From 06c74dc086dc4777c8f41cd037aae6a527706715 Mon Sep 17 00:00:00 2001
From: Peter Kling <1018801+pitkling@users.noreply.github.com>
Date: Thu, 9 Jan 2025 14:19:11 +0100
Subject: [PATCH 001/489] python312Packages.jaconv: do not include unnecessary
 files

`data_files` installs into Python's installation prefix (not into the directory of the python module), potentially causing collisions if other packages do the same (with such general files).
---
 pkgs/development/python-modules/jaconv/default.nix   |  5 ++++-
 .../python-modules/jaconv/fix-packaging.patch        | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/jaconv/fix-packaging.patch

diff --git a/pkgs/development/python-modules/jaconv/default.nix b/pkgs/development/python-modules/jaconv/default.nix
index 2ec947be0268..3304ed3e82fe 100644
--- a/pkgs/development/python-modules/jaconv/default.nix
+++ b/pkgs/development/python-modules/jaconv/default.nix
@@ -21,7 +21,10 @@ buildPythonPackage rec {
     hash = "sha256-9ruhOLaYNESeKOwJs3IN6ct66fSq7My9DOyA7/cH3d0=";
   };
 
-  patches = [ ./use-pytest.patch ];
+  patches = [
+    ./fix-packaging.patch
+    ./use-pytest.patch
+  ];
 
   build-system = [ setuptools ];
 
diff --git a/pkgs/development/python-modules/jaconv/fix-packaging.patch b/pkgs/development/python-modules/jaconv/fix-packaging.patch
new file mode 100644
index 000000000000..f970b4e6c969
--- /dev/null
+++ b/pkgs/development/python-modules/jaconv/fix-packaging.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index 297357b..12b861f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -39,7 +42,6 @@
+           'Programming Language :: Python :: 3.10',
+           'Programming Language :: Python :: 3.11', 'Topic :: Text Processing'
+       ],
+-      data_files=[('', ['README.rst', 'CHANGES.rst'])],
+       long_description='%s\n\n%s' %
+       (open('README.rst', encoding='utf8').read(),
+        open('CHANGES.rst', encoding='utf8').read()),

From 8f2084a6d0857e2d69b2bb6bc5eaa4abf5f47966 Mon Sep 17 00:00:00 2001
From: Peter Kling <1018801+pitkling@users.noreply.github.com>
Date: Thu, 9 Jan 2025 14:25:07 +0100
Subject: [PATCH 002/489] python312Packages.macfsevents: do not include
 unnecessary files

`data_files` installs into Python's installation prefix (not into the directory of the python module), potentially causing collisions if other packages do the same (with such general files).
---
 .../python-modules/macfsevents/default.nix       |  2 ++
 .../macfsevents/fix-packaging.patch              | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/python-modules/macfsevents/fix-packaging.patch

diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix
index 77e82746e77d..e240f96929d1 100644
--- a/pkgs/development/python-modules/macfsevents/default.nix
+++ b/pkgs/development/python-modules/macfsevents/default.nix
@@ -16,6 +16,8 @@ buildPythonPackage rec {
     hash = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs=";
   };
 
+  patches = [ ./fix-packaging.patch ];
+
   buildInputs = [
     CoreFoundation
     CoreServices
diff --git a/pkgs/development/python-modules/macfsevents/fix-packaging.patch b/pkgs/development/python-modules/macfsevents/fix-packaging.patch
new file mode 100644
index 000000000000..21569c63ade5
--- /dev/null
+++ b/pkgs/development/python-modules/macfsevents/fix-packaging.patch
@@ -0,0 +1,16 @@
+diff --git a/setup.py b/setup.py
+index d7f9bb0..7707e38 100644
+--- a/setup.py
++++ b/setup.py
+@@ -21,11 +21,6 @@ def read(fname):
+       description = "Thread-based interface to file system observation primitives.",
+       long_description = "\n\n".join((read('README.rst'), read('CHANGES.rst'))),
+       license = "BSD",
+-      data_files = [("", [
+-          "compat.h",
+-          "LICENSE.txt",
+-          "CHANGES.rst"
+-      ])],
+       author = "Malthe Borch",
+       author_email = "mborch@gmail.com",
+       url = 'https://github.com/malthe/macfsevents',

From 11c33d83eacbc79ab2d421b876e6280bad21effe Mon Sep 17 00:00:00 2001
From: Peter Kling <1018801+pitkling@users.noreply.github.com>
Date: Mon, 10 Feb 2025 11:56:55 +0100
Subject: [PATCH 003/489] python312Packages.macfsevents: use new apple sdk
 pattern

---
 pkgs/development/python-modules/macfsevents/default.nix | 7 -------
 pkgs/top-level/python-packages.nix                      | 4 +---
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix
index e240f96929d1..65a086fae242 100644
--- a/pkgs/development/python-modules/macfsevents/default.nix
+++ b/pkgs/development/python-modules/macfsevents/default.nix
@@ -2,8 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  CoreFoundation,
-  CoreServices,
 }:
 
 buildPythonPackage rec {
@@ -18,11 +16,6 @@ buildPythonPackage rec {
 
   patches = [ ./fix-packaging.patch ];
 
-  buildInputs = [
-    CoreFoundation
-    CoreServices
-  ];
-
   # Some tests fail under nix build directory
   doCheck = false;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ad9734cfcfd0..215a204dc88f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7860,9 +7860,7 @@ self: super: with self; {
 
   macaddress = callPackage ../development/python-modules/macaddress{ };
 
-  macfsevents = callPackage ../development/python-modules/macfsevents {
-    inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices;
-  };
+  macfsevents = callPackage ../development/python-modules/macfsevents { };
 
   macholib = callPackage ../development/python-modules/macholib { };
 

From 1ccd3dbd4cd2da60978fd456dea4d03138476feb Mon Sep 17 00:00:00 2001
From: Stephen Huan <stephen.huan@cgdct.moe>
Date: Mon, 10 Mar 2025 21:09:08 -0400
Subject: [PATCH 004/489] sioyek: replace nix-update with unstableGitUpdater

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

diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix
index fc12436e786f..c38451e93c54 100644
--- a/pkgs/by-name/si/sioyek/package.nix
+++ b/pkgs/by-name/si/sioyek/package.nix
@@ -4,7 +4,7 @@
   installShellFiles,
   fetchFromGitHub,
   freetype,
-  nix-update-script,
+  unstableGitUpdater,
   gumbo,
   harfbuzz,
   jbig2dec,
@@ -74,11 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
         installManPage resources/sioyek.1
       '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "branch=development"
-    ];
+  passthru.updateScript = unstableGitUpdater {
+    branch = "development";
+    tagPrefix = "v";
   };
 
   meta = with lib; {

From bba169e23d801137e1e90daba0c067aab09373a0 Mon Sep 17 00:00:00 2001
From: Stephen Huan <stephen.huan@cgdct.moe>
Date: Mon, 10 Mar 2025 21:08:34 -0400
Subject: [PATCH 005/489] sioyek: 2.0.0-unstable-2025-02-20 ->
 2.0.0-unstable-2025-03-11

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

diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix
index c38451e93c54..1e387991d622 100644
--- a/pkgs/by-name/si/sioyek/package.nix
+++ b/pkgs/by-name/si/sioyek/package.nix
@@ -15,13 +15,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "sioyek";
-  version = "2.0.0-unstable-2025-02-20";
+  version = "2.0.0-unstable-2025-03-11";
 
   src = fetchFromGitHub {
     owner = "ahrm";
     repo = "sioyek";
-    rev = "a64ad82b2c14e1ef821c13ddf1291ebb6aaafca6";
-    hash = "sha256-aI8GqXAgyh5VkayEQbaXOK+JQKzqVqQs8RO3CdOsgX8=";
+    rev = "b3575d9634d6c305cdf555a383e019a1e9013f2a";
+    hash = "sha256-a6zIgFe8bHrqXAtCC4/LC5jl3hy2Cs1xZBI91sKQgqw=";
   };
 
   buildInputs =

From 7ab2c04f181c8d62418fe605b42cf47d3b23f1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 13 Mar 2025 20:06:25 +0100
Subject: [PATCH 006/489] jdk: combine meta.platforms of both packages to fix
 hydra builds for dependent packages

---
 pkgs/top-level/java-packages.nix | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 0def6c5b74b1..3da6d851b27d 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -9,13 +9,28 @@ with pkgs;
     let
       mkOpenjdk =
         featureVersion: path-darwin:
+        let
+          # merge meta.platforms of both packages so that dependent packages and hydra build them
+          mergeMetaPlatforms =
+            jdk: other:
+            jdk
+            // {
+              meta = jdk.meta // {
+                platforms = lib.unique (jdk.meta.platforms ++ other.meta.platforms);
+              };
+            };
+          openjdkLinux = mkOpenjdkLinuxOnly featureVersion;
+          openjdkLinuxHeadless = openjdkLinux.override { headless = true; };
+          openjdkDarwin =
+            let
+              openjdk = callPackage path-darwin { };
+            in
+            openjdk // { headless = mergeMetaPlatforms openjdkDarwin openjdkLinuxHeadless; };
+        in
         if stdenv.hostPlatform.isLinux then
-          mkOpenjdkLinuxOnly featureVersion
+          (mergeMetaPlatforms openjdkLinux openjdkDarwin)
         else
-          let
-            openjdk = callPackage path-darwin { };
-          in
-          openjdk // { headless = openjdk; };
+          (mergeMetaPlatforms openjdkDarwin openjdkLinux);
 
       mkOpenjdkLinuxOnly =
         featureVersion:
@@ -25,7 +40,7 @@ with pkgs;
         assert stdenv.hostPlatform.isLinux;
         openjdk
         // {
-          headless = openjdk.override { headless = true; };
+          headless = mergeMetaPlatforms openjdkLinuxHeadless openjdkDarwin;
         };
 
     in

From d7f9effeff926c284b5ffc5a22083e6078b7444d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 13 Mar 2025 20:11:37 +0100
Subject: [PATCH 007/489] java-packages: simplify code

---
 pkgs/top-level/java-packages.nix | 60 +++++++++++++++++---------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 3da6d851b27d..989b880b71ca 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -7,8 +7,25 @@ with pkgs;
 
   compiler =
     let
+      # merge meta.platforms of both packages so that dependent packages and hydra build them
+      mergeMetaPlatforms =
+        jdk: other:
+        jdk
+        // {
+          meta = jdk.meta // {
+            platforms = lib.unique (jdk.meta.platforms ++ other.meta.platforms);
+          };
+        };
+
+      mkLinuxDarwin =
+        linux: darwin:
+        if stdenv.hostPlatform.isLinux then
+          mergeMetaPlatforms linux darwin
+        else
+          mergeMetaPlatforms darwin linux;
+
       mkOpenjdk =
-        featureVersion: path-darwin:
+        featureVersion:
         let
           # merge meta.platforms of both packages so that dependent packages and hydra build them
           mergeMetaPlatforms =
@@ -19,41 +36,28 @@ with pkgs;
                 platforms = lib.unique (jdk.meta.platforms ++ other.meta.platforms);
               };
             };
-          openjdkLinux = mkOpenjdkLinuxOnly featureVersion;
+          openjdkLinux =
+            (callPackage ../development/compilers/openjdk/generic.nix { inherit featureVersion; })
+            // {
+              headless = mergeMetaPlatforms openjdkLinuxHeadless openjdkDarwin;
+            };
           openjdkLinuxHeadless = openjdkLinux.override { headless = true; };
-          openjdkDarwin =
-            let
-              openjdk = callPackage path-darwin { };
-            in
-            openjdk // { headless = mergeMetaPlatforms openjdkDarwin openjdkLinuxHeadless; };
+          openjdkDarwin = (callPackage ../development/compilers/zulu/${featureVersion}.nix { }) // {
+            headless = mergeMetaPlatforms openjdkDarwin openjdkLinuxHeadless;
+          };
         in
-        if stdenv.hostPlatform.isLinux then
-          (mergeMetaPlatforms openjdkLinux openjdkDarwin)
-        else
-          (mergeMetaPlatforms openjdkDarwin openjdkLinux);
-
-      mkOpenjdkLinuxOnly =
-        featureVersion:
-        let
-          openjdk = callPackage ../development/compilers/openjdk/generic.nix { inherit featureVersion; };
-        in
-        assert stdenv.hostPlatform.isLinux;
-        openjdk
-        // {
-          headless = mergeMetaPlatforms openjdkLinuxHeadless openjdkDarwin;
-        };
-
+        mkLinuxDarwin openjdkLinux openjdkDarwin;
     in
     rec {
       corretto11 = callPackage ../development/compilers/corretto/11.nix { };
       corretto17 = callPackage ../development/compilers/corretto/17.nix { };
       corretto21 = callPackage ../development/compilers/corretto/21.nix { };
 
-      openjdk8 = mkOpenjdk "8" ../development/compilers/zulu/8.nix;
-      openjdk11 = mkOpenjdk "11" ../development/compilers/zulu/11.nix;
-      openjdk17 = mkOpenjdk "17" ../development/compilers/zulu/17.nix;
-      openjdk21 = mkOpenjdk "21" ../development/compilers/zulu/21.nix;
-      openjdk23 = mkOpenjdk "23" ../development/compilers/zulu/23.nix;
+      openjdk8 = mkOpenjdk "8";
+      openjdk11 = mkOpenjdk "11";
+      openjdk17 = mkOpenjdk "17";
+      openjdk21 = mkOpenjdk "21";
+      openjdk23 = mkOpenjdk "23";
 
       # Legacy aliases
       openjdk8-bootstrap = temurin-bin.jdk-8;

From d1ad3425f977eb41063055a34d44803ed1c958ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 13 Mar 2025 20:17:56 +0100
Subject: [PATCH 008/489] semeru,temurin: also fix meta similar to jdk

---
 pkgs/top-level/java-packages.nix | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 989b880b71ca..a2124af1270b 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -27,15 +27,6 @@ with pkgs;
       mkOpenjdk =
         featureVersion:
         let
-          # merge meta.platforms of both packages so that dependent packages and hydra build them
-          mergeMetaPlatforms =
-            jdk: other:
-            jdk
-            // {
-              meta = jdk.meta // {
-                platforms = lib.unique (jdk.meta.platforms ++ other.meta.platforms);
-              };
-            };
           openjdkLinux =
             (callPackage ../development/compilers/openjdk/generic.nix { inherit featureVersion; })
             // {
@@ -65,21 +56,19 @@ with pkgs;
       openjdk17-bootstrap = temurin-bin.jdk-17;
 
       temurin-bin = recurseIntoAttrs (
-        callPackage (
-          if stdenv.hostPlatform.isLinux then
-            ../development/compilers/temurin-bin/jdk-linux.nix
-          else
-            ../development/compilers/temurin-bin/jdk-darwin.nix
-        ) { }
+        let
+          temurinLinux = callPackage ../development/compilers/temurin-bin/jdk-linux.nix { };
+          temurinDarwin = callPackage ../development/compilers/temurin-bin/jdk-darwin.nix { };
+        in
+        lib.mapAttrs (name: drv: mkLinuxDarwin drv temurinDarwin.${name}) temurinLinux
       );
 
       semeru-bin = recurseIntoAttrs (
-        callPackage (
-          if stdenv.hostPlatform.isLinux then
-            ../development/compilers/semeru-bin/jdk-linux.nix
-          else
-            ../development/compilers/semeru-bin/jdk-darwin.nix
-        ) { }
+        let
+          semeruLinux = callPackage ../development/compilers/semeru-bin/jdk-linux.nix { };
+          semeruDarwin = callPackage ../development/compilers/semeru-bin/jdk-darwin.nix { };
+        in
+        lib.mapAttrs (name: drv: mkLinuxDarwin drv semeruDarwin.${name}) semeruLinux
       );
     };
 }

From 3be0589d1835af9cfeb81f6d56329ba743a9362b Mon Sep 17 00:00:00 2001
From: cr0n <cr0n@cypherpunks.cc>
Date: Sun, 16 Mar 2025 17:13:39 +0100
Subject: [PATCH 009/489] maintainers: add cr0n

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6bbcab5d3f55..659cb26ca2bb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4897,6 +4897,12 @@
     name = "Daniel McCarney";
     keys = [ { fingerprint = "8026 D24A A966 BF9C D3CD  CB3C 08FB 2BFC 470E 75B4"; } ];
   };
+  cr0n = {
+    name = "cr0n";
+    github = "n0rc";
+    githubId = 355000;
+    email = "cr0n@cypherpunks.cc";
+  };
   Crafter = {
     email = "crafter@crafter.rocks";
     github = "Craftzman7";

From 40567b6b8ddc2a2ed8d221db6192b64a8631ca8b Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Thu, 6 Mar 2025 10:56:52 +0100
Subject: [PATCH 010/489] nixos/nebula: add DNS options

Add the options:

- lighthouse.serve_dns
- lighthouse.dns.host
- lighthouse.dns.port

Improve systemd capabilities handling:

- do not give CAP_NET_ADMIN when tunnel interface is disabled
- give CAP_NET_BIND_SERVICE when DNS is enabled

Add self as maintainer: I'm using Nebula on NixOS in prod.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
 nixos/modules/services/networking/nebula.nix | 52 +++++++++++++++++---
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/nebula.nix b/nixos/modules/services/networking/nebula.nix
index 35d7fafb43b5..36122d45c128 100644
--- a/nixos/modules/services/networking/nebula.nix
+++ b/nixos/modules/services/networking/nebula.nix
@@ -84,6 +84,28 @@ in
                 description = "Whether this node is a relay.";
               };
 
+              lighthouse.dns.enable = lib.mkOption {
+                type = lib.types.bool;
+                default = false;
+                description = "Whether this lighthouse node should serve DNS.";
+              };
+
+              lighthouse.dns.host = lib.mkOption {
+                type = lib.types.str;
+                default = "localhost";
+                description = ''
+                  IP address on which nebula lighthouse should serve DNS.
+                  'localhost' is a good default to ensure the service does not listen on public interfaces;
+                  use a Nebula address like 10.0.0.5 to make DNS resolution available to nebula hosts only.
+                '';
+              };
+
+              lighthouse.dns.port = lib.mkOption {
+                type = lib.types.nullOr lib.types.port;
+                default = 5353;
+                description = "UDP port number for lighthouse DNS server.";
+              };
+
               lighthouses = lib.mkOption {
                 type = lib.types.listOf lib.types.str;
                 default = [ ];
@@ -172,10 +194,7 @@ in
                 '';
                 example = lib.literalExpression ''
                   {
-                    lighthouse.dns = {
-                      host = "0.0.0.0";
-                      port = 53;
-                    };
+                    lighthouse.interval = 15;
                   }
                 '';
               };
@@ -203,6 +222,9 @@ in
             lighthouse = {
               am_lighthouse = netCfg.isLighthouse;
               hosts = netCfg.lighthouses;
+              serve_dns = netCfg.lighthouse.dns.enable;
+              dns.host = netCfg.lighthouse.dns.host;
+              dns.port = netCfg.lighthouse.dns.port;
             };
             relay = {
               am_relay = netCfg.isRelay;
@@ -231,6 +253,19 @@ in
               ''
               settings
           );
+          capabilities =
+            let
+              nebulaPort = if !settings.tun.disabled then settings.listen.port else 0;
+              dnsPort = if settings.lighthouse.serve_dns then settings.lighthouse.dns.port else 0;
+            in
+            lib.concatStringsSep " " (
+              # creation of tunnel interfaces
+              lib.optional (!settings.tun.disabled) "CAP_NET_ADMIN"
+              # binding to privileged ports
+              ++ lib.optional (
+                nebulaPort > 0 && nebulaPort < 1024 || dnsPort > 0 && dnsPort < 1024
+              ) "CAP_NET_BIND_SERVICE"
+            );
         in
         {
           # Create the systemd service for Nebula.
@@ -248,8 +283,8 @@ in
               Restart = "always";
               ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}";
               UMask = "0027";
-              CapabilityBoundingSet = "CAP_NET_ADMIN";
-              AmbientCapabilities = "CAP_NET_ADMIN";
+              CapabilityBoundingSet = capabilities;
+              AmbientCapabilities = capabilities;
               LockPersonality = true;
               NoNewPrivileges = true;
               PrivateDevices = false; # needs access to /dev/net/tun (below)
@@ -302,5 +337,8 @@ in
     );
   };
 
-  meta.maintainers = with lib.maintainers; [ numinit ];
+  meta.maintainers = with lib.maintainers; [
+    numinit
+    siriobalmelli
+  ];
 }

From a247dd229ae4dc95b62416008a572884e91eaacd Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Thu, 6 Mar 2025 10:56:52 +0100
Subject: [PATCH 011/489] nixos/nebula: add DNS tests

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
 nixos/tests/nebula.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/nebula.nix b/nixos/tests/nebula.nix
index b3096424a614..68a48d4c86a2 100644
--- a/nixos/tests/nebula.nix
+++ b/nixos/tests/nebula.nix
@@ -14,7 +14,10 @@ import ./make-test-python.nix (
       lib.mkMerge [
         {
           # Expose nebula for doing cert signing.
-          environment.systemPackages = [ pkgs.nebula ];
+          environment.systemPackages = [
+            pkgs.dig
+            pkgs.nebula
+          ];
           users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ];
           services.openssh.enable = true;
           networking.firewall.enable = true; # Implicitly true, but let's make sure.
@@ -51,6 +54,7 @@ import ./make-test-python.nix (
       lighthouse =
         { ... }@args:
         makeNebulaNode args "lighthouse" {
+          networking.firewall.allowedUDPPorts = [ 53 ];
           networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
             {
               address = "192.168.1.1";
@@ -77,6 +81,13 @@ import ./make-test-python.nix (
                 }
               ];
             };
+            lighthouse = {
+              dns = {
+                enable = true;
+                host = "10.0.100.1"; # bind to lighthouse interface
+                port = 53; # answer on standard DNS port
+              };
+            };
           };
         };
 
@@ -338,6 +349,8 @@ import ./make-test-python.nix (
         # allowAny can ping the lighthouse, but not allowFromLighthouse because of its inbound firewall
         allowAny.succeed("ping -c3 10.0.100.1")
         allowAny.fail("ping -c3 10.0.100.3")
+        # allowAny can also resolve DNS on lighthouse
+        allowAny.succeed("dig @10.0.100.1 allowToLighthouse | grep -E 'allowToLighthouse\.\s+[0-9]+\s+IN\s+A\s+10\.0\.100\.4'")
 
         # allowFromLighthouse can ping the lighthouse and allowAny
         allowFromLighthouse.succeed("ping -c3 10.0.100.1")

From 410b9853bf4a872ccc56f06c58422782deae4d38 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Mon, 17 Mar 2025 18:00:00 +0100
Subject: [PATCH 012/489] i2pd: remove unused USE_AESNI flag

Since release 2.55 that flag has been removed. Therefore we remove it
to avoid confusion.

References:

https://github.com/PurpleI2P/i2pd/blob/2.55.0/ChangeLog#L19

https://github.com/PurpleI2P/i2pd/commit/48b62340ccfc6742d09b3d20a4aa16325391af3c
---
 pkgs/by-name/i2/i2pd/package.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix
index 59a4f509feac..0f8399f9e4a5 100644
--- a/pkgs/by-name/i2/i2pd/package.nix
+++ b/pkgs/by-name/i2/i2pd/package.nix
@@ -8,7 +8,6 @@
   openssl,
   upnpSupport ? true,
   miniupnpc,
-  aesniSupport ? stdenv.hostPlatform.aesSupport,
 }:
 
 stdenv.mkDerivation rec {
@@ -37,14 +36,9 @@ stdenv.mkDerivation rec {
     installShellFiles
   ];
 
-  makeFlags =
-    let
-      ynf = a: b: a + "=" + (if b then "yes" else "no");
-    in
-    [
-      (ynf "USE_AESNI" aesniSupport)
-      (ynf "USE_UPNP" upnpSupport)
-    ];
+  makeFlags = [
+    "USE_UPNP=${if upnpSupport then "yes" else "no"}"
+  ];
 
   enableParallelBuilding = true;
 

From c83d599496b3408f27d1aa3a033ca491da8ae7e9 Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Fri, 21 Mar 2025 17:44:16 -0500
Subject: [PATCH 013/489] bstone: 1.2.13 -> 1.2.15

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

diff --git a/pkgs/by-name/bs/bstone/package.nix b/pkgs/by-name/bs/bstone/package.nix
index e5f98c653ad5..f0bf4886ae6f 100644
--- a/pkgs/by-name/bs/bstone/package.nix
+++ b/pkgs/by-name/bs/bstone/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bstone";
-  version = "1.2.13";
+  version = "1.2.15";
 
   src = fetchFromGitHub {
     owner = "bibendovsky";
     repo = "bstone";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-jK40/FdC11SWe2Vmh6cbNTxPeM1vrAveEtUWoiAh+jc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-L07GfqeQPTWGQb+vOOXNgbYLYpxQ2OHFnCLWd4uSlBw=";
   };
 
   nativeBuildInputs = [
@@ -28,8 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postInstall = ''
-    mkdir -p $out/bin
-    mv $out/bstone* $out/bin
+    mkdir -p $out/{bin,share/bibendovsky/bstone}
+    mv $out/bstone $out/bin
+    mv $out/*.txt $out/share/bibendovsky/bstone
   '';
 
   meta = {

From df5ddd15b15d1288b2439c9cdc3bd0bee8c3214c Mon Sep 17 00:00:00 2001
From: Matt Schreiber <tomeon@dogea.red>
Date: Wed, 19 Mar 2025 10:23:11 -0400
Subject: [PATCH 014/489] gemstash: update dependencies

to address a fatal error attempting to load the sqlite3 gem.
---
 pkgs/development/tools/gemstash/Gemfile.lock |  56 +++++-----
 pkgs/development/tools/gemstash/gemset.nix   | 103 +++++++++++++------
 2 files changed, 95 insertions(+), 64 deletions(-)

diff --git a/pkgs/development/tools/gemstash/Gemfile.lock b/pkgs/development/tools/gemstash/Gemfile.lock
index e091a27c0f86..92112368f9a2 100644
--- a/pkgs/development/tools/gemstash/Gemfile.lock
+++ b/pkgs/development/tools/gemstash/Gemfile.lock
@@ -1,8 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.1.2)
+    activesupport (7.2.2.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -13,10 +14,12 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     dalli (3.2.8)
+    date (3.4.1)
     drb (2.2.1)
     faraday (1.10.4)
       faraday-em_http (~> 1.0)
@@ -34,8 +37,8 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -57,26 +60,28 @@ GEM
       sqlite3 (~> 1.3)
       terminal-table (~> 3.0)
       thor (~> 1.0)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    logger (1.6.1)
+    logger (1.6.6)
     lru_redux (1.1.0)
-    minitest (5.25.1)
+    mini_portile2 (2.8.8)
+    minitest (5.25.5)
     multipart-post (2.4.1)
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
-    nio4r (2.7.3)
-    psych (5.1.2)
+    nio4r (2.7.4)
+    psych (5.2.3)
+      date
       stringio
-    puma (6.4.3)
+    puma (6.6.0)
       nio4r (~> 2.0)
-    rack (2.2.10)
+    rack (2.2.13)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
     ruby2_keywords (0.0.5)
-    securerandom (0.3.1)
-    sequel (5.85.0)
+    securerandom (0.4.1)
+    sequel (5.90.0)
       bigdecimal
     server_health_check (1.0.2)
     server_health_check-rack (0.1.0)
@@ -86,31 +91,22 @@ GEM
       rack (~> 2.2, >= 2.2.4)
       rack-protection (= 3.2.0)
       tilt (~> 2.0)
-    sqlite3 (1.7.3-aarch64-linux)
-    sqlite3 (1.7.3-arm-linux)
-    sqlite3 (1.7.3-arm64-darwin)
-    sqlite3 (1.7.3-x86-linux)
-    sqlite3 (1.7.3-x86_64-darwin)
-    sqlite3 (1.7.3-x86_64-linux)
-    stringio (3.1.1)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
+    stringio (3.1.5)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.3.2)
-    tilt (2.4.0)
+    tilt (2.6.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
 
 PLATFORMS
-  aarch64-linux
-  arm-linux
-  arm64-darwin
-  x86-linux
-  x86_64-darwin
-  x86_64-linux
+  ruby
 
 DEPENDENCIES
   gemstash
 
 BUNDLED WITH
-   2.5.17
+   2.6.2
diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/development/tools/gemstash/gemset.nix
index 40f7f09fe9e2..afa40fa2c182 100644
--- a/pkgs/development/tools/gemstash/gemset.nix
+++ b/pkgs/development/tools/gemstash/gemset.nix
@@ -2,6 +2,7 @@
   activesupport = {
     dependencies = [
       "base64"
+      "benchmark"
       "bigdecimal"
       "concurrent-ruby"
       "connection_pool"
@@ -16,10 +17,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc";
+      sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4";
       type = "gem";
     };
-    version = "7.2.1.2";
+    version = "7.2.2.1";
   };
   base64 = {
     groups = [ "default" ];
@@ -31,35 +32,45 @@
     };
     version = "0.2.0";
   };
+  benchmark = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
   bigdecimal = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
+      sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
       type = "gem";
     };
-    version = "3.1.8";
+    version = "3.1.9";
   };
   concurrent-ruby = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
+      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
       type = "gem";
     };
-    version = "1.3.4";
+    version = "1.3.5";
   };
   connection_pool = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
+      sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3";
       type = "gem";
     };
-    version = "2.4.1";
+    version = "2.5.0";
   };
   dalli = {
     groups = [ "default" ];
@@ -71,6 +82,16 @@
     };
     version = "3.2.8";
   };
+  date = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz";
+      type = "gem";
+    };
+    version = "3.4.1";
+  };
   drb = {
     groups = [ "default" ];
     platforms = [ ];
@@ -150,10 +171,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh";
+      sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.1.0";
   };
   faraday-net_http = {
     groups = [ "default" ];
@@ -247,20 +268,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
+      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
       type = "gem";
     };
-    version = "1.14.6";
+    version = "1.14.7";
   };
   logger = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+      sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
       type = "gem";
     };
-    version = "1.6.1";
+    version = "1.6.6";
   };
   lru_redux = {
     groups = [ "default" ];
@@ -272,15 +293,25 @@
     };
     version = "1.1.0";
   };
+  mini_portile2 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
+      type = "gem";
+    };
+    version = "2.8.8";
+  };
   minitest = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
+      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
       type = "gem";
     };
-    version = "5.25.1";
+    version = "5.25.5";
   };
   multipart-post = {
     groups = [ "default" ];
@@ -308,21 +339,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal";
+      sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr";
       type = "gem";
     };
-    version = "2.7.3";
+    version = "2.7.4";
   };
   psych = {
-    dependencies = [ "stringio" ];
+    dependencies = [
+      "date"
+      "stringio"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk";
+      sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
       type = "gem";
     };
-    version = "5.1.2";
+    version = "5.2.3";
   };
   puma = {
     dependencies = [ "nio4r" ];
@@ -330,20 +364,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914";
+      sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j";
       type = "gem";
     };
-    version = "6.4.3";
+    version = "6.6.0";
   };
   rack = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4";
+      sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc";
       type = "gem";
     };
-    version = "2.2.10";
+    version = "2.2.13";
   };
   rack-protection = {
     dependencies = [
@@ -374,10 +408,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
+      sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc";
       type = "gem";
     };
-    version = "0.3.1";
+    version = "0.4.1";
   };
   sequel = {
     dependencies = [ "bigdecimal" ];
@@ -385,10 +419,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04jjv63wvvi9qfkpfsrv6w74liiqk4cd1qnlk7ja7i2waci9hlzx";
+      sha256 = "1s5qhylirrmfbjhdjdfqaiksjlaqmgixl25sxd8znq8dqwqlrydz";
       type = "gem";
     };
-    version = "5.85.0";
+    version = "5.90.0";
   };
   server_health_check = {
     groups = [ "default" ];
@@ -428,11 +462,12 @@
     version = "3.2.0";
   };
   sqlite3 = {
+    dependencies = [ "mini_portile2" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "sha256-+nf2PHCVSPRtTptrtFzaUqo4gaoSzIWZETJ1jolocBw=";
+      sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs";
       type = "gem";
     };
     version = "1.7.3";
@@ -442,10 +477,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak";
+      sha256 = "1j1mgvrgkxhadi6nb6pz1kcff7gsb5aivj1vfhsia4ssa5hj9adw";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.1.5";
   };
   terminal-table = {
     dependencies = [ "unicode-display_width" ];
@@ -473,10 +508,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z";
+      sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.6.0";
   };
   tzinfo = {
     dependencies = [ "concurrent-ruby" ];

From a715615154070c1b5fca36a13b33a0ed7c5519d7 Mon Sep 17 00:00:00 2001
From: ziguana <git@ziguana.dev>
Date: Sat, 22 Mar 2025 15:51:23 -0600
Subject: [PATCH 015/489] rkdeveloptool: unstable-2021-04-04 ->
 unstable-2025-03-07

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

diff --git a/pkgs/by-name/rk/rkdeveloptool/package.nix b/pkgs/by-name/rk/rkdeveloptool/package.nix
index 6c06584d7968..9b319231ad05 100644
--- a/pkgs/by-name/rk/rkdeveloptool/package.nix
+++ b/pkgs/by-name/rk/rkdeveloptool/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "rkdeveloptool";
-  version = "unstable-2021-04-08";
+  version = "unstable-2025-03-07";
 
   src = fetchFromGitHub {
     owner = "rockchip-linux";
     repo = "rkdeveloptool";
-    rev = "46bb4c073624226c3f05b37b9ecc50bbcf543f5a";
-    sha256 = "eIFzyoY6l3pdfCN0uS16hbVp0qzdG3MtcS1jnDX1Yk0=";
+    rev = "304f073752fd25c854e1bcf05d8e7f925b1f4e14";
+    sha256 = "sha256-GcSxkraJrDCz5ADO0XJk4xRrYTk0V5dAAim+D7ZiMJQ=";
   };
 
   nativeBuildInputs = [

From 3c17721be9009111c32cd2bc0a1da0fbe79847f4 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 23 Mar 2025 16:02:31 +0100
Subject: [PATCH 016/489] nmh: 1.7.1 -> 1.8

---
 pkgs/by-name/nm/nmh/package.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix
index 0eebc1cb85e0..67ab19a8d460 100644
--- a/pkgs/by-name/nm/nmh/package.nix
+++ b/pkgs/by-name/nm/nmh/package.nix
@@ -14,25 +14,25 @@
   openssl,
   readline,
   runtimeShell,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nmh";
-  version = "1.7.1";
+  version = "1.8";
   src = fetchFromSavannah {
     repo = "nmh";
     rev = finalAttrs.version;
-    hash = "sha256-sBftXl4hWs4bKw5weHkif1KIJBpheU/RCePx0WXuv9o=";
+    hash = "sha256-ShAdinvBA7guVBhjqTelBRiUzyo5KqHcawlQS9kXtqs=";
   };
 
   postPatch = ''
-    substituteInPlace config/config.c --replace /bin/cat ${coreutils}/bin/cat
     substituteInPlace \
       sbr/arglist.c \
       uip/mhbuildsbr.c \
       uip/whatnowsbr.c \
       uip/slocal.c \
-      --replace '"/bin/sh"' '"${runtimeShell}"'
+      --replace-fail '"/bin/sh"' '"${runtimeShell}"'
     # the "cleanup" pseudo-test makes diagnosing test failures a pain
     ln -s -f ${stdenv}/bin/true test/cleanup
   '';
@@ -57,6 +57,13 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
   enableParallelBuilding = true;
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/install-mh";
+  versionCheckProgramArg = "-version";
+
   meta = {
     description = "New MH Mail Handling System";
     homepage = "https://nmh.nongnu.org/";

From d2a3e5e04bb845692025f71b86883cff68ebdf53 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 23 Mar 2025 16:02:42 +0100
Subject: [PATCH 017/489] nmh: make reproducible

---
 pkgs/by-name/nm/nmh/package.nix                   |  2 ++
 pkgs/by-name/nm/nmh/reproducible-build-date.patch | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/by-name/nm/nmh/reproducible-build-date.patch

diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix
index 67ab19a8d460..61d0c738c694 100644
--- a/pkgs/by-name/nm/nmh/package.nix
+++ b/pkgs/by-name/nm/nmh/package.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ShAdinvBA7guVBhjqTelBRiUzyo5KqHcawlQS9kXtqs=";
   };
 
+  patches = [ ./reproducible-build-date.patch ];
+
   postPatch = ''
     substituteInPlace \
       sbr/arglist.c \
diff --git a/pkgs/by-name/nm/nmh/reproducible-build-date.patch b/pkgs/by-name/nm/nmh/reproducible-build-date.patch
new file mode 100644
index 000000000000..cb28c0a948cf
--- /dev/null
+++ b/pkgs/by-name/nm/nmh/reproducible-build-date.patch
@@ -0,0 +1,15 @@
+Index: config/version.sh
+===================================================================
+--- a/config/version.sh
++++ b/config/version.sh
+@@ -11,9 +11,9 @@
+     git=" `git -C $srcdir describe --long --dirty`"
+ else
+     git=
+ fi
+-date="`TZ=GMT0 date +'%Y-%m-%d %T'` +0000"
++date="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)"
+ 
+ cat <<E
+ char *version_str = "nmh-$version$git built $date on $host";
+ char *version_num = "nmh-$version";

From 619ca2251035d0e56feb835da9591fe5936b5003 Mon Sep 17 00:00:00 2001
From: blackzeshi <105582686+zeshi09@users.noreply.github.com>
Date: Sun, 23 Mar 2025 22:31:44 +0500
Subject: [PATCH 018/489] maintainers: add blackzeshi

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 282deb45d653..10dceb35fefe 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3205,6 +3205,12 @@
     githubId = 5718007;
     name = "Bastian Köcher";
   };
+  blackzeshi = {
+    name = "blackzeshi";
+    email = "sergey_zhuzhgov@mail.ru";
+    github = "zeshi09";
+    githubId = 105582686;
+  };
   blakesmith = {
     name = "Blake Smith";
     email = "blakesmith0@gmail.com";

From e61e1aaadc8fd150a672e4ea9967240d36354672 Mon Sep 17 00:00:00 2001
From: blackzeshi <105582686+zeshi09@users.noreply.github.com>
Date: Sun, 23 Mar 2025 22:35:16 +0500
Subject: [PATCH 019/489] caido: 0.45.1 -> 0.47.1, add blackzeshi as maintainer

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

diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix
index 401ec4676de6..ef79b31cbb54 100644
--- a/pkgs/by-name/ca/caido/package.nix
+++ b/pkgs/by-name/ca/caido/package.nix
@@ -15,14 +15,14 @@ let
     "cli"
     "desktop"
   ];
-  version = "0.45.1";
+  version = "0.47.1";
   cli = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
-    hash = "sha256-tudXyf9wwWABMGwfsxaLJtkZPKImlgjzfJJYFtimQOE=";
+    hash = "sha256-T+NOp5UEKcP8slDddQ9vyrrpoZVGEChJ379Da5E7pVw=";
   };
   desktop = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
-    hash = "sha256-meNB1KCtxApsP95476ggL2gbCxu2fdold6BQ2dlZqFc=";
+    hash = "sha256-J2FvEdLy77uO52KNlugZZ+flsraKatXT2n17npMYo9M=";
   };
   appimageContents = appimageTools.extractType2 {
     inherit pname version;
@@ -70,6 +70,7 @@ let
     maintainers = with lib.maintainers; [
       octodi
       d3vil0p3r
+      blackzeshi
     ];
     platforms = [ "x86_64-linux" ];
   };

From 1de35b7af080dab016595f528494c87e97eeeeb5 Mon Sep 17 00:00:00 2001
From: jayrovacsek <jay@rovacsek.com>
Date: Mon, 24 Mar 2025 06:25:07 +1100
Subject: [PATCH 020/489] authelia: fix session termination bug

---
 pkgs/servers/authelia/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/authelia/default.nix b/pkgs/servers/authelia/default.nix
index 364060ca90d2..beea275ace20 100644
--- a/pkgs/servers/authelia/default.nix
+++ b/pkgs/servers/authelia/default.nix
@@ -51,6 +51,11 @@ buildGoModule rec {
       "-X ${p}.BuildExtra=nixpkgs"
     ];
 
+  # It is required to set this to avoid a change in the
+  # handling of sync map in go 1.24+
+  # Upstream issue: https://github.com/authelia/authelia/issues/8980
+  env.GOEXPERIMENT = "nosynchashtriemap";
+
   # several tests with networking and several that want chromium
   doCheck = false;
 

From acc8a468c37e94926cf46625a253d192d1f37fd7 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <github@i.m.mmlb.dev>
Date: Sun, 23 Mar 2025 18:30:51 -0400
Subject: [PATCH 021/489] exiftool: 13.00 -> 13.25

Missed an intermediate "production release" (13.10), see changelog for
list of changes:
https://github.com/exiftool/exiftool/blob/13.25/Changes#L7-L347
---
 pkgs/development/perl-modules/ImageExifTool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix
index 23ec41875319..073cb0423682 100644
--- a/pkgs/development/perl-modules/ImageExifTool/default.nix
+++ b/pkgs/development/perl-modules/ImageExifTool/default.nix
@@ -11,11 +11,11 @@
 
 buildPerlPackage rec {
   pname = "Image-ExifTool";
-  version = "13.00";
+  version = "13.25";
 
   src = fetchurl {
     url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
-    hash = "sha256-SJV4jzT4NHZfhr5KWtWjJDP1ctdXFg7Ne2Eur17TfoQ=";
+    hash = "sha256-HNVVFEhGooKYeDvr86tFIjUnPHg1hBCBPj1Ok8ZTsfo=";
   };
 
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;

From dfd1e59ff6be831a8af2daccc5c42f95546287cd Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Fri, 21 Mar 2025 20:36:28 -0500
Subject: [PATCH 022/489] protoc-gen-elixir: 0.13.0 -> 0.14.1

Changes:
- https://github.com/elixir-protobuf/protobuf/blob/main/CHANGELOG.md#v0140
- https://github.com/elixir-protobuf/protobuf/blob/main/CHANGELOG.md#v0141
---
 pkgs/by-name/pr/protoc-gen-elixir/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
index 79aef256c7d0..e82bb39a2a1f 100644
--- a/pkgs/by-name/pr/protoc-gen-elixir/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
@@ -5,20 +5,20 @@
 }:
 beamPackages.mixRelease rec {
   pname = "protoc-gen-elixir";
-  version = "0.13.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "elixir-protobuf";
     repo = "protobuf";
     tag = "v${version}";
-    hash = "sha256-TnuIlXYr36hx1sVktPHj4J4cJLCFK5F1xaX0V9/+ICQ=";
+    hash = "sha256-SbwjOFTyN3euMNXkuIP49zNqoXmD8611IXgqPwqfuFU=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
     inherit version src;
     pname = "protoc-gen-elixir-deps";
 
-    hash = "sha256-lFfAfKAM4O+yIBXgdCA+EPe1XAOaTIjTfpOFjITpvQ4=";
+    hash = "sha256-T1uL3xXXmCkobJJhS3p6xMrJUyiim3AMwaG87/Ix7A8=";
   };
 
   postBuild = ''

From 0a712020b49eb4ac5bc8998f7228b9e4f55ed69f Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Fri, 21 Mar 2025 20:38:46 -0500
Subject: [PATCH 023/489] protoc-gen-elixir: add update script

---
 pkgs/by-name/pr/protoc-gen-elixir/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
index e82bb39a2a1f..8e62c516bf7d 100644
--- a/pkgs/by-name/pr/protoc-gen-elixir/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
@@ -2,6 +2,7 @@
   beamPackages,
   fetchFromGitHub,
   lib,
+  nix-update-script,
 }:
 beamPackages.mixRelease rec {
   pname = "protoc-gen-elixir";
@@ -34,6 +35,8 @@ beamPackages.mixRelease rec {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "A protoc plugin to generate Elixir code";
     mainProgram = "protoc-gen-elixir";

From 0bded101defee4c3208fc1def80fe441eccb2476 Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Sun, 23 Mar 2025 22:15:02 -0500
Subject: [PATCH 024/489] protoc-gen-elixir: fix unpatched escript binary

The result of `mix do escript.build` is a script with a shebang
referring to the `escript` binary. Previously, this shebang was being
left alone. This commit causes the shebang to be patched.
---
 pkgs/by-name/pr/protoc-gen-elixir/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
index 8e62c516bf7d..b51076f75f0f 100644
--- a/pkgs/by-name/pr/protoc-gen-elixir/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
@@ -4,7 +4,10 @@
   lib,
   nix-update-script,
 }:
-beamPackages.mixRelease rec {
+let
+  inherit (beamPackages) mixRelease fetchMixDeps erlang;
+in
+mixRelease rec {
   pname = "protoc-gen-elixir";
   version = "0.14.1";
 
@@ -15,13 +18,15 @@ beamPackages.mixRelease rec {
     hash = "sha256-SbwjOFTyN3euMNXkuIP49zNqoXmD8611IXgqPwqfuFU=";
   };
 
-  mixFodDeps = beamPackages.fetchMixDeps {
+  mixFodDeps = fetchMixDeps {
     inherit version src;
     pname = "protoc-gen-elixir-deps";
 
     hash = "sha256-T1uL3xXXmCkobJJhS3p6xMrJUyiim3AMwaG87/Ix7A8=";
   };
 
+  buildInputs = [ erlang ];
+
   postBuild = ''
     mix do escript.build
   '';

From 128bdeb3c5d185af082b8aabd70a99ad1a1466e5 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 24 Mar 2025 21:57:25 +0800
Subject: [PATCH 025/489] nxios/cyrus-imap: fix cyrus-imap certs options

---
 nixos/modules/services/mail/cyrus-imap.nix | 32 ++++++++++------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/mail/cyrus-imap.nix b/nixos/modules/services/mail/cyrus-imap.nix
index 12d63431cd73..3ffd74451b6c 100644
--- a/nixos/modules/services/mail/cyrus-imap.nix
+++ b/nixos/modules/services/mail/cyrus-imap.nix
@@ -72,6 +72,20 @@ let
     } cfg.imapdSettings;
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "services" "cyrus-imap" "sslServerCert" ]
+      [ "services" "cyrus-imap" "imapdSettings" "tls_server_cert" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "services" "cyrus-imap" "sslServerKey" ]
+      [ "services" "cyrus-imap" "imapdSettings" "tls_server_key" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "services" "cyrus-imap" "sslCACert" ]
+      [ "services" "cyrus-imap" "imapdSettings" "tls_client_ca_file" ]
+    )
+  ];
   options.services.cyrus-imap = {
     enable = mkEnableOption "Cyrus IMAP, an email, contacts and calendar server";
     debug = mkEnableOption "debugging messages for the Cyrus master process";
@@ -294,24 +308,6 @@ in
       description = "Path to the configuration file used for Cyrus.";
       apply = v: if v != null then v else pkgs.writeText "cyrus.conf" cyrusConfig;
     };
-
-    sslCACert = mkOption {
-      type = nullOr str;
-      default = null;
-      description = "File path which containing one or more CA certificates to use.";
-    };
-
-    sslServerCert = mkOption {
-      type = nullOr str;
-      default = null;
-      description = "File containing the global certificate used for all services (IMAP, POP3, LMTP, Sieve)";
-    };
-
-    sslServerKey = mkOption {
-      type = nullOr str;
-      default = null;
-      description = "File containing the private key belonging to the global server certificate.";
-    };
   };
 
   config = mkIf cfg.enable {

From 8c30ab913341adcc30297b3aa7fa2b92016ec7f3 Mon Sep 17 00:00:00 2001
From: ymstnt <21342713+ymstnt@users.noreply.github.com>
Date: Mon, 24 Mar 2025 16:19:11 +0100
Subject: [PATCH 026/489] hifile: make overridable

---
 pkgs/by-name/hi/hifile/package.nix |  5 +++--
 pkgs/by-name/hi/hifile/update.sh   | 10 ++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix
index a57e4d65794f..6c07d6dbdfde 100644
--- a/pkgs/by-name/hi/hifile/package.nix
+++ b/pkgs/by-name/hi/hifile/package.nix
@@ -2,15 +2,16 @@
   lib,
   appimageTools,
   fetchurl,
+  version ? "0.9.9.19",
+  hash ? "sha256-WrPNH7N8nYr/zd6RGsX3mL1P+nYUzXMPgIoBtC6tGo0=",
 }:
 
 let
-  version = "0.9.9.19";
   pname = "hifile";
 
   src = fetchurl {
     url = "https://www.hifile.app/files/HiFile-${version}.AppImage";
-    hash = "sha256-WrPNH7N8nYr/zd6RGsX3mL1P+nYUzXMPgIoBtC6tGo0=";
+    inherit hash;
   };
 
   appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/by-name/hi/hifile/update.sh b/pkgs/by-name/hi/hifile/update.sh
index 95a0ae8440db..e65e3cb7f7f6 100755
--- a/pkgs/by-name/hi/hifile/update.sh
+++ b/pkgs/by-name/hi/hifile/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl common-updater-scripts
+#!nix-shell -I nixpkgs=./. -i bash -p curl nix-update
 
 latestVersion=$(curl -s "https://www.hifile.app/otherdownloads" | grep -A 10 '<h1>All downloads</h1>' | grep -m 1 '<li>.*AppImage.*' | sed -n 's/.*HiFile-\([0-9.]*\)\.AppImage.*/\1/p')
 currentVersion=$(nix-instantiate --eval -E "with import ./. {}; hifile.version" | tr -d '"')
@@ -13,10 +13,4 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then
 fi
 
 
-prefetch=$(nix-prefetch-url "https://www.hifile.app/files/HiFile-$latestVersion.AppImage")
-hash=$(nix-hash --type sha256 --to-sri "$prefetch")
-
-update-source-version hifile 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system="x86_64-linux"
-update-source-version hifile "$latestVersion" "$hash" --system="x86_64-linux"
-
-
+nix-update hifile --version $latestVersion

From 856352f4ff400e864da935b24f6b5168aaa9ea97 Mon Sep 17 00:00:00 2001
From: ymstnt <21342713+ymstnt@users.noreply.github.com>
Date: Mon, 24 Mar 2025 16:23:00 +0100
Subject: [PATCH 027/489] hifile: 0.9.9.19 -> 0.9.9.23

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

diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix
index 6c07d6dbdfde..2feeef5c1829 100644
--- a/pkgs/by-name/hi/hifile/package.nix
+++ b/pkgs/by-name/hi/hifile/package.nix
@@ -2,8 +2,8 @@
   lib,
   appimageTools,
   fetchurl,
-  version ? "0.9.9.19",
-  hash ? "sha256-WrPNH7N8nYr/zd6RGsX3mL1P+nYUzXMPgIoBtC6tGo0=",
+  version ? "0.9.9.23",
+  hash ? "sha256-BTHiLTgLqtUCuxnpPeI5nwe8tYMp+uxFKm01qHnC8A0=",
 }:
 
 let

From 5c80ec4556409393a074195bb6fd8faf68c0c9c2 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 25 Mar 2025 18:41:17 +0800
Subject: [PATCH 028/489] logstalgia: 1.1.2 -> 1.1.4

---
 pkgs/by-name/lo/logstalgia/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lo/logstalgia/package.nix b/pkgs/by-name/lo/logstalgia/package.nix
index 3b4ea626225e..4964f7e31e2e 100644
--- a/pkgs/by-name/lo/logstalgia/package.nix
+++ b/pkgs/by-name/lo/logstalgia/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   libpng,
   libjpeg,
-  pcre,
+  pcre2,
   SDL2_image,
   glew,
   libGLU,
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   pname = "logstalgia";
-  version = "1.1.2";
+  version = "1.1.4";
 
   src = fetchurl {
     url = "https://github.com/acaudwell/Logstalgia/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd";
+    hash = "sha256-wEnv9AXpJANSIu2ya8xse18AoIkmq9t7Rn4kSSQnkKk=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     ftgl
     libpng
     libjpeg
-    pcre
+    pcre2
     SDL2_image
     libGLU
     libGL
@@ -42,6 +42,11 @@ stdenv.mkDerivation rec {
     freetype
   ];
 
+  configureFlags = [
+    "--with-boost-system=boost_system"
+    "--with-boost-filesystem=boost_filesystem"
+  ];
+
   meta = with lib; {
     homepage = "https://logstalgia.io/";
     description = "Website traffic visualization tool";

From cba7c442ca40b926f868a58b91aaf48eaf87a6ee Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Tue, 25 Mar 2025 08:51:44 +0000
Subject: [PATCH 029/489] kew: set nix-update-script as updater

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

diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index 29f55beafa94..d9a63c30bca2 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
 
   passthru = {
-    updateScript = gitUpdater { };
+    updateScript = nix-update-script { };
   };
 
   meta = {

From 1b8cee82b064378059f7f57fe39e2d194ad4a656 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Tue, 25 Mar 2025 18:38:19 +0100
Subject: [PATCH 030/489] kew: 3.0.3 -> 3.1.2

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

diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index d9a63c30bca2..ba15bbdc3c88 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   fftwFloat,
   chafa,
+  curl,
   glib,
   libopus,
   opusfile,
@@ -13,24 +14,25 @@
   libogg,
   pkg-config,
   versionCheckHook,
-  gitUpdater,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kew";
-  version = "3.0.3";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "ravachol";
     repo = "kew";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DzJ+7PanA15A9nIbFPWZ/tdxq4aDyParJORcuqHV7jc=";
+    hash = "sha256-64xdxRx4OanAcLgir9N7p/q71+gQYhffnWnxZzz93h8=";
   };
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     fftwFloat.dev
     chafa
+    curl.dev
     glib.dev
     libopus
     opusfile

From 55540bc17068731469c0994bf23f95493e889a5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Mar 2025 18:30:10 +0000
Subject: [PATCH 031/489] python312Packages.githubkit: 0.12.8 -> 0.12.9

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

diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix
index b3d82a2e15bd..7bcb99458521 100644
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "githubkit";
-  version = "0.12.8";
+  version = "0.12.9";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "yanyongyu";
     repo = "githubkit";
     tag = "v${version}";
-    hash = "sha256-gR8nZnD/+foKTCNtxzPIitw4HyR0hwN9YeZg/0kIAco=";
+    hash = "sha256-S2nCFFqsLDkx7f50VxcfIF1qHO+VLiV79752UDvIcDM=";
   };
 
   pythonRelaxDeps = [ "hishel" ];

From dff2c1e35918a913598617fbbcd85b49390b8ffe Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 25 Mar 2025 09:20:57 +0300
Subject: [PATCH 032/489] cen64: unstable-2022-10-02 -> 0-unstable-2023-05-29

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

diff --git a/pkgs/by-name/ce/cen64/package.nix b/pkgs/by-name/ce/cen64/package.nix
index 1a2450ee6304..fbe61f18638b 100644
--- a/pkgs/by-name/ce/cen64/package.nix
+++ b/pkgs/by-name/ce/cen64/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cen64";
-  version = "unstable-2022-10-02";
+  version = "0-unstable-2023-05-29";
 
   src = fetchFromGitHub {
     owner = "n64dev";
     repo = "cen64";
-    rev = "ee6db7d803a77b474e73992fdc25d76b9723d806";
-    sha256 = "sha256-/CraSu/leNA0dl8NVgFjvKdOWrC9/namAz5NSxtPr+I=";
+    rev = "1c1118462bd9d9b8ceb4c556a647718072477aab";
+    sha256 = "sha256-vFk29KESATcEY0eRNbS+mHLD9T1phJiG1fqjOlI19/w=";
   };
 
   nativeBuildInputs = [ cmake ];

From d42f9fd6b91cae5af43c52f02a7c6a7bfa1573ed Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 25 Mar 2025 09:20:57 +0300
Subject: [PATCH 033/489] cen64: fix build with gcc14

- add patch from unmerged upstream PR (only `bus/controller.c`,
other changes are already applied in master):
https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96
fixes error from gcc14:
`error: initialization of ... from incompatible pointer type`

- add patch from unmerged upstream PR:
https://github.com/n64dev/cen64/pull/237
fixes errors from gcc14:
`error: passing argument 1 of 'cen64_thread_setname' makes pointer from integer without a cast [-Wint-conversion]`
`error: passing argument 1 of 'cen64_thread_setname' makes integer from pointer without a cast [-Wint-conversion]`
---
 .../ce/cen64/cast-mi_regs-callbacks.patch     |  22 +++
 ...read-arg-type-for-pthread_setname_np.patch | 137 ++++++++++++++++++
 pkgs/by-name/ce/cen64/package.nix             |   8 +
 3 files changed, 167 insertions(+)
 create mode 100644 pkgs/by-name/ce/cen64/cast-mi_regs-callbacks.patch
 create mode 100644 pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch

diff --git a/pkgs/by-name/ce/cen64/cast-mi_regs-callbacks.patch b/pkgs/by-name/ce/cen64/cast-mi_regs-callbacks.patch
new file mode 100644
index 000000000000..fc86ce32233c
--- /dev/null
+++ b/pkgs/by-name/ce/cen64/cast-mi_regs-callbacks.patch
@@ -0,0 +1,22 @@
+From f13bdf94c00a9da3b152ed9fe20001e240215b96 Mon Sep 17 00:00:00 2001
+From: James Lambert <lambertjamesd@gmail.com>
+Date: Tue, 9 Feb 2021 11:49:51 -0700
+Subject: [PATCH] Cast mi_regs callbacks
+
+---
+ bus/controller.c   | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bus/controller.c b/bus/controller.c
+index 1f0cdfccf..24b3df260 100644
+--- a/bus/controller.c
++++ b/bus/controller.c
+@@ -44,7 +44,7 @@ int bus_init(struct bus_controller *bus, int dd_present) {
+   static const struct bus_controller_mapping mappings[NUM_MAPPINGS] = {
+     {read_ai_regs, write_ai_regs, AI_REGS_BASE_ADDRESS, AI_REGS_ADDRESS_LEN},
+     {read_dp_regs, write_dp_regs, DP_REGS_BASE_ADDRESS, DP_REGS_ADDRESS_LEN},
+-    {read_mi_regs, write_mi_regs, MI_REGS_BASE_ADDRESS, MI_REGS_ADDRESS_LEN},
++    {(memory_rd_function)read_mi_regs, (memory_wr_function)write_mi_regs, MI_REGS_BASE_ADDRESS, MI_REGS_ADDRESS_LEN},
+     {read_pi_regs, write_pi_regs, PI_REGS_BASE_ADDRESS, PI_REGS_ADDRESS_LEN},
+     {read_ri_regs, write_ri_regs, RI_REGS_BASE_ADDRESS, RI_REGS_ADDRESS_LEN},
+     {read_si_regs, write_si_regs, SI_REGS_BASE_ADDRESS, SI_REGS_ADDRESS_LEN},
diff --git a/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch b/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch
new file mode 100644
index 000000000000..7d3ff742c57a
--- /dev/null
+++ b/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch
@@ -0,0 +1,137 @@
+From 41ad58ab1953835313ad2b89686931b08b5b47e8 Mon Sep 17 00:00:00 2001
+From: ghpzin <ghpzin@gmail.com>
+Date: Tue, 25 Mar 2025 15:26:07 +0300
+Subject: [PATCH] Fix thread arg type for pthread_setname_np
+
+- change `thread` arg type to `cen64_thread` instead of `cen64_thread *`
+(`pthread_t` instead of `pthread_t *`) according to definition of
+`pthread_setname_np` from `<pthread.h>`:
+`int pthread_setname_np(pthread_t thread, const char *name);`
+fixes gcc14 errors:
+```
+/build/source/cen64.c:475:24: error: passing argument 1 of 'cen64_thread_setname' makes pointer from integer without a cast [-Wint-conversion]
+  475 |   cen64_thread_setname(thread, "device");
+      |                        ^~~~~~
+      |                        |
+      |                        cen64_thread {aka long unsigned int}
+In file included from /build/source/device/device.h:26,
+                 from /build/source/cen64.c:15:
+/build/source/os/posix/thread.h:59:54: note: expected 'cen64_thread *' {aka 'long unsigned int *'} but argument is of type 'cen64_thread' {aka 'lo>
+   59 | static inline int cen64_thread_setname(cen64_thread *t, const char *name) {
+      |                                        ~~~~~~~~~~~~~~^
+```
+
+- add cast to `cen64_thread` from NULL where `cen64_thread` is called
+with it, fixes gcc14 errors:
+```
+/build/source/gdb/gdb.c:82:24: error: passing argument 1 of 'cen64_thread_setname' makes integer from pointer without a cast [-Wint-conversion]
+   82 |   cen64_thread_setname(NULL, "gdb");
+      |                        ^~~~
+      |                        |
+      |                        void *
+/build/source/os/posix/thread.h:59:53: note: expected 'cen64_thread' {aka 'long unsigned int'} but argument is of type 'void *'
+   59 | static inline int cen64_thread_setname(cen64_thread t, const char *name) {
+      |                                        ~~~~~~~~~~~~~^
+```
+---
+ cen64.c            | 2 +-
+ device/device.c    | 4 ++--
+ gdb/gdb.c          | 4 ++--
+ os/posix/thread.h  | 6 +++---
+ os/winapi/thread.h | 2 +-
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/cen64.c b/cen64.c
+index 51014a4..ca6bda1 100644
+--- a/cen64.c
++++ b/cen64.c
+@@ -483,7 +483,7 @@ int run_device(struct cen64_device *device, bool no_video) {
+ }
+ 
+ CEN64_THREAD_RETURN_TYPE run_device_thread(void *opaque) {
+-  cen64_thread_setname(NULL, "device");
++  cen64_thread_setname((cen64_thread)NULL, "device");
+   struct cen64_device *device = (struct cen64_device *) opaque;
+ 
+   device_run(device);
+diff --git a/device/device.c b/device/device.c
+index cd5a046..c915846 100644
+--- a/device/device.c
++++ b/device/device.c
+@@ -224,7 +224,7 @@ CEN64_THREAD_RETURN_TYPE run_rcp_thread(void *opaque) {
+ }
+ 
+ CEN64_THREAD_RETURN_TYPE run_vr4300_thread(void *opaque) {
+-  cen64_thread_setname(NULL, "vr4300");
++  cen64_thread_setname((cen64_thread)NULL, "vr4300");
+   struct cen64_device *device = (struct cen64_device *) opaque;
+ 
+   while (likely(device->running)) {
+@@ -351,4 +351,4 @@ int device_debug_spin(struct cen64_device *device) {
+ 
+ cen64_cold void device_connect_debugger(struct cen64_device *device, void* break_handler_data, vr4300_debug_break_handler break_handler) {
+   vr4300_connect_debugger(device->vr4300, break_handler_data, break_handler);
+-}
+\ No newline at end of file
++}
+diff --git a/gdb/gdb.c b/gdb/gdb.c
+index 021784d..0e8d188 100644
+--- a/gdb/gdb.c
++++ b/gdb/gdb.c
+@@ -79,7 +79,7 @@ bool gdb_parse_packet(const char* input, int len, const char** command_start, co
+ }
+ 
+ CEN64_THREAD_RETURN_TYPE gdb_thread(void *opaque) {
+-  cen64_thread_setname(NULL, "gdb");
++  cen64_thread_setname((cen64_thread)NULL, "gdb");
+   struct gdb *gdb = (struct gdb *) opaque;
+ 
+   cen64_mutex_lock(&gdb->client_mutex);
+@@ -257,4 +257,4 @@ cen64_cold void gdb_destroy(struct gdb* gdb) {
+ 
+   gdb->device = NULL;
+   free(gdb);
+-}
+\ No newline at end of file
++}
+diff --git a/os/posix/thread.h b/os/posix/thread.h
+index 2a261c6..e8e6144 100644
+--- a/os/posix/thread.h
++++ b/os/posix/thread.h
+@@ -45,9 +45,9 @@ static inline int cen64_thread_join(cen64_thread *t) {
+ #ifdef __APPLE__
+ int pthread_setname_np(const char*);
+ #elif __NETBSD__
+-int pthread_setname_np(cen64_thread*, const char*, const char*);
++int pthread_setname_np(cen64_thread, const char*, const char*);
+ #else
+-int pthread_setname_np(cen64_thread*, const char*);
++int pthread_setname_np(cen64_thread, const char*);
+ #endif
+ 
+ // Sets the name of the thread to a specific value
+@@ -56,7 +56,7 @@ int pthread_setname_np(cen64_thread*, const char*);
+ // If you call it at the wrong time or your OS doesn't support custom thread names
+ // the return value will be non-zero.
+ // If cen64_thread is not set the name of the current thread will be changed.
+-static inline int cen64_thread_setname(cen64_thread *t, const char *name) {
++static inline int cen64_thread_setname(cen64_thread t, const char *name) {
+   #ifdef __APPLE__
+     if (t == NULL)
+       return pthread_setname_np(name);
+diff --git a/os/winapi/thread.h b/os/winapi/thread.h
+index d7c162a..128d935 100644
+--- a/os/winapi/thread.h
++++ b/os/winapi/thread.h
+@@ -57,7 +57,7 @@ static inline int cen64_thread_join(cen64_thread *t) {
+ //
+ // Windows isn't supported for the moment.
+ //
+-static inline int cen64_thread_setname(cen64_thread *t, const char *name) {
++static inline int cen64_thread_setname(cen64_thread t, const char *name) {
+   return ENOSYS;
+ }
+ 
+-- 
+2.48.1
+
diff --git a/pkgs/by-name/ce/cen64/package.nix b/pkgs/by-name/ce/cen64/package.nix
index fbe61f18638b..ea6071c71260 100644
--- a/pkgs/by-name/ce/cen64/package.nix
+++ b/pkgs/by-name/ce/cen64/package.nix
@@ -20,6 +20,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-vFk29KESATcEY0eRNbS+mHLD9T1phJiG1fqjOlI19/w=";
   };
 
+  patches = [
+    # fix build with gcc14:
+    # https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96
+    ./cast-mi_regs-callbacks.patch
+    # https://github.com/n64dev/cen64/pull/237
+    ./fix-thread-arg-type-for-pthread_setname_np.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     libGL

From 009ec1d3141c9ecf2c3ab3b951428890f2c40e6f Mon Sep 17 00:00:00 2001
From: Rane <rane+git@junkyard.systems>
Date: Wed, 26 Mar 2025 16:47:12 +1100
Subject: [PATCH 034/489] maintainers: Add rane as a maintainer, and to the Xen
 team

---
 maintainers/maintainer-list.nix | 8 ++++++++
 maintainers/team-list.nix       | 1 +
 2 files changed, 9 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ded32a943da7..306766e7c998 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19822,6 +19822,14 @@
     githubId = 5653911;
     name = "Rampoina";
   };
+  rane = {
+    name = "Rane";
+    email = "rane+git@junkyard.systems";
+    matrix = "@rane:junkyard.systems";
+    github = "digitalrane";
+    githubId = 1829286;
+    keys = [ { fingerprint = "EBB6 0EE1 488F D04C D922  C039 AE96 1AF5 9D40 10B5"; } ];
+  };
   ranfdev = {
     email = "ranfdev@gmail.com";
     name = "Lorenzo Miglietta";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 61a40c13ac3b..a27ed96e443a 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1162,6 +1162,7 @@ with lib.maintainers;
       hehongbo
       lach
       sigmasquadron
+      rane
     ];
     scope = "Maintain the Xen Project Hypervisor and the related tooling ecosystem.";
     shortName = "Xen Project Hypervisor";

From 05e62d5ba3808973e21f97ce9c3307a9fe56e47f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?=
 <22820003+c4f3z1n@users.noreply.github.com>
Date: Wed, 26 Mar 2025 14:39:59 +0100
Subject: [PATCH 035/489] maintainers: add c4f3z1n

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d5462acd543c..081059c391bf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3725,6 +3725,12 @@
     githubId = 382011;
     name = "c4605";
   };
+  c4f3z1n = {
+    name = "João Nogueira";
+    email = "shires.waking0d@icloud.com";
+    github = "c4f3z1n";
+    githubId = 22820003;
+  };
   c4thebomb = {
     name = "Ceferino Patino";
     email = "c4patino@gmail.com";

From baeb309c7404d9ee2e017786b290520b15c0a297 Mon Sep 17 00:00:00 2001
From: Maxwell L-T <maxwell.lt@live.com>
Date: Wed, 26 Mar 2025 21:47:07 -0400
Subject: [PATCH 036/489] itgmania: add maxwell-lt as a maintainer

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

diff --git a/pkgs/by-name/it/itgmania/package.nix b/pkgs/by-name/it/itgmania/package.nix
index 9247d8596b47..489fb38fcfd5 100644
--- a/pkgs/by-name/it/itgmania/package.nix
+++ b/pkgs/by-name/it/itgmania/package.nix
@@ -88,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Fork of StepMania 5.1, improved for the post-ITG community";
     platforms = lib.platforms.linux;
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ftsimas ];
+    maintainers = with lib.maintainers; [
+      ftsimas
+      maxwell-lt
+    ];
     mainProgram = "itgmania";
   };
 })

From 01cbc86e671872cb99b5312d16a56ee6b8bef044 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Thu, 27 Mar 2025 09:50:39 +0100
Subject: [PATCH 037/489] irqbalance: link against libsystemd

This enables irqbalance to provide systemd-native journal output
---
 pkgs/by-name/ir/irqbalance/package.nix | 30 ++++++++++++++++----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ir/irqbalance/package.nix b/pkgs/by-name/ir/irqbalance/package.nix
index 5b97c7225290..3b62b7f45950 100644
--- a/pkgs/by-name/ir/irqbalance/package.nix
+++ b/pkgs/by-name/ir/irqbalance/package.nix
@@ -7,6 +7,8 @@
   glib,
   ncurses,
   libcap_ng,
+  enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal,
+  systemdMinimal,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,21 +26,27 @@ stdenv.mkDerivation rec {
     autoreconfHook
     pkg-config
   ];
-  buildInputs = [
-    glib
-    ncurses
-    libcap_ng
-  ];
+  buildInputs =
+    [
+      glib
+      ncurses
+      libcap_ng
+    ]
+    ++ (lib.optionals enableSystemd [
+      systemdMinimal
+    ]);
 
-  LDFLAGS = "-lncurses";
+  configureFlags = lib.optionals enableSystemd [
+    "--with-systemd"
+  ];
 
   postInstall = ''
     # Systemd service
-    mkdir -p $out/lib/systemd/system
-    grep -vi "EnvironmentFile" misc/irqbalance.service >$out/lib/systemd/system/irqbalance.service
-    substituteInPlace $out/lib/systemd/system/irqbalance.service \
-      --replace /usr/sbin/irqbalance $out/bin/irqbalance \
-      --replace ' $IRQBALANCE_ARGS' ""
+    mkdir -p "$out/lib/systemd/system"
+    grep -vi "EnvironmentFile" misc/irqbalance.service >"$out/lib/systemd/system/irqbalance.service"
+    substituteInPlace "$out/lib/systemd/system/irqbalance.service" \
+      --replace-fail /usr/sbin/irqbalance "$out/bin/irqbalance --journal" \
+      --replace-fail ' $IRQBALANCE_ARGS' ""
   '';
 
   meta = with lib; {

From 3b49501eb88dbf736e5b3d1505715a5ffa1d3e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?=
 <alexander.klimov@icinga.com>
Date: Thu, 27 Mar 2025 11:14:23 +0100
Subject: [PATCH 038/489] icinga2-agent: build without perfdata writers

they seem pretty useless given DB outputs are already disabled.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe790da3b7bb..74b6cde6609d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11271,6 +11271,7 @@ with pkgs;
     withMysql = false;
     withNotification = false;
     withIcingadb = false;
+    withPerfdata = false;
   };
 
   nagiosPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/nagios-plugins { });

From bd674955578e4a3563d345fc3279579756f61cdc Mon Sep 17 00:00:00 2001
From: Maxwell L-T <maxwell.lt@live.com>
Date: Wed, 26 Mar 2025 21:49:00 -0400
Subject: [PATCH 039/489] itgmania: 1.0.0 -> 1.0.2

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

diff --git a/pkgs/by-name/it/itgmania/package.nix b/pkgs/by-name/it/itgmania/package.nix
index 489fb38fcfd5..930b8fb38aef 100644
--- a/pkgs/by-name/it/itgmania/package.nix
+++ b/pkgs/by-name/it/itgmania/package.nix
@@ -23,14 +23,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "itgmania";
-  version = "1.0.0";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "itgmania";
     repo = "itgmania";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-GzpsyyjR7NhgCQ9D7q8G4YU7HhV1C1es1C1355gHnV8=";
+    hash = "sha256-OGOvC7/NmEsWXVw4bFjqdT/Hg3Ypbwct//uWuW3/f1o=";
   };
 
   nativeBuildInputs = [

From e82086eaa183cc91b9b47de9cf92e296cecacfbd Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 24 Mar 2025 22:39:26 +0100
Subject: [PATCH 040/489] granian: 1.7.0 -> 2.2.0

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

diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix
index 4ed069e3a31c..4b6ba09179f1 100644
--- a/pkgs/by-name/gr/granian/package.nix
+++ b/pkgs/by-name/gr/granian/package.nix
@@ -4,24 +4,25 @@
   rustPlatform,
   python3Packages,
   libiconv,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "granian";
-  version = "1.7.0";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "emmett-framework";
     repo = "granian";
     rev = "v${version}";
-    hash = "sha256-OjyDwfp0d779oFQ7wUdR1eRPP35kcJa3wIdcYGrGGME=";
+    hash = "sha256-YQ9+PcKXtSc+wdvhgDfSAfcv/y53oqcrPCEI9dDKFa0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-jAjHvVyFhGGE/OwfusUE/GdrNrEgvh48lmC5tla4lhI=";
+    hash = "sha256-XJ61+u5aGQis6YkfASD+WJHEKDBL+2ImqCAuQmm3A/g=";
   };
 
   nativeBuildInputs = with rustPlatform; [
@@ -38,6 +39,8 @@ python3Packages.buildPythonApplication rec {
     python3Packages.click
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications";
     homepage = "https://github.com/emmett-framework/granian";

From d6a369fe3b072189aa7103432b60e2959b54e9a9 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 24 Mar 2025 22:56:41 +0100
Subject: [PATCH 041/489] granian: move to python3Packages

---
 pkgs/by-name/gr/granian/package.nix           | 50 +----------------
 .../python-modules/granian/default.nix        | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 57 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/development/python-modules/granian/default.nix

diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix
index 4b6ba09179f1..b7ae540a4696 100644
--- a/pkgs/by-name/gr/granian/package.nix
+++ b/pkgs/by-name/gr/granian/package.nix
@@ -1,52 +1,4 @@
 {
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
   python3Packages,
-  libiconv,
-  nix-update-script,
 }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "granian";
-  version = "2.2.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "emmett-framework";
-    repo = "granian";
-    rev = "v${version}";
-    hash = "sha256-YQ9+PcKXtSc+wdvhgDfSAfcv/y53oqcrPCEI9dDKFa0=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    name = "${pname}-${version}";
-    hash = "sha256-XJ61+u5aGQis6YkfASD+WJHEKDBL+2ImqCAuQmm3A/g=";
-  };
-
-  nativeBuildInputs = with rustPlatform; [
-    cargoSetupHook
-    maturinBuildHook
-  ];
-
-  buildInputs = [
-    libiconv
-  ];
-
-  dependencies = [
-    python3Packages.uvloop
-    python3Packages.click
-  ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications";
-    homepage = "https://github.com/emmett-framework/granian";
-    license = lib.licenses.bsd3;
-    mainProgram = "granian";
-    maintainers = with lib.maintainers; [ lucastso10 ];
-    platforms = lib.platforms.unix;
-  };
-}
+python3Packages.toPythonApplication python3Packages.granian
diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
new file mode 100644
index 000000000000..6435bd19b6e2
--- /dev/null
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  buildPythonPackage,
+  uvloop,
+  click,
+  libiconv,
+  nix-update-script,
+}:
+
+buildPythonPackage rec {
+  pname = "granian";
+  version = "2.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "emmett-framework";
+    repo = "granian";
+    rev = "v${version}";
+    hash = "sha256-YQ9+PcKXtSc+wdvhgDfSAfcv/y53oqcrPCEI9dDKFa0=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-XJ61+u5aGQis6YkfASD+WJHEKDBL+2ImqCAuQmm3A/g=";
+  };
+
+  nativeBuildInputs = with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ];
+
+  buildInputs = [
+    libiconv
+  ];
+
+  dependencies = [
+    uvloop
+    click
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications";
+    homepage = "https://github.com/emmett-framework/granian";
+    license = lib.licenses.bsd3;
+    mainProgram = "granian";
+    maintainers = with lib.maintainers; [ lucastso10 ];
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84089eace07f..c7d1850c63ae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5860,6 +5860,8 @@ self: super: with self; {
 
   grandalf = callPackage ../development/python-modules/grandalf { };
 
+  granian = callPackage ../development/python-modules/granian { };
+
   graph-tool = callPackage ../development/python-modules/graph-tool { inherit (pkgs) cgal; };
 
   grapheme = callPackage ../development/python-modules/grapheme { };

From 0630c1b25cce47739849b3e77b499e85887d9a80 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Thu, 27 Mar 2025 19:33:08 +0100
Subject: [PATCH 042/489] bazecor: 1.6.5 -> 1.7.0

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

diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix
index 64be0b278445..3c6298124ba8 100644
--- a/pkgs/by-name/ba/bazecor/package.nix
+++ b/pkgs/by-name/ba/bazecor/package.nix
@@ -6,12 +6,12 @@
 }:
 let
   pname = "bazecor";
-  version = "1.6.5";
+  version = "1.7.0";
   src = appimageTools.extract {
     inherit pname version;
     src = fetchurl {
       url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage";
-      hash = "sha256-TitZzTNfEnuU0clTsGKexrtbIcsqE1W9A1pJCefVA6U=";
+      hash = "sha256-i+6EBgT8Fv3GN2qwnr+QH9mcDToeQvit52qRt30Y9sM=";
     };
 
     # Workaround for https://github.com/Dygmalab/Bazecor/issues/370

From 438d311460ebcb961d80d24821690b40410eb8a4 Mon Sep 17 00:00:00 2001
From: Thomas Watson <twatson52@icloud.com>
Date: Thu, 27 Mar 2025 13:45:21 -0500
Subject: [PATCH 043/489] mission-planner: reduce closure size

The release zip file doesn't contain a top level directory. The previous
solution of `sourceRoot = "."` followed by an `installPhase` of `mv *
$out/...` does install correctly. However, this grabs detritus from the
Nix build sandbox root, in particular `env-vars`, resulting in an
accidental run-time dependency on many build-time inputs.

Fix by instead using a custom `unpackPhase` to change into an empty
directory, then extracting the release and proceeding with the
installation from there, so that only files from the release are
installed. This reduces closure size by ~425M.

Tested that Mission Planner opens and connects to a drone.
---
 pkgs/by-name/mi/mission-planner/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mi/mission-planner/package.nix b/pkgs/by-name/mi/mission-planner/package.nix
index 626f499f9e15..ccf1af203c1a 100644
--- a/pkgs/by-name/mi/mission-planner/package.nix
+++ b/pkgs/by-name/mi/mission-planner/package.nix
@@ -34,7 +34,17 @@ stdenv.mkDerivation rec {
     mono
     unzip
   ];
-  sourceRoot = ".";
+
+  # zip has no outer directory, so make one and unpack there
+  unpackPhase = ''
+    runHook preUnpack
+
+    mkdir -p source
+    cd source
+    unzip -q $src
+
+    runHook postUnpack
+  '';
 
   AOT_FILES = [
     "MissionPlanner.exe"

From a987411223c44a9ba61800f6e4fd8785c6ed2011 Mon Sep 17 00:00:00 2001
From: MarkTanui <marktanui75@gmail.com>
Date: Fri, 21 Mar 2025 03:20:16 +0300
Subject: [PATCH 044/489] redocly: 1.29.0 -> 1.34.0

---
 pkgs/by-name/re/redocly/package.nix | 36 +++++++++++++++++------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix
index 4f5638a43986..645589dd8abd 100644
--- a/pkgs/by-name/re/redocly/package.nix
+++ b/pkgs/by-name/re/redocly/package.nix
@@ -1,49 +1,55 @@
 {
   lib,
+  nodejs,
   buildNpmPackage,
   fetchFromGitHub,
-  makeWrapper,
   redocly,
   testers,
 }:
 
 buildNpmPackage rec {
   pname = "redocly";
-  version = "1.29.0";
+  version = "1.34.0";
 
   src = fetchFromGitHub {
     owner = "Redocly";
     repo = "redocly-cli";
     rev = "@redocly/cli@${version}";
-    hash = "sha256-Oa4R4R7Obg26DKWZkccqjIcrD35pBw1AYIPe2/KN8f4=";
+    hash = "sha256-1iyE0LYbVEleCdSw6fWvIHqCkWMEZrjK6tum+qytcCY=";
   };
 
-  npmDepsHash = "sha256-V0NklVsPRqRJ479nIMWqs/sXciXOm6LAlIh3YcPPDEc=";
+  npmDepsHash = "sha256-TIsVjdohsmvAAn9xQeeD5pu4CjXtYlD7bmKeDp113Lc=";
 
   npmBuildScript = "prepare";
 
-  nativeBuildInputs = [ makeWrapper ];
-
   postBuild = ''
     npm --prefix packages/cli run copy-assets
   '';
 
   postInstall = ''
-    rm $out/lib/node_modules/@redocly/cli/node_modules/@redocly/{cli,openapi-core}
+    rm $out/lib/node_modules/@redocly/cli/node_modules/@redocly/{cli,openapi-core,respect-core}
     cp -R packages/cli $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli
     cp -R packages/core $out/lib/node_modules/@redocly/cli/node_modules/@redocly/openapi-core
+    cp -R packages/respect-core $out/lib/node_modules/@redocly/cli/node_modules/@redocly/respect-core
 
-    mkdir $out/bin
-    makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js \
-      $out/bin/redocly \
-      --set-default REDOCLY_TELEMETRY off \
-      --set-default REDOCLY_SUPPRESS_UPDATE_NOTICE true
+    # Create a wrapper script to force the correct command name (Nodejs uses argv[1] for command name)
+    mkdir -p $out/bin
+    cat <<EOF > $out/bin/redocly
+    #!${lib.getBin nodejs}/bin/node
+    // Override argv[1] to show "redocly" instead of "cli.js"
+    process.argv[1] = 'redocly';
+
+    // Set environment variables directly
+    process.env.REDOCLY_TELEMETRY = process.env.REDOCLY_TELEMETRY || "off";
+    process.env.REDOCLY_SUPPRESS_UPDATE_NOTICE = process.env.REDOCLY_SUPPRESS_UPDATE_NOTICE || "true";
+
+    require('$out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js');
+    EOF
+    chmod +x $out/bin/redocly
   '';
 
   passthru = {
-    tests.version = testers.testVersion {
-      package = redocly;
-    };
+    tests.version = testers.testVersion { package = redocly; };
   };
 
   meta = {

From b9ce04665d94a806478040d0477a77fd2d4259ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20K=C3=B6pcke?= <marco.koepcke@tudock.de>
Date: Fri, 28 Mar 2025 12:38:11 +0100
Subject: [PATCH 045/489] google-lighthouse: 12.4.0 -> 12.5.1

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

diff --git a/pkgs/by-name/go/google-lighthouse/package.nix b/pkgs/by-name/go/google-lighthouse/package.nix
index b5768d407e9f..bfb4a6c57d22 100644
--- a/pkgs/by-name/go/google-lighthouse/package.nix
+++ b/pkgs/by-name/go/google-lighthouse/package.nix
@@ -12,18 +12,18 @@
 }:
 stdenv.mkDerivation rec {
   pname = "google-lighthouse";
-  version = "12.4.0";
+  version = "12.5.1";
 
   src = fetchFromGitHub {
     owner = "GoogleChrome";
     repo = "lighthouse";
     tag = "v${version}";
-    hash = "sha256-O5HBaL+NogrE7dWi3TI0C5t+kQcJ7YG6yxRWsYpE1vw=";
+    hash = "sha256-v4V4K77WC3InQ+jRlzw0JV8ehPF+hwWlnAt3P8yHMGU=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-Jy3KBsHIh/HctSze3We04aisBjq67LZt0Z+HrBdDeIs=";
+    hash = "sha256-qdOR7A8ku8qJyJ3rdzH1okt+P1aekGfdtZbxjYOqehA=";
   };
 
   yarnBuildScript = "build-report";

From c8f8f61a3cbf594c4698788cf507a7a4d9ea7321 Mon Sep 17 00:00:00 2001
From: Ananth Venkatesh <dev.quantum9innovation@gmail.com>
Date: Thu, 27 Mar 2025 21:20:10 -0400
Subject: [PATCH 046/489] sleek-todo: use ozone layer on wayland

respect system-level wayland settings for consistent graphics; closes nixos/nixpkgs#371690
---
 pkgs/by-name/sl/sleek-todo/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sl/sleek-todo/package.nix b/pkgs/by-name/sl/sleek-todo/package.nix
index 84436b9a732a..9962bb5fa571 100644
--- a/pkgs/by-name/sl/sleek-todo/package.nix
+++ b/pkgs/by-name/sl/sleek-todo/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   undmg,
   appimageTools,
-
+  makeWrapper,
 }:
 
 let
@@ -66,8 +66,10 @@ else
       src
       meta
       ;
-
+    nativeBuildInputs = [ makeWrapper ];
     extraInstallCommands = ''
+      wrapProgram $out/bin/sleek-todo \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
       mkdir -p $out/share/{applications,sleek}
       cp -a ${appimageContents}/{locales,resources} $out/share/sleek
       cp -a ${appimageContents}/usr/share/icons $out/share

From ae58f59488dac97adc7a2b18d853b3b9bce81cea Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sat, 29 Mar 2025 00:49:02 -0400
Subject: [PATCH 047/489] decibels: 46.0 -> 48.0

Changelog: https://gitlab.gnome.org/GNOME/decibels/-/blob/48.0/NEWS?ref_type=tags
---
 pkgs/by-name/de/decibels/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/de/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix
index 162c1b9a8aa5..3b4640ba5f58 100644
--- a/pkgs/by-name/de/decibels/package.nix
+++ b/pkgs/by-name/de/decibels/package.nix
@@ -17,15 +17,15 @@
 }:
 stdenv.mkDerivation rec {
   pname = "decibels";
-  version = "46.0";
+  version = "48.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     group = "GNOME";
     owner = "Incubator";
     repo = "decibels";
-    rev = version;
-    hash = "sha256-3LQQcrpmWrTfk8A8GR+KnxJEB1HGozgEsM+j5ECK8kc=";
+    tag = version;
+    hash = "sha256-qtKiKfcxGLuV1bE3lb7l4s+reZRJXcjlV35M8eZmvHc=";
     fetchSubmodules = true;
   };
 
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Play audio files";
     homepage = "https://gitlab.gnome.org/GNOME/Incubator/decibels";
-    changelog = "https://gitlab.gnome.org/GNOME/Incubator/decibels/-/blob/main/NEWS?ref_type=tags";
+    changelog = "https://gitlab.gnome.org/GNOME/decibels/-/blob/${version}/NEWS?ref_type=tags";
     license = lib.licenses.gpl3Only;
     maintainers = lib.teams.gnome-circle.members;
     mainProgram = "org.gnome.Decibels";

From 80c63cbf69bfbb986ebda8648f2b5d55ad43f911 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sat, 29 Mar 2025 00:55:45 -0400
Subject: [PATCH 048/489] garnet: 1.0.58 -> 1.0.61

Diff: https://github.com/microsoft/garnet/compare/v1.0.58...v1.0.61

Changelog: https://github.com/microsoft/garnet/releases/tag/v1.0.61
---
 pkgs/by-name/ga/garnet/deps.json   | 223 ++++++++++++++++++++---------
 pkgs/by-name/ga/garnet/package.nix |  10 +-
 2 files changed, 164 insertions(+), 69 deletions(-)

diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json
index 46004d44a882..2ca0aaf4e7fa 100644
--- a/pkgs/by-name/ga/garnet/deps.json
+++ b/pkgs/by-name/ga/garnet/deps.json
@@ -1,18 +1,18 @@
 [
   {
     "pname": "Azure.Core",
-    "version": "1.41.0",
-    "hash": "sha256-/ixQr8KFGlZa43gGd2A7aBzwu9h+wLO6OqIMy3YbW+Y="
+    "version": "1.44.1",
+    "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk="
   },
   {
     "pname": "Azure.Storage.Blobs",
-    "version": "12.21.2",
-    "hash": "sha256-DvdMGuophEbvvVtbRU3vsNwla0zTn5dn7HbW0Mr4P/o="
+    "version": "12.24.0",
+    "hash": "sha256-PcI3Jf9VrDfkr0YfoR89us45HE1DE8g5J3ZpZ8vZkLs="
   },
   {
     "pname": "Azure.Storage.Common",
-    "version": "12.20.1",
-    "hash": "sha256-XBDyzAEt5iwdyB3jgoG5TLyx5NZ/MoiEerBR/7U7F4w="
+    "version": "12.23.0",
+    "hash": "sha256-DAMzFlls76hH5jtXtU89SvbQWhhELaQq+PfG4SK7W+Q="
   },
   {
     "pname": "CommandLineParser",
@@ -25,9 +25,29 @@
     "hash": "sha256-ouRL7+0bW/VYUNNYQoXenXzYO0HNF3D1IsScqtah3DE="
   },
   {
-    "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "1.1.1",
-    "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="
+    "pname": "Microsoft.AspNetCore.App.Ref",
+    "version": "8.0.14",
+    "hash": "sha256-/KLfqaH4v++SyVJR9p+2WxrMDKPEZKmUvLUjB2ZwT/0="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
+    "version": "8.0.14",
+    "hash": "sha256-f0PiSIwbh5t4IKMcVBWb6qSEGp/NAHuC/bWdR3Er440="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
+    "version": "8.0.14",
+    "hash": "sha256-HGSGesUhWei4IE+jqGh85aokkIg7xufpVn+n1vOLoY4="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
+    "version": "8.0.14",
+    "hash": "sha256-rAypEtdQcbfckGqa8oAY2WLTDlx54Xi3IOiE42BKV+M="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
+    "version": "8.0.14",
+    "hash": "sha256-6nKy10sMp/xqjFZvDfv28s9+r8gzYnKpxVq9p2v6FAo="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
@@ -35,129 +55,179 @@
     "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
   },
   {
-    "pname": "Microsoft.Build.Tasks.Git",
-    "version": "8.0.0",
-    "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="
+    "pname": "Microsoft.Bcl.Memory",
+    "version": "9.0.0",
+    "hash": "sha256-ECgyZ53XqJoRcZexQpctEq1nHFXuW4YqFSx7Elsae7U="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "8.0.0",
-    "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
+    "version": "9.0.3",
+    "hash": "sha256-p1KEkbl1h3dJkBZQUMK2Jt1vbm/NGIHqLEr7QrLYIbg="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
+    "version": "9.0.3",
+    "hash": "sha256-OjL0pzW+Wsp0KSrqawYHdtIf8w0XqvY8USEbptgP6dI="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "8.0.0",
-    "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="
+    "version": "9.0.3",
+    "hash": "sha256-KxYOzATIl0qI8MScHL9BYsCB3dvqoNDCrraiquBHMVs="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "8.0.0",
-    "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="
+    "version": "9.0.3",
+    "hash": "sha256-/gAk+YbJT1/XjMfPBrEg9wUbljA0g1vFJuE+mFOPwV0="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
+    "version": "9.0.3",
+    "hash": "sha256-90HSc8MgyemdtRTBN7Indq62DRaqI2mjai9iV/pi/o4="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "8.0.0",
-    "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="
+    "version": "9.0.3",
+    "hash": "sha256-w1cKHraJW+i7avhTseoJ+u0parEAJ7r51E2qvsuXZDA="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "8.0.0",
     "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.2",
+    "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "9.0.3",
+    "hash": "sha256-f/K3A9NPpCOTGlyha5DJf+OIjfAVWu+dJ4rAqQ+3sso="
+  },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
-    "version": "8.0.0",
-    "hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="
+    "version": "9.0.3",
+    "hash": "sha256-u9Un3Bc+Cbj2E8u2etU+KPPv3IbCKgCAY/SCAGK6+LE="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Console",
-    "version": "8.0.0",
-    "hash": "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c="
+    "version": "9.0.3",
+    "hash": "sha256-bDHxUjuO4d63GXbDoD9Hdo8AvAke0/r38hzctAWQUqc="
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "8.0.0",
-    "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
+    "version": "9.0.3",
+    "hash": "sha256-h4CLVA1cZdte8hd/bcb5dsi61MhAAScHRZU4LR2W5Z8="
   },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "8.0.0",
-    "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
+    "version": "9.0.3",
+    "hash": "sha256-FjYrMjnkEplPTYoHUVU94zXIuVsjL5AcGHb/zYkh138="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "8.0.0",
-    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
+    "version": "9.0.3",
+    "hash": "sha256-iBwolNt6Lb2OqjDWBVnUj8vZDSID9EQw/JPI1xcuFus="
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
-    "version": "8.0.1",
-    "hash": "sha256-zPWUKTCfGm4MWcYPU037NzezsFE1g8tEijjQkw5iooI="
+    "version": "8.6.1",
+    "hash": "sha256-RDyVSOYjQFGZsGr2tjwcJHjJV4JJPZ5uZdwE3BbbLB0="
   },
   {
     "pname": "Microsoft.IdentityModel.JsonWebTokens",
-    "version": "8.0.1",
-    "hash": "sha256-Xv9MUnjb66U3xeR9drOcSX5n2DjOCIJZPMNSKjWHo9Y="
+    "version": "8.6.1",
+    "hash": "sha256-Y3NBDifORZ09vKlIF8J1Ocxe8DrmWV4/DuVJZul4xmM="
   },
   {
     "pname": "Microsoft.IdentityModel.Logging",
-    "version": "8.0.1",
-    "hash": "sha256-FfwrH/2eLT521Kqw+RBIoVfzlTNyYMqlWP3z+T6Wy2Y="
+    "version": "8.6.1",
+    "hash": "sha256-AXGRN3rs+CJlxyxF80FzPe8UDcZqg6jHrj12pyBs+gU="
   },
   {
     "pname": "Microsoft.IdentityModel.Protocols",
-    "version": "8.0.1",
-    "hash": "sha256-v3DIpG6yfIToZBpHOjtQHRo2BhXGDoE70EVs6kBtrRg="
+    "version": "8.6.1",
+    "hash": "sha256-o+1L4GoUh94XKcUzTS/ECVoPIfVH/i84XN+wSmE75pg="
   },
   {
     "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect",
-    "version": "8.0.1",
-    "hash": "sha256-ZHKaZxqESk+OU1SFTFGxvZ71zbdgWqv1L6ET9+fdXX0="
+    "version": "8.6.1",
+    "hash": "sha256-H8ZkyYOR37DT09dbCU4khligNgUbIHfnHUiuaD5Kenw="
   },
   {
     "pname": "Microsoft.IdentityModel.Tokens",
-    "version": "8.0.1",
-    "hash": "sha256-beVbbVQy874HlXkTKarPTT5/r7XR1NGHA/50ywWp7YA="
+    "version": "8.6.1",
+    "hash": "sha256-rB4Hg9FSlkiXireuZKYdVq9CcqmJa5YeTw+WMlSVnkQ="
   },
   {
     "pname": "Microsoft.IdentityModel.Validators",
-    "version": "8.0.1",
-    "hash": "sha256-5LTLbFNWz33nco+hyKAEHcQeAWaBugJ0oMKR6AuEI34="
+    "version": "8.6.1",
+    "hash": "sha256-BDdJNDquVEplPJT3fYOakg26bSNyzNyUce+7mCjtc5o="
   },
   {
-    "pname": "Microsoft.SourceLink.Common",
-    "version": "8.0.0",
-    "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="
+    "pname": "Microsoft.NETCore.App.Host.linux-arm64",
+    "version": "8.0.14",
+    "hash": "sha256-TCO/TrAqfmDvJfO+oM80frwHtg4hzpGTZXkrR3UiuAc="
   },
   {
-    "pname": "Microsoft.SourceLink.GitHub",
-    "version": "8.0.0",
-    "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="
+    "pname": "Microsoft.NETCore.App.Host.linux-x64",
+    "version": "8.0.14",
+    "hash": "sha256-MO52s0Y/7wkAhY4d+ecz1MT+xe7pMqchsakvcY8pWNA="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.osx-arm64",
+    "version": "8.0.14",
+    "hash": "sha256-QJeEGCWpGejHQiQVgnwUH60CxM9YPZfyuhywoVf/bE8="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.osx-x64",
+    "version": "8.0.14",
+    "hash": "sha256-uVxJpshjquHLuWzFOA6gcWSB87U39dJw4y5MhmsPvoM="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Ref",
+    "version": "8.0.14",
+    "hash": "sha256-YeIjDhpNaO+7kWYZL0ZrbH+EX3inANNbd7m45cxDwLI="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
+    "version": "8.0.14",
+    "hash": "sha256-NBmDWdhOzIbS4KzGnndhWV5addf46B8/mn8j7BC/oDs="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
+    "version": "8.0.14",
+    "hash": "sha256-l8clUSsyExPwyZ7oO6Dl/K2Md1mnaNdVEe9G4716yCs="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
+    "version": "8.0.14",
+    "hash": "sha256-OrtH7sxUN+BKS+5LQJxto0QJkakQmFgfTgEyRp3bS2c="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.osx-x64",
+    "version": "8.0.14",
+    "hash": "sha256-2S+TxQJfLtdpHZftM1YTENQYQpwH+ZWlmLSvwK51Ikk="
   },
   {
     "pname": "System.ClientModel",
-    "version": "1.0.0",
-    "hash": "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y="
+    "version": "1.1.0",
+    "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM="
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
     "version": "6.0.1",
     "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="
   },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "9.0.3",
+    "hash": "sha256-zgZF8BTksBk5oucX0j0Ju8qNG8oKJbIGio0GM+egT9M="
+  },
   {
     "pname": "System.IdentityModel.Tokens.Jwt",
-    "version": "8.0.1",
-    "hash": "sha256-hW4f9zWs0afxPbcMqCA/FAGvBZbBFSkugIOurswomHg="
+    "version": "8.6.1",
+    "hash": "sha256-vzwoEHRmUBnmlj77lFUZ/nD2oCEmY2rjwyaaXEZxuaU="
   },
   {
     "pname": "System.Interactive.Async",
@@ -169,6 +239,11 @@
     "version": "6.0.0",
     "hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE="
   },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "9.0.3",
+    "hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68="
+  },
   {
     "pname": "System.Linq.Async",
     "version": "6.0.1",
@@ -179,6 +254,11 @@
     "version": "1.0.2",
     "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0="
   },
+  {
+    "pname": "System.Memory.Data",
+    "version": "6.0.0",
+    "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo="
+  },
   {
     "pname": "System.Numerics.Vectors",
     "version": "4.5.0",
@@ -191,18 +271,33 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "4.7.2",
-    "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="
+    "version": "6.0.0",
+    "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "9.0.3",
+    "hash": "sha256-ZGRcKnblIdt1fHZ4AehyyWCgM+/1FcZyxoGJFe4K3JE="
   },
   {
     "pname": "System.Text.Json",
-    "version": "4.7.2",
-    "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="
+    "version": "6.0.0",
+    "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="
   },
   {
     "pname": "System.Text.Json",
-    "version": "8.0.5",
-    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
+    "version": "6.0.10",
+    "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "6.0.9",
+    "hash": "sha256-5jjvxV8ubGYjkydDhLsGZXB6ml3O/7CGauQcu1ikeLs="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "9.0.3",
+    "hash": "sha256-I7z6sRb2XbbXNZ2MyNbn2wysh1P2cnk4v6BM0zucj1w="
   },
   {
     "pname": "System.Threading.Tasks.Extensions",
diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index ed1a40a268ad..102062f446d6 100644
--- a/pkgs/by-name/ga/garnet/package.nix
+++ b/pkgs/by-name/ga/garnet/package.nix
@@ -8,24 +8,24 @@
 
 buildDotnetModule rec {
   pname = "garnet";
-  version = "1.0.58";
+  version = "1.0.61";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-PP1Dko7/3Yx3evEyTRhHA85m6XztQiUt307LVZsCx64=";
+    hash = "sha256-Xvc/ECu/aIduHABZ08J3+iDgvOBs3vLCpzHJwfuLSp0=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";
   nugetDeps = ./deps.json;
 
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
-  dotnet-runtime = dotnetCorePackages.runtime_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-runtime = dotnetCorePackages.runtime_9_0;
 
   dotnetBuildFlags = [
     "-f"
-    "net8.0"
+    "net9.0"
   ];
   dotnetInstallFlags = dotnetBuildFlags;
 

From 1bd6fbf0558d2a8b960c7240a4b63548c8d13815 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 29 Mar 2025 19:12:47 +0800
Subject: [PATCH 049/489] saber: 0.25.3 -> 0.25.4

---
 pkgs/by-name/sa/saber/package.nix       |  38 ++-
 pkgs/by-name/sa/saber/pubspec.lock.json | 412 +++++++++++++-----------
 2 files changed, 250 insertions(+), 200 deletions(-)

diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix
index 15f533a890b7..f71f41315b77 100644
--- a/pkgs/by-name/sa/saber/package.nix
+++ b/pkgs/by-name/sa/saber/package.nix
@@ -1,23 +1,29 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter329,
   gst_all_1,
   libunwind,
   orc,
   webkitgtk_4_1,
   autoPatchelfHook,
   xorg,
+  runCommand,
+  yq,
+  saber,
+  _experimental-update-script-combinators,
+  gitUpdater,
 }:
-flutter327.buildFlutterApplication rec {
+
+flutter329.buildFlutterApplication rec {
   pname = "saber";
-  version = "0.25.3";
+  version = "0.25.4";
 
   src = fetchFromGitHub {
     owner = "saber-notes";
     repo = "saber";
     tag = "v${version}";
-    hash = "sha256-plBcZo67/x8KcND28jqfrwbvI9IZz8ptLZoGl2y2vW4=";
+    hash = "sha256-3ZTvGF5Ip6VTmyeuuZoJaGO1dDOee5GuRp6/YxSz27c=";
   };
 
   gitHashes = {
@@ -27,9 +33,7 @@ flutter327.buildFlutterApplication rec {
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  nativeBuildInputs = [
-    autoPatchelfHook
-  ];
+  nativeBuildInputs = [ autoPatchelfHook ];
 
   buildInputs = [
     gst_all_1.gstreamer
@@ -41,8 +45,8 @@ flutter327.buildFlutterApplication rec {
   ];
 
   postInstall = ''
-    install -Dm0644 ./flatpak/com.adilhanney.saber.desktop $out/share/applications/com.adilhanney.saber.desktop
-    install -Dm0644 ./assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg
+    install -Dm0644 flatpak/com.adilhanney.saber.desktop $out/share/applications/saber.desktop
+    install -Dm0644 assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg
   '';
 
   preFixup = ''
@@ -50,6 +54,22 @@ flutter327.buildFlutterApplication rec {
     patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/saber/lib/lib*.so
   '';
 
+  passthru = {
+    pubspecSource =
+      runCommand "pubspec.lock.json"
+        {
+          nativeBuildInputs = [ yq ];
+          inherit (saber) src;
+        }
+        ''
+          cat $src/pubspec.lock | yq > $out
+        '';
+    updateScript = _experimental-update-script-combinators.sequence [
+      (gitUpdater { rev-prefix = "v"; })
+      (_experimental-update-script-combinators.copyAttrOutputToFile "saber.pubspecSource" ./pubspec.lock.json)
+    ];
+  };
+
   meta = {
     description = "Cross-platform open-source app built for handwriting";
     homepage = "https://github.com/saber-notes/saber";
diff --git a/pkgs/by-name/sa/saber/pubspec.lock.json b/pkgs/by-name/sa/saber/pubspec.lock.json
index 4fa55a1e38a3..359273655523 100644
--- a/pkgs/by-name/sa/saber/pubspec.lock.json
+++ b/pkgs/by-name/sa/saber/pubspec.lock.json
@@ -4,11 +4,11 @@
       "dependency": "direct main",
       "description": {
         "name": "abstract_sync",
-        "sha256": "40c83f10dc670e6c6c7f1999fd9ddd0a32dcc61454ed6c202bd59cb6befd81c4",
+        "sha256": "f88f85bfecf2171d8756556b8d7992cf8d31d076a6d0ebbfd9f8ee559d8a18bc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.3.1"
     },
     "animated_vector": {
       "dependency": "transitive",
@@ -44,11 +44,11 @@
       "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "sha256": "528579c7e4579719f04b21eeeeddfd73a18b31dabc22766893b7d1be7f49b967",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.3"
     },
     "args": {
       "dependency": "direct main",
@@ -64,71 +64,71 @@
       "dependency": "transitive",
       "description": {
         "name": "asn1lib",
-        "sha256": "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5",
+        "sha256": "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.8"
+      "version": "1.5.9"
     },
     "assorted_layout_widgets": {
       "dependency": "transitive",
       "description": {
         "name": "assorted_layout_widgets",
-        "sha256": "5b7f7c76a1a4c7cf95edfb854c3ed09ce9cb7f25a372f2d9a8d4c1569d42ecfb",
+        "sha256": "86eacbd25f7dd14a8182003935b07d94205ae4b0e6bedee03bde1404746bb7a9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.0.2"
+      "version": "10.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.12.0"
     },
     "audioplayers": {
       "dependency": "direct main",
       "description": {
         "name": "audioplayers",
-        "sha256": "c346ba5a39dc208f1bab55fc239855f573d69b0e832402114bf0b793622adc4d",
+        "sha256": "b3d02a23918b980073d4a76c4e5659eaf5127251ca91a6a804869ba88ef1c8bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "6.2.0"
     },
     "audioplayers_android": {
       "dependency": "transitive",
       "description": {
         "name": "audioplayers_android",
-        "sha256": "de576b890befe27175c2f511ba8b742bec83765fa97c3ce4282bba46212f58e4",
+        "sha256": "56830454da1a943f33c686cdbfca52a8d24f4c6fd6ce88c6b3501020dbaaf48b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "5.0.3"
     },
     "audioplayers_darwin": {
       "dependency": "transitive",
       "description": {
         "name": "audioplayers_darwin",
-        "sha256": "e507887f3ff18d8e5a10a668d7bedc28206b12e10b98347797257c6ae1019c3b",
+        "sha256": "34e1fb3a88ba02566615c6ca7173aa93b39cf61a38a05a729b60ba14c4899169",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.0"
+      "version": "6.1.0"
     },
     "audioplayers_linux": {
       "dependency": "transitive",
       "description": {
         "name": "audioplayers_linux",
-        "sha256": "3d3d244c90436115417f170426ce768856d8fe4dfc5ed66a049d2890acfa82f9",
+        "sha256": "ce8383c1ff0db1ba93b5b0b8ef5b260ec2d0ce2598ad37dc8b946b773dd2c5fa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.0"
+      "version": "4.1.0"
     },
     "audioplayers_platform_interface": {
       "dependency": "transitive",
@@ -154,21 +154,21 @@
       "dependency": "transitive",
       "description": {
         "name": "audioplayers_windows",
-        "sha256": "8605762dddba992138d476f6a0c3afd9df30ac5b96039929063eceed416795c2",
+        "sha256": "52b57c706a20fc85daa911be67381b3a5c9d03f8e27cb9fdb226de5bddf293b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.0"
+      "version": "4.1.0"
     },
     "barcode": {
       "dependency": "transitive",
       "description": {
         "name": "barcode",
-        "sha256": "ab180ce22c6555d77d45f0178a523669db67f95856e3378259ef2ffeb43e6003",
+        "sha256": "7b6729c37e3b7f34233e2318d866e8c48ddb46c1f7ad01ff7bb2a8de1da2b9f4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.8"
+      "version": "2.2.9"
     },
     "bidi": {
       "dependency": "transitive",
@@ -184,11 +184,11 @@
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "bson": {
       "dependency": "direct main",
@@ -214,21 +214,31 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
+        "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.2"
+      "version": "8.9.3"
+    },
+    "chalkdart": {
+      "dependency": "transitive",
+      "description": {
+        "name": "chalkdart",
+        "sha256": "08c910ee341fcdd1e46f20ddce59b13c1d85f5d97f2fd2f12014c46ede670e40",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
     },
     "characters": {
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "charcode": {
       "dependency": "transitive",
@@ -244,11 +254,11 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "collapsible": {
       "dependency": "direct main",
@@ -264,11 +274,11 @@
       "dependency": "direct main",
       "description": {
         "name": "collection",
-        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.19.0"
+      "version": "1.19.1"
     },
     "convert": {
       "dependency": "transitive",
@@ -354,11 +364,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dbus",
-        "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac",
+        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
     },
     "decimal": {
       "dependency": "transitive",
@@ -394,11 +404,11 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431",
+        "sha256": "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.2.0"
+      "version": "11.3.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -464,11 +474,11 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.2"
     },
     "fast_image_resizer": {
       "dependency": "direct main",
@@ -484,31 +494,31 @@
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "file": {
       "dependency": "transitive",
       "description": {
         "name": "file",
-        "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.0.1"
     },
     "file_picker": {
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "16dc141db5a2ccc6520ebb6a2eb5945b1b09e95085c021d9f914f8ded7f1465c",
+        "sha256": "6f6bfa8797f296965bdc3e1f702574ab49a540c19b9237b401e7c2b25dfe594c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.4"
+      "version": "9.0.0"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -534,11 +544,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_windows",
-        "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4",
+        "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+3"
+      "version": "0.9.3+4"
     },
     "fixnum": {
       "dependency": "direct main",
@@ -554,21 +564,21 @@
       "dependency": "direct main",
       "description": {
         "name": "flex_color_picker",
-        "sha256": "12dc855ae8ef5491f529b1fc52c655f06dcdf4114f1f7fdecafa41eec2ec8d79",
+        "sha256": "c083b79f1c57eaeed9f464368be376951230b3cb1876323b784626152a86e480",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.0"
+      "version": "3.7.0"
     },
     "flex_seed_scheme": {
       "dependency": "transitive",
       "description": {
         "name": "flex_seed_scheme",
-        "sha256": "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334",
+        "sha256": "d3ba3c5c92d2d79d45e94b4c6c71d01fac3c15017da1545880c53864da5dfeb0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.1"
+      "version": "3.5.0"
     },
     "flutter": {
       "dependency": "direct main",
@@ -626,11 +636,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_keyboard_visibility_temp_fork",
-        "sha256": "cecc44a350a8a369efbc960bb2126386af53cb0597ca6789607cbfb88081b9f4",
+        "sha256": "e3d02900640fbc1129245540db16944a0898b8be81694f4bf04b6c985bed9048",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.4"
+      "version": "0.1.5"
     },
     "flutter_keyboard_visibility_windows": {
       "dependency": "transitive",
@@ -662,91 +672,91 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398",
+        "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.23"
+      "version": "2.0.24"
     },
     "flutter_quill": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_quill",
-        "sha256": "6274834823e61291c0cedee9dd7f73fc7836ea07a12596de8f5fa08598b5eb74",
+        "sha256": "3765d057bb63e6e5b7d5aba7c8fb048ec1b38c8a3428ded8c22e57cf2682a580",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.8.5"
+      "version": "11.0.0"
     },
     "flutter_quill_delta_from_html": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_quill_delta_from_html",
-        "sha256": "63873b5391b56daa999ce8fa7dd23dfd7d0417a70e00a647ba450f4a8988afd0",
+        "sha256": "79405765612016de9de2361be86383360b0b43a6bf88b818c079a953583f1849",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.3"
+      "version": "1.5.0"
     },
     "flutter_secure_storage": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_secure_storage",
-        "sha256": "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0",
+        "sha256": "f7eceb0bc6f4fd0441e29d43cab9ac2a1c5ffd7ea7b64075136b718c46954874",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.2.2"
+      "version": "10.0.0-beta.4"
+    },
+    "flutter_secure_storage_darwin": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flutter_secure_storage_darwin",
+        "sha256": "f226f2a572bed96bc6542198ebaec227150786e34311d455a7e2d3d06d951845",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.0"
     },
     "flutter_secure_storage_linux": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_secure_storage_linux",
-        "sha256": "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b",
+        "sha256": "9b4b73127e857cd3117d43a70fa3dddadb6e0b253be62e6a6ab85caa0742182c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
-    },
-    "flutter_secure_storage_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_secure_storage_macos",
-        "sha256": "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
+      "version": "2.0.1"
     },
     "flutter_secure_storage_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_secure_storage_platform_interface",
-        "sha256": "cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8",
+        "sha256": "8ceea1223bee3c6ac1a22dabd8feefc550e4729b3675de4b5900f55afcb435d6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "2.0.1"
     },
     "flutter_secure_storage_web": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_secure_storage_web",
-        "sha256": "f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9",
+        "sha256": "4c3f233e739545c6cb09286eeec1cc4744138372b985113acc904f7263bef517",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "2.0.0"
     },
     "flutter_secure_storage_windows": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_secure_storage_windows",
-        "sha256": "b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709",
+        "sha256": "ff32af20f70a8d0e59b2938fc92de35b54a74671041c814275afd80e27df9f21",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "4.0.0"
     },
     "flutter_speed_dial": {
       "dependency": "direct main",
@@ -772,11 +782,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123",
+        "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.16"
+      "version": "2.0.17"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -826,25 +836,35 @@
       "source": "sdk",
       "version": "0.0.0"
     },
+    "glob": {
+      "dependency": "transitive",
+      "description": {
+        "name": "glob",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.3"
+    },
     "go_router": {
       "dependency": "direct main",
       "description": {
         "name": "go_router",
-        "sha256": "2fd11229f59e23e967b0775df8d5948a519cd7e1e8b6e849729e010587b46539",
+        "sha256": "04539267a740931c6d4479a10d466717ca5901c6fdfd3fcda09391bbb8ebd651",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.6.2"
+      "version": "14.8.0"
     },
     "golden_screenshot": {
       "dependency": "direct dev",
       "description": {
         "name": "golden_screenshot",
-        "sha256": "6c800c8e1338434ccb68dec788b5121bf97d256aa6a98b43a4330190572f144a",
+        "sha256": "548b49cb2d7ee57664ed8cfd44df764182c59b04a437c7d695ed784e3a21569f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.2"
+      "version": "3.2.0"
     },
     "golden_toolkit": {
       "dependency": "transitive",
@@ -890,21 +910,21 @@
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.3.0"
     },
     "http_parser": {
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.1"
+      "version": "4.1.2"
     },
     "icons_launcher": {
       "dependency": "direct dev",
@@ -920,11 +940,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image",
-        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
+        "sha256": "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.5.3"
     },
     "integration_test": {
       "dependency": "direct dev",
@@ -966,11 +986,11 @@
       "dependency": "transitive",
       "description": {
         "name": "js",
-        "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
+        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.7"
+      "version": "0.7.2"
     },
     "json2yaml": {
       "dependency": "direct overridden",
@@ -1007,21 +1027,21 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
+        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.7"
+      "version": "10.0.8"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
+        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.8"
+      "version": "3.0.9"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
@@ -1037,11 +1057,11 @@
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "4a16b3f03741e1252fda5de3ce712666d010ba2122f8e912c94f9f7b90e1a4c3",
+        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.1.0"
+      "version": "5.1.1"
     },
     "list_utilities": {
       "dependency": "transitive",
@@ -1067,21 +1087,21 @@
       "dependency": "transitive",
       "description": {
         "name": "markdown",
-        "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051",
+        "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.2.2"
+      "version": "7.3.0"
     },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -1097,31 +1117,31 @@
       "dependency": "direct main",
       "description": {
         "name": "material_symbols_icons",
-        "sha256": "64404f47f8e0a9d20478468e5decef867a688660bad7173adcd20418d7f892c9",
+        "sha256": "1403944c2a68dbdf934fca2b2115a372e70a4a185c136ab71a9d16e2108d0b14",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2801.0"
+      "version": "4.2805.1"
     },
     "matrix4_transform": {
       "dependency": "transitive",
       "description": {
         "name": "matrix4_transform",
-        "sha256": "42c42610deecc382be2653f4a21358537401bd5b027c168a174c7c6a64959908",
+        "sha256": "1346e53517e3081d3e8362377be97e285e2bd348855c177eae2a18aa965cafa0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "4.0.1"
     },
     "meta": {
       "dependency": "direct main",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -1167,11 +1187,11 @@
       "dependency": "direct main",
       "description": {
         "name": "one_dollar_unistroke_recognizer",
-        "sha256": "fa47695d7318542401cd29a35829011dafa0d0b3cb401803e6d78d55d382a96c",
+        "sha256": "459ba12aaada0e85e8f211f62fea649f246ccb74f726527593a0716bf1bcf6c4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
     },
     "onyxsdk_pen": {
       "dependency": "direct main",
@@ -1273,14 +1293,14 @@
       "version": "0.1.1"
     },
     "path": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_drawing": {
       "dependency": "direct main",
@@ -1376,11 +1396,11 @@
       "dependency": "direct main",
       "description": {
         "name": "pdf",
-        "sha256": "05df53f8791587402493ac97b9869d3824eccbc77d97855f4545cf72df3cae07",
+        "sha256": "28eacad99bffcce2e05bba24e50153890ad0255294f4dd78a17075a2ba5c8416",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.11.1"
+      "version": "3.11.3"
     },
     "pdf_widget_wrapper": {
       "dependency": "transitive",
@@ -1396,11 +1416,11 @@
       "dependency": "direct main",
       "description": {
         "name": "pdfrx",
-        "sha256": "1a9cb7c6c6ac9b6e8b441d6a956697894dc4d10a9452ca9d640490c26c07cbfc",
+        "sha256": "7feafb9f5f2af8743d24d0b04e3b46bca6571c975e4697446f9692c7553c4e31",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.97"
+      "version": "1.1.11"
     },
     "perfect_freehand": {
       "dependency": "direct main",
@@ -1416,31 +1436,31 @@
       "dependency": "direct main",
       "description": {
         "name": "permission_handler",
-        "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb",
+        "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.3.1"
+      "version": "11.4.0"
     },
     "permission_handler_android": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_android",
-        "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1",
+        "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.13"
+      "version": "12.1.0"
     },
     "permission_handler_apple": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_apple",
-        "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0",
+        "sha256": "f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.4.5"
+      "version": "9.4.6"
     },
     "permission_handler_html": {
       "dependency": "transitive",
@@ -1456,11 +1476,11 @@
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_platform_interface",
-        "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9",
+        "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.3"
+      "version": "4.3.0"
     },
     "permission_handler_windows": {
       "dependency": "transitive",
@@ -1476,11 +1496,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
     },
     "pixel_snap": {
       "dependency": "transitive",
@@ -1496,11 +1516,11 @@
       "dependency": "transitive",
       "description": {
         "name": "platform",
-        "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
+        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.5"
+      "version": "3.1.6"
     },
     "platform_linux": {
       "dependency": "transitive",
@@ -1532,6 +1552,16 @@
       "source": "hosted",
       "version": "3.9.1"
     },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.1"
+    },
     "power_extensions": {
       "dependency": "transitive",
       "description": {
@@ -1546,21 +1576,21 @@
       "dependency": "direct main",
       "description": {
         "name": "printing",
-        "sha256": "b535d177fc6e8f8908e19b0ff5c1d4a87e3c4d0bf675e05aa2562af1b7853906",
+        "sha256": "482cd5a5196008f984bb43ed0e47cbfdca7373490b62f3b27b3299275bf22a93",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.13.4"
+      "version": "5.14.2"
     },
     "process": {
       "dependency": "transitive",
       "description": {
         "name": "process",
-        "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32",
+        "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.2"
+      "version": "5.0.3"
     },
     "provider": {
       "dependency": "transitive",
@@ -1586,11 +1616,11 @@
       "dependency": "transitive",
       "description": {
         "name": "quill_native_bridge",
-        "sha256": "0b3200c57bb4f1f12d6c764648d42482891f20f12024c75fe3479cafc1e132c9",
+        "sha256": "bda0f0ad9bc160dcdd4bd2b378a7ae8bdb55c3d4b7301bf739d5e3b065ee5e82",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.7.11"
+      "version": "11.0.0"
     },
     "quill_native_bridge_android": {
       "dependency": "transitive",
@@ -1636,11 +1666,11 @@
       "dependency": "transitive",
       "description": {
         "name": "quill_native_bridge_platform_interface",
-        "sha256": "2d71b6c5106db0a4b1d788640d1b949ccdd0e570b5a5e0384f7b28be9630a94a",
+        "sha256": "ea48bd12bf426741747ec8a575b122350971f338a75049099b349c63447582a2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.0.1"
+      "version": "0.0.1+1"
     },
     "quill_native_bridge_web": {
       "dependency": "transitive",
@@ -1787,11 +1817,11 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400",
+        "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.3"
+      "version": "10.1.4"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -1807,31 +1837,31 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82",
+        "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.5.2"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549",
+        "sha256": "a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.4"
+      "version": "2.4.6"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d",
+        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.4"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
@@ -1857,11 +1887,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "shared_preferences_windows": {
       "dependency": "transitive",
@@ -1877,11 +1907,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "simplytranslate",
-        "sha256": "632b78778c5016b51ee3e5af778ad27f90d350d3153993d107fcb51fde1493c8",
+        "sha256": "3137b221b088c589cd68d26192d753a3a6fe314b83d95fc9c96cd0a40b270772",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.1+3"
+      "version": "2.2.2"
     },
     "sky_engine": {
       "dependency": "transitive",
@@ -1893,31 +1923,31 @@
       "dependency": "direct main",
       "description": {
         "name": "slang",
-        "sha256": "e02feadc1291280e755ed01da39817213247295368671da67570e28ac0120aa8",
+        "sha256": "2778b88f05ffc23fd0a37436f607bf2a541d0b6b922e69a8ea5bbd50c2427d18",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.4.1"
     },
     "slang_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "slang_flutter",
-        "sha256": "493456b7c4f842ec2e7519c2358a4653b3198b84e9b2656b03a648f7f3405471",
+        "sha256": "819637a23348adbc4f4e8faee3f274d8908f9af31d57bf1e277cd730b14bacde",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.4.0"
     },
     "source_span": {
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "sprintf": {
       "dependency": "transitive",
@@ -1933,51 +1963,51 @@
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.12.0"
+      "version": "1.12.1"
     },
     "stream_channel": {
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "string_scanner": {
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.1"
     },
     "super_clipboard": {
       "dependency": "direct main",
       "description": {
         "name": "super_clipboard",
-        "sha256": "687ef5d4ceb2cb1e0e36a4af37683936609f424f0767b46fee5fc312b0aeb595",
+        "sha256": "5203c881d24033c3e6154c2ae01afd94e7f0a3201280373f28e540f1defa3f40",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.0-dev.5"
+      "version": "0.9.0-dev.6"
     },
     "super_native_extensions": {
       "dependency": "transitive",
       "description": {
         "name": "super_native_extensions",
-        "sha256": "1cb6baecf529300ae7f59974bdc33a53b947ecc4ce374c00126df064c10e4e51",
+        "sha256": "09ccc40c475e6f91770eaeb2553bf4803812d7beadc3759aa57d643370619c86",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.0-dev.5"
+      "version": "0.9.0-dev.6"
     },
     "sync_http": {
       "dependency": "transitive",
@@ -1993,31 +2023,31 @@
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
+        "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0+3"
+      "version": "3.3.1"
     },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
+        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.7.4"
     },
     "timezone": {
       "dependency": "transitive",
@@ -2123,21 +2153,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.0"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.4"
     },
     "uuid": {
       "dependency": "transitive",
@@ -2153,21 +2183,21 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7",
+        "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.15"
+      "version": "1.1.18"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_codec",
-        "sha256": "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb",
+        "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.12"
+      "version": "1.1.13"
     },
     "vector_graphics_compiler": {
       "dependency": "transitive",
@@ -2203,21 +2233,21 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
+        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.0"
+      "version": "14.3.1"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "web": {
       "dependency": "transitive",
@@ -2243,11 +2273,11 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69",
+        "sha256": "b89e6e24d1454e149ab20fbb225af58660f0c0bf4475544650700d8e2da54aef",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.9.0"
+      "version": "5.11.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -2333,21 +2363,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     },
     "yaru": {
       "dependency": "direct main",
       "description": {
         "name": "yaru",
-        "sha256": "afc659f78a0bef5e06ebbbd516979afceca7526b7703daa444bf419a54b2dc85",
+        "sha256": "f149399d81ecd3d20bfcc79afd5ddd9bcd7e4c901d5e602a8577fe59c71c8617",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.3.2"
+      "version": "7.0.0"
     },
     "yaru_window": {
       "dependency": "transitive",
@@ -2401,7 +2431,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.6.0-0 <4.0.0",
-    "flutter": ">=3.24.3"
+    "dart": ">=3.7.0 <4.0.0",
+    "flutter": ">=3.29.0"
   }
 }

From 123ae57041b56b40685b7c752df51714f25fbf38 Mon Sep 17 00:00:00 2001
From: Yongun Seong <nevivurn@nevi.dev>
Date: Sat, 29 Mar 2025 22:39:09 +0900
Subject: [PATCH 050/489] kavita: 0.8.4.2 -> 0.8.5.11

---
 pkgs/servers/web-apps/kavita/default.nix     |   18 +-
 pkgs/servers/web-apps/kavita/nuget-deps.json | 1017 +++++++-----------
 2 files changed, 399 insertions(+), 636 deletions(-)

diff --git a/pkgs/servers/web-apps/kavita/default.nix b/pkgs/servers/web-apps/kavita/default.nix
index ef9d3232e875..855a733a363b 100644
--- a/pkgs/servers/web-apps/kavita/default.nix
+++ b/pkgs/servers/web-apps/kavita/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  fetchpatch2,
   buildDotnetModule,
   buildNpmPackage,
   dotnetCorePackages,
@@ -10,13 +11,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "kavita";
-  version = "0.8.4.2";
+  version = "0.8.5.11";
 
   src = fetchFromGitHub {
     owner = "kareadita";
     repo = "kavita";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-iJ9ocTWcKSUvgN48s5a2N2tz83uid2N4vg1bHAQmnH4=";
+    hash = "sha256-HSVdEB0yhmm/SZseHQ5kTRBaVqCZZx934Ovq1pTmQkM=";
   };
 
   backend = buildDotnetModule {
@@ -32,6 +33,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       # On update: check if more migrations need to be restored!
       # Migrations should at least allow updates from previous NixOS versions
       ./restore-migrations.diff
+      # Our nixos test depends on /api/locale; this patch fixes an upstream bug where the first response always fails
+      # https://github.com/Kareadita/Kavita/pull/3686 remove once upstream is fixed
+      (fetchpatch2 {
+        name = "fix-locale-cache.patch";
+        url = "https://github.com/Kareadita/Kavita/commit/5af07b9525c2164a6548092244bbdf66815b3e95.patch?full_index=1";
+        hash = "sha256-aFZRxijAbA2mXJM+3kC4P4p76d0p5fEXLiaRhNmjOAA=";
+      })
     ];
     postPatch = ''
       substituteInPlace API/Services/DirectoryService.cs --subst-var out
@@ -44,8 +52,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     projectFile = "API/API.csproj";
     nugetDeps = ./nuget-deps.json;
-    dotnet-sdk = dotnetCorePackages.sdk_8_0;
-    dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+    dotnet-sdk = dotnetCorePackages.sdk_9_0;
+    dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
   };
 
   frontend = buildNpmPackage {
@@ -57,7 +65,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     npmBuildScript = "prod";
     npmFlags = [ "--legacy-peer-deps" ];
     npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent playwright from trying to install browsers
-    npmDepsHash = "sha256-ttEAoLg8OmA4lA7IJS4+5QwpMJdFIoJrWZryFhTZUdI=";
+    npmDepsHash = "sha256-9SfiH567+q3Id6/7pqWeX0y934V2YFQ4EWIJ+66smgI=";
   };
 
   dontBuild = true;
diff --git a/pkgs/servers/web-apps/kavita/nuget-deps.json b/pkgs/servers/web-apps/kavita/nuget-deps.json
index 23a141deb399..263289860b7f 100644
--- a/pkgs/servers/web-apps/kavita/nuget-deps.json
+++ b/pkgs/servers/web-apps/kavita/nuget-deps.json
@@ -11,13 +11,13 @@
   },
   {
     "pname": "BouncyCastle.Cryptography",
-    "version": "2.4.0",
-    "hash": "sha256-DoDZNWtYM+0OLIclOEZ+tjcGXymGlXvdvq2ZMPmiAJA="
+    "version": "2.5.0",
+    "hash": "sha256-4JTx7QKSu3BE7kPuspN1KK2LtA9BWKLHZRLfOBEzWHY="
   },
   {
     "pname": "Cronos",
-    "version": "0.8.4",
-    "hash": "sha256-L9rLcqnQybPoJCcg60h49bjXfqEarM9SFHqOJUMvxz8="
+    "version": "0.9.0",
+    "hash": "sha256-yDYBfqSXqvT/VPUf6UT3XOgqqPmOMYqhjCBxpF5i15c="
   },
   {
     "pname": "CsvHelper",
@@ -51,28 +51,23 @@
   },
   {
     "pname": "Flurl",
-    "version": "3.0.6",
-    "hash": "sha256-PqpYY1vlXC/tbpelm+sH81gYzClT32CGvG4+8NSiAvk="
-  },
-  {
-    "pname": "Flurl",
-    "version": "3.0.7",
-    "hash": "sha256-Jnxss3qPP8KCJMnoDrMXwsEC5WX773HKpFh4Lck5psQ="
+    "version": "4.0.0",
+    "hash": "sha256-qCbO6ELAw+OP/RyrJhrxys5b+Kk2xR4RbzpLOsZYheg="
   },
   {
     "pname": "Flurl.Http",
-    "version": "3.2.4",
-    "hash": "sha256-s3DKhQu+iHTHBH890eSfMbNsElPutHKOjUhEl3NQ5W4="
+    "version": "4.0.2",
+    "hash": "sha256-V1tlyjoCB9ZyTiwEV3ZYiSP/0q2R2+bqRI+wZLVJATA="
   },
   {
     "pname": "Hangfire",
-    "version": "1.8.15",
-    "hash": "sha256-42y8ywFu5cPD9qN4bM4Pa8/W1H0B+xKxPDPg5z22oug="
+    "version": "1.8.18",
+    "hash": "sha256-Ty2nF3qL5VQyZZcAaCBuBVohT7eMtwrKwFSv9TZCx0k="
   },
   {
     "pname": "Hangfire.AspNetCore",
-    "version": "1.8.15",
-    "hash": "sha256-LSSGantQQrOf7DPUQitrUyVAfNxyAKo+dWLZ3F59gM4="
+    "version": "1.8.18",
+    "hash": "sha256-tQx6bh68ZJk+kG2d3hszAzAY+9yPzoNqvlfgccsXfxc="
   },
   {
     "pname": "Hangfire.Core",
@@ -86,8 +81,8 @@
   },
   {
     "pname": "Hangfire.Core",
-    "version": "1.8.15",
-    "hash": "sha256-jnHP60tTlWbpHNZ5hIlYTrQ6uyFtBsUqJliw6tJF3EQ="
+    "version": "1.8.18",
+    "hash": "sha256-erTLLsfI1Vo58zke9qqI1n2PCFqCGBoH0J0/f+WCwnQ="
   },
   {
     "pname": "Hangfire.InMemory",
@@ -101,13 +96,13 @@
   },
   {
     "pname": "Hangfire.NetCore",
-    "version": "1.8.15",
-    "hash": "sha256-l99cRfSCnDlFrhRWRDqJMWf9Hy0DjiVCsiYz6eLFEHA="
+    "version": "1.8.18",
+    "hash": "sha256-pensGJ3OJTydVhi5ziaVPCKNpOe9EMlimohtFmBw0bo="
   },
   {
     "pname": "Hangfire.SqlServer",
-    "version": "1.8.15",
-    "hash": "sha256-aIYnrHvJQtrOPJj15ltOOPgDk2kj1KdMYfd0bjbieME="
+    "version": "1.8.18",
+    "hash": "sha256-mirQEgFPCXdvxE9XqXGUDizjixAlkUZ6WSJIk0Ovpuc="
   },
   {
     "pname": "Hangfire.Storage.SQLite",
@@ -116,8 +111,8 @@
   },
   {
     "pname": "HtmlAgilityPack",
-    "version": "1.11.70",
-    "hash": "sha256-V/SI2N1+jNkwjSQRd2Y/XVVhdOKvSNz3/NeIFE9V3wY="
+    "version": "1.11.74",
+    "hash": "sha256-kp9Hd6H6YfVI8xGOQXTcpcLXDen85tzI423vsJkL6Zo="
   },
   {
     "pname": "Humanizer.Core",
@@ -126,8 +121,8 @@
   },
   {
     "pname": "MailKit",
-    "version": "4.8.0",
-    "hash": "sha256-ONvrVOwjxyNrIQM8FMzT5mLzlU56Kc8oOwkzegNAiXM="
+    "version": "4.10.0",
+    "hash": "sha256-LnpMn+yD5gWrEmZ8dsHf80aBV1KM508uM91C4TftPsk="
   },
   {
     "pname": "MarkdownDeep.NET.Core",
@@ -136,168 +131,183 @@
   },
   {
     "pname": "Microsoft.AspNetCore.Authentication.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-0JcJYAoU+AEM0dWaXk2qnqxrVM0Ak9/ntCU1MC90R24="
+    "version": "2.3.0",
+    "hash": "sha256-UwMVhuE3TBEO7G0QJrghhYrgkYw2p9WR87yHQ1ty2RI="
   },
   {
     "pname": "Microsoft.AspNetCore.Authentication.JwtBearer",
-    "version": "8.0.10",
-    "hash": "sha256-FNUdNGdNG/a1PAFh9SADmCF0h8+Be4r/Q3izKML3tas="
+    "version": "9.0.2",
+    "hash": "sha256-X/n1/FojwBdgJpAwgfUjTzt6sStEsjTX5KyZWXm1cGA="
   },
   {
     "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect",
-    "version": "8.0.10",
-    "hash": "sha256-Ygtk026vu/i9ZoxrLGSiDNmDZqCJBwsvM9jNpJz9IPU="
+    "version": "9.0.2",
+    "hash": "sha256-xqyfZOksphmvaN71bM5on4xf8usOSiKvGZ1j8F250IE="
   },
   {
     "pname": "Microsoft.AspNetCore.Authorization",
-    "version": "2.2.0",
-    "hash": "sha256-PaMYICjQ0rprUv53Uza/jQvvWTcbPjGLMMp12utF+NY="
+    "version": "2.3.0",
+    "hash": "sha256-UbxzeOIh76eCOMgC8A92KwfgOAljyT0k8En+l4PZDtA="
   },
   {
     "pname": "Microsoft.AspNetCore.Authorization.Policy",
-    "version": "2.2.0",
-    "hash": "sha256-onFYB+jtCbGyfZsIglReCPRdDMmwah2EDMhJN4uBP7Q="
+    "version": "2.3.0",
+    "hash": "sha256-nMV4Yt6810pXITTxMysPIpfenu+3AnY7jq2LkPrkV00="
   },
   {
     "pname": "Microsoft.AspNetCore.Connections.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-MoieWAe7zT/0a7PAn3gMKO8YpHTbOtiGIwF/sFAmieY="
+    "version": "2.3.0",
+    "hash": "sha256-qvA9LDr8vOLaERoxia/KRnVmf2q15n7OHKNsBY6t6xw="
   },
   {
     "pname": "Microsoft.AspNetCore.Cryptography.Internal",
-    "version": "8.0.10",
-    "hash": "sha256-zR9xbcGD4yU/oo/c9dQ4AKTMFT+HSBsfu0oNV6bjPNo="
+    "version": "9.0.2",
+    "hash": "sha256-rGpA88L92YFSNeMZCoO74QTGOpmcgNqhYJ6norXX3eU="
   },
   {
     "pname": "Microsoft.AspNetCore.Cryptography.KeyDerivation",
-    "version": "8.0.10",
-    "hash": "sha256-S4klWSZI+QeQkXNXnzr91JMyKCmWSekqV1tvlFgHljo="
+    "version": "9.0.2",
+    "hash": "sha256-crQVw+JYWjOshBokx2W5fUEa+6oitZIJKEhXIsDg70g="
   },
   {
     "pname": "Microsoft.AspNetCore.Hosting.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-GzqYrTqCCVy41AOfmgIRY1kkqxekn5T0gFC7tUMxcxA="
+    "version": "2.3.0",
+    "hash": "sha256-gtiRMQA5kO1biIVaBLjSq0/jVVpiI8WzS136z/Ex1zs="
   },
   {
     "pname": "Microsoft.AspNetCore.Hosting.Server.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-8PnZFCkMwAeEHySmmjJOnQvOyx2199PesYHBnfka51s="
+    "version": "2.3.0",
+    "hash": "sha256-ltKZ02L3cXu2dCx1JGEt1X8gQgwTABn45QkBsREYxaw="
   },
   {
     "pname": "Microsoft.AspNetCore.Http",
-    "version": "2.2.0",
-    "hash": "sha256-+ARZomTXSD1m/PR3TWwifXb67cQtoqDVWEqfoq5Tmbk="
+    "version": "2.3.0",
+    "hash": "sha256-ubPGvFwMjXbydY1gzo/m31pWq5/SsS/tGRtOotHFfBU="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-y3j3Wo9Xl7kUdGkfnUc8Wexwbc2/vgxy7c3fJk1lSI8="
+    "version": "2.3.0",
+    "hash": "sha256-NrAFzk5IcxmeRk3Zu+rLcq0+KKiAYfygJbAdIt2Zpfk="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Connections",
-    "version": "1.1.0",
-    "hash": "sha256-mPo2jkfWmeA1yz87Vv/jwWMOkHFR+yPHNntkJShDkA8="
+    "version": "1.2.0",
+    "hash": "sha256-uev0FzYG2Ppl09h//B3BFxooD0uRm0ENO2jgOsABedM="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Connections.Common",
-    "version": "1.1.0",
-    "hash": "sha256-PooDjJHsIcZkL2IOp530pJr4GLGlre2sIdboNRrAcHQ="
+    "version": "1.2.0",
+    "hash": "sha256-eXIg7vJSl1x0xWcxTKmgUiGRJnEfnp/TEe0xqL0629w="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Extensions",
-    "version": "2.2.0",
-    "hash": "sha256-1rXxGQnkNR+SiNMtDShYoQVGOZbvu4P4ZtWj5Wq4D4U="
+    "version": "2.3.0",
+    "hash": "sha256-sOVwC5wK5w85R+HbYkBlfPpmknyAEig3g0uVnTSGwhI="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Features",
-    "version": "2.2.0",
-    "hash": "sha256-odvntHm669YtViNG5fJIxU4B+akA2SL8//DvYCLCNHc="
+    "version": "2.3.0",
+    "hash": "sha256-QkNFS3ScDLyt0XppATSogbF1raSQJN+wStcnAsSoUJw="
   },
   {
     "pname": "Microsoft.AspNetCore.Identity.EntityFrameworkCore",
-    "version": "8.0.10",
-    "hash": "sha256-1Tpim7X/sglHkUMP3R07jioVgcy+4C+hKWf8FKusnBo="
+    "version": "9.0.2",
+    "hash": "sha256-0AAxLKe2QwrfdGzBVWImKYSZyz8JLEErjf+/vFVVYzU="
   },
   {
     "pname": "Microsoft.AspNetCore.Routing",
-    "version": "2.2.0",
-    "hash": "sha256-mvsF973Cm48XUB6lPBiGp7U7vkfBjB3oILdnIQUwe4o="
+    "version": "2.3.0",
+    "hash": "sha256-bXrYeVgI+sm2e5eOCwOkdWyCf5b7dQ8kv+pJRaeLiHI="
   },
   {
     "pname": "Microsoft.AspNetCore.Routing.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-nqJjxKXkdPAY1XvQjIRNW2y855Xi+LAX1S5AncPnPDU="
+    "version": "2.3.0",
+    "hash": "sha256-pSPpwAU/zEidmBcRjSuz71fs5CIBRWF8yp/ujsIBXok="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR",
-    "version": "1.1.0",
-    "hash": "sha256-VCTxQAWRKBk640FhkGu4XUcfWXWSV8x4jEfezDoM4Jo="
+    "version": "1.2.0",
+    "hash": "sha256-83ogiJwoHL0XBOnGFQYopGTlzEyen1ep4aXesWSl/sg="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Common",
-    "version": "1.1.0",
-    "hash": "sha256-XSltgjH11X4a1mhtcVHR7dL4EOpbIZ/oWfP587jBzD0="
+    "version": "1.2.0",
+    "hash": "sha256-ULMhoU12HCOE6BMAjdZpsbgIPGjtHeggnn7RkyPHmag="
   },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Core",
     "version": "1.1.0",
     "hash": "sha256-8NYrz6J0cVF+eBW/2B6oObwtD82Ze74H6TV+a1xRPtM="
   },
+  {
+    "pname": "Microsoft.AspNetCore.SignalR.Core",
+    "version": "1.2.0",
+    "hash": "sha256-FbLZ4BbD5wYOoEyfqZ9C7Y5hJldXlbm1q3QJlkxgp68="
+  },
   {
     "pname": "Microsoft.AspNetCore.SignalR.Protocols.Json",
-    "version": "1.1.0",
-    "hash": "sha256-JIG9czeHrRRruPNNOYF/ct8fQSGDzbePG4Dfn9dYnn0="
+    "version": "1.2.0",
+    "hash": "sha256-j2oYNJEX9r4owDiHMI83cglxkyP5Gty0Y0aFzA7avBo="
   },
   {
     "pname": "Microsoft.AspNetCore.WebSockets",
-    "version": "2.2.0",
-    "hash": "sha256-YxlVwhhqRtABF9BAxlJJFITcMUf1w6m45Br2Qto0MUI="
+    "version": "2.3.0",
+    "hash": "sha256-D3h1Im37SQlDnIl3LiKb7Roje34qPeaRoeP3nEm0p3Y="
   },
   {
     "pname": "Microsoft.AspNetCore.WebUtilities",
-    "version": "2.2.0",
-    "hash": "sha256-UdfOwSWqOUXdb0mGrSMx6Z+d536/P+v5clSRZyN5QTM="
+    "version": "2.3.0",
+    "hash": "sha256-oJMEP44Q9ClhbyZUPtSb9jqQyJJ/dD4DHElRvkYpIOo="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "6.0.0",
-    "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
+    "version": "7.0.0",
+    "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="
   },
   {
-    "pname": "Microsoft.Bcl.TimeProvider",
-    "version": "8.0.1",
-    "hash": "sha256-TQRaWjk1aZu+jn/rR8oOv8BJEG31i6mPkf3BkIR7C+c="
+    "pname": "Microsoft.Build.Framework",
+    "version": "16.10.0",
+    "hash": "sha256-Sj41LE1YQ/NfOdiDf5YnZgWSwGOzQ2uVvP1LgF/HSJ0="
+  },
+  {
+    "pname": "Microsoft.Build.Framework",
+    "version": "17.8.3",
+    "hash": "sha256-Rp4dN8ejOXqclIKMUXYvIliM6IYB7WMckMLwdCbVZ34="
+  },
+  {
+    "pname": "Microsoft.Build.Locator",
+    "version": "1.7.8",
+    "hash": "sha256-VhZ4jiJi17Cd5AkENXL1tjG9dV/oGj0aY67IGYd7vNs="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.3.3",
-    "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="
+    "version": "3.3.4",
+    "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "4.5.0",
-    "hash": "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I="
+    "version": "4.8.0",
+    "hash": "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "4.5.0",
-    "hash": "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="
+    "version": "4.8.0",
+    "hash": "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
-    "version": "4.5.0",
-    "hash": "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="
+    "version": "4.8.0",
+    "hash": "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Workspaces.Common",
-    "version": "4.5.0",
-    "hash": "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="
+    "version": "4.8.0",
+    "hash": "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM="
   },
   {
-    "pname": "Microsoft.CSharp",
-    "version": "4.0.1",
-    "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="
+    "pname": "Microsoft.CodeAnalysis.Workspaces.MSBuild",
+    "version": "4.8.0",
+    "hash": "sha256-hxpMKC6OF8OaIiSZhAgJ+Rw7M8nqS6xHdUURnRRxJmU="
   },
   {
     "pname": "Microsoft.CSharp",
@@ -306,43 +316,43 @@
   },
   {
     "pname": "Microsoft.Data.Sqlite.Core",
-    "version": "8.0.10",
-    "hash": "sha256-YBjY88KAC4ShfcGXcNHL6y1A9NH2xvk4d/qTMfuLuoE="
+    "version": "9.0.2",
+    "hash": "sha256-ZUVDe+oy7fAWcnQDRdhkVeN7YZkJewwqBNaxdZcykiM="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore",
-    "version": "8.0.10",
-    "hash": "sha256-kj/PFfEdCxygb8AYuD0U6F1VPo7jBicxC3N3p/U74rM="
+    "version": "9.0.2",
+    "hash": "sha256-ew+vhHqu+4Hgc5xKiIwEHYWD8dsXqtHmu8Ctre5MrXc="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Abstractions",
-    "version": "8.0.10",
-    "hash": "sha256-OwqqkvChI8qSIabo17MNmcWyby6TT5ZXv5cnOeyVFGw="
+    "version": "9.0.2",
+    "hash": "sha256-FNTvIJPkG6jlEE+3p4/qeL7NPDKNDgDCYlIrSn1gQ4E="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Analyzers",
-    "version": "8.0.10",
-    "hash": "sha256-8qxvGV3dQMM8vGxEi7YqOimfWDQYFp3QVMNe3ryiO7g="
+    "version": "9.0.2",
+    "hash": "sha256-qXwOxUCeg4b4NSLFD3Ws/D161uQoozM+EiBThp7IeBY="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Design",
-    "version": "8.0.10",
-    "hash": "sha256-Nbwn3aeVyDl7rGftchEzFcqnTNkvArqKafaarQiCWQw="
+    "version": "9.0.2",
+    "hash": "sha256-f5LMTlXnb13wKQOofCJJ+TyEPOnHi9FpTaHaiYwJF80="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
-    "version": "8.0.10",
-    "hash": "sha256-n9xRg8WYjNLB92wMVNL/I5D3AKvtM9w0ICJ+Tieq5VQ="
+    "version": "9.0.2",
+    "hash": "sha256-IGc3xy455dFu+z6M0Vaqqm09VXehb/XFquOgtpTLcGk="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite",
-    "version": "8.0.10",
-    "hash": "sha256-Y0OghTa4r7VSV3jE8ZXzP8zU2eIDx/9CLAnPoNzP+vE="
+    "version": "9.0.2",
+    "hash": "sha256-ucYyVaLWpRk6Xl0OtX9qp8Nr0gktElgIML5b/JPItX4="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core",
-    "version": "8.0.10",
-    "hash": "sha256-NYoX3vaq687M1VfJWBMzItsBqSuRPnrL/IOIRpy6W9c="
+    "version": "9.0.2",
+    "hash": "sha256-LqWVpwwj837DHoQuk/aq78Y9lwD/oWDJAxwLNdYN1No="
   },
   {
     "pname": "Microsoft.Extensions.ApiDescription.Server",
@@ -351,13 +361,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="
+    "version": "9.0.2",
+    "hash": "sha256-fSHzO0OgH+bSuq7vxMhe8gw17Cx2ouMLen9IsJAOD7c="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "8.0.1",
-    "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps="
+    "version": "9.0.2",
+    "hash": "sha256-QBqH+WqnJrzjLFekeu8yCGyRBRfiMUPihfhLi+Wtm7w="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
@@ -365,29 +375,29 @@
     "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
   },
   {
-    "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-5Jjn+0WZQ6OiN8AkNlGV0XIaw8L+a/wAq9hBD88RZbs="
+    "pname": "Microsoft.Extensions.Configuration",
+    "version": "9.0.2",
+    "hash": "sha256-AUNaLhYTcHUkqKGhSL7QgrifV9JkjKhNQ4Ws8UtZhlM="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
     "version": "3.0.0",
     "hash": "sha256-GJDvt3qFAif5ToFjHgs8imCaUER7yvYJghnlYXiHrHU="
   },
-  {
-    "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "6.0.0",
-    "hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="
-  },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
     "version": "8.0.0",
     "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
   },
   {
-    "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "6.0.0",
-    "hash": "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y="
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "9.0.0",
+    "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "9.0.2",
+    "hash": "sha256-icRtfbi0nDRUYDErtKYx0z6A1gWo5xdswsSM6o4ozxc="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
@@ -399,45 +409,45 @@
     "version": "8.0.2",
     "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="
   },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "9.0.0",
+    "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "9.0.2",
+    "hash": "sha256-lYWUfvSnpp9M4N4wIfFnMlB+8K79g9uUa1NXsgnxs0k="
+  },
   {
     "pname": "Microsoft.Extensions.Configuration.CommandLine",
-    "version": "8.0.0",
-    "hash": "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="
+    "version": "9.0.2",
+    "hash": "sha256-qsEwiAO/n2+k8Q8/AftqdSlvvQWDx7WKb+9VlP8Nuxw="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
-    "version": "8.0.0",
-    "hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="
+    "version": "9.0.2",
+    "hash": "sha256-XgSdv8+zh2vXmhP+a31/+Y+mNLwQwLflfCiEtDemea0="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.FileExtensions",
-    "version": "8.0.1",
-    "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA="
+    "version": "9.0.2",
+    "hash": "sha256-eeZbwf2lcV74mjXtOX8q0MxvP4QzEYyHXr1EGFS/orU="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
-    "version": "8.0.1",
-    "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig="
+    "version": "9.0.2",
+    "hash": "sha256-7/ewyjh0gXu798fYcJxOCkdaAPIzrJ8reuTzqz93IJ0="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.UserSecrets",
-    "version": "8.0.1",
-    "hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0="
+    "version": "9.0.2",
+    "hash": "sha256-0OmAQn8gIqTPN4s0NkcidXivjq5LsEGiNVxmp3qxGoo="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "8.0.1",
-    "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "2.0.0",
-    "hash": "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="
+    "version": "9.0.2",
+    "hash": "sha256-jNQVj2Xo7wzVdNDu27bLbYCVUOF8yDVrFtC3cZ9OsXo="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -464,6 +474,16 @@
     "version": "8.0.2",
     "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
   },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "9.0.0",
+    "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "9.0.2",
+    "hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM="
+  },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
     "version": "3.1.6",
@@ -471,28 +491,28 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "8.0.2",
-    "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q="
+    "version": "9.0.0",
+    "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyModel",
+    "version": "9.0.2",
+    "hash": "sha256-KqR0yrNi7S8rDje4RYjTEC98XG0rBreO4wkHGO6Llks="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics",
-    "version": "8.0.1",
-    "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="
+    "version": "9.0.2",
+    "hash": "sha256-ImTZ6PZyKEdq1XvqYT5DPr6cG0BSTrsrO7rTDuy29fc="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="
+    "version": "9.0.0",
+    "hash": "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "8.0.1",
-    "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="
-  },
-  {
-    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-pLAxP15+PncMiRrUT5bBAhWg7lC6/dfQk5TLTpZzA7k="
+    "version": "9.0.2",
+    "hash": "sha256-JTJ8LCW3aYUO86OPgXRQthtDTUMikOfILExgeOF8CX4="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
@@ -504,145 +524,135 @@
     "version": "8.0.0",
     "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="
   },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
+    "version": "9.0.0",
+    "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
+    "version": "9.0.2",
+    "hash": "sha256-RmVshMCWW1/RE/Wk8AeT4r6uZ+XFuwDFYzdxYKSm440="
+  },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
-    "version": "8.0.0",
-    "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="
+    "version": "9.0.2",
+    "hash": "sha256-vQBgVLW813wOnJ1+943ArDWReok6p0jAl7fhwvyFtL8="
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "8.0.0",
-    "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="
+    "version": "9.0.2",
+    "hash": "sha256-oH6X8SQjqi5Q2HLRILcUr9iPqnC1Ky5m5GbYYCKCxag="
   },
   {
     "pname": "Microsoft.Extensions.Hosting",
-    "version": "8.0.1",
-    "hash": "sha256-FFLo6em0N2vaWg6//vaQhxoOgT9LLH5Y2KWkCeX5xQ4="
-  },
-  {
-    "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-YZcyKXL6jOpyGrDbFLu46vncfUw2FuqhclMdbEPuh/U="
+    "version": "9.0.2",
+    "hash": "sha256-eI9ckarRX0UCX+mBsEBYdvHZrmN86bXyTRvbH4gU9JM="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
     "version": "3.0.0",
     "hash": "sha256-iUMCRR9uHSoub48MboewTxokP5QwrC47X5t+C+JUMo4="
   },
-  {
-    "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="
-  },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
     "version": "8.0.1",
     "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA="
   },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "9.0.0",
+    "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "9.0.2",
+    "hash": "sha256-PUCam4g5g84qIqfPA9sVBNVPA26rWFq7js9nHF3WLZc="
+  },
   {
     "pname": "Microsoft.Extensions.Identity.Core",
-    "version": "8.0.10",
-    "hash": "sha256-vL4KIPHHCWfTJp+aozejVqLuDw1MK9Fw6LFyfRxnY1s="
+    "version": "9.0.2",
+    "hash": "sha256-5aLS+VE+FqHozXW4qFu5gyGpV8HqIfGzRnUV/zXM2/Q="
   },
   {
     "pname": "Microsoft.Extensions.Identity.Stores",
-    "version": "8.0.10",
-    "hash": "sha256-Z6GZXZiheTcxi4GuGqP4DtqtVuEchI66IlX2UAyqxMU="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging",
-    "version": "2.0.0",
-    "hash": "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo="
+    "version": "9.0.2",
+    "hash": "sha256-Em/aKN8WTmwg79RdK6+QDx1iVTR0qCK6/f54GW2HCjo="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
     "version": "6.0.0",
     "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="
   },
-  {
-    "pname": "Microsoft.Extensions.Logging",
-    "version": "8.0.0",
-    "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="
-  },
   {
     "pname": "Microsoft.Extensions.Logging",
     "version": "8.0.1",
     "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="
   },
   {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "2.0.0",
-    "hash": "sha256-cBBNcoREIdCDnwZtnTG+BoAFmVb71P1nhFOAH07UsfQ="
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "9.0.0",
+    "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
   },
   {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-lJeKyhBnDc4stX2Wd7WpcG+ZKxPTFHILZSezKM2Fhws="
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "9.0.2",
+    "hash": "sha256-vPCb4ZoiwZUSGJIOhYiLwcZLnsd0ZZhny6KQkT88nI0="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "3.0.0",
     "hash": "sha256-p70uTENWQc0J7ibLHlRHWk3RYZg0DMP3g2m4kAUaoxA="
   },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "6.0.0",
-    "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
-  },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "8.0.2",
     "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
   },
   {
-    "pname": "Microsoft.Extensions.Logging.Configuration",
-    "version": "8.0.0",
-    "hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "9.0.0",
+    "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "9.0.2",
+    "hash": "sha256-mCxeuc+37XY0bmZR+z4p1hrZUdTZEg+FRcs/m6dAQDU="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
     "version": "8.0.1",
     "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging.Configuration",
+    "version": "9.0.2",
+    "hash": "sha256-SeNQ8us2cZ8xbJx8TK7xm3IxQR95EanSfMYhqvP2pWU="
+  },
   {
     "pname": "Microsoft.Extensions.Logging.Console",
-    "version": "8.0.1",
-    "hash": "sha256-2thhF1JbDNj3Bx2fcH7O26uHGNeMd9MYah6N60lIpIU="
+    "version": "9.0.2",
+    "hash": "sha256-yD30lW3ax4JHmZ9QIp1b0ELrXiwykP5KHF/feJGweyE="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Debug",
-    "version": "8.0.1",
-    "hash": "sha256-gKFqBg5lbjy5VBEcAuoQ/SsXAxvrYdBYOu9dV60eJKg="
+    "version": "9.0.2",
+    "hash": "sha256-0WP9jFTsbXCIhYx/2IFL69mv2+K3Ld7C4QvwY00iOD0="
   },
   {
     "pname": "Microsoft.Extensions.Logging.EventLog",
-    "version": "8.0.1",
-    "hash": "sha256-1UkEOwl3Op2b3jTvpI10hHxIe9FqeVVy+VB1tZp6Lc8="
+    "version": "9.0.2",
+    "hash": "sha256-e4q/Z6xLq2HzQiKI7npagyEZdkfUe+FbIz3Tg+hPH9g="
   },
   {
     "pname": "Microsoft.Extensions.Logging.EventSource",
-    "version": "8.0.1",
-    "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA="
+    "version": "9.0.2",
+    "hash": "sha256-W7yidllNOKxTvgIUqjJ3h55PAIR/XREfbuH+8TUhD0o="
   },
   {
     "pname": "Microsoft.Extensions.ObjectPool",
-    "version": "2.2.0",
-    "hash": "sha256-P+QUM50j/V8f45zrRqat8fz6Gu3lFP+hDjESwTZNOFg="
-  },
-  {
-    "pname": "Microsoft.Extensions.Options",
-    "version": "2.0.0",
-    "hash": "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw="
-  },
-  {
-    "pname": "Microsoft.Extensions.Options",
-    "version": "2.2.0",
-    "hash": "sha256-YBtPoWBEs+dlHPQ7qOmss+U9gnvG0T1irZY8NwD0QKw="
+    "version": "8.0.11",
+    "hash": "sha256-xutYzUA86hOg0NfLcs/NPylKvNcNohucY1LpSEkkaps="
   },
   {
     "pname": "Microsoft.Extensions.Options",
@@ -659,6 +669,16 @@
     "version": "8.0.2",
     "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
   },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "9.0.0",
+    "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "9.0.2",
+    "hash": "sha256-y2jZfcWx/H6Sx7wklA248r6kPjZmzTTLGxW8ZxrzNLM="
+  },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
     "version": "6.0.0",
@@ -670,19 +690,9 @@
     "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
   },
   {
-    "pname": "Microsoft.Extensions.Primitives",
-    "version": "2.0.0",
-    "hash": "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="
-  },
-  {
-    "pname": "Microsoft.Extensions.Primitives",
-    "version": "2.2.0",
-    "hash": "sha256-DMCTC3HW+sHaRlh/9F1sDwof+XgvVp9IzAqzlZWByn4="
-  },
-  {
-    "pname": "Microsoft.Extensions.Primitives",
-    "version": "3.0.0",
-    "hash": "sha256-cwlj0X19gngcOB7kpODhF/h96/L6psMLBIOd2pf3CbU="
+    "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
+    "version": "9.0.2",
+    "hash": "sha256-xOYLRlXDI4gMEoQ+J+sQBNRT2RPDNrSCZkob7qBiV10="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
@@ -695,49 +705,49 @@
     "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
   },
   {
-    "pname": "Microsoft.IdentityModel.Abstractions",
-    "version": "7.1.2",
-    "hash": "sha256-QN2btwsc8XnOp8RxwSY4ntzpqFIrWRZg6ZZEGBZ6TQY="
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "9.0.0",
+    "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "9.0.2",
+    "hash": "sha256-zy/YNMaY47o6yNv2WuYiAJEjtoOF8jlWgsWHqXeSm4s="
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
-    "version": "8.2.0",
-    "hash": "sha256-e+BmN/Et9mTqWt4M38udL47M4wHHs25Ob299gJSBZIM="
+    "version": "8.6.0",
+    "hash": "sha256-0mXOkDKvUikcyCMUcmA7PWl4RlAwwUciKSqTTgLDa3o="
   },
   {
     "pname": "Microsoft.IdentityModel.JsonWebTokens",
-    "version": "8.2.0",
-    "hash": "sha256-tOzI2GmMISuWO/vDtJIeKmYAaFPYjrB5NhpzCWWcIw4="
+    "version": "8.6.0",
+    "hash": "sha256-Wey0xjL0n6NCi4HiVFGcDS6+ONPp+ogzb5ZTF7sFt3k="
   },
   {
     "pname": "Microsoft.IdentityModel.Logging",
-    "version": "7.1.2",
-    "hash": "sha256-6M7Y1u2cBVsO/dP+qrgkMLisXbZgMgyWoRs5Uq/QJ/o="
-  },
-  {
-    "pname": "Microsoft.IdentityModel.Logging",
-    "version": "8.2.0",
-    "hash": "sha256-JdrIo2Dg9UPu/eK5TIPKLWfRmvPGhKZrBCQL+MIv72I="
+    "version": "8.6.0",
+    "hash": "sha256-4M4EUJDMDgmqdBxlbptnrLNWOLbmzatypDpl30CBUlk="
   },
   {
     "pname": "Microsoft.IdentityModel.Protocols",
-    "version": "7.1.2",
-    "hash": "sha256-6OXP0vQ6bQ3Xvj3I73eqng6NqqMC4htWKuM8cchZhWI="
+    "version": "8.0.1",
+    "hash": "sha256-v3DIpG6yfIToZBpHOjtQHRo2BhXGDoE70EVs6kBtrRg="
   },
   {
     "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect",
-    "version": "7.1.2",
-    "hash": "sha256-cAwwCti+/ycdjqNy8PrBNEeuF7u5gYtCX8vBb2qIKRs="
+    "version": "8.0.1",
+    "hash": "sha256-ZHKaZxqESk+OU1SFTFGxvZ71zbdgWqv1L6ET9+fdXX0="
   },
   {
     "pname": "Microsoft.IdentityModel.Tokens",
-    "version": "7.1.2",
-    "hash": "sha256-qf8y8KCo1ysrK+jCrnR+ARHwlfMWPXLxe7a41FVg4OA="
+    "version": "8.0.1",
+    "hash": "sha256-beVbbVQy874HlXkTKarPTT5/r7XR1NGHA/50ywWp7YA="
   },
   {
     "pname": "Microsoft.IdentityModel.Tokens",
-    "version": "8.2.0",
-    "hash": "sha256-QxhnZVUrKKUZEKZgok2+4HjawuXZtVhXCJ2+BDomja8="
+    "version": "8.6.0",
+    "hash": "sha256-gyZpy8h9I09fr7icHaIXaxRTzhstHrrrq2wkd/5vz78="
   },
   {
     "pname": "Microsoft.IO.RecyclableMemoryStream",
@@ -746,59 +756,19 @@
   },
   {
     "pname": "Microsoft.Net.Http.Headers",
-    "version": "2.2.0",
-    "hash": "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA="
-  },
-  {
-    "pname": "Microsoft.NETCore.Jit",
-    "version": "1.0.2",
-    "hash": "sha256-T92T+bmdXfpAe73OKFTYXGJW1gTHuwcryBSgV7mwSkk="
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.0.1",
-    "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="
+    "version": "2.3.0",
+    "hash": "sha256-XY3OyhKTzUVbmMnegp0IxApg8cw97RD9eXC2XenrOqE="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.1.0",
     "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "2.0.0",
-    "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "2.1.2",
-    "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="
-  },
-  {
-    "pname": "Microsoft.NETCore.Portable.Compatibility",
-    "version": "1.0.1",
-    "hash": "sha256-xQ1YqrDXB0cg6u9v8MHM+Ygv2c7lxLVIGZRfsWXIiuM="
-  },
-  {
-    "pname": "Microsoft.NETCore.Runtime.CoreCLR",
-    "version": "1.0.2",
-    "hash": "sha256-7K5EruLlrFmN3rAfXZMPK3hfhS728k5Gew0e+L3Ur8M="
-  },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "1.0.1",
-    "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="
-  },
   {
     "pname": "Microsoft.NETCore.Targets",
     "version": "1.1.0",
     "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
   },
-  {
-    "pname": "Microsoft.NETCore.Windows.ApiSets",
-    "version": "1.0.1",
-    "hash": "sha256-6PR4o/wQxBaJ5eRdt/awSO80EP3QqpWIk0XkCR9kaJo="
-  },
   {
     "pname": "Microsoft.OpenApi",
     "version": "1.3.1",
@@ -806,8 +776,8 @@
   },
   {
     "pname": "Microsoft.OpenApi",
-    "version": "1.6.14",
-    "hash": "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="
+    "version": "1.6.22",
+    "hash": "sha256-DDyPc6DAD/X4PgXlVIYqqU5KLwaIaMpvBml1fACKdjY="
   },
   {
     "pname": "Microsoft.Win32.Primitives",
@@ -816,13 +786,13 @@
   },
   {
     "pname": "Microsoft.Win32.SystemEvents",
-    "version": "8.0.0",
-    "hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="
+    "version": "9.0.2",
+    "hash": "sha256-WXgu8y2LT8OtQSVRojumtlTkJVjfvXeZ8N9iRKIW/lI="
   },
   {
     "pname": "MimeKit",
-    "version": "4.8.0",
-    "hash": "sha256-4EB54ktBXuq5QRID9i8E7FzU7YZTE4wwH+2yr7ivi/Q="
+    "version": "4.10.0",
+    "hash": "sha256-SLQ7+Yh3o8bbxyRsA5yJgeAOkR8SqMI0vB8VwjQDzl8="
   },
   {
     "pname": "MimeTypeMapOfficial",
@@ -831,8 +801,8 @@
   },
   {
     "pname": "Mono.TextTemplating",
-    "version": "2.2.1",
-    "hash": "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY="
+    "version": "3.0.0",
+    "hash": "sha256-VlgGDvgNZb7MeBbIZ4DE2Nn/j2aD9k6XqNHnASUSDr0="
   },
   {
     "pname": "Nager.ArticleNumber",
@@ -914,20 +884,10 @@
     "version": "11.0.2",
     "hash": "sha256-YhlAbGfwoxQzxb3Hef4iyV9eGdPQJJNd2GgSR0jsBJ0="
   },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "12.0.2",
-    "hash": "sha256-BW7sXT2LKpP3ylsCbTTZ1f6Mg1sR4yL68aJVHaJcTnA="
-  },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "9.0.1",
-    "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="
-  },
   {
     "pname": "NReco.Logging.File",
-    "version": "1.2.1",
-    "hash": "sha256-zFAeY5b3Bdy9EOxJcx8eyaXE4gMSRg6auDhQLm+/oLY="
+    "version": "1.2.2",
+    "hash": "sha256-guI+h8t26u/DfYq354CXbdKIBqrKsDAyDZh1wFtDshw="
   },
   {
     "pname": "runtime.any.System.Collections",
@@ -1141,13 +1101,13 @@
   },
   {
     "pname": "Serilog",
-    "version": "4.1.0",
-    "hash": "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k="
+    "version": "4.2.0",
+    "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs="
   },
   {
     "pname": "Serilog.AspNetCore",
-    "version": "8.0.3",
-    "hash": "sha256-ZyBlauyG/7CLTqrbhRalmayFd99d7bimNTMw4hXDR2I="
+    "version": "9.0.0",
+    "hash": "sha256-h58CFtXBRvwhTCrhQPHQMKbp98YiK02o+cOyOmktVpQ="
   },
   {
     "pname": "Serilog.Enrichers.Thread",
@@ -1156,8 +1116,8 @@
   },
   {
     "pname": "Serilog.Extensions.Hosting",
-    "version": "8.0.0",
-    "hash": "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="
+    "version": "9.0.0",
+    "hash": "sha256-bidr2foe7Dp4BJOlkc7ko0q6vt9ITG3IZ8b2BKRa0pw="
   },
   {
     "pname": "Serilog.Extensions.Logging",
@@ -1166,18 +1126,18 @@
   },
   {
     "pname": "Serilog.Extensions.Logging",
-    "version": "8.0.0",
-    "hash": "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="
+    "version": "9.0.0",
+    "hash": "sha256-aGkz1V4HVl0rWC1BkcnLhG1EC7WLBoT3tdLdUUTFXaw="
   },
   {
     "pname": "Serilog.Formatting.Compact",
-    "version": "2.0.0",
-    "hash": "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="
+    "version": "3.0.0",
+    "hash": "sha256-nejEYqJEMG9P2iFZvbsCUPr5LZRtxbdUTLCI9N71jHY="
   },
   {
     "pname": "Serilog.Settings.Configuration",
-    "version": "8.0.4",
-    "hash": "sha256-00abT3H5COh5/A/tMYJwAZ37Mwa6jafVvW/nysLIbNQ="
+    "version": "9.0.0",
+    "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I="
   },
   {
     "pname": "Serilog.Sinks.AspNetCore.SignalR",
@@ -1191,8 +1151,8 @@
   },
   {
     "pname": "Serilog.Sinks.Debug",
-    "version": "2.0.0",
-    "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="
+    "version": "3.0.0",
+    "hash": "sha256-7/LmoRF1rUDFhJ47bTRQQFRgSHnZDO8484r3sCGqYvE="
   },
   {
     "pname": "Serilog.Sinks.File",
@@ -1206,23 +1166,18 @@
   },
   {
     "pname": "SharpCompress",
-    "version": "0.38.0",
-    "hash": "sha256-bQL3kazuqbuqn+Csy9RYMMUsNMtqkGXF7x32s787UBM="
+    "version": "0.39.0",
+    "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE="
   },
   {
     "pname": "SixLabors.ImageSharp",
-    "version": "3.1.5",
-    "hash": "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="
+    "version": "3.1.7",
+    "hash": "sha256-jMD/FiIwW1kNhTI6hKig8/QFOO3eTQX/C22cSAcKBH4="
   },
   {
     "pname": "SonarAnalyzer.CSharp",
-    "version": "10.3.0.106239",
-    "hash": "sha256-42ODQdtI3JHem4zhkty2Kk9DrAWICxFDoTCnmULraf0="
-  },
-  {
-    "pname": "SonarAnalyzer.CSharp",
-    "version": "9.32.0.97167",
-    "hash": "sha256-F8f9YjBZekwIowIm6LKfjowqmCyhLUuTFQIcjEEVDPg="
+    "version": "10.7.0.110445",
+    "hash": "sha256-HIG3Us7EnfaZOLKjxDRCJjaoqwqCdrFuDI2GlMGadp4="
   },
   {
     "pname": "sqlite-net-pcl",
@@ -1231,8 +1186,8 @@
   },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="
+    "version": "2.1.10",
+    "hash": "sha256-kZIWjH/TVTXRIsHPZSl7zoC4KAMBMWmgFYGLrQ15Occ="
   },
   {
     "pname": "SQLitePCLRaw.bundle_green",
@@ -1246,8 +1201,8 @@
   },
   {
     "pname": "SQLitePCLRaw.core",
-    "version": "2.1.6",
-    "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="
+    "version": "2.1.10",
+    "hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8="
   },
   {
     "pname": "SQLitePCLRaw.lib.e_sqlite3",
@@ -1256,8 +1211,8 @@
   },
   {
     "pname": "SQLitePCLRaw.lib.e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="
+    "version": "2.1.10",
+    "hash": "sha256-m2v2RQWol+1MNGZsx+G2N++T9BNtQGLLHXUjcwkdCnc="
   },
   {
     "pname": "SQLitePCLRaw.provider.dynamic_cdecl",
@@ -1266,13 +1221,13 @@
   },
   {
     "pname": "SQLitePCLRaw.provider.e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="
+    "version": "2.1.10",
+    "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg="
   },
   {
     "pname": "Swashbuckle.AspNetCore",
-    "version": "6.9.0",
-    "hash": "sha256-fmJjAfVHzbw/31IFPFUP31g46Y1XXIc1kr6VvYW5pCc="
+    "version": "7.3.1",
+    "hash": "sha256-ZcTjOzUbSEIrlGPO/7M5C3wRqyhjZggNGJ3Sg6aUjf0="
   },
   {
     "pname": "Swashbuckle.AspNetCore.Filters",
@@ -1286,13 +1241,8 @@
   },
   {
     "pname": "Swashbuckle.AspNetCore.Swagger",
-    "version": "5.0.0",
-    "hash": "sha256-TnAjQpCdwSH3rm1m3ptdoOGS4/9a8OOH3srAatG2gYw="
-  },
-  {
-    "pname": "Swashbuckle.AspNetCore.Swagger",
-    "version": "6.9.0",
-    "hash": "sha256-8KM21CWckFghGaqWahMa3V64+hUBrifAJnQ6P2VXlEk="
+    "version": "7.3.1",
+    "hash": "sha256-ifpw7iIFjFD1tqWuJeFxxQ9AQv4VKKbg7uk+EMzCISg="
   },
   {
     "pname": "Swashbuckle.AspNetCore.SwaggerGen",
@@ -1301,13 +1251,13 @@
   },
   {
     "pname": "Swashbuckle.AspNetCore.SwaggerGen",
-    "version": "6.9.0",
-    "hash": "sha256-Ni8Z9CFs+ybTX8IgDuSKA580ISQ55w032EeqWYQXwoc="
+    "version": "7.3.1",
+    "hash": "sha256-ZgPqUgcK8iO+1cDqm4JxkJwg9atuj6f9uR2ty5z54Do="
   },
   {
     "pname": "Swashbuckle.AspNetCore.SwaggerUI",
-    "version": "6.9.0",
-    "hash": "sha256-V+3bEEpxSXPi9Sy1hHZEjY9qxuIpRWV5dKzaqYMSu40="
+    "version": "7.3.1",
+    "hash": "sha256-0VmUWgbdW9L7YO+Xb79RsPsEJjXpDj/twLas1OlHlUs="
   },
   {
     "pname": "System.AppContext",
@@ -1321,18 +1271,13 @@
   },
   {
     "pname": "System.Buffers",
-    "version": "4.5.0",
-    "hash": "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="
+    "version": "4.6.0",
+    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
   },
   {
     "pname": "System.CodeDom",
-    "version": "4.4.0",
-    "hash": "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="
-  },
-  {
-    "pname": "System.Collections",
-    "version": "4.0.11",
-    "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="
+    "version": "6.0.0",
+    "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="
   },
   {
     "pname": "System.Collections",
@@ -1346,54 +1291,44 @@
   },
   {
     "pname": "System.Collections.Immutable",
-    "version": "6.0.0",
-    "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
-  },
-  {
-    "pname": "System.ComponentModel.Annotations",
-    "version": "4.5.0",
-    "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
+    "version": "7.0.0",
+    "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
   },
   {
     "pname": "System.Composition",
-    "version": "6.0.0",
-    "hash": "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="
+    "version": "7.0.0",
+    "hash": "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao="
   },
   {
     "pname": "System.Composition.AttributedModel",
-    "version": "6.0.0",
-    "hash": "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="
+    "version": "7.0.0",
+    "hash": "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM="
   },
   {
     "pname": "System.Composition.Convention",
-    "version": "6.0.0",
-    "hash": "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="
+    "version": "7.0.0",
+    "hash": "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk="
   },
   {
     "pname": "System.Composition.Hosting",
-    "version": "6.0.0",
-    "hash": "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="
+    "version": "7.0.0",
+    "hash": "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M="
   },
   {
     "pname": "System.Composition.Runtime",
-    "version": "6.0.0",
-    "hash": "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="
+    "version": "7.0.0",
+    "hash": "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0="
   },
   {
     "pname": "System.Composition.TypedParts",
-    "version": "6.0.0",
-    "hash": "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="
+    "version": "7.0.0",
+    "hash": "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s="
   },
   {
     "pname": "System.Console",
     "version": "4.3.0",
     "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
   },
-  {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.0.11",
-    "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="
-  },
   {
     "pname": "System.Diagnostics.Debug",
     "version": "4.3.0",
@@ -1409,20 +1344,10 @@
     "version": "6.0.0",
     "hash": "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc="
   },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "8.0.0",
-    "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="
-  },
   {
     "pname": "System.Diagnostics.EventLog",
-    "version": "8.0.1",
-    "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA="
-  },
-  {
-    "pname": "System.Diagnostics.Tools",
-    "version": "4.0.1",
-    "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="
+    "version": "9.0.2",
+    "hash": "sha256-IoiQbH8To9UqzYgJzYpFbuiRV3KGU85y4ccPTyttP/w="
   },
   {
     "pname": "System.Diagnostics.Tools",
@@ -1436,24 +1361,14 @@
   },
   {
     "pname": "System.Drawing.Common",
-    "version": "8.0.10",
-    "hash": "sha256-GOmBRym8DI9J3t2apGV0fTdpTgFL3hCJtzeUvgDDGD4="
-  },
-  {
-    "pname": "System.Dynamic.Runtime",
-    "version": "4.0.11",
-    "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="
+    "version": "9.0.2",
+    "hash": "sha256-S7IMV4R/nWbZs/YCwI9UwwLHDP57NkfSEIaoYNbRq54="
   },
   {
     "pname": "System.Formats.Asn1",
     "version": "8.0.1",
     "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
   },
-  {
-    "pname": "System.Globalization",
-    "version": "4.0.11",
-    "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="
-  },
   {
     "pname": "System.Globalization",
     "version": "4.3.0",
@@ -1471,13 +1386,8 @@
   },
   {
     "pname": "System.IdentityModel.Tokens.Jwt",
-    "version": "8.2.0",
-    "hash": "sha256-Htz1I19N0/IWHF8tbyZC90wCqI5xLh42jMXI3GXkCP4="
-  },
-  {
-    "pname": "System.IO",
-    "version": "4.1.0",
-    "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="
+    "version": "8.6.0",
+    "hash": "sha256-9usJvCIfrtI6T94wSXKGoL3UjZlE+F4LE4Y5zsD3LxI="
   },
   {
     "pname": "System.IO",
@@ -1486,8 +1396,8 @@
   },
   {
     "pname": "System.IO.Abstractions",
-    "version": "21.1.3",
-    "hash": "sha256-qgbg9Y5CUcll+mjJyeYp6xPED4FxwLbthr6b8Q64m4E="
+    "version": "22.0.11",
+    "hash": "sha256-jFfPplSHoc8HfmLDexMustNaljMFiXK/CdH35vzju+4="
   },
   {
     "pname": "System.IO.Compression",
@@ -1499,21 +1409,11 @@
     "version": "4.3.0",
     "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
   },
-  {
-    "pname": "System.IO.FileSystem",
-    "version": "4.0.1",
-    "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="
-  },
   {
     "pname": "System.IO.FileSystem",
     "version": "4.3.0",
     "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
   },
-  {
-    "pname": "System.IO.FileSystem.Primitives",
-    "version": "4.0.1",
-    "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="
-  },
   {
     "pname": "System.IO.FileSystem.Primitives",
     "version": "4.3.0",
@@ -1521,39 +1421,24 @@
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "4.5.2",
-    "hash": "sha256-AXsErCMtJnoT1ZhYlChyObzAimwEp1Cl1L6X6fewuhA="
+    "version": "7.0.0",
+    "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "6.0.3",
-    "hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="
-  },
-  {
-    "pname": "System.Linq",
-    "version": "4.1.0",
-    "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
   },
   {
     "pname": "System.Linq",
     "version": "4.3.0",
     "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
   },
-  {
-    "pname": "System.Linq.Expressions",
-    "version": "4.1.0",
-    "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="
-  },
   {
     "pname": "System.Linq.Expressions",
     "version": "4.3.0",
     "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
   },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.1",
-    "hash": "sha256-7JhQNSvE6JigM1qmmhzOX3NiZ6ek82R4whQNb+FpBzg="
-  },
   {
     "pname": "System.Memory",
     "version": "4.5.3",
@@ -1581,13 +1466,8 @@
   },
   {
     "pname": "System.Net.WebSockets.WebSocketProtocol",
-    "version": "4.5.1",
-    "hash": "sha256-5g6C2vb0RCUiSBw/tlCUbmrIbCvT9zQ+w/45o3l6Ctg="
-  },
-  {
-    "pname": "System.ObjectModel",
-    "version": "4.0.12",
-    "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="
+    "version": "5.1.0",
+    "hash": "sha256-TCcPu94+/BpZ94sTdBA20RgD+qJvMsaTOqYKN+HxZBc="
   },
   {
     "pname": "System.ObjectModel",
@@ -1599,51 +1479,31 @@
     "version": "4.3.0",
     "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
   },
-  {
-    "pname": "System.Reflection",
-    "version": "4.1.0",
-    "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="
-  },
   {
     "pname": "System.Reflection",
     "version": "4.3.0",
     "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
   },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.0.1",
-    "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="
-  },
   {
     "pname": "System.Reflection.Emit",
     "version": "4.3.0",
     "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
   },
   {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.0.1",
-    "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="
+    "pname": "System.Reflection.Emit",
+    "version": "4.7.0",
+    "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
   },
   {
     "pname": "System.Reflection.Emit.ILGeneration",
     "version": "4.3.0",
     "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
   },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.0.1",
-    "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="
-  },
   {
     "pname": "System.Reflection.Emit.Lightweight",
     "version": "4.3.0",
     "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
   },
-  {
-    "pname": "System.Reflection.Extensions",
-    "version": "4.0.1",
-    "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="
-  },
   {
     "pname": "System.Reflection.Extensions",
     "version": "4.3.0",
@@ -1651,94 +1511,44 @@
   },
   {
     "pname": "System.Reflection.Metadata",
-    "version": "6.0.1",
-    "hash": "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo="
-  },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.0.1",
-    "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="
+    "version": "7.0.0",
+    "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="
   },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.3.0",
     "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
   },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.1.0",
-    "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="
-  },
   {
     "pname": "System.Reflection.TypeExtensions",
     "version": "4.3.0",
     "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
   },
-  {
-    "pname": "System.Resources.ResourceManager",
-    "version": "4.0.1",
-    "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="
-  },
   {
     "pname": "System.Resources.ResourceManager",
     "version": "4.3.0",
     "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
   },
-  {
-    "pname": "System.Runtime",
-    "version": "4.1.0",
-    "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="
-  },
   {
     "pname": "System.Runtime",
     "version": "4.3.0",
     "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.4.0",
-    "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.1",
-    "hash": "sha256-Lucrfpuhz72Ns+DOS7MjuNT2KWgi+m4bJkg87kqXmfU="
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.2",
-    "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="
-  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "6.0.0",
     "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
   },
-  {
-    "pname": "System.Runtime.Extensions",
-    "version": "4.1.0",
-    "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="
-  },
   {
     "pname": "System.Runtime.Extensions",
     "version": "4.3.0",
     "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
   },
-  {
-    "pname": "System.Runtime.Handles",
-    "version": "4.0.1",
-    "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="
-  },
   {
     "pname": "System.Runtime.Handles",
     "version": "4.3.0",
     "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
   },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.1.0",
-    "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="
-  },
   {
     "pname": "System.Runtime.InteropServices",
     "version": "4.3.0",
@@ -1754,11 +1564,6 @@
     "version": "4.3.0",
     "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
   },
-  {
-    "pname": "System.Runtime.Serialization.Primitives",
-    "version": "4.1.1",
-    "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="
-  },
   {
     "pname": "System.Security.Claims",
     "version": "4.3.0",
@@ -1791,8 +1596,8 @@
   },
   {
     "pname": "System.Security.Cryptography.Pkcs",
-    "version": "8.0.0",
-    "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI="
+    "version": "8.0.1",
+    "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU="
   },
   {
     "pname": "System.Security.Cryptography.Primitives",
@@ -1814,36 +1619,11 @@
     "version": "4.3.0",
     "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
   },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "4.5.0",
-    "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="
-  },
-  {
-    "pname": "System.Text.Encoding",
-    "version": "4.0.11",
-    "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="
-  },
   {
     "pname": "System.Text.Encoding",
     "version": "4.3.0",
     "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
   },
-  {
-    "pname": "System.Text.Encoding.CodePages",
-    "version": "4.5.1",
-    "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="
-  },
-  {
-    "pname": "System.Text.Encoding.CodePages",
-    "version": "6.0.0",
-    "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="
-  },
-  {
-    "pname": "System.Text.Encoding.Extensions",
-    "version": "4.0.11",
-    "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="
-  },
   {
     "pname": "System.Text.Encoding.Extensions",
     "version": "4.3.0",
@@ -1851,29 +1631,24 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "4.5.0",
-    "hash": "sha256-o+jikyFOG30gX57GoeZztmuJ878INQ5SFMmKovYqLWs="
+    "version": "8.0.0",
+    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
   },
   {
     "pname": "System.Text.Json",
-    "version": "4.7.2",
-    "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="
+    "version": "7.0.3",
+    "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4="
   },
   {
-    "pname": "System.Text.RegularExpressions",
-    "version": "4.1.0",
-    "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="
+    "pname": "System.Text.Json",
+    "version": "9.0.2",
+    "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8="
   },
   {
     "pname": "System.Text.RegularExpressions",
     "version": "4.3.0",
     "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
   },
-  {
-    "pname": "System.Threading",
-    "version": "4.0.11",
-    "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="
-  },
   {
     "pname": "System.Threading",
     "version": "4.3.0",
@@ -1881,39 +1656,24 @@
   },
   {
     "pname": "System.Threading.Channels",
-    "version": "4.5.0",
-    "hash": "sha256-34I/eRNA/R8tazesCaE0yzYf80n3iEN3UQIeFSUf31g="
+    "version": "7.0.0",
+    "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="
   },
   {
     "pname": "System.Threading.Channels",
-    "version": "6.0.0",
-    "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="
-  },
-  {
-    "pname": "System.Threading.Tasks",
-    "version": "4.0.11",
-    "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="
+    "version": "8.0.0",
+    "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="
   },
   {
     "pname": "System.Threading.Tasks",
     "version": "4.3.0",
     "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
   },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.0.0",
-    "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="
-  },
   {
     "pname": "System.Threading.Tasks.Extensions",
     "version": "4.3.0",
     "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
   },
-  {
-    "pname": "System.Threading.Thread",
-    "version": "4.0.0",
-    "hash": "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8="
-  },
   {
     "pname": "System.Threading.ThreadPool",
     "version": "4.3.0",
@@ -1924,21 +1684,11 @@
     "version": "4.3.0",
     "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
   },
-  {
-    "pname": "System.Xml.ReaderWriter",
-    "version": "4.0.11",
-    "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="
-  },
   {
     "pname": "System.Xml.ReaderWriter",
     "version": "4.3.0",
     "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
   },
-  {
-    "pname": "System.Xml.XDocument",
-    "version": "4.0.11",
-    "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="
-  },
   {
     "pname": "System.Xml.XDocument",
     "version": "4.3.0",
@@ -1946,13 +1696,18 @@
   },
   {
     "pname": "TestableIO.System.IO.Abstractions",
-    "version": "21.1.3",
-    "hash": "sha256-ZD+4JKFD6c50Kfd8AmPCO6g5jrkUFM6hGhA1W/0WvAA="
+    "version": "22.0.11",
+    "hash": "sha256-zW1WYq/rHJF9DFzbSrVSejepEE32jtO6E0M6xSW3ZTI="
   },
   {
     "pname": "TestableIO.System.IO.Abstractions.Wrappers",
-    "version": "21.1.3",
-    "hash": "sha256-mS3xbH8p9rMNNpYxUb6Owb2CkDSfgnTr2XLxPKvL+6A="
+    "version": "22.0.11",
+    "hash": "sha256-iy8sWpCe2+mG6zICnUT1qMEIz97DPcA6/P6KNonm9aM="
+  },
+  {
+    "pname": "Testably.Abstractions.FileSystem.Interface",
+    "version": "9.0.0",
+    "hash": "sha256-6JW+qDtqQT9StP4oTR7uO0NnmVc2xcjSZ6ds2H71wtg="
   },
   {
     "pname": "VersOne.Epub",
@@ -1961,17 +1716,17 @@
   },
   {
     "pname": "xunit.assert",
-    "version": "2.9.2",
-    "hash": "sha256-EE6r526Q4cHn0Ourf1ENpXZ37Lj/P2uNvonHgpdcnq4="
+    "version": "2.9.3",
+    "hash": "sha256-vHYOde8bd10pOmr7iTAYNtPlqHzsJl4x3t1DDuYdDCA="
   },
   {
     "pname": "YamlDotNet",
-    "version": "16.1.3",
-    "hash": "sha256-xsti5h1ZUCS9Jvb4UGKdHrEudJIQXrbOe0USxSjWqjc="
+    "version": "16.3.0",
+    "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q="
   },
   {
     "pname": "ZstdSharp.Port",
-    "version": "0.8.1",
-    "hash": "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg="
+    "version": "0.8.4",
+    "hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo="
   }
 ]

From 2c486980b63d4894a29155bd5facb53a242fcb94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Mar 2025 16:39:21 +0000
Subject: [PATCH 051/489] python312Packages.pipdeptree: 2.25.1 -> 2.26.0

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

diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix
index 7b4feb7ac8b2..a30535f53217 100644
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pipdeptree";
-  version = "2.25.1";
+  version = "2.26.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "tox-dev";
     repo = "pipdeptree";
     tag = version;
-    hash = "sha256-vZPxpbR8O3XIyGcp2rn4skjy2xMQb6+5BHc4tjO84tw=";
+    hash = "sha256-Nq+xXzi5PeDDNTtkTaMTWO4HpxkjSUptE4jwfjBoauY=";
   };
 
   postPatch = ''
@@ -66,7 +66,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Command line utility to show dependency tree of packages";
     homepage = "https://github.com/tox-dev/pipdeptree";
-    changelog = "https://github.com/tox-dev/pipdeptree/releases/tag/${version}";
+    changelog = "https://github.com/tox-dev/pipdeptree/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ charlesbaynham ];
     mainProgram = "pipdeptree";

From e1e7c55a760cc82baf4acbb102736f15656514ea Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 29 Mar 2025 17:20:53 -0700
Subject: [PATCH 052/489] redfang: unbreak on GCC 14, modernize

---
 pkgs/by-name/re/redfang/include-pthread.patch | 12 ++++++++++++
 pkgs/by-name/re/redfang/package.nix           | 14 ++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/re/redfang/include-pthread.patch

diff --git a/pkgs/by-name/re/redfang/include-pthread.patch b/pkgs/by-name/re/redfang/include-pthread.patch
new file mode 100644
index 000000000000..6e895df84ac4
--- /dev/null
+++ b/pkgs/by-name/re/redfang/include-pthread.patch
@@ -0,0 +1,12 @@
+diff --git a/fang.c b/fang.c
+index cda61bf..52f9659 100755
+--- a/fang.c
++++ b/fang.c
+@@ -45,6 +45,7 @@
+ #include <sys/socket.h>
+ #include <asm/types.h>
+ #include <netinet/in.h>
++#include <pthread.h>
+
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/hci.h>
diff --git a/pkgs/by-name/re/redfang/package.nix b/pkgs/by-name/re/redfang/package.nix
index 014e62ac328f..5bb42b53b109 100644
--- a/pkgs/by-name/re/redfang/package.nix
+++ b/pkgs/by-name/re/redfang/package.nix
@@ -6,7 +6,7 @@
   bluez,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "redfang";
   version = "2.5";
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     group = "kalilinux";
     owner = "packages";
     repo = "redfang";
-    rev = "upstream/${version}";
+    rev = "upstream/${finalAttrs.version}";
     hash = "sha256-dF9QmBckyHAZ+JbLr0jTmp0eMu947unJqjrTMsJAfIE=";
   };
 
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.com/kalilinux/packages/redfang/-/merge_requests/1.diff";
       sha256 = "sha256-oxIrUAucxsBL4+u9zNNe2XXoAd088AEAHcRB/AN7B1M=";
     })
+    # error: implicit declaration of function 'pthread_create' []
+    ./include-pthread.patch
   ];
 
   installFlags = [ "DESTDIR=$(out)" ];
@@ -32,11 +34,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ bluez ];
 
-  meta = with lib; {
+  meta = {
     description = "Small proof-of-concept application to find non discoverable bluetooth devices";
     homepage = "https://gitlab.com/kalilinux/packages/redfang";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ moni ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ moni ];
     mainProgram = "fang";
   };
-}
+})

From 10aacc7a4374c2b7878ad08dbdcaf3fad926b866 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Sun, 30 Mar 2025 03:11:11 +0300
Subject: [PATCH 053/489] ttf2pt1: fix build with gcc14

- add patch fixing build with c99 from fedora:
https://src.fedoraproject.org/rpms/ttf2pt1/c/070de5269475785d27ae7996513bee12cb9a0f53
Fixes build error:
```
t1asm.c: In function 'main':
t1asm.c:501:15: error: implicit declaration of function 'getopt';
did you mean 'getsubopt'? []
  501 |   while ((c = getopt(argc, argv, "bl:")) != -1)
      |               ^~~~~~
      |               getsubopt
```

- add patch fixing build with gcc14 from fedora
https://src.fedoraproject.org/rpms/ttf2pt1/c/1ebb612acb7088095c6bd7242209f0ce848895fb
Patch does not apply as is with `fetchpatch` because of incorrect
listed files: `diff -u ft.c{.orig,}`.
Fixes `-Wincompatible-pointer-types` errors:
`error: intialization of ... from incompatible pointer type ...`
for `outl_moveto`, `outl_lineto`, `outl_conicto` and `outl_cubicto`
in `ft.c`
---
 pkgs/by-name/tt/ttf2pt1/package.nix         | 16 ++++++-
 pkgs/by-name/tt/ttf2pt1/ttf2pt1-gcc14.patch | 47 +++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/tt/ttf2pt1/ttf2pt1-gcc14.patch

diff --git a/pkgs/by-name/tt/ttf2pt1/package.nix b/pkgs/by-name/tt/ttf2pt1/package.nix
index 75b32dc70a2c..116692bc667f 100644
--- a/pkgs/by-name/tt/ttf2pt1/package.nix
+++ b/pkgs/by-name/tt/ttf2pt1/package.nix
@@ -4,6 +4,7 @@
   fetchurl,
   perl,
   freetype,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +29,20 @@ stdenv.mkDerivation rec {
   buildInputs = [ freetype ];
   nativeBuildInputs = [ perl ];
 
-  patches = ./gentoo-makefile.patch; # also contains the freetype patch
+  patches = [
+    ./gentoo-makefile.patch # also contains the freetype patch
+
+    # fix build with c99
+    # https://src.fedoraproject.org/rpms/ttf2pt1/c/070de5269475785d27ae7996513bee12cb9a0f53
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/ttf2pt1/raw/070de5269475785d27ae7996513bee12cb9a0f53/f/ttf2pt1-c99.patch";
+      hash = "sha256-7+RnExqxED+fUJSj3opfYi0eQ5zqswOZnKjQMvlF020=";
+    })
+
+    # fix build with gcc14
+    # https://src.fedoraproject.org/rpms/ttf2pt1/c/1ebb612acb7088095c6bd7242209f0ce848895fb
+    ./ttf2pt1-gcc14.patch
+  ];
 
   meta = {
     description = "True Type to Postscript Type 3 converter, fpdf";
diff --git a/pkgs/by-name/tt/ttf2pt1/ttf2pt1-gcc14.patch b/pkgs/by-name/tt/ttf2pt1/ttf2pt1-gcc14.patch
new file mode 100644
index 000000000000..22503463c87a
--- /dev/null
+++ b/pkgs/by-name/tt/ttf2pt1/ttf2pt1-gcc14.patch
@@ -0,0 +1,47 @@
+diff --git a/ft.c b/ft.c
+index 4ca1ca6..3ae9ac9 100644
+--- a/ft.c
++++ b/ft.c
+@@ -457,7 +457,7 @@ static double lastx, lasty;
+ 
+ static int
+ outl_moveto(
+-	FT_Vector *to,
++	const FT_Vector *to,
+ 	void *unused
+ )
+ {
+@@ -477,7 +477,7 @@ outl_moveto(
+ 
+ static int
+ outl_lineto(
+-	FT_Vector *to,
++	const FT_Vector *to,
+ 	void *unused
+ )
+ {
+@@ -493,8 +493,8 @@ outl_lineto(
+ 
+ static int
+ outl_conicto(
+-	FT_Vector *control1,
+-	FT_Vector *to,
++	const FT_Vector *control1,
++	const FT_Vector *to,
+ 	void *unused
+ )
+ {
+@@ -514,9 +514,9 @@ outl_conicto(
+ 
+ static int
+ outl_cubicto(
+-	FT_Vector *control1,
+-	FT_Vector *control2,
+-	FT_Vector *to,
++	const FT_Vector *control1,
++	const FT_Vector *control2,
++	const FT_Vector *to,
+ 	void *unused
+ )
+ {
+

From 9a9d6d44fe4b5c02aa17bce255d16d2e25d3b324 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Sun, 30 Mar 2025 03:11:11 +0300
Subject: [PATCH 054/489] ttf2pt1: modernize

- replace `rec` with `finalAttrs`
---
 pkgs/by-name/tt/ttf2pt1/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tt/ttf2pt1/package.nix b/pkgs/by-name/tt/ttf2pt1/package.nix
index 116692bc667f..67f27ccb9bd3 100644
--- a/pkgs/by-name/tt/ttf2pt1/package.nix
+++ b/pkgs/by-name/tt/ttf2pt1/package.nix
@@ -7,12 +7,12 @@
   fetchpatch,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ttf2pt1";
   version = "3.4.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ttf2pt1/ttf2pt1-${version}.tgz";
+    url = "mirror://sourceforge/ttf2pt1/ttf2pt1-${finalAttrs.version}.tgz";
     sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf";
   };
 
@@ -50,4 +50,4 @@ stdenv.mkDerivation rec {
     license = "ttf2pt1";
     platforms = lib.platforms.linux;
   };
-}
+})

From b053368a31f0d338e0a72c318782bfd61b35eba8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Mar 2025 03:22:39 +0000
Subject: [PATCH 055/489] libphidget22: 1.21.20241122 -> 1.22.20250324

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

diff --git a/pkgs/by-name/li/libphidget22/package.nix b/pkgs/by-name/li/libphidget22/package.nix
index f3fa7d72f1c6..8f38eaf8847e 100644
--- a/pkgs/by-name/li/libphidget22/package.nix
+++ b/pkgs/by-name/li/libphidget22/package.nix
@@ -7,7 +7,7 @@
 }:
 let
   # This package should be updated together with libphidget22extra
-  version = "1.21.20241122";
+  version = "1.22.20250324";
 in
 stdenv.mkDerivation {
   pname = "libphidget22";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22/libphidget22-${version}.tar.gz";
-    hash = "sha256-6Sib9CSaPUbAdyHfoSgQ6g4oik7+pjb7g79QftSeVIk=";
+    hash = "sha256-FR/+b4z73LtGQdT4gypre9SZmZSiWzP/Q+00uia1lhA=";
   };
 
   nativeBuildInputs = [ automake ];

From 345189c2047e1e0dc719e4261df0159d4192a26d Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 30 Mar 2025 10:27:51 +0200
Subject: [PATCH 056/489] libphidget22extra: 1.21.20241122 -> 1.22.20250324

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

diff --git a/pkgs/by-name/li/libphidget22extra/package.nix b/pkgs/by-name/li/libphidget22extra/package.nix
index 1072b798b42f..ffe239d5570e 100644
--- a/pkgs/by-name/li/libphidget22extra/package.nix
+++ b/pkgs/by-name/li/libphidget22extra/package.nix
@@ -9,7 +9,7 @@
 let
 
   # This package should be updated together with libphidget22
-  version = "1.21.20241122";
+  version = "1.22.20250324";
 in
 stdenv.mkDerivation {
   pname = "libphidget22extra";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22extra/libphidget22extra-${version}.tar.gz";
-    hash = "sha256-l8lwEpdR87U2pb0jOAkrI/157B+87QvSVtAtOfedaBo=";
+    hash = "sha256-8FTd/hyqzZKWN68FAxrV1N0pPglNAbZ/aRH4V6hEgBM=";
   };
 
   nativeBuildInputs = [ automake ];

From d894b799baaeef6f90def97be6051a3302f1594e Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sat, 29 Mar 2025 18:43:06 +0100
Subject: [PATCH 057/489] pdal: fix and enable strictDeps

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

diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix
index 4d64c1646f67..39b23070f143 100644
--- a/pkgs/by-name/pd/pdal/package.nix
+++ b/pkgs/by-name/pd/pdal/package.nix
@@ -62,6 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
     libe57format
   ];
 
+  strictDeps = true;
+
   cmakeFlags = [
     "-DBUILD_PLUGIN_E57=${if enableE57 then "ON" else "OFF"}"
     "-DBUILD_PLUGIN_HDF=ON"
@@ -109,6 +111,10 @@ stdenv.mkDerivation (finalAttrs: {
     "pdal_app_plugin_test"
   ];
 
+  nativeCheckInputs = [
+    gdal # gdalinfo
+  ];
+
   checkPhase = ''
     runHook preCheck
     # tests are flaky and they seem to fail less often when they don't run in
@@ -117,6 +123,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postCheck
   '';
 
+  postInstall = ''
+    patchShebangs --update --build $out/bin/pdal-config
+  '';
+
   passthru.tests = {
     version = testers.testVersion {
       package = finalAttrs.finalPackage;

From 6bc3977fe530cd07b7ab4ec9c3e1357d53e9739b Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Sun, 30 Mar 2025 17:14:25 -0500
Subject: [PATCH 058/489] dash-mpd-cli: set `passthru.updateScript`

---
 pkgs/by-name/da/dash-mpd-cli/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix
index 6a4dfd8729ba..e34c1b4012ed 100644
--- a/pkgs/by-name/da/dash-mpd-cli/package.nix
+++ b/pkgs/by-name/da/dash-mpd-cli/package.nix
@@ -8,6 +8,7 @@
   ffmpeg,
   libxslt,
   shaka-packager,
+  nix-update-script,
 }:
 
 let
@@ -59,6 +60,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       }
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Download media content from a DASH-MPEG or DASH-WebM MPD manifest";
     longDescription = ''

From 1ae839554a7fe1612adcfd48c47a4fd33c58f5f9 Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Sun, 30 Mar 2025 17:15:33 -0500
Subject: [PATCH 059/489] =?UTF-8?q?dash-mpd-cli:=200.2.25=20=E2=86=92=200.?=
 =?UTF-8?q?2.26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changelog: https://github.com/emarsden/dash-mpd-cli/blob/main/CHANGELOG.md#0226---2025-03-30
---
 pkgs/by-name/da/dash-mpd-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix
index e34c1b4012ed..37d5168f8741 100644
--- a/pkgs/by-name/da/dash-mpd-cli/package.nix
+++ b/pkgs/by-name/da/dash-mpd-cli/package.nix
@@ -25,13 +25,13 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dash-mpd-cli";
-  version = "0.2.25";
+  version = "0.2.26";
 
   src = fetchFromGitHub {
     owner = "emarsden";
     repo = "dash-mpd-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xC/U48QyVn9K8Do1909XS7j9aY+ia0gd5cMdfipIds4=";
+    hash = "sha256-PMzHWY129Bddl1RQQyEPstqvDLAqXxGv9I3fw1AylBo=";
   };
 
   patches = [
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-QHfon0795XNtG3jCVv56EIA1pPToWUiopKWI3cA7Vg0=";
+  cargoHash = "sha256-qy8X9DoBD5MIUQ6akalqtyasst0ZKJJLZTEz+6Hp6EI=";
 
   nativeBuildInputs = [
     makeWrapper

From 7a84bf54ecc1f5626a9c72b09d29a0d8e12bb668 Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Mon, 31 Mar 2025 11:48:17 +0900
Subject: [PATCH 060/489] mqttx-cli: 1.11.0 -> 1.11.1

---
 pkgs/by-name/mq/mqttx-cli/package.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/mq/mqttx-cli/package.nix b/pkgs/by-name/mq/mqttx-cli/package.nix
index 025e63baaec6..dd10d69c9d7a 100644
--- a/pkgs/by-name/mq/mqttx-cli/package.nix
+++ b/pkgs/by-name/mq/mqttx-cli/package.nix
@@ -1,7 +1,6 @@
 {
   fetchFromGitHub,
   fetchYarnDeps,
-  fetchpatch,
   lib,
   mqttx-cli,
   nodejs,
@@ -13,25 +12,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mqttx-cli";
-  version = "1.11.0";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "emqx";
     repo = "MQTTX";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IPIiSav6MPJmzetBgVw9fLGPjJ+JKS3oWMEfCJmEY84=";
+    hash = "sha256-kxK/c1tOwK9hCxX19um0z1MWBZQOwADYEh4xEqJNgWI=";
   };
 
-  patches = [
-    # moves @faker-js/faker from devDependencies to dependencies
-    # because the final package depends on it
-    # https://github.com/emqx/MQTTX/pull/1801
-    (fetchpatch {
-      url = "https://github.com/emqx/MQTTX/commit/3d89c3a08477e9e2b5d83f2a222ceaa8c08e50ce.patch";
-      hash = "sha256-Rd6YpGHsvAYD7/XCJq6dgvGeKfOiLh7IUQFr/AQz0mY=";
-    })
-  ];
-
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/cli/yarn.lock";
     hash = "sha256-vwPwSE6adxM1gkdsJBq3LH2eXze9yXADvnM90LsKjjo=";

From 5b311ec850f0d2708fce3a06514335f3f6bba05f Mon Sep 17 00:00:00 2001
From: Qiming Chu <cchuqiming@gmail.com>
Date: Mon, 31 Mar 2025 12:14:29 +0800
Subject: [PATCH 061/489] hal-hardware-analyzer: fix darwin build

Signed-off-by: Qiming Chu <cchuqiming@gmail.com>
---
 .../electronics/hal-hardware-analyzer/default.nix   |  1 +
 .../resynthesis-fix-narrowing-conversion.patch      | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch

diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
index 1f42d5ae2a62..cfb13ffab886 100644
--- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
+++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
       hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E=";
     })
     ./4.4.1-newer-spdlog-fmt-compat.patch
+    ./resynthesis-fix-narrowing-conversion.patch
   ];
 
   # make sure bundled dependencies don't get in the way - install also otherwise
diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch b/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch
new file mode 100644
index 000000000000..58160330cd06
--- /dev/null
+++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/resynthesis/src/resynthesis.cpp b/plugins/resynthesis/src/resynthesis.cpp
+index 7a7e404114f..f2889667af8 100644
+--- a/plugins/resynthesis/src/resynthesis.cpp
++++ b/plugins/resynthesis/src/resynthesis.cpp
+@@ -1058,7 +1058,7 @@ namespace hal
+             // delete the created directory and the contained files
+             std::filesystem::remove_all(base_path);
+ 
+-            return OK(subgraph.size());
++            return OK(static_cast<unsigned int>(subgraph.size()));
+         }
+ 
+         Result<u32> resynthesize_subgraph_of_type(Netlist* nl, const std::vector<const GateType*>& gate_types, GateLibrary* target_gl)

From 2b89b7f0e7141ac13b9a157be33a3720a6ba9aed Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 31 Mar 2025 14:14:37 +0200
Subject: [PATCH 062/489] furnace: 0.6.7 -> 0.6.8

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

diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix
index 62d60e8abbcd..c5827e2c3b40 100644
--- a/pkgs/by-name/fu/furnace/package.nix
+++ b/pkgs/by-name/fu/furnace/package.nix
@@ -29,14 +29,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "furnace";
-  version = "0.6.7";
+  version = "0.6.8";
 
   src = fetchFromGitHub {
     owner = "tildearrow";
     repo = "furnace";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-G5yjqsep+hDGXCqGNBKoMvV7JOD7ZZTxTPBl9VmG8RM=";
+    hash = "sha256-pdl46Xrq1NS0Wtri/xMfd4SxKnFQykB0TpOG/GJT89Y=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

From 8de371e8046d7a18daca41044604dfeb4caa95da Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@protonmail.com>
Date: Mon, 31 Mar 2025 08:18:45 -0400
Subject: [PATCH 063/489] bisq2: 2.1.6 -> 2.1.7

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

diff --git a/pkgs/by-name/bi/bisq2/package.nix b/pkgs/by-name/bi/bisq2/package.nix
index 96a7d15f070c..05519f122068 100644
--- a/pkgs/by-name/bi/bisq2/package.nix
+++ b/pkgs/by-name/bi/bisq2/package.nix
@@ -18,7 +18,7 @@
 }:
 
 let
-  version = "2.1.6";
+  version = "2.1.7";
 
   jdk = jdk23.override { enableJavaFX = true; };
 
@@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
-    hash = "sha256-420XZt8wEzY70xv1OZswYZO1/dtVDt8CRyKCJW068H0=";
+    hash = "sha256-kNQbTZoHFR2qFw/Jjc9iaEews/oUOYoJanmbVH/vs44=";
 
     # Verify the upstream Debian package prior to extraction.
     # See https://bisq.wiki/Bisq_2#Installation
@@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation rec {
 
   signature = fetchurl {
     url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
-    hash = "sha256-17NjRIcDKlmqvX/zKVrahWd8qJEY+v25qP9yfFMPojw=";
+    hash = "sha256-Cl9EIp+ycD8Tp/bx5dXQK206jZzrYJkI/U9ItfXDRWw=";
   };
 
   nativeBuildInputs = [

From e15a093a915db1d657bf93fdaaf98ecdc5edbf8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 12:22:24 +0000
Subject: [PATCH 064/489] python312Packages.berkeleydb: 18.1.13 -> 18.1.14

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

diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix
index c1cd0dcb8452..1988a026f087 100644
--- a/pkgs/development/python-modules/berkeleydb/default.nix
+++ b/pkgs/development/python-modules/berkeleydb/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "berkeleydb";
-  version = "18.1.13";
+  version = "18.1.14";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PPxNayvSqi8iMDnvh3dzys+RaSyYb9GuFKU/kT7nSrg=";
+    hash = "sha256-jCYCgvV+vVucPOU9oOt1vllXrdswPjGQk1txZEjzL30=";
   };
 
   build-system = [ setuptools ];

From bd743514f97fbb66fbda52fd3bb83a513f26fc8f Mon Sep 17 00:00:00 2001
From: blackzeshi <105582686+zeshi09@users.noreply.github.com>
Date: Mon, 31 Mar 2025 19:01:48 +0500
Subject: [PATCH 065/489] burpsuite: 2025.1.5 -> 2025.2.3, add blackzeshi as
 maintainer

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

diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index 2481b5a236b7..6d9dbaf03da9 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -9,20 +9,20 @@
 }:
 
 let
-  version = "2025.1.5";
+  version = "2025.2.3";
 
   product =
     if proEdition then
       {
         productName = "pro";
         productDesktop = "Burp Suite Professional Edition";
-        hash = "sha256-QTYeiM2hyZpvSu5oE2wrNrF3qFkp4JJnQftOg3BJqZA=";
+        hash = "sha256-eVtqlZHW1w10tUKlqdwFSbx2kJW5hEtfyq7MuBsNS4Q=";
       }
     else
       {
         productName = "community";
         productDesktop = "Burp Suite Community Edition";
-        hash = "sha256-vIcBRsylS+ftSq5x0HDe6Zb8dtVUtWw6hENBITYmzyQ=";
+        hash = "sha256-XWAaNAdPVxKS7/9uYWpAdbzHt+xNqpKCIOH7dVcUyaI=";
       };
 
   src = fetchurl {
@@ -109,6 +109,7 @@ buildFHSEnv {
     hydraPlatforms = [ ];
     maintainers = with maintainers; [
       bennofs
+      blackzeshi
       fab
     ];
     mainProgram = "burpsuite";

From 18ea9a32db4ef7968c7d809ed8b74b559cd93e92 Mon Sep 17 00:00:00 2001
From: Adrian Pistol <vifino@posteo.net>
Date: Mon, 31 Mar 2025 20:57:18 +0200
Subject: [PATCH 066/489] hercules: 4.7 -> 4.8

---
 pkgs/by-name/he/hercules/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/he/hercules/package.nix b/pkgs/by-name/he/hercules/package.nix
index 6ae12bfda411..d7a3df6d6053 100644
--- a/pkgs/by-name/he/hercules/package.nix
+++ b/pkgs/by-name/he/hercules/package.nix
@@ -61,8 +61,8 @@ let
     src = fetchFromGitHub {
       owner = "SDL-Hercules-390";
       repo = "crypto";
-      rev = "a5096e5dd79f46b568806240c0824cd8cb2fcda2";
-      hash = "sha256-VWjM8WxPMynyW49Z8U/r6SsF7u7Xbk7Dd0gR35lIw28=";
+      rev = "9ac58405c2b91fb7cd230aed474dc7059f0fcad9";
+      hash = "sha256-hWNowhKP26+HMIL4facOCrZAJ1bR0rRTRc+2R9AM2cc=";
     };
   });
 
@@ -71,8 +71,8 @@ let
     src = fetchFromGitHub {
       owner = "SDL-Hercules-390";
       repo = "decNumber";
-      rev = "3aa2f4531b5fcbd0478ecbaf72ccc47079c67280";
-      hash = "sha256-PfPhnYUSIw1sYiGRM3iHRTbHHbQ+sK7oO12pH/yt+MQ=";
+      rev = "995184583107625015bb450228a5f3fb781d9502";
+      hash = "sha256-3PAJ+HZasf3fr6F1cmqIk+Jjv3Gzkki7AFrAHBaEATo=";
     };
   });
 
@@ -81,8 +81,8 @@ let
     src = fetchFromGitHub {
       owner = "SDL-Hercules-390";
       repo = "SoftFloat";
-      rev = "4b0c326008e174610969c92e69178939ed80653d";
-      hash = "sha256-DEIT5Xk6IqUXCIGD2Wj0h9xPOR0Mid2Das7aKMQMDaM=";
+      rev = "e053494d988ec0648c92f683abce52597bfae745";
+      hash = "sha256-1UCRYzf24U3zniKnatPvYKSmTEsx3YCrtv1tBR5lvw8=";
     };
   });
 
@@ -91,8 +91,8 @@ let
     src = fetchFromGitHub {
       owner = "SDL-Hercules-390";
       repo = "telnet";
-      rev = "729f0b688c1426018112c1e509f207fb5f266efa";
-      hash = "sha256-ED0Cl+VcK6yl59ShgJBZKy25oAFC8eji36pNLwMxTM0=";
+      rev = "384b2542dfc9af67ca078e2bc13487a8fc234a3f";
+      hash = "sha256-dPgLK7nsRZsqY4fVMdlcSHKC2xkGdNmayyK2FW5CNiI=";
     };
   });
 
@@ -108,13 +108,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "hercules";
-  version = "4.7";
+  version = "4.8";
 
   src = fetchFromGitHub {
     owner = "SDL-Hercules-390";
     repo = "hyperion";
     rev = "Release_${version}";
-    hash = "sha256-5Kvs2OWQrlsRZpmx7vet8GCky5xAISBNAqn+NHgicOM";
+    hash = "sha256-3Go5m4/K8d4Vu7Yi8ULQpX83d44fu9XzmG/gClWeUKo=";
   };
 
   postPatch = ''

From 3440c6ce07a0bc5ec1892cdc6be8475567a9e6db Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Mon, 31 Mar 2025 15:16:53 +0200
Subject: [PATCH 067/489] kopia-ui: init at 0.19.0

Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com>
---
 pkgs/by-name/ko/kopia-ui/fix-paths.patch | 42 +++++++++++
 pkgs/by-name/ko/kopia-ui/package.nix     | 94 ++++++++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 pkgs/by-name/ko/kopia-ui/fix-paths.patch
 create mode 100644 pkgs/by-name/ko/kopia-ui/package.nix

diff --git a/pkgs/by-name/ko/kopia-ui/fix-paths.patch b/pkgs/by-name/ko/kopia-ui/fix-paths.patch
new file mode 100644
index 000000000000..22744100099e
--- /dev/null
+++ b/pkgs/by-name/ko/kopia-ui/fix-paths.patch
@@ -0,0 +1,42 @@
+diff --git a/public/utils.js b/public/utils.js
+index 3cd38b63..54152694 100644
+--- a/public/utils.js
++++ b/public/utils.js
+@@ -17,7 +17,7 @@ const osShortName = function () {
+ 
+ export function iconsPath() {
+     if (!app.isPackaged) {
+-        return path.join(__dirname, "..", "resources", osShortName, "icons");
++        return path.join(__dirname, "..", "..", "icons");
+     }
+ 
+     return path.join(process.resourcesPath, "icons");
+@@ -25,26 +25,14 @@ export function iconsPath() {
+ 
+ export function publicPath() {
+     if (!app.isPackaged) {
+-        return path.join(__dirname, "..", "public");
++        return path.join(__dirname, "..", "..", "public");
+     }
+ 
+     return process.resourcesPath;
+ }
+ 
+ export function defaultServerBinary() {
+-    if (!app.isPackaged) {
+-        return {
+-            "mac": path.join(__dirname, "..", "..", "dist", "kopia_darwin_amd64", "kopia"),
+-            "win": path.join(__dirname, "..", "..", "dist", "kopia_windows_amd64", "kopia.exe"),
+-            "linux": path.join(__dirname, "..", "..", "dist", "kopia_linux_amd64", "kopia"),
+-        }[osShortName]
+-    }
+-
+-    return {
+-        "mac": path.join(process.resourcesPath, "server", "kopia"),
+-        "win": path.join(process.resourcesPath, "server", "kopia.exe"),
+-        "linux": path.join(process.resourcesPath, "server", "kopia"),
+-    }[osShortName]
++    return "KOPIA"
+ }
+ export function selectByOS(x) {
+     return x[osShortName]
diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix
new file mode 100644
index 000000000000..0a74ec1bc8c5
--- /dev/null
+++ b/pkgs/by-name/ko/kopia-ui/package.nix
@@ -0,0 +1,94 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  electron,
+  copyDesktopItems,
+  makeDesktopItem,
+  nix-update-script,
+  makeWrapper,
+  kopia,
+}:
+let
+  version = "0.19.0";
+  src = fetchFromGitHub {
+    owner = "kopia";
+    repo = "kopia";
+    tag = "v${version}";
+    hash = "sha256-PfxMs9MwoI+4z8vZ1sVlIEal3TOmA06997jWwShNfrE=";
+  };
+in
+buildNpmPackage {
+  pname = "kopia-ui";
+  inherit version src;
+
+  sourceRoot = "${src.name}/app";
+
+  npmDepsHash = "sha256-3K5dwAQeAo98rz2gxGw3k/D+VkDJNe5pmAyEo4boetU=";
+  makeCacheWritable = true;
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeWrapper
+  ];
+
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
+  };
+
+  patches = [ ./fix-paths.patch ];
+
+  postPatch = ''
+    substituteInPlace public/utils.js --replace-fail KOPIA ${lib.getExe kopia}
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w ..
+    npm exec electron-builder -- \
+      --dir \
+      -c.electronDist=electron-dist \
+      -c.electronVersion=${electron.version} \
+      -c.extraMetadata.version=v${version}
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/kopia
+    cp -r ../dist/kopia-ui/*-unpacked/{locales,resources{,.pak}} $out/share/kopia
+    install -Dm644 $src/icons/kopia.svg $out/share/icons/hicolor/scalable/apps/kopia.svg
+    makeWrapper ${lib.getExe electron} $out/bin/kopia-ui \
+      --prefix PATH : ${lib.makeBinPath [ kopia ]} \
+      --add-flags $out/share/kopia/resources/app.asar \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --inherit-argv0
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "kopia-ui";
+      type = "Application";
+      desktopName = "KopiaUI";
+      comment = "Fast and secure open source backup.";
+      icon = "kopia-ui";
+      exec = "kopia-ui";
+      categories = [ "Utility" ];
+    })
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication";
+    mainProgram = "kopia-ui";
+    homepage = "https://kopia.io";
+    downloadPage = "https://github.com/kopia/kopia";
+    changelog = "https://github.com/kopia/kopia/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ blenderfreaky ];
+    platforms = lib.platforms.linux;
+  };
+}

From 6ec0c6ffc9badf720b0d552d63844eeae057d0f9 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 1 Apr 2025 01:53:43 +0200
Subject: [PATCH 068/489] lxterminal: 0.4.0 -> 0.4.1

Diff: https://github.com/lxde/lxterminal/compare/0.4.0...0.4.1
---
 .../lx/lxterminal/fix-gcc14-pr122.patch       | 24 -------------------
 pkgs/by-name/lx/lxterminal/package.nix        | 15 ++++++------
 2 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch

diff --git a/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch b/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch
deleted file mode 100644
index 57c58ac9255f..000000000000
--- a/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/lxterminal.c b/src/lxterminal.c
-index 015f5e4..32e3b68 100644
---- a/src/lxterminal.c
-+++ b/src/lxterminal.c
-@@ -1210,6 +1210,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
-     vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);
-     ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0);
-     vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);
-+    vte_regex_unref(dingus1);
-+    vte_regex_unref(dingus2);
- #else
-     GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL);
-     GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL);
-@@ -1217,9 +1219,9 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
-     vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);
-     ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0);
-     vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2);
--#endif
-     g_regex_unref(dingus1);
-     g_regex_unref(dingus2);
-+#endif
- 
-     /* Create a horizontal box inside an event box as the toplevel for the tab label. */
-     term->tab = gtk_event_box_new();
diff --git a/pkgs/by-name/lx/lxterminal/package.nix b/pkgs/by-name/lx/lxterminal/package.nix
index 956d3e3b121a..9fb97945ae4e 100644
--- a/pkgs/by-name/lx/lxterminal/package.nix
+++ b/pkgs/by-name/lx/lxterminal/package.nix
@@ -18,15 +18,15 @@
   pcre2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxterminal";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxterminal";
-    rev = version;
-    sha256 = "sha256-bCF/V6yFe4vKqVMOtNlwYyw/ickj1LFuFn4IyypwIg0=";
+    tag = finalAttrs.version;
+    sha256 = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U=";
   };
 
   configureFlags = [
@@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    ./fix-gcc14-pr122.patch # manual port of https://github.com/lxde/lxterminal/pull/122
     ./respect-xml-catalog-files-var.patch
   ];
 
@@ -73,10 +72,10 @@ stdenv.mkDerivation rec {
       desktop-independent VTE-based terminal emulator for LXDE without any
       unnecessary dependencies.
     '';
-    homepage = "https://wiki.lxde.org/en/LXTerminal";
-    license = lib.licenses.gpl2;
+    homepage = "https://www.lxde.org/";
+    license = lib.licenses.gpl2Only;
     maintainers = [ lib.maintainers.pbsds ];
     platforms = lib.platforms.linux;
     mainProgram = "lxterminal";
   };
-}
+})

From 331f049c891ffbd1a5fa83f08e5ba5b50b9aa534 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 1 Apr 2025 08:50:04 +0300
Subject: [PATCH 069/489] lxpanel: fix build with gcc14

- add patch from upstream commit:
https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c
fixing `incompatible-pointer-types` error with gcc14
---
 pkgs/desktops/lxde/core/lxpanel/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index 9c4750440566..8994ff1406f5 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch2,
   pkg-config,
   gettext,
   m4,
@@ -38,6 +39,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-HjGPV9fja2HCOlBNA9JDDHja0ULBgERRBh8bPqVEHug=";
   };
 
+  patches = [
+    # fix build with gcc14
+    # https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c
+    (fetchpatch2 {
+      url = "https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c.patch?full_index=1";
+      hash = "sha256-lj4CWdiUQhEc9J8UNKcP7/tmsGnPjA5pwXAok5YFW4M=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     gettext

From 267e16ac89c28d1f56230c74dcf577da1863f1c3 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 1 Apr 2025 10:12:49 +0300
Subject: [PATCH 070/489] lxpanel: modernize

- replace `rec` with `finalAttrs`
- remove `with lib;` from `meta`
---
 pkgs/desktops/lxde/core/lxpanel/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index 8994ff1406f5..3c68690302e9 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -30,12 +30,12 @@
   withGtk3 ? true,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxpanel";
   version = "0.10.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
+    url = "mirror://sourceforge/lxde/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
     sha256 = "sha256-HjGPV9fja2HCOlBNA9JDDHja0ULBgERRBh8bPqVEHug=";
   };
 
@@ -82,11 +82,11 @@ stdenv.mkDerivation rec {
 
   configureFlags = lib.optional withGtk3 "--enable-gtk3";
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight X11 desktop panel for LXDE";
     homepage = "https://lxde.org/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.ryneeverett ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.ryneeverett ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From f21a0311c3657b5a1f4e1b5460d68b601878f5f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Apr 2025 11:15:45 +0000
Subject: [PATCH 071/489] repomix: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix
index d9f3c163ecf6..05da4f6c520c 100644
--- a/pkgs/by-name/re/repomix/package.nix
+++ b/pkgs/by-name/re/repomix/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "repomix";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "yamadashy";
     repo = "repomix";
     tag = "v${version}";
-    hash = "sha256-a0FZaATQ4U9KtRY1m/Bi/1P9hDoNbcracZagm9EMSew=";
+    hash = "sha256-vK+Fn9gmPUTWkUHmNAX9OAoGxhG4tiVwqK6P+f8hcJQ=";
   };
 
-  npmDepsHash = "sha256-BD0JBwZ3FSMpJRRTKQinPuaSBjX/RrkwXUqDr1wXEhk=";
+  npmDepsHash = "sha256-ihC4SCl0J5trz84ixUq12BjGtPMsfv5Ngs+QzkbjJbQ=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 41d69e7ebe58c860fc4392e2a1cb03f8519334a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Apr 2025 19:24:33 +0000
Subject: [PATCH 072/489] micronaut: 4.7.6 -> 4.8.0

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

diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix
index 4e25aa18430d..44c7f32ab990 100644
--- a/pkgs/by-name/mi/micronaut/package.nix
+++ b/pkgs/by-name/mi/micronaut/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "micronaut";
-  version = "4.7.6";
+  version = "4.8.0";
 
   src = fetchzip {
     url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
-    sha256 = "sha256-PGdxwq20nSc7TPBlfo6HWxx6DmbZ1OFyeh4cZvsQ3Hg=";
+    sha256 = "sha256-BV3O+HwZc8Bin3G+DoV/nxmroCxSinvuy+bW11TrTrY=";
   };
 
   nativeBuildInputs = [

From efd5d7b047594be468aeae7543e570139046faf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 1 Apr 2025 14:29:44 -0700
Subject: [PATCH 073/489] python313Packages.simsimd: 6.4.0 -> 6.4.1

Diff: https://github.com/ashvardanian/simsimd/compare/refs/tags/v6.4.0...v6.4.1

Changelog: https://github.com/ashvardanian/SimSIMD/releases/tag/v6.4.1
---
 pkgs/development/python-modules/simsimd/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/simsimd/default.nix b/pkgs/development/python-modules/simsimd/default.nix
index d61a2e529406..9069f0f539a0 100644
--- a/pkgs/development/python-modules/simsimd/default.nix
+++ b/pkgs/development/python-modules/simsimd/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "simsimd";
-  version = "6.4.0";
+  version = "6.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "simsimd";
     tag = "v${version}";
-    hash = "sha256-o9GhLfFuH3mTE4V6DGyGwU7o3EfP4iEoxUfFvR5gtLc=";
+    hash = "sha256-4t3uCxQG0zSa2JLKE1d2G3OQLr+8E3ZDNnTf9LAYXsk=";
   };
 
   build-system = [
@@ -44,7 +44,11 @@ buildPythonPackage rec {
     changelog = "https://github.com/ashvardanian/SimSIMD/releases/tag/${src.tag}";
     description = "Portable mixed-precision BLAS-like vector math library for x86 and ARM";
     homepage = "https://github.com/ashvardanian/simsimd";
-    license = lib.licenses.asl20;
+    license = with lib.licenses; [
+      asl20
+      # or
+      bsd3
+    ];
     maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From df481d6d949987041cf4382aa599bf46dec2dd08 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 27 Mar 2025 16:20:12 +0100
Subject: [PATCH 074/489] python313Packages.granian: enable checks, add pbsds
 as maintainer

---
 .../python-modules/granian/default.nix        | 57 +++++++++++++++----
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
index 6435bd19b6e2..5a2953607dde 100644
--- a/pkgs/development/python-modules/granian/default.nix
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -2,10 +2,18 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  cacert,
   buildPythonPackage,
   uvloop,
   click,
-  libiconv,
+  setproctitle,
+  watchfiles,
+  versionCheckHook,
+  pytestCheckHook,
+  pytest-asyncio,
+  websockets,
+  httpx,
+  sniffio,
   nix-update-script,
 }:
 
@@ -17,13 +25,12 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emmett-framework";
     repo = "granian";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YQ9+PcKXtSc+wdvhgDfSAfcv/y53oqcrPCEI9dDKFa0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    name = "${pname}-${version}";
+    inherit pname version src;
     hash = "sha256-XJ61+u5aGQis6YkfASD+WJHEKDBL+2ImqCAuQmm3A/g=";
   };
 
@@ -32,15 +39,42 @@ buildPythonPackage rec {
     maturinBuildHook
   ];
 
-  buildInputs = [
-    libiconv
-  ];
-
   dependencies = [
-    uvloop
     click
   ];
 
+  optional-dependencies = {
+    pname = [ setproctitle ];
+    reload = [ watchfiles ];
+    # rloop = [ rloop ]; # not packaged
+    uvloop = [ uvloop ];
+  };
+
+  nativeCheckInputs = [
+    versionCheckHook
+    pytestCheckHook
+    pytest-asyncio
+    websockets
+    httpx
+    sniffio
+  ];
+
+  preCheck = ''
+    # collides with the one installed in $out
+    rm -rf granian/
+  '';
+
+  # needed for checks
+  env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  __darwinAllowLocalNetworking = true;
+
+  pytestFlagsArray = [ "tests/" ];
+
+  pythonImportCheck = [ "granian" ];
+
+  versionCheckProgramArg = "--version";
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
@@ -48,7 +82,10 @@ buildPythonPackage rec {
     homepage = "https://github.com/emmett-framework/granian";
     license = lib.licenses.bsd3;
     mainProgram = "granian";
-    maintainers = with lib.maintainers; [ lucastso10 ];
+    maintainers = with lib.maintainers; [
+      lucastso10
+      pbsds
+    ];
     platforms = lib.platforms.unix;
   };
 }

From 7e8dc8809112b505ad1983dae863703e481964d5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 24 Mar 2025 22:33:03 +0100
Subject: [PATCH 075/489] python313Packages.reflex: 0.7.4a0 -> 0.7.4

Changelog: https://github.com/reflex-dev/reflex/releases/tag/v0.7.4
---
 pkgs/development/python-modules/reflex/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix
index be714a1d1df0..9b5a31324fdd 100644
--- a/pkgs/development/python-modules/reflex/default.nix
+++ b/pkgs/development/python-modules/reflex/default.nix
@@ -9,6 +9,7 @@
   dill,
   distro,
   fastapi,
+  granian,
   gunicorn,
   hatchling,
   httpx,
@@ -25,6 +26,7 @@
   pydantic,
   pytest-asyncio,
   pytest-mock,
+  python-dotenv,
   pytestCheckHook,
   python-engineio,
   python-multipart,
@@ -48,14 +50,14 @@
 
 buildPythonPackage rec {
   pname = "reflex";
-  version = "0.7.4a0";
+  version = "0.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "reflex-dev";
     repo = "reflex";
     tag = "v${version}";
-    hash = "sha256-KFNcdPoZc+Zps8OV3aLIkk9rlbfy6rx0I9JrYFt2b5E=";
+    hash = "sha256-Ra7XFa86sZ18xXjfJ4COiIl7MDqz87MPLRws+kGEfKk=";
   };
 
   pythonRelaxDeps = [
@@ -77,6 +79,8 @@ buildPythonPackage rec {
     dill
     distro
     fastapi
+    granian
+    granian.optional-dependencies.reload
     gunicorn
     httpx
     jinja2
@@ -106,6 +110,7 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-asyncio
     pytest-mock
+    python-dotenv
     playwright
     attrs
     numpy

From 9d248114fa1db17f3ff1dac35bcc2d0dfcb33dae Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 24 Mar 2025 22:33:11 +0100
Subject: [PATCH 076/489] python313Packages.reflex-chakra: 0.6.3 -> 0.7.0

Changelog: https://github.com/reflex-dev/reflex-chakra/releases/tag/v0.7.0
---
 .../python-modules/reflex-chakra/default.nix  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix
index e197395d1d2a..b51b86d660c8 100644
--- a/pkgs/development/python-modules/reflex-chakra/default.nix
+++ b/pkgs/development/python-modules/reflex-chakra/default.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   poetry-core,
   pythonOlder,
+  reflex,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -20,22 +22,25 @@ buildPythonPackage rec {
     hash = "sha256-foIXPLWcxNf33y39BgiRpvwRnZOTcfAjhCvC4TD8ZMs=";
   };
 
-  pythonRemoveDeps = [
-    # Circular dependency
-    "reflex"
-  ];
-
   build-system = [ poetry-core ];
 
-  # pythonImportsCheck = [ "reflex_chakra" ];
+  dependencies = [
+    reflex
+  ];
 
+  pythonImportsCheck = [ "reflex_chakra" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  # there are no "test_*.py" files, and the
+  # other files with `test_*` functions are not maintained it seems
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Chakra Implementation in Reflex";
     homepage = "https://github.com/reflex-dev/reflex-chakra";
     changelog = "https://github.com/reflex-dev/reflex-chakra/releases/tag/${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 8f1d307f91161dab45f8063a86dc4a08a9b433ff Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 1 Apr 2025 01:11:27 +0200
Subject: [PATCH 077/489] python313Packages.reflex: 0.7.4 -> 0.7.5

Diff: https://github.com/reflex-dev/reflex/compare/refs/tags/v0.7.4...v0.7.5

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

diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix
index 9b5a31324fdd..07ed325d19ec 100644
--- a/pkgs/development/python-modules/reflex/default.nix
+++ b/pkgs/development/python-modules/reflex/default.nix
@@ -50,14 +50,14 @@
 
 buildPythonPackage rec {
   pname = "reflex";
-  version = "0.7.4";
+  version = "0.7.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "reflex-dev";
     repo = "reflex";
     tag = "v${version}";
-    hash = "sha256-Ra7XFa86sZ18xXjfJ4COiIl7MDqz87MPLRws+kGEfKk=";
+    hash = "sha256-uHlLItjONHGnuE4t2UOcVRYxcDDbRldUwHd8mPn7JfY=";
   };
 
   pythonRelaxDeps = [

From e5fe266bd4de55322ea5104146bb4b48629d3a47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 00:35:09 +0000
Subject: [PATCH 078/489] smartgit: 24.1.2 -> 24.1.3

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

diff --git a/pkgs/by-name/sm/smartgit/package.nix b/pkgs/by-name/sm/smartgit/package.nix
index a833e4d0ff05..a6c3d9ac231d 100644
--- a/pkgs/by-name/sm/smartgit/package.nix
+++ b/pkgs/by-name/sm/smartgit/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "smartgit";
-  version = "24.1.2";
+  version = "24.1.3";
 
   src = fetchurl {
     url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${
       builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
     }.tar.gz";
-    hash = "sha256-bPiPb/k5f9dRpwm4Wj+c2mhFhH9WOz2hzKeDfQLRLHQ=";
+    hash = "sha256-YhgE1Y0L8lzefJnvswKwIFnx6XIo40DszAr/cxOoOds=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook3 ];

From c7d1fc9dcd99ad4395a064b602782e6ca68b5527 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 00:38:49 +0000
Subject: [PATCH 079/489] datovka: 4.25.0 -> 4.26.0

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

diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix
index c311a79f3bdc..da0b4ca2e495 100644
--- a/pkgs/applications/networking/datovka/default.nix
+++ b/pkgs/applications/networking/datovka/default.nix
@@ -12,11 +12,11 @@
 
 mkDerivation rec {
   pname = "datovka";
-  version = "4.25.0";
+  version = "4.26.0";
 
   src = fetchurl {
     url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
-    sha256 = "sha256-Snm9dDtHZQsx4T82tML77auBTb1lvITUOfL+kmhY4es=";
+    sha256 = "sha256-pEdjh/c4vhirj2R9bYDdi2FL7N9x67kTOyfXiJDzMKE=";
   };
 
   buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ];

From 8a8bbad67bf406bdea6568fb8178e0c8abf85435 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 01:03:09 +0000
Subject: [PATCH 080/489] mendeley: 2.131.0 -> 2.132.0

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

diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 499ef5248938..be65d30b7376 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -8,13 +8,13 @@
 
 let
   pname = "mendeley";
-  version = "2.131.0";
+  version = "2.132.0";
 
   executableName = "${pname}-reference-manager";
 
   src = fetchurl {
     url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
-    hash = "sha256-pVykRTs0yI9UArgxuE3RUKI8onv27hjyG1Dy4PXztuQ=";
+    hash = "sha256-d4B+rVwWHKLVgY/aK3E6i6CyQKD4TsxZ/XyKbbCrQE0=";
   };
 
   appimageContents = appimageTools.extractType2 {

From ea485e12078a3c7436c2a5dea9a6f8813c3ecc6b Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 25 Jan 2025 16:20:58 -0800
Subject: [PATCH 081/489] mattermost: squash systemd-tmpfiles warning (+ other
 minor fixes)

There was a systemd-tmpfiles warning about not being able to remove the
'plugins' directory. Squash this warning through removal of unnecessary
systemd-tmpfiles options, and write a test for it.

Add the {option}`services.mattermost.pluginsBundle` option to allow
overriding the plugin directory and also using it for tests. Update
wording in option documentation so it is more clear.

Use formats.json instead of builtins.toJSON so module merging works.

Make the tests go faster by pipelining shutdowns of nodes.
---
 .../modules/services/web-apps/mattermost.nix  |  88 ++++----
 nixos/tests/mattermost/default.nix            | 188 +++++++++++-------
 2 files changed, 171 insertions(+), 105 deletions(-)

diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index b1352778fee0..22dad6497d07 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -147,34 +147,34 @@ let
     else
       throw "Invalid database driver: ${cfg.database.driver}";
 
-  mattermostPluginDerivations =
-    with pkgs;
-    map (
-      plugin:
-      stdenv.mkDerivation {
-        name = "mattermost-plugin";
-        installPhase = ''
-          mkdir -p $out/share
-          cp ${plugin} $out/share/plugin.tar.gz
-        '';
-        dontUnpack = true;
-        dontPatch = true;
-        dontConfigure = true;
-        dontBuild = true;
-        preferLocalBuild = true;
-      }
-    ) cfg.plugins;
+  mattermostPluginDerivations = map (
+    plugin:
+    pkgs.stdenvNoCC.mkDerivation {
+      name = "${cfg.package.name}-plugin";
+      installPhase = ''
+        runHook preInstall
+        mkdir -p $out/share
+        ln -sf ${plugin} $out/share/plugin.tar.gz
+        runHook postInstall
+      '';
+      dontUnpack = true;
+      dontPatch = true;
+      dontConfigure = true;
+      dontBuild = true;
+      preferLocalBuild = true;
+    }
+  ) cfg.plugins;
 
   mattermostPlugins =
-    with pkgs;
     if mattermostPluginDerivations == [ ] then
       null
     else
-      stdenv.mkDerivation {
+      pkgs.stdenvNoCC.mkDerivation {
         name = "${cfg.package.name}-plugins";
-        nativeBuildInputs = [ autoPatchelfHook ] ++ mattermostPluginDerivations;
+        nativeBuildInputs = [ pkgs.autoPatchelfHook ] ++ mattermostPluginDerivations;
         buildInputs = [ cfg.package ];
         installPhase = ''
+          runHook preInstall
           mkdir -p $out
           plugins=(${
             escapeShellArgs (map (plugin: "${plugin}/share/plugin.tar.gz") mattermostPluginDerivations)
@@ -187,6 +187,7 @@ let
             GZIP_OPT=-9 tar -C "$hash" -cvzf "$out/$hash.tar.gz" .
             rm -rf "$hash"
           done
+          runHook postInstall
         '';
 
         dontUnpack = true;
@@ -254,8 +255,8 @@ let
       }
   );
 
-  mattermostConfJSON = pkgs.writeText "mattermost-config.json" (builtins.toJSON mattermostConf);
-
+  format = pkgs.formats.json { };
+  finalConfig = format.generate "mattermost-config.json" mattermostConf;
 in
 {
   imports = [
@@ -454,9 +455,9 @@ in
           the options specified in services.mattermost will be generated
           but won't be overwritten on changes or rebuilds.
 
-          If this option is disabled, changes in the system console won't
-          be possible (default). If an config.json is present, it will be
-          overwritten!
+          If this option is disabled, persistent changes in the system
+          console won't be possible (the default). If a config.json is
+          present, it will be overwritten at service start!
         '';
       };
 
@@ -480,7 +481,20 @@ in
         description = ''
           Plugins to add to the configuration. Overrides any installed if non-null.
           This is a list of paths to .tar.gz files or derivations evaluating to
-          .tar.gz files.
+          .tar.gz files. You can use `mattermost.buildPlugin` to build plugins;
+          see the NixOS documentation for more details.
+        '';
+      };
+
+      pluginsBundle = mkOption {
+        type = with types; nullOr package;
+        default = mattermostPlugins;
+        defaultText = ''
+          All entries in {config}`services.mattermost.plugins`, repacked
+        '';
+        description = ''
+          Derivation building to a directory of plugin tarballs.
+          This overrides {option}`services.mattermost.plugins` if provided.
         '';
       };
 
@@ -508,7 +522,8 @@ in
         type = with types; attrsOf (either int str);
         default = { };
         description = ''
-          Extra environment variables to export to the Mattermost process, in the systemd unit.
+          Extra environment variables to export to the Mattermost process
+          from the systemd unit configuration.
         '';
         example = {
           MM_SERVICESETTINGS_SITEURL = "http://example.com";
@@ -524,11 +539,11 @@ in
           for mattermost (see [the Mattermost documentation](https://docs.mattermost.com/configure/configuration-settings.html#environment-variables)).
 
           Settings defined in the environment file will overwrite settings
-          set via nix or via the {option}`services.mattermost.extraConfig`
+          set via Nix or via the {option}`services.mattermost.extraConfig`
           option.
 
           Useful for setting config options without their value ending up in the
-          (world-readable) nix store, e.g. for a database password.
+          (world-readable) Nix store, e.g. for a database password.
         '';
       };
 
@@ -687,7 +702,7 @@ in
       };
 
       settings = mkOption {
-        type = types.attrs;
+        inherit (format) type;
         default = { };
         description = ''
           Additional configuration options as Nix attribute set in config.json schema.
@@ -786,7 +801,7 @@ in
           "d= ${tempDir} 0750 ${cfg.user} ${cfg.group} - -"
 
           # Ensure that pluginDir is a directory, as it could be a symlink on prior versions.
-          "r- ${pluginDir} - - - - -"
+          # Don't remove or clean it out since it should be persistent, as this is where plugins are unpacked.
           "d= ${pluginDir} 0750 ${cfg.user} ${cfg.group} - -"
 
           # Ensure that the plugin directories exist.
@@ -801,15 +816,14 @@ in
           "L+ ${cfg.dataDir}/client - - - - ${cfg.package}/client"
         ]
         ++ (
-          if mattermostPlugins == null then
-            # Create the plugin tarball directory if it's a symlink.
+          if cfg.pluginsBundle == null then
+            # Create the plugin tarball directory to allow plugin uploads.
             [
-              "r- ${cfg.dataDir}/plugins - - - - -"
               "d= ${cfg.dataDir}/plugins 0750 ${cfg.user} ${cfg.group} - -"
             ]
           else
-            # Symlink the plugin tarball directory, removing anything existing.
-            [ "L+ ${cfg.dataDir}/plugins - - - - ${mattermostPlugins}" ]
+            # Symlink the plugin tarball directory, removing anything existing, since it's managed by Nix.
+            [ "L+ ${cfg.dataDir}/plugins - - - - ${cfg.pluginsBundle}" ]
         );
 
       systemd.services.mattermost = rec {
@@ -836,7 +850,7 @@ in
             configDir=${escapeShellArg cfg.configDir}
             logDir=${escapeShellArg cfg.logDir}
             package=${escapeShellArg cfg.package}
-            nixConfig=${escapeShellArg mattermostConfJSON}
+            nixConfig=${escapeShellArg finalConfig}
           ''
           + optionalString (versionAtLeast config.system.stateVersion "25.05") ''
             # Migrate configs in the pre-25.05 directory structure.
diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix
index eb7b814e3983..47efc213383d 100644
--- a/nixos/tests/mattermost/default.nix
+++ b/nixos/tests/mattermost/default.nix
@@ -33,7 +33,7 @@ import ../make-test-python.nix (
               );
             };
 
-            system.stateVersion = lib.mkDefault "25.05";
+            system.stateVersion = lib.mkDefault (lib.versions.majorMinor lib.version);
 
             services.mattermost = lib.recursiveUpdate {
               enable = true;
@@ -63,7 +63,7 @@ import ../make-test-python.nix (
             # Upgrade to the latest Mattermost.
             specialisation.latest.configuration = {
               services.mattermost.package = lib.mkForce pkgs.mattermostLatest;
-              system.stateVersion = lib.mkVMOverride "25.05";
+              system.stateVersion = lib.mkVMOverride (lib.versions.majorMinor lib.version);
             };
           }
         )
@@ -90,57 +90,60 @@ import ../make-test-python.nix (
     name = "mattermost";
 
     nodes = rec {
-      postgresMutable =
+      postgresMutable = makeMattermost {
+        mutableConfig = true;
+        preferNixConfig = false;
+        settings.SupportSettings.HelpLink = "https://search.nixos.org";
+      } { };
+      postgresMostlyMutable =
         makeMattermost
           {
             mutableConfig = true;
-            preferNixConfig = false;
-            settings.SupportSettings.HelpLink = "https://search.nixos.org";
+            preferNixConfig = true;
+            plugins = with pkgs; [
+              # Build the demo plugin.
+              (mattermost.buildPlugin {
+                pname = "mattermost-plugin-starter-template";
+                version = "0.1.0";
+                src = fetchFromGitHub {
+                  owner = "mattermost";
+                  repo = "mattermost-plugin-starter-template";
+                  # Newer versions have issues with their dependency lockfile.
+                  rev = "7c98e89ac1a268ce8614bc665571b7bbc9a70df2";
+                  hash = "sha256-uyfxB0GZ45qL9ssWUord0eKQC6S0TlCTtjTOXWtK4H0=";
+                };
+                vendorHash = "sha256-Jl4F9YkHNqiFP9/yeyi4vTntqxMk/J1zhEP6QLSvJQA=";
+                npmDepsHash = "sha256-z08nc4XwT+uQjQlZiUydJyh8mqeJoYdPFWuZpw9k99s=";
+              })
+
+              # Build the todos plugin.
+              (mattermost.buildPlugin {
+                pname = "mattermost-plugin-todo";
+                version = "0.8-pre";
+                src = fetchFromGitHub {
+                  owner = "mattermost-community";
+                  repo = "mattermost-plugin-todo";
+                  # 0.7.1 didn't work, seems to use an older set of node dependencies.
+                  rev = "f25dc91ea401c9f0dcd4abcebaff10eb8b9836e5";
+                  hash = "sha256-OM+m4rTqVtolvL5tUE8RKfclqzoe0Y38jLU60Pz7+HI=";
+                };
+                vendorHash = "sha256-5KpechSp3z/Nq713PXYruyNxveo6CwrCSKf2JaErbgg=";
+                npmDepsHash = "sha256-o2UOEkwb8Vx2lDWayNYgng0GXvmS6lp/ExfOq3peyMY=";
+                extraGoModuleAttrs = {
+                  npmFlags = [ "--legacy-peer-deps" ];
+                };
+              })
+            ];
           }
           {
             # Last version to support the "old" config layout.
             system.stateVersion = lib.mkForce "24.11";
 
-            # First version to support the "new" config layout.
-            specialisation.upgrade.configuration.system.stateVersion = lib.mkVMOverride "25.05";
+            # Supports the "new" config layout.
+            specialisation.upgrade.configuration.system.stateVersion = lib.mkVMOverride (
+              lib.versions.majorMinor lib.version
+            );
           };
-      postgresMostlyMutable = makeMattermost {
-        mutableConfig = true;
-        plugins = with pkgs; [
-          # Build the demo plugin.
-          (mattermost.buildPlugin {
-            pname = "mattermost-plugin-starter-template";
-            version = "0.1.0";
-            src = fetchFromGitHub {
-              owner = "mattermost";
-              repo = "mattermost-plugin-starter-template";
-              # Newer versions have issues with their dependency lockfile.
-              rev = "7c98e89ac1a268ce8614bc665571b7bbc9a70df2";
-              hash = "sha256-uyfxB0GZ45qL9ssWUord0eKQC6S0TlCTtjTOXWtK4H0=";
-            };
-            vendorHash = "sha256-Jl4F9YkHNqiFP9/yeyi4vTntqxMk/J1zhEP6QLSvJQA=";
-            npmDepsHash = "sha256-z08nc4XwT+uQjQlZiUydJyh8mqeJoYdPFWuZpw9k99s=";
-          })
-
-          # Build the todos plugin.
-          (mattermost.buildPlugin {
-            pname = "mattermost-plugin-todo";
-            version = "0.8-pre";
-            src = fetchFromGitHub {
-              owner = "mattermost-community";
-              repo = "mattermost-plugin-todo";
-              # 0.7.1 didn't work, seems to use an older set of node dependencies.
-              rev = "f25dc91ea401c9f0dcd4abcebaff10eb8b9836e5";
-              hash = "sha256-OM+m4rTqVtolvL5tUE8RKfclqzoe0Y38jLU60Pz7+HI=";
-            };
-            vendorHash = "sha256-5KpechSp3z/Nq713PXYruyNxveo6CwrCSKf2JaErbgg=";
-            npmDepsHash = "sha256-o2UOEkwb8Vx2lDWayNYgng0GXvmS6lp/ExfOq3peyMY=";
-            extraGoModuleAttrs = {
-              npmFlags = [ "--legacy-peer-deps" ];
-            };
-          })
-        ];
-      } { };
       postgresImmutable = makeMattermost {
         package = pkgs.mattermost.overrideAttrs (prev: {
           webapp = prev.webapp.overrideAttrs (prevWebapp: {
@@ -343,9 +346,14 @@ import ../make-test-python.nix (
         '';
       in
       ''
+        import sys
         import shlex
+        import threading
+        import queue
 
         def wait_mattermost_up(node, site_name="${siteName}"):
+          print(f"wait_mattermost_up({node.name!r}, site_name={site_name!r})", file=sys.stderr)
+          node.wait_for_unit("multi-user.target")
           node.systemctl("start mattermost.service")
           node.wait_for_unit("mattermost.service")
           node.wait_for_open_port(8065)
@@ -353,20 +361,25 @@ import ../make-test-python.nix (
           node.succeed(f"curl {shlex.quote('${url}')}/index.html | grep {shlex.quote(site_name)}")
 
         def restart_mattermost(node, site_name="${siteName}"):
+          print(f"restart_mattermost({node.name!r}, site_name={site_name!r})", file=sys.stderr)
           node.systemctl("restart mattermost.service")
           wait_mattermost_up(node, site_name)
 
         def expect_config(node, mattermost_version, *configs):
+          print(f"expect_config({node.name!r}, {mattermost_version!r}, *{configs!r})", file=sys.stderr)
           for config in configs:
             node.succeed(f"${expectConfig} {shlex.quote(config)} {shlex.quote(mattermost_version)}")
 
         def expect_plugins(node, jq_or_code):
+          print(f"expect_plugins({node.name!r}, {jq_or_code!r})", file=sys.stderr)
           node.succeed(f"${expectPlugins} {shlex.quote(str(jq_or_code))}")
 
         def ensure_post(node, fail_if_not_found=False):
+          print(f"ensure_post({node.name!r}, fail_if_not_found={fail_if_not_found!r})", file=sys.stderr)
           node.succeed(f"${ensurePost} {shlex.quote('${url}')} {1 if fail_if_not_found else 0}")
 
-        def set_config(node, *configs, nixos_version='25.05'):
+        def set_config(node, *configs, nixos_version='${lib.versions.majorMinor lib.version}'):
+          print(f"set_config({node.name!r}, *{configs!r}, nixos_version={nixos_version!r})", file=sys.stderr)
           for config in configs:
             args = [shlex.quote("${setConfig}")]
             args.append(shlex.quote(config))
@@ -374,8 +387,13 @@ import ../make-test-python.nix (
               args.append(shlex.quote(str(nixos_version)))
             node.succeed(' '.join(args))
 
-        def run_mattermost_tests(mutableToplevel: str, mutable,
-                                 mostlyMutableToplevel: str, mostlyMutable,
+        def switch_to_specialisation(node, toplevel: str, specialisation: str):
+          print(f"switch_to_specialisation({node.name!r}, {toplevel!r}, {specialisation!r})", file=sys.stderr)
+          node.succeed(f"{toplevel}/specialisation/{specialisation}/bin/switch-to-configuration switch || true")
+
+        def run_mattermost_tests(shutdown_queue: queue.Queue,
+                                 mutableToplevel: str, mutable,
+                                 mostlyMutableToplevel: str, mostlyMutablePlugins: str, mostlyMutable,
                                  immutableToplevel: str, immutable,
                                  environmentFileToplevel: str, environmentFile):
           esr, latest = '${pkgs.mattermost.version}', '${pkgs.mattermostLatest.version}'
@@ -391,8 +409,7 @@ import ../make-test-python.nix (
           set_config(
             mutable,
             '.SupportSettings.AboutLink = "https://mattermost.com"',
-            '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual"',
-            nixos_version='24.11' # Default 'mutable' config is an old version
+            '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual"'
           )
           ensure_post(mutable)
           restart_mattermost(mutable)
@@ -401,23 +418,14 @@ import ../make-test-python.nix (
           expect_config(mutable, esr, '.AboutLink == "https://mattermost.com" and .HelpLink == "https://nixos.org/nixos/manual"')
           ensure_post(mutable, fail_if_not_found=True)
 
-          # Switch to the newer config
-          mutable.succeed(f"{mutableToplevel}/specialisation/upgrade/bin/switch-to-configuration switch")
-          wait_mattermost_up(mutable)
-
-          # AboutLink and HelpLink should be changed, still, and the post should still exist
-          expect_config(mutable, esr, '.AboutLink == "https://mattermost.com" and .HelpLink == "https://nixos.org/nixos/manual"')
-          ensure_post(mutable, fail_if_not_found=True)
-
           # Switch to the latest Mattermost version
-          mutable.succeed(f"{mutableToplevel}/specialisation/latest/bin/switch-to-configuration switch")
+          switch_to_specialisation(mutable, mutableToplevel, "latest")
           wait_mattermost_up(mutable)
 
           # AboutLink and HelpLink should be changed, still, and the post should still exist
           expect_config(mutable, latest, '.AboutLink == "https://mattermost.com" and .HelpLink == "https://nixos.org/nixos/manual"')
           ensure_post(mutable, fail_if_not_found=True)
-
-          mutable.shutdown()
+          shutdown_queue.put(mutable)
 
           ## Mostly mutable node tests ##
           mostlyMutable.start()
@@ -434,13 +442,40 @@ import ../make-test-python.nix (
             mostlyMutable,
             '.SupportSettings.AboutLink = "https://mattermost.com"',
             '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual"',
+            nixos_version='24.11' # Default 'mostlyMutable' config is an old version
+          )
+          ensure_post(mostlyMutable)
+          restart_mattermost(mostlyMutable)
+
+          # HelpLink should be changed but AboutLink should not, and the post should exist
+          expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"')
+          ensure_post(mostlyMutable, fail_if_not_found=True)
+
+          # Switch to the newer config and make sure the plugins directory is replaced with a directory,
+          # since it could have been a symlink on previous versions.
+          mostlyMutable.systemctl("stop mattermost.service")
+          mostlyMutable.succeed(f"[ ! -L /var/lib/mattermost/data/plugins ] && rm -rf /var/lib/mattermost/data/plugins && ln -s {mostlyMutablePlugins} /var/lib/mattermost/data/plugins || true")
+          mostlyMutable.succeed('[ -L /var/lib/mattermost/data/plugins ] && [ -d /var/lib/mattermost/data/plugins ]')
+          switch_to_specialisation(mostlyMutable, mostlyMutableToplevel, "upgrade")
+          wait_mattermost_up(mostlyMutable)
+          mostlyMutable.succeed('[ ! -L /var/lib/mattermost/data/plugins ] && [ -d /var/lib/mattermost/data/plugins ]')
+
+          # HelpLink should be changed, still, and the post should still exist
+          expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"')
+          ensure_post(mostlyMutable, fail_if_not_found=True)
+
+          # Edit the config and make a post
+          set_config(
+            mostlyMutable,
+            '.SupportSettings.AboutLink = "https://mattermost.com/foo"',
+            '.SupportSettings.HelpLink = "https://nixos.org/nixos/manual/bar"',
             '.PluginSettings.PluginStates."com.mattermost.plugin-todo".Enable = true'
           )
           ensure_post(mostlyMutable)
           restart_mattermost(mostlyMutable)
 
           # AboutLink should be overridden by NixOS configuration; HelpLink should be what we set above
-          expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"')
+          expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual/bar"')
 
           # Single plugin that's now enabled.
           expect_plugins(mostlyMutable, 'length == 1')
@@ -449,14 +484,14 @@ import ../make-test-python.nix (
           ensure_post(mostlyMutable, fail_if_not_found=True)
 
           # Switch to the latest Mattermost version
-          mostlyMutable.succeed(f"{mostlyMutableToplevel}/specialisation/latest/bin/switch-to-configuration switch")
+          switch_to_specialisation(mostlyMutable, mostlyMutableToplevel, "latest")
           wait_mattermost_up(mostlyMutable)
 
           # AboutLink should be overridden and the post should still exist
-          expect_config(mostlyMutable, latest, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"')
+          expect_config(mostlyMutable, latest, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual/bar"')
           ensure_post(mostlyMutable, fail_if_not_found=True)
 
-          mostlyMutable.shutdown()
+          shutdown_queue.put(mostlyMutable)
 
           ## Immutable node tests ##
           immutable.start()
@@ -484,14 +519,14 @@ import ../make-test-python.nix (
           ensure_post(immutable, fail_if_not_found=True)
 
           # Switch to the latest Mattermost version
-          immutable.succeed(f"{immutableToplevel}/specialisation/latest/bin/switch-to-configuration switch")
+          switch_to_specialisation(immutable, immutableToplevel, "latest")
           wait_mattermost_up(immutable)
 
           # AboutLink and HelpLink should be changed, still, and the post should still exist
           expect_config(immutable, latest, '.AboutLink == "https://nixos.org" and .HelpLink == "https://search.nixos.org"')
           ensure_post(immutable, fail_if_not_found=True)
 
-          immutable.shutdown()
+          shutdown_queue.put(immutable)
 
           ## Environment File node tests ##
           environmentFile.start()
@@ -503,19 +538,31 @@ import ../make-test-python.nix (
           ensure_post(environmentFile, fail_if_not_found=True)
 
           # Switch to the latest Mattermost version
-          environmentFile.succeed(f"{environmentFileToplevel}/specialisation/latest/bin/switch-to-configuration switch")
+          switch_to_specialisation(environmentFile, environmentFileToplevel, "latest")
           wait_mattermost_up(environmentFile)
 
           # AboutLink should be changed still, and the post should still exist
           expect_config(environmentFile, latest, '.AboutLink == "https://nixos.org"')
           ensure_post(environmentFile, fail_if_not_found=True)
 
-          environmentFile.shutdown()
+          shutdown_queue.put(environmentFile)
+
+        # Run shutdowns asynchronously so we can pipeline them.
+        shutdown_queue: queue.Queue = queue.Queue()
+        def shutdown_worker():
+          while True:
+            node = shutdown_queue.get()
+            print(f"Shutting down node {node.name!r} asynchronously", file=sys.stderr)
+            node.shutdown()
+            shutdown_queue.task_done()
+        threading.Thread(target=shutdown_worker, daemon=True).start()
 
         run_mattermost_tests(
+          shutdown_queue,
           "${nodes.mysqlMutable.system.build.toplevel}",
           mysqlMutable,
           "${nodes.mysqlMostlyMutable.system.build.toplevel}",
+          "${nodes.mysqlMostlyMutable.services.mattermost.pluginsBundle}",
           mysqlMostlyMutable,
           "${nodes.mysqlImmutable.system.build.toplevel}",
           mysqlImmutable,
@@ -524,15 +571,20 @@ import ../make-test-python.nix (
         )
 
         run_mattermost_tests(
+          shutdown_queue,
           "${nodes.postgresMutable.system.build.toplevel}",
           postgresMutable,
           "${nodes.postgresMostlyMutable.system.build.toplevel}",
+          "${nodes.postgresMostlyMutable.services.mattermost.pluginsBundle}",
           postgresMostlyMutable,
           "${nodes.postgresImmutable.system.build.toplevel}",
           postgresImmutable,
           "${nodes.postgresEnvironmentFile.system.build.toplevel}",
           postgresEnvironmentFile
         )
+
+        # Drain the queue
+        shutdown_queue.join()
       '';
   }
 )

From d66de8e4c9161d513cc40eb6191dbaff4d5afb70 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 13 Mar 2025 23:57:36 -0700
Subject: [PATCH 082/489] mattermost: disable failing aarch64 tests

These were added fairly recently, and apparently test that thumbnailing
an image exactly matches a reference image, which varies by arch.
---
 pkgs/by-name/ma/mattermost/tests.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix
index 0eaf1c8966a9..60cf915ad92f 100644
--- a/pkgs/by-name/ma/mattermost/tests.nix
+++ b/pkgs/by-name/ma/mattermost/tests.nix
@@ -146,6 +146,10 @@ mattermost.overrideAttrs (
       ++ optionals (!stdenv.hostPlatform.isx86_64) [
         # aarch64: invalid operating system or processor architecture
         "TestCanIUpgradeToE0"
+
+        # aarch64: thumbnail previews are nondeterministic
+        "TestUploadFiles/multipart_Happy_image_thumbnail"
+        "TestUploadFiles/simple_Happy_image_thumbnail"
       ];
 
     preCheck = ''

From 9f23ed6644376d94f925c324e1a24e18d04053a8 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Tue, 1 Apr 2025 22:17:57 -0700
Subject: [PATCH 083/489] nixos/mattermost: increase db connect timeouts

---
 nixos/modules/services/web-apps/mattermost.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index 22dad6497d07..572b47d2b518 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -654,13 +654,13 @@ in
             if cfg.database.driver == "postgres" then
               {
                 sslmode = "disable";
-                connect_timeout = 30;
+                connect_timeout = 60;
               }
             else if cfg.database.driver == "mysql" then
               {
                 charset = "utf8mb4,utf8";
-                writeTimeout = "30s";
-                readTimeout = "30s";
+                writeTimeout = "60s";
+                readTimeout = "60s";
               }
             else
               throw "Invalid database driver ${cfg.database.driver}";
@@ -668,13 +668,13 @@ in
             if config.mattermost.database.driver == "postgres" then
               {
                 sslmode = "disable";
-                connect_timeout = 30;
+                connect_timeout = 60;
               }
             else if config.mattermost.database.driver == "mysql" then
               {
                 charset = "utf8mb4,utf8";
-                writeTimeout = "30s";
-                readTimeout = "30s";
+                writeTimeout = "60s";
+                readTimeout = "60s";
               }
             else
               throw "Invalid database driver";

From 7423868fd89b7fd5181abeeb50c0e37177dec56f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 10:42:29 +0000
Subject: [PATCH 084/489] bento: 1.5.2 -> 1.6.0

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

diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix
index 722e4a5a8188..edf9dfe1c85c 100644
--- a/pkgs/by-name/be/bento/package.nix
+++ b/pkgs/by-name/be/bento/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "bento";
-  version = "1.5.2";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "warpstreamlabs";
     repo = "bento";
     tag = "v${version}";
-    hash = "sha256-ufRC/xVuSnoN+dHeiQZ2k2T8mYxz576l1n+y3Y3TMEY=";
+    hash = "sha256-IPdRe5H/ADaQyz9MjFFplhesUwWMnZ9/RKLBt+f0Z8w=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-FRaT+TeH6+0RzvCwPd0e+2a6i85GTPARS2H49zYVwk4=";
+  vendorHash = "sha256-ormwwLixxvU5W5Vy8c3HTfS5lXkcs+1z0EKr99Em92o=";
 
   subPackages = [
     "cmd/bento"

From 5336a918dfcabac3d15a0c04ac9d47f12b31ed72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Wed, 2 Apr 2025 21:17:32 +0200
Subject: [PATCH 085/489] textual-image: init at 0.8.2

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

diff --git a/pkgs/development/python-modules/textual-image/default.nix b/pkgs/development/python-modules/textual-image/default.nix
new file mode 100644
index 000000000000..9449d2295752
--- /dev/null
+++ b/pkgs/development/python-modules/textual-image/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # dependencies
+  rich,
+
+  # tests
+  pillow,
+  pytestCheckHook,
+
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "textual-image";
+  version = "0.8.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "lnqs";
+    repo = "textual-image";
+    tag = "v${version}";
+    hash = "sha256-ik/zvnxXN5u2jXHfsGsCLnymZZ+IQiixagOJdEMRDlw=";
+  };
+
+  buildInputs = [ setuptools ];
+
+  dependencies = [
+    pillow
+    rich
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "textual_image" ];
+
+  doCheck = false; # tests require [syrupy](https://github.com/syrupy-project/syrupy)
+
+  meta = {
+    description = "Render images in the terminal with Textual and rich";
+    homepage = "https://github.com/lnqs/textual-image/";
+    changelog = "https://github.com/lnqs/textual-image/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ gaelj ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f1d6ddb041a0..bba2f04a224f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17050,6 +17050,8 @@ self: super: with self; {
 
   textual-fastdatatable = callPackage ../development/python-modules/textual-fastdatatable { };
 
+  textual-image = callPackage ../development/python-modules/textual-image { };
+
   textual-serve = callPackage ../development/python-modules/textual-serve { };
 
   textual-slider = callPackage ../development/python-modules/textual-slider { };

From 0db68e1fba3cab70ad5f1510e02a863987a1cd96 Mon Sep 17 00:00:00 2001
From: Max Siling <root@goldstein.lol>
Date: Wed, 2 Apr 2025 21:55:42 +0300
Subject: [PATCH 086/489] betula: 1.3.1 -> 1.4.0

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

diff --git a/pkgs/by-name/be/betula/package.nix b/pkgs/by-name/be/betula/package.nix
index c78e7ad5fc15..6b6e9f67eab1 100644
--- a/pkgs/by-name/be/betula/package.nix
+++ b/pkgs/by-name/be/betula/package.nix
@@ -5,15 +5,15 @@
 }:
 buildGoModule rec {
   pname = "betula";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchFromSourcehut {
     owner = "~bouncepaw";
     repo = "betula";
     rev = "v${version}";
-    hash = "sha256-20sA2Hnnppr2RXqu2Qx2bkU/u9FUkH6INUUGx2zKfao=";
+    hash = "sha256-f2F0YRhDnKdMqcUvpcRFNAI62gbusfzIUKQSZ65onMU=";
   };
-  vendorHash = "sha256-SWcQYF8LP6lw5kWlAVFt3qiwDnvpSOXenmdm6TSfJSc=";
+  vendorHash = "sha256-3PS4fIyHbGGjnbMOy2VIQBXsnIyYDKR/ecl/i5jwSVM=";
 
   env.CGO_ENABLED = 1;
   # These tests use internet, so are failing in Nix build.

From 8cbe1c1f0a778cd6f02b15778967ff6c3e4b7c48 Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Wed, 2 Apr 2025 22:52:42 +0300
Subject: [PATCH 087/489] werf: 2.31.1 -> 2.34.1

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

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index 31fb7254e5b9..8dd10d357c0d 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -11,18 +11,17 @@
 
 buildGoModule rec {
   pname = "werf";
-  version = "2.31.1";
+  version = "2.34.1";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${version}";
-    hash = "sha256-eEdhAY3vN6hsgggakYpGFiVjR2BBGrg1UF18gFXc8g8=";
+    hash = "sha256-hWkU3tyh0kQ9GNl5gQIs4wTRBQV0B3/0oOAhKLo1hOo=";
   };
 
-  vendorHash = "sha256-g+QZI0mfXSIU+iBnKzMeTGuF5UB1cwOixvRhcrBGrpE=";
-
   proxyVendor = true;
+  vendorHash = "sha256-x9ehxBfyk5sMg71yJcyjcrBAi5bzEnENAaqLXFoGQck=";
 
   subPackages = [ "cmd/werf" ];
 
@@ -72,10 +71,11 @@ buildGoModule rec {
       # Test all packages.
       unset subPackages
 
-      # Remove tests that require external services, usually a Docker daemon.
+      # Remove tests that fail or require external services.
       rm -rf \
         integration/suites \
         pkg/true_git/*_test.go \
+        pkg/werf/exec/*_test.go \
         test/e2e
     ''
     + lib.optionalString (env.CGO_ENABLED == 0) ''

From 1a20063f9f945122614926c3000b404745ee6bdb Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Wed, 2 Apr 2025 22:57:14 +0300
Subject: [PATCH 088/489] werf: refactor

---
 pkgs/by-name/we/werf/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index 8dd10d357c0d..98b7f159bd24 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -8,15 +8,14 @@
   installShellFiles,
   versionCheckHook,
 }:
-
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "werf";
   version = "2.34.1";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-hWkU3tyh0kQ9GNl5gQIs4wTRBQV0B3/0oOAhKLo1hOo=";
   };
 
@@ -40,9 +39,9 @@ buildGoModule rec {
     [
       "-s"
       "-w"
-      "-X github.com/werf/werf/v2/pkg/werf.Version=v${version}"
+      "-X github.com/werf/werf/v2/pkg/werf.Version=${finalAttrs.src.rev}"
     ]
-    ++ lib.optionals (env.CGO_ENABLED == 1) [
+    ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [
       "-extldflags=-static"
       "-linkmode external"
     ];
@@ -55,7 +54,7 @@ buildGoModule rec {
       "dfrunsecurity"
       "dfssh"
     ]
-    ++ lib.optionals (env.CGO_ENABLED == 1) [
+    ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [
       "cni"
       "exclude_graphdriver_devicemapper"
       "netgo"
@@ -78,7 +77,7 @@ buildGoModule rec {
         pkg/werf/exec/*_test.go \
         test/e2e
     ''
-    + lib.optionalString (env.CGO_ENABLED == 0) ''
+    + lib.optionalString (finalAttrs.env.CGO_ENABLED == 0) ''
       # A workaround for osusergo.
       export USER=nixbld
     '';
@@ -104,9 +103,9 @@ buildGoModule rec {
       Buildah.
     '';
     homepage = "https://werf.io";
-    changelog = "https://github.com/werf/werf/releases/tag/${src.rev}";
+    changelog = "https://github.com/werf/werf/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.azahi ];
     mainProgram = "werf";
   };
-}
+})

From b4fc0f82bc039a9472ae842742a81cf95908b8c7 Mon Sep 17 00:00:00 2001
From: sund3RRR <evenquantity@gmail.com>
Date: Sat, 29 Mar 2025 00:23:04 +0300
Subject: [PATCH 089/489] amnezia-vpn: fix openvpn; refactor install and fixup

---
 nixos/modules/programs/amnezia-vpn.nix  | 16 ++++++---
 pkgs/by-name/am/amnezia-vpn/package.nix | 44 ++++++++++++-------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/programs/amnezia-vpn.nix b/nixos/modules/programs/amnezia-vpn.nix
index e2b49ebb6e7b..22db93bde51c 100644
--- a/nixos/modules/programs/amnezia-vpn.nix
+++ b/nixos/modules/programs/amnezia-vpn.nix
@@ -10,16 +10,24 @@ in
 {
   options.programs.amnezia-vpn = {
     enable = lib.mkEnableOption "The AmneziaVPN client";
+    package = lib.mkPackageOption pkgs "amnezia-vpn" { };
   };
 
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.amnezia-vpn ];
-    services.dbus.packages = [ pkgs.amnezia-vpn ];
+    environment.systemPackages = [ cfg.package ];
+    services.dbus.packages = [ cfg.package ];
     services.resolved.enable = true;
 
     systemd = {
-      packages = [ pkgs.amnezia-vpn ];
-      services."AmneziaVPN".wantedBy = [ "multi-user.target" ];
+      packages = [ cfg.package ];
+      services."AmneziaVPN" = {
+        wantedBy = [ "multi-user.target" ];
+        path = with pkgs; [
+          procps
+          iproute2
+          sudo
+        ];
+      };
     };
   };
 
diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix
index ed17dc8c903f..8994558d2c03 100644
--- a/pkgs/by-name/am/amnezia-vpn/package.nix
+++ b/pkgs/by-name/am/amnezia-vpn/package.nix
@@ -12,14 +12,12 @@
   shadowsocks-rust,
   cloak-pt,
   wireguard-tools,
-  procps,
-  iproute2,
-  sudo,
   libssh,
   zlib,
   tun2socks,
   xray,
   nix-update-script,
+  bash,
 }:
 let
   amnezia-tun2socks = tun2socks.overrideAttrs (
@@ -83,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
       substituteInPlace client/configurators/openvpn_configurator.cpp \
         --replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/libexec\");"
       substituteInPlace client/ui/qautostart.cpp \
-        --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png"
+        --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "AmneziaVPN"
       substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \
         --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png"
       substituteInPlace deploy/data/linux/AmneziaVPN.service \
@@ -107,31 +105,31 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    bash
+    kdePackages.qt5compat
+    kdePackages.qtremoteobjects
+    kdePackages.qtsvg
     libsecret
     qt6.qtbase
     qt6.qttools
-    kdePackages.qtremoteobjects
-    kdePackages.qtsvg
-    kdePackages.qt5compat
   ];
 
-  qtWrapperArgs = [
-    ''--prefix PATH : ${
-      lib.makeBinPath [
-        procps
-        iproute2
-        sudo
-      ]
-    }''
-  ];
+  installPhase = ''
+    runHook preInstall
 
-  postInstall = ''
     mkdir -p $out/bin $out/libexec $out/share/applications $out/share/pixmaps $out/lib/systemd/system
-    cp client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/
-    cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/libexec/
-    cp ../AppDir/AmneziaVPN.desktop $out/share/applications/
-    cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/
-    cp ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/
+    install -m555 client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/
+    install -m555 ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/libexec/
+    install -m444 ../AppDir/AmneziaVPN.desktop $out/share/applications/
+    install -m444 ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/
+    install -m444 ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    # Temporary unwrap non-binary executable until qt6.wrapQtAppsHook is fixed
+    mv $out/libexec/.update-resolv-conf.sh-wrapped $out/libexec/update-resolv-conf.sh
   '';
 
   passthru = {
@@ -149,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Amnezia VPN Client";
     downloadPage = "https://amnezia.org/en/downloads";
-    homepage = "https://amnezia.org/en";
+    homepage = "https://github.com/amnezia-vpn/amnezia-client";
     license = licenses.gpl3;
     mainProgram = "AmneziaVPN";
     maintainers = with maintainers; [ sund3RRR ];

From 88e94b8d75d714205ba76a1008abdf9b997ffaba Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Wed, 26 Mar 2025 12:02:02 -0700
Subject: [PATCH 090/489] envision-unwrapped: Add plea for more maintainers

---
 pkgs/by-name/en/envision-unwrapped/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix
index 2c764b8d8076..25e8ddf3dbe3 100644
--- a/pkgs/by-name/en/envision-unwrapped/package.nix
+++ b/pkgs/by-name/en/envision-unwrapped/package.nix
@@ -106,6 +106,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.com/gabmus/envision";
     license = lib.licenses.agpl3Only;
     mainProgram = "envision";
+    # More maintainers needed!
+    # envision (wrapped) requires frequent updates to the dependency list;
+    # the more people that can help with this, the better.
     maintainers = with lib.maintainers; [
       pandapip1
       Scrumplex

From 71669fc2d5bc5a0a973f7c4e6fc2ad84d6a18761 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Wed, 2 Apr 2025 15:26:03 -0700
Subject: [PATCH 091/489] envision: Add missing dependency

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

diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix
index 794ce30a59bd..543ac343b31f 100644
--- a/pkgs/by-name/en/envision/package.nix
+++ b/pkgs/by-name/en/envision/package.nix
@@ -52,6 +52,7 @@ buildFHSEnv {
           xorg.xorgproto
           SDL2
           wayland
+          mesa-gl-headers
           # Additional dependencies required for Monado WMR support
           bc
           fmt

From 752cfca89c8ca436ce79cd5f6a38c0c16a4062e3 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Wed, 2 Apr 2025 15:29:51 -0700
Subject: [PATCH 092/489] envision: Add lz4 dependency

I can't reproduce the issue https://github.com/NixOS/nixpkgs/issues/378252#issuecomment-2641916362 describes, but apparently adding lz4 fixes it
---
 pkgs/by-name/en/envision/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix
index 543ac343b31f..19a4fce1f80a 100644
--- a/pkgs/by-name/en/envision/package.nix
+++ b/pkgs/by-name/en/envision/package.nix
@@ -61,6 +61,7 @@ buildFHSEnv {
           gtest
           jq
           libepoxy
+          lz4
           lz4.dev
           tbb
           libxkbcommon

From 6330a59d024938e913abe584af5be0033946a0a3 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Thu, 3 Apr 2025 10:58:56 +0900
Subject: [PATCH 093/489] infisical: 0.36.22 -> 0.36.23

https://github.com/Infisical/infisical/compare/infisical-cli/v0.36.22...infisical-cli/v0.36.23

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/development/tools/infisical/default.nix | 2 +-
 pkgs/development/tools/infisical/hashes.json | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix
index a398aec7a14f..75d9dc6f5449 100644
--- a/pkgs/development/tools/infisical/default.nix
+++ b/pkgs/development/tools/infisical/default.nix
@@ -21,7 +21,7 @@ let
   buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
 
   # the version of infisical
-  version = "0.36.22";
+  version = "0.36.23";
 
   # the platform-specific, statically linked binary
   src =
diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json
index f2fe7635124c..619cbae8448c 100644
--- a/pkgs/development/tools/infisical/hashes.json
+++ b/pkgs/development/tools/infisical/hashes.json
@@ -1,6 +1,6 @@
 { "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
-, "x86_64-linux": "sha256-slxWIdEqZRF07H5nDXj7YAXoX/K10v3FE+C8NgfpgPU="
-, "x86_64-darwin": "sha256-KCEAiFQqmVQ9ifxQs/4tr3qB2EUH3A0wnAvf6//kkVg="
-, "aarch64-linux": "sha256-syxTmj56gy8JKmvV1201jLQSRsWZY0cYEL91pukSTeQ="
-, "aarch64-darwin": "sha256-zedOyZ33PgKflECdhjAFkotfEXG5r3dmgBJ8awFuuTQ="
+, "x86_64-linux": "sha256-lUnvumfma4gBxbOzKBdjdSMRvCjgzzdRdisIB0c+U30="
+, "x86_64-darwin": "sha256-wN8IWlbhMVMYj9jxtqOZksjinPCHrrAFjIV24cv5vNw="
+, "aarch64-linux": "sha256-NPBgtEJ8pzxHG0D21EE0ngZAxbETAfJpmIoWp2BokPw="
+, "aarch64-darwin": "sha256-wlfz6LOn2Ri5m1ID8kXnlFN/zzNgDpC4zUgiWziUUC0="
 }

From 589c3ba0bd586ed587774f20acbecf6ae79e485b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 02:59:30 +0000
Subject: [PATCH 094/489] last: 1615 -> 1638

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

diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix
index e4d904894c0c..e7ec4e9f6393 100644
--- a/pkgs/by-name/la/last/package.nix
+++ b/pkgs/by-name/la/last/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "last";
-  version = "1615";
+  version = "1638";
 
   src = fetchFromGitLab {
     owner = "mcfrith";
     repo = "last";
     rev = "refs/tags/${version}";
-    hash = "sha256-1opYdV4nszLSuHNCo0HuURuPYby8oVGXwQvDd68mDOM=";
+    hash = "sha256-lOdXlAoLSrUb32GohfQGvmtwQsKDFGH4ImYMi8EZqU0=";
   };
 
   nativeBuildInputs = [

From fd32c3e63e1d90cd6a4e89384a03acf733e2dcd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 04:56:02 +0000
Subject: [PATCH 095/489] python312Packages.ignite: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix
index a34e5c5d6c24..b68533a0dfea 100644
--- a/pkgs/development/python-modules/ignite/default.nix
+++ b/pkgs/development/python-modules/ignite/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "ignite";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "pytorch";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-J0xrqAGwH0bAs59T7zA8irMWOGbE2+Zd9kwqxYUYYMA=";
+    hash = "sha256-aWm+rj/9A7oNBW5jkMg/BRuEw2gQUJ88At1wB75FgNQ=";
   };
 
   build-system = [ setuptools ];
@@ -93,7 +93,7 @@ buildPythonPackage rec {
   meta = {
     description = "High-level training library for PyTorch";
     homepage = "https://pytorch-ignite.ai";
-    changelog = "https://github.com/pytorch/ignite/releases/tag/v${version}";
+    changelog = "https://github.com/pytorch/ignite/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.bcdarwin ];
     # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package

From b861e1a5c3634758de26a3a919bfb1a7518d4dcf Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 3 Apr 2025 07:51:37 +0000
Subject: [PATCH 096/489] goose-cli: 1.0.15 -> 1.0.17

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

diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index 449361d4fdee..344b86532034 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -26,17 +26,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "goose-cli";
-  version = "1.0.15";
+  version = "1.0.17";
 
   src = fetchFromGitHub {
     owner = "block";
     repo = "goose";
     tag = "v${version}";
-    hash = "sha256-9uIpwJaRpYvsWW8ysFQWgogp/4hh5b72+5dNwYQKrM8=";
+    hash = "sha256-l/lcwTNUq2xJHh0MKhnDZjRJ/5cANbdar/Vusf38esQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-5qMciAnX34fbiV5Oy/+V3o7S3NwubxyRRNFXWcQK+kE=";
+  cargoHash = "sha256-1xKWzgptnM1ZP0nQXILBoaKVwL2FyXpldTUIa1ITQO0=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 71cdfb2dad23363519053e6c2aa7a6ce3dfe1005 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 3 Apr 2025 07:55:34 +0000
Subject: [PATCH 097/489] goose-cli: fix license

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

diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index 344b86532034..22b72675f74b 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -16,12 +16,12 @@ let
   gpt-4o-tokenizer = fetchurl {
     url = "https://huggingface.co/Xenova/gpt-4o/resolve/31376962e96831b948abe05d420160d0793a65a4/tokenizer.json";
     hash = "sha256-Q6OtRhimqTj4wmFBVOoQwxrVOmLVaDrgsOYTNXXO8H4=";
-    meta.license = lib.licenses.unfree;
+    meta.license = lib.licenses.mit;
   };
   claude-tokenizer = fetchurl {
     url = "https://huggingface.co/Xenova/claude-tokenizer/resolve/cae688821ea05490de49a6d3faa36468a4672fad/tokenizer.json";
     hash = "sha256-wkFzffJLTn98mvT9zuKaDKkD3LKIqLdTvDRqMJKRF2c=";
-    meta.license = lib.licenses.unfree;
+    meta.license = lib.licenses.mit;
   };
 in
 rustPlatform.buildRustPackage rec {

From b42b9e061b7adb3de93a44ed53b4a7aa83304073 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 17 Mar 2025 16:17:54 +0000
Subject: [PATCH 098/489] lib.modules: init lib.mkDefinition

Free-floating definitions including file location.
---
 lib/default.nix |  1 +
 lib/modules.nix | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index e671fcf9546d..19316addb8cb 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -446,6 +446,7 @@ let
         fixupOptionType
         mkIf
         mkAssert
+        mkDefinition
         mkMerge
         mkOverride
         mkOptionDefault
diff --git a/lib/modules.nix b/lib/modules.nix
index a9ddaf7bda02..3d57c3dd062d 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1097,10 +1097,16 @@ let
         # Process mkMerge and mkIf properties.
         defs' = concatMap (
           m:
-          map (value: {
-            inherit (m) file;
-            inherit value;
-          }) (addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value))
+          map (
+            value:
+            if value._type or null == "definition" then
+              value
+            else
+              {
+                inherit (m) file;
+                inherit value;
+              }
+          ) (addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value))
         ) defs;
 
         # Process mkOverride properties.
@@ -1171,6 +1177,8 @@ let
       map (mapAttrs (n: v: mkIf cfg.condition v)) (pushDownProperties cfg.content)
     else if cfg._type or "" == "override" then
       map (mapAttrs (n: v: mkOverride cfg.priority v)) (pushDownProperties cfg.content)
+    # else if cfg._type or "" == "definition" then
+    #   map (mapAttrs (n: v: mkDefinition v)) (pushDownProperties cfg.content)
     # FIXME: handle mkOrder?
     else
       [ cfg ];
@@ -1365,6 +1373,11 @@ let
     inherit contents;
   };
 
+  /**
+    Return a definition with file location information.
+  */
+  mkDefinition = args@{ file, value, ... }: args // { _type = "definition"; };
+
   mkOverride = priority: content: {
     _type = "override";
     inherit priority content;
@@ -2095,6 +2108,7 @@ private
     mkBefore
     mkChangedOptionModule
     mkDefault
+    mkDefinition
     mkDerivedConfig
     mkFixStrictness
     mkForce

From c906064af1b36ad2e1478c917da300ac12e115ae Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Tue, 18 Mar 2025 14:32:30 +0000
Subject: [PATCH 099/489] lib.modules: document mkDefinition section

---
 .../manual/development/option-def.section.md  | 44 +++++++++++++++++++
 nixos/doc/manual/redirects.json               |  3 ++
 2 files changed, 47 insertions(+)

diff --git a/nixos/doc/manual/development/option-def.section.md b/nixos/doc/manual/development/option-def.section.md
index 227f41d812ff..6ab5b7dc96de 100644
--- a/nixos/doc/manual/development/option-def.section.md
+++ b/nixos/doc/manual/development/option-def.section.md
@@ -123,3 +123,47 @@ they were declared in separate modules. This can be done using
     ];
 }
 ```
+
+## Free-floating definitions {#sec-option-definitions-definitions}
+
+:::{.note}
+The module system internally transforms module syntax into definitions. This always happens internally.
+:::
+
+It is possible to create first class definitions which are not transformed _again_ into definitions by the module system.
+
+Usually the file location of a definition is implicit and equal to the file it came from.
+However, when manipulating definitions, it may be useful for them to be completely self-contained (or "free-floating").
+
+A free-floating definition is created with `mkDefinition { file = ...; value = ...; }`.
+
+Preserving the file location creates better error messages, for example when copying definitions from one option to another.
+
+Other properties like `mkOverride` `mkMerge` `mkAfter` can be used in the `value` attribute but not the other way around.
+
+The following shows an example configuration that yields an error with the custom position information:
+
+```nix
+{
+  _file = "file.nix";
+  options.foo = mkOption {
+    default = 13;
+  };
+  config.foo = lib.mkDefinition {
+    file = "custom place";
+    # mkOptionDefault creates a conflict with the option foo's `default = 1` on purpose
+    # So we see the error message below contains the conflicting values and different positions
+    value = lib.mkOptionDefault 42;
+  };
+}
+```
+
+evaluating the module yields the following error:
+
+```
+error: Cannot merge definitions of `foo'. Definition values:
+- In `file.nix': 13
+- In `custom place': 42
+```
+
+To set the file location for all definitions in a module, you may add the `_file` module syntax attribute, which has a similar effect to using `mkDefinition` on all definitions in the module, without the hassle.
diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 65520e2afb7d..ab86ee58dda7 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -1664,6 +1664,9 @@
   "sec-option-definitions-merging": [
     "index.html#sec-option-definitions-merging"
   ],
+  "sec-option-definitions-definitions": [
+    "index.html#sec-option-definitions-definitions"
+  ],
   "sec-assertions": [
     "index.html#sec-assertions"
   ],

From 33daa3f4b9104b55d11740277d0182cb23fcde07 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Tue, 18 Mar 2025 15:02:12 +0000
Subject: [PATCH 100/489] lib.modules: init test for lib.mkDefinition

---
 lib/modules.nix                               |  2 -
 lib/tests/modules.sh                          |  8 +++
 lib/tests/modules/mkDefinition.nix            | 71 +++++++++++++++++++
 .../manual/development/option-def.section.md  | 20 +++++-
 4 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 lib/tests/modules/mkDefinition.nix

diff --git a/lib/modules.nix b/lib/modules.nix
index 3d57c3dd062d..7716e855ebb2 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1177,8 +1177,6 @@ let
       map (mapAttrs (n: v: mkIf cfg.condition v)) (pushDownProperties cfg.content)
     else if cfg._type or "" == "override" then
       map (mapAttrs (n: v: mkOverride cfg.priority v)) (pushDownProperties cfg.content)
-    # else if cfg._type or "" == "definition" then
-    #   map (mapAttrs (n: v: mkDefinition v)) (pushDownProperties cfg.content)
     # FIXME: handle mkOrder?
     else
       [ cfg ];
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index e623c0fb55b8..9df6e61797b7 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -673,6 +673,14 @@ checkConfigError 'The option .conflictingPathOptionType. in .*/pathWith.nix. is
 # types.pathWith { inStore = true; absolute = false; }
 checkConfigError 'In pathWith, inStore means the path must be absolute' config.impossiblePathOptionType ./pathWith.nix
 
+# mkDefinition
+# check that mkDefinition 'file' is printed in the error message
+checkConfigError 'Cannot merge definitions.*\n\s*- In .file.*\n\s*- In .other.*' config.conflict ./mkDefinition.nix
+checkConfigError 'A definition for option .viaOptionDefault. is not of type .boolean.*' config.viaOptionDefault ./mkDefinition.nix
+checkConfigOutput '^true$' config.viaConfig ./mkDefinition.nix
+checkConfigOutput '^true$' config.mkMerge ./mkDefinition.nix
+checkConfigOutput '^true$' config.mkForce ./mkDefinition.nix
+
 cat <<EOF
 ====== module tests ======
 $pass Pass
diff --git a/lib/tests/modules/mkDefinition.nix b/lib/tests/modules/mkDefinition.nix
new file mode 100644
index 000000000000..0a807090fa28
--- /dev/null
+++ b/lib/tests/modules/mkDefinition.nix
@@ -0,0 +1,71 @@
+{ lib, ... }:
+let
+  inherit (lib)
+    mkOption
+    mkDefinition
+    mkOptionDefault
+    ;
+in
+{
+  imports = [
+    {
+      _file = "file";
+      options.conflict = mkOption {
+        default = 1;
+      };
+      config.conflict = mkDefinition {
+        file = "other";
+        value = mkOptionDefault 42;
+      };
+    }
+    {
+      # Check that mkDefinition works within 'config'
+      options.viaConfig = mkOption { };
+      config.viaConfig = mkDefinition {
+        file = "other";
+        value = true;
+      };
+    }
+    {
+      # Check mkMerge can wrap mkDefinitions
+      # Not the other way around
+      options.mkMerge = mkOption {
+        type = lib.types.bool;
+      };
+      config.mkMerge = lib.mkMerge [
+        (mkDefinition {
+          file = "a.nix";
+          value = true;
+        })
+        (mkDefinition {
+          file = "b.nix";
+          value = true;
+        })
+      ];
+    }
+    {
+      # Check mkDefinition can use mkForce on the value
+      # Not the other way around
+      options.mkForce = mkOption {
+        type = lib.types.bool;
+        default = false;
+      };
+      config.mkForce = mkDefinition {
+        file = "other";
+        value = lib.mkForce true;
+      };
+    }
+    {
+      # Currently expects an error
+      # mkDefinition doesn't work on option default
+      # This is a limitation and might be resolved in the future
+      options.viaOptionDefault = mkOption {
+        type = lib.types.bool;
+        default = mkDefinition {
+          file = "other";
+          value = true;
+        };
+      };
+    }
+  ];
+}
diff --git a/nixos/doc/manual/development/option-def.section.md b/nixos/doc/manual/development/option-def.section.md
index 6ab5b7dc96de..fddcfef393ae 100644
--- a/nixos/doc/manual/development/option-def.section.md
+++ b/nixos/doc/manual/development/option-def.section.md
@@ -139,7 +139,25 @@ A free-floating definition is created with `mkDefinition { file = ...; value = .
 
 Preserving the file location creates better error messages, for example when copying definitions from one option to another.
 
-Other properties like `mkOverride` `mkMerge` `mkAfter` can be used in the `value` attribute but not the other way around.
+Other properties like `mkOverride` `mkMerge` `mkAfter` can be used in the `value` attribute but not on the entire definition.
+
+This is what would work
+
+```nix
+mkDefinition {
+   value = mkForce 42;
+   file = "somefile.nix";
+}
+```
+
+While this would NOT work.
+
+```nix
+mkForce (mkDefinition {
+   value = 42;
+   file = "somefile.nix";
+})
+```
 
 The following shows an example configuration that yields an error with the custom position information:
 

From db01714e37f10f0648920b068a3d8360e31d932c Mon Sep 17 00:00:00 2001
From: William Vandervalk <git@williamvandervalk.com>
Date: Thu, 3 Apr 2025 09:35:05 -0400
Subject: [PATCH 101/489] backrest: 1.7.3 -> 1.8.0

---
 pkgs/by-name/ba/backrest/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index 505934d42f48..ad0cc70edb98 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -11,13 +11,13 @@
 }:
 let
   pname = "backrest";
-  version = "1.7.3";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "garethgeorge";
     repo = "backrest";
     tag = "v${version}";
-    hash = "sha256-X3FiNor2q/JgyV05CIAls7MjMvongH5dGeutPz+CW9I=";
+    hash = "sha256-p2CKXQeA0rHhS6uP0x2tNsFzHBCOi6sRDlr+o4HeBjk=";
   };
 
   frontend = stdenv.mkDerivation (finalAttrs: {
@@ -69,7 +69,11 @@ buildGoModule {
   checkFlags =
     let
       skippedTests =
-        [ "TestRunCommand" ]
+        [
+          "TestMultihostIndexSnapshots"
+          "TestRunCommand"
+          "TestSnapshot"
+        ]
         ++ lib.optionals stdenv.hostPlatform.isDarwin [
           "TestBackup" # relies on ionice
           "TestCancelBackup"

From ebc8f41992b45eaf77e8a68fc5097841c38644b4 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 3 Apr 2025 17:08:31 +0200
Subject: [PATCH 102/489] defaultPkgConfigPackages: fix eval

---
 pkgs/top-level/all-packages.nix                | 4 +---
 pkgs/top-level/pkg-config/pkg-config-data.json | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9753eda1b4ac..d65d67ca1191 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -125,9 +125,7 @@ with pkgs;
 
   defaultPkgConfigPackages =
     # We don't want nix-env -q to enter this, because all of these are aliases.
-    dontRecurseIntoAttrs (import ./pkg-config/defaultPkgConfigPackages.nix pkgs) // {
-      __attrsFailEvaluation = true;
-    };
+    dontRecurseIntoAttrs (import ./pkg-config/defaultPkgConfigPackages.nix pkgs);
 
   ### Nixpkgs maintainer tools
 
diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json
index 5705c8ad4c70..83885cd85cb5 100644
--- a/pkgs/top-level/pkg-config/pkg-config-data.json
+++ b/pkgs/top-level/pkg-config/pkg-config-data.json
@@ -395,7 +395,7 @@
     },
     "javascriptcoregtk-4.0": {
       "attrPath": [
-        "webkitgtk"
+        "webkitgtk_4_0"
       ]
     },
     "lapack": {
@@ -837,12 +837,12 @@
     },
     "webkit2gtk-4.0": {
       "attrPath": [
-        "webkitgtk"
+        "webkitgtk_4_0"
       ]
     },
     "webkit2gtk-web-extension-4.0": {
       "attrPath": [
-        "webkitgtk"
+        "webkitgtk_4_0"
       ]
     },
     "x11": {

From 2ba55c4a167ada12d6a67eb6b5ab10b22052904c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 3 Apr 2025 17:38:37 +0200
Subject: [PATCH 103/489] plover.stable: move deprication behinde allowAliases

---
 pkgs/applications/misc/plover/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 24c14969970f..89c32a27b7ce 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  config,
   fetchFromGitHub,
   python3Packages,
   wmctrl,
@@ -8,8 +9,6 @@
 }:
 
 {
-  stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05
-
   dev =
     with python3Packages;
     mkDerivationWith buildPythonPackage rec {
@@ -58,3 +57,6 @@
       '';
     };
 }
+// lib.optionalAttrs config.allowAliases {
+  stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05
+}

From 26d986dddfe0cdb2cf5976c6514176cb5e9343d1 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 3 Apr 2025 18:35:37 +0000
Subject: [PATCH 104/489] commit: 4.2 -> 4.3

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

diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix
index 639d9275357d..96e15a4e8023 100644
--- a/pkgs/by-name/co/commit/package.nix
+++ b/pkgs/by-name/co/commit/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "commit";
-  version = "4.2";
+  version = "4.3";
 
   src = fetchFromGitHub {
     owner = "sonnyp";
     repo = "Commit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-L8CI8SAGWhhJyTc8aMPV0s+UevEJGE7n1l7fFnTjdPw=";
+    hash = "sha256-yNzMFOd0IN5EUKG7ztCEbQzQ9RHc+D4iC1OiBauMSwE=";
     fetchSubmodules = true;
   };
 

From 8458d55fe5b81010d2d05ba168b89967ca9ce75d Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 3 Apr 2025 18:37:25 +0000
Subject: [PATCH 105/489] resources: 1.7.1 -> 1.8.0

Diff: https://github.com/nokyan/resources/compare/v1.7.1...v1.8.0

Changelog: https://github.com/nokyan/resources/releases/tag/v1.8.0
---
 pkgs/by-name/re/resources/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix
index 0986cbfe5fb1..9fdb07b342a5 100644
--- a/pkgs/by-name/re/resources/package.nix
+++ b/pkgs/by-name/re/resources/package.nix
@@ -22,19 +22,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "resources";
-  version = "1.7.1";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "nokyan";
     repo = "resources";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SHawaH09+mDovFiznZ+ZkUgUbv5tQGcXBgUGrdetOcA=";
+    hash = "sha256-z4ZVj/nS4n3oqENSK87YJ8sQRnqK7c4tWzKHUD0Qw2s=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
-    name = "resources-${finalAttrs.version}";
-    hash = "sha256-zqCqbQAUAIhjntX4gcV1aoJwjozZFlF7Sr49w7uIgaI=";
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-jHdEiK3nu9mN2A6biHq9Iu4bSniD74hGnKFBTt5xVDM=";
   };
 
   nativeBuildInputs = [

From 812a744582c45aa1b85151fa921894b8e6683fec Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-git@spacefrogg.net>
Date: Thu, 3 Apr 2025 22:15:55 +0200
Subject: [PATCH 106/489] factor-lang: 0.99 -> 0.100

Keep 0.99 around as they are not 100% backwards compatible.

Fixes #393387
---
 pkgs/development/compilers/factor-lang/0.100.nix    |  9 +++++++++
 pkgs/development/compilers/factor-lang/0.99.nix     |  9 +++++++++
 .../development/compilers/factor-lang/unwrapped.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix                     | 13 +++++++++++--
 pkgs/top-level/factor-packages.nix                  |  3 ++-
 5 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/compilers/factor-lang/0.100.nix
 create mode 100644 pkgs/development/compilers/factor-lang/0.99.nix

diff --git a/pkgs/development/compilers/factor-lang/0.100.nix b/pkgs/development/compilers/factor-lang/0.100.nix
new file mode 100644
index 000000000000..64751dad76a9
--- /dev/null
+++ b/pkgs/development/compilers/factor-lang/0.100.nix
@@ -0,0 +1,9 @@
+{ callPackage, fetchurl }:
+
+callPackage ./unwrapped.nix (rec {
+  version = "0.100";
+  src = fetchurl {
+    url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip";
+    hash = "sha256-ei1x6mgEoDVe1mKfoWSGC9RgZCONovAPYfIdAlOGi+0=";
+  };
+})
diff --git a/pkgs/development/compilers/factor-lang/0.99.nix b/pkgs/development/compilers/factor-lang/0.99.nix
new file mode 100644
index 000000000000..88c234213af9
--- /dev/null
+++ b/pkgs/development/compilers/factor-lang/0.99.nix
@@ -0,0 +1,9 @@
+{ callPackage, fetchurl }:
+
+callPackage ./unwrapped.nix (rec {
+  version = "0.99";
+  src = fetchurl {
+    url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip";
+    sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e";
+  };
+})
diff --git a/pkgs/development/compilers/factor-lang/unwrapped.nix b/pkgs/development/compilers/factor-lang/unwrapped.nix
index 8d7b6dae6661..a8b733a0a2bd 100644
--- a/pkgs/development/compilers/factor-lang/unwrapped.nix
+++ b/pkgs/development/compilers/factor-lang/unwrapped.nix
@@ -8,16 +8,16 @@
   ncurses,
   tzdata,
   unzip,
+
+  # Version-specific attributes
+  version,
+  src,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "factor-lang";
-  version = "0.99";
 
-  src = fetchurl {
-    url = "https://downloads.factorcode.org/releases/${finalAttrs.version}/factor-src-${finalAttrs.version}.zip";
-    sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e";
-  };
+  inherit src version;
 
   patches = [
     # Use full path to image while bootstrapping
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a732d145d65..ccc01130c6bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9272,8 +9272,17 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon OpenGL;
   };
 
-  factorPackages = callPackage ./factor-packages.nix { };
-  factor-lang = factorPackages.factor-lang;
+  factorPackages-0_99 = callPackage ./factor-packages.nix {
+    factor-unwrapped = callPackage ../development/compilers/factor-lang/0.99.nix { };
+  };
+  factorPackages-0_100 = callPackage ./factor-packages.nix {
+    factor-unwrapped = callPackage ../development/compilers/factor-lang/0.100.nix { };
+  };
+  factorPackages = factorPackages-0_100;
+
+  factor-lang-0_99 = factorPackages-0_99.factor-lang;
+  factor-lang-0_100 = factorPackages-0_100.factor-lang;
+  factor-lang = factor-lang-0_100;
 
   far2l = callPackage ../applications/misc/far2l {
     inherit (darwin.apple_sdk.frameworks)
diff --git a/pkgs/top-level/factor-packages.nix b/pkgs/top-level/factor-packages.nix
index eae05e694130..5ddc4ad86599 100644
--- a/pkgs/top-level/factor-packages.nix
+++ b/pkgs/top-level/factor-packages.nix
@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  factor-unwrapped,
   overrides ? (self: super: { }),
 }:
 
@@ -17,7 +18,7 @@ let
           { };
       buildFactorVocab = callPackage ../development/compilers/factor-lang/mk-vocab.nix { };
 
-      factor-unwrapped = callPackage ../development/compilers/factor-lang/unwrapped.nix { };
+      inherit factor-unwrapped;
 
       factor-lang = callPackage ../development/compilers/factor-lang/wrapper.nix { };
       factor-no-gui = callPackage ../development/compilers/factor-lang/wrapper.nix {

From 1eacebe90d74a1ea950bb93103a089c1a8b628b4 Mon Sep 17 00:00:00 2001
From: Rane <rane+git@junkyard.systems>
Date: Fri, 4 Apr 2025 08:50:17 +1100
Subject: [PATCH 107/489] limine: 9.2.1 -> 9.2.2

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

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 08e697c17fbc..6490d3ebb9d1 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -42,14 +42,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "9.2.1";
+  version = "9.2.2";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-yHr8FMOKlWlSkkmkGADC6R4PHO7tHk38gwrJS/nPvvs=";
+    hash = "sha256-uD3s117/uhAeRCex78gXSM9zIByFvjbjeVygkPXwgIM=";
   };
 
   enableParallelBuilding = true;

From be58312bc600207b4a408be0e82ff9ab5164cc4b Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Thu, 3 Apr 2025 19:51:45 -0400
Subject: [PATCH 108/489] coconutbattery: 3.9.14 -> 4.0.2,152

---
 pkgs/by-name/co/coconutbattery/package.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/co/coconutbattery/package.nix b/pkgs/by-name/co/coconutbattery/package.nix
index cef8e8b27769..a822dac98fab 100644
--- a/pkgs/by-name/co/coconutbattery/package.nix
+++ b/pkgs/by-name/co/coconutbattery/package.nix
@@ -6,20 +6,15 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "coconutbattery";
-  version = "3.9.14";
+  version = "4.0.2,152";
 
   src = fetchzip {
     url = "https://coconut-flavour.com/downloads/coconutBattery_${
-      builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version
+      lib.replaceStrings [ "." "," ] [ "" "_" ] finalAttrs.version
     }.zip";
-    hash = "sha256-zKSPKwDBwxlyNJFurCLLGtba9gpizJCjOOAd81vdD5Q=";
+    hash = "sha256-PNSDUp07lUx5ebcfM3WSJAfRQjeuIIy7KfY0KJ0i1AE=";
   };
 
-  dontPatch = true;
-  dontConfigure = true;
-  dontBuild = true;
-  dontFixup = true;
-
   installPhase = ''
     runHook preInstall
 
@@ -29,16 +24,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Standard for battery reading since 2005";
     longDescription = ''
       With coconutBattery you are always aware of your current battery health.
       It shows you live information about the battery quality in your Mac, iPhone and iPad.
     '';
     homepage = "https://www.coconut-flavour.com/coconutbattery";
-    license = with licenses; [ unfree ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ stepbrobd ];
+    license = with lib.licenses; [ unfree ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ stepbrobd ];
     platforms = [
       "aarch64-darwin"
       "x86_64-darwin"

From 36e1474e6f207f1809c97acfeea4fb3e63491cfa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 00:04:11 +0000
Subject: [PATCH 109/489] filebeat8: 8.17.3 -> 8.17.4

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

diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix
index 815b88839817..0095902d5e1c 100644
--- a/pkgs/by-name/fi/filebeat8/package.nix
+++ b/pkgs/by-name/fi/filebeat8/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "filebeat";
-  version = "8.17.3";
+  version = "8.17.4";
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "beats";
     tag = "v${version}";
-    hash = "sha256-b0JDOA3yb/Pfcp9WQFvzE+k9DXDKg/hF4+iWGJ00doo=";
+    hash = "sha256-m3TJaYmmyE+MXGCiRnuGCObyv0QPrvN7imI2lWtoAn8=";
   };
 
-  vendorHash = "sha256-p2Bm2MM85BFI/ePw+ZY90UgqeFKbozGvFvsjY6M82ts=";
+  vendorHash = "sha256-D24ViZv34mhv8S4l1O8cup54e7wXT5MyZ/HkkBO4bOo=";
 
   subPackages = [ "filebeat" ];
 

From f9820ed06bb6809c7f27891f31b733ea8f7605e7 Mon Sep 17 00:00:00 2001
From: "Braian A. Diez" <bdiez19@gmail.com>
Date: Mon, 31 Mar 2025 16:18:25 -0300
Subject: [PATCH 110/489] multiviewer-for-f1: 1.38.1 -> 1.43.2

---
 pkgs/by-name/mu/multiviewer-for-f1/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix
index 9a9d1019e5cb..acd55a8d8e4e 100644
--- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix
+++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix
@@ -25,15 +25,15 @@
   writeScript,
 }:
 let
-  id = "232635194";
+  id = "243289393";
 in
 stdenvNoCC.mkDerivation rec {
   pname = "multiviewer-for-f1";
-  version = "1.38.1";
+  version = "1.43.2";
 
   src = fetchurl {
     url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb";
-    sha256 = "sha256-3UgpjQdZYr48MPoqgHci6Yvo+jxK7oa3THl/JuL8tRo=";
+    sha256 = "sha256-wdA5f/80GkKP6LrrP2E6M9GY5bl6rg7Spz7NWB7cQjg=";
   };
 
   nativeBuildInputs = [

From 349c119852cf70e4272e00e2dba1130c34b54cde Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 4 Apr 2025 06:10:59 +0200
Subject: [PATCH 111/489] gerrit: Enable update script

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/ge/gerrit/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix
index f48a32f03216..ebfd7f0604ad 100644
--- a/pkgs/by-name/ge/gerrit/package.nix
+++ b/pkgs/by-name/ge/gerrit/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  gitUpdater,
   nixosTests,
 }:
 
@@ -20,6 +21,11 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
+    updateScript = gitUpdater {
+      url = "https://gerrit.googlesource.com/gerrit";
+      rev-prefix = "v";
+      allowedVersions = "^[0-9\\.]+$";
+    };
     # A list of plugins that are part of the gerrit.war file.
     # Use `java -jar gerrit.war ls | grep plugins/` to generate that list.
     plugins = [

From b2aa25b270bbf220fcbd954a3ef134c660892f35 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Fri, 4 Apr 2025 06:40:17 +0200
Subject: [PATCH 112/489] bird2: 2.16.1 -> 2.17

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

diff --git a/pkgs/by-name/bi/bird2/package.nix b/pkgs/by-name/bi/bird2/package.nix
index 5d28f0add04c..c7e50d9e75a5 100644
--- a/pkgs/by-name/bi/bird2/package.nix
+++ b/pkgs/by-name/bi/bird2/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bird";
-  version = "2.16.1";
+  version = "2.17";
 
   src = fetchurl {
     url = "https://bird.network.cz/download/bird-${version}.tar.gz";
-    hash = "sha256-9uWcvMrKYmaK6gIGhyS9QnuexEnH4PD8VoFQOYjHNbQ=";
+    hash = "sha256-ebvMd8Y+nht6EKSDichvT3WwU/097Ejjxsvg3xuoHrM=";
   };
 
   nativeBuildInputs = [

From 8072c624691045f6cdb931cac53ef3608b2b8bda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 06:08:10 +0000
Subject: [PATCH 113/489] python312Packages.globus-sdk: 3.52.0 -> 3.54.0

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

diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index 0c436028f48e..ad04d1c42273 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "globus-sdk";
-  version = "3.52.0";
+  version = "3.54.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "globus";
     repo = "globus-sdk-python";
     tag = version;
-    hash = "sha256-BjfpohzVbtPk2AjhSeTVgyJ5BF2m/HeXr3pjfJx+Qws=";
+    hash = "sha256-Be3sHPGd0//8jz2U6Ew/EsOQVXnJ7L7gJ07+QCLK9VM=";
   };
 
   build-system = [ setuptools ];

From ff720dcf863a38e31c00502cd41b633fd62df200 Mon Sep 17 00:00:00 2001
From: Julius Michaelis <gitter@liftm.de>
Date: Fri, 4 Apr 2025 15:12:32 +0900
Subject: [PATCH 114/489] lls: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/by-name/ll/lls/package.nix b/pkgs/by-name/ll/lls/package.nix
index fad8352a9d78..88f7c84e4afa 100644
--- a/pkgs/by-name/ll/lls/package.nix
+++ b/pkgs/by-name/ll/lls/package.nix
@@ -5,17 +5,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "lls";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "jcaesar";
     repo = "lls";
     tag = "v${version}";
-    hash = "sha256-7biyctXeTTZi8PQqKKYn7Qkuw1CxJ9lT6Wo1+rpnjVs=";
+    hash = "sha256-OszKEWrpXEyi+0ayTzqy6O+cMZ/AVmesN3QJWCAHF7Q=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-v4AW6kL546LNdBh9GEJfC5lKJBvVhfF52MS4bOkUbdU=";
+  cargoHash = "sha256-GIAGy0yLV7hRUk7cMEKxjmXJxpZSNyMXICEGr4vfIxc=";
 
   meta = with lib; {
     description = "Tool to list listening sockets";

From 42b075d7cd71139d044220cf7c89ac890c87917b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?=
 <rapiteanu.catalin@gmail.com>
Date: Fri, 4 Apr 2025 09:39:32 +0300
Subject: [PATCH 115/489] proton-pass: 1.29.8 -> 1.30.1

Update the package to the latest version.
---
 pkgs/by-name/pr/proton-pass/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix
index 6cee601d5b52..78b3f2f62bb5 100644
--- a/pkgs/by-name/pr/proton-pass/package.nix
+++ b/pkgs/by-name/pr/proton-pass/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.29.8";
+  version = "1.30.1";
 
   src = fetchurl {
     url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-xwXIcoBPhANKiTv7DP+gmVeCtuzjymtQmHu+HuRKqjU=";
+    hash = "sha256-0IEQAzK3Pu195kjpo9l2HdLUCySR0HKSl1M8Z9URgJA=";
   };
 
   dontConfigure = true;

From dfaad22261b39cd07d44401c91a8bbf88857d299 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Wed, 12 Feb 2025 22:23:08 +0100
Subject: [PATCH 116/489] nixos/reposilite: init module

---
 .../manual/release-notes/rl-2505.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/web-apps/reposilite.nix  | 439 ++++++++++++++++++
 3 files changed, 442 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/reposilite.nix

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 4ba61c8baadb..c8724688c8eb 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -74,6 +74,8 @@
 
 - [MaryTTS](https://github.com/marytts/marytts), an open-source, multilingual text-to-speech synthesis system written in pure Java. Available as [services.marytts](options.html#opt-services.marytts).
 
+- [Reposilite](https://reposilite.com), a lightweight and easy-to-use repository manager for Maven-based artifacts in the JVM ecosystem. Available as [services.reposilite](options.html#opt-services.reposilite).
+
 - [networking.modemmanager](options.html#opt-networking.modemmanager) has been split out of [networking.networkmanager](options.html#opt-networking.networkmanager). NetworkManager still enables ModemManager by default, but options exist now to run NetworkManager without ModemManager.
 
 - [Routinator 3000](https://nlnetlabs.nl/projects/routing/routinator/), a full-featured RPKI Relying Party software package that runs as a service which periodically downloads and verifies RPKI data.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2bcd9b90c178..221987089c79 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1608,6 +1608,7 @@
   ./services/web-apps/pretix.nix
   ./services/web-apps/privatebin.nix
   ./services/web-apps/prosody-filer.nix
+  ./services/web-apps/reposilite.nix
   ./services/web-apps/rimgo.nix
   ./services/web-apps/rutorrent.nix
   ./services/web-apps/screego.nix
diff --git a/nixos/modules/services/web-apps/reposilite.nix b/nixos/modules/services/web-apps/reposilite.nix
new file mode 100644
index 000000000000..ac9c9937bcfa
--- /dev/null
+++ b/nixos/modules/services/web-apps/reposilite.nix
@@ -0,0 +1,439 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.reposilite;
+  format = pkgs.formats.cdn { };
+  configFile = format.generate "reposilite.cdn" cfg.settings;
+
+  useEmbeddedDb = cfg.database.type == "sqlite" || cfg.database.type == "h2";
+  useMySQL = cfg.database.type == "mariadb" || cfg.database.type == "mysql";
+  usePostgres = cfg.database.type == "postgresql";
+
+  # db password is appended at runtime by the service script (if needed)
+  dbString =
+    if useEmbeddedDb then
+      "${cfg.database.type} ${cfg.database.path}"
+    else
+      "${cfg.database.type} ${cfg.database.host}:${builtins.toString cfg.database.port} ${cfg.database.dbname} ${cfg.database.user} $(<${cfg.database.passwordFile})";
+
+  certDir = config.security.acme.certs.${cfg.useACMEHost}.directory;
+
+  databaseModule = {
+    options = {
+      type = lib.mkOption {
+        type = lib.types.enum [
+          "h2"
+          "mariadb"
+          "mysql"
+          "postgresql"
+          "sqlite"
+        ];
+        description = ''
+          Database engine to use.
+        '';
+        default = "sqlite";
+      };
+
+      path = lib.mkOption {
+        type = lib.types.str;
+        description = ''
+          Path to the embedded database file. Set to `--temporary` to use an in-memory database.
+        '';
+        default = "reposilite.db";
+      };
+
+      host = lib.mkOption {
+        type = lib.types.str;
+        description = ''
+          Database host address.
+        '';
+        default = "127.0.0.1";
+      };
+
+      port = lib.mkOption {
+        type = lib.types.port;
+        description = ''
+          Database TCP port.
+        '';
+        defaultText = lib.literalExpression ''
+          if type == "postgresql" then 5432 else 3306
+        '';
+        default = if usePostgres then config.services.postgresql.settings.port else 3306;
+      };
+
+      dbname = lib.mkOption {
+        type = lib.types.str;
+        description = ''
+          Database name.
+        '';
+        default = "reposilite";
+      };
+
+      user = lib.mkOption {
+        type = lib.types.str;
+        description = ''
+          Database user.
+        '';
+        default = "reposilite";
+      };
+
+      passwordFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
+        description = ''
+          Path to the file containing the password for the database connection.
+          This file must be readable by {option}`services.reposilite.user`.
+        '';
+        default = null;
+      };
+    };
+  };
+
+  settingsModule = {
+    freeformType = format.type;
+    options = {
+      hostname = lib.mkOption {
+        type = lib.types.str;
+        description = ''
+          The hostname to bind to. Set to `0.0.0.0` to accept connections from everywhere, or `127.0.0.1` to restrict to localhost."
+        '';
+        default = "0.0.0.0";
+        example = "127.0.0.1";
+      };
+
+      port = lib.mkOption {
+        type = lib.types.port;
+        description = ''
+          The TCP port to bind to.
+        '';
+        default = 3000;
+      };
+
+      database = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
+        description = ''
+          Database connection string. Please use {option}`services.reposilite.database` instead.
+          See https://reposilite.com/guide/general#local-configuration for valid values.
+        '';
+        default = null;
+      };
+
+      sslEnabled = lib.mkOption {
+        type = lib.types.bool;
+        description = ''
+          Whether to listen for encrypted connections on {option}`settings.sslPort`.
+        '';
+        default = false;
+      };
+
+      sslPort = lib.mkOption {
+        type = lib.types.port; # cant be null
+        description = "SSL port to bind to. SSL needs to be enabled explicitly via {option}`settings.enableSsl`.";
+        default = 443;
+      };
+
+      keyPath = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
+        description = ''
+          Path to the .jsk KeyStore or paths to the PKCS#8 certificate and private key, separated by a space (see example).
+          You can use `''${WORKING_DIRECTORY}` to refer to paths relative to Reposilite's working directory.
+          If you are using a Java KeyStore, don't forget to specify the password via the {var}`REPOSILITE_LOCAL_KEYPASSWORD` environment variable.
+          See https://reposilite.com/guide/ssl for more information on how to set SSL up.
+        '';
+        default = null;
+        example = "\${WORKING_DIRECTORY}/cert.pem \${WORKING_DIRECTORY}/key.pem";
+      };
+
+      keyPassword = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
+        description = ''
+          Plaintext password used to unlock the Java KeyStore set in {option}`services.reposilite.settings.keyPath`.
+          WARNING: this option is insecure and should not be used to store the password.
+          Consider using {option}`services.reposilite.keyPasswordFile` instead.
+        '';
+        default = null;
+      };
+
+      enforceSsl = lib.mkOption {
+        type = lib.types.bool;
+        description = ''
+          Whether to redirect all traffic to SSL.
+        '';
+        default = false;
+      };
+
+      webThreadPool = lib.mkOption {
+        type = lib.types.ints.between 5 65535;
+        description = ''
+          Maximum amount of threads used by the core thread pool. (min: 5)
+          The web thread pool handles the first few steps of incoming HTTP connections, tasks are redirected as soon as possible to the IO thread pool.
+        '';
+        default = 16;
+      };
+
+      ioThreadPool = lib.mkOption {
+        type = lib.types.ints.between 2 65535;
+        description = ''
+          The IO thread pool handles all tasks that may benefit from non-blocking IO. (min: 2)
+          Because most tasks are redirected to IO thread pool, it might be a good idea to keep it at least equal to web thread pool.
+        '';
+        default = 8;
+      };
+
+      databaseThreadPool = lib.mkOption {
+        type = lib.types.ints.positive;
+        description = ''
+          Maximum amount of concurrent connections to the database. (one per thread)
+          Embedded databases (sqlite, h2) do not support truly concurrent connections, so the value will always be `1` if they are used.
+        '';
+        default = 1;
+      };
+
+      compressionStrategy = lib.mkOption {
+        type = lib.types.enum [
+          "none"
+          "gzip"
+        ];
+        description = ''
+          Compression algorithm used by this instance of Reposilite.
+          `none` reduces usage of CPU & memory, but requires transfering more data.
+        '';
+        default = "none";
+      };
+
+      idleTimeout = lib.mkOption {
+        type = lib.types.ints.unsigned;
+        description = ''
+          Default idle timeout used by Jetty.
+        '';
+        default = 30000;
+      };
+
+      bypassExternalCache = lib.mkOption {
+        type = lib.types.bool;
+        description = ''
+          Add cache bypass headers to responses from /api/* to avoid issues with proxies such as Cloudflare.
+        '';
+        default = true;
+      };
+
+      cachedLogSize = lib.mkOption {
+        type = lib.types.ints.unsigned;
+        description = ''
+          Amount of messages stored in the cache logger.
+        '';
+        default = 50;
+      };
+
+      defaultFrontend = lib.mkOption {
+        type = lib.types.bool;
+        description = ''
+          Whether to enable the default included frontend with a dashboard.
+        '';
+        default = true;
+      };
+
+      basePath = lib.mkOption {
+        type = lib.types.str;
+        description = ''
+          Custom base path for this Reposilite instance.
+          It is not recommended changing this, you should instead prioritize using a different subdomain.
+        '';
+        default = "/";
+      };
+
+      debugEnabled = lib.mkOption {
+        type = lib.types.bool;
+        description = ''
+          Whether to enable debug mode.
+        '';
+        default = false;
+      };
+    };
+  };
+in
+{
+  options.services.reposilite = {
+    enable = lib.mkEnableOption "Reposilite";
+    package = lib.mkPackageOption pkgs "reposilite" { } // {
+      apply =
+        pkg:
+        pkg.override (old: {
+          plugins = (old.plugins or [ ]) ++ cfg.plugins;
+        });
+    };
+
+    plugins = lib.mkOption {
+      type = lib.types.listOf lib.types.package;
+      description = ''
+        List of plugins to add to Reposilite.
+      '';
+      default = [ ];
+      example = "with reposilitePlugins; [ checksum groovy ]";
+    };
+
+    database = lib.mkOption {
+      description = "Database options.";
+      default = { };
+      type = lib.types.submodule databaseModule;
+    };
+
+    keyPasswordFile = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      description = ''
+        Path the the file containing the password used to unlock the Java KeyStore file specified in {option}`services.reposilite.settings.keyPath`.
+        This file must be readable my {option}`services.reposilite.user`.
+      '';
+      default = null;
+    };
+
+    useACMEHost = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = ''
+        Host of an existing Let's Encrypt certificate to use for SSL.
+        Make sure that the certificate directory is readable by the `reposilite` user or group, for example via {option}`security.acme.certs.<cert>.group`.
+        *Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using {option}`security.acme.certs`*
+      '';
+      default = null;
+    };
+
+    settings = lib.mkOption {
+      description = "Configuration written to the reposilite.cdn file";
+      default = { };
+      type = lib.types.submodule settingsModule;
+    };
+
+    workingDirectory = lib.mkOption {
+      type = lib.types.path;
+      description = ''
+        Working directory for Reposilite.
+      '';
+      default = "/var/lib/reposilite";
+    };
+
+    extraArgs = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      description = ''
+        Extra arguments/parameters passed to the Reposilite. Can be used for first token generation.
+      '';
+      default = [ ];
+      example = lib.literalExpression ''[ "--token" "name:tempsecrettoken" ]'';
+    };
+
+    user = lib.mkOption {
+      type = lib.types.str;
+      description = ''
+        The user to run Reposilite under.
+      '';
+      default = "reposilite";
+    };
+
+    group = lib.mkOption {
+      type = lib.types.str;
+      description = ''
+        The group to run Reposilite under.
+      '';
+      default = "reposilite";
+    };
+
+    openFirewall = lib.mkOption {
+      type = lib.types.bool;
+      description = ''
+        Whether to open the firewall ports for Reposilite. If SSL is enabled, its port will be opened too.
+      '';
+      default = false;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.settings.sslEnabled -> cfg.settings.keyPath != null;
+        message = ''
+          Reposilite was configured to enable SSL, but no valid paths to certificate files were provided via `settings.keyPath`.
+          Read more about SSL certificates here: https://reposilite.com/guide/ssl
+        '';
+      }
+      {
+        assertion = cfg.settings.enforceSsl -> cfg.settings.sslEnabled;
+        message = "You cannot enforce SSL if SSL is not enabled.";
+      }
+      {
+        assertion = !useEmbeddedDb -> cfg.database.passwordFile != null;
+        message = "You need to set `services.reposilite.database.passwordFile` when using MySQL or Postgres.";
+      }
+    ];
+
+    services.reposilite.settings.keyPath = lib.mkIf (
+      cfg.useACMEHost != null
+    ) "${certDir}/fullchain.pem ${certDir}/key.pem";
+
+    environment.systemPackages = [ cfg.package ];
+
+    users = {
+      groups.${cfg.group} = lib.mkIf (cfg.group == "reposilite") { };
+      users.${cfg.user} = lib.mkIf (cfg.user == "reposilite") {
+        isSystemUser = true;
+        group = cfg.group;
+      };
+    };
+
+    networking.firewall = lib.mkIf cfg.openFirewall (
+      lib.mkMerge [
+        {
+          allowedTCPPorts = [ cfg.settings.port ];
+        }
+        (lib.mkIf cfg.settings.sslEnabled {
+          allowedTCPPorts = [ cfg.settings.sslPort ];
+        })
+      ]
+    );
+
+    systemd.services.reposilite = {
+      enable = true;
+      wantedBy = [ "multi-user.target" ];
+      after =
+        [ "network.target" ]
+        ++ (lib.optional useMySQL "mysql.service")
+        ++ (lib.optional usePostgres "postgresql.service");
+
+      script =
+        lib.optionalString (cfg.keyPasswordFile != null && cfg.settings.keyPassword == null) ''
+          export REPOSILITE_LOCAL_KEYPASSWORD="$(<${cfg.keyPasswordFile})"
+        ''
+        + ''
+          export REPOSILITE_LOCAL_DATABASE="${dbString}"
+
+          ${lib.getExe cfg.package} --local-configuration ${configFile} --local-configuration-mode none --working-directory ${cfg.workingDirectory} ${lib.escapeShellArgs cfg.extraArgs}
+        '';
+
+      serviceConfig = lib.mkMerge [
+        (lib.mkIf (builtins.dirOf cfg.workingDirectory == "/var/lib") {
+          StateDirectory = builtins.baseNameOf cfg.workingDirectory;
+          StateDirectoryMode = "700";
+        })
+        {
+          Type = "exec";
+          Restart = "on-failure";
+
+          User = cfg.user;
+          Group = cfg.group;
+          WorkingDirectory = cfg.workingDirectory;
+
+          # TODO better hardening
+          LimitNOFILE = "1048576";
+          PrivateTmp = true;
+          PrivateDevices = true;
+          ProtectHome = true;
+          ProtectSystem = "strict";
+          AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+        }
+      ];
+    };
+  };
+
+  meta.maintainers = [ lib.maintainers.uku3lig ];
+}

From 3a856acfc912e66c2c7f239fc27a4f7305a452d7 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Wed, 12 Feb 2025 22:23:15 +0100
Subject: [PATCH 117/489] nixos/tests/reposilite: init

---
 nixos/tests/all-tests.nix              |  1 +
 nixos/tests/reposilite.nix             | 53 ++++++++++++++++++++++++++
 pkgs/by-name/re/reposilite/package.nix |  6 ++-
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/reposilite.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0d75a616e23a..6dce1e68f9d1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1123,6 +1123,7 @@ in
   redmine = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./redmine.nix { };
   renovate = handleTest ./renovate.nix { };
   replace-dependencies = handleTest ./replace-dependencies { };
+  reposilite = runTest ./reposilite.nix;
   restartByActivationScript = handleTest ./restart-by-activation-script.nix { };
   restic-rest-server = handleTest ./restic-rest-server.nix { };
   restic = handleTest ./restic.nix { };
diff --git a/nixos/tests/reposilite.nix b/nixos/tests/reposilite.nix
new file mode 100644
index 000000000000..f66a95b47a1d
--- /dev/null
+++ b/nixos/tests/reposilite.nix
@@ -0,0 +1,53 @@
+{ lib, ... }:
+{
+  name = "reposilite";
+
+  nodes = {
+    machine =
+      { pkgs, ... }:
+      {
+        services = {
+          mysql = {
+            enable = true;
+            package = pkgs.mariadb;
+            ensureDatabases = [ "reposilite" ];
+            initialScript = pkgs.writeText "reposilite-test-db-init" ''
+              CREATE USER 'reposilite'@'localhost' IDENTIFIED BY 'ReposiliteDBPass';
+              GRANT ALL PRIVILEGES ON reposilite.* TO 'reposilite'@'localhost';
+              FLUSH PRIVILEGES;
+            '';
+          };
+
+          reposilite = {
+            enable = true;
+            plugins = with pkgs.reposilitePlugins; [
+              checksum
+              groovy
+            ];
+            extraArgs = [
+              "--token"
+              "test:SuperSecretTestToken"
+            ];
+            database = {
+              type = "mariadb";
+              passwordFile = "/run/reposiliteDbPass";
+            };
+            settings.port = 8080;
+          };
+        };
+      };
+  };
+
+  testScript = ''
+    machine.start()
+
+    machine.execute("echo \"ReposiliteDBPass\" > /run/reposiliteDbPass && chmod 600 /run/reposiliteDbPass && chown reposilite:reposilite /run/reposiliteDbPass")
+    machine.wait_for_unit("reposilite.service")
+    machine.wait_for_open_port(8080)
+
+    machine.fail("curl -Sf localhost:8080/api/auth/me")
+    machine.succeed("curl -Sfu test:SuperSecretTestToken localhost:8080/api/auth/me")
+  '';
+
+  meta.maintainers = [ lib.maintainers.uku3lig ];
+}
diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix
index 0cdb557714ca..c19c0f013ebd 100644
--- a/pkgs/by-name/re/reposilite/package.nix
+++ b/pkgs/by-name/re/reposilite/package.nix
@@ -5,6 +5,7 @@
   jre_headless,
   linkFarm,
   makeWrapper,
+  nixosTests,
   plugins ? [ ],
 }:
 let
@@ -41,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.updateScript = ./update.sh;
+  passthru = {
+    tests = nixosTests.reposilite;
+    updateScript = ./update.sh;
+  };
 
   meta = {
     description = "Lightweight and easy-to-use repository management software dedicated for the Maven based artifacts in the JVM ecosystem";

From 4c62c92dc3bea96dd14798ce06bf0f952c01df7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A5?= <toastal@posteo.net>
Date: Sat, 29 Mar 2025 02:17:48 +0700
Subject: [PATCH 118/489] =?UTF-8?q?ejabberd:=2024.12=20=E2=86=92=2025.03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ej/ejabberd/package.nix    | 24 ++++--------
 pkgs/by-name/ej/ejabberd/rebar-deps.nix | 52 ++++++++++++-------------
 2 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index de16727c3bf6..6e6e0668064b 100644
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -53,21 +53,21 @@ let
 
   provider_asn1 = buildRebar3 {
     name = "provider_asn1";
-    version = "0.3.0";
+    version = "0.4.1";
     src = fetchHex {
       pkg = "provider_asn1";
-      version = "0.3.0";
-      sha256 = "sha256-MuelWYZi01rBut8jM6a5alMZizPGZoBE/LveSRu/+wU=";
+      version = "0.4.1";
+      sha256 = "sha256-HqR6IyJyJinvbPJJlhJE14yEiBbNmTGOmR0hqonrOR0=";
     };
     beamDeps = [ ];
   };
   rebar3_hex = buildRebar3 {
     name = "rebar3_hex";
-    version = "7.0.7";
+    version = "7.0.8";
     src = fetchHex {
       pkg = "rebar3_hex";
-      version = "7.0.7";
-      sha256 = "sha256-1S2igSwiInATUgULZ1E6e2dK6YI5gvRffHRfF1Gg5Ok=";
+      version = "7.0.8";
+      sha256 = "sha256-aEY0EEZwRHp6AAuE1pSfm5RjBjU+PaaJuKp7fvXRiBc=";
     };
     beamDeps = [ ];
   };
@@ -141,7 +141,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ejabberd";
-  version = "24.12";
+  version = "25.03";
 
   nativeBuildInputs = [
     makeWrapper
@@ -170,17 +170,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "processone";
     repo = "ejabberd";
     tag = finalAttrs.version;
-    hash = "sha256-9TyIgsinUpUbirwqg61EYnPB/OyE5vhl3MBMRihqAtE=";
+    hash = "sha256-VEH1V8v2wQ9qf6Xcj00xHw30tWo0s9AhPyoB7d5B8k8=";
   };
 
-  patches = [
-    # Fix json_encode_with_kv_list used in mod_matrix_gw
-    (fetchpatch2 {
-      url = "https://github.com/processone/ejabberd/commit/056635119c8b9f169f1c59cccbf81faab88a6712.patch?full_index=1";
-      hash = "sha256-53NMT/SwPtaeo8zaJ1JHW6HUZrxkITi731UOdsFAlJ4=";
-    })
-  ];
-
   passthru.tests = {
     inherit (nixosTests) ejabberd;
   };
diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
index 4fd3e6740b74..bd5b79474028 100644
--- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix
+++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
@@ -44,21 +44,21 @@ let
     };
     yconf = builder {
       name = "yconf";
-      version = "1.0.17";
+      version = "1.0.18";
       src = fetchHex {
         pkg = "yconf";
-        version = "1.0.17";
-        sha256 = "sha256-3SiSkjJBRJpGzIRXuewPsUAwcAc1pYhZVWd8c1w0GiU=";
+        version = "1.0.18";
+        sha256 = "sha256-+pUOxlA/ktZBf7jMHZgkA/BBaX6OG79NRYj7kZuVYuo=";
       };
       beamDeps = [ fast_yaml ];
     };
     xmpp = builder {
       name = "xmpp";
-      version = "1.9.1";
+      version = "1.10.0";
       src = fetchHex {
         pkg = "xmpp";
-        version = "1.9.1";
-        sha256 = "sha256-0rFDGvbkwaTIv5DK8MwRzesEe4MjuH6dfkgm1JEyddw=";
+        version = "1.10.0";
+        sha256 = "sha256-zurkO4/pdknY+FRrP38rOOz8kxwM3Vx0Rf+z+A/LfYU=";
       };
       beamDeps = [
         ezlib
@@ -71,11 +71,11 @@ let
     };
     stun = builder {
       name = "stun";
-      version = "1.2.15";
+      version = "1.2.17";
       src = fetchHex {
         pkg = "stun";
-        version = "1.2.15";
-        sha256 = "sha256-9tilQaKf0T8s5li2dsDMZhJiuW4EW1Le8WRLdevA7e8=";
+        version = "1.2.17";
+        sha256 = "sha256-azGCRMIehSSpquOsmgXNgjTumUwcLIFd5o0wYIatdo0=";
       };
       beamDeps = [
         fast_tls
@@ -84,11 +84,11 @@ let
     };
     stringprep = builder {
       name = "stringprep";
-      version = "1.0.30";
+      version = "1.0.31";
       src = fetchHex {
         pkg = "stringprep";
-        version = "1.0.30";
-        sha256 = "sha256-9vybM4SgOHeDD4my84WAyvP0onRIpKMz1qjDl1wiC5o=";
+        version = "1.0.31";
+        sha256 = "sha256-6WmciOjbFrOkHw5FrGh0pNqBpuSFSnfXbt5tCbCONTA=";
       };
       beamDeps = [ p1_utils ];
     };
@@ -117,18 +117,18 @@ let
       version = "1.0.26";
       src = fetchHex {
         pkg = "p1_utils";
-        version = "1.0.26";
-        sha256 = "sha256-0DeejBFWuYvWT4Epwd4CL8yk8v23SGznO/DtLDN2sEw=";
+        version = "1.0.27";
+        sha256 = "sha256-8a+UKwpivPoNWfvjBnm+T/614kGgxJ7V8JTbL1uA9eA=";
       };
       beamDeps = [ ];
     };
     p1_pgsql = builder {
       name = "p1_pgsql";
-      version = "1.1.29";
+      version = "1.1.32";
       src = fetchHex {
         pkg = "p1_pgsql";
-        version = "1.1.29";
-        sha256 = "sha256-pv9Y6LF0mT84ldo+piEan50MVNGm4ouzIdo7PNaLOME=";
+        version = "1.1.32";
+        sha256 = "sha256-JosB6PTrdcIRoxSVolwoFcVJrszi8N8aFhxuCizeBh4=";
       };
       beamDeps = [ xmpp ];
     };
@@ -144,11 +144,11 @@ let
     };
     p1_mysql = builder {
       name = "p1_mysql";
-      version = "1.0.25";
+      version = "1.0.26";
       src = fetchHex {
         pkg = "p1_mysql";
-        version = "1.0.25";
-        sha256 = "sha256-5hh/+ulbcmCY6I8+5vI0SsJZziwm4O5AOwX+7zQa5DQ=";
+        version = "1.0.26";
+        sha256 = "sha256-6hOAg/LFRxm5z1Sdv1gCooiwAZ6j5USbNUx0zAP6/ew=";
       };
       beamDeps = [ ];
     };
@@ -250,11 +250,11 @@ let
     };
     esip = builder {
       name = "esip";
-      version = "1.0.56";
+      version = "1.0.57";
       src = fetchHex {
         pkg = "esip";
-        version = "1.0.56";
-        sha256 = "sha256-nvNmDO+TtiP3No3NXHn05wQ1hjGQnm3UZOM1N4gV2h8=";
+        version = "1.0.57";
+        sha256 = "sha256-GcNX4YF7HgR5LvNZv5AEAPPm0OWt6Sn9cviOqbRK8u0=";
       };
       beamDeps = [
         fast_tls
@@ -284,11 +284,11 @@ let
     };
     eimp = builder {
       name = "eimp";
-      version = "1.0.23";
+      version = "1.0.24";
       src = fetchHex {
         pkg = "eimp";
-        version = "1.0.23";
-        sha256 = "sha256-kHx4ACPLKJPk/Evb5qTwLDVZE4Yqxn8OzCZgXoFrYoo=";
+        version = "1.0.24";
+        sha256 = "sha256-fWFDLrikVlnAvkdfROde62UXQ6pkod6K33hc2tgZYa0=";
       };
       beamDeps = [ p1_utils ];
     };

From 890f2a21bf2f0835df85a6a11003d4e7c8cbe106 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <thierry@delafontaine.xyz>
Date: Fri, 4 Apr 2025 10:55:32 +0200
Subject: [PATCH 119/489] codechecker: enable build on `aarch64-darwin`

CodeChecker successfully builds on `aarch64-darwin`.
---
 pkgs/by-name/co/codechecker/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/co/codechecker/package.nix b/pkgs/by-name/co/codechecker/package.nix
index f09011e8e68b..38b189f5a959 100644
--- a/pkgs/by-name/co/codechecker/package.nix
+++ b/pkgs/by-name/co/codechecker/package.nix
@@ -122,6 +122,5 @@ python3Packages.buildPythonApplication rec {
       felixsinger
     ];
     mainProgram = "CodeChecker";
-    platforms = platforms.linux;
   };
 }

From 7b9790d0056b3774008852b421fbefddec1cdb33 Mon Sep 17 00:00:00 2001
From: Daru <mica.tui@proton.me>
Date: Fri, 4 Apr 2025 11:49:26 +0200
Subject: [PATCH 120/489] hmcl: 3.6.11 -> 3.6.12

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

diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix
index ca3ad3eb69a6..165d09db6700 100644
--- a/pkgs/by-name/hm/hmcl/package.nix
+++ b/pkgs/by-name/hm/hmcl/package.nix
@@ -21,7 +21,7 @@
 }:
 
 let
-  version = "3.6.11";
+  version = "3.6.12";
   icon = fetchurl {
     url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico";
     hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc=";
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar";
-    hash = "sha256-ZQNJm7xbOdVSnxtx4krOnM9QBsxibFXo8wx1fCn1gJA=";
+    hash = "sha256-ofrG7CVZIODJoHE6owR9P7viBlChamYF5PEpFeeOH4E=";
   };
 
   dontUnpack = true;

From 3d05e6fe7c24a4bcae5a5b327e85a9a0a3b284e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 09:50:52 +0000
Subject: [PATCH 121/489] mpb: 1.11.1 -> 1.12.0

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

diff --git a/pkgs/by-name/mp/mpb/package.nix b/pkgs/by-name/mp/mpb/package.nix
index 0a2a79e61f27..4d09844c386e 100644
--- a/pkgs/by-name/mp/mpb/package.nix
+++ b/pkgs/by-name/mp/mpb/package.nix
@@ -19,13 +19,13 @@ assert !lapack.isILP64;
 
 stdenv.mkDerivation rec {
   pname = "mpb";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = "mpb";
     tag = "v${version}";
-    hash = "sha256-+2cMjZSGdfngtGoAeZRPRPBDvflTEIOWO8Se0W6jv9k=";
+    hash = "sha256-naxVKD7pxefb/ht5Pa4e/T9eDzlZ0raNYPSvKNaZUn8=";
   };
 
   nativeBuildInputs = [

From 9d18594a79676a66729cc48831a5ce4bfede52a9 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 4 Apr 2025 18:28:31 +0900
Subject: [PATCH 122/489] dprint-plugins: fix updater with filling pname and
 version

---
 pkgs/by-name/dp/dprint/plugins/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/dp/dprint/plugins/default.nix b/pkgs/by-name/dp/dprint/plugins/default.nix
index cefe95973b8d..0c0d2ab0b492 100644
--- a/pkgs/by-name/dp/dprint/plugins/default.nix
+++ b/pkgs/by-name/dp/dprint/plugins/default.nix
@@ -13,7 +13,12 @@ let
       maintainers ? [ lib.maintainers.phanirithvij ],
     }:
     fetchurl {
-      inherit hash url;
+      inherit
+        hash
+        url
+        pname
+        version
+        ;
       name = "${pname}-${version}.wasm";
       meta = {
         inherit

From 388a54929a343382c850a4674d7396a3a8b81518 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Thu, 3 Apr 2025 01:40:10 +0100
Subject: [PATCH 123/489] nixos/tests/fluent-bit: add regression test for
 #395128

---
 nixos/tests/fluent-bit.nix | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/fluent-bit.nix b/nixos/tests/fluent-bit.nix
index 9dc68011ea85..729a586784ad 100644
--- a/nixos/tests/fluent-bit.nix
+++ b/nixos/tests/fluent-bit.nix
@@ -13,7 +13,7 @@ import ./make-test-python.nix (
               inputs = [
                 {
                   name = "systemd";
-                  systemd_filter = "_SYSTEMD_UNIT=fluent-bit.service";
+                  systemd_filter = "_SYSTEMD_UNIT=fluent-bit-regression-395128.service";
                 }
               ];
               outputs = [
@@ -28,12 +28,35 @@ import ./make-test-python.nix (
         };
 
         systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit";
+
+        # Logs get compressed when larger than 1024 bytes
+        # Lets generate some logs that trigger that
+        # This causes libzstd to be dlopen'd by systemd which breaks fluent-bit 3.2.7+
+        # https://www.freedesktop.org/software/systemd/man/latest/journald.conf.html#Compress=
+        systemd.services.fluent-bit-regression-395128 = {
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+          };
+          script = ''
+            for i in {1..20}; do
+              (head -c 1200 < /dev/zero | tr '\0' 'A') && echo
+              sleep 1
+            done
+          '';
+        };
       };
 
     testScript = ''
       start_all()
 
       machine.wait_for_unit("fluent-bit.service")
+
+      # Regression test for https://github.com/NixOS/nixpkgs/pull/395128
+      with subtest("fluent-bit handles zstd-compressed journal logs"):
+        machine.succeed("systemctl start fluent-bit-regression-395128.service")
+        machine.succeed("systemctl show -p NRestarts fluent-bit.service | grep -q 'NRestarts=0'")
+
       machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out")
     '';
   }

From 145cc7ff23c13c272eb9d3d2cdc4c86dd7b1e36b Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Fri, 4 Apr 2025 12:16:33 +0100
Subject: [PATCH 124/489] nixos/tests/fluent-bit: migrate to runTest

---
 nixos/tests/all-tests.nix  |   2 +-
 nixos/tests/fluent-bit.nix | 107 +++++++++++++++++--------------------
 2 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0d75a616e23a..4b35f538e590 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -480,7 +480,7 @@ in
     imports = [ ./firefox.nix ];
     _module.args.firefoxPackage = pkgs.floorp;
   };
-  fluent-bit = handleTest ./fluent-bit.nix { };
+  fluent-bit = runTest ./fluent-bit.nix;
   fluentd = handleTest ./fluentd.nix { };
   fluidd = handleTest ./fluidd.nix { };
   fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix { };
diff --git a/nixos/tests/fluent-bit.nix b/nixos/tests/fluent-bit.nix
index 729a586784ad..f9923e3ada7e 100644
--- a/nixos/tests/fluent-bit.nix
+++ b/nixos/tests/fluent-bit.nix
@@ -1,63 +1,56 @@
-import ./make-test-python.nix (
-  { lib, pkgs, ... }:
-  {
-    name = "fluent-bit";
-
-    nodes.machine =
-      { config, pkgs, ... }:
-      {
-        services.fluent-bit = {
-          enable = true;
-          settings = {
-            pipeline = {
-              inputs = [
-                {
-                  name = "systemd";
-                  systemd_filter = "_SYSTEMD_UNIT=fluent-bit-regression-395128.service";
-                }
-              ];
-              outputs = [
-                {
-                  name = "file";
-                  path = "/var/log/fluent-bit";
-                  file = "fluent-bit.out";
-                }
-              ];
-            };
-          };
-        };
-
-        systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit";
-
-        # Logs get compressed when larger than 1024 bytes
-        # Lets generate some logs that trigger that
-        # This causes libzstd to be dlopen'd by systemd which breaks fluent-bit 3.2.7+
-        # https://www.freedesktop.org/software/systemd/man/latest/journald.conf.html#Compress=
-        systemd.services.fluent-bit-regression-395128 = {
-          serviceConfig = {
-            Type = "oneshot";
-            RemainAfterExit = true;
-          };
-          script = ''
-            for i in {1..20}; do
-              (head -c 1200 < /dev/zero | tr '\0' 'A') && echo
-              sleep 1
-            done
-          '';
+# Regression test for https://github.com/NixOS/nixpkgs/pull/395128
+{
+  name = "fluent-bit";
+  nodes.machine = {
+    services.fluent-bit = {
+      enable = true;
+      settings = {
+        pipeline = {
+          inputs = [
+            {
+              name = "systemd";
+              systemd_filter = "_SYSTEMD_UNIT=fluent-bit-regression-395128.service";
+            }
+          ];
+          outputs = [
+            {
+              name = "file";
+              path = "/var/log/fluent-bit";
+              file = "fluent-bit.out";
+            }
+          ];
         };
       };
+    };
+    systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit";
 
-    testScript = ''
-      start_all()
+    # Logs get compressed when larger than 1024 bytes
+    # Lets generate some logs that trigger that
+    # This causes libzstd to be dlopen'd by systemd which breaks fluent-bit 3.2.7+
+    # https://www.freedesktop.org/software/systemd/man/latest/journald.conf.html#Compress=
+    systemd.services.fluent-bit-regression-395128 = {
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+      };
+      script = ''
+        for i in {1..20}; do
+          (head -c 1200 < /dev/zero | tr '\0' 'A') && echo
+          sleep 1
+        done
+      '';
+    };
+  };
 
-      machine.wait_for_unit("fluent-bit.service")
+  testScript = ''
+    start_all()
 
-      # Regression test for https://github.com/NixOS/nixpkgs/pull/395128
-      with subtest("fluent-bit handles zstd-compressed journal logs"):
-        machine.succeed("systemctl start fluent-bit-regression-395128.service")
-        machine.succeed("systemctl show -p NRestarts fluent-bit.service | grep -q 'NRestarts=0'")
+    machine.wait_for_unit("fluent-bit.service")
 
-      machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out")
-    '';
-  }
-)
+    with subtest("fluent-bit handles zstd-compressed journal logs"):
+      machine.succeed("systemctl start fluent-bit-regression-395128.service")
+      machine.succeed("systemctl show -p NRestarts fluent-bit.service | grep -q 'NRestarts=0'")
+
+    machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out")
+  '';
+}

From af20fc2c770d066b7283404f7e4ec1abecb00bbc Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 4 Apr 2025 21:11:26 +0200
Subject: [PATCH 125/489] harper: 0.27.0 -> 0.28.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.28.0
---
 pkgs/by-name/ha/harper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 9f39d078b7b5..2f6765b866ab 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.27.0";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-y1DjkHGTXQPLot/sdUQ6nP3cf29yFJa1vUjlQQTcUwY=";
+    hash = "sha256-g+noAc+vKli2T8C2EAK4ejw/2DWZPhtKbezyt53iHYg=";
   };
 
   buildAndTestSubdir = "harper-ls";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-1ofAsWckkI1AvMat28ZqWLZh2dHwalBW7kw7tBrebQ8=";
+  cargoHash = "sha256-Ql1WdwDnXBC4JHO/uzJJlacQC44bOaHo2i3M9atjf3I=";
 
   passthru.updateScript = nix-update-script { };
 

From 86b2ae1989c719a750bcf58c40a8bd04b1dfe815 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Mon, 23 Dec 2024 03:51:45 +0100
Subject: [PATCH 126/489] dotnet-sdk-setup-hook: add nuget.org as a package
 source when there is no <clear/>

---
 pkgs/by-name/ps/ps3-disc-dumper/package.nix          |  6 ------
 pkgs/by-name/re/recyclarr/package.nix                | 12 ------------
 .../compilers/dotnet/dotnet-sdk-setup-hook.sh        |  7 +++++++
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ps/ps3-disc-dumper/package.nix b/pkgs/by-name/ps/ps3-disc-dumper/package.nix
index 7d90e7ad1549..59553b16acda 100644
--- a/pkgs/by-name/ps/ps3-disc-dumper/package.nix
+++ b/pkgs/by-name/ps/ps3-disc-dumper/package.nix
@@ -27,12 +27,6 @@ buildDotnetModule rec {
   projectFile = "UI.Avalonia/UI.Avalonia.csproj";
   nugetDeps = ./deps.json;
 
-  preConfigureNuGet = ''
-    # This should really be in the upstream nuget.config
-    dotnet nuget add source https://api.nuget.org/v3/index.json \
-      -n nuget.org --configfile nuget.config
-  '';
-
   runtimeDeps = [
     zlib
     openssl
diff --git a/pkgs/by-name/re/recyclarr/package.nix b/pkgs/by-name/re/recyclarr/package.nix
index f729757aed3a..7ac3bb36fb62 100644
--- a/pkgs/by-name/re/recyclarr/package.nix
+++ b/pkgs/by-name/re/recyclarr/package.nix
@@ -1,22 +1,12 @@
 {
   lib,
   openssl,
-  writeText,
   git,
   buildDotnetModule,
   dotnetCorePackages,
   fetchFromGitHub,
   testers,
 }:
-let
-  nuget-config = writeText "nuget.config" ''
-    <configuration>
-      <packageSources>
-        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-      </packageSources>
-    </configuration>
-  '';
-in
 buildDotnetModule (finalAttrs: {
   pname = "recyclarr";
   version = "7.4.1";
@@ -47,8 +37,6 @@ buildDotnetModule (finalAttrs: {
 
   enableParallelBuilding = false;
 
-  dotnetRestoreFlags = [ "--configfile=${nuget-config}" ];
-
   doCheck = false;
 
   dotnet-sdk = dotnetCorePackages.sdk_9_0;
diff --git a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
index 76f8734d4e12..fc4a5ba9f315 100644
--- a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
+++ b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
@@ -85,6 +85,7 @@ configureNuget() {
     rootConfig=$(find . -maxdepth 1 -iname nuget.config -print -quit)
     if [[ -z $rootConfig ]]; then
         dotnet new nugetconfig
+        rootConfig=nuget.config
     fi
 
     (
@@ -100,6 +101,12 @@ configureNuget() {
             -i /configuration/packageSources/__new -t attr -n value -v "$nugetSource"
             -r /configuration/packageSources/__new -v add)
 
+        if [[ -n ${keepNugetConfig-} ]] &&
+            ! @xmlstarlet@/bin/xmlstarlet select -t -i "/configuration/packageSources/clear" -nl "$rootConfig" &&
+            ! @xmlstarlet@/bin/xmlstarlet select -t -i "/configuration/packageSources/add[@value='https://api.nuget.org/v3/index.json' or @key='nuget.org']" -nl "$rootConfig"; then
+            dotnet nuget add source https://api.nuget.org/v3/index.json --name nuget.org --configfile "$rootConfig"
+        fi
+
         if [[ -z ${keepNugetConfig-} ]]; then
             xmlConfigArgs+=(-d '//configuration/*')
             xmlRootConfigArgs+=("${xmlSourceConfigArgs[@]}")

From 58a0bf05e57dca02a403273d3655730765df92a9 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 4 Apr 2025 22:58:13 -0400
Subject: [PATCH 127/489] python312Packages.webdataset: enable tests for
 torch.distributed

torch.distributed module is now build on Darwin too, so we can enable
the tests.

test_wids.py failed with Permission denied because the test suite was
using the same global path to write test shard files to for all test
runs. If a previous test run created some shard files, consequent runs
failed. This patch sets WIDS_CACHE variable for tests to use a unique
path for these files for each build.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 pkgs/development/python-modules/webdataset/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix
index 9a3a3cf63d07..77236a576649 100644
--- a/pkgs/development/python-modules/webdataset/default.nix
+++ b/pkgs/development/python-modules/webdataset/default.nix
@@ -53,6 +53,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "webdataset" ];
 
+  preCheck = ''
+    export WIDS_CACHE=$TMPDIR
+  '';
+
   disabledTests =
     [
       # requires network
@@ -77,8 +81,6 @@ buildPythonPackage rec {
     ]
     ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [
       "test_concurrent_access"
-      # fails to patch 'init_process_group' from torch.distributed
-      "TestDistributedChunkedSampler"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
       # segfaults on aarch64-linux
@@ -89,9 +91,6 @@ buildPythonPackage rec {
     ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
-    # AttributeError: <module 'torch.distributed' from /nix/store/...
-    "tests/wids/test_wids.py"
-
     # Issue with creating a temp file in the sandbox
     "tests/wids/test_wids_mmtar.py"
   ];

From 30c4b3714709ef88ea140434e8f7f5491891d484 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <thierry@delafontaine.xyz>
Date: Sat, 5 Apr 2025 08:49:50 +0200
Subject: [PATCH 128/489] codechecker: add `distutils` to
 `propagatedBuildInputs`

Python 3.12 removed the `distutils` module, which causes
errors when running CodeChecker sub-commands.
This patch adds `distutils` to ensure compatibility with Python 3.12.

Related: [Ericsson/codechecker#4350](https://github.com/Ericsson/codechecker/issues/4350)
---
 pkgs/by-name/co/codechecker/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/codechecker/package.nix b/pkgs/by-name/co/codechecker/package.nix
index f09011e8e68b..1c4317670a65 100644
--- a/pkgs/by-name/co/codechecker/package.nix
+++ b/pkgs/by-name/co/codechecker/package.nix
@@ -68,6 +68,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python3Packages; [
+    distutils # required in python312 to call subcommands (see https://github.com/Ericsson/codechecker/issues/4350)
     lxml
     sqlalchemy
     alembic

From af47a5cd149f438551b1c83168e6981b04a7a5fe Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Sat, 5 Apr 2025 10:55:08 +0200
Subject: [PATCH 129/489] appflowy: 0.8.7 -> 0.8.8

https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.8.8
---
 pkgs/by-name/ap/appflowy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix
index d7f316ea540f..003fbcd80ef4 100644
--- a/pkgs/by-name/ap/appflowy/package.nix
+++ b/pkgs/by-name/ap/appflowy/package.nix
@@ -17,11 +17,11 @@ let
     rec {
       x86_64-linux = {
         urlSuffix = "linux-x86_64.tar.gz";
-        hash = "sha256-e0G7J2BRRC+2MMqpvu5BNnimS7RRTjRBgo/j1T9iYWU=";
+        hash = "sha256-WUAyGx7RcLlQsYpfcbV69k1ESaif5VraxUFAslMi5lo=";
       };
       x86_64-darwin = {
         urlSuffix = "macos-universal.zip";
-        hash = "sha256-A9BCdYxeWPjCOZ/L0wYTVuqybLHfc1vsWWxAY7IJohw=";
+        hash = "sha256-fB6DCp2+7T9ozHuMdsv6IwwIyD6+t7LxVWMj9lDJ5Fw=";
       };
       aarch64-darwin = x86_64-darwin;
     }
@@ -30,7 +30,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "appflowy";
-  version = "0.8.7";
+  version = "0.8.8";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";

From 21ebb676dce1a5940e3a5a90c5a8d1df69187b5c Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Wed, 26 Mar 2025 08:59:59 +0100
Subject: [PATCH 130/489] qgis: 3.42.0 -> 3.42.1

---
 pkgs/applications/gis/qgis/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 4a8ddae9923c..49b290b37e4b 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -82,14 +82,14 @@ let
   ];
 in
 mkDerivation rec {
-  version = "3.42.0";
+  version = "3.42.1";
   pname = "qgis-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-vqT6ffqY1M6/2eW08VghysC+v7ZI9Yz0Zhk9UY/izZc=";
+    hash = "sha256-0VW/5X8C35uwIZu018Vtp7qosS0v1b+1SFUE8NSTQYE=";
   };
 
   passthru = {

From 379e4e481c17b81ff06ccc0503ba16e29b6a33b4 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sat, 5 Apr 2025 14:17:22 +0200
Subject: [PATCH 131/489] readest: 0.9.29 -> 0.9.30

Changelog: https://github.com/readest/readest/releases/tag/v0.9.30
Diff: https://github.com/readest/readest/compare/v0.9.29...v0.9.30
---
 pkgs/by-name/re/readest/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index 839bd03f2fcd..c9dda7c14427 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -19,13 +19,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.29";
+  version = "0.9.30";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2L5Wyl3xWjiJCjwUq9mcKe/hnDeHjNnhHgFPISNqfk0=";
+    hash = "sha256-Kratl77JJzrwzc3hi+BCjT/E2qmmbeJeXxiGH0AcM9I=";
     fetchSubmodules = true;
   };
 
@@ -38,14 +38,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-VcPxhCpDrKaqKtGMsvPwXwniPy0rbJ/i03gbZ3i87aE=";
+    hash = "sha256-6JFBw/jktEQBXum7Cb4TrntbrnVQM36jE6sby2bmIlw=";
   };
 
   pnpmRoot = "../..";
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-bRIZcR8UNE78k5cbOt6GQM+PlFVHR2qV7eB82Y+abZw=";
+  cargoHash = "sha256-2XYfcYjrg7RUXuI0B4i9DVNr0i0bYNYHj1peAi77QaE=";
 
   cargoRoot = "../..";
 

From f12e0f58fb0f1317eab89f998ee939104cd684c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 13:24:29 +0000
Subject: [PATCH 132/489] mobilecoin-wallet: 1.9.1 -> 1.9.2

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

diff --git a/pkgs/by-name/mo/mobilecoin-wallet/package.nix b/pkgs/by-name/mo/mobilecoin-wallet/package.nix
index 1fba3f5a3f17..c6c972a0e78d 100644
--- a/pkgs/by-name/mo/mobilecoin-wallet/package.nix
+++ b/pkgs/by-name/mo/mobilecoin-wallet/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "mobilecoin-wallet";
-  version = "1.9.1";
+  version = "1.9.2";
   src = fetchurl {
     url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage";
-    hash = "sha256-UCBQRcGFHMQlLGvChrrMmM0MYv7AZtlkngFK4ptIPU0=";
+    hash = "sha256-JfG+eHsPFXZKi9Vjbw7CPvhmeMvfPWSDS65Ey4Lb8iQ=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 

From 8fd7c70891adea7383b2a60e2bea9dc9eaf22f24 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sat, 5 Apr 2025 16:55:36 +0300
Subject: [PATCH 133/489] swiftlint: 0.58.2 -> 0.59.0

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

diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix
index 74193b6a7eaa..e2968a05f31d 100644
--- a/pkgs/by-name/sw/swiftlint/package.nix
+++ b/pkgs/by-name/sw/swiftlint/package.nix
@@ -8,11 +8,11 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "swiftlint";
-  version = "0.58.2";
+  version = "0.59.0";
 
   src = fetchurl {
     url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip";
-    hash = "sha256-rQcdWjbX9Ddt/pLX7Z9LrvizvedbdRMdwofPNPEDU6U=";
+    hash = "sha256-rsGt9hy2EklZEA7eQ/Tp9eztVLVlVn9LMPTeZz9fQYA=";
   };
 
   dontPatch = true;

From ba440403c0458fdd9d82fd3d8f106a41031e66e9 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 5 Apr 2025 17:05:37 +0200
Subject: [PATCH 134/489] gale: add glib-networking to fix icon loading

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

diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix
index 42fb06906a68..9c87c8b7a52d 100644
--- a/pkgs/by-name/ga/gale/package.nix
+++ b/pkgs/by-name/ga/gale/package.nix
@@ -13,8 +13,9 @@
   pkg-config,
   wrapGAppsHook3,
 
-  openssl,
+  glib-networking,
   libsoup_3,
+  openssl,
   webkitgtk_4_1,
 }:
 
@@ -66,9 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    glib-networking # needed to load icons
     libsoup_3
-    webkitgtk_4_1
     openssl
+    webkitgtk_4_1
   ];
 
   meta = {

From 09ba7e257a79a9343223f17b207c905b44b8c5d3 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 18 Mar 2025 16:14:35 -0700
Subject: [PATCH 135/489] python3Packages.langgraph*: define version regex in
 update script

---
 .../langgraph-checkpoint-postgres/default.nix | 27 +++++++++++--------
 .../langgraph-checkpoint-sqlite/default.nix   | 22 ++++++++++-----
 .../langgraph-checkpoint/default.nix          | 24 ++++++++++++-----
 .../python-modules/langgraph-cli/default.nix  | 20 +++++++-------
 .../python-modules/langgraph-sdk/default.nix  | 21 +++++----------
 5 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index b800f60141f1..1a79d08a275e 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -2,19 +2,26 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  stdenvNoCC,
+
+  # build system
+  poetry-core,
+
+  # dependencies
   langgraph-checkpoint,
-  langgraph-sdk,
   orjson,
   psycopg,
   psycopg-pool,
-  poetry-core,
-  pythonOlder,
+
+  # testing
   pgvector,
   postgresql,
   postgresqlTestHook,
   pytestCheckHook,
   pytest-asyncio,
-  stdenvNoCC,
+
+  # passthru
+  nix-update-script,
 }:
 
 buildPythonPackage rec {
@@ -22,8 +29,6 @@ buildPythonPackage rec {
   version = "2.0.15";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
@@ -83,11 +88,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langgraph.checkpoint.postgres" ];
 
-  passthru = {
-    updateScript = langgraph-sdk.updateScript;
-
-    # multiple tags confuse the bulk updater
-    skipBulkUpdate = true;
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "checkpointpostgres==(\\d+\\.\\d+\\.\\d+)"
+    ];
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
index 7bd37f352d69..7255c4aefa38 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
@@ -2,12 +2,20 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  langgraph-checkpoint,
+
+  # build system
+  poetry-core,
+
+  # dependencies
   aiosqlite,
+  langgraph-checkpoint,
+
+  # testing
   pytest-asyncio,
   pytestCheckHook,
-  langgraph-sdk,
-  poetry-core,
+
+  # passthru
+  nix-update-script,
 }:
 
 buildPythonPackage rec {
@@ -45,9 +53,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  passthru = {
-    inherit (langgraph-sdk) updateScript;
-    skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "checkpoint-sqlite==(\\d+\\.\\d+\\.\\d+)"
+    ];
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index 31b175ff1e9f..e2a9e47b6244 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -1,15 +1,23 @@
 {
   lib,
   buildPythonPackage,
-  dataclasses-json,
   fetchFromGitHub,
-  langchain-core,
-  langgraph-sdk,
-  msgpack,
+
+  # build system
   poetry-core,
+
+  # dependencies
+  langchain-core,
+  msgpack,
+
+  # testing
+  dataclasses-json,
   pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
+
+  # passthru
+  nix-update-script,
 }:
 
 buildPythonPackage rec {
@@ -48,9 +56,11 @@ buildPythonPackage rec {
     "test_serde_jsonplus"
   ];
 
-  passthru = {
-    updateScript = langgraph-sdk.updateScript;
-    skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "checkpoint==(\\d+\\.\\d+\\.\\d+)"
+    ];
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index 9403d86784db..709bf4d378ab 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -1,19 +1,21 @@
 {
   lib,
   buildPythonPackage,
-  click,
   fetchFromGitHub,
+
+  # build-system
   poetry-core,
 
-  # for update script
-  langgraph-sdk,
+  # dependencies
+  click,
 
   # testing
   pytest-asyncio,
   pytestCheckHook,
   docker-compose,
 
-  pythonOlder,
+  # passthru
+  nix-update-script,
 }:
 
 buildPythonPackage rec {
@@ -21,8 +23,6 @@ buildPythonPackage rec {
   version = "0.1.74";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
@@ -59,9 +59,11 @@ buildPythonPackage rec {
     "test_dockerfile_command_with_docker_compose"
   ];
 
-  passthru = {
-    inherit (langgraph-sdk) updateScript;
-    skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "cli==(\\d+\\.\\d+\\.\\d+)"
+    ];
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix
index ab0c5fbb4340..932121757ab3 100644
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@@ -13,7 +13,7 @@
   typing-extensions,
 
   # passthru
-  writeScript,
+  nix-update-script,
 }:
 
 buildPythonPackage rec {
@@ -43,20 +43,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "langgraph_sdk" ];
 
-  passthru = {
-    updateScript = writeScript "update.sh" ''
-      #!/usr/bin/env nix-shell
-      #!nix-shell -i bash -p nix-update
-
-      set -eu -o pipefail +e
-      nix-update --commit --version-regex '(.*)' python3Packages.langgraph
-      nix-update --commit --version-regex 'sdk==(.*)' python3Packages.langgraph-sdk
-      nix-update --commit --version-regex 'checkpoint==(.*)' python3Packages.langgraph-checkpoint
-      nix-update --commit --version-regex 'checkpointduckdb==(.*)' python3Packages.langgraph-checkpoint-duckdb
-      nix-update --commit --version-regex 'checkpointpostgres==(.*)' python3Packages.langgraph-checkpoint-postgres
-      nix-update --commit --version-regex 'checkpointsqlite==(.*)' python3Packages.langgraph-checkpoint-sqlite
-    '';
-    skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "sdk==(\\d+\\.\\d+\\.\\d+)"
+    ];
   };
 
   meta = {

From d27ed9aaeaa1967d1e81e61b2cb80925027cfeb2 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 1 Apr 2025 12:34:54 -0700
Subject: [PATCH 136/489] python312Packages.{langgraph,langgraph-prebuilt}:
 unbundle prebuilt, update both

---
 .../langgraph-prebuilt/default.nix            | 104 ++++++++++++++++++
 .../python-modules/langgraph/default.nix      |  71 +-----------
 pkgs/top-level/python-packages.nix            |   2 +
 3 files changed, 111 insertions(+), 66 deletions(-)
 create mode 100644 pkgs/development/python-modules/langgraph-prebuilt/default.nix

diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
new file mode 100644
index 000000000000..73a1d6ade3ad
--- /dev/null
+++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
+  langchain-core,
+  langgraph-checkpoint,
+
+  # tests
+  langgraph-checkpoint-postgres,
+  langgraph-checkpoint-sqlite,
+  postgresql,
+  postgresqlTestHook,
+  psycopg-pool,
+  psycopg,
+  pytest-asyncio,
+  pytest-mock,
+  pytestCheckHook,
+
+  # passthru
+  nix-update-script,
+}:
+# langgraph-prebuilt isn't meant to be a standalone package but is bundled into langgraph at build time.
+# It exists so the langgraph team can iterate on it without having to rebuild langgraph.
+buildPythonPackage rec {
+  pname = "langgraph-prebuilt";
+  version = "0.1.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "langchain-ai";
+    repo = "langgraph";
+    tag = "prebuilt==${version}";
+    hash = "sha256-mYcj7HRbB5H6G0CVLOICKgdtR5Wlv9WeTIBjQJqlhOE=";
+  };
+
+  sourceRoot = "${src.name}/libs/prebuilt";
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    langchain-core
+    langgraph-checkpoint
+  ];
+
+  skipPythonImportsCheck = true; # This will be packaged with langgraph
+
+  # postgresql doesn't play nicely with the darwin sandbox:
+  # FATAL:  could not create shared memory segment: Operation not permitted
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    postgresql
+    postgresqlTestHook
+  ];
+
+  checkInputs = [
+    langgraph-checkpoint
+    langgraph-checkpoint-postgres
+    langgraph-checkpoint-sqlite
+    psycopg
+    psycopg-pool
+    pytest-asyncio
+    pytest-mock
+  ];
+
+  preCheck = ''
+    export PYTHONPATH=${src}/libs/langgraph:$PYTHONPATH
+  '';
+
+  pytestFlagsArray = [
+    "-W"
+    "ignore::pytest.PytestDeprecationWarning"
+    "-W"
+    "ignore::DeprecationWarning"
+  ];
+
+  disabledTestPaths = [
+    # psycopg.OperationalError: connection failed: connection to server at "127.0.0.1", port 5442 failed: Connection refused
+    # Is the server running on that host and accepting TCP/IP connections?
+    "tests/test_react_agent.py"
+  ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "prebuilt==(\\d+\\.\\d+\\.\\d+)"
+    ];
+  };
+
+  meta = {
+    description = "Prebuilt agents add-on for Langgraph. Should always be bundled with langgraph";
+    homepage = "https://github.com/langchain-ai/langgraph";
+    changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sarahec ];
+  };
+}
diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index f99b92d1de14..8cd814b4af6d 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -10,7 +10,9 @@
   # dependencies
   langchain-core,
   langgraph-checkpoint,
+  langgraph-prebuilt,
   langgraph-sdk,
+  xxhash,
 
   # tests
   aiosqlite,
@@ -33,80 +35,16 @@
   postgresql,
   postgresqlTestHook,
 }:
-let
-  # langgraph-prebuilt isn't meant to be a standalone package but is bundled into langgraph at build time.
-  # It exists so the langgraph team can iterate on it without having to rebuild langgraph.
-  langgraph-prebuilt = buildPythonPackage rec {
-    pname = "langgraph-prebuilt";
-    version = "0.1.1";
-    pyproject = true;
-
-    src = fetchFromGitHub {
-      owner = "langchain-ai";
-      repo = "langgraph";
-      tag = "prebuilt==${version}";
-      hash = "sha256-Kyyr4BSrUReC6jBp4LItuS/JNSzGK5IUaPl7UaLse78=";
-    };
-
-    sourceRoot = "${src.name}/libs/prebuilt";
-
-    build-system = [ poetry-core ];
-
-    dependencies = [
-      langchain-core
-      langgraph-checkpoint
-    ];
-
-    skipPythonImportsCheck = true; # This will be packaged with langgraph
-
-    # postgresql doesn't play nicely with the darwin sandbox:
-    # FATAL:  could not create shared memory segment: Operation not permitted
-    doCheck = !stdenv.hostPlatform.isDarwin;
-
-    nativeCheckInputs = [
-      pytestCheckHook
-      postgresql
-      postgresqlTestHook
-    ];
-
-    checkInputs = [
-      langgraph-checkpoint
-      langgraph-checkpoint-postgres
-      langgraph-checkpoint-sqlite
-      psycopg
-      psycopg-pool
-      pytest-asyncio
-      pytest-mock
-    ];
-
-    preCheck = ''
-      export PYTHONPATH=${src}/libs/langgraph:$PYTHONPATH
-    '';
-
-    pytestFlagsArray = [
-      "-W"
-      "ignore::pytest.PytestDeprecationWarning"
-      "-W"
-      "ignore::DeprecationWarning"
-    ];
-
-    disabledTestPaths = [
-      # psycopg.OperationalError: connection failed: connection to server at "127.0.0.1", port 5442 failed: Connection refused
-      # Is the server running on that host and accepting TCP/IP connections?
-      "tests/test_react_agent.py"
-    ];
-  };
-in
 buildPythonPackage rec {
   pname = "langgraph";
-  version = "0.3.2";
+  version = "0.3.24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "${version}";
-    hash = "sha256-EawVIzG+db2k6/tQyUHCF6SzlO77QTXsYRUm3XpLu/c=";
+    hash = "sha256-NlTpBXBeADlIHQDlt0muJEuoKOgXiAtAo8GoU5CsvZo=";
   };
 
   postgresqlTestSetupPost = ''
@@ -123,6 +61,7 @@ buildPythonPackage rec {
     langgraph-checkpoint
     langgraph-prebuilt
     langgraph-sdk
+    xxhash
   ];
 
   pythonImportsCheck = [ "langgraph" ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7270fd25d512..00c6bc450949 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7464,6 +7464,8 @@ self: super: with self; {
 
   langgraph-cli = callPackage ../development/python-modules/langgraph-cli { };
 
+  langgraph-prebuilt = callPackage ../development/python-modules/langgraph-prebuilt { };
+
   langgraph-sdk = callPackage ../development/python-modules/langgraph-sdk { };
 
   langid = callPackage ../development/python-modules/langid { };

From 350453b75fb110f2f24842cff739152dcbb9ec16 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 1 Apr 2025 13:14:07 -0700
Subject: [PATCH 137/489] python312Packages.langgraph-checkpoint: 2.0.16 ->
 2.0.24

---
 .../python-modules/langgraph-checkpoint/default.nix  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index e2a9e47b6244..a6ead03a494d 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -9,6 +9,7 @@
   # dependencies
   langchain-core,
   msgpack,
+  ormsgpack,
 
   # testing
   dataclasses-json,
@@ -22,26 +23,27 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint";
-  version = "2.0.16";
+  version = "2.0.24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "checkpoint==${version}";
-    hash = "sha256-HieCzNM+z7d0UGL8QOyjNP5P2IbLf0x0xhaUCWM/c0k=";
+    hash = "sha256-NlTpBXBeADlIHQDlt0muJEuoKOgXiAtAo8GoU5CsvZo=";
   };
 
   sourceRoot = "${src.name}/libs/checkpoint";
 
   build-system = [ poetry-core ];
 
-  dependencies = [ langchain-core ];
+  dependencies = [
+    langchain-core
+    ormsgpack
+  ];
 
   propagatedBuildInputs = [ msgpack ];
 
-  pythonRelaxDeps = [ "msgpack" ]; # Can drop after msgpack 1.0.10 lands in nixpkgs
-
   pythonImportsCheck = [ "langgraph.checkpoint" ];
 
   nativeCheckInputs = [

From 412cfc3ee3cf4d35dece232af7b9e0eef22daef1 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 1 Apr 2025 13:21:14 -0700
Subject: [PATCH 138/489] python312Packages.langgraph-checkpoint-postgres:
 2.0.15->2.0.19

---
 .../langgraph-checkpoint-postgres/default.nix               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index 1a79d08a275e..ebd5eb24b6d0 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -9,7 +9,7 @@
 
   # dependencies
   langgraph-checkpoint,
-  orjson,
+  ormsgpack,
   psycopg,
   psycopg-pool,
 
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint-postgres";
-  version = "2.0.15";
+  version = "2.0.19";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -48,7 +48,7 @@ buildPythonPackage rec {
 
   dependencies = [
     langgraph-checkpoint
-    orjson
+    ormsgpack
     psycopg
     psycopg-pool
   ];

From c74a6fd6bfa3e6a130f1db0071a4e77f36e4c1e3 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 1 Apr 2025 18:01:23 -0700
Subject: [PATCH 139/489] python312Packages.langgraph-checkpoint-sqlite: 2.0.5
 -> 2.0.6

---
 .../python-modules/langgraph-checkpoint-sqlite/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
index 7255c4aefa38..54efb25d7ca8 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint-sqlite";
-  version = "2.0.5";
+  version = "2.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "checkpointsqlite==${version}";
-    hash = "sha256-8JNPKaaKDM7VROd1n9TDALN6yxKRz1CuAultBcqBMG0=";
+    hash = "sha256-UUlrhQS0C2rPp//+LwU2rgR4R3AM5fM9X3CYvi/DAy8=";
   };
 
   sourceRoot = "${src.name}/libs/checkpoint-sqlite";

From ca9eeaccd30f6049d115d493204ac8acb75de99d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 1 Apr 2025 18:16:11 -0700
Subject: [PATCH 140/489] python312Packages.langgraph-cli: 0.1.74 -> 0.1.84

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

diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index 709bf4d378ab..4b4cddcb998a 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-cli";
-  version = "0.1.74";
+  version = "0.1.84";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "cli==${version}";
-    hash = "sha256-9/lL2TyOPiRIy6PfWEcd2fBNjn3n3Rpg0/7DL/4+Qpc=";
+    hash = "sha256-nb6u3YooDujRc6BKl35ZQPrKDlZkCreFn82TGxt4m5M=";
   };
 
   sourceRoot = "${src.name}/libs/cli";

From b4bbe42f0d10889f74ae4890ff68abfa7f8a0aec Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 2 Apr 2025 13:40:36 -0700
Subject: [PATCH 141/489] python312Packages.langgraph-sdk: 0.1.53 -> 0.1.61

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

diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix
index 932121757ab3..563e0babce35 100644
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-sdk";
-  version = "0.1.53";
+  version = "0.1.61";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "sdk==${version}";
-    hash = "sha256-Mx/36+FYZi/XNHJwlNRKE/lVo6nRTXUQwtYkq7HmBu0=";
+    hash = "sha256-cwoJ/1D+oAxqt6DEmpRBxDiR2nRAqBIOfqwLOmgUcZQ=";
   };
 
   sourceRoot = "${src.name}/libs/sdk-py";

From 80636392809aab5a76309583e969cc283c3d02e6 Mon Sep 17 00:00:00 2001
From: clementpoiret <poiret.clement@outlook.fr>
Date: Sat, 5 Apr 2025 18:51:39 +0200
Subject: [PATCH 142/489] wl-kbptr: 0.2.3 -> 0.3.0

---
 pkgs/by-name/wl/wl-kbptr/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wl/wl-kbptr/package.nix b/pkgs/by-name/wl/wl-kbptr/package.nix
index 10c1719b1c3e..5ed8c1e30316 100644
--- a/pkgs/by-name/wl/wl-kbptr/package.nix
+++ b/pkgs/by-name/wl/wl-kbptr/package.nix
@@ -6,6 +6,8 @@
   libxkbcommon,
   meson,
   ninja,
+  opencv,
+  pixman,
   pkg-config,
   stdenv,
   wayland,
@@ -14,7 +16,7 @@
 }:
 let
   pname = "wl-kbptr";
-  version = "0.2.3";
+  version = "0.3.0";
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -22,7 +24,7 @@ stdenv.mkDerivation {
     owner = "moverest";
     repo = "wl-kbptr";
     tag = "v${version}";
-    hash = "sha256-4OWy5Q+NSKgzDn12aflZ+YAfacLeOTIhOojiJ2WiqQg=";
+    hash = "sha256-T7vxD5FW6Hjqc6io7Hypr6iJRM32KggQVMOGsy2Lg4Q=";
   };
 
   depsBuildBuild = [ pkg-config ];
@@ -37,10 +39,14 @@ stdenv.mkDerivation {
   buildInputs = [
     gtk3
     libxkbcommon
+    opencv
+    pixman
     wayland
     wayland-protocols
   ];
 
+  mesonFlags = [ "-Dopencv=enabled" ];
+
   strictDeps = true;
 
   passthru = {

From 744329a6ed585479c613ddf5470e6f2cf04e3a7c Mon Sep 17 00:00:00 2001
From: clementpoiret <poiret.clement@outlook.fr>
Date: Sat, 5 Apr 2025 18:52:56 +0200
Subject: [PATCH 143/489] wl-kbptr: add maintainer

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

diff --git a/pkgs/by-name/wl/wl-kbptr/package.nix b/pkgs/by-name/wl/wl-kbptr/package.nix
index 5ed8c1e30316..72c82c5b78c6 100644
--- a/pkgs/by-name/wl/wl-kbptr/package.nix
+++ b/pkgs/by-name/wl/wl-kbptr/package.nix
@@ -59,7 +59,10 @@ stdenv.mkDerivation {
     changelog = "https://github.com/moverest/wl-kbptr/releases/tag/v${version}";
     license = lib.licenses.gpl3;
     mainProgram = "wl-kbptr";
-    maintainers = [ lib.maintainers.luftmensch-luftmensch ];
+    maintainers = [
+      lib.maintainers.luftmensch-luftmensch
+      lib.maintainers.clementpoiret
+    ];
     inherit (wayland.meta) platforms;
   };
 }

From e01cc950ddde90faed25fb449e7e7886ca58e621 Mon Sep 17 00:00:00 2001
From: Tanya <tanyaarora1866@gmail.com>
Date: Sat, 5 Apr 2025 22:31:47 +0530
Subject: [PATCH 144/489] openterface-qt: 0.2.0 -> 0.3.1, generate language
 files via lrelease

---
 pkgs/by-name/op/openterface-qt/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openterface-qt/package.nix b/pkgs/by-name/op/openterface-qt/package.nix
index 9000ceaa8600..5d2a296833c6 100644
--- a/pkgs/by-name/op/openterface-qt/package.nix
+++ b/pkgs/by-name/op/openterface-qt/package.nix
@@ -22,17 +22,18 @@ let
 in
 stdenv.mkDerivation (final: {
   pname = "openterface-qt";
-  version = "0.2.0";
+  version = "0.3.1";
   src = fetchFromGitHub {
     owner = "TechxArtisanStudio";
     repo = "Openterface_QT";
-    rev = "v${final.version}";
-    hash = "sha256-2Z4sMoNfbGuZKyS4YVrId8AIKr5XhNBNcdYfywc2MXM=";
+    rev = "${final.version}";
+    hash = "sha256-HSUKewI6VPEAVkp/O2vnzXR9Eicecutntsd/WvuHU8w=";
   };
   nativeBuildInputs = [
     copyDesktopItems
     qt6.wrapQtAppsHook
     qt6.qmake
+    qt6.qttools
   ];
   buildInputs = [
     libusb1
@@ -41,6 +42,9 @@ stdenv.mkDerivation (final: {
     qt6.qtserialport
     qt6.qtsvg
   ];
+  preBuild = ''
+    lrelease openterfaceQT.pro
+  '';
   installPhase = ''
     runHook preInstall
     mkdir -p $out/bin

From d031302957b6538ce11a7fbbd6aa600b7bc1c90e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 21:45:16 +0000
Subject: [PATCH 145/489] brave: 1.76.81 -> 1.77.95

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

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index 8785f5c0f034..634d7acf32bd 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.76.81";
+  version = "1.77.95";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-Q9BCoSIgP0asYACkHgashQ5h4BITl5My4dxuy50ID8g=";
+      hash = "sha256-jK9narldfjxgtRjOR2P/0r2hVwFF+D60iCHOIrVTBdM=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-Mzd1qxPUmlZkl7kmuO+rEVT8EE2EF8fQwdF2398gjoI=";
+      hash = "sha256-k4x2TdTIlYPCJ/u30JrwPt0AOSvt16qrxisHjqkDNY8=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-5GrlXZW2uIHNpTXFHStWWfGpz4hINR9z6442n2g9258=";
+      hash = "sha256-apJFnG80joh7RMJndJI7jU6tgS2QwHZpnackVp4rCek=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-gOZagyA0oM8KvM+FTsYV/vknG6fG/49rfNInQmN/8K4=";
+      hash = "sha256-wdKIFUwGKJdI7EiMFIrOJuLnMaeBSGgDOk2QUwhNlLE=";
     };
   };
 

From 3c96ce60fa5ffc6de725fdb8089ee7606570818a Mon Sep 17 00:00:00 2001
From: kylerisse <kylerisse@users.noreply.github.com>
Date: Sat, 5 Apr 2025 15:09:13 -0700
Subject: [PATCH 146/489] openrct2: 0.4.20 -> 0.4.21

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

diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix
index 52bab92c1a8f..8d7bf1375308 100644
--- a/pkgs/by-name/op/openrct2/package.nix
+++ b/pkgs/by-name/op/openrct2/package.nix
@@ -33,18 +33,18 @@
 }:
 
 let
-  openrct2-version = "0.4.20";
+  openrct2-version = "0.4.21";
 
   # Those versions MUST match the pinned versions within the CMakeLists.txt
   # file. The REPLAYS repository from the CMakeLists.txt is not necessary.
-  objects-version = "1.5.1";
+  objects-version = "1.6.1";
   openmsx-version = "1.6";
   opensfx-version = "1.0.5";
   title-sequences-version = "0.4.14";
 
   objects = fetchurl {
     url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip";
-    hash = "sha256-xrgAy817G5xwfzZX+8Xy2508/Zwq32aKzMndus14Qd8=";
+    hash = "sha256-aCkYZjDlLDMrakhH67k2xUmlIvytr49eXkV5xMkaRFA=";
   };
   openmsx = fetchurl {
     url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${openmsx-version}/openmusic.zip";
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "OpenRCT2";
     repo = "OpenRCT2";
     rev = "v${openrct2-version}";
-    hash = "sha256-G/uD3t8m7C74pjSA6dbz4gzu9CwEpmyFwtYpoFIiRjM=";
+    hash = "sha256-exG6pXqok/mrDSCtqIs6VS2WwCr6XlP1gHJA1FgPOiM=";
   };
 
   nativeBuildInputs = [

From 4c3ff06f210a55e7c2be6e706f0caef51b7fd754 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 22:33:10 +0000
Subject: [PATCH 147/489] calf: 0.90.4 -> 0.90.6

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

diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index eee2d7f1b2dd..8e42515a0320 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "calf";
-  version = "0.90.4";
+  version = "0.90.6";
 
   src = fetchFromGitHub {
     owner = "calf-studio-gear";
     repo = "calf";
     tag = version;
-    hash = "sha256-E9H2YG1HAhIN+zJxDKIJTkJapbNz8h9dfd5YfZp9Zp0=";
+    hash = "sha256-rcMuQFig6BrnyGFyvYaAHmOvabEHGl+1lMNfffLHn1w=";
   };
 
   outputs = [

From 6d3c140fc7c691e9924903163195d04363fb574d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 01:23:06 +0000
Subject: [PATCH 148/489] workrave: 1.10.52 -> 1.10.53

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

diff --git a/pkgs/by-name/wo/workrave/package.nix b/pkgs/by-name/wo/workrave/package.nix
index 8f1322c323e9..1a84f57c656f 100644
--- a/pkgs/by-name/wo/workrave/package.nix
+++ b/pkgs/by-name/wo/workrave/package.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation rec {
   pname = "workrave";
-  version = "1.10.52";
+  version = "1.10.53";
 
   src = fetchFromGitHub {
     repo = "workrave";
     owner = "rcaelers";
     rev = "v" + lib.concatStringsSep "_" (lib.splitVersion version);
-    sha256 = "sha256-U39zr8XGIDbyY480bla2yTaRQLP3wMrL8RLWjlTa5uY=";
+    sha256 = "sha256-Dt0KY6nchcGZLyiUGGS4pnVagreIhuQpSq2DdvWqtn8=";
   };
 
   nativeBuildInputs = [

From 9af9832b588f8fc5c323670c8e0abe765454cea0 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 6 Apr 2025 12:17:32 +0200
Subject: [PATCH 149/489] perlPackages.DataEntropy: 0.007 -> 0.008

Fixes CVE-2025-1860.

https://metacpan.org/release/RRWO/Data-Entropy-0.008/source/Changes
---
 pkgs/top-level/perl-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 10b69fde6708..0a41596ff0e4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8068,15 +8068,16 @@ with self;
     };
   };
 
-  DataEntropy = buildPerlModule {
+  DataEntropy = buildPerlPackage {
     pname = "Data-Entropy";
-    version = "0.007";
+    version = "0.008";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Entropy-0.007.tar.gz";
-      hash = "sha256-JhHEoaMDhZTXnqTtFNnhWpr493EF9RZneV/k+KU0J+Q=";
+      url = "mirror://cpan/authors/id/R/RR/RRWO/Data-Entropy-0.008.tar.gz";
+      hash = "sha256-GKUrE4boLGuM2zhKOYYdYCIKRCp5DgdwEL5y3YU7Z7M=";
     };
     propagatedBuildInputs = [
       CryptRijndael
+      CryptURandom
       DataFloat
       HTTPLite
       ParamsClassify

From 4828c40ef4d331ad55a000a177d54ff18eb1b06e Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 6 Apr 2025 12:56:01 +0200
Subject: [PATCH 150/489] vyper: 0.4.0 -> 0.4.1

Fixes CVE-2025-21607, CVE-2025-27105, CVE-2025-26622 and CVE-2025-27104.

https://github.com/vyperlang/vyper/releases/tag/v0.4.1
---
 pkgs/development/compilers/vyper/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix
index 8f523f14735b..011675a1f31b 100644
--- a/pkgs/development/compilers/vyper/default.nix
+++ b/pkgs/development/compilers/vyper/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  lark,
   asttokens,
   buildPythonPackage,
   cbor2,
@@ -28,21 +29,20 @@ let
 in
 buildPythonPackage rec {
   pname = "vyper";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-locUXGoL9C3lLpIgLOmpE2SNPGV6yOXPubNaEA3EfjQ=";
+    hash = "sha256-KiGbiVybWtanEjem+30DpuzKqAD6owujJBiEfjUKleM=";
   };
 
   postPatch = ''
     # pythonRelaxDeps doesn't work
     substituteInPlace setup.py \
-      --replace-fail "setuptools_scm>=7.1.0,<8.0.0" "setuptools_scm>=7.1.0" \
-      --replace-fail '"pytest-runner",' ""
+      --replace-fail "setuptools_scm>=7.1.0,<8.0.0" "setuptools_scm>=7.1.0"
   '';
 
   nativeBuildInputs = [
@@ -59,6 +59,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    lark
     asttokens
     cbor2
     importlib-metadata

From cccb2035790da19593754000f47c9dba8ac0286d Mon Sep 17 00:00:00 2001
From: Justinas Stankevicius <justinas@justinas.org>
Date: Sun, 26 Feb 2023 21:23:32 +0200
Subject: [PATCH 151/489] agnos: init at 0.1.0

---
 pkgs/by-name/ag/agnos/package.nix | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/ag/agnos/package.nix

diff --git a/pkgs/by-name/ag/agnos/package.nix b/pkgs/by-name/ag/agnos/package.nix
new file mode 100644
index 000000000000..9b6bc6258b88
--- /dev/null
+++ b/pkgs/by-name/ag/agnos/package.nix
@@ -0,0 +1,31 @@
+{
+  fetchFromGitHub,
+  lib,
+  nixosTests,
+  rustPlatform,
+  openssl,
+  pkg-config,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "agnos";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "krtab";
+    repo = "agnos";
+    rev = "v${version}";
+    hash = "sha256-hSiJvpTQIbhz/0AFBTvgfRDTqOi9YcDOvln15SksMJs=";
+  };
+
+  cargoHash = "sha256-wmnfAvtTjioslSdD6z0mMl3Hz46wpPYMk494r9xXj44=";
+
+  buildInputs = [ openssl ];
+  nativeBuildInputs = [ pkg-config ];
+
+  meta = with lib; {
+    description = "Obtains certificates from Let's Encrypt using DNS-01 without the need for API access to the DNS provider";
+    homepage = "https://github.com/krtab/agnos";
+    license = licenses.mit;
+    maintainers = with maintainers; [ justinas ];
+  };
+}

From 64e6e34a5d08347298cc0d4a1c92f5628b5a5a2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 11:06:37 +0000
Subject: [PATCH 152/489] gqlgen: 0.17.68 -> 0.17.70

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

diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix
index b6971a73f4dd..2f57022ee15d 100644
--- a/pkgs/by-name/gq/gqlgen/package.nix
+++ b/pkgs/by-name/gq/gqlgen/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.17.68";
+  version = "0.17.70";
 in
 buildGoModule {
   pname = "gqlgen";
@@ -16,7 +16,7 @@ buildGoModule {
     owner = "99designs";
     repo = "gqlgen";
     tag = "v${version}";
-    hash = "sha256-zu9Rgxua19dZNLUeJeMklKB0C95E8UVWGu/I5Lkk66E=";
+    hash = "sha256-VpZQBmQKxqrWC9pD90V4hMO6mYgbCCbrenyCEbGTHtA=";
   };
 
   vendorHash = "sha256-B3RiZZee6jefslUSTfHDth8WUl5rv7fmEFU0DpKkWZk=";

From b151e120eb1ccbbed80d176aec8c0eb9daa00a52 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 6 Apr 2025 10:52:53 +0200
Subject: [PATCH 153/489] wxGTK32: add missing optional deps

---
 pkgs/by-name/wx/wxGTK32/package.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix
index a1e2ca6b7a5d..06f0148e13d7 100644
--- a/pkgs/by-name/wx/wxGTK32/package.nix
+++ b/pkgs/by-name/wx/wxGTK32/package.nix
@@ -4,6 +4,7 @@
   curl,
   expat,
   fetchFromGitHub,
+  gspell,
   gst_all_1,
   gtk3,
   libGL,
@@ -12,9 +13,12 @@
   libXinerama,
   libXtst,
   libXxf86vm,
+  libnotify,
   libpng,
+  libsecret,
   libtiff,
   libjpeg_turbo,
+  libxkbcommon,
   zlib,
   pcre2,
   pkg-config,
@@ -66,11 +70,15 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       curl
+      gspell # wxTextCtrl spell checking
       gtk3
       libSM
       libXinerama
       libXtst
       libXxf86vm
+      libnotify # wxNotificationMessage backend
+      libsecret # wxSecretStore backend
+      libxkbcommon # proper key codes in key events
       xorgproto
     ]
     ++ lib.optional withMesa libGLU
@@ -142,7 +150,10 @@ stdenv.mkDerivation rec {
       database support, HTML viewing and printing, and much more.
     '';
     license = licenses.wxWindows;
-    maintainers = with maintainers; [ tfmoraes ];
+    maintainers = with maintainers; [
+      tfmoraes
+      fliegendewurst
+    ];
     platforms = platforms.unix;
   };
 }

From 943ab931911f48e0cff07eb4ecb1ba3934bad2b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 13:07:39 +0000
Subject: [PATCH 154/489] mago: 0.22.1 -> 0.22.2

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

diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix
index af8bc1189280..21d545518bfb 100644
--- a/pkgs/by-name/ma/mago/package.nix
+++ b/pkgs/by-name/ma/mago/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mago";
-  version = "0.22.1";
+  version = "0.22.2";
 
   src = fetchFromGitHub {
     owner = "carthage-software";
     repo = "mago";
     tag = version;
-    hash = "sha256-Zc6DTqIVU4shmZ9csg4nzwjn7ut/D6FrBXATQqwHI8o=";
+    hash = "sha256-78lnNbUKjQYS2BSRGiGmFfnu85Mz+xAwaDG5pVCBqkQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-wppfZNsAFzXMJzcIOHL8Lj2FCgPp/i/TZcHP4VYsGCk=";
+  cargoHash = "sha256-lwL+5HuT6xiiittGlRDaFWfS9qum4xHginHT/TUMcco=";
 
   env = {
     # Get openssl-sys to use pkg-config

From 80b1f41c37ac58578b18e4189dd2d635621472df Mon Sep 17 00:00:00 2001
From: Qiming Chu <cchuqiming@gmail.com>
Date: Sun, 6 Apr 2025 21:21:01 +0800
Subject: [PATCH 155/489] circt: 1.111.1 -> 1.112.0

Signed-off-by: Qiming Chu <cchuqiming@gmail.com>
---
 pkgs/by-name/ci/circt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix
index b68b64dcd96f..5f2e46b344db 100644
--- a/pkgs/by-name/ci/circt/package.nix
+++ b/pkgs/by-name/ci/circt/package.nix
@@ -19,12 +19,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "circt";
-  version = "1.111.1";
+  version = "1.112.0";
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "circt";
     rev = "firtool-${version}";
-    hash = "sha256-eOoUwYNQS83/uNfbbEPUbTf9aIjqc2vklIC3zi9U9KU=";
+    hash = "sha256-yh7/2QsUO2/sCyrgT8QTBC/BENEZNmXoHTIiz5abngw=";
     fetchSubmodules = true;
   };
 

From cf4050299965ab0657de6d0e223a048a9c95abd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 14:10:53 +0000
Subject: [PATCH 156/489] kclvm: 0.10.0 -> 0.11.1

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

diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix
index aaa3a3cca342..7c33e7e0b9eb 100644
--- a/pkgs/by-name/kc/kclvm/package.nix
+++ b/pkgs/by-name/kc/kclvm/package.nix
@@ -10,19 +10,19 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "kclvm";
-  version = "0.10.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "kcl";
     rev = "v${version}";
-    hash = "sha256-OMPo2cT0ngwHuGghVSfGoDgf+FThj2GsZ3Myb1wSxQM=";
+    hash = "sha256-14yFGa8y8w3wbCmx0JOSN0TShXLZZpTdVynEfUKkjuE=";
   };
 
   sourceRoot = "${src.name}/kclvm";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-xQgCiNt0lUvB5XmVB45l0GuIiVp5Jm6dZY7396Rsnqw=";
+  cargoHash = "sha256-o7YFyqRWAMjq23mcAqDrcN4infdBgp1KNvviYOLR35s=";
 
   buildInputs =
     [ rustc ]

From 2f56e30f1e2e9ce25f481b908669b8a0d8eeb646 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 6 Apr 2025 16:29:51 +0200
Subject: [PATCH 157/489] libmamba: 2.0.5 -> 2.1.0

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

diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix
index c1ed853b834f..c3b8c302b84c 100644
--- a/pkgs/by-name/li/libmamba/package.nix
+++ b/pkgs/by-name/li/libmamba/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmamba";
-  version = "2.0.5";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "mamba-org";
     repo = "mamba";
-    rev = "libmamba-${finalAttrs.version}";
-    hash = "sha256-o5shAmsplJS2WZ4HhAt1U27KqUheVxZTkjlyxR7EYxI=";
+    tag = finalAttrs.version;
+    hash = "sha256-7YR3ToPz80I9d1pRNiEaoIacVyaz2mqzdm0h5WGSb2g=";
   };
 
   nativeBuildInputs = [

From 59b3409db3aad1f00cbfbf23117746621cbc924e Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 6 Apr 2025 16:29:51 +0200
Subject: [PATCH 158/489] mamba-cpp: 2.0.5 -> 2.1.0

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

diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix
index 3d501df085ed..f541eb67dd4b 100644
--- a/pkgs/by-name/ma/mamba-cpp/package.nix
+++ b/pkgs/by-name/ma/mamba-cpp/package.nix
@@ -13,16 +13,17 @@
   tl-expected,
   libmamba,
   python3,
+  versionCheckHook,
 }:
 stdenv.mkDerivation rec {
   pname = "mamba-cpp";
-  version = "2.0.5";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "mamba-org";
     repo = "mamba";
-    rev = "micromamba-${version}";
-    hash = "sha256-o5shAmsplJS2WZ4HhAt1U27KqUheVxZTkjlyxR7EYxI=";
+    tag = version;
+    hash = "sha256-7YR3ToPz80I9d1pRNiEaoIacVyaz2mqzdm0h5WGSb2g=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -46,6 +47,8 @@ stdenv.mkDerivation rec {
     (lib.cmakeBool "BUILD_LIBMAMBA" false)
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   meta = with lib; {
     description = "Reimplementation of the conda package manager";
     homepage = "https://github.com/mamba-org/mamba";

From 8f7ccde5b1e97a5b7121e19203be3004c7dc1683 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 15:00:01 +0000
Subject: [PATCH 159/489] wine-staging: 10.4 -> 10.5

---
 pkgs/applications/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index 853dea8f22e6..31a67dd3c413 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -115,9 +115,9 @@ rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "10.4";
+    version = "10.5";
     url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
-    hash = "sha256-oJAZzlxCuga6kexCPUnY8qmo6sTBqSMMc+HRGWOdXpI=";
+    hash = "sha256-wDbsHvR2dHdKX5lFgwIuni62j+j8GLOox55oWzvsibw=";
     inherit (stable) patches;
 
     ## see http://wiki.winehq.org/Gecko
@@ -163,7 +163,7 @@ rec {
   staging = fetchFromGitLab rec {
     # https://gitlab.winehq.org/wine/wine-staging
     inherit (unstable) version;
-    hash = "sha256-LteUANxr+w1N9r6LNztjRfr3yXtJnUMi0uayTRtFoSU=";
+    hash = "sha256-rXA/55rwQSJR247E4H7cQdTtXRmjomRbls7THV3jfcE=";
     domain = "gitlab.winehq.org";
     owner = "wine";
     repo = "wine-staging";

From 487d0a77a2ab688f998ccaad04058b5bf3cbbe72 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 6 Apr 2025 17:03:51 +0200
Subject: [PATCH 160/489] python313Packages.opower: 0.10.0 -> 0.10.1

Diff: https://github.com/tronikos/opower/compare/refs/tags/v0.10.0...v0.10.1

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

diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index 33689c5344fc..034a6bd31e83 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.10.0";
+  version = "0.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "tronikos";
     repo = "opower";
     tag = "v${version}";
-    hash = "sha256-2ENP67OD466T6jLyyUxOz5CXKzVRhucpEycOXj42Ue0=";
+    hash = "sha256-egkXrTKqUz6AiOr55QRUTkz/3CnhTO2GeBDcd40QGvQ=";
   };
 
   build-system = [ setuptools ];

From 3e8802d7b7bd5c15a59ce05ae6ccecb6483b7aff Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 6 Apr 2025 17:04:50 +0200
Subject: [PATCH 161/489] python313Packages.flux-led: 1.1.4 -> 1.2.0

Diff: https://github.com/Danielhiversen/flux_led/compare/refs/tags/1.1.4...1.2.0

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

diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix
index db3305a312c5..bd69a1f647ac 100644
--- a/pkgs/development/python-modules/flux-led/default.nix
+++ b/pkgs/development/python-modules/flux-led/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "flux-led";
-  version = "1.1.4";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "flux_led";
     tag = version;
-    hash = "sha256-VYhXW3aqjDN7J+OkhYAOC0hGG5RkuFL0I7d6jbGKBvY=";
+    hash = "sha256-+i+/WMHdz4HPKDlRPV1Aq9QqrTo5gZiulSc7Hinn+kI=";
   };
 
   postPatch = ''

From e38b09aef0c04c583e9f503365f9786d382a6dcc Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 6 Apr 2025 17:35:08 +0200
Subject: [PATCH 162/489] homer: 25.02.1 -> 25.04.1

---
 ...cifying-custom-sass-compiler-path-by.patch | 112 +++++++++---------
 pkgs/by-name/ho/homer/package.nix             |   6 +-
 2 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch
index 5634f03dfb79..2320b53976cf 100644
--- a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch
+++ b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch
@@ -12,21 +12,20 @@ Signed-off-by: Christoph Heiss <christoph@c8h4.io>
  3 files changed, 41 insertions(+), 16 deletions(-)
  create mode 100644 patches/sass-embedded.patch
 
-diff --git a/package.json b/package.json
-index 87e57b9..723e0b6 100644
---- a/package.json
-+++ b/package.json
-@@ -28,5 +28,10 @@
-     "vite-plugin-pwa": "^0.21.1"
-   },
+diff --git i/package.json w/package.json
+index 897b42e..7a91a85 100644
+--- i/package.json
++++ w/package.json
+@@ -32,6 +32,9 @@
    "license": "Apache-2.0",
--  "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0"
-+  "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0",
-+  "pnpm": {
+   "packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af",
+   "pnpm": {
+-    "neverBuiltDependencies": []
++    "neverBuiltDependencies": [],
 +    "patchedDependencies": {
 +      "sass-embedded": "patches/sass-embedded.patch"
 +    }
-+  }
+   }
  }
 diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch
 new file mode 100644
@@ -49,10 +48,10 @@ index 0000000..f941a8e
 +     const platform = process.platform === 'linux' && isLinuxMusl(process.execPath)
 +         ? 'linux-musl'
 +         : process.platform;
-diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-index f347757..d054bea 100644
---- a/pnpm-lock.yaml
-+++ b/pnpm-lock.yaml
+diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml
+index 5df58fb..bb27c4b 100644
+--- i/pnpm-lock.yaml
++++ w/pnpm-lock.yaml
 @@ -4,6 +4,11 @@ settings:
    autoInstallPeers: true
    excludeLinksFromLockfile: false
@@ -65,80 +64,79 @@ index f347757..d054bea 100644
  importers:
 
    .:
-@@ -26,7 +31,7 @@ importers:
-     devDependencies:
+@@ -29,7 +34,7 @@ importers:
+         version: 9.21.0
        '@vitejs/plugin-vue':
          specifier: ^5.2.1
--        version: 5.2.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13)
-+        version: 5.2.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13)
+-        version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)
++        version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)
        '@vue/eslint-config-prettier':
          specifier: ^10.2.0
-         version: 10.2.0(eslint@9.19.0)(prettier@3.4.2)
-@@ -44,13 +49,13 @@ importers:
-         version: 3.4.2
+         version: 10.2.0(eslint@9.21.0)(prettier@3.5.2)
+@@ -50,13 +55,13 @@ importers:
+         version: 3.5.2
        sass-embedded:
-         specifier: ^1.83.4
--        version: 1.83.4
-+        version: 1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
+         specifier: ^1.85.0
+-        version: 1.85.0
++        version: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
        vite:
-         specifier: ^6.0.11
--        version: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0)
-+        version: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0)
+         specifier: ^6.1.3
+-        version: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
++        version: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
        vite-plugin-pwa:
          specifier: ^0.21.1
--        version: 0.21.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0)
-+        version: 0.21.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0)
+-        version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
++        version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
 
  packages:
 
-@@ -3683,9 +3688,9 @@ snapshots:
+@@ -3477,9 +3482,9 @@ snapshots:
 
    '@types/trusted-types@2.0.7': {}
 
--  '@vitejs/plugin-vue@5.2.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13)':
-+  '@vitejs/plugin-vue@5.2.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13)':
+-  '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)':
++  '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)':
      dependencies:
--      vite: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0)
-+      vite: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0)
+-      vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
++      vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
        vue: 3.5.13
 
    '@vue/compiler-core@3.5.13':
-@@ -4965,7 +4970,7 @@ snapshots:
-   sass-embedded-win32-x64@1.83.4:
+@@ -4702,7 +4707,7 @@ snapshots:
+   sass-embedded-win32-x64@1.85.0:
      optional: true
 
--  sass-embedded@1.83.4:
-+  sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi):
+-  sass-embedded@1.85.0:
++  sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi):
      dependencies:
-       '@bufbuild/protobuf': 2.2.0
+       '@bufbuild/protobuf': 2.2.3
        buffer-builder: 0.2.0
-@@ -5286,18 +5291,18 @@ snapshots:
+@@ -5001,25 +5006,25 @@ snapshots:
 
    varint@6.0.0: {}
 
--  vite-plugin-pwa@0.21.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0):
-+  vite-plugin-pwa@0.21.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0):
+-  vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
++  vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
      dependencies:
-       debug: 4.3.7
+       debug: 4.4.0
        pretty-bytes: 6.1.1
-       tinyglobby: 0.2.10
--      vite: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0)
-+      vite: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0)
-       workbox-build: 7.1.0
-       workbox-window: 7.1.0
+       tinyglobby: 0.2.12
+-      vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
++      vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
+       workbox-build: 7.3.0
+       workbox-window: 7.3.0
      transitivePeerDependencies:
        - supports-color
 
--  vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0):
-+  vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0):
+-  vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0):
++  vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0):
      dependencies:
        esbuild: 0.24.2
-       postcss: 8.5.1
-@@ -5305,7 +5310,7 @@ snapshots:
+       postcss: 8.5.3
+       rollup: 4.38.0
      optionalDependencies:
        fsevents: 2.3.3
-       sass: 1.79.5
--      sass-embedded: 1.83.4
-+      sass-embedded: 1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
-       terser: 5.37.0
+-      sass-embedded: 1.85.0
++      sass-embedded: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
+       terser: 5.39.0
        yaml: 2.7.0
diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index eaad9c42bd8f..0579e37fbd94 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -10,12 +10,12 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "homer";
-  version = "25.02.1";
+  version = "25.04.1";
   src = fetchFromGitHub {
     owner = "bastienwirtz";
     repo = "homer";
     rev = "v${version}";
-    hash = "sha256-Fh6qV2eU7VRskbPun7OcJmqgjILVE8w5lV70xH6znmc=";
+    hash = "sha256-hvDrFGv6Mht9whA2lJbDLQnP2LkOiCo3NtjMpWr/q6A=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
       src
       patches
       ;
-    hash = "sha256-qeMmPI2B5FW82qLVtbREDjQh76THMCOZRQCM0DgvCqI=";
+    hash = "sha256-y1R+rlaOtFOHHAgEHPBl40536U10Ft0iUSfGcfXS08Y=";
   };
 
   # Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable.

From 7757648f8243fd93a92bf6ef6058d8d9f9d35082 Mon Sep 17 00:00:00 2001
From: Justinas Stankevicius <justinas@justinas.org>
Date: Mon, 27 Feb 2023 00:17:06 +0200
Subject: [PATCH 163/489] nixos/agnos: init

---
 nixos/modules/module-list.nix     |   1 +
 nixos/modules/security/agnos.nix  | 314 ++++++++++++++++++++++++++++++
 nixos/tests/agnos.nix             | 209 ++++++++++++++++++++
 nixos/tests/all-tests.nix         |   1 +
 pkgs/by-name/ag/agnos/package.nix |   2 +
 5 files changed, 527 insertions(+)
 create mode 100644 nixos/modules/security/agnos.nix
 create mode 100644 nixos/tests/agnos.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5aa0af4c442c..ca4148d81ba8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -361,6 +361,7 @@
   ./programs/zsh/zsh.nix
   ./rename.nix
   ./security/acme
+  ./security/agnos.nix
   ./security/apparmor.nix
   ./security/audit.nix
   ./security/auditd.nix
diff --git a/nixos/modules/security/agnos.nix b/nixos/modules/security/agnos.nix
new file mode 100644
index 000000000000..dbd93afdb263
--- /dev/null
+++ b/nixos/modules/security/agnos.nix
@@ -0,0 +1,314 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.security.agnos;
+  format = pkgs.formats.toml { };
+  name = "agnos";
+  stateDir = "/var/lib/${name}";
+
+  accountType =
+    let
+      inherit (lib) types mkOption;
+    in
+    types.submodule {
+      freeformType = format.type;
+
+      options = {
+        email = mkOption {
+          type = types.str;
+          description = ''
+            Email associated with this account.
+          '';
+        };
+        private_key_path = mkOption {
+          type = types.str;
+          description = ''
+            Path of the PEM-encoded private key for this account.
+            Currently, only RSA keys are supported.
+
+            If this path does not exist, then the behavior depends on `generateKeys.enable`.
+            When this option is `true`,
+            the key will be automatically generated and saved to this path.
+            When it is `false`, agnos will fail.
+
+            If a relative path is specified,
+            the key will be looked up (or generated and saved to) under `${stateDir}`.
+          '';
+        };
+        certificates = mkOption {
+          type = types.listOf certificateType;
+          description = ''
+            Certificates for agnos to issue or renew.
+          '';
+        };
+      };
+    };
+
+  certificateType =
+    let
+      inherit (lib) types literalExpression mkOption;
+    in
+    types.submodule {
+      freeformType = format.type;
+
+      options = {
+        domains = mkOption {
+          type = types.listOf types.str;
+          description = ''
+            Domains the certificate represents
+          '';
+          example = literalExpression ''["a.example.com", "b.example.com", "*b.example.com"]'';
+        };
+        fullchain_output_file = mkOption {
+          type = types.str;
+          description = ''
+            Output path for the full chain including the acquired certificate.
+            If a relative path is specified, the file will be created in `${stateDir}`.
+          '';
+        };
+        key_output_file = mkOption {
+          type = types.str;
+          description = ''
+            Output path for the certificate private key.
+            If a relative path is specified, the file will be created in `${stateDir}`.
+          '';
+        };
+      };
+    };
+in
+{
+  options.security.agnos =
+    let
+      inherit (lib) types mkEnableOption mkOption;
+    in
+    {
+      enable = mkEnableOption name;
+
+      settings = mkOption {
+        description = "Settings";
+        type = types.submodule {
+          freeformType = format.type;
+
+          options = {
+            dns_listen_addr = mkOption {
+              type = types.str;
+              default = "0.0.0.0:53";
+              description = ''
+                Address for agnos to listen on.
+                Note that this needs to be reachable by the outside world,
+                and 53 is required in most situations
+                since `NS` records do not allow specifying the port.
+              '';
+            };
+
+            accounts = mkOption {
+              type = types.listOf accountType;
+              description = ''
+                A list of ACME accounts.
+                Each account is associated with an email address
+                and can be used to obtain an arbitrary amount of certificate
+                (subject to provider's rate limits,
+                see e.g. [Let's Encrypt Rate Limits](https://letsencrypt.org/docs/rate-limits/)).
+              '';
+            };
+          };
+        };
+      };
+
+      generateKeys = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Enable automatic generation of account keys.
+
+            When this is `true`, a key will be generated for each account where
+            the file referred to by the `private_key` path does not exist yet.
+
+            Currently, only RSA keys can be generated.
+          '';
+        };
+
+        keySize = mkOption {
+          type = types.int;
+          default = 4096;
+          description = ''
+            Key size in bits to use when generating new keys.
+          '';
+        };
+      };
+
+      server = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          ACME Directory Resource URI. Defaults to Let's Encrypt's production endpoint,
+          `https://acme-v02.api.letsencrypt.org/directory`, if unset.
+        '';
+      };
+
+      serverCa = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          The root certificate (in PEM format) of the ACME server's HTTPS interface.
+        '';
+      };
+
+      persistent = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          When `true`, use a persistent systemd timer.
+        '';
+      };
+
+      startAt = mkOption {
+        type = types.either types.str (types.listOf types.str);
+        default = "daily";
+        example = "02:00";
+        description = ''
+          How often or when to run agnos.
+
+          The format is described in
+          {manpage}`systemd.time(7)`.
+        '';
+      };
+
+      temporarilyOpenFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          When `true`, will open the port specified in `settings.dns_listen_addr`
+          before running the agnos service, and close it when agnos finishes running.
+        '';
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = name;
+        description = ''
+          Group to run Agnos as. The acquired certificates will be owned by this group.
+        '';
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = name;
+        description = ''
+          User to run Agnos as. The acquired certificates will be owned by this user.
+        '';
+      };
+    };
+
+  config =
+    let
+      configFile = format.generate "agnos.toml" cfg.settings;
+      port = lib.toInt (lib.last (builtins.split ":" cfg.settings.dns_listen_addr));
+
+      useNftables = config.networking.nftables.enable;
+
+      # nftables implementation for temporarilyOpenFirewall
+      nftablesSetup = pkgs.writeShellScript "agnos-fw-setup" ''
+        ${lib.getExe pkgs.nftables} add element inet nixos-fw temp-ports "{ tcp . ${toString port} }"
+        ${lib.getExe pkgs.nftables} add element inet nixos-fw temp-ports "{ udp . ${toString port} }"
+      '';
+      nftablesTeardown = pkgs.writeShellScript "agnos-fw-teardown" ''
+        ${lib.getExe pkgs.nftables} delete element inet nixos-fw temp-ports "{ tcp . ${toString port} }"
+        ${lib.getExe pkgs.nftables} delete element inet nixos-fw temp-ports "{ udp . ${toString port} }"
+      '';
+
+      # iptables implementation for temporarilyOpenFirewall
+      helpers = ''
+        function ip46tables() {
+          ${lib.getExe' pkgs.iptables "iptables"} -w "$@"
+          ${lib.getExe' pkgs.iptables "ip6tables"} -w "$@"
+        }
+      '';
+      fwFilter = ''--dport ${toString port} -j ACCEPT -m comment --comment "agnos"'';
+      iptablesSetup = pkgs.writeShellScript "agnos-fw-setup" ''
+        ${helpers}
+        ip46tables -I INPUT 1 -p tcp ${fwFilter}
+        ip46tables -I INPUT 1 -p udp ${fwFilter}
+      '';
+      iptablesTeardown = pkgs.writeShellScript "agnos-fw-setup" ''
+        ${helpers}
+        ip46tables -D INPUT -p tcp ${fwFilter}
+        ip46tables -D INPUT -p udp ${fwFilter}
+      '';
+    in
+    lib.mkIf cfg.enable {
+      assertions = [
+        {
+          assertion = !cfg.temporarilyOpenFirewall || config.networking.firewall.enable;
+          message = "temporarilyOpenFirewall is only useful when firewall is enabled";
+        }
+      ];
+
+      systemd.services.agnos = {
+        serviceConfig = {
+          ExecStartPre =
+            lib.optional cfg.generateKeys.enable ''
+              ${pkgs.agnos}/bin/agnos-generate-accounts-keys \
+                --no-confirm \
+                --key-size ${toString cfg.generateKeys.keySize} \
+                ${configFile}
+            ''
+            ++ lib.optional cfg.temporarilyOpenFirewall (
+              "+" + (if useNftables then nftablesSetup else iptablesSetup)
+            );
+          ExecStopPost = lib.optional cfg.temporarilyOpenFirewall (
+            "+" + (if useNftables then nftablesTeardown else iptablesTeardown)
+          );
+          ExecStart = ''
+            ${pkgs.agnos}/bin/agnos \
+              ${if cfg.server != null then "--acme-url=${cfg.server}" else "--no-staging"} \
+              ${lib.optionalString (cfg.serverCa != null) "--acme-serv-ca=${cfg.serverCa}"} \
+              ${configFile}
+          '';
+          Type = "oneshot";
+          User = cfg.user;
+          Group = cfg.group;
+          StateDirectory = name;
+          StateDirectoryMode = "0750";
+          WorkingDirectory = "${stateDir}";
+
+          # Allow binding privileged ports if necessary
+          CapabilityBoundingSet = lib.mkIf (port < 1024) [ "CAP_NET_BIND_SERVICE" ];
+          AmbientCapabilities = lib.mkIf (port < 1024) [ "CAP_NET_BIND_SERVICE" ];
+        };
+
+        after = [
+          "firewall.target"
+          "network-online.target"
+          "nftables.service"
+        ];
+        wants = [ "network-online.target" ];
+      };
+
+      systemd.timers.agnos = {
+        timerConfig = {
+          OnCalendar = cfg.startAt;
+          Persistent = cfg.persistent;
+          Unit = "agnos.service";
+        };
+        wantedBy = [ "timers.target" ];
+      };
+
+      users.groups = lib.mkIf (cfg.group == name) {
+        ${cfg.group} = { };
+      };
+
+      users.users = lib.mkIf (cfg.user == name) {
+        ${cfg.user} = {
+          isSystemUser = true;
+          description = "Agnos service user";
+          group = cfg.group;
+        };
+      };
+    };
+}
diff --git a/nixos/tests/agnos.nix b/nixos/tests/agnos.nix
new file mode 100644
index 000000000000..b73f1c021412
--- /dev/null
+++ b/nixos/tests/agnos.nix
@@ -0,0 +1,209 @@
+{
+  system ? builtins.currentSystem,
+  pkgs ? import ../.. { inherit system; },
+  lib ? pkgs.lib,
+}:
+
+let
+  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
+  nodeIP = n: n.networking.primaryIPAddress;
+  dnsZone =
+    nodes:
+    pkgs.writeText "agnos.test.zone" ''
+      $TTL    604800
+      @       IN      SOA     ns1.agnos.test. root.agnos.test. (
+                        3     ; Serial
+                   604800     ; Refresh
+                    86400     ; Retry
+                  2419200     ; Expire
+                   604800 )   ; Negative Cache TTL
+      ;
+      ; name servers - NS records
+           IN      NS      ns1.agnos.test.
+
+      ; name servers - A records
+      ns1.agnos.test.          IN      A      ${nodeIP nodes.dnsserver}
+
+      agnos-ns.agnos.test.        IN      A      ${nodeIP nodes.server}
+      _acme-challenge.a.agnos.test.   IN     NS      agnos-ns.agnos.test.
+      _acme-challenge.b.agnos.test.   IN     NS      agnos-ns.agnos.test.
+      _acme-challenge.c.agnos.test.   IN     NS      agnos-ns.agnos.test.
+      _acme-challenge.d.agnos.test.   IN     NS      agnos-ns.agnos.test.
+    '';
+
+  mkTest =
+    {
+      name,
+      extraServerConfig ? { },
+      checkFirewallClosed ? true,
+    }:
+    makeTest {
+      inherit name;
+      meta = {
+        maintainers = with lib.maintainers; [ justinas ];
+      };
+
+      nodes = {
+        # The fake ACME server which will respond to client requests
+        acme =
+          { nodes, pkgs, ... }:
+          {
+            imports = [ ./common/acme/server ];
+            environment.systemPackages = [ pkgs.netcat ];
+            networking.nameservers = lib.mkForce [ (nodeIP nodes.dnsserver) ];
+          };
+
+        # A fake DNS server which points _acme-challenge subdomains to "server"
+        dnsserver =
+          { nodes, ... }:
+          {
+            networking.firewall.allowedTCPPorts = [ 53 ];
+            networking.firewall.allowedUDPPorts = [ 53 ];
+            services.bind = {
+              cacheNetworks = [ "192.168.1.0/24" ];
+              enable = true;
+              extraOptions = ''
+                dnssec-validation no;
+              '';
+              zones."agnos.test" = {
+                file = dnsZone nodes;
+                master = true;
+              };
+            };
+          };
+
+        # The server using agnos to request certificates
+        server =
+          { nodes, ... }:
+          {
+            imports = [ extraServerConfig ];
+
+            networking.extraHosts = ''
+              ${nodeIP nodes.acme} acme.test
+            '';
+            security.agnos = {
+              enable = true;
+              generateKeys.enable = true;
+              persistent = false;
+              server = "https://acme.test/dir";
+              serverCa = ./common/acme/server/ca.cert.pem;
+              temporarilyOpenFirewall = true;
+
+              settings.accounts = [
+                {
+                  email = "webmaster@agnos.test";
+                  # account with an existing private key
+                  private_key_path = "${./common/acme/server/acme.test.key.pem}";
+
+                  certificates = [
+                    {
+                      domains = [ "a.agnos.test" ];
+                      # Absolute paths
+                      fullchain_output_file = "/tmp/a.agnos.test.crt";
+                      key_output_file = "/tmp/a.agnos.test.key";
+                    }
+
+                    {
+                      domains = [
+                        "b.agnos.test"
+                        "*.b.agnos.test"
+                      ];
+                      # Relative paths
+                      fullchain_output_file = "b.agnos.test.crt";
+                      key_output_file = "b.agnos.test.key";
+                    }
+                  ];
+                }
+
+                {
+                  email = "webmaster2@agnos.test";
+                  # account with a missing private key, should get generated
+                  private_key_path = "webmaster2.key";
+
+                  certificates = [
+                    {
+                      domains = [ "c.agnos.test" ];
+                      # Absolute paths
+                      fullchain_output_file = "/tmp/c.agnos.test.crt";
+                      key_output_file = "/tmp/c.agnos.test.key";
+                    }
+
+                    {
+                      domains = [
+                        "d.agnos.test"
+                        "*.d.agnos.test"
+                      ];
+                      # Relative paths
+                      fullchain_output_file = "d.agnos.test.crt";
+                      key_output_file = "d.agnos.test.key";
+                    }
+                  ];
+                }
+              ];
+            };
+          };
+      };
+
+      testScript = ''
+        def check_firewall_closed(caller):
+            """
+            Check that TCP port 53 is closed again.
+
+            Since we do not set `networking.firewall.rejectPackets`,
+            "timed out" indicates a closed port,
+            while "connection refused" (after agnos has shut down) indicates an open port.
+            """
+
+            out = caller.fail("nc -v -z -w 1 server 53 2>&1")
+            assert "Connection timed out" in out
+
+        start_all()
+        acme.wait_for_unit('pebble.service')
+        server.wait_for_unit('default.target')
+
+        # Test that agnos.timer is scheduled
+        server.succeed("systemctl status agnos.timer")
+        server.succeed('systemctl start agnos.service')
+
+        expected_perms = "640 agnos agnos"
+        outputs = [
+            "/tmp/a.agnos.test.crt",
+            "/tmp/a.agnos.test.key",
+            "/var/lib/agnos/b.agnos.test.crt",
+            "/var/lib/agnos/b.agnos.test.key",
+            "/var/lib/agnos/webmaster2.key",
+            "/tmp/c.agnos.test.crt",
+            "/tmp/c.agnos.test.key",
+            "/var/lib/agnos/d.agnos.test.crt",
+            "/var/lib/agnos/d.agnos.test.key",
+        ]
+        for o in outputs:
+            out = server.succeed(f"stat -c '%a %U %G' {o}").strip()
+            assert out == expected_perms, \
+              f"Expected mode/owner/group to be '{expected_perms}', but it was '{out}'"
+
+        ${lib.optionalString checkFirewallClosed "check_firewall_closed(acme)"}
+      '';
+    };
+in
+{
+  iptables = mkTest {
+    name = "iptables";
+  };
+
+  nftables = mkTest {
+    name = "nftables";
+    extraServerConfig = {
+      networking.nftables.enable = true;
+    };
+  };
+
+  no-firewall = mkTest {
+    name = "no-firewall";
+    extraServerConfig = {
+      networking.firewall.enable = lib.mkForce false;
+      security.agnos.temporarilyOpenFirewall = lib.mkForce false;
+    };
+    checkFirewallClosed = false;
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9770153b216a..8ec1a101313f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -177,6 +177,7 @@ in
   agate = runTest ./web-servers/agate.nix;
   agda = runTest ./agda.nix;
   age-plugin-tpm-decrypt = runTest ./age-plugin-tpm-decrypt.nix;
+  agnos = discoverTests (import ./agnos.nix);
   agorakit = runTest ./web-apps/agorakit.nix;
   airsonic = runTest ./airsonic.nix;
   akkoma = runTestOn [ "x86_64-linux" "aarch64-linux" ] {
diff --git a/pkgs/by-name/ag/agnos/package.nix b/pkgs/by-name/ag/agnos/package.nix
index 9b6bc6258b88..cc171a165971 100644
--- a/pkgs/by-name/ag/agnos/package.nix
+++ b/pkgs/by-name/ag/agnos/package.nix
@@ -28,4 +28,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [ justinas ];
   };
+
+  passthru.tests = nixosTests.agnos;
 }

From edd965ff7e0ebe38682bb67364232d7351a32115 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 17:22:54 +0000
Subject: [PATCH 164/489] python312Packages.libbs: 2.11.1 -> 2.11.3

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

diff --git a/pkgs/development/python-modules/libbs/default.nix b/pkgs/development/python-modules/libbs/default.nix
index 3fb3de5bd5f8..5b158ac41713 100644
--- a/pkgs/development/python-modules/libbs/default.nix
+++ b/pkgs/development/python-modules/libbs/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "libbs";
-  version = "2.11.1";
+  version = "2.11.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "binsync";
     repo = "libbs";
     tag = "v${version}";
-    hash = "sha256-hYRRmnxA6K7O6suaP1eGRnY89gok3JNNsL70XRGWYBU=";
+    hash = "sha256-Ztn4AYnDlHpUYsr8jMvzmQ4zlRpDVsL+J6F1ipLbwwI=";
   };
 
   build-system = [ setuptools ];

From 191fa2552f1d20ca24202773dd242ebc4d9c24c7 Mon Sep 17 00:00:00 2001
From: JB Gosselin <1536838+jbgosselin@users.noreply.github.com>
Date: Sun, 6 Apr 2025 13:31:36 -0400
Subject: [PATCH 165/489] python312Packages.okta: 2.9.10 -> 2.9.11

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

diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix
index 305b2d4e3f62..e748d6f6549f 100644
--- a/pkgs/development/python-modules/okta/default.nix
+++ b/pkgs/development/python-modules/okta/default.nix
@@ -25,18 +25,16 @@
 
 buildPythonPackage rec {
   pname = "okta";
-  version = "2.9.10";
+  version = "2.9.11";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hLdq5AlTaCZ9x/x5VL4Q673th2HnE7haAaOp5zOQdjQ=";
+    hash = "sha256-Ca+xjr1aqCX7MmEb7MXD63Dhib/8hggnudj32pjiTyw=";
   };
 
-  pythonRelaxDeps = [ "aenum" ];
-
   build-system = [ setuptools ];
 
   dependencies = [

From 13f9a63dde76e6a6605f79622af8a2513ec7684c Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Sun, 6 Apr 2025 11:15:50 -0700
Subject: [PATCH 166/489] mongodb-cli: add nix-update-script

---
 pkgs/by-name/mo/mongodb-cli/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/mo/mongodb-cli/package.nix b/pkgs/by-name/mo/mongodb-cli/package.nix
index 8d023508f77d..7de8eca4cdde 100644
--- a/pkgs/by-name/mo/mongodb-cli/package.nix
+++ b/pkgs/by-name/mo/mongodb-cli/package.nix
@@ -4,6 +4,7 @@
   lib,
   buildGoModule,
   installShellFiles,
+  nix-update-script,
 }:
 
 buildGoModule rec {
@@ -30,6 +31,8 @@ buildGoModule rec {
       --zsh <($out/bin/mongocli completion zsh)
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "MongoDB CLI enable you to manage your MongoDB via ops manager and cloud manager";
     homepage = "https://github.com/mongodb/mongodb-cli";

From 6b5f15a40662718766ffd678e7b4a54c3ec5a676 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 19:19:18 +0000
Subject: [PATCH 167/489] stylelint: 16.17.0 -> 16.18.0

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

diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix
index 1f595bdb0103..8cf61f05298c 100644
--- a/pkgs/by-name/st/stylelint/package.nix
+++ b/pkgs/by-name/st/stylelint/package.nix
@@ -5,16 +5,16 @@
 }:
 buildNpmPackage rec {
   pname = "stylelint";
-  version = "16.17.0";
+  version = "16.18.0";
 
   src = fetchFromGitHub {
     owner = "stylelint";
     repo = "stylelint";
     tag = version;
-    hash = "sha256-oCNgBS9yTOCrqI/35KWgim1cW62+91xwAMpWORUQVAQ=";
+    hash = "sha256-DtNZHxWmOwStUAYqfF37QoUpHjrDU1C7Tzmya4OCibc=";
   };
 
-  npmDepsHash = "sha256-JZT7PXbEd7jSx0WGPLh0GtUthkMfgHR17c451k515Rc=";
+  npmDepsHash = "sha256-h8ryKrh5A+PWMLcDFq7xC/NRmLUhsWqjsw4pIwtcy6g=";
 
   dontNpmBuild = true;
 

From c177fa68c0ef0610b6cb56d8e0d9b33095cdce0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 18:06:20 +0000
Subject: [PATCH 168/489] jmol: 16.3.11 -> 16.3.13

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

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index a00c8d806b5f..487403f40184 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -31,7 +31,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "16.3.11";
+  version = "16.3.13";
   pname = "jmol";
 
   src =
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     in
     fetchurl {
       url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-      hash = "sha256-sa2wYzLtk3rSghNxk/kJfaOIDPEJLfwKRRIXMRNBEuI=";
+      hash = "sha256-ehJZSMhUsE0iO3sDD5Q0UMfcjNmTgPzMNgWG5nIeBFo=";
     };
 
   patchPhase = ''

From 551247ead5058669f7007f21f6e57cdf0ee30ff9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 24 Mar 2025 04:24:40 +0000
Subject: [PATCH 169/489] lidarr: 2.9.6.4552 -> 2.10.3.4602

---
 pkgs/servers/lidarr/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix
index 0cd87d208c20..09f2fd414c53 100644
--- a/pkgs/servers/lidarr/default.nix
+++ b/pkgs/servers/lidarr/default.nix
@@ -26,15 +26,15 @@ let
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   hash =
     {
-      x64-linux_hash = "sha256-fgOe0xZMepec+DDi/6Kq1j5EVuw45Igvrvucdnklj1w=";
-      arm64-linux_hash = "sha256-Jhjwpwgo1vRluWTzpn0gd17uII3rw6OPV/+SW8TMolQ=";
-      x64-osx_hash = "sha256-htSMl+Y22YE2SnUOsx+2ZfRvWCeF4K9b+wVfDoxK4+M=";
+      x64-linux_hash = "sha256-PwHIUbXxk9VOKd+I7EcrTEYlikfw2NUdO6IQdiQWhWs=";
+      arm64-linux_hash = "sha256-uu7iVexyss29Q7mZ280KeDLZWp6wwCh+TJj9XeZc/lQ=";
+      x64-osx_hash = "sha256-POjIY2iPoYOQQci6AV/7X8t7GGbxVqROjlMzwERH/3c=";
     }
     ."${arch}-${os}_hash";
 in
 stdenv.mkDerivation rec {
   pname = "lidarr";
-  version = "2.9.6.4552";
+  version = "2.10.3.4602";
 
   src = fetchurl {
     url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz";

From 994274e7a5674b622bc4d034ab4f943a187b607f Mon Sep 17 00:00:00 2001
From: archer-65 <mario.liguori.056@gmail.com>
Date: Sun, 6 Apr 2025 21:01:46 +0200
Subject: [PATCH 170/489] emacs: allow specifying meta in sources

---
 pkgs/applications/editors/emacs/make-emacs.nix | 4 ++--
 pkgs/applications/editors/emacs/sources.nix    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index e203a5fd3506..bb64c30fccdc 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -538,10 +538,10 @@ mkDerivation (finalAttrs: {
     };
   };
 
-  meta = meta // {
+  meta = {
     broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
     knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [
       "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30"
     ];
-  };
+  } // meta;
 })
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 23ce17d40b89..6b5816604345 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -13,6 +13,7 @@ let
       patches ? _: [ ],
       rev,
       hash,
+      meta ? { },
     }:
     {
       inherit
@@ -97,7 +98,7 @@ let
           }
           .${variant};
         mainProgram = "emacs";
-      };
+      } // meta;
     };
 in
 {

From 86733544de4fa500480bf5c7207da8b8a689c058 Mon Sep 17 00:00:00 2001
From: archer-65 <mario.liguori.056@gmail.com>
Date: Sat, 5 Apr 2025 21:05:49 +0200
Subject: [PATCH 171/489] emacs-macport: 29.1 -> 29.4

Additional:
* Do not mark as vulnerable as CVE patches are applied
---
 pkgs/applications/editors/emacs/sources.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 6b5816604345..febe3288ff69 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -152,9 +152,24 @@ in
 
   emacs29-macport = import ./make-emacs.nix (mkArgs {
     pname = "emacs-mac";
-    version = "29.1";
+    version = "29.4";
     variant = "macport";
-    rev = "emacs-29.1-mac-10.0";
-    hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU=";
+    rev = "emacs-29.4-mac-10.1";
+    hash = "sha256-8OQ+fon9tclbh/eUJ09uqKfMaz9M77QnLIp2R8QB6Ic=";
+    patches = fetchpatch: [
+      # CVE-2024-53920
+      (fetchpatch {
+        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/07_all_trusted-content.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f";
+        hash = "sha256-zUWM2HDO5MHEB5fC5TCUxzmSafMvXO5usRzCyp9Q7P4=";
+      })
+
+      # CVE-2025-1244
+      (fetchpatch {
+        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/06_all_man.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f";
+        hash = "sha256-Vdf6GF5YmGoHTkxiD9mdYH0hgvfovZwrqYN1NQ++U1w=";
+      })
+    ];
+
+    meta.knownVulnerabilities = [ ];
   });
 }

From 5f3f3a755c9936782a4b24313ce4f8c8fe4b51d2 Mon Sep 17 00:00:00 2001
From: archer-65 <mario.liguori.056@gmail.com>
Date: Sun, 6 Apr 2025 21:09:55 +0200
Subject: [PATCH 172/489] emacs28-macport: remove

---
 pkgs/applications/editors/emacs/default.nix |  2 --
 pkgs/applications/editors/emacs/sources.nix | 29 ---------------------
 pkgs/top-level/aliases.nix                  |  1 +
 pkgs/top-level/all-packages.nix             |  1 -
 4 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 8640d64786b3..90189ee8b779 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -46,8 +46,6 @@ lib.makeScope pkgs.newScope (
       withPgtk = true;
     };
 
-    emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs;
-
     emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;
   }
 )
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 952d8e5aeab7..76785b7bbea8 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -121,35 +121,6 @@ in
     ];
   });
 
-  emacs28-macport = import ./make-emacs.nix (mkArgs {
-    pname = "emacs-mac";
-    version = "28.2";
-    variant = "macport";
-    rev = "emacs-28.2-mac-9.1";
-    hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
-    patches = fetchpatch: [
-      # CVE-2022-45939
-      (fetchpatch {
-        url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51";
-        hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs=";
-      })
-
-      # https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html
-      (fetchpatch {
-        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
-        hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs=";
-      })
-      (fetchpatch {
-        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
-        hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA=";
-      })
-      (fetchpatch {
-        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
-        hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek=";
-      })
-    ];
-  });
-
   emacs29-macport = import ./make-emacs.nix (mkArgs {
     pname = "emacs-mac";
     version = "29.1";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3c2334ce3ddf..adea31864fb6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -545,6 +545,7 @@ mapAliases {
   emacs28 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
   emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20
   emacs28-gtk3 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
+  emacs28-macport = throw "Emacs 28 Macport is removed due to CVEs which are fixed in Emacs 30 and backported to Emacs 29 Macport"; # Added 2025-04-06
   emacs28-nox = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
   emacs28NativeComp = emacs28; # Added 2022-06-08
   emacs28Packages = throw "'emacs28Packages' has been renamed to/replaced by 'emacs28.pkgs'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df389f32233d..2e581c210e2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14182,7 +14182,6 @@ with pkgs;
     emacs30-nox
     emacs30-pgtk
 
-    emacs28-macport
     emacs29-macport
     ;
 

From 2472eda1188fd235935d543c6c6158ea5c13f5da Mon Sep 17 00:00:00 2001
From: archer-65 <mario.liguori.056@gmail.com>
Date: Sun, 6 Apr 2025 22:16:39 +0200
Subject: [PATCH 173/489] doc/rl-2505: mention Emacs 29 Macport patches and
 Emacs 28 Macport removal

---
 doc/release-notes/rl-2505.section.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 6a6a797269c6..a44349118a34 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -273,6 +273,7 @@
 - `docker_24` has been removed, as it was EOL with vulnerabilities since June 08, 2024.
 
 - Emacs 28 and 29 have been removed.
+- Emacs 28 Macport has been removed, while CVEs of Emacs 29 Macport are patched.
 
 - `containerd` has been updated to v2, which contains breaking changes. See the [containerd
   2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more

From 37d010691541ed3f32bf55fbdaeb47289d79b2a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 21:36:46 +0000
Subject: [PATCH 174/489] python312Packages.pytubefix: 8.12.2 -> 8.12.3

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

diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix
index 9986c26c4902..fdcc302faaa0 100644
--- a/pkgs/development/python-modules/pytubefix/default.nix
+++ b/pkgs/development/python-modules/pytubefix/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pytubefix";
-  version = "8.12.2";
+  version = "8.12.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JuanBindez";
     repo = "pytubefix";
     tag = "v${version}";
-    hash = "sha256-1m7d1eLnoIDrja83sGKBh/u8ryZuw6lb1FEO+XNc03M=";
+    hash = "sha256-DhzeEYdI/hrx6Stq77aOBJsl5AEtZO4ssbthmW4u/sE=";
   };
 
   build-system = [ setuptools ];

From 8136ba02df57ceda4209c4b5e990c11b0faee706 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 22:14:52 +0000
Subject: [PATCH 175/489] laravel: 5.14.1 -> 5.14.2

---
 pkgs/by-name/la/laravel/composer.lock | 86 +++++++++++++--------------
 pkgs/by-name/la/laravel/package.nix   |  6 +-
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock
index ed290491877c..aa9d0843fabc 100644
--- a/pkgs/by-name/la/laravel/composer.lock
+++ b/pkgs/by-name/la/laravel/composer.lock
@@ -168,16 +168,16 @@
         },
         {
             "name": "illuminate/collections",
-            "version": "v12.3.0",
+            "version": "v12.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/collections.git",
-                "reference": "0094b162fa505126c1391222f27fd98734d24525"
+                "reference": "f1d8ae882c014673b1f7bedab6435989553776e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/collections/zipball/0094b162fa505126c1391222f27fd98734d24525",
-                "reference": "0094b162fa505126c1391222f27fd98734d24525",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/f1d8ae882c014673b1f7bedab6435989553776e3",
+                "reference": "f1d8ae882c014673b1f7bedab6435989553776e3",
                 "shasum": ""
             },
             "require": {
@@ -220,20 +220,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-03-16T23:50:18+00:00"
+            "time": "2025-04-03T17:58:47+00:00"
         },
         {
             "name": "illuminate/conditionable",
-            "version": "v12.3.0",
+            "version": "v12.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/conditionable.git",
-                "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d"
+                "reference": "251ef166c6ee46cc8a141403253f83fe7ee50507"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/conditionable/zipball/a2b3c66f3ca532e12e694bd5c9254adc303b922d",
-                "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d",
+                "url": "https://api.github.com/repos/illuminate/conditionable/zipball/251ef166c6ee46cc8a141403253f83fe7ee50507",
+                "reference": "251ef166c6ee46cc8a141403253f83fe7ee50507",
                 "shasum": ""
             },
             "require": {
@@ -266,20 +266,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-02-19T19:08:33+00:00"
+            "time": "2025-03-19T20:10:05+00:00"
         },
         {
             "name": "illuminate/contracts",
-            "version": "v12.3.0",
+            "version": "v12.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
-                "reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6"
+                "reference": "bbaec083da240396f2186f4c3a9952da207f28a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/88962e0a73fb837e048ebdbbc67afd2f6b30e8e6",
-                "reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/bbaec083da240396f2186f4c3a9952da207f28a0",
+                "reference": "bbaec083da240396f2186f4c3a9952da207f28a0",
                 "shasum": ""
             },
             "require": {
@@ -314,20 +314,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-03-16T23:56:53+00:00"
+            "time": "2025-03-19T20:10:05+00:00"
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v12.3.0",
+            "version": "v12.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857"
+                "reference": "4fa2995bad173c1a0067b285bb7fef47a4b441c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/e59cfec3c16d71be2da85cf9385ddd82f0c15857",
-                "reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/4fa2995bad173c1a0067b285bb7fef47a4b441c6",
+                "reference": "4fa2995bad173c1a0067b285bb7fef47a4b441c6",
                 "shasum": ""
             },
             "require": {
@@ -381,11 +381,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-03-12T14:22:47+00:00"
+            "time": "2025-03-19T20:10:05+00:00"
         },
         {
             "name": "illuminate/macroable",
-            "version": "v12.3.0",
+            "version": "v12.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/macroable.git",
@@ -431,16 +431,16 @@
         },
         {
             "name": "illuminate/support",
-            "version": "v12.3.0",
+            "version": "v12.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57"
+                "reference": "1d5d07534bb2d9f16e655c2cb99607517ad43e8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/bcba98dcdbc758261b3b872a9b9dc789aed1eb57",
-                "reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/1d5d07534bb2d9f16e655c2cb99607517ad43e8f",
+                "reference": "1d5d07534bb2d9f16e655c2cb99607517ad43e8f",
                 "shasum": ""
             },
             "require": {
@@ -504,7 +504,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-03-13T14:51:35+00:00"
+            "time": "2025-04-02T19:35:42+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -567,16 +567,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.8.6",
+            "version": "3.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd"
+                "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ff2f20cf83bd4d503720632ce8a426dc747bf7fd",
-                "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/6d16a8a015166fe54e22c042e0805c5363aef50d",
+                "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d",
                 "shasum": ""
             },
             "require": {
@@ -669,7 +669,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-20T17:33:38+00:00"
+            "time": "2025-03-27T12:57:33+00:00"
         },
         {
             "name": "psr/clock",
@@ -899,16 +899,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.2.1",
+            "version": "v7.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
+                "reference": "e51498ea18570c062e7df29d05a7003585b19b88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
-                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+                "url": "https://api.github.com/repos/symfony/console/zipball/e51498ea18570c062e7df29d05a7003585b19b88",
+                "reference": "e51498ea18570c062e7df29d05a7003585b19b88",
                 "shasum": ""
             },
             "require": {
@@ -972,7 +972,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.2.1"
+                "source": "https://github.com/symfony/console/tree/v7.2.5"
             },
             "funding": [
                 {
@@ -988,7 +988,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-11T03:49:26+00:00"
+            "time": "2025-03-12T08:11:12+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1517,16 +1517,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.2.4",
+            "version": "v7.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf"
+                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
-                "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
+                "url": "https://api.github.com/repos/symfony/process/zipball/87b7c93e57df9d8e39a093d32587702380ff045d",
+                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d",
                 "shasum": ""
             },
             "require": {
@@ -1558,7 +1558,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.2.4"
+                "source": "https://github.com/symfony/process/tree/v7.2.5"
             },
             "funding": [
                 {
@@ -1574,7 +1574,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-05T08:33:46+00:00"
+            "time": "2025-03-13T12:21:46+00:00"
         },
         {
             "name": "symfony/service-contracts",
diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix
index 1608936e9aa1..4e673700be57 100644
--- a/pkgs/by-name/la/laravel/package.nix
+++ b/pkgs/by-name/la/laravel/package.nix
@@ -7,19 +7,19 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "laravel";
-  version = "5.14.1";
+  version = "5.14.2";
 
   src = fetchFromGitHub {
     owner = "laravel";
     repo = "installer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3DgiOybYN9G8BONK7kmyO21B5WqeY7DcHunWcT6h124=";
+    hash = "sha256-A/uyYi2CAlj8ozX65frCM32kNM2kZ/FpV1ZHr6UXWWY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-6oPbR6cpsdr2aJWjJvLWVD1NfuZF38sUMJEdBAjl/aA=";
+  vendorHash = "sha256-yj0AfN+jCDMtuAQ69yEyI+dGTHgeRNGj86YnvKVKkqQ=";
 
   # Adding npm (nodejs) and php composer to path
   postInstall = ''

From 13496afdd99d29849c4063c3225ed7af878295f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 22:34:08 +0000
Subject: [PATCH 176/489] powerpipe: 1.2.2 -> 1.2.4

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

diff --git a/pkgs/by-name/po/powerpipe/package.nix b/pkgs/by-name/po/powerpipe/package.nix
index c7a06dacbfed..1834b3973282 100644
--- a/pkgs/by-name/po/powerpipe/package.nix
+++ b/pkgs/by-name/po/powerpipe/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "powerpipe";
-  version = "1.2.2";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "powerpipe";
     tag = "v${version}";
-    hash = "sha256-kOC2eS13OzyKGgaQj7BtLxzzjGqncTEFB7HaHPuedUE=";
+    hash = "sha256-nYlhB6EeT98FF/FuYsJXgGfe7+naKwhTmOPy1lX90XQ=";
   };
 
-  vendorHash = "sha256-fSMIsMefRWTX02/S9wCxbqQXN76qYQibU1Xq012HiXs=";
+  vendorHash = "sha256-5+IapEYAL4p5jhGhqNw00s42e3dE0cXRDVawq8Fqb08=";
   proxyVendor = true;
 
   nativeBuildInputs = [

From c82b32e6ddbdfdd05bc422fbce1be2a6e9c557a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 22:35:31 +0000
Subject: [PATCH 177/489] python312Packages.x-transformers: 2.1.37 -> 2.2.7

---
 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 79d565e1df9f..997c1dc33472 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.1.37";
+  version = "2.2.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lucidrains";
     repo = "x-transformers";
     tag = version;
-    hash = "sha256-Bykx/A7qmS6RraRfDYNufbRsOnESp8DQRltQVwT0tAY=";
+    hash = "sha256-rrPwOTE+dK7g7p7DHTffhVZbcTSk7YvnYeCqR6zQeXA=";
   };
 
   build-system = [ hatchling ];

From 9e64a2fd9b936055d84d4e5a0ed596876a0ea429 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 23:31:33 +0000
Subject: [PATCH 178/489] terraform-providers.oci: 6.31.0 -> 6.32.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0b878b7d28c0..f804d54d57cc 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -913,11 +913,11 @@
     "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
   },
   "oci": {
-    "hash": "sha256-/tgZFUzJqBNTxJzmhcs9YyB55DNwC3oFr9nVyHsFGW4=",
+    "hash": "sha256-UG2dXoHHH7sWma4+Zlvtj2aHwcvJPKgTxJFZDxqzKyc=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v6.31.0",
+    "rev": "v6.32.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 8fca4d1f7a67533af24ab8c14f50ac0beb9e879d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 00:16:22 +0000
Subject: [PATCH 179/489] stalwart-mail-webadmin: 0.1.24 -> 0.1.25

---
 pkgs/by-name/st/stalwart-mail/webadmin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix
index 53c44fa5d017..5ed67c2b45c2 100644
--- a/pkgs/by-name/st/stalwart-mail/webadmin.nix
+++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix
@@ -16,13 +16,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "webadmin";
-  version = "0.1.24";
+  version = "0.1.25";
 
   src = fetchFromGitHub {
     owner = "stalwartlabs";
     repo = "webadmin";
     tag = "v${version}";
-    hash = "sha256-KtCSP7PP1LBTcP1LFdEmom/4G8or87oA6ml6MXOhATk=";
+    hash = "sha256-Hv7FojY/SZgbzS8XGVj0uRfynZCZPEbPiSHRuBtt/Jc=";
   };
 
   npmDeps = fetchNpmDeps {
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-VXbFQLMtqypQlisirKhlfu9PYgmEryJx85GRqlRslNY=";
+  cargoHash = "sha256-/BoGeAF4GbM8ddWCnxAueJQYgQZvAL0pQ0pDUW0mXI0=";
 
   postPatch = ''
     # Using local tailwindcss for compilation

From cbef4f28aa92fa31f1b830c76e180ba1d971cbb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 7 Apr 2025 02:06:14 +0200
Subject: [PATCH 180/489] pdftk: use minimal jre

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

diff --git a/pkgs/by-name/pd/pdftk/package.nix b/pkgs/by-name/pd/pdftk/package.nix
index 025652d69b87..d21f0b2d3117 100644
--- a/pkgs/by-name/pd/pdftk/package.nix
+++ b/pkgs/by-name/pd/pdftk/package.nix
@@ -3,12 +3,20 @@
   stdenv,
   fetchFromGitLab,
   gradle_8,
-  jre,
+  jre_headless,
+  jre_minimal,
   runtimeShell,
 }:
 let
   # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
   gradle = gradle_8;
+
+  jre = jre_minimal.override {
+    modules = [
+      "java.base"
+    ];
+    jdk = jre_headless;
+  };
 in
 stdenv.mkDerivation rec {
   pname = "pdftk";

From 1f67f0f1c99f4aec5a25665799d6d5deffe1a805 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 6 Apr 2025 17:40:22 -0700
Subject: [PATCH 181/489] nixos/tests/mattermost: disable MySQL tests on
 aarch64

There seems to be some intermittent issue initializing the database on
aarch64. Still test Postgres since it is the default.
---
 nixos/tests/mattermost/default.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix
index 47efc213383d..bfbbf40b3d8d 100644
--- a/nixos/tests/mattermost/default.nix
+++ b/nixos/tests/mattermost/default.nix
@@ -557,18 +557,21 @@ import ../make-test-python.nix (
             shutdown_queue.task_done()
         threading.Thread(target=shutdown_worker, daemon=True).start()
 
-        run_mattermost_tests(
-          shutdown_queue,
-          "${nodes.mysqlMutable.system.build.toplevel}",
-          mysqlMutable,
-          "${nodes.mysqlMostlyMutable.system.build.toplevel}",
-          "${nodes.mysqlMostlyMutable.services.mattermost.pluginsBundle}",
-          mysqlMostlyMutable,
-          "${nodes.mysqlImmutable.system.build.toplevel}",
-          mysqlImmutable,
-          "${nodes.mysqlEnvironmentFile.system.build.toplevel}",
-          mysqlEnvironmentFile
-        )
+        ${pkgs.lib.optionalString pkgs.stdenv.isx86_64 ''
+          # Only run the MySQL tests on x86_64 so we don't have to debug MySQL ARM issues.
+          run_mattermost_tests(
+            shutdown_queue,
+            "${nodes.mysqlMutable.system.build.toplevel}",
+            mysqlMutable,
+            "${nodes.mysqlMostlyMutable.system.build.toplevel}",
+            "${nodes.mysqlMostlyMutable.services.mattermost.pluginsBundle}",
+            mysqlMostlyMutable,
+            "${nodes.mysqlImmutable.system.build.toplevel}",
+            mysqlImmutable,
+            "${nodes.mysqlEnvironmentFile.system.build.toplevel}",
+            mysqlEnvironmentFile
+          )
+        ''}
 
         run_mattermost_tests(
           shutdown_queue,

From 7e1b06860eeea6d48ec49b370cb836f49a6a4d33 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 6 Apr 2025 17:41:31 -0700
Subject: [PATCH 182/489] mattermost: build without long test suite by default

It was good for the unstable cycle to sort things out, switch it for
25.05 release since it's still in the passthru.
---
 pkgs/by-name/ma/mattermost/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index d6624fde408d..5ab3025bf425 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -80,7 +80,7 @@ let
           tests.mattermostWithTests = withTests;
         };
     in
-    finalPassthru.withTests;
+    finalPassthru.withoutTests;
 in
 buildMattermost rec {
   pname = "mattermost";

From 423caa2d1363dbc57a01f9b9a80924e0d421fbb4 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 6 Apr 2025 18:00:12 -0700
Subject: [PATCH 183/489] mattermost: 9.11.11 -> 10.5.2

---
 nixos/doc/manual/release-notes/rl-2505.section.md |  1 +
 pkgs/by-name/ma/mattermost/package.nix            | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 1950f41ef455..dc923ff16dfa 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -22,6 +22,7 @@
 - The Mattermost module ({option}`services.mattermost`) and packages (`mattermost` and `mmctl`) have been substantially updated:
   - {option}`services.mattermost.preferNixConfig` now defaults to true if you advance {option}`system.stateVersion` to 25.05. This means that if you have {option}`services.mattermost.mutableConfig` set, NixOS will override your settings to those that you define in the module. It is recommended to leave this at the default, even if you used a mutable config before, because it will ensure that your Mattermost data directories are correct. If you moved your data directories, you may want to review the module changes before upgrading.
   - Mattermost telemetry reporting is now disabled by default, though security update notifications are enabled. Look at {option}`services.mattermost.telemetry` for options to control this behavior.
+  - `pkgs.mattermost` has been updated from 9.11 to 10.5 to track the latest extended support release, since 9.11 will become end-of-life during the lifetime of NixOS 25.05.
   - `pkgs.mattermostLatest` is now an option to track the latest (non-prerelease) Mattermost release. We test upgrade migrations from ESR releases (`pkgs.mattermost`) to `pkgs.mattermostLatest`.
   - The Mattermost frontend is now built from source and can be overridden.
     - Note that the Mattermost derivation containing both the webapp and server is now wrapped to allow them to be built independently, so overrides to both webapp and server look like `mattermost.overrideAttrs (prev: { webapp = prev.webapp.override { ... }; server = prev.server.override { ... }; })` now.
diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index 5ab3025bf425..408848d22ca8 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -18,11 +18,14 @@
     # the version regex here as well.
     #
     # Ensure you also check ../mattermostLatest/package.nix.
-    regex = "^v(9\\.11\\.[0-9]+)$";
-    version = "9.11.11";
-    srcHash = "sha256-ugFGb85Oolg9pXeNi2JFKWQ4eebmdr/O3xIGbKGFSvQ=";
-    vendorHash = "sha256-h/hcdVImU3wFp7BGHS/TxYBEWGv9v06y8etaz9OrHTA=";
-    npmDepsHash = "sha256-Kk0Bbx/Rs5xpwSpgpm9BSMMEMKmO6kgKgyv/oDIAZ7w=";
+    regex = "^v(10\\.5\\.[0-9]+)$";
+    version = "10.5.2";
+    srcHash = "sha256-wC8tkplOntZpucCe2QPmnlrecwcqkzyEiTni8lO0p1I=";
+    vendorHash = "sha256-7jghoXFKA+WZ/ywOT0wWDMTfqAcBqp5gswOvpB7weL0=";
+    npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
+    lockfileOverlay = ''
+      unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
+    '';
   },
 }:
 

From da2c8afbf95bbd569ec95e4ddc6aab4c1957123a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 01:13:25 +0000
Subject: [PATCH 184/489] gtk-layer-shell: 0.9.0 -> 0.9.1

---
 pkgs/by-name/gt/gtk-layer-shell/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gt/gtk-layer-shell/package.nix b/pkgs/by-name/gt/gtk-layer-shell/package.nix
index 079f525bd712..195c4a56f236 100644
--- a/pkgs/by-name/gt/gtk-layer-shell/package.nix
+++ b/pkgs/by-name/gt/gtk-layer-shell/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk-layer-shell";
-  version = "0.9.0";
+  version = "0.9.1";
 
   outputs = [
     "out"
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "wmww";
     repo = "gtk-layer-shell";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9hQE1NY5QCuj+5R5aSjJ0DaMUQuO7HPpZooj+1+96RY=";
+    hash = "sha256-TObAo/YgS6ObYrNLitxMwneGzLxwnnBIOhBVAeAzbt4=";
   };
 
   strictDeps = true;

From 48d1a65f67cc059faae193ae1cabe5208838f43d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 01:15:39 +0000
Subject: [PATCH 185/489] havn: 0.2.0 -> 0.2.1

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

diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix
index e7b26d6214b1..704a7415e350 100644
--- a/pkgs/by-name/ha/havn/package.nix
+++ b/pkgs/by-name/ha/havn/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "havn";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "mrjackwills";
     repo = "havn";
     tag = "v${version}";
-    hash = "sha256-zZiBVuA6rjsCfn0Ih3Sum0VsmtyXbfPG9fwK2zkwJaA=";
+    hash = "sha256-SXsCJzKfm77/IH3H7L5STylusmlN9DN4xd12Vt6L3TM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-j84DF6LJ9q56u4QgMFk9c6089Ghk5K0EatvonGjImjU=";
+  cargoHash = "sha256-SwqajiyYrN0VTGtQo9+Tux8sBvEmWzOQQknQ9zTQ0hY=";
 
   checkFlags = [
     # Skip tests that require network access

From a03de75b00579c8a2039ff4b0fc8d017222db258 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 01:23:05 +0000
Subject: [PATCH 186/489] swego: 1.13 -> 1.14

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

diff --git a/pkgs/by-name/sw/swego/package.nix b/pkgs/by-name/sw/swego/package.nix
index 71e814cfb5a7..0d7b69bdf048 100644
--- a/pkgs/by-name/sw/swego/package.nix
+++ b/pkgs/by-name/sw/swego/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "swego";
-  version = "1.13";
+  version = "1.14";
 
   src = fetchFromGitHub {
     owner = "nodauf";
     repo = "Swego";
     tag = "v${version}";
-    hash = "sha256-JILdtmTdDZzcjsDfH0rZo4HpTp26EPP8WKPbHhQeNN8=";
+    hash = "sha256-28PU7jAVnWfRbFmTE2pmwJO1Zi+ceyFrzY5MiRt+91Y=";
   };
 
   vendorHash = "sha256-w2OhZq7vaVDVoRfnWPH0bFO85yGTFcO6KpDo5ulTifo=";

From 510482fff0157cf362aed7e2b5a7d4bfc429f030 Mon Sep 17 00:00:00 2001
From: hucancode <hucancode@gmail.com>
Date: Mon, 7 Apr 2025 10:39:32 +0900
Subject: [PATCH 187/489] c3c: 0.6.6 -> 0.7.0

---
 maintainers/maintainer-list.nix |  6 +++++
 pkgs/by-name/c3/c3c/package.nix | 39 +++++++++++++++++++++++++--------
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe8b6b20dd04..6e37f6d4c895 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9896,6 +9896,12 @@
     github = "the-furry-hubofeverything";
     githubId = 53921912;
   };
+  hucancode = {
+    email = "hucancode@gmail.com";
+    github = "hucancode";
+    githubId = 15852849;
+    name = "Bang Nguyen Huu";
+  };
   hufman = {
     email = "hufman@gmail.com";
     github = "hufman";
diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix
index 5cae5d2671c4..75dc31527bd7 100644
--- a/pkgs/by-name/c3/c3c/package.nix
+++ b/pkgs/by-name/c3/c3c/package.nix
@@ -9,29 +9,43 @@
   libffi,
   xar,
   versionCheckHook,
+  rev ? "unknown",
+  debug ? false,
+  checks ? true,
 }:
-
+let
+  inherit (lib.strings) optionalString;
+in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
-  pname = "c3c";
-  version = "0.6.6";
+
+  pname = "c3c${optionalString debug "-debug"}";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "c3lang";
     repo = "c3c";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+rNj1SmiBYBw3Ncx2uS8X5OA/qDvJ8SFpZOQVRCgvmM=";
+    hash = "sha256-SCUMyc8Gf7TAOXRppooNiyfbM84CUoIvokgvNgODqw8=";
   };
 
+  cmakeBuildType = if debug then "Debug" else "Release";
+
   postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "\''${LLVM_LIBRARY_DIRS}" "${llvmPackages.lld.lib}/lib ${llvmPackages.llvm.lib}/lib"
+    substituteInPlace git_hash.cmake \
+      --replace-fail "\''${GIT_HASH}" "${rev}"
   '';
 
   nativeBuildInputs = [ cmake ];
+  cmakeFlags = [
+    "-DC3_ENABLE_CLANGD_LSP=${if debug then "ON" else "OFF"}"
+    "-DC3_LLD_DIR=${llvmPackages.lld.lib}/lib"
+    "-DLLVM_CRT_LIBRARY_DIR=${llvmPackages.compiler-rt}/lib/darwin"
+  ];
 
   buildInputs = [
     llvmPackages.llvm
     llvmPackages.lld
+    llvmPackages.compiler-rt
     curl
     libxml2
     libffi
@@ -39,12 +53,18 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   nativeCheckInputs = [ python3 ];
 
-  doCheck = llvmPackages.stdenv.system == "x86_64-linux";
+  doCheck =
+    lib.elem llvmPackages.stdenv.system [
+      "x86_64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ]
+    && checks;
 
   checkPhase = ''
     runHook preCheck
-    ( cd ../resources/testproject; ../../build/c3c build )
-    ( cd ../test; python src/tester.py ../build/c3c test_suite )
+    ( cd ../resources/testproject; ../../build/c3c build --trust=full )
+    ( cd ../test; ../build/c3c compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c test_suite )
     runHook postCheck
   '';
 
@@ -56,6 +76,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/c3lang/c3c";
     license = licenses.lgpl3Only;
     maintainers = with maintainers; [
+      hucancode
       anas
     ];
     platforms = platforms.all;

From 9c28fbb29910ad78894e3c32fcdb8037810eea7c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 02:02:19 +0000
Subject: [PATCH 188/489] terraform-providers.azurerm: 4.24.0 -> 4.26.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0b878b7d28c0..75b7ab9b76f7 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -135,11 +135,11 @@
     "vendorHash": null
   },
   "azurerm": {
-    "hash": "sha256-wM/oWLOAB6EhtUVTP+gHn+hpqhrISAsd31ili2hmLyQ=",
+    "hash": "sha256-pbXkGKym7amioTZlguwBpoFvfvYnCGOxZ7PIT8I3dxY=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.24.0",
+    "rev": "v4.26.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From fbf130008fffb8b6fd232a9dd019e85de16dd5f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 02:17:06 +0000
Subject: [PATCH 189/489] veryfasttree: 4.0.4 -> 4.0.5

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

diff --git a/pkgs/by-name/ve/veryfasttree/package.nix b/pkgs/by-name/ve/veryfasttree/package.nix
index 3f493f01dcbb..89487a913eae 100644
--- a/pkgs/by-name/ve/veryfasttree/package.nix
+++ b/pkgs/by-name/ve/veryfasttree/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "veryfasttree";
-  version = "4.0.4";
+  version = "4.0.5";
 
   src = fetchFromGitHub {
     owner = "citiususc";
     repo = "veryfasttree";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-S4FW91VEdTPOIwRamz62arLSN9inxoKXpKsen2ISXMo=";
+    hash = "sha256-xoz2mK72gvNRpA4kGInAb3WHa/D8HvXprUQiJClLwh8=";
   };
 
   nativeBuildInputs = [ cmake ];

From f0dfb185c53221e16e1531196d22d1d4474b2f57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 02:40:27 +0000
Subject: [PATCH 190/489] python312Packages.pixel-font-knife: 0.0.11 -> 0.0.12

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

diff --git a/pkgs/development/python-modules/pixel-font-knife/default.nix b/pkgs/development/python-modules/pixel-font-knife/default.nix
index c8ca0cbd2c07..6f3a81554113 100644
--- a/pkgs/development/python-modules/pixel-font-knife/default.nix
+++ b/pkgs/development/python-modules/pixel-font-knife/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pixel-font-knife";
-  version = "0.0.11";
+  version = "0.0.12";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pixel_font_knife";
     inherit version;
-    hash = "sha256-tm5cAaeUBL9vbdvq73N2HCytlwYe0Q2Tovo+6XU59GQ=";
+    hash = "sha256-raVWoMRHmaVaxAzxo+k1r3ldqSOBMbMvcEyuWHq7AaM=";
   };
 
   build-system = [ hatchling ];

From ff10684d241ab4bc07b46f86a48fb33132014b01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 03:10:06 +0000
Subject: [PATCH 191/489] python312Packages.clickhouse-connect: 0.8.14 ->
 0.8.16

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

diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix
index 3cddd564499d..d049b05bf594 100644
--- a/pkgs/development/python-modules/clickhouse-connect/default.nix
+++ b/pkgs/development/python-modules/clickhouse-connect/default.nix
@@ -24,7 +24,7 @@
 }:
 buildPythonPackage rec {
   pname = "clickhouse-connect";
-  version = "0.8.14";
+  version = "0.8.16";
 
   format = "setuptools";
 
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     repo = "clickhouse-connect";
     owner = "ClickHouse";
     tag = "v${version}";
-    hash = "sha256-srUNIjoov2kIzfvFkyyktKjn5UNfxS5aqRlmgeJvljw=";
+    hash = "sha256-qPlxgBWISd3hb2L5fgFDo1fREJ3DRgQeayzv9EkIVY0=";
   };
 
   nativeBuildInputs = [ cython ];

From a0a9d1e0268d63a7f45ac2b558e1829ef2cc0931 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 03:56:23 +0000
Subject: [PATCH 192/489] louvre: 2.16.0-1 -> 2.16.2-1

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

diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix
index 561fb1af2ed6..2a874f42a756 100644
--- a/pkgs/by-name/lo/louvre/package.nix
+++ b/pkgs/by-name/lo/louvre/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "louvre";
-  version = "2.16.0-1";
+  version = "2.16.2-1";
 
   src = fetchFromGitHub {
     owner = "CuarzoSoftware";
     repo = "Louvre";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zw/n/Q1wwTiwhk6Q3xrMl2pEFBAk/BqSa/p0LTDbGBA=";
+    hash = "sha256-E6g9BqP8KniCBfYC1xOMqLA5RiAacsslgWAkvTop3CA=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";

From 2a299827f83f25bbcbee324f2f560e98d541a5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 6 Apr 2025 21:02:38 -0700
Subject: [PATCH 193/489] python313Packages.img2pdf: fix test with exiftool
 13.25

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

diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix
index f2a30d00d3e8..b161d18f8956 100644
--- a/pkgs/development/python-modules/img2pdf/default.nix
+++ b/pkgs/development/python-modules/img2pdf/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitea,
+  fetchpatch,
   replaceVars,
   colord,
   setuptools,
@@ -34,6 +35,11 @@ buildPythonPackage rec {
   };
 
   patches = [
+    (fetchpatch {
+      name = "exiftool-13.23-compat.patch";
+      url = "https://gitlab.mister-muffin.de/josch/img2pdf/commit/59132f20f8a40f6ed4e5cd2a3719bf55473ba4d7.patch";
+      hash = "sha256-A36YSZ6kBFzEa2lSKIVHRg9r6Oi8FGkOnmt2YxlkwWw=";
+    })
     (replaceVars ./default-icc-profile.patch {
       srgbProfile =
         if stdenv.hostPlatform.isDarwin then

From 4d5e27fbdf3d6bac600ccd6842960d5fd937a08b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 04:20:17 +0000
Subject: [PATCH 194/489] libmaddy-markdown: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/by-name/li/libmaddy-markdown/package.nix b/pkgs/by-name/li/libmaddy-markdown/package.nix
index 98a9ee3cff59..0905289e695c 100644
--- a/pkgs/by-name/li/libmaddy-markdown/package.nix
+++ b/pkgs/by-name/li/libmaddy-markdown/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "libmaddy-markdown";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "progsource";
     repo = "maddy";
     tag = finalAttrs.version;
-    hash = "sha256-sVUXACT94PSPcohnOyIp7KK8baCBuf6ZNMIyk6Cfdjg=";
+    hash = "sha256-cc0RggNYn0wZpeCn5QU9C+sqv7CTJkiQVB3LSQ/3YQw=";
   };
 
   dontBuild = true;

From 9087b69cf51cdce16da4cd7af89b14d06736ba22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 05:49:06 +0000
Subject: [PATCH 195/489] nano: 8.3 -> 8.4

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

diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix
index 895c538bc67a..a421c33c44d7 100644
--- a/pkgs/by-name/na/nano/package.nix
+++ b/pkgs/by-name/na/nano/package.nix
@@ -31,11 +31,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nano";
-  version = "8.3";
+  version = "8.4";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    hash = "sha256-VRtxey4o9+kPdJMjaGobW7vYTPoTkGBNhUo8o3ePER4=";
+    hash = "sha256-WtKSIrvVViTYfqZ3kosxBqdDEU1sb5tB82yXviqOYo0=";
   };
 
   nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext;

From 3c3e4390db62fe26ed249eb17e6c614c43f0539a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 07:10:29 +0000
Subject: [PATCH 196/489] nitter: 0-unstable-2025-02-25 ->
 0-unstable-2025-04-05

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

diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix
index 6865383baa78..bdd7d3293f82 100644
--- a/pkgs/by-name/ni/nitter/package.nix
+++ b/pkgs/by-name/ni/nitter/package.nix
@@ -10,13 +10,13 @@
 buildNimPackage (
   finalAttrs: prevAttrs: {
     pname = "nitter";
-    version = "0-unstable-2025-02-25";
+    version = "0-unstable-2025-04-05";
 
     src = fetchFromGitHub {
       owner = "zedeus";
       repo = "nitter";
-      rev = "41fa47bfbf3917e9b3ac4f7b49c89a75a7a2bd44";
-      hash = "sha256-cmYlmzCJl1405TuYExGw3AOmjdY0r7ObmmLCAom+Fyw=";
+      rev = "83b0f8b55ae7bfb8a19a0bf14de52f30d06b8db6";
+      hash = "sha256-2QIcAhzYrIo1q80959980H+hzLYtPHAOy0+CItDZ1d4=";
     };
 
     lockFile = ./lock.json;

From 9183ad708d65616018d78ad81ada247389e94f17 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 7 Apr 2025 10:19:09 +0200
Subject: [PATCH 197/489] python313Packages.tencentcloud-sdk-python: 3.0.1354
 -> 3.0.1355

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1354...3.0.1355

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

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 8b192d4f7ff5..1aadc9635fef 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1354";
+  version = "3.0.1355";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-Z6py2Uc17Gv4Lj5pEPLQZaKir4S4vX1OFUqYzDgsfzM=";
+    hash = "sha256-Sg6RU4rvagvFV5oyyDiCp/atdUlkCRYXoctIRaukfic=";
   };
 
   build-system = [ setuptools ];

From d940d4a0b185ad3ce6458b11bd3fa7df60c43b36 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 7 Apr 2025 10:20:18 +0200
Subject: [PATCH 198/489] checkov: 3.2.397 -> 3.2.399

Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.397...3.2.399

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.399
---
 pkgs/by-name/ch/checkov/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index 4d0abb1aa746..28a46a64576a 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -25,14 +25,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.397";
+  version = "3.2.399";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-TFAieHFWM/gQqZyLMKqmGjvTUMPwXbn6LzOBGkSBqk0=";
+    hash = "sha256-/ssPTHHW3AeQRjIDdBBZe6Jnoj/UvQXiLYFhuOJZI5o=";
   };
 
   pythonRelaxDeps = [

From 85b48bce92845ed2722ca368abe93d463863be9b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 7 Apr 2025 10:26:04 +0200
Subject: [PATCH 199/489] python313Packages.model-checker: 0.8.20 -> 0.8.25

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

diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix
index 76b7f4f7b5b4..a3c16b2972ea 100644
--- a/pkgs/development/python-modules/model-checker/default.nix
+++ b/pkgs/development/python-modules/model-checker/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "model-checker";
-  version = "0.8.20";
+  version = "0.8.25";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "model_checker";
     inherit version;
-    hash = "sha256-NSgsMKjnZIRrzLZJD9XlXgsc92Gx1VmeKmyuz5WyHc4=";
+    hash = "sha256-4SQRapViYU0uCtKEhXHpNXcJQBplE6r40ChzeTrX0/c=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From 7ebf6f8d6ca29a9ccc99380d17ffdd2e5f9c6330 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 7 Apr 2025 10:27:49 +0200
Subject: [PATCH 200/489] cdncheck: 1.1.12 -> 1.1.13

Diff: https://github.com/projectdiscovery/cdncheck/compare/refs/tags/v1.1.12...v1.1.13

Changelog: https://github.com/projectdiscovery/cdncheck/releases/tag/v1.1.13
---
 pkgs/by-name/cd/cdncheck/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 0180e338c4b9..008fedf7eb1a 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.1.12";
+  version = "1.1.13";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-rhrcjGR179oBhflEBAztHD+e6Q0MsIkAR40LDrSYzgE=";
+    hash = "sha256-jHUFHmVVugshheRjz5ztIVK1jsrW7kSWSgEjZj9OVQw=";
   };
 
   vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";

From 3d95be84ae645aa26c71bf071241db35de7a91c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 7 Apr 2025 10:29:08 +0200
Subject: [PATCH 201/489] exploitdb: 2025-03-30 -> 2025-04-07

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-03-30...2025-04-07
---
 pkgs/by-name/ex/exploitdb/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index 3df2bacc3604..47f33ba813a8 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-03-30";
+  version = "2025-04-07";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-79CcXrGxFNc51LctL1OiUiYIJyGUkqB+NmGiUoxTbpU=";
+    hash = "sha256-cuKfuxgHD6aFsYSbcmLSaqz5z1EyOCgjBxsrvJFfuoU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4456c6fb022e877a3581ddcf94b18a45afae9f29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 08:36:11 +0000
Subject: [PATCH 202/489] versatiles: 0.15.3 -> 0.15.4

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

diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix
index a1aa47f9bda0..ec4f19b3da86 100644
--- a/pkgs/by-name/ve/versatiles/package.nix
+++ b/pkgs/by-name/ve/versatiles/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "versatiles";
-  version = "0.15.3"; # When updating: Replace with current version
+  version = "0.15.4"; # When updating: Replace with current version
 
   src = fetchFromGitHub {
     owner = "versatiles-org";
     repo = "versatiles-rs";
     tag = "v${version}"; # When updating: Replace with long commit hash of new version
-    hash = "sha256-xIZ/9l/wvl2Gh7vmxTGUxhZ9KIPSPLoqqC8DRN3PiQs="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
+    hash = "sha256-C9LTfRi6FRRg4yUIbs1DMtOtILTO/ItjWGnuKwUSHeU="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-UkPKwXPQW/M7AgNTMx4OqTLQCc9+c+RkzcCPyEHJayw="; # When updating: Same as above
+  cargoHash = "sha256-B9QCkAjyak2rX3waMG74KBbBVKn2veliMl7tAS41HQQ="; # When updating: Same as above
 
   __darwinAllowLocalNetworking = true;
 

From 015a48f58268b1032992ea51fd5e49f1d0c39dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 Apr 2025 10:44:16 +0200
Subject: [PATCH 203/489] nixVersions.latest: 2.26 -> 2.28

---
 pkgs/tools/package-management/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 14ef652e076e..4cec9c721c1d 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -211,7 +211,7 @@ lib.makeExtensible (
 
       nix_2_28 = addTests "nix_2_28" self.nixComponents_2_28.nix-everything;
 
-      latest = self.nix_2_26;
+      latest = self.nix_2_28;
 
       # The minimum Nix version supported by Nixpkgs
       # Note that some functionality *might* have been backported into this Nix version,

From 2ddb083f2eea920323f42da8493221640210db37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 Apr 2025 11:16:23 +0200
Subject: [PATCH 204/489] nixVersions: use tags instead of commits

---
 pkgs/tools/package-management/nix/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 4cec9c721c1d..c189eac1b03a 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -167,14 +167,14 @@ lib.makeExtensible (
         self_attribute_name = "nix_2_25";
       };
 
-      nixComponents_2_26 = nixDependencies.callPackage ./modular/packages.nix {
+      nixComponents_2_26 = nixDependencies.callPackage ./modular/packages.nix rec {
         version = "2.26.3";
         inherit (self.nix_2_24.meta) maintainers;
         otherSplices = generateSplicesForNixComponents "nixComponents_2_26";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "42fc03dd1f12df2d9152303f3fb8bf22b746462c";
+          tag = version;
           hash = "sha256-5ZV8YqU8mfFmoAMiUEuBqNwk0T3vUR//x1D12BiYCeY=";
         };
       };
@@ -183,14 +183,14 @@ lib.makeExtensible (
       # depend on the components they need in `nixComponents_2_26`.
       nix_2_26 = addTests "nix_2_26" self.nixComponents_2_26.nix-everything;
 
-      nixComponents_2_27 = nixDependencies.callPackage ./modular/packages.nix {
+      nixComponents_2_27 = nixDependencies.callPackage ./modular/packages.nix rec {
         version = "2.27.1";
         inherit (self.nix_2_24.meta) maintainers;
         otherSplices = generateSplicesForNixComponents "nixComponents_2_27";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "9cb662df7442a1e2c4600fb8ecb2ad613ebc5a95";
+          tag = version;
           hash = "sha256-rBPulEBpn4IiqkPsetuh7BRzT2iGCzZYnogTAsbrvhU=";
         };
       };
@@ -199,6 +199,7 @@ lib.makeExtensible (
 
       nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix {
         version = "2.28.1pre";
+      nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix rec {
         inherit (self.nix_2_24.meta) maintainers;
         otherSplices = generateSplicesForNixComponents "nixComponents_2_28";
         src = fetchFromGitHub {

From 96877bcad6c6a16e84332b2591b5b4119e206f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 Apr 2025 11:18:25 +0200
Subject: [PATCH 205/489] nixVersions.2_28: 2.28.1pre -> 2.28.1

---
 pkgs/tools/package-management/nix/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index c189eac1b03a..b85d0b605f36 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -197,16 +197,15 @@ lib.makeExtensible (
 
       nix_2_27 = addTests "nix_2_27" self.nixComponents_2_27.nix-everything;
 
-      nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix {
-        version = "2.28.1pre";
       nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix rec {
+        version = "2.28.1";
         inherit (self.nix_2_24.meta) maintainers;
         otherSplices = generateSplicesForNixComponents "nixComponents_2_28";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "9cdf72beaa77f1e6c0faed44872b83783051f20d";
-          hash = "sha256-0sk7cGOdfUA6/AamSsuURHdILxSyw+s2zl7CDaSsawo=";
+          rev = version;
+          hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI=";
         };
       };
 

From 2ddb856be5f6e35594f9c38e088e5ee559ca59d7 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Sun, 22 Dec 2024 17:41:30 +0100
Subject: [PATCH 206/489] openexr: switch default version to v3

---
 pkgs/applications/graphics/gimp/default.nix   |  4 +--
 pkgs/applications/graphics/krita/generic.nix  |  4 +--
 pkgs/applications/kde/kio-extras.nix          |  4 +--
 .../video/olive-editor/default.nix            |  4 +--
 pkgs/by-name/an/ansel/package.nix             |  4 +--
 pkgs/by-name/ar/art/package.nix               |  4 +--
 .../color-transformation-language/package.nix |  4 +--
 pkgs/by-name/da/darktable/package.nix         |  4 +--
 pkgs/by-name/il/ilmbase/package.nix           |  8 +++--
 pkgs/by-name/li/libjxl/package.nix            |  4 +--
 pkgs/by-name/sw/swayimg/package.nix           |  4 +--
 pkgs/by-name/vi/vips/package.nix              |  4 +--
 pkgs/development/libraries/gdal/default.nix   |  4 +--
 .../libraries/gstreamer/bad/default.nix       |  4 +--
 .../libraries/libdevil/default.nix            |  4 +--
 .../libraries/opencolorio/default.nix         |  4 +--
 .../libraries/openexr/{default.nix => 2.nix}  |  1 +
 pkgs/development/libraries/openexr/3.nix      |  2 +-
 .../libraries/openscenegraph/default.nix      |  4 +--
 pkgs/kde/frameworks/kimageformats/default.nix |  4 +--
 pkgs/kde/gear/kio-extras/default.nix          |  4 +--
 pkgs/kde/misc/kio-extras-kf5/default.nix      |  4 +--
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               | 31 +++++++++----------
 24 files changed, 60 insertions(+), 59 deletions(-)
 rename pkgs/development/libraries/openexr/{default.nix => 2.nix} (99%)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index d2b2644a1709..e5e552f299f9 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -45,7 +45,7 @@
   libheif,
   libxslt,
   libgudev,
-  openexr_3,
+  openexr,
   desktopToDarwinBundle,
   AppKit,
   Cocoa,
@@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
       poppler
       poppler_data
       libtiff
-      openexr_3
+      openexr
       libmng
       librsvg
       libwmf
diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix
index 989bdb6fb02e..9b008cfc5d78 100644
--- a/pkgs/applications/graphics/krita/generic.nix
+++ b/pkgs/applications/graphics/krita/generic.nix
@@ -30,7 +30,7 @@
   libkdcraw,
   lcms2,
   gsl,
-  openexr_3,
+  openexr,
   giflib,
   libjxl,
   mlt,
@@ -105,7 +105,7 @@ mkDerivation rec {
     fribidi
     lcms2
     gsl
-    openexr_3
+    openexr
     lager
     libaom
     libheif
diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
index 91d80677bb16..918c74301ad5 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
@@ -24,7 +24,7 @@
   syntax-highlighting,
   libmtp,
   libssh,
-  openexr_3,
+  openexr,
   libtirpc,
   phonon,
   qtsvg,
@@ -71,7 +71,7 @@ mkDerivation {
     syntax-highlighting
     libmtp
     libssh
-    openexr_3
+    openexr
     libtirpc
     phonon
     qtsvg
diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix
index b0c39aa7b3b5..b3cd3512a74d 100644
--- a/pkgs/applications/video/olive-editor/default.nix
+++ b/pkgs/applications/video/olive-editor/default.nix
@@ -12,7 +12,7 @@
   cmake,
   wrapQtAppsHook,
   openimageio,
-  openexr_3,
+  openexr,
   portaudio,
   imath,
   qtwayland,
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
     opencolorio
     openimageio'
     imath
-    openexr_3
+    openexr
     portaudio
     qtwayland
     qtmultimedia
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index 1e01858c5097..8e7d7dc50645 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -15,7 +15,7 @@
   libxml2,
   cmake,
   exiftool,
-  openexr_3,
+  openexr,
   glib,
   python3Packages,
   perlPackages,
@@ -147,7 +147,7 @@ stdenv.mkDerivation {
     libxkbcommon
     libxslt
     libXtst
-    openexr_3
+    openexr
     openjpeg
     osm-gps-map
     pcre
diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index c6ac2033d256..428aaf9d400e 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -32,7 +32,7 @@
   exiv2,
   exiftool,
   mimalloc,
-  openexr_3,
+  openexr,
   ilmbase,
   opencolorio,
   color-transformation-language,
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     exiftool
     libcanberra-gtk3
     mimalloc
-    openexr_3
+    openexr
     ilmbase
     opencolorio
     color-transformation-language
diff --git a/pkgs/by-name/co/color-transformation-language/package.nix b/pkgs/by-name/co/color-transformation-language/package.nix
index 7fe0b5c661be..1fd5403142c9 100644
--- a/pkgs/by-name/co/color-transformation-language/package.nix
+++ b/pkgs/by-name/co/color-transformation-language/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   ilmbase,
-  openexr_3,
+  openexr,
   libtiff,
   aces-container,
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ilmbase
-    openexr_3
+    openexr
     libtiff
     aces-container
   ];
diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index 56c0799783b3..c005a716ddaa 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -55,7 +55,7 @@
   libxslt,
   lua,
   util-linux,
-  openexr_3,
+  openexr,
   openjpeg,
   osm-gps-map,
   pcre2,
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
       libwebp
       libxslt
       lua
-      openexr_3
+      openexr
       openjpeg
       osm-gps-map
       pcre2
diff --git a/pkgs/by-name/il/ilmbase/package.nix b/pkgs/by-name/il/ilmbase/package.nix
index 400eec45f1a8..ecca1b5159a5 100644
--- a/pkgs/by-name/il/ilmbase/package.nix
+++ b/pkgs/by-name/il/ilmbase/package.nix
@@ -3,16 +3,17 @@
   lib,
   buildPackages,
   cmake,
-  openexr,
+  # explicitely depending on openexr_2 because ilmbase doesn't exist for v3
+  openexr_2,
 }:
 
 stdenv.mkDerivation {
   pname = "ilmbase";
-  version = lib.getVersion openexr;
+  version = lib.getVersion openexr_2;
 
   # the project no longer provides separate tarballs. We may even want to merge
   # the ilmbase package into openexr in the future.
-  inherit (openexr) src patches;
+  inherit (openexr_2) src patches;
 
   outputs = [
     "out"
@@ -37,5 +38,6 @@ stdenv.mkDerivation {
     homepage = "https://www.openexr.com/";
     license = licenses.bsd3;
     platforms = platforms.all;
+    insecure = true;
   };
 }
diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix
index e9860f5867f2..0a91d21f128e 100644
--- a/pkgs/by-name/li/libjxl/package.nix
+++ b/pkgs/by-name/li/libjxl/package.nix
@@ -12,7 +12,7 @@
   libpng,
   libwebp,
   gdk-pixbuf,
-  openexr_3,
+  openexr,
   pkg-config,
   makeWrapper,
   zlib,
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     libpng
     libwebp
     gdk-pixbuf
-    openexr_3
+    openexr
     zlib
   ];
 
diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix
index 1420a6374fe0..369c7897ef7c 100644
--- a/pkgs/by-name/sw/swayimg/package.nix
+++ b/pkgs/by-name/sw/swayimg/package.nix
@@ -23,7 +23,7 @@
   libavif,
   libsixel,
   libraw,
-  openexr_3,
+  openexr,
   bash-completion,
   testers,
   nix-update-script,
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     libavif
     libsixel
     libraw
-    openexr_3
+    openexr
   ];
 
   passthru = {
diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix
index c76857b0a371..0c1785e560a6 100644
--- a/pkgs/by-name/vi/vips/package.nix
+++ b/pkgs/by-name/vi/vips/package.nix
@@ -38,7 +38,7 @@
   libtiff,
   libwebp,
   matio,
-  openexr_3,
+  openexr,
   openjpeg,
   openslide,
   pango,
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
       libtiff
       libwebp
       matio
-      openexr_3
+      openexr
       openjpeg
       openslide
       pango
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 86521085307a..f908456749ad 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -62,7 +62,7 @@
   libxml2,
   lz4,
   netcdf,
-  openexr_3,
+  openexr,
   openjpeg,
   openssl,
   pcre2,
@@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: {
       nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) (
         [
           # tests for formats enabled by these packages fail on macos
-          openexr_3
+          openexr
           xercesc
         ]
         ++ arrowDeps
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index b6ad921a3768..fabdf20404ed 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -62,7 +62,7 @@
   libusb1,
   neon,
   openal,
-  openexr_3,
+  openexr,
   openh264Support ? lib.meta.availableOn stdenv.hostPlatform openh264,
   openh264,
   libopenmpt,
@@ -192,7 +192,7 @@ stdenv.mkDerivation rec {
       libusb1
       neon
       openal
-      openexr_3
+      openexr
       rtmpdump
       pango
       soundtouch
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 997fb3025a03..e36402b68b5a 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -8,7 +8,7 @@
   libmng,
   lcms1,
   libtiff,
-  openexr_3,
+  openexr,
   libGL,
   libX11,
   pkg-config,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       libmng
       lcms1
       libtiff
-      openexr_3
+      openexr
     ]
     ++ lib.optionals withXorg [
       libX11
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 5b5a45b6c372..00e041aafb0a 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -22,7 +22,7 @@
   # Build apps
   buildApps ? true, # Utility applications
   lcms2,
-  openexr_3,
+  openexr,
 }:
 
 stdenv.mkDerivation rec {
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals buildApps [
       lcms2
-      openexr_3
+      openexr
     ];
 
   cmakeFlags =
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/2.nix
similarity index 99%
rename from pkgs/development/libraries/openexr/default.nix
rename to pkgs/development/libraries/openexr/2.nix
index 84dc7fb990e7..7a71776aba89 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/2.nix
@@ -74,5 +74,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.openexr.com/";
     license = licenses.bsd3;
     platforms = platforms.all;
+    insecure = true;
   };
 }
diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index c52dac8dab25..dff5ba112bca 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = {
     inherit libjxl;
-    musl = pkgsCross.musl64.openexr_3;
+    musl = pkgsCross.musl64.openexr;
   };
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index c28beee8645c..df568d649494 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -25,7 +25,7 @@
   jpegSupport ? true,
   libjpeg,
   exrSupport ? false,
-  openexr_3,
+  openexr,
   gifSupport ? true,
   giflib,
   pngSupport ? true,
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
       zlib
     ]
     ++ lib.optional jpegSupport libjpeg
-    ++ lib.optional exrSupport openexr_3
+    ++ lib.optional exrSupport openexr
     ++ lib.optional gifSupport giflib
     ++ lib.optional pngSupport libpng
     ++ lib.optional tiffSupport libtiff
diff --git a/pkgs/kde/frameworks/kimageformats/default.nix b/pkgs/kde/frameworks/kimageformats/default.nix
index 0b3d049dc185..71e6d884af98 100644
--- a/pkgs/kde/frameworks/kimageformats/default.nix
+++ b/pkgs/kde/frameworks/kimageformats/default.nix
@@ -5,7 +5,7 @@
   libjxl,
   libavif,
   libraw,
-  openexr_3,
+  openexr,
 }:
 mkKdeDerivation {
   pname = "kimageformats";
@@ -17,6 +17,6 @@ mkKdeDerivation {
     libjxl
     libavif
     libraw
-    openexr_3
+    openexr
   ];
 }
diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix
index 0e3702ce7360..2260feeac62c 100644
--- a/pkgs/kde/gear/kio-extras/default.nix
+++ b/pkgs/kde/gear/kio-extras/default.nix
@@ -9,7 +9,7 @@
   libimobiledevice,
   gperf,
   libtirpc,
-  openexr_3,
+  openexr,
   taglib,
   shared-mime-info,
   libappimage,
@@ -34,7 +34,7 @@ mkKdeDerivation {
     libimobiledevice
     gperf
     libtirpc
-    openexr_3
+    openexr
     taglib
     libappimage
     xorg.libXcursor
diff --git a/pkgs/kde/misc/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix
index add6b08de399..886ae1a62777 100644
--- a/pkgs/kde/misc/kio-extras-kf5/default.nix
+++ b/pkgs/kde/misc/kio-extras-kf5/default.nix
@@ -10,7 +10,7 @@
   libimobiledevice,
   gperf,
   libtirpc,
-  openexr_3,
+  openexr,
   taglib,
   libappimage,
 }:
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     libimobiledevice
     gperf
     libtirpc
-    openexr_3
+    openexr
     taglib
     libappimage
   ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f218415ab6b6..14b051cd6e2b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1269,6 +1269,7 @@ mapAliases {
   opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15
   openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17
   openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13
+  openexr_3 = openexr; # Added 2025-03-12
   openimageio2 = openimageio; # Added 2023-01-05
   openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17
   openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df389f32233d..40e3b1f4abdf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -361,10 +361,6 @@ with pkgs;
 
   copilot-language-server-fhs = copilot-language-server.fhs;
 
-  curv = callPackage ../by-name/cu/curv/package.nix {
-    openexr = openexr_3;
-  };
-
   databricks-sql-cli = callPackage ../applications/misc/databricks-sql-cli { };
 
   deck = callPackage ../by-name/de/deck/package.nix {
@@ -4740,7 +4736,6 @@ with pkgs;
     libclang = llvmPackages_15.libclang;
     clang = clang_15;
     llvm = llvm_15;
-    openexr = openexr_3;
   };
 
   ossec-agent = callPackage ../tools/security/ossec/agent.nix { };
@@ -9358,6 +9353,10 @@ with pkgs;
   fplll = callPackage ../development/libraries/fplll { };
   fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { };
 
+  freeimage = callPackage ../by-name/fr/freeimage/package.nix {
+    openexr = openexr_2;
+  };
+
   freeipa = callPackage ../os-specific/linux/freeipa {
     # NOTE: freeipa and sssd need to be built with the same version of python
     kerberos = krb5.override {
@@ -9401,6 +9400,7 @@ with pkgs;
 
   gegl = callPackage ../development/libraries/gegl {
     inherit (darwin.apple_sdk.frameworks) OpenCL;
+    openexr = openexr_2;
   };
 
   gensio = darwin.apple_sdk_11_0.callPackage ../development/libraries/gensio { };
@@ -10789,6 +10789,7 @@ with pkgs;
     # TODO: LTO does not work.
     # https://github.com/NixOS/nixpkgs/issues/343123
     enableLto = false;
+    openexr = openexr_2;
   };
 
   opencv4WithoutCuda = opencv4.override {
@@ -10797,9 +10798,8 @@ with pkgs;
 
   opencv = opencv4;
 
-  openexr = openexr_2;
-  openexr_2 = callPackage ../development/libraries/openexr { };
-  openexr_3 = callPackage ../development/libraries/openexr/3.nix { };
+  openexr = callPackage ../development/libraries/openexr/3.nix { };
+  openexr_2 = callPackage ../development/libraries/openexr/2.nix { };
 
   opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio {
     inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa;
@@ -11438,7 +11438,6 @@ with pkgs;
 
   vigra = callPackage ../development/libraries/vigra {
     hdf5 = hdf5.override { usev110Api = true; };
-    openexr = openexr_3;
   };
 
   vllm = with python3Packages; toPythonApplication vllm;
@@ -13800,9 +13799,7 @@ with pkgs;
 
   airwave = libsForQt5.callPackage ../applications/audio/airwave { };
 
-  alembic = callPackage ../development/libraries/alembic {
-    openexr = openexr_3;
-  };
+  alembic = callPackage ../development/libraries/alembic { };
 
   amarok = libsForQt5.callPackage ../applications/audio/amarok { };
   amarok-kf5 = amarok; # for compatibility
@@ -13901,7 +13898,6 @@ with pkgs;
   };
 
   blender = callPackage ../by-name/bl/blender/package.nix {
-    openexr = openexr_3;
     python3Packages = python311Packages;
     inherit (darwin.apple_sdk.frameworks)
       Cocoa
@@ -14090,6 +14086,8 @@ with pkgs;
     hamlib = hamlib_4;
   };
 
+  djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; };
+
   djview = libsForQt5.callPackage ../applications/graphics/djview { };
   djview4 = djview;
 
@@ -14728,7 +14726,6 @@ with pkgs;
 
   hugin = callPackage ../applications/graphics/hugin {
     wxGTK = wxGTK32;
-    openexr = openexr_3;
   };
 
   huggle = libsForQt5.callPackage ../applications/misc/huggle { };
@@ -14937,7 +14934,6 @@ with pkgs;
   imagemagick = lowPrio (
     callPackage ../applications/graphics/ImageMagick {
       inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
-      openexr = openexr_3;
     }
   );
 
@@ -15255,7 +15251,9 @@ with pkgs;
     portaudio = null;
   };
 
-  luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };
+  luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr {
+    openexr = openexr_2;
+  };
 
   luddite = with python3Packages; toPythonApplication luddite;
 
@@ -15691,7 +15689,6 @@ with pkgs;
   };
 
   openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio {
-    openexr = openexr_3;
   };
 
   open-music-kontrollers = lib.recurseIntoAttrs {

From 016061732b57bc0ff098020e4debbc2b0b9ae6de Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Sun, 26 Jan 2025 15:07:59 +0100
Subject: [PATCH 207/489] libyafaray: switch to openexr_3

---
 pkgs/by-name/li/libyafaray/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/li/libyafaray/package.nix b/pkgs/by-name/li/libyafaray/package.nix
index 3f6ba6312623..69d2aaad0466 100644
--- a/pkgs/by-name/li/libyafaray/package.nix
+++ b/pkgs/by-name/li/libyafaray/package.nix
@@ -2,7 +2,6 @@
   cmake,
   fetchFromGitHub,
   freetype,
-  ilmbase,
   lib,
   libjpeg,
   libtiff,
@@ -33,10 +32,6 @@ stdenv.mkDerivation {
       include/geometry/poly_double.h include/noise/noise_generator.h # gcc12
   '';
 
-  preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR"
-  '';
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -44,7 +39,6 @@ stdenv.mkDerivation {
 
   buildInputs = [
     freetype
-    ilmbase
     libjpeg
     libtiff
     libxml2

From ace0ceb2816c398a9c11727df79f1e869bd82fc2 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Wed, 12 Mar 2025 11:08:45 +0100
Subject: [PATCH 208/489] qt5Packages.kimageformats: fix build

---
 pkgs/development/libraries/kde-frameworks/kimageformats.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index d07bb36ea100..bc1b86099939 100644
--- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
@@ -30,7 +30,6 @@ mkDerivation {
     qtbase
   ];
   outputs = [ "out" ]; # plugins only
-  CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR";
   cmakeFlags = [
     "-DKIMAGEFORMATS_HEIF=ON"
   ];

From fa470f9679760a5bf51479d2b8863ebf9da178c3 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Wed, 2 Apr 2025 11:03:47 +0200
Subject: [PATCH 209/489] openexr: mention the default version change in
 release notes

---
 doc/release-notes/rl-2505.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 6a6a797269c6..f58141eceeb4 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -25,6 +25,8 @@
   NEWS can been viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar.
   It can also be browsed [online](https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30).
 
+- The default openexr version has been updated to 3.2.4.
+
 - The default PHP version has been updated to 8.4.
 
 - The default Erlang OTP version has been updated to 27.

From 1c183380417e7216cb8690b1e85cc50c14ca4a3b Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Mon, 7 Apr 2025 11:51:03 +0200
Subject: [PATCH 210/489] alive2: fix and enable strictDeps for cross

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

diff --git a/pkgs/by-name/al/alive2/package.nix b/pkgs/by-name/al/alive2/package.nix
index e69c134d4d1e..89a3587a85b8 100644
--- a/pkgs/by-name/al/alive2/package.nix
+++ b/pkgs/by-name/al/alive2/package.nix
@@ -24,17 +24,19 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
+    ninja
+    re2c
   ];
   buildInputs = [
-    re2c
     z3
     hiredis
     llvm_18
-    ninja
   ];
+  strictDeps = true;
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
+      --replace-fail '-Werror' "" \
       --replace-fail 'find_package(Git REQUIRED)' ""
   '';
 

From c7a86bbec2c2d69a9d26f70613741628e6a65b0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 09:57:00 +0000
Subject: [PATCH 211/489] clickable: 8.2.0 -> 8.3.0

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

diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix
index 5b938f117a2a..741103455c39 100644
--- a/pkgs/by-name/cl/clickable/package.nix
+++ b/pkgs/by-name/cl/clickable/package.nix
@@ -8,13 +8,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "clickable";
-  version = "8.2.0";
+  version = "8.3.0";
 
   src = fetchFromGitLab {
     owner = "clickable";
     repo = "clickable";
     rev = "v${version}";
-    hash = "sha256-MFzpeiWeqJ0MG8ouwRkYXD1e6Nsxshmz1NSzCIBRjZ0=";
+    hash = "sha256-5fymmsZUYwB+wc1X7Y1HwwJbGRjQPwkk9JLTxnfH8fo=";
   };
 
   propagatedBuildInputs = with python3Packages; [

From f58525c4c6120c62089d6041f8e49070d1f874e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 10:03:55 +0000
Subject: [PATCH 212/489] pretty-php: 0.4.92 -> 0.4.93

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

diff --git a/pkgs/by-name/pr/pretty-php/package.nix b/pkgs/by-name/pr/pretty-php/package.nix
index 985a03cc727c..97efb357c8bb 100644
--- a/pkgs/by-name/pr/pretty-php/package.nix
+++ b/pkgs/by-name/pr/pretty-php/package.nix
@@ -6,16 +6,16 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "pretty-php";
-  version = "0.4.92";
+  version = "0.4.93";
 
   src = fetchFromGitHub {
     owner = "lkrms";
     repo = "pretty-php";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rKL6ViBEJf+GGxWood0DXVF8U7wuz22Z26SEdgDAJww=";
+    hash = "sha256-5gFTL4hcnEMKrffMpLRfneq5zeMHH50fjpvZcnefJZ8=";
   };
 
-  vendorHash = "sha256-V1oqMnDJgWujQXJJqyc2cvEvBbFv+KdXjXfb+sxs8/8=";
+  vendorHash = "sha256-cp6WPlEc3WCW19UqLgrqMv8zE9UrCiTuN+WqTpAsuWE=";
 
   passthru = {
     tests.version = testers.testVersion {

From 4c70fcd60f66321ce726d9de79d243ec2a6ce464 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 10:26:04 +0000
Subject: [PATCH 213/489] sscg: 3.0.5 -> 3.0.6

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

diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix
index a5deb0054c14..e0a6044e78b6 100644
--- a/pkgs/by-name/ss/sscg/package.nix
+++ b/pkgs/by-name/ss/sscg/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sscg";
-  version = "3.0.5";
+  version = "3.0.6";
 
   src = fetchFromGitHub {
     owner = "sgallagher";
     repo = "sscg";
     tag = "sscg-${finalAttrs.version}";
-    hash = "sha256-NzS9EV7DyQzPt4mvuEMs3zKRaQnyKzLNxmeheY7WHm4=";
+    hash = "sha256-BT9qytO9M3uymsHak4FtBapYLSNJcF96/8LxqXXiwxE=";
   };
 
   nativeBuildInputs = [

From ae8f07e1dd48246f902d50a38c4431e92b51a396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 Apr 2025 12:33:19 +0200
Subject: [PATCH 214/489] nixVersions.nix_2_24: 2.24.13 -> 2.24.14

Diff: https://github.com/NixOS/nix/compare/2.24.13...2.24.14
---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 12 ++++++------
 pkgs/tools/package-management/nix/default.nix        |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 93c52da399ff..c94e0fe4699a 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,8 +1,8 @@
 {
-  x86_64-linux = "/nix/store/00a7rdfwhm6avqkgj68grddbzyz3h6ql-nix-2.24.13";
-  i686-linux = "/nix/store/s6c620v60hfishzi1lbfpryk65lbvg8g-nix-2.24.13";
-  aarch64-linux = "/nix/store/7yg9is1shh3383iwi6qynz3vh91l1f9d-nix-2.24.13";
-  riscv64-linux = "/nix/store/fagjkrx5r6p52xp8qb5581bmnlgp01sn-nix-riscv64-unknown-linux-gnu-2.24.13";
-  x86_64-darwin = "/nix/store/ifby7rrgkkly5pzjnyac90lzvrak3i9y-nix-2.24.13";
-  aarch64-darwin = "/nix/store/b0rbdp6ba2fprprpgsw1a8pplzg0j324-nix-2.24.13";
+  x86_64-linux = "/nix/store/kvqnqgjw3k0xmv3ypzajz3c5wf1pxnbs-nix-2.24.14";
+  i686-linux = "/nix/store/292xy9z1vjmy0888bzadmj9fmq1ccapv-nix-2.24.14";
+  aarch64-linux = "/nix/store/qsy62z6rk31s8s937nvkcdhn0ds62yax-nix-2.24.14";
+  riscv64-linux = "/nix/store/zvrzwzv534zcmhw4ai1hbc4iz229hk3p-nix-riscv64-unknown-linux-gnu-2.24.14";
+  x86_64-darwin = "/nix/store/jc7x6906wyy6csgf6br1gbwkw56nxm4l-nix-2.24.14";
+  aarch64-darwin = "/nix/store/sfrmn30fijs6qpfi7ckjkv2vdr4z590h-nix-2.24.14";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 14ef652e076e..c302568efd3d 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -156,8 +156,8 @@ lib.makeExtensible (
           };
 
       nix_2_24 = common {
-        version = "2.24.13";
-        hash = "sha256-lUsK8lAwaaTEM+KFML/6sYwaVAiSf70g1EfSDJNNrU0=";
+        version = "2.24.14";
+        hash = "sha256-SthMCsj6POjawLnJq9+lj/UzObX9skaeN1UGmMZiwTY=";
         self_attribute_name = "nix_2_24";
       };
 

From aa59912bbaaf0092d564980e7576c6bb29bd764a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 Apr 2025 09:16:05 +0200
Subject: [PATCH 215/489] nix-eval-jobs: 2.26.0 -> 2.28.0

---
 pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
index 4924db5e6fd6..623b17695ea7 100644
--- a/pkgs/tools/package-management/nix-eval-jobs/default.nix
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -13,12 +13,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nix-eval-jobs";
-  version = "2.26.0";
+  version = "2.28.0";
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Lo4KFBNcY8tmBuCmEr2XV0IUZtxXHmbXPNLkov/QSU0=";
+    hash = "sha256-v5n6t49X7MOpqS9j0FtI6TWOXvxuZMmGsp2OfUK5QfA=";
   };
   buildInputs = [
     boost
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df389f32233d..fe16ab27f68f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19001,7 +19001,7 @@ with pkgs;
   nixosOptionsDoc = attrs: (import ../../nixos/lib/make-options-doc) ({ inherit pkgs lib; } // attrs);
 
   nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
-    nix = nixVersions.nix_2_26;
+    nix = nixVersions.nix_2_28;
   };
 
   nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;

From 307a02f0495a2ffa233b309e0b725d2e710b91c2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 7 Apr 2025 13:26:45 +0200
Subject: [PATCH 216/489] tuisky: 0.2.0 -> 0.2.1

Diff: https://github.com/sugyan/tuisky/compare/refs/tags/v0.2.0...refs/tags/v0.2.1

Changelog: https://github.com/sugyan/tuisky/blob/v0.2.1/CHANGELOG.md
---
 pkgs/by-name/tu/tuisky/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix
index 61b9651dada6..67103615d4db 100644
--- a/pkgs/by-name/tu/tuisky/package.nix
+++ b/pkgs/by-name/tu/tuisky/package.nix
@@ -8,19 +8,19 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tuisky";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "sugyan";
     repo = "tuisky";
-    tag = "v${version}";
-    hash = "sha256-s0eKWP4cga82Fj7KGIG6yLk67yOqGoAqfhvJINzytTw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7SkY2n5nfqGDxbaSYmWwwmksA8eNY9SjRLLfCUP3qtc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-F/gEBEpcgNT0Q55zUTf8254yYIZI6RmiW9heCuljAEY=";
+  cargoHash = "sha256-rkIc/dRvuuOUq2v3bHLAL//DmiEBbBAhTxR0MHxAL/U=";
 
   nativeBuildInputs = [
     pkg-config
@@ -43,9 +43,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "TUI client for bluesky";
     homepage = "https://github.com/sugyan/tuisky";
-    changelog = "https://github.com/sugyan/tuisky/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/sugyan/tuisky/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
     mainProgram = "tuisky";
   };
-}
+})

From 54c98362fd736d606992e177ebdc9886f79b6bba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 11:30:28 +0000
Subject: [PATCH 217/489] slackdump: 3.0.8 -> 3.0.10

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

diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix
index 0c9b24b22ef2..c24eaf61edde 100644
--- a/pkgs/by-name/sl/slackdump/package.nix
+++ b/pkgs/by-name/sl/slackdump/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "slackdump";
-  version = "3.0.8";
+  version = "3.0.10";
 
   src = fetchFromGitHub {
     owner = "rusq";
     repo = "slackdump";
     tag = "v${version}";
-    hash = "sha256-ufoksglrOPdvFb86rcc9kfOMC/koyHCRAXxaqUge6cU=";
+    hash = "sha256-+Q79DauC+hnUCxBa9muVsq03D9ph7lEB5pmU7ujv3Mo=";
   };
 
   nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;

From e4bf24acdec0f92d782f497827710ad90b3a01d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 11:30:56 +0000
Subject: [PATCH 218/489] reindeer: 2025.03.24.00 -> 2025.03.31.00

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

diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index 0470a12b2cc9..3e5ad769353d 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2025.03.24.00";
+  version = "2025.03.31.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     tag = "v${version}";
-    hash = "sha256-Rv6EtrsDISR/lHo0Fimh2cNToSxUE5bxVdURmjs8/g4=";
+    hash = "sha256-ocnd/4bIZwrGik2r8HSeyPfLQycmJJrKikgLIZhsb6A=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mzYpqI+PT5083exelS+kyGLZ+M8bTiTSxAoTwqV2ubc=";
+  cargoHash = "sha256-DguWlibOB8z0Blj5ZVFycyJrxJHK3uUROt8hGxacxOY=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 034262985cd3fad1ae6b849b8c3fad24669d78e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 11:47:15 +0000
Subject: [PATCH 219/489] python312Packages.open-clip-torch: 2.31.0 -> 2.32.0

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

diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix
index 2aae0e744a93..d9b06c1d2130 100644
--- a/pkgs/development/python-modules/open-clip-torch/default.nix
+++ b/pkgs/development/python-modules/open-clip-torch/default.nix
@@ -29,14 +29,14 @@
 }:
 buildPythonPackage rec {
   pname = "open-clip-torch";
-  version = "2.31.0";
+  version = "2.32.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mlfoundations";
     repo = "open_clip";
     tag = "v${version}";
-    hash = "sha256-VOfjxQjIC6IL7WyhTc8JpIAa9eknmU4LpnA9DtQJ+oQ=";
+    hash = "sha256-HXzorEAVPieCHfW3xzXqNTTIzJSbIuaZhcfcp0htdCk=";
   };
 
   build-system = [ pdm-backend ];

From 4a5fb133e3a4b3f4c827160bf4fd39129dda5a83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 12:02:10 +0000
Subject: [PATCH 220/489] mpls: 0.13.2 -> 0.13.3

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

diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix
index 1dbc8f69ab0b..ff9a67cc6be2 100644
--- a/pkgs/by-name/mp/mpls/package.nix
+++ b/pkgs/by-name/mp/mpls/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
   pname = "mpls";
-  version = "0.13.2";
+  version = "0.13.3";
 
   src = fetchFromGitHub {
     owner = "mhersson";
     repo = "mpls";
     tag = "v${version}";
-    hash = "sha256-jcSi/ZdHP9kJRUaMkQdS6BuScp2GM4+iNGIoclYMljI=";
+    hash = "sha256-sr0NZGQoaJw8LYJy13iNNos06KDHXNPbYSw3UAHi6eg=";
   };
 
   vendorHash = "sha256-xILlYrwcnMWAPACeELwVKGUBIK9QbrUSR03xVmNXsnE=";

From c86da4e491344598c9bbc802907164b07be61109 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 7 Apr 2025 13:06:42 +0100
Subject: [PATCH 221/489] nexusmods-app: 0.8.3 -> 0.9.2

https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.9.1
https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.9.2
---
 doc/release-notes/rl-2505.section.md      |  2 +-
 pkgs/by-name/ne/nexusmods-app/deps.json   |  4 ++--
 pkgs/by-name/ne/nexusmods-app/package.nix | 10 ++--------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 6a6a797269c6..324fa6c8be14 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -328,7 +328,7 @@
 
 ### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded}
 
-- `nexusmods-app` has been upgraded from version 0.6.3 to 0.8.3.
+- `nexusmods-app` has been upgraded from version 0.6.3 to 0.9.2.
 
   - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present.
 
diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json
index a9b2f5a7fbf1..0728dca5649b 100644
--- a/pkgs/by-name/ne/nexusmods-app/deps.json
+++ b/pkgs/by-name/ne/nexusmods-app/deps.json
@@ -1606,8 +1606,8 @@
   },
   {
     "pname": "NexusMods.Archives.Nx",
-    "version": "0.6.3",
-    "hash": "sha256-E4bOexmmPqMJoXs2gDAhgierGAFyc2JVrP3HBn3KAXs="
+    "version": "0.6.4",
+    "hash": "sha256-jDOCZ6VWPqcKE6gqqAdkyLL3G2g6pbG78mpMRhgYx2o="
   },
   {
     "pname": "NexusMods.Hashing.xxHash3",
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 7b39ae86eca2..6e492636a9c8 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -24,12 +24,12 @@ let
 in
 buildDotnetModule (finalAttrs: {
   inherit pname;
-  version = "0.8.3";
+  version = "0.9.2";
 
   src = fetchgit {
     url = "https://github.com/Nexus-Mods/NexusMods.App.git";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-b6Tpwy0DepbT80+Jil8celeiNN3W+5prt57NjgLD+u0=";
+    hash = "sha256-Xb/i25l0jLn87OeouD0+CRv11d8aOn7Sr69z3TkS6I4=";
     fetchSubmodules = true;
     fetchLFS = true;
   };
@@ -65,12 +65,6 @@ buildDotnetModule (finalAttrs: {
   postPatch = ''
     # for some reason these tests fail (intermittently?) with a zero timestamp
     touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
-
-    # Bump StrawberryShake so we can drop .NET 8
-    # See https://github.com/Nexus-Mods/NexusMods.App/pull/2830
-    substituteInPlace Directory.Packages.props \
-      --replace-fail 'Include="StrawberryShake.Server" Version="14.1.0"' \
-                     'Include="StrawberryShake.Server" Version="15.0.3"'
   '';
 
   makeWrapperArgs = [

From 2025f72a16ec69daf221a5553e75fdcf2dacb35d Mon Sep 17 00:00:00 2001
From: codgician <15964984+codgician@users.noreply.github.com>
Date: Mon, 7 Apr 2025 20:36:53 +0800
Subject: [PATCH 222/489] python3Packages.pyghmi: init at 1.5.77 (#383866)

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

diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix
new file mode 100644
index 000000000000..5919b94fbeb9
--- /dev/null
+++ b/pkgs/development/python-modules/pyghmi/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  wheel,
+  cryptography,
+  python-dateutil,
+  six,
+  pbr,
+  coverage,
+  oslotest,
+  stestr,
+}:
+
+buildPythonPackage rec {
+  pname = "pyghmi";
+  version = "1.5.76";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-nJEL9x/+fZT/vpAKL5qVLXYVPcMvUXT9WSEvHzOrGZU=";
+  };
+
+  build-system = [
+    pbr
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    coverage
+    oslotest
+    stestr
+  ];
+
+  dependencies = [
+    cryptography
+    python-dateutil
+    six
+    pbr
+  ];
+
+  pythonImportsCheck = [ "pyghmi" ];
+
+  checkPhase = ''
+    runHook preCheck
+    stestr run
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Pure Python (mostly IPMI) server management library";
+    homepage = "https://opendev.org/x/pyghmi/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ codgician ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index adb6667984aa..d1f393385126 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12235,6 +12235,8 @@ self: super: with self; {
 
   pygetwindow = callPackage ../development/python-modules/pygetwindow { };
 
+  pyghmi = callPackage ../development/python-modules/pyghmi { };
+
   pygit2 = callPackage ../development/python-modules/pygit2 { };
 
   pygitguardian = callPackage ../development/python-modules/pygitguardian { };

From 492b3f330f647c1c6db23996cd80dfd79adc7986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 7 Apr 2025 13:51:20 +0200
Subject: [PATCH 223/489] networkd-dispatcher: remove unused configparser, use
 installManPage and --replace-fail

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

diff --git a/pkgs/by-name/ne/networkd-dispatcher/package.nix b/pkgs/by-name/ne/networkd-dispatcher/package.nix
index e0892968d7ca..486551ce0f6a 100644
--- a/pkgs/by-name/ne/networkd-dispatcher/package.nix
+++ b/pkgs/by-name/ne/networkd-dispatcher/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitLab,
   fetchpatch,
+  installShellFiles,
   python3Packages,
   asciidoc,
   wrapGAppsNoGuiHook,
@@ -36,13 +37,14 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # Fix paths in systemd unit file
     substituteInPlace networkd-dispatcher.service \
-      --replace "/usr/bin/networkd-dispatcher" "$out/bin/networkd-dispatcher"
+      --replace-fail "/usr/bin/networkd-dispatcher" "$out/bin/networkd-dispatcher"
     # Remove conditions on existing rules path
     sed -i '/ConditionPathExistsGlob/g' networkd-dispatcher.service
   '';
 
   nativeBuildInputs = [
-    asciidoc
+    asciidoc # for a2x
+    installShellFiles
     wrapGAppsNoGuiHook
     python3Packages.wrapPython
   ];
@@ -58,7 +60,6 @@ stdenv.mkDerivation rec {
   ];
 
   pythonPath = with python3Packages; [
-    configparser
     dbus-python
     pygobject3
   ];
@@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
     install -D -m755 -t $out/bin networkd-dispatcher
     install -Dm644 networkd-dispatcher.service $out/lib/systemd/system/networkd-dispatcher.service
     install -Dm644 networkd-dispatcher.conf $out/etc/conf.d/networkd-dispatcher.conf
-    install -D networkd-dispatcher.8 -t $out/share/man/man8/
+    installManPage networkd-dispatcher.8
     runHook postInstall
   '';
 

From 5cd2623332baee2f9e0565abef6f91329fbdb32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 Apr 2025 14:44:59 +0200
Subject: [PATCH 224/489] nixVersions: drop 2.27 in favour of 2.28

---
 pkgs/tools/package-management/nix/default.nix | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b85d0b605f36..0d55afe67562 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -183,20 +183,6 @@ lib.makeExtensible (
       # depend on the components they need in `nixComponents_2_26`.
       nix_2_26 = addTests "nix_2_26" self.nixComponents_2_26.nix-everything;
 
-      nixComponents_2_27 = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.27.1";
-        inherit (self.nix_2_24.meta) maintainers;
-        otherSplices = generateSplicesForNixComponents "nixComponents_2_27";
-        src = fetchFromGitHub {
-          owner = "NixOS";
-          repo = "nix";
-          tag = version;
-          hash = "sha256-rBPulEBpn4IiqkPsetuh7BRzT2iGCzZYnogTAsbrvhU=";
-        };
-      };
-
-      nix_2_27 = addTests "nix_2_27" self.nixComponents_2_27.nix-everything;
-
       nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix rec {
         version = "2.28.1";
         inherit (self.nix_2_24.meta) maintainers;
@@ -244,6 +230,9 @@ lib.makeExtensible (
         ) (lib.range 4 23)
       )
       // {
+        nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_2_28.";
+        nix_2_27 = throw "nix_2_27 has been removed. use nix_2_28.";
+
         unstable = throw "nixVersions.unstable has been removed. use nixVersions.latest or the nix flake.";
         git = throw "nixVersions.git has been removed. use nixVersions.latest or the nix flake.";
       }

From d1f03667e4e59aae94295b0e32783274ab62daea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 13:00:34 +0000
Subject: [PATCH 225/489] principia: 2024.07.12 -> 2025.04.05

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

diff --git a/pkgs/by-name/pr/principia/package.nix b/pkgs/by-name/pr/principia/package.nix
index 85edd081024d..6ed8e890eca9 100644
--- a/pkgs/by-name/pr/principia/package.nix
+++ b/pkgs/by-name/pr/principia/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "principia";
-  version = "2024.07.12";
+  version = "2025.04.05";
 
   src = fetchFromGitHub {
     owner = "Bithack";
     repo = "principia";
     rev = finalAttrs.version;
-    hash = "sha256-JZXarRXScn7/0uve3Ul9dxMz0TE3N8E1VR1nasl051Q=";
+    hash = "sha256-cXtc1E4iJf3//UyzZzhky/NV7zk4959xSwGLHdCeyk0=";
   };
 
   nativeBuildInputs = [

From f960e3c8528300499d1e2db85ca9a33c72fedcf8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 08:58:26 +0000
Subject: [PATCH 226/489] libresplit: 0-unstable-2024-09-24 ->
 0-unstable-2025-04-05

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

diff --git a/pkgs/by-name/li/libresplit/package.nix b/pkgs/by-name/li/libresplit/package.nix
index 8ef17056ad05..5eb9d2763e7d 100644
--- a/pkgs/by-name/li/libresplit/package.nix
+++ b/pkgs/by-name/li/libresplit/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation {
   pname = "libresplit";
-  version = "0-unstable-2024-09-24";
+  version = "0-unstable-2025-04-05";
 
   src = fetchFromGitHub {
     owner = "wins1ey";
     repo = "LibreSplit";
-    rev = "b56ce6743378fc09c9ab621713423754eac945a1";
-    hash = "sha256-mhX5xyBmElPV6NUQRTz8KKL+H1on3WJ4DYatv89MRPo=";
+    rev = "2dd5dfc684b777b814b4cbd3ea7fee8028157cd5";
+    hash = "sha256-FHOX6trRjn+IoiVRdbV6mHUUAzxbRLDWluxGM1GxFVk=";
   };
 
   nativeBuildInputs = [

From aa51d1855529157d8397486b31adbcb49101fb1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 14 Mar 2025 23:27:40 +0000
Subject: [PATCH 227/489] centrifugo: 5.4.9 -> 6.1.0

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

diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix
index e96f82a984b6..44c8139c955e 100644
--- a/pkgs/by-name/ce/centrifugo/package.nix
+++ b/pkgs/by-name/ce/centrifugo/package.nix
@@ -16,16 +16,16 @@ let
 in
 buildGoModule rec {
   pname = "centrifugo";
-  version = "5.4.9";
+  version = "6.1.0";
 
   src = fetchFromGitHub {
     owner = "centrifugal";
     repo = "centrifugo";
     rev = "v${version}";
-    hash = "sha256-FDtAkoN1bdqVUEP0obbXBfQfVRpZN5YXbU1KT1yXWuI=";
+    hash = "sha256-7hh9wcM9cMfQ2W2PlDitTdJD9ftZt/KO/B+wV/c588U=";
   };
 
-  vendorHash = "sha256-WfYN7bhtOPDp2UeB/WqtN3dD3+WO9lIxnXe2iTqn000=";
+  vendorHash = "sha256-hl1BznajnaOXMrlSqksqPdJih29yRDYW9IsyV9mSN20=";
 
   ldflags = [
     "-s"

From b052de7c3895558e9c7fd3ec0fe8f7fcabc012f9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 7 Apr 2025 15:59:46 +0200
Subject: [PATCH 228/489] prowler: override py-ocsf-models

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

diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix
index 4f33d93ee670..d5fd8c794a89 100644
--- a/pkgs/by-name/pr/prowler/package.nix
+++ b/pkgs/by-name/pr/prowler/package.nix
@@ -4,7 +4,22 @@
   fetchFromGitHub,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+let
+  py = python3.override {
+    packageOverrides = self: super: {
+
+      # Doesn't work with latest pydantic
+      py-ocsf-models = super.py-ocsf-models.overridePythonAttrs (oldAttrs: rec {
+        dependencies = [
+          python3.pkgs.pydantic_1
+          python3.pkgs.cryptography
+          python3.pkgs.email-validator
+        ];
+      });
+    };
+  };
+in
+py.pkgs.buildPythonApplication rec {
   pname = "prowler";
   version = "5.4.2";
   pyproject = true;
@@ -18,9 +33,9 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = true;
 
-  build-system = with python3.pkgs; [ poetry-core ];
+  build-system = with py.pkgs; [ poetry-core ];
 
-  dependencies = with python3.pkgs; [
+  dependencies = with py.pkgs; [
     alive-progress
     awsipranges
     azure-identity
@@ -59,7 +74,7 @@ python3.pkgs.buildPythonApplication rec {
     numpy
     pandas
     py-ocsf-models
-    pydantic
+    pydantic_1
     python-dateutil
     pytz
     schema

From 0a93df322d8a8e035527c17201f2d18690881623 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 14:23:06 +0000
Subject: [PATCH 229/489] cables: 0.5.10 -> 0.5.11

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

diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix
index 1bb6049bc849..051a2be17e1a 100644
--- a/pkgs/by-name/ca/cables/package.nix
+++ b/pkgs/by-name/ca/cables/package.nix
@@ -7,12 +7,12 @@
 
 let
   pname = "cables";
-  version = "0.5.10";
+  version = "0.5.11";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage";
-    sha256 = "sha256-FwjmqCIoo1RG+57Y1fnAAWRtOAj4ILQb0pJMESxkiwo=";
+    sha256 = "sha256-d6IKORuySXrVk5ifevtPlposSuxk7n9b/dxD8CRfdMQ=";
   };
 
   appimageContents = appimageTools.extract {

From 79fe936cb8a85d90f7b44c7d356e168504adc497 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 7 Apr 2025 14:27:59 +0000
Subject: [PATCH 230/489] uiua: 0.15.0 -> 0.15.1

---
 pkgs/by-name/ui/uiua/stable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix
index a46416c8c21c..dee37a99cc6b 100644
--- a/pkgs/by-name/ui/uiua/stable.nix
+++ b/pkgs/by-name/ui/uiua/stable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.15.0";
+  version = "0.15.1";
   tag = version;
-  hash = "sha256-XjU8XPi8jTydJ439X6hjyZhXho2zbtt4Fqq3uIQg09M=";
-  cargoHash = "sha256-tMNIk52nq4dYfJU+nP2IKW21ex13YdrDvrEm2GSAAF4=";
+  hash = "sha256-PTpGjJCTqc8bgCfKoq8Bh5eb5vWc1ZjWtdZXMY2j2f8=";
+  cargoHash = "sha256-UAwlnJsZfHnKzchhn79cBsX3iRPV+N52szRMiv2NBno=";
   updateScript = ./update-stable.sh;
 }

From 255a0335b7ac40855b7e210ec7ea00b559d630eb Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 7 Apr 2025 14:30:30 +0000
Subject: [PATCH 231/489] uiua-unstable: 0.15.0 -> 0.15.1

---
 pkgs/by-name/ui/uiua/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix
index a245509ec20c..99978a95e8bc 100644
--- a/pkgs/by-name/ui/uiua/unstable.nix
+++ b/pkgs/by-name/ui/uiua/unstable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.15.0";
+  version = "0.15.1";
   tag = version;
-  hash = "sha256-XjU8XPi8jTydJ439X6hjyZhXho2zbtt4Fqq3uIQg09M=";
-  cargoHash = "sha256-tMNIk52nq4dYfJU+nP2IKW21ex13YdrDvrEm2GSAAF4=";
+  hash = "sha256-PTpGjJCTqc8bgCfKoq8Bh5eb5vWc1ZjWtdZXMY2j2f8=";
+  cargoHash = "sha256-UAwlnJsZfHnKzchhn79cBsX3iRPV+N52szRMiv2NBno=";
   updateScript = ./update-unstable.sh;
 }

From fa7a27b2bc8feb35a344aa3ea458650629771493 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 7 Apr 2025 16:29:03 +0200
Subject: [PATCH 232/489] vscode-extensions.uiua-lang.uiua-vscode: 0.0.62 ->
 0.0.63

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 63d1f22bf9b7..4b72b470176d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5038,8 +5038,8 @@ let
         mktplcRef = {
           name = "uiua-vscode";
           publisher = "uiua-lang";
-          version = "0.0.62";
-          hash = "sha256-Fq3NmCL17QVAmOmFWSkxc0qRwCRDsRbkeRzwyP02Nq4=";
+          version = "0.0.63";
+          hash = "sha256-qlBcnQyH5VbgmBlTvVi59OpYtyuVrJLoSuRIbrBGFVE=";
         };
         meta = {
           description = "VSCode language extension for Uiua";

From 253906b62bc3306924e061beb33954dff17e2ffc Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Sun, 6 Apr 2025 13:21:58 +0530
Subject: [PATCH 233/489] nixosTests: add base configuration for the COSMIC
 modules' tests

---
 nixos/tests/cosmic.nix | 131 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 nixos/tests/cosmic.nix

diff --git a/nixos/tests/cosmic.nix b/nixos/tests/cosmic.nix
new file mode 100644
index 000000000000..44df8fb1da49
--- /dev/null
+++ b/nixos/tests/cosmic.nix
@@ -0,0 +1,131 @@
+{
+  config,
+  lib,
+  testName,
+  enableAutologin,
+  enableXWayland,
+  ...
+}:
+
+{
+  name = testName;
+
+  meta = {
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      thefossguy
+    ];
+  };
+
+  nodes.machine = {
+    imports = [ ./common/user-account.nix ];
+
+    services = {
+      # For `cosmic-store` to be added to `environment.systemPackages`
+      # and for it to work correctly because Flatpak is a runtime
+      # dependency of `cosmic-store`.
+      flatpak.enable = true;
+
+      displayManager.cosmic-greeter.enable = true;
+      desktopManager.cosmic = {
+        enable = true;
+        xwayland.enable = enableXWayland;
+      };
+    };
+
+    services.displayManager.autoLogin = lib.mkIf enableAutologin {
+      enable = true;
+      user = "alice";
+    };
+
+    environment.systemPackages = with config.node.pkgs; [
+      # These two packages are used to check if a window was opened
+      # under the COSMIC session or not. Kinda important.
+      # TODO: Move the check from the test module to
+      # `nixos/lib/test-driver/src/test_driver/machine.py` so more
+      # Wayland-only testing can be done using the existing testing
+      # infrastructure.
+      jq
+      lswt
+    ];
+
+    # So far, all COSMIC tests launch a few GUI applications. In doing
+    # so, the default allocated memory to the guest of 1024M quickly
+    # poses a very high risk of an OOM-shutdown which is worse than an
+    # OOM-kill. Because now, the test failed, but not for a genuine
+    # reason, but an OOM-shutdown. That's an inconclusive failure
+    # which might possibly mask an actual failure. Not enabling
+    # systemd-oomd because we need said applications running for a
+    # few seconds. So instead, bump the allocated memory to the guest
+    # from 1024M to 4x; 4096M.
+    virtualisation.memorySize = 4096;
+  };
+
+  testScript =
+    { nodes, ... }:
+    let
+      cfg = nodes.machine;
+      user = cfg.users.users.alice;
+      DISPLAY = lib.strings.optionalString enableXWayland (
+        if enableAutologin then "DISPLAY=:0" else "DISPLAY=:1"
+      );
+    in
+    ''
+      #testName: ${testName}
+    ''
+    + (
+      if (enableAutologin) then
+        ''
+          with subtest("cosmic-greeter initialisation"):
+              machine.wait_for_unit("graphical.target")
+        ''
+      else
+        ''
+          from time import sleep
+
+          machine.wait_for_unit("graphical.target")
+          machine.wait_until_succeeds("pgrep --uid ${toString cfg.users.users.cosmic-greeter.name} --full cosmic-greeter")
+          # Sleep for 10 seconds for ensuring that `greetd` loads the
+          # password prompt for the login screen properly.
+          sleep(10)
+
+          with subtest("cosmic-session login"):
+              machine.send_chars("${user.password}\n", delay=0.2)
+        ''
+    )
+    + ''
+          # _One_ of the final processes to start as part of the
+          # `cosmic-session` target is the Workspaces applet. So, wait
+          # for it to start. The process existing means that COSMIC
+          # now handles any opened windows from now on.
+          machine.wait_until_succeeds("pgrep --uid ${toString user.uid} --full 'cosmic-panel-button com.system76.CosmicWorkspaces'")
+
+      # The best way to test for Wayland and XWayland is to launch
+      # the GUI applications and see the results yourself.
+      with subtest("Launch applications"):
+          # key: binary_name
+          # value: "app-id" as reported by `lswt`
+          gui_apps_to_launch = {}
+
+          # We want to ensure that the first-party applications
+          # start/launch properly.
+          gui_apps_to_launch['cosmic-edit'] = 'com.system76.CosmicEdit'
+          gui_apps_to_launch['cosmic-files'] = 'com.system76.CosmicFiles'
+          gui_apps_to_launch['cosmic-player'] = 'com.system76.CosmicPlayer'
+          gui_apps_to_launch['cosmic-settings'] = 'com.system76.CosmicSettings'
+          gui_apps_to_launch['cosmic-store'] = 'com.system76.CosmicStore'
+          gui_apps_to_launch['cosmic-term'] = 'com.system76.CosmicTerm'
+
+          for gui_app, app_id in gui_apps_to_launch.items():
+              machine.succeed(f"su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} ${DISPLAY} {gui_app} >&2 &'", timeout=5)
+              # Nix builds the following non-commented expression to the following:
+              #                              `su - alice -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/1000 lswt --json | jq ".toplevels" | grep "^    \\"app-id\\": \\"{app_id}\\"$"' `
+              machine.wait_until_succeeds(f''''su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} lswt --json | jq ".toplevels" | grep "^    \\"app-id\\": \\"{app_id}\\"$"' '''', timeout=30)
+              machine.succeed(f"pkill {gui_app}", timeout=5)
+
+      machine.succeed("echo 'test completed succeessfully' > /${testName}")
+      machine.copy_from_vm('/${testName}')
+
+      machine.shutdown()
+    '';
+}

From d4ea9e9d2e4c475a8147c2583352abcc7c845cf1 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Sun, 6 Apr 2025 13:22:49 +0530
Subject: [PATCH 234/489] nixosTests.cosmic: init

---
 nixos/tests/all-tests.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index df22707356e6..b1e7639b9bc7 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -339,6 +339,12 @@ in
   containers-unified-hierarchy = handleTest ./containers-unified-hierarchy.nix { };
   convos = handleTest ./convos.nix { };
   corerad = handleTest ./corerad.nix { };
+  cosmic = runTest {
+    imports = [ ./cosmic.nix ];
+    _module.args.testName = "cosmic";
+    _module.args.enableAutologin = false;
+    _module.args.enableXWayland = true;
+  };
   coturn = handleTest ./coturn.nix { };
   couchdb = handleTest ./couchdb.nix { };
   crabfit = handleTest ./crabfit.nix { };

From 3dde381d9db571fb45b144d8cbb1b5db004e4cee Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Sun, 6 Apr 2025 13:23:14 +0530
Subject: [PATCH 235/489] nixosTests.cosmic-autologin: init

---
 nixos/tests/all-tests.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b1e7639b9bc7..0ee231fcd03f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -345,6 +345,12 @@ in
     _module.args.enableAutologin = false;
     _module.args.enableXWayland = true;
   };
+  cosmic-autologin = runTest {
+    imports = [ ./cosmic.nix ];
+    _module.args.testName = "cosmic-autologin";
+    _module.args.enableAutologin = true;
+    _module.args.enableXWayland = true;
+  };
   coturn = handleTest ./coturn.nix { };
   couchdb = handleTest ./couchdb.nix { };
   crabfit = handleTest ./crabfit.nix { };

From 64627fbbb283b3370a66a6478a46d8c6a260f033 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Sun, 6 Apr 2025 13:23:43 +0530
Subject: [PATCH 236/489] nixosTests.cosmic-noxwayland: init

---
 nixos/tests/all-tests.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0ee231fcd03f..7104bdef541f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -351,6 +351,12 @@ in
     _module.args.enableAutologin = true;
     _module.args.enableXWayland = true;
   };
+  cosmic-noxwayland = runTest {
+    imports = [ ./cosmic.nix ];
+    _module.args.testName = "cosmic-noxwayland";
+    _module.args.enableAutologin = false;
+    _module.args.enableXWayland = false;
+  };
   coturn = handleTest ./coturn.nix { };
   couchdb = handleTest ./couchdb.nix { };
   crabfit = handleTest ./crabfit.nix { };

From d4afb70293e08f50f182ac6893aff562ee412cb9 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Sun, 6 Apr 2025 13:24:08 +0530
Subject: [PATCH 237/489] nixosTests.cosmic-autologin-noxwayland: init

---
 nixos/tests/all-tests.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7104bdef541f..9477e8da435a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -357,6 +357,12 @@ in
     _module.args.enableAutologin = false;
     _module.args.enableXWayland = false;
   };
+  cosmic-autologin-noxwayland = runTest {
+    imports = [ ./cosmic.nix ];
+    _module.args.testName = "cosmic-autologin-noxwayland";
+    _module.args.enableAutologin = true;
+    _module.args.enableXWayland = false;
+  };
   coturn = handleTest ./coturn.nix { };
   couchdb = handleTest ./couchdb.nix { };
   crabfit = handleTest ./crabfit.nix { };

From 65a333600d5c88a98d674f637d092807cfc12253 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 7 Apr 2025 08:23:42 +0200
Subject: [PATCH 238/489] treewide: replace `rev` with `tag`

---
 doc/languages-frameworks/crystal.section.md   |  4 +-
 doc/languages-frameworks/dart.section.md      |  2 +-
 doc/languages-frameworks/dlang.section.md     |  2 +-
 doc/languages-frameworks/go.section.md        |  2 +-
 .../javascript.section.md                     |  2 +-
 doc/languages-frameworks/rust.section.md      |  6 +-
 doc/languages-frameworks/swift.section.md     |  2 +-
 nixos/tests/dokuwiki.nix                      |  2 +-
 pkgs/applications/audio/airwave/default.nix   |  2 +-
 pkgs/applications/audio/ardour/7.nix          |  2 +-
 pkgs/applications/audio/ardour/default.nix    |  2 +-
 .../audio/bucklespring/default.nix            |  2 +-
 pkgs/applications/audio/cmus/default.nix      |  2 +-
 .../audio/codecserver/default.nix             |  2 +-
 .../audio/csound/csound-qt/default.nix        |  2 +-
 pkgs/applications/audio/deadbeef/default.nix  |  2 +-
 .../audio/deadbeef/plugins/headerbar-gtk3.nix |  2 +-
 .../audio/deadbeef/plugins/mpris2.nix         |  2 +-
 .../audio/deadbeef/plugins/statusnotifier.nix |  2 +-
 pkgs/applications/audio/dfasma/default.nix    |  2 +-
 .../audio/easyaudiosync/default.nix           |  2 +-
 pkgs/applications/audio/espeak-ng/default.nix |  2 +-
 pkgs/applications/audio/faust/faust2.nix      |  2 +-
 pkgs/applications/audio/faust/faustlive.nix   |  2 +-
 pkgs/applications/audio/flacon/default.nix    |  2 +-
 pkgs/applications/audio/fmit/default.nix      |  2 +-
 pkgs/applications/audio/ft2-clone/default.nix |  2 +-
 .../applications/audio/grandorgue/default.nix |  2 +-
 pkgs/applications/audio/hydrogen/default.nix  |  2 +-
 pkgs/applications/audio/jackmix/default.nix   |  2 +-
 pkgs/applications/audio/jamesdsp/default.nix  |  2 +-
 .../audio/ladspa-plugins/default.nix          |  2 +-
 pkgs/applications/audio/librespot/default.nix |  2 +-
 .../audio/linvstmanager/default.nix           |  2 +-
 pkgs/applications/audio/lmms/default.nix      |  2 +-
 .../applications/audio/lpd8editor/default.nix |  2 +-
 .../magnetophonDSP/VoiceOfFaust/default.nix   |  2 +-
 .../faustCompressors/default.nix              |  2 +-
 pkgs/applications/audio/master_me/default.nix |  2 +-
 .../audio/mellowplayer/default.nix            |  2 +-
 .../audio/melmatcheq.lv2/default.nix          |  2 +-
 pkgs/applications/audio/minidsp/default.nix   |  2 +-
 pkgs/applications/audio/mixxx/default.nix     |  2 +-
 .../audio/mopidy/musicbox-webclient.nix       |  2 +-
 pkgs/applications/audio/mopidy/soundcloud.nix |  2 +-
 pkgs/applications/audio/mopidy/subidy.nix     |  2 +-
 pkgs/applications/audio/mopidy/ytmusic.nix    |  2 +-
 pkgs/applications/audio/muse/default.nix      |  2 +-
 pkgs/applications/audio/noson/default.nix     |  2 +-
 .../audio/pianobooster/default.nix            |  2 +-
 .../audio/pipecontrol/default.nix             |  2 +-
 pkgs/applications/audio/playbar2/default.nix  |  2 +-
 pkgs/applications/audio/polyphone/default.nix |  2 +-
 pkgs/applications/audio/pragha/default.nix    |  2 +-
 .../applications/audio/projectm_3/default.nix |  2 +-
 .../audio/radiotray-ng/default.nix            |  2 +-
 pkgs/applications/audio/sayonara/default.nix  |  2 +-
 pkgs/applications/audio/seq66/default.nix     |  2 +-
 pkgs/applications/audio/sfxr-qt/default.nix   |  2 +-
 pkgs/applications/audio/sisco.lv2/default.nix |  2 +-
 pkgs/applications/audio/snapcast/default.nix  |  2 +-
 pkgs/applications/audio/sonic-pi/default.nix  |  2 +-
 pkgs/applications/audio/spek/default.nix      |  2 +-
 .../applications/audio/strawberry/default.nix |  2 +-
 pkgs/applications/audio/tageditor/default.nix |  2 +-
 .../backup/timeshift/unwrapped.nix            |  2 +-
 .../blockchains/alfis/default.nix             |  2 +-
 .../blockchains/bitcoin-abc/default.nix       |  2 +-
 .../blockchains/digibyte/default.nix          |  2 +-
 .../blockchains/electrs/default.nix           |  2 +-
 .../blockchains/fulcrum/default.nix           |  2 +-
 .../blockchains/gridcoin-research/default.nix |  2 +-
 .../blockchains/groestlcoin/default.nix       |  2 +-
 .../blockchains/lighthouse/default.nix        |  2 +-
 .../blockchains/monero-cli/default.nix        |  2 +-
 .../blockchains/monero-gui/default.nix        |  2 +-
 .../blockchains/optimism/geth.nix             |  2 +-
 .../blockchains/snarkos/default.nix           |  2 +-
 .../applications/blockchains/teos/default.nix |  2 +-
 .../blockchains/zcash/default.nix             |  2 +-
 .../display-managers/greetd/regreet.nix       |  2 +-
 .../display-managers/lightdm/default.nix      |  2 +-
 .../applications/editors/cpeditor/default.nix |  2 +-
 .../applications/editors/cudatext/default.nix |  2 +-
 .../manual-packages/copilot/package.nix       |  2 +-
 .../manual-packages/idris2-mode/package.nix   |  2 +-
 .../manual-packages/rect-mark/package.nix     |  2 +-
 .../manual-packages/tsc/package.nix           |  2 +-
 .../editors/focuswriter/default.nix           |  2 +-
 .../jupyter-kernels/clojupyter/default.nix    |  2 +-
 .../editors/jupyter-kernels/coq/kernel.nix    |  2 +-
 .../jupyter-kernels/wolfram/kernel.nix        |  2 +-
 .../jupyter-kernels/xeus-cling/xeus-cling.nix |  2 +-
 .../editors/kakoune/plugins/overrides.nix     |  4 +-
 .../editors/leo-editor/default.nix            |  2 +-
 pkgs/applications/editors/lite-xl/default.nix |  2 +-
 .../editors/mindforger/default.nix            |  2 +-
 .../editors/neovim/gnvim/default.nix          |  2 +-
 .../editors/notepadqq/default.nix             |  2 +-
 .../applications/editors/qxmledit/default.nix |  2 +-
 pkgs/applications/editors/tiled/default.nix   |  2 +-
 pkgs/applications/editors/vim/common.nix      |  2 +-
 .../non-generated/gitlab-vim/default.nix      |  2 +-
 .../rescript-editor-analysis.nix              |  2 +-
 .../vadimcn.vscode-lldb/default.nix           |  2 +-
 .../editors/your-editor/default.nix           |  2 +-
 pkgs/applications/editors/zee/default.nix     |  2 +-
 pkgs/applications/emulators/blink/default.nix |  2 +-
 .../emulators/firebird-emu/default.nix        |  2 +-
 .../emulators/goldberg-emu/default.nix        |  2 +-
 pkgs/applications/emulators/wibo/default.nix  |  2 +-
 pkgs/applications/emulators/zsnes/2.x.nix     |  2 +-
 pkgs/applications/gis/grass/default.nix       |  2 +-
 .../gis/whitebox-tools/default.nix            |  2 +-
 .../applications/graphics/ImageMagick/6.x.nix |  2 +-
 .../graphics/apitrace/default.nix             |  2 +-
 .../graphics/cloudcompare/default.nix         |  2 +-
 pkgs/applications/graphics/drawio/default.nix |  2 +-
 .../graphics/drawpile/default.nix             |  2 +-
 .../graphics/emulsion/default.nix             |  2 +-
 pkgs/applications/graphics/feh/default.nix    |  2 +-
 .../graphics/fontmatrix/default.nix           |  2 +-
 .../graphics/foxotron/default.nix             |  2 +-
 .../graphics/gimp/plugins/default.nix         |  6 +-
 .../graphics/gnome-decoder/default.nix        |  2 +-
 .../graphics/gnome-obfuscate/default.nix      |  2 +-
 pkgs/applications/graphics/imgp/default.nix   |  2 +-
 pkgs/applications/graphics/ktikz/default.nix  |  2 +-
 .../graphics/mandelbulber/default.nix         |  2 +-
 .../applications/graphics/menyoki/default.nix |  2 +-
 pkgs/applications/graphics/ovito/default.nix  |  2 +-
 .../graphics/photoflare/default.nix           |  2 +-
 .../graphics/phototonic/default.nix           |  2 +-
 .../graphics/pineapple-pictures/default.nix   |  2 +-
 .../graphics/qcomicbook/default.nix           |  2 +-
 pkgs/applications/graphics/qosmic/default.nix |  2 +-
 pkgs/applications/graphics/qvge/default.nix   |  2 +-
 pkgs/applications/graphics/qview/default.nix  |  2 +-
 .../rapid-photo-downloader/default.nix        |  2 +-
 .../graphics/rawtherapee/default.nix          |  2 +-
 pkgs/applications/graphics/sane/xsane.nix     |  2 +-
 .../graphics/scantailor/advanced.nix          |  2 +-
 .../graphics/scantailor/universal.nix         |  2 +-
 pkgs/applications/graphics/sxiv/default.nix   |  2 +-
 .../graphics/tesseract/tesseract3.nix         |  2 +-
 .../graphics/tesseract/tesseract4.nix         |  2 +-
 .../graphics/tesseract/tesseract5.nix         |  2 +-
 .../graphics/xournalpp/default.nix            |  2 +-
 .../graphics/yacreader/default.nix            |  2 +-
 .../misc/ArchiSteamFarm/default.nix           |  2 +-
 .../misc/ArchiSteamFarm/web-ui/default.nix    |  2 +-
 pkgs/applications/misc/ape/clex.nix           |  2 +-
 pkgs/applications/misc/ausweisapp/default.nix |  2 +-
 .../misc/avalonia-ilspy/default.nix           |  2 +-
 pkgs/applications/misc/barrier/default.nix    |  2 +-
 pkgs/applications/misc/binocle/default.nix    |  2 +-
 pkgs/applications/misc/birdtray/default.nix   |  2 +-
 .../misc/bluetooth_battery/default.nix        |  2 +-
 pkgs/applications/misc/brewtarget/default.nix |  2 +-
 pkgs/applications/misc/candle/default.nix     |  2 +-
 .../misc/chewing-editor/default.nix           |  2 +-
 pkgs/applications/misc/clight/clightd.nix     |  2 +-
 pkgs/applications/misc/clight/default.nix     |  2 +-
 pkgs/applications/misc/collision/default.nix  |  2 +-
 pkgs/applications/misc/copyq/default.nix      |  2 +-
 .../misc/cubiomes-viewer/default.nix          |  2 +-
 .../cubocore-packages/coreaction/default.nix  |  2 +-
 .../corearchiver/default.nix                  |  2 +-
 .../misc/cubocore-packages/corefm/default.nix |  2 +-
 .../cubocore-packages/coregarage/default.nix  |  2 +-
 .../cubocore-packages/corehunt/default.nix    |  2 +-
 .../cubocore-packages/coreimage/default.nix   |  2 +-
 .../cubocore-packages/coreinfo/default.nix    |  2 +-
 .../corekeyboard/default.nix                  |  2 +-
 .../cubocore-packages/corepad/default.nix     |  2 +-
 .../cubocore-packages/corepaint/default.nix   |  2 +-
 .../cubocore-packages/corepdf/default.nix     |  2 +-
 .../cubocore-packages/corepins/default.nix    |  2 +-
 .../cubocore-packages/corerenamer/default.nix |  2 +-
 .../cubocore-packages/coreshot/default.nix    |  2 +-
 .../cubocore-packages/corestats/default.nix   |  2 +-
 .../cubocore-packages/corestuff/default.nix   |  2 +-
 .../coreterminal/default.nix                  |  2 +-
 .../cubocore-packages/coretime/default.nix    |  2 +-
 .../coretoppings/default.nix                  |  2 +-
 .../coreuniverse/default.nix                  |  2 +-
 .../cubocore-packages/libcprime/default.nix   |  2 +-
 .../cubocore-packages/libcsys/default.nix     |  2 +-
 pkgs/applications/misc/cura/default.nix       |  2 +-
 pkgs/applications/misc/cura/plugins.nix       |  2 +-
 pkgs/applications/misc/curaengine/default.nix |  2 +-
 pkgs/applications/misc/curaengine/stable.nix  |  2 +-
 pkgs/applications/misc/ddcui/default.nix      |  2 +-
 .../deadd-notification-center/default.nix     |  2 +-
 pkgs/applications/misc/diff-pdf/default.nix   |  2 +-
 .../misc/digitalbitbox/default.nix            |  2 +-
 pkgs/applications/misc/dmensamenu/default.nix |  2 +-
 pkgs/applications/misc/dupeguru/default.nix   |  2 +-
 pkgs/applications/misc/edgetx/default.nix     |  2 +-
 pkgs/applications/misc/electrum/ltc.nix       |  2 +-
 .../misc/eureka-ideas/default.nix             |  2 +-
 pkgs/applications/misc/goldendict/default.nix |  2 +-
 pkgs/applications/misc/gphoto2/default.nix    |  2 +-
 pkgs/applications/misc/heimer/default.nix     |  2 +-
 pkgs/applications/misc/hovercraft/default.nix |  2 +-
 pkgs/applications/misc/huggle/default.nix     |  2 +-
 .../misc/inherd-quake/default.nix             |  2 +-
 pkgs/applications/misc/inlyne/default.nix     |  2 +-
 pkgs/applications/misc/inochi2d/default.nix   |  4 +-
 pkgs/applications/misc/input-leap/default.nix |  2 +-
 .../misc/johnny-reborn/default.nix            |  2 +-
 pkgs/applications/misc/k4dirstat/default.nix  |  2 +-
 pkgs/applications/misc/kapow/default.nix      |  2 +-
 pkgs/applications/misc/keepassxc/default.nix  |  2 +-
 pkgs/applications/misc/kemai/default.nix      |  2 +-
 pkgs/applications/misc/kiwix/default.nix      |  2 +-
 pkgs/applications/misc/kiwix/lib.nix          |  2 +-
 pkgs/applications/misc/klayout/default.nix    |  2 +-
 .../misc/klipper-estimator/default.nix        |  2 +-
 .../applications/misc/ksmoothdock/default.nix |  2 +-
 pkgs/applications/misc/lutris/default.nix     |  2 +-
 pkgs/applications/misc/makehuman/default.nix  |  4 +-
 .../misc/maliit-keyboard/default.nix          |  2 +-
 pkgs/applications/misc/mdzk/default.nix       |  2 +-
 pkgs/applications/misc/mediaelch/default.nix  |  2 +-
 pkgs/applications/misc/moolticute/default.nix |  2 +-
 pkgs/applications/misc/nimbo/default.nix      |  2 +-
 pkgs/applications/misc/nixnote2/default.nix   |  2 +-
 pkgs/applications/misc/openambit/default.nix  |  2 +-
 .../misc/osmscout-server/default.nix          |  2 +-
 pkgs/applications/misc/pastel/default.nix     |  2 +-
 pkgs/applications/misc/pdfpc/default.nix      |  2 +-
 pkgs/applications/misc/pe-bear/default.nix    |  2 +-
 pkgs/applications/misc/peaclock/default.nix   |  2 +-
 pkgs/applications/misc/pgmodeler/default.nix  |  2 +-
 .../plasma-applet-volumewin7mixer/default.nix |  2 +-
 .../misc/plasma-theme-switcher/default.nix    |  2 +-
 pkgs/applications/misc/plover/default.nix     |  2 +-
 .../misc/prusa-slicer/super-slicer.nix        |  2 +-
 pkgs/applications/misc/pueue/default.nix      |  2 +-
 pkgs/applications/misc/pure-maps/default.nix  |  2 +-
 pkgs/applications/misc/q4wine/default.nix     |  2 +-
 .../misc/qMasterPassword/default.nix          |  2 +-
 pkgs/applications/misc/qcad/default.nix       |  2 +-
 pkgs/applications/misc/qsudo/default.nix      |  2 +-
 .../misc/qsyncthingtray/default.nix           |  2 +-
 pkgs/applications/misc/qtpass/default.nix     |  2 +-
 pkgs/applications/misc/reddsaver/default.nix  |  2 +-
 .../misc/redshift-plasma-applet/default.nix   |  2 +-
 pkgs/applications/misc/redshift/default.nix   |  4 +-
 pkgs/applications/misc/resp-app/default.nix   |  2 +-
 pkgs/applications/misc/rofi-emoji/default.nix |  2 +-
 pkgs/applications/misc/rofi/default.nix       |  2 +-
 pkgs/applications/misc/rofi/wayland.nix       |  2 +-
 pkgs/applications/misc/slstatus/default.nix   |  2 +-
 pkgs/applications/misc/stog/default.nix       |  2 +-
 pkgs/applications/misc/stork/default.nix      |  2 +-
 pkgs/applications/misc/swappy/default.nix     |  2 +-
 pkgs/applications/misc/synergy/default.nix    |  2 +-
 .../misc/terminal-typeracer/default.nix       |  2 +-
 pkgs/applications/misc/tipp10/default.nix     |  2 +-
 pkgs/applications/misc/tuxclocker/default.nix |  2 +-
 .../misc/twitch-chat-downloader/default.nix   |  2 +-
 pkgs/applications/misc/ubpm/default.nix       |  2 +-
 pkgs/applications/misc/valentina/default.nix  |  2 +-
 pkgs/applications/misc/visidata/default.nix   |  2 +-
 pkgs/applications/misc/wikicurses/default.nix |  2 +-
 pkgs/applications/misc/xsw/default.nix        |  2 +-
 .../networking/browsers/elinks/default.nix    |  2 +-
 .../networking/browsers/qtchan/default.nix    |  2 +-
 .../networking/browsers/surf/default.nix      |  2 +-
 .../networking/browsers/webmacs/default.nix   |  2 +-
 .../networking/cluster/calico/default.nix     |  2 +-
 .../networking/cluster/cni/default.nix        |  2 +-
 .../networking/cluster/cni/plugins.nix        |  2 +-
 .../cluster/helm/plugins/helm-cm-push.nix     |  2 +-
 .../cluster/helm/plugins/helm-diff.nix        |  2 +-
 .../cluster/helm/plugins/helm-git.nix         |  2 +-
 .../cluster/helm/plugins/helm-mapkubeapis.nix |  2 +-
 .../cluster/helm/plugins/helm-s3.nix          |  2 +-
 .../cluster/helm/plugins/helm-secrets.nix     |  2 +-
 .../cluster/helm/plugins/helm-unittest.nix    |  2 +-
 .../networking/cluster/helmfile/default.nix   |  2 +-
 .../networking/cluster/k3s/builder.nix        |  2 +-
 .../cluster/kubectl-evict-pod/default.nix     |  2 +-
 .../networking/cluster/kubernetes/default.nix |  2 +-
 .../networking/cluster/kubeval/default.nix    |  2 +-
 .../networking/cluster/kuma/default.nix       |  2 +-
 .../networking/cluster/minikube/default.nix   |  2 +-
 .../networking/cluster/nomad/default.nix      |  2 +-
 .../networking/cluster/roxctl/default.nix     |  2 +-
 .../networking/cluster/sonobuoy/default.nix   |  2 +-
 .../networking/cluster/terraform/default.nix  |  2 +-
 .../networking/cluster/timoni/default.nix     |  2 +-
 .../networking/compactor/default.nix          |  2 +-
 .../networking/firehol/default.nix            |  2 +-
 .../networking/ftp/gftp/default.nix           |  2 +-
 pkgs/applications/networking/geph/default.nix |  4 +-
 .../google-drive-ocamlfuse/default.nix        |  2 +-
 .../networking/icemon/default.nix             |  2 +-
 .../networking/ids/zeek/broker/default.nix    |  2 +-
 .../discord-screenaudio/default.nix           |  2 +-
 .../instant-messengers/jami/default.nix       |  2 +-
 .../instant-messengers/linphone/default.nix   |  2 +-
 .../matrix-commander/default.nix              |  2 +-
 .../pantalaimon/default.nix                   |  2 +-
 .../pidgin/pidgin-plugins/carbons/default.nix |  2 +-
 .../pidgin-plugins/msn-pecan/default.nix      |  2 +-
 .../pidgin-indicator/default.nix              |  2 +-
 .../pidgin-opensteamworks/default.nix         |  2 +-
 .../pidgin-skypeweb/default.nix               |  2 +-
 .../pidgin-plugins/purple-lurch/default.nix   |  2 +-
 .../pidgin-plugins/purple-signald/default.nix |  2 +-
 .../pidgin-plugins/tdlib-purple/default.nix   |  2 +-
 .../instant-messengers/profanity/default.nix  |  2 +-
 .../instant-messengers/psi-plus/default.nix   |  2 +-
 .../instant-messengers/psi/default.nix        |  2 +-
 .../instant-messengers/quaternion/default.nix |  2 +-
 .../telegram/tg/default.nix                   |  2 +-
 .../networking/irc/quassel/default.nix        |  2 +-
 .../networking/irc/tiny/default.nix           |  2 +-
 .../irc/weechat/scripts/edit/default.nix      |  2 +-
 .../irc/weechat/scripts/wee-slack/default.nix |  2 +-
 .../scripts/weechat-matrix/default.nix        |  2 +-
 .../scripts/weechat-notify-send/default.nix   |  2 +-
 .../weechat/scripts/weechat-otr/default.nix   |  2 +-
 .../networking/ktailctl/default.nix           |  2 +-
 .../networking/libcoap/default.nix            |  2 +-
 .../mailreaders/astroid/default.nix           |  2 +-
 .../mailreaders/mailnag/default.nix           |  2 +-
 .../mailreaders/mailnag/goa-plugin.nix        |  2 +-
 .../applications/networking/mhost/default.nix |  2 +-
 .../networking/mujmap/default.nix             |  2 +-
 .../networking/mumble/default.nix             |  2 +-
 .../networking/netmaker/default.nix           |  2 +-
 .../newsreaders/quiterss/default.nix          |  2 +-
 .../networking/ostinato/default.nix           |  2 +-
 .../networking/p2p/eiskaltdcpp/default.nix    |  2 +-
 .../networking/p2p/jesec-rtorrent/default.nix |  2 +-
 .../p2p/jesec-rtorrent/libtorrent.nix         |  2 +-
 .../networking/p2p/retroshare/default.nix     |  2 +-
 .../networking/p2p/transmission/4.nix         |  2 +-
 .../networking/rymdport/default.nix           |  2 +-
 .../networking/seafile-client/default.nix     |  2 +-
 .../networking/sniffers/wireshark/default.nix |  2 +-
 .../networking/sync/acd_cli/default.nix       |  2 +-
 .../networking/sync/backintime/common.nix     |  2 +-
 .../networking/sync/rclone/browser.nix        |  2 +-
 .../networking/wgnord/default.nix             |  2 +-
 pkgs/applications/networking/znc/modules.nix  |  2 +-
 pkgs/applications/office/PageEdit/default.nix |  2 +-
 .../office/activitywatch/default.nix          |  2 +-
 .../office/beamerpresenter/default.nix        |  2 +-
 .../office/beancount/beancount-ing-diba.nix   |  2 +-
 pkgs/applications/office/jabref/default.nix   |  2 +-
 .../office/pdfmixtool/default.nix             |  2 +-
 pkgs/applications/radio/cqrlog/default.nix    |  2 +-
 pkgs/applications/radio/cubicsdr/default.nix  |  2 +-
 pkgs/applications/radio/direwolf/default.nix  |  2 +-
 pkgs/applications/radio/gnuradio/shared.nix   |  2 +-
 pkgs/applications/radio/gqrx/default.nix      |  2 +-
 pkgs/applications/radio/guglielmo/default.nix |  2 +-
 pkgs/applications/radio/limesuite/default.nix |  2 +-
 pkgs/applications/radio/openwebrx/default.nix |  6 +-
 pkgs/applications/radio/qdmr/default.nix      |  2 +-
 pkgs/applications/radio/qlog/default.nix      |  2 +-
 pkgs/applications/radio/rtl-sdr/default.nix   |  4 +-
 pkgs/applications/radio/sigdigger/default.nix |  2 +-
 pkgs/applications/radio/welle-io/default.nix  |  2 +-
 .../science/astronomy/celestia/default.nix    |  2 +-
 .../science/astronomy/gpredict/default.nix    |  2 +-
 .../science/biology/hh-suite/default.nix      |  2 +-
 .../science/biology/kallisto/default.nix      |  2 +-
 .../science/biology/nest/default.nix          |  2 +-
 .../science/biology/truvari/default.nix       |  2 +-
 .../science/chemistry/avogadro2/default.nix   |  2 +-
 .../timeloop/default.nix                      |  2 +-
 .../science/electronics/caneda/default.nix    |  2 +-
 .../hal-hardware-analyzer/default.nix         |  2 +-
 .../science/electronics/librepcb/default.nix  |  2 +-
 .../science/electronics/openems/default.nix   |  2 +-
 .../electronics/openhantek6022/default.nix    |  2 +-
 .../science/electronics/qucs-s/default.nix    |  2 +-
 .../science/logic/cedille/default.nix         |  2 +-
 .../science/logic/klee/default.nix            |  2 +-
 .../science/logic/potassco/clingcon.nix       |  2 +-
 .../science/logic/potassco/clingo.nix         |  2 +-
 .../science/logic/tamarin-prover/default.nix  |  2 +-
 .../finalfusion-utils/default.nix             |  2 +-
 .../science/math/caffe/default.nix            |  2 +-
 .../math/engauge-digitizer/default.nix        |  2 +-
 .../science/math/mpsolve/default.nix          |  2 +-
 .../science/math/yacas/default.nix            |  2 +-
 .../science/misc/colmap/default.nix           |  2 +-
 .../science/misc/convertall/default.nix       |  2 +-
 .../science/misc/foldingathome/client.nix     |  2 +-
 .../science/misc/graphia/default.nix          |  2 +-
 .../science/misc/openmvg/default.nix          |  2 +-
 .../science/misc/openmvs/default.nix          |  2 +-
 .../science/misc/openrefine/default.nix       |  2 +-
 .../science/misc/rink/default.nix             |  2 +-
 .../molecular-dynamics/raspa/default.nix      |  2 +-
 .../science/robotics/apmplanner2/default.nix  |  2 +-
 .../robotics/sumorobot-manager/default.nix    |  2 +-
 pkgs/applications/system/monitor/default.nix  |  2 +-
 .../system/qjournalctl/default.nix            |  2 +-
 .../default.nix                               |  2 +-
 .../urxvt-font-size/default.nix               |  2 +-
 .../urxvt-perls/default.nix                   |  2 +-
 .../urxvt-tabbedex/default.nix                |  2 +-
 .../terminal-emulators/st/xst.nix             |  2 +-
 .../terminal-emulators/termite/default.nix    |  2 +-
 .../version-management/blackbox/default.nix   |  2 +-
 .../git-annex-metadata-gui/default.nix        |  2 +-
 .../git-archive-all/default.nix               |  2 +-
 .../git-credential-manager/default.nix        |  2 +-
 .../git-machete/default.nix                   |  2 +-
 .../git-publish/default.nix                   |  2 +-
 .../version-management/git-recent/default.nix |  2 +-
 .../version-management/git-review/default.nix |  2 +-
 .../version-management/git-stack/default.nix  |  2 +-
 .../version-management/gita/default.nix       |  2 +-
 .../version-management/gitqlient/default.nix  |  2 +-
 .../lucky-commit/default.nix                  |  2 +-
 .../version-management/nitpick/default.nix    |  2 +-
 .../version-management/sapling/default.nix    |  2 +-
 .../silver-platter/default.nix                |  2 +-
 .../svn-all-fast-export/default.nix           |  2 +-
 .../version-management/svn2git/default.nix    |  2 +-
 .../video/anilibria-winmaclinux/default.nix   |  2 +-
 pkgs/applications/video/haruna/default.nix    |  2 +-
 .../video/hyperion-ng/default.nix             |  2 +-
 .../video/jellyfin-media-player/default.nix   |  2 +-
 .../kodi/addons/archive_tool/default.nix      |  2 +-
 .../controller-topology-project/default.nix   |  2 +-
 .../video/kodi/addons/iagl/default.nix        |  2 +-
 .../video/kodi/addons/infotagger/default.nix  |  2 +-
 .../video/kodi/addons/jellycon/default.nix    |  2 +-
 .../video/kodi/addons/jellyfin/default.nix    |  2 +-
 .../video/kodi/addons/netflix/default.nix     |  2 +-
 .../video/kodi/addons/orftvthek/default.nix   |  2 +-
 .../video/kodi/addons/pdfreader/default.nix   |  2 +-
 .../video/kodi/addons/sendtokodi/default.nix  |  2 +-
 .../kodi/addons/sponsorblock/default.nix      |  2 +-
 .../kodi/addons/steam-library/default.nix     |  2 +-
 .../video/kodi/addons/svtplay/default.nix     |  2 +-
 .../video/kodi/addons/xbmcswift2/default.nix  |  2 +-
 .../video/kodi/addons/youtube/default.nix     |  2 +-
 pkgs/applications/video/mapmap/default.nix    |  2 +-
 pkgs/applications/video/minitube/default.nix  |  2 +-
 pkgs/applications/video/mpc-qt/default.nix    |  2 +-
 .../video/mpv/scripts/inhibit-gnome.nix       |  2 +-
 .../video/mpv/scripts/modernx-zydezu.nix      |  2 +-
 .../video/mpv/scripts/modernx.nix             |  2 +-
 pkgs/applications/video/mpv/scripts/mpris.nix |  2 +-
 .../video/mpv/scripts/mpv-discord.nix         |  2 +-
 .../video/mpv/scripts/mpvacious.nix           |  2 +-
 .../video/mpv/scripts/quality-menu.nix        |  2 +-
 .../video/mpv/scripts/simple-mpv-webui.nix    |  2 +-
 .../video/mpv/scripts/thumbnail.nix           |  2 +-
 pkgs/applications/video/mpv/scripts/uosc.nix  |  2 +-
 .../video/mpv/scripts/vr-reversal.nix         |  2 +-
 .../video/mpv/scripts/webtorrent-mpv-hook.nix |  2 +-
 .../video/mpv/scripts/youtube-upnext.nix      |  2 +-
 pkgs/applications/video/mythtv/default.nix    |  2 +-
 pkgs/applications/video/natron/default.nix    |  2 +-
 .../applications/video/obs-studio/default.nix |  2 +-
 .../advanced-scene-switcher/default.nix       |  2 +-
 .../obs-studio/plugins/obs-3d-effect.nix      |  2 +-
 .../plugins/obs-backgroundremoval/default.nix |  2 +-
 .../obs-studio/plugins/obs-command-source.nix |  2 +-
 .../obs-studio/plugins/obs-freeze-filter.nix  |  2 +-
 .../plugins/obs-gradient-source.nix           |  2 +-
 .../obs-studio/plugins/obs-gstreamer.nix      |  2 +-
 .../plugins/obs-hyperion/default.nix          |  2 +-
 .../plugins/obs-livesplit-one/default.nix     |  2 +-
 .../plugins/obs-move-transition.nix           |  2 +-
 .../plugins/obs-multi-rtmp/default.nix        |  2 +-
 .../obs-studio/plugins/obs-mute-filter.nix    |  2 +-
 .../obs-studio/plugins/obs-ndi/default.nix    |  2 +-
 .../video/obs-studio/plugins/obs-nvfbc.nix    |  2 +-
 .../plugins/obs-pipewire-audio-capture.nix    |  2 +-
 .../plugins/obs-rgb-levels-filter.nix         |  2 +-
 .../obs-studio/plugins/obs-shaderfilter.nix   |  2 +-
 .../obs-studio/plugins/obs-source-record.nix  |  2 +-
 .../plugins/obs-teleport/default.nix          |  2 +-
 .../obs-studio/plugins/obs-text-pthread.nix   |  2 +-
 .../obs-studio/plugins/obs-vaapi/default.nix  |  2 +-
 .../plugins/obs-vertical-canvas.nix           |  2 +-
 .../obs-studio/plugins/obs-vintage-filter.nix |  2 +-
 .../obs-studio/plugins/obs-websocket.nix      |  2 +-
 .../obs-studio/plugins/waveform/default.nix   |  2 +-
 .../video/pipe-viewer/default.nix             |  2 +-
 .../video/qmediathekview/default.nix          |  2 +-
 pkgs/applications/video/vdr/default.nix       |  2 +-
 .../video/vdr/epgsearch/default.nix           |  2 +-
 pkgs/applications/video/vdr/plugins.nix       |  6 +-
 .../video/vdr/softhddevice/default.nix        |  2 +-
 .../video/vdr/streamdev/default.nix           |  2 +-
 .../applications/video/vokoscreen/default.nix |  2 +-
 .../virtualization/cri-o/default.nix          |  2 +-
 .../virtualization/docker/buildx.nix          |  2 +-
 .../virtualization/docker/compose.nix         |  2 +-
 .../virtualization/krunvm/default.nix         |  2 +-
 .../virtualization/lima/default.nix           |  2 +-
 .../virtualization/sail-riscv/default.nix     |  2 +-
 .../virtualization/virt-manager/default.nix   |  2 +-
 .../virtualization/virt-manager/qt.nix        |  2 +-
 .../window-managers/2bwm/default.nix          |  2 +-
 .../window-managers/awesome/default.nix       |  2 +-
 .../window-managers/cagebreak/default.nix     |  2 +-
 .../window-managers/dwm/dwm-status.nix        |  2 +-
 .../hyprwm/hyprland-plugins/hycov.nix         |  2 +-
 .../i3/bumblebee-status/default.nix           |  2 +-
 .../window-managers/i3/i3-ratiosplit.nix      |  2 +-
 .../window-managers/i3/i3ipc-glib.nix         |  2 +-
 .../window-managers/i3/lock-blur.nix          |  2 +-
 .../window-managers/i3/lock-color.nix         |  2 +-
 pkgs/applications/window-managers/i3/lock.nix |  2 +-
 .../window-managers/i3/wmfocus.nix            |  2 +-
 pkgs/applications/window-managers/i3/wsr.nix  |  2 +-
 .../window-managers/jwm/default.nix           |  2 +-
 .../window-managers/lemonbar/default.nix      |  2 +-
 .../window-managers/stumpwm/default.nix       |  2 +-
 .../window-managers/tabbed/default.nix        |  2 +-
 .../window-managers/wayfire/firedecor.nix     |  2 +-
 .../dlang/builddubpackage/default.nix         |  2 +-
 pkgs/build-support/mitm-cache/default.nix     |  2 +-
 pkgs/by-name/_1/_1fps/package.nix             |  2 +-
 pkgs/by-name/_2/_20kly/package.nix            |  2 +-
 pkgs/by-name/_2/_2ship2harkinian/package.nix  |  2 +-
 pkgs/by-name/_3/_3mux/package.nix             |  2 +-
 pkgs/by-name/_3/_3proxy/package.nix           |  2 +-
 pkgs/by-name/_6/_6tunnel/package.nix          |  2 +-
 pkgs/by-name/_7/_7z2hashcat/package.nix       |  2 +-
 pkgs/by-name/_9/_9pfs/package.nix             |  2 +-
 pkgs/by-name/aa/aaa/package.nix               |  2 +-
 pkgs/by-name/aa/aaaaxy/package.nix            |  2 +-
 .../aa/aarch64-esr-decoder/package.nix        |  2 +-
 pkgs/by-name/aa/aardvark-dns/package.nix      |  2 +-
 pkgs/by-name/aa/aaxtomp3/package.nix          |  2 +-
 pkgs/by-name/ab/ab-av1/package.nix            |  2 +-
 pkgs/by-name/ab/abaddon/package.nix           |  2 +-
 pkgs/by-name/ab/abbaye-des-morts/package.nix  |  2 +-
 pkgs/by-name/ab/abbreviate/package.nix        |  2 +-
 .../ab/abi-compliance-checker/package.nix     |  2 +-
 pkgs/by-name/ab/abi-dumper/package.nix        |  2 +-
 pkgs/by-name/ab/abracadabra/package.nix       |  2 +-
 pkgs/by-name/ab/abuild/package.nix            |  2 +-
 pkgs/by-name/ac/acc/package.nix               |  2 +-
 pkgs/by-name/ac/acr/package.nix               |  2 +-
 pkgs/by-name/ac/acsccid/package.nix           |  2 +-
 pkgs/by-name/ac/action-validator/package.nix  |  2 +-
 .../by-name/ad/adapta-backgrounds/package.nix |  2 +-
 pkgs/by-name/ad/adapta-gtk-theme/package.nix  |  2 +-
 pkgs/by-name/ad/adapta-kde-theme/package.nix  |  2 +-
 pkgs/by-name/ad/adbtuifm/package.nix          |  2 +-
 pkgs/by-name/ad/addlicense/package.nix        |  2 +-
 pkgs/by-name/ad/adementary-theme/package.nix  |  2 +-
 pkgs/by-name/ad/adguardian/package.nix        |  2 +-
 pkgs/by-name/ad/adif-multitool/package.nix    |  2 +-
 pkgs/by-name/ad/adrgen/package.nix            |  2 +-
 pkgs/by-name/ad/adrs/package.nix              |  2 +-
 pkgs/by-name/ad/advancecomp/package.nix       |  2 +-
 pkgs/by-name/ae/aeron-cpp/package.nix         |  2 +-
 pkgs/by-name/ae/aerospike/package.nix         |  2 +-
 pkgs/by-name/ae/aether-lv2/package.nix        |  2 +-
 pkgs/by-name/af/afflib/package.nix            |  2 +-
 pkgs/by-name/af/afio/package.nix              |  2 +-
 pkgs/by-name/af/afsctool/package.nix          |  2 +-
 pkgs/by-name/af/afterburn/package.nix         |  2 +-
 pkgs/by-name/af/afterstep/package.nix         |  2 +-
 pkgs/by-name/af/afuse/package.nix             |  2 +-
 pkgs/by-name/ag/agate/package.nix             |  2 +-
 pkgs/by-name/ag/agdsn-zsh-config/package.nix  |  2 +-
 .../ag/age-plugin-fido2-hmac/package.nix      |  2 +-
 pkgs/by-name/ag/agebox/package.nix            |  2 +-
 pkgs/by-name/ag/agenda/package.nix            |  2 +-
 pkgs/by-name/ag/agenix-cli/package.nix        |  2 +-
 .../by-name/ag/agkozak-zsh-prompt/package.nix |  2 +-
 pkgs/by-name/ag/agola/package.nix             |  2 +-
 pkgs/by-name/ah/aha/package.nix               |  2 +-
 pkgs/by-name/ah/ahoviewer/package.nix         |  2 +-
 pkgs/by-name/ai/aiac/package.nix              |  2 +-
 pkgs/by-name/ai/aiken/package.nix             |  2 +-
 pkgs/by-name/ai/ain/package.nix               |  2 +-
 pkgs/by-name/ai/air/package.nix               |  2 +-
 pkgs/by-name/ai/aircrack-ng/package.nix       |  2 +-
 pkgs/by-name/ai/airshipper/package.nix        |  2 +-
 pkgs/by-name/ai/airspy/package.nix            |  2 +-
 pkgs/by-name/ai/airspyhf/package.nix          |  2 +-
 pkgs/by-name/ai/aixlog/package.nix            |  2 +-
 pkgs/by-name/ak/akira-unstable/package.nix    |  2 +-
 .../by-name/al/alarm-clock-applet/package.nix |  2 +-
 pkgs/by-name/al/albatross/package.nix         |  2 +-
 pkgs/by-name/al/alegreya-sans/package.nix     |  2 +-
 pkgs/by-name/al/alegreya/package.nix          |  2 +-
 pkgs/by-name/al/alejandra/package.nix         |  2 +-
 .../al/alertmanager-irc-relay/package.nix     |  2 +-
 .../alertmanager-webhook-logger/package.nix   |  2 +-
 pkgs/by-name/al/algia/package.nix             |  2 +-
 pkgs/by-name/al/algolia-cli/package.nix       |  2 +-
 pkgs/by-name/al/alice-lg/package.nix          |  2 +-
 pkgs/by-name/al/alienarena/package.nix        |  2 +-
 pkgs/by-name/al/align/package.nix             |  2 +-
 pkgs/by-name/al/allmark/package.nix           |  2 +-
 pkgs/by-name/al/almonds/package.nix           |  2 +-
 pkgs/by-name/al/alp/package.nix               |  2 +-
 pkgs/by-name/al/alpaca-proxy/package.nix      |  2 +-
 .../by-name/al/alpine-make-rootfs/package.nix |  2 +-
 .../al/alpine-make-vm-image/package.nix       |  2 +-
 pkgs/by-name/al/alpnpass/package.nix          |  2 +-
 pkgs/by-name/al/alsa-scarlett-gui/package.nix |  2 +-
 pkgs/by-name/al/alttab/package.nix            |  2 +-
 .../amazon-ecr-credential-helper/package.nix  |  2 +-
 pkgs/by-name/am/amber-lang/package.nix        |  2 +-
 pkgs/by-name/am/amber-secret/package.nix      |  2 +-
 pkgs/by-name/am/amber-theme/package.nix       |  2 +-
 pkgs/by-name/am/amd-blis/package.nix          |  2 +-
 pkgs/by-name/am/amd-libflame/package.nix      |  2 +-
 pkgs/by-name/am/amdctl/package.nix            |  2 +-
 pkgs/by-name/am/amdgpu_top/package.nix        |  2 +-
 pkgs/by-name/am/amf-headers/package.nix       |  2 +-
 pkgs/by-name/am/amfora/package.nix            |  2 +-
 pkgs/by-name/am/aml/package.nix               |  2 +-
 pkgs/by-name/am/amneziawg-go/package.nix      |  2 +-
 pkgs/by-name/am/amoco/package.nix             |  2 +-
 pkgs/by-name/am/amphetype/package.nix         |  2 +-
 pkgs/by-name/am/amqpcat/package.nix           |  2 +-
 pkgs/by-name/am/ams-lv2/package.nix           |  2 +-
 pkgs/by-name/am/amule/package.nix             |  2 +-
 pkgs/by-name/an/analog/package.nix            |  2 +-
 pkgs/by-name/an/anchor/package.nix            |  2 +-
 pkgs/by-name/an/anders/package.nix            |  2 +-
 .../by-name/an/android-udev-rules/package.nix |  2 +-
 pkgs/by-name/an/anew/package.nix              |  2 +-
 pkgs/by-name/an/anewer/package.nix            |  2 +-
 pkgs/by-name/an/angband/package.nix           |  2 +-
 pkgs/by-name/an/angle-grinder/package.nix     |  2 +-
 pkgs/by-name/an/angsd/package.nix             |  2 +-
 pkgs/by-name/an/anime-downloader/package.nix  |  2 +-
 pkgs/by-name/an/anko/package.nix              |  2 +-
 pkgs/by-name/an/annextimelog/package.nix      |  2 +-
 pkgs/by-name/an/annotator/package.nix         |  2 +-
 pkgs/by-name/an/ansel/package.nix             |  2 +-
 pkgs/by-name/an/ansible-cmdb/package.nix      |  2 +-
 pkgs/by-name/an/antibody/package.nix          |  2 +-
 .../an/antora-lunr-extension/package.nix      |  2 +-
 pkgs/by-name/an/antora/package.nix            |  2 +-
 pkgs/by-name/an/any-nix-shell/package.nix     |  2 +-
 pkgs/by-name/ao/aocl-utils/package.nix        |  2 +-
 pkgs/by-name/ap/aperture/package.nix          |  2 +-
 pkgs/by-name/ap/apfel/package.nix             |  2 +-
 pkgs/by-name/ap/apfelgrid/package.nix         |  2 +-
 pkgs/by-name/ap/api-linter/package.nix        |  2 +-
 pkgs/by-name/ap/aporetic/package.nix          |  2 +-
 pkgs/by-name/ap/appeditor/package.nix         |  2 +-
 pkgs/by-name/ap/appimageupdate/package.nix    |  2 +-
 .../by-name/ap/appindicator-sharp/package.nix |  2 +-
 pkgs/by-name/ap/approxmc/package.nix          |  2 +-
 pkgs/by-name/ap/apt-mirror/package.nix        |  2 +-
 pkgs/by-name/ap/apt/package.nix               |  2 +-
 pkgs/by-name/ap/aptdec/package.nix            |  2 +-
 pkgs/by-name/ap/aptly/package.nix             |  2 +-
 pkgs/by-name/ar/arangodb/package.nix          |  2 +-
 pkgs/by-name/ar/aravis/package.nix            |  2 +-
 pkgs/by-name/ar/arc-icon-theme/package.nix    |  2 +-
 pkgs/by-name/ar/arc-kde-theme/package.nix     |  2 +-
 pkgs/by-name/ar/arc-theme/package.nix         |  2 +-
 pkgs/by-name/ar/archiver/package.nix          |  2 +-
 pkgs/by-name/ar/ardugotools/package.nix       |  2 +-
 pkgs/by-name/ar/arduino-ci/package.nix        |  2 +-
 .../ar/arduino-create-agent/package.nix       |  2 +-
 pkgs/by-name/ar/arduino-mk/package.nix        |  2 +-
 pkgs/by-name/ar/arduinoOTA/package.nix        |  2 +-
 pkgs/by-name/ar/ares-cli/package.nix          |  2 +-
 pkgs/by-name/ar/argagg/package.nix            |  2 +-
 pkgs/by-name/ar/argbash/package.nix           |  2 +-
 pkgs/by-name/ar/argc/package.nix              |  2 +-
 pkgs/by-name/ar/argo-expr/package.nix         |  2 +-
 pkgs/by-name/ar/argo-rollouts/package.nix     |  2 +-
 pkgs/by-name/ar/argocd-autopilot/package.nix  |  2 +-
 .../ar/argocd-vault-plugin/package.nix        |  2 +-
 pkgs/by-name/ar/argocd/package.nix            |  2 +-
 pkgs/by-name/ar/argp-standalone/package.nix   |  2 +-
 pkgs/by-name/ar/argparse/package.nix          |  2 +-
 pkgs/by-name/ar/ariang/package.nix            |  2 +-
 pkgs/by-name/ar/arjun-cnf/package.nix         |  2 +-
 pkgs/by-name/ar/arkade/package.nix            |  2 +-
 pkgs/by-name/ar/arp-scan/package.nix          |  2 +-
 pkgs/by-name/ar/arpa2cm/package.nix           |  2 +-
 pkgs/by-name/ar/arsenal/package.nix           |  2 +-
 pkgs/by-name/ar/artem/package.nix             |  2 +-
 .../as/ascii-image-converter/package.nix      |  2 +-
 pkgs/by-name/as/asciigraph/package.nix        |  2 +-
 pkgs/by-name/as/asciinema-agg/package.nix     |  2 +-
 .../as/asciinema-automation/package.nix       |  2 +-
 pkgs/by-name/as/asciinema/package.nix         |  2 +-
 .../as/asciiquarium-transparent/package.nix   |  2 +-
 pkgs/by-name/as/asdf-vm/package.nix           |  2 +-
 pkgs/by-name/as/asfa/package.nix              |  2 +-
 pkgs/by-name/as/ashuffle/package.nix          |  2 +-
 pkgs/by-name/as/asm-lsp/package.nix           |  2 +-
 pkgs/by-name/as/asmfmt/package.nix            |  2 +-
 pkgs/by-name/as/asn1editor/package.nix        |  2 +-
 pkgs/by-name/as/asouldocs/package.nix         |  2 +-
 pkgs/by-name/as/aspcud/package.nix            |  2 +-
 pkgs/by-name/as/assaultcube/package.nix       |  2 +-
 pkgs/by-name/as/assemblyscript/package.nix    |  2 +-
 pkgs/by-name/as/assetfinder/package.nix       |  2 +-
 pkgs/by-name/as/assh/package.nix              |  2 +-
 pkgs/by-name/as/assign-lb-ip/package.nix      |  2 +-
 pkgs/by-name/as/assimp/package.nix            |  2 +-
 pkgs/by-name/as/astartectl/package.nix        |  2 +-
 pkgs/by-name/as/astc-encoder/package.nix      |  2 +-
 .../as/asterisk-module-sccp/package.nix       |  2 +-
 pkgs/by-name/as/astromenace/package.nix       |  2 +-
 pkgs/by-name/as/astronomer/package.nix        |  2 +-
 pkgs/by-name/as/async-profiler/package.nix    |  2 +-
 pkgs/by-name/at/atac/package.nix              |  2 +-
 pkgs/by-name/at/athens/package.nix            |  2 +-
 pkgs/by-name/at/atlantis/package.nix          |  2 +-
 pkgs/by-name/at/atlas/package.nix             |  2 +-
 pkgs/by-name/at/atmos/package.nix             |  2 +-
 pkgs/by-name/at/atomic-operator/package.nix   |  2 +-
 pkgs/by-name/at/atomic-swap/package.nix       |  2 +-
 pkgs/by-name/at/atuin/package.nix             |  2 +-
 pkgs/by-name/au/audio-sharing/package.nix     |  2 +-
 pkgs/by-name/au/audiowaveform/package.nix     |  2 +-
 pkgs/by-name/au/augustus/package.nix          |  2 +-
 pkgs/by-name/au/authentik/package.nix         |  2 +-
 pkgs/by-name/au/authz0/package.nix            |  2 +-
 pkgs/by-name/au/autokey/package.nix           |  2 +-
 .../au/automatic-timezoned/package.nix        |  2 +-
 .../au/automaticcomponenttoolkit/package.nix  |  2 +-
 pkgs/by-name/au/automirror/package.nix        |  2 +-
 pkgs/by-name/au/automysqlbackup/package.nix   |  2 +-
 pkgs/by-name/au/autoprefixer/package.nix      |  2 +-
 pkgs/by-name/au/autoraise/package.nix         |  2 +-
 pkgs/by-name/au/autorestic/package.nix        |  2 +-
 pkgs/by-name/au/autotiling-rs/package.nix     |  2 +-
 pkgs/by-name/au/autotrace/package.nix         |  2 +-
 pkgs/by-name/av/avalonia/package.nix          |  2 +-
 pkgs/by-name/av/aviator/package.nix           |  2 +-
 pkgs/by-name/av/avizo/package.nix             |  2 +-
 pkgs/by-name/av/avra/package.nix              |  2 +-
 pkgs/by-name/aw/await/package.nix             |  2 +-
 pkgs/by-name/aw/awatcher/package.nix          |  2 +-
 pkgs/by-name/aw/awf/package.nix               |  2 +-
 pkgs/by-name/aw/aws-c-auth/package.nix        |  2 +-
 pkgs/by-name/aw/aws-c-common/package.nix      |  2 +-
 pkgs/by-name/aw/aws-c-compression/package.nix |  2 +-
 .../by-name/aw/aws-c-event-stream/package.nix |  2 +-
 pkgs/by-name/aw/aws-c-http/package.nix        |  2 +-
 pkgs/by-name/aw/aws-c-mqtt/package.nix        |  2 +-
 pkgs/by-name/aw/aws-c-s3/package.nix          |  2 +-
 pkgs/by-name/aw/aws-c-sdkutils/package.nix    |  2 +-
 pkgs/by-name/aw/aws-checksums/package.nix     |  2 +-
 .../aw/aws-codeartifact-proxy/package.nix     |  2 +-
 pkgs/by-name/aw/aws-crt-cpp/package.nix       |  2 +-
 pkgs/by-name/aw/aws-gate/package.nix          |  2 +-
 pkgs/by-name/aw/aws-lambda-rie/package.nix    |  2 +-
 pkgs/by-name/aw/aws-rotate-key/package.nix    |  2 +-
 .../by-name/aw/aws-signing-helper/package.nix |  2 +-
 pkgs/by-name/aw/aws-sso-cli/package.nix       |  2 +-
 pkgs/by-name/aw/aws-sso-creds/package.nix     |  2 +-
 pkgs/by-name/aw/aws-vault/package.nix         |  2 +-
 pkgs/by-name/aw/awsbck/package.nix            |  2 +-
 pkgs/by-name/aw/awslogs/package.nix           |  2 +-
 pkgs/by-name/aw/awsls/package.nix             |  2 +-
 pkgs/by-name/aw/awsrm/package.nix             |  2 +-
 pkgs/by-name/aw/awsweeper/package.nix         |  2 +-
 pkgs/by-name/ax/axmldec/package.nix           |  2 +-
 pkgs/by-name/ay/ayatana-ido/package.nix       |  2 +-
 pkgs/by-name/az/azimuth/package.nix           |  2 +-
 pkgs/by-name/az/azpainter/package.nix         |  2 +-
 .../azure-artifacts-credprovider/package.nix  |  2 +-
 pkgs/by-name/az/azurite/package.nix           |  2 +-
 pkgs/by-name/b6/b612/package.nix              |  2 +-
 pkgs/by-name/ba/babeltrace2/package.nix       |  2 +-
 pkgs/by-name/ba/backdown/package.nix          |  2 +-
 pkgs/by-name/ba/backgroundremover/package.nix |  2 +-
 pkgs/by-name/ba/backlight-auto/package.nix    |  2 +-
 pkgs/by-name/ba/backward-cpp/package.nix      |  2 +-
 pkgs/by-name/ba/badger/package.nix            |  2 +-
 pkgs/by-name/ba/badrobot/package.nix          |  2 +-
 pkgs/by-name/ba/badvpn/package.nix            |  2 +-
 pkgs/by-name/ba/baidupcs-go/package.nix       |  2 +-
 pkgs/by-name/ba/balena-cli/package.nix        |  2 +-
 pkgs/by-name/ba/balls/package.nix             |  2 +-
 pkgs/by-name/ba/bam/package.nix               |  2 +-
 pkgs/by-name/ba/bambu-studio/package.nix      |  2 +-
 pkgs/by-name/ba/bamf/package.nix              |  2 +-
 pkgs/by-name/ba/bandwhich/package.nix         |  2 +-
 pkgs/by-name/ba/bankstown-lv2/package.nix     |  2 +-
 pkgs/by-name/ba/bant/package.nix              |  2 +-
 pkgs/by-name/ba/baresip/package.nix           |  2 +-
 pkgs/by-name/ba/bartib/package.nix            |  2 +-
 .../ba/base16-universal-manager/package.nix   |  2 +-
 pkgs/by-name/ba/base16384/package.nix         |  2 +-
 pkgs/by-name/ba/bash-env-json/package.nix     |  2 +-
 pkgs/by-name/ba/bash-preexec/package.nix      |  2 +-
 pkgs/by-name/ba/bashSnippets/package.nix      |  2 +-
 pkgs/by-name/ba/bash_unit/package.nix         |  2 +-
 pkgs/by-name/ba/bashcards/package.nix         |  2 +-
 pkgs/by-name/ba/bashmount/package.nix         |  2 +-
 pkgs/by-name/ba/bastet/package.nix            |  2 +-
 pkgs/by-name/ba/bat/package.nix               |  2 +-
 pkgs/by-name/ba/bato/package.nix              |  2 +-
 pkgs/by-name/ba/bats/package.nix              |  2 +-
 pkgs/by-name/ba/batsignal/package.nix         |  2 +-
 pkgs/by-name/ba/bazel-buildtools/package.nix  |  2 +-
 pkgs/by-name/ba/bazel-gazelle/package.nix     |  2 +-
 pkgs/by-name/ba/bazel-kazel/package.nix       |  2 +-
 pkgs/by-name/ba/bazel-remote/package.nix      |  2 +-
 pkgs/by-name/ba/bazel-watcher/package.nix     |  2 +-
 pkgs/by-name/ba/bazelisk/package.nix          |  2 +-
 pkgs/by-name/bb/bbin/package.nix              |  2 +-
 pkgs/by-name/bc/bc-ur/package.nix             |  2 +-
 pkgs/by-name/bc/bcache-tools/package.nix      |  2 +-
 pkgs/by-name/bc/bcal/package.nix              |  2 +-
 pkgs/by-name/bc/bchoppr/package.nix           |  2 +-
 pkgs/by-name/bd/bdf2sfd/package.nix           |  2 +-
 pkgs/by-name/bd/bdsync/package.nix            |  2 +-
 .../be/beancount-language-server/package.nix  |  2 +-
 pkgs/by-name/be/beanstalkd/package.nix        |  2 +-
 pkgs/by-name/be/bear/package.nix              |  2 +-
 pkgs/by-name/be/beats/package.nix             |  2 +-
 pkgs/by-name/be/bedops/package.nix            |  2 +-
 pkgs/by-name/be/bedtools/package.nix          |  2 +-
 pkgs/by-name/be/bee/package.nix               |  2 +-
 pkgs/by-name/be/beefi/package.nix             |  2 +-
 pkgs/by-name/be/beep/package.nix              |  2 +-
 pkgs/by-name/be/bees/package.nix              |  2 +-
 pkgs/by-name/be/behdad-fonts/package.nix      |  2 +-
 pkgs/by-name/be/beidconnect/package.nix       |  2 +-
 pkgs/by-name/be/bemenu/package.nix            |  2 +-
 pkgs/by-name/be/benchexec/package.nix         |  2 +-
 pkgs/by-name/be/bencode/package.nix           |  2 +-
 pkgs/by-name/be/bento4/package.nix            |  2 +-
 pkgs/by-name/be/bepass/package.nix            |  2 +-
 pkgs/by-name/be/berglas/package.nix           |  2 +-
 pkgs/by-name/be/berry/package.nix             |  2 +-
 pkgs/by-name/be/bettercap/package.nix         |  2 +-
 pkgs/by-name/be/betterlockscreen/package.nix  |  2 +-
 pkgs/by-name/bf/bfc/package.nix               |  2 +-
 pkgs/by-name/bf/bfs/package.nix               |  2 +-
 pkgs/by-name/bg/bgpdump/package.nix           |  2 +-
 pkgs/by-name/bg/bgpq3/package.nix             |  2 +-
 pkgs/by-name/bg/bgpq4/package.nix             |  2 +-
 pkgs/by-name/bg/bgs/package.nix               |  2 +-
 pkgs/by-name/bi/bibata-cursors/package.nix    |  2 +-
 .../by-name/bi/biber-for-tectonic/package.nix |  2 +-
 pkgs/by-name/bi/biblatex-check/package.nix    |  2 +-
 pkgs/by-name/bi/biblesync/package.nix         |  2 +-
 pkgs/by-name/bi/bibtex-tidy/package.nix       |  2 +-
 pkgs/by-name/bi/bic/package.nix               |  2 +-
 pkgs/by-name/bi/bicep/package.nix             |  2 +-
 pkgs/by-name/bi/binbloom/package.nix          |  2 +-
 pkgs/by-name/bi/bindle/package.nix            |  2 +-
 pkgs/by-name/bi/bingo/package.nix             |  2 +-
 pkgs/by-name/bi/bingrep/package.nix           |  2 +-
 pkgs/by-name/bi/binserve/package.nix          |  2 +-
 pkgs/by-name/bi/binsider/package.nix          |  2 +-
 pkgs/by-name/bi/biodiff/package.nix           |  2 +-
 pkgs/by-name/bi/biosdevname/package.nix       |  2 +-
 pkgs/by-name/bi/bird-lg/package.nix           |  2 +-
 pkgs/by-name/bi/birdwatcher/package.nix       |  2 +-
 pkgs/by-name/bi/biscuit-cli/package.nix       |  2 +-
 pkgs/by-name/bi/bit/package.nix               |  2 +-
 .../bi/bitbake-language-server/package.nix    |  2 +-
 pkgs/by-name/bi/bitbox/package.nix            |  2 +-
 pkgs/by-name/bi/bitbucket-cli/package.nix     |  2 +-
 pkgs/by-name/bi/bitlbee-discord/package.nix   |  2 +-
 pkgs/by-name/bi/bitlbee-facebook/package.nix  |  2 +-
 pkgs/by-name/bi/bitlbee-steam/package.nix     |  2 +-
 pkgs/by-name/bi/bitmagnet/package.nix         |  2 +-
 pkgs/by-name/bi/bitrise/package.nix           |  2 +-
 pkgs/by-name/bi/bitwise/package.nix           |  2 +-
 pkgs/by-name/bi/bitwuzla/package.nix          |  2 +-
 pkgs/by-name/bj/bjumblr/package.nix           |  2 +-
 pkgs/by-name/bk/bkt/package.nix               |  2 +-
 pkgs/by-name/bl/blahaj/package.nix            |  2 +-
 pkgs/by-name/bl/blahtexml/package.nix         |  2 +-
 pkgs/by-name/bl/blanket/package.nix           |  2 +-
 pkgs/by-name/bl/blasfeo/package.nix           |  2 +-
 pkgs/by-name/bl/blendfarm/package.nix         |  2 +-
 pkgs/by-name/bl/blflash/package.nix           |  2 +-
 pkgs/by-name/bl/blink1-tool/package.nix       |  2 +-
 pkgs/by-name/bl/blis/package.nix              |  2 +-
 pkgs/by-name/bl/blitz/package.nix             |  2 +-
 pkgs/by-name/bl/blockbook/package.nix         |  2 +-
 pkgs/by-name/bl/blockhash/package.nix         |  2 +-
 pkgs/by-name/bl/blocky/package.nix            |  2 +-
 pkgs/by-name/bl/blogc/package.nix             |  2 +-
 pkgs/by-name/bl/blueberry/package.nix         |  2 +-
 pkgs/by-name/bl/bluespec/package.nix          |  2 +-
 pkgs/by-name/bl/bluetui/package.nix           |  2 +-
 pkgs/by-name/bl/bluetuith/package.nix         |  2 +-
 pkgs/by-name/bl/bluewalker/package.nix        |  2 +-
 pkgs/by-name/bl/blugon/package.nix            |  2 +-
 pkgs/by-name/bl/blur-effect/package.nix       |  2 +-
 pkgs/by-name/bm/bmaptool/package.nix          |  2 +-
 pkgs/by-name/bm/bmon/package.nix              |  2 +-
 pkgs/by-name/bn/bngblaster/package.nix        |  2 +-
 pkgs/by-name/bo/boa/package.nix               |  2 +-
 pkgs/by-name/bo/bob/package.nix               |  2 +-
 pkgs/by-name/bo/boca/package.nix              |  2 +-
 pkgs/by-name/bo/boltbrowser/package.nix       |  2 +-
 pkgs/by-name/bo/bom/package.nix               |  2 +-
 pkgs/by-name/bo/bombadillo/package.nix        |  2 +-
 pkgs/by-name/bo/bombardier/package.nix        |  2 +-
 pkgs/by-name/bo/bomutils/package.nix          |  2 +-
 pkgs/by-name/bo/bonk/package.nix              |  2 +-
 pkgs/by-name/bo/bonzomatic/package.nix        |  2 +-
 pkgs/by-name/bo/boogie/package.nix            |  2 +-
 pkgs/by-name/bo/boolector/package.nix         |  2 +-
 pkgs/by-name/bo/boops/package.nix             |  2 +-
 pkgs/by-name/bo/boost-sml/package.nix         |  2 +-
 pkgs/by-name/bo/booster/package.nix           |  2 +-
 pkgs/by-name/bo/bootc/package.nix             |  2 +-
 pkgs/by-name/bo/bootiso/package.nix           |  2 +-
 pkgs/by-name/bo/bootspec/package.nix          |  2 +-
 pkgs/by-name/bo/borealis-cursors/package.nix  |  2 +-
 pkgs/by-name/bo/bosh-cli/package.nix          |  2 +-
 pkgs/by-name/bo/bossa-arduino/package.nix     |  2 +-
 pkgs/by-name/bo/bossa/package.nix             |  2 +-
 pkgs/by-name/bo/bowtie/package.nix            |  2 +-
 pkgs/by-name/bo/boxbuddy/package.nix          |  2 +-
 pkgs/by-name/bo/boxes/package.nix             |  2 +-
 pkgs/by-name/bo/boxfort/package.nix           |  2 +-
 pkgs/by-name/bo/boxxy/package.nix             |  2 +-
 pkgs/by-name/bp/bpftrace/package.nix          |  2 +-
 pkgs/by-name/bp/bpp-core/package.nix          |  2 +-
 pkgs/by-name/bp/bpp-phyl/package.nix          |  2 +-
 pkgs/by-name/bp/bpp-popgen/package.nix        |  2 +-
 pkgs/by-name/bp/bpp-seq/package.nix           |  2 +-
 pkgs/by-name/bp/bppsuite/package.nix          |  2 +-
 pkgs/by-name/br/braincurses/package.nix       |  2 +-
 pkgs/by-name/br/break-time/package.nix        |  2 +-
 pkgs/by-name/br/brev-cli/package.nix          |  2 +-
 pkgs/by-name/br/brial/package.nix             |  2 +-
 pkgs/by-name/br/brickd/package.nix            |  2 +-
 pkgs/by-name/br/brig/package.nix              |  2 +-
 pkgs/by-name/br/brightnessctl/package.nix     |  2 +-
 pkgs/by-name/br/brillo/package.nix            |  2 +-
 pkgs/by-name/br/brmodelo/package.nix          |  2 +-
 pkgs/by-name/br/brook/package.nix             |  2 +-
 pkgs/by-name/br/broom/package.nix             |  2 +-
 pkgs/by-name/br/broot/package.nix             |  2 +-
 pkgs/by-name/br/browserpass/package.nix       |  2 +-
 pkgs/by-name/br/browsh/package.nix            |  2 +-
 pkgs/by-name/br/brunsli/package.nix           |  2 +-
 pkgs/by-name/br/bruteforce-luks/package.nix   |  2 +-
 .../br/bruteforce-salted-openssl/package.nix  |  2 +-
 pkgs/by-name/br/bruteforce-wallet/package.nix |  2 +-
 pkgs/by-name/bs/bs2b-lv2/package.nix          |  2 +-
 pkgs/by-name/bs/bschaffl/package.nix          |  2 +-
 pkgs/by-name/bs/bsequencer/package.nix        |  2 +-
 pkgs/by-name/bs/bshapr/package.nix            |  2 +-
 pkgs/by-name/bs/bslizr/package.nix            |  2 +-
 pkgs/by-name/bs/bspwm/package.nix             |  2 +-
 pkgs/by-name/bt/btc-rpc-explorer/package.nix  |  2 +-
 pkgs/by-name/bt/btcd/package.nix              |  2 +-
 pkgs/by-name/bt/btcpayserver/package.nix      |  2 +-
 pkgs/by-name/bt/btdu/package.nix              |  2 +-
 pkgs/by-name/bt/btfs/package.nix              |  2 +-
 pkgs/by-name/bt/btrfs-assistant/package.nix   |  2 +-
 .../bt/btrfs-auto-snapshot/package.nix        |  2 +-
 pkgs/by-name/bt/btrfs-heatmap/package.nix     |  2 +-
 pkgs/by-name/bt/btrfs-snap/package.nix        |  2 +-
 pkgs/by-name/bu/bubblewrap/package.nix        |  2 +-
 pkgs/by-name/bu/buckle/package.nix            |  2 +-
 pkgs/by-name/bu/buf/package.nix               |  2 +-
 pkgs/by-name/bu/buffer/package.nix            |  2 +-
 pkgs/by-name/bu/bufisk/package.nix            |  2 +-
 pkgs/by-name/bu/bugstalker/package.nix        |  2 +-
 pkgs/by-name/bu/buildkit-nix/package.nix      |  2 +-
 pkgs/by-name/bu/buildkit/package.nix          |  2 +-
 .../bu/buildkite-agent-metrics/package.nix    |  2 +-
 pkgs/by-name/bu/buildkite-agent/package.nix   |  2 +-
 pkgs/by-name/bu/buildkite-cli/package.nix     |  2 +-
 pkgs/by-name/bu/buku/package.nix              |  2 +-
 pkgs/by-name/bu/bukubrow/package.nix          |  2 +-
 pkgs/by-name/bu/bulky/package.nix             |  2 +-
 pkgs/by-name/bu/bulloak/package.nix           |  2 +-
 pkgs/by-name/bu/bully/package.nix             |  2 +-
 pkgs/by-name/bu/bump/package.nix              |  2 +-
 pkgs/by-name/bu/bundix/package.nix            |  2 +-
 pkgs/by-name/bu/bunnyfetch/package.nix        |  2 +-
 pkgs/by-name/bu/bunyan-rs/package.nix         |  2 +-
 pkgs/by-name/bu/bup/package.nix               |  2 +-
 pkgs/by-name/bu/burp/package.nix              |  2 +-
 pkgs/by-name/bu/bustools/package.nix          |  2 +-
 pkgs/by-name/bu/butane/package.nix            |  2 +-
 pkgs/by-name/bu/buttermanager/package.nix     |  2 +-
 pkgs/by-name/by/byobu/package.nix             |  2 +-
 pkgs/by-name/by/bytecode-viewer/package.nix   |  2 +-
 pkgs/by-name/c-/c-for-go/package.nix          |  2 +-
 pkgs/by-name/c2/c2fmzq/package.nix            |  2 +-
 pkgs/by-name/c2/c2nim/package.nix             |  2 +-
 pkgs/by-name/c2/c2patool/package.nix          |  2 +-
 pkgs/by-name/c3/c3-lsp/package.nix            |  2 +-
 pkgs/by-name/ca/cabal-cli/package.nix         |  2 +-
 pkgs/by-name/ca/cadvisor/package.nix          |  2 +-
 pkgs/by-name/ca/cadzinho/package.nix          |  2 +-
 pkgs/by-name/ca/caf/package.nix               |  2 +-
 pkgs/by-name/ca/cairo-lang/package.nix        |  2 +-
 .../ca/calamares-nixos-extensions/package.nix |  2 +-
 pkgs/by-name/ca/calendar-cli/package.nix      |  2 +-
 pkgs/by-name/ca/caligula/package.nix          |  2 +-
 pkgs/by-name/ca/cameractrls/package.nix       |  2 +-
 pkgs/by-name/ca/cameradar/package.nix         |  2 +-
 pkgs/by-name/ca/can-utils/package.nix         |  2 +-
 pkgs/by-name/ca/canta-theme/package.nix       |  2 +-
 pkgs/by-name/ca/canto-curses/package.nix      |  2 +-
 pkgs/by-name/ca/canto-daemon/package.nix      |  2 +-
 pkgs/by-name/ca/cantoolz/package.nix          |  2 +-
 pkgs/by-name/ca/caper/package.nix             |  2 +-
 pkgs/by-name/ca/capnproto-java/package.nix    |  2 +-
 pkgs/by-name/ca/capnproto/package.nix         |  2 +-
 pkgs/by-name/ca/caprice32/package.nix         |  2 +-
 pkgs/by-name/ca/caprine/package.nix           |  2 +-
 pkgs/by-name/ca/capslock/package.nix          |  2 +-
 pkgs/by-name/ca/capypdf/package.nix           |  2 +-
 pkgs/by-name/ca/carbon-now-cli/package.nix    |  2 +-
 pkgs/by-name/ca/cargo-about/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-autoinherit/package.nix |  2 +-
 pkgs/by-name/ca/cargo-benchcmp/package.nix    |  2 +-
 pkgs/by-name/ca/cargo-binstall/package.nix    |  2 +-
 .../by-name/ca/cargo-bisect-rustc/package.nix |  2 +-
 pkgs/by-name/ca/cargo-bitbake/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-bloat/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-bootimage/package.nix   |  2 +-
 pkgs/by-name/ca/cargo-bump/package.nix        |  2 +-
 .../ca/cargo-bundle-licenses/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-cache/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-careful/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-component/package.nix   |  2 +-
 pkgs/by-name/ca/cargo-cranky/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-criterion/package.nix   |  2 +-
 pkgs/by-name/ca/cargo-deadlinks/package.nix   |  2 +-
 pkgs/by-name/ca/cargo-deb/package.nix         |  2 +-
 pkgs/by-name/ca/cargo-deny/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-dephell/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-diet/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-dist/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-docset/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-duplicates/package.nix  |  2 +-
 pkgs/by-name/ca/cargo-espmonitor/package.nix  |  2 +-
 pkgs/by-name/ca/cargo-expand/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-feature/package.nix     |  2 +-
 .../ca/cargo-features-manager/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-fuzz/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-generate/package.nix    |  2 +-
 pkgs/by-name/ca/cargo-i18n/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-leptos/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-limit/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-llvm-cov/package.nix    |  2 +-
 pkgs/by-name/ca/cargo-llvm-lines/package.nix  |  2 +-
 .../ca/cargo-local-registry/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-machete/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-make/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-mutants/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-outdated/package.nix    |  2 +-
 pkgs/by-name/ca/cargo-pgo/package.nix         |  2 +-
 pkgs/by-name/ca/cargo-play/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-raze/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-readme/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-rr/package.nix          |  2 +-
 pkgs/by-name/ca/cargo-shear/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-shuttle/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-sort/package.nix        |  2 +-
 .../by-name/ca/cargo-supply-chain/package.nix |  2 +-
 pkgs/by-name/ca/cargo-sweep/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-swift/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-sync-readme/package.nix |  2 +-
 pkgs/by-name/ca/cargo-temp/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-typify/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-wipe/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-wizard/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-xbuild/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-xwin/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-zigbuild/package.nix    |  2 +-
 pkgs/by-name/ca/carl/package.nix              |  2 +-
 pkgs/by-name/ca/caroline/package.nix          |  2 +-
 pkgs/by-name/ca/carp/package.nix              |  2 +-
 pkgs/by-name/ca/carto/package.nix             |  2 +-
 pkgs/by-name/ca/casadi/package.nix            |  2 +-
 pkgs/by-name/ca/cassette/package.nix          |  2 +-
 pkgs/by-name/ca/cassowary/package.nix         |  2 +-
 pkgs/by-name/ca/castero/package.nix           |  2 +-
 pkgs/by-name/ca/castnow/package.nix           |  2 +-
 pkgs/by-name/ca/catatonit/package.nix         |  2 +-
 pkgs/by-name/ca/catch/package.nix             |  2 +-
 pkgs/by-name/ca/catimg/package.nix            |  2 +-
 pkgs/by-name/ca/catnip/package.nix            |  2 +-
 .../by-name/ca/catppuccin-cursors/package.nix |  2 +-
 pkgs/by-name/ca/catppuccin-grub/package.nix   |  2 +-
 pkgs/by-name/ca/catppuccin-gtk/package.nix    |  2 +-
 pkgs/by-name/ca/catppuccin-kde/package.nix    |  2 +-
 pkgs/by-name/ca/catppuccin-sddm/package.nix   |  2 +-
 .../ca/catppuccinifier-cli/package.nix        |  2 +-
 pkgs/by-name/ca/cava/package.nix              |  2 +-
 pkgs/by-name/ca/cayley/package.nix            |  2 +-
 pkgs/by-name/cb/cbatticon/package.nix         |  2 +-
 pkgs/by-name/cb/cbconvert/package.nix         |  2 +-
 pkgs/by-name/cb/cbfmt/package.nix             |  2 +-
 pkgs/by-name/cb/cbmp/package.nix              |  2 +-
 pkgs/by-name/cb/cbonsai/package.nix           |  2 +-
 pkgs/by-name/cc/ccls/package.nix              |  2 +-
 pkgs/by-name/cc/cconv/package.nix             |  2 +-
 pkgs/by-name/cd/cddlib/package.nix            |  2 +-
 pkgs/by-name/cd/cde/package.nix               |  2 +-
 pkgs/by-name/cd/cdogs-sdl/package.nix         |  2 +-
 pkgs/by-name/cd/cdwe/package.nix              |  2 +-
 pkgs/by-name/ce/cel-go/package.nix            |  2 +-
 pkgs/by-name/ce/celeste/package.nix           |  2 +-
 pkgs/by-name/ce/celeste64/package.nix         |  2 +-
 pkgs/by-name/ce/cemu/package.nix              |  2 +-
 pkgs/by-name/ce/centerpiece/package.nix       |  2 +-
 pkgs/by-name/ce/centrifugo/package.nix        |  2 +-
 pkgs/by-name/ce/ceph-csi/package.nix          |  2 +-
 pkgs/by-name/ce/cero/package.nix              |  2 +-
 pkgs/by-name/ce/certgraph/package.nix         |  2 +-
 pkgs/by-name/ce/certigo/package.nix           |  2 +-
 pkgs/by-name/ce/certinfo/package.nix          |  2 +-
 pkgs/by-name/ce/certmgr/package.nix           |  2 +-
 pkgs/by-name/ce/certspotter/package.nix       |  2 +-
 pkgs/by-name/ce/certstrap/package.nix         |  2 +-
 pkgs/by-name/ce/cewl/package.nix              |  2 +-
 pkgs/by-name/ce/cewler/package.nix            |  2 +-
 pkgs/by-name/cf/cf-terraforming/package.nix   |  2 +-
 pkgs/by-name/cf/cf-tool/package.nix           |  2 +-
 pkgs/by-name/cf/cf-vault/package.nix          |  2 +-
 pkgs/by-name/cf/cfdyndns/package.nix          |  2 +-
 pkgs/by-name/cf/cfm/package.nix               |  2 +-
 pkgs/by-name/cf/cfs-zen-tweaks/package.nix    |  2 +-
 pkgs/by-name/cf/cfssl/package.nix             |  2 +-
 pkgs/by-name/cg/cg3/package.nix               |  2 +-
 pkgs/by-name/cg/cglm/package.nix              |  2 +-
 pkgs/by-name/cg/cgminer/package.nix           |  2 +-
 pkgs/by-name/cg/cgreen/package.nix            |  2 +-
 pkgs/by-name/cg/cgt-calc/package.nix          |  2 +-
 pkgs/by-name/ch/chain-bench/package.nix       |  2 +-
 pkgs/by-name/ch/chamber/package.nix           |  2 +-
 pkgs/by-name/ch/changelogger/package.nix      |  2 +-
 pkgs/by-name/ch/changetower/package.nix       |  2 +-
 pkgs/by-name/ch/changie/package.nix           |  2 +-
 pkgs/by-name/ch/charasay/package.nix          |  2 +-
 pkgs/by-name/ch/charliecloud/package.nix      |  2 +-
 pkgs/by-name/ch/charm-freeze/package.nix      |  2 +-
 pkgs/by-name/ch/charm/package.nix             |  2 +-
 pkgs/by-name/ch/chart-testing/package.nix     |  2 +-
 pkgs/by-name/ch/chatd/package.nix             |  2 +-
 pkgs/by-name/ch/chatgpt-cli/package.nix       |  2 +-
 pkgs/by-name/ch/chatgpt-shell-cli/package.nix |  2 +-
 pkgs/by-name/ch/cheat/package.nix             |  2 +-
 pkgs/by-name/ch/checkmake/package.nix         |  2 +-
 pkgs/by-name/ch/checkmate/package.nix         |  2 +-
 pkgs/by-name/ch/checksec/package.nix          |  2 +-
 pkgs/by-name/ch/chelf/package.nix             |  2 +-
 pkgs/by-name/ch/cherry/package.nix            |  2 +-
 pkgs/by-name/ch/chess-tui/package.nix         |  2 +-
 pkgs/by-name/ch/chez-matchable/package.nix    |  2 +-
 pkgs/by-name/ch/chez-mit/package.nix          |  2 +-
 pkgs/by-name/ch/chez-scmutils/package.nix     |  2 +-
 pkgs/by-name/ch/chez-srfi/package.nix         |  2 +-
 pkgs/by-name/ch/chibi/package.nix             |  2 +-
 .../ch/chirpstack-concentratord/package.nix   |  2 +-
 .../ch/chirpstack-gateway-bridge/package.nix  |  2 +-
 .../ch/chirpstack-mqtt-forwarder/package.nix  |  2 +-
 .../ch/chirpstack-rest-api/package.nix        |  2 +-
 .../ch/chirpstack-udp-forwarder/package.nix   |  2 +-
 pkgs/by-name/ch/chit/package.nix              |  2 +-
 pkgs/by-name/ch/cholmod-extra/package.nix     |  2 +-
 pkgs/by-name/ch/choose-gui/package.nix        |  2 +-
 pkgs/by-name/ch/choose/package.nix            |  2 +-
 pkgs/by-name/ch/chopchop/package.nix          |  2 +-
 pkgs/by-name/ch/chroma/package.nix            |  2 +-
 pkgs/by-name/ch/chrome-export/package.nix     |  2 +-
 pkgs/by-name/ch/chruby-fish/package.nix       |  2 +-
 pkgs/by-name/ci/ciano/package.nix             |  2 +-
 pkgs/by-name/ci/ciao/package.nix              |  2 +-
 pkgs/by-name/ci/cicero-tui/package.nix        |  2 +-
 pkgs/by-name/ci/cidr-merger/package.nix       |  2 +-
 .../ci/cie-middleware-linux/package.nix       |  2 +-
 pkgs/by-name/ci/cinnamon-common/package.nix   |  2 +-
 .../ci/cinnamon-control-center/package.nix    |  2 +-
 pkgs/by-name/ci/cinnamon-desktop/package.nix  |  2 +-
 pkgs/by-name/ci/cinnamon-menus/package.nix    |  2 +-
 .../ci/cinnamon-screensaver/package.nix       |  2 +-
 pkgs/by-name/ci/cinnamon-session/package.nix  |  2 +-
 .../ci/cinnamon-settings-daemon/package.nix   |  2 +-
 .../ci/cinnamon-translations/package.nix      |  2 +-
 pkgs/by-name/ci/cinny-unwrapped/package.nix   |  2 +-
 pkgs/by-name/ci/cipher/package.nix            |  2 +-
 pkgs/by-name/ci/circleci-cli/package.nix      |  2 +-
 pkgs/by-name/ci/circom/package.nix            |  2 +-
 pkgs/by-name/ci/circumflex/package.nix        |  2 +-
 pkgs/by-name/ci/cirrus-cli/package.nix        |  2 +-
 pkgs/by-name/ci/cirrusgo/package.nix          |  2 +-
 pkgs/by-name/ci/cista/package.nix             |  2 +-
 pkgs/by-name/ci/citations/package.nix         |  2 +-
 pkgs/by-name/ci/civetweb/package.nix          |  2 +-
 pkgs/by-name/ci/civo/package.nix              |  2 +-
 pkgs/by-name/cj/cjose/package.nix             |  2 +-
 pkgs/by-name/cj/cjs/package.nix               |  2 +-
 pkgs/by-name/cj/cjson/package.nix             |  2 +-
 pkgs/by-name/cl/cl-wordle/package.nix         |  2 +-
 pkgs/by-name/cl/clair/package.nix             |  2 +-
 pkgs/by-name/cl/clairvoyant/package.nix       |  2 +-
 pkgs/by-name/cl/clamtk/package.nix            |  2 +-
 pkgs/by-name/cl/clang-uml/package.nix         |  2 +-
 pkgs/by-name/cl/clap/package.nix              |  2 +-
 pkgs/by-name/cl/clapboard/package.nix         |  2 +-
 pkgs/by-name/cl/classicube/package.nix        |  2 +-
 pkgs/by-name/cl/claws/package.nix             |  2 +-
 pkgs/by-name/cl/clblast/package.nix           |  2 +-
 pkgs/by-name/cl/clean-css-cli/package.nix     |  2 +-
 pkgs/by-name/cl/clever-tools/package.nix      |  2 +-
 pkgs/by-name/cl/clfft/package.nix             |  2 +-
 pkgs/by-name/cl/cli-visualizer/package.nix    |  2 +-
 pkgs/by-name/cl/cli53/package.nix             |  2 +-
 pkgs/by-name/cl/cliam/package.nix             |  2 +-
 pkgs/by-name/cl/clib/package.nix              |  2 +-
 pkgs/by-name/cl/click/package.nix             |  2 +-
 pkgs/by-name/cl/clickable/package.nix         |  2 +-
 pkgs/by-name/cl/clickhouse-backup/package.nix |  2 +-
 pkgs/by-name/cl/clifm/package.nix             |  2 +-
 pkgs/by-name/cl/clima/package.nix             |  2 +-
 pkgs/by-name/cl/cling/package.nix             |  2 +-
 pkgs/by-name/cl/clipboard-jh/package.nix      |  2 +-
 pkgs/by-name/cl/clipman/package.nix           |  2 +-
 pkgs/by-name/cl/clipmenu/package.nix          |  2 +-
 pkgs/by-name/cl/clipp/package.nix             |  2 +-
 pkgs/by-name/cl/clipqr/package.nix            |  2 +-
 pkgs/by-name/cl/clipse/package.nix            |  2 +-
 pkgs/by-name/cl/clipster/package.nix          |  2 +-
 pkgs/by-name/cl/cliquer/package.nix           |  2 +-
 pkgs/by-name/cl/cloak-pt/package.nix          |  2 +-
 pkgs/by-name/cl/cloc/package.nix              |  2 +-
 pkgs/by-name/cl/clojure-lsp/package.nix       |  2 +-
 pkgs/by-name/cl/clolcat/package.nix           |  2 +-
 pkgs/by-name/cl/cloud-hypervisor/package.nix  |  2 +-
 pkgs/by-name/cl/cloudbrute/package.nix        |  2 +-
 pkgs/by-name/cl/cloudflare-dyndns/package.nix |  2 +-
 pkgs/by-name/cl/cloudflare-utils/package.nix  |  2 +-
 pkgs/by-name/cl/cloudfoundry-cli/package.nix  |  2 +-
 pkgs/by-name/cl/cloudlens/package.nix         |  2 +-
 pkgs/by-name/cl/cloudlog/package.nix          |  2 +-
 pkgs/by-name/cl/cloudmonkey/package.nix       |  2 +-
 pkgs/by-name/cl/clpeak/package.nix            |  2 +-
 pkgs/by-name/cl/clubhouse-cli/package.nix     |  2 +-
 pkgs/by-name/cl/clusterctl/package.nix        |  2 +-
 pkgs/by-name/cm/cm256cc/package.nix           |  2 +-
 pkgs/by-name/cm/cmakerc/package.nix           |  2 +-
 pkgs/by-name/cm/cmark-gfm/package.nix         |  2 +-
 pkgs/by-name/cm/cmark/package.nix             |  2 +-
 pkgs/by-name/cm/cmatrix/package.nix           |  2 +-
 pkgs/by-name/cm/cmctl/package.nix             |  2 +-
 pkgs/by-name/cm/cmd-wrapped/package.nix       |  2 +-
 pkgs/by-name/cm/cmdstan/package.nix           |  2 +-
 pkgs/by-name/cm/cminpack/package.nix          |  2 +-
 pkgs/by-name/cm/cmrt/package.nix              |  2 +-
 pkgs/by-name/cm/cmusfm/package.nix            |  2 +-
 pkgs/by-name/cn/cntb/package.nix              |  2 +-
 pkgs/by-name/cn/cntr/package.nix              |  2 +-
 pkgs/by-name/co/cobra-cli/package.nix         |  2 +-
 pkgs/by-name/co/coc-css/package.nix           |  2 +-
 pkgs/by-name/co/cocogitto/package.nix         |  2 +-
 pkgs/by-name/co/cod/package.nix               |  2 +-
 pkgs/by-name/co/code-minimap/package.nix      |  2 +-
 pkgs/by-name/co/code2prompt/package.nix       |  2 +-
 pkgs/by-name/co/codebraid/package.nix         |  2 +-
 pkgs/by-name/co/codec2/package.nix            |  2 +-
 pkgs/by-name/co/codecrafters-cli/package.nix  |  2 +-
 pkgs/by-name/co/codeowners/package.nix        |  2 +-
 pkgs/by-name/co/codesearch/package.nix        |  2 +-
 pkgs/by-name/co/codespelunker/package.nix     |  2 +-
 pkgs/by-name/co/codevis/package.nix           |  2 +-
 pkgs/by-name/co/coffeescript/package.nix      |  2 +-
 pkgs/by-name/co/cog/package.nix               |  2 +-
 pkgs/by-name/co/cointop/package.nix           |  2 +-
 pkgs/by-name/co/coldsnap/package.nix          |  2 +-
 pkgs/by-name/co/colima/package.nix            |  2 +-
 pkgs/by-name/co/colloid-gtk-theme/package.nix |  2 +-
 .../by-name/co/colloid-icon-theme/package.nix |  2 +-
 pkgs/by-name/co/colmena/package.nix           |  2 +-
 pkgs/by-name/co/coloquinte/package.nix        |  2 +-
 pkgs/by-name/co/colordiff/package.nix         |  2 +-
 pkgs/by-name/co/colstr/package.nix            |  2 +-
 pkgs/by-name/co/comma/package.nix             |  2 +-
 pkgs/by-name/co/commafeed/package.nix         |  2 +-
 pkgs/by-name/co/commandergenius/package.nix   |  2 +-
 pkgs/by-name/co/commit-formatter/package.nix  |  2 +-
 pkgs/by-name/co/commitizen-go/package.nix     |  2 +-
 pkgs/by-name/co/commitmsgfmt/package.nix      |  2 +-
 pkgs/by-name/co/comodoro/package.nix          |  2 +-
 pkgs/by-name/co/compdb/package.nix            |  2 +-
 pkgs/by-name/co/compile-daemon/package.nix    |  2 +-
 pkgs/by-name/co/complete-alias/package.nix    |  2 +-
 pkgs/by-name/co/complgen/package.nix          |  2 +-
 pkgs/by-name/co/compose2nix/package.nix       |  2 +-
 pkgs/by-name/co/compsize/package.nix          |  2 +-
 pkgs/by-name/co/comrak/package.nix            |  2 +-
 pkgs/by-name/co/conceal/package.nix           |  2 +-
 pkgs/by-name/co/conduwuit/package.nix         |  2 +-
 .../co/configurable-http-proxy/package.nix    |  2 +-
 pkgs/by-name/co/confluencepot/package.nix     |  2 +-
 pkgs/by-name/co/conform/package.nix           |  2 +-
 pkgs/by-name/co/conjure/package.nix           |  2 +-
 pkgs/by-name/co/conmon-rs/package.nix         |  2 +-
 pkgs/by-name/co/conmon/package.nix            |  2 +-
 pkgs/by-name/co/connman-gtk/package.nix       |  2 +-
 pkgs/by-name/co/conserve/package.nix          |  2 +-
 pkgs/by-name/co/conserver/package.nix         |  2 +-
 pkgs/by-name/co/console-bridge/package.nix    |  2 +-
 pkgs/by-name/co/construct/package.nix         |  2 +-
 pkgs/by-name/co/consul-alerts/package.nix     |  2 +-
 pkgs/by-name/co/consul-template/package.nix   |  2 +-
 .../co/container-structure-test/package.nix   |  2 +-
 pkgs/by-name/co/containerlab/package.nix      |  2 +-
 pkgs/by-name/co/convco/package.nix            |  2 +-
 pkgs/by-name/co/convimg/package.nix           |  2 +-
 pkgs/by-name/co/convos/package.nix            |  2 +-
 pkgs/by-name/co/cook-cli/package.nix          |  2 +-
 pkgs/by-name/co/copilot-cli/package.nix       |  2 +-
 .../co/copilot-node-server/package.nix        |  2 +-
 pkgs/by-name/co/coppwr/package.nix            |  2 +-
 pkgs/by-name/co/coq2html/package.nix          |  2 +-
 pkgs/by-name/co/cordless/package.nix          |  2 +-
 pkgs/by-name/co/cordova/package.nix           |  2 +-
 pkgs/by-name/co/coredns/package.nix           |  2 +-
 pkgs/by-name/co/corerad/package.nix           |  2 +-
 pkgs/by-name/co/coreth/package.nix            |  2 +-
 pkgs/by-name/co/corkscrew/package.nix         |  2 +-
 pkgs/by-name/co/coroot-node-agent/package.nix |  2 +-
 pkgs/by-name/co/coroot/package.nix            |  2 +-
 pkgs/by-name/co/corrosion/package.nix         |  2 +-
 pkgs/by-name/co/cosmopolitan/package.nix      |  2 +-
 pkgs/by-name/co/costa/package.nix             |  2 +-
 pkgs/by-name/co/cotp/package.nix              |  2 +-
 pkgs/by-name/co/couchbase-shell/package.nix   |  2 +-
 pkgs/by-name/co/coulr/package.nix             |  2 +-
 pkgs/by-name/co/cowpatty/package.nix          |  2 +-
 pkgs/by-name/co/coz/package.nix               |  2 +-
 pkgs/by-name/co/coze/package.nix              |  2 +-
 pkgs/by-name/co/cozy/package.nix              |  2 +-
 pkgs/by-name/cp/cp2k/package.nix              |  2 +-
 pkgs/by-name/cp/cp437/package.nix             |  2 +-
 pkgs/by-name/cp/cpcfs/package.nix             |  2 +-
 pkgs/by-name/cp/cplay-ng/package.nix          |  2 +-
 pkgs/by-name/cp/cpp-hocon/package.nix         |  2 +-
 pkgs/by-name/cp/cpp-jwt/package.nix           |  2 +-
 pkgs/by-name/cp/cpp-redis/package.nix         |  2 +-
 pkgs/by-name/cp/cppclean/package.nix          |  2 +-
 pkgs/by-name/cp/cppe/package.nix              |  2 +-
 pkgs/by-name/cp/cppzmq/package.nix            |  2 +-
 pkgs/by-name/cp/cpu-energy-meter/package.nix  |  2 +-
 pkgs/by-name/cp/cpu_features/package.nix      |  2 +-
 pkgs/by-name/cp/cpufetch/package.nix          |  2 +-
 pkgs/by-name/cp/cpulimit/package.nix          |  2 +-
 pkgs/by-name/cp/cpuminer/package.nix          |  2 +-
 pkgs/by-name/cp/cpuset/package.nix            |  2 +-
 pkgs/by-name/cq/cq/package.nix                |  2 +-
 pkgs/by-name/cr/crabz/package.nix             |  2 +-
 pkgs/by-name/cr/crackxls/package.nix          |  2 +-
 pkgs/by-name/cr/craftos-pc/package.nix        |  6 +-
 pkgs/by-name/cr/crate2nix/package.nix         |  2 +-
 pkgs/by-name/cr/crawley/package.nix           |  2 +-
 pkgs/by-name/cr/crc/package.nix               |  2 +-
 pkgs/by-name/cr/crc32c/package.nix            |  2 +-
 pkgs/by-name/cr/crd2pulumi/package.nix        |  2 +-
 pkgs/by-name/cr/cre2/package.nix              |  2 +-
 pkgs/by-name/cr/create-react-app/package.nix  |  2 +-
 .../cr/credential-detector/package.nix        |  2 +-
 pkgs/by-name/cr/credhub-cli/package.nix       |  2 +-
 pkgs/by-name/cr/creep/package.nix             |  2 +-
 pkgs/by-name/cr/crex/package.nix              |  2 +-
 pkgs/by-name/cr/cri-tools/package.nix         |  2 +-
 pkgs/by-name/cr/critcmp/package.nix           |  2 +-
 pkgs/by-name/cr/criterion/package.nix         |  2 +-
 pkgs/by-name/cr/criu/package.nix              |  2 +-
 pkgs/by-name/cr/crlfuzz/package.nix           |  2 +-
 pkgs/by-name/cr/croaring/package.nix          |  2 +-
 pkgs/by-name/cr/croc/package.nix              |  2 +-
 pkgs/by-name/cr/crossplane-cli/package.nix    |  2 +-
 pkgs/by-name/cr/crudini/package.nix           |  2 +-
 pkgs/by-name/cr/crumbs/package.nix            |  2 +-
 pkgs/by-name/cr/crun/package.nix              |  2 +-
 pkgs/by-name/cr/cryfs/package.nix             |  2 +-
 pkgs/by-name/cr/crypto-tracker/package.nix    |  2 +-
 pkgs/by-name/cr/cryptominisat/package.nix     |  2 +-
 pkgs/by-name/cr/cryptpad/package.nix          |  2 +-
 pkgs/by-name/cr/crystal2nix/package.nix       |  2 +-
 pkgs/by-name/cs/csdr/package.nix              |  2 +-
 pkgs/by-name/cs/cshatag/package.nix           |  2 +-
 pkgs/by-name/cs/csound-manual/package.nix     |  2 +-
 pkgs/by-name/cs/css-checker/package.nix       |  2 +-
 pkgs/by-name/cs/csv-tui/package.nix           |  2 +-
 pkgs/by-name/cs/csv2parquet/package.nix       |  2 +-
 pkgs/by-name/cs/csvdiff/package.nix           |  2 +-
 pkgs/by-name/cs/csview/package.nix            |  2 +-
 pkgs/by-name/cs/csvq/package.nix              |  2 +-
 pkgs/by-name/cs/csvquote/package.nix          |  2 +-
 pkgs/by-name/cs/csvs-to-sqlite/package.nix    |  2 +-
 pkgs/by-name/cs/csxcad/package.nix            |  2 +-
 pkgs/by-name/ct/ctlptl/package.nix            |  2 +-
 pkgs/by-name/ct/ctodo/package.nix             |  2 +-
 pkgs/by-name/ct/ctop/package.nix              |  2 +-
 pkgs/by-name/ct/ctpv/package.nix              |  2 +-
 pkgs/by-name/ct/ctre/package.nix              |  2 +-
 pkgs/by-name/ct/ctypes_sh/package.nix         |  2 +-
 pkgs/by-name/cu/cuelsp/package.nix            |  2 +-
 pkgs/by-name/cu/cuetools/package.nix          |  2 +-
 pkgs/by-name/cu/cuetsy/package.nix            |  2 +-
 pkgs/by-name/cu/cunicu/package.nix            |  2 +-
 pkgs/by-name/cu/cups-browsed/package.nix      |  2 +-
 pkgs/by-name/cu/curlie/package.nix            |  2 +-
 pkgs/by-name/cu/curlpp/package.nix            |  2 +-
 pkgs/by-name/cu/cursewords/package.nix        |  2 +-
 pkgs/by-name/cv/cvc4/package.nix              |  2 +-
 pkgs/by-name/cw/cw/package.nix                |  2 +-
 pkgs/by-name/cw/cwe-client-cli/package.nix    |  2 +-
 pkgs/by-name/cw/cwm/package.nix               |  2 +-
 pkgs/by-name/cx/cxx-rs/package.nix            |  2 +-
 pkgs/by-name/cx/cxxopts/package.nix           |  2 +-
 pkgs/by-name/cy/cyan/package.nix              |  2 +-
 pkgs/by-name/cy/cyclone-scheme/package.nix    |  4 +-
 pkgs/by-name/cy/cyclonedds-cxx/package.nix    |  2 +-
 pkgs/by-name/cy/cyclonedds/package.nix        |  2 +-
 pkgs/by-name/cy/cyme/package.nix              |  2 +-
 .../by-name/cy/cyrus-sasl-xoauth2/package.nix |  2 +-
 pkgs/by-name/d-/d-seams/package.nix           |  2 +-
 pkgs/by-name/da/dablin/package.nix            |  2 +-
 pkgs/by-name/da/dae/package.nix               |  2 +-
 pkgs/by-name/da/daktilo/package.nix           |  2 +-
 pkgs/by-name/da/dapper/package.nix            |  2 +-
 pkgs/by-name/da/dapr-cli/package.nix          |  2 +-
 pkgs/by-name/da/darkhttpd/package.nix         |  2 +-
 pkgs/by-name/da/darklua/package.nix           |  2 +-
 pkgs/by-name/da/darkman/package.nix           |  2 +-
 pkgs/by-name/da/darktile/package.nix          |  2 +-
 pkgs/by-name/da/dart-sass/package.nix         |  2 +-
 pkgs/by-name/da/dasel/package.nix             |  2 +-
 pkgs/by-name/da/dashing/package.nix           |  2 +-
 pkgs/by-name/da/dasht/package.nix             |  2 +-
 pkgs/by-name/da/dasm/package.nix              |  2 +-
 pkgs/by-name/da/datafusion-cli/package.nix    |  2 +-
 pkgs/by-name/da/dav1d/package.nix             |  2 +-
 pkgs/by-name/db/db-rest/package.nix           |  2 +-
 pkgs/by-name/db/dbcsr/package.nix             |  2 +-
 pkgs/by-name/db/dblab/package.nix             |  2 +-
 pkgs/by-name/db/dbqn/package.nix              |  2 +-
 pkgs/by-name/db/dbus-cpp/package.nix          |  2 +-
 pkgs/by-name/dc/dcap/package.nix              |  2 +-
 pkgs/by-name/dd/ddccontrol-db/package.nix     |  2 +-
 pkgs/by-name/dd/ddccontrol/package.nix        |  2 +-
 pkgs/by-name/dd/ddclient/package.nix          |  2 +-
 pkgs/by-name/dd/ddev/package.nix              |  2 +-
 pkgs/by-name/dd/ddgr/package.nix              |  2 +-
 pkgs/by-name/dd/ddh/package.nix               |  2 +-
 pkgs/by-name/dd/ddns-go/package.nix           |  2 +-
 pkgs/by-name/dd/ddns-updater/package.nix      |  2 +-
 pkgs/by-name/dd/dduper/package.nix            |  2 +-
 pkgs/by-name/de/deadnix/package.nix           |  2 +-
 pkgs/by-name/de/decker/package.nix            |  2 +-
 pkgs/by-name/de/decktape/package.nix          |  2 +-
 pkgs/by-name/de/deepfilternet/package.nix     |  2 +-
 pkgs/by-name/de/deepsea/package.nix           |  2 +-
 pkgs/by-name/de/deepsource/package.nix        |  2 +-
 pkgs/by-name/de/deer/package.nix              |  2 +-
 pkgs/by-name/de/degit/package.nix             |  2 +-
 pkgs/by-name/de/dehydrated/package.nix        |  2 +-
 pkgs/by-name/de/deja-dup/package.nix          |  2 +-
 pkgs/by-name/de/dejsonlz4/package.nix         |  2 +-
 pkgs/by-name/de/delve/package.nix             |  2 +-
 pkgs/by-name/de/demoit/package.nix            |  2 +-
 pkgs/by-name/de/denaro/package.nix            |  2 +-
 pkgs/by-name/de/dendrite/package.nix          |  2 +-
 pkgs/by-name/de/dep-tree/package.nix          |  2 +-
 pkgs/by-name/de/dependabot-cli/package.nix    |  2 +-
 pkgs/by-name/de/dependency-track/package.nix  |  4 +-
 pkgs/by-name/de/der-ascii/package.nix         |  2 +-
 pkgs/by-name/de/design/package.nix            |  2 +-
 pkgs/by-name/de/deskew/package.nix            |  2 +-
 pkgs/by-name/de/desktop-postflop/package.nix  |  2 +-
 pkgs/by-name/de/detect-it-easy/package.nix    |  2 +-
 pkgs/by-name/de/detox/package.nix             |  2 +-
 pkgs/by-name/de/devenv/package.nix            |  2 +-
 pkgs/by-name/de/devour/package.nix            |  2 +-
 pkgs/by-name/de/devspace/package.nix          |  2 +-
 pkgs/by-name/de/dex-oidc/package.nix          |  2 +-
 pkgs/by-name/de/dex/package.nix               |  2 +-
 pkgs/by-name/df/dfrs/package.nix              |  2 +-
 pkgs/by-name/df/dftd4/package.nix             |  2 +-
 pkgs/by-name/dg/dgraph/package.nix            |  2 +-
 pkgs/by-name/dh/dhcpcd/package.nix            |  2 +-
 pkgs/by-name/dh/dhewm3/package.nix            |  2 +-
 pkgs/by-name/di/di-tui/package.nix            |  2 +-
 pkgs/by-name/di/diamond/package.nix           |  2 +-
 pkgs/by-name/di/dictu/package.nix             |  2 +-
 pkgs/by-name/di/didder/package.nix            |  2 +-
 pkgs/by-name/di/didyoumean/package.nix        |  2 +-
 pkgs/by-name/di/diff-so-fancy/package.nix     |  2 +-
 pkgs/by-name/di/diffoci/package.nix           |  2 +-
 pkgs/by-name/di/diffsitter/package.nix        |  2 +-
 pkgs/by-name/di/diffuse/package.nix           |  2 +-
 pkgs/by-name/di/digital/package.nix           |  2 +-
 pkgs/by-name/di/digitemp/package.nix          |  2 +-
 pkgs/by-name/di/dinit/package.nix             |  2 +-
 pkgs/by-name/di/diopser/package.nix           |  2 +-
 pkgs/by-name/di/dippi/package.nix             |  2 +-
 pkgs/by-name/di/directx-headers/package.nix   |  2 +-
 pkgs/by-name/di/direnv/package.nix            |  2 +-
 pkgs/by-name/di/dirstalk/package.nix          |  2 +-
 pkgs/by-name/di/discocss/package.nix          |  2 +-
 pkgs/by-name/di/discord-sh/package.nix        |  2 +-
 .../di/discordchatexporter-cli/package.nix    |  2 +-
 .../discordchatexporter-desktop/package.nix   |  2 +-
 pkgs/by-name/di/discount/package.nix          |  2 +-
 .../di/discourse-mail-receiver/package.nix    |  2 +-
 pkgs/by-name/di/disfetch/package.nix          |  2 +-
 pkgs/by-name/di/diskrsync/package.nix         |  2 +-
 pkgs/by-name/di/diskscan/package.nix          |  2 +-
 pkgs/by-name/di/dislocker/package.nix         |  2 +-
 pkgs/by-name/di/dismap/package.nix            |  2 +-
 pkgs/by-name/di/dispad/package.nix            |  2 +-
 pkgs/by-name/di/distrobox-tui/package.nix     |  2 +-
 pkgs/by-name/di/distrobox/package.nix         |  2 +-
 pkgs/by-name/di/diswall/package.nix           |  2 +-
 pkgs/by-name/di/dive/package.nix              |  2 +-
 pkgs/by-name/dj/djenrandom/package.nix        |  2 +-
 pkgs/by-name/dj/djent/package.nix             |  2 +-
 pkgs/by-name/dk/dkh/package.nix               |  2 +-
 pkgs/by-name/dl/dl-librescore/package.nix     |  2 +-
 .../dl/dleyna-connector-dbus/package.nix      |  2 +-
 pkgs/by-name/dl/dleyna-core/package.nix       |  2 +-
 pkgs/by-name/dl/dleyna-renderer/package.nix   |  2 +-
 pkgs/by-name/dl/dleyna-server/package.nix     |  2 +-
 .../dm/dmarc-report-converter/package.nix     |  2 +-
 pkgs/by-name/dm/dmrconfig/package.nix         |  2 +-
 pkgs/by-name/dn/dnadd/package.nix             |  2 +-
 pkgs/by-name/dn/dnglab/package.nix            |  2 +-
 pkgs/by-name/dn/dnscrypt-proxy/package.nix    |  2 +-
 pkgs/by-name/dn/dnsdbq/package.nix            |  2 +-
 pkgs/by-name/dn/dnsenum/package.nix           |  2 +-
 pkgs/by-name/dn/dnsname-cni/package.nix       |  2 +-
 pkgs/by-name/dn/dnspeep/package.nix           |  2 +-
 pkgs/by-name/dn/dnsperf/package.nix           |  2 +-
 pkgs/by-name/dn/dnsproxy/package.nix          |  2 +-
 pkgs/by-name/dn/dnstake/package.nix           |  2 +-
 pkgs/by-name/do/do-agent/package.nix          |  2 +-
 pkgs/by-name/do/doas-sudo-shim/package.nix    |  2 +-
 pkgs/by-name/do/doas/package.nix              |  2 +-
 pkgs/by-name/do/doc2go/package.nix            |  2 +-
 pkgs/by-name/do/docfd/package.nix             |  2 +-
 pkgs/by-name/do/dockbarx/package.nix          |  2 +-
 .../package.nix                               |  2 +-
 .../do/docker-credential-helpers/package.nix  |  2 +-
 pkgs/by-name/do/docker-ls/package.nix         |  2 +-
 pkgs/by-name/do/docker-slim/package.nix       |  2 +-
 .../package.nix                               |  2 +-
 pkgs/by-name/do/dockle/package.nix            |  2 +-
 pkgs/by-name/do/dockutil/package.nix          |  2 +-
 pkgs/by-name/do/docopt_cpp/package.nix        |  2 +-
 pkgs/by-name/do/doctave/package.nix           |  2 +-
 pkgs/by-name/do/doctest/package.nix           |  2 +-
 pkgs/by-name/do/doctl/package.nix             |  2 +-
 pkgs/by-name/do/doctoc/package.nix            |  2 +-
 pkgs/by-name/do/docui/package.nix             |  2 +-
 pkgs/by-name/do/documenso/package.nix         |  2 +-
 .../by-name/do/documize-community/package.nix |  2 +-
 pkgs/by-name/do/docuum/package.nix            |  2 +-
 pkgs/by-name/do/doge/package.nix              |  2 +-
 pkgs/by-name/do/dogedns/package.nix           |  2 +-
 pkgs/by-name/do/doggo/package.nix             |  2 +-
 pkgs/by-name/do/dolt/package.nix              |  2 +-
 pkgs/by-name/do/done/package.nix              |  2 +-
 pkgs/by-name/do/dool/package.nix              |  2 +-
 pkgs/by-name/do/door-knocker/package.nix      |  2 +-
 pkgs/by-name/do/doppler/package.nix           |  2 +-
 pkgs/by-name/do/dorkscout/package.nix         |  2 +-
 pkgs/by-name/do/dosfstools/package.nix        |  2 +-
 .../do/dot-language-server/package.nix        |  2 +-
 pkgs/by-name/do/dotconf/package.nix           |  2 +-
 pkgs/by-name/do/dotenv-cli/package.nix        |  2 +-
 pkgs/by-name/do/dotnet-outdated/package.nix   |  2 +-
 pkgs/by-name/do/dotter/package.nix            |  2 +-
 pkgs/by-name/do/double-conversion/package.nix |  2 +-
 .../do/double-entry-generator/package.nix     |  2 +-
 .../by-name/do/dovecot_fts_xapian/package.nix |  2 +-
 pkgs/by-name/dp/dpt-rp1-py/package.nix        |  2 +-
 pkgs/by-name/dr/dr14_tmeter/package.nix       |  2 +-
 pkgs/by-name/dr/dracut/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/dreamchess/package.nix        |  2 +-
 pkgs/by-name/dr/driftctl/package.nix          |  2 +-
 pkgs/by-name/dr/drip/package.nix              |  2 +-
 pkgs/by-name/dr/drive/package.nix             |  2 +-
 pkgs/by-name/dr/droidcam/package.nix          |  2 +-
 pkgs/by-name/dr/drone-scp/package.nix         |  2 +-
 pkgs/by-name/dr/dropwatch/package.nix         |  2 +-
 pkgs/by-name/dr/dry/package.nix               |  2 +-
 pkgs/by-name/ds/dsda-doom/package.nix         |  2 +-
 pkgs/by-name/ds/dsq/package.nix               |  2 +-
 pkgs/by-name/ds/dstask/package.nix            |  2 +-
 pkgs/by-name/ds/dstep/package.nix             |  2 +-
 pkgs/by-name/ds/dstp/package.nix              |  2 +-
 pkgs/by-name/ds/dsvpn/package.nix             |  2 +-
 pkgs/by-name/dt/dtcmp/package.nix             |  2 +-
 pkgs/by-name/dt/dtool/package.nix             |  2 +-
 pkgs/by-name/dt/dtrx/package.nix              |  2 +-
 pkgs/by-name/du/duc/package.nix               |  2 +-
 pkgs/by-name/du/duf/package.nix               |  2 +-
 pkgs/by-name/du/dufs/package.nix              |  2 +-
 pkgs/by-name/du/dum/package.nix               |  2 +-
 pkgs/by-name/du/dumb-init/package.nix         |  2 +-
 pkgs/by-name/du/dumb/package.nix              |  2 +-
 pkgs/by-name/du/dumbpipe/package.nix          |  2 +-
 pkgs/by-name/du/dummyhttp/package.nix         |  2 +-
 pkgs/by-name/du/dump1090/package.nix          |  2 +-
 pkgs/by-name/du/dupd/package.nix              |  2 +-
 pkgs/by-name/du/dupe-krill/package.nix        |  2 +-
 pkgs/by-name/du/duperemove/package.nix        |  2 +-
 pkgs/by-name/du/duplicacy/package.nix         |  2 +-
 pkgs/by-name/du/dust/package.nix              |  2 +-
 pkgs/by-name/du/dutree/package.nix            |  2 +-
 pkgs/by-name/dy/dyff/package.nix              |  2 +-
 pkgs/by-name/dy/dynamic-colors/package.nix    |  2 +-
 pkgs/by-name/dy/dynamic-wallpaper/package.nix |  2 +-
 pkgs/by-name/dy/dynein/package.nix            |  2 +-
 pkgs/by-name/dy/dysk/package.nix              |  2 +-
 pkgs/by-name/ea/ea/package.nix                |  2 +-
 pkgs/by-name/ea/each/package.nix              |  2 +-
 pkgs/by-name/ea/earlybird/package.nix         |  2 +-
 pkgs/by-name/ea/earthly/package.nix           |  2 +-
 pkgs/by-name/ea/earthlyls/package.nix         |  2 +-
 pkgs/by-name/ea/easeprobe/package.nix         |  2 +-
 pkgs/by-name/ea/eask-cli/package.nix          |  2 +-
 pkgs/by-name/ea/easyjson/package.nix          |  2 +-
 pkgs/by-name/ea/easyloggingpp/package.nix     |  2 +-
 pkgs/by-name/ea/easypdkprog/package.nix       |  2 +-
 pkgs/by-name/ea/easyrsa/package.nix           |  2 +-
 pkgs/by-name/eb/ebusd/package.nix             |  2 +-
 pkgs/by-name/ec/ec2-metadata-mock/package.nix |  2 +-
 pkgs/by-name/ec/ecc/package.nix               |  2 +-
 pkgs/by-name/ec/ecdsautils/package.nix        |  2 +-
 pkgs/by-name/ec/eclint/package.nix            |  2 +-
 pkgs/by-name/ec/ecos/package.nix              |  2 +-
 pkgs/by-name/ec/ecs-agent/package.nix         |  2 +-
 pkgs/by-name/ed/edge-runtime/package.nix      |  2 +-
 pkgs/by-name/ed/editline/package.nix          |  2 +-
 .../ed/editorconfig-checker/package.nix       |  2 +-
 pkgs/by-name/ed/edwood/package.nix            |  2 +-
 pkgs/by-name/ef/eff/package.nix               |  2 +-
 .../ef/efficient-compression-tool/package.nix |  2 +-
 pkgs/by-name/ef/effitask/package.nix          |  2 +-
 pkgs/by-name/ef/efivar/package.nix            |  2 +-
 pkgs/by-name/ef/efm-langserver/package.nix    |  2 +-
 pkgs/by-name/ef/efmt/package.nix              |  2 +-
 pkgs/by-name/eg/eg25-manager/package.nix      |  2 +-
 pkgs/by-name/eg/eget/package.nix              |  2 +-
 pkgs/by-name/eg/egglog/package.nix            |  2 +-
 pkgs/by-name/eg/egl-wayland/package.nix       |  2 +-
 .../eg/eglexternalplatform/package.nix        |  2 +-
 pkgs/by-name/eg/ego/package.nix               |  2 +-
 pkgs/by-name/ei/eiciel/package.nix            |  2 +-
 pkgs/by-name/ei/eigenlayer/package.nix        |  2 +-
 pkgs/by-name/ei/eiwd/package.nix              |  2 +-
 pkgs/by-name/ej/ejs/package.nix               |  2 +-
 pkgs/by-name/ej/ejson/package.nix             |  2 +-
 pkgs/by-name/ej/ejson2env/package.nix         |  2 +-
 pkgs/by-name/ej/ejsonkms/package.nix          |  2 +-
 pkgs/by-name/ek/eksctl/package.nix            |  2 +-
 pkgs/by-name/el/elan/package.nix              |  2 +-
 pkgs/by-name/el/elektroid/package.nix         |  2 +-
 .../el/element-desktop/keytar/default.nix     |  2 +-
 .../el/element-desktop/seshat/default.nix     |  2 +-
 pkgs/by-name/el/element/package.nix           |  2 +-
 .../el/elementary-xfce-icon-theme/package.nix |  2 +-
 pkgs/by-name/el/elf-info/package.nix          |  2 +-
 pkgs/by-name/el/elf2nucleus/package.nix       |  2 +-
 pkgs/by-name/el/elfcat/package.nix            |  2 +-
 pkgs/by-name/el/elfinfo/package.nix           |  2 +-
 pkgs/by-name/el/ell/package.nix               |  2 +-
 pkgs/by-name/el/elm-land/package.nix          |  2 +-
 pkgs/by-name/el/elogind/package.nix           |  2 +-
 pkgs/by-name/el/eludris/package.nix           |  2 +-
 pkgs/by-name/el/elvish/package.nix            |  2 +-
 pkgs/by-name/em/emacs-lsp-booster/package.nix |  2 +-
 pkgs/by-name/em/emacspeak/package.nix         |  2 +-
 pkgs/by-name/em/emmet-ls/package.nix          |  2 +-
 pkgs/by-name/em/emoji-picker/package.nix      |  2 +-
 pkgs/by-name/em/emojify/package.nix           |  2 +-
 pkgs/by-name/em/emote/package.nix             |  2 +-
 pkgs/by-name/em/emptty/package.nix            |  2 +-
 pkgs/by-name/em/emulsion-palette/package.nix  |  2 +-
 pkgs/by-name/en/enc/package.nix               |  2 +-
 pkgs/by-name/en/enchive/package.nix           |  2 +-
 pkgs/by-name/en/encpipe/package.nix           |  2 +-
 .../en/endgame-singularity/package.nix        |  2 +-
 pkgs/by-name/en/endlessh-go/package.nix       |  2 +-
 pkgs/by-name/en/endlessh/package.nix          |  2 +-
 pkgs/by-name/en/endlines/package.nix          |  2 +-
 pkgs/by-name/en/enjarify/package.nix          |  2 +-
 pkgs/by-name/en/enkei/package.nix             |  2 +-
 pkgs/by-name/en/ent-go/package.nix            |  2 +-
 pkgs/by-name/en/entropy/package.nix           |  2 +-
 pkgs/by-name/en/entt/package.nix              |  2 +-
 pkgs/by-name/en/entwine/package.nix           |  2 +-
 pkgs/by-name/en/enum4linux/package.nix        |  2 +-
 pkgs/by-name/en/envconsul/package.nix         |  2 +-
 pkgs/by-name/en/envfs/package.nix             |  2 +-
 pkgs/by-name/en/envio/package.nix             |  2 +-
 .../by-name/en/envision-unwrapped/package.nix |  2 +-
 pkgs/by-name/en/envsubst/package.nix          |  2 +-
 pkgs/by-name/en/enzyme/package.nix            |  2 +-
 pkgs/by-name/ep/epeg/package.nix              |  2 +-
 pkgs/by-name/ep/epgstation/package.nix        |  2 +-
 pkgs/by-name/ep/ephemeral/package.nix         |  2 +-
 pkgs/by-name/ep/epilys-bb/package.nix         |  2 +-
 pkgs/by-name/ep/epm/package.nix               |  2 +-
 pkgs/by-name/ep/epr/package.nix               |  2 +-
 pkgs/by-name/er/er-patcher/package.nix        |  2 +-
 pkgs/by-name/er/erdtree/package.nix           |  2 +-
 pkgs/by-name/er/eresi/package.nix             |  2 +-
 pkgs/by-name/er/erg/package.nix               |  2 +-
 pkgs/by-name/er/ergochat/package.nix          |  2 +-
 pkgs/by-name/er/ericw-tools/package.nix       |  2 +-
 pkgs/by-name/er/erigon/package.nix            |  2 +-
 pkgs/by-name/er/eris-go/package.nix           |  2 +-
 pkgs/by-name/er/errbot/package.nix            |  2 +-
 pkgs/by-name/er/errcheck/package.nix          |  2 +-
 pkgs/by-name/es/esbuild-config/package.nix    |  2 +-
 pkgs/by-name/es/escambo/package.nix           |  2 +-
 pkgs/by-name/es/esdm/package.nix              |  2 +-
 pkgs/by-name/es/esh/package.nix               |  2 +-
 pkgs/by-name/es/eslint_d/package.nix          |  2 +-
 pkgs/by-name/es/esp-generate/package.nix      |  2 +-
 pkgs/by-name/es/espeakup/package.nix          |  2 +-
 pkgs/by-name/es/espresso/package.nix          |  2 +-
 pkgs/by-name/es/espup/package.nix             |  2 +-
 pkgs/by-name/et/et/package.nix                |  2 +-
 pkgs/by-name/et/eternity/package.nix          |  2 +-
 pkgs/by-name/et/ethash/package.nix            |  2 +-
 pkgs/by-name/et/etherguard/package.nix        |  2 +-
 pkgs/by-name/et/ets/package.nix               |  2 +-
 pkgs/by-name/et/ettercap/package.nix          |  2 +-
 pkgs/by-name/ev/evans/package.nix             |  2 +-
 pkgs/by-name/ev/evebox/package.nix            |  2 +-
 pkgs/by-name/ev/evscript/package.nix          |  2 +-
 pkgs/by-name/ev/evsieve/package.nix           |  2 +-
 pkgs/by-name/ex/exaile/package.nix            |  2 +-
 pkgs/by-name/ex/exfat/package.nix             |  2 +-
 pkgs/by-name/ex/exfatprogs/package.nix        |  2 +-
 pkgs/by-name/ex/exhaustive/package.nix        |  2 +-
 pkgs/by-name/ex/exhibit/package.nix           |  2 +-
 pkgs/by-name/ex/exiflooter/package.nix        |  2 +-
 pkgs/by-name/ex/exiv2/package.nix             |  2 +-
 pkgs/by-name/ex/exoscale-cli/package.nix      |  2 +-
 pkgs/by-name/ex/expected-lite/package.nix     |  2 +-
 pkgs/by-name/ex/expenses/package.nix          |  2 +-
 pkgs/by-name/ex/exportarr/package.nix         |  2 +-
 pkgs/by-name/ex/expr/package.nix              |  2 +-
 pkgs/by-name/ex/exprtk/package.nix            |  2 +-
 pkgs/by-name/ex/extest/package.nix            |  2 +-
 pkgs/by-name/ex/extra-container/package.nix   |  2 +-
 pkgs/by-name/ex/extrace/package.nix           |  2 +-
 pkgs/by-name/ex/extract_url/package.nix       |  2 +-
 pkgs/by-name/ex/extractpdfmark/package.nix    |  2 +-
 pkgs/by-name/ex/extrude/package.nix           |  2 +-
 pkgs/by-name/ey/eyedropper/package.nix        |  2 +-
 pkgs/by-name/ey/eyewitness/package.nix        |  2 +-
 pkgs/by-name/ez/ezquake/package.nix           |  2 +-
 pkgs/by-name/f1/f1viewer/package.nix          |  2 +-
 pkgs/by-name/f2/f2/package.nix                |  2 +-
 pkgs/by-name/f3/f3/package.nix                |  2 +-
 pkgs/by-name/fa/faad2/package.nix             |  2 +-
 pkgs/by-name/fa/faas-cli/package.nix          |  2 +-
 pkgs/by-name/fa/faba-icon-theme/package.nix   |  2 +-
 pkgs/by-name/fa/fabric-ai/package.nix         |  2 +-
 pkgs/by-name/fa/fabs/package.nix              |  2 +-
 pkgs/by-name/fa/facedetect/package.nix        |  2 +-
 pkgs/by-name/fa/fail2ban/package.nix          |  2 +-
 pkgs/by-name/fa/faircamp/package.nix          |  2 +-
 pkgs/by-name/fa/fakechroot/package.nix        |  2 +-
 pkgs/by-name/fa/falcoctl/package.nix          |  2 +-
 pkgs/by-name/fa/fan2go/package.nix            |  2 +-
 pkgs/by-name/fa/fanbox-dl/package.nix         |  2 +-
 pkgs/by-name/fa/fanctl/package.nix            |  2 +-
 pkgs/by-name/fa/faraday/package.nix           |  2 +-
 pkgs/by-name/fa/fasole/package.nix            |  2 +-
 pkgs/by-name/fa/fastd/package.nix             |  2 +-
 pkgs/by-name/fa/fastddsgen/package.nix        |  2 +-
 pkgs/by-name/fa/fastp/package.nix             |  2 +-
 pkgs/by-name/fa/fastpbkdf2/package.nix        |  2 +-
 pkgs/by-name/fa/fatcat/package.nix            |  2 +-
 pkgs/by-name/fa/fatrace/package.nix           |  2 +-
 pkgs/by-name/fa/fatresize/package.nix         |  2 +-
 pkgs/by-name/fa/faudio/package.nix            |  2 +-
 .../fa/faustPhysicalModeling/package.nix      |  2 +-
 pkgs/by-name/fb/fbcat/package.nix             |  2 +-
 pkgs/by-name/fb/fbjni/package.nix             |  2 +-
 pkgs/by-name/fb/fblog/package.nix             |  2 +-
 pkgs/by-name/fb/fbmark/package.nix            |  2 +-
 pkgs/by-name/fb/fbmenugen/package.nix         |  2 +-
 pkgs/by-name/fc/fcft/package.nix              |  2 +-
 pkgs/by-name/fc/fcgi/package.nix              |  2 +-
 pkgs/by-name/fc/fcgiwrap/package.nix          |  2 +-
 .../fc/fcitx5-material-color/package.nix      |  2 +-
 pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix |  2 +-
 pkgs/by-name/fc/fcl/package.nix               |  2 +-
 pkgs/by-name/fc/fcppt/package.nix             |  2 +-
 pkgs/by-name/fd/fd/package.nix                |  2 +-
 pkgs/by-name/fd/fdk-aac-encoder/package.nix   |  2 +-
 pkgs/by-name/fd/fdm/package.nix               |  2 +-
 pkgs/by-name/fd/fdupes/package.nix            |  2 +-
 pkgs/by-name/fe/feather/package.nix           |  2 +-
 pkgs/by-name/fe/fedimint/package.nix          |  2 +-
 pkgs/by-name/fe/feed2imap-go/package.nix      |  2 +-
 pkgs/by-name/fe/feedgnuplot/package.nix       |  2 +-
 pkgs/by-name/fe/feishin/package.nix           |  2 +-
 pkgs/by-name/fe/fend/package.nix              |  2 +-
 pkgs/by-name/fe/ferretdb/package.nix          |  2 +-
 pkgs/by-name/fe/fet-sh/package.nix            |  2 +-
 pkgs/by-name/fe/fetch-scm/package.nix         |  2 +-
 pkgs/by-name/fe/fetchit/package.nix           |  2 +-
 pkgs/by-name/ff/ff2mpv-rust/package.nix       |  2 +-
 pkgs/by-name/ff/ff2mpv/package.nix            |  2 +-
 pkgs/by-name/ff/ffcast/package.nix            |  2 +-
 pkgs/by-name/ff/fff/package.nix               |  2 +-
 pkgs/by-name/ff/ffizer/package.nix            |  2 +-
 pkgs/by-name/ff/fflas-ffpack/package.nix      |  2 +-
 pkgs/by-name/ff/ffms/package.nix              |  2 +-
 pkgs/by-name/fh/fh/package.nix                |  2 +-
 pkgs/by-name/fh/fheroes2/package.nix          |  2 +-
 pkgs/by-name/fi/fiano/package.nix             |  2 +-
 pkgs/by-name/fi/fiche/package.nix             |  2 +-
 pkgs/by-name/fi/fido2luks/package.nix         |  2 +-
 pkgs/by-name/fi/figurine/package.nix          |  2 +-
 pkgs/by-name/fi/filebrowser/package.nix       |  2 +-
 pkgs/by-name/fi/files-cli/package.nix         |  2 +-
 pkgs/by-name/fi/fileshelter/package.nix       |  2 +-
 pkgs/by-name/fi/filter-audio/package.nix      |  2 +-
 pkgs/by-name/fi/filterpath/package.nix        |  2 +-
 pkgs/by-name/fi/filtron/package.nix           |  2 +-
 pkgs/by-name/fi/finamp/package.nix            |  2 +-
 pkgs/by-name/fi/find-cursor/package.nix       |  2 +-
 pkgs/by-name/fi/findex/package.nix            |  2 +-
 pkgs/by-name/fi/fioctl/package.nix            |  2 +-
 pkgs/by-name/fi/firecracker/package.nix       |  2 +-
 pkgs/by-name/fi/firectl/package.nix           |  2 +-
 .../fi/firefox-sync-client/package.nix        |  2 +-
 pkgs/by-name/fi/firefoxpwa/package.nix        |  2 +-
 pkgs/by-name/fi/firejail/package.nix          |  2 +-
 pkgs/by-name/fi/firestarter/package.nix       |  2 +-
 pkgs/by-name/fi/firewalld/package.nix         |  2 +-
 pkgs/by-name/fi/firmware-manager/package.nix  |  2 +-
 pkgs/by-name/fi/fishnet/package.nix           |  2 +-
 pkgs/by-name/fi/fission/package.nix           |  2 +-
 pkgs/by-name/fi/fits-cloudctl/package.nix     |  2 +-
 pkgs/by-name/fi/fityk/package.nix             |  2 +-
 pkgs/by-name/fl/flaca/package.nix             |  2 +-
 pkgs/by-name/fl/flake-checker/package.nix     |  2 +-
 pkgs/by-name/fl/flake-edit/package.nix        |  2 +-
 pkgs/by-name/fl/flamerobin/package.nix        |  2 +-
 pkgs/by-name/fl/flann/package.nix             |  2 +-
 pkgs/by-name/fl/flare-signal/package.nix      |  2 +-
 pkgs/by-name/fl/flarectl/package.nix          |  2 +-
 pkgs/by-name/fl/flat-remix-gnome/package.nix  |  2 +-
 pkgs/by-name/fl/flat-remix-gtk/package.nix    |  2 +-
 pkgs/by-name/fl/flatcc/package.nix            |  2 +-
 pkgs/by-name/fl/flavours/package.nix          |  2 +-
 pkgs/by-name/fl/flawz/package.nix             |  2 +-
 pkgs/by-name/fl/flex-ncat/package.nix         |  2 +-
 pkgs/by-name/fl/flex-ndax/package.nix         |  2 +-
 pkgs/by-name/fl/flexcpp/package.nix           |  2 +-
 pkgs/by-name/fl/flintlock/package.nix         |  2 +-
 pkgs/by-name/fl/flip-link/package.nix         |  2 +-
 pkgs/by-name/fl/flitter/package.nix           |  2 +-
 pkgs/by-name/fl/flock/package.nix             |  2 +-
 pkgs/by-name/fl/flood/package.nix             |  2 +-
 pkgs/by-name/fl/flottbot/package.nix          |  2 +-
 pkgs/by-name/fl/flowblade/package.nix         |  2 +-
 pkgs/by-name/fl/flowtime/package.nix          |  2 +-
 pkgs/by-name/fl/fluent-gtk-theme/package.nix  |  2 +-
 .../flutter_rust_bridge_codegen/package.nix   |  2 +-
 pkgs/by-name/fl/fluxcd/package.nix            |  2 +-
 pkgs/by-name/fl/fluxctl/package.nix           |  2 +-
 pkgs/by-name/fl/fly/package.nix               |  2 +-
 pkgs/by-name/fl/flycast/package.nix           |  2 +-
 pkgs/by-name/fl/flyctl/package.nix            |  2 +-
 pkgs/by-name/fm/fm-tune/package.nix           |  2 +-
 pkgs/by-name/fn/fn-cli/package.nix            |  2 +-
 pkgs/by-name/fn/fna3d/package.nix             |  2 +-
 pkgs/by-name/fn/fnm/package.nix               |  2 +-
 pkgs/by-name/fn/fnott/package.nix             |  2 +-
 pkgs/by-name/fo/focus-stack/package.nix       |  2 +-
 pkgs/by-name/fo/follow/package.nix            |  2 +-
 pkgs/by-name/fo/fondo/package.nix             |  2 +-
 pkgs/by-name/fo/font-config-info/package.nix  |  2 +-
 pkgs/by-name/fo/font-manager/package.nix      |  2 +-
 pkgs/by-name/fo/fontfinder/package.nix        |  2 +-
 pkgs/by-name/fo/fontfor/package.nix           |  2 +-
 pkgs/by-name/fo/fontforge/package.nix         |  2 +-
 pkgs/by-name/fo/fontpreview/package.nix       |  2 +-
 pkgs/by-name/fo/foot/package.nix              |  2 +-
 pkgs/by-name/fo/forge-sparks/package.nix      |  2 +-
 pkgs/by-name/fo/fork-cleaner/package.nix      |  2 +-
 pkgs/by-name/fo/formatter/package.nix         |  2 +-
 pkgs/by-name/fo/fortune-kind/package.nix      |  2 +-
 pkgs/by-name/fo/foxmarks/package.nix          |  2 +-
 pkgs/by-name/fp/fpp/package.nix               |  2 +-
 pkgs/by-name/fp/fprettify/package.nix         |  2 +-
 pkgs/by-name/fq/fq/package.nix                |  2 +-
 pkgs/by-name/fr/frangipanni/package.nix       |  2 +-
 pkgs/by-name/fr/fre/package.nix               |  2 +-
 pkgs/by-name/fr/freac/package.nix             |  2 +-
 pkgs/by-name/fr/frece/package.nix             |  2 +-
 pkgs/by-name/fr/freebayes/package.nix         |  2 +-
 pkgs/by-name/fr/freecad/package.nix           |  2 +-
 pkgs/by-name/fr/freerdp/package.nix           |  2 +-
 pkgs/by-name/fr/freewheeling/package.nix      |  2 +-
 pkgs/by-name/fr/freeze/package.nix            |  2 +-
 pkgs/by-name/fr/frei/package.nix              |  2 +-
 pkgs/by-name/fr/frei0r/package.nix            |  2 +-
 pkgs/by-name/fr/fricas/package.nix            |  2 +-
 pkgs/by-name/fr/friture/package.nix           |  2 +-
 pkgs/by-name/fr/frogmouth/package.nix         |  2 +-
 pkgs/by-name/fr/frp/package.nix               |  2 +-
 pkgs/by-name/fr/frugal/package.nix            |  2 +-
 pkgs/by-name/fs/fsarchiver/package.nix        |  2 +-
 pkgs/by-name/fs/fscan/package.nix             |  2 +-
 .../fs/fscrypt-experimental/package.nix       |  2 +-
 pkgs/by-name/fs/fsearch/package.nix           |  2 +-
 pkgs/by-name/fs/fselect/package.nix           |  2 +-
 pkgs/by-name/fs/fsharp/package.nix            |  2 +-
 pkgs/by-name/fs/fsql/package.nix              |  2 +-
 pkgs/by-name/fs/fsrx/package.nix              |  2 +-
 pkgs/by-name/fs/fstrm/package.nix             |  2 +-
 pkgs/by-name/ft/ftgl/package.nix              |  2 +-
 pkgs/by-name/fu/fuc/package.nix               |  2 +-
 pkgs/by-name/fu/fuchsia-cursor/package.nix    |  2 +-
 pkgs/by-name/fu/fulcio/package.nix            |  2 +-
 pkgs/by-name/fu/function-runner/package.nix   |  2 +-
 pkgs/by-name/fu/functionalplus/package.nix    |  2 +-
 pkgs/by-name/fu/fundoc/package.nix            |  2 +-
 pkgs/by-name/fu/funzzy/package.nix            |  2 +-
 pkgs/by-name/fu/fuse-overlayfs/package.nix    |  2 +-
 pkgs/by-name/fu/fusionInventory/package.nix   |  2 +-
 pkgs/by-name/fu/fuzzel/package.nix            |  2 +-
 pkgs/by-name/fu/fuzzylite/package.nix         |  2 +-
 pkgs/by-name/fv/fvwm2/package.nix             |  2 +-
 pkgs/by-name/fv/fvwm3/package.nix             |  2 +-
 pkgs/by-name/fw/fw/package.nix                |  2 +-
 pkgs/by-name/fw/fwanalyzer/package.nix        |  2 +-
 pkgs/by-name/fx/fx-cast-bridge/package.nix    |  2 +-
 pkgs/by-name/fx/fx/package.nix                |  2 +-
 pkgs/by-name/fy/fyi/package.nix               |  2 +-
 pkgs/by-name/fy/fypp/package.nix              |  2 +-
 pkgs/by-name/fz/fzf-make/package.nix          |  2 +-
 pkgs/by-name/fz/fzf-obc/package.nix           |  2 +-
 pkgs/by-name/fz/fzf/package.nix               |  2 +-
 pkgs/by-name/fz/fzy/package.nix               |  2 +-
 pkgs/by-name/g3/g3kb-switch/package.nix       |  2 +-
 pkgs/by-name/ga/gabutdm/package.nix           |  2 +-
 pkgs/by-name/ga/galaxis/package.nix           |  2 +-
 pkgs/by-name/ga/galerio/package.nix           |  2 +-
 pkgs/by-name/ga/gambit-chess/package.nix      |  2 +-
 .../ga/game-devices-udev-rules/package.nix    |  2 +-
 pkgs/by-name/ga/game-rs/package.nix           |  2 +-
 pkgs/by-name/ga/gamecube-tools/package.nix    |  2 +-
 pkgs/by-name/ga/gammu/package.nix             |  2 +-
 pkgs/by-name/ga/gandom-fonts/package.nix      |  2 +-
 pkgs/by-name/ga/gargoyle/package.nix          |  2 +-
 pkgs/by-name/ga/gatus/package.nix             |  2 +-
 pkgs/by-name/ga/gavin-bc/package.nix          |  2 +-
 pkgs/by-name/gb/gbenchmark/package.nix        |  2 +-
 pkgs/by-name/gb/gbsplay/package.nix           |  2 +-
 pkgs/by-name/gc/gci/package.nix               |  2 +-
 pkgs/by-name/gc/gcli/package.nix              |  2 +-
 pkgs/by-name/gc/gcov2lcov/package.nix         |  2 +-
 pkgs/by-name/gc/gcsfuse/package.nix           |  2 +-
 pkgs/by-name/gc/gcstar/package.nix            |  2 +-
 pkgs/by-name/gd/gdlv/package.nix              |  2 +-
 pkgs/by-name/gd/gdrive/package.nix            |  2 +-
 pkgs/by-name/gd/gdrive3/package.nix           |  2 +-
 pkgs/by-name/gd/gdtoolkit_3/package.nix       |  2 +-
 pkgs/by-name/gd/gdtoolkit_4/package.nix       |  2 +-
 pkgs/by-name/ge/gebaar-libinput/package.nix   |  2 +-
 pkgs/by-name/ge/geek-life/package.nix         |  2 +-
 pkgs/by-name/ge/geeqie/package.nix            |  2 +-
 pkgs/by-name/ge/geesefs/package.nix           |  2 +-
 pkgs/by-name/ge/gef/package.nix               |  2 +-
 pkgs/by-name/ge/gemget/package.nix            |  2 +-
 pkgs/by-name/ge/gemrb/package.nix             |  2 +-
 pkgs/by-name/ge/gen-license/package.nix       |  2 +-
 pkgs/by-name/ge/gen-oath-safe/package.nix     |  2 +-
 pkgs/by-name/ge/genact/package.nix            |  2 +-
 pkgs/by-name/ge/genann/package.nix            |  2 +-
 pkgs/by-name/ge/genext2fs/package.nix         |  2 +-
 pkgs/by-name/ge/genxword/package.nix          |  2 +-
 pkgs/by-name/ge/geo/package.nix               |  2 +-
 pkgs/by-name/ge/geoipupdate/package.nix       |  2 +-
 pkgs/by-name/ge/geonkick/package.nix          |  2 +-
 pkgs/by-name/ge/gephi/package.nix             |  2 +-
 pkgs/by-name/ge/gerbera/package.nix           |  2 +-
 pkgs/by-name/ge/gerbolyze/package.nix         |  2 +-
 pkgs/by-name/ge/gerrit-queue/package.nix      |  2 +-
 pkgs/by-name/ge/get_iplayer/package.nix       |  2 +-
 pkgs/by-name/ge/getdata/package.nix           |  2 +-
 pkgs/by-name/ge/getoptions/package.nix        |  2 +-
 pkgs/by-name/ge/gex/package.nix               |  2 +-
 pkgs/by-name/gf/gflags/package.nix            |  2 +-
 pkgs/by-name/gf/gfold/package.nix             |  2 +-
 pkgs/by-name/gf/gforth/package.nix            |  2 +-
 pkgs/by-name/gf/gfshare/package.nix           |  2 +-
 pkgs/by-name/gf/gfxreconstruct/package.nix    |  2 +-
 pkgs/by-name/gg/gg-scm/package.nix            |  2 +-
 pkgs/by-name/gh/gh-actions-cache/package.nix  |  2 +-
 pkgs/by-name/gh/gh-contribs/package.nix       |  2 +-
 pkgs/by-name/gh/gh-dash/package.nix           |  2 +-
 pkgs/by-name/gh/gh-f/package.nix              |  2 +-
 pkgs/by-name/gh/gh-gei/package.nix            |  2 +-
 pkgs/by-name/gh/gh-i/package.nix              |  2 +-
 .../gh/gh-markdown-preview/package.nix        |  2 +-
 pkgs/by-name/gh/gh-ost/package.nix            |  2 +-
 pkgs/by-name/gh/gh-poi/package.nix            |  2 +-
 pkgs/by-name/gh/gh-s/package.nix              |  2 +-
 pkgs/by-name/gh/gh-screensaver/package.nix    |  2 +-
 pkgs/by-name/gh/ghbackup/package.nix          |  2 +-
 pkgs/by-name/gh/ghciwatch/package.nix         |  2 +-
 pkgs/by-name/gh/ghfetch/package.nix           |  2 +-
 pkgs/by-name/gh/ghorg/package.nix             |  2 +-
 pkgs/by-name/gh/ghost/package.nix             |  2 +-
 pkgs/by-name/gh/ghostie/package.nix           |  2 +-
 pkgs/by-name/gh/ghosttohugo/package.nix       |  2 +-
 pkgs/by-name/gh/ghostunnel/package.nix        |  2 +-
 pkgs/by-name/gh/ghq/package.nix               |  2 +-
 pkgs/by-name/gh/ghr/package.nix               |  2 +-
 pkgs/by-name/gh/ghz/package.nix               |  2 +-
 pkgs/by-name/gi/gImageReader/package.nix      |  2 +-
 pkgs/by-name/gi/gi-crystal/package.nix        |  2 +-
 pkgs/by-name/gi/giada/package.nix             |  2 +-
 pkgs/by-name/gi/gibo/package.nix              |  2 +-
 pkgs/by-name/gi/gifgen/package.nix            |  2 +-
 pkgs/by-name/gi/gifski/package.nix            |  2 +-
 pkgs/by-name/gi/gimme-aws-creds/package.nix   |  2 +-
 pkgs/by-name/gi/gimoji/package.nix            |  2 +-
 pkgs/by-name/gi/gimx/package.nix              |  2 +-
 pkgs/by-name/gi/ginkgo/package.nix            |  2 +-
 pkgs/by-name/gi/gio-sharp/package.nix         |  2 +-
 pkgs/by-name/gi/giph/package.nix              |  2 +-
 pkgs/by-name/gi/gir-rs/package.nix            |  2 +-
 pkgs/by-name/gi/girouette/package.nix         |  2 +-
 .../gi/git-annex-remote-rclone/package.nix    |  2 +-
 pkgs/by-name/gi/git-autoshare/package.nix     |  2 +-
 pkgs/by-name/gi/git-backup-go/package.nix     |  2 +-
 pkgs/by-name/gi/git-branchless/package.nix    |  2 +-
 pkgs/by-name/gi/git-bug-migration/package.nix |  2 +-
 pkgs/by-name/gi/git-bug/package.nix           |  2 +-
 pkgs/by-name/gi/git-chglog/package.nix        |  2 +-
 pkgs/by-name/gi/git-cliff/package.nix         |  2 +-
 pkgs/by-name/gi/git-codereview/package.nix    |  2 +-
 .../gi/git-credential-keepassxc/package.nix   |  2 +-
 .../gi/git-credential-oauth/package.nix       |  2 +-
 pkgs/by-name/gi/git-crypt/package.nix         |  2 +-
 pkgs/by-name/gi/git-dive/package.nix          |  2 +-
 pkgs/by-name/gi/git-extras/package.nix        |  2 +-
 pkgs/by-name/gi/git-ftp/package.nix           |  2 +-
 pkgs/by-name/gi/git-get/package.nix           |  2 +-
 pkgs/by-name/gi/git-hound/package.nix         |  2 +-
 pkgs/by-name/gi/git-hub/package.nix           |  2 +-
 pkgs/by-name/gi/git-igitt/package.nix         |  2 +-
 pkgs/by-name/gi/git-ignore/package.nix        |  2 +-
 pkgs/by-name/gi/git-instafix/package.nix      |  2 +-
 .../git-interactive-rebase-tool/package.nix   |  2 +-
 pkgs/by-name/gi/git-mit/package.nix           |  2 +-
 pkgs/by-name/gi/git-my/package.nix            |  2 +-
 pkgs/by-name/gi/git-nomad/package.nix         |  2 +-
 pkgs/by-name/gi/git-octopus/package.nix       |  2 +-
 pkgs/by-name/gi/git-open/package.nix          |  2 +-
 pkgs/by-name/gi/git-pr/package.nix            |  2 +-
 pkgs/by-name/gi/git-privacy/package.nix       |  2 +-
 pkgs/by-name/gi/git-quick-stats/package.nix   |  2 +-
 pkgs/by-name/gi/git-quickfix/package.nix      |  2 +-
 pkgs/by-name/gi/git-radar/package.nix         |  2 +-
 pkgs/by-name/gi/git-repo/package.nix          |  2 +-
 pkgs/by-name/gi/git-run/package.nix           |  2 +-
 pkgs/by-name/gi/git-secrets/package.nix       |  2 +-
 pkgs/by-name/gi/git-sim/package.nix           |  2 +-
 pkgs/by-name/gi/git-sizer/package.nix         |  2 +-
 pkgs/by-name/gi/git-standup/package.nix       |  2 +-
 pkgs/by-name/gi/git-subrepo/package.nix       |  2 +-
 pkgs/by-name/gi/git-subtrac/package.nix       |  2 +-
 pkgs/by-name/gi/git-team/package.nix          |  2 +-
 pkgs/by-name/gi/git-test/package.nix          |  2 +-
 pkgs/by-name/gi/git-trim/package.nix          |  2 +-
 pkgs/by-name/gi/git-vendor/package.nix        |  2 +-
 pkgs/by-name/gi/git-when-merged/package.nix   |  2 +-
 pkgs/by-name/gi/git-who/package.nix           |  2 +-
 pkgs/by-name/gi/git2-cpp/package.nix          |  2 +-
 pkgs/by-name/gi/gitaly/git.nix                |  2 +-
 pkgs/by-name/gi/gitaly/package.nix            |  2 +-
 pkgs/by-name/gi/gitbatch/package.nix          |  2 +-
 pkgs/by-name/gi/gitcs/package.nix             |  2 +-
 pkgs/by-name/gi/gitflow/package.nix           |  2 +-
 pkgs/by-name/gi/gitfs/package.nix             |  2 +-
 pkgs/by-name/gi/githooks/package.nix          |  2 +-
 pkgs/by-name/gi/github-commenter/package.nix  |  2 +-
 .../gi/github-markdown-toc-go/package.nix     |  2 +-
 pkgs/by-name/gi/gitjacker/package.nix         |  2 +-
 pkgs/by-name/gi/gitlab-ci-local/package.nix   |  2 +-
 pkgs/by-name/gi/gitlab-ci-ls/package.nix      |  2 +-
 .../gitlab-elasticsearch-indexer/package.nix  |  2 +-
 pkgs/by-name/gi/gitlab-pages/package.nix      |  2 +-
 .../by-name/gi/gitlab-release-cli/package.nix |  2 +-
 pkgs/by-name/gi/gitlab-shell/package.nix      |  2 +-
 pkgs/by-name/gi/gitless/package.nix           |  2 +-
 pkgs/by-name/gi/gitls/package.nix             |  2 +-
 pkgs/by-name/gi/gitnr/package.nix             |  2 +-
 pkgs/by-name/gi/gitolite/package.nix          |  2 +-
 pkgs/by-name/gi/gitopper/package.nix          |  2 +-
 pkgs/by-name/gi/gitoxide/package.nix          |  2 +-
 pkgs/by-name/gi/gitprompt-rs/package.nix      |  2 +-
 pkgs/by-name/gi/gitrs/package.nix             |  2 +-
 pkgs/by-name/gi/gitsign/package.nix           |  2 +-
 pkgs/by-name/gi/gitstatus/package.nix         |  2 +-
 pkgs/by-name/gi/gittuf/package.nix            |  2 +-
 pkgs/by-name/gi/gitty/package.nix             |  2 +-
 pkgs/by-name/gi/gitu/package.nix              |  2 +-
 pkgs/by-name/gi/gitui/package.nix             |  2 +-
 pkgs/by-name/gi/gitwatch/package.nix          |  2 +-
 pkgs/by-name/gi/gixy/package.nix              |  2 +-
 pkgs/by-name/gj/gjo/package.nix               |  2 +-
 pkgs/by-name/gl/glas/package.nix              |  2 +-
 pkgs/by-name/gl/glauth/package.nix            |  2 +-
 pkgs/by-name/gl/glava/package.nix             |  2 +-
 pkgs/by-name/gl/glbinding/package.nix         |  2 +-
 pkgs/by-name/gl/glfw3/package.nix             |  2 +-
 pkgs/by-name/gl/glicol-cli/package.nix        |  2 +-
 .../by-name/gl/glide-media-player/package.nix |  2 +-
 pkgs/by-name/gl/glider/package.nix            |  2 +-
 pkgs/by-name/gl/glitter/package.nix           |  2 +-
 pkgs/by-name/gl/glm/package.nix               |  2 +-
 pkgs/by-name/gl/glmark2/package.nix           |  2 +-
 .../gl/global-platform-pro/package.nix        |  2 +-
 pkgs/by-name/gl/globalarrays/package.nix      |  2 +-
 pkgs/by-name/gl/globalping-cli/package.nix    |  2 +-
 pkgs/by-name/gl/glog/package.nix              |  2 +-
 pkgs/by-name/gl/glooctl/package.nix           |  2 +-
 pkgs/by-name/gl/glow/package.nix              |  2 +-
 pkgs/by-name/gl/glowing-bear/package.nix      |  2 +-
 pkgs/by-name/gl/glrnvim/package.nix           |  2 +-
 pkgs/by-name/gl/glslang/package.nix           |  2 +-
 pkgs/by-name/gl/glslls/package.nix            |  2 +-
 pkgs/by-name/gl/gluesql/package.nix           |  2 +-
 pkgs/by-name/gl/glui/package.nix              |  2 +-
 pkgs/by-name/gl/glusterfs/package.nix         |  2 +-
 pkgs/by-name/gl/glyr/package.nix              |  2 +-
 pkgs/by-name/gm/gmailctl/package.nix          |  2 +-
 pkgs/by-name/gm/gmid/package.nix              |  2 +-
 pkgs/by-name/gn/gnirehtet/package.nix         |  2 +-
 pkgs/by-name/gn/gnmic/package.nix             |  2 +-
 .../gn/gnome-extension-manager/package.nix    |  2 +-
 pkgs/by-name/gn/gnome-firmware/package.nix    |  2 +-
 .../gn/gnome-online-accounts-gtk/package.nix  |  2 +-
 .../gn/gnome-pass-search-provider/package.nix |  2 +-
 pkgs/by-name/gn/gnome-pomodoro/package.nix    |  2 +-
 pkgs/by-name/gn/gnome-session/ctl.nix         |  2 +-
 pkgs/by-name/gn/gnostic/package.nix           |  2 +-
 pkgs/by-name/gn/gnss-sdr/package.nix          |  2 +-
 pkgs/by-name/gn/gnss-share/package.nix        |  2 +-
 pkgs/by-name/gn/gnu-efi_3/package.nix         |  2 +-
 pkgs/by-name/gn/gnucash/package.nix           |  2 +-
 pkgs/by-name/go/go-2fa/package.nix            |  2 +-
 pkgs/by-name/go/go-audit/package.nix          |  2 +-
 pkgs/by-name/go/go-bindata/package.nix        |  2 +-
 pkgs/by-name/go/go-blueprint/package.nix      |  2 +-
 pkgs/by-name/go/go-callvis/package.nix        |  2 +-
 pkgs/by-name/go/go-camo/package.nix           |  2 +-
 .../go/go-containerregistry/package.nix       |  2 +-
 pkgs/by-name/go/go-cover-treemap/package.nix  |  2 +-
 pkgs/by-name/go/go-cqhttp/package.nix         |  2 +-
 pkgs/by-name/go/go-critic/package.nix         |  2 +-
 pkgs/by-name/go/go-dnscollector/package.nix   |  2 +-
 pkgs/by-name/go/go-errorlint/package.nix      |  2 +-
 pkgs/by-name/go/go-ethereum/package.nix       |  2 +-
 pkgs/by-name/go/go-graft/package.nix          |  2 +-
 pkgs/by-name/go/go-ios/package.nix            |  2 +-
 pkgs/by-name/go/go-jet/package.nix            |  2 +-
 pkgs/by-name/go/go-jira/package.nix           |  2 +-
 pkgs/by-name/go/go-jsonnet/package.nix        |  2 +-
 pkgs/by-name/go/go-judge/package.nix          |  2 +-
 pkgs/by-name/go/go-junit-report/package.nix   |  2 +-
 pkgs/by-name/go/go-libp2p-daemon/package.nix  |  2 +-
 .../go/go-licence-detector/package.nix        |  2 +-
 .../go/go-license-detector/package.nix        |  2 +-
 pkgs/by-name/go/go-md2man/package.nix         |  2 +-
 pkgs/by-name/go/go-migrate/package.nix        |  2 +-
 pkgs/by-name/go/go-minimock/package.nix       |  2 +-
 pkgs/by-name/go/go-mockery/package.nix        |  2 +-
 .../by-name/go/go-mod-graph-chart/package.nix |  2 +-
 pkgs/by-name/go/go-motion/package.nix         |  2 +-
 pkgs/by-name/go/go-mtpfs/package.nix          |  2 +-
 pkgs/by-name/go/go-musicfox/package.nix       |  2 +-
 pkgs/by-name/go/go-org/package.nix            |  2 +-
 pkgs/by-name/go/go-passbolt-cli/package.nix   |  2 +-
 pkgs/by-name/go/go-protobuf/package.nix       |  2 +-
 pkgs/by-name/go/go-rice/package.nix           |  2 +-
 pkgs/by-name/go/go-shadowsocks2/package.nix   |  2 +-
 pkgs/by-name/go/go-swag/package.nix           |  2 +-
 pkgs/by-name/go/go-symbols/package.nix        |  2 +-
 pkgs/by-name/go/go-toml/package.nix           |  2 +-
 pkgs/by-name/go/go-tools/package.nix          |  2 +-
 pkgs/by-name/go/goa/package.nix               |  2 +-
 pkgs/by-name/go/goat-cli/package.nix          |  2 +-
 pkgs/by-name/go/goatcounter/package.nix       |  2 +-
 pkgs/by-name/go/goawk/package.nix             |  2 +-
 pkgs/by-name/go/gobang/package.nix            |  2 +-
 pkgs/by-name/go/gobble/package.nix            |  2 +-
 pkgs/by-name/go/gobby/package.nix             |  2 +-
 pkgs/by-name/go/gobetween/package.nix         |  2 +-
 pkgs/by-name/go/gobgp/package.nix             |  2 +-
 pkgs/by-name/go/gocode-gomod/package.nix      |  2 +-
 pkgs/by-name/go/goconst/package.nix           |  2 +-
 pkgs/by-name/go/gocover-cobertura/package.nix |  2 +-
 pkgs/by-name/go/gocryptfs/package.nix         |  2 +-
 pkgs/by-name/go/gocyclo/package.nix           |  2 +-
 pkgs/by-name/go/goda/package.nix              |  2 +-
 pkgs/by-name/go/godu/package.nix              |  2 +-
 pkgs/by-name/go/goeland/package.nix           |  2 +-
 pkgs/by-name/go/gof5/package.nix              |  2 +-
 pkgs/by-name/go/goflow/package.nix            |  2 +-
 pkgs/by-name/go/goflow2/package.nix           |  2 +-
 pkgs/by-name/go/gofumpt/package.nix           |  2 +-
 pkgs/by-name/go/gogup/package.nix             |  2 +-
 pkgs/by-name/go/goimports-reviser/package.nix |  2 +-
 pkgs/by-name/go/gojq/package.nix              |  2 +-
 pkgs/by-name/go/gojsontoyaml/package.nix      |  2 +-
 pkgs/by-name/go/gokart/package.nix            |  2 +-
 pkgs/by-name/go/golangci-lint/package.nix     |  2 +-
 pkgs/by-name/go/goldwarden/package.nix        |  2 +-
 pkgs/by-name/go/golex/package.nix             |  2 +-
 pkgs/by-name/go/golines/package.nix           |  2 +-
 pkgs/by-name/go/gomapenum/package.nix         |  2 +-
 pkgs/by-name/go/gomarkdoc/package.nix         |  2 +-
 pkgs/by-name/go/gomatrix/package.nix          |  2 +-
 pkgs/by-name/go/gomodifytags/package.nix      |  2 +-
 pkgs/by-name/go/gomtree/package.nix           |  2 +-
 pkgs/by-name/go/gomuks/package.nix            |  2 +-
 pkgs/by-name/go/gonic/package.nix             |  2 +-
 pkgs/by-name/go/goodhosts/package.nix         |  2 +-
 pkgs/by-name/go/goodvibes/package.nix         |  2 +-
 .../go/google-authenticator/package.nix       |  2 +-
 pkgs/by-name/go/google-cloud-cpp/package.nix  |  2 +-
 .../go/google-cloud-sql-proxy/package.nix     |  2 +-
 .../go/google-guest-configs/package.nix       |  2 +-
 .../go/google-guest-oslogin/package.nix       |  2 +-
 pkgs/by-name/go/google-play/package.nix       |  2 +-
 pkgs/by-name/go/goose-lang/package.nix        |  2 +-
 pkgs/by-name/go/goose/package.nix             |  2 +-
 pkgs/by-name/go/gopacked/package.nix          |  2 +-
 pkgs/by-name/go/gopass-jsonapi/package.nix    |  2 +-
 pkgs/by-name/go/gopatch/package.nix           |  2 +-
 pkgs/by-name/go/gophernotes/package.nix       |  2 +-
 pkgs/by-name/go/gophish/package.nix           |  2 +-
 pkgs/by-name/go/gopkgs/package.nix            |  2 +-
 pkgs/by-name/go/gopro/package.nix             |  2 +-
 pkgs/by-name/go/gops/package.nix              |  2 +-
 pkgs/by-name/go/gopsuinfo/package.nix         |  2 +-
 pkgs/by-name/go/gore/package.nix              |  2 +-
 pkgs/by-name/go/goread/package.nix            |  2 +-
 pkgs/by-name/go/goreleaser/package.nix        |  2 +-
 pkgs/by-name/go/goreman/package.nix           |  2 +-
 pkgs/by-name/go/goreplay/package.nix          |  2 +-
 pkgs/by-name/go/goresym/package.nix           |  2 +-
 pkgs/by-name/go/gorilla-cli/package.nix       |  2 +-
 pkgs/by-name/go/gortr/package.nix             |  2 +-
 pkgs/by-name/go/gosec/package.nix             |  2 +-
 pkgs/by-name/go/gosimports/package.nix        |  2 +-
 pkgs/by-name/go/gosmee/package.nix            |  2 +-
 pkgs/by-name/go/gospider/package.nix          |  2 +-
 pkgs/by-name/go/gossa/package.nix             |  2 +-
 pkgs/by-name/go/gostatic/package.nix          |  2 +-
 pkgs/by-name/go/gosu/package.nix              |  2 +-
 pkgs/by-name/go/gotest/package.nix            |  2 +-
 pkgs/by-name/go/gotestdox/package.nix         |  2 +-
 pkgs/by-name/go/gotestfmt/package.nix         |  2 +-
 pkgs/by-name/go/gotests/package.nix           |  2 +-
 pkgs/by-name/go/gotify-cli/package.nix        |  2 +-
 pkgs/by-name/go/gotify-desktop/package.nix    |  2 +-
 pkgs/by-name/go/gotify-server/package.nix     |  2 +-
 pkgs/by-name/go/gotools/package.nix           |  2 +-
 pkgs/by-name/go/gotraceui/package.nix         |  2 +-
 pkgs/by-name/go/gotree/package.nix            |  2 +-
 pkgs/by-name/go/gotty/package.nix             |  2 +-
 pkgs/by-name/go/gotypist/package.nix          |  2 +-
 pkgs/by-name/go/govc/package.nix              |  2 +-
 pkgs/by-name/go/govee2mqtt/package.nix        |  2 +-
 pkgs/by-name/go/goverlay/package.nix          |  2 +-
 pkgs/by-name/go/gowall/package.nix            |  2 +-
 pkgs/by-name/go/gox/package.nix               |  2 +-
 pkgs/by-name/go/goxlr-utility/package.nix     |  2 +-
 pkgs/by-name/gp/gpac/package.nix              |  2 +-
 pkgs/by-name/gp/gpart/package.nix             |  2 +-
 pkgs/by-name/gp/gpauth/package.nix            |  2 +-
 pkgs/by-name/gp/gpclient/package.nix          |  2 +-
 pkgs/by-name/gp/gphotos-sync/package.nix      |  2 +-
 pkgs/by-name/gp/gpick/package.nix             |  2 +-
 pkgs/by-name/gp/gpodder/package.nix           |  2 +-
 pkgs/by-name/gp/gptman/package.nix            |  2 +-
 pkgs/by-name/gp/gpustat/package.nix           |  2 +-
 pkgs/by-name/gp/gpuvis/package.nix            |  2 +-
 pkgs/by-name/gp/gpx-viewer/package.nix        |  2 +-
 pkgs/by-name/gp/gpx/package.nix               |  2 +-
 pkgs/by-name/gp/gpxlab/package.nix            |  2 +-
 pkgs/by-name/gp/gpython/package.nix           |  2 +-
 pkgs/by-name/gq/gql/package.nix               |  2 +-
 pkgs/by-name/gq/gqlgenc/package.nix           |  2 +-
 pkgs/by-name/gq/gqlint/package.nix            |  2 +-
 pkgs/by-name/gr/gr-framework/package.nix      |  2 +-
 pkgs/by-name/gr/grabserial/package.nix        |  2 +-
 pkgs/by-name/gr/gradescope-submit/package.nix |  2 +-
 .../gr/grafana-dash-n-grab/package.nix        |  2 +-
 .../gr/grafana-image-renderer/package.nix     |  2 +-
 pkgs/by-name/gr/grafana-kiosk/package.nix     |  2 +-
 pkgs/by-name/gr/grafana-loki/package.nix      |  2 +-
 pkgs/by-name/gr/grafana-reporter/package.nix  |  2 +-
 pkgs/by-name/gr/grafterm/package.nix          |  2 +-
 pkgs/by-name/gr/granted/package.nix           |  2 +-
 .../gr/graphene-hardened-malloc/package.nix   |  2 +-
 pkgs/by-name/gr/graphene/package.nix          |  2 +-
 pkgs/by-name/gr/graphite-cursors/package.nix  |  2 +-
 .../by-name/gr/graphite-gtk-theme/package.nix |  2 +-
 pkgs/by-name/gr/graphqurl/package.nix         |  2 +-
 pkgs/by-name/gr/graphwar/package.nix          |  2 +-
 pkgs/by-name/gr/gravit/package.nix            |  2 +-
 pkgs/by-name/gr/greybird/package.nix          |  2 +-
 pkgs/by-name/gr/gridtracker/package.nix       |  2 +-
 pkgs/by-name/gr/grip-search/package.nix       |  2 +-
 pkgs/by-name/gr/grit/package.nix              |  2 +-
 pkgs/by-name/gr/grive2/package.nix            |  2 +-
 pkgs/by-name/gr/grizzly/package.nix           |  2 +-
 pkgs/by-name/gr/grml-zsh-config/package.nix   |  2 +-
 pkgs/by-name/gr/grmon/package.nix             |  2 +-
 pkgs/by-name/gr/grobi/package.nix             |  2 +-
 pkgs/by-name/gr/gron/package.nix              |  2 +-
 pkgs/by-name/gr/grpc-client-cli/package.nix   |  2 +-
 pkgs/by-name/gr/grpc/package.nix              |  2 +-
 pkgs/by-name/gr/grpc_cli/package.nix          |  2 +-
 pkgs/by-name/gr/grpcui/package.nix            |  2 +-
 pkgs/by-name/gr/grpcurl/package.nix           |  2 +-
 pkgs/by-name/gr/gruvbox-dark-gtk/package.nix  |  2 +-
 pkgs/by-name/gs/gsctl/package.nix             |  2 +-
 pkgs/by-name/gs/gsimplecal/package.nix        |  2 +-
 pkgs/by-name/gs/gsocket/package.nix           |  2 +-
 pkgs/by-name/gs/gspeech/package.nix           |  2 +-
 pkgs/by-name/gs/gst/package.nix               |  2 +-
 pkgs/by-name/gs/gst123/package.nix            |  2 +-
 pkgs/by-name/gt/gtest/package.nix             |  2 +-
 pkgs/by-name/gt/gtg/package.nix               |  2 +-
 pkgs/by-name/gt/gthree/package.nix            |  2 +-
 pkgs/by-name/gt/gti/package.nix               |  2 +-
 pkgs/by-name/gt/gtk-sharp-beans/package.nix   |  2 +-
 pkgs/by-name/gt/gtkclipblock/package.nix      |  2 +-
 pkgs/by-name/gt/gtkhash/package.nix           |  2 +-
 pkgs/by-name/gt/gtkterm/package.nix           |  2 +-
 pkgs/by-name/gt/gtop/package.nix              |  2 +-
 pkgs/by-name/gt/gtrash/package.nix            |  2 +-
 pkgs/by-name/gt/gtree/package.nix             |  2 +-
 pkgs/by-name/gt/gtt/package.nix               |  2 +-
 pkgs/by-name/gu/guacamole-server/package.nix  |  2 +-
 pkgs/by-name/gu/gubbi-font/package.nix        |  2 +-
 pkgs/by-name/gu/gucharmap/package.nix         |  2 +-
 pkgs/by-name/gu/guetzli/package.nix           |  2 +-
 pkgs/by-name/gu/guff/package.nix              |  2 +-
 pkgs/by-name/gu/guile-aspell/package.nix      |  2 +-
 pkgs/by-name/gu/guile-fibers/package.nix      |  2 +-
 pkgs/by-name/gu/guile-git/package.nix         |  2 +-
 pkgs/by-name/gu/guile-hoot/package.nix        |  2 +-
 pkgs/by-name/gu/guilt/package.nix             |  2 +-
 pkgs/by-name/gu/gum/package.nix               |  2 +-
 pkgs/by-name/gu/gumbo/package.nix             |  2 +-
 pkgs/by-name/gu/gummi/package.nix             |  2 +-
 pkgs/by-name/gu/gummy/package.nix             |  2 +-
 pkgs/by-name/gu/gungnir/package.nix           |  2 +-
 pkgs/by-name/gu/gut/package.nix               |  2 +-
 pkgs/by-name/gv/gvproxy/package.nix           |  2 +-
 pkgs/by-name/gw/gwc/package.nix               |  2 +-
 pkgs/by-name/gx/gx/package.nix                |  2 +-
 pkgs/by-name/gx/gxkb/package.nix              |  2 +-
 pkgs/by-name/gx/gxml/package.nix              |  2 +-
 pkgs/by-name/gx/gxplugins-lv2/package.nix     |  2 +-
 pkgs/by-name/ha/habitat/package.nix           |  2 +-
 pkgs/by-name/ha/hackedbox/package.nix         |  2 +-
 pkgs/by-name/ha/hackrf/package.nix            |  2 +-
 pkgs/by-name/ha/hacompanion/package.nix       |  2 +-
 pkgs/by-name/ha/hacpack/package.nix           |  2 +-
 pkgs/by-name/ha/hactool/package.nix           |  2 +-
 pkgs/by-name/ha/hakrawler/package.nix         |  2 +-
 pkgs/by-name/ha/halfempty/package.nix         |  2 +-
 pkgs/by-name/ha/halp/package.nix              |  2 +-
 pkgs/by-name/ha/handlr-regex/package.nix      |  2 +-
 pkgs/by-name/ha/hans/package.nix              |  2 +-
 pkgs/by-name/ha/hap-py/package.nix            |  2 +-
 pkgs/by-name/ha/harbor-cli/package.nix        |  2 +-
 pkgs/by-name/ha/harminv/package.nix           |  2 +-
 pkgs/by-name/ha/harper/package.nix            |  2 +-
 pkgs/by-name/ha/harsh/package.nix             |  2 +-
 pkgs/by-name/ha/hash-slinger/package.nix      |  2 +-
 pkgs/by-name/ha/hashcat-utils/package.nix     |  2 +-
 pkgs/by-name/ha/hashi-up/package.nix          |  2 +-
 pkgs/by-name/ha/hashit/package.nix            |  2 +-
 pkgs/by-name/ha/hashlink/package.nix          |  2 +-
 pkgs/by-name/ha/haveged/package.nix           |  2 +-
 pkgs/by-name/ha/havoc/package.nix             |  2 +-
 pkgs/by-name/hb/hblock/package.nix            |  2 +-
 pkgs/by-name/hc/hck/package.nix               |  2 +-
 pkgs/by-name/hc/hcl2json/package.nix          |  2 +-
 pkgs/by-name/hc/hcledit/package.nix           |  2 +-
 pkgs/by-name/hc/hclfmt/package.nix            |  2 +-
 pkgs/by-name/hc/hcxdumptool/package.nix       |  2 +-
 pkgs/by-name/hc/hcxtools/package.nix          |  2 +-
 pkgs/by-name/hd/hd-idle/package.nix           |  2 +-
 pkgs/by-name/hd/hdaps-gl/package.nix          |  2 +-
 pkgs/by-name/hd/hdf5-blosc/package.nix        |  2 +-
 pkgs/by-name/hd/hdrop/package.nix             |  2 +-
 pkgs/by-name/hd/hdt/package.nix               |  2 +-
 pkgs/by-name/he/headache/package.nix          |  2 +-
 pkgs/by-name/he/headphones/package.nix        |  2 +-
 pkgs/by-name/he/headsetcontrol/package.nix    |  2 +-
 pkgs/by-name/he/heatseeker/package.nix        |  2 +-
 pkgs/by-name/he/hebcal/package.nix            |  2 +-
 pkgs/by-name/he/hedgedoc-cli/package.nix      |  2 +-
 pkgs/by-name/he/heh/package.nix               |  2 +-
 pkgs/by-name/he/helio-workstation/package.nix |  2 +-
 pkgs/by-name/he/heliocron/package.nix         |  2 +-
 pkgs/by-name/he/helm-dashboard/package.nix    |  2 +-
 pkgs/by-name/he/helm-docs/package.nix         |  2 +-
 pkgs/by-name/he/helm-ls/package.nix           |  2 +-
 pkgs/by-name/he/helmsman/package.nix          |  2 +-
 pkgs/by-name/he/herbe/package.nix             |  2 +-
 pkgs/by-name/he/hermitcli/package.nix         |  2 +-
 pkgs/by-name/he/hetzner-kube/package.nix      |  2 +-
 pkgs/by-name/he/hex/package.nix               |  2 +-
 pkgs/by-name/he/hexbinhex/package.nix         |  2 +-
 pkgs/by-name/he/hexchat/package.nix           |  2 +-
 pkgs/by-name/he/hexcurse/package.nix          |  2 +-
 pkgs/by-name/he/hexd/package.nix              |  2 +-
 pkgs/by-name/he/hexdino/package.nix           |  2 +-
 pkgs/by-name/he/hexedit/package.nix           |  2 +-
 pkgs/by-name/he/hexo-cli/package.nix          |  2 +-
 pkgs/by-name/he/hextazy/package.nix           |  2 +-
 pkgs/by-name/he/hey/package.nix               |  2 +-
 pkgs/by-name/he/heygpt/package.nix            |  2 +-
 pkgs/by-name/hh/hhpc/package.nix              |  2 +-
 pkgs/by-name/hi/hidviz/package.nix            |  2 +-
 pkgs/by-name/hi/highfive/package.nix          |  2 +-
 .../hi/highlight-assertions/package.nix       |  2 +-
 pkgs/by-name/hi/himalaya/package.nix          |  2 +-
 pkgs/by-name/hi/hime/package.nix              |  2 +-
 pkgs/by-name/hi/hiraeth/package.nix           |  2 +-
 pkgs/by-name/hi/hiredis/package.nix           |  2 +-
 pkgs/by-name/hi/hisat2/package.nix            |  2 +-
 pkgs/by-name/hi/hishtory/package.nix          |  2 +-
 pkgs/by-name/hi/hivemind/package.nix          |  2 +-
 pkgs/by-name/hj/hjson-go/package.nix          |  2 +-
 pkgs/by-name/hn/hn-text/package.nix           |  2 +-
 pkgs/by-name/ho/hoard/package.nix             |  2 +-
 pkgs/by-name/ho/hof/package.nix               |  2 +-
 pkgs/by-name/ho/holo-build/package.nix        |  2 +-
 pkgs/by-name/ho/hologram/package.nix          |  2 +-
 pkgs/by-name/ho/holos/package.nix             |  2 +-
 pkgs/by-name/ho/homebox/package.nix           |  2 +-
 pkgs/by-name/ho/homer/package.nix             |  2 +-
 pkgs/by-name/ho/honcho/package.nix            |  2 +-
 .../by-name/ho/honeycomb-refinery/package.nix |  2 +-
 pkgs/by-name/ho/honggfuzz/package.nix         |  2 +-
 pkgs/by-name/ho/horizon-eda/base.nix          |  2 +-
 pkgs/by-name/ho/horst/package.nix             |  2 +-
 pkgs/by-name/ho/host-spawn/package.nix        |  2 +-
 pkgs/by-name/ho/hostapd-mana/package.nix      |  2 +-
 pkgs/by-name/ho/hostctl/package.nix           |  2 +-
 pkgs/by-name/ho/hostess/package.nix           |  2 +-
 pkgs/by-name/ho/hostmux/package.nix           |  2 +-
 pkgs/by-name/ho/hound/package.nix             |  2 +-
 pkgs/by-name/ho/hover/package.nix             |  2 +-
 .../ho/howard-hinnant-date/package.nix        |  2 +-
 pkgs/by-name/hp/hpe-ltfs/package.nix          |  2 +-
 pkgs/by-name/hp/hpx/package.nix               |  2 +-
 pkgs/by-name/hr/hr/package.nix                |  2 +-
 pkgs/by-name/hr/hred/package.nix              |  2 +-
 pkgs/by-name/hs/hsd/package.nix               |  2 +-
 pkgs/by-name/hs/hsetroot/package.nix          |  2 +-
 pkgs/by-name/hs/hstr/package.nix              |  2 +-
 pkgs/by-name/ht/htcondor/package.nix          |  2 +-
 pkgs/by-name/ht/html-minifier/package.nix     |  2 +-
 pkgs/by-name/ht/html-tidy/package.nix         |  2 +-
 pkgs/by-name/ht/html2text/package.nix         |  2 +-
 pkgs/by-name/ht/htmlhint/package.nix          |  2 +-
 pkgs/by-name/ht/htmltest/package.nix          |  2 +-
 pkgs/by-name/ht/htmx-lsp/package.nix          |  2 +-
 pkgs/by-name/ht/htop-vim/package.nix          |  2 +-
 pkgs/by-name/ht/htpdate/package.nix           |  2 +-
 pkgs/by-name/ht/httm/package.nix              |  2 +-
 pkgs/by-name/ht/http-parser/package.nix       |  2 +-
 pkgs/by-name/ht/http-server/package.nix       |  2 +-
 pkgs/by-name/ht/httplab/package.nix           |  2 +-
 pkgs/by-name/ht/httpref/package.nix           |  2 +-
 pkgs/by-name/ht/httprobe/package.nix          |  2 +-
 pkgs/by-name/ht/httpstat/package.nix          |  2 +-
 pkgs/by-name/hu/hubicfuse/package.nix         |  2 +-
 pkgs/by-name/hu/hueadm/package.nix            |  2 +-
 pkgs/by-name/hu/humioctl/package.nix          |  2 +-
 pkgs/by-name/hu/hunt/package.nix              |  2 +-
 pkgs/by-name/hu/husky/package.nix             |  2 +-
 pkgs/by-name/hw/hwdata/package.nix            |  2 +-
 pkgs/by-name/hw/hwinfo/package.nix            |  2 +-
 pkgs/by-name/hy/hydroxide/package.nix         |  2 +-
 pkgs/by-name/hy/hyp2mat/package.nix           |  2 +-
 pkgs/by-name/hy/hyperbeam/package.nix         |  2 +-
 .../by-name/hy/hyperledger-fabric/package.nix |  2 +-
 pkgs/by-name/hy/hyperlink/package.nix         |  2 +-
 pkgs/by-name/hy/hyperpotamus/package.nix      |  2 +-
 pkgs/by-name/hy/hypershell/package.nix        |  2 +-
 pkgs/by-name/hy/hypnotix/package.nix          |  2 +-
 pkgs/by-name/hy/hyprdim/package.nix           |  2 +-
 pkgs/by-name/hy/hyprkeys/package.nix          |  2 +-
 .../hy/hyprland-activewindow/package.nix      |  2 +-
 .../hyprland-autoname-workspaces/package.nix  |  2 +-
 .../hy/hyprland-monitor-attached/package.nix  |  2 +-
 .../hy/hyprland-per-window-layout/package.nix |  2 +-
 .../hy/hyprland-workspaces/package.nix        |  2 +-
 pkgs/by-name/hy/hyprls/package.nix            |  2 +-
 pkgs/by-name/hy/hyprnome/package.nix          |  2 +-
 pkgs/by-name/hy/hyprnotify/package.nix        |  2 +-
 pkgs/by-name/hy/hyprshot/package.nix          |  2 +-
 pkgs/by-name/i3/i3-volume/package.nix         |  2 +-
 pkgs/by-name/i3/i3bar-river/package.nix       |  2 +-
 pkgs/by-name/i3/i3minator/package.nix         |  2 +-
 .../iam-policy-json-to-terraform/package.nix  |  2 +-
 pkgs/by-name/ia/iamy/package.nix              |  2 +-
 pkgs/by-name/ia/ianny/package.nix             |  2 +-
 pkgs/by-name/ib/ibus-theme-tools/package.nix  |  2 +-
 pkgs/by-name/ic/ic-keysmith/package.nix       |  2 +-
 pkgs/by-name/ic/ical2orgpy/package.nix        |  2 +-
 pkgs/by-name/ic/icecream/package.nix          |  2 +-
 pkgs/by-name/ic/icewm/package.nix             |  2 +-
 pkgs/by-name/ic/icnsify/package.nix           |  2 +-
 pkgs/by-name/ic/icoextract/package.nix        |  2 +-
 pkgs/by-name/ic/iconpack-jade/package.nix     |  2 +-
 pkgs/by-name/ic/iconpack-obsidian/package.nix |  2 +-
 pkgs/by-name/ic/icr/package.nix               |  2 +-
 pkgs/by-name/ic/ictree/package.nix            |  2 +-
 pkgs/by-name/id/id3/package.nix               |  2 +-
 pkgs/by-name/id/ideogram/package.nix          |  2 +-
 pkgs/by-name/id/idsk/package.nix              |  2 +-
 pkgs/by-name/ie/ieda/package.nix              |  2 +-
 pkgs/by-name/if/ifrextractor-rs/package.nix   |  2 +-
 pkgs/by-name/ig/igir/package.nix              |  2 +-
 pkgs/by-name/ig/igmpproxy/package.nix         |  2 +-
 pkgs/by-name/ig/ignite-cli/package.nix        |  2 +-
 pkgs/by-name/ig/igprof/package.nix            |  2 +-
 pkgs/by-name/ig/igraph/package.nix            |  2 +-
 pkgs/by-name/ih/ihp-new/package.nix           |  2 +-
 pkgs/by-name/ii/iir1/package.nix              |  2 +-
 pkgs/by-name/ik/ike-scan/package.nix          |  2 +-
 pkgs/by-name/ik/ikill/package.nix             |  2 +-
 pkgs/by-name/il/illum/package.nix             |  2 +-
 pkgs/by-name/im/image-roll/package.nix        |  2 +-
 pkgs/by-name/im/imagelol/package.nix          |  2 +-
 pkgs/by-name/im/imageworsener/package.nix     |  2 +-
 pkgs/by-name/im/imaginary/package.nix         |  2 +-
 pkgs/by-name/im/imaginer/package.nix          |  2 +-
 pkgs/by-name/im/imath/package.nix             |  2 +-
 pkgs/by-name/im/img-cat/package.nix           |  2 +-
 pkgs/by-name/im/img/package.nix               |  2 +-
 pkgs/by-name/im/imgcat/package.nix            |  2 +-
 pkgs/by-name/im/imgcrypt/package.nix          |  2 +-
 pkgs/by-name/im/imgpatchtools/package.nix     |  2 +-
 pkgs/by-name/im/imgpkg/package.nix            |  2 +-
 pkgs/by-name/im/imgproxy/package.nix          |  2 +-
 pkgs/by-name/im/imgur-screenshot/package.nix  |  2 +-
 pkgs/by-name/im/imgurbash2/package.nix        |  2 +-
 pkgs/by-name/im/immudb/package.nix            |  2 +-
 pkgs/by-name/im/impala/package.nix            |  2 +-
 pkgs/by-name/im/impl/package.nix              |  2 +-
 pkgs/by-name/im/implot/package.nix            |  2 +-
 pkgs/by-name/im/imtui/package.nix             |  2 +-
 pkgs/by-name/in/inadyn/package.nix            |  2 +-
 pkgs/by-name/in/infamousPlugins/package.nix   |  2 +-
 pkgs/by-name/in/inferno/package.nix           |  2 +-
 pkgs/by-name/in/inflow/package.nix            |  2 +-
 pkgs/by-name/in/infra-arcana/package.nix      |  2 +-
 pkgs/by-name/in/infra/package.nix             |  2 +-
 pkgs/by-name/in/infracost/package.nix         |  2 +-
 pkgs/by-name/in/inframap/package.nix          |  2 +-
 .../in/infrastructure-agent/package.nix       |  2 +-
 pkgs/by-name/in/ingress2gateway/package.nix   |  2 +-
 pkgs/by-name/in/inhibridge/package.nix        |  2 +-
 pkgs/by-name/in/initool/package.nix           |  2 +-
 pkgs/by-name/in/inklecate/package.nix         |  2 +-
 pkgs/by-name/in/inotify-tools/package.nix     |  2 +-
 .../in/inputmodule-control/package.nix        |  2 +-
 pkgs/by-name/in/inriafonts/package.nix        |  2 +-
 pkgs/by-name/in/inspector/package.nix         |  2 +-
 pkgs/by-name/in/inspectrum/package.nix        |  2 +-
 pkgs/by-name/in/inspircd/package.nix          |  2 +-
 pkgs/by-name/in/insulator2/package.nix        |  2 +-
 pkgs/by-name/in/integresql/package.nix        |  2 +-
 pkgs/by-name/in/intel-cmt-cat/package.nix     |  2 +-
 .../intel-compute-runtime-legacy1/package.nix |  2 +-
 pkgs/by-name/in/intelli-shell/package.nix     |  2 +-
 pkgs/by-name/in/interlock/package.nix         |  2 +-
 pkgs/by-name/in/intermodal/package.nix        |  2 +-
 pkgs/by-name/in/invoice/package.nix           |  2 +-
 pkgs/by-name/in/invoice2data/package.nix      |  2 +-
 pkgs/by-name/in/inxi/package.nix              |  2 +-
 pkgs/by-name/io/ioccheck/package.nix          |  4 +-
 pkgs/by-name/io/ioping/package.nix            |  2 +-
 pkgs/by-name/io/ior/package.nix               |  2 +-
 pkgs/by-name/io/ios-deploy/package.nix        |  2 +-
 pkgs/by-name/io/iosevka/package.nix           |  2 +-
 pkgs/by-name/io/iotop-c/package.nix           |  2 +-
 pkgs/by-name/io/ioztat/package.nix            |  2 +-
 pkgs/by-name/ip/ip2location-c/package.nix     |  2 +-
 pkgs/by-name/ip/ip2unix/package.nix           |  2 +-
 pkgs/by-name/ip/ipatool/package.nix           |  2 +-
 pkgs/by-name/ip/iperf3d/package.nix           |  2 +-
 pkgs/by-name/ip/ipfs-cluster/package.nix      |  2 +-
 .../by-name/ip/ipfs-upload-client/package.nix |  2 +-
 pkgs/by-name/ip/ipget/package.nix             |  2 +-
 pkgs/by-name/ip/ipgrep/package.nix            |  2 +-
 pkgs/by-name/ip/iplan/package.nix             |  2 +-
 pkgs/by-name/ip/ipp-usb/package.nix           |  2 +-
 pkgs/by-name/ip/iptraf-ng/package.nix         |  2 +-
 pkgs/by-name/ip/ipv6calc/package.nix          |  2 +-
 pkgs/by-name/iq/iqtree/package.nix            |  2 +-
 pkgs/by-name/ir/ir-standard-fonts/package.nix |  2 +-
 pkgs/by-name/ir/irccat/package.nix            |  2 +-
 pkgs/by-name/ir/iredis/package.nix            |  2 +-
 pkgs/by-name/ir/iroh/package.nix              |  2 +-
 pkgs/by-name/ir/ironbar/package.nix           |  2 +-
 pkgs/by-name/ir/irqbalance/package.nix        |  2 +-
 pkgs/by-name/ir/irrd/package.nix              |  2 +-
 pkgs/by-name/ir/irssi/package.nix             |  2 +-
 pkgs/by-name/is/isolate/package.nix           |  2 +-
 pkgs/by-name/is/isomd5sum/package.nix         |  2 +-
 pkgs/by-name/is/ispc/package.nix              |  2 +-
 pkgs/by-name/is/istioctl/package.nix          |  2 +-
 pkgs/by-name/it/it-tools/package.nix          |  2 +-
 pkgs/by-name/it/itch/package.nix              |  2 +-
 pkgs/by-name/it/itchiodl/package.nix          |  2 +-
 pkgs/by-name/it/ite-backlight/package.nix     |  2 +-
 pkgs/by-name/it/itools/package.nix            |  2 +-
 pkgs/by-name/iu/iucode-tool/package.nix       |  2 +-
 pkgs/by-name/iv/ivan/package.nix              |  2 +-
 pkgs/by-name/iv/ivy/package.nix               |  2 +-
 pkgs/by-name/iw/iwd/package.nix               |  2 +-
 pkgs/by-name/iw/iwgtk/package.nix             |  2 +-
 pkgs/by-name/j/j/package.nix                  |  2 +-
 pkgs/by-name/ja/jake/package.nix              |  2 +-
 pkgs/by-name/ja/janus-gateway/package.nix     |  2 +-
 pkgs/by-name/ja/jarowinkler-cpp/package.nix   |  2 +-
 pkgs/by-name/ja/jasp-desktop/package.nix      |  2 +-
 .../package.nix                               |  2 +-
 pkgs/by-name/ja/jay/package.nix               |  2 +-
 pkgs/by-name/jb/jbig2enc/package.nix          |  2 +-
 pkgs/by-name/jb/jbofihe/package.nix           |  2 +-
 pkgs/by-name/jc/jcal/package.nix              |  2 +-
 pkgs/by-name/jd/jd-diff-patch/package.nix     |  2 +-
 pkgs/by-name/je/jefferson/package.nix         |  2 +-
 pkgs/by-name/je/jellycli/package.nix          |  2 +-
 pkgs/by-name/je/jellyfin-ffmpeg/package.nix   |  2 +-
 pkgs/by-name/je/jellyfin-web/package.nix      |  2 +-
 pkgs/by-name/je/jellyfin/package.nix          |  2 +-
 pkgs/by-name/je/jetbrains-runner/package.nix  |  2 +-
 pkgs/by-name/jf/jf/package.nix                |  2 +-
 pkgs/by-name/jf/jfmt/package.nix              |  2 +-
 pkgs/by-name/jf/jftui/package.nix             |  2 +-
 pkgs/by-name/jg/jgmenu/package.nix            |  2 +-
 pkgs/by-name/jh/jhead/package.nix             |  2 +-
 pkgs/by-name/ji/jid/package.nix               |  2 +-
 pkgs/by-name/ji/jikken/package.nix            |  2 +-
 pkgs/by-name/ji/jimtcl/package.nix            |  2 +-
 pkgs/by-name/ji/jinja2-cli/package.nix        |  2 +-
 pkgs/by-name/ji/jiq/package.nix               |  2 +-
 pkgs/by-name/ji/jiten/package.nix             |  4 +-
 .../ji/jitsi-meet-electron/package.nix        |  2 +-
 .../by-name/ji/jitterentropy-rngd/package.nix |  2 +-
 pkgs/by-name/ji/jitterentropy/package.nix     |  2 +-
 pkgs/by-name/jj/jj/package.nix                |  2 +-
 pkgs/by-name/jm/jmc2obj/package.nix           |  2 +-
 pkgs/by-name/jm/jmespath/package.nix          |  2 +-
 pkgs/by-name/jm/jmtpfs/package.nix            |  2 +-
 pkgs/by-name/jn/jna/package.nix               |  2 +-
 pkgs/by-name/jo/jo/package.nix                |  2 +-
 pkgs/by-name/jo/jobber/package.nix            |  2 +-
 pkgs/by-name/jo/johnny/package.nix            |  2 +-
 pkgs/by-name/jo/joker/package.nix             |  2 +-
 pkgs/by-name/jo/jose/package.nix              |  2 +-
 pkgs/by-name/jo/jot/package.nix               |  2 +-
 pkgs/by-name/jo/jotdown/package.nix           |  2 +-
 pkgs/by-name/jo/joularjx/package.nix          |  2 +-
 pkgs/by-name/jo/jove/package.nix              |  2 +-
 pkgs/by-name/jp/jp/package.nix                |  2 +-
 pkgs/by-name/jp/jp2a/package.nix              |  2 +-
 pkgs/by-name/jp/jpegoptim/package.nix         |  2 +-
 pkgs/by-name/jq/jqp/package.nix               |  2 +-
 pkgs/by-name/jr/jrsonnet/package.nix          |  2 +-
 pkgs/by-name/js/json-fortran/package.nix      |  2 +-
 pkgs/by-name/js/json-plot/package.nix         |  2 +-
 pkgs/by-name/js/json2hcl/package.nix          |  2 +-
 pkgs/by-name/js/jsoncpp/package.nix           |  2 +-
 pkgs/by-name/js/jsonfmt/package.nix           |  2 +-
 pkgs/by-name/js/jsonld-cli/package.nix        |  2 +-
 pkgs/by-name/js/jsonnet-bundler/package.nix   |  2 +-
 pkgs/by-name/js/jsonnet/package.nix           |  2 +-
 .../by-name/jt/jtag-remote-server/package.nix |  2 +-
 pkgs/by-name/jt/jtbl/package.nix              |  2 +-
 pkgs/by-name/jt/jtc/package.nix               |  2 +-
 pkgs/by-name/ju/jugglinglab/package.nix       |  2 +-
 pkgs/by-name/ju/juicefs/package.nix           |  2 +-
 pkgs/by-name/ju/juicity/package.nix           |  2 +-
 pkgs/by-name/ju/juju/package.nix              |  2 +-
 pkgs/by-name/ju/julius/package.nix            |  2 +-
 pkgs/by-name/ju/jump/package.nix              |  2 +-
 pkgs/by-name/ju/jumpapp/package.nix           |  2 +-
 pkgs/by-name/ju/jumppad/package.nix           |  2 +-
 pkgs/by-name/ju/jumpy/package.nix             |  2 +-
 pkgs/by-name/ju/junction/package.nix          |  2 +-
 pkgs/by-name/ju/junkie/package.nix            |  2 +-
 pkgs/by-name/jw/jwtinfo/package.nix           |  2 +-
 pkgs/by-name/jw/jwx/package.nix               |  2 +-
 pkgs/by-name/jx/jx/package.nix                |  2 +-
 pkgs/by-name/k2/k2tf/package.nix              |  2 +-
 pkgs/by-name/k3/k3sup/package.nix             |  2 +-
 pkgs/by-name/k6/k6/package.nix                |  2 +-
 .../k8/k8s-manifest-sigstore/package.nix      |  2 +-
 pkgs/by-name/k8/k8sgpt/package.nix            |  2 +-
 pkgs/by-name/k9/k9s/package.nix               |  2 +-
 pkgs/by-name/ka/kaf/package.nix               |  2 +-
 pkgs/by-name/ka/kail/package.nix              |  2 +-
 pkgs/by-name/ka/kakoune-lsp/package.nix       |  2 +-
 pkgs/by-name/ka/kalamine/package.nix          |  2 +-
 pkgs/by-name/ka/kalker/package.nix            |  2 +-
 pkgs/by-name/ka/kamp/package.nix              |  2 +-
 pkgs/by-name/ka/kanata/package.nix            |  2 +-
 pkgs/by-name/ka/kanidm-provision/package.nix  |  2 +-
 pkgs/by-name/ka/kaniko/package.nix            |  2 +-
 pkgs/by-name/ka/kanjidraw/package.nix         |  2 +-
 .../ka/kapitonov-plugins-pack/package.nix     |  2 +-
 pkgs/by-name/ka/kapowbang/package.nix         |  2 +-
 pkgs/by-name/ka/kapp/package.nix              |  2 +-
 pkgs/by-name/ka/kappanhang/package.nix        |  2 +-
 pkgs/by-name/ka/karlender/package.nix         |  2 +-
 pkgs/by-name/ka/karma-runner/package.nix      |  2 +-
 pkgs/by-name/ka/karma/package.nix             |  2 +-
 pkgs/by-name/ka/karmor/package.nix            |  2 +-
 pkgs/by-name/ka/kata-runtime/package.nix      |  2 +-
 pkgs/by-name/ka/katago/package.nix            |  2 +-
 pkgs/by-name/ka/kaufkauflist/package.nix      |  2 +-
 pkgs/by-name/kb/kb/package.nix                |  2 +-
 pkgs/by-name/kb/kbdlight/package.nix          |  2 +-
 pkgs/by-name/kb/kbld/package.nix              |  2 +-
 pkgs/by-name/kb/kbst/package.nix              |  2 +-
 pkgs/by-name/kb/kbt/package.nix               |  2 +-
 pkgs/by-name/kc/kcat/package.nix              |  2 +-
 pkgs/by-name/kc/kcl/package.nix               |  2 +-
 pkgs/by-name/kc/kcli/package.nix              |  2 +-
 pkgs/by-name/kc/kclvm/package.nix             |  2 +-
 pkgs/by-name/kc/kclvm_cli/package.nix         |  2 +-
 pkgs/by-name/kc/kconf/package.nix             |  2 +-
 pkgs/by-name/kc/kcov/package.nix              |  2 +-
 pkgs/by-name/kc/kcp/package.nix               |  2 +-
 pkgs/by-name/kd/kdigger/package.nix           |  2 +-
 pkgs/by-name/kd/kdlfmt/package.nix            |  2 +-
 pkgs/by-name/kd/kdocker/package.nix           |  2 +-
 pkgs/by-name/kd/kdotool/package.nix           |  2 +-
 pkgs/by-name/ke/keepalived/package.nix        |  2 +-
 .../ke/keepass-keepasshttp/package.nix        |  2 +-
 pkgs/by-name/ke/keepassxc-go/package.nix      |  2 +-
 pkgs/by-name/ke/keeperrl/package.nix          |  2 +-
 pkgs/by-name/ke/keepmenu/package.nix          |  2 +-
 pkgs/by-name/ke/kepubify/package.nix          |  2 +-
 pkgs/by-name/ke/kermit-terminal/package.nix   |  2 +-
 .../ke/kernel-hardening-checker/package.nix   |  2 +-
 pkgs/by-name/ke/kestrel/package.nix           |  2 +-
 pkgs/by-name/ke/keto/package.nix              |  2 +-
 pkgs/by-name/ke/key-rack/package.nix          |  2 +-
 pkgs/by-name/ke/keycard-cli/package.nix       |  2 +-
 pkgs/by-name/ke/keychain/package.nix          |  2 +-
 .../keycloak-restrict-client-auth/default.nix |  2 +-
 .../ke/keycloak/scim-for-keycloak/default.nix |  2 +-
 pkgs/by-name/ke/keyfinder-cli/package.nix     |  2 +-
 .../package.nix                               |  2 +-
 pkgs/by-name/ke/keymapper/package.nix         |  2 +-
 pkgs/by-name/ke/keymapviz/package.nix         |  2 +-
 pkgs/by-name/ke/keystone/package.nix          |  2 +-
 pkgs/by-name/kf/kfilt/package.nix             |  2 +-
 .../kh/khronos-ocl-icd-loader/package.nix     |  2 +-
 pkgs/by-name/kh/khronos/package.nix           |  2 +-
 pkgs/by-name/ki/kibi/package.nix              |  2 +-
 pkgs/by-name/ki/kickoff/package.nix           |  2 +-
 pkgs/by-name/ki/kickstart/package.nix         |  2 +-
 pkgs/by-name/ki/kicli/package.nix             |  2 +-
 pkgs/by-name/ki/kikoplay/package.nix          |  2 +-
 pkgs/by-name/ki/kind/package.nix              |  2 +-
 pkgs/by-name/ki/kine/package.nix              |  2 +-
 pkgs/by-name/ki/kirc/package.nix              |  2 +-
 pkgs/by-name/ki/kissfft/package.nix           |  2 +-
 pkgs/by-name/ki/kiterunner/package.nix        |  2 +-
 pkgs/by-name/ki/kitex/package.nix             |  2 +-
 pkgs/by-name/ki/kitsas/package.nix            |  2 +-
 pkgs/by-name/ki/kittysay/package.nix          |  2 +-
 pkgs/by-name/kl/klick/package.nix             |  2 +-
 pkgs/by-name/kl/klipperscreen/package.nix     |  2 +-
 pkgs/by-name/kl/klog-rs/package.nix           |  2 +-
 pkgs/by-name/kl/klog-time-tracker/package.nix |  2 +-
 pkgs/by-name/kl/kluctl/package.nix            |  2 +-
 pkgs/by-name/kl/klystrack/package.nix         |  2 +-
 pkgs/by-name/km/kmon/package.nix              |  2 +-
 pkgs/by-name/km/kmsvnc/package.nix            |  2 +-
 pkgs/by-name/kn/knightos-genkfs/package.nix   |  2 +-
 pkgs/by-name/kn/knightos-kcc/package.nix      |  2 +-
 pkgs/by-name/kn/knightos-kimg/package.nix     |  2 +-
 pkgs/by-name/kn/knightos-kpack/package.nix    |  2 +-
 pkgs/by-name/kn/knightos-mkrom/package.nix    |  2 +-
 .../kn/knightos-mktiupgrade/package.nix       |  2 +-
 pkgs/by-name/kn/knightos-patchrom/package.nix |  2 +-
 pkgs/by-name/kn/knightos-scas/package.nix     |  2 +-
 pkgs/by-name/kn/knightos-z80e/package.nix     |  2 +-
 pkgs/by-name/kn/knit/package.nix              |  2 +-
 pkgs/by-name/kn/knossosnet/package.nix        |  2 +-
 pkgs/by-name/ko/kodi-cli/package.nix          |  2 +-
 pkgs/by-name/ko/kokkos/package.nix            |  2 +-
 pkgs/by-name/ko/kolla/package.nix             |  2 +-
 pkgs/by-name/ko/kompose/package.nix           |  2 +-
 pkgs/by-name/ko/konbucase/package.nix         |  2 +-
 pkgs/by-name/ko/kondo/package.nix             |  2 +-
 pkgs/by-name/ko/konf/package.nix              |  2 +-
 pkgs/by-name/ko/konstraint/package.nix        |  2 +-
 pkgs/by-name/ko/kontroll/package.nix          |  2 +-
 pkgs/by-name/ko/kooha/package.nix             |  2 +-
 pkgs/by-name/ko/kool/package.nix              |  2 +-
 pkgs/by-name/ko/kor/package.nix               |  2 +-
 pkgs/by-name/ko/kord/package.nix              |  2 +-
 pkgs/by-name/ko/kore/package.nix              |  2 +-
 pkgs/by-name/ko/koreader/package.nix          |  2 +-
 pkgs/by-name/ko/koruri/package.nix            |  2 +-
 .../ko/kotlin-interactive-shell/package.nix   |  2 +-
 pkgs/by-name/kp/kpt/package.nix               |  2 +-
 pkgs/by-name/kr/kraft/package.nix             |  2 +-
 pkgs/by-name/kr/krankerl/package.nix          |  2 +-
 pkgs/by-name/kr/krapslog/package.nix          |  2 +-
 pkgs/by-name/kr/kratos/package.nix            |  2 +-
 pkgs/by-name/kr/krelay/package.nix            |  2 +-
 pkgs/by-name/kr/krew/package.nix              |  2 +-
 pkgs/by-name/kr/kronosnet/package.nix         |  2 +-
 pkgs/by-name/kr/krop/package.nix              |  2 +-
 .../kr/krunner-vscodeprojects/package.nix     |  2 +-
 pkgs/by-name/ks/ks/package.nix                |  2 +-
 pkgs/by-name/ks/ksmbd-tools/package.nix       |  2 +-
 pkgs/by-name/ks/ksuperkey/package.nix         |  2 +-
 pkgs/by-name/kt/kt/package.nix                |  2 +-
 pkgs/by-name/kt/ktop/package.nix              |  2 +-
 pkgs/by-name/kt/ktunnel/package.nix           |  2 +-
 pkgs/by-name/kt/ktx-tools/package.nix         |  2 +-
 pkgs/by-name/ku/kube-capacity/package.nix     |  2 +-
 pkgs/by-name/ku/kube-linter/package.nix       |  2 +-
 pkgs/by-name/ku/kube-prompt/package.nix       |  2 +-
 pkgs/by-name/ku/kube-router/package.nix       |  2 +-
 pkgs/by-name/ku/kube-score/package.nix        |  2 +-
 .../by-name/ku/kube-state-metrics/package.nix |  2 +-
 pkgs/by-name/ku/kubebuilder/package.nix       |  2 +-
 pkgs/by-name/ku/kubecfg/package.nix           |  2 +-
 pkgs/by-name/ku/kubecm/package.nix            |  2 +-
 pkgs/by-name/ku/kubecolor/package.nix         |  2 +-
 pkgs/by-name/ku/kubeconform/package.nix       |  2 +-
 pkgs/by-name/ku/kubectl-cnpg/package.nix      |  2 +-
 pkgs/by-name/ku/kubectl-df-pv/package.nix     |  2 +-
 pkgs/by-name/ku/kubectl-doctor/package.nix    |  2 +-
 pkgs/by-name/ku/kubectl-example/package.nix   |  2 +-
 pkgs/by-name/ku/kubectl-explore/package.nix   |  2 +-
 pkgs/by-name/ku/kubectl-gadget/package.nix    |  2 +-
 pkgs/by-name/ku/kubectl-graph/package.nix     |  2 +-
 pkgs/by-name/ku/kubectl-images/package.nix    |  2 +-
 pkgs/by-name/ku/kubectl-klock/package.nix     |  2 +-
 pkgs/by-name/ku/kubectl-ktop/package.nix      |  2 +-
 pkgs/by-name/ku/kubectl-neat/package.nix      |  2 +-
 .../by-name/ku/kubectl-node-shell/package.nix |  2 +-
 pkgs/by-name/ku/kubectl-tree/package.nix      |  2 +-
 pkgs/by-name/ku/kubectl-validate/package.nix  |  2 +-
 .../ku/kubectl-view-secret/package.nix        |  2 +-
 pkgs/by-name/ku/kubectx/package.nix           |  2 +-
 pkgs/by-name/ku/kubedock/package.nix          |  2 +-
 pkgs/by-name/ku/kubedog/package.nix           |  2 +-
 pkgs/by-name/ku/kubefetch/package.nix         |  2 +-
 pkgs/by-name/ku/kubefwd/package.nix           |  2 +-
 pkgs/by-name/ku/kubelogin-oidc/package.nix    |  2 +-
 pkgs/by-name/ku/kubelogin/package.nix         |  2 +-
 pkgs/by-name/ku/kubemq-community/package.nix  |  2 +-
 pkgs/by-name/ku/kubemqctl/package.nix         |  2 +-
 pkgs/by-name/ku/kubent/package.nix            |  2 +-
 pkgs/by-name/ku/kubeone/package.nix           |  2 +-
 pkgs/by-name/ku/kubeprompt/package.nix        |  2 +-
 pkgs/by-name/ku/kubepug/package.nix           |  2 +-
 pkgs/by-name/ku/kubergrunt/package.nix        |  2 +-
 .../ku/kubernetes-code-generator/package.nix  |  2 +-
 .../ku/kubernetes-metrics-server/package.nix  |  2 +-
 .../by-name/ku/kubernetes-polaris/package.nix |  2 +-
 pkgs/by-name/ku/kubernix/package.nix          |  2 +-
 pkgs/by-name/ku/kubeseal/package.nix          |  2 +-
 pkgs/by-name/ku/kubeshark/package.nix         |  2 +-
 pkgs/by-name/ku/kubespy/package.nix           |  2 +-
 pkgs/by-name/ku/kubeswitch/package.nix        |  2 +-
 pkgs/by-name/ku/kubetail/package.nix          |  2 +-
 pkgs/by-name/ku/kubevela/package.nix          |  2 +-
 pkgs/by-name/ku/kubevirt/package.nix          |  2 +-
 pkgs/by-name/ku/kubevpn/package.nix           |  2 +-
 pkgs/by-name/ku/kubexit/package.nix           |  2 +-
 pkgs/by-name/ku/kulala-fmt/package.nix        |  2 +-
 pkgs/by-name/ku/kuro/package.nix              |  2 +-
 pkgs/by-name/ku/kuttl/package.nix             |  2 +-
 pkgs/by-name/ky/kyverno-chainsaw/package.nix  |  2 +-
 pkgs/by-name/ky/kyverno/package.nix           |  2 +-
 pkgs/by-name/la/LAStools/package.nix          |  2 +-
 pkgs/by-name/la/lab/package.nix               |  2 +-
 pkgs/by-name/la/labelImg/package.nix          |  2 +-
 pkgs/by-name/la/lact/package.nix              |  2 +-
 pkgs/by-name/la/lalrpop/package.nix           |  2 +-
 pkgs/by-name/la/lambda-delta/package.nix      |  2 +-
 pkgs/by-name/la/laminar/package.nix           |  2 +-
 pkgs/by-name/la/lan-mouse/package.nix         |  2 +-
 pkgs/by-name/la/lanzaboote-tool/package.nix   |  2 +-
 pkgs/by-name/la/lastpass-cli/package.nix      |  2 +-
 pkgs/by-name/la/laszip/package.nix            |  2 +-
 pkgs/by-name/la/latex2html/package.nix        |  2 +-
 pkgs/by-name/la/lavanda-gtk-theme/package.nix |  2 +-
 pkgs/by-name/la/lavat/package.nix             |  2 +-
 pkgs/by-name/la/layan-gtk-theme/package.nix   |  2 +-
 pkgs/by-name/la/lazycli/package.nix           |  2 +-
 pkgs/by-name/la/lazydocker/package.nix        |  2 +-
 pkgs/by-name/la/lazyjj/package.nix            |  2 +-
 pkgs/by-name/la/lazymc/package.nix            |  2 +-
 pkgs/by-name/la/lazysql/package.nix           |  2 +-
 pkgs/by-name/lb/lbzip2/package.nix            |  2 +-
 pkgs/by-name/lc/lcdf-typetools/package.nix    |  2 +-
 pkgs/by-name/lc/lcdproc/package.nix           |  2 +-
 pkgs/by-name/lc/lcm/package.nix               |  2 +-
 pkgs/by-name/lc/lcov/package.nix              |  2 +-
 pkgs/by-name/ld/ldacbt/package.nix            |  2 +-
 pkgs/by-name/ld/ldproxy/package.nix           |  2 +-
 pkgs/by-name/le/leaf/package.nix              |  2 +-
 pkgs/by-name/le/leaps/package.nix             |  2 +-
 pkgs/by-name/le/leatherman/package.nix        |  2 +-
 pkgs/by-name/le/ledger-autosync/package.nix   |  2 +-
 pkgs/by-name/le/ledger/package.nix            |  2 +-
 pkgs/by-name/le/ledger2beancount/package.nix  |  2 +-
 pkgs/by-name/le/ledmon/package.nix            |  2 +-
 pkgs/by-name/le/leetgo/package.nix            |  2 +-
 pkgs/by-name/le/lefthook/package.nix          |  2 +-
 pkgs/by-name/le/legba/package.nix             |  2 +-
 pkgs/by-name/le/legendary-heroic/package.nix  |  2 +-
 pkgs/by-name/le/legit-web/package.nix         |  2 +-
 pkgs/by-name/le/lemminx/package.nix           |  2 +-
 pkgs/by-name/le/lemmy-help/package.nix        |  2 +-
 pkgs/by-name/le/lensfun/package.nix           |  2 +-
 pkgs/by-name/le/leptonica/package.nix         |  2 +-
 pkgs/by-name/le/leptosfmt/package.nix         |  2 +-
 pkgs/by-name/le/lessc/package.nix             |  2 +-
 pkgs/by-name/le/lesspass-cli/package.nix      |  2 +-
 pkgs/by-name/le/lesspipe/package.nix          |  2 +-
 pkgs/by-name/le/levant/package.nix            |  2 +-
 pkgs/by-name/le/leveldb/package.nix           |  2 +-
 pkgs/by-name/le/lexido/package.nix            |  2 +-
 pkgs/by-name/li/lianad/package.nix            |  2 +-
 pkgs/by-name/li/lib3270/package.nix           |  2 +-
 pkgs/by-name/li/libGDSII/package.nix          |  2 +-
 pkgs/by-name/li/libad9361/package.nix         |  2 +-
 pkgs/by-name/li/libaosd/package.nix           |  2 +-
 pkgs/by-name/li/libappimage/package.nix       |  2 +-
 pkgs/by-name/li/libargon2/package.nix         |  2 +-
 pkgs/by-name/li/libargs/package.nix           |  2 +-
 pkgs/by-name/li/libaribcaption/package.nix    |  2 +-
 pkgs/by-name/li/libast/package.nix            |  2 +-
 pkgs/by-name/li/libation/package.nix          |  2 +-
 pkgs/by-name/li/libaudec/package.nix          |  2 +-
 pkgs/by-name/li/libavif/package.nix           |  2 +-
 .../li/libayatana-appindicator/package.nix    |  2 +-
 .../li/libayatana-indicator/package.nix       |  2 +-
 pkgs/by-name/li/libb64/package.nix            |  2 +-
 pkgs/by-name/li/libbase58/package.nix         |  2 +-
 pkgs/by-name/li/libbaseencode/package.nix     |  2 +-
 pkgs/by-name/li/libblockdev/package.nix       |  2 +-
 pkgs/by-name/li/libbytesize/package.nix       |  2 +-
 pkgs/by-name/li/libcaca/package.nix           |  2 +-
 pkgs/by-name/li/libcaption/package.nix        |  2 +-
 pkgs/by-name/li/libccd/package.nix            |  2 +-
 pkgs/by-name/li/libcdada/package.nix          |  2 +-
 pkgs/by-name/li/libcgroup/package.nix         |  2 +-
 pkgs/by-name/li/libchardet/package.nix        |  2 +-
 pkgs/by-name/li/libcint/package.nix           |  2 +-
 pkgs/by-name/li/libcircle/package.nix         |  2 +-
 pkgs/by-name/li/libck/package.nix             |  2 +-
 pkgs/by-name/li/libcmis/package.nix           |  2 +-
 pkgs/by-name/li/libconfuse/package.nix        |  2 +-
 pkgs/by-name/li/libcork/package.nix           |  2 +-
 pkgs/by-name/li/libcotp/package.nix           |  2 +-
 pkgs/by-name/li/libcouchbase/package.nix      |  2 +-
 pkgs/by-name/li/libcpr/package.nix            |  2 +-
 pkgs/by-name/li/libcpr_1_10_5/package.nix     |  2 +-
 pkgs/by-name/li/libcpuid/package.nix          |  2 +-
 pkgs/by-name/li/libcsptr/package.nix          |  2 +-
 pkgs/by-name/li/libctl/package.nix            |  2 +-
 pkgs/by-name/li/libcue/package.nix            |  2 +-
 pkgs/by-name/li/libcyaml/package.nix          |  2 +-
 pkgs/by-name/li/libdatachannel/package.nix    |  2 +-
 pkgs/by-name/li/libdict/package.nix           |  2 +-
 pkgs/by-name/li/libdivsufsort/package.nix     |  2 +-
 pkgs/by-name/li/libdmtx/package.nix           |  2 +-
 pkgs/by-name/li/libdynd/package.nix           |  2 +-
 pkgs/by-name/li/libebur128/package.nix        |  2 +-
 pkgs/by-name/li/libedgetpu/package.nix        |  2 +-
 pkgs/by-name/li/libemf2svg/package.nix        |  2 +-
 .../li/liberation-sans-narrow/package.nix     |  2 +-
 pkgs/by-name/li/liberfa/package.nix           |  2 +-
 pkgs/by-name/li/libesmtp/package.nix          |  2 +-
 pkgs/by-name/li/libetebase/package.nix        |  2 +-
 pkgs/by-name/li/libetpan/package.nix          |  2 +-
 pkgs/by-name/li/libevdevc/package.nix         |  2 +-
 pkgs/by-name/li/libexsid/package.nix          |  2 +-
 pkgs/by-name/li/libfabric/package.nix         |  2 +-
 pkgs/by-name/li/libfaketime/package.nix       |  2 +-
 pkgs/by-name/li/libfann/package.nix           |  2 +-
 pkgs/by-name/li/libff/package.nix             |  2 +-
 pkgs/by-name/li/libfixposix/package.nix       |  2 +-
 pkgs/by-name/li/libfreeaptx/package.nix       |  2 +-
 pkgs/by-name/li/libgadu/package.nix           |  2 +-
 pkgs/by-name/li/libgbinder/package.nix        |  2 +-
 pkgs/by-name/li/libgedit-gfls/package.nix     |  2 +-
 .../li/libgedit-gtksourceview/package.nix     |  2 +-
 pkgs/by-name/li/libgen-cli/package.nix        |  2 +-
 pkgs/by-name/li/libgeotiff/package.nix        |  2 +-
 pkgs/by-name/li/libgestures/package.nix       |  2 +-
 pkgs/by-name/li/libglibutil/package.nix       |  2 +-
 pkgs/by-name/li/libharu/package.nix           |  2 +-
 pkgs/by-name/li/libheif/package.nix           |  2 +-
 pkgs/by-name/li/libhomfly/package.nix         |  2 +-
 pkgs/by-name/li/libhttpserver/package.nix     |  2 +-
 pkgs/by-name/li/libhwy/package.nix            |  2 +-
 pkgs/by-name/li/libical/package.nix           |  2 +-
 pkgs/by-name/li/libid3tag/package.nix         |  2 +-
 pkgs/by-name/li/libimagequant/package.nix     |  2 +-
 pkgs/by-name/li/libime/package.nix            |  2 +-
 .../li/libimobiledevice-glue/package.nix      |  2 +-
 pkgs/by-name/li/libinotify-kqueue/package.nix |  2 +-
 pkgs/by-name/li/libinstpatch/package.nix      |  2 +-
 pkgs/by-name/li/libipt/package.nix            |  2 +-
 pkgs/by-name/li/libirecovery/package.nix      |  2 +-
 pkgs/by-name/li/libiscsi/package.nix          |  2 +-
 pkgs/by-name/li/libite/package.nix            |  2 +-
 pkgs/by-name/li/libjcat/package.nix           |  2 +-
 pkgs/by-name/li/libjpeg_turbo/package.nix     |  2 +-
 pkgs/by-name/li/libjson-rpc-cpp/package.nix   |  2 +-
 pkgs/by-name/li/libjwt/package.nix            |  2 +-
 pkgs/by-name/li/libjxl/package.nix            |  2 +-
 pkgs/by-name/li/libkcapi/package.nix          |  2 +-
 pkgs/by-name/li/libkeyfinder/package.nix      |  2 +-
 pkgs/by-name/li/libkqueue/package.nix         |  2 +-
 pkgs/by-name/li/libks/package.nix             |  2 +-
 pkgs/by-name/li/libksi/package.nix            |  2 +-
 pkgs/by-name/li/liblaxjson/package.nix        |  2 +-
 pkgs/by-name/li/liblc3/package.nix            |  2 +-
 pkgs/by-name/li/liblcf/package.nix            |  2 +-
 pkgs/by-name/li/liblsl/package.nix            |  2 +-
 pkgs/by-name/li/libmbd/package.nix            |  2 +-
 pkgs/by-name/li/libmesode/package.nix         |  2 +-
 pkgs/by-name/li/libmicrodns/package.nix       |  2 +-
 pkgs/by-name/li/libmodbus/package.nix         |  2 +-
 pkgs/by-name/li/libmodule/package.nix         |  2 +-
 pkgs/by-name/li/libmongocrypt/package.nix     |  2 +-
 pkgs/by-name/li/libmowgli/package.nix         |  2 +-
 pkgs/by-name/li/libmpack/package.nix          |  2 +-
 pkgs/by-name/li/libmsym/package.nix           |  2 +-
 pkgs/by-name/li/libmypaint/package.nix        |  2 +-
 pkgs/by-name/li/libmysofa/package.nix         |  2 +-
 pkgs/by-name/li/libnabo/package.nix           |  2 +-
 pkgs/by-name/li/libnats-c/package.nix         |  2 +-
 pkgs/by-name/li/libndctl/package.nix          |  2 +-
 pkgs/by-name/li/libnet/package.nix            |  2 +-
 pkgs/by-name/li/libnsl/package.nix            |  2 +-
 pkgs/by-name/li/libnss-mysql/package.nix      |  2 +-
 pkgs/by-name/li/libnss_nis/package.nix        |  2 +-
 .../li/libnvidia-container/package.nix        |  6 +-
 pkgs/by-name/li/libofx/package.nix            |  2 +-
 pkgs/by-name/li/libomemo-c/package.nix        |  2 +-
 pkgs/by-name/li/libopenaptx/package.nix       |  2 +-
 pkgs/by-name/li/liboqs/package.nix            |  2 +-
 pkgs/by-name/li/libosmo-netif/package.nix     |  2 +-
 pkgs/by-name/li/libosmo-sigtran/package.nix   |  2 +-
 pkgs/by-name/li/libosmoabis/package.nix       |  2 +-
 pkgs/by-name/li/libosmocore/package.nix       |  2 +-
 pkgs/by-name/li/libow/package.nix             |  2 +-
 pkgs/by-name/li/libowlevelzs/package.nix      |  2 +-
 pkgs/by-name/li/libplist/package.nix          |  2 +-
 pkgs/by-name/li/libpointmatcher/package.nix   |  2 +-
 pkgs/by-name/li/libportal/package.nix         |  2 +-
 pkgs/by-name/li/libppd/package.nix            |  2 +-
 pkgs/by-name/li/libpqxx/package.nix           |  2 +-
 pkgs/by-name/li/libproxy/package.nix          |  2 +-
 pkgs/by-name/li/libqb/package.nix             |  2 +-
 pkgs/by-name/li/libr3/package.nix             |  2 +-
 pkgs/by-name/li/libraqm/package.nix           |  2 +-
 pkgs/by-name/li/libratbag/package.nix         |  2 +-
 pkgs/by-name/li/libraw/package.nix            |  2 +-
 pkgs/by-name/li/librearp/package.nix          |  2 +-
 pkgs/by-name/li/libredwg/package.nix          |  2 +-
 .../li/libreelec-dvb-firmware/package.nix     |  2 +-
 pkgs/by-name/li/librelp/package.nix           |  2 +-
 pkgs/by-name/li/librem/package.nix            |  2 +-
 pkgs/by-name/li/librespeed-cli/package.nix    |  2 +-
 .../by-name/li/libretro-core-info/package.nix |  2 +-
 pkgs/by-name/li/librime/package.nix           |  2 +-
 pkgs/by-name/li/librsync/package.nix          |  2 +-
 pkgs/by-name/li/librtprocess/package.nix      |  2 +-
 pkgs/by-name/li/libsass/package.nix           |  2 +-
 pkgs/by-name/li/libscrypt/package.nix         |  2 +-
 pkgs/by-name/li/libserdes/package.nix         |  2 +-
 .../li/libsignal-protocol-c/package.nix       |  2 +-
 pkgs/by-name/li/libsmartcols/package.nix      |  2 +-
 pkgs/by-name/li/libsmbios/package.nix         |  2 +-
 pkgs/by-name/li/libsolv/package.nix           |  2 +-
 pkgs/by-name/li/libspatialaudio/package.nix   |  2 +-
 pkgs/by-name/li/libspatialindex/package.nix   |  2 +-
 pkgs/by-name/li/libspecbleach/package.nix     |  2 +-
 pkgs/by-name/li/libspf2/package.nix           |  2 +-
 pkgs/by-name/li/libspiro/package.nix          |  2 +-
 pkgs/by-name/li/libspng/package.nix           |  2 +-
 pkgs/by-name/li/libstemmer/package.nix        |  2 +-
 pkgs/by-name/li/libstrophe/package.nix        |  2 +-
 pkgs/by-name/li/libsurvive/package.nix        |  2 +-
 pkgs/by-name/li/libsv/package.nix             |  2 +-
 pkgs/by-name/li/libtickit/package.nix         |  2 +-
 pkgs/by-name/li/libtins/package.nix           |  2 +-
 .../li/libtorrent-rasterbar-1_2_x/package.nix |  2 +-
 .../li/libtorrent-rasterbar-2_0_x/package.nix |  2 +-
 pkgs/by-name/li/libtorrent/package.nix        |  2 +-
 pkgs/by-name/li/libtpms/package.nix           |  2 +-
 pkgs/by-name/li/libucl/package.nix            |  2 +-
 pkgs/by-name/li/libucontext/package.nix       |  2 +-
 pkgs/by-name/li/libudev-zero/package.nix      |  2 +-
 pkgs/by-name/li/libudev0-shim/package.nix     |  2 +-
 pkgs/by-name/li/libuev/package.nix            |  2 +-
 pkgs/by-name/li/libuldaq/package.nix          |  2 +-
 pkgs/by-name/li/libuninameslist/package.nix   |  2 +-
 pkgs/by-name/li/libusbmuxd/package.nix        |  2 +-
 pkgs/by-name/li/libusbp/package.nix           |  2 +-
 pkgs/by-name/li/libv3270/package.nix          |  2 +-
 pkgs/by-name/li/libvarlink/package.nix        |  2 +-
 pkgs/by-name/li/libvdpau-va-gl/package.nix    |  2 +-
 pkgs/by-name/li/libversion/package.nix        |  2 +-
 pkgs/by-name/li/libverto/package.nix          |  2 +-
 pkgs/by-name/li/libvibrant/package.nix        |  2 +-
 pkgs/by-name/li/libvisio2svg/package.nix      |  2 +-
 pkgs/by-name/li/libvpx/package.nix            |  2 +-
 pkgs/by-name/li/libwebp/package.nix           |  2 +-
 pkgs/by-name/li/libwebsockets/package.nix     |  2 +-
 pkgs/by-name/li/libwhereami/package.nix       |  2 +-
 pkgs/by-name/li/libwhich/package.nix          |  2 +-
 pkgs/by-name/li/libwmf/package.nix            |  2 +-
 pkgs/by-name/li/libx86emu/package.nix         |  2 +-
 pkgs/by-name/li/libxls/package.nix            |  2 +-
 pkgs/by-name/li/libxmlb/package.nix           |  2 +-
 pkgs/by-name/li/libxo/package.nix             |  2 +-
 pkgs/by-name/li/libxsmm/package.nix           |  2 +-
 pkgs/by-name/li/libyaml/package.nix           |  2 +-
 pkgs/by-name/li/libyang/package.nix           |  2 +-
 pkgs/by-name/li/libytnef/package.nix          |  2 +-
 pkgs/by-name/li/libzbc/package.nix            |  2 +-
 pkgs/by-name/li/libzbd/package.nix            |  2 +-
 pkgs/by-name/li/license-go/package.nix        |  2 +-
 pkgs/by-name/li/licenseclassifier/package.nix |  2 +-
 pkgs/by-name/li/licensure/package.nix         |  2 +-
 pkgs/by-name/li/lifecycled/package.nix        |  2 +-
 .../li/lightdm-mini-greeter/package.nix       |  2 +-
 .../li/lightdm-slick-greeter/package.nix      |  2 +-
 .../li/lightdm-tiny-greeter/package.nix       |  2 +-
 pkgs/by-name/li/lightlocker/package.nix       |  2 +-
 pkgs/by-name/li/lightning-loop/package.nix    |  2 +-
 pkgs/by-name/li/lightning-pool/package.nix    |  2 +-
 pkgs/by-name/li/lightspark/package.nix        |  2 +-
 pkgs/by-name/li/lightwalletd/package.nix      |  2 +-
 pkgs/by-name/li/lilipod/package.nix           |  2 +-
 pkgs/by-name/li/limesurvey/package.nix        |  2 +-
 pkgs/by-name/li/linbox/package.nix            |  2 +-
 pkgs/by-name/li/linenoise-ng/package.nix      |  2 +-
 pkgs/by-name/li/lineselect/package.nix        |  2 +-
 pkgs/by-name/li/lint-staged/package.nix       |  2 +-
 pkgs/by-name/li/linux_logo/package.nix        |  2 +-
 pkgs/by-name/li/linuxptp/package.nix          |  2 +-
 pkgs/by-name/li/liquidprompt/package.nix      |  2 +-
 pkgs/by-name/li/listmonk/package.nix          |  2 +-
 pkgs/by-name/li/listmonk/stuffbin.nix         |  2 +-
 pkgs/by-name/li/lite/package.nix              |  2 +-
 pkgs/by-name/li/litecli/package.nix           |  2 +-
 pkgs/by-name/li/litefs/package.nix            |  2 +-
 pkgs/by-name/li/litestream/package.nix        |  2 +-
 pkgs/by-name/li/litmus/package.nix            |  2 +-
 pkgs/by-name/li/litmusctl/package.nix         |  2 +-
 pkgs/by-name/li/little_boxes/package.nix      |  2 +-
 pkgs/by-name/li/littlefs-fuse/package.nix     |  2 +-
 pkgs/by-name/li/live-chart/package.nix        |  2 +-
 pkgs/by-name/li/live-server/package.nix       |  2 +-
 pkgs/by-name/li/livekit-cli/package.nix       |  2 +-
 pkgs/by-name/li/livekit/package.nix           |  2 +-
 pkgs/by-name/li/lizardfs/package.nix          |  2 +-
 pkgs/by-name/lk/lksctp-tools/package.nix      |  2 +-
 pkgs/by-name/ll/lldap/package.nix             |  2 +-
 pkgs/by-name/ll/llpp/package.nix              |  2 +-
 pkgs/by-name/lm/lmdbxx/package.nix            |  2 +-
 pkgs/by-name/lm/lmp/package.nix               |  2 +-
 pkgs/by-name/lm/lms/package.nix               |  2 +-
 pkgs/by-name/ln/lnd/package.nix               |  2 +-
 pkgs/by-name/ln/lndconnect/package.nix        |  2 +-
 pkgs/by-name/ln/lndhub-go/package.nix         |  2 +-
 pkgs/by-name/ln/lndinit/package.nix           |  2 +-
 pkgs/by-name/lo/local-ai/package.nix          |  2 +-
 .../lo/locate-dominating-file/package.nix     |  2 +-
 pkgs/by-name/lo/log4j-sniffer/package.nix     |  2 +-
 .../by-name/lo/log4j-vuln-scanner/package.nix |  2 +-
 pkgs/by-name/lo/logiops_0_2_3/package.nix     |  2 +-
 pkgs/by-name/lo/logrotate/package.nix         |  2 +-
 pkgs/by-name/lo/lokalise2-cli/package.nix     |  2 +-
 pkgs/by-name/lo/loksh/package.nix             |  2 +-
 pkgs/by-name/lo/lolcode/package.nix           |  2 +-
 pkgs/by-name/lo/longview/package.nix          |  2 +-
 .../lo/looking-glass-client/package.nix       |  2 +-
 pkgs/by-name/lo/lorem/package.nix             |  2 +-
 pkgs/by-name/lo/lorien/package.nix            |  2 +-
 pkgs/by-name/lo/loudgain/package.nix          |  2 +-
 pkgs/by-name/lo/lounge-gtk-theme/package.nix  |  2 +-
 pkgs/by-name/lo/lout/package.nix              |  2 +-
 pkgs/by-name/lp/lparchive2epub/package.nix    |  2 +-
 pkgs/by-name/lp/lprint/package.nix            |  2 +-
 pkgs/by-name/lr/lr/package.nix                |  2 +-
 pkgs/by-name/lr/lrcget/package.nix            |  2 +-
 pkgs/by-name/lr/lrdf/package.nix              |  2 +-
 pkgs/by-name/lr/lrzip/package.nix             |  2 +-
 pkgs/by-name/ls/ls-lint/package.nix           |  2 +-
 pkgs/by-name/ls/lsd/package.nix               |  2 +-
 pkgs/by-name/ls/lsd2dsl/package.nix           |  2 +-
 pkgs/by-name/ls/lsh/package.nix               |  2 +-
 pkgs/by-name/ls/lsix/package.nix              |  2 +-
 pkgs/by-name/ls/lsof/package.nix              |  2 +-
 pkgs/by-name/lt/ltc-tools/package.nix         |  2 +-
 pkgs/by-name/lt/ltunify/package.nix           |  2 +-
 pkgs/by-name/lu/luabridge/package.nix         |  2 +-
 pkgs/by-name/lu/luaformatter/package.nix      |  2 +-
 pkgs/by-name/lu/luakit/package.nix            |  2 +-
 pkgs/by-name/lu/luau/package.nix              |  2 +-
 pkgs/by-name/lu/lubelogger/package.nix        |  2 +-
 pkgs/by-name/lu/lucky-cli/package.nix         |  2 +-
 pkgs/by-name/lu/ludtwig/package.nix           |  2 +-
 pkgs/by-name/lu/ludusavi/package.nix          |  2 +-
 pkgs/by-name/lu/luminous-ttv/package.nix      |  2 +-
 pkgs/by-name/lu/lunatic/package.nix           |  2 +-
 pkgs/by-name/lu/lune/package.nix              |  2 +-
 pkgs/by-name/lu/luneta/package.nix            |  2 +-
 pkgs/by-name/lu/lutgen/package.nix            |  2 +-
 pkgs/by-name/lu/lux/package.nix               |  2 +-
 pkgs/by-name/lv/lv2bm/package.nix             |  2 +-
 pkgs/by-name/lv/lv_font_conv/package.nix      |  2 +-
 pkgs/by-name/lw/lwan/package.nix              |  2 +-
 pkgs/by-name/lw/lwgrp/package.nix             |  2 +-
 pkgs/by-name/lx/lxcfs/package.nix             |  2 +-
 pkgs/by-name/lx/lxd-image-server/package.nix  |  2 +-
 pkgs/by-name/lx/lxgw-fusionkai/package.nix    |  2 +-
 .../lx/lxqt-panel-profiles/package.nix        |  2 +-
 pkgs/by-name/ly/lynis/package.nix             |  2 +-
 pkgs/by-name/ly/lyra/package.nix              |  2 +-
 pkgs/by-name/lz/lzbench/package.nix           |  2 +-
 pkgs/by-name/lz/lzsa/package.nix              |  2 +-
 pkgs/by-name/m-/m-cli/package.nix             |  2 +-
 pkgs/by-name/m1/m17-cxx-demod/package.nix     |  2 +-
 pkgs/by-name/m4/m4acut/package.nix            |  2 +-
 pkgs/by-name/m4/m4ri/package.nix              |  2 +-
 pkgs/by-name/m4/m4rie/package.nix             |  2 +-
 pkgs/by-name/ma/maa-cli/package.nix           |  2 +-
 pkgs/by-name/ma/macchanger/package.nix        |  2 +-
 pkgs/by-name/ma/macchina/package.nix          |  2 +-
 pkgs/by-name/ma/macdylibbundler/package.nix   |  2 +-
 pkgs/by-name/ma/mackerel-agent/package.nix    |  2 +-
 pkgs/by-name/ma/mackup/package.nix            |  2 +-
 pkgs/by-name/ma/macmon/package.nix            |  2 +-
 pkgs/by-name/ma/maddy/package.nix             |  2 +-
 pkgs/by-name/ma/madonctl/package.nix          |  2 +-
 pkgs/by-name/ma/maeparser/package.nix         |  2 +-
 pkgs/by-name/ma/mage/package.nix              |  2 +-
 pkgs/by-name/ma/magic-wormhole-rs/package.nix |  2 +-
 pkgs/by-name/ma/mailhog/package.nix           |  2 +-
 pkgs/by-name/ma/mailsy/package.nix            |  2 +-
 pkgs/by-name/ma/maim/package.nix              |  2 +-
 pkgs/by-name/ma/mainsail/package.nix          |  2 +-
 pkgs/by-name/ma/maizzle/package.nix           |  2 +-
 pkgs/by-name/ma/maker-panel/package.nix       |  2 +-
 pkgs/by-name/ma/makerpm/package.nix           |  2 +-
 pkgs/by-name/ma/makima/package.nix            |  2 +-
 pkgs/by-name/ma/malt/package.nix              |  2 +-
 pkgs/by-name/ma/mamba/package.nix             |  2 +-
 pkgs/by-name/ma/manga-tui/package.nix         |  2 +-
 pkgs/by-name/ma/mangal/package.nix            |  2 +-
 pkgs/by-name/ma/mangareader/package.nix       |  2 +-
 pkgs/by-name/ma/manifest-tool/package.nix     |  2 +-
 pkgs/by-name/ma/manix/package.nix             |  2 +-
 pkgs/by-name/ma/manticoresearch/package.nix   |  2 +-
 pkgs/by-name/ma/map-cmd/package.nix           |  2 +-
 pkgs/by-name/ma/mapscii/package.nix           |  2 +-
 pkgs/by-name/ma/marathonctl/package.nix       |  2 +-
 pkgs/by-name/ma/mari0/package.nix             |  2 +-
 pkgs/by-name/ma/marisa/package.nix            |  2 +-
 pkgs/by-name/ma/mark/package.nix              |  2 +-
 .../ma/markdown-link-check/package.nix        |  2 +-
 pkgs/by-name/ma/markdownlint-cli/package.nix  |  2 +-
 pkgs/by-name/ma/marked-man/package.nix        |  2 +-
 pkgs/by-name/ma/marker/package.nix            |  2 +-
 pkgs/by-name/ma/markets/package.nix           |  2 +-
 pkgs/by-name/ma/markscribe/package.nix        |  2 +-
 pkgs/by-name/ma/marksman/package.nix          |  2 +-
 pkgs/by-name/ma/markuplinkchecker/package.nix |  2 +-
 pkgs/by-name/ma/marp-cli/package.nix          |  2 +-
 pkgs/by-name/ma/marwaita-icons/package.nix    |  2 +-
 pkgs/by-name/ma/marwaita-mint/package.nix     |  2 +-
 pkgs/by-name/ma/marwaita-orange/package.nix   |  2 +-
 pkgs/by-name/ma/marwaita-red/package.nix      |  2 +-
 pkgs/by-name/ma/marwaita-teal/package.nix     |  2 +-
 pkgs/by-name/ma/marwaita-x/package.nix        |  2 +-
 pkgs/by-name/ma/marwaita-yellow/package.nix   |  2 +-
 pkgs/by-name/ma/marwaita/package.nix          |  2 +-
 pkgs/by-name/ma/masklint/package.nix          |  2 +-
 pkgs/by-name/ma/masscan/package.nix           |  2 +-
 pkgs/by-name/ma/massdns/package.nix           |  2 +-
 pkgs/by-name/ma/massren/package.nix           |  2 +-
 pkgs/by-name/ma/mastodon-archive/package.nix  |  2 +-
 pkgs/by-name/ma/mastotool/package.nix         |  2 +-
 pkgs/by-name/ma/matcha-gtk-theme/package.nix  |  2 +-
 pkgs/by-name/ma/matcha-rss-digest/package.nix |  2 +-
 pkgs/by-name/ma/matchbox-server/package.nix   |  2 +-
 pkgs/by-name/ma/materia-kde-theme/package.nix |  2 +-
 pkgs/by-name/ma/materia-theme/package.nix     |  2 +-
 .../ma/material-design-icons/package.nix      |  2 +-
 pkgs/by-name/ma/material-icons/package.nix    |  2 +-
 pkgs/by-name/ma/material-maker/package.nix    |  2 +-
 pkgs/by-name/ma/math-preview/package.nix      |  2 +-
 pkgs/by-name/ma/mathjax-node-cli/package.nix  |  2 +-
 .../ma/matrix-alertmanager/package.nix        |  2 +-
 .../ma/matrix-appservice-discord/package.nix  |  2 +-
 pkgs/by-name/ma/matrix-conduit/package.nix    |  2 +-
 pkgs/by-name/ma/matrix-corporal/package.nix   |  2 +-
 pkgs/by-name/ma/matrix-hook/package.nix       |  2 +-
 pkgs/by-name/ma/matrix-media-repo/package.nix |  2 +-
 .../ma/matrix-sdk-crypto-nodejs/package.nix   |  2 +-
 .../ma/matrix-synapse-unwrapped/package.nix   |  2 +-
 .../matrix-synapse-unwrapped/plugins/pam.nix  |  2 +-
 .../plugins/rendezvous.nix                    |  2 +-
 .../plugins/shared-secret-auth.nix            |  2 +-
 .../ma/matrix-zulip-bridge/package.nix        |  2 +-
 pkgs/by-name/ma/matterircd/package.nix        |  2 +-
 pkgs/by-name/ma/maturin/package.nix           |  2 +-
 pkgs/by-name/ma/maturin/pyo3-test/default.nix |  2 +-
 pkgs/by-name/ma/mautrix-discord/package.nix   |  2 +-
 pkgs/by-name/ma/mautrix-meta/package.nix      |  2 +-
 pkgs/by-name/ma/mautrix-whatsapp/package.nix  |  2 +-
 pkgs/by-name/ma/maxcso/package.nix            |  2 +-
 pkgs/by-name/ma/maxflow/package.nix           |  2 +-
 pkgs/by-name/ma/maxlib/package.nix            |  2 +-
 pkgs/by-name/mb/mbelib/package.nix            |  2 +-
 pkgs/by-name/mb/mblaze/package.nix            |  2 +-
 pkgs/by-name/mb/mbpfan/package.nix            |  2 +-
 pkgs/by-name/mb/mbtileserver/package.nix      |  2 +-
 pkgs/by-name/mb/mbusd/package.nix             |  2 +-
 pkgs/by-name/mc/mcfly-fzf/package.nix         |  2 +-
 pkgs/by-name/mc/mcfly/package.nix             |  2 +-
 pkgs/by-name/mc/mcontrolcenter/package.nix    |  2 +-
 pkgs/by-name/mc/mcpp/package.nix              |  2 +-
 pkgs/by-name/mc/mcrcon/package.nix            |  2 +-
 pkgs/by-name/mc/mctc-lib/package.nix          |  2 +-
 pkgs/by-name/mc/mcumgr-client/package.nix     |  2 +-
 pkgs/by-name/md/mdbook-alerts/package.nix     |  2 +-
 pkgs/by-name/md/mdbook-d2/package.nix         |  2 +-
 pkgs/by-name/md/mdbook-emojicodes/package.nix |  2 +-
 .../md/mdbook-kroki-preprocessor/package.nix  |  2 +-
 pkgs/by-name/md/mdbook-open-on-gh/package.nix |  2 +-
 pkgs/by-name/md/mdbook-pagetoc/package.nix    |  2 +-
 pkgs/by-name/md/mdbtools/package.nix          |  2 +-
 pkgs/by-name/md/mdds/package.nix              |  2 +-
 pkgs/by-name/md/mdhtml/package.nix            |  2 +-
 pkgs/by-name/md/mdns/package.nix              |  2 +-
 pkgs/by-name/md/mdp/package.nix               |  2 +-
 pkgs/by-name/md/mdr/package.nix               |  2 +-
 pkgs/by-name/md/mdsh/package.nix              |  2 +-
 pkgs/by-name/me/me_cleaner/package.nix        |  2 +-
 pkgs/by-name/me/measureme/package.nix         |  2 +-
 pkgs/by-name/me/med/package.nix               |  2 +-
 pkgs/by-name/me/media-downloader/package.nix  |  2 +-
 pkgs/by-name/me/mediamtx/package.nix          |  2 +-
 pkgs/by-name/me/mediasynclite/package.nix     |  2 +-
 pkgs/by-name/me/mednaffe/package.nix          |  2 +-
 pkgs/by-name/me/meg/package.nix               |  2 +-
 pkgs/by-name/me/megaglest/package.nix         |  2 +-
 pkgs/by-name/me/megahit/package.nix           |  2 +-
 pkgs/by-name/me/megapixels/package.nix        |  2 +-
 pkgs/by-name/me/megatools/package.nix         |  2 +-
 pkgs/by-name/me/mekuteriya/package.nix        |  2 +-
 pkgs/by-name/me/mela/package.nix              |  2 +-
 pkgs/by-name/me/melange/package.nix           |  2 +-
 pkgs/by-name/me/melt/package.nix              |  2 +-
 .../me/meme-image-generator/package.nix       |  2 +-
 pkgs/by-name/me/memo/package.nix              |  2 +-
 pkgs/by-name/me/memtest_vulkan/package.nix    |  2 +-
 pkgs/by-name/me/meow/package.nix              |  2 +-
 pkgs/by-name/me/mercure/package.nix           |  2 +-
 pkgs/by-name/me/merkaartor/package.nix        |  2 +-
 pkgs/by-name/me/mermaid-cli/package.nix       |  2 +-
 pkgs/by-name/me/mermaid-filter/package.nix    |  2 +-
 pkgs/by-name/me/meshoptimizer/package.nix     |  2 +-
 pkgs/by-name/me/meson-tools/package.nix       |  2 +-
 pkgs/by-name/me/mesos-dns/package.nix         |  2 +-
 pkgs/by-name/me/messer-slim/package.nix       |  2 +-
 pkgs/by-name/me/metadata-cleaner/package.nix  |  2 +-
 pkgs/by-name/me/metal-cli/package.nix         |  2 +-
 pkgs/by-name/me/metamath/package.nix          |  2 +-
 pkgs/by-name/me/metastore/package.nix         |  2 +-
 pkgs/by-name/me/meteor-git/package.nix        |  2 +-
 pkgs/by-name/me/metersLv2/package.nix         |  2 +-
 pkgs/by-name/me/mev-boost/package.nix         |  2 +-
 pkgs/by-name/mg/mgitstatus/package.nix        |  2 +-
 pkgs/by-name/mi/microbin/package.nix          |  2 +-
 pkgs/by-name/mi/microcom/package.nix          |  2 +-
 pkgs/by-name/mi/microdnf/package.nix          |  2 +-
 pkgs/by-name/mi/micromdm/package.nix          |  2 +-
 pkgs/by-name/mi/micronucleus/package.nix      |  2 +-
 pkgs/by-name/mi/microplane/package.nix        |  2 +-
 pkgs/by-name/mi/micropython/package.nix       |  2 +-
 pkgs/by-name/mi/microscheme/package.nix       |  2 +-
 pkgs/by-name/mi/microserver/package.nix       |  2 +-
 pkgs/by-name/mi/microsocks/package.nix        |  2 +-
 pkgs/by-name/mi/microsoft-gsl/package.nix     |  2 +-
 pkgs/by-name/mi/midi-trigger/package.nix      |  2 +-
 pkgs/by-name/mi/mieru/package.nix             |  2 +-
 pkgs/by-name/mi/migra/package.nix             |  2 +-
 pkgs/by-name/mi/mihomo/package.nix            |  2 +-
 pkgs/by-name/mi/miller/package.nix            |  2 +-
 pkgs/by-name/mi/millet/package.nix            |  2 +-
 pkgs/by-name/mi/millipixels/package.nix       |  2 +-
 pkgs/by-name/mi/mimalloc/package.nix          |  2 +-
 pkgs/by-name/mi/mimic/package.nix             |  2 +-
 pkgs/by-name/mi/minder/package.nix            |  2 +-
 pkgs/by-name/mi/mindustry/package.nix         |  4 +-
 .../minecraft-server-hibernation/package.nix  |  2 +-
 pkgs/by-name/mi/minesweep-rs/package.nix      |  2 +-
 .../by-name/mi/minetest-mapserver/package.nix |  2 +-
 pkgs/by-name/mi/mini-calc/package.nix         |  2 +-
 pkgs/by-name/mi/minia/package.nix             |  2 +-
 pkgs/by-name/mi/miniaudio/package.nix         |  2 +-
 pkgs/by-name/mi/minica/package.nix            |  2 +-
 pkgs/by-name/mi/minify/package.nix            |  2 +-
 pkgs/by-name/mi/minijinja/package.nix         |  2 +-
 pkgs/by-name/mi/minimacy/package.nix          |  2 +-
 pkgs/by-name/mi/minimap2/package.nix          |  2 +-
 pkgs/by-name/mi/mininet/package.nix           |  2 +-
 pkgs/by-name/mi/minio-certgen/package.nix     |  2 +-
 pkgs/by-name/mi/minio-warp/package.nix        |  2 +-
 pkgs/by-name/mi/miniserve/package.nix         |  2 +-
 pkgs/by-name/mi/minisign/package.nix          |  2 +-
 pkgs/by-name/mi/minivmac/package.nix          |  2 +-
 pkgs/by-name/mi/minixml/package.nix           |  2 +-
 pkgs/by-name/mi/miniz/package.nix             |  2 +-
 pkgs/by-name/mi/minizign/package.nix          |  2 +-
 pkgs/by-name/mi/minizip-ng/package.nix        |  2 +-
 pkgs/by-name/mi/mint-l-theme/package.nix      |  2 +-
 pkgs/by-name/mi/mint-themes/package.nix       |  2 +-
 pkgs/by-name/mi/mint-x-icons/package.nix      |  2 +-
 pkgs/by-name/mi/mint-y-icons/package.nix      |  2 +-
 pkgs/by-name/mi/mint/package.nix              |  2 +-
 pkgs/by-name/mi/mirakurun/package.nix         |  2 +-
 pkgs/by-name/mi/mirrorbits/package.nix        |  2 +-
 pkgs/by-name/mi/mise/package.nix              |  2 +-
 pkgs/by-name/mi/mission-center/package.nix    |  2 +-
 pkgs/by-name/mi/misskey/package.nix           |  2 +-
 pkgs/by-name/mi/mix2nix/package.nix           |  2 +-
 pkgs/by-name/mk/mkcert/package.nix            |  2 +-
 pkgs/by-name/mk/mkjson/generated.nix          |  2 +-
 pkgs/by-name/mk/mkp224o/package.nix           |  2 +-
 pkgs/by-name/mk/mktorrent/package.nix         |  2 +-
 pkgs/by-name/ml/mle/package.nix               |  2 +-
 pkgs/by-name/ml/mlkit/package.nix             |  2 +-
 pkgs/by-name/ml/mlvwm/package.nix             |  2 +-
 pkgs/by-name/mm/mmake/package.nix             |  2 +-
 pkgs/by-name/mm/mmdoc/package.nix             |  2 +-
 pkgs/by-name/mm/mmex/package.nix              |  2 +-
 pkgs/by-name/mm/mmsd-tng/package.nix          |  2 +-
 pkgs/by-name/mm/mmtc/package.nix              |  2 +-
 pkgs/by-name/mm/mmutils/package.nix           |  2 +-
 pkgs/by-name/mm/mmv-go/package.nix            |  2 +-
 pkgs/by-name/mm/mmv/package.nix               |  2 +-
 pkgs/by-name/mn/mnemonicode/package.nix       |  2 +-
 pkgs/by-name/mo/mo/package.nix                |  2 +-
 pkgs/by-name/mo/moar/package.nix              |  2 +-
 pkgs/by-name/mo/mob/package.nix               |  2 +-
 pkgs/by-name/mo/mockgen/package.nix           |  2 +-
 pkgs/by-name/mo/mod/package.nix               |  2 +-
 pkgs/by-name/mo/modern-cpp-kafka/package.nix  |  2 +-
 pkgs/by-name/mo/modprobed-db/package.nix      |  2 +-
 pkgs/by-name/mo/mods/package.nix              |  2 +-
 pkgs/by-name/mo/modsecurity-crs/package.nix   |  2 +-
 .../mo/modsecurity_standalone/package.nix     |  2 +-
 pkgs/by-name/mo/mojave-gtk-theme/package.nix  |  2 +-
 pkgs/by-name/mo/mokutil/package.nix           |  2 +-
 pkgs/by-name/mo/mold/package.nix              |  2 +-
 pkgs/by-name/mo/mole/package.nix              |  2 +-
 pkgs/by-name/mo/molot-lite/package.nix        |  2 +-
 pkgs/by-name/mo/mommy/package.nix             |  2 +-
 pkgs/by-name/mo/mongoaudit/package.nix        |  2 +-
 pkgs/by-name/mo/mongodb-tools/package.nix     |  2 +-
 .../by-name/mo/monitoring-plugins/package.nix |  2 +-
 pkgs/by-name/mo/monophony/package.nix         |  2 +-
 .../by-name/mo/moonlight-embedded/package.nix |  2 +-
 pkgs/by-name/mo/moosefs/package.nix           |  2 +-
 pkgs/by-name/mo/mop/package.nix               |  2 +-
 pkgs/by-name/mo/mopac/package.nix             |  2 +-
 pkgs/by-name/mo/moproxy/package.nix           |  2 +-
 pkgs/by-name/mo/moq/package.nix               |  2 +-
 pkgs/by-name/mo/morph/package.nix             |  2 +-
 pkgs/by-name/mo/morsel/package.nix            |  2 +-
 pkgs/by-name/mo/mosquitto/package.nix         |  2 +-
 pkgs/by-name/mo/mountpoint-s3/package.nix     |  2 +-
 pkgs/by-name/mo/mousai/package.nix            |  2 +-
 pkgs/by-name/mo/mouse-actions/package.nix     |  2 +-
 pkgs/by-name/mo/mozc/package.nix              |  2 +-
 pkgs/by-name/mo/mozjpeg/package.nix           |  2 +-
 pkgs/by-name/mp/mp3blaster/package.nix        |  2 +-
 pkgs/by-name/mp/mp3cat/package.nix            |  2 +-
 pkgs/by-name/mp/mp3fs/package.nix             |  2 +-
 pkgs/by-name/mp/mpd-discord-rpc/package.nix   |  2 +-
 pkgs/by-name/mp/mpd-mpris/package.nix         |  2 +-
 pkgs/by-name/mp/mpd-notification/package.nix  |  2 +-
 pkgs/by-name/mp/mpdas/package.nix             |  2 +-
 pkgs/by-name/mp/mpdris2/package.nix           |  2 +-
 pkgs/by-name/mp/mpifileutils/package.nix      |  2 +-
 pkgs/by-name/mp/mpris-notifier/package.nix    |  2 +-
 pkgs/by-name/mp/mpris-scrobbler/package.nix   |  2 +-
 .../mp/mpv-shim-default-shaders/package.nix   |  2 +-
 pkgs/by-name/mp/mpv-subs-popout/package.nix   |  2 +-
 pkgs/by-name/mp/mpvpaper/package.nix          |  2 +-
 pkgs/by-name/mq/mqtt-explorer/package.nix     |  2 +-
 pkgs/by-name/mr/mrbayes/package.nix           |  2 +-
 pkgs/by-name/mr/mruby/package.nix             |  2 +-
 .../msbuild-structured-log-viewer/package.nix |  2 +-
 pkgs/by-name/ms/mscompress/package.nix        |  2 +-
 pkgs/by-name/ms/msfpc/package.nix             |  2 +-
 pkgs/by-name/ms/msgpack-tools/package.nix     |  2 +-
 pkgs/by-name/ms/msgpuck/package.nix           |  2 +-
 pkgs/by-name/ms/mstore/package.nix            |  2 +-
 pkgs/by-name/ms/mstpd/package.nix             |  2 +-
 pkgs/by-name/mt/mtail/package.nix             |  2 +-
 pkgs/by-name/mt/mtm/package.nix               |  2 +-
 pkgs/by-name/mt/mtr-exporter/package.nix      |  2 +-
 pkgs/by-name/mt/mtxclient/package.nix         |  2 +-
 pkgs/by-name/mu/mu/package.nix                |  2 +-
 pkgs/by-name/mu/mucommander/package.nix       |  2 +-
 pkgs/by-name/mu/muffet/package.nix            |  2 +-
 pkgs/by-name/mu/muffin/package.nix            |  2 +-
 pkgs/by-name/mu/multicharge/package.nix       |  2 +-
 pkgs/by-name/mu/multilockscreen/package.nix   |  2 +-
 pkgs/by-name/mu/multimarkdown/package.nix     |  2 +-
 pkgs/by-name/mu/multimon-ng/package.nix       |  2 +-
 pkgs/by-name/mu/multiplex/package.nix         |  2 +-
 pkgs/by-name/mu/multirun/package.nix          |  2 +-
 pkgs/by-name/mu/multitail/package.nix         |  2 +-
 pkgs/by-name/mu/multus-cni/package.nix        |  2 +-
 pkgs/by-name/mu/munin/package.nix             |  2 +-
 pkgs/by-name/mu/muparser/package.nix          |  2 +-
 pkgs/by-name/mu/muparserx/package.nix         |  2 +-
 pkgs/by-name/mu/murex/package.nix             |  2 +-
 pkgs/by-name/mu/muscle/package.nix            |  2 +-
 pkgs/by-name/mu/musikcube/package.nix         |  2 +-
 pkgs/by-name/mu/musl-fts/package.nix          |  2 +-
 pkgs/by-name/mu/musl-obstack/package.nix      |  2 +-
 pkgs/by-name/mu/mustache-go/package.nix       |  2 +-
 pkgs/by-name/mu/mustache-hpp/package.nix      |  2 +-
 pkgs/by-name/mu/mustache-spec/package.nix     |  2 +-
 pkgs/by-name/mu/mutagen-compose/package.nix   |  2 +-
 pkgs/by-name/mu/mutagen/package.nix           |  2 +-
 pkgs/by-name/mu/mutt-wizard/package.nix       |  2 +-
 pkgs/by-name/mv/mvnd/package.nix              |  2 +-
 pkgs/by-name/mx/mxt-app/package.nix           |  2 +-
 pkgs/by-name/my/mycelium/package.nix          |  2 +-
 pkgs/by-name/my/mycorrhiza/package.nix        |  2 +-
 pkgs/by-name/my/mysqltuner/package.nix        |  2 +-
 pkgs/by-name/my/myxer/package.nix             |  2 +-
 pkgs/by-name/n2/n2n/package.nix               |  2 +-
 pkgs/by-name/na/naev/package.nix              |  2 +-
 pkgs/by-name/na/nahid-fonts/package.nix       |  2 +-
 pkgs/by-name/na/nali/package.nix              |  2 +-
 pkgs/by-name/na/namaka/package.nix            |  2 +-
 pkgs/by-name/na/namespace-cli/package.nix     |  2 +-
 pkgs/by-name/na/nanodbc/package.nix           |  2 +-
 pkgs/by-name/na/nanomq/package.nix            |  2 +-
 pkgs/by-name/na/nanomsg/package.nix           |  2 +-
 pkgs/by-name/na/nanovna-qt/package.nix        |  2 +-
 pkgs/by-name/na/nap/package.nix               |  2 +-
 pkgs/by-name/na/naps2/package.nix             |  2 +-
 pkgs/by-name/na/nar-serve/package.nix         |  2 +-
 pkgs/by-name/na/narrowlink/package.nix        |  2 +-
 pkgs/by-name/na/nasc/package.nix              |  2 +-
 pkgs/by-name/na/natls/package.nix             |  2 +-
 pkgs/by-name/na/nats-kafka/package.nix        |  2 +-
 pkgs/by-name/na/nats-server/package.nix       |  2 +-
 .../na/nats-streaming-server/package.nix      |  2 +-
 pkgs/by-name/na/navidrome/package.nix         |  2 +-
 pkgs/by-name/na/navilu-font/package.nix       |  2 +-
 pkgs/by-name/na/nawk/package.nix              |  2 +-
 pkgs/by-name/nb/nb/package.nix                |  2 +-
 pkgs/by-name/nb/nbfc-linux/package.nix        |  2 +-
 pkgs/by-name/nb/nbstripout/package.nix        |  2 +-
 pkgs/by-name/nb/nbxplorer/package.nix         |  2 +-
 pkgs/by-name/nc/ncdns/package.nix             |  2 +-
 pkgs/by-name/nc/ncgopher/package.nix          |  2 +-
 pkgs/by-name/nc/ncnn/package.nix              |  2 +-
 pkgs/by-name/nc/nco/package.nix               |  2 +-
 pkgs/by-name/nc/ncompress/package.nix         |  2 +-
 pkgs/by-name/nc/ncrack/package.nix            |  2 +-
 pkgs/by-name/nd/ndppd/package.nix             |  2 +-
 pkgs/by-name/nd/ndstool/package.nix           |  2 +-
 pkgs/by-name/nd/ndstrim/package.nix           |  2 +-
 pkgs/by-name/ne/ne/package.nix                |  2 +-
 pkgs/by-name/ne/near-cli/package.nix          |  2 +-
 pkgs/by-name/ne/neatvnc/package.nix           |  2 +-
 pkgs/by-name/ne/needle/package.nix            |  2 +-
 pkgs/by-name/ne/neil/package.nix              |  2 +-
 pkgs/by-name/ne/nemo-emblems/package.nix      |  2 +-
 pkgs/by-name/ne/nemo-fileroller/package.nix   |  2 +-
 pkgs/by-name/ne/nemo-python/package.nix       |  2 +-
 pkgs/by-name/ne/nemo/package.nix              |  2 +-
 pkgs/by-name/ne/neo-cowsay/package.nix        |  2 +-
 pkgs/by-name/ne/neocmakelsp/package.nix       |  2 +-
 pkgs/by-name/ne/neosay/package.nix            |  2 +-
 pkgs/by-name/ne/neothesia/package.nix         |  2 +-
 pkgs/by-name/ne/neovim-gtk/package.nix        |  2 +-
 .../ne/neovim-qt-unwrapped/package.nix        |  2 +-
 pkgs/by-name/ne/neovim-remote/package.nix     |  2 +-
 pkgs/by-name/ne/nerdctl/package.nix           |  2 +-
 pkgs/by-name/ne/nerdfix/package.nix           |  2 +-
 pkgs/by-name/ne/nest-cli/package.nix          |  2 +-
 pkgs/by-name/ne/nestopia-ue/package.nix       |  2 +-
 pkgs/by-name/ne/net-cpp/package.nix           |  2 +-
 pkgs/by-name/ne/netassert/package.nix         |  2 +-
 pkgs/by-name/ne/netavark/package.nix          |  2 +-
 pkgs/by-name/ne/netbird-dashboard/package.nix |  2 +-
 pkgs/by-name/ne/netbox2netshot/package.nix    |  2 +-
 pkgs/by-name/ne/netcdfcxx4/package.nix        |  2 +-
 pkgs/by-name/ne/netclient/package.nix         |  2 +-
 pkgs/by-name/ne/netcoredbg/package.nix        |  2 +-
 pkgs/by-name/ne/nethogs/package.nix           |  2 +-
 pkgs/by-name/ne/nethoscope/package.nix        |  2 +-
 pkgs/by-name/ne/netmask/package.nix           |  2 +-
 pkgs/by-name/ne/netop/package.nix             |  2 +-
 pkgs/by-name/ne/netplan/package.nix           |  2 +-
 pkgs/by-name/ne/netproc/package.nix           |  2 +-
 pkgs/by-name/ne/netsniff-ng/package.nix       |  2 +-
 .../ne/networkmanager-l2tp/package.nix        |  2 +-
 .../ne/networkmanager_dmenu/package.nix       |  2 +-
 .../ne/neural-amp-modeler-lv2/package.nix     |  2 +-
 pkgs/by-name/ne/neuron/package.nix            |  2 +-
 pkgs/by-name/ne/neverest/package.nix          |  2 +-
 .../ne/new-session-manager/package.nix        |  2 +-
 pkgs/by-name/ne/newcomputermodern/package.nix |  2 +-
 pkgs/by-name/ne/nextdns/package.nix           |  2 +-
 pkgs/by-name/ne/nexttrace/package.nix         |  2 +-
 pkgs/by-name/nf/nfft/package.nix              |  2 +-
 pkgs/by-name/nf/nfpm/package.nix              |  2 +-
 pkgs/by-name/nf/nfstrace/package.nix          |  2 +-
 .../ng/nginx-config-formatter/package.nix     |  2 +-
 pkgs/by-name/ng/nginx-sso/package.nix         |  2 +-
 pkgs/by-name/ng/ngrid/package.nix             |  2 +-
 pkgs/by-name/ng/ngrrram/package.nix           |  2 +-
 pkgs/by-name/nh/nheko/package.nix             |  2 +-
 pkgs/by-name/nh/nhentai/package.nix           |  2 +-
 pkgs/by-name/ni/niff/package.nix              |  2 +-
 pkgs/by-name/ni/nifticlib/package.nix         |  2 +-
 pkgs/by-name/ni/niftyseg/package.nix          |  2 +-
 pkgs/by-name/ni/nika-fonts/package.nix        |  2 +-
 pkgs/by-name/ni/nikto/package.nix             |  2 +-
 pkgs/by-name/ni/nil/package.nix               |  2 +-
 pkgs/by-name/ni/nilfs-utils/package.nix       |  2 +-
 pkgs/by-name/ni/nimlangserver/package.nix     |  2 +-
 pkgs/by-name/ni/ninjas2/package.nix           |  2 +-
 pkgs/by-name/ni/ninvaders/package.nix         |  2 +-
 .../ni/nitrokey-pro-firmware/package.nix      |  2 +-
 .../ni/nix-bash-completions/package.nix       |  2 +-
 .../by-name/ni/nix-build-uncached/package.nix |  2 +-
 pkgs/by-name/ni/nix-bundle/package.nix        |  2 +-
 pkgs/by-name/ni/nix-direnv/package.nix        |  2 +-
 pkgs/by-name/ni/nix-doc/package.nix           |  2 +-
 pkgs/by-name/ni/nix-init/package.nix          |  2 +-
 pkgs/by-name/ni/nix-ld/package.nix            |  2 +-
 pkgs/by-name/ni/nix-melt/package.nix          |  2 +-
 pkgs/by-name/ni/nix-plugins/package.nix       |  2 +-
 .../ni/nix-query-tree-viewer/package.nix      |  2 +-
 pkgs/by-name/ni/nix-search/package.nix        |  2 +-
 pkgs/by-name/ni/nix-snapshotter/package.nix   |  2 +-
 .../ni/nix-store-gcs-proxy/package.nix        |  2 +-
 .../package.nix                               |  2 +-
 pkgs/by-name/ni/nix-top/package.nix           |  2 +-
 pkgs/by-name/ni/nix-weather/package.nix       |  2 +-
 pkgs/by-name/ni/nix-your-shell/package.nix    |  2 +-
 pkgs/by-name/ni/nixdoc/package.nix            |  2 +-
 pkgs/by-name/ni/nixel/package.nix             |  2 +-
 pkgs/by-name/ni/nixops-dns/package.nix        |  2 +-
 pkgs/by-name/ni/nixos-anywhere/package.nix    |  2 +-
 pkgs/by-name/ni/nixos-facter/package.nix      |  2 +-
 pkgs/by-name/ni/nixos-generators/package.nix  |  2 +-
 pkgs/by-name/ni/nixos-shell/package.nix       |  2 +-
 pkgs/by-name/ni/nixpacks/package.nix          |  2 +-
 pkgs/by-name/ni/nixpkgs-fmt/package.nix       |  2 +-
 .../ni/nixpkgs-lint-community/package.nix     |  2 +-
 .../ni/nixseparatedebuginfod/package.nix      |  2 +-
 pkgs/by-name/ni/nixtract/package.nix          |  2 +-
 .../package.nix                               |  2 +-
 .../nm/nm-file-secret-agent/package.nix       |  2 +-
 pkgs/by-name/nm/nmap-formatter/package.nix    |  2 +-
 pkgs/by-name/nm/nmapsi4/package.nix           |  2 +-
 pkgs/by-name/nm/nmrpflash/package.nix         |  2 +-
 pkgs/by-name/nm/nms/package.nix               |  2 +-
 pkgs/by-name/nn/nng/package.nix               |  2 +-
 pkgs/by-name/nn/nnpdf/package.nix             |  2 +-
 pkgs/by-name/no/noaa-apt/package.nix          |  2 +-
 pkgs/by-name/no/node-glob/package.nix         |  2 +-
 pkgs/by-name/no/node-manta/package.nix        |  2 +-
 .../no/node-problem-detector/package.nix      |  2 +-
 pkgs/by-name/no/nodemon/package.nix           |  2 +-
 pkgs/by-name/no/nodenv/package.nix            |  2 +-
 pkgs/by-name/no/nofi/package.nix              |  2 +-
 pkgs/by-name/no/noise-repellent/package.nix   |  2 +-
 pkgs/by-name/no/noisetorch/package.nix        |  2 +-
 pkgs/by-name/no/nomacs/package.nix            |  2 +-
 pkgs/by-name/no/nomad-autoscaler/package.nix  |  2 +-
 .../no/nomad-driver-containerd/package.nix    |  2 +-
 .../no/nomad-driver-podman/package.nix        |  2 +-
 pkgs/by-name/no/nomad-pack/package.nix        |  2 +-
 pkgs/by-name/no/nominatim/package.nix         |  2 +-
 pkgs/by-name/no/nomino/package.nix            |  2 +-
 .../no/nordzy-cursor-theme/package.nix        |  2 +-
 pkgs/by-name/no/nordzy-icon-theme/package.nix |  2 +-
 pkgs/by-name/no/norouter/package.nix          |  2 +-
 pkgs/by-name/no/noseyparker/package.nix       |  2 +-
 pkgs/by-name/no/nosqli/package.nix            |  2 +-
 pkgs/by-name/no/nostr-rs-relay/package.nix    |  2 +-
 pkgs/by-name/no/nostui/package.nix            |  2 +-
 pkgs/by-name/no/notation/package.nix          |  2 +-
 pkgs/by-name/no/notcurses/package.nix         |  2 +-
 pkgs/by-name/no/notejot/package.nix           |  2 +-
 pkgs/by-name/no/notes-up/package.nix          |  2 +-
 pkgs/by-name/no/noteshrink/package.nix        |  2 +-
 pkgs/by-name/no/notify-client/package.nix     |  2 +-
 pkgs/by-name/no/notify/package.nix            |  2 +-
 pkgs/by-name/no/notion/package.nix            |  2 +-
 .../by-name/no/notmuch-addrlookup/package.nix |  2 +-
 pkgs/by-name/no/notmuch-bower/package.nix     |  2 +-
 pkgs/by-name/no/notmuch-mailmover/package.nix |  2 +-
 .../no/noto-fonts-color-emoji/package.nix     |  2 +-
 pkgs/by-name/no/nova/package.nix              |  2 +-
 pkgs/by-name/no/novelwriter/package.nix       |  2 +-
 pkgs/by-name/no/novnc/package.nix             |  2 +-
 pkgs/by-name/no/novops/package.nix            |  2 +-
 pkgs/by-name/np/npkill/package.nix            |  2 +-
 pkgs/by-name/np/npm-check/package.nix         |  2 +-
 pkgs/by-name/np/npm-lockfile-fix/package.nix  |  2 +-
 pkgs/by-name/nq/nq/package.nix                |  2 +-
 pkgs/by-name/nr/nrr/package.nix               |  2 +-
 pkgs/by-name/nr/nrsc5/package.nix             |  2 +-
 pkgs/by-name/ns/ns-usbloader/package.nix      |  2 +-
 pkgs/by-name/ns/nsc/package.nix               |  2 +-
 pkgs/by-name/ns/nsh/package.nix               |  2 +-
 pkgs/by-name/ns/nsnake/package.nix            |  2 +-
 pkgs/by-name/ns/nsncd/package.nix             |  2 +-
 pkgs/by-name/ns/nsq/package.nix               |  2 +-
 pkgs/by-name/ns/nssmdns/package.nix           |  2 +-
 pkgs/by-name/ns/nsync/package.nix             |  2 +-
 pkgs/by-name/nt/ntfy/package.nix              |  2 +-
 pkgs/by-name/nt/ntfy/webpush.nix              |  2 +-
 pkgs/by-name/nt/ntirpc/package.nix            |  2 +-
 pkgs/by-name/nt/ntk/package.nix               |  2 +-
 pkgs/by-name/nt/ntpstat/package.nix           |  2 +-
 pkgs/by-name/nt/ntttcp/package.nix            |  2 +-
 pkgs/by-name/nu/nudoku/package.nix            |  2 +-
 pkgs/by-name/nu/nullidentdmod/package.nix     |  2 +-
 pkgs/by-name/nu/nulloy/package.nix            |  2 +-
 pkgs/by-name/nu/numactl/package.nix           |  2 +-
 pkgs/by-name/nu/numatop/package.nix           |  2 +-
 .../by-name/nu/numix-cursor-theme/package.nix |  2 +-
 .../nu/numix-icon-theme-circle/package.nix    |  2 +-
 .../nu/numix-icon-theme-square/package.nix    |  2 +-
 .../nu/numix-solarized-gtk-theme/package.nix  |  2 +-
 pkgs/by-name/nu/numworks-epsilon/package.nix  |  2 +-
 pkgs/by-name/nu/nuraft/package.nix            |  2 +-
 pkgs/by-name/nu/nurl/package.nix              |  2 +-
 pkgs/by-name/nu/nuv/package.nix               |  2 +-
 .../nvidia-docker.nix                         |  2 +-
 .../nv/nvidia-container-toolkit/package.nix   |  2 +-
 pkgs/by-name/nv/nvidia-modprobe/package.nix   |  2 +-
 pkgs/by-name/nv/nvimpager/package.nix         |  2 +-
 pkgs/by-name/nv/nvme-cli/package.nix          |  2 +-
 pkgs/by-name/nv/nvmetcfg/package.nix          |  2 +-
 pkgs/by-name/nw/nwg-bar/package.nix           |  2 +-
 pkgs/by-name/nw/nwg-dock/package.nix          |  2 +-
 pkgs/by-name/nw/nwg-drawer/package.nix        |  2 +-
 pkgs/by-name/nw/nwg-launchers/package.nix     |  2 +-
 pkgs/by-name/nw/nwg-look/package.nix          |  2 +-
 pkgs/by-name/nw/nwg-menu/package.nix          |  2 +-
 pkgs/by-name/nw/nwipe/package.nix             |  2 +-
 pkgs/by-name/nx/nx-libs/package.nix           |  2 +-
 pkgs/by-name/ny/nyancat/package.nix           |  2 +-
 pkgs/by-name/oa/oak/package.nix               |  2 +-
 pkgs/by-name/oa/oathkeeper/package.nix        |  2 +-
 pkgs/by-name/oa/oatpp/package.nix             |  2 +-
 pkgs/by-name/oa/oauth2-proxy/package.nix      |  2 +-
 pkgs/by-name/oa/oauth2c/package.nix           |  2 +-
 pkgs/by-name/oa/oauth2l/package.nix           |  2 +-
 pkgs/by-name/ob/obs-cmd/package.nix           |  2 +-
 pkgs/by-name/ob/obsidian-export/package.nix   |  2 +-
 pkgs/by-name/oc/ocaml-top/package.nix         |  2 +-
 .../oc/ocf-resource-agents/package.nix        |  2 +-
 .../oc/oci-seccomp-bpf-hook/package.nix       |  2 +-
 pkgs/by-name/oc/ocl-icd/package.nix           |  2 +-
 pkgs/by-name/oc/oclgrind/package.nix          |  2 +-
 pkgs/by-name/oc/ocm/package.nix               |  2 +-
 pkgs/by-name/oc/ocproxy/package.nix           |  2 +-
 pkgs/by-name/oc/ocrodjvu/package.nix          |  2 +-
 pkgs/by-name/oc/ocsigen-i18n/package.nix      |  2 +-
 pkgs/by-name/oc/octomap/package.nix           |  2 +-
 pkgs/by-name/oc/octoprint/package.nix         |  8 +--
 pkgs/by-name/oc/octoprint/plugins.nix         | 56 +++++++++----------
 pkgs/by-name/oc/octopus-caller/package.nix    |  2 +-
 pkgs/by-name/oc/octosql/package.nix           |  2 +-
 pkgs/by-name/oc/oculante/package.nix          |  2 +-
 pkgs/by-name/od/odin2/package.nix             |  2 +-
 pkgs/by-name/od/odo/package.nix               |  2 +-
 pkgs/by-name/od/odoo15/package.nix            |  2 +-
 pkgs/by-name/od/odp-dpdk/package.nix          |  2 +-
 pkgs/by-name/od/odpic/package.nix             |  2 +-
 pkgs/by-name/od/odyssey/package.nix           |  2 +-
 pkgs/by-name/of/offensive-azure/package.nix   |  2 +-
 pkgs/by-name/of/office-code-pro/package.nix   |  2 +-
 pkgs/by-name/of/offlineimap/package.nix       |  2 +-
 pkgs/by-name/oh/oh-my-git/package.nix         |  2 +-
 pkgs/by-name/oh/oh/package.nix                |  2 +-
 pkgs/by-name/oi/oidc-agent/package.nix        |  2 +-
 pkgs/by-name/oi/oil-buku/package.nix          |  2 +-
 pkgs/by-name/oi/oink/package.nix              |  2 +-
 pkgs/by-name/ok/okolors/package.nix           |  2 +-
 pkgs/by-name/ok/okta-aws-cli/package.nix      |  2 +-
 pkgs/by-name/ok/okteto/package.nix            |  2 +-
 pkgs/by-name/ol/olsrd/package.nix             |  2 +-
 pkgs/by-name/om/omekasy/package.nix           |  2 +-
 pkgs/by-name/om/omnictl/package.nix           |  2 +-
 pkgs/by-name/om/omping/package.nix            |  2 +-
 pkgs/by-name/on/one-click-backup/package.nix  |  2 +-
 pkgs/by-name/on/onedrivegui/package.nix       |  2 +-
 pkgs/by-name/on/onedriver/package.nix         |  2 +-
 pkgs/by-name/on/onefetch/package.nix          |  2 +-
 pkgs/by-name/on/oneshot/package.nix           |  2 +-
 pkgs/by-name/on/onetun/package.nix            |  2 +-
 pkgs/by-name/on/onmetal-image/package.nix     |  2 +-
 pkgs/by-name/on/onscripter-en/package.nix     |  2 +-
 pkgs/by-name/oo/oo7/package.nix               |  2 +-
 pkgs/by-name/oo/oonf-olsrd2/package.nix       |  2 +-
 pkgs/by-name/oo/ooniprobe-cli/package.nix     |  2 +-
 pkgs/by-name/op/opaline/package.nix           |  2 +-
 pkgs/by-name/op/opam-publish/package.nix      |  2 +-
 pkgs/by-name/op/opam2json/package.nix         |  2 +-
 pkgs/by-name/op/opcr-policy/package.nix       |  2 +-
 pkgs/by-name/op/opcua-commander/package.nix   |  2 +-
 pkgs/by-name/op/open-dyslexic/package.nix     |  2 +-
 pkgs/by-name/op/open-fprintd/package.nix      |  2 +-
 pkgs/by-name/op/open-in-mpv/package.nix       |  2 +-
 pkgs/by-name/op/open-isns/package.nix         |  2 +-
 pkgs/by-name/op/open-policy-agent/package.nix |  2 +-
 pkgs/by-name/op/open-scq30/package.nix        |  2 +-
 .../by-name/op/open-stage-control/package.nix |  2 +-
 pkgs/by-name/op/openapi-changes/package.nix   |  2 +-
 pkgs/by-name/op/openapi-tui/package.nix       |  2 +-
 pkgs/by-name/op/openbgpd/package.nix          |  2 +-
 pkgs/by-name/op/openboardview/package.nix     |  2 +-
 pkgs/by-name/op/opencbm/package.nix           |  2 +-
 pkgs/by-name/op/opencl-clhpp/package.nix      |  2 +-
 pkgs/by-name/op/opencollada/package.nix       |  2 +-
 pkgs/by-name/op/opencommit/package.nix        |  2 +-
 pkgs/by-name/op/opencryptoki/package.nix      |  2 +-
 pkgs/by-name/op/opendune/package.nix          |  2 +-
 pkgs/by-name/op/openfga-cli/package.nix       |  2 +-
 pkgs/by-name/op/openfga/package.nix           |  2 +-
 pkgs/by-name/op/openhmd/package.nix           |  2 +-
 pkgs/by-name/op/openiscsi/package.nix         |  2 +-
 pkgs/by-name/op/openjpeg/package.nix          |  2 +-
 pkgs/by-name/op/openjph/package.nix           |  2 +-
 pkgs/by-name/op/openlibm/package.nix          |  2 +-
 pkgs/by-name/op/openlierox/package.nix        |  2 +-
 pkgs/by-name/op/openmm/package.nix            |  2 +-
 pkgs/by-name/op/openmolcas/package.nix        |  2 +-
 .../op/openorienteering-mapper/package.nix    |  2 +-
 pkgs/by-name/op/openresolv/package.nix        |  2 +-
 pkgs/by-name/op/openrussian-cli/package.nix   |  2 +-
 pkgs/by-name/op/opensaml-cpp/package.nix      |  2 +-
 pkgs/by-name/op/openscap/package.nix          |  2 +-
 pkgs/by-name/op/openseachest/package.nix      |  2 +-
 pkgs/by-name/op/opensearch-cli/package.nix    |  2 +-
 pkgs/by-name/op/opensm/package.nix            |  2 +-
 pkgs/by-name/op/opensmt/package.nix           |  2 +-
 pkgs/by-name/op/opensoundmeter/package.nix    |  2 +-
 pkgs/by-name/op/openspecfun/package.nix       |  2 +-
 pkgs/by-name/op/opensupaplex/package.nix      |  2 +-
 pkgs/by-name/op/opentracing-cpp/package.nix   |  2 +-
 pkgs/by-name/op/opentyrian/package.nix        |  2 +-
 pkgs/by-name/op/openvi/package.nix            |  2 +-
 pkgs/by-name/op/openzone-cursors/package.nix  |  2 +-
 pkgs/by-name/op/oppai-ng/package.nix          |  2 +-
 pkgs/by-name/op/ops/package.nix               |  2 +-
 pkgs/by-name/op/opustags/package.nix          |  2 +-
 pkgs/by-name/oq/oq/package.nix                |  2 +-
 pkgs/by-name/oq/oqs-provider/package.nix      |  2 +-
 .../or/oranchelo-icon-theme/package.nix       |  2 +-
 pkgs/by-name/or/oranda/package.nix            |  2 +-
 pkgs/by-name/or/oras/package.nix              |  2 +-
 pkgs/by-name/or/orcania/package.nix           |  2 +-
 pkgs/by-name/or/orchard/package.nix           |  2 +-
 pkgs/by-name/or/orchis-theme/package.nix      |  2 +-
 pkgs/by-name/or/ord/package.nix               |  2 +-
 pkgs/by-name/or/org-stats/package.nix         |  2 +-
 pkgs/by-name/or/orjail/package.nix            |  2 +-
 pkgs/by-name/or/orocos-kdl/package.nix        |  2 +-
 pkgs/by-name/or/orogene/package.nix           |  2 +-
 pkgs/by-name/os/osc-cli/package.nix           |  2 +-
 pkgs/by-name/os/oscar/package.nix             |  2 +-
 pkgs/by-name/os/oscclip/package.nix           |  2 +-
 pkgs/by-name/os/osdlyrics/package.nix         |  2 +-
 pkgs/by-name/os/osgqt/package.nix             |  2 +-
 pkgs/by-name/os/oshka/package.nix             |  2 +-
 pkgs/by-name/os/osm2pgsql/package.nix         |  2 +-
 pkgs/by-name/os/osm2xmap/package.nix          |  2 +-
 pkgs/by-name/os/osmid/package.nix             |  2 +-
 pkgs/by-name/os/osmo-bsc/package.nix          |  2 +-
 pkgs/by-name/os/osmo-bts/package.nix          |  2 +-
 pkgs/by-name/os/osmo-ggsn/package.nix         |  2 +-
 pkgs/by-name/os/osmo-hlr/package.nix          |  2 +-
 pkgs/by-name/os/osmo-hnbgw/package.nix        |  2 +-
 pkgs/by-name/os/osmo-hnodeb/package.nix       |  2 +-
 pkgs/by-name/os/osmo-iuh/package.nix          |  2 +-
 pkgs/by-name/os/osmo-mgw/package.nix          |  2 +-
 pkgs/by-name/os/osmo-msc/package.nix          |  2 +-
 pkgs/by-name/os/osmo-pcu/package.nix          |  2 +-
 pkgs/by-name/os/osmo-sgsn/package.nix         |  2 +-
 .../by-name/os/osmo-sip-connector/package.nix |  2 +-
 pkgs/by-name/os/osmtogeojson/package.nix      |  2 +-
 pkgs/by-name/os/osqp/package.nix              |  2 +-
 pkgs/by-name/os/osslsigncode/package.nix      |  2 +-
 pkgs/by-name/os/osv-detector/package.nix      |  2 +-
 pkgs/by-name/os/osxsnarf/package.nix          |  2 +-
 pkgs/by-name/ot/otadump/package.nix           |  2 +-
 pkgs/by-name/ot/otel-cli/package.nix          |  2 +-
 .../ot/otel-desktop-viewer/package.nix        |  2 +-
 pkgs/by-name/ot/otf2bdf/package.nix           |  2 +-
 pkgs/by-name/ot/otfcc/package.nix             |  2 +-
 pkgs/by-name/ot/otpauth/package.nix           |  2 +-
 pkgs/by-name/ot/otree/package.nix             |  2 +-
 pkgs/by-name/ot/ots/package.nix               |  2 +-
 pkgs/by-name/ot/ott/package.nix               |  2 +-
 pkgs/by-name/ot/otus-lisp/package.nix         |  2 +-
 pkgs/by-name/ou/ouch/package.nix              |  2 +-
 pkgs/by-name/ou/oui/package.nix               |  2 +-
 pkgs/by-name/ou/outils/package.nix            |  2 +-
 pkgs/by-name/ov/oven-media-engine/package.nix |  2 +-
 pkgs/by-name/ov/overmind/package.nix          |  2 +-
 pkgs/by-name/ov/overskride/package.nix        |  2 +-
 pkgs/by-name/ov/oversteer/package.nix         |  2 +-
 pkgs/by-name/ov/ovh-ttyrec/package.nix        |  2 +-
 pkgs/by-name/ow/owamp/package.nix             |  2 +-
 pkgs/by-name/ow/owl-lisp/package.nix          |  2 +-
 pkgs/by-name/ow/owncast/package.nix           |  2 +-
 .../by-name/ow/owntracks-recorder/package.nix |  2 +-
 pkgs/by-name/ox/oxefmsynth/package.nix        |  2 +-
 pkgs/by-name/ox/oxide-rs/package.nix          |  2 +-
 pkgs/by-name/p1/p11-kit/package.nix           |  2 +-
 pkgs/by-name/p2/p2pool/package.nix            |  2 +-
 pkgs/by-name/p9/p910nd/package.nix            |  2 +-
 pkgs/by-name/pa/pachyderm/package.nix         |  2 +-
 pkgs/by-name/pa/pack/package.nix              |  2 +-
 pkgs/by-name/pa/packer/package.nix            |  2 +-
 pkgs/by-name/pa/packet-sd/package.nix         |  2 +-
 pkgs/by-name/pa/packr/package.nix             |  4 +-
 pkgs/by-name/pa/paco/package.nix              |  2 +-
 pkgs/by-name/pa/pacparser/package.nix         |  2 +-
 pkgs/by-name/pa/pacproxy/package.nix          |  2 +-
 pkgs/by-name/pa/page/package.nix              |  2 +-
 pkgs/by-name/pa/pagmo2/package.nix            |  2 +-
 pkgs/by-name/pa/pairdrop/package.nix          |  2 +-
 pkgs/by-name/pa/paleta/package.nix            |  2 +-
 pkgs/by-name/pa/pam-reattach/package.nix      |  2 +-
 pkgs/by-name/pa/pam_gnupg/package.nix         |  2 +-
 pkgs/by-name/pa/pam_mysql/package.nix         |  2 +-
 pkgs/by-name/pa/pam_rssh/package.nix          |  2 +-
 pkgs/by-name/pa/pamixer/package.nix           |  2 +-
 pkgs/by-name/pa/pandoc-katex/package.nix      |  2 +-
 .../by-name/pa/pandoc-lua-filters/package.nix |  2 +-
 pkgs/by-name/pa/panicparse/package.nix        |  2 +-
 pkgs/by-name/pa/pantheon-tweaks/package.nix   |  2 +-
 pkgs/by-name/pa/papeer/package.nix            |  2 +-
 pkgs/by-name/pa/paper-age/package.nix         |  2 +-
 .../pa/paperless-asn-qr-codes/package.nix     |  2 +-
 pkgs/by-name/pa/papirus-folders/package.nix   |  2 +-
 pkgs/by-name/pa/papirus-nord/package.nix      |  2 +-
 pkgs/by-name/pa/paps/package.nix              |  2 +-
 pkgs/by-name/pa/par2cmdline-turbo/package.nix |  2 +-
 pkgs/by-name/pa/par2cmdline/package.nix       |  2 +-
 .../pa/parallel-disk-usage/package.nix        |  2 +-
 pkgs/by-name/pa/paralus-cli/package.nix       |  2 +-
 pkgs/by-name/pa/parastoo-fonts/package.nix    |  2 +-
 pkgs/by-name/pa/paretosecurity/package.nix    |  2 +-
 .../pa/parinfer-rust-emacs/package.nix        |  2 +-
 pkgs/by-name/pa/parlatype/package.nix         |  2 +-
 pkgs/by-name/pa/parlay/package.nix            |  2 +-
 pkgs/by-name/pa/parsedmarc/package.nix        |  2 +-
 pkgs/by-name/pa/partclone/package.nix         |  2 +-
 pkgs/by-name/pa/particl-core/package.nix      |  2 +-
 pkgs/by-name/pa/paru/package.nix              |  2 +-
 pkgs/by-name/pa/passage/package.nix           |  2 +-
 pkgs/by-name/pa/passdetective/package.nix     |  2 +-
 pkgs/by-name/pa/passerine/package.nix         |  2 +-
 pkgs/by-name/pa/passff-host/package.nix       |  2 +-
 pkgs/by-name/pa/passphrase2pgp/package.nix    |  2 +-
 pkgs/by-name/pa/pastebinit/package.nix        |  2 +-
 pkgs/by-name/pa/pasystray/package.nix         |  2 +-
 pkgs/by-name/pa/pat/package.nix               |  2 +-
 pkgs/by-name/pa/patch2pr/package.nix          |  2 +-
 pkgs/by-name/pa/patchage/package.nix          |  2 +-
 pkgs/by-name/pa/pathvector/package.nix        |  2 +-
 pkgs/by-name/pa/patsh/package.nix             |  2 +-
 pkgs/by-name/pa/payme/package.nix             |  2 +-
 pkgs/by-name/pa/pazi/package.nix              |  2 +-
 pkgs/by-name/pb/pbgopy/package.nix            |  2 +-
 pkgs/by-name/pb/pbpctrl/package.nix           |  2 +-
 pkgs/by-name/pb/pbzx/package.nix              |  2 +-
 pkgs/by-name/pc/pcapc/package.nix             |  2 +-
 pkgs/by-name/pc/pcaudiolib/package.nix        |  2 +-
 pkgs/by-name/pc/pcb2gcode/package.nix         |  2 +-
 pkgs/by-name/pc/pcm/package.nix               |  2 +-
 pkgs/by-name/pc/pcmanx-gtk2/package.nix       |  2 +-
 pkgs/by-name/pc/pcmsolver/package.nix         |  2 +-
 pkgs/by-name/pc/pcp/package.nix               |  2 +-
 pkgs/by-name/pc/pcstat/package.nix            |  2 +-
 pkgs/by-name/pd/pdal/package.nix              |  2 +-
 pkgs/by-name/pd/pdf2djvu/package.nix          |  2 +-
 pkgs/by-name/pd/pdf2svg/package.nix           |  2 +-
 pkgs/by-name/pd/pdfannots/package.nix         |  2 +-
 pkgs/by-name/pd/pdfcpu/package.nix            |  2 +-
 pkgs/by-name/pd/pdfdiff/package.nix           |  2 +-
 pkgs/by-name/pd/pdfslicer/package.nix         |  2 +-
 pkgs/by-name/pd/pdftag/package.nix            |  2 +-
 pkgs/by-name/pd/pdftk/package.nix             |  2 +-
 pkgs/by-name/pd/pdftoipe/package.nix          |  2 +-
 pkgs/by-name/pd/pdpmake/package.nix           |  2 +-
 pkgs/by-name/pe/pe-parse/package.nix          |  2 +-
 pkgs/by-name/pe/peazip/package.nix            |  2 +-
 pkgs/by-name/pe/pebble/package.nix            |  2 +-
 pkgs/by-name/pe/peco/package.nix              |  2 +-
 pkgs/by-name/pe/peek/package.nix              |  2 +-
 pkgs/by-name/pe/peep/package.nix              |  2 +-
 pkgs/by-name/pe/peergos/package.nix           |  2 +-
 pkgs/by-name/pe/pegtl/package.nix             |  2 +-
 pkgs/by-name/pe/perceptualdiff/package.nix    |  2 +-
 pkgs/by-name/pe/percollate/package.nix        |  2 +-
 pkgs/by-name/pe/perfect-hash/package.nix      |  2 +-
 .../by-name/pe/perl-debug-adapter/package.nix |  2 +-
 pkgs/by-name/pe/perlnavigator/package.nix     |  2 +-
 .../pe/persistent-cache-cpp/package.nix       |  2 +-
 pkgs/by-name/pe/peru/package.nix              |  2 +-
 pkgs/by-name/pe/pest-ide-tools/package.nix    |  2 +-
 pkgs/by-name/pe/pet/package.nix               |  2 +-
 pkgs/by-name/pf/pfetch-rs/package.nix         |  2 +-
 pkgs/by-name/pf/pfsshell/package.nix          |  2 +-
 pkgs/by-name/pg/pg_checksums/package.nix      |  2 +-
 pkgs/by-name/pg/pg_featureserv/package.nix    |  2 +-
 pkgs/by-name/pg/pg_flame/package.nix          |  2 +-
 pkgs/by-name/pg/pg_tileserv/package.nix       |  2 +-
 pkgs/by-name/pg/pgagroal/package.nix          |  2 +-
 pkgs/by-name/pg/pgcat/package.nix             |  2 +-
 pkgs/by-name/pg/pgcenter/package.nix          |  2 +-
 pkgs/by-name/pg/pget/package.nix              |  2 +-
 pkgs/by-name/pg/pgformatter/package.nix       |  2 +-
 pkgs/by-name/pg/pgmetrics/package.nix         |  2 +-
 pkgs/by-name/pg/pgmoneta/package.nix          |  2 +-
 pkgs/by-name/pg/pgo-client/package.nix        |  2 +-
 pkgs/by-name/pg/pgpdump/package.nix           |  2 +-
 pkgs/by-name/pg/pgsrip/package.nix            |  2 +-
 pkgs/by-name/pg/pgtop/package.nix             |  2 +-
 pkgs/by-name/pg/pgweb/package.nix             |  2 +-
 pkgs/by-name/ph/phash/package.nix             |  2 +-
 pkgs/by-name/ph/phd2/package.nix              |  2 +-
 pkgs/by-name/ph/phockup/package.nix           |  2 +-
 pkgs/by-name/ph/photocollage/package.nix      |  2 +-
 pkgs/by-name/ph/photon/package.nix            |  2 +-
 pkgs/by-name/ph/photoprism/package.nix        |  2 +-
 pkgs/by-name/ph/phpactor/package.nix          |  2 +-
 pkgs/by-name/ph/phrase-cli/package.nix        |  2 +-
 pkgs/by-name/ph/phraze/package.nix            |  2 +-
 pkgs/by-name/ph/physlock/package.nix          |  2 +-
 pkgs/by-name/pi/piano-rs/package.nix          |  2 +-
 pkgs/by-name/pi/pianotrans/package.nix        |  2 +-
 pkgs/by-name/pi/pick/package.nix              |  2 +-
 pkgs/by-name/pi/picocom/package.nix           |  2 +-
 pkgs/by-name/pi/picocrypt-cli/package.nix     |  2 +-
 pkgs/by-name/pi/pid1/package.nix              |  2 +-
 pkgs/by-name/pi/pigeon/package.nix            |  2 +-
 pkgs/by-name/pi/pik/package.nix               |  2 +-
 pkgs/by-name/pi/piknik/package.nix            |  2 +-
 pkgs/by-name/pi/pinchflat/package.nix         |  2 +-
 pkgs/by-name/pi/pinentry-bemenu/package.nix   |  2 +-
 pkgs/by-name/pi/pinentry-rofi/package.nix     |  2 +-
 pkgs/by-name/pi/pinfo/package.nix             |  2 +-
 pkgs/by-name/pi/pingme/package.nix            |  2 +-
 pkgs/by-name/pi/pingtunnel/package.nix        |  2 +-
 pkgs/by-name/pi/pinit/package.nix             |  2 +-
 pkgs/by-name/pi/pinniped/package.nix          |  2 +-
 pkgs/by-name/pi/pinta/package.nix             |  2 +-
 pkgs/by-name/pi/pioasm/package.nix            |  2 +-
 pkgs/by-name/pi/pioneer/package.nix           |  2 +-
 pkgs/by-name/pi/pipectl/package.nix           |  2 +-
 pkgs/by-name/pi/piper/package.nix             |  2 +-
 pkgs/by-name/pi/pipes-rs/package.nix          |  2 +-
 pkgs/by-name/pi/pipes/package.nix             |  2 +-
 pkgs/by-name/pi/pipet/package.nix             |  2 +-
 pkgs/by-name/pi/pipr/package.nix              |  2 +-
 pkgs/by-name/pi/pistol/package.nix            |  2 +-
 pkgs/by-name/pi/pius/package.nix              |  2 +-
 pkgs/by-name/pi/piv-agent/package.nix         |  2 +-
 pkgs/by-name/pi/pix/package.nix               |  2 +-
 pkgs/by-name/pi/pixd/package.nix              |  2 +-
 pkgs/by-name/pi/pixiewps/package.nix          |  2 +-
 pkgs/by-name/pi/pixz/package.nix              |  2 +-
 pkgs/by-name/pi/pizarra/package.nix           |  2 +-
 pkgs/by-name/pk/pkarr/package.nix             |  2 +-
 pkgs/by-name/pk/pkcs11-provider/package.nix   |  2 +-
 pkgs/by-name/pk/pkg/package.nix               |  2 +-
 pkgs/by-name/pk/pkgdiff/package.nix           |  2 +-
 pkgs/by-name/pk/pkger/package.nix             |  2 +-
 pkgs/by-name/pk/pkgtop/package.nix            |  2 +-
 pkgs/by-name/pl/planify/package.nix           |  2 +-
 pkgs/by-name/pl/plano-theme/package.nix       |  2 +-
 pkgs/by-name/pl/plasma-hud/package.nix        |  2 +-
 pkgs/by-name/pl/platform-folders/package.nix  |  2 +-
 pkgs/by-name/pl/platinum-searcher/package.nix |  2 +-
 pkgs/by-name/pl/playerctl/package.nix         |  2 +-
 pkgs/by-name/pl/please/package.nix            |  2 +-
 pkgs/by-name/pl/plfit/package.nix             |  2 +-
 pkgs/by-name/pl/plink-ng/package.nix          |  2 +-
 pkgs/by-name/pl/plocate/package.nix           |  2 +-
 pkgs/by-name/pl/plog/package.nix              |  2 +-
 pkgs/by-name/pl/plotinus/package.nix          |  2 +-
 pkgs/by-name/pl/plowshare/package.nix         |  2 +-
 pkgs/by-name/pl/plumber/package.nix           |  2 +-
 pkgs/by-name/pl/plumed/package.nix            |  2 +-
 pkgs/by-name/pl/pluto/package.nix             |  2 +-
 pkgs/by-name/pl/plymouth/package.nix          |  2 +-
 pkgs/by-name/pm/pm2/package.nix               |  2 +-
 pkgs/by-name/pn/pn/package.nix                |  2 +-
 pkgs/by-name/pn/pngoptimizer/package.nix      |  2 +-
 pkgs/by-name/pn/pngquant/package.nix          |  2 +-
 pkgs/by-name/pn/pnmixer/package.nix           |  2 +-
 .../pn/pnpm-shell-completion/package.nix      |  2 +-
 pkgs/by-name/po/pocket-casts/package.nix      |  2 +-
 pkgs/by-name/po/pocketbase/package.nix        |  2 +-
 pkgs/by-name/po/podman-tui/package.nix        |  2 +-
 pkgs/by-name/po/podman/package.nix            |  2 +-
 pkgs/by-name/po/poetry2conda/package.nix      |  2 +-
 pkgs/by-name/po/pokeget-rs/package.nix        |  2 +-
 pkgs/by-name/po/pokemonsay/package.nix        |  2 +-
 pkgs/by-name/po/polkit/package.nix            |  2 +-
 pkgs/by-name/po/polybar/package.nix           |  2 +-
 pkgs/by-name/po/polylux2pdfpc/package.nix     |  2 +-
 pkgs/by-name/po/pomerium-cli/package.nix      |  2 +-
 pkgs/by-name/po/pomerium/package.nix          |  2 +-
 pkgs/by-name/po/pommed_light/package.nix      |  2 +-
 pkgs/by-name/po/pomsky/package.nix            |  2 +-
 pkgs/by-name/po/ponymix/package.nix           |  2 +-
 pkgs/by-name/po/poop/package.nix              |  2 +-
 pkgs/by-name/po/pop-icon-theme/package.nix    |  2 +-
 pkgs/by-name/po/pop-launcher/package.nix      |  2 +-
 pkgs/by-name/po/pop/package.nix               |  2 +-
 pkgs/by-name/po/popeye/package.nix            |  2 +-
 pkgs/by-name/po/popl/package.nix              |  2 +-
 pkgs/by-name/po/poppins/package.nix           |  2 +-
 pkgs/by-name/po/popsicle/package.nix          |  2 +-
 pkgs/by-name/po/poptop/package.nix            |  2 +-
 pkgs/by-name/po/popura/package.nix            |  2 +-
 pkgs/by-name/po/porsmo/package.nix            |  2 +-
 pkgs/by-name/po/portal/package.nix            |  2 +-
 .../po/portfolio-filemanager/package.nix      |  2 +-
 pkgs/by-name/po/portmod/package.nix           |  2 +-
 pkgs/by-name/po/portunus/package.nix          |  2 +-
 .../by-name/po/postiats-utilities/package.nix |  2 +-
 pkgs/by-name/po/postsrsd/package.nix          |  2 +-
 pkgs/by-name/po/pouf/package.nix              |  2 +-
 .../po/power-profiles-daemon/package.nix      |  2 +-
 pkgs/by-name/po/powercap/package.nix          |  2 +-
 pkgs/by-name/po/powerdns-admin/package.nix    |  2 +-
 pkgs/by-name/po/powerjoular/package.nix       |  2 +-
 pkgs/by-name/po/powerline-go/package.nix      |  2 +-
 pkgs/by-name/pp/pps-tools/package.nix         |  2 +-
 pkgs/by-name/pq/pqiv/package.nix              |  2 +-
 pkgs/by-name/pq/pql/package.nix               |  2 +-
 pkgs/by-name/pq/pqrs/package.nix              |  2 +-
 pkgs/by-name/pr/prboom-plus/package.nix       |  2 +-
 pkgs/by-name/pr/precice/package.nix           |  2 +-
 pkgs/by-name/pr/preserves-nim/package.nix     |  2 +-
 pkgs/by-name/pr/pretalx/package.nix           |  2 +-
 .../by-name/pr/pretalx/plugins/downstream.nix |  2 +-
 .../pr/pretalx/plugins/media-ccc-de.nix       |  2 +-
 pkgs/by-name/pr/pretalx/plugins/pages.nix     |  2 +-
 .../pr/pretalx/plugins/public-voting.nix      |  2 +-
 pkgs/by-name/pr/pretalx/plugins/venueless.nix |  2 +-
 pkgs/by-name/pr/pretalx/plugins/vimeo.nix     |  2 +-
 pkgs/by-name/pr/pretalx/plugins/youtube.nix   |  2 +-
 pkgs/by-name/pr/pretix-banktool/package.nix   |  2 +-
 .../pr/pretix/plugins/dbvat/package.nix       |  2 +-
 .../pr/pretix/plugins/pages/package.nix       |  2 +-
 .../pr/pretix/plugins/passbook/package.nix    |  2 +-
 .../pr/pretix/plugins/zugferd/package.nix     |  2 +-
 pkgs/by-name/pr/prettier-d-slim/package.nix   |  2 +-
 pkgs/by-name/pr/prettyping/package.nix        |  2 +-
 pkgs/by-name/pr/prevo-tools/package.nix       |  2 +-
 pkgs/by-name/pr/prime-server/package.nix      |  2 +-
 pkgs/by-name/pr/principia/package.nix         |  2 +-
 pkgs/by-name/pr/prisma-engines/package.nix    |  2 +-
 pkgs/by-name/pr/prisma/package.nix            |  2 +-
 pkgs/by-name/pr/pritunl-client/package.nix    |  2 +-
 pkgs/by-name/pr/pritunl-ssh/package.nix       |  2 +-
 pkgs/by-name/pr/procdump/package.nix          |  2 +-
 pkgs/by-name/pr/process-compose/package.nix   |  2 +-
 pkgs/by-name/pr/process-cpp/package.nix       |  2 +-
 pkgs/by-name/pr/prodigal/package.nix          |  2 +-
 pkgs/by-name/pr/profetch/package.nix          |  2 +-
 pkgs/by-name/pr/profile-cleaner/package.nix   |  2 +-
 .../pr/profile-sync-daemon/package.nix        |  2 +-
 .../pr/programmer-calculator/package.nix      |  2 +-
 pkgs/by-name/pr/progress/package.nix          |  2 +-
 pkgs/by-name/pr/proj-datumgrid/package.nix    |  2 +-
 pkgs/by-name/pr/projectable/package.nix       |  2 +-
 .../package.nix                               |  2 +-
 .../pr/prometheus-frr-exporter/package.nix    |  2 +-
 .../prometheus-klipper-exporter/package.nix   |  2 +-
 .../package.nix                               |  2 +-
 .../pr/prometheus-pushgateway/package.nix     |  2 +-
 .../pr/prometheus-restic-exporter/package.nix |  2 +-
 .../pr/prometheus-squid-exporter/package.nix  |  2 +-
 .../prometheus-surfboard-exporter/package.nix |  2 +-
 pkgs/by-name/pr/promptfoo/package.nix         |  2 +-
 pkgs/by-name/pr/promql-cli/package.nix        |  2 +-
 pkgs/by-name/pr/promscale/package.nix         |  2 +-
 pkgs/by-name/pr/proot/package.nix             |  2 +-
 pkgs/by-name/pr/properties-cpp/package.nix    |  2 +-
 pkgs/by-name/pr/protege/package.nix           |  2 +-
 pkgs/by-name/pr/proteus/package.nix           |  2 +-
 pkgs/by-name/pr/proto-contrib/package.nix     |  2 +-
 pkgs/by-name/pr/proto/package.nix             |  2 +-
 pkgs/by-name/pr/protoc-gen-doc/package.nix    |  2 +-
 .../by-name/pr/protoc-gen-entgrpc/package.nix |  2 +-
 .../pr/protoc-gen-go-vtproto/package.nix      |  2 +-
 pkgs/by-name/pr/protoc-gen-go/package.nix     |  2 +-
 pkgs/by-name/pr/protoc-gen-js/package.nix     |  2 +-
 pkgs/by-name/pr/protoc-gen-swift/package.nix  |  2 +-
 pkgs/by-name/pr/protoc-gen-twirp/package.nix  |  2 +-
 .../pr/protoc-gen-validate/package.nix        |  2 +-
 .../pr/protoc-go-inject-tag/package.nix       |  2 +-
 pkgs/by-name/pr/protolint/package.nix         |  2 +-
 pkgs/by-name/pr/protolock/package.nix         |  2 +-
 pkgs/by-name/pr/proton-caller/package.nix     |  2 +-
 .../pr/proton-vpn-local-agent/package.nix     |  2 +-
 pkgs/by-name/pr/protonmail-bridge/package.nix |  2 +-
 pkgs/by-name/pr/prototool/package.nix         |  2 +-
 pkgs/by-name/pr/prox/package.nix              |  2 +-
 pkgs/by-name/pr/proximity-sort/package.nix    |  2 +-
 pkgs/by-name/pr/proxmove/package.nix          |  2 +-
 pkgs/by-name/pr/proxychains-ng/package.nix    |  2 +-
 pkgs/by-name/pr/proxysql/package.nix          |  2 +-
 pkgs/by-name/pr/prqlc/package.nix             |  2 +-
 pkgs/by-name/pr/prr/package.nix               |  2 +-
 pkgs/by-name/pr/prrte/package.nix             |  2 +-
 pkgs/by-name/ps/ps2eps/package.nix            |  2 +-
 pkgs/by-name/ps/ps_mem/package.nix            |  2 +-
 pkgs/by-name/ps/pscale/package.nix            |  2 +-
 pkgs/by-name/ps/pscircle/package.nix          |  2 +-
 pkgs/by-name/ps/psi-notify/package.nix        |  2 +-
 pkgs/by-name/ps/psitop/package.nix            |  2 +-
 pkgs/by-name/ps/psitransfer/package.nix       |  2 +-
 pkgs/by-name/ps/psmisc/package.nix            |  2 +-
 pkgs/by-name/ps/pspg/package.nix              |  2 +-
 pkgs/by-name/ps/psql2csv/package.nix          |  2 +-
 pkgs/by-name/ps/pssh/package.nix              |  2 +-
 pkgs/by-name/ps/psstop/package.nix            |  2 +-
 pkgs/by-name/ps/psw/package.nix               |  2 +-
 pkgs/by-name/pt/ptags/package.nix             |  2 +-
 pkgs/by-name/pt/ptex/package.nix              |  2 +-
 pkgs/by-name/pt/ptouch-driver/package.nix     |  2 +-
 pkgs/by-name/pt/ptyxis/package.nix            |  2 +-
 pkgs/by-name/pu/pufferpanel/package.nix       |  2 +-
 pkgs/by-name/pu/puffin/package.nix            |  2 +-
 pkgs/by-name/pu/pulsarctl/package.nix         |  2 +-
 pkgs/by-name/pu/pulseaudio-ctl/package.nix    |  2 +-
 .../pu/pulseaudio-module-xrdp/package.nix     |  2 +-
 pkgs/by-name/pu/pulsemixer/package.nix        |  2 +-
 pkgs/by-name/pu/pulumi-esc/package.nix        |  2 +-
 pkgs/by-name/pu/pulumictl/package.nix         |  2 +-
 pkgs/by-name/pu/pupdate/package.nix           |  2 +-
 pkgs/by-name/pu/puppeteer-cli/package.nix     |  2 +-
 pkgs/by-name/pu/pure-prompt/package.nix       |  2 +-
 pkgs/by-name/pu/pushup/package.nix            |  2 +-
 pkgs/by-name/pv/pvsneslib/package.nix         |  2 +-
 pkgs/by-name/pw/pw-viz/package.nix            |  2 +-
 pkgs/by-name/pw/pw-volume/package.nix         |  2 +-
 pkgs/by-name/pw/pw3270/package.nix            |  2 +-
 pkgs/by-name/pw/pwalarmctl/package.nix        |  2 +-
 pkgs/by-name/pw/pwalarmd/package.nix          |  2 +-
 pkgs/by-name/pw/pwgen-secure/package.nix      |  2 +-
 pkgs/by-name/pw/pwgen/package.nix             |  2 +-
 pkgs/by-name/pw/pwru/package.nix              |  2 +-
 pkgs/by-name/pw/pwsafe/package.nix            |  2 +-
 pkgs/by-name/px/pxder/package.nix             |  2 +-
 pkgs/by-name/py/py3c/package.nix              |  2 +-
 pkgs/by-name/py/pyCA/package.nix              |  4 +-
 pkgs/by-name/py/pychess/package.nix           |  2 +-
 pkgs/by-name/py/pylint-exit/package.nix       |  2 +-
 pkgs/by-name/py/pymol/package.nix             |  2 +-
 pkgs/by-name/py/pyrseas/package.nix           |  4 +-
 pkgs/by-name/py/pysentation/package.nix       |  2 +-
 pkgs/by-name/py/pystring/package.nix          |  2 +-
 pkgs/by-name/py/python-launcher/package.nix   |  2 +-
 pkgs/by-name/py/pytrainer/package.nix         |  2 +-
 pkgs/by-name/py/pyxel/package.nix             |  2 +-
 pkgs/by-name/pz/pzip/package.nix              |  2 +-
 pkgs/by-name/q-/q-text-as-data/package.nix    |  2 +-
 .../qa/qadwaitadecorations/package.nix        |  2 +-
 pkgs/by-name/qa/qastools/package.nix          |  2 +-
 pkgs/by-name/qb/qbec/package.nix              |  2 +-
 pkgs/by-name/qc/qc/package.nix                |  2 +-
 pkgs/by-name/qd/qdirstat/package.nix          |  2 +-
 pkgs/by-name/qg/qgrep/package.nix             |  2 +-
 pkgs/by-name/qg/qgroundcontrol/package.nix    |  2 +-
 pkgs/by-name/qh/qhull/package.nix             |  2 +-
 pkgs/by-name/qm/qm-dsp/package.nix            |  2 +-
 pkgs/by-name/qm/qmk_hid/package.nix           |  2 +-
 pkgs/by-name/qm/qmqtt/package.nix             |  2 +-
 pkgs/by-name/qo/qogir-icon-theme/package.nix  |  2 +-
 pkgs/by-name/qo/qogir-theme/package.nix       |  2 +-
 pkgs/by-name/qp/qperf/package.nix             |  2 +-
 pkgs/by-name/qr/qrrs/package.nix              |  2 +-
 pkgs/by-name/qr/qrscan/package.nix            |  2 +-
 pkgs/by-name/qr/qrtool/package.nix            |  2 +-
 pkgs/by-name/qs/qsreplace/package.nix         |  2 +-
 pkgs/by-name/qs/qsv/package.nix               |  2 +-
 pkgs/by-name/qu/quadrafuzz/package.nix        |  2 +-
 pkgs/by-name/qu/quark-goldleaf/package.nix    |  2 +-
 .../qu/qubes-core-vchan-xen/package.nix       |  2 +-
 pkgs/by-name/qu/qucsator-rf/package.nix       |  2 +-
 pkgs/by-name/qu/quich/package.nix             |  2 +-
 pkgs/by-name/qu/quick-lint-js/package.nix     |  2 +-
 pkgs/by-name/qu/quickder/package.nix          |  2 +-
 pkgs/by-name/qu/quickemu/package.nix          |  2 +-
 pkgs/by-name/qu/quickfix/package.nix          |  2 +-
 pkgs/by-name/qu/quickgui/package.nix          |  2 +-
 pkgs/by-name/qu/quickmem/package.nix          |  2 +-
 pkgs/by-name/qu/quicktemplate/package.nix     |  2 +-
 pkgs/by-name/qu/quill-log/package.nix         |  2 +-
 pkgs/by-name/qu/quill-qr/package.nix          |  2 +-
 pkgs/by-name/qu/quorum/package.nix            |  2 +-
 pkgs/by-name/r0/r0vm/package.nix              |  2 +-
 pkgs/by-name/r1/r128gain/package.nix          |  2 +-
 pkgs/by-name/r2/r2mod_cli/package.nix         |  2 +-
 pkgs/by-name/r5/r53-ddns/package.nix          |  2 +-
 pkgs/by-name/ra/ra-multiplex/package.nix      |  2 +-
 pkgs/by-name/ra/rabtap/package.nix            |  2 +-
 pkgs/by-name/ra/radeontop/package.nix         |  2 +-
 pkgs/by-name/ra/radio-cli/package.nix         |  2 +-
 pkgs/by-name/ra/radioboat/package.nix         |  2 +-
 pkgs/by-name/ra/raffi/package.nix             |  2 +-
 pkgs/by-name/ra/rage/package.nix              |  2 +-
 pkgs/by-name/ra/ragnarwm/package.nix          |  2 +-
 pkgs/by-name/ra/raider/package.nix            |  2 +-
 pkgs/by-name/ra/railway/package.nix           |  2 +-
 pkgs/by-name/ra/rain/package.nix              |  2 +-
 pkgs/by-name/ra/rakkess/package.nix           |  2 +-
 pkgs/by-name/ra/ramfetch/package.nix          |  2 +-
 pkgs/by-name/ra/ran/package.nix               |  2 +-
 pkgs/by-name/ra/rancher/package.nix           |  2 +-
 pkgs/by-name/ra/range-v3/package.nix          |  2 +-
 pkgs/by-name/ra/rapidyaml/package.nix         |  2 +-
 pkgs/by-name/ra/rar2fs/package.nix            |  2 +-
 pkgs/by-name/ra/rar2hashcat/package.nix       |  2 +-
 pkgs/by-name/ra/rare-regex/package.nix        |  2 +-
 pkgs/by-name/ra/rasm/package.nix              |  2 +-
 pkgs/by-name/ra/ratman/package.nix            |  2 +-
 pkgs/by-name/ra/ratools/package.nix           |  2 +-
 pkgs/by-name/ra/ratslap/package.nix           |  2 +-
 pkgs/by-name/ra/rauc/package.nix              |  2 +-
 pkgs/by-name/ra/raxml/package.nix             |  2 +-
 pkgs/by-name/ra/raylib/package.nix            |  2 +-
 pkgs/by-name/ra/razer-cli/package.nix         |  2 +-
 pkgs/by-name/rb/rbdoom-3-bfg/package.nix      |  2 +-
 pkgs/by-name/rc/rcon/package.nix              |  2 +-
 pkgs/by-name/rc/rcp/package.nix               |  2 +-
 pkgs/by-name/rd/rdap/package.nix              |  2 +-
 pkgs/by-name/re/re-flex/package.nix           |  2 +-
 pkgs/by-name/re/re2/package.nix               |  2 +-
 pkgs/by-name/re/re2c/package.nix              |  2 +-
 pkgs/by-name/re/react-static/package.nix      |  2 +-
 pkgs/by-name/re/readability-cli/package.nix   |  2 +-
 pkgs/by-name/re/readstat/package.nix          |  2 +-
 .../re/realcugan-ncnn-vulkan/package.nix      |  2 +-
 .../re/realesrgan-ncnn-vulkan/package.nix     |  2 +-
 pkgs/by-name/re/realm/package.nix             |  2 +-
 pkgs/by-name/re/reason-shell/package.nix      |  2 +-
 pkgs/by-name/re/reaverwps-t6x/package.nix     |  2 +-
 pkgs/by-name/re/recapp/package.nix            |  2 +-
 pkgs/by-name/re/reco/package.nix              |  2 +-
 .../re/redhat-official-fonts/package.nix      |  2 +-
 pkgs/by-name/re/redict/package.nix            |  2 +-
 pkgs/by-name/re/redir/package.nix             |  2 +-
 pkgs/by-name/re/redis-plus-plus/package.nix   |  2 +-
 pkgs/by-name/re/redisinsight/package.nix      |  2 +-
 pkgs/by-name/re/redka/package.nix             |  2 +-
 pkgs/by-name/re/redo-c/package.nix            |  2 +-
 pkgs/by-name/re/redpanda-client/package.nix   |  2 +-
 pkgs/by-name/re/reflex/package.nix            |  2 +-
 pkgs/by-name/re/refmt/package.nix             |  2 +-
 pkgs/by-name/re/reg/package.nix               |  2 +-
 pkgs/by-name/re/regal/package.nix             |  2 +-
 pkgs/by-name/re/regex2json/package.nix        |  2 +-
 pkgs/by-name/re/regexploit/package.nix        |  2 +-
 pkgs/by-name/re/regextester/package.nix       |  2 +-
 pkgs/by-name/re/regols/package.nix            |  2 +-
 pkgs/by-name/re/rehex/package.nix             |  2 +-
 pkgs/by-name/re/relic/package.nix             |  2 +-
 pkgs/by-name/re/remind/package.nix            |  2 +-
 pkgs/by-name/re/remote-touchpad/package.nix   |  2 +-
 pkgs/by-name/re/rename/package.nix            |  2 +-
 pkgs/by-name/re/renderizer/package.nix        |  2 +-
 pkgs/by-name/re/rep/package.nix               |  2 +-
 pkgs/by-name/re/repgrep/package.nix           |  2 +-
 pkgs/by-name/re/replacement/package.nix       |  2 +-
 pkgs/by-name/re/repro-get/package.nix         |  2 +-
 pkgs/by-name/re/reproc/package.nix            |  2 +-
 pkgs/by-name/re/reredirect/package.nix        |  2 +-
 pkgs/by-name/re/rescrobbled/package.nix       |  2 +-
 pkgs/by-name/re/resgate/package.nix           |  2 +-
 pkgs/by-name/re/restic-browser/package.nix    |  2 +-
 pkgs/by-name/re/restls/package.nix            |  2 +-
 pkgs/by-name/re/restman/package.nix           |  2 +-
 pkgs/by-name/re/restream/package.nix          |  2 +-
 pkgs/by-name/re/resumed/package.nix           |  2 +-
 pkgs/by-name/re/resvg/package.nix             |  2 +-
 pkgs/by-name/re/retroarch-bare/package.nix    |  2 +-
 .../retroarch-joypad-autoconfig/package.nix   |  2 +-
 pkgs/by-name/re/retrospy/package.nix          |  2 +-
 pkgs/by-name/re/reveal-md/package.nix         |  2 +-
 pkgs/by-name/re/reviewdog/package.nix         |  2 +-
 pkgs/by-name/re/revive/package.nix            |  2 +-
 pkgs/by-name/re/rewrk/package.nix             |  2 +-
 pkgs/by-name/rf/rfc/package.nix               |  2 +-
 pkgs/by-name/rg/rgbds/package.nix             |  2 +-
 pkgs/by-name/rh/rhack/package.nix             |  2 +-
 pkgs/by-name/rh/rhai-doc/package.nix          |  2 +-
 pkgs/by-name/rh/rhash/package.nix             |  2 +-
 pkgs/by-name/rh/rhoas/package.nix             |  2 +-
 pkgs/by-name/rh/rhodium-libre/package.nix     |  2 +-
 pkgs/by-name/rh/rhvoice/package.nix           |  2 +-
 pkgs/by-name/ri/richgo/package.nix            |  2 +-
 .../rictydiminished-with-firacode/package.nix |  2 +-
 pkgs/by-name/ri/riff/package.nix              |  2 +-
 pkgs/by-name/ri/riko4/package.nix             |  2 +-
 pkgs/by-name/ri/rime-cli/package.nix          |  2 +-
 pkgs/by-name/ri/rime-ls/package.nix           |  2 +-
 pkgs/by-name/ri/rinetd/package.nix            |  2 +-
 pkgs/by-name/ri/rio/package.nix               |  2 +-
 pkgs/by-name/ri/rip2/package.nix              |  2 +-
 pkgs/by-name/ri/ripdrag/package.nix           |  2 +-
 pkgs/by-name/ri/ripgrep/package.nix           |  2 +-
 pkgs/by-name/ri/ripsecrets/package.nix        |  2 +-
 pkgs/by-name/ri/ripser/package.nix            |  2 +-
 pkgs/by-name/ri/ripunzip/package.nix          |  2 +-
 pkgs/by-name/ri/risor/package.nix             |  2 +-
 pkgs/by-name/ri/river-bsp-layout/package.nix  |  2 +-
 pkgs/by-name/ri/river-filtile/package.nix     |  2 +-
 pkgs/by-name/ri/river-luatile/package.nix     |  2 +-
 pkgs/by-name/rk/rke/package.nix               |  2 +-
 pkgs/by-name/rk/rkrlv2/package.nix            |  2 +-
 pkgs/by-name/rk/rkvm/package.nix              |  2 +-
 pkgs/by-name/rl/rl_json/package.nix           |  2 +-
 pkgs/by-name/rl/rlaunch/package.nix           |  2 +-
 pkgs/by-name/rl/rlci/package.nix              |  2 +-
 pkgs/by-name/rl/rlottie/package.nix           |  2 +-
 pkgs/by-name/rl/rlwrap/package.nix            |  2 +-
 pkgs/by-name/rm/rm-improved/package.nix       |  2 +-
 pkgs/by-name/rm/rmapi/package.nix             |  2 +-
 pkgs/by-name/rm/rmenu/package.nix             |  2 +-
 pkgs/by-name/rm/rmfakecloud/package.nix       |  2 +-
 pkgs/by-name/rm/rmount/package.nix            |  2 +-
 pkgs/by-name/rm/rmpc/package.nix              |  2 +-
 pkgs/by-name/rm/rmtrash/package.nix           |  2 +-
 pkgs/by-name/rm/rmw/package.nix               |  2 +-
 pkgs/by-name/rn/rnd-name/package.nix          |  2 +-
 pkgs/by-name/rn/rng-tools/package.nix         |  2 +-
 pkgs/by-name/rn/rnr/package.nix               |  2 +-
 pkgs/by-name/ro/robotfindskitten/package.nix  |  2 +-
 pkgs/by-name/ro/robustirc-bridge/package.nix  |  2 +-
 pkgs/by-name/ro/roc-toolkit/package.nix       |  2 +-
 pkgs/by-name/ro/rockcraft/package.nix         |  2 +-
 pkgs/by-name/ro/rofi-calc/package.nix         |  2 +-
 pkgs/by-name/ro/rofi-file-browser/package.nix |  2 +-
 pkgs/by-name/ro/rofi-mpd/package.nix          |  2 +-
 pkgs/by-name/ro/rofi-power-menu/package.nix   |  2 +-
 pkgs/by-name/ro/rofi-systemd/package.nix      |  2 +-
 pkgs/by-name/ro/rofi-vpn/package.nix          |  2 +-
 pkgs/by-name/ro/rojo/package.nix              |  2 +-
 pkgs/by-name/ro/roogle/package.nix            |  2 +-
 pkgs/by-name/ro/roon-tui/package.nix          |  2 +-
 pkgs/by-name/ro/rootlesskit/package.nix       |  2 +-
 pkgs/by-name/ro/rosa/package.nix              |  2 +-
 pkgs/by-name/ro/roslyn/package.nix            |  2 +-
 pkgs/by-name/ro/rospo/package.nix             |  2 +-
 pkgs/by-name/ro/roswell/package.nix           |  2 +-
 pkgs/by-name/ro/rotate-backups/package.nix    |  2 +-
 pkgs/by-name/ro/round/package.nix             |  2 +-
 pkgs/by-name/ro/roundup/package.nix           |  2 +-
 pkgs/by-name/ro/routedns/package.nix          |  2 +-
 pkgs/by-name/ro/router/package.nix            |  2 +-
 pkgs/by-name/ro/routinator/package.nix        |  2 +-
 pkgs/by-name/ro/roxterm/package.nix           |  2 +-
 pkgs/by-name/rp/rpPPPoE/package.nix           |  2 +-
 pkgs/by-name/rp/rpcsvc-proto/package.nix      |  2 +-
 pkgs/by-name/rp/rpg-cli/package.nix           |  2 +-
 pkgs/by-name/rp/rpiboot/package.nix           |  2 +-
 pkgs/by-name/rp/rpm-sequoia/package.nix       |  2 +-
 pkgs/by-name/rq/rq/package.nix                |  2 +-
 pkgs/by-name/rq/rqbit/package.nix             |  2 +-
 pkgs/by-name/rq/rqlite/package.nix            |  2 +-
 pkgs/by-name/rr/rrdtool/package.nix           |  2 +-
 pkgs/by-name/rs/rs-tftpd/package.nix          |  2 +-
 pkgs/by-name/rs/rsbep/package.nix             |  2 +-
 pkgs/by-name/rs/rsclock/package.nix           |  2 +-
 pkgs/by-name/rs/rsgain/package.nix            |  2 +-
 pkgs/by-name/rs/rshijack/package.nix          |  2 +-
 pkgs/by-name/rs/rslint/package.nix            |  2 +-
 pkgs/by-name/rs/rspamd/package.nix            |  2 +-
 pkgs/by-name/rs/rss-bridge/package.nix        |  2 +-
 pkgs/by-name/rt/rtg-tools/package.nix         |  2 +-
 pkgs/by-name/rt/rtl_433/package.nix           |  2 +-
 pkgs/by-name/rt/rtlcss/package.nix            |  2 +-
 pkgs/by-name/rt/rtrlib/package.nix            |  2 +-
 pkgs/by-name/rt/rtss/package.nix              |  2 +-
 pkgs/by-name/rt/rttr/package.nix              |  2 +-
 pkgs/by-name/rt/rtz/package.nix               |  2 +-
 pkgs/by-name/ru/ruapu/package.nix             |  2 +-
 pkgs/by-name/ru/rubyripper/package.nix        |  2 +-
 pkgs/by-name/ru/rucksack/package.nix          |  2 +-
 pkgs/by-name/ru/rucola/package.nix            |  2 +-
 pkgs/by-name/ru/run/package.nix               |  2 +-
 pkgs/by-name/ru/runc/package.nix              |  2 +-
 pkgs/by-name/ru/rund/package.nix              |  2 +-
 pkgs/by-name/ru/runelite/package.nix          |  2 +-
 pkgs/by-name/ru/runitor/package.nix           |  2 +-
 pkgs/by-name/ru/runme/package.nix             |  2 +-
 pkgs/by-name/ru/runpodctl/package.nix         |  2 +-
 pkgs/by-name/ru/runzip/package.nix            |  2 +-
 pkgs/by-name/ru/ruplacer/package.nix          |  2 +-
 pkgs/by-name/ru/rush-parallel/package.nix     |  2 +-
 .../ru/rust-analyzer-unwrapped/package.nix    |  2 +-
 pkgs/by-name/ru/rust-parallel/package.nix     |  2 +-
 pkgs/by-name/ru/rust-script/package.nix       |  2 +-
 .../rust-synapse-compress-state/package.nix   |  2 +-
 pkgs/by-name/ru/rust-traverse/package.nix     |  2 +-
 pkgs/by-name/ru/rustc-demangle/package.nix    |  2 +-
 pkgs/by-name/ru/rustdesk-flutter/package.nix  |  2 +-
 pkgs/by-name/ru/rustdesk-server/package.nix   |  2 +-
 pkgs/by-name/ru/rusti-cal/package.nix         |  2 +-
 pkgs/by-name/ru/rustlings/package.nix         |  2 +-
 pkgs/by-name/ru/rustmission/package.nix       |  2 +-
 pkgs/by-name/ru/rustypaste-cli/package.nix    |  2 +-
 pkgs/by-name/ru/rustypaste/package.nix        |  2 +-
 pkgs/by-name/ru/rustywind/package.nix         |  2 +-
 pkgs/by-name/rv/rvvm/package.nix              |  2 +-
 pkgs/by-name/rv/rvz/package.nix               |  2 +-
 pkgs/by-name/rw/rwc/package.nix               |  2 +-
 pkgs/by-name/rw/rwedid/package.nix            |  2 +-
 pkgs/by-name/rw/rwpspread/package.nix         |  2 +-
 pkgs/by-name/rx/rx/package.nix                |  2 +-
 pkgs/by-name/ry/ryokucha/package.nix          |  2 +-
 pkgs/by-name/ry/ryzenadj/package.nix          |  2 +-
 pkgs/by-name/s2/s2n-tls/package.nix           |  2 +-
 pkgs/by-name/s2/s2png/package.nix             |  2 +-
 pkgs/by-name/s3/s3backer/package.nix          |  2 +-
 pkgs/by-name/s3/s3scanner/package.nix         |  2 +-
 pkgs/by-name/s5/s5/package.nix                |  2 +-
 pkgs/by-name/s5/s5cmd/package.nix             |  2 +-
 pkgs/by-name/sa/sabnzbd/package.nix           |  2 +-
 pkgs/by-name/sa/sacd/package.nix              |  2 +-
 pkgs/by-name/sa/safe/package.nix              |  2 +-
 pkgs/by-name/sa/safecloset/package.nix        |  2 +-
 pkgs/by-name/sa/sage/sage-src.nix             |  2 +-
 pkgs/by-name/sa/sage/threejs-sage.nix         |  2 +-
 pkgs/by-name/sa/sagetex/package.nix           |  2 +-
 pkgs/by-name/sa/sagoin/package.nix            |  2 +-
 pkgs/by-name/sa/sahel-fonts/package.nix       |  2 +-
 pkgs/by-name/sa/sailsd/package.nix            |  2 +-
 pkgs/by-name/sa/saldl/package.nix             |  2 +-
 pkgs/by-name/sa/sambamba/package.nix          |  2 +-
 pkgs/by-name/sa/sameboy/package.nix           |  2 +-
 pkgs/by-name/sa/samim-fonts/package.nix       |  2 +-
 pkgs/by-name/sa/sampler/package.nix           |  2 +-
 pkgs/by-name/sa/samplicator/package.nix       |  2 +-
 pkgs/by-name/sa/samurai/package.nix           |  2 +-
 pkgs/by-name/sa/sane-airscan/package.nix      |  2 +-
 pkgs/by-name/sa/sanjuuni/package.nix          |  2 +-
 pkgs/by-name/sa/sanoid/package.nix            |  2 +-
 pkgs/by-name/sa/sassc/package.nix             |  2 +-
 pkgs/by-name/sa/satty/package.nix             |  2 +-
 pkgs/by-name/sa/savepagenow/package.nix       |  2 +-
 pkgs/by-name/sb/sblast/package.nix            |  2 +-
 pkgs/by-name/sb/sbs/package.nix               |  2 +-
 pkgs/by-name/sc/sc-im/package.nix             |  2 +-
 pkgs/by-name/sc/scaleway-cli/package.nix      |  2 +-
 pkgs/by-name/sc/scalingo/package.nix          |  2 +-
 pkgs/by-name/sc/scalr-cli/package.nix         |  2 +-
 pkgs/by-name/sc/scanmem/package.nix           |  2 +-
 pkgs/by-name/sc/scanservjs/package.nix        |  2 +-
 pkgs/by-name/sc/scaphandre/package.nix        |  2 +-
 pkgs/by-name/sc/scc/package.nix               |  2 +-
 pkgs/by-name/sc/sccache/package.nix           |  2 +-
 pkgs/by-name/sc/sccmhunter/package.nix        |  2 +-
 pkgs/by-name/sc/scenebuilder/package.nix      |  2 +-
 pkgs/by-name/sc/scenic-view/package.nix       |  2 +-
 pkgs/by-name/sc/schemamap/package.nix         |  2 +-
 .../sc/scheme-bytestructures/package.nix      |  2 +-
 pkgs/by-name/sc/scid/package.nix              |  2 +-
 .../by-name/sc/scion-bootstrapper/package.nix |  2 +-
 pkgs/by-name/sc/scion/package.nix             |  2 +-
 pkgs/by-name/sc/scip-go/package.nix           |  2 +-
 pkgs/by-name/sc/scip/package.nix              |  2 +-
 pkgs/by-name/sc/scmpuff/package.nix           |  2 +-
 pkgs/by-name/sc/scons/package.nix             |  2 +-
 pkgs/by-name/sc/scooter/package.nix           |  2 +-
 pkgs/by-name/sc/scope-lite/package.nix        |  2 +-
 pkgs/by-name/sc/scout/package.nix             |  2 +-
 pkgs/by-name/sc/scream/package.nix            |  2 +-
 pkgs/by-name/sc/screego/package.nix           |  2 +-
 pkgs/by-name/sc/screen-message/package.nix    |  2 +-
 pkgs/by-name/sc/screen-pipe/package.nix       |  2 +-
 pkgs/by-name/sc/screenfetch/package.nix       |  2 +-
 pkgs/by-name/sc/screenkey/package.nix         |  2 +-
 pkgs/by-name/sc/script-directory/package.nix  |  2 +-
 pkgs/by-name/sc/scripthaus/package.nix        |  2 +-
 pkgs/by-name/sc/scriptisto/package.nix        |  2 +-
 pkgs/by-name/sc/scrot/package.nix             |  2 +-
 pkgs/by-name/sc/scrub/package.nix             |  2 +-
 pkgs/by-name/sc/scryer-prolog/package.nix     |  2 +-
 pkgs/by-name/sc/scudcloud/package.nix         |  2 +-
 pkgs/by-name/sd/SDL2_sound/package.nix        |  2 +-
 pkgs/by-name/sd/sd-local/package.nix          |  2 +-
 pkgs/by-name/sd/sd/package.nix                |  2 +-
 pkgs/by-name/sd/sdate/package.nix             |  2 +-
 pkgs/by-name/sd/sdcv/package.nix              |  2 +-
 pkgs/by-name/sd/sdlpop/package.nix            |  2 +-
 pkgs/by-name/se/seabird/package.nix           |  2 +-
 pkgs/by-name/se/seafile-shared/package.nix    |  2 +-
 pkgs/by-name/se/seasocks/package.nix          |  2 +-
 pkgs/by-name/se/seaweedfs/package.nix         |  2 +-
 pkgs/by-name/se/sec/package.nix               |  2 +-
 pkgs/by-name/se/see-cat/package.nix           |  2 +-
 pkgs/by-name/se/seilfahrt/package.nix         |  2 +-
 pkgs/by-name/se/selene/package.nix            |  2 +-
 pkgs/by-name/se/sem/package.nix               |  2 +-
 pkgs/by-name/se/semantic-release/package.nix  |  2 +-
 pkgs/by-name/se/semver-tool/package.nix       |  2 +-
 pkgs/by-name/se/semver/package.nix            |  2 +-
 pkgs/by-name/se/sendme/package.nix            |  2 +-
 pkgs/by-name/se/sentry-native/package.nix     |  2 +-
 pkgs/by-name/se/senv/package.nix              |  2 +-
 pkgs/by-name/se/seqkit/package.nix            |  2 +-
 pkgs/by-name/se/seqtk/package.nix             |  2 +-
 pkgs/by-name/se/sequeler/package.nix          |  2 +-
 .../se/sequoia-chameleon-gnupg/package.nix    |  2 +-
 pkgs/by-name/se/sequoia-sqv/package.nix       |  2 +-
 pkgs/by-name/se/sequoia-wot/package.nix       |  2 +-
 pkgs/by-name/se/ser2net/package.nix           |  2 +-
 pkgs/by-name/se/serfdom/package.nix           |  2 +-
 pkgs/by-name/se/serial-studio/package.nix     |  2 +-
 pkgs/by-name/se/serialdv/package.nix          |  2 +-
 pkgs/by-name/se/serie/package.nix             |  2 +-
 pkgs/by-name/se/serpl/package.nix             |  2 +-
 pkgs/by-name/se/serve-d/package.nix           |  2 +-
 pkgs/by-name/se/serverless/package.nix        |  2 +-
 pkgs/by-name/se/sesh/package.nix              |  2 +-
 pkgs/by-name/se/setbfree/package.nix          |  2 +-
 pkgs/by-name/se/setroot/package.nix           |  2 +-
 pkgs/by-name/se/setup-envtest/package.nix     |  2 +-
 pkgs/by-name/se/seturgent/package.nix         |  2 +-
 pkgs/by-name/sf/sfizz/package.nix             |  2 +-
 pkgs/by-name/sf/sfm/package.nix               |  2 +-
 pkgs/by-name/sf/sfsexp/package.nix            |  2 +-
 pkgs/by-name/sf/sftpman/package.nix           |  2 +-
 pkgs/by-name/sf/sfwbar/package.nix            |  2 +-
 pkgs/by-name/sf/sfz/package.nix               |  2 +-
 .../sg/sgx-azure-dcap-client/package.nix      |  2 +-
 pkgs/by-name/sh/shab/package.nix              |  2 +-
 pkgs/by-name/sh/shabnam-fonts/package.nix     |  2 +-
 pkgs/by-name/sh/shadered/package.nix          |  2 +-
 .../sh/shades-of-gray-theme/package.nix       |  2 +-
 pkgs/by-name/sh/shadow-tls/package.nix        |  2 +-
 pkgs/by-name/sh/shadow/package.nix            |  2 +-
 pkgs/by-name/sh/shadowfox/package.nix         |  2 +-
 .../sh/shadowsocks-v2ray-plugin/package.nix   |  2 +-
 pkgs/by-name/sh/shaq/package.nix              |  2 +-
 pkgs/by-name/sh/share-preview/package.nix     |  2 +-
 pkgs/by-name/sh/sharing/package.nix           |  2 +-
 pkgs/by-name/sh/shavee/package.nix            |  2 +-
 pkgs/by-name/sh/shell2http/package.nix        |  2 +-
 pkgs/by-name/sh/shellharden/package.nix       |  2 +-
 pkgs/by-name/sh/shellhub-agent/package.nix    |  2 +-
 pkgs/by-name/sh/shellspec/package.nix         |  2 +-
 pkgs/by-name/sh/shellz/package.nix            |  2 +-
 pkgs/by-name/sh/shepherd/package.nix          |  2 +-
 pkgs/by-name/sh/shfm/package.nix              |  2 +-
 pkgs/by-name/sh/shfmt/package.nix             |  2 +-
 pkgs/by-name/sh/shibboleth-sp/package.nix     |  2 +-
 pkgs/by-name/sh/shikane/package.nix           |  2 +-
 pkgs/by-name/sh/shim-unsigned/package.nix     |  2 +-
 pkgs/by-name/sh/shine/package.nix             |  2 +-
 pkgs/by-name/sh/shiori/package.nix            |  2 +-
 pkgs/by-name/sh/shisho/package.nix            |  2 +-
 pkgs/by-name/sh/shmig/package.nix             |  2 +-
 pkgs/by-name/sh/shocco/package.nix            |  2 +-
 pkgs/by-name/sh/shod/package.nix              |  2 +-
 pkgs/by-name/sh/shopify-themekit/package.nix  |  2 +-
 pkgs/by-name/sh/shotgun/package.nix           |  2 +-
 pkgs/by-name/sh/show-midi/package.nix         |  2 +-
 pkgs/by-name/sh/shpool/package.nix            |  2 +-
 pkgs/by-name/sh/shunit2/package.nix           |  2 +-
 pkgs/by-name/sh/shutter/package.nix           |  2 +-
 pkgs/by-name/si/sic-image-cli/package.nix     |  2 +-
 pkgs/by-name/si/sidekick/package.nix          |  2 +-
 pkgs/by-name/si/sieve-connect/package.nix     |  2 +-
 pkgs/by-name/si/sift/package.nix              |  2 +-
 pkgs/by-name/si/sig/package.nix               |  2 +-
 pkgs/by-name/si/siglo/package.nix             |  2 +-
 .../by-name/si/signalbackup-tools/package.nix |  2 +-
 pkgs/by-name/si/signaldctl/package.nix        |  2 +-
 pkgs/by-name/si/signaturepdf/package.nix      |  2 +-
 pkgs/by-name/si/signify/package.nix           |  2 +-
 pkgs/by-name/si/sigslot/package.nix           |  2 +-
 pkgs/by-name/si/sigtop/package.nix            |  2 +-
 pkgs/by-name/si/siketyan-ghr/package.nix      |  2 +-
 pkgs/by-name/si/sil-q/package.nix             |  2 +-
 pkgs/by-name/si/silicon/package.nix           |  2 +-
 pkgs/by-name/si/silver-searcher/package.nix   |  2 +-
 pkgs/by-name/si/simde/package.nix             |  2 +-
 pkgs/by-name/si/simdjson/package.nix          |  2 +-
 pkgs/by-name/si/simg2img/package.nix          |  2 +-
 pkgs/by-name/si/simh/package.nix              |  2 +-
 .../by-name/si/simple-http-server/package.nix |  2 +-
 pkgs/by-name/si/simple-mtpfs/package.nix      |  2 +-
 pkgs/by-name/si/simpleTpmPk11/package.nix     |  2 +-
 pkgs/by-name/si/simplehttp2server/package.nix |  2 +-
 pkgs/by-name/si/simplotask/package.nix        |  2 +-
 pkgs/by-name/si/sing-box/package.nix          |  2 +-
 pkgs/by-name/si/sink-rotate/package.nix       |  2 +-
 pkgs/by-name/si/sipexer/package.nix           |  2 +-
 pkgs/by-name/si/sirikali/package.nix          |  2 +-
 pkgs/by-name/si/sirius/package.nix            |  2 +-
 pkgs/by-name/si/sitespeed-io/package.nix      |  2 +-
 pkgs/by-name/sj/sjasmplus/package.nix         |  2 +-
 pkgs/by-name/sk/skaffold/package.nix          |  2 +-
 pkgs/by-name/sk/skate/package.nix             |  2 +-
 pkgs/by-name/sk/skeditor/package.nix          |  2 +-
 pkgs/by-name/sk/skeema/package.nix            |  2 +-
 pkgs/by-name/sk/skeu/package.nix              |  2 +-
 pkgs/by-name/sk/skia-aseprite/package.nix     |  2 +-
 pkgs/by-name/sk/skopeo/package.nix            |  2 +-
 pkgs/by-name/sl/sl/package.nix                |  2 +-
 pkgs/by-name/sl/slack-cli/package.nix         |  2 +-
 pkgs/by-name/sl/slack-term/package.nix        |  2 +-
 pkgs/by-name/sl/sleek/package.nix             |  2 +-
 pkgs/by-name/sl/slic3r/package.nix            |  2 +-
 pkgs/by-name/sl/slides/package.nix            |  2 +-
 pkgs/by-name/sl/slimevr/package.nix           |  2 +-
 pkgs/by-name/sl/slimserver/package.nix        |  2 +-
 pkgs/by-name/sl/slingshot/package.nix         |  2 +-
 pkgs/by-name/sl/slippy/package.nix            |  2 +-
 pkgs/by-name/sl/slirp4netns/package.nix       |  2 +-
 pkgs/by-name/sl/slop/package.nix              |  2 +-
 pkgs/by-name/sl/sloth/package.nix             |  2 +-
 pkgs/by-name/sl/slowhttptest/package.nix      |  2 +-
 pkgs/by-name/sl/slsa-verifier/package.nix     |  2 +-
 .../sl/slurm-spank-stunnel/package.nix        |  2 +-
 pkgs/by-name/sl/slurm-spank-x11/package.nix   |  2 +-
 pkgs/by-name/sm/smag/package.nix              |  2 +-
 pkgs/by-name/sm/smarty3-i18n/package.nix      |  2 +-
 pkgs/by-name/sm/smarty3/package.nix           |  2 +-
 pkgs/by-name/sm/smassh/package.nix            |  2 +-
 pkgs/by-name/sm/smatch/package.nix            |  2 +-
 pkgs/by-name/sm/smcroute/package.nix          |  2 +-
 pkgs/by-name/sm/smenu/package.nix             |  2 +-
 pkgs/by-name/sm/smimesign/package.nix         |  2 +-
 pkgs/by-name/sm/smlfmt/package.nix            |  2 +-
 pkgs/by-name/sm/smlfut/package.nix            |  2 +-
 pkgs/by-name/sm/smlpkg/package.nix            |  2 +-
 pkgs/by-name/sm/smooth/package.nix            |  2 +-
 pkgs/by-name/sm/smu/package.nix               |  2 +-
 pkgs/by-name/sm/smug/package.nix              |  2 +-
 pkgs/by-name/sn/sn-pro/package.nix            |  2 +-
 pkgs/by-name/sn/snabb/package.nix             |  2 +-
 pkgs/by-name/sn/snapper/package.nix           |  2 +-
 pkgs/by-name/sn/snappy/package.nix            |  2 +-
 pkgs/by-name/sn/snapraid/package.nix          |  2 +-
 pkgs/by-name/sn/snapweb/package.nix           |  2 +-
 pkgs/by-name/sn/snazy/package.nix             |  2 +-
 pkgs/by-name/sn/snes9x/package.nix            |  2 +-
 pkgs/by-name/sn/sngrep/package.nix            |  2 +-
 pkgs/by-name/sn/sniffglue/package.nix         |  2 +-
 pkgs/by-name/sn/snippetpixie/package.nix      |  2 +-
 pkgs/by-name/sn/sniproxy/package.nix          |  2 +-
 pkgs/by-name/sn/snips-sh/package.nix          |  2 +-
 pkgs/by-name/sn/snooze/package.nix            |  2 +-
 pkgs/by-name/sn/snore/package.nix             |  2 +-
 pkgs/by-name/sn/snowcat/package.nix           |  2 +-
 .../so/social-engineer-toolkit/package.nix    |  2 +-
 pkgs/by-name/so/sockperf/package.nix          |  2 +-
 pkgs/by-name/so/soco-cli/package.nix          |  2 +-
 pkgs/by-name/so/sof-tools/package.nix         |  2 +-
 pkgs/by-name/so/soft-serve/package.nix        |  2 +-
 pkgs/by-name/so/solvespace/package.nix        |  2 +-
 pkgs/by-name/so/somafm-cli/package.nix        |  2 +-
 pkgs/by-name/so/somatic-sniper/package.nix    |  2 +-
 pkgs/by-name/so/sonarlint-ls/package.nix      |  2 +-
 pkgs/by-name/so/sonata/package.nix            |  2 +-
 pkgs/by-name/so/songrec/package.nix           |  2 +-
 pkgs/by-name/so/sonivox/package.nix           |  2 +-
 pkgs/by-name/so/sonobus/package.nix           |  2 +-
 .../so/sony-headphones-client/package.nix     |  2 +-
 pkgs/by-name/so/sooperlooper/package.nix      |  2 +-
 pkgs/by-name/so/sophus/package.nix            |  2 +-
 pkgs/by-name/so/sord/package.nix              |  2 +-
 pkgs/by-name/so/souffle/package.nix           |  2 +-
 pkgs/by-name/so/soundtouch/package.nix        |  2 +-
 pkgs/by-name/so/sov/package.nix               |  2 +-
 pkgs/by-name/so/sozu/package.nix              |  2 +-
 .../space-station-14-launcher.nix             |  2 +-
 pkgs/by-name/sp/spaceFM/package.nix           |  2 +-
 pkgs/by-name/sp/spacebar/package.nix          |  2 +-
 pkgs/by-name/sp/spacectl/package.nix          |  2 +-
 pkgs/by-name/sp/spacer/package.nix            |  2 +-
 pkgs/by-name/sp/spaceship-prompt/package.nix  |  2 +-
 pkgs/by-name/sp/spacevim/package.nix          |  2 +-
 pkgs/by-name/sp/spade/package.nix             |  2 +-
 pkgs/by-name/sp/span-lite/package.nix         |  2 +-
 pkgs/by-name/sp/sparkleshare/package.nix      |  2 +-
 pkgs/by-name/sp/spatial-shell/package.nix     |  2 +-
 pkgs/by-name/sp/spdk/package.nix              |  2 +-
 .../sp/spdx-license-list-data/package.nix     |  2 +-
 pkgs/by-name/sp/spectra/package.nix           |  2 +-
 pkgs/by-name/sp/spfft/package.nix             |  2 +-
 pkgs/by-name/sp/spice-up/package.nix          |  2 +-
 pkgs/by-name/sp/spicetify-cli/package.nix     |  2 +-
 .../sp/spicy-parser-generator/package.nix     |  2 +-
 pkgs/by-name/sp/spicy/package.nix             |  2 +-
 pkgs/by-name/sp/spire/package.nix             |  2 +-
 pkgs/by-name/sp/spla/package.nix              |  2 +-
 pkgs/by-name/sp/spoof/package.nix             |  2 +-
 pkgs/by-name/sp/spoofdpi/package.nix          |  2 +-
 pkgs/by-name/sp/spotify-tray/package.nix      |  2 +-
 pkgs/by-name/sp/spral/package.nix             |  2 +-
 pkgs/by-name/sp/spruce/package.nix            |  2 +-
 pkgs/by-name/sp/sptk/package.nix              |  2 +-
 pkgs/by-name/sp/sptlrx/package.nix            |  2 +-
 pkgs/by-name/sp/spyre/package.nix             |  2 +-
 pkgs/by-name/sq/sq/package.nix                |  2 +-
 pkgs/by-name/sq/sql-formatter/package.nix     |  2 +-
 pkgs/by-name/sq/sql-studio/package.nix        |  2 +-
 pkgs/by-name/sq/sqlcheck/package.nix          |  2 +-
 pkgs/by-name/sq/sqlcipher/package.nix         |  2 +-
 pkgs/by-name/sq/sqlcmd/package.nix            |  2 +-
 pkgs/by-name/sq/sqldef/package.nix            |  2 +-
 pkgs/by-name/sq/sqlitecpp/package.nix         |  2 +-
 pkgs/by-name/sq/sqlitestudio/package.nix      |  2 +-
 pkgs/by-name/sq/sqls/package.nix              |  2 +-
 pkgs/by-name/sq/squashfsTools/package.nix     |  2 +-
 pkgs/by-name/sq/squashfuse/package.nix        |  2 +-
 pkgs/by-name/sq/squirreldisk/package.nix      |  2 +-
 pkgs/by-name/sr/srain/package.nix             |  2 +-
 pkgs/by-name/sr/srandrd/package.nix           |  2 +-
 pkgs/by-name/sr/src-cli/package.nix           |  2 +-
 pkgs/by-name/sr/sregex/package.nix            |  2 +-
 pkgs/by-name/sr/srisum/package.nix            |  2 +-
 pkgs/by-name/sr/srt/package.nix               |  2 +-
 pkgs/by-name/sr/srtp/package.nix              |  2 +-
 pkgs/by-name/sr/srtrelay/package.nix          |  2 +-
 pkgs/by-name/ss/ssh-agents/package.nix        |  2 +-
 pkgs/by-name/ss/ssh-chat/package.nix          |  2 +-
 pkgs/by-name/ss/ssh-key-confirmer/package.nix |  2 +-
 pkgs/by-name/ss/ssh-to-age/package.nix        |  2 +-
 pkgs/by-name/ss/ssh-to-pgp/package.nix        |  2 +-
 pkgs/by-name/ss/ssh-tpm-agent/package.nix     |  2 +-
 pkgs/by-name/ss/sshchecker/package.nix        |  2 +-
 pkgs/by-name/ss/sshed/package.nix             |  2 +-
 pkgs/by-name/ss/sshesame/package.nix          |  2 +-
 pkgs/by-name/ss/sshlatex/package.nix          |  2 +-
 pkgs/by-name/ss/sshping/package.nix           |  2 +-
 pkgs/by-name/ss/sshportal/package.nix         |  2 +-
 pkgs/by-name/ss/sshs/package.nix              |  2 +-
 pkgs/by-name/ss/sslh/package.nix              |  2 +-
 pkgs/by-name/ss/sslsplit/package.nix          |  2 +-
 .../ss/ssm-session-manager-plugin/package.nix |  2 +-
 pkgs/by-name/ss/ssmsh/package.nix             |  2 +-
 pkgs/by-name/ss/ssocr/package.nix             |  2 +-
 pkgs/by-name/ss/sss-cli/package.nix           |  2 +-
 pkgs/by-name/ss/sssnake/package.nix           |  2 +-
 pkgs/by-name/st/stackblur-go/package.nix      |  2 +-
 pkgs/by-name/st/stackit-cli/package.nix       |  2 +-
 pkgs/by-name/st/stackql/package.nix           |  2 +-
 pkgs/by-name/st/stacs/package.nix             |  2 +-
 pkgs/by-name/st/stagit/package.nix            |  2 +-
 pkgs/by-name/st/stalonetray/package.nix       |  2 +-
 pkgs/by-name/st/stanc/package.nix             |  2 +-
 pkgs/by-name/st/star/package.nix              |  2 +-
 pkgs/by-name/st/starboard/package.nix         |  2 +-
 pkgs/by-name/st/starcharts/package.nix        |  2 +-
 pkgs/by-name/st/starfetch/package.nix         |  2 +-
 pkgs/by-name/st/stargate-libcds/package.nix   |  2 +-
 pkgs/by-name/st/static-server/package.nix     |  2 +-
 pkgs/by-name/st/static-web-server/package.nix |  2 +-
 pkgs/by-name/st/statik/package.nix            |  2 +-
 pkgs/by-name/st/statix/package.nix            |  2 +-
 pkgs/by-name/st/stayrtr/package.nix           |  2 +-
 pkgs/by-name/st/stc-cli/package.nix           |  2 +-
 pkgs/by-name/st/stdman/package.nix            |  2 +-
 pkgs/by-name/st/stdoutisatty/package.nix      |  2 +-
 pkgs/by-name/st/stduuid/package.nix           |  2 +-
 pkgs/by-name/st/steam-acf/package.nix         |  2 +-
 pkgs/by-name/st/steam-tui/package.nix         |  2 +-
 pkgs/by-name/st/steamguard-cli/package.nix    |  2 +-
 pkgs/by-name/st/steghide/package.nix          |  2 +-
 pkgs/by-name/st/stegseek/package.nix          |  2 +-
 pkgs/by-name/st/stella/package.nix            |  2 +-
 pkgs/by-name/st/stellarsolver/package.nix     |  2 +-
 pkgs/by-name/st/step-kms-plugin/package.nix   |  2 +-
 pkgs/by-name/st/stern/package.nix             |  2 +-
 pkgs/by-name/st/stgit/package.nix             |  2 +-
 pkgs/by-name/st/sticky-notes/package.nix      |  2 +-
 pkgs/by-name/st/sticky/package.nix            |  2 +-
 pkgs/by-name/st/stig/package.nix              |  2 +-
 pkgs/by-name/st/stilo-themes/package.nix      |  2 +-
 pkgs/by-name/st/stl-to-obj/package.nix        |  2 +-
 pkgs/by-name/st/stlink/package.nix            |  2 +-
 pkgs/by-name/st/stochas/package.nix           |  2 +-
 pkgs/by-name/st/stone-phaser/package.nix      |  2 +-
 pkgs/by-name/st/stopmotion/package.nix        |  2 +-
 pkgs/by-name/st/storj-uplink/package.nix      |  2 +-
 pkgs/by-name/st/strace-analyzer/package.nix   |  2 +-
 pkgs/by-name/st/streamdeck-ui/package.nix     |  2 +-
 pkgs/by-name/st/streamrip/package.nix         |  2 +-
 pkgs/by-name/st/stripe-cli/package.nix        |  2 +-
 pkgs/by-name/st/strongswan/package.nix        |  2 +-
 pkgs/by-name/st/structorizer/package.nix      |  2 +-
 pkgs/by-name/st/sttr/package.nix              |  2 +-
 pkgs/by-name/st/stu/package.nix               |  2 +-
 pkgs/by-name/st/stuffbin/package.nix          |  2 +-
 pkgs/by-name/st/stxxl/package.nix             |  2 +-
 pkgs/by-name/st/stylua/package.nix            |  2 +-
 pkgs/by-name/st/styx/package.nix              |  2 +-
 pkgs/by-name/su/su-exec/package.nix           |  2 +-
 pkgs/by-name/su/sub-batch/package.nix         |  2 +-
 pkgs/by-name/su/subberthehut/package.nix      |  2 +-
 pkgs/by-name/su/subjs/package.nix             |  2 +-
 pkgs/by-name/su/subtitlr/package.nix          |  2 +-
 pkgs/by-name/su/subxt/package.nix             |  2 +-
 pkgs/by-name/su/sudo-rs/package.nix           |  2 +-
 .../su/suitesparse-graphblas/package.nix      |  2 +-
 pkgs/by-name/su/summon/package.nix            |  2 +-
 pkgs/by-name/su/sunwait/package.nix           |  2 +-
 pkgs/by-name/su/supabase-cli/package.nix      |  2 +-
 pkgs/by-name/su/supercronic/package.nix       |  2 +-
 pkgs/by-name/su/supersonic/package.nix        |  2 +-
 pkgs/by-name/su/supertag/package.nix          |  2 +-
 pkgs/by-name/su/surface-control/package.nix   |  2 +-
 pkgs/by-name/su/surfer/package.nix            |  2 +-
 pkgs/by-name/su/surge-cli/package.nix         |  2 +-
 pkgs/by-name/su/surrealist/package.nix        |  2 +-
 pkgs/by-name/su/suscan/package.nix            |  2 +-
 pkgs/by-name/su/sutils/package.nix            |  2 +-
 pkgs/by-name/sv/sv-lang/package.nix           |  2 +-
 pkgs/by-name/sv/svaba/package.nix             |  2 +-
 pkgs/by-name/sv/svg2pdf/package.nix           |  2 +-
 pkgs/by-name/sv/svix-server/package.nix       |  2 +-
 pkgs/by-name/sv/svls/package.nix              |  2 +-
 pkgs/by-name/sv/svtplay-dl/package.nix        |  2 +-
 pkgs/by-name/sv/svu/package.nix               |  2 +-
 pkgs/by-name/sw/swagger-cli/package.nix       |  2 +-
 .../sw/sway-launcher-desktop/package.nix      |  2 +-
 .../by-name/sw/sway-new-workspace/package.nix |  2 +-
 pkgs/by-name/sw/sway-overfocus/package.nix    |  2 +-
 pkgs/by-name/sw/sway-scratch/package.nix      |  2 +-
 pkgs/by-name/sw/sway-unwrapped/package.nix    |  2 +-
 pkgs/by-name/sw/swayest-workstyle/package.nix |  2 +-
 pkgs/by-name/sw/swayidle/package.nix          |  2 +-
 pkgs/by-name/sw/swaykbdd/package.nix          |  2 +-
 pkgs/by-name/sw/swaylock-effects/package.nix  |  2 +-
 pkgs/by-name/sw/swaynag-battery/package.nix   |  2 +-
 .../sw/swaynotificationcenter/package.nix     |  2 +-
 pkgs/by-name/sw/swayosd/package.nix           |  2 +-
 pkgs/by-name/sw/swh_lv2/package.nix           |  2 +-
 pkgs/by-name/sw/swiftformat/package.nix       |  2 +-
 pkgs/by-name/sw/swim/package.nix              |  2 +-
 pkgs/by-name/sx/sx-go/package.nix             |  2 +-
 pkgs/by-name/sx/sx/package.nix                |  2 +-
 pkgs/by-name/sx/sxhkd/package.nix             |  2 +-
 pkgs/by-name/sy/symbolicator/package.nix      |  2 +-
 pkgs/by-name/sy/symengine/package.nix         |  2 +-
 pkgs/by-name/sy/symlinks/package.nix          |  2 +-
 pkgs/by-name/sy/sympa/package.nix             |  2 +-
 pkgs/by-name/sy/syn2mas/package.nix           |  2 +-
 pkgs/by-name/sy/synapse-admin/package.nix     |  2 +-
 pkgs/by-name/sy/syncall/package.nix           |  2 +-
 pkgs/by-name/sy/synchrony/package.nix         |  2 +-
 pkgs/by-name/sy/syncthing-tray/package.nix    |  2 +-
 pkgs/by-name/sy/syncyomi/package.nix          |  2 +-
 pkgs/by-name/sy/syndicate_utils/package.nix   |  2 +-
 pkgs/by-name/sy/synfigstudio/package.nix      |  2 +-
 pkgs/by-name/sy/syntax/package.nix            |  2 +-
 pkgs/by-name/sy/sysbench/package.nix          |  2 +-
 pkgs/by-name/sy/system76-firmware/package.nix |  2 +-
 .../package.nix                               |  2 +-
 .../by-name/sy/system76-scheduler/package.nix |  2 +-
 pkgs/by-name/sy/systembus-notify/package.nix  |  2 +-
 pkgs/by-name/sy/systemc/package.nix           |  2 +-
 pkgs/by-name/sy/systemfd/package.nix          |  2 +-
 pkgs/by-name/sy/systeroid/package.nix         |  2 +-
 pkgs/by-name/sy/sysz/package.nix              |  2 +-
 pkgs/by-name/sz/szyszka/package.nix           |  2 +-
 pkgs/by-name/t-/t-rex/package.nix             |  2 +-
 pkgs/by-name/ta/ta-lib/package.nix            |  2 +-
 pkgs/by-name/ta/tab/package.nix               |  2 +-
 pkgs/by-name/ta/tabiew/package.nix            |  2 +-
 pkgs/by-name/ta/tabula-java/package.nix       |  2 +-
 pkgs/by-name/ta/tagger/package.nix            |  2 +-
 pkgs/by-name/ta/tagparser/package.nix         |  2 +-
 pkgs/by-name/ta/tagref/package.nix            |  2 +-
 pkgs/by-name/ta/tagutil/package.nix           |  2 +-
 pkgs/by-name/ta/tailer/package.nix            |  2 +-
 pkgs/by-name/ta/tailscale/package.nix         |  2 +-
 pkgs/by-name/ta/tailscalesd/package.nix       |  2 +-
 pkgs/by-name/ta/talentedhack/package.nix      |  2 +-
 pkgs/by-name/ta/taler-wallet-core/package.nix |  2 +-
 pkgs/by-name/ta/tambura/package.nix           |  2 +-
 pkgs/by-name/ta/tandoor-recipes/common.nix    |  2 +-
 pkgs/by-name/ta/tango/package.nix             |  2 +-
 pkgs/by-name/ta/tangram/package.nix           |  2 +-
 pkgs/by-name/ta/tanka/package.nix             |  2 +-
 pkgs/by-name/ta/taoup/package.nix             |  2 +-
 pkgs/by-name/ta/taproot-assets/package.nix    |  2 +-
 pkgs/by-name/ta/tar2ext4/package.nix          |  2 +-
 pkgs/by-name/ta/tarantool/package.nix         |  2 +-
 pkgs/by-name/ta/target-isns/package.nix       |  2 +-
 pkgs/by-name/ta/tarsnapper/package.nix        |  2 +-
 pkgs/by-name/ta/tarssh/package.nix            |  2 +-
 pkgs/by-name/ta/taskopen/package.nix          |  2 +-
 pkgs/by-name/ta/tasktimer/package.nix         |  2 +-
 pkgs/by-name/ta/taskwarrior-tui/package.nix   |  2 +-
 pkgs/by-name/ta/taskwarrior2/package.nix      |  2 +-
 pkgs/by-name/ta/tau-hydrogen/package.nix      |  2 +-
 pkgs/by-name/ta/taxi/package.nix              |  2 +-
 pkgs/by-name/tb/tbox/package.nix              |  2 +-
 pkgs/by-name/tc/tcat/package.nix              |  2 +-
 pkgs/by-name/tc/tcpcrypt/package.nix          |  2 +-
 pkgs/by-name/tc/tcpkali/package.nix           |  2 +-
 pkgs/by-name/td/tdl/package.nix               |  2 +-
 pkgs/by-name/td/tdrop/package.nix             |  2 +-
 pkgs/by-name/te/tealdeer/package.nix          |  2 +-
 pkgs/by-name/te/teapot/package.nix            |  2 +-
 pkgs/by-name/te/tebreak/package.nix           |  2 +-
 pkgs/by-name/te/techmino/ccloader.nix         |  2 +-
 pkgs/by-name/te/teehee/package.nix            |  2 +-
 pkgs/by-name/te/teensy-loader-cli/package.nix |  2 +-
 pkgs/by-name/te/teip/package.nix              |  2 +-
 pkgs/by-name/te/tektoncd-cli/package.nix      |  2 +-
 pkgs/by-name/te/tela-icon-theme/package.nix   |  2 +-
 pkgs/by-name/te/telegraf/package.nix          |  2 +-
 pkgs/by-name/te/telepresence2/package.nix     |  4 +-
 pkgs/by-name/te/telescope/package.nix         |  2 +-
 pkgs/by-name/te/teller/package.nix            |  2 +-
 pkgs/by-name/te/templ/package.nix             |  2 +-
 pkgs/by-name/te/tempo/package.nix             |  2 +-
 pkgs/by-name/te/temporal-cli/package.nix      |  2 +-
 pkgs/by-name/te/temporal/package.nix          |  2 +-
 pkgs/by-name/te/temporalite/package.nix       |  2 +-
 pkgs/by-name/te/tendermint/package.nix        |  2 +-
 pkgs/by-name/te/tenki/package.nix             |  2 +-
 pkgs/by-name/te/tensorflow-lite/package.nix   |  2 +-
 pkgs/by-name/te/termbg/package.nix            |  2 +-
 pkgs/by-name/te/termbook/package.nix          |  2 +-
 pkgs/by-name/te/termcolor/package.nix         |  2 +-
 pkgs/by-name/te/terminal-colors/package.nix   |  2 +-
 pkgs/by-name/te/terminal-parrot/package.nix   |  2 +-
 pkgs/by-name/te/terminal-stocks/package.nix   |  2 +-
 pkgs/by-name/te/termshark/package.nix         |  2 +-
 pkgs/by-name/te/termsvg/package.nix           |  2 +-
 pkgs/by-name/te/termtekst/package.nix         |  2 +-
 pkgs/by-name/te/termusic/package.nix          |  2 +-
 pkgs/by-name/te/terracognita/package.nix      |  2 +-
 .../te/terraform-backend-git/package.nix      |  2 +-
 pkgs/by-name/te/terraform-docs/package.nix    |  2 +-
 .../te/terraform-inventory/package.nix        |  2 +-
 pkgs/by-name/te/terraform-ls/package.nix      |  2 +-
 pkgs/by-name/te/terraform-lsp/package.nix     |  2 +-
 pkgs/by-name/te/terraformer/package.nix       |  2 +-
 pkgs/by-name/te/terramate/package.nix         |  2 +-
 pkgs/by-name/te/terranix/package.nix          |  2 +-
 pkgs/by-name/te/terser/package.nix            |  2 +-
 pkgs/by-name/te/tesh/package.nix              |  2 +-
 pkgs/by-name/te/test-drive/package.nix        |  2 +-
 pkgs/by-name/te/testkube/package.nix          |  2 +-
 pkgs/by-name/te/testssl/package.nix           |  2 +-
 pkgs/by-name/te/tev/package.nix               |  2 +-
 pkgs/by-name/te/tewi-font/package.nix         |  2 +-
 pkgs/by-name/te/texstudio/package.nix         |  2 +-
 pkgs/by-name/te/text-engine/package.nix       |  2 +-
 pkgs/by-name/te/textual-paint/package.nix     |  4 +-
 pkgs/by-name/te/texture-synthesis/package.nix |  2 +-
 pkgs/by-name/te/tezos-rust-libs/package.nix   |  2 +-
 pkgs/by-name/tf/tf-summarize/package.nix      |  2 +-
 pkgs/by-name/tf/tf2pulumi/package.nix         |  2 +-
 pkgs/by-name/tf/tfautomv/package.nix          |  2 +-
 pkgs/by-name/tf/tfswitch/package.nix          |  2 +-
 pkgs/by-name/tf/tfupdate/package.nix          |  2 +-
 pkgs/by-name/tg/tgswitch/package.nix          |  2 +-
 pkgs/by-name/tg/tgt/package.nix               |  2 +-
 pkgs/by-name/th/thc-hydra/package.nix         |  2 +-
 pkgs/by-name/th/thc-ipv6/package.nix          |  2 +-
 .../th/the-legend-of-edgar/package.nix        |  2 +-
 pkgs/by-name/th/theforceengine/package.nix    |  2 +-
 pkgs/by-name/th/theft/package.nix             |  2 +-
 pkgs/by-name/th/theme-sh/package.nix          |  2 +-
 pkgs/by-name/th/theme-vertex/package.nix      |  2 +-
 pkgs/by-name/th/themechanger/package.nix      |  2 +-
 pkgs/by-name/th/themix-gui/package.nix        |  2 +-
 pkgs/by-name/th/thermald/package.nix          |  2 +-
 pkgs/by-name/th/thicket/package.nix           |  2 +-
 .../th/thin-provisioning-tools/package.nix    |  2 +-
 pkgs/by-name/th/thinkfan/package.nix          |  2 +-
 pkgs/by-name/th/thokr/package.nix             |  2 +-
 pkgs/by-name/th/thrift-ls/package.nix         |  2 +-
 pkgs/by-name/th/throttled/package.nix         |  2 +-
 pkgs/by-name/th/thud/package.nix              |  2 +-
 pkgs/by-name/th/thumbs/package.nix            |  2 +-
 pkgs/by-name/th/thunderbolt/package.nix       |  2 +-
 pkgs/by-name/ti/tidb/package.nix              |  2 +-
 pkgs/by-name/ti/tidy-viewer/package.nix       |  2 +-
 pkgs/by-name/ti/tigervnc/package.nix          |  2 +-
 pkgs/by-name/ti/tiledb/package.nix            |  2 +-
 pkgs/by-name/ti/tilix/package.nix             |  2 +-
 pkgs/by-name/ti/tilt/package.nix              |  2 +-
 pkgs/by-name/ti/time-ghc-modules/package.nix  |  2 +-
 .../ti/timelapse-deflicker/package.nix        |  2 +-
 pkgs/by-name/ti/timemachine/package.nix       |  2 +-
 pkgs/by-name/ti/timer/package.nix             |  2 +-
 pkgs/by-name/ti/timescaledb-tune/package.nix  |  2 +-
 pkgs/by-name/ti/timew-sync-client/package.nix |  2 +-
 pkgs/by-name/ti/timew-sync-server/package.nix |  2 +-
 pkgs/by-name/ti/timewall/package.nix          |  2 +-
 pkgs/by-name/ti/timewarrior/package.nix       |  2 +-
 pkgs/by-name/ti/tini/package.nix              |  2 +-
 pkgs/by-name/ti/tintin/package.nix            |  2 +-
 pkgs/by-name/ti/tiny-dfr/package.nix          |  2 +-
 pkgs/by-name/ti/tinycbor/package.nix          |  2 +-
 pkgs/by-name/ti/tinyfecvpn/package.nix        |  2 +-
 pkgs/by-name/ti/tinygo/package.nix            |  2 +-
 pkgs/by-name/ti/tinymembench/package.nix      |  2 +-
 pkgs/by-name/ti/tinyobjloader/package.nix     |  2 +-
 pkgs/by-name/ti/tinyproxy/package.nix         |  2 +-
 pkgs/by-name/ti/tinyxml-2/package.nix         |  2 +-
 pkgs/by-name/ti/tiv/package.nix               |  2 +-
 pkgs/by-name/tk/tkey-ssh-agent/package.nix    |  2 +-
 pkgs/by-name/tl/tl-expected/package.nix       |  2 +-
 pkgs/by-name/tl/tllist/package.nix            |  2 +-
 pkgs/by-name/tl/tlock/package.nix             |  2 +-
 pkgs/by-name/tl/tlrc/package.nix              |  2 +-
 pkgs/by-name/tl/tlwg/package.nix              |  2 +-
 pkgs/by-name/tm/tmatrix/package.nix           |  2 +-
 pkgs/by-name/tm/tml/package.nix               |  2 +-
 pkgs/by-name/tm/tmpmail/package.nix           |  2 +-
 pkgs/by-name/tm/tmux-mem-cpu-load/package.nix |  2 +-
 pkgs/by-name/tm/tmux-xpanes/package.nix       |  2 +-
 pkgs/by-name/tm/tmux/package.nix              |  2 +-
 pkgs/by-name/tm/tmuxifier/package.nix         |  2 +-
 pkgs/by-name/tn/tncattach/package.nix         |  2 +-
 pkgs/by-name/tn/tnef/package.nix              |  2 +-
 pkgs/by-name/to/to-html/package.nix           |  2 +-
 pkgs/by-name/to/toast/package.nix             |  2 +-
 pkgs/by-name/to/tocpdf/package.nix            |  2 +-
 pkgs/by-name/to/todo/package.nix              |  2 +-
 pkgs/by-name/to/todofi-sh/package.nix         |  2 +-
 pkgs/by-name/to/todoist/package.nix           |  2 +-
 pkgs/by-name/to/tofi/package.nix              |  2 +-
 pkgs/by-name/to/toml-f/package.nix            |  2 +-
 pkgs/by-name/to/ton/package.nix               |  2 +-
 pkgs/by-name/to/toolbox/package.nix           |  2 +-
 pkgs/by-name/to/topfew-rs/package.nix         |  2 +-
 pkgs/by-name/to/topfew/package.nix            |  2 +-
 pkgs/by-name/to/topicctl/package.nix          |  2 +-
 pkgs/by-name/to/topydo/package.nix            |  2 +-
 pkgs/by-name/to/torctl/package.nix            |  2 +-
 pkgs/by-name/to/torrent7z/package.nix         |  2 +-
 pkgs/by-name/to/torrential/package.nix        |  2 +-
 pkgs/by-name/to/torrentstream/package.nix     |  2 +-
 pkgs/by-name/to/toss/package.nix              |  2 +-
 pkgs/by-name/to/touchegg/package.nix          |  2 +-
 pkgs/by-name/to/tox-node/package.nix          |  2 +-
 pkgs/by-name/to/toxic/package.nix             |  2 +-
 pkgs/by-name/to/toxiproxy/package.nix         |  2 +-
 pkgs/by-name/tp/tp-auto-kbbl/package.nix      |  2 +-
 pkgs/by-name/tp/tpacpi-bat/package.nix        |  2 +-
 pkgs/by-name/tp/tparse/package.nix            |  2 +-
 pkgs/by-name/tp/tpi/package.nix               |  2 +-
 pkgs/by-name/tp/tplay/package.nix             |  2 +-
 pkgs/by-name/tp/tpm2-abrmd/package.nix        |  2 +-
 pkgs/by-name/tp/tpm2-openssl/package.nix      |  2 +-
 pkgs/by-name/tp/tpm2-totp/package.nix         |  2 +-
 pkgs/by-name/tp/tpsecore/package.nix          |  2 +-
 pkgs/by-name/tr/tracebox/package.nix          |  2 +-
 pkgs/by-name/tr/trackballs/package.nix        |  2 +-
 pkgs/by-name/tr/trackma/package.nix           |  2 +-
 pkgs/by-name/tr/tracy/package.nix             |  2 +-
 .../tr/traefik-certs-dumper/package.nix       |  2 +-
 pkgs/by-name/tr/traitor/package.nix           |  2 +-
 pkgs/by-name/tr/trak/package.nix              |  2 +-
 pkgs/by-name/tr/tran/package.nix              |  2 +-
 pkgs/by-name/tr/transcrypt/package.nix        |  2 +-
 pkgs/by-name/tr/transfer-sh/package.nix       |  2 +-
 pkgs/by-name/tr/transifex-cli/package.nix     |  2 +-
 pkgs/by-name/tr/translate-shell/package.nix   |  2 +-
 pkgs/by-name/tr/transmission_3/package.nix    |  2 +-
 pkgs/by-name/tr/trash-cli/package.nix         |  2 +-
 pkgs/by-name/tr/trayscale/package.nix         |  2 +-
 pkgs/by-name/tr/trdl-client/package.nix       |  2 +-
 pkgs/by-name/tr/tre-command/package.nix       |  2 +-
 pkgs/by-name/tr/tree-from-tags/package.nix    |  2 +-
 pkgs/by-name/tr/treedome/package.nix          |  2 +-
 pkgs/by-name/tr/treefmt/package.nix           |  2 +-
 pkgs/by-name/tr/tremc/package.nix             |  2 +-
 pkgs/by-name/tr/trexio/package.nix            |  2 +-
 pkgs/by-name/tr/trf/package.nix               |  2 +-
 pkgs/by-name/tr/triforce-lv2/package.nix      |  2 +-
 pkgs/by-name/tr/trillian/package.nix          |  2 +-
 pkgs/by-name/tr/trimal/package.nix            |  2 +-
 pkgs/by-name/tr/trippy/package.nix            |  2 +-
 pkgs/by-name/tr/triton/package.nix            |  2 +-
 pkgs/by-name/tr/trlib/package.nix             |  2 +-
 pkgs/by-name/tr/trompeloeil/package.nix       |  2 +-
 pkgs/by-name/tr/trunk-ng/package.nix          |  2 +-
 pkgs/by-name/tr/trunk-recorder/package.nix    |  2 +-
 pkgs/by-name/tr/trunk/package.nix             |  2 +-
 pkgs/by-name/tr/try/package.nix               |  2 +-
 pkgs/by-name/ts/ts-warp/package.nix           |  2 +-
 pkgs/by-name/ts/ts_query_ls/package.nix       |  2 +-
 pkgs/by-name/ts/tsduck/package.nix            |  2 +-
 pkgs/by-name/ts/tslib/package.nix             |  2 +-
 .../tt/tt-rss-plugin-feediron/package.nix     |  2 +-
 .../tt/tt-rss-theme-feedly/package.nix        |  2 +-
 pkgs/by-name/tt/tt/package.nix                |  2 +-
 pkgs/by-name/tt/tt2020/package.nix            |  2 +-
 pkgs/by-name/tt/ttags/package.nix             |  2 +-
 pkgs/by-name/tt/ttchat/package.nix            |  2 +-
 pkgs/by-name/tt/ttdl/package.nix              |  2 +-
 pkgs/by-name/tt/tty-share/package.nix         |  2 +-
 pkgs/by-name/tt/tty-solitaire/package.nix     |  2 +-
 pkgs/by-name/tt/ttygif/package.nix            |  2 +-
 pkgs/by-name/tt/ttylog/package.nix            |  2 +-
 pkgs/by-name/tt/ttyper/package.nix            |  2 +-
 pkgs/by-name/tt/ttyplot/package.nix           |  2 +-
 pkgs/by-name/tu/tuba/package.nix              |  2 +-
 pkgs/by-name/tu/tuc/package.nix               |  2 +-
 pkgs/by-name/tu/tuckr/package.nix             |  2 +-
 pkgs/by-name/tu/tuhi/package.nix              |  2 +-
 pkgs/by-name/tu/tui-journal/package.nix       |  2 +-
 pkgs/by-name/tu/tuir/package.nix              |  2 +-
 pkgs/by-name/tu/tuntox/package.nix            |  2 +-
 pkgs/by-name/tu/tunwg/package.nix             |  2 +-
 pkgs/by-name/tu/tup/package.nix               |  2 +-
 pkgs/by-name/tu/tuptime/package.nix           |  2 +-
 pkgs/by-name/tu/turbocase/package.nix         |  2 +-
 pkgs/by-name/tu/turnon/package.nix            |  2 +-
 pkgs/by-name/tu/turso-cli/package.nix         |  2 +-
 pkgs/by-name/tu/turtle-build/package.nix      |  2 +-
 pkgs/by-name/tu/tusc-sh/package.nix           |  2 +-
 pkgs/by-name/tu/tut/package.nix               |  2 +-
 pkgs/by-name/tu/tuxmux/package.nix            |  2 +-
 pkgs/by-name/tv/tv/package.nix                |  2 +-
 pkgs/by-name/tv/tvm/package.nix               |  2 +-
 pkgs/by-name/tw/twa/package.nix               |  2 +-
 pkgs/by-name/tw/tweego/package.nix            |  2 +-
 pkgs/by-name/tw/twitch-cli/package.nix        |  2 +-
 pkgs/by-name/tw/twitch-hls-client/package.nix |  2 +-
 .../tw/twitter-color-emoji/package.nix        |  2 +-
 pkgs/by-name/tx/txtw/package.nix              |  2 +-
 pkgs/by-name/ty/tydra/package.nix             |  2 +-
 pkgs/by-name/ty/tygo/package.nix              |  2 +-
 pkgs/by-name/ty/tym/package.nix               |  2 +-
 pkgs/by-name/ty/typescript/package.nix        |  2 +-
 pkgs/by-name/ty/typeshare/package.nix         |  2 +-
 pkgs/by-name/ty/typical/package.nix           |  2 +-
 pkgs/by-name/ty/typioca/package.nix           |  2 +-
 pkgs/by-name/ty/typstfmt/package.nix          |  2 +-
 pkgs/by-name/tz/tz/package.nix                |  2 +-
 pkgs/by-name/u2/u2ps/package.nix              |  2 +-
 pkgs/by-name/ua/uacme/package.nix             |  2 +-
 pkgs/by-name/ua/uair/package.nix              |  2 +-
 pkgs/by-name/ua/uarmsolver/package.nix        |  2 +-
 pkgs/by-name/ub/ubertooth/package.nix         |  2 +-
 pkgs/by-name/ub/ubi_reader/package.nix        |  2 +-
 pkgs/by-name/uc/uchess/package.nix            |  2 +-
 pkgs/by-name/uc/ucode/package.nix             |  2 +-
 pkgs/by-name/uc/ucx/package.nix               |  2 +-
 pkgs/by-name/ud/uddup/package.nix             |  2 +-
 pkgs/by-name/ud/udevil/package.nix            |  2 +-
 pkgs/by-name/ud/udict/package.nix             |  2 +-
 pkgs/by-name/ud/udiskie/package.nix           |  2 +-
 pkgs/by-name/ud/udp2raw/package.nix           |  2 +-
 pkgs/by-name/ud/udpreplay/package.nix         |  2 +-
 pkgs/by-name/ud/udpt/package.nix              |  2 +-
 pkgs/by-name/ue/ueberzugpp/package.nix        |  2 +-
 .../ue/uefi-firmware-parser/package.nix       |  2 +-
 pkgs/by-name/ue/uefi-run/package.nix          |  2 +-
 pkgs/by-name/ue/uesave/package.nix            |  2 +-
 pkgs/by-name/uf/ufiformat/package.nix         |  2 +-
 pkgs/by-name/uf/uftpd/package.nix             |  2 +-
 pkgs/by-name/uf/uftrace/package.nix           |  2 +-
 pkgs/by-name/ug/uget-integrator/package.nix   |  2 +-
 pkgs/by-name/ug/uglify-js/package.nix         |  2 +-
 pkgs/by-name/ug/ugm/package.nix               |  2 +-
 pkgs/by-name/ug/ugtrain/package.nix           |  2 +-
 pkgs/by-name/uh/uhttpmock_1_0/package.nix     |  2 +-
 pkgs/by-name/uh/uhubctl/package.nix           |  2 +-
 pkgs/by-name/ui/uivonim/package.nix           |  2 +-
 pkgs/by-name/ul/ulid/package.nix              |  2 +-
 pkgs/by-name/ul/ultralist/package.nix         |  2 +-
 pkgs/by-name/ul/ultrastardx/package.nix       |  2 +-
 pkgs/by-name/um/umoci/package.nix             |  2 +-
 pkgs/by-name/um/umoria/package.nix            |  2 +-
 pkgs/by-name/um/umpire/package.nix            |  2 +-
 pkgs/by-name/um/umurmur/package.nix           |  2 +-
 pkgs/by-name/un/unbook/package.nix            |  2 +-
 pkgs/by-name/un/unclutter-xfixes/package.nix  |  2 +-
 pkgs/by-name/un/undervolt/package.nix         |  2 +-
 pkgs/by-name/un/unfurl/package.nix            |  2 +-
 pkgs/by-name/un/ungit/package.nix             |  2 +-
 pkgs/by-name/un/unhide/package.nix            |  2 +-
 pkgs/by-name/un/unibilium/package.nix         |  2 +-
 pkgs/by-name/un/unicode-paracode/package.nix  |  2 +-
 .../un/unifiedpush-common-proxies/package.nix |  2 +-
 pkgs/by-name/un/unimap/package.nix            |  2 +-
 pkgs/by-name/un/unison-fsmonitor/package.nix  |  2 +-
 pkgs/by-name/un/unit/package.nix              |  2 +-
 pkgs/by-name/un/unittest-cpp/package.nix      |  2 +-
 pkgs/by-name/un/unnethack/package.nix         |  2 +-
 pkgs/by-name/un/unoconv/package.nix           |  2 +-
 pkgs/by-name/un/unpoller/package.nix          |  2 +-
 pkgs/by-name/un/unshield/package.nix          |  2 +-
 pkgs/by-name/un/unsilence/package.nix         |  2 +-
 pkgs/by-name/un/unstructured-api/package.nix  |  2 +-
 pkgs/by-name/un/unused/package.nix            |  2 +-
 pkgs/by-name/un/unvanquished/package.nix      |  2 +-
 pkgs/by-name/un/unyaffs/package.nix           |  2 +-
 pkgs/by-name/un/unzoo/package.nix             |  2 +-
 pkgs/by-name/up/up/package.nix                |  2 +-
 pkgs/by-name/up/updatecli/package.nix         |  2 +-
 pkgs/by-name/up/uplosi/package.nix            |  2 +-
 pkgs/by-name/up/ups/package.nix               |  2 +-
 pkgs/by-name/up/upterm/package.nix            |  2 +-
 pkgs/by-name/up/uptime-kuma/package.nix       |  2 +-
 pkgs/by-name/up/uptimed/package.nix           |  2 +-
 pkgs/by-name/uq/uqm/3dovideo.nix              |  2 +-
 pkgs/by-name/ur/urban-cli/package.nix         |  2 +-
 pkgs/by-name/ur/urdfdom-headers/package.nix   |  2 +-
 pkgs/by-name/ur/urdfdom/package.nix           |  2 +-
 pkgs/by-name/ur/uri/package.nix               |  2 +-
 pkgs/by-name/ur/urlencode/package.nix         |  2 +-
 pkgs/by-name/ur/urlhunter/package.nix         |  2 +-
 pkgs/by-name/ur/urlwatch/package.nix          |  2 +-
 pkgs/by-name/ur/urn/package.nix               |  2 +-
 pkgs/by-name/us/usage/package.nix             |  2 +-
 pkgs/by-name/us/usbview/package.nix           |  2 +-
 pkgs/by-name/us/userborn/package.nix          |  2 +-
 pkgs/by-name/us/userhosts/package.nix         |  2 +-
 pkgs/by-name/us/usrsctp/package.nix           |  2 +-
 pkgs/by-name/us/ustreamer/package.nix         |  2 +-
 pkgs/by-name/ut/utf8cpp/package.nix           |  2 +-
 pkgs/by-name/ut/utf8proc/package.nix          |  2 +-
 pkgs/by-name/ut/uthash/package.nix            |  2 +-
 pkgs/by-name/ut/uthenticode/package.nix       |  2 +-
 pkgs/by-name/ut/utox/package.nix              |  2 +-
 pkgs/by-name/uw/uwufetch/package.nix          |  2 +-
 pkgs/by-name/uw/uwuify/package.nix            |  2 +-
 .../v2ray-domain-list-community/package.nix   |  2 +-
 pkgs/by-name/v2/v2ray/package.nix             |  2 +-
 .../by-name/va/vaapi-intel-hybrid/package.nix |  2 +-
 .../va/vala-language-server/package.nix       |  2 +-
 pkgs/by-name/va/vale/package.nix              |  2 +-
 pkgs/by-name/va/vale/styles.nix               | 14 ++---
 pkgs/by-name/va/valijson/package.nix          |  2 +-
 pkgs/by-name/va/valkey/package.nix            |  2 +-
 pkgs/by-name/va/vals/package.nix              |  2 +-
 pkgs/by-name/va/valum/package.nix             |  2 +-
 pkgs/by-name/va/valuta/package.nix            |  2 +-
 .../va/vapoursynth-mvtools/package.nix        |  2 +-
 pkgs/by-name/va/vault-medusa/package.nix      |  2 +-
 pkgs/by-name/va/vault-ssh-plus/package.nix    |  2 +-
 pkgs/by-name/va/vault-tasks/package.nix       |  2 +-
 pkgs/by-name/va/vault-unseal/package.nix      |  2 +-
 pkgs/by-name/va/vault/package.nix             |  2 +-
 pkgs/by-name/va/vazir-code-font/package.nix   |  2 +-
 pkgs/by-name/va/vazir-fonts/package.nix       |  2 +-
 pkgs/by-name/vc/vcftools/package.nix          |  2 +-
 pkgs/by-name/vc/vcg/package.nix               |  2 +-
 pkgs/by-name/vc/vcpkg-tool/package.nix        |  2 +-
 pkgs/by-name/vc/vcpkg/package.nix             |  2 +-
 pkgs/by-name/vc/vcs_query/package.nix         |  2 +-
 pkgs/by-name/vd/vde2/package.nix              |  2 +-
 pkgs/by-name/vd/vdhcoapp/filepicker.nix       |  2 +-
 pkgs/by-name/vd/vdhcoapp/package.nix          |  2 +-
 pkgs/by-name/vd/vdo/package.nix               |  2 +-
 pkgs/by-name/ve/vector/package.nix            |  2 +-
 pkgs/by-name/ve/vegeta/package.nix            |  2 +-
 pkgs/by-name/ve/velero/package.nix            |  2 +-
 pkgs/by-name/ve/vendir/package.nix            |  2 +-
 pkgs/by-name/ve/venta/package.nix             |  2 +-
 pkgs/by-name/ve/vep/package.nix               |  2 +-
 pkgs/by-name/ve/verapdf/package.nix           |  2 +-
 pkgs/by-name/ve/vercel-pkg/package.nix        |  2 +-
 pkgs/by-name/ve/verco/package.nix             |  2 +-
 pkgs/by-name/ve/verifpal/package.nix          |  2 +-
 pkgs/by-name/ve/verilator/package.nix         |  2 +-
 pkgs/by-name/ve/vermin/package.nix            |  2 +-
 pkgs/by-name/ve/versus/package.nix            |  2 +-
 pkgs/by-name/ve/veryl/package.nix             |  2 +-
 pkgs/by-name/vf/vfkit/package.nix             |  2 +-
 pkgs/by-name/vg/vgrep/package.nix             |  2 +-
 pkgs/by-name/vh/vhdl-ls/package.nix           |  2 +-
 pkgs/by-name/vh/vhs/package.nix               |  2 +-
 pkgs/by-name/vi/viddy/package.nix             |  2 +-
 pkgs/by-name/vi/vidmerger/package.nix         |  2 +-
 pkgs/by-name/vi/vieb/package.nix              |  2 +-
 pkgs/by-name/vi/vikunja/package.nix           |  2 +-
 pkgs/by-name/vi/vim-startuptime/package.nix   |  2 +-
 pkgs/by-name/vi/vimcats/package.nix           |  2 +-
 pkgs/by-name/vi/vimer/package.nix             |  2 +-
 pkgs/by-name/vi/vimiv-qt/package.nix          |  2 +-
 pkgs/by-name/vi/vimix-gtk-themes/package.nix  |  2 +-
 pkgs/by-name/vi/vimix-icon-theme/package.nix  |  2 +-
 pkgs/by-name/vi/vimpc/package.nix             |  2 +-
 pkgs/by-name/vi/virter/package.nix            |  2 +-
 pkgs/by-name/vi/virtiofsd/package.nix         |  2 +-
 pkgs/by-name/vi/vis/package.nix               |  2 +-
 pkgs/by-name/vi/vitess/package.nix            |  2 +-
 pkgs/by-name/vi/vitetris/package.nix          |  2 +-
 pkgs/by-name/vi/viu/package.nix               |  2 +-
 pkgs/by-name/vi/vivictpp/package.nix          |  2 +-
 pkgs/by-name/vi/vivid/package.nix             |  2 +-
 pkgs/by-name/vk/vk-bootstrap/package.nix      |  2 +-
 pkgs/by-name/vk/vkbasalt-cli/package.nix      |  2 +-
 pkgs/by-name/vk/vkdevicechooser/package.nix   |  2 +-
 pkgs/by-name/vk/vkdisplayinfo/package.nix     |  2 +-
 pkgs/by-name/vk/vkmark/package.nix            |  2 +-
 pkgs/by-name/vl/vlang/package.nix             |  2 +-
 pkgs/by-name/vm/vmtouch/package.nix           |  2 +-
 pkgs/by-name/vn/vnstat/package.nix            |  2 +-
 pkgs/by-name/vo/vo-amrwbenc/package.nix       |  2 +-
 pkgs/by-name/vo/vocal/package.nix             |  2 +-
 pkgs/by-name/vo/volctl/package.nix            |  2 +-
 pkgs/by-name/vo/volumeicon/package.nix        |  2 +-
 pkgs/by-name/vp/vpp/package.nix               |  2 +-
 pkgs/by-name/vs/vscode-js-debug/package.nix   |  2 +-
 .../vscode-langservers-extracted/package.nix  |  2 +-
 pkgs/by-name/vs/vscode-runner/package.nix     |  2 +-
 pkgs/by-name/vs/vsh/package.nix               |  2 +-
 pkgs/by-name/vt/vtable-dumper/package.nix     |  2 +-
 pkgs/by-name/vt/vtracer/package.nix           |  2 +-
 .../robin-hood-hashing.nix                    |  2 +-
 pkgs/by-name/vu/vultr-cli/package.nix         |  2 +-
 pkgs/by-name/vu/vultr/package.nix             |  2 +-
 pkgs/by-name/vv/vvvvvv/package.nix            |  2 +-
 pkgs/by-name/w3/w3m/package.nix               |  2 +-
 pkgs/by-name/w_/w_scan2/package.nix           |  2 +-
 pkgs/by-name/wa/wabt/package.nix              |  2 +-
 pkgs/by-name/wa/wad/package.nix               |  2 +-
 pkgs/by-name/wa/wait4x/package.nix            |  2 +-
 pkgs/by-name/wa/wakeonlan/package.nix         |  2 +-
 pkgs/by-name/wa/wal-g/package.nix             |  2 +-
 pkgs/by-name/wa/wal-listener/package.nix      |  2 +-
 pkgs/by-name/wa/walk/package.nix              |  2 +-
 pkgs/by-name/wa/walker/package.nix            |  2 +-
 pkgs/by-name/wa/wallust/package.nix           |  2 +-
 pkgs/by-name/wa/wallutils/package.nix         |  2 +-
 pkgs/by-name/wa/wander/package.nix            |  2 +-
 pkgs/by-name/wa/wannier90/package.nix         |  2 +-
 pkgs/by-name/wa/waon/package.nix              |  2 +-
 pkgs/by-name/wa/wapm/package.nix              |  2 +-
 pkgs/by-name/wa/wargus/package.nix            |  2 +-
 pkgs/by-name/wa/wargus/stratagus.nix          |  2 +-
 pkgs/by-name/wa/warp-plus/package.nix         |  2 +-
 pkgs/by-name/wa/warpd/package.nix             |  2 +-
 pkgs/by-name/wa/warpinator/package.nix        |  2 +-
 pkgs/by-name/wa/wasm-tools/package.nix        |  2 +-
 pkgs/by-name/wa/wasm3/package.nix             |  2 +-
 pkgs/by-name/wa/wasmer-pack/package.nix       |  2 +-
 pkgs/by-name/wa/wasmserve/package.nix         |  2 +-
 pkgs/by-name/wa/wastebin/package.nix          |  2 +-
 pkgs/by-name/wa/wasynth/package.nix           |  2 +-
 pkgs/by-name/wa/watchdogd/package.nix         |  2 +-
 pkgs/by-name/wa/watchlog/package.nix          |  2 +-
 pkgs/by-name/wa/watershot/package.nix         |  2 +-
 pkgs/by-name/wa/watson/package.nix            |  2 +-
 pkgs/by-name/wa/wavemon/package.nix           |  2 +-
 pkgs/by-name/wa/wavpack/package.nix           |  2 +-
 pkgs/by-name/wa/way-displays/package.nix      |  2 +-
 .../wa/wayback-machine-archiver/package.nix   |  2 +-
 pkgs/by-name/wa/wayback/package.nix           |  2 +-
 pkgs/by-name/wa/waybox/package.nix            |  2 +-
 pkgs/by-name/wa/wayfarer/package.nix          |  2 +-
 pkgs/by-name/wa/wayland-logout/package.nix    |  2 +-
 .../wayland-pipewire-idle-inhibit/package.nix |  2 +-
 pkgs/by-name/wa/waylyrics/package.nix         |  2 +-
 pkgs/by-name/wa/waynergy/package.nix          |  2 +-
 pkgs/by-name/wa/wayshot/package.nix           |  2 +-
 pkgs/by-name/wa/wayvnc/package.nix            |  2 +-
 pkgs/by-name/wa/wazero/package.nix            |  2 +-
 pkgs/by-name/wb/wb32-dfu-updater/package.nix  |  2 +-
 pkgs/by-name/wb/wbg/package.nix               |  2 +-
 pkgs/by-name/wc/wcpg/package.nix              |  2 +-
 pkgs/by-name/wd/wdisplays/package.nix         |  2 +-
 pkgs/by-name/we/weave-gitops/package.nix      |  2 +-
 pkgs/by-name/we/weaver/package.nix            |  2 +-
 pkgs/by-name/we/weaviate/package.nix          |  2 +-
 pkgs/by-name/we/web-ext/package.nix           |  2 +-
 pkgs/by-name/we/webcat/package.nix            |  2 +-
 pkgs/by-name/we/webdis/package.nix            |  2 +-
 .../we/webfontkitgenerator/package.nix        |  2 +-
 pkgs/by-name/we/webhook/package.nix           |  2 +-
 pkgs/by-name/we/webmesh/package.nix           |  2 +-
 .../by-name/we/webp-pixbuf-loader/package.nix |  2 +-
 pkgs/by-name/we/websocketd/package.nix        |  2 +-
 pkgs/by-name/we/websocketpp/package.nix       |  2 +-
 pkgs/by-name/we/weggli/package.nix            |  2 +-
 pkgs/by-name/we/wego/package.nix              |  2 +-
 pkgs/by-name/we/weidu/package.nix             |  2 +-
 pkgs/by-name/we/wesher/package.nix            |  2 +-
 pkgs/by-name/wf/wf-recorder/package.nix       |  2 +-
 pkgs/by-name/wf/wfa2-lib/package.nix          |  2 +-
 pkgs/by-name/wg/wg-access-server/package.nix  |  2 +-
 pkgs/by-name/wg/wget2/package.nix             |  2 +-
 pkgs/by-name/wg/wgo/package.nix               |  2 +-
 pkgs/by-name/wh/whatfiles/package.nix         |  2 +-
 pkgs/by-name/wh/whipper/package.nix           |  2 +-
 pkgs/by-name/wh/whisper/package.nix           |  2 +-
 pkgs/by-name/wh/whistle/package.nix           |  2 +-
 pkgs/by-name/wh/whitebophir/package.nix       |  2 +-
 .../by-name/wh/whitesur-gtk-theme/package.nix |  2 +-
 pkgs/by-name/wh/whoami/package.nix            |  2 +-
 pkgs/by-name/wh/whois/package.nix             |  2 +-
 pkgs/by-name/wh/whsniff/package.nix           |  2 +-
 pkgs/by-name/wi/widelands/package.nix         |  2 +-
 pkgs/by-name/wi/wifi-password/package.nix     |  2 +-
 pkgs/by-name/wi/wifish/package.nix            |  2 +-
 pkgs/by-name/wi/wifite2/package.nix           |  2 +-
 pkgs/by-name/wi/wiggle/package.nix            |  2 +-
 pkgs/by-name/wi/wiiload/package.nix           |  2 +-
 pkgs/by-name/wi/wike/package.nix              |  2 +-
 pkgs/by-name/wi/wimboot/package.nix           |  2 +-
 pkgs/by-name/wi/win2xcur/package.nix          |  2 +-
 pkgs/by-name/wi/windmill/package.nix          |  2 +-
 pkgs/by-name/wi/windowchef/package.nix        |  2 +-
 pkgs/by-name/wi/windows10-icons/package.nix   |  2 +-
 pkgs/by-name/wi/wineasio/package.nix          |  2 +-
 pkgs/by-name/wi/wire/package.nix              |  2 +-
 pkgs/by-name/wi/wiredtiger/package.nix        |  2 +-
 .../wi/wireguard-vanity-keygen/package.nix    |  2 +-
 pkgs/by-name/wi/wireproxy/package.nix         |  2 +-
 pkgs/by-name/wi/wiringpi/package.nix          |  2 +-
 pkgs/by-name/wi/wiseunpacker/package.nix      |  2 +-
 pkgs/by-name/wi/wishbone-tool/package.nix     |  2 +-
 pkgs/by-name/wi/wishlist/package.nix          |  2 +-
 pkgs/by-name/wi/wit-bindgen/package.nix       |  2 +-
 pkgs/by-name/wi/witness/package.nix           |  2 +-
 pkgs/by-name/wl/wl-clip-persist/package.nix   |  2 +-
 pkgs/by-name/wl/wl-clipboard-rs/package.nix   |  2 +-
 pkgs/by-name/wl/wl-clipboard-x11/package.nix  |  2 +-
 pkgs/by-name/wl/wl-clipboard/package.nix      |  2 +-
 pkgs/by-name/wl/wl-color-picker/package.nix   |  2 +-
 pkgs/by-name/wl/wl-gammarelay-rs/package.nix  |  2 +-
 pkgs/by-name/wl/wl-mirror/package.nix         |  2 +-
 pkgs/by-name/wl/wldash/package.nix            |  2 +-
 pkgs/by-name/wl/wleave/package.nix            |  2 +-
 pkgs/by-name/wl/wljoywake/package.nix         |  2 +-
 pkgs/by-name/wl/wlogout/package.nix           |  2 +-
 pkgs/by-name/wl/wlr-which-key/package.nix     |  2 +-
 pkgs/by-name/wl/wlx-overlay-s/package.nix     |  2 +-
 pkgs/by-name/wm/wmic-bin/package.nix          |  2 +-
 pkgs/by-name/wm/wmutils-core/package.nix      |  2 +-
 pkgs/by-name/wm/wmutils-opt/package.nix       |  2 +-
 pkgs/by-name/wo/wob/package.nix               |  2 +-
 pkgs/by-name/wo/woeusb-ng/package.nix         |  2 +-
 pkgs/by-name/wo/woeusb/package.nix            |  2 +-
 pkgs/by-name/wo/woff2/package.nix             |  2 +-
 pkgs/by-name/wo/wolf-shaper/package.nix       |  2 +-
 pkgs/by-name/wo/wolfebin/package.nix          |  2 +-
 pkgs/by-name/wo/wordgrinder/package.nix       |  2 +-
 pkgs/by-name/wo/workshop-runner/package.nix   |  2 +-
 pkgs/by-name/wo/wormhole-william/package.nix  |  2 +-
 pkgs/by-name/wp/wpaperd/package.nix           |  2 +-
 pkgs/by-name/wp/wpgtk/package.nix             |  2 +-
 pkgs/by-name/wp/wprecon/package.nix           |  2 +-
 pkgs/by-name/wr/wrap/package.nix              |  2 +-
 pkgs/by-name/wr/write-good/package.nix        |  2 +-
 pkgs/by-name/wr/writefreely/package.nix       |  2 +-
 pkgs/by-name/wr/wrk/package.nix               |  2 +-
 pkgs/by-name/ws/wsdd/package.nix              |  2 +-
 pkgs/by-name/ws/wsl-open/package.nix          |  2 +-
 pkgs/by-name/ws/wsl-vpnkit/package.nix        |  2 +-
 pkgs/by-name/ws/wslu/package.nix              |  2 +-
 pkgs/by-name/ws/wsysmon/package.nix           |  2 +-
 pkgs/by-name/wt/wtfutil/package.nix           |  2 +-
 pkgs/by-name/wt/wthrr/package.nix             |  2 +-
 pkgs/by-name/wt/wttrbar/package.nix           |  2 +-
 pkgs/by-name/wt/wtwitch/package.nix           |  2 +-
 pkgs/by-name/wt/wtype/package.nix             |  2 +-
 pkgs/by-name/wu/wush/package.nix              |  2 +-
 pkgs/by-name/wu/wuzz/package.nix              |  2 +-
 pkgs/by-name/wx/wxGTK31/package.nix           |  2 +-
 pkgs/by-name/wx/wxGTK32/package.nix           |  2 +-
 pkgs/by-name/wx/wxhexeditor/package.nix       |  2 +-
 pkgs/by-name/wx/wxmacmolplt/package.nix       |  2 +-
 pkgs/by-name/wx/wxsqlite3/package.nix         |  2 +-
 pkgs/by-name/wx/wxsqliteplus/package.nix      |  2 +-
 .../x-/x-create-mouse-void/package.nix        |  2 +-
 pkgs/by-name/x1/x11docker/package.nix         |  2 +-
 pkgs/by-name/x1/x11vnc/package.nix            |  2 +-
 pkgs/by-name/x4/x4/package.nix                |  2 +-
 pkgs/by-name/x4/x42-avldrums/package.nix      |  2 +-
 pkgs/by-name/x4/x42-gmsynth/package.nix       |  2 +-
 pkgs/by-name/xa/xapp/package.nix              |  2 +-
 pkgs/by-name/xa/xarchiver/package.nix         |  2 +-
 pkgs/by-name/xa/xautoclick/package.nix        |  2 +-
 pkgs/by-name/xb/xbanish/package.nix           |  2 +-
 pkgs/by-name/xb/xbps/package.nix              |  2 +-
 pkgs/by-name/xc/xcaddy/package.nix            |  2 +-
 pkgs/by-name/xc/xcalib/package.nix            |  2 +-
 pkgs/by-name/xc/xcat/package.nix              |  2 +-
 pkgs/by-name/xc/xcb-imdkit/package.nix        |  2 +-
 pkgs/by-name/xc/xcfun/package.nix             |  2 +-
 pkgs/by-name/xc/xchm/package.nix              |  2 +-
 pkgs/by-name/xc/xclip/package.nix             |  2 +-
 pkgs/by-name/xc/xcodes/package.nix            |  2 +-
 pkgs/by-name/xc/xcolor/package.nix            |  2 +-
 pkgs/by-name/xc/xcp/package.nix               |  2 +-
 pkgs/by-name/xc/xcur2png/package.nix          |  2 +-
 pkgs/by-name/xd/xd/package.nix                |  2 +-
 .../xd/xdg-desktop-portal-gtk/package.nix     |  2 +-
 .../xd/xdg-desktop-portal-shana/package.nix   |  2 +-
 .../xd/xdg-desktop-portal-wlr/package.nix     |  2 +-
 .../xd/xdg-desktop-portal-xapp/package.nix    |  2 +-
 pkgs/by-name/xd/xdg-launch/package.nix        |  2 +-
 pkgs/by-name/xd/xdg-ninja/package.nix         |  2 +-
 pkgs/by-name/xd/xdg-utils-cxx/package.nix     |  2 +-
 pkgs/by-name/xd/xdgmenumaker/package.nix      |  2 +-
 pkgs/by-name/xd/xdo/package.nix               |  2 +-
 pkgs/by-name/xd/xdotool/package.nix           |  2 +-
 pkgs/by-name/xd/xdp-tools/package.nix         |  2 +-
 .../by-name/xe/xe-guest-utilities/package.nix |  2 +-
 pkgs/by-name/xe/xed-editor/package.nix        |  2 +-
 pkgs/by-name/xe/xed/package.nix               |  4 +-
 pkgs/by-name/xe/xenomapper/package.nix        |  2 +-
 pkgs/by-name/xe/xephem/package.nix            |  2 +-
 pkgs/by-name/xe/xeus-zmq/package.nix          |  2 +-
 pkgs/by-name/xf/xf86_input_cmt/package.nix    |  2 +-
 pkgs/by-name/xg/xgboost/package.nix           |  2 +-
 pkgs/by-name/xh/xh/package.nix                |  2 +-
 pkgs/by-name/xi/xiccd/package.nix             |  2 +-
 pkgs/by-name/xi/xilinx-bootgen/package.nix    |  2 +-
 pkgs/by-name/xi/xinput_calibrator/package.nix |  2 +-
 pkgs/by-name/xi/xiphos/package.nix            |  2 +-
 pkgs/by-name/xi/xits-math/package.nix         |  2 +-
 pkgs/by-name/xi/xiu/package.nix               |  2 +-
 pkgs/by-name/xj/xjadeo/package.nix            |  2 +-
 pkgs/by-name/xk/xkb-switch-i3/package.nix     |  2 +-
 pkgs/by-name/xk/xkb-switch/package.nix        |  2 +-
 pkgs/by-name/xk/xkblayout-state/package.nix   |  2 +-
 pkgs/by-name/xk/xkbmon/package.nix            |  2 +-
 pkgs/by-name/xl/xl2tpd/package.nix            |  2 +-
 pkgs/by-name/xl/xlayoutdisplay/package.nix    |  2 +-
 .../xl/xlibinput-calibrator/package.nix       |  2 +-
 pkgs/by-name/xm/xmenu/package.nix             |  2 +-
 pkgs/by-name/xm/xml-security-c/package.nix    |  2 +-
 pkgs/by-name/xm/xml-tooling-c/package.nix     |  2 +-
 pkgs/by-name/xm/xmldiff/package.nix           |  2 +-
 pkgs/by-name/xm/xmloscopy/package.nix         |  2 +-
 pkgs/by-name/xm/xmlroff/package.nix           |  2 +-
 pkgs/by-name/xm/xmltoman/package.nix          |  2 +-
 pkgs/by-name/xm/xmoto/package.nix             |  2 +-
 pkgs/by-name/xm/xmousepasteblock/package.nix  |  2 +-
 pkgs/by-name/xm/xmpp-bridge/package.nix       |  2 +-
 pkgs/by-name/xm/xmppc/package.nix             |  2 +-
 pkgs/by-name/xm/xmrig-mo/package.nix          |  2 +-
 pkgs/by-name/xm/xmrig-proxy/package.nix       |  2 +-
 pkgs/by-name/xm/xmrig/package.nix             |  2 +-
 pkgs/by-name/xn/xnotify/package.nix           |  2 +-
 pkgs/by-name/xo/xob/package.nix               |  2 +-
 pkgs/by-name/xo/xorex/package.nix             |  2 +-
 pkgs/by-name/xo/xosview/package.nix           |  2 +-
 pkgs/by-name/xp/xpano/package.nix             |  2 +-
 pkgs/by-name/xp/xpar/package.nix              |  2 +-
 pkgs/by-name/xp/xplr/package.nix              |  2 +-
 pkgs/by-name/xp/xplugd/package.nix            |  2 +-
 pkgs/by-name/xp/xprintidle/package.nix        |  2 +-
 pkgs/by-name/xp/xprompt/package.nix           |  2 +-
 pkgs/by-name/xq/xq-xml/package.nix            |  2 +-
 .../xr/xrandr-invert-colors/package.nix       |  2 +-
 pkgs/by-name/xr/xray/package.nix              |  2 +-
 pkgs/by-name/xr/xrdp/package.nix              |  4 +-
 pkgs/by-name/xr/xreader/package.nix           |  2 +-
 pkgs/by-name/xr/xrectsel/package.nix          |  2 +-
 pkgs/by-name/xs/xschem/package.nix            |  2 +-
 pkgs/by-name/xs/xsecurelock/package.nix       |  2 +-
 pkgs/by-name/xs/xsel/package.nix              |  2 +-
 pkgs/by-name/xs/xsettingsd/package.nix        |  2 +-
 pkgs/by-name/xs/xsimd/package.nix             |  2 +-
 pkgs/by-name/xs/xsos/package.nix              |  2 +-
 pkgs/by-name/xs/xssproxy/package.nix          |  2 +-
 pkgs/by-name/xs/xstow/package.nix             |  2 +-
 pkgs/by-name/xs/xsuspender/package.nix        |  2 +-
 pkgs/by-name/xt/xtensor/package.nix           |  2 +-
 pkgs/by-name/xt/xteve/package.nix             |  2 +-
 pkgs/by-name/xt/xtitle/package.nix            |  2 +-
 pkgs/by-name/xt/xtl/package.nix               |  2 +-
 pkgs/by-name/xt/xtuner/package.nix            |  2 +-
 pkgs/by-name/xu/xunit-viewer/package.nix      |  2 +-
 pkgs/by-name/xv/xv/package.nix                |  2 +-
 pkgs/by-name/xv/xva-img/package.nix           |  2 +-
 pkgs/by-name/xv/xviewer/package.nix           |  2 +-
 pkgs/by-name/xw/xwallpaper/package.nix        |  2 +-
 pkgs/by-name/xx/xxHash/package.nix            |  2 +-
 pkgs/by-name/ya/yad/package.nix               |  2 +-
 pkgs/by-name/ya/yadm/package.nix              |  2 +-
 pkgs/by-name/ya/yaegi/package.nix             |  2 +-
 pkgs/by-name/ya/yafc-ce/package.nix           |  2 +-
 pkgs/by-name/ya/yaft/package.nix              |  2 +-
 pkgs/by-name/ya/yai/package.nix               |  2 +-
 pkgs/by-name/ya/yajsv/package.nix             |  2 +-
 pkgs/by-name/ya/yallback/package.nix          |  2 +-
 .../ya/yambar-hyprland-wses/package.nix       |  2 +-
 pkgs/by-name/ya/yambar/package.nix            |  2 +-
 pkgs/by-name/ya/yaml-filter/package.nix       |  2 +-
 .../ya/yaml-language-server/package.nix       |  2 +-
 pkgs/by-name/ya/yaml2json/package.nix         |  2 +-
 pkgs/by-name/ya/yams/package.nix              |  2 +-
 pkgs/by-name/ya/yandex-music/package.nix      |  2 +-
 pkgs/by-name/ya/yanic/package.nix             |  2 +-
 pkgs/by-name/ya/yank/package.nix              |  2 +-
 pkgs/by-name/ya/yarGen/package.nix            |  2 +-
 .../ya/yarn-bash-completion/package.nix       |  2 +-
 pkgs/by-name/ya/yarp/package.nix              |  2 +-
 pkgs/by-name/ya/yarr/package.nix              |  2 +-
 pkgs/by-name/ya/yaru-remix-theme/package.nix  |  2 +-
 pkgs/by-name/ya/yaru-theme/package.nix        |  2 +-
 pkgs/by-name/ya/yas/package.nix               |  2 +-
 pkgs/by-name/ya/yascreen/package.nix          |  2 +-
 pkgs/by-name/ya/yash/package.nix              |  2 +-
 pkgs/by-name/yd/yder/package.nix              |  2 +-
 pkgs/by-name/yd/ydict/package.nix             |  2 +-
 pkgs/by-name/ye/yeahconsole/package.nix       |  2 +-
 pkgs/by-name/ye/yeetgif/package.nix           |  2 +-
 pkgs/by-name/yg/yggdrasil/package.nix         |  2 +-
 pkgs/by-name/yg/yggstack/package.nix          |  2 +-
 pkgs/by-name/yj/yj/package.nix                |  2 +-
 pkgs/by-name/yl/yle-dl/package.nix            |  2 +-
 pkgs/by-name/ym/ympd/package.nix              |  2 +-
 pkgs/by-name/ym/ymuse/package.nix             |  2 +-
 pkgs/by-name/yo/yo/package.nix                |  2 +-
 pkgs/by-name/yo/yoink/package.nix             |  2 +-
 pkgs/by-name/yo/yor/package.nix               |  2 +-
 pkgs/by-name/yo/yoshimi/package.nix           |  2 +-
 pkgs/by-name/yo/youki/package.nix             |  2 +-
 pkgs/by-name/yq/yq-go/package.nix             |  2 +-
 pkgs/by-name/yt/yt-dlg/package.nix            |  2 +-
 pkgs/by-name/yt/ytarchive/package.nix         |  2 +-
 pkgs/by-name/yt/ytcast/package.nix            |  2 +-
 pkgs/by-name/yt/ytcc/package.nix              |  2 +-
 pkgs/by-name/yt/ytfzf/package.nix             |  2 +-
 pkgs/by-name/yt/ytt/package.nix               |  2 +-
 pkgs/by-name/yt/ytui-music/package.nix        |  2 +-
 pkgs/by-name/yu/yubihsm-connector/package.nix |  2 +-
 pkgs/by-name/yu/yubihsm-shell/package.nix     |  2 +-
 pkgs/by-name/yu/yubikey-agent/package.nix     |  2 +-
 pkgs/by-name/yu/yubikey-manager/package.nix   |  2 +-
 .../yu/yubikey-touch-detector/package.nix     |  2 +-
 pkgs/by-name/yu/yubioath-flutter/package.nix  |  2 +-
 pkgs/by-name/yu/yunfaavatar/package.nix       |  2 +-
 pkgs/by-name/yy/yyjson/package.nix            |  2 +-
 pkgs/by-name/z-/z-lua/package.nix             |  2 +-
 pkgs/by-name/za/zam-plugins/package.nix       |  2 +-
 pkgs/by-name/za/zap-chip/package.nix          |  2 +-
 pkgs/by-name/za/zarchive/package.nix          |  2 +-
 pkgs/by-name/za/zarf/package.nix              |  2 +-
 pkgs/by-name/za/zasm/package.nix              |  2 +-
 pkgs/by-name/zc/zcfan/package.nix             |  2 +-
 pkgs/by-name/zc/zchunk/package.nix            |  2 +-
 pkgs/by-name/ze/zed/package.nix               |  2 +-
 pkgs/by-name/ze/zenith/package.nix            |  2 +-
 pkgs/by-name/ze/zenoh/package.nix             |  2 +-
 pkgs/by-name/ze/zerobin/package.nix           |  2 +-
 pkgs/by-name/ze/zeroc-ice/package.nix         |  4 +-
 .../ze/zeronet-conservancy/package.nix        |  2 +-
 pkgs/by-name/ze/zeronet/package.nix           |  2 +-
 pkgs/by-name/ze/zeronsd/package.nix           |  2 +-
 pkgs/by-name/ze/zet/package.nix               |  2 +-
 pkgs/by-name/zf/zfind/package.nix             |  2 +-
 pkgs/by-name/zf/zfp/package.nix               |  2 +-
 .../zf/zfs-prune-snapshots/package.nix        |  2 +-
 pkgs/by-name/zf/zfsnap/package.nix            |  2 +-
 pkgs/by-name/zf/zfstools/package.nix          |  2 +-
 pkgs/by-name/zf/zfxtop/package.nix            |  2 +-
 pkgs/by-name/zi/zigbee2mqtt_1/package.nix     |  2 +-
 pkgs/by-name/zi/zimfw/package.nix             |  2 +-
 pkgs/by-name/zi/zitadel-tools/package.nix     |  2 +-
 pkgs/by-name/zi/zitadel/package.nix           |  2 +-
 pkgs/by-name/zi/zix/package.nix               |  2 +-
 pkgs/by-name/zk/zk/package.nix                |  2 +-
 pkgs/by-name/zk/zktree/package.nix            |  2 +-
 pkgs/by-name/zl/zlib-ng/package.nix           |  2 +-
 pkgs/by-name/zl/zls/package.nix               |  2 +-
 pkgs/by-name/zm/zmap/package.nix              |  2 +-
 pkgs/by-name/zm/zmqpp/package.nix             |  2 +-
 pkgs/by-name/zm/zmusic/package.nix            |  2 +-
 pkgs/by-name/zo/zola/package.nix              |  2 +-
 pkgs/by-name/zo/zon2nix/package.nix           |  2 +-
 pkgs/by-name/zo/zoneminder/package.nix        |  2 +-
 pkgs/by-name/zp/zpaqfranz/package.nix         |  2 +-
 pkgs/by-name/zp/zplug/package.nix             |  2 +-
 .../zpool-auto-expand-partitions/package.nix  |  2 +-
 pkgs/by-name/zp/zps/package.nix               |  2 +-
 pkgs/by-name/zr/zram-generator/package.nix    |  2 +-
 pkgs/by-name/zr/zrepl/package.nix             |  2 +-
 pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix   |  2 +-
 pkgs/by-name/zs/zs/package.nix                |  2 +-
 pkgs/by-name/zs/zscroll/package.nix           |  2 +-
 pkgs/by-name/zs/zsh-autocomplete/package.nix  |  2 +-
 .../zs/zsh-autosuggestions/package.nix        |  2 +-
 pkgs/by-name/zs/zsh-completions/package.nix   |  2 +-
 pkgs/by-name/zs/zsh-f-sy-h/package.nix        |  2 +-
 .../zsh-fast-syntax-highlighting/package.nix  |  2 +-
 pkgs/by-name/zs/zsh-fzf-tab/package.nix       |  2 +-
 .../zsh-history-substring-search/package.nix  |  2 +-
 .../zs/zsh-navigation-tools/package.nix       |  2 +-
 pkgs/by-name/zs/zsh-nix-shell/package.nix     |  2 +-
 .../zs/zsh-syntax-highlighting/package.nix    |  2 +-
 .../zs/zsh-system-clipboard/package.nix       |  2 +-
 pkgs/by-name/zs/zsh-vi-mode/package.nix       |  2 +-
 pkgs/by-name/zs/zsh-wd/package.nix            |  2 +-
 pkgs/by-name/zs/zsync2/package.nix            |  2 +-
 pkgs/by-name/zu/zug/package.nix               |  2 +-
 pkgs/by-name/zu/zuki-themes/package.nix       |  2 +-
 pkgs/by-name/zu/zuo/package.nix               |  2 +-
 pkgs/by-name/zw/zwave-js-server/package.nix   |  2 +-
 pkgs/by-name/zx/zx/package.nix                |  4 +-
 pkgs/by-name/zx/zxcvbn-c/package.nix          |  2 +-
 pkgs/by-name/zx/zxfer/package.nix             |  2 +-
 pkgs/by-name/zy/zydis/package.nix             |  2 +-
 pkgs/by-name/zy/zydis/zycore.nix              |  2 +-
 pkgs/by-name/zz/zziplib/package.nix           |  2 +-
 pkgs/data/fonts/emojione/default.nix          |  2 +-
 pkgs/data/fonts/iosevka/comfy.nix             |  2 +-
 pkgs/data/fonts/liberation-fonts/default.nix  |  2 +-
 pkgs/data/fonts/openmoji/default.nix          |  2 +-
 .../icons/beauty-line-icon-theme/default.nix  |  2 +-
 .../data/icons/bibata-cursors/translucent.nix |  2 +-
 .../icons/flat-remix-icon-theme/default.nix   |  2 +-
 .../icons/gruvbox-dark-icons-gtk/default.nix  |  2 +-
 pkgs/data/icons/kora-icon-theme/default.nix   |  2 +-
 .../icons/la-capitaine-icon-theme/default.nix |  2 +-
 pkgs/data/icons/numix-icon-theme/default.nix  |  2 +-
 .../data/icons/papirus-icon-theme/default.nix |  2 +-
 .../icons/tela-circle-icon-theme/default.nix  |  2 +-
 pkgs/data/icons/zafiro-icons/default.nix      |  2 +-
 pkgs/data/themes/adwaita-qt/default.nix       |  2 +-
 .../themes/gtk-theme-framework/default.nix    |  2 +-
 pkgs/data/themes/kde2/default.nix             |  2 +-
 .../kde-rounded-corners/default.nix           |  2 +-
 pkgs/data/themes/lightly-qt/default.nix       |  2 +-
 pkgs/data/themes/qtcurve/default.nix          |  2 +-
 pkgs/data/themes/sddm-sugar-dark/default.nix  |  2 +-
 pkgs/data/themes/whitesur-kde/default.nix     |  2 +-
 .../deepin/apps/deepin-calculator/default.nix |  2 +-
 .../deepin/apps/deepin-compressor/default.nix |  2 +-
 .../deepin/apps/deepin-draw/default.nix       |  2 +-
 .../deepin/apps/deepin-editor/default.nix     |  2 +-
 .../deepin/apps/deepin-music/default.nix      |  2 +-
 .../deepin/apps/deepin-picker/default.nix     |  2 +-
 .../deepin/apps/deepin-reader/default.nix     |  2 +-
 .../apps/deepin-screensaver/default.nix       |  2 +-
 .../apps/deepin-shortcut-viewer/default.nix   |  2 +-
 .../apps/deepin-system-monitor/default.nix    |  2 +-
 .../deepin/apps/deepin-terminal/default.nix   |  2 +-
 .../artwork/dde-account-faces/default.nix     |  2 +-
 .../artwork/deepin-desktop-theme/default.nix  |  2 +-
 .../artwork/deepin-gtk-theme/default.nix      |  2 +-
 .../artwork/deepin-icon-theme/default.nix     |  2 +-
 .../artwork/deepin-sound-theme/default.nix    |  2 +-
 .../artwork/deepin-wallpapers/default.nix     |  2 +-
 .../deepin/core/dde-api-proxy/default.nix     |  2 +-
 .../deepin/core/dde-app-services/default.nix  |  2 +-
 .../deepin/core/dde-appearance/default.nix    |  2 +-
 .../core/dde-application-manager/default.nix  |  2 +-
 .../deepin/core/dde-calendar/default.nix      |  2 +-
 .../deepin/core/dde-clipboard/default.nix     |  2 +-
 .../core/dde-control-center/default.nix       |  2 +-
 .../deepin/core/dde-file-manager/default.nix  |  2 +-
 .../deepin/core/dde-grand-search/default.nix  |  2 +-
 .../deepin/core/dde-launchpad/default.nix     |  2 +-
 .../deepin/core/dde-network-core/default.nix  |  2 +-
 .../deepin/core/dde-polkit-agent/default.nix  |  2 +-
 .../deepin/core/dde-session-shell/default.nix |  2 +-
 .../deepin/core/dde-session-ui/default.nix    |  2 +-
 .../deepin/core/dde-session/default.nix       |  2 +-
 .../deepin/core/dde-shell/default.nix         |  2 +-
 .../deepin/core/dde-tray-loader/default.nix   |  2 +-
 .../deepin/core/dde-widgets/default.nix       |  2 +-
 .../deepin/core/deepin-kwin/default.nix       |  2 +-
 .../core/deepin-service-manager/default.nix   |  2 +-
 .../core/dpa-ext-gnomekeyring/default.nix     |  2 +-
 .../deepin/go-package/dde-api/default.nix     |  2 +-
 .../deepin/go-package/dde-daemon/default.nix  |  2 +-
 .../deepin-desktop-schemas/default.nix        |  2 +-
 .../go-package/deepin-pw-check/default.nix    |  2 +-
 .../deepin/go-package/startdde/default.nix    |  2 +-
 .../library/dde-qt-dbus-factory/default.nix   |  2 +-
 .../deepin/library/deepin-pdfium/default.nix  |  2 +-
 .../deepin-wayland-protocols/default.nix      |  2 +-
 .../deepin/library/disomaster/default.nix     |  2 +-
 .../deepin/library/docparser/default.nix      |  2 +-
 .../deepin/library/dtk6core/default.nix       |  2 +-
 .../library/dtk6declarative/default.nix       |  2 +-
 .../deepin/library/dtk6gui/default.nix        |  2 +-
 .../deepin/library/dtk6log/default.nix        |  2 +-
 .../library/dtk6systemsettings/default.nix    |  2 +-
 .../deepin/library/dtk6widget/default.nix     |  2 +-
 .../deepin/library/dtkcommon/default.nix      |  2 +-
 .../deepin/library/dtkcore/default.nix        |  2 +-
 .../deepin/library/dtkdeclarative/default.nix |  2 +-
 .../deepin/library/dtkgui/default.nix         |  2 +-
 .../deepin/library/dtklog/default.nix         |  2 +-
 .../deepin/library/dtkwidget/default.nix      |  2 +-
 .../deepin/library/dwayland/default.nix       |  2 +-
 .../deepin/library/gio-qt/default.nix         |  2 +-
 .../deepin/library/qt5integration/default.nix |  2 +-
 .../library/qt5platform-plugins/default.nix   |  2 +-
 .../deepin/library/qt6integration/default.nix |  2 +-
 .../deepin/library/qt6mpris/default.nix       |  2 +-
 .../library/qt6platform-plugins/default.nix   |  2 +-
 .../library/treeland-protocols/default.nix    |  2 +-
 .../deepin/library/udisks2-qt5/default.nix    |  2 +-
 .../deepin/library/util-dfm/default.nix       |  2 +-
 .../misc/deepin-desktop-base/default.nix      |  2 +-
 .../tools/dde-device-formatter/default.nix    |  2 +-
 .../deepin/tools/deepin-anything/default.nix  |  2 +-
 .../tools/deepin-gettext-tools/default.nix    |  2 +-
 pkgs/desktops/expidus/calculator/default.nix  |  2 +-
 .../desktops/expidus/file-manager/default.nix |  2 +-
 .../extensions/EasyScreenCast/default.nix     |  2 +-
 .../gnome/extensions/arcmenu/default.nix      |  2 +-
 .../gnome/extensions/gsconnect/default.nix    |  2 +-
 .../gnome/extensions/icon-hider/default.nix   |  2 +-
 .../pidgin-im-integration/default.nix         |  2 +-
 .../extensions/systemd-manager/default.nix    |  2 +-
 .../extensions/taskwhisperer/default.nix      |  2 +-
 .../extensions/topicons-plus/default.nix      |  2 +-
 .../gnome/extensions/unite/default.nix        |  2 +-
 .../lomiri-system-settings/default.nix        |  2 +-
 .../lomiri/applications/lomiri/default.nix    |  2 +-
 .../lomiri/data/lomiri-session/default.nix    |  2 +-
 .../lomiri/data/lomiri-sounds/default.nix     |  2 +-
 .../lomiri/data/lomiri-wallpapers/default.nix |  2 +-
 .../lomiri/data/suru-icon-theme/default.nix   |  2 +-
 .../lomiri/development/deviceinfo/default.nix |  2 +-
 .../lomiri/development/geonames/default.nix   |  2 +-
 .../development/gmenuharness/default.nix      |  2 +-
 .../development/libusermetrics/default.nix    |  2 +-
 .../development/trust-store/default.nix       |  2 +-
 .../lomiri/development/u1db-qt/default.nix    |  2 +-
 .../lomiri/qml/lomiri-action-api/default.nix  |  2 +-
 .../lomiri-settings-components/default.nix    |  2 +-
 .../lomiri/qml/lomiri-ui-extras/default.nix   |  2 +-
 .../lomiri/qml/lomiri-ui-toolkit/default.nix  |  2 +-
 .../lomiri/services/biometryd/default.nix     |  2 +-
 .../lomiri/services/hfd-service/default.nix   |  2 +-
 .../services/lomiri-content-hub/default.nix   |  2 +-
 .../lomiri-download-manager/default.nix       |  2 +-
 .../lomiri-history-service/default.nix        |  2 +-
 .../lomiri-url-dispatcher/default.nix         |  2 +-
 .../lomiri/services/mediascanner2/default.nix |  2 +-
 .../lumina/lumina-calculator/default.nix      |  2 +-
 pkgs/desktops/lumina/lumina-pdf/default.nix   |  2 +-
 pkgs/desktops/lumina/lumina/default.nix       |  2 +-
 pkgs/desktops/lxde/core/lxsession/default.nix |  2 +-
 pkgs/desktops/lxde/core/lxtask/default.nix    |  2 +-
 pkgs/desktops/lxqt/compton-conf/default.nix   |  2 +-
 .../lxqt/libdbusmenu-lxqt/default.nix         |  2 +-
 pkgs/desktops/lxqt/libfm-qt/default.nix       |  2 +-
 pkgs/desktops/lxqt/liblxqt/default.nix        |  2 +-
 pkgs/desktops/lxqt/libqtxdg/default.nix       |  2 +-
 pkgs/desktops/lxqt/libsysstat/default.nix     |  2 +-
 pkgs/desktops/lxqt/lximage-qt/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-about/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-admin/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-archiver/default.nix  |  2 +-
 .../lxqt/lxqt-build-tools/default.nix         |  2 +-
 pkgs/desktops/lxqt/lxqt-config/default.nix    |  2 +-
 .../desktops/lxqt/lxqt-globalkeys/default.nix |  2 +-
 pkgs/desktops/lxqt/lxqt-menu-data/default.nix |  2 +-
 .../lxqt/lxqt-notificationd/default.nix       |  2 +-
 .../lxqt/lxqt-openssh-askpass/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-panel/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-policykit/default.nix |  2 +-
 .../lxqt/lxqt-powermanagement/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix  |  2 +-
 pkgs/desktops/lxqt/lxqt-runner/default.nix    |  2 +-
 pkgs/desktops/lxqt/lxqt-session/default.nix   |  2 +-
 pkgs/desktops/lxqt/lxqt-sudo/default.nix      |  2 +-
 pkgs/desktops/lxqt/lxqt-themes/default.nix    |  2 +-
 .../lxqt/lxqt-wayland-session/default.nix     |  2 +-
 pkgs/desktops/lxqt/obconf-qt/default.nix      |  2 +-
 pkgs/desktops/lxqt/pavucontrol-qt/default.nix |  2 +-
 pkgs/desktops/lxqt/pcmanfm-qt/default.nix     |  2 +-
 pkgs/desktops/lxqt/qlipper/default.nix        |  2 +-
 pkgs/desktops/lxqt/qps/default.nix            |  2 +-
 pkgs/desktops/lxqt/qterminal/default.nix      |  2 +-
 pkgs/desktops/lxqt/qtermwidget/default.nix    |  2 +-
 pkgs/desktops/lxqt/qtxdg-tools/default.nix    |  2 +-
 pkgs/desktops/lxqt/screengrab/default.nix     |  2 +-
 .../lxqt/xdg-desktop-portal-lxqt/default.nix  |  2 +-
 pkgs/desktops/mate/mate-tweak/default.nix     |  2 +-
 .../mate/mate-wayland-session/default.nix     |  2 +-
 .../pantheon/apps/appcenter/default.nix       |  2 +-
 .../apps/elementary-calculator/default.nix    |  2 +-
 .../apps/elementary-calendar/default.nix      |  2 +-
 .../apps/elementary-camera/default.nix        |  2 +-
 .../pantheon/apps/elementary-code/default.nix |  2 +-
 .../pantheon/apps/elementary-dock/default.nix |  2 +-
 .../apps/elementary-feedback/default.nix      |  2 +-
 .../apps/elementary-files/default.nix         |  2 +-
 .../apps/elementary-iconbrowser/default.nix   |  2 +-
 .../apps/elementary-music/default.nix         |  2 +-
 .../apps/elementary-photos/default.nix        |  2 +-
 .../apps/elementary-screenshot/default.nix    |  2 +-
 .../apps/elementary-tasks/default.nix         |  2 +-
 .../apps/elementary-terminal/default.nix      |  2 +-
 .../apps/elementary-videos/default.nix        |  2 +-
 .../pantheon/apps/sideload/default.nix        |  2 +-
 .../apps/switchboard-plugs/about/default.nix  |  2 +-
 .../applications/default.nix                  |  2 +-
 .../switchboard-plugs/bluetooth/default.nix   |  2 +-
 .../switchboard-plugs/datetime/default.nix    |  2 +-
 .../switchboard-plugs/display/default.nix     |  2 +-
 .../switchboard-plugs/keyboard/default.nix    |  2 +-
 .../mouse-touchpad/default.nix                |  2 +-
 .../switchboard-plugs/network/default.nix     |  2 +-
 .../notifications/default.nix                 |  2 +-
 .../onlineaccounts/default.nix                |  2 +-
 .../pantheon-shell/default.nix                |  2 +-
 .../apps/switchboard-plugs/power/default.nix  |  2 +-
 .../switchboard-plugs/printers/default.nix    |  2 +-
 .../security-privacy/default.nix              |  2 +-
 .../switchboard-plugs/sharing/default.nix     |  2 +-
 .../apps/switchboard-plugs/sound/default.nix  |  2 +-
 .../apps/switchboard-plugs/wacom/default.nix  |  2 +-
 .../pantheon/apps/switchboard/default.nix     |  2 +-
 .../artwork/elementary-gtk-theme/default.nix  |  2 +-
 .../artwork/elementary-icon-theme/default.nix |  2 +-
 .../elementary-redacted-script/default.nix    |  2 +-
 .../elementary-sound-theme/default.nix        |  2 +-
 .../artwork/elementary-wallpapers/default.nix |  2 +-
 .../elementary-default-settings/default.nix   |  2 +-
 .../desktop/elementary-greeter/default.nix    |  2 +-
 .../desktop/elementary-onboarding/default.nix |  2 +-
 .../desktop/elementary-print-shim/default.nix |  2 +-
 .../elementary-session-settings/default.nix   |  2 +-
 .../elementary-shortcut-overlay/default.nix   |  2 +-
 .../pantheon/desktop/gala/default.nix         |  2 +-
 .../wingpanel-indicators/a11y/default.nix     |  2 +-
 .../applications-menu/default.nix             |  2 +-
 .../bluetooth/default.nix                     |  2 +-
 .../wingpanel-indicators/datetime/default.nix |  2 +-
 .../wingpanel-indicators/keyboard/default.nix |  2 +-
 .../wingpanel-indicators/network/default.nix  |  2 +-
 .../nightlight/default.nix                    |  2 +-
 .../notifications/default.nix                 |  2 +-
 .../wingpanel-indicators/power/default.nix    |  2 +-
 .../quick-settings/default.nix                |  2 +-
 .../wingpanel-indicators/sound/default.nix    |  2 +-
 .../pantheon/desktop/wingpanel/default.nix    |  2 +-
 .../pantheon/libraries/granite/7/default.nix  |  2 +-
 .../pantheon/libraries/granite/default.nix    |  2 +-
 .../libraries/pantheon-wayland/default.nix    |  2 +-
 .../pantheon/services/contractor/default.nix  |  2 +-
 .../elementary-bluetooth-daemon/default.nix   |  2 +-
 .../elementary-capnet-assist/default.nix      |  2 +-
 .../elementary-notifications/default.nix      |  2 +-
 .../elementary-settings-daemon/default.nix    |  2 +-
 .../pantheon-agent-geoclue2/default.nix       |  2 +-
 .../pantheon-agent-polkit/default.nix         |  2 +-
 .../xdg-desktop-portal-pantheon/default.nix   |  2 +-
 .../3rdparty/addons/bismuth/default.nix       |  2 +-
 .../3rdparty/addons/caffeine-plus.nix         |  2 +-
 .../3rdparty/addons/krunner-symbols.nix       |  2 +-
 .../kwin/scripts/dynamic-workspaces.nix       |  2 +-
 .../3rdparty/kwin/scripts/krohnkite.nix       |  2 +-
 .../3rdparty/kwin/scripts/parachute.nix       |  2 +-
 .../plasma-5/3rdparty/kwin/scripts/tiling.nix |  2 +-
 .../plasma-5/3rdparty/lightly/default.nix     |  2 +-
 .../xfce4-dockbarx-plugin/default.nix         |  2 +-
 .../xfce4-i3-workspaces-plugin/default.nix    |  2 +-
 .../xfce/thunar-plugins/dropbox/default.nix   |  2 +-
 .../ada-modules/gnatcoll/bindings.nix         |  2 +-
 .../development/ada-modules/gnatcoll/core.nix |  2 +-
 pkgs/development/ada-modules/gnatcoll/db.nix  |  2 +-
 .../ada-modules/gnatprove/default.nix         |  2 +-
 .../development/ada-modules/gprbuild/boot.nix |  4 +-
 .../ada-modules/xmlada/default.nix            |  2 +-
 .../beam-modules/elixir-ls/default.nix        |  2 +-
 .../beam-modules/elvis-erlang/default.nix     |  2 +-
 .../beam-modules/erlang-ls/default.nix        |  2 +-
 .../beam-modules/erlfmt/default.nix           |  2 +-
 .../beam-modules/ex_doc/default.nix           |  2 +-
 pkgs/development/beam-modules/hex/default.nix |  2 +-
 .../beam-modules/rebar3-nix/default.nix       |  2 +-
 pkgs/development/compilers/alan/default.nix   |  2 +-
 pkgs/development/compilers/armips/default.nix |  2 +-
 .../compilers/chicken/4/egg2nix.nix           |  2 +-
 pkgs/development/compilers/codon/default.nix  |  2 +-
 pkgs/development/compilers/corretto/11.nix    |  2 +-
 pkgs/development/compilers/corretto/17.nix    |  2 +-
 pkgs/development/compilers/corretto/21.nix    |  2 +-
 .../development/compilers/crystal/default.nix |  2 +-
 .../elm/packages/elm-review/default.nix       |  2 +-
 .../elm/packages/elm-test/default.nix         |  2 +-
 .../compilers/elm/packages/node/default.nix   |  2 +-
 .../elm/packages/node/elm-pages/default.nix   |  2 +-
 .../compilers/emscripten/default.nix          |  2 +-
 .../development/compilers/flutter/default.nix |  2 +-
 pkgs/development/compilers/fstar/default.nix  |  2 +-
 pkgs/development/compilers/haxe/default.nix   |  2 +-
 pkgs/development/compilers/idris2/idris2.nix  |  2 +-
 pkgs/development/compilers/koka/default.nix   |  2 +-
 pkgs/development/compilers/mkcl/default.nix   |  2 +-
 pkgs/development/compilers/osl/default.nix    |  2 +-
 pkgs/development/compilers/polyml/5.7.nix     |  2 +-
 pkgs/development/compilers/polyml/default.nix |  2 +-
 pkgs/development/compilers/ponyc/default.nix  |  2 +-
 .../compilers/ponyc/pony-corral.nix           |  2 +-
 .../compilers/rust/cargo-auditable.nix        |  2 +-
 .../development/compilers/shaderc/default.nix |  2 +-
 .../compilers/x11basic/default.nix            |  2 +-
 .../compilers/yosys/plugins/symbiflow.nix     |  2 +-
 pkgs/development/compilers/zig/generic.nix    |  2 +-
 .../embedded/arduino/arduino-core/default.nix |  2 +-
 .../embedded/fpga/apio/default.nix            |  2 +-
 .../embedded/fpga/ecpdap/default.nix          |  2 +-
 .../embedded/fpga/fujprog/default.nix         |  2 +-
 pkgs/development/embedded/tytools/default.nix |  2 +-
 .../emilua-plugins/bech32/default.nix         |  2 +-
 .../emilua-plugins/botan/default.nix          |  2 +-
 .../emilua-plugins/qt5/default.nix            |  2 +-
 .../emilua-plugins/qt6/default.nix            |  2 +-
 .../emilua-plugins/secp256k1/default.nix      |  2 +-
 .../emilua-plugins/tdlib/default.nix          |  2 +-
 .../emilua-plugins/this-thread/default.nix    |  2 +-
 .../haskell-modules/configuration-common.nix  |  2 +-
 pkgs/development/idris-modules/sdl2.nix       |  2 +-
 .../development/interpreters/acl2/default.nix |  2 +-
 pkgs/development/interpreters/clojure/obb.nix |  2 +-
 .../interpreters/evcxr/default.nix            |  2 +-
 .../interpreters/gnudatalanguage/default.nix  |  2 +-
 pkgs/development/interpreters/janet/jpm.nix   |  2 +-
 pkgs/development/interpreters/love/0.10.nix   |  2 +-
 pkgs/development/interpreters/love/11.nix     |  2 +-
 .../interpreters/luajit/openresty.nix         |  2 +-
 .../python/cpython/2.7/default.nix            |  2 +-
 .../interpreters/rakudo/default.nix           |  2 +-
 .../interpreters/rakudo/moarvm.nix            |  2 +-
 pkgs/development/interpreters/rakudo/nqp.nix  |  2 +-
 .../interpreters/wasmtime/default.nix         |  2 +-
 .../libraries/abseil-cpp/202103.nix           |  2 +-
 .../agda/agda-categories/default.nix          |  2 +-
 .../libraries/agda/agdarsec/default.nix       |  2 +-
 .../libraries/agda/cubical/default.nix        |  2 +-
 .../functional-linear-algebra/default.nix     |  2 +-
 .../libraries/agda/generic/default.nix        |  2 +-
 .../libraries/agda/generics/default.nix       |  2 +-
 .../libraries/agda/iowa-stdlib/default.nix    |  2 +-
 .../agda/standard-library/default.nix         |  2 +-
 .../development/libraries/alembic/default.nix |  2 +-
 pkgs/development/libraries/allegro/5.nix      |  2 +-
 .../applet-window-buttons/default.nix         |  2 +-
 .../libraries/audio/rtaudio/default.nix       |  2 +-
 .../libraries/audio/suil/default.nix          |  2 +-
 .../libraries/aws-c-io/default.nix            |  2 +-
 .../libraries/aws-sdk-cpp/default.nix         |  2 +-
 pkgs/development/libraries/bullet/default.nix |  2 +-
 pkgs/development/libraries/capstone/4.nix     |  2 +-
 .../libraries/capstone/default.nix            |  2 +-
 pkgs/development/libraries/catch2/3.nix       |  2 +-
 pkgs/development/libraries/catch2/default.nix |  2 +-
 pkgs/development/libraries/cctag/default.nix  |  2 +-
 pkgs/development/libraries/cctz/default.nix   |  2 +-
 .../libraries/ctranslate2/default.nix         |  2 +-
 .../development/libraries/cxxtest/default.nix |  2 +-
 .../dbus-sharp-glib/dbus-sharp-glib-1.0.nix   |  2 +-
 .../libraries/dbus-sharp-glib/default.nix     |  2 +-
 .../libraries/dbus-sharp/dbus-sharp-1.0.nix   |  2 +-
 .../libraries/dbus-sharp/default.nix          |  2 +-
 .../libraries/discord-rpc/default.nix         |  2 +-
 pkgs/development/libraries/draco/default.nix  |  2 +-
 pkgs/development/libraries/draco/tinygltf.nix |  2 +-
 pkgs/development/libraries/embree/default.nix |  2 +-
 pkgs/development/libraries/flatbuffers/23.nix |  2 +-
 .../libraries/flatbuffers/default.nix         |  2 +-
 pkgs/development/libraries/fmt/default.nix    |  2 +-
 pkgs/development/libraries/fplll/default.nix  |  2 +-
 .../libraries/freenect/default.nix            |  2 +-
 .../gamenetworkingsockets/default.nix         |  2 +-
 pkgs/development/libraries/gensio/default.nix |  2 +-
 pkgs/development/libraries/geoip/default.nix  |  2 +-
 .../libraries/grantlee/5/default.nix          |  2 +-
 .../libraries/grantlee/default.nix            |  2 +-
 .../libraries/gstreamer/rs/default.nix        |  2 +-
 pkgs/development/libraries/gtk-sharp/2.0.nix  |  2 +-
 .../libraries/hunspell/default.nix            |  2 +-
 .../libraries/hunspell/dictionaries.nix       |  6 +-
 .../development/libraries/iksemel/default.nix |  2 +-
 .../libraries/kcolorpicker/default.nix        |  2 +-
 .../libraries/kddockwidgets/default.nix       |  2 +-
 .../libraries/keybinder/default.nix           |  2 +-
 .../libraries/kimageannotator/default.nix     |  2 +-
 .../development/libraries/kompute/default.nix |  2 +-
 .../development/libraries/l-smash/default.nix |  2 +-
 .../libraries/libadwaita/default.nix          |  2 +-
 pkgs/development/libraries/libao/default.nix  |  2 +-
 .../libraries/libarchive-qt/default.nix       |  2 +-
 .../development/libraries/libbtbb/default.nix |  2 +-
 .../libraries/libcommuni/default.nix          |  2 +-
 .../libraries/libepoxy/default.nix            |  2 +-
 pkgs/development/libraries/libiio/default.nix |  2 +-
 pkgs/development/libraries/libint/default.nix |  2 +-
 .../libraries/liblqr-1/default.nix            |  2 +-
 .../libraries/libpulsar/default.nix           |  2 +-
 .../libraries/libqofono/default.nix           |  2 +-
 .../libraries/libqtdbusmock/default.nix       |  2 +-
 .../libraries/libqtdbustest/default.nix       |  2 +-
 .../libraries/libquotient/default.nix         |  2 +-
 pkgs/development/libraries/libre/default.nix  |  2 +-
 .../libraries/librealsense/default.nix        |  2 +-
 .../libraries/libsndfile/default.nix          |  2 +-
 .../libraries/libsoundio/default.nix          |  2 +-
 .../libraries/libuiohook/default.nix          |  2 +-
 .../libraries/libusb-compat/0.1.nix           |  2 +-
 .../development/libraries/libusb1/default.nix |  2 +-
 pkgs/development/libraries/libva/1.nix        |  2 +-
 pkgs/development/libraries/libva/default.nix  |  2 +-
 pkgs/development/libraries/libva/utils.nix    |  2 +-
 .../libraries/liquid-dsp/default.nix          |  2 +-
 .../libraries/luksmeta/default.nix            |  2 +-
 .../libraries/mailcore2/default.nix           |  2 +-
 pkgs/development/libraries/mapnik/default.nix |  2 +-
 pkgs/development/libraries/mlt/default.nix    |  2 +-
 .../libraries/mypaint-brushes/1.0.nix         |  2 +-
 .../libraries/mypaint-brushes/default.nix     |  2 +-
 .../libraries/netcdf-fortran/default.nix      |  2 +-
 .../development/libraries/nghttp3/default.nix |  2 +-
 pkgs/development/libraries/ngtcp2/default.nix |  2 +-
 pkgs/development/libraries/ngtcp2/gnutls.nix  |  2 +-
 pkgs/development/libraries/nlopt/default.nix  |  2 +-
 .../development/libraries/nuspell/default.nix |  2 +-
 .../libraries/nvidia-vaapi-driver/default.nix |  2 +-
 pkgs/development/libraries/ogre/default.nix   |  2 +-
 pkgs/development/libraries/ois/default.nix    |  2 +-
 .../libraries/openal-soft/default.nix         |  2 +-
 .../development/libraries/opencolorio/1.x.nix |  2 +-
 .../libraries/opencolorio/default.nix         |  2 +-
 pkgs/development/libraries/openexr/3.nix      |  2 +-
 .../development/libraries/openexr/default.nix |  2 +-
 .../libraries/openimageio/default.nix         |  2 +-
 pkgs/development/libraries/openvdb/11.nix     |  2 +-
 .../development/libraries/openvdb/default.nix |  2 +-
 .../libraries/pangolin/default.nix            |  2 +-
 .../libraries/pc-ble-driver/default.nix       |  2 +-
 .../libraries/pdfhummus/default.nix           |  2 +-
 .../libraries/phonetisaurus/default.nix       |  2 +-
 .../libraries/pipewire/default.nix            |  2 +-
 pkgs/development/libraries/podofo/0.10.x.nix  |  2 +-
 .../libraries/portmidi/default.nix            |  2 +-
 pkgs/development/libraries/proj/7.nix         |  2 +-
 pkgs/development/libraries/proj/default.nix   |  2 +-
 .../libraries/prometheus-client-c/default.nix |  2 +-
 .../libraries/pyotherside/default.nix         |  2 +-
 pkgs/development/libraries/qcoro/default.nix  |  2 +-
 .../libraries/qgnomeplatform/default.nix      |  2 +-
 pkgs/development/libraries/qjson/default.nix  |  2 +-
 .../libraries/qmenumodel/default.nix          |  2 +-
 .../libraries/qmlbox2d/default.nix            |  2 +-
 pkgs/development/libraries/qoauth/default.nix |  2 +-
 pkgs/development/libraries/qt-5/5.15/srcs.nix |  4 +-
 .../libraries/qtdbusextended/default.nix      |  2 +-
 .../libraries/qtkeychain/default.nix          |  2 +-
 .../development/libraries/qtmpris/default.nix |  2 +-
 .../development/libraries/qtspell/default.nix |  2 +-
 pkgs/development/libraries/quazip/default.nix |  2 +-
 .../libraries/qwlroots/default.nix            |  2 +-
 pkgs/development/libraries/qxlsx/default.nix  |  2 +-
 pkgs/development/libraries/qxmpp/default.nix  |  2 +-
 .../development/libraries/randomx/default.nix |  2 +-
 .../libraries/rnnoise-plugin/default.nix      |  2 +-
 .../chemistry/avogadrolibs/default.nix        |  2 +-
 .../science/chemistry/molequeue/default.nix   |  2 +-
 .../science/chemistry/tblite/default.nix      |  2 +-
 .../libraries/science/math/clblas/default.nix |  2 +-
 .../science/math/openblas/default.nix         |  2 +-
 .../science/math/suitesparse/default.nix      |  2 +-
 pkgs/development/libraries/soci/default.nix   |  2 +-
 .../libraries/sofia-sip/default.nix           |  2 +-
 pkgs/development/libraries/spglib/default.nix |  2 +-
 .../libraries/structuresynth/default.nix      |  2 +-
 pkgs/development/libraries/tbb/2020_3.nix     |  2 +-
 pkgs/development/libraries/tbb/default.nix    |  2 +-
 .../libraries/tpm2-tss/default.nix            |  2 +-
 .../libraries/unixODBCDrivers/default.nix     |  2 +-
 .../development/libraries/unqlite/default.nix |  2 +-
 pkgs/development/libraries/vc/0.7.nix         |  2 +-
 pkgs/development/libraries/vc/default.nix     |  2 +-
 .../libraries/waylandpp/default.nix           |  2 +-
 pkgs/development/libraries/waylib/default.nix |  2 +-
 .../libraries/webkit2-sharp/default.nix       |  2 +-
 pkgs/development/libraries/wiiuse/default.nix |  2 +-
 .../development/libraries/wlroots/default.nix |  2 +-
 pkgs/development/libraries/wt/default.nix     |  2 +-
 .../libraries/yaml-cpp/default.nix            |  2 +-
 .../libraries/yubico-pam/default.nix          |  2 +-
 pkgs/development/libraries/zint/default.nix   |  2 +-
 pkgs/development/lisp-modules/packages.nix    |  2 +-
 pkgs/development/misc/msp430/mspdebug.nix     |  2 +-
 pkgs/development/misc/resholve/deps.nix       |  2 +-
 pkgs/development/misc/resholve/source.nix     |  2 +-
 pkgs/development/mobile/fdroidcl/default.nix  |  2 +-
 .../ocaml-modules/afl-persistent/default.nix  |  2 +-
 .../ocaml-modules/algaeff/default.nix         |  2 +-
 .../ocaml-modules/alsa/default.nix            |  2 +-
 .../ocaml-modules/angstrom/default.nix        |  2 +-
 pkgs/development/ocaml-modules/ao/default.nix |  2 +-
 .../ocaml-modules/apron/default.nix           |  2 +-
 .../ocaml-modules/asai/default.nix            |  2 +-
 .../development/ocaml-modules/bap/default.nix |  2 +-
 .../ocaml-modules/batteries/default.nix       |  2 +-
 .../ocaml-modules/bigarray-compat/default.nix |  2 +-
 .../ocaml-modules/bigstring/default.nix       |  2 +-
 .../ocaml-modules/bigstringaf/default.nix     |  2 +-
 .../ocaml-modules/bindlib/default.nix         |  2 +-
 .../ocaml-modules/biocaml/default.nix         |  2 +-
 .../ocaml-modules/bisect_ppx/default.nix      |  2 +-
 .../ocaml-modules/bitstring/default.nix       |  2 +-
 .../ocaml-modules/bjack/default.nix           |  2 +-
 .../development/ocaml-modules/bwd/default.nix |  2 +-
 .../ocaml-modules/calendar/default.nix        |  2 +-
 .../ocaml-modules/camlp-streams/default.nix   |  2 +-
 .../ocaml-modules/camlpdf/default.nix         |  2 +-
 .../ocaml-modules/camomile/default.nix        |  4 +-
 .../ocaml-modules/capnp/default.nix           |  2 +-
 .../ocaml-modules/cfstream/default.nix        |  2 +-
 .../ocaml-modules/chacha/default.nix          |  2 +-
 .../ocaml-modules/clap/default.nix            |  2 +-
 .../ocaml-modules/class_group_vdf/default.nix |  2 +-
 .../ocaml-modules/containers/default.nix      |  2 +-
 .../ocaml-modules/cpdf/default.nix            |  2 +-
 .../development/ocaml-modules/cpu/default.nix |  2 +-
 .../ocaml-modules/crowbar/default.nix         |  2 +-
 .../development/ocaml-modules/cry/default.nix |  2 +-
 .../ocaml-modules/ctypes/default.nix          |  2 +-
 .../ocaml-modules/cudf/default.nix            |  2 +-
 .../ocaml-modules/curses/default.nix          |  2 +-
 .../ocaml-modules/dates_calc/default.nix      |  2 +-
 .../development/ocaml-modules/dbf/default.nix |  2 +-
 .../ocaml-modules/dedukti/default.nix         |  2 +-
 .../ocaml-modules/directories/default.nix     |  2 +-
 .../ocaml-modules/dispatch/default.nix        |  2 +-
 .../ocaml-modules/dolog/default.nix           |  2 +-
 .../ocaml-modules/dssi/default.nix            |  2 +-
 .../ocaml-modules/dtools/default.nix          |  2 +-
 .../development/ocaml-modules/dum/default.nix |  2 +-
 .../ocaml-modules/duppy/default.nix           |  2 +-
 .../ocaml-modules/dypgen/default.nix          |  2 +-
 .../ocaml-modules/earley/default.nix          |  2 +-
 .../ocaml-modules/earlybird/default.nix       |  2 +-
 .../ocaml-modules/eigen/default.nix           |  2 +-
 .../ocaml-modules/eliom/default.nix           |  2 +-
 .../ocaml-modules/expat/default.nix           |  2 +-
 .../ocaml-modules/faad/default.nix            |  2 +-
 .../ocaml-modules/faraday/default.nix         |  2 +-
 .../ocaml-modules/fdkaac/default.nix          |  2 +-
 .../ocaml-modules/flac/default.nix            |  2 +-
 .../ocaml-modules/frei0r/default.nix          |  2 +-
 .../ocaml-modules/frontc/default.nix          |  2 +-
 .../ocaml-modules/gapi-ocaml/default.nix      |  2 +-
 pkgs/development/ocaml-modules/gd/default.nix |  2 +-
 .../development/ocaml-modules/gen/default.nix |  2 +-
 .../ocaml-modules/gen_js_api/default.nix      |  2 +-
 .../ocaml-modules/get-activity/lib.nix        |  2 +-
 .../ocaml-modules/getopt/default.nix          |  2 +-
 .../ocaml-modules/github/default.nix          |  2 +-
 .../ocaml-modules/gitlab/default.nix          |  2 +-
 .../ocaml-modules/gnuplot/default.nix         |  2 +-
 .../ocaml-modules/graphql_ppx/default.nix     |  2 +-
 .../development/ocaml-modules/gsl/default.nix |  2 +-
 .../ocaml-modules/gstreamer/default.nix       |  2 +-
 .../ocaml-modules/hack_parallel/default.nix   |  2 +-
 .../ocaml-modules/hidapi/default.nix          |  2 +-
 .../ocaml-modules/httpaf/default.nix          |  2 +-
 .../ocaml-modules/inotify/default.nix         |  2 +-
 .../ocaml-modules/integers/default.nix        |  2 +-
 .../integers_stubs_js/default.nix             |  2 +-
 .../ocaml-modules/iso8601/default.nix         |  2 +-
 .../janestreet/janePackage_0_12.nix           |  2 +-
 .../janestreet/janePackage_0_14.nix           |  2 +-
 .../janestreet/janePackage_0_15.nix           |  2 +-
 .../janestreet/janePackage_0_16.nix           |  2 +-
 .../janestreet/janePackage_0_17.nix           |  2 +-
 .../ocaml-modules/javalib/default.nix         |  2 +-
 .../ocaml-modules/jingoo/default.nix          |  2 +-
 .../json-data-encoding/default.nix            |  2 +-
 .../ocaml-modules/jwto/default.nix            |  2 +-
 .../ocaml-modules/lablgl/default.nix          |  2 +-
 .../ocaml-modules/lablgtk/default.nix         |  2 +-
 .../ocaml-modules/ladspa/default.nix          |  2 +-
 .../ocaml-modules/lambda-term/default.nix     |  2 +-
 .../ocaml-modules/lambdasoup/default.nix      |  2 +-
 .../ocaml-modules/lame/default.nix            |  2 +-
 .../ocaml-modules/lastfm/default.nix          |  2 +-
 .../development/ocaml-modules/lem/default.nix |  2 +-
 .../ocaml-modules/lens/default.nix            |  2 +-
 .../ocaml-modules/lilv/default.nix            |  2 +-
 .../ocaml-modules/linenoise/default.nix       |  2 +-
 .../ocaml-modules/linksem/default.nix         |  2 +-
 pkgs/development/ocaml-modules/lo/default.nix |  2 +-
 .../ocaml-modules/lua-ml/default.nix          |  2 +-
 .../ocaml-modules/lwt-canceler/default.nix    |  2 +-
 .../ocaml-modules/lwt-watcher/default.nix     |  2 +-
 .../development/ocaml-modules/lwt/default.nix |  2 +-
 .../ocaml-modules/lwt_log/default.nix         |  2 +-
 .../development/ocaml-modules/mad/default.nix |  2 +-
 .../ocaml-modules/magic-trace/default.nix     |  2 +-
 .../ocaml-modules/markup/default.nix          |  2 +-
 .../ocaml-modules/mccs/default.nix            |  2 +-
 .../ocaml-modules/mem_usage/default.nix       |  2 +-
 .../ocaml-modules/memprof-limits/default.nix  |  2 +-
 .../ocaml-modules/memtrace/default.nix        |  2 +-
 .../ocaml-modules/metadata/default.nix        |  2 +-
 .../development/ocaml-modules/mew/default.nix |  2 +-
 .../ocaml-modules/mew_vi/default.nix          |  2 +-
 .../ocaml-modules/minisat/default.nix         |  2 +-
 .../ocaml-modules/mldoc/default.nix           |  2 +-
 .../ocaml-modules/mlgmpidl/default.nix        |  2 +-
 .../development/ocaml-modules/mlx/default.nix |  2 +-
 pkgs/development/ocaml-modules/mm/default.nix |  2 +-
 .../ocaml-modules/morbig/default.nix          |  2 +-
 .../ocaml-modules/mparser/default.nix         |  2 +-
 .../ocaml-modules/msat/default.nix            |  2 +-
 .../ocaml-modules/msgpck/default.nix          |  2 +-
 .../multipart-form-data/default.nix           |  2 +-
 .../ocaml-modules/mustache/default.nix        |  2 +-
 .../development/ocaml-modules/npy/default.nix |  2 +-
 .../development/ocaml-modules/num/default.nix |  2 +-
 .../ocaml-freestanding/default.nix            |  2 +-
 .../ocaml-modules/ocaml-libvirt/default.nix   |  2 +-
 .../ocaml-migrate-parsetree/1.8.x.nix         |  2 +-
 .../ocaml-modules/ocaml-monadic/default.nix   |  2 +-
 .../ocaml-print-intf/default.nix              |  2 +-
 .../ocaml-protoc-plugin/default.nix           |  2 +-
 .../ocaml-modules/ocaml-r/default.nix         |  2 +-
 .../ocaml-sat-solvers/default.nix             |  2 +-
 .../ocaml-modules/ocamlfuse/default.nix       |  2 +-
 .../ocaml-modules/ocamline/default.nix        |  2 +-
 .../ocaml-modules/ocp-ocamlres/default.nix    |  2 +-
 .../ocaml-modules/ocplib-endian/default.nix   |  2 +-
 .../ocaml-modules/ocplib-simplex/default.nix  |  2 +-
 .../ocaml-modules/ocsigen-ppx-rpc/default.nix |  2 +-
 .../ocaml-modules/ocsigen-start/default.nix   |  2 +-
 .../ocaml-modules/ocsigen-toolkit/default.nix |  2 +-
 .../ocaml-modules/ocsipersist/lib.nix         |  2 +-
 .../ocaml-modules/octavius/default.nix        |  2 +-
 .../ocaml-modules/odate/default.nix           |  2 +-
 .../development/ocaml-modules/ogg/default.nix |  2 +-
 .../opam-file-format/default.nix              |  2 +-
 .../ocaml-modules/opus/default.nix            |  2 +-
 .../ocaml-modules/oseq/default.nix            |  2 +-
 .../ocaml-modules/otfed/default.nix           |  2 +-
 .../ocaml-modules/otoml/default.nix           |  2 +-
 .../ocaml-modules/parany/default.nix          |  2 +-
 .../ocaml-modules/parmap/default.nix          |  2 +-
 .../ocaml-modules/pgocaml/default.nix         |  2 +-
 .../ocaml-modules/pgsolver/default.nix        |  2 +-
 .../ocaml-modules/piqi-ocaml/default.nix      |  2 +-
 .../ocaml-modules/piqi/default.nix            |  2 +-
 .../ocaml-modules/portaudio/default.nix       |  2 +-
 .../ocaml-modules/pprint/default.nix          |  2 +-
 .../ocaml-modules/ppx_bap/default.nix         |  2 +-
 .../ocaml-modules/ppx_cstubs/default.nix      |  2 +-
 .../ocaml-modules/ppx_derivers/default.nix    |  2 +-
 .../ppx_deriving_cmdliner/default.nix         |  2 +-
 .../ppx_deriving_yojson/default.nix           |  2 +-
 .../ocaml-modules/ppx_monad/default.nix       |  2 +-
 .../ocaml-modules/ppx_show/default.nix        |  2 +-
 .../ppx_tools_versioned/default.nix           |  2 +-
 .../ocaml-modules/ppx_yojson_conv/default.nix |  2 +-
 .../ppx_yojson_conv_lib/default.nix           |  2 +-
 .../ocaml-modules/printbox/default.nix        |  2 +-
 .../ocaml-modules/process/default.nix         |  2 +-
 .../ocaml-modules/psmt2-frontend/default.nix  |  2 +-
 .../ocaml-modules/pulseaudio/default.nix      |  2 +-
 .../ocaml-modules/pure-splitmix/default.nix   |  2 +-
 .../ocaml-modules/pyml/default.nix            |  2 +-
 .../development/ocaml-modules/qcheck/core.nix |  2 +-
 .../qcheck/multicoretests-util.nix            |  2 +-
 .../ocaml-modules/qtest/default.nix           |  2 +-
 .../ocaml-modules/reactivedata/default.nix    |  2 +-
 .../ocaml-modules/repr/default.nix            |  2 +-
 .../resource-pooling/default.nix              |  2 +-
 .../ocaml-modules/resto/default.nix           |  2 +-
 .../ocaml-modules/rfc7748/default.nix         |  2 +-
 .../ocaml-modules/ringo/default.nix           |  2 +-
 .../ocaml-modules/safepass/default.nix        |  2 +-
 .../ocaml-modules/samplerate/default.nix      |  2 +-
 .../ocaml-modules/sawja/default.nix           |  2 +-
 .../secp256k1-internal/default.nix            |  2 +-
 .../ocaml-modules/secp256k1/default.nix       |  2 +-
 .../ocaml-modules/sedlex/default.nix          |  2 +-
 .../ocaml-modules/simple-diff/default.nix     |  2 +-
 .../ocaml-modules/slug/default.nix            |  2 +-
 .../ocaml-modules/sodium/default.nix          |  2 +-
 .../ocaml-modules/soundtouch/default.nix      |  2 +-
 .../ocaml-modules/speex/default.nix           |  2 +-
 .../ocaml-modules/spelll/default.nix          |  2 +-
 .../development/ocaml-modules/srt/default.nix |  2 +-
 .../development/ocaml-modules/ssl/default.nix |  2 +-
 .../ocaml-modules/swhid_core/default.nix      |  2 +-
 .../ocaml-modules/syslog/default.nix          |  2 +-
 .../ocaml-modules/taglib/default.nix          |  2 +-
 .../ocaml-modules/tcslib/default.nix          |  2 +-
 .../ocaml-modules/tdigest/default.nix         |  2 +-
 .../ocaml-modules/terml/default.nix           |  2 +-
 .../ocaml-modules/theora/default.nix          |  2 +-
 .../ocaml-modules/timed/default.nix           |  2 +-
 .../ocaml-modules/tiny_httpd/default.nix      |  2 +-
 .../ocaml-modules/toml/default.nix            |  2 +-
 .../ocaml-modules/torch/default.nix           |  2 +-
 .../ocaml-modules/trie/default.nix            |  2 +-
 .../ocaml-modules/tsdl-image/default.nix      |  2 +-
 .../ocaml-modules/tsdl-mixer/default.nix      |  2 +-
 .../ocaml-modules/tsdl-ttf/default.nix        |  2 +-
 .../ocaml-modules/tsort/default.nix           |  2 +-
 .../development/ocaml-modules/twt/default.nix |  2 +-
 .../ocaml-modules/uecc/default.nix            |  2 +-
 .../ocaml-modules/ulex/default.nix            |  2 +-
 .../ocaml-modules/vorbis/default.nix          |  2 +-
 .../ocaml-modules/vpl-core/default.nix        |  2 +-
 .../ocaml-modules/webmachine/default.nix      |  2 +-
 .../ocaml-modules/xenstore/default.nix        |  2 +-
 .../xenstore_transport/default.nix            |  2 +-
 .../ocaml-modules/xmlplaylist/default.nix     |  2 +-
 .../ocaml-modules/yuujinchou/default.nix      |  2 +-
 .../development/ocaml-modules/zed/default.nix |  2 +-
 .../ocaml-modules/zelus/default.nix           |  2 +-
 .../octave-modules/bim/default.nix            |  2 +-
 .../octave-modules/msh/default.nix            |  2 +-
 .../octave-modules/video/default.nix          |  2 +-
 .../perl-modules/Percona-Toolkit/default.nix  |  2 +-
 .../WWW-YoutubeViewer/default.nix             |  2 +-
 .../development/php-packages/amqp/default.nix |  2 +-
 .../development/php-packages/apcu/default.nix |  2 +-
 pkgs/development/php-packages/ast/default.nix |  2 +-
 .../composer-local-repo-plugin/default.nix    |  2 +-
 .../php-packages/couchbase/default.nix        |  2 +-
 .../cyclonedx-php-composer/default.nix        |  2 +-
 .../php-packages/datadog_trace/default.nix    |  2 +-
 pkgs/development/php-packages/ds/default.nix  |  2 +-
 .../development/php-packages/imap/default.nix |  2 +-
 .../php-packages/maxminddb/default.nix        |  2 +-
 .../php-packages/memcache/default.nix         |  2 +-
 .../php-packages/memcached/default.nix        |  2 +-
 .../php-packages/memprof/default.nix          |  2 +-
 .../php-packages/mongodb/default.nix          |  2 +-
 .../php-packages/openswoole/default.nix       |  2 +-
 .../php-packages/opentelemetry/default.nix    |  2 +-
 .../php-packages/pdlib/default.nix            |  2 +-
 .../php-packages/phalcon/default.nix          |  2 +-
 .../development/php-packages/phan/default.nix |  2 +-
 .../php-packages/pspell/default.nix           |  2 +-
 .../php-packages/redis/default.nix            |  2 +-
 .../php-packages/snuffleupagus/default.nix    |  2 +-
 pkgs/development/php-packages/spx/default.nix |  2 +-
 .../php-packages/swoole/default.nix           |  2 +-
 pkgs/development/php-packages/uv/default.nix  |  2 +-
 .../php-packages/xdebug/default.nix           |  2 +-
 .../development/php-packages/zstd/default.nix |  2 +-
 .../python-modules/accupy/default.nix         |  2 +-
 .../python-modules/adal/default.nix           |  2 +-
 .../python-modules/adb-shell/default.nix      |  2 +-
 .../add-trailing-comma/default.nix            |  2 +-
 .../python-modules/advocate/default.nix       |  2 +-
 .../python-modules/aggdraw/default.nix        |  2 +-
 .../python-modules/aggregate6/default.nix     |  2 +-
 .../python-modules/aiocontextvars/default.nix |  2 +-
 .../python-modules/aiodhcpwatcher/default.nix |  2 +-
 .../python-modules/aioemonitor/default.nix    |  2 +-
 .../aiohttp-asyncmdnsresolver/default.nix     |  2 +-
 .../aiohttp-swagger/default.nix               |  2 +-
 .../python-modules/aiohttp-wsgi/default.nix   |  2 +-
 .../python-modules/aiohwenergy/default.nix    |  2 +-
 .../python-modules/aiokef/default.nix         |  2 +-
 .../python-modules/aiomcache/default.nix      |  2 +-
 .../python-modules/aiomodernforms/default.nix |  2 +-
 .../python-modules/aiopg/default.nix          |  2 +-
 .../python-modules/aiopylgtv/default.nix      |  2 +-
 .../python-modules/aiosenz/default.nix        |  2 +-
 .../python-modules/aiosignal/default.nix      |  2 +-
 .../python-modules/airium/default.nix         |  2 +-
 .../python-modules/airly/default.nix          |  2 +-
 .../python-modules/alarmdecoder/default.nix   |  2 +-
 .../python-modules/amshan/default.nix         |  2 +-
 .../python-modules/android-backup/default.nix |  2 +-
 .../python-modules/anitopy/default.nix        |  2 +-
 .../python-modules/anonip/default.nix         |  2 +-
 .../python-modules/ansiconv/default.nix       |  2 +-
 .../python-modules/anyqt/default.nix          |  2 +-
 .../python-modules/apcaccess/default.nix      |  2 +-
 .../python-modules/appnope/default.nix        |  2 +-
 .../python-modules/aprslib/default.nix        |  2 +-
 .../python-modules/aqipy-atmotech/default.nix |  2 +-
 .../python-modules/aqualogic/default.nix      |  2 +-
 .../python-modules/arc4/default.nix           |  2 +-
 .../python-modules/aresponses/default.nix     |  2 +-
 .../python-modules/arpy/default.nix           |  2 +-
 .../python-modules/arxiv2bib/default.nix      |  2 +-
 .../python-modules/asciitree/default.nix      |  2 +-
 .../python-modules/asks/default.nix           |  2 +-
 .../python-modules/asn1ate/default.nix        |  2 +-
 .../aspy-refactor-imports/default.nix         |  2 +-
 .../python-modules/assertpy/default.nix       |  2 +-
 .../python-modules/async-dns/default.nix      |  2 +-
 .../asyncio-throttle/default.nix              |  2 +-
 .../python-modules/attr/default.nix           |  2 +-
 .../python-modules/aubio/default.nix          |  2 +-
 .../python-modules/augeas/default.nix         |  2 +-
 .../python-modules/autograd-gamma/default.nix |  2 +-
 .../python-modules/avea/default.nix           |  2 +-
 .../python-modules/aw-core/default.nix        |  2 +-
 .../backports-tarfile/default.nix             |  2 +-
 .../python-modules/bagit/default.nix          |  2 +-
 .../python-modules/bap/default.nix            |  2 +-
 .../python-modules/barectf/default.nix        |  2 +-
 .../python-modules/base36/default.nix         |  2 +-
 .../python-modules/base58check/default.nix    |  2 +-
 .../python-modules/bashlex/default.nix        |  2 +-
 .../batchgenerators/default.nix               |  2 +-
 .../python-modules/bcf/default.nix            |  2 +-
 .../python-modules/bcg/default.nix            |  2 +-
 .../python-modules/bch/default.nix            |  2 +-
 .../beancount-plugin-utils/default.nix        |  2 +-
 .../python-modules/beanstalkc/default.nix     |  2 +-
 .../python-modules/beaupy/default.nix         |  2 +-
 .../python-modules/beautifultable/default.nix |  2 +-
 .../python-modules/beautysh/default.nix       |  2 +-
 .../python-modules/behave/default.nix         |  2 +-
 .../python-modules/beziers/default.nix        |  2 +-
 .../python-modules/bip32/default.nix          |  2 +-
 .../python-modules/birch/default.nix          |  2 +-
 .../python-modules/bitcoinrpc/default.nix     |  2 +-
 .../python-modules/bitvavo-aio/default.nix    |  2 +-
 .../bitvector-for-humans/default.nix          |  2 +-
 .../python-modules/bizkaibus/default.nix      |  2 +-
 .../python-modules/bjoern/default.nix         |  2 +-
 .../black-macchiato/default.nix               |  2 +-
 .../python-modules/blacken-docs/default.nix   |  2 +-
 .../blurhash-python/default.nix               |  2 +-
 .../python-modules/bond-api/default.nix       |  2 +-
 .../python-modules/bonsai/default.nix         |  2 +-
 .../python-modules/boolean-py/default.nix     |  2 +-
 .../python-modules/braintree/default.nix      |  2 +-
 .../python-modules/bravado-core/default.nix   |  2 +-
 .../python-modules/bravia-tv/default.nix      |  2 +-
 .../python-modules/brotli-asgi/default.nix    |  2 +-
 .../python-modules/brotlicffi/default.nix     |  2 +-
 .../brottsplatskartan/default.nix             |  2 +-
 .../btsmarthub-devicelist/default.nix         |  2 +-
 .../python-modules/bubop/default.nix          |  2 +-
 .../python-modules/cachey/default.nix         |  2 +-
 .../python-modules/calver/default.nix         |  2 +-
 .../python-modules/calysto/default.nix        |  2 +-
 .../python-modules/capturer/default.nix       |  2 +-
 .../python-modules/catkin-pkg/default.nix     |  2 +-
 .../celery-singleton/default.nix              |  2 +-
 .../python-modules/certifi/default.nix        |  2 +-
 .../python-modules/certvalidator/default.nix  |  2 +-
 .../python-modules/cfn-flip/default.nix       |  2 +-
 .../python-modules/cgroup-utils/default.nix   |  2 +-
 .../python-modules/checksumdir/default.nix    |  2 +-
 .../python-modules/chirpstack-api/default.nix |  2 +-
 .../python-modules/cjkwrap/default.nix        |  2 +-
 .../classify-imports/default.nix              |  2 +-
 .../python-modules/cleanit/default.nix        |  2 +-
 .../python-modules/click-aliases/default.nix  |  2 +-
 .../python-modules/clickclick/default.nix     |  2 +-
 .../clickhouse-driver/default.nix             |  2 +-
 .../python-modules/cligj/default.nix          |  2 +-
 .../python-modules/clldutils/default.nix      |  2 +-
 .../python-modules/coapthon3/default.nix      |  2 +-
 .../python-modules/codepy/default.nix         |  2 +-
 .../python-modules/coloredlogs/default.nix    |  2 +-
 .../python-modules/colorthief/default.nix     |  2 +-
 .../python-modules/commandlines/default.nix   |  2 +-
 .../python-modules/commentjson/default.nix    |  2 +-
 .../python-modules/confuse/default.nix        |  2 +-
 .../construct-classes/default.nix             |  2 +-
 .../python-modules/controku/default.nix       |  2 +-
 .../python-modules/convertdate/default.nix    |  2 +-
 .../python-modules/coreapi/default.nix        |  2 +-
 .../python-modules/coreschema/default.nix     |  2 +-
 .../python-modules/cornice/default.nix        |  2 +-
 .../python-modules/cose/default.nix           |  2 +-
 .../crownstone-core/default.nix               |  2 +-
 .../crownstone-uart/default.nix               |  2 +-
 .../python-modules/cryptg/default.nix         |  2 +-
 .../python-modules/crysp/default.nix          |  2 +-
 .../python-modules/csv2md/default.nix         |  2 +-
 .../python-modules/csvw/default.nix           |  2 +-
 .../cxxheaderparser/default.nix               |  2 +-
 .../cython-test-exception-raiser/default.nix  |  2 +-
 .../python-modules/daemonocle/default.nix     |  2 +-
 .../python-modules/darkdetect/default.nix     |  2 +-
 .../dask-gateway-server/default.nix           |  2 +-
 .../dataclass-factory/default.nix             |  2 +-
 .../dataclass-wizard/default.nix              |  2 +-
 .../dataclasses-serialization/default.nix     |  2 +-
 .../datasette-template-sql/default.nix        |  2 +-
 .../dbus-signature-pyparsing/default.nix      |  2 +-
 .../python-modules/deepwave/default.nix       |  2 +-
 .../python-modules/dehinter/default.nix       |  2 +-
 .../python-modules/dek/default.nix            |  2 +-
 .../python-modules/deploykit/default.nix      |  2 +-
 .../desktop-entry-lib/default.nix             |  2 +-
 .../devolo-home-control-api/default.nix       |  2 +-
 .../python-modules/dfdiskcache/default.nix    |  2 +-
 .../python-modules/dictdiffer/default.nix     |  2 +-
 .../python-modules/dingz/default.nix          |  2 +-
 .../python-modules/directv/default.nix        |  2 +-
 .../python-modules/dirsearch/default.nix      |  2 +-
 .../python-modules/diskcache/default.nix      |  2 +-
 .../python-modules/dissononce/default.nix     |  2 +-
 .../python-modules/dj-static/default.nix      |  2 +-
 .../django-apscheduler/default.nix            |  2 +-
 .../django-auditlog/default.nix               |  2 +-
 .../django-bootstrap5/default.nix             |  2 +-
 .../django-celery-email/default.nix           |  2 +-
 .../django-choices-field/default.nix          |  2 +-
 .../django-context-decorator/default.nix      |  2 +-
 .../django-graphiql-debug-toolbar/default.nix |  2 +-
 .../python-modules/django-htmx/default.nix    |  2 +-
 .../django-js-reverse/default.nix             |  2 +-
 .../django-logentry-admin/default.nix         |  2 +-
 .../django-mdeditor/default.nix               |  2 +-
 .../python-modules/django-mptt/default.nix    |  2 +-
 .../django-postgresql-netfields/default.nix   |  2 +-
 .../django-prometheus/default.nix             |  2 +-
 .../django-rest-auth/default.nix              |  2 +-
 .../python-modules/django-sites/default.nix   |  2 +-
 .../django-split-settings/default.nix         |  2 +-
 .../django-timezone-field/default.nix         |  2 +-
 .../djangorestframework-guardian/default.nix  |  2 +-
 .../djangorestframework-recursive/default.nix |  2 +-
 .../djangorestframework/default.nix           |  2 +-
 .../python-modules/dodgy/default.nix          |  2 +-
 .../python-modules/doit-py/default.nix        |  2 +-
 .../python-modules/donfig/default.nix         |  2 +-
 .../donut-shellcode/default.nix               |  2 +-
 .../python-modules/drafthorse/default.nix     |  2 +-
 .../python-modules/drf-jwt/default.nix        |  2 +-
 .../drf-spectacular-sidecar/default.nix       |  2 +-
 .../python-modules/ds4drv/default.nix         |  2 +-
 .../python-modules/dsinternals/default.nix    |  2 +-
 .../python-modules/duct-py/default.nix        |  2 +-
 .../python-modules/duden/default.nix          |  2 +-
 .../python-modules/dufte/default.nix          |  2 +-
 .../python-modules/dungeon-eos/default.nix    |  2 +-
 .../python-modules/durationpy/default.nix     |  2 +-
 .../python-modules/dynd/default.nix           |  2 +-
 .../python-modules/ebooklib/default.nix       |  2 +-
 .../python-modules/editdistance-s/default.nix |  2 +-
 .../python-modules/editor/default.nix         |  2 +-
 .../python-modules/editorconfig/default.nix   |  2 +-
 .../python-modules/einx/default.nix           |  2 +-
 .../python-modules/elmax/default.nix          |  2 +-
 .../python-modules/emailthreads/default.nix   |  2 +-
 .../python-modules/emulated-roku/default.nix  |  2 +-
 .../python-modules/encodec/default.nix        |  2 +-
 .../python-modules/enturclient/default.nix    |  2 +-
 .../python-modules/envoy-reader/default.nix   |  2 +-
 .../ephemeral-port-reserve/default.nix        |  2 +-
 .../python-modules/esprima/default.nix        |  2 +-
 .../python-modules/essentials/default.nix     |  2 +-
 .../python-modules/etcd/default.nix           |  2 +-
 .../python-modules/etebase/default.nix        |  2 +-
 .../python-modules/eth-rlp/default.nix        |  2 +-
 .../python-modules/executing/default.nix      |  2 +-
 .../python-modules/expects/default.nix        |  2 +-
 .../python-modules/fabulous/default.nix       |  2 +-
 .../python-modules/fairseq/default.nix        |  2 +-
 .../farama-notifications/default.nix          |  2 +-
 .../python-modules/fastdtw/default.nix        |  2 +-
 .../python-modules/fastjsonschema/default.nix |  2 +-
 .../python-modules/fastpbkdf2/default.nix     |  2 +-
 .../python-modules/filedate/default.nix       |  2 +-
 .../python-modules/finalfusion/default.nix    |  2 +-
 .../python-modules/fingerprints/default.nix   |  2 +-
 .../python-modules/fissix/default.nix         |  2 +-
 .../python-modules/fitbit/default.nix         |  2 +-
 .../python-modules/fixerio/default.nix        |  2 +-
 .../python-modules/flasgger/default.nix       |  2 +-
 .../python-modules/flask-bcrypt/default.nix   |  2 +-
 .../flask-expects-json/default.nix            |  2 +-
 .../python-modules/flask-mysqldb/default.nix  |  2 +-
 .../python-modules/flask-paranoid/default.nix |  2 +-
 .../flask-reverse-proxy-fix/default.nix       |  2 +-
 .../python-modules/flask-sock/default.nix     |  2 +-
 .../python-modules/flatdict/default.nix       |  2 +-
 .../python-modules/flatten-dict/default.nix   |  2 +-
 .../python-modules/flatten-json/default.nix   |  2 +-
 .../python-modules/flexcache/default.nix      |  2 +-
 .../python-modules/flexparser/default.nix     |  2 +-
 .../python-modules/flit-gettext/default.nix   |  2 +-
 .../python-modules/flit/default.nix           |  2 +-
 .../python-modules/fnvhash/default.nix        |  2 +-
 .../python-modules/font-v/default.nix         |  2 +-
 .../python-modules/fordpass/default.nix       |  2 +-
 .../python-modules/fqdn/default.nix           |  2 +-
 .../python-modules/frilouz/default.nix        |  2 +-
 .../python-modules/frozenlist2/default.nix    |  2 +-
 .../python-modules/funcparserlib/default.nix  |  2 +-
 .../functions-framework/default.nix           |  2 +-
 .../python-modules/fx2/default.nix            |  2 +-
 .../garminconnect-aio/default.nix             |  2 +-
 .../python-modules/gatt/default.nix           |  2 +-
 .../python-modules/gawd/default.nix           |  2 +-
 .../python-modules/gb-io/default.nix          |  2 +-
 .../python-modules/gbinder-python/default.nix |  2 +-
 .../python-modules/gcodepy/default.nix        |  2 +-
 .../python-modules/gcsa/default.nix           |  2 +-
 .../python-modules/gdsfactory/default.nix     |  2 +-
 .../python-modules/gekitchen/default.nix      |  2 +-
 .../georss-generic-client/default.nix         |  2 +-
 .../default.nix                               |  2 +-
 .../georss-tfs-incidents-client/default.nix   |  2 +-
 .../georss-wa-dfes-client/default.nix         |  2 +-
 .../python-modules/gerbonara/default.nix      |  2 +-
 .../python-modules/gfal2-python/default.nix   |  2 +-
 .../python-modules/gfal2-util/default.nix     |  2 +-
 .../gibberish-detector/default.nix            |  2 +-
 .../python-modules/git-dummy/default.nix      |  2 +-
 .../python-modules/git-find-repos/default.nix |  2 +-
 .../python-modules/git-url-parse/default.nix  |  2 +-
 .../python-modules/git-versioner/default.nix  |  2 +-
 .../github-to-sqlite/default.nix              |  2 +-
 .../python-modules/glean-sdk/default.nix      |  2 +-
 .../python-modules/gpt-2-simple/default.nix   |  2 +-
 .../python-modules/gpxpy/default.nix          |  2 +-
 .../python-modules/grandalf/default.nix       |  2 +-
 .../graphlib-backport/default.nix             |  2 +-
 .../graphql-server-core/default.nix           |  2 +-
 .../python-modules/grip/default.nix           |  2 +-
 .../python-modules/gruut-ipa/default.nix      |  2 +-
 .../python-modules/gtts-token/default.nix     |  2 +-
 .../python-modules/help2man/default.nix       |  2 +-
 .../python-modules/helper/default.nix         |  2 +-
 .../python-modules/here-routing/default.nix   |  2 +-
 .../python-modules/here-transit/default.nix   |  2 +-
 .../python-modules/hetzner/default.nix        |  2 +-
 .../python-modules/hightime/default.nix       |  2 +-
 .../python-modules/hlk-sw16/default.nix       |  2 +-
 .../python-modules/hocr-tools/default.nix     |  2 +-
 .../homepluscontrol/default.nix               |  2 +-
 .../python-modules/hpack/default.nix          |  2 +-
 .../python-modules/hsh/default.nix            |  2 +-
 .../python-modules/hsluv/default.nix          |  2 +-
 .../html-table-parser-python3/default.nix     |  2 +-
 .../python-modules/html-tag-names/default.nix |  2 +-
 .../html-void-elements/default.nix            |  2 +-
 .../python-modules/html5tagger/default.nix    |  2 +-
 .../python-modules/httmock/default.nix        |  2 +-
 .../python-modules/http-ece/default.nix       |  2 +-
 .../http-message-signatures/default.nix       |  2 +-
 .../python-modules/httplib2/default.nix       |  2 +-
 .../huisbaasje-client/default.nix             |  2 +-
 .../python-modules/humblewx/default.nix       |  2 +-
 .../python-modules/hydrawiser/default.nix     |  2 +-
 .../python-modules/hyperion-py/default.nix    |  2 +-
 .../python-modules/i3ipc/default.nix          |  2 +-
 .../python-modules/ibis/default.nix           |  2 +-
 .../python-modules/icmplib/default.nix        |  2 +-
 .../python-modules/image-diff/default.nix     |  2 +-
 .../python-modules/imaplib2/default.nix       |  2 +-
 .../python-modules/imgdiff/default.nix        |  2 +-
 .../python-modules/installer/default.nix      |  2 +-
 .../python-modules/interface-meta/default.nix |  2 +-
 .../into-dbus-python/default.nix              |  2 +-
 .../python-modules/ionhash/default.nix        |  2 +-
 .../python-modules/ipfshttpclient/default.nix |  2 +-
 .../python-modules/ipyniivue/default.nix      |  2 +-
 .../python-modules/ipyxact/default.nix        |  2 +-
 .../python-modules/ircrobots/default.nix      |  2 +-
 .../python-modules/ircstates/default.nix      |  2 +-
 .../python-modules/irctokens/default.nix      |  2 +-
 .../python-modules/isal/default.nix           |  2 +-
 .../python-modules/isbnlib/default.nix        |  2 +-
 .../python-modules/isoduration/default.nix    |  2 +-
 .../item-synchronizer/default.nix             |  2 +-
 .../python-modules/itypes/default.nix         |  2 +-
 .../python-modules/jax-jumpy/default.nix      |  2 +-
 .../python-modules/jedi/default.nix           |  2 +-
 .../python-modules/jello/default.nix          |  2 +-
 .../python-modules/jellyfish/default.nix      |  2 +-
 .../python-modules/jieba/default.nix          |  2 +-
 .../python-modules/jproperties/default.nix    |  2 +-
 .../python-modules/jpylyzer/default.nix       |  2 +-
 .../python-modules/jschon/default.nix         |  2 +-
 .../json-home-client/default.nix              |  2 +-
 .../python-modules/json2html/default.nix      |  2 +-
 .../python-modules/jsonlines/default.nix      |  2 +-
 .../python-modules/jsonrpc-async/default.nix  |  2 +-
 .../python-modules/jsonstreams/default.nix    |  2 +-
 .../python-modules/jsonxs/default.nix         |  2 +-
 .../python-modules/junitparser/default.nix    |  2 +-
 .../python-modules/justbackoff/default.nix    |  2 +-
 .../python-modules/jwt/default.nix            |  2 +-
 .../kaldi-active-grammar/default.nix          |  2 +-
 .../kaldi-active-grammar/fork.nix             |  2 +-
 .../python-modules/keepkey/default.nix        |  2 +-
 .../python-modules/keyboard/default.nix       |  2 +-
 .../python-modules/keyutils/default.nix       |  2 +-
 .../python-modules/kfactory/default.nix       |  2 +-
 .../python-modules/kivy-garden/default.nix    |  2 +-
 .../python-modules/klaus/default.nix          |  2 +-
 .../python-modules/kml2geojson/default.nix    |  2 +-
 .../python-modules/kotsu/default.nix          |  2 +-
 .../python-modules/krakenex/default.nix       |  2 +-
 .../python-modules/laszip/default.nix         |  2 +-
 .../python-modules/latex2mathml/default.nix   |  2 +-
 .../python-modules/ledgerwallet/default.nix   |  2 +-
 .../python-modules/libarcus/default.nix       |  2 +-
 .../python-modules/liblarch/default.nix       |  2 +-
 .../python-modules/libnacl/default.nix        |  2 +-
 .../python-modules/libpyvivotek/default.nix   |  2 +-
 .../python-modules/libsavitar/default.nix     |  2 +-
 .../python-modules/libversion/default.nix     |  2 +-
 .../python-modules/lightparam/default.nix     |  2 +-
 .../python-modules/limiter/default.nix        |  2 +-
 .../python-modules/lineedit/default.nix       |  2 +-
 .../python-modules/litemapy/default.nix       |  2 +-
 .../python-modules/lizard/default.nix         |  2 +-
 .../python-modules/logi-circle/default.nix    |  2 +-
 .../python-modules/logster/default.nix        |  2 +-
 .../python-modules/lpc-checksum/default.nix   |  2 +-
 .../python-modules/luftdaten/default.nix      |  2 +-
 .../python-modules/luhn/default.nix           |  2 +-
 .../python-modules/luxtronik/default.nix      |  2 +-
 .../python-modules/lzallright/default.nix     |  2 +-
 .../python-modules/macaddress/default.nix     |  2 +-
 .../python-modules/macholib/default.nix       |  2 +-
 .../python-modules/macropy/default.nix        |  2 +-
 .../python-modules/mando/default.nix          |  2 +-
 .../python-modules/manuf/default.nix          |  2 +-
 .../python-modules/matchpy/default.nix        |  2 +-
 .../python-modules/materialx/default.nix      |  2 +-
 .../python-modules/matplotx/default.nix       |  2 +-
 .../python-modules/mbddns/default.nix         |  2 +-
 .../python-modules/mdurl/default.nix          |  2 +-
 .../python-modules/medvol/default.nix         |  2 +-
 .../memory-tempfile/default.nix               |  2 +-
 .../python-modules/mercantile/default.nix     |  2 +-
 .../python-modules/mergedeep/default.nix      |  2 +-
 .../python-modules/messagebird/default.nix    |  2 +-
 .../python-modules/meteocalc/default.nix      |  2 +-
 .../python-modules/methodtools/default.nix    |  2 +-
 .../python-modules/microdata/default.nix      |  2 +-
 .../python-modules/minexr/default.nix         |  2 +-
 .../python-modules/minimock/default.nix       |  2 +-
 .../python-modules/mitmproxy-rs/default.nix   |  2 +-
 .../mkdocs-get-deps/default.nix               |  2 +-
 .../python-modules/mlrose/default.nix         |  2 +-
 .../python-modules/mnemonic/default.nix       |  2 +-
 .../python-modules/mock-open/default.nix      |  2 +-
 .../python-modules/mock-services/default.nix  |  2 +-
 .../python-modules/mockfs/default.nix         |  2 +-
 .../python-modules/moddb/default.nix          |  2 +-
 .../python-modules/monero/default.nix         |  2 +-
 .../motioneye-client/default.nix              |  2 +-
 .../mozilla-django-oidc/default.nix           |  2 +-
 .../python-modules/mpegdash/default.nix       |  2 +-
 .../python-modules/mplcursors/default.nix     |  2 +-
 .../python-modules/mpldatacursor/default.nix  |  2 +-
 .../python-modules/mpv/default.nix            |  2 +-
 .../python-modules/ms-cv/default.nix          |  2 +-
 .../python-modules/mutf8/default.nix          |  2 +-
 .../python-modules/mygene/default.nix         |  2 +-
 .../python-modules/mygpoclient/default.nix    |  2 +-
 .../python-modules/myhome/default.nix         |  2 +-
 .../python-modules/mypy/extensions.nix        |  2 +-
 .../mysql-connector/default.nix               |  2 +-
 .../python-modules/nad-receiver/default.nix   |  2 +-
 .../python-modules/naked/default.nix          |  2 +-
 .../python-modules/name-that-hash/default.nix |  2 +-
 .../python-modules/names/default.nix          |  2 +-
 .../python-modules/nbtlib/default.nix         |  2 +-
 .../python-modules/nc-dnsapi/default.nix      |  2 +-
 .../ndg-httpsclient/default.nix               |  2 +-
 .../python-modules/ndms2-client/default.nix   |  2 +-
 .../netbox-napalm-plugin/default.nix          |  2 +-
 .../python-modules/netdata-pandas/default.nix |  2 +-
 .../python-modules/netmap/default.nix         |  2 +-
 .../python-modules/newick/default.nix         |  2 +-
 .../python-modules/nh3/default.nix            |  2 +-
 .../python-modules/nidaqmx/default.nix        |  2 +-
 .../nix-prefetch-github/default.nix           |  2 +-
 .../python-modules/nmapthon2/default.nix      |  2 +-
 .../python-modules/norfair/default.nix        |  2 +-
 .../python-modules/normality/default.nix      |  2 +-
 .../python-modules/nose2pytest/default.nix    |  2 +-
 .../python-modules/nplusone/default.nix       |  2 +-
 .../python-modules/nuclear/default.nix        |  2 +-
 .../python-modules/nuitka/default.nix         |  2 +-
 .../python-modules/numdifftools/default.nix   |  2 +-
 .../python-modules/oasatelematics/default.nix |  2 +-
 .../python-modules/oauthlib/default.nix       |  2 +-
 .../python-modules/ochre/default.nix          |  2 +-
 .../python-modules/ocrmypdf/default.nix       |  2 +-
 .../python-modules/ofxhome/default.nix        |  2 +-
 .../python-modules/ofxtools/default.nix       |  2 +-
 .../python-modules/oletools/default.nix       |  2 +-
 .../python-modules/opcua-widgets/default.nix  |  2 +-
 .../python-modules/open-garage/default.nix    |  2 +-
 .../open-interpreter/default.nix              |  2 +-
 .../python-modules/open-meteo/default.nix     |  2 +-
 .../openapi-pydantic/default.nix              |  2 +-
 .../python-modules/openapi3/default.nix       |  2 +-
 .../python-modules/openevsewifi/default.nix   |  2 +-
 .../python-modules/openrazer/common.nix       |  2 +-
 .../openrouteservice/default.nix              |  2 +-
 .../python-modules/opensimplex/default.nix    |  2 +-
 .../python-modules/opytimark/default.nix      |  2 +-
 .../python-modules/orm/default.nix            |  2 +-
 .../python-modules/orvibo/default.nix         |  2 +-
 .../python-modules/osc-lib/default.nix        |  2 +-
 .../python-modules/osc/default.nix            |  2 +-
 .../python-modules/oscpy/default.nix          |  2 +-
 .../python-modules/oscrypto/default.nix       |  2 +-
 .../python-modules/osmpythontools/default.nix |  2 +-
 .../python-modules/pa-ringbuffer/default.nix  |  2 +-
 .../python-modules/paginate/default.nix       |  2 +-
 .../python-modules/paho-mqtt/default.nix      |  2 +-
 .../python-modules/paintcompiler/default.nix  |  2 +-
 .../python-modules/pamqp/default.nix          |  2 +-
 .../python-modules/pasimple/default.nix       |  2 +-
 .../path-and-address/default.nix              |  2 +-
 .../python-modules/patrowl4py/default.nix     |  2 +-
 .../python-modules/pcapy-ng/default.nix       |  2 +-
 .../python-modules/pcodedmp/default.nix       |  2 +-
 .../python-modules/pdoc/default.nix           |  2 +-
 .../python-modules/pepit/default.nix          |  2 +-
 .../permissionedforms/default.nix             |  2 +-
 .../python-modules/pgpy/default.nix           |  2 +-
 .../python-modules/pickpack/default.nix       |  2 +-
 .../python-modules/piexif/default.nix         |  2 +-
 .../python-modules/pinboard/default.nix       |  2 +-
 .../python-modules/pixel-ring/default.nix     |  2 +-
 .../python-modules/pkce/default.nix           |  2 +-
 .../python-modules/pkgconfig/default.nix      |  2 +-
 .../python-modules/pkginfo2/default.nix       |  2 +-
 .../python-modules/playsound/default.nix      |  2 +-
 .../python-modules/pleroma-bot/default.nix    |  2 +-
 .../python-modules/plexauth/default.nix       |  2 +-
 .../python-modules/plugp100/default.nix       |  2 +-
 .../python-modules/pluthon/default.nix        |  2 +-
 .../pmdsky-debug-py/default.nix               |  2 +-
 .../python-modules/podcats/default.nix        |  2 +-
 .../python-modules/polling/default.nix        |  2 +-
 .../pre-commit-po-hooks/default.nix           |  2 +-
 .../python-modules/pretend/default.nix        |  2 +-
 .../python-modules/prison/default.nix         |  2 +-
 .../python-modules/prodict/default.nix        |  2 +-
 .../prometheus-async/default.nix              |  2 +-
 .../prometheus-flask-exporter/default.nix     |  2 +-
 .../python-modules/prompthub-py/default.nix   |  2 +-
 .../property-manager/default.nix              |  2 +-
 .../python-modules/prophet/default.nix        |  2 +-
 .../python-modules/proton-client/default.nix  |  2 +-
 .../proton-vpn-api-core/default.nix           |  2 +-
 .../python-modules/psautohint/default.nix     |  2 +-
 .../python-modules/pure-eval/default.nix      |  2 +-
 .../python-modules/purl/default.nix           |  2 +-
 .../python-modules/py-air-control/default.nix |  2 +-
 .../python-modules/py-cid/default.nix         |  2 +-
 .../python-modules/py-cpuinfo/default.nix     |  2 +-
 .../python-modules/py-deprecate/default.nix   |  2 +-
 .../python-modules/py-ecc/default.nix         |  2 +-
 .../py-eth-sig-utils/default.nix              |  2 +-
 .../py-expression-eval/default.nix            |  2 +-
 .../python-modules/py-multiaddr/default.nix   |  2 +-
 .../python-modules/py-nightscout/default.nix  |  2 +-
 .../python-modules/py-ubjson/default.nix      |  2 +-
 .../python-modules/py3buddy/default.nix       |  2 +-
 .../python-modules/pyaehw4a1/default.nix      |  2 +-
 .../python-modules/pyarlo/default.nix         |  2 +-
 .../python-modules/pyasn/default.nix          |  2 +-
 .../python-modules/pyasynchat/default.nix     |  2 +-
 .../python-modules/pyaxmlparser/default.nix   |  2 +-
 .../python-modules/pybids/default.nix         |  2 +-
 .../pybind11-abseil/default.nix               |  2 +-
 .../python-modules/pycarwings2/default.nix    |  2 +-
 .../python-modules/pychannels/default.nix     |  2 +-
 .../python-modules/pycketcasts/default.nix    |  2 +-
 .../python-modules/pyclimacell/default.nix    |  2 +-
 .../python-modules/pycodestyle/default.nix    |  2 +-
 .../python-modules/pycolorecho/default.nix    |  2 +-
 .../python-modules/pycompliance/default.nix   |  2 +-
 .../python-modules/pycsdr/default.nix         |  2 +-
 .../python-modules/pydigiham/default.nix      |  2 +-
 .../python-modules/pyeight/default.nix        |  2 +-
 .../python-modules/pyeverlights/default.nix   |  2 +-
 .../python-modules/pyevilgenius/default.nix   |  2 +-
 .../python-modules/pyevmasm/default.nix       |  2 +-
 .../python-modules/pyexcel-ods/default.nix    |  2 +-
 .../python-modules/pyexcel-xls/default.nix    |  2 +-
 .../python-modules/pyflakes/default.nix       |  2 +-
 .../python-modules/pyflexit/default.nix       |  2 +-
 .../python-modules/pyflic/default.nix         |  2 +-
 .../python-modules/pyfma/default.nix          |  2 +-
 .../python-modules/pyfzf/default.nix          |  2 +-
 .../python-modules/pygrok/default.nix         |  2 +-
 .../python-modules/pygtail/default.nix        |  2 +-
 .../python-modules/pyhcl/default.nix          |  2 +-
 .../python-modules/pyhomepilot/default.nix    |  2 +-
 .../python-modules/pyhumps/default.nix        |  2 +-
 .../python-modules/pyialarm/default.nix       |  2 +-
 .../python-modules/pyicloud/default.nix       |  2 +-
 .../pyinstaller-versionfile/default.nix       |  2 +-
 .../python-modules/pykostalpiko/default.nix   |  2 +-
 .../python-modules/pykrakenapi/default.nix    |  2 +-
 .../python-modules/pykulersky/default.nix     |  2 +-
 .../python-modules/pylama/default.nix         |  2 +-
 .../python-modules/pylatex/default.nix        |  2 +-
 .../python-modules/pylatexenc/default.nix     |  2 +-
 .../python-modules/pyld/default.nix           |  2 +-
 .../python-modules/pyldavis/default.nix       |  2 +-
 .../python-modules/pylddwrap/default.nix      |  2 +-
 .../python-modules/pylev/default.nix          |  2 +-
 .../python-modules/pylibdmtx/default.nix      |  2 +-
 .../python-modules/pylint-celery/default.nix  |  2 +-
 .../pyloggermanager/default.nix               |  2 +-
 .../python-modules/pylru/default.nix          |  2 +-
 .../python-modules/pyls-spyder/default.nix    |  2 +-
 .../python-modules/pymailgunner/default.nix   |  2 +-
 .../python-modules/pymarshal/default.nix      |  2 +-
 .../python-modules/pymata-express/default.nix |  2 +-
 .../python-modules/pymdstat/default.nix       |  2 +-
 .../python-modules/pymelcloud/default.nix     |  2 +-
 .../python-modules/pymemcache/default.nix     |  2 +-
 .../python-modules/pymysensors/default.nix    |  2 +-
 .../python-modules/pynamecheap/default.nix    |  2 +-
 .../python-modules/pynello/default.nix        |  2 +-
 .../python-modules/pynest2d/default.nix       |  2 +-
 .../python-modules/pynotifier/default.nix     |  2 +-
 .../python-modules/pynut2/default.nix         |  2 +-
 .../python-modules/pyperscan/default.nix      |  2 +-
 .../python-modules/pypika/default.nix         |  2 +-
 .../python-modules/pyqt5-stubs/default.nix    |  2 +-
 .../python-modules/pyqtdarktheme/default.nix  |  2 +-
 .../python-modules/pyquaternion/default.nix   |  2 +-
 .../python-modules/pyqvrpro/default.nix       |  2 +-
 .../python-modules/pyrate-limiter/default.nix |  2 +-
 .../python-modules/pyrituals/default.nix      |  2 +-
 .../python-modules/pyrmvtransport/default.nix |  2 +-
 .../python-modules/pyrogram/default.nix       |  2 +-
 .../python-modules/pyroma/default.nix         |  2 +-
 .../python-modules/pysaj/default.nix          |  2 +-
 .../python-modules/pysatochip/default.nix     |  2 +-
 .../python-modules/pysbd/default.nix          |  2 +-
 .../pyserial-asyncio-fast/default.nix         |  2 +-
 .../python-modules/pyshp/default.nix          |  2 +-
 .../python-modules/pyskyqhub/default.nix      |  2 +-
 .../python-modules/pysmappee/default.nix      |  2 +-
 .../python-modules/pysmartapp/default.nix     |  2 +-
 .../python-modules/pysmt/default.nix          |  2 +-
 .../python-modules/pysnow/default.nix         |  2 +-
 .../python-modules/pysonos/default.nix        |  2 +-
 .../python-modules/pysrt/default.nix          |  2 +-
 .../python-modules/pyssim/default.nix         |  2 +-
 .../python-modules/pystardict/default.nix     |  2 +-
 .../python-modules/pystray/default.nix        |  2 +-
 .../python-modules/pysubs2/default.nix        |  2 +-
 .../python-modules/pysvg-py3/default.nix      |  2 +-
 .../python-modules/pytap2/default.nix         |  2 +-
 .../python-modules/pyte/default.nix           |  2 +-
 .../python-modules/pytest-click/default.nix   |  2 +-
 .../pytest-error-for-skips/default.nix        |  2 +-
 .../pytest-factoryboy/default.nix             |  2 +-
 .../pytest-freezegun/default.nix              |  2 +-
 .../python-modules/pytest-logdog/default.nix  |  2 +-
 .../python-modules/pytest-mockito/default.nix |  2 +-
 .../pytest-mockservers/default.nix            |  2 +-
 .../python-modules/pytest-mpi/default.nix     |  2 +-
 .../pytest-pytestrail/default.nix             |  2 +-
 .../python-modules/pytest-raisin/default.nix  |  2 +-
 .../pytest-randomly/default.nix               |  2 +-
 .../pytest-resource-path/default.nix          |  2 +-
 .../python-modules/pytest-reverse/default.nix |  2 +-
 .../python-modules/pytest-tap/default.nix     |  2 +-
 .../python-modules/pytest-trio/default.nix    |  2 +-
 .../python-modules/pytest-vcr/default.nix     |  2 +-
 .../python-modules/python-awair/default.nix   |  2 +-
 .../python-barbicanclient/default.nix         |  2 +-
 .../python-constraint/default.nix             |  2 +-
 .../python-modules/python-ctags3/default.nix  |  2 +-
 .../python-designateclient/default.nix        |  2 +-
 .../python-modules/python-doi/default.nix     |  2 +-
 .../python-modules/python-ev3dev2/default.nix |  2 +-
 .../python-modules/python-flirt/default.nix   |  2 +-
 .../python-modules/python-gammu/default.nix   |  2 +-
 .../python-http-client/default.nix            |  2 +-
 .../python-modules/python-i18n/default.nix    |  2 +-
 .../python-juicenet/default.nix               |  2 +-
 .../python-modules/python-magic/default.nix   |  2 +-
 .../python-modules/python-mbedtls/default.nix |  2 +-
 .../python-memcached/default.nix              |  2 +-
 .../python-mistralclient/default.nix          |  2 +-
 .../python-mpv-jsonipc/default.nix            |  2 +-
 .../python-owasp-zap-v2-4/default.nix         |  2 +-
 .../python-modules/python-pae/default.nix     |  2 +-
 .../python-modules/python-pkcs11/default.nix  |  2 +-
 .../python-modules/python-pptx/default.nix    |  2 +-
 .../python-rabbitair/default.nix              |  2 +-
 .../python-modules/python-sat/default.nix     |  2 +-
 .../python-modules/python-tds/default.nix     |  2 +-
 .../python-modules/python-twitter/default.nix |  2 +-
 .../python-u2flib-server/default.nix          |  2 +-
 .../python-modules/python-xapp/default.nix    |  2 +-
 .../python-modules/python-yakh/default.nix    |  2 +-
 .../python3-eventlib/default.nix              |  2 +-
 .../python-modules/pythonix/default.nix       |  2 +-
 .../python-modules/pytomlpp/default.nix       |  2 +-
 .../python-modules/pytube/default.nix         |  2 +-
 .../python-modules/pytun/default.nix          |  2 +-
 .../python-modules/pyuca/default.nix          |  2 +-
 .../python-modules/pyupgrade/default.nix      |  2 +-
 .../python-modules/pyuseragents/default.nix   |  2 +-
 .../python-modules/pyversasense/default.nix   |  2 +-
 .../python-modules/pyvolumio/default.nix      |  2 +-
 .../python-modules/pywavefront/default.nix    |  2 +-
 .../python-modules/pywebcopy/default.nix      |  2 +-
 .../python-modules/pywizlight/default.nix     |  2 +-
 .../python-modules/pyws66i/default.nix        |  2 +-
 .../pyxiaomigateway/default.nix               |  2 +-
 .../python-modules/qnap-qsw/default.nix       |  2 +-
 .../python-modules/quadprog/default.nix       |  2 +-
 .../python-modules/quantiphy-eval/default.nix |  2 +-
 .../quantum-gateway/default.nix               |  2 +-
 .../python-modules/questo/default.nix         |  2 +-
 .../python-modules/radiotherm/default.nix     |  2 +-
 .../python-modules/radon/default.nix          |  2 +-
 .../range-typed-integers/default.nix          |  2 +-
 .../python-modules/rank-bm25/default.nix      |  2 +-
 .../python-modules/rapidfuzz-capi/default.nix |  2 +-
 .../python-modules/ratelimit/default.nix      |  2 +-
 .../python-modules/raven/default.nix          |  2 +-
 .../readability-lxml/default.nix              |  2 +-
 .../python-modules/readlike/default.nix       |  2 +-
 .../python-modules/readmdict/default.nix      |  2 +-
 .../python-modules/recommonmark/default.nix   |  2 +-
 .../rectangle-packer/default.nix              |  2 +-
 .../python-modules/rectpack/default.nix       |  2 +-
 .../python-modules/releases/default.nix       |  2 +-
 .../python-modules/remi/default.nix           |  2 +-
 .../python-modules/remote-pdb/default.nix     |  2 +-
 .../python-modules/reparser/default.nix       |  2 +-
 .../python-modules/reprint/default.nix        |  2 +-
 .../python-modules/reprshed/default.nix       |  2 +-
 .../requests-credssp/default.nix              |  2 +-
 .../requests-http-signature/default.nix       |  2 +-
 .../requests-kerberos/default.nix             |  2 +-
 .../requests-pkcs12/default.nix               |  2 +-
 .../python-modules/resolvelib/default.nix     |  2 +-
 .../python-modules/result/default.nix         |  2 +-
 .../python-modules/rfc6555/default.nix        |  2 +-
 .../rich-argparse-plus/default.nix            |  2 +-
 .../ripe-atlas-sagan/default.nix              |  2 +-
 .../python-modules/rlp/default.nix            |  2 +-
 .../python-modules/roku/default.nix           |  2 +-
 .../python-modules/roonapi/default.nix        |  2 +-
 .../python-modules/ropper/default.nix         |  2 +-
 .../python-modules/rowan/default.nix          |  2 +-
 .../python-modules/rpi-bad-power/default.nix  |  2 +-
 .../python-modules/rply/default.nix           |  2 +-
 .../python-modules/rtoml/default.nix          |  2 +-
 .../python-modules/ruffus/default.nix         |  2 +-
 .../python-modules/runs/default.nix           |  2 +-
 .../python-modules/rustworkx/default.nix      |  2 +-
 .../python-modules/rxv/default.nix            |  2 +-
 .../python-modules/sacremoses/default.nix     |  2 +-
 .../python-modules/sarge/default.nix          |  2 +-
 .../python-modules/scramp/default.nix         |  2 +-
 .../python-modules/seekpath/default.nix       |  2 +-
 .../python-modules/segments/default.nix       |  2 +-
 .../python-modules/semgrep/default.nix        |  2 +-
 .../sentence-splitter/default.nix             |  2 +-
 .../python-modules/sepaxml/default.nix        |  2 +-
 .../python-modules/seqeval/default.nix        |  2 +-
 .../python-modules/seventeentrack/default.nix |  2 +-
 .../python-modules/shellescape/default.nix    |  2 +-
 .../python-modules/shutilwhich/default.nix    |  2 +-
 .../python-modules/simanneal/default.nix      |  2 +-
 .../simple-rest-client/default.nix            |  2 +-
 .../python-modules/simpleaudio/default.nix    |  2 +-
 .../python-modules/simplehound/default.nix    |  2 +-
 .../python-modules/simplenote/default.nix     |  2 +-
 .../python-modules/sklearn-deap/default.nix   |  2 +-
 .../python-modules/skyfield/default.nix       |  2 +-
 .../python-modules/skytemple-dtef/default.nix |  2 +-
 .../skytemple-eventserver/default.nix         |  2 +-
 .../skytemple-files/default.nix               |  2 +-
 .../skytemple-icons/default.nix               |  2 +-
 .../python-modules/skytemple-rust/default.nix |  2 +-
 .../skytemple-ssb-debugger/default.nix        |  2 +-
 .../python-modules/slicedimage/default.nix    |  2 +-
 .../python-modules/slugid/default.nix         |  2 +-
 .../python-modules/snuggs/default.nix         |  2 +-
 .../socketio-client/default.nix               |  2 +-
 .../python-modules/solidpython2/default.nix   |  2 +-
 .../python-modules/solo-python/default.nix    |  2 +-
 .../somfy-mylink-synergy/default.nix          |  2 +-
 .../python-modules/somweb/default.nix         |  2 +-
 .../sortedcollections/default.nix             |  2 +-
 .../sortedcontainers/default.nix              |  2 +-
 .../sphinx-basic-ng/default.nix               |  2 +-
 .../sphinx-better-theme/default.nix           |  2 +-
 .../sphinx-copybutton/default.nix             |  2 +-
 .../sphinx-hoverxref/default.nix              |  2 +-
 .../sphinx-inline-tabs/default.nix            |  2 +-
 .../python-modules/sphinx-issues/default.nix  |  2 +-
 .../sphinx-lv2-theme/default.nix              |  2 +-
 .../python-modules/spiderpy/default.nix       |  2 +-
 .../sqlalchemy-file/default.nix               |  2 +-
 .../python-modules/ssdpy/default.nix          |  2 +-
 .../python-modules/sshpubkeys/default.nix     |  2 +-
 .../starlette-admin/default.nix               |  2 +-
 .../python-modules/static3/default.nix        |  2 +-
 .../python-modules/staticjinja/default.nix    |  2 +-
 .../python-modules/stopit/default.nix         |  2 +-
 .../python-modules/stransi/default.nix        |  2 +-
 .../python-modules/strct/default.nix          |  2 +-
 .../streamcontroller-plugin-tools/default.nix |  2 +-
 .../streaming-form-data/default.nix           |  2 +-
 .../stups-cli-support/default.nix             |  2 +-
 .../python-modules/stups-fullstop/default.nix |  2 +-
 .../python-modules/stups-pierone/default.nix  |  2 +-
 .../python-modules/stups-tokens/default.nix   |  2 +-
 .../python-modules/stups-zign/default.nix     |  2 +-
 .../python-modules/sumtypes/default.nix       |  2 +-
 .../python-modules/svgwrite/default.nix       |  2 +-
 .../swagger-spec-validator/default.nix        |  2 +-
 .../python-modules/swspotify/default.nix      |  2 +-
 .../python-modules/syncer/default.nix         |  2 +-
 .../python-modules/systembridge/default.nix   |  2 +-
 .../python-modules/systemd/default.nix        |  2 +-
 .../systemdunitparser/default.nix             |  2 +-
 .../python-modules/tabview/default.nix        |  2 +-
 .../python-modules/tahoma-api/default.nix     |  2 +-
 .../python-modules/tailer/default.nix         |  2 +-
 .../python-modules/taxi/default.nix           |  2 +-
 .../python-modules/tbats/default.nix          |  2 +-
 .../python-modules/tcxparser/default.nix      |  2 +-
 .../python-modules/tdir/default.nix           |  2 +-
 .../python-modules/telepath/default.nix       |  2 +-
 .../python-modules/telfhash/default.nix       |  2 +-
 .../python-modules/termplotlib/default.nix    |  2 +-
 .../tesla-wall-connector/default.nix          |  2 +-
 .../python-modules/test-tube/default.nix      |  2 +-
 .../python-modules/testbook/default.nix       |  2 +-
 .../python-modules/textfsm/default.nix        |  2 +-
 .../python-modules/textstat/default.nix       |  2 +-
 .../python-modules/textx/default.nix          |  2 +-
 .../python-modules/thorlabspm100/default.nix  |  2 +-
 .../threat9-test-bed/default.nix              |  2 +-
 .../python-modules/tikzplotlib/default.nix    |  2 +-
 .../python-modules/timeago/default.nix        |  2 +-
 .../python-modules/tls-parser/default.nix     |  2 +-
 .../python-modules/tlv8/default.nix           |  2 +-
 .../python-modules/tmb/default.nix            |  2 +-
 .../python-modules/tokenize-rt/default.nix    |  2 +-
 .../python-modules/tokenlib/default.nix       |  2 +-
 .../python-modules/tomli-w/default.nix        |  2 +-
 .../python-modules/tomli/default.nix          |  2 +-
 .../python-modules/torpy/default.nix          |  2 +-
 .../python-modules/torrent-parser/default.nix |  2 +-
 .../python-modules/trakit/default.nix         |  2 +-
 .../tree-sitter-languages/default.nix         |  2 +-
 .../tree-sitter-make/default.nix              |  2 +-
 .../python-modules/trio-websocket/default.nix |  2 +-
 .../python-modules/tunigo/default.nix         |  2 +-
 .../tuya-iot-py-sdk/default.nix               |  2 +-
 .../python-modules/tuyaha/default.nix         |  2 +-
 .../python-modules/tweedledum/default.nix     |  2 +-
 .../python-modules/typesystem/default.nix     |  2 +-
 .../python-modules/uasiren/default.nix        |  2 +-
 .../python-modules/ueagle/default.nix         |  2 +-
 .../python-modules/ufolint/default.nix        |  2 +-
 .../python-modules/ukkonen/default.nix        |  2 +-
 .../python-modules/unasync/default.nix        |  2 +-
 .../python-modules/unifiled/default.nix       |  2 +-
 .../python-modules/upass/default.nix          |  2 +-
 .../python-modules/update-dotdee/default.nix  |  2 +-
 .../python-modules/upnpy/default.nix          |  2 +-
 .../python-modules/uranium/default.nix        |  2 +-
 .../python-modules/url-normalize/default.nix  |  2 +-
 .../python-modules/urlman/default.nix         |  2 +-
 .../python-modules/urlpy/default.nix          |  2 +-
 .../python-modules/usbtmc/default.nix         |  2 +-
 .../python-modules/user-agents/default.nix    |  2 +-
 .../python-modules/ush/default.nix            |  2 +-
 .../python-modules/utils/default.nix          |  2 +-
 .../python-modules/vat-moss/default.nix       |  2 +-
 .../python-modules/verboselogs/default.nix    |  2 +-
 .../python-modules/versionfinder/default.nix  |  2 +-
 .../python-modules/vfblib/default.nix         |  2 +-
 .../python-modules/vincenty/default.nix       |  2 +-
 .../virtualenv-clone/default.nix              |  2 +-
 .../python-modules/visions/default.nix        |  2 +-
 .../python-modules/vnoise/default.nix         |  2 +-
 .../python-modules/vpk/default.nix            |  2 +-
 .../python-modules/vttlib/default.nix         |  2 +-
 .../python-modules/vultr/default.nix          |  2 +-
 .../python-modules/vxi11/default.nix          |  2 +-
 .../python-modules/wasmer/default.nix         |  2 +-
 .../python-modules/wasserstein/default.nix    |  2 +-
 .../python-modules/wat/default.nix            |  2 +-
 .../python-modules/webthing/default.nix       |  2 +-
 .../python-modules/wgnlpy/default.nix         |  2 +-
 .../python-modules/whois-api/default.nix      |  2 +-
 .../python-modules/widlparser/default.nix     |  2 +-
 .../python-modules/wifi/default.nix           |  2 +-
 .../python-modules/wikitextparser/default.nix |  2 +-
 .../python-modules/wirerope/default.nix       |  2 +-
 .../python-modules/worldengine/default.nix    |  2 +-
 .../python-modules/wsdiscovery/default.nix    |  2 +-
 .../python-modules/wsgiproxy2/default.nix     |  2 +-
 .../wtforms-bootstrap5/default.nix            |  2 +-
 .../python-modules/xbox-webapi/default.nix    |  2 +-
 .../python-modules/xdot/default.nix           |  2 +-
 .../python-modules/xmind/default.nix          |  2 +-
 .../python-modules/xmod/default.nix           |  2 +-
 .../xpath-expressions/default.nix             |  2 +-
 .../python-modules/xpybutil/default.nix       |  2 +-
 .../python-modules/xtensor-python/default.nix |  2 +-
 .../python-modules/yacs/default.nix           |  2 +-
 .../python-modules/yasi/default.nix           |  2 +-
 .../python-modules/zenoh/default.nix          |  2 +-
 .../python-modules/zigpy-cc/default.nix       |  2 +-
 .../python-modules/zlib-ng/default.nix        |  2 +-
 .../zulip-emoji-mapping/default.nix           |  2 +-
 .../python-modules/zulip/default.nix          |  2 +-
 .../python2-modules/pip/default.nix           |  2 +-
 .../python2-modules/pycairo/default.nix       |  2 +-
 .../python2-modules/setuptools/default.nix    |  2 +-
 .../python2-modules/wheel/default.nix         |  2 +-
 .../rocm-modules/5/rocm-docs-core/default.nix |  2 +-
 .../rocm-modules/6/rocm-docs-core/default.nix |  2 +-
 .../by-name/mu/mustache-tcl/package.nix       |  2 +-
 .../by-name/tc/tclreadline/package.nix        |  2 +-
 .../tcl-modules/by-name/tc/tclx/package.nix   |  2 +-
 .../tcl-modules/critcl/default.nix            |  2 +-
 .../tools/amazon-qldb-shell/default.nix       |  2 +-
 .../analysis/cargo-tarpaulin/default.nix      |  2 +-
 .../tools/analysis/dotenv-linter/default.nix  |  2 +-
 .../tools/analysis/flow/default.nix           |  2 +-
 .../tools/analysis/ikos/default.nix           |  2 +-
 .../tools/analysis/jdepend/default.nix        |  2 +-
 .../tools/analysis/rizin/cutter.nix           |  2 +-
 .../development/tools/analysis/rr/default.nix |  2 +-
 .../tools/analysis/snowman/default.nix        |  2 +-
 .../tflint-plugins/tflint-ruleset-aws.nix     |  2 +-
 .../tflint-plugins/tflint-ruleset-google.nix  |  2 +-
 .../tools/asn2quickder/default.nix            |  2 +-
 pkgs/development/tools/boomerang/default.nix  |  2 +-
 .../tools/build-managers/buck/default.nix     |  2 +-
 .../tools/build-managers/moon/default.nix     |  2 +-
 .../tools/build-managers/qbs/default.nix      |  2 +-
 .../tools/build-managers/rebar/default.nix    |  2 +-
 .../tools/build-managers/rebar3/default.nix   |  2 +-
 pkgs/development/tools/buildah/default.nix    |  2 +-
 pkgs/development/tools/comby/default.nix      |  2 +-
 .../buildbot/master.nix                       |  2 +-
 .../buildkite-test-collector-rust/default.nix |  2 +-
 .../continuous-integration/drone/default.nix  |  2 +-
 .../tools/database/replibyte/default.nix      |  2 +-
 .../database/surrealdb-migrations/default.nix |  2 +-
 pkgs/development/tools/devbox/default.nix     |  2 +-
 pkgs/development/tools/devpod/default.nix     |  2 +-
 pkgs/development/tools/dump_syms/default.nix  |  2 +-
 pkgs/development/tools/esbuild/default.nix    |  2 +-
 pkgs/development/tools/gammaray/default.nix   |  2 +-
 pkgs/development/tools/gauge/default.nix      |  2 +-
 .../tools/gauge/plugins/js/default.nix        |  2 +-
 pkgs/development/tools/git-ps-rs/default.nix  |  2 +-
 .../tools/github/cligh/default.nix            |  2 +-
 pkgs/development/tools/glslviewer/default.nix |  2 +-
 pkgs/development/tools/gptcommit/default.nix  |  2 +-
 .../tools/haskell/vaultenv/default.nix        |  2 +-
 pkgs/development/tools/hors/default.nix       |  2 +-
 pkgs/development/tools/htmlq/default.nix      |  2 +-
 pkgs/development/tools/ilspycmd/default.nix   |  2 +-
 pkgs/development/tools/jless/default.nix      |  2 +-
 pkgs/development/tools/kdash/default.nix      |  2 +-
 pkgs/development/tools/kubie/default.nix      |  2 +-
 .../tools/kustomize/kustomize-sops.nix        |  2 +-
 .../language-servers/crystalline/default.nix  |  2 +-
 .../development/tools/loganalyzer/default.nix |  2 +-
 pkgs/development/tools/minizinc/default.nix   |  2 +-
 pkgs/development/tools/minizinc/ide.nix       |  2 +-
 .../development/tools/misc/chruby/default.nix |  2 +-
 .../tools/misc/coccinelle/default.nix         |  2 +-
 .../tools/misc/coreboot-toolchain/default.nix |  2 +-
 pkgs/development/tools/misc/dura/default.nix  |  2 +-
 .../tools/misc/fswatch/default.nix            |  2 +-
 .../tools/misc/linuxkit/default.nix           |  2 +-
 .../tools/misc/nixbang/default.nix            |  2 +-
 pkgs/development/tools/misc/premake/5.nix     |  2 +-
 .../tools/misc/pwninit/default.nix            |  2 +-
 pkgs/development/tools/misc/seer/default.nix  |  2 +-
 pkgs/development/tools/misc/tokei/default.nix |  2 +-
 .../tools/misc/whatstyle/default.nix          |  2 +-
 .../tools/ocaml/camlp5/default.nix            |  2 +-
 pkgs/development/tools/ocaml/cppo/default.nix |  4 +-
 .../tools/ocaml/obelisk/default.nix           |  2 +-
 .../ocaml/ocaml-recovery-parser/default.nix   |  2 +-
 .../tools/ocaml/ocamlbuild/default.nix        |  2 +-
 .../tools/ocaml/ocamlscript/default.nix       |  2 +-
 .../tools/ocaml/ocp-build/default.nix         |  2 +-
 .../tools/ocaml/ocp-indent/default.nix        |  2 +-
 .../tools/ocaml/ocp-index/default.nix         |  2 +-
 pkgs/development/tools/pactorio/default.nix   |  2 +-
 .../tools/profiling/heaptrack/default.nix     |  2 +-
 .../tools/protoc-gen-grpc-web/default.nix     |  2 +-
 pkgs/development/tools/py-spy/default.nix     |  2 +-
 pkgs/development/tools/remodel/default.nix    |  2 +-
 pkgs/development/tools/rover/default.nix      |  2 +-
 pkgs/development/tools/rtags/default.nix      |  2 +-
 pkgs/development/tools/rubyfmt/default.nix    |  2 +-
 .../tools/rust/cargo-clone/default.nix        |  2 +-
 .../tools/rust/cargo-codspeed/default.nix     |  2 +-
 .../tools/rust/cargo-crev/default.nix         |  2 +-
 .../tools/rust/cargo-edit/default.nix         |  2 +-
 .../tools/rust/cargo-flamegraph/default.nix   |  2 +-
 .../tools/rust/cargo-fund/default.nix         |  2 +-
 .../tools/rust/cargo-ndk/default.nix          |  2 +-
 .../tools/rust/cargo-udeps/default.nix        |  2 +-
 .../tools/rust/cargo-vet/default.nix          |  2 +-
 .../tools/rust/cargo-watch/default.nix        |  2 +-
 .../tools/rust/cargo-whatfeatures/default.nix |  2 +-
 .../tools/rust/cbindgen/default.nix           |  2 +-
 .../default.nix                               |  2 +-
 .../development/tools/rust/rustup/default.nix |  2 +-
 .../tools/rust/sqlx-cli/default.nix           |  2 +-
 pkgs/development/tools/sentry-cli/default.nix |  2 +-
 pkgs/development/tools/simavr/default.nix     |  2 +-
 .../tools/solarus-quest-editor/default.nix    |  2 +-
 pkgs/development/tools/toluapp/default.nix    |  2 +-
 pkgs/development/tools/viceroy/default.nix    |  2 +-
 pkgs/development/tools/wasmedge/default.nix   |  2 +-
 pkgs/development/tools/wrangler_1/default.nix |  2 +-
 pkgs/development/web/playwright/driver.nix    |  2 +-
 pkgs/games/anki/default.nix                   |  2 +-
 pkgs/games/arx-libertatis/default.nix         |  2 +-
 pkgs/games/blightmud/default.nix              |  2 +-
 pkgs/games/bugdom/default.nix                 |  2 +-
 pkgs/games/chiaki-ng/default.nix              |  2 +-
 pkgs/games/cockatrice/default.nix             |  2 +-
 pkgs/games/crawl/default.nix                  |  2 +-
 pkgs/games/devilutionx/default.nix            |  2 +-
 pkgs/games/doom-ports/slade/default.nix       |  2 +-
 .../dwarf-therapist/default.nix               |  2 +-
 pkgs/games/easyrpg-player/default.nix         |  2 +-
 pkgs/games/exult/default.nix                  |  2 +-
 pkgs/games/fallout-ce/fallout-ce.nix          |  2 +-
 pkgs/games/fallout-ce/fallout2-ce.nix         |  2 +-
 pkgs/games/ferium/default.nix                 |  2 +-
 pkgs/games/flare/engine.nix                   |  2 +-
 pkgs/games/flare/game.nix                     |  2 +-
 pkgs/games/gshogi/default.nix                 |  2 +-
 pkgs/games/iortcw/sp.nix                      |  2 +-
 pkgs/games/koboredux/default.nix              |  2 +-
 pkgs/games/ldmud/default.nix                  |  2 +-
 pkgs/games/leela-zero/default.nix             |  2 +-
 pkgs/games/libremines/default.nix             |  2 +-
 pkgs/games/nile/default.nix                   |  2 +-
 pkgs/games/openra_2019/mods.nix               | 12 ++--
 pkgs/games/openspades/default.nix             |  2 +-
 pkgs/games/orthorobot/default.nix             |  2 +-
 pkgs/games/pentobi/default.nix                |  2 +-
 pkgs/games/pokerth/default.nix                |  2 +-
 pkgs/games/pro-office-calculator/default.nix  |  2 +-
 pkgs/games/qtads/default.nix                  |  2 +-
 pkgs/games/scummvm/default.nix                |  2 +-
 .../games/shattered-pixel-dungeon/default.nix |  2 +-
 .../rat-king-adventure/default.nix            |  2 +-
 .../shattered-pixel-dungeon/rkpd2/default.nix |  2 +-
 pkgs/games/solarus/default.nix                |  2 +-
 pkgs/games/stuntrally/default.nix             |  4 +-
 pkgs/games/super-tux-kart/default.nix         |  2 +-
 pkgs/games/teeworlds/default.nix              |  2 +-
 pkgs/games/vcmi/default.nix                   |  2 +-
 pkgs/games/wesnoth/default.nix                |  2 +-
 .../applet-window-buttons6/default.nix        |  2 +-
 pkgs/kde/third-party/koi/default.nix          |  2 +-
 pkgs/misc/apulse/default.nix                  |  2 +-
 pkgs/misc/calaos/installer/default.nix        |  2 +-
 pkgs/misc/cups/filters.nix                    |  2 +-
 pkgs/misc/logging/beats/7.x.nix               |  2 +-
 pkgs/misc/opcua-client-gui/default.nix        |  2 +-
 pkgs/misc/t-rec/default.nix                   |  2 +-
 pkgs/misc/tmux-plugins/default.nix            | 10 ++--
 .../tmux-plugins/tmux-fingers/default.nix     |  2 +-
 pkgs/misc/wiki-tui/default.nix                |  2 +-
 .../bsd/freebsd/pkgs/drm-kmod-firmware.nix    |  2 +-
 pkgs/os-specific/darwin/khd/default.nix       |  2 +-
 pkgs/os-specific/darwin/noah/default.nix      |  2 +-
 pkgs/os-specific/darwin/pngpaste/default.nix  |  2 +-
 .../reattach-to-user-namespace/default.nix    |  2 +-
 pkgs/os-specific/darwin/sigtool/default.nix   |  2 +-
 pkgs/os-specific/darwin/trash/default.nix     |  2 +-
 pkgs/os-specific/linux/acpi-call/default.nix  |  2 +-
 pkgs/os-specific/linux/akvcam/default.nix     |  2 +-
 pkgs/os-specific/linux/conky/default.nix      |  2 +-
 pkgs/os-specific/linux/corefreq/default.nix   |  2 +-
 .../linux/cpupower-gui/default.nix            |  2 +-
 pkgs/os-specific/linux/digimend/default.nix   |  2 +-
 pkgs/os-specific/linux/facetimehd/default.nix |  2 +-
 .../linux/firmware/ath9k/default.nix          |  2 +-
 .../linux/firmware/raspberrypi/default.nix    |  2 +-
 pkgs/os-specific/linux/i7z/default.nix        |  2 +-
 pkgs/os-specific/linux/iputils/default.nix    |  2 +-
 pkgs/os-specific/linux/libbpf/0.x.nix         |  2 +-
 pkgs/os-specific/linux/libbpf/default.nix     |  2 +-
 .../linux/lttng-modules/default.nix           |  2 +-
 pkgs/os-specific/linux/mcelog/default.nix     |  2 +-
 pkgs/os-specific/linux/nullfs/default.nix     |  2 +-
 pkgs/os-specific/linux/projecteur/default.nix |  2 +-
 pkgs/os-specific/linux/r8168/default.nix      |  2 +-
 pkgs/os-specific/linux/sysdig/default.nix     |  2 +-
 .../linux/system76-acpi/default.nix           |  2 +-
 .../os-specific/linux/system76-io/default.nix |  2 +-
 pkgs/os-specific/linux/system76/default.nix   |  2 +-
 pkgs/os-specific/linux/systemd/default.nix    |  2 +-
 pkgs/os-specific/linux/usbrelay/default.nix   |  2 +-
 .../linux/v4l2loopback/default.nix            |  2 +-
 .../linux/veikk-linux-driver/default.nix      |  2 +-
 .../linux/virtio_vmmci/default.nix            |  2 +-
 pkgs/os-specific/linux/vmm_clock/default.nix  |  2 +-
 pkgs/os-specific/windows/dlfcn/default.nix    |  2 +-
 .../windows/npiperelay/default.nix            |  2 +-
 pkgs/servers/authelia/sources.nix             |  2 +-
 pkgs/servers/code-server/default.nix          |  2 +-
 pkgs/servers/etcd/3.4.nix                     |  2 +-
 pkgs/servers/etcd/3.5/default.nix             |  2 +-
 pkgs/servers/firebird/default.nix             |  4 +-
 pkgs/servers/geospatial/martin/default.nix    |  2 +-
 pkgs/servers/hockeypuck/sources.nix           |  2 +-
 pkgs/servers/home-assistant/cli.nix           |  2 +-
 .../custom-components/bodymiscale/package.nix |  2 +-
 .../dirigera_platform/package.nix             |  2 +-
 .../custom-components/dwd/package.nix         |  2 +-
 .../custom-components/emporia_vue/package.nix |  2 +-
 .../local_luftdaten/package.nix               |  2 +-
 .../custom-components/localtuya/package.nix   |  2 +-
 .../midea-air-appliances-lan/package.nix      |  2 +-
 .../custom-components/ntfy/package.nix        |  2 +-
 .../philips_airpurifier_coap/package.nix      |  2 +-
 .../smartthinq-sensors/package.nix            |  2 +-
 .../solis-sensor/package.nix                  |  2 +-
 .../xiaomi_gateway3/package.nix               |  2 +-
 .../custom-components/xiaomi_miot/package.nix |  2 +-
 .../apexcharts-card/package.nix               |  2 +-
 .../atomic-calendar-revive/package.nix        |  2 +-
 .../bubble-card/package.nix                   |  2 +-
 .../button-card/package.nix                   |  2 +-
 .../card-mod/package.nix                      |  2 +-
 .../decluttering-card/package.nix             |  2 +-
 .../hourly-weather/package.nix                |  2 +-
 .../lg-webos-remote-control/package.nix       |  2 +-
 .../mini-media-player/package.nix             |  2 +-
 .../multiple-entity-row/package.nix           |  2 +-
 .../mushroom/package.nix                      |  2 +-
 .../sankey-chart/package.nix                  |  2 +-
 .../template-entity-row/package.nix           |  2 +-
 .../universal-remote-card/package.nix         |  2 +-
 .../vacuum-card/package.nix                   |  2 +-
 .../valetudo-map-card/package.nix             |  2 +-
 .../versatile-thermostat-ui-card/package.nix  |  2 +-
 .../zigbee2mqtt-networkmap/package.nix        |  2 +-
 pkgs/servers/home-assistant/default.nix       |  4 +-
 .../mod_auth_mellon/default.nix               |  2 +-
 .../apache-modules/mod_cspnonce/default.nix   |  2 +-
 .../apache-modules/mod_fastcgi/default.nix    |  2 +-
 .../http/apache-modules/mod_wsgi/default.nix  |  2 +-
 pkgs/servers/http/nginx/modules.nix           |  6 +-
 pkgs/servers/http/tengine/default.nix         |  2 +-
 pkgs/servers/icingaweb2/default.nix           |  2 +-
 pkgs/servers/icingaweb2/ipl.nix               |  2 +-
 .../icingaweb2/theme-april/default.nix        |  2 +-
 pkgs/servers/icingaweb2/theme-lsd/default.nix |  2 +-
 .../icingaweb2/theme-particles/default.nix    |  2 +-
 .../servers/icingaweb2/theme-snow/default.nix |  2 +-
 .../icingaweb2/theme-spring/default.nix       |  2 +-
 .../icingaweb2/theme-unicorn/default.nix      |  2 +-
 pkgs/servers/icingaweb2/thirdparty.nix        |  2 +-
 pkgs/servers/jackett/default.nix              |  2 +-
 pkgs/servers/krill/default.nix                |  2 +-
 pkgs/servers/mail/mailpit/default.nix         |  2 +-
 pkgs/servers/mail/opensmtpd/filter-rspamd.nix |  2 +-
 pkgs/servers/mastodon/source.nix              |  2 +-
 pkgs/servers/memos/default.nix                |  2 +-
 pkgs/servers/monitoring/grafana/default.nix   |  2 +-
 pkgs/servers/monitoring/icinga2/default.nix   |  2 +-
 .../nagios-plugins/check_openvpn/default.nix  |  2 +-
 .../openbsd_snmp3_check/default.nix           |  2 +-
 .../prometheus/apcupsd-exporter.nix           |  2 +-
 .../monitoring/prometheus/atlas-exporter.nix  |  2 +-
 .../monitoring/prometheus/aws-s3-exporter.nix |  2 +-
 .../monitoring/prometheus/bind-exporter.nix   |  2 +-
 .../monitoring/prometheus/bird-exporter.nix   |  2 +-
 .../prometheus/bitcoin-exporter.nix           |  2 +-
 .../prometheus/cloudflare-exporter.nix        |  2 +-
 .../prometheus/collectd-exporter.nix          |  2 +-
 .../prometheus/dnsmasq-exporter.nix           |  2 +-
 .../monitoring/prometheus/domain-exporter.nix |  2 +-
 .../monitoring/prometheus/fastly-exporter.nix |  2 +-
 .../monitoring/prometheus/flow-exporter.nix   |  2 +-
 .../gitlab-ci-pipelines-exporter.nix          |  2 +-
 .../prometheus/graphite-exporter.nix          |  2 +-
 .../prometheus/haproxy-exporter.nix           |  2 +-
 .../monitoring/prometheus/ipmi-exporter.nix   |  2 +-
 .../monitoring/prometheus/json-exporter.nix   |  2 +-
 .../prometheus/junos-czerwonk-exporter.nix    |  2 +-
 .../prometheus/keylight-exporter.nix          |  2 +-
 .../servers/monitoring/prometheus/kthxbye.nix |  2 +-
 .../monitoring/prometheus/lnd-exporter.nix    |  2 +-
 .../prometheus/modemmanager-exporter.nix      |  2 +-
 .../prometheus/mongodb-exporter.nix           |  2 +-
 .../monitoring/prometheus/mysqld-exporter.nix |  2 +-
 .../monitoring/prometheus/nats-exporter.nix   |  2 +-
 .../prometheus/nextcloud-exporter.nix         |  2 +-
 .../monitoring/prometheus/nginx-exporter.nix  |  2 +-
 .../prometheus/nginxlog-exporter.nix          |  2 +-
 .../monitoring/prometheus/nut-exporter.nix    |  2 +-
 .../prometheus/pgbouncer-exporter.nix         |  2 +-
 .../prometheus/php-fpm-exporter.nix           |  2 +-
 .../monitoring/prometheus/pihole-exporter.nix |  2 +-
 .../monitoring/prometheus/ping-exporter.nix   |  2 +-
 .../prometheus/postgres-exporter.nix          |  2 +-
 .../prometheus/process-exporter.nix           |  2 +-
 .../monitoring/prometheus/prom2json.nix       |  2 +-
 .../monitoring/prometheus/redis-exporter.nix  |  2 +-
 .../prometheus/rtl_433-exporter.nix           |  2 +-
 pkgs/servers/monitoring/prometheus/sachet.nix |  2 +-
 .../monitoring/prometheus/script-exporter.nix |  2 +-
 .../monitoring/prometheus/shelly-exporter.nix |  2 +-
 .../prometheus/smokeping-prober.nix           |  2 +-
 .../monitoring/prometheus/snmp-exporter.nix   |  2 +-
 .../monitoring/prometheus/sql-exporter.nix    |  2 +-
 .../monitoring/prometheus/statsd-exporter.nix |  2 +-
 .../prometheus/systemd-exporter.nix           |  2 +-
 .../monitoring/prometheus/v2ray-exporter.nix  |  2 +-
 .../prometheus/varnish-exporter.nix           |  2 +-
 .../prometheus/wireguard-exporter.nix         |  2 +-
 .../monitoring/prometheus/xmpp-alerts.nix     |  2 +-
 pkgs/servers/monitoring/sensu-go/default.nix  |  2 +-
 pkgs/servers/mpd/default.nix                  |  2 +-
 pkgs/servers/mtprotoproxy/default.nix         |  2 +-
 pkgs/servers/nosql/influxdb/default.nix       |  2 +-
 pkgs/servers/nosql/influxdb2/cli.nix          |  2 +-
 pkgs/servers/nosql/influxdb2/default.nix      |  2 +-
 pkgs/servers/nosql/influxdb2/provision.nix    |  2 +-
 .../nosql/influxdb2/token-manipulator.nix     |  2 +-
 pkgs/servers/openvscode-server/default.nix    |  2 +-
 pkgs/servers/osmocom/libasn1c/default.nix     |  2 +-
 pkgs/servers/oxigraph/default.nix             |  2 +-
 pkgs/servers/pingvin-share/default.nix        |  2 +-
 pkgs/servers/piping-server-rust/default.nix   |  2 +-
 pkgs/servers/plik/programs.nix                |  2 +-
 pkgs/servers/polaris/default.nix              |  2 +-
 pkgs/servers/rtrtr/default.nix                |  2 +-
 pkgs/servers/search/quickwit/default.nix      |  2 +-
 pkgs/servers/sip/freeswitch/default.nix       |  2 +-
 pkgs/servers/spicedb/default.nix              |  2 +-
 pkgs/servers/spicedb/zed.nix                  |  2 +-
 .../sql/mariadb/connector-c/default.nix       |  2 +-
 pkgs/servers/teleport/generic.nix             |  2 +-
 .../tracing/honeycomb/honeymarker/default.nix |  2 +-
 .../tracing/honeycomb/honeytail/default.nix   |  2 +-
 .../tracing/honeycomb/honeyvent/default.nix   |  2 +-
 pkgs/servers/trezord/default.nix              |  2 +-
 pkgs/servers/trickster/trickster.nix          |  2 +-
 pkgs/servers/unpackerr/default.nix            |  2 +-
 pkgs/servers/varnish/digest.nix               |  2 +-
 pkgs/servers/varnish/dynamic.nix              |  2 +-
 pkgs/servers/varnish/modules.nix              |  2 +-
 pkgs/servers/web-apps/bookstack/default.nix   |  2 +-
 pkgs/servers/web-apps/discourse/default.nix   |  2 +-
 pkgs/servers/web-apps/freshrss/default.nix    |  2 +-
 .../web-apps/freshrss/extensions/default.nix  |  4 +-
 pkgs/servers/web-apps/lemmy/server.nix        |  2 +-
 pkgs/servers/web-apps/lemmy/ui.nix            |  2 +-
 pkgs/servers/web-apps/outline/default.nix     |  2 +-
 pkgs/servers/web-apps/plausible/default.nix   |  2 +-
 pkgs/shells/carapace/default.nix              |  2 +-
 pkgs/shells/fish/babelfish.nix                |  2 +-
 pkgs/shells/fish/plugins/async-prompt.nix     |  2 +-
 pkgs/shells/fish/plugins/autopair.nix         |  2 +-
 pkgs/shells/fish/plugins/done.nix             |  2 +-
 pkgs/shells/fish/plugins/fifc.nix             |  2 +-
 pkgs/shells/fish/plugins/fish-bd.nix          |  2 +-
 pkgs/shells/fish/plugins/fishtape.nix         |  2 +-
 pkgs/shells/fish/plugins/fishtape_3.nix       |  2 +-
 pkgs/shells/fish/plugins/forgit.nix           |  2 +-
 pkgs/shells/fish/plugins/fzf-fish.nix         |  2 +-
 .../fish/plugins/github-copilot-cli-fish.nix  |  2 +-
 pkgs/shells/fish/plugins/pisces.nix           |  2 +-
 pkgs/shells/fish/plugins/puffer.nix           |  2 +-
 pkgs/shells/fish/plugins/pure.nix             |  2 +-
 pkgs/shells/fish/plugins/sdkman-for-fish.nix  |  2 +-
 pkgs/shells/fish/plugins/sponge.nix           |  2 +-
 pkgs/shells/fish/plugins/tide.nix             |  2 +-
 pkgs/shells/fish/plugins/wakatime-fish.nix    |  2 +-
 pkgs/shells/nushell/plugins/dbus.nix          |  2 +-
 pkgs/shells/nushell/plugins/units.nix         |  2 +-
 pkgs/test/overriding.nix                      |  6 +-
 pkgs/tools/admin/aws-mfa/default.nix          |  2 +-
 pkgs/tools/admin/awsume/default.nix           |  2 +-
 pkgs/tools/admin/cdist/default.nix            |  2 +-
 pkgs/tools/admin/procs/default.nix            |  2 +-
 pkgs/tools/admin/turbovnc/default.nix         |  2 +-
 pkgs/tools/archivers/zpaq/default.nix         |  2 +-
 pkgs/tools/audio/beets/plugins/audible.nix    |  2 +-
 pkgs/tools/audio/opl3bankeditor/common.nix    |  2 +-
 pkgs/tools/backup/bupstash/default.nix        |  2 +-
 pkgs/tools/backup/monolith/default.nix        |  2 +-
 pkgs/tools/backup/rdedup/default.nix          |  2 +-
 pkgs/tools/backup/restic/default.nix          |  2 +-
 pkgs/tools/backup/restic/rest-server.nix      |  2 +-
 pkgs/tools/backup/zbackup/default.nix         |  2 +-
 pkgs/tools/cd-dvd/unetbootin/default.nix      |  2 +-
 pkgs/tools/compression/bzip3/default.nix      |  2 +-
 pkgs/tools/compression/xdelta/default.nix     |  2 +-
 pkgs/tools/compression/xdelta/unstable.nix    |  2 +-
 pkgs/tools/compression/zstd/default.nix       |  2 +-
 .../android-file-transfer/default.nix         |  2 +-
 pkgs/tools/filesystems/ceph/default.nix       |  2 +-
 pkgs/tools/filesystems/encfs/default.nix      |  2 +-
 pkgs/tools/filesystems/irods/default.nix      |  4 +-
 pkgs/tools/filesystems/kdiskmark/default.nix  |  2 +-
 pkgs/tools/filesystems/mergerfs/default.nix   |  2 +-
 pkgs/tools/filesystems/mkspiffs/default.nix   |  2 +-
 pkgs/tools/filesystems/ntfs-3g/default.nix    |  2 +-
 pkgs/tools/filesystems/romdirfs/default.nix   |  2 +-
 pkgs/tools/filesystems/s3fs/default.nix       |  2 +-
 pkgs/tools/filesystems/securefs/default.nix   |  2 +-
 pkgs/tools/games/alice-tools/default.nix      |  2 +-
 pkgs/tools/games/pokefinder/default.nix       |  2 +-
 pkgs/tools/games/slipstream/default.nix       |  2 +-
 pkgs/tools/graphics/hobbits/default.nix       |  2 +-
 pkgs/tools/graphics/maskromtool/default.nix   |  2 +-
 .../graphics/vulkan-caps-viewer/default.nix   |  2 +-
 .../waifu2x-converter-cpp/default.nix         |  2 +-
 pkgs/tools/graphics/zbar/default.nix          |  2 +-
 pkgs/tools/inputmethods/fcitx5/default.nix    |  2 +-
 .../inputmethods/fcitx5/fcitx5-bamboo.nix     |  2 +-
 .../inputmethods/fcitx5/fcitx5-chewing.nix    |  2 +-
 .../fcitx5/fcitx5-chinese-addons.nix          |  2 +-
 .../inputmethods/fcitx5/fcitx5-configtool.nix |  2 +-
 pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix |  2 +-
 .../inputmethods/fcitx5/fcitx5-hangul.nix     |  2 +-
 pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix |  2 +-
 .../tools/inputmethods/fcitx5/fcitx5-m17n.nix |  2 +-
 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix  |  2 +-
 pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix |  2 +-
 .../fcitx5/fcitx5-table-extra.nix             |  2 +-
 .../fcitx5/fcitx5-table-other.nix             |  2 +-
 .../inputmethods/fcitx5/fcitx5-unikey.nix     |  2 +-
 .../ibus-engines/ibus-hangul/default.nix      |  2 +-
 .../ibus-engines/ibus-m17n/default.nix        |  2 +-
 .../ibus-engines/ibus-pinyin/default.nix      |  2 +-
 .../ibus-engines/ibus-rime/default.nix        |  2 +-
 .../ibus-engines/ibus-table/default.nix       |  2 +-
 .../ibus-typing-booster/default.nix           |  2 +-
 pkgs/tools/inputmethods/ibus/default.nix      |  2 +-
 .../inputmethods/input-remapper/default.nix   |  2 +-
 .../interception-tools/default.nix            |  2 +-
 pkgs/tools/misc/antimicrox/default.nix        |  2 +-
 pkgs/tools/misc/aoc-cli/default.nix           |  2 +-
 pkgs/tools/misc/bat-extras/default.nix        |  2 +-
 pkgs/tools/misc/brotab/default.nix            |  2 +-
 pkgs/tools/misc/chafa/default.nix             |  2 +-
 pkgs/tools/misc/ckb-next/default.nix          |  2 +-
 pkgs/tools/misc/coreboot-utils/default.nix    |  2 +-
 pkgs/tools/misc/dijo/default.nix              |  2 +-
 pkgs/tools/misc/diskus/default.nix            |  2 +-
 pkgs/tools/misc/envchain/default.nix          |  2 +-
 pkgs/tools/misc/fclones/default.nix           |  2 +-
 pkgs/tools/misc/fclones/gui.nix               |  2 +-
 pkgs/tools/misc/ffsend/default.nix            |  2 +-
 pkgs/tools/misc/fltrdr/default.nix            |  2 +-
 pkgs/tools/misc/freshfetch/default.nix        |  2 +-
 pkgs/tools/misc/fwup/default.nix              |  2 +-
 pkgs/tools/misc/grc/default.nix               |  2 +-
 pkgs/tools/misc/grex/default.nix              |  2 +-
 pkgs/tools/misc/h/default.nix                 |  2 +-
 pkgs/tools/misc/heimdall/default.nix          |  2 +-
 pkgs/tools/misc/hiksink/default.nix           |  2 +-
 pkgs/tools/misc/hyperfine/default.nix         |  2 +-
 pkgs/tools/misc/iay/default.nix               |  2 +-
 pkgs/tools/misc/kcollectd/default.nix         |  2 +-
 .../tools/misc/krunner-translator/default.nix |  2 +-
 pkgs/tools/misc/ksnip/default.nix             |  2 +-
 .../tools/misc/lighthouse-steamvr/default.nix |  2 +-
 pkgs/tools/misc/lorri/default.nix             |  2 +-
 pkgs/tools/misc/noti/default.nix              |  2 +-
 pkgs/tools/misc/ntfy-sh/default.nix           |  2 +-
 pkgs/tools/misc/nvfancontrol/default.nix      |  2 +-
 pkgs/tools/misc/octofetch/default.nix         |  2 +-
 .../default.nix                               |  2 +-
 .../misc/opentelemetry-collector/releases.nix |  2 +-
 pkgs/tools/misc/owofetch/default.nix          |  2 +-
 .../misc/pandoc-drawio-filter/default.nix     |  2 +-
 pkgs/tools/misc/pandoc-eqnos/default.nix      |  2 +-
 pkgs/tools/misc/pandoc-fignos/default.nix     |  2 +-
 pkgs/tools/misc/pandoc-imagine/default.nix    |  2 +-
 pkgs/tools/misc/pandoc-secnos/default.nix     |  2 +-
 pkgs/tools/misc/pandoc-tablenos/default.nix   |  2 +-
 pkgs/tools/misc/parcellite/default.nix        |  2 +-
 pkgs/tools/misc/qflipper/default.nix          |  2 +-
 pkgs/tools/misc/qjoypad/default.nix           |  2 +-
 pkgs/tools/misc/radeon-profile/default.nix    |  2 +-
 pkgs/tools/misc/rmlint/default.nix            |  2 +-
 pkgs/tools/misc/rust-motd/default.nix         |  2 +-
 pkgs/tools/misc/shadowenv/default.nix         |  2 +-
 pkgs/tools/misc/sheldon/default.nix           |  2 +-
 pkgs/tools/misc/starship/default.nix          |  2 +-
 pkgs/tools/misc/synth/default.nix             |  2 +-
 .../misc/system-config-printer/default.nix    |  2 +-
 pkgs/tools/misc/tab-rs/default.nix            |  2 +-
 pkgs/tools/misc/thinkpad-scripts/default.nix  |  2 +-
 pkgs/tools/misc/tlp/default.nix               |  2 +-
 pkgs/tools/misc/tmux-sessionizer/default.nix  |  2 +-
 pkgs/tools/misc/toastify/default.nix          |  2 +-
 pkgs/tools/misc/topgrade/default.nix          |  2 +-
 pkgs/tools/misc/toybox/default.nix            |  2 +-
 pkgs/tools/misc/tremor-rs/default.nix         |  2 +-
 pkgs/tools/misc/tremor-rs/ls.nix              |  2 +-
 .../misc/veikk-linux-driver-gui/default.nix   |  2 +-
 pkgs/tools/misc/wagyu/default.nix             |  2 +-
 pkgs/tools/misc/watchexec/default.nix         |  2 +-
 pkgs/tools/misc/xflux/gui.nix                 |  2 +-
 pkgs/tools/networking/axel/default.nix        |  2 +-
 pkgs/tools/networking/bore-cli/default.nix    |  2 +-
 pkgs/tools/networking/cocom/default.nix       |  2 +-
 .../curl-impersonate/chrome/default.nix       |  2 +-
 .../curl-impersonate/firefox/default.nix      |  2 +-
 .../networking/dd-agent/datadog-agent.nix     |  2 +-
 .../networking/dd-agent/integrations-core.nix |  2 +-
 pkgs/tools/networking/dnsviz/default.nix      |  2 +-
 pkgs/tools/networking/drill/default.nix       |  2 +-
 pkgs/tools/networking/flannel/plugin.nix      |  2 +-
 pkgs/tools/networking/gandi-cli/default.nix   |  2 +-
 .../networking/gmrender-resurrect/default.nix |  2 +-
 pkgs/tools/networking/ifwifi/default.nix      |  2 +-
 pkgs/tools/networking/lxi-tools/default.nix   |  2 +-
 pkgs/tools/networking/mozwire/default.nix     |  2 +-
 pkgs/tools/networking/mtr/default.nix         |  2 +-
 pkgs/tools/networking/networkmanager/tray.nix |  2 +-
 .../octodns/providers/bind/default.nix        |  2 +-
 pkgs/tools/networking/opendrop/default.nix    |  2 +-
 .../openvpn/update-systemd-resolved.nix       |  2 +-
 pkgs/tools/networking/pingu/default.nix       |  2 +-
 pkgs/tools/networking/q/default.nix           |  2 +-
 pkgs/tools/networking/rosenpass/default.nix   |  2 +-
 pkgs/tools/networking/s3rs/default.nix        |  2 +-
 pkgs/tools/networking/suckit/default.nix      |  2 +-
 .../tools/networking/telepresence/default.nix |  2 +-
 pkgs/tools/networking/veilid/default.nix      |  2 +-
 pkgs/tools/networking/vpn-slice/default.nix   |  2 +-
 .../package-management/libcomps/default.nix   |  2 +-
 .../package-management/librepo/default.nix    |  2 +-
 pkgs/tools/package-management/lix/default.nix |  8 +--
 .../nix-eval-jobs/default.nix                 |  2 +-
 .../package-management/nix-index/default.nix  |  2 +-
 .../nix-template/default.nix                  |  2 +-
 pkgs/tools/package-management/nix/common.nix  |  2 +-
 .../package-management/nix/dependencies.nix   |  2 +-
 .../package-management/packagekit/default.nix |  2 +-
 .../package-management/packagekit/qt.nix      |  2 +-
 .../security/age-plugin-ledger/default.nix    |  2 +-
 pkgs/tools/security/b2sum/default.nix         |  2 +-
 .../bitwarden-directory-connector/default.nix |  2 +-
 pkgs/tools/security/chipsec/default.nix       |  2 +-
 .../security/chrome-token-signing/default.nix |  2 +-
 pkgs/tools/security/cosign/default.nix        |  2 +-
 pkgs/tools/security/echidna/default.nix       |  2 +-
 pkgs/tools/security/eid-mw/default.nix        |  2 +-
 pkgs/tools/security/fwbuilder/default.nix     |  2 +-
 pkgs/tools/security/fwknop/default.nix        |  2 +-
 .../ghidra/extensions/findcrypt/default.nix   |  2 +-
 .../ghidra-delinker-extension/default.nix     |  2 +-
 .../default.nix                               |  2 +-
 .../ghidra/extensions/kaiju/default.nix       |  2 +-
 .../ghidra/extensions/lightkeeper/default.nix |  2 +-
 .../ghidra/extensions/wasm/default.nix        |  2 +-
 pkgs/tools/security/gopass/default.nix        |  2 +-
 pkgs/tools/security/gopass/git-credential.nix |  2 +-
 pkgs/tools/security/gopass/hibp.nix           |  2 +-
 pkgs/tools/security/gopass/summon.nix         |  2 +-
 pkgs/tools/security/gotrue/default.nix        |  2 +-
 pkgs/tools/security/gotrue/supabase.nix       |  2 +-
 pkgs/tools/security/gpg-tui/default.nix       |  2 +-
 pkgs/tools/security/kbs2/default.nix          |  2 +-
 pkgs/tools/security/keybase/default.nix       |  2 +-
 pkgs/tools/security/krunner-pass/default.nix  |  2 +-
 pkgs/tools/security/lethe/default.nix         |  2 +-
 .../tools/security/libmodsecurity/default.nix |  2 +-
 pkgs/tools/security/nsjail/default.nix        |  2 +-
 .../pass/extensions/audit/default.nix         |  2 +-
 .../security/pass/extensions/checkup.nix      |  2 +-
 pkgs/tools/security/pass/extensions/file.nix  |  2 +-
 .../security/pass/extensions/genphrase.nix    |  2 +-
 pkgs/tools/security/pass/extensions/otp.nix   |  2 +-
 pkgs/tools/security/pass/extensions/tomb.nix  |  2 +-
 .../tools/security/pass/extensions/update.nix |  2 +-
 pkgs/tools/security/pass/wofi-pass.nix        |  2 +-
 pkgs/tools/security/pinentry/mac.nix          |  2 +-
 pkgs/tools/security/quill/default.nix         |  2 +-
 pkgs/tools/security/rekor/default.nix         |  2 +-
 pkgs/tools/security/rucredstash/default.nix   |  2 +-
 pkgs/tools/security/saml2aws/default.nix      |  2 +-
 pkgs/tools/security/solo2-cli/default.nix     |  2 +-
 pkgs/tools/security/stoken/default.nix        |  2 +-
 pkgs/tools/security/vaultwarden/default.nix   |  2 +-
 pkgs/tools/security/vaultwarden/webvault.nix  |  2 +-
 pkgs/tools/security/web-eid-app/default.nix   |  2 +-
 pkgs/tools/security/whatweb/default.nix       |  2 +-
 pkgs/tools/system/btop/default.nix            |  2 +-
 pkgs/tools/system/clinfo/default.nix          |  2 +-
 pkgs/tools/system/cm-rgb/default.nix          |  2 +-
 pkgs/tools/system/gotop/default.nix           |  2 +-
 pkgs/tools/system/htop/default.nix            |  2 +-
 pkgs/tools/system/hw-probe/default.nix        |  2 +-
 .../nvidia-system-monitor-qt/default.nix      |  2 +-
 pkgs/tools/system/nvtop/build-nvtop.nix       |  2 +-
 pkgs/tools/system/pciutils/default.nix        |  2 +-
 pkgs/tools/system/stacer/default.nix          |  2 +-
 pkgs/tools/system/uefitool/common.nix         |  2 +-
 pkgs/tools/text/amber/default.nix             |  2 +-
 pkgs/tools/text/autocorrect/default.nix       |  2 +-
 pkgs/tools/text/chars/default.nix             |  2 +-
 pkgs/tools/text/coloursum/default.nix         |  2 +-
 pkgs/tools/text/diffr/default.nix             |  2 +-
 pkgs/tools/text/fastmod/default.nix           |  2 +-
 pkgs/tools/text/glogg/default.nix             |  2 +-
 pkgs/tools/text/highlight/default.nix         |  2 +-
 pkgs/tools/text/igrep/default.nix             |  2 +-
 pkgs/tools/text/languagetool-rust/default.nix |  2 +-
 pkgs/tools/text/mdbook-linkcheck/default.nix  |  2 +-
 pkgs/tools/text/pinyin-tool/default.nix       |  2 +-
 pkgs/tools/text/ripgrep-all/default.nix       |  2 +-
 pkgs/tools/typesetting/asciidoc/default.nix   |  2 +-
 pkgs/tools/typesetting/htmldoc/default.nix    |  2 +-
 pkgs/tools/typesetting/xmlto/default.nix      |  2 +-
 pkgs/tools/video/atomicparsley/default.nix    |  2 +-
 .../google-compute-engine/default.nix         |  2 +-
 pkgs/tools/wayland/swaytools/default.nix      |  2 +-
 pkgs/top-level/all-packages.nix               |  8 +--
 pkgs/top-level/lua-packages.nix               |  6 +-
 pkgs/top-level/python-packages.nix            |  2 +-
 8131 files changed, 8232 insertions(+), 8232 deletions(-)

diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md
index 9953f357048a..fd50e595d12f 100644
--- a/doc/languages-frameworks/crystal.section.md
+++ b/doc/languages-frameworks/crystal.section.md
@@ -26,7 +26,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
-    rev = version;
+    tag = version;
     hash = "sha256-dFN9l5fgrM/TtOPqlQvUYgixE4KPr629aBmkwdDoq28=";
   };
 
@@ -65,7 +65,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
-    rev = version;
+    tag = version;
     hash = "sha256-dFN9l5fgrM/TtOPqlQvUYgixE4KPr629aBmkwdDoq28=";
   };
 
diff --git a/doc/languages-frameworks/dart.section.md b/doc/languages-frameworks/dart.section.md
index dfb456ba1941..58cae726d870 100644
--- a/doc/languages-frameworks/dart.section.md
+++ b/doc/languages-frameworks/dart.section.md
@@ -39,7 +39,7 @@ buildDartApplication rec {
   src = fetchFromGitHub {
     owner = "sass";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-U6enz8yJcc4Wf8m54eYIAnVg/jsGi247Wy8lp1r1wg4=";
   };
 
diff --git a/doc/languages-frameworks/dlang.section.md b/doc/languages-frameworks/dlang.section.md
index 6e9edefc5e0f..fa211dc6a43d 100644
--- a/doc/languages-frameworks/dlang.section.md
+++ b/doc/languages-frameworks/dlang.section.md
@@ -22,7 +22,7 @@ buildDubPackage rec {
   src = fetchFromGitHub {
     owner = "CyberShadow";
     repo = "btdu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3sSZq+5UJH02IO0Y1yL3BLHDb4lk8k6awb5ZysBQciE=";
   };
 
diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
index 34bf913ef1e8..dfa4071e57f8 100644
--- a/doc/languages-frameworks/go.section.md
+++ b/doc/languages-frameworks/go.section.md
@@ -20,7 +20,7 @@ The following is an example expression using `buildGoModule`:
     src = fetchFromGitHub {
       owner = "knqyf263";
       repo = "pet";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-Gjw1dRrgM8D3G7v6WIM2+50r4HmTXvx0Xxme2fH9TlQ=";
     };
 
diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index 9acfd4181108..c3de65adc9aa 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -194,7 +194,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jesec";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM=";
   };
 
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 34ac80cac998..8f58f607ac17 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
   };
 
@@ -646,7 +646,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Qiskit";
     repo = "retworkx";
-    rev = version;
+    tag = version;
     hash = "sha256-11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20=";
   };
 
@@ -984,7 +984,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
-    rev = version;
+    tag = version;
     hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
   };
 
diff --git a/doc/languages-frameworks/swift.section.md b/doc/languages-frameworks/swift.section.md
index 88d98deeb2dd..1dac81c5b665 100644
--- a/doc/languages-frameworks/swift.section.md
+++ b/doc/languages-frameworks/swift.section.md
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nixos";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
   };
 
diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix
index 2ae25c850011..6d3f603967c3 100644
--- a/nixos/tests/dokuwiki.nix
+++ b/nixos/tests/dokuwiki.nix
@@ -9,7 +9,7 @@ let
     src = pkgs.fetchFromGitHub {
       owner = "giterlizzi";
       repo = "dokuwiki-template-bootstrap3";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-B3Yd4lxdwqfCnfmZdp+i/Mzwn/aEuZ0ovagDxuR6lxo=";
     };
     installPhase = "mkdir -p $out; cp -R * $out/";
diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix
index 9789485488be..0c123309dd31 100644
--- a/pkgs/applications/audio/airwave/default.nix
+++ b/pkgs/applications/audio/airwave/default.nix
@@ -21,7 +21,7 @@ let
   airwave-src = fetchFromGitHub {
     owner = "phantom-code";
     repo = "airwave";
-    rev = version;
+    tag = version;
     sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s";
   };
 
diff --git a/pkgs/applications/audio/ardour/7.nix b/pkgs/applications/audio/ardour/7.nix
index 0830ff4ddf54..10a55ee9f6d1 100644
--- a/pkgs/applications/audio/ardour/7.nix
+++ b/pkgs/applications/audio/ardour/7.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
-    rev = version;
+    tag = version;
     hash = "sha256-cmYt6fGYuuVs6YhAXaO9AG6TrYLDVUaE1/iC67rt76I=";
   };
 
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 45e8e95d2c0a..fa7ceedc1ad0 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
   # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
-    rev = version;
+    tag = version;
     hash = "sha256-z+rIWFVua1IG4GZ8kH3quKaBbN+I7Yr62vukJZk6KAg=";
   };
 
diff --git a/pkgs/applications/audio/bucklespring/default.nix b/pkgs/applications/audio/bucklespring/default.nix
index a126c227f346..be4d6d6594ca 100644
--- a/pkgs/applications/audio/bucklespring/default.nix
+++ b/pkgs/applications/audio/bucklespring/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zevv";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0prhqibivxzmz90k79zpwx3c97h8wa61rk5ihi9a5651mnc46mna";
   };
 
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index d4fef58281d0..d7a67aa76d35 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cmus";
     repo = "cmus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8hgibGtkiwzenMI9YImIApRmw2EzTwE6RhglALpUkp4=";
   };
 
diff --git a/pkgs/applications/audio/codecserver/default.nix b/pkgs/applications/audio/codecserver/default.nix
index c055c72c4eaf..68bbac821906 100644
--- a/pkgs/applications/audio/codecserver/default.nix
+++ b/pkgs/applications/audio/codecserver/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jketterl";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-JzaVBFl3JsFNDm4gy1qOKA9uAjUjNeMiI39l5gfH0aE=";
   };
 
diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix
index 9ff6bb2de902..1cdb98d0630d 100644
--- a/pkgs/applications/audio/csound/csound-qt/default.nix
+++ b/pkgs/applications/audio/csound/csound-qt/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CsoundQt";
     repo = "CsoundQt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZdQwWRAr6AKLmZ/L0lSxIlvWRLoZIKinn7BAQiR+luk=";
   };
 
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 222dfa3acb4e..546043a8be7a 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -80,7 +80,7 @@ clangStdenv.mkDerivation {
     owner = "DeaDBeeF-Player";
     repo = "deadbeef";
     fetchSubmodules = true;
-    rev = version;
+    tag = version;
     hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q=";
   };
 
diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
index 784195b23d73..11d924f14611 100644
--- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "saivert";
     repo = "ddb_misc_headerbar_GTK3";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1v1schvnps7ypjqgcbqi74a45w8r2gbhrawz7filym22h1qr9wn0";
   };
 
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index bb41a6f0f5f4..d636020059d6 100644
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "DeaDBeeF-Player";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-f6iHgwLdzQJJEquyuUQGWFfOfpjH/Hxh9IqQ5HkYrog=";
   };
 
diff --git a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
index c6a1a08d5954..f5b86fc3f1d9 100644
--- a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vovochka404";
     repo = "deadbeef-statusnotifier-plugin";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6WEbY59vPNrL3W5GUwFQJimmSS+td8Ob+G46fPAxfV4=";
   };
 
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index dd3827ab8a19..64273c7f80d5 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -42,7 +42,7 @@ mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "dfasma";
     owner = "gillesdegottex";
   };
diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/applications/audio/easyaudiosync/default.nix
index e7166cd9eb80..bb3b5e38894a 100644
--- a/pkgs/applications/audio/easyaudiosync/default.nix
+++ b/pkgs/applications/audio/easyaudiosync/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "complexlogic";
     repo = "EasyAudioSync";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UCOL4DzynKjNDvS0HZ4/K+Wn5lOqHZ0bNop0zqJl5kc=";
   };
 
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 14835a9e0b60..6215445a7f3d 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "espeak-ng";
     repo = "espeak-ng";
-    rev = version;
+    tag = version;
     hash = "sha256-aAJ+k+kkOS6k835mEW7BvgAIYGhUHxf7Q4P5cKO8XTk=";
   };
 
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 9304f4536e19..24ca7658acb2 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -30,7 +30,7 @@ let
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
-    rev = version;
+    tag = version;
     hash = "sha256-Rn+Cjpk4vttxARrkDSnpKdBdSRtgElsit8zu1BA8Jd4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
index d7830565fcc8..d7fa14c241a1 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.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/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index 988b81e2ffb8..d41171c88d05 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flacon";
     repo = "flacon";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-r9SdQg6JTMoGxO2xUtkkBe5F5cajnsndZEq20BjJGuU=";
   };
 
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 9455874ded68..37a5f3e32957 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -27,7 +27,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gillesdegottex";
     repo = "fmit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1q062pfwz2vr9hbfn29fv54ip3jqfd9r99nhpr8w7mn1csy38azx";
   };
 
diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index 90e3d80ad14d..dbf9d819112a 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Xb4LHoon56P6OmHvd7RkODrOc4MDa0+U8npypGhcyw4=";
   };
 
diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix
index e31dbbed38b2..00fc400e44dd 100644
--- a/pkgs/applications/audio/grandorgue/default.nix
+++ b/pkgs/applications/audio/grandorgue/default.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/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index 6d81b7cc4a6d..06029c40dde3 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hydrogen-music";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-OMd8t043JVfMEfRjLdcE/R/4ymGp2yennkCjyX75r8Q=";
   };
 
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index d4a0bf6064a4..70bb2c276b1a 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kampfschlaefer";
     repo = "jackmix";
-    rev = version;
+    tag = version;
     sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
   };
 
diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix
index f98bdae72975..21c51d6cfb0b 100644
--- a/pkgs/applications/audio/jamesdsp/default.nix
+++ b/pkgs/applications/audio/jamesdsp/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Audio4Linux";
     repo = "JDSP4Linux";
     fetchSubmodules = true;
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-eVndqIqJ3DRceuFMT++g2riXq0CL5r+TWbvzvaYIfZ8=";
   };
 
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index 9032f34d5a32..121741aedad0 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swh";
     repo = "ladspa";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eOtIhNcuItREUShI8JRlBVKfMfovpdfIYu+m37v4KLE=";
   };
 
diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index 6a29a96e470b..8e09e5d30b3c 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "librespot-org";
     repo = "librespot";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dGQDRb7fgIkXelZKa+PdodIs9DxbgEMlVGJjK/hU3Mo=";
   };
 
diff --git a/pkgs/applications/audio/linvstmanager/default.nix b/pkgs/applications/audio/linvstmanager/default.nix
index 1da68ebb45d1..93152364519e 100644
--- a/pkgs/applications/audio/linvstmanager/default.nix
+++ b/pkgs/applications/audio/linvstmanager/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Goli4thus";
     repo = "linvstmanager";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-K6eugimMy/MZgHYkg+zfF8DDqUuqqoeymxHtcFGu2Uk=";
   };
 
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index d4c45a283603..fc0ade8edd9c 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -32,7 +32,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LMMS";
     repo = "lmms";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "006hwv1pbh3y5whsxkjk20hsbgwkzr4dawz43afq1gil69y7xpda";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/audio/lpd8editor/default.nix b/pkgs/applications/audio/lpd8editor/default.nix
index b5071a2c5a41..b8d83df1a21a 100644
--- a/pkgs/applications/audio/lpd8editor/default.nix
+++ b/pkgs/applications/audio/lpd8editor/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "charlesfleche";
     repo = "lpd8editor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lRp2RhNiIf1VrryfKqYFSbKG3pktw3M7B49fXVoj+C8=";
   };
 
diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 983e3924f815..7fdbb5904c97 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "magnetophon";
     repo = "VoiceOfFaust";
-    rev = version;
+    tag = version;
     sha256 = "sha256-vB8+ymvNuuovFXwOJ3BTIj5mGzCGa1+yhYs4nWMYIxU=";
   };
 
diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
index beb40dcbfece..1cafb2abeb45 100644
--- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "magnetophon";
     repo = "faustCompressors";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "144f6g17q4m50kxzdncsfzdyycdfprnpwdaxcwgxj4jky1xsha1d";
   };
 
diff --git a/pkgs/applications/audio/master_me/default.nix b/pkgs/applications/audio/master_me/default.nix
index 3c766b701cf9..688a9f4d61b2 100644
--- a/pkgs/applications/audio/master_me/default.nix
+++ b/pkgs/applications/audio/master_me/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trummerschlunk";
     repo = "master_me";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-FG3X1dOF9KRHHSnd5/zP+GrYCB2O0y+tnI5/l9tNhyE=";
   };
diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix
index 0b51b83f98f7..ce274cf9b8c9 100644
--- a/pkgs/applications/audio/mellowplayer/default.nix
+++ b/pkgs/applications/audio/mellowplayer/default.nix
@@ -21,7 +21,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "ColinDuquesnoy";
     repo = "MellowPlayer";
-    rev = version;
+    tag = version;
     hash = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk=";
   };
 
diff --git a/pkgs/applications/audio/melmatcheq.lv2/default.nix b/pkgs/applications/audio/melmatcheq.lv2/default.nix
index ef49dc783d2e..555f7ab78499 100644
--- a/pkgs/applications/audio/melmatcheq.lv2/default.nix
+++ b/pkgs/applications/audio/melmatcheq.lv2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1s805jgb9msxfq9047s7pxrngizb00w8sm4z94iii80ba65rd20x";
   };
 
diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix
index 37f87257bdf3..eb400418778d 100644
--- a/pkgs/applications/audio/minidsp/default.nix
+++ b/pkgs/applications/audio/minidsp/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mrene";
     repo = "minidsp-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8bKP9/byVRKj1P1MP3ZVg8yw0WaNB0BcqarCti7B8CA=";
   };
 
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 8c9022df6eca..c790b09a66a6 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mixxxdj";
     repo = "mixxx";
-    rev = version;
+    tag = version;
     hash = "sha256-1ZE2hVwacZve0+IOQs+htK/kl7zFsOWkh/KcrnI6u/M=";
   };
 
diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
index caf18e26e7f1..475e2c66388e 100644
--- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix
+++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pimusicbox";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1lzarazq67gciyn6r8cdms0f7j0ayyfwhpf28z93ydb280mfrrb9";
   };
 
diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix
index a601cc2196a6..c3bcd0e44356 100644
--- a/pkgs/applications/audio/mopidy/soundcloud.nix
+++ b/pkgs/applications/audio/mopidy/soundcloud.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mopidy";
     repo = "mopidy-soundcloud";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1Qqbfw6NZ+2K1w+abMBfWo0RAmIRbNyIErEmalmWJ0s=";
   };
 
diff --git a/pkgs/applications/audio/mopidy/subidy.nix b/pkgs/applications/audio/mopidy/subidy.nix
index 0891d19f8a8f..bd4139940a56 100644
--- a/pkgs/applications/audio/mopidy/subidy.nix
+++ b/pkgs/applications/audio/mopidy/subidy.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Prior99";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0c5ghhhrj5v3yp4zmll9ari6r5c6ha8c1izwqshvadn40b02q7xz";
   };
 
diff --git a/pkgs/applications/audio/mopidy/ytmusic.nix b/pkgs/applications/audio/mopidy/ytmusic.nix
index 5db613bc3ebe..af0c11a5fb7d 100644
--- a/pkgs/applications/audio/mopidy/ytmusic.nix
+++ b/pkgs/applications/audio/mopidy/ytmusic.nix
@@ -16,7 +16,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jmcdo29";
     repo = "mopidy-ytmusic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2o4fDtaIxRDvIiAGV/9qK/00BmYXasBUwW03fxFcDAU=";
   };
 
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index 5bf3612596b2..838f1e564fe0 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "muse-sequencer";
     repo = "muse";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-LxibuqopMHuKEfTWXSEXc1g3wTm2F3NQRiV71FHvaY0=";
   };
 
diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix
index 0ab89c108524..ff19c1dcbaf2 100644
--- a/pkgs/applications/audio/noson/default.nix
+++ b/pkgs/applications/audio/noson/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "janbar";
     repo = "noson-app";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-hCVGi+++6CcTRMXeRKH8xRncm/Gl83GgU3aAIPI/yGU=";
   };
 
diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index 3ec19cf487dc..4a28169d11c9 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pianobooster";
     repo = "PianoBooster";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1WOlAm/HXSL6QK0Kd1mnFEZxxpMseTG+6WzgMNWt+RA=";
   };
 
diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix
index 120ae1bb80bb..35904ab3348a 100644
--- a/pkgs/applications/audio/pipecontrol/default.nix
+++ b/pkgs/applications/audio/pipecontrol/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "portaloffreedom";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc=";
   };
 
diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix
index f698a39440a6..98fd5250ddc7 100644
--- a/pkgs/applications/audio/playbar2/default.nix
+++ b/pkgs/applications/audio/playbar2/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "audoban";
     repo = "PlayBar2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0iv2m4flgaz2r0k7f6l0ca8p6cw8j8j2gin1gci2pg3l5g5khbch";
   };
 
diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix
index 436a690ffd62..514a78d440ef 100644
--- a/pkgs/applications/audio/polyphone/default.nix
+++ b/pkgs/applications/audio/polyphone/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "davy7125";
     repo = "polyphone";
-    rev = version;
+    tag = version;
     hash = "sha256-43EswCgNJv11Ov+4vmj2vS/yJ2atyzkRmk/SoCKYD/0=";
   };
 
diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/applications/audio/pragha/default.nix
index e3ef9f3cdfc6..25b22d0788eb 100644
--- a/pkgs/applications/audio/pragha/default.nix
+++ b/pkgs/applications/audio/pragha/default.nix
@@ -53,7 +53,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pragha-music-player";
     repo = "pragha";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE=";
   };
 
diff --git a/pkgs/applications/audio/projectm_3/default.nix b/pkgs/applications/audio/projectm_3/default.nix
index 09db5ad83393..e6da9ac3704c 100644
--- a/pkgs/applications/audio/projectm_3/default.nix
+++ b/pkgs/applications/audio/projectm_3/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "projectM";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oEfOx93JyR94II5NkUCvMwqxuV7ktpOHZ8PNMLCiqDw=";
   };
 
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index 439fa8e4a0dd..572ac7aeab5f 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ebruck";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/0GlQdSsIPKGrDT9CgxvaH8TpAbqxFduwL2A2+BSrEI=";
   };
 
diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix
index 8426cc20e2e1..025ab6b59abc 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/applications/audio/sayonara/default.nix
@@ -30,7 +30,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "luciocarreras";
     repo = "sayonara-player";
-    rev = version;
+    tag = version;
     hash = "sha256-ZcuWe1dsLJS4/nLXSSKB7wzPU9COFyE4vPSwZIo0bgI=";
   };
 
diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix
index c6cbbaa53756..a496dc71414b 100644
--- a/pkgs/applications/audio/seq66/default.nix
+++ b/pkgs/applications/audio/seq66/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ahlstromcj";
     repo = "seq66";
-    rev = version;
+    tag = version;
     hash = "sha256-9cEvwJTH6Iwi4aZQHTjQ/DhUtKYw2QC1Oq+D1/tpE90=";
   };
 
diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix
index e1caae7c8024..3dffcc921b21 100644
--- a/pkgs/applications/audio/sfxr-qt/default.nix
+++ b/pkgs/applications/audio/sfxr-qt/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agateau";
     repo = "sfxr-qt";
-    rev = version;
+    tag = version;
     hash = "sha256-JAWDk7mGkPtQ5yaA6UT9hlAy770MHrTBhBP9G8UqFKg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix
index 2163ea5db514..8fb370c6e21f 100644
--- a/pkgs/applications/audio/sisco.lv2/default.nix
+++ b/pkgs/applications/audio/sisco.lv2/default.nix
@@ -20,7 +20,7 @@ let
   src = fetchFromGitHub {
     owner = "x42";
     repo = "sisco.lv2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1r6g29yqbdqgkh01x6d3nvmvc58rk2dp94fd0qyyizq37a1qplj1";
   };
 
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index f6cbf58d8954..7e171de9ba34 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "badaix";
     repo = "snapcast";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EJgpZz4PnXfge0rkVH1F7cah+i9AvDJVSUVqL7qChDM=";
   };
 
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index 9a45ba77ca6a..acf6cd7a3b91 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sonic-pi-net";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JMextQY0jLShWmqRQoVAbqIzDhA1mOzI7vfsG7+jjX0=";
   };
 
diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix
index ad1c2ff5b7e2..5580154ceba5 100644
--- a/pkgs/applications/audio/spek/default.nix
+++ b/pkgs/applications/audio/spek/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexkay";
     repo = "spek";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VYt2so2k3Rk3sLSV1Tf1G2pESYiXygrKr9Koop8ChCg=";
   };
 
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index 2480587792a9..0001928621f9 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jonaski";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-EJE6GDyXYMjJUQeTRgmjd0HX3hf4ajSRGsv/2s2oItc=";
   };
 
diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix
index 4c21e137aed1..703d054eb8e3 100644
--- a/pkgs/applications/audio/tageditor/default.nix
+++ b/pkgs/applications/audio/tageditor/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martchus";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VRQV4bTPG4VFhRHFJamUnYd04ZCaNpaxU27Jcl6Chc4=";
   };
 
diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix
index 571672dd0d1e..878edc615e9e 100644
--- a/pkgs/applications/backup/timeshift/unwrapped.nix
+++ b/pkgs/applications/backup/timeshift/unwrapped.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "timeshift";
-    rev = version;
+    tag = version;
     hash = "sha256-umMekxP9bvV01KzfIh2Zxa9Xb+tR5x+tG9dOnBIOkjY=";
   };
 
diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix
index c644d6662775..aaf68d6f0e73 100644
--- a/pkgs/applications/blockchains/alfis/default.nix
+++ b/pkgs/applications/blockchains/alfis/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Alfis";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ettStNktSDZnYNN/IWqTB1Ou1g1QEGFabS4EatnDLaE=";
   };
 
diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix
index a9270da67d9f..5f46e89e001f 100644
--- a/pkgs/applications/blockchains/bitcoin-abc/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix
@@ -32,7 +32,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+9uBmmdQ/shWYnJ7tM+Y8OgqYcQHHI2qeMw2tl1lE+w=";
   };
 
diff --git a/pkgs/applications/blockchains/digibyte/default.nix b/pkgs/applications/blockchains/digibyte/default.nix
index bb254dc0c32f..a42b02703f81 100644
--- a/pkgs/applications/blockchains/digibyte/default.nix
+++ b/pkgs/applications/blockchains/digibyte/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "digibyte-core";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "zPwnC2qd28fA1saG4nysPlKU1nnXhfuSG3DpCY6T+kM=";
   };
 
diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix
index d06ce837c0a3..5aa307bcc329 100644
--- a/pkgs/applications/blockchains/electrs/default.nix
+++ b/pkgs/applications/blockchains/electrs/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "romanz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Xo7aqP4tIh/kYthPucscxnl+ZtVioEja4TTFdH0Q350=";
   };
 
diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix
index b52c720267e5..cfef72f5198c 100644
--- a/pkgs/applications/blockchains/fulcrum/default.nix
+++ b/pkgs/applications/blockchains/fulcrum/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cculianu";
     repo = "Fulcrum";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+hBc7jW1MVLVjYXNOV7QvFJJpZ5RzW5/c9NdqOXrsj0=";
   };
 
diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/applications/blockchains/gridcoin-research/default.nix
index 011c3a76818e..cc51098be3a3 100644
--- a/pkgs/applications/blockchains/gridcoin-research/default.nix
+++ b/pkgs/applications/blockchains/gridcoin-research/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gridcoin-community";
     repo = "Gridcoin-Research";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-nupZB4nNbitpf5EBCNy0e+ovjayAszup/r7qxbxA5jI=";
   };
 
diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix
index d0de5fa729b3..4341491c893f 100644
--- a/pkgs/applications/blockchains/groestlcoin/default.nix
+++ b/pkgs/applications/blockchains/groestlcoin/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Groestlcoin";
     repo = "groestlcoin";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0kl7nq62362clgzxwwd5c256xnaar4ilxcvbralazxg47zv95r11";
   };
 
diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix
index 8361c2e23f94..06a8f54ae2ff 100644
--- a/pkgs/applications/blockchains/lighthouse/default.nix
+++ b/pkgs/applications/blockchains/lighthouse/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sigp";
     repo = "lighthouse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8jHNm/MGpHGOt52rLMXLMWIVn8AXqnpAr+Wvk7DH6gc=";
   };
 
diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix
index e39d5374b9ad..7ef95c943aed 100644
--- a/pkgs/applications/blockchains/monero-cli/default.nix
+++ b/pkgs/applications/blockchains/monero-cli/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nDiFJjhsISYM8kTgJUaPYL44iyccnz5+Pd5beBh+lsM=";
   };
 
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index 790f691b79b2..d1805fca820c 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wnU24EmZig2W/psy4OhaQVy2WwR0CgljlyYwOg4bzwM=";
   };
 
diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix
index e88ce594cd8d..55dfbc5d68b7 100644
--- a/pkgs/applications/blockchains/optimism/geth.nix
+++ b/pkgs/applications/blockchains/optimism/geth.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ethereum-optimism";
     repo = "op-geth";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AKVwwvt77FZlm7089EeayYVRYLo7c3v6LFVpsQN68Zk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix
index 219e9f530f4c..c2f1d544476b 100644
--- a/pkgs/applications/blockchains/snarkos/default.nix
+++ b/pkgs/applications/blockchains/snarkos/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AleoHQ";
     repo = "snarkOS";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+z9dgg5HdR+Gomug03gI1zdCU6t4SBHkl1Pxoq69wrc=";
   };
 
diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix
index 66d28bd3bac8..393bd5edfd7a 100644
--- a/pkgs/applications/blockchains/teos/default.nix
+++ b/pkgs/applications/blockchains/teos/default.nix
@@ -16,7 +16,7 @@ let
   src = fetchFromGitHub {
     owner = "talaia-labs";
     repo = "rust-teos";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UrzH9xmhVq12TcSUQ1AihCG1sNGcy/N8LDsZINVKFkY=";
   };
 
diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index 1706bcd888d7..496ebecdf893 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
   src = fetchFromGitHub {
     owner = "zcash";
     repo = "zcash";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XGq/cYUo43FcpmRDO2YiNLCuEQLsTFLBFC4M1wM29l8=";
   };
 
diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix
index ec537e7b0d85..7d0ea55501d5 100644
--- a/pkgs/applications/display-managers/greetd/regreet.nix
+++ b/pkgs/applications/display-managers/greetd/regreet.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rharish101";
     repo = "ReGreet";
-    rev = version;
+    tag = version;
     hash = "sha256-f8Xvno5QqmWz4SUiFYDvs8lFU1ZaqQ8gpTaVzWxW4T8=";
   };
 
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 45fa03377e69..b07661243eec 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-ttNlhWD0Ran4d3QvZ+PxbFbSUGMkfrRm+hJdQxIDJvM=";
   };
 
diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix
index b869ec3b6d15..60a8bf367106 100644
--- a/pkgs/applications/editors/cpeditor/default.nix
+++ b/pkgs/applications/editors/cpeditor/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cpeditor";
     repo = "cpeditor";
-    rev = version;
+    tag = version;
     hash = "sha256-t7nn3sO45dOQq5OMWhaseO9XHicQ/1fjukXal5yPMgY";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index 6b805dbb0870..969e68db6907 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
-    rev = version;
+    tag = version;
     hash = "sha256-ZFMO986D4RtrTnLFdcL0a2BNjcsB+9pIolylblku7j4=";
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
index 86109b57a2ac..c262eac301e1 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
@@ -19,7 +19,7 @@ let
     src = fetchFromGitHub {
       owner = "jfcherng";
       repo = "copilot-node-server";
-      rev = version;
+      tag = version;
       hash = "sha256-Ds2agoO7LBXI2M1dwvifQyYJ3F9fm9eV2Kmm7WITgyo=";
     };
   });
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
index 3901b4afcc17..86d1642db5a3 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
@@ -16,7 +16,7 @@ melpaBuild {
   src = fetchFromGitHub {
     owner = "idris-community";
     repo = "idris2-mode";
-    rev = version;
+    tag = version;
     hash = "sha256-rTeVjkAw44Q35vjaERs4uoZRJ6XR3FKplEUCVPHhY7Q=";
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
index 4bdf1c124223..3b05bf9a1366 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
@@ -14,7 +14,7 @@ melpaBuild {
   src = fetchFromGitHub {
     owner = "emacsmirror";
     repo = "rect-mark";
-    rev = version;
+    tag = version;
     hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
index f96632992080..491c6710180e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
@@ -17,7 +17,7 @@ let
     src = fetchFromGitHub {
       owner = "emacs-tree-sitter";
       repo = "emacs-tree-sitter";
-      rev = version;
+      tag = version;
       hash = "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=";
     };
 
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index b4b83ff3a587..8768ba4cad1a 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gottcode";
     repo = "focuswriter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oivhrDF3HikbEtS1cOlHwmQYNYf3IkX+gQGW0V55IWU=";
   };
 
diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
index 0a1de3a871a2..40dfdc959d50 100644
--- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
@@ -43,7 +43,7 @@ let
       src = fetchFromGitHub {
         owner = "clojupyter";
         repo = "clojupyter";
-        rev = version;
+        tag = version;
         sha256 = "sha256-BCzcPnLSonm+ELFU4JIIzLPlVnP0VzlrRSGxOd/LFow=";
       };
 
diff --git a/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix b/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix
index 1fd032e465f0..c268efde8ffc 100644
--- a/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix
+++ b/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "EugeneLoy";
     repo = "coq_jupyter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+Pp51cxeqjg5MW4CEccNWVjNcY9iyFNATIEage9RWJ0=";
   };
 
diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix
index eab4626a663c..710b657bf193 100644
--- a/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix
+++ b/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WolframResearch";
     repo = "WolframLanguageForJupyter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "19d9dvr0bv7iy0x8mk4f576ha7z7h7id39nyrggwf9cp7gymxf47";
   };
 
diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
index af0c5cce88f3..498df86b137e 100644
--- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
+++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
@@ -58,7 +58,7 @@ clangStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "QuantStack";
     repo = "xeus-cling";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-OfZU+z+p3/a36GntusBfwfFu3ssJW4Fu7SV3SMCoo1I=";
   };
 
diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix
index c809978616f7..d3c289ba4812 100644
--- a/pkgs/applications/editors/kakoune/plugins/overrides.nix
+++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix
@@ -52,7 +52,7 @@ self: super: {
     src = fetchFromGitHub {
       owner = "eraserhd";
       repo = "kak-ansi";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "kFjTYFy0KF5WWEHU4hHFAnD/03/d3ptjqMMbTSaGImE=";
     };
 
@@ -86,7 +86,7 @@ self: super: {
     src = fetchFromGitHub {
       owner = "eraserhd";
       repo = "kak-plumb";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "1rz6pr786slnf1a78m3sj09axr4d2lb5rg7sfa4mfg1zcjh06ps6";
     };
 
diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index b4d32534e284..f19ef31d6bb7 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leo-editor";
     repo = "leo-editor";
-    rev = version;
+    tag = version;
     sha256 = "sha256-nK6JMR4XrxZxvLOAsYjuyHQo/sob+OLSk/8U3zZ/Iyo=";
   };
 
diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix
index 8d6d1ac8bc04..886adcb2f8ca 100644
--- a/pkgs/applications/editors/lite-xl/default.nix
+++ b/pkgs/applications/editors/lite-xl/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lite-xl";
     repo = "lite-xl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ig0XDxnll/zruAwWHwuXiqumBXgAPxuK0E1ELupvcXo=";
   };
 
diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix
index 2883c52fafc8..f20a9825b08b 100644
--- a/pkgs/applications/editors/mindforger/default.nix
+++ b/pkgs/applications/editors/mindforger/default.nix
@@ -18,7 +18,7 @@ let
     mindforger = fetchFromGitHub {
       owner = "dvorka";
       repo = "mindforger";
-      rev = version;
+      tag = version;
       sha256 = "sha256-+8miV2xuQcaWGdWCEXPIg6EXjAHtgD9pX7Z8ZNhpMjA=";
     };
     cmark-gfm = fetchFromGitHub {
diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix
index 1fc6f2184f08..2ec7f6a6b521 100644
--- a/pkgs/applications/editors/neovim/gnvim/default.nix
+++ b/pkgs/applications/editors/neovim/gnvim/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vhakulinen";
     repo = "gnvim";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VyyHlyMW/9zYECobQwngFARQYqcoXmopyCHUwHolXfo=";
   };
 
diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
index 019887ee324b..15a2c8af3723 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/pkgs/applications/editors/notepadqq/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "notepadqq";
     repo = "notepadqq";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-XA9Ay9kJApY+bDeOf0iPv+BWYFuTmIuqsLEPgRTCZCE=";
   };
 
diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix
index 9d64e6549c8e..0fd3f6938b94 100644
--- a/pkgs/applications/editors/qxmledit/default.nix
+++ b/pkgs/applications/editors/qxmledit/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lbellonda";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-UzN5U+aC/uKokSdeUG2zv8+mkaH4ndYZ0sfzkpQ3l1M=";
   };
 
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 95ff14a96bd5..aa88727c02e5 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mapeditor";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E=";
   };
 
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 68147dd144a1..8140387a270a 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -10,7 +10,7 @@ rec {
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Eaxia/FLRCnr8MVDvt+ZUFwIQD5Pqq7SsmWZeQdjuXs=";
   };
 
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix
index 824190179389..25dad4855d6e 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix
@@ -14,7 +14,7 @@ vimUtils.buildVimPlugin {
   src = fetchFromGitLab {
     owner = "gitlab-org/editor-extensions";
     repo = "gitlab.vim";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W/FV+i/QJYX6A8uyxAQN4ov1kMd9UFCghFmSQp1kbnM=";
   };
 
diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix
index 718d14a52851..84f054b6d07e 100644
--- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix
+++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix
@@ -13,7 +13,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rescript-lang";
     repo = "rescript-vscode";
-    rev = version;
+    tag = version;
     hash = "sha256-v+qCVge57wvA97mtzbxAX9Fvi7ruo6ZyIC14O8uWl9Y=";
   };
 
diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
index 590c03c26115..e617abbbe8ab 100644
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
@@ -26,7 +26,7 @@ let
   src = fetchFromGitHub {
     owner = "vadimcn";
     repo = "vscode-lldb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ExSS5HxDmJJtYypRYJNz7nY0D50gjoDBc4CnJMfgVw8=";
   };
 
diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix
index 272729bcb47f..e880317e6bee 100644
--- a/pkgs/applications/editors/your-editor/default.nix
+++ b/pkgs/applications/editors/your-editor/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "your-editor";
     repo = "yed";
-    rev = version;
+    tag = version;
     sha256 = "sha256-pa9ibXyuWq7jRYsn3bGdqvLWbwQO2VYsP6Bk+BayQ8o=";
   };
 
diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix
index 43c63bb95260..25600a76cfda 100644
--- a/pkgs/applications/editors/zee/default.nix
+++ b/pkgs/applications/editors/zee/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zee-editor";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w=";
   };
 
diff --git a/pkgs/applications/emulators/blink/default.nix b/pkgs/applications/emulators/blink/default.nix
index a65ebf5886b3..d82b91a513fa 100644
--- a/pkgs/applications/emulators/blink/default.nix
+++ b/pkgs/applications/emulators/blink/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jart";
     repo = "blink";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-4wgDftXOYm2fMP+/aTRljDi38EzbbwAJlQkuxjAMl3I=";
   };
 
diff --git a/pkgs/applications/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix
index e0ff2b7c20a6..d7f5a352ecef 100644
--- a/pkgs/applications/emulators/firebird-emu/default.nix
+++ b/pkgs/applications/emulators/firebird-emu/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nspire-emus";
     repo = "firebird";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-ZptjlnOiF+hKuKYvBFJL95H5YQuR99d4biOco/MVEmE=";
   };
diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/applications/emulators/goldberg-emu/default.nix
index e3100d497681..17f8b2707f28 100644
--- a/pkgs/applications/emulators/goldberg-emu/default.nix
+++ b/pkgs/applications/emulators/goldberg-emu/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "mr_goldberg";
     repo = "goldberg_emulator";
-    rev = version;
+    tag = version;
     hash = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog=";
   };
 
diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix
index 1909e6b0fb8d..886f63f95eaf 100644
--- a/pkgs/applications/emulators/wibo/default.nix
+++ b/pkgs/applications/emulators/wibo/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "decompals";
     repo = "wibo";
-    rev = version;
+    tag = version;
     hash = "sha256-6YcraHBFWmm8TBfuFHbM9jGvUm9KvTOplJrFSTQkt70=";
   };
 
diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/applications/emulators/zsnes/2.x.nix
index 94cb5ad8e6e0..79559949ed01 100644
--- a/pkgs/applications/emulators/zsnes/2.x.nix
+++ b/pkgs/applications/emulators/zsnes/2.x.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "zsnes";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Xz+9YgMpnHyno7vP67aut4tIyG/gTn7SnU2FO2QMND0=";
   };
 
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index fb72f76d29a5..0b4e954c515f 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "grass";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-q1jOimQi+24I1ZBf6Z0cvAyXcBFBpT5aWSNeG6n6y0k=";
   };
 
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index 24be5ebeb558..0c035fbc937a 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jblindsay";
     repo = "whitebox-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kvtfEEydwonoDux1VbAxqrF/Hf8Qh8mhprYnROGOC6g=";
   };
 
diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix
index 3dd69d56b19d..4f570c5b32d0 100644
--- a/pkgs/applications/graphics/ImageMagick/6.x.nix
+++ b/pkgs/applications/graphics/ImageMagick/6.x.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick6";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-AdlJaCJOrN+NkkzzzgELtgAr5iZ9dvlVYVc7tYiM+R8=";
   };
 
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index 6db2925644d5..bdfbd5527fa5 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "apitrace";
     repo = "apitrace";
-    rev = version;
+    tag = version;
     hash = "sha256-Y2ceE0F7q5tP64Mtvkc7JHOZQN30MDVCPHfiWDnfTSQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix
index 39ca9122d13a..08ae6b1e4880 100644
--- a/pkgs/applications/graphics/cloudcompare/default.nix
+++ b/pkgs/applications/graphics/cloudcompare/default.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CloudCompare";
     repo = "CloudCompare";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-a/0lf3Mt5ZpLFRM8jAoqZer8pY1ROgPRY4dPt34Bk3E=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index e3e816116831..9399870dc8b1 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jgraph";
     repo = "drawio-desktop";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-se3yxIzxeinOnfltv+fSflypwxRHvW/wxKJ43LPsiho=";
   };
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index 82362ee6d90c..18ea919fca84 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -74,7 +74,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "drawpile";
     repo = "drawpile";
-    rev = version;
+    tag = version;
     sha256 = "sha256-xcutcSpbFt+pb7QP1E/RG6iNnZwpfhIZTxr+1usLKHc=";
   };
 
diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix
index 89014afb8eb4..a1bb82521569 100644
--- a/pkgs/applications/graphics/emulsion/default.nix
+++ b/pkgs/applications/graphics/emulsion/default.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ArturKovacs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0t+MUZu1cvkJSL9Ly9kblH8fMr05KuRpOo+JDn/VUc8=";
   };
 
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index fcc62660dc0f..f097f5faafee 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "derf";
     repo = "feh";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-FtaFoLjI3HTLAxRTucp5VDYS73UuWqw9r9UWKK6T+og=";
   };
 
diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index 04f0ff9bf358..36f9786670f5 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fontmatrix";
     repo = "fontmatrix";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DtajGhx79DiecglXHja9q/TKVq8Jl2faQdA5Ib/yT88=";
   };
 
diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix
index f25c1064a7ac..dffaaceec1d0 100644
--- a/pkgs/applications/graphics/foxotron/default.nix
+++ b/pkgs/applications/graphics/foxotron/default.nix
@@ -32,7 +32,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/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index b237c5f1bcf1..a7ea6f0cd28d 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -99,7 +99,7 @@ lib.makeScope pkgs.newScope (
       src = fetchFromGitHub {
         owner = "alessandrofrancesconi";
         repo = "gimp-plugin-bimp";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-IJ3+/9UwxJTRo0hUdzlOndOHwso1wGv7Q4UuhbsFkco=";
       };
 
@@ -217,7 +217,7 @@ lib.makeScope pkgs.newScope (
       src = fetchFromGitHub {
         owner = "bootchk";
         repo = "resynthesizer";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = "1jwc8bhhm21xhrgw56nzbma6fwg59gc8anlmyns7jdiw83y0zx3j";
       };
 
@@ -277,7 +277,7 @@ lib.makeScope pkgs.newScope (
       src = fetchFromGitHub {
         owner = "carlobaldassi";
         repo = "gimp-lqr-plugin";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = "81ajdZ2zQi/THxnBlSeT36tVTEzrS1YqLGpHMhFTKAo=";
       };
       patches = [
diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix
index 21d711d8ba42..37ab1d9487a7 100644
--- a/pkgs/applications/graphics/gnome-decoder/default.nix
+++ b/pkgs/applications/graphics/gnome-decoder/default.nix
@@ -35,7 +35,7 @@ clangStdenv.mkDerivation rec {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "decoder";
-    rev = version;
+    tag = version;
     hash = "sha256-qSPuEVW+FwC9OJa+dseIy4/2bhVdTryJSJNSpes9tpY=";
   };
 
diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix
index 6e5641cafd2a..f9fe1580893a 100644
--- a/pkgs/applications/graphics/gnome-obfuscate/default.nix
+++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "Obfuscate";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-/Plvvn1tle8t/bsPcsamn5d81CqnyGCyGYPF6j6U5NI=";
   };
 
diff --git a/pkgs/applications/graphics/imgp/default.nix b/pkgs/applications/graphics/imgp/default.nix
index 3855d3e16ba5..ca78a87d11db 100644
--- a/pkgs/applications/graphics/imgp/default.nix
+++ b/pkgs/applications/graphics/imgp/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "imgp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yQ2BzOBn6Bl9ieZkREKsj1zLnoPcf0hZhZ90Za5kiKA=";
   };
 
diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix
index c267b563d974..27b887c07972 100644
--- a/pkgs/applications/graphics/ktikz/default.nix
+++ b/pkgs/applications/graphics/ktikz/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fhackenberger";
     repo = "ktikz";
-    rev = version;
+    tag = version;
     sha256 = "1s83x8r2yi64wc6ah2iz09dj3qahy0fkxx6cfgpkavjw9x0j0582";
   };
 
diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix
index 912e3b963175..54cbc9859128 100644
--- a/pkgs/applications/graphics/mandelbulber/default.nix
+++ b/pkgs/applications/graphics/mandelbulber/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "buddhi1980";
     repo = "mandelbulber2";
-    rev = version;
+    tag = version;
     sha256 = "sha256-amNNRuuk7qtcyXUVLEW71yEETExgKw48HeQQyxbi8BE=";
   };
 
diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix
index a0e757cc536f..8a470711532f 100644
--- a/pkgs/applications/graphics/menyoki/default.nix
+++ b/pkgs/applications/graphics/menyoki/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y=";
   };
 
diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix
index 209dc697817b..3b8daae0dde2 100644
--- a/pkgs/applications/graphics/ovito/default.nix
+++ b/pkgs/applications/graphics/ovito/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "stuko";
     repo = "ovito";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ulzcsFAiZDg8nABQXNB2/MS7lZdK3czGHLKgKDWS15E=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix
index 75645349377b..b0ecfc025e3d 100644
--- a/pkgs/applications/graphics/photoflare/default.nix
+++ b/pkgs/applications/graphics/photoflare/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PhotoFlare";
     repo = "photoflare";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0eAuof/FBro2IKxkJ6JHauW6C96VTPxy7QtfPVzPFi4=";
   };
 
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index fca4490d3448..654341c7fe80 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oferkv";
     repo = "phototonic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BxJgTKblOKIwt88+PT7XZE0mk0t2B4SfsdXpQHttUTM=";
   };
 
diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix
index a5e54f3f9120..a94ca6a4851b 100644
--- a/pkgs/applications/graphics/pineapple-pictures/default.nix
+++ b/pkgs/applications/graphics/pineapple-pictures/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BLumia";
     repo = "pineapple-pictures";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-NWh0+DEfKT1iZY6tXVGuxgaXF5U+UB9S5BlWyD+1Bko=";
   };
 
diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix
index 734a49f02622..6d5eea39e13e 100644
--- a/pkgs/applications/graphics/qcomicbook/default.nix
+++ b/pkgs/applications/graphics/qcomicbook/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stolowski";
     repo = "QComicBook";
-    rev = version;
+    tag = version;
     sha256 = "1b769lp6gfwds4jb2g7ymhdm9c06zg57zpyz3zpdb40w07zfsjzv";
   };
 
diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix
index 3643a9e7af4f..933ce3d4dabf 100644
--- a/pkgs/applications/graphics/qosmic/default.nix
+++ b/pkgs/applications/graphics/qosmic/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bitsed";
     repo = "qosmic";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "13nw1mkdib14430r21mj352v62vi546vf184vyhxm7yjjygyra1w";
   };
 
diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix
index 688f2f0716d6..18cae4c331ad 100644
--- a/pkgs/applications/graphics/qvge/default.nix
+++ b/pkgs/applications/graphics/qvge/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ArsMasiuk";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rtbUAp3l0VZsu+D9HCHM3q0UkDLflw50rYRq/LP4Wu4=";
   };
 
diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix
index eb2f81c93984..cf68b3f21454 100644
--- a/pkgs/applications/graphics/qview/default.nix
+++ b/pkgs/applications/graphics/qview/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jurplel";
     repo = "qView";
-    rev = version;
+    tag = version;
     hash = "sha256-h1K1Smfy875NoHtgUrOvZZp0IgcQdbyuQhXU9ndM4bA=";
   };
 
diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index f7a2685169ca..a48785cdc0a9 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -26,7 +26,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "damonlynch";
     repo = "rapid-photo-downloader";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw=";
   };
 
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 378706775928..7ae6bbc8d448 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
-    rev = version;
+    tag = version;
     hash = "sha256-jIAbguwF2aqRTk72ro5oHNTawA7biPSFC41YHgRR730=";
     # The developers ask not to use the tarball from Github releases, see
     # https://www.rawtherapee.com/downloads/5.10/#news-relevant-to-package-maintainers
diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index ab07837bc678..ede67b62ca3e 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     owner = "frontend";
     group = "sane-project";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM=";
   };
 
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index 954ddb4f407c..c7645f73e21b 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vigri";
     repo = "scantailor-advanced";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mvoCoYdRTgXW5t8yd9Y9TOl7D3RDVwcjUv2YDUWrtRI=";
   };
 
diff --git a/pkgs/applications/graphics/scantailor/universal.nix b/pkgs/applications/graphics/scantailor/universal.nix
index b7bdc609f61c..1aa35ed4d1da 100644
--- a/pkgs/applications/graphics/scantailor/universal.nix
+++ b/pkgs/applications/graphics/scantailor/universal.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trufanov-nok";
     repo = pname;
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-n8NbokK+U0FAuYXtjRJcxlI1XAmI4hk5zV3sF86hB/s=";
   };
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index e40a1e0b5805..0858eacf4514 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "muennich";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0xaawlfdy7b277m38mgg4423kd7p1ffn0dq4hciqs6ivbb3q9c4f";
   };
 
diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix
index 4d3a97ade7dd..80a99eab6806 100644
--- a/pkgs/applications/graphics/tesseract/tesseract3.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract3.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tesseract-ocr";
     repo = "tesseract";
-    rev = version;
+    tag = version;
     hash = "sha256-28osuZnVwkJpNTYkU+5D5PI8xtViFzGCMScHzkS2H20=";
   };
 
diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix
index 96ce6dda1ead..68ed2848b662 100644
--- a/pkgs/applications/graphics/tesseract/tesseract4.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract4.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tesseract-ocr";
     repo = "tesseract";
-    rev = version;
+    tag = version;
     hash = "sha256-sV3w53ky13ESc0dGPutMGQ4TcmOeWJkvUwBPIyzSTc8=";
   };
 
diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix
index 22059873e4bb..c9b5281a2aa1 100644
--- a/pkgs/applications/graphics/tesseract/tesseract5.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract5.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tesseract-ocr";
     repo = "tesseract";
-    rev = version;
+    tag = version;
     sha256 = "sha256-qyckAQZs3gR1NBqWgE+COSKXhv3kPF+iHVQrt6OPi8s=";
   };
 
diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index 333f08aa9d1b..c93055cef554 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xournalpp";
     repo = "xournalpp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VS5f+9daEQpPu5vam8DWhRqU0AWMmJab8KaRzTnRU/M=";
   };
 
diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index 692463174da6..3e4a30817e09 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -21,7 +21,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "YACReader";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-5vCjr8WRwa7Q/84Itgg07K1CJKGnWA1z53et2IxxReE=";
   };
 
diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix
index 356127483fe8..275d718e97fc 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -17,7 +17,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "JustArchiNET";
     repo = "ArchiSteamFarm";
-    rev = version;
+    tag = version;
     hash = "sha256-PTO4x5YKqs4wWonW3N/sMAVlbWJp+eVjLL98G9bNZ4c=";
   };
 
diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
index 9a185ff1f9f6..3c3a2a00610f 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
     repo = "ASF-ui";
     # updated by the update script
     # this is always the commit that should be used with asf-ui from the latest asf version
-    rev = version;
+    tag = version;
     hash = "sha256-B2gn40LWVm75pwV5sQpv1gRsNof9tQUDClu7oLSz/VM=";
   };
 
diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix
index 5403e4d5e95b..25914f8fdb97 100644
--- a/pkgs/applications/misc/ape/clex.nix
+++ b/pkgs/applications/misc/ape/clex.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Attempto";
     repo = "Clex";
-    rev = version;
+    tag = version;
     sha256 = "0p9s64g1jic213bwm6347jqckszgnni9szrrz31qjgaf32kf7nkp";
   };
 
diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix
index fb94b2d1e4de..bad85693f677 100644
--- a/pkgs/applications/misc/ausweisapp/default.nix
+++ b/pkgs/applications/misc/ausweisapp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Governikus";
     repo = "AusweisApp2";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-1G9H+1YBoIgSE8GO8UuUaG9gbVtY+gCp0oPNSNw0oO8=";
   };
 
diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix
index 69aeb11e2bbd..d51e42d65177 100644
--- a/pkgs/applications/misc/avalonia-ilspy/default.nix
+++ b/pkgs/applications/misc/avalonia-ilspy/default.nix
@@ -28,7 +28,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "icsharpcode";
     repo = "AvaloniaILSpy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ=";
   };
 
diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix
index d43ed3921c0d..f4672526fbe5 100644
--- a/pkgs/applications/misc/barrier/default.nix
+++ b/pkgs/applications/misc/barrier/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "debauchee";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/binocle/default.nix b/pkgs/applications/misc/binocle/default.nix
index e2afd9d91b14..de87589f806e 100644
--- a/pkgs/applications/misc/binocle/default.nix
+++ b/pkgs/applications/misc/binocle/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WAk7xIrCRfVofn4w+gP5E3wnSZbXm/6MZWlNmtoLm20=";
   };
 
diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix
index 428249549509..769915cbc4dc 100644
--- a/pkgs/applications/misc/birdtray/default.nix
+++ b/pkgs/applications/misc/birdtray/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gyunaev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M=";
   };
 
diff --git a/pkgs/applications/misc/bluetooth_battery/default.nix b/pkgs/applications/misc/bluetooth_battery/default.nix
index 0eff5be2206f..462dfd4e1858 100644
--- a/pkgs/applications/misc/bluetooth_battery/default.nix
+++ b/pkgs/applications/misc/bluetooth_battery/default.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "TheWeirdDev";
     repo = "Bluetooth_Headset_Battery_Level";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "067qfxh228cy1x95bnjp88dx4k00ajj7ay7fz5vr1gkj2yfa203s";
   };
 
diff --git a/pkgs/applications/misc/brewtarget/default.nix b/pkgs/applications/misc/brewtarget/default.nix
index 72e7df62486a..a3c607121915 100644
--- a/pkgs/applications/misc/brewtarget/default.nix
+++ b/pkgs/applications/misc/brewtarget/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Brewtarget";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PqaiZ2eLH8+qRRkIolnQClTL9O9EgHMqFH/nUffosV8=";
   };
 
diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix
index 32c0b872d1ae..dddee75123c5 100644
--- a/pkgs/applications/misc/candle/default.nix
+++ b/pkgs/applications/misc/candle/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Denvi";
     repo = "Candle";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1gpx08gdz8awbsj6lsczwgffp19z3q0r2fvm72a73qd9az29pmm0";
   };
 
diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix
index 9f2e10fce874..c25c5d0f7e89 100644
--- a/pkgs/applications/misc/chewing-editor/default.nix
+++ b/pkgs/applications/misc/chewing-editor/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chewing";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w";
   };
 
diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix
index cb9bdea22067..72b4f6f74076 100644
--- a/pkgs/applications/misc/clight/clightd.nix
+++ b/pkgs/applications/misc/clight/clightd.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedeDP";
     repo = "Clightd";
-    rev = version;
+    tag = version;
     hash = "sha256-Lmno/TJVCQVNzfpKNZzuDf2OM6w6rbz+zJTr3zVo/CM=";
   };
 
diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix
index 820e1f3d62fd..d9ec515919b1 100644
--- a/pkgs/applications/misc/clight/default.nix
+++ b/pkgs/applications/misc/clight/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedeDP";
     repo = "Clight";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Fu38HRP83Yn2jsq9xnCWOXNlV/0hJKD1/cOOp3EV45Q=";
   };
 
diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix
index fb693b1ff66f..7404c8a66a37 100644
--- a/pkgs/applications/misc/collision/default.nix
+++ b/pkgs/applications/misc/collision/default.nix
@@ -26,7 +26,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "Collision";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-c/74LzDM63w5zW8z2T8o4Efvuzj791/zTSKEDN32uak=";
   };
 
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index bb395236a66c..b78de7776a72 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WBJyLfiPPEQ/Cj5uuwy9KhVc1kw4Hv5TeEuRFDydlGk=";
   };
 
diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix
index eafd42bf38e9..e744e84235d5 100644
--- a/pkgs/applications/misc/cubiomes-viewer/default.nix
+++ b/pkgs/applications/misc/cubiomes-viewer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Cubitect";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-izDKS08LNT2rV5rIxlWRHevJAKEbAVzekjfZy0Oen1I=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix
index 944dc109c0e9..9f0db2a141f8 100644
--- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qhYuLqWXCpOJCqg+JJ8VQQokNEQVwxpHAtYGITxHZ3Y=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix
index d06bea646dc7..2138f68ca5e8 100644
--- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TKBr/CFY4ixQnJuaN+wJB88s6g4lvQz4rwq9YsccRYk=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix
index 1bdf0f104dee..1daaa245c5b0 100644
--- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mCFFT/vHzfC4jl1I8SkgaX8qu+AFNNcwUZx4eJeE+i4=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix
index 32ab1063a04b..90a6cc2c9797 100644
--- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WCSc3ppYaktj9WnPb4n7SmSNWxT2HiXNmPKS3md3ST4=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix
index 61d585e347fe..a3e6fe78d13a 100644
--- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Xir1RQG7AlO166lZq1TJssiWoSixY6EfLEjxek+9ifo=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix
index d0c01f95c0d2..3c2cd9bf80c0 100644
--- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SyGIeoYC4bTBWZ0adOfYJpWkW3/bvFNZg5zK2MN27kA=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix
index 7d788eea2286..834284111a53 100644
--- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DmvmFMttEvNnIp1zwCe0BLrMx3Wlw1U9LcJwyb4Mx9U=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
index d5df2a0bf830..1dc1fc2c161f 100644
--- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix
index e3ff6fdf2b36..f81b6ec4ef5d 100644
--- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qiw6P+I9iAcFcBWiMKAzyxM6waXx/2TPVQHLcLjAnoY=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix
index 2f4e15543a2f..03a888b4432f 100644
--- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ndknVT/gl2P0s3ADW0txiVtAyI/l/ZFWEgufFleS0A4=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix
index b45330fef2ce..65b4381a4ed2 100644
--- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-t3r/bF/uKoprdDoRjrmYTND0Jws+jX6tAGnBeqofBF8=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix
index 19e34bfbfea1..e52f2932bad8 100644
--- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vA2Phs+sEs+Gd73xzj6vb91Krm8q3+koWDM7rCUayTQ=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix
index c500ab6fa6a8..3115b3b7a4aa 100644
--- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jN1keyo2tDlgUu243173zgChw2nhvbsLPH9af6jDhKs=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
index b283e49237aa..369e16ed89bf 100644
--- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XPECvwZkJIoN/r5oFWJpgl/WASpybgLjCK/F0XVMHyU=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix
index f557f48740f8..8328a24f7854 100644
--- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-584dSlXhPfvTBeDjex1o2TZPoG40tl1fNDiIYqjyzOI=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix
index 8ec6080a4c32..b93723b23310 100644
--- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2tnJMBbROGWZQDWjy/xGBNkv7DXXKLWrHf2XnMjOjWQ=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix
index f2671ab3eff2..0cb443301323 100644
--- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zMSE1gQ2HJQCqil3MB4slRe0Cojv2XRLd8wLTokF8H0=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix
index b210b0ca766c..e385616029e4 100644
--- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0x3014UG861lXRwIBpYiiYVPmhln9Q20jJ4tIO50Tjs=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
index ed5d5fc49fa9..8054b3b837e4 100644
--- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
@@ -36,7 +36,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IYUkPGgFGI6889IyromMBobIoqSZtALVsSswQ7O1Bp0=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix
index dfe9e4f1ea89..0bb93266b7a5 100644
--- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SjD37+uLKJrPvjxK0douNgGCUq9He3EK86takZlrX7Q=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
index 353128b091af..6b9dddb8a89a 100644
--- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j6WFLcjDMkYl+9HCmhMRttwtjNX05oP5mfdOsoLC7og=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
index ba9162ed33c8..47a4cdb9b258 100644
--- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1MHyx01w+dCeAeumcSXRBStgAec2yu1rLwaZaCXRgTc=";
   };
 
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 88f3579753c2..132a104fce59 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Cura";
-    rev = version;
+    tag = version;
     sha256 = "sha256-R88SdAxx3tkQCDInrFTKad1tPSDTSYaVAPUVmdk94Xk=";
   };
 
diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix
index 0b6ebae802a3..5080a228794c 100644
--- a/pkgs/applications/misc/cura/plugins.nix
+++ b/pkgs/applications/misc/cura/plugins.nix
@@ -46,7 +46,7 @@ let
       src = fetchFromGitHub {
         owner = "smartavionics";
         repo = pname;
-        rev = version;
+        tag = version;
         sha256 = "0hvi7qwd4xfnqnhbj9dgfjmvv9df7s42asf3fdfxv43n6nx74scw";
       };
 
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 20a0359c6ebd..389ab326b489 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
-    rev = version;
+    tag = version;
     sha256 = "sha256-dx0Q6cuA66lG4nwR7quW5Tvs9sdxjdV4gtpxXirI4nY=";
   };
 
diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix
index 103f081fe150..e69469eb097e 100644
--- a/pkgs/applications/misc/curaengine/stable.nix
+++ b/pkgs/applications/misc/curaengine/stable.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
-    rev = version;
+    tag = version;
     sha256 = "sha256-8V21TRSqCN+hkTlz51d5A5oK5JOwEtx+ROt8cfJBL/0=";
   };
 
diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix
index 7016c5c74617..ebdf60af2cdd 100644
--- a/pkgs/applications/misc/ddcui/default.nix
+++ b/pkgs/applications/misc/ddcui/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rockowitz";
     repo = "ddcui";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KcivAoPV/4TihVkwYgq3bWWhG5E8enVSD3bhObl++I0=";
   };
 
diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix
index dda967a113e1..39e12a68c569 100644
--- a/pkgs/applications/misc/deadd-notification-center/default.nix
+++ b/pkgs/applications/misc/deadd-notification-center/default.nix
@@ -28,7 +28,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phuhl";
     repo = "linux_notification_center";
-    rev = version;
+    tag = version;
     hash = "sha256-VU9NaQVS0n8hFRjWMvCMkaF5mZ4hpnluV31+/SAK7tU=";
   };
 
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index 4302d6cde399..0c0e6226a4d9 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vslavik";
     repo = "diff-pdf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6aKF3Xqp/1BoHEiZVZJSemTjn5Qwwr3QyhsXOIjTr08=";
   };
 
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index 1aa3ca72eb61..da280c8b872d 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -55,7 +55,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "digitalbitbox";
     repo = "dbb-app";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA=";
   };
 
diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix
index 447cb0d37794..af077991c36e 100644
--- a/pkgs/applications/misc/dmensamenu/default.nix
+++ b/pkgs/applications/misc/dmensamenu/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dotlambda";
     repo = "dmensamenu";
-    rev = version;
+    tag = version;
     sha256 = "1ck1i1k40bli6m3n49ff6987hglby9fn4vfr28jpkm3h70s2km3n";
   };
 
diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix
index bab21335b1e8..b725bf6aadb6 100644
--- a/pkgs/applications/misc/dupeguru/default.nix
+++ b/pkgs/applications/misc/dupeguru/default.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "arsenetar";
     repo = "dupeguru";
-    rev = version;
+    tag = version;
     hash = "sha256-/jkZiCapmCLMp7WfgUmpsR8aNCfb3gBELlMYaC4e7zI=";
   };
 
diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix
index e4b4e3f3b385..d338ab5dc8af 100644
--- a/pkgs/applications/misc/edgetx/default.nix
+++ b/pkgs/applications/misc/edgetx/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EdgeTX";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E=";
   };
diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index 51df5b17b99d..2ea00ad650bb 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -34,7 +34,7 @@ let
   tests = fetchFromGitHub {
     owner = "pooler";
     repo = "electrum-ltc";
-    rev = version;
+    tag = version;
     sha256 = "sha256-qu72LIV07pgHqvKv+Kcw9ZmNk6IBz+4/vdJELlT5tE4=";
 
     postFetch = ''
diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix
index d43afca3250c..cca045fb8c0a 100644
--- a/pkgs/applications/misc/eureka-ideas/default.nix
+++ b/pkgs/applications/misc/eureka-ideas/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "simeg";
     repo = "eureka";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc=";
   };
 
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 3a75f783aa51..cdd8da3d01e5 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "goldendict";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-80o8y+mbzpyMQYUGHYs/zgQT23nLVCs7Jcr8FbbXn8M=";
   };
 
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 3822b1655b1b..e086b13b1e71 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gphoto";
     repo = "gphoto2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-t5EnM4WaDbOTPM+rJW+hQxBgNErnnZEN9lZvxTKoDhA=";
   };
 
diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index 564d28e73f2b..bb711093f63c 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "juzzlin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-eKnGCYxC3b7qd/g2IMDyZveBg+jvFA9s3tWEGeTPSkU=";
   };
 
diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix
index a6c478051703..6d990ea52faf 100644
--- a/pkgs/applications/misc/hovercraft/default.nix
+++ b/pkgs/applications/misc/hovercraft/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "regebro";
     repo = "hovercraft";
-    rev = version;
+    tag = version;
     sha256 = "0k0gjlqjz424rymcfdjpj6a71ppblfls5f8y2hd800d1as4im8az";
   };
 
diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix
index 5fc2aabfb390..a99d67420d01 100644
--- a/pkgs/applications/misc/huggle/default.nix
+++ b/pkgs/applications/misc/huggle/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "huggle";
     repo = "huggle3-qt-lx";
-    rev = version;
+    tag = version;
     sha256 = "sha256-f7Oo6x262Ju9KY8f/xjm9gL6I1fRCaDsQWGWJMUNUfY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix
index a05800414a79..d74cd88b19f5 100644
--- a/pkgs/applications/misc/inherd-quake/default.nix
+++ b/pkgs/applications/misc/inherd-quake/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "phodal";
     repo = "quake";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q=";
   };
 
diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix
index f7f302628b8c..3f33a9a37562 100644
--- a/pkgs/applications/misc/inlyne/default.nix
+++ b/pkgs/applications/misc/inlyne/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Inlyne-Project";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ueE1NKbCMBUBrrdsHkwZ5Yv6LD3tQL3ZAk2O4xoYOcw=";
   };
 
diff --git a/pkgs/applications/misc/inochi2d/default.nix b/pkgs/applications/misc/inochi2d/default.nix
index 9e30a883d668..76d2c5b38f2e 100644
--- a/pkgs/applications/misc/inochi2d/default.nix
+++ b/pkgs/applications/misc/inochi2d/default.nix
@@ -27,7 +27,7 @@ in
     src = fetchFromGitHub {
       owner = "Inochi2D";
       repo = "inochi-creator";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-9d3j5ZL6rGOjN1GUpCIfbjby0mNMvOK7BJbHYgwLY2k=";
     };
 
@@ -58,7 +58,7 @@ in
     src = fetchFromGitHub {
       owner = "Inochi2D";
       repo = "inochi-session";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-FcgzTCpD+L50MsPP90kfL6h6DEUtiYkUV1xKww1pQfg=";
     };
 
diff --git a/pkgs/applications/misc/input-leap/default.nix b/pkgs/applications/misc/input-leap/default.nix
index 68287ee614a3..4bad158b0559 100644
--- a/pkgs/applications/misc/input-leap/default.nix
+++ b/pkgs/applications/misc/input-leap/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "input-leap";
     repo = "input-leap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YkBHvwN573qqQWe/p0n4C2NlyNQHSZNz2jyMKGPITF4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/johnny-reborn/default.nix b/pkgs/applications/misc/johnny-reborn/default.nix
index 7b3630654933..286b926e655a 100644
--- a/pkgs/applications/misc/johnny-reborn/default.nix
+++ b/pkgs/applications/misc/johnny-reborn/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xesf";
     repo = "jc_reborn";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PDh2RKdvm4LkDKi963CB5RiraWcS3FED6ug8T1J65GM=";
   };
 
diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix
index 0894b4b08b69..cf56fa24c8f8 100644
--- a/pkgs/applications/misc/k4dirstat/default.nix
+++ b/pkgs/applications/misc/k4dirstat/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeromerobert";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-TXMUtiPS7qRLm6cCy2ZntYrcNJ0fn6X+3o3P5u7oo08=";
   };
 
diff --git a/pkgs/applications/misc/kapow/default.nix b/pkgs/applications/misc/kapow/default.nix
index d2eef8279c3a..3d114d6a604f 100644
--- a/pkgs/applications/misc/kapow/default.nix
+++ b/pkgs/applications/misc/kapow/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gottcode";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1fz9fb4w21ax8hjs6dwfn2410ig4lqvzdlijq0jcj3jbgxd4i1gw";
   };
 
diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix
index 4e0a53397944..6d2a85232335 100644
--- a/pkgs/applications/misc/keepassxc/default.nix
+++ b/pkgs/applications/misc/keepassxc/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
-    rev = version;
+    tag = version;
     hash = "sha256-FBoqCYNM/leN+w4aV0AJMx/G0bjHbI9KVWrnmq3NfaI=";
   };
 
diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix
index 3c80d820a129..f95e8ebaaddd 100644
--- a/pkgs/applications/misc/kemai/default.nix
+++ b/pkgs/applications/misc/kemai/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AlexandrePTJ";
     repo = "kemai";
-    rev = version;
+    tag = version;
     hash = "sha256-wclBAgeDyAIw/nGF6lzIwbwdoZMBTu+tjxsnIxIkODM=";
   };
 
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index bb52de44c15d..4f8918074ad7 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kiwix";
     repo = "kiwix-desktop";
-    rev = version;
+    tag = version;
     hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw=";
   };
 
diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix
index 93381ecce06b..7eb067f646ba 100644
--- a/pkgs/applications/misc/kiwix/lib.nix
+++ b/pkgs/applications/misc/kiwix/lib.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kiwix";
     repo = "libkiwix";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-QP23ZS0FJsMVtnWOofywaAPIU0GJ2L+hLP/x0LXMKiU=";
   };
 
diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix
index 4f3e74c4a1ee..584e582f3e18 100644
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -21,7 +21,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KLayout";
     repo = "klayout";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-i7MQqkVf+NZkmcf589BpLofwqc5KGxRNqdr1Go84M9A=";
   };
 
diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix
index 609414f21d7f..84dbaca86ec4 100644
--- a/pkgs/applications/misc/klipper-estimator/default.nix
+++ b/pkgs/applications/misc/klipper-estimator/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Annex-Engineering";
     repo = "klipper_estimator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EjfW2qeq0ehGhjE2Psz5g/suYMZPvtQi2gaYb+NCa2U=";
   };
 
diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix
index 526ee7eafd96..b03a250db839 100644
--- a/pkgs/applications/misc/ksmoothdock/default.nix
+++ b/pkgs/applications/misc/ksmoothdock/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dangvd";
     repo = "ksmoothdock";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hO7xgjFMFrEhQs3oc2peFTjSVEDsl7Ma/TeVybEZMEk=";
   };
 
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index e438351f1906..49329d9bbf0f 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -79,7 +79,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lutris";
     repo = "lutris";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CAXKnx5+60MITRM8enkYgFl5ZKM6HCXhCYNyG7kHhuQ=";
   };
 
diff --git a/pkgs/applications/misc/makehuman/default.nix b/pkgs/applications/misc/makehuman/default.nix
index c52ae1b813a3..be9380ac78eb 100644
--- a/pkgs/applications/misc/makehuman/default.nix
+++ b/pkgs/applications/misc/makehuman/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   source = fetchFromGitHub {
     owner = "makehumancommunity";
     repo = "makehuman";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-x0v/SkwtOl1lkVi2TRuIgx2Xgz4JcWD3He7NhU44Js4=";
     name = "${pname}-source";
   };
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   assets = fetchFromGitHub {
     owner = "makehumancommunity";
     repo = "makehuman-assets";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Jd2A0PAHVdFMnDLq4Mu5wsK/E6A4QpKjUyv66ix1Gbo=";
     name = "${pname}-assets-source";
   };
diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix
index dd7d60049c46..5ee4f7f2c6c9 100644
--- a/pkgs/applications/misc/maliit-keyboard/default.nix
+++ b/pkgs/applications/misc/maliit-keyboard/default.nix
@@ -27,7 +27,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maliit";
     repo = "keyboard";
-    rev = version;
+    tag = version;
     sha256 = "sha256-XH3sKQuNMLgJi2aV+bnU2cflwkFIw4RYVfxzQiejCT0=";
   };
 
diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix
index ce1897b4aed2..cd630b4b72fd 100644
--- a/pkgs/applications/misc/mdzk/default.nix
+++ b/pkgs/applications/misc/mdzk/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mdzk-rs";
     repo = "mdzk";
-    rev = version;
+    tag = version;
     hash = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs=";
   };
 
diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix
index d815c354f8e6..4d0aa9ad4cf8 100644
--- a/pkgs/applications/misc/mediaelch/default.nix
+++ b/pkgs/applications/misc/mediaelch/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Komet";
     repo = "MediaElch";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m2d4lnyD8HhhqovMdeG36dMK+4kJA7rlPHE2tlhfevo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index b8023272f60f..c25ce8ddb66c 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mooltipass";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-S2Pnueo3opP1k6XBBHGAyRJpkNuI1Hotz7ypXa/96eQ=";
   };
 
diff --git a/pkgs/applications/misc/nimbo/default.nix b/pkgs/applications/misc/nimbo/default.nix
index 151393c804b4..0bc7a7c2dafe 100644
--- a/pkgs/applications/misc/nimbo/default.nix
+++ b/pkgs/applications/misc/nimbo/default.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nimbo-sh";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "YC5T02Sw22Uczufbyts8l99oCQW4lPq0gPMRXCoKsvw=";
   };
 
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix
index 9014f2f32344..43779a594b9b 100644
--- a/pkgs/applications/misc/nixnote2/default.nix
+++ b/pkgs/applications/misc/nixnote2/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baumgarr";
     repo = "nixnote2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr";
   };
 
diff --git a/pkgs/applications/misc/openambit/default.nix b/pkgs/applications/misc/openambit/default.nix
index 9f80b8ee3168..5dc499a6c132 100644
--- a/pkgs/applications/misc/openambit/default.nix
+++ b/pkgs/applications/misc/openambit/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openambitproject";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1074kvkamwnlkwdajsw1799wddcfkjh2ay6l842r0s4cvrxrai85";
   };
 
diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix
index c7680b8f2dfb..ae2cca2da7da 100644
--- a/pkgs/applications/misc/osmscout-server/default.nix
+++ b/pkgs/applications/misc/osmscout-server/default.nix
@@ -35,7 +35,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rinigus";
     repo = "osmscout-server";
-    rev = version;
+    tag = version;
     hash = "sha256-GqUXHn3ZK8gdDlm3TitEp/jhBpQoVeQZUCfAyiyrDEg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix
index 3265a1b61299..b7c09814c6c6 100644
--- a/pkgs/applications/misc/pastel/default.nix
+++ b/pkgs/applications/misc/pastel/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0=";
   };
 
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 661117bcaace..78666225049a 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "pdfpc";
     owner = "pdfpc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5HFmbVsNajMwo+lBe9kJcJyQGe61N6Oy2CI/WJwmSE4=";
   };
 
diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix
index c85fc3f9403b..56c7b343242a 100644
--- a/pkgs/applications/misc/pe-bear/default.nix
+++ b/pkgs/applications/misc/pe-bear/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hasherezade";
     repo = "pe-bear";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jHFH1GAbAtOzUh+Gma89YCU5r/yuwekv/bqiyy8VmRk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/peaclock/default.nix b/pkgs/applications/misc/peaclock/default.nix
index 7b495ed4dc30..7f42e136c5fe 100644
--- a/pkgs/applications/misc/peaclock/default.nix
+++ b/pkgs/applications/misc/peaclock/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "octobanana";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1582vgslhpgbvcd7ipgf1d1razrvgpq1f93q069yr2bbk6xn8i16";
   };
 
diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
index 884acd7aaa77..877567562d01 100644
--- a/pkgs/applications/misc/pgmodeler/default.nix
+++ b/pkgs/applications/misc/pgmodeler/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pgmodeler";
     repo = "pgmodeler";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZoWCXCRaFQMf/RbcgXZQiF4+TDogdMOtccxOTk1c7Jw=";
   };
 
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
index cba463516a68..6df5a16bae45 100644
--- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
+++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Zren";
     repo = "plasma-applet-volumewin7mixer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VMOUNtAURTHDuJBOGz2N0+3VzxBmVNC1O8dVuyUZAa4=";
   };
 
diff --git a/pkgs/applications/misc/plasma-theme-switcher/default.nix b/pkgs/applications/misc/plasma-theme-switcher/default.nix
index 324cca93099f..208c8a6b9914 100644
--- a/pkgs/applications/misc/plasma-theme-switcher/default.nix
+++ b/pkgs/applications/misc/plasma-theme-switcher/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maldoinc";
     repo = "plasma-theme-switcher";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sdcJ6K5QmglJEDIEl4sd8x7DuCPCqMHRxdYbcToM46Q=";
   };
 
diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 24c14969970f..335bfa55bb45 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -29,7 +29,7 @@
       src = fetchFromGitHub {
         owner = "openstenoproject";
         repo = "plover";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = "sha256-oJ7+R3ZWhUbNTTAw1AfMg2ur8vW1XEbsa5FgSTam1Ns=";
       };
 
diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix
index 0e7114cc787f..a0496ac34049 100644
--- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix
+++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix
@@ -53,7 +53,7 @@ let
         owner = "supermerill";
         repo = "SuperSlicer";
         inherit hash;
-        rev = version;
+        tag = version;
         fetchSubmodules = true;
       };
 
diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix
index 8a3717a8eefc..818449ac026a 100644
--- a/pkgs/applications/misc/pueue/default.nix
+++ b/pkgs/applications/misc/pueue/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Nukesor";
     repo = "pueue";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TDxTj7VGzJzd6RWyVbe2ubpVS57bqq7OVvi23ZHmYDM=";
   };
 
diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix
index f93c1e6cd853..d96ba9df7cbf 100644
--- a/pkgs/applications/misc/pure-maps/default.nix
+++ b/pkgs/applications/misc/pure-maps/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rinigus";
     repo = "pure-maps";
-    rev = version;
+    tag = version;
     hash = "sha256-3XghdDwzt0r8Qi8W3ZMwar2aaqTNGiGsM27BHVr5C2E=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix
index b3cbb9572923..a5662809616a 100644
--- a/pkgs/applications/misc/q4wine/default.nix
+++ b/pkgs/applications/misc/q4wine/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brezerk";
     repo = "q4wine";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "04gw5y3dxdpivm2xqacqq85fdzx7xkl0c3h3hdazljb0c3cxxs6h";
   };
 
diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix
index 069e5ae7b48a..a6d249ed6faa 100644
--- a/pkgs/applications/misc/qMasterPassword/default.nix
+++ b/pkgs/applications/misc/qMasterPassword/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bkueng";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4qxPjrf6r2S0l/hcs6bqfJm56jdDz+0a0xEkqGBYGBs=";
   };
 
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index 699afb8a6a5f..ac4495e7c1c3 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     name = "qcad-${version}-src";
     owner = "qcad";
     repo = "qcad";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3P6iudD/swpNDPL4G8isJI6zxqc6/rmHAMpPnEwnuiM=";
   };
 
diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix
index d379b95eb2bb..b6419ec56b5c 100644
--- a/pkgs/applications/misc/qsudo/default.nix
+++ b/pkgs/applications/misc/qsudo/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "project-trident";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "06kg057vwkvafnk69m9rar4wih3vq4h36wbzwbfc2kndsnn47lfl";
   };
 
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 523a91b92f4f..6589d3491667 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -21,7 +21,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sieren";
     repo = "QSyncthingTray";
-    rev = version;
+    tag = version;
     sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w";
   };
 
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 56a43e10e360..9b5397646199 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IJHack";
     repo = "QtPass";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI=";
   };
 
diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix
index 435da18f8abe..ce5a424a2212 100644
--- a/pkgs/applications/misc/reddsaver/default.nix
+++ b/pkgs/applications/misc/reddsaver/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "manojkarthick";
     repo = "reddsaver";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf";
   };
 
diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 8a198a702eaa..5b05f6c7d349 100644
--- a/pkgs/applications/misc/redshift-plasma-applet/default.nix
+++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kotelnik";
     repo = "plasma-applet-redshift-control";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "122nnbafa596rxdxlfshxk45lzch8c9342bzj7kzrsjkjg0xr9pq";
   };
 
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 31e866d0e7c5..505f6bab0781 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -156,7 +156,7 @@ rec {
     src = fetchFromGitHub {
       owner = "jonls";
       repo = "redshift";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6";
     };
 
@@ -185,7 +185,7 @@ rec {
     src = fetchFromGitLab {
       owner = "chinstrap";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU=";
     };
 
diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix
index 78c810c3dff6..75a699e3a1ba 100644
--- a/pkgs/applications/misc/resp-app/default.nix
+++ b/pkgs/applications/misc/resp-app/default.nix
@@ -38,7 +38,7 @@ mkDerivation rec {
     owner = "RedisInsight";
     repo = "RedisDesktopManager";
     fetchSubmodules = true;
-    rev = version;
+    tag = version;
     hash = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4=";
   };
 
diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix
index a8a83fcfe863..a249356388e9 100644
--- a/pkgs/applications/misc/rofi-emoji/default.nix
+++ b/pkgs/applications/misc/rofi-emoji/default.nix
@@ -33,7 +33,7 @@ import ./versions.nix (
     src = fetchFromGitHub {
       owner = "Mange";
       repo = "rofi-emoji";
-      rev = "v${version}";
+      tag = "v${version}";
       inherit hash;
     };
 
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 95597a6ee411..3ba6ef4280ac 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "davatorium";
     repo = "rofi";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-TEn3LoTUc5mxYcVkckIFTfkqQ9cUJxkXyg/5TFv5TZ0=";
   };
diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix
index a28d6f1027fe..481c3e11d9af 100644
--- a/pkgs/applications/misc/rofi/wayland.nix
+++ b/pkgs/applications/misc/rofi/wayland.nix
@@ -15,7 +15,7 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec {
   src = fetchFromGitHub {
     owner = "lbonn";
     repo = "rofi";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-6hQfy0c73z1Oi2mGjuhKLZQIBpG1u06v40dmlc5fL/w=";
   };
diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix
index 090c0454def1..13b25023b6c4 100644
--- a/pkgs/applications/misc/slstatus/default.nix
+++ b/pkgs/applications/misc/slstatus/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.suckless.org/slstatus";
-    rev = version;
+    tag = version;
     hash = "sha256-cFah6EgApslLSlJaOy/5W9ZV9Z1lzfKye/rRh9Om3T4=";
   };
 
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix
index e00289353842..ecd20697bd7b 100644
--- a/pkgs/applications/misc/stog/default.nix
+++ b/pkgs/applications/misc/stog/default.nix
@@ -28,7 +28,7 @@ buildDunePackage rec {
     domain = "framagit.org";
     owner = "zoggy";
     repo = "stog";
-    rev = version;
+    tag = version;
     hash = "sha256-hMb6D6VSq2o2NjycwxZt3mZKy1FR+3afEwbOmTc991g=";
   };
 
diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix
index 24e160ab3a62..ab9f3682bd91 100644
--- a/pkgs/applications/misc/stork/default.nix
+++ b/pkgs/applications/misc/stork/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jameslittle230";
     repo = "stork";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw=";
   };
 
diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix
index 848e73ff2df3..75d69854cbf1 100644
--- a/pkgs/applications/misc/swappy/default.nix
+++ b/pkgs/applications/misc/swappy/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jtheoof";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo=";
   };
 
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index df841710a11c..a9083fa79d8c 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "symless";
     repo = "synergy-core";
-    rev = version;
+    tag = version;
     hash = "sha256-0QqklfSsvcXh7I2jaHk82k0nY8gQOj9haA4WOjGqBqY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix
index 76013b492330..1b46b550ba39 100644
--- a/pkgs/applications/misc/terminal-typeracer/default.nix
+++ b/pkgs/applications/misc/terminal-typeracer/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "ttyperacer";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-S3OW6KihRd6ReTWUXRb1OWC7+YoxehjFRBxcnJVgImU=";
   };
 
diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix
index 29f1591b9fc8..81b29acba80c 100644
--- a/pkgs/applications/misc/tipp10/default.nix
+++ b/pkgs/applications/misc/tipp10/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "tipp10";
     repo = "tipp10";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-e0sWH4pT7ej9XGK/Sg9XMX2bMqcXqtSaYI7KBZTXvp4=";
   };
 
diff --git a/pkgs/applications/misc/tuxclocker/default.nix b/pkgs/applications/misc/tuxclocker/default.nix
index 42f02f2ab223..76a24891ce9f 100644
--- a/pkgs/applications/misc/tuxclocker/default.nix
+++ b/pkgs/applications/misc/tuxclocker/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Lurkki14";
     repo = "tuxclocker";
     fetchSubmodules = true;
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-QLKLqTCpVMWxlDINa8Bo1vgCDcjwovoaXUs/PdMnxv0=";
   };
 
diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix
index e3b42c54a198..6abe7cfbe806 100644
--- a/pkgs/applications/misc/twitch-chat-downloader/default.nix
+++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "TheDrHax";
     repo = "twitch-chat-downloader";
-    rev = version;
+    tag = version;
     hash = "sha256-mV60ygrtQa9ZkJ2CImhAV59ckCJ7vJSA9cWkYE2xo1M=";
   };
 
diff --git a/pkgs/applications/misc/ubpm/default.nix b/pkgs/applications/misc/ubpm/default.nix
index 013d31b9d57f..1b7ea446d737 100644
--- a/pkgs/applications/misc/ubpm/default.nix
+++ b/pkgs/applications/misc/ubpm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "LazyT";
     repo = "ubpm";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-BUUn1WyLT7nm4I+2SpO1ZtIf8isGDy8Za15SiO7sXL8=";
   };
 
diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix
index 746fd8aaad50..9728fb4ecb59 100644
--- a/pkgs/applications/misc/valentina/default.nix
+++ b/pkgs/applications/misc/valentina/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "smart-pattern";
     repo = "valentina";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vIlqrK7wyFaXKfvcJ3FtkAwUt6Xb/47qxcDGy1Ty2uk=";
   };
 
diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index 7bb38e8b0d1b..5881b9a17998 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -56,7 +56,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "saulpw";
     repo = "visidata";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ICEYC9QjYrB+oTzakfjgyg4DigzDOtYnqHRTaqF7Gw0=";
   };
 
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index 64f8f2cbac36..08347da83a2c 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ids1024";
     repo = "wikicurses";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm";
   };
 
diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix
index 6d57f49a6a30..e63a5db55daf 100644
--- a/pkgs/applications/misc/xsw/default.nix
+++ b/pkgs/applications/misc/xsw/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrenho";
     repo = "xsw";
-    rev = version;
+    tag = version;
     sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g";
   };
 
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 7bececfc29de..bcdcefe19855 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rkd77";
     repo = "elinks";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TTb/v24gIWKiCQCESHo0Pz6rvRtw5anoXK0b35dzfLM=";
   };
 
diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix
index 3e266f5f8712..c7bd8b893e19 100644
--- a/pkgs/applications/networking/browsers/qtchan/default.nix
+++ b/pkgs/applications/networking/browsers/qtchan/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "siavash119";
     repo = "qtchan";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll";
   };
 
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 2e8e52b3efe4..475419d09a45 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   # tarball is missing file common.h
   src = fetchgit {
     url = "git://git.suckless.org/surf";
-    rev = version;
+    tag = version;
     sha256 = "1v926hiayddylq79n8l7dy51bm0dsa9n18nx9bkhg666cx973x4z";
   };
 
diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix
index fbec74002d1f..ea394696c2fe 100644
--- a/pkgs/applications/networking/browsers/webmacs/default.nix
+++ b/pkgs/applications/networking/browsers/webmacs/default.nix
@@ -18,7 +18,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "parkouss";
     repo = "webmacs";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     sha256 = "1hzb9341hybgrqcy1w20hshm6xaiby4wbjpjkigf4zq389407368";
   };
diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix
index 4da964a3c7bf..abfb386800ec 100644
--- a/pkgs/applications/networking/cluster/calico/default.nix
+++ b/pkgs/applications/networking/cluster/calico/default.nix
@@ -19,7 +19,7 @@ builtins.mapAttrs
       src = fetchFromGitHub {
         owner = "projectcalico";
         repo = "calico";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-JK/iKVLXT8h+xZpkjVBEI8vfgRuoTHwWaoKikjBsJgI=";
       };
 
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index be96dfdbe562..7a53156b0a6c 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ocSc1fhbBB8YRxVVOvYMombOOkLMdfv9V4GYbf8kwIE=";
   };
 
diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index 085d688e51bd..f68119ad4687 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = "plugins";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-thtN7po5SToM0ZFYIbycaPJTafLvk9hFV4XFGOpWmpg=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix
index 825b8e1f7780..3905431718d4 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chartmuseum";
     repo = "helm-push";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YnhI1/BDk9swr3YFm5ajGf4LLgPty7blA2tlsMH0erY=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
index 2f9545fbdc6c..e6b055d9b7e9 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "databus23";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vRngZigXOyxdx9bG2uWpeQ0ASTW+4tKuQWZ1Vm47Y+k=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
index 12724709f993..48847a42e755 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aslafy-z";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-o9y1C4O1uG2Z7f3kCEoK1tSmSuQh1zJxB/CZBv/GPus=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
index 47aa83ee9653..5bd64544b37f 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm-mapkubeapis";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0DIBdSi/WIHVF8O7OtJOaFnIfpObsUXzgpj25kJuS6E=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
index 22ef1697a6a8..c28bd33b414e 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hypnoglow";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WiK2kZWik81HYZVVmzdqdqIE+jnAcYyu536NbdYWYxk=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
index 90253a131ffe..dfc5f030f852 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jkroepke";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5vsUyeQH/kCaHo7aze1xA1NVLXrxpFB19P708ikKTpg=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
index ff8a20376d53..05e2eb615848 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RWucFZlyVYV5pHFGP7x5I+SILAJ9k12R7l5o7WKGS/c=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index e7e7bdc155a2..f4ccba3f87a0 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "helmfile";
     repo = "helmfile";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zZt0YxGbDqIhg2tXjQo5QnD09ASOUgFyQ1uWbGcujkc=";
   };
 
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index 285b6c4e4c17..5ddde86c41d4 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -188,7 +188,7 @@ let
       src = fetchFromGitHub {
         owner = "rancher";
         repo = "plugins";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = k3sCNISha256;
       };
 
diff --git a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix
index 83f3e752a021..e8e67204bf8f 100644
--- a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rajatjindal";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Z1NIueonjyO2GHulBbXbsQtX7V/Z95GUoZv9AqjLIR0=";
   };
 
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 541bf4d25e01..fd3bfed7ef31 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kF3Oo+YETnsrFPWBO5b7nH2A2eONIOkE84+u6vOSrpE=";
   };
 
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index f9209c858ebc..f3d620115435 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "instrumenta";
     repo = "kubeval";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg=";
   };
 
diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix
index 045210950a4f..438459d5611d 100644
--- a/pkgs/applications/networking/cluster/kuma/default.nix
+++ b/pkgs/applications/networking/cluster/kuma/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kumahq";
     repo = "kuma";
-    rev = version;
+    tag = version;
     hash = "sha256-7vRz2B1aSxpQrV7Om8Zs4o1kJgSVd9rMsOagQZyWMLI=";
   };
 
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 438fb2cfde49..e41f8acc8bc6 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "minikube";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Z7x3MOQUF3a19X4SSiIUfSJ3xl3482eKH700m/9pqcU=";
   };
   postPatch =
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index c48a154d39e0..3f7cd98fbd6f 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -36,7 +36,7 @@ let
         src = fetchFromGitHub {
           owner = "hashicorp";
           repo = pname;
-          rev = "v${version}";
+          tag = "v${version}";
           inherit sha256;
         };
 
diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix
index e10ba0c7e28f..20d30b74b7ff 100644
--- a/pkgs/applications/networking/cluster/roxctl/default.nix
+++ b/pkgs/applications/networking/cluster/roxctl/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = "stackrox";
-    rev = version;
+    tag = version;
     sha256 = "sha256-AQaMWpI7kFFotEQa536dqKxuP/mHuzNm75RPqUWw1VY=";
   };
 
diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix
index bfe9d0a89835..12df142271ad 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "sonobuoy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YFItnwU08g4pVo4OOHscRmPRVXyr+R9YWYTxhSzd7iI=";
   };
 
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index ae80dab1db21..80f1fbccef7d 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -35,7 +35,7 @@ let
         src = fetchFromGitHub {
           owner = "hashicorp";
           repo = "terraform";
-          rev = "v${version}";
+          tag = "v${version}";
           inherit hash;
         };
 
diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix
index 75977b38cdaa..25b85cebf2be 100644
--- a/pkgs/applications/networking/cluster/timoni/default.nix
+++ b/pkgs/applications/networking/cluster/timoni/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stefanprodan";
     repo = "timoni";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nI0yy/zhsJUvisHo+C+/uNRF96ZQ1Ve8VWpE8ZvUeJc=";
   };
 
diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index f729420cee65..2b53534dceca 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dns-stats";
     repo = "compactor";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4=";
   };
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index bc358bc4d036..feaa77d326fc 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "firehol";
     repo = "firehol";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6O3AoQs7Qzcin8VXQgJfCVsNOI74H6fE1DgqdY+e4bA=";
   };
 
diff --git a/pkgs/applications/networking/ftp/gftp/default.nix b/pkgs/applications/networking/ftp/gftp/default.nix
index 361abf88c2d8..2adf5e3de602 100644
--- a/pkgs/applications/networking/ftp/gftp/default.nix
+++ b/pkgs/applications/networking/ftp/gftp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "masneyb";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-0zdv2oYl24BXh61IGCWby/2CCkzNjLpDrAFc0J89Pw4=";
   };
 
diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix
index 3a8082687666..aedb52d28126 100644
--- a/pkgs/applications/networking/geph/default.nix
+++ b/pkgs/applications/networking/geph/default.nix
@@ -34,7 +34,7 @@ in
     src = fetchFromGitHub {
       owner = "geph-official";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-6YWPsSRIZpvVCIGZ1z7srobDvVzLr0o2jBcB/7kbK7I=";
     };
 
@@ -101,7 +101,7 @@ in
                 src = fetchFromGitHub {
                   owner = "evanw";
                   repo = "esbuild";
-                  rev = "v${version}";
+                  tag = "v${version}";
                   hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk=";
                 };
                 vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index 48af19cc590f..55044bcc0d99 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "astrada";
     repo = "google-drive-ocamlfuse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AWr1tcium70rXFKMTv6xcWxndOJua3UXG8Q04TN1Siw=";
   };
 
diff --git a/pkgs/applications/networking/icemon/default.nix b/pkgs/applications/networking/icemon/default.nix
index 43e9c2b8ebba..a0bfe6088170 100644
--- a/pkgs/applications/networking/icemon/default.nix
+++ b/pkgs/applications/networking/icemon/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "icecc";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09jnipr67dhawbxfn69yh7mmjrkylgiqmd0gmc2limd3z15d7pgc";
   };
 
diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix
index bd2591019582..21c926a6210d 100644
--- a/pkgs/applications/networking/ids/zeek/broker/default.nix
+++ b/pkgs/applications/networking/ids/zeek/broker/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeek";
     repo = "broker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SG5TzozKvYc7qcEPJgiEtsxgzdZbbJt90lmuUbCPyv0=";
   };
   postUnpack = ''
diff --git a/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix b/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix
index cf8eab529474..60c7b57cb415 100644
--- a/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maltejur";
     repo = "discord-screenaudio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+F+XRBQn4AVDVARdM2XtBDE7c6tMPZTR3cntDL8aenw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix
index ba1c6d69c01c..9c49b436d2e6 100644
--- a/pkgs/applications/networking/instant-messengers/jami/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jami/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     src = fetchFromGitHub {
       owner = "savoirfairelinux";
       repo = "pjproject";
-      rev = version;
+      tag = version;
       hash = "sha256-uA6ZJYUgAu3cK4CKCGtqaI0KPM/0szExPS2pCOflz5A=";
     };
 
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index 84bc3da601e6..88434c4cb353 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -42,7 +42,7 @@ mkDerivation rec {
     owner = "public";
     group = "BC";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Pu2tGKe3C1uR4lzXkC5sJFu8iJBqF76UfWJXYjPwBkc=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
index 2ed07af8eeb3..4ffcc3e631e0 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
@@ -23,7 +23,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "8go";
     repo = "matrix-commander";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JZcdAo6d7huwDQ9hJE8oT5FH0ZQjg0DhoglOkhOyk1o=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
index 35e438c6a61f..99f6d3440323 100644
--- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "pantalaimon";
-    rev = version;
+    tag = version;
     hash = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
index 6333693e946d..e55c66363a9f 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gkdr";
     repo = "carbons";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qiyIvmJbRmCrAi/93UxDVtO76nSdtzUVfT/sZGxxAh8=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix
index 1d50370c4be7..3b7e993de647 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "felipec";
     repo = "msn-pecan";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0133rpiy4ik6rx9qn8m38vp7w505hnycggr53g3a2hfpk5xj03zh";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
index 35002f0b5773..fe451bf5f139 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "philipl";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix
index 3e2231c887d3..e1153d500360 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EionRobb";
     repo = "pidgin-opensteamworks";
-    rev = version;
+    tag = version;
     sha256 = "sha256-VWsoyFG+Ro+Y6ngSTMQ7yBYf6awCMNOc6U0WqNeg/jU=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
index 6c14b86281a1..ad6465a9a544 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EionRobb";
     repo = "skype4pidgin";
-    rev = version;
+    tag = version;
     sha256 = "11snyrjhm58gjvdmr5h5ajii3ah4a7c8zw3cavjv9xnnwrpfm5rb";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix
index 4f29ebdf3bb6..d991973de8a3 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gkdr";
     repo = "lurch";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yyzotKL1Z4B2BxloJndJKemONMPLG9pVDVe2K5AL05g=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix
index ed295055c2be..97e98998f3cf 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hoehermann";
     repo = "libpurple-signald";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix
index 1e8bf780dceb..02a06d4faa16 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ars3niy";
     repo = "tdlib-purple";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mrowzTtNLyMc2WwLVIop8Mg2DbyiQs0OPXmJuM9QUnM=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index fa4ca8190625..66533dea36bd 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "profanity-im";
     repo = "profanity";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-3TmnbTnL8SPSd3seThavOOJVELi8kWLSlZlAub24KZ4=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 95d847a77b9f..8385fb10f2a6 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -50,7 +50,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
-    rev = version;
+    tag = version;
     sha256 = "sha256-RlZwMBWjhCTEEV08UHbf8NvuqmuihXwR1aA/vMmD1BM=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 0f386c884cc8..5b4153b78c17 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psi-im";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index af2c5434bd68..750a697e1749 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "quotient-im";
     repo = "Quaternion";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-lRCSEb/ldVnEv6z0moU4P5rf0ssKb9Bw+4QEssLjuwI=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix
index efa7dffdae71..abed32f5f665 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "paul-nameless";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-apHd26XnOz5nak+Kz8PJPsonQfTWDyPz7Mi/tWf7zwM=";
   };
 
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 0807b51f6fca..cd8bf42e3185 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -52,7 +52,7 @@ in
   src = fetchFromGitHub {
     owner = "quassel";
     repo = "quassel";
-    rev = version;
+    tag = version;
     sha256 = "sha256-eulhNcyCmy9ryietOhT2yVJeJH+MMZRbTUo2XuTy9qU=";
   };
 
diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix
index 30023e00057d..0576ea2a913a 100644
--- a/pkgs/applications/networking/irc/tiny/default.nix
+++ b/pkgs/applications/networking/irc/tiny/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "osa1";
     repo = "tiny";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-phjEae2SS3zkSpuhhE4iscUM8ij8DT47YLIMATMG/+Q=";
   };
 
diff --git a/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix b/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix
index b89971bc0686..e2dcc7b90441 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "keith";
     repo = "edit-weechat";
-    rev = version;
+    tag = version;
     sha256 = "1s42r0l0xkhlp6rbc23cm4vlda91il6cg53w33hqfhd2wz91s66w";
   };
 
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index 443738ff08a1..8d44d1433d5d 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "wee-slack";
     owner = "wee-slack";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xQO/yi4pJSnO/ldzVQkC7UhAfpy57xzO58NV7KZm4E8=";
   };
 
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index 0a9765549b63..a3242a0207dd 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "poljar";
     repo = "weechat-matrix";
-    rev = version;
+    tag = version;
     hash = "sha256-o4kgneszVLENG167nWnk2FxM+PsMzi+PSyMUMIktZcc=";
   };
 
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
index 5aebaf7c82cf..5dda8c5cc5c6 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "s3rvac";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7uw0IdRSxhPrLqdgECKB9eOrtFj+2HTILBhakKiRuNQ=";
   };
 
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
index e38f41555898..7aef4e27831d 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "mmb";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1lngv98y6883vk8z2628cl4d5y8jxy39w8245gjdvshl8g18k5s2";
   };
 
diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix
index d08ad5686990..42606e8780d4 100644
--- a/pkgs/applications/networking/ktailctl/default.nix
+++ b/pkgs/applications/networking/ktailctl/default.nix
@@ -31,7 +31,7 @@ let
   src = fetchFromGitHub {
     owner = "f-koehler";
     repo = "KTailctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BgxWsT/s5Hv5cvzcSjfrgAmZhcoquaydSZKdPmld4Rg=";
   };
 
diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix
index bef56def692c..bd1b039219be 100644
--- a/pkgs/applications/networking/libcoap/default.nix
+++ b/pkgs/applications/networking/libcoap/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "libcoap";
     owner = "obgm";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-QNrsR6VarZ2favvTZ9pMhVafwF2fOjYLKcyNqZyUl6s=";
   };
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 365aefcc4543..bd4fb4f405cb 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "astroidmail";
     repo = "astroid";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6xQniOLNUk8tDkooDN3Tp6sb43GqoynO6+fN9yhNqZ4=";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 77aa89e029a1..9e2a2220209d 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pulb";
     repo = "mailnag";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0m1cyzwzm7z4p2v31dx098a1iar7dbilwyjcxiqnjx05nlmiqvgf";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix
index 3b32debe0f14..2686ad6499ff 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pulb";
     repo = "mailnag-goa-plugin";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0bij6cy96nhq7xzslx0fnhmiac629h0x4wgy67k4i4npwqw10680";
   };
 
diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix
index aade921aa809..2e06e4b51de3 100644
--- a/pkgs/applications/networking/mhost/default.nix
+++ b/pkgs/applications/networking/mhost/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lukaspustina";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6jn9jOCh96d9y2l1OZ5hgxg7sYXPUFzJiiT95OR7lD0=";
   };
 
diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix
index a37177426b10..ea1bf729fe3f 100644
--- a/pkgs/applications/networking/mujmap/default.nix
+++ b/pkgs/applications/networking/mujmap/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "elizagamedev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E=";
   };
 
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 3205630ce61c..5618f9a08c25 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -176,7 +176,7 @@ let
     src = fetchFromGitHub {
       owner = "mumble-voip";
       repo = "mumble";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-JRnGgxkf5ct6P71bYgLbCEUmotDLS2Evy6t8R7ac7D4=";
       fetchSubmodules = true;
     };
diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix
index 1b6d530016b2..83f4c0deafba 100644
--- a/pkgs/applications/networking/netmaker/default.nix
+++ b/pkgs/applications/networking/netmaker/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gravitl";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/7tj3SuTa2lSMgN4f2/OutzoPvAN7ARK1RKTLlMw13Y=";
   };
 
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 1adc5d981b87..5a8383c38fdb 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "QuiteRSS";
     repo = "quiterss";
-    rev = version;
+    tag = version;
     sha256 = "1cgvl67vhn5y7bj5gbjbgk26bhb0196bgrgsp3r5fmrislarj8s6";
   };
 
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index 5ae05c37776e..1adb08533f1b 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -24,7 +24,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pstavirs";
     repo = "ostinato";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo=";
   };
 
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index 5b122cc3fe55..2b2bed14ca70 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eiskaltdcpp";
     repo = "eiskaltdcpp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JmAopXFS6MkxW0wDQ1bC/ibRmWgOpzU0971hcqAehLU=";
   };
 
diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
index 78f804fc6bce..5e4438c47aa4 100644
--- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
+++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "rtorrent";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k=";
   };
 
diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix
index 50d250e7efe3..1afa4e25d968 100644
--- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix
+++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "libtorrent";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jC/hgGSi2qy+ToZgdxl1PhASLYbUL0O8trX0th2v5H0=";
   };
 
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 1bc2b7db19c7..071e3e112a0e 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -28,7 +28,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RetroShare";
     repo = "RetroShare";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1A1YvOWIiWlP1JPUTg5Z/lxVGCBv4tCPf5sZdPogitU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix
index 45dcb717f2b8..0c458c41b217 100644
--- a/pkgs/applications/networking/p2p/transmission/4.nix
+++ b/pkgs/applications/networking/p2p/transmission/4.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "transmission";
     repo = "transmission";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-KBXvBFgrJ3njIoXrxHbHHLsiocwfd7Eba/GNI8uZA38=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix
index c25585d74701..57ce1f8a1e20 100644
--- a/pkgs/applications/networking/rymdport/default.nix
+++ b/pkgs/applications/networking/rymdport/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Jacalz";
     repo = "rymdport";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WWLs0gzFo1+scG+2JfNMd28jIP1BMMJOK4fhQ726mHY=";
   };
 
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 94495361d60c..9e95cf07a208 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9ng8TsT211jAt2Vhv8fEIQGCtbQ6LQ6pCVFToVaK8LY=";
   };
 
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index d613cc647432..577d9bd86127 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     repo = "wireshark";
     owner = "wireshark";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NO8tc5Av5Gl3yzkxK9KJAZwIjkrXEnIGmbLBPYKRm0E=";
   };
 
diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix
index f782cc9937b4..74ada3f71a61 100644
--- a/pkgs/applications/networking/sync/acd_cli/default.nix
+++ b/pkgs/applications/networking/sync/acd_cli/default.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yadayada";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp";
   };
 
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index 8bc4f5f856ee..4e9e3e9e54b9 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bit-team";
     repo = "backintime";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QTUezD3OdOMqrxOCrdPFI8fB5XDhNVo9XpLgi7Y2aRg=";
   };
 
diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix
index 272445a04753..00a2cf937b0a 100644
--- a/pkgs/applications/networking/sync/rclone/browser.nix
+++ b/pkgs/applications/networking/sync/rclone/browser.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kapitainsky";
     repo = "RcloneBrowser";
-    rev = version;
+    tag = version;
     sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33";
   };
 
diff --git a/pkgs/applications/networking/wgnord/default.nix b/pkgs/applications/networking/wgnord/default.nix
index 7f146995abde..614efc203208 100644
--- a/pkgs/applications/networking/wgnord/default.nix
+++ b/pkgs/applications/networking/wgnord/default.nix
@@ -19,7 +19,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phirecc";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-26cfYXtZVQ7kIRxY6oNGCqIjdw/hjwXhVKimVgolLgk=";
   };
 
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index cde866ff60fe..97d64ca1e228 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -145,7 +145,7 @@ in
     src = fetchFromGitHub {
       owner = "cocodelabs";
       repo = "znc-palaver";
-      rev = version;
+      tag = version;
       hash = "sha256-8W3uF1PrLQiEZm7JaFrpqmJLSFioa4F4qlM1J6Zua8U=";
     };
 
diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix
index fc2d43bb2fb2..2a60ec170845 100644
--- a/pkgs/applications/office/PageEdit/default.nix
+++ b/pkgs/applications/office/PageEdit/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Sigil-Ebook";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-zwOSt1eyvuuqfQ1G2bCB4yj6GgixFRc2FLOgcCrdg3Q=";
   };
 
diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix
index 1287c4c3ccc4..d2d91be35fa9 100644
--- a/pkgs/applications/office/activitywatch/default.nix
+++ b/pkgs/applications/office/activitywatch/default.nix
@@ -24,7 +24,7 @@ let
   sources = fetchFromGitHub {
     owner = "ActivityWatch";
     repo = "activitywatch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Z3WAg3b1zN0nS00u0zIose55JXRzQ7X7qy39XMY7Snk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix
index 887ded477918..f78df780a2f7 100644
--- a/pkgs/applications/office/beamerpresenter/default.nix
+++ b/pkgs/applications/office/beamerpresenter/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stiglers-eponym";
     repo = "BeamerPresenter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sPeWlPkWOPfLAoAC/+T7nyhPqvoaZg6aMOIVLjMqd2k=";
   };
 
diff --git a/pkgs/applications/office/beancount/beancount-ing-diba.nix b/pkgs/applications/office/beancount/beancount-ing-diba.nix
index 84e905353740..59176757e58a 100644
--- a/pkgs/applications/office/beancount/beancount-ing-diba.nix
+++ b/pkgs/applications/office/beancount/beancount-ing-diba.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "siddhantgoel";
     repo = "beancount-ing-diba";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1cdXqdeTz38n0g13EXJ1/IF/gJJCe1uL/Z5NJz4DL+E=";
   };
 
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index f5c58890e6d0..85829e8fe0e4 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JabRef";
     repo = "jabref";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-inE2FXAaEEiq7343KwtjEiTEHLtn01AzP0foTpsLoAw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/office/pdfmixtool/default.nix b/pkgs/applications/office/pdfmixtool/default.nix
index 61443dddcde0..5ddb17009ed1 100644
--- a/pkgs/applications/office/pdfmixtool/default.nix
+++ b/pkgs/applications/office/pdfmixtool/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "scarpetta";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fgtRKUG6J/CM6cXUTHWAPemqL8loWZT3wZmGdRHldq8=";
   };
 
diff --git a/pkgs/applications/radio/cqrlog/default.nix b/pkgs/applications/radio/cqrlog/default.nix
index b2bcc7829414..d37903174670 100644
--- a/pkgs/applications/radio/cqrlog/default.nix
+++ b/pkgs/applications/radio/cqrlog/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ok2cqr";
     repo = "cqrlog";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0zzcg0bl6mq4wfifj998x9x09w8sigbh46synpqx034fpr0swyhb";
   };
 
diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix
index a6608f926967..1e25e24b6897 100644
--- a/pkgs/applications/radio/cubicsdr/default.nix
+++ b/pkgs/applications/radio/cubicsdr/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cjcliffe";
     repo = "CubicSDR";
-    rev = version;
+    tag = version;
     sha256 = "0cyv1vk97x4i3h3hhh7dx8mv6d1ad0fypdbx5fl26bz661sr8j2n";
   };
 
diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix
index f35f66ecc2a4..b6d310b7b23f 100644
--- a/pkgs/applications/radio/direwolf/default.nix
+++ b/pkgs/applications/radio/direwolf/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wb2osz";
     repo = "direwolf";
-    rev = version;
+    tag = version;
     hash = "sha256-Vbxc6a6CK+wrBfs15dtjfRa1LJDKKyHMrg8tqsF7EX4=";
   };
 
diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix
index ef1b5feb6a8d..de1a3fcf8da4 100644
--- a/pkgs/applications/radio/gnuradio/shared.nix
+++ b/pkgs/applications/radio/gnuradio/shared.nix
@@ -33,7 +33,7 @@ in
       fetchFromGitHub {
         repo = "gnuradio";
         owner = "gnuradio";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = sourceSha256;
       };
   nativeBuildInputs =
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index 2bb626cc324a..89595a4beaf3 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -36,7 +36,7 @@ gnuradioMinimal.pkgs.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gqrx-sdr";
     repo = "gqrx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/ykKcwOotu8kn+EpJI+EUeqSkHZ2IrSh+o7lBGeHrZ0=";
   };
 
diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/applications/radio/guglielmo/default.nix
index 9836d03ee851..9fb895be7532 100644
--- a/pkgs/applications/radio/guglielmo/default.nix
+++ b/pkgs/applications/radio/guglielmo/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "marcogrecopriolo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM=";
   };
 
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index 2679132bdb8f..45b980cde1fa 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "myriadrf";
     repo = "LimeSuite";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-f1cXrkVCIc1MqTvlCUBFqzHLhIVueybVxipNZRlF2gE=";
   };
 
diff --git a/pkgs/applications/radio/openwebrx/default.nix b/pkgs/applications/radio/openwebrx/default.nix
index e4fd91c1ca64..18dccbb10b48 100644
--- a/pkgs/applications/radio/openwebrx/default.nix
+++ b/pkgs/applications/radio/openwebrx/default.nix
@@ -29,7 +29,7 @@ let
     src = fetchFromGitHub {
       owner = "jketterl";
       repo = pname;
-      rev = version;
+      tag = version;
       sha256 = "1j80zclg1cl5clqd00qqa16prz7cyc32bvxqz2mh540cirygq24w";
     };
 
@@ -53,7 +53,7 @@ let
     src = fetchFromGitHub {
       owner = "jketterl";
       repo = pname;
-      rev = version;
+      tag = version;
       sha256 = "sha256-1H0TJ8QN3b6Lof5TWvyokhCeN+dN7ITwzRvEo2X8OWc=";
     };
 
@@ -87,7 +87,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jketterl";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-i3Znp5Sxs/KtJazHh2v9/2P+3cEocWB5wIpF7E4pK9s=";
   };
 
diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix
index 6e023899d639..5e91d3e45513 100644
--- a/pkgs/applications/radio/qdmr/default.nix
+++ b/pkgs/applications/radio/qdmr/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hmatuschek";
     repo = "qdmr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6eg2w2h1ot7Cklt5UAiaFqJZjC6EM1VtEAwy3HgH4CE=";
   };
 
diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix
index 309ca8bf0f6a..4060fb97c897 100644
--- a/pkgs/applications/radio/qlog/default.nix
+++ b/pkgs/applications/radio/qlog/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "foldynl";
     repo = "QLog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gCXLZ00klyjisLxSvs4wKD0Sg8CFvF0xR+eHpc1D0Jc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix
index 9697488a7b7d..332d14fdb2c9 100644
--- a/pkgs/applications/radio/rtl-sdr/default.nix
+++ b/pkgs/applications/radio/rtl-sdr/default.nix
@@ -76,7 +76,7 @@ in
     src = fetchFromGitHub {
       owner = "librtlsdr";
       repo = "librtlsdr";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-I1rbywQ0ZBw26wZdtMBkfpj7+kv09XKrrcoDuhIkRmw=";
     };
     meta = {
@@ -95,7 +95,7 @@ in
     src = fetchFromGitHub {
       owner = "rtlsdrblog";
       repo = "rtl-sdr-blog";
-      rev = version;
+      tag = version;
       hash = "sha256-7FpT+BoQ2U8KiKwX4NfEwrO3lMBti7RX8uKtT5dFH8M=";
     };
     meta = {
diff --git a/pkgs/applications/radio/sigdigger/default.nix b/pkgs/applications/radio/sigdigger/default.nix
index 6e344c84d625..2d442c8c20b4 100644
--- a/pkgs/applications/radio/sigdigger/default.nix
+++ b/pkgs/applications/radio/sigdigger/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BatchDrake";
     repo = "SigDigger";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE=";
   };
 
diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix
index 6f3e82e93022..e28bbc5af47c 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/applications/radio/welle-io/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AlbrechtL";
     repo = "welle.io";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sSknzZiD9/MLyO+gAYopogOQu5HRcqaRcfqwq4Rld7A=";
   };
 
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index 43b7b27ce71e..6b094483f68b 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CelestiaProject";
     repo = "Celestia";
-    rev = version;
+    tag = version;
     sha256 = "sha256-MkElGo1ZR0ImW/526QlDE1ePd+VOQxwkX7l+0WyZ6Vs=";
   };
 
diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix
index 7f0e0836d9ca..424484ab214d 100644
--- a/pkgs/applications/science/astronomy/gpredict/default.nix
+++ b/pkgs/applications/science/astronomy/gpredict/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "csete";
     repo = "gpredict";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+hgjImfT3nWMBYwde7+KC/hzd84pwQbpoJvaJSNG4E8=";
   };
 
diff --git a/pkgs/applications/science/biology/hh-suite/default.nix b/pkgs/applications/science/biology/hh-suite/default.nix
index 51f12d9ae6ea..80409df0a198 100644
--- a/pkgs/applications/science/biology/hh-suite/default.nix
+++ b/pkgs/applications/science/biology/hh-suite/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "soedinglab";
     repo = "hh-suite";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kjNqJddioCZoh/cZL3YNplweIGopWIGzCYQOnKDqZmw=";
   };
 
diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index 9ba81327710d..60689e5b777a 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "kallisto";
     owner = "pachterlab";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hfdeztEyHvuOnLS71oSv8sPqFe2UCX5KlANqrT/Gfx8=";
   };
 
diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix
index 3026ac9ce885..88e99cd123d1 100644
--- a/pkgs/applications/science/biology/nest/default.nix
+++ b/pkgs/applications/science/biology/nest/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nest";
     repo = "nest-simulator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hysOe1ZZpCClVOGo0+UeCP7imAakXrZlnJ4V95zfiyA=";
   };
 
diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix
index 51fd73ea2493..e715dfef0515 100644
--- a/pkgs/applications/science/biology/truvari/default.nix
+++ b/pkgs/applications/science/biology/truvari/default.nix
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ACEnglish";
     repo = "truvari";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SFBVatcVavBfQtFbBcXifBX3YnKsxJS669vCcyjsBA4=";
   };
 
diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix
index 601e8053b6b6..d8d3db81398a 100644
--- a/pkgs/applications/science/chemistry/avogadro2/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro2/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadroapp";
-    rev = version;
+    tag = version;
     hash = "sha256-NSozi6oElNTIFTdRW32ZcNm8Ae311xk6kN1wtrEqjaU=";
   };
 
diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix
index 627773ef7b9a..02c0da8e6499 100644
--- a/pkgs/applications/science/computer-architecture/timeloop/default.nix
+++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NVlabs";
     repo = "timeloop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CGPhrBNzFdERAA/Eym2v0+FvFUe+VkBLnwYEqEMHE9k=";
   };
 
diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index b99c2201ec09..40d4a1f6acd2 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Caneda";
     repo = "Caneda";
-    rev = version;
+    tag = version;
     sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
   };
 
diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
index 1f42d5ae2a62..078c35d32a44 100644
--- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
+++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emsec";
     repo = "hal";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8kmYeqsmqR7tY044rZb3KuEAVGv37IObX6k1qjXWG0A=";
   };
 
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index ef645d36b079..b2a0bf33e1e0 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-/Hw7ZTv2CbDcKuyI27wC46IxCcTnrXDS/Mf7csUTc7w=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix
index f251bd34c54b..a8c6e746446e 100644
--- a/pkgs/applications/science/electronics/openems/default.nix
+++ b/pkgs/applications/science/electronics/openems/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "openEMS";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wdH+Zw7G2ZigzBMX8p3GKdFVx/AhbTNL+P3w+YjI/dc=";
   };
 
diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix
index 9aab0615d9fc..b1c4476d4963 100644
--- a/pkgs/applications/science/electronics/openhantek6022/default.nix
+++ b/pkgs/applications/science/electronics/openhantek6022/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenHantek";
     repo = "OpenHantek6022";
-    rev = version;
+    tag = version;
     sha256 = "sha256-FT+DyfD5WHBblRXWXFnyB2xwoIgoh84oB+QN32wx78c=";
   };
 
diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix
index aa41e3185c03..ab1880ffb8c1 100644
--- a/pkgs/applications/science/electronics/qucs-s/default.nix
+++ b/pkgs/applications/science/electronics/qucs-s/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ra3xdh";
     repo = "qucs_s";
-    rev = version;
+    tag = version;
     hash = "sha256-H/iLCCX1fMozs/G8erX7cia7wRLjvLxofuiu6pGVJ58=";
   };
 
diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix
index 2e15890aa30c..1781d29705d5 100644
--- a/pkgs/applications/science/logic/cedille/default.nix
+++ b/pkgs/applications/science/logic/cedille/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cedille";
     repo = "cedille";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1j745q9sd32fhcb96wjq6xvyqq1k6imppjnya6x0n99fyfnqzvg9";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix
index fd618fec2026..36e5a5b1b44d 100644
--- a/pkgs/applications/science/logic/klee/default.nix
+++ b/pkgs/applications/science/logic/klee/default.nix
@@ -65,7 +65,7 @@ llvmPackages.stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "klee";
     repo = "klee";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5js1N8qVF0lCkahSU3ojT7+p/a9IaUpPWhIyFHEzqto=";
   };
 
diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix
index 33521fc0248d..7286dc862d15 100644
--- a/pkgs/applications/science/logic/potassco/clingcon.nix
+++ b/pkgs/applications/science/logic/potassco/clingcon.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "potassco";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-R2kgcw8VUwhOdvPXnsahT5gnoUd5DXLqfdH++8rFoAA=";
   };
 
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index bc799bf8ba04..c4a830a17f3b 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "potassco";
     repo = "clingo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VhfWGAcrq4aN5Tgz84v7vLOWexsA89vRaang58SXVyI=";
   };
 
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 2dac1f012c9e..fa67a1a6d093 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -17,7 +17,7 @@ let
   src = fetchFromGitHub {
     owner = "tamarin-prover";
     repo = "tamarin-prover";
-    rev = version;
+    tag = version;
     hash = "sha256-v1BruU2p/Sg/g7b9a+QRza46bD7PkMtsGq82qFaNhpI=";
   };
 
diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
index ec1e20a91329..1894b8a215e6 100644
--- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
+++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "finalfusion";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE=";
   };
 
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index 4b9bd9e6fdcc..01ba5aabe395 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BVLC";
     repo = "caffe";
-    rev = version;
+    tag = version;
     sha256 = "104jp3cm823i3cdph7hgsnj6l77ygbwsy35mdmzhmsi4jxprd9j3";
   };
 
diff --git a/pkgs/applications/science/math/engauge-digitizer/default.nix b/pkgs/applications/science/math/engauge-digitizer/default.nix
index f2f87a42ab8a..3c1bfe5a7ae6 100644
--- a/pkgs/applications/science/math/engauge-digitizer/default.nix
+++ b/pkgs/applications/science/math/engauge-digitizer/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "markummitchell";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Wj9o3wWbtHsEi6LFH4xDpwVR9BwcWc472jJ/QFDQZvY=";
   };
 
diff --git a/pkgs/applications/science/math/mpsolve/default.nix b/pkgs/applications/science/math/mpsolve/default.nix
index b5b0b2c9823a..7895352f37e2 100644
--- a/pkgs/applications/science/math/mpsolve/default.nix
+++ b/pkgs/applications/science/math/mpsolve/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "robol";
     repo = "MPSolve";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-7lYwInodKj02G76xqhp/6e9MCzPY80gsAW3vTMNsfdA=";
   };
 
diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix
index 26744a19f86f..1c80ba995e7b 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/applications/science/math/yacas/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grzegorzmazur";
     repo = "yacas";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0dqgqvsb6ggr8jb3ngf0jwfkn6xwj2knhmvqyzx3amc74yd3ckqx";
   };
 
diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix
index 6566d38b4ef7..4b79533bd77b 100644
--- a/pkgs/applications/science/misc/colmap/default.nix
+++ b/pkgs/applications/science/misc/colmap/default.nix
@@ -39,7 +39,7 @@ stdenv'.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "colmap";
     repo = "colmap";
-    rev = version;
+    tag = version;
     hash = "sha256-Xb4JOttCMERwPYs5DyGKHw+f9Wik1/rdJQKbgVuygH8=";
   };
 
diff --git a/pkgs/applications/science/misc/convertall/default.nix b/pkgs/applications/science/misc/convertall/default.nix
index 703bb5b3221e..29b3268ca8af 100644
--- a/pkgs/applications/science/misc/convertall/default.nix
+++ b/pkgs/applications/science/misc/convertall/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "doug-101";
     repo = "ConvertAll";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "02xxasgbjbivsbhyfpn3cpv52lscdx5kc95s6ns1dvnmdg0fpng0";
   };
 
diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix
index 24de920d1ddc..5f935bafd4ad 100644
--- a/pkgs/applications/science/misc/foldingathome/client.nix
+++ b/pkgs/applications/science/misc/foldingathome/client.nix
@@ -30,7 +30,7 @@ let
     src = fetchFromGitHub {
       owner = "FoldingAtHome";
       repo = "fah-client-bastet";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-lqpC1fAMFb8iX02daVre/pE0c7DkwswlFigJS3ZGEjM=";
     };
 
diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix
index fcfd76ab24a9..0c90fab73f7f 100644
--- a/pkgs/applications/science/misc/graphia/default.nix
+++ b/pkgs/applications/science/misc/graphia/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "graphia-app";
     repo = "graphia";
-    rev = version;
+    tag = version;
     sha256 = "sha256-tS5oqpwpqvWGu67s8OuA4uQR3Zb5VzHTY/GnfVQki6k=";
   };
 
diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
index caacdd108819..9c20227a3a42 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openmvg";
     repo = "openmvg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vG+tW9Gl/DAUL8DeY+rJVDJH/oMPH3XyZMUgzjtwFv0=";
   };
 
diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index 4ee25e9739e2..85805dd5b277 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cdcseacave";
     repo = "openmvs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix
index b934320025a5..fa884b06e4fe 100644
--- a/pkgs/applications/science/misc/openrefine/default.nix
+++ b/pkgs/applications/science/misc/openrefine/default.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "openrefine";
     repo = "openrefine";
-    rev = version;
+    tag = version;
     hash = "sha256-Z52YfS+caNe7N3xMv85eoBes6TwkSsGk5/rGaQd/6ds=";
   };
 
diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index dfa7fbf8daf4..e9380c9f2f77 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tiffany352";
     repo = "rink-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2+ZkyWhEnnO/QgCzWscbMr0u5kwdv2HqPLjtiXDfv/o=";
   };
 
diff --git a/pkgs/applications/science/molecular-dynamics/raspa/default.nix b/pkgs/applications/science/molecular-dynamics/raspa/default.nix
index 088bc1ef4840..bfc7bba1d2f8 100644
--- a/pkgs/applications/science/molecular-dynamics/raspa/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/raspa/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iRASPA";
     repo = "RASPA2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-i8Y+pejiOuyPNJto+/0CmRoAnMljCrnDFx8qDh4I/68=";
   };
 
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
index e606edb0fe0e..76a265930e43 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/pkgs/applications/science/robotics/apmplanner2/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ArduPilot";
     repo = "apm_planner";
-    rev = version;
+    tag = version;
     sha256 = "0wvbfjnnf7sh6fpgw8gimh5hgzywj3nwrgr80r782f5gayd3v2l1";
   };
 
diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
index 226d83b6beda..2e3ad9c5829c 100644
--- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix
+++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "robokoding";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "07snhwmqqp52vdgr66vx50zxx0nmpmns5cdjgh50hzlhji2z1fl9";
   };
 
diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix
index 635aa584371d..323f4eb56aa9 100644
--- a/pkgs/applications/system/monitor/default.nix
+++ b/pkgs/applications/system/monitor/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stsdc";
     repo = "monitor";
-    rev = version;
+    tag = version;
     hash = "sha256-Kk3L4hfHon0B6Y6vU7en1UFpg221+EiVCxMX9mvu7pU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix
index 972f688d9596..8a2e47e8713b 100644
--- a/pkgs/applications/system/qjournalctl/default.nix
+++ b/pkgs/applications/system/qjournalctl/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pentix";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-anNNzqjbIaQI+MAwwMwzy6v4SKqi4u9F5IbFBErm4q8=";
   };
 
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
index 192b98d32a49..98580f6ef69f 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Vifon";
     repo = "autocomplete-ALL-the-things";
-    rev = version;
+    tag = version;
     sha256 = "06xd59c6gd9rglwq4km93n2p078k7v4x300lqrg1f32vvnjvs7sr";
   };
 
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
index 9a32da5427e7..45fcc450ddd0 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "majutsushi";
     repo = "urxvt-font-size";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1526ap161cp3378f4ijd09nmsh71ld7bkxxhp8p6razdi2v8r16h";
   };
 
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
index 1055f7ba19c8..4a5d71b2c816 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "muennich";
     repo = "urxvt-perls";
-    rev = version;
+    tag = version;
     sha256 = "0xvwfw7965ghhd9g6rl6y6fgpd444l46rjqmlgg0rfjypbh6c0p1";
   };
 
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
index 0c9eec816abb..8707a6b69282 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mina86";
     repo = "urxvt-tabbedex";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "06msd156h6r8ss7qg66sjz5jz8613qfq2yvp0pc24i6mxzj8vl77";
   };
 
diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix
index 904f939c6b8e..7b62de5e49ed 100644
--- a/pkgs/applications/terminal-emulators/st/xst.nix
+++ b/pkgs/applications/terminal-emulators/st/xst.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gnotclub";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-2pXR9U2tTBd0lyeQ3BjnXW+Ne9aUQg/+rnpmYPPG06A=";
   };
 
diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix
index 9e03345a63a9..3186a67e135a 100644
--- a/pkgs/applications/terminal-emulators/termite/default.nix
+++ b/pkgs/applications/terminal-emulators/termite/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thestinger";
     repo = "termite";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0hp1x6lj098m3jgna274wv5dv60lnzg22297di68g4hw9djjyd2k";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix
index 80f4858aa5f4..a4fb9166bf3b 100644
--- a/pkgs/applications/version-management/blackbox/default.nix
+++ b/pkgs/applications/version-management/blackbox/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stackexchange";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g0oNV7Nj7ZMmsVQFVTDwbKtF4a/Fb3WDB+NRx9IGSWA=";
   };
 
diff --git a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
index 08f8e17eae1f..ab4679dfb7c6 100644
--- a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
+++ b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "alpernebbi";
     repo = "git-annex-metadata-gui";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "03kch67k0q9lcs817906g864wwabkn208aiqvbiyqp1qbg99skam";
   };
 
diff --git a/pkgs/applications/version-management/git-archive-all/default.nix b/pkgs/applications/version-management/git-archive-all/default.nix
index d43c2359e377..3e1a0bdf1d6e 100644
--- a/pkgs/applications/version-management/git-archive-all/default.nix
+++ b/pkgs/applications/version-management/git-archive-all/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Kentzo";
     repo = "git-archive-all";
-    rev = version;
+    tag = version;
     hash = "sha256-fIPjggOx+CEorj1bazz8s81ZdppkTL0OlA5tRqCYZyc=";
   };
 
diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix
index 00d840c7f064..1afa23257f95 100644
--- a/pkgs/applications/version-management/git-credential-manager/default.nix
+++ b/pkgs/applications/version-management/git-credential-manager/default.nix
@@ -20,7 +20,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "git-ecosystem";
     repo = "git-credential-manager";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fzcGAcKOAEnBiAEYYyxKJ71xnixb5cz7FzR28/cKIFg=";
   };
 
diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix
index 3ec812bc8219..1c0ee9407cd0 100644
--- a/pkgs/applications/version-management/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-machete/default.nix
@@ -16,7 +16,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "virtuslab";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2Or4L3wrvqW7bvrJcgvK7rGqjqiob6k8CZc/XauguLo=";
   };
 
diff --git a/pkgs/applications/version-management/git-publish/default.nix b/pkgs/applications/version-management/git-publish/default.nix
index 6596fbeddf3e..aae2f147f671 100644
--- a/pkgs/applications/version-management/git-publish/default.nix
+++ b/pkgs/applications/version-management/git-publish/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stefanha";
     repo = "git-publish";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jjpbr+ZqG4U8/z0PurnXR+IUKQkG3QB8YqhDkH8uu2Y=";
   };
 
diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix
index 8c4f1c79b585..13bb8cf0eac7 100644
--- a/pkgs/applications/version-management/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-recent/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-recent";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KPM24DVwvLdHeOkq77fz1TJ6NxJ2h21bP0TrItCPamo=";
   };
 
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index ac6d7879e2bf..cf1b2e0e81b7 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
     domain = "opendev.org";
     owner = "opendev";
     repo = "git-review";
-    rev = version;
+    tag = version;
     hash = "sha256-UfYc662NqnQt0+CKc+18jXnNTOcZv8urCNBsWd6x0VQ=";
   };
 
diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix
index 5107fef5426f..13a2e1abbf48 100644
--- a/pkgs/applications/version-management/git-stack/default.nix
+++ b/pkgs/applications/version-management/git-stack/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gitext-rs";
     repo = "git-stack";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iFoxYq4NHC/K0ruPDXHfayZDglebBJE00V57HUH9Y84=";
   };
 
diff --git a/pkgs/applications/version-management/gita/default.nix b/pkgs/applications/version-management/gita/default.nix
index 433ebcb1a384..0ef871f63321 100644
--- a/pkgs/applications/version-management/gita/default.nix
+++ b/pkgs/applications/version-management/gita/default.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     sha256 = "sha256-kPyk13yd4rc63Nh73opuHsCTj4DgYAVfro8To96tteA=";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "gita";
     owner = "nosarthur";
   };
diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix
index f396dfeed177..038d8cef0102 100644
--- a/pkgs/applications/version-management/gitqlient/default.nix
+++ b/pkgs/applications/version-management/gitqlient/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "francescmm";
     repo = "gitqlient";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-gfWky5KTSj+5FC++QIVTJbrDOYi/dirTzs6LvTnO74A=";
   };
diff --git a/pkgs/applications/version-management/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix
index 3b5c389e70ed..5464ac733d0d 100644
--- a/pkgs/applications/version-management/lucky-commit/default.nix
+++ b/pkgs/applications/version-management/lucky-commit/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "not-an-aardvark";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-57eOhlOkRU1sz0y/sfEyEFXQJx165qehBTP8iWiEGx8=";
   };
 
diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix
index 06725dae6884..261b146be5bb 100644
--- a/pkgs/applications/version-management/nitpick/default.nix
+++ b/pkgs/applications/version-management/nitpick/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "travisb-ca";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "11gn6nc6ypwivy20bx1r0rm2giblwx6jv485zk875a9pdbcwbrf6";
   };
 
diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix
index 535abf792679..94ec67513972 100644
--- a/pkgs/applications/version-management/sapling/default.nix
+++ b/pkgs/applications/version-management/sapling/default.nix
@@ -47,7 +47,7 @@ let
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "sapling";
-    rev = version;
+    tag = version;
     hash = "sha256-4pOpJ91esTSH90MvvMu74CnlLULLUawqxcniUeqnLwA=";
   };
 
diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/applications/version-management/silver-platter/default.nix
index 8c585b7e6f8e..c7e2f789def2 100644
--- a/pkgs/applications/version-management/silver-platter/default.nix
+++ b/pkgs/applications/version-management/silver-platter/default.nix
@@ -26,7 +26,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jelmer";
     repo = "silver-platter";
-    rev = version;
+    tag = version;
     hash = "sha256-k+C4jrC4FO/yy9Eb6x4lv1zyyp/eGkpMcDqZ0KoxfBs=";
   };
 
diff --git a/pkgs/applications/version-management/svn-all-fast-export/default.nix b/pkgs/applications/version-management/svn-all-fast-export/default.nix
index 6b2628f3a4f1..fc1368558aab 100644
--- a/pkgs/applications/version-management/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/svn-all-fast-export/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "svn-all-fast-export";
     repo = "svn2git";
-    rev = version;
+    tag = version;
     sha256 = "1b5yx2316hbyvw3v30vn1ljma9yd21nd59wis1gi34g92lgvqcd6";
   };
 
diff --git a/pkgs/applications/version-management/svn2git/default.nix b/pkgs/applications/version-management/svn2git/default.nix
index c839b01239c0..5e28c13261fa 100644
--- a/pkgs/applications/version-management/svn2git/default.nix
+++ b/pkgs/applications/version-management/svn2git/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nirvdrum";
     repo = "svn2git";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-w649l/WO68vYYxZOBKzI8XhGFkaSwWx/O3oVOtnGg6w=";
   };
 
diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix
index 4b7f152ab5c3..bbe1c80b6d4c 100644
--- a/pkgs/applications/video/anilibria-winmaclinux/default.nix
+++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix
@@ -26,7 +26,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "anilibria";
     repo = "anilibria-winmaclinux";
-    rev = version;
+    tag = version;
     hash = "sha256-F+5R1nSmZuHKUe9bAEVwOru07SVs8tIQlbDC6Ip+zy4=";
   };
 
diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix
index 94c4b9342fcd..afad04b64ec7 100644
--- a/pkgs/applications/video/haruna/default.nix
+++ b/pkgs/applications/video/haruna/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "multimedia";
     repo = "haruna";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EoB8qoCiB6jvHqfhkGHhiq9/79MBLt6GguvRIwY90B0=";
     domain = "invent.kde.org";
   };
diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix
index f803f0f694de..531d21843e03 100644
--- a/pkgs/applications/video/hyperion-ng/default.nix
+++ b/pkgs/applications/video/hyperion-ng/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hyperion-project";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-nQPtJw9DOKMPGI5trxZxpP+z2PYsbRKqOQEyaGzvmmA=";
     # needed for `dependencies/external/`:
     # * rpi_ws281x` - not possible to use as a "system" lib
diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix
index cf660186976d..2ac02f35b213 100644
--- a/pkgs/applications/video/jellyfin-media-player/default.nix
+++ b/pkgs/applications/video/jellyfin-media-player/default.nix
@@ -33,7 +33,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-media-player";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-IXinyenadnW+a+anQ9e61h+N8vG2r77JPboHm5dN4Iw=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/archive_tool/default.nix b/pkgs/applications/video/kodi/addons/archive_tool/default.nix
index 0b90ee1cd5a3..376f1b54f9dd 100644
--- a/pkgs/applications/video/kodi/addons/archive_tool/default.nix
+++ b/pkgs/applications/video/kodi/addons/archive_tool/default.nix
@@ -12,7 +12,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "zach-morris";
     repo = "script.module.archive_tool";
-    rev = version;
+    tag = version;
     sha256 = "0hbkyk59xxfjv6vzfjplahmqxi5564qjlwyq6k8ijy6jjcwnd3p7";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
index 33ab01e94c6b..2172bb738f0e 100644
--- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
+++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
@@ -13,7 +13,7 @@ let
     src = fetchFromGitHub {
       owner = "kodi-game";
       repo = "controller-topology-project";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-pbYFNCDhKhYKREffWbMbcd9xBL4ZiKWR7hMZUCTUHRg=";
     };
 
diff --git a/pkgs/applications/video/kodi/addons/iagl/default.nix b/pkgs/applications/video/kodi/addons/iagl/default.nix
index ae8ff5dc19aa..0f79ff392325 100644
--- a/pkgs/applications/video/kodi/addons/iagl/default.nix
+++ b/pkgs/applications/video/kodi/addons/iagl/default.nix
@@ -19,7 +19,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "zach-morris";
     repo = "plugin.program.iagl";
-    rev = version;
+    tag = version;
     sha256 = "sha256-b8nO3D/xTnj/5UDshGlIJdiHd75VhIlkrGUi0vkZqG4=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/infotagger/default.nix b/pkgs/applications/video/kodi/addons/infotagger/default.nix
index 40b0399ca3b2..4d823984b4b1 100644
--- a/pkgs/applications/video/kodi/addons/infotagger/default.nix
+++ b/pkgs/applications/video/kodi/addons/infotagger/default.nix
@@ -12,7 +12,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "jurialmunkey";
     repo = namespace;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ns1OjrYLKz4znXRxqUErDLcmC0HBjBFVYI9GFqDVurY=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix
index 221c450be543..556a42e56bf7 100644
--- a/pkgs/applications/video/kodi/addons/jellycon/default.nix
+++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix
@@ -22,7 +22,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dCPbPuUtiMhcECd3Aebs3ZGIM6jn6mmCd0rXS+1TQLs=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
index 037612982d34..a0ffecf8d837 100644
--- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix
+++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
@@ -22,7 +22,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-kodi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7PgE1KrKmSBWzzi6tZp1Pou/82P1mPX8iE/IQlBi1Cc=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix
index f40dc45da27e..a6115bc4b66b 100644
--- a/pkgs/applications/video/kodi/addons/netflix/default.nix
+++ b/pkgs/applications/video/kodi/addons/netflix/default.nix
@@ -17,7 +17,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "CastagnaIT";
     repo = namespace;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tve7E7dK60BIHETdwt9hD3/5eEdJB6c6rhw4oDoLAKM=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/orftvthek/default.nix b/pkgs/applications/video/kodi/addons/orftvthek/default.nix
index f1e202f7ced0..a77065d51bfc 100644
--- a/pkgs/applications/video/kodi/addons/orftvthek/default.nix
+++ b/pkgs/applications/video/kodi/addons/orftvthek/default.nix
@@ -15,7 +15,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "s0faking";
     repo = namespace;
-    rev = version;
+    tag = version;
     sha256 = "sha256-bCVsR7lH0REJmG3OKU8mRRvw/PhSrLfhufmVBmw05+k=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/pdfreader/default.nix b/pkgs/applications/video/kodi/addons/pdfreader/default.nix
index 49783ffef23f..6d6a9511ea7d 100644
--- a/pkgs/applications/video/kodi/addons/pdfreader/default.nix
+++ b/pkgs/applications/video/kodi/addons/pdfreader/default.nix
@@ -11,7 +11,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "i96751414";
     repo = "plugin.image.pdfreader";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-J93poR5VO9fAgNCEGftJVYnpXOsJSxnhHI6TAJZ2LeI=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
index dba58914feb1..f972c5efa4c9 100644
--- a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
+++ b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
@@ -14,7 +14,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "firsttris";
     repo = "plugin.video.sendtokodi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ga+9Q7x8+sEmQmteHbSyCahZ/T/l28BAEM84w7bf7z8=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/sponsorblock/default.nix b/pkgs/applications/video/kodi/addons/sponsorblock/default.nix
index fb9e9cdd6e6f..4fec6ec8d9c0 100644
--- a/pkgs/applications/video/kodi/addons/sponsorblock/default.nix
+++ b/pkgs/applications/video/kodi/addons/sponsorblock/default.nix
@@ -13,7 +13,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "siku2";
     repo = namespace;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IBgh2kdPgCy+HHrR7UZxTgjF1LR77ABGlUp3PgaobNM=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/steam-library/default.nix b/pkgs/applications/video/kodi/addons/steam-library/default.nix
index e4434813c37c..d7133f387fed 100644
--- a/pkgs/applications/video/kodi/addons/steam-library/default.nix
+++ b/pkgs/applications/video/kodi/addons/steam-library/default.nix
@@ -15,7 +15,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "aanderse";
     repo = namespace;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LVdFih0n/lkjyaYf8jw0IFlcDiXXOtUH2N9OduV1H9Q=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/svtplay/default.nix b/pkgs/applications/video/kodi/addons/svtplay/default.nix
index c301234682a4..2dab1babf068 100644
--- a/pkgs/applications/video/kodi/addons/svtplay/default.nix
+++ b/pkgs/applications/video/kodi/addons/svtplay/default.nix
@@ -11,7 +11,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "nilzen";
     repo = "xbmc-" + pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CZtBUqFaKtMmKcpfBQp0Mb8sVvpCTkqcpfdYe41YSJs=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix b/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix
index bb9e68130c7a..88351ce21062 100644
--- a/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix
+++ b/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix
@@ -12,7 +12,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "XBMC-Addons";
     repo = namespace;
-    rev = version;
+    tag = version;
     sha256 = "sha256-Z+rHz3wncoNvV1pwhRzJFB/X0H6wdfwg88otVh27wg8=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix
index fb4e6ebd7304..b89df984e86e 100644
--- a/pkgs/applications/video/kodi/addons/youtube/default.nix
+++ b/pkgs/applications/video/kodi/addons/youtube/default.nix
@@ -15,7 +15,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "anxdpanic";
     repo = "plugin.video.youtube";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fcr7FDTaStr9EaEaC3QG3uJQav0YuEITa62Y1kW1vlM=";
   };
 
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index 0147a07b45ec..333c02133a5e 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mapmapteam";
     repo = "mapmap";
-    rev = version;
+    tag = version;
     sha256 = "1pyb3vz19lbfz2hrfqm9a29vnajw1bigdrblbmcy32imkf4isfvm";
   };
 
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 66dc8891988e..fc4ebb22bd34 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -21,7 +21,7 @@ mkDerivation rec {
 
   src = fetchFromGitHub {
     hash = "sha256-ROqROQsV8ddrxYT5mMdkf6rCgCoGr1jpxQ1ohcoEaQs=";
-    rev = version;
+    tag = version;
     repo = "minitube";
     owner = "flaviotordini";
     fetchSubmodules = true;
diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index 7868257ffda7..5dcc0f178de3 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mpc-qt";
     repo = "mpc-qt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gn94kVs3Lbd+ggj4jTacHpmnVO2lH/QDhFk+hJC1N/c=";
   };
 
diff --git a/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix b/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix
index 02a54a2cf475..fdb1faeda2a5 100644
--- a/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix
+++ b/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Guldoman";
     repo = "mpv_inhibit_gnome";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LSGg5gAQE2JpepBqhz6D6d3NlqYaU4bjvYf1F+oLphQ=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix
index e59fce3b9cec..c02b1a3e16d6 100644
--- a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix
+++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix
@@ -13,7 +13,7 @@ buildLua (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zydezu";
     repo = "ModernX";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-tm1vsHEFX2YnQ1w3DcLd/zHASetkqQ4wYcYT9w8HVok=";
   };
 
diff --git a/pkgs/applications/video/mpv/scripts/modernx.nix b/pkgs/applications/video/mpv/scripts/modernx.nix
index 28a50e15d5d8..04621e2d2ec2 100644
--- a/pkgs/applications/video/mpv/scripts/modernx.nix
+++ b/pkgs/applications/video/mpv/scripts/modernx.nix
@@ -13,7 +13,7 @@ buildLua (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cyl0";
     repo = "ModernX";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-q7DwyfmOIM7K1L7vvCpq1EM0RVpt9E/drhAa9rLYb1k=";
   };
 
diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix
index fbb1a8f68583..71b7272828ef 100644
--- a/pkgs/applications/video/mpv/scripts/mpris.nix
+++ b/pkgs/applications/video/mpv/scripts/mpris.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hoyon";
     repo = "mpv-mpris";
-    rev = version;
+    tag = version;
     hash = "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0=";
   };
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/applications/video/mpv/scripts/mpv-discord.nix b/pkgs/applications/video/mpv/scripts/mpv-discord.nix
index 58d4940f548b..92007c960b0b 100644
--- a/pkgs/applications/video/mpv/scripts/mpv-discord.nix
+++ b/pkgs/applications/video/mpv/scripts/mpv-discord.nix
@@ -10,7 +10,7 @@ let
   src = fetchFromGitHub {
     owner = "tnychn";
     repo = "mpv-discord";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P1UaXGboOiqrXapfLzJI6IT3esNtflkQkcNXt4Umukc=";
   };
 
diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix
index a6a00283129e..2a95b323012f 100644
--- a/pkgs/applications/video/mpv/scripts/mpvacious.nix
+++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix
@@ -15,7 +15,7 @@ buildLua rec {
   src = fetchFromGitHub {
     owner = "Ajatt-Tools";
     repo = "mpvacious";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8E/EGIePK5siCchZPL81XMgspvNaRunqiLVU/J3nsmI=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/applications/video/mpv/scripts/quality-menu.nix b/pkgs/applications/video/mpv/scripts/quality-menu.nix
index 8cee576a5792..61351048a63d 100644
--- a/pkgs/applications/video/mpv/scripts/quality-menu.nix
+++ b/pkgs/applications/video/mpv/scripts/quality-menu.nix
@@ -13,7 +13,7 @@ buildLua rec {
   src = fetchFromGitHub {
     owner = "christoph-heinrich";
     repo = "mpv-quality-menu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uaU4W72P7zhHzxmfr59icCAl1mJ3ycLGzkGcYasHllI=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix
index f36bce3cb200..dd7a2bed2e58 100644
--- a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix
+++ b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix
@@ -11,7 +11,7 @@ buildLua rec {
   src = fetchFromGitHub {
     owner = "open-dynaMIX";
     repo = "simple-mpv-webui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-I8lwpo3Hfpy3UnPMmHEJCdArVQnNL245NkxsYVmnMF0=";
     sparseCheckout = [
       "main.lua"
diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix
index fc37b1a50dea..5543ab85921b 100644
--- a/pkgs/applications/video/mpv/scripts/thumbnail.nix
+++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix
@@ -13,7 +13,7 @@ buildLua rec {
   src = fetchFromGitHub {
     owner = "marzzzello";
     repo = "mpv_thumbnail_script";
-    rev = version;
+    tag = version;
     sha256 = "sha256-nflavx25skLj9kitneL6Uz3zI2DyMMhQC595npofzbQ=";
   };
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix
index 2838dd5e4942..b74812ed73ce 100644
--- a/pkgs/applications/video/mpv/scripts/uosc.nix
+++ b/pkgs/applications/video/mpv/scripts/uosc.nix
@@ -15,7 +15,7 @@ buildLua (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tomasklaen";
     repo = "uosc";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-UbSEJGlLSX5wZpfj+Cb3LfWw17pnjxIJUNtP8dclKoU=";
   };
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/applications/video/mpv/scripts/vr-reversal.nix b/pkgs/applications/video/mpv/scripts/vr-reversal.nix
index 6fb91e9ad780..1a143e6997e1 100644
--- a/pkgs/applications/video/mpv/scripts/vr-reversal.nix
+++ b/pkgs/applications/video/mpv/scripts/vr-reversal.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dfaker";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1wn2ngcvn7wcsl3kmj782x5q9130qw951lj6ilrkafp6q6zscpqr";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix
index daa2ed947ae0..04e4cef89dfe 100644
--- a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix
+++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix
@@ -73,7 +73,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mrxdst";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qFeQBVPZZFKkxz1fhK3+ah3TPDovklhhQwtv09TiSqo=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/applications/video/mpv/scripts/youtube-upnext.nix b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix
index ecd71353d6a3..8dcc6f77f95d 100644
--- a/pkgs/applications/video/mpv/scripts/youtube-upnext.nix
+++ b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix
@@ -13,7 +13,7 @@ buildLua rec {
   src = fetchFromGitHub {
     owner = "cvzi";
     repo = "mpv-youtube-upnext";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-x9mfyc8JIlOpbSfGEwxXoUtsH0A+K3JPwT/8MHq7ks4=";
   };
 
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 98ddc17e5589..79de30006b59 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -48,7 +48,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MythTV";
     repo = "mythtv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZhVlDX5I6SJEntVg30Iy/XxgsorDjFycAt2uksJMJps=";
   };
 
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index 6d11f5aa5f7e..6cb451d3c7b1 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "NatronGitHub";
     repo = "Natron";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-dgScbfyulZPlrngqSw7xwipldoRd8uFO8VP9mlJyhQ8=";
   };
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 62e02381c134..ec2b36e7246c 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-studio";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-i1wkGlafPvfMTsQr5Ww5iwmUu+23cr0YmN10llJfohA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index 871b0921ee47..b0c68447e654 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WarmUpTill";
     repo = "SceneSwitcher";
-    rev = version;
+    tag = version;
     hash = "sha256-1U5quhfdhEBcCbEzW0uEpimYgvdbsIwaL2EdQ4cLF/M=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix
index 0a80098f5d1b..e1ed494185bc 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-3d-effect";
-    rev = version;
+    tag = version;
     sha256 = "sha256-SgxrBhuO3IaqINwjwdtn31cIcu3hXiPZyVMZJiNsO+s=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
index 408e2bb709cc..005bd8c8914e 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "occ-ai";
     repo = "obs-backgroundremoval";
-    rev = version;
+    tag = version;
     hash = "sha256-QoC9/HkwOXMoFNvcOxQkGCLLAJmsja801LKCNT9O9T0=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix
index 56236261483a..102e1a51a8da 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-command-source";
-    rev = version;
+    tag = version;
     sha256 = "sha256-yrzY4pHSupkkdRlx725oSVtQTH1Ci9zFolHN3i2Vm28=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix
index af2afe2cbdc6..e2decbd41467 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-freeze-filter";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-fVrfGqwce4oFYdWGElXMsXHO1AzQ/mhfBmZL1mPdT3I=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix
index 23a3c3e41d42..421b7665e82d 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-gradient-source";
-    rev = version;
+    tag = version;
     sha256 = "sha256-5pll84UZYOTESrid2UuC1aWlaLrWf1LpXqlV09XKLug=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix
index 6ac26bf599ab..205bc83900f8 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fzwoch";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-23LyxN1Vgol9uA7rDdfZXcmfhG4l0RfMYGbofbhObBE=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
index ee34343c275f..d93c06fc433c 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hyperion-project";
     repo = "hyperion-obs-plugin";
-    rev = version;
+    tag = version;
     sha256 = "sha256-UAfjafoZhhhHRSo+eUBLhHaCmn2GYFcYyRb9wHIp/9I=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
index 22e963b1d8e1..df8beed42be4 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LiveSplit";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3B3P1PlzIlpVqHJMKWpEnWXGgD/IaiWM1FVKn0BtRj0=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
index 9e542067069d..9435a4e73a1b 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-move-transition";
-    rev = version;
+    tag = version;
     sha256 = "sha256-BCivYK18T4b+lRo6Qf9qFwmjAyjCPZDekQVi03QBLHc=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
index b16e35f53151..87392b1ca49a 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sorayuki";
     repo = "obs-multi-rtmp";
-    rev = version;
+    tag = version;
     sha256 = "sha256-MRBQY9m6rj8HVdn58mK/Vh07FSm0EglRUaP20P3FFO4=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix
index b235ca6fb20b..2593bbbc993d 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-mute-filter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-UVYN9R7TnwD3a+KIYTXvxOQWfNUtR8cSWUoKZuNoBJc=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix
index e7b2784fff6e..169706a7afe7 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Palakis";
     repo = "obs-ndi";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ex/fZmZpFM6GTKNBQClzSf6Ns0Yts5+0PAmf5mIQCwc=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix
index f1120c7c255e..2f3cb5a40315 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "fzwoch";
     repo = "obs-nvfbc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AJ3K0O1vrixskn+/Tpg7LsgRO8N4sgDo1Y6gg3CwGVo=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
index fefdefc8eb4f..c4f1ff345f03 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dimtpap";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-nkd/AoMsEUUxQQH5CjbnPbNwAwkd1y6j2nCa1GIAFPs=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels-filter.nix
index f51d7963089a..8979fc0cf9db 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels-filter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels-filter.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wimpysworld";
     repo = "obs-rgb-levels-filter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-QREwK9nBhjCBFslXUj9bGUGPgfEns8QqlgP5e2O/0oU=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
index 6c2074bd7f7e..3ee958a190aa 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-shaderfilter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-J4g8PTPtVkKNkUTb0Ntz+HT4AaNCtqt58KfZOMS6llE=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix
index 20b0fc3d2084..e963245289af 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-source-record";
-    rev = version;
+    tag = version;
     sha256 = "sha256-wh5BVWKHelw/ry6algST4EFGmmqsKs+phmVacS77dqM=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix
index 06fa3481c0c2..331f6d07614a 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fzwoch";
     repo = "obs-teleport";
-    rev = version;
+    tag = version;
     sha256 = "sha256-mHHPlmUyR9NDdQHqw1YNgThGl/8DH/aiCE9rdZhrIK4=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
index 8a6e77b51f87..96520f18b32d 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-text-pthread";
-    rev = version;
+    tag = version;
     sha256 = "sha256-zrgxKs3jmrwQJiEgKfZz1BOVToTLauQXtFYcuFlV71o=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
index 31241c74f119..b55415cf04bf 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fzwoch";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-ykiLsHL3hoe0ibxMxp4zrqeSeQfgnJfNg7Yb5i9HDJQ=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
index 41f1b34f6daf..400f8f96a40a 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Aitum";
     repo = "obs-vertical-canvas";
-    rev = version;
+    tag = version;
     sha256 = "sha256-0XfJ8q8n2ANO0oDtLZhZjRunZ5S1EouQ6Ak/pxEQYOQ=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix
index 9a8967d67df8..a0d8c724df96 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cg2121";
     repo = "obs-vintage-filter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-K7AxvwVLe4G+75aY430lygSRB7rMtsGi17pGzdygEac=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
index a3198dba06d6..326d5ff024bd 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-websocket";
-    rev = version;
+    tag = version;
     sha256 = "sha256-cHsJxoQjwbWLxiHgIa3Es0mu62vyLCAd1wULeZqZsJM=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix
index 1c432de77d5e..eaab88ffe498 100644
--- a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
     owner = "phandasm";
     repo = "waveform";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Bg1n1yV4JzNFEXFNayNa1exsSZhmRJ0RLHDjLWmqGZE=";
   };
 
diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix
index 2c9c1d9b47fd..3436eb60a269 100644
--- a/pkgs/applications/video/pipe-viewer/default.nix
+++ b/pkgs/applications/video/pipe-viewer/default.nix
@@ -48,7 +48,7 @@ buildPerlModule rec {
   src = fetchFromGitHub {
     owner = "trizen";
     repo = "pipe-viewer";
-    rev = version;
+    tag = version;
     hash = "sha256-NVUZn02rBhOQyIfBp/BArbL2YY19TuDTwfiQH2pEWzk=";
   };
 
diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix
index 4c532f86b141..3ce474f6cc69 100644
--- a/pkgs/applications/video/qmediathekview/default.nix
+++ b/pkgs/applications/video/qmediathekview/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "adamreichold";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6";
   };
 
diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix
index 0b80ad8186b2..c80a38c0e022 100644
--- a/pkgs/applications/video/vdr/default.nix
+++ b/pkgs/applications/video/vdr/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.tvdr.de/vdr.git";
-    rev = version;
+    tag = version;
     hash = "sha256-0Metur3+fQhomf+ClY9zXijNsr5wWkaqnzjUNXjsjss=";
   };
 
diff --git a/pkgs/applications/video/vdr/epgsearch/default.nix b/pkgs/applications/video/vdr/epgsearch/default.nix
index 208ce7fb953f..dc29d45ea66b 100644
--- a/pkgs/applications/video/vdr/epgsearch/default.nix
+++ b/pkgs/applications/video/vdr/epgsearch/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     repo = "vdr-plugin-epgsearch";
     owner = "vdr-projects";
     sha256 = "sha256-hOMISobeEt/jB4/18t5ZeN+EcPHhm8Jz8Kar72KYS3E=";
-    rev = "v${version}";
+    tag = "v${version}";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
index ef35f18b2f86..025042873e5a 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -60,7 +60,7 @@ in
       repo = "vdr-plugin-femon";
       owner = "rofafor";
       sha256 = "sha256-0qBMYgNKk7N9Bj8fAoOokUo+G9gfj16N5e7dhoKRBqs=";
-      rev = "v${version}";
+      tag = "v${version}";
     };
 
     postPatch = "substituteInPlace Makefile --replace /bin/true true";
@@ -88,7 +88,7 @@ in
     src = fetchFromGitHub {
       repo = "vdr-plugin-vnsiserver";
       owner = "vdr-projects";
-      rev = version;
+      tag = version;
       sha256 = "sha256-ivHdzX90ozMXSvIc5OrKC5qHeK5W3TK8zyrN8mY3IhE=";
     };
 
@@ -148,7 +148,7 @@ in
     src = fetchFromGitHub {
       owner = "jowi24";
       repo = "vdr-fritz";
-      rev = version;
+      tag = version;
       hash = "sha256-DGD73i+ZHFgtCo+pMj5JaMovvb5vS1x20hmc5t29//o=";
       fetchSubmodules = true;
     };
diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix
index 814b4b5e971b..3f67b022a5ae 100644
--- a/pkgs/applications/video/vdr/softhddevice/default.nix
+++ b/pkgs/applications/video/vdr/softhddevice/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "ua0lnj";
     repo = "vdr-plugin-softhddevice";
     sha256 = "sha256-G5pOSlO1FU7kvHwH1yw8UBEeDwQ5aIxubdyFcWQ2Z/8=";
-    rev = "v${version}";
+    tag = "v${version}";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/video/vdr/streamdev/default.nix b/pkgs/applications/video/vdr/streamdev/default.nix
index e971ef130877..94e8cca6f133 100644
--- a/pkgs/applications/video/vdr/streamdev/default.nix
+++ b/pkgs/applications/video/vdr/streamdev/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vdr-projects";
     repo = "vdr-plugin-streamdev";
-    rev = version;
+    tag = version;
     sha256 = "sha256-fFnRDe3n/ltanRvLhrQDB6aV0UmyuEJgNUip0gKBrBA=";
   };
 
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index b691dde96aab..23dda789a856 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vkohaupt";
     repo = "vokoscreen";
-    rev = version;
+    tag = version;
     sha256 = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan";
   };
 
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index fc57f0cf270d..a92217ffb99a 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EIJT/LwxRZUYvbH0EFYSeZpGgFOywI6jpfmFO3g8cps=";
   };
   vendorHash = null;
diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 4135f7a0938a..7dd9d3f3877c 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4IToXaOEMfgEh9mXuN7nRn+8l8T6+mzVWYvfsYN4ZIM=";
   };
 
diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index 7d133751e713..5460bc218461 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "docker";
     repo = "compose";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AoYm2gRqNgXTc7ksQeSPVo+gTkxaFwhfLhue3Z8a4Wo=";
   };
 
diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix
index 8d100b93d439..754d1d4827b0 100644
--- a/pkgs/applications/virtualization/krunvm/default.nix
+++ b/pkgs/applications/virtualization/krunvm/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IXofYsOmbrjq8Zq9+a6pvBYsvZFcKzN5IvCuHaxwazI=";
   };
 
diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix
index 6365ef7d44c8..f4338b02b3ed 100644
--- a/pkgs/applications/virtualization/lima/default.nix
+++ b/pkgs/applications/virtualization/lima/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lima-vm";
     repo = "lima";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pwSLQlYPJNzvXuW6KLmQoaafQyf3o6fjVAfKe9RJ3UE=";
   };
 
diff --git a/pkgs/applications/virtualization/sail-riscv/default.nix b/pkgs/applications/virtualization/sail-riscv/default.nix
index cb288daf8598..95236369d939 100644
--- a/pkgs/applications/virtualization/sail-riscv/default.nix
+++ b/pkgs/applications/virtualization/sail-riscv/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "riscv";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Keu96+yHWUEFO3rRLvF7rzcJmF3y/V/uyK7TIFj0Xw0=";
   };
 
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 593cd4d63c78..a78769b9f174 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KtB2VspkA/vFu7I8y6M8WfAoZglxmCeb4Z3OzdsGuvk=";
   };
 
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index c05dbb1444c3..233d18de0758 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -28,7 +28,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "F1ash";
     repo = "qt-virt-manager";
-    rev = version;
+    tag = version;
     hash = "sha256-1aXlGlK+YPOe2X51xycWvSu8YC9uCywyL6ItiScFA04=";
   };
 
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index 4ed3054a42e7..5fdb138c7e54 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "venam";
     repo = "2bwm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xwib612ahv4rg9yl5injck89dlpyp5475xqgag0ydfd0r4sfld7";
   };
 
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 2e60bcf41e68..df5b49ffd729 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awesomewm";
     repo = "awesome";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1i7ajmgbsax4lzpgnmkyv35x8vxqi0j84a14k6zys4blx94m9yjf";
   };
 
diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix
index 93aa7f55d087..97c2fc66319a 100644
--- a/pkgs/applications/window-managers/cagebreak/default.nix
+++ b/pkgs/applications/window-managers/cagebreak/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "project-repo";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-GAANZIEUtuONPBpk0E3fErgOZtm3wB+gWJNwfO6VOTo=";
   };
 
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 3019ab156fb1..16ae17aa6c4f 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Gerschtli";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-OFwI4evwbXLO4ufjrh5SZia79bwbAKVoSm/IPCDku68=";
   };
 
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
index 38bcd12a7ffa..02db511f6511 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
@@ -14,7 +14,7 @@ mkHyprlandPlugin hyprland rec {
   src = fetchFromGitHub {
     owner = "DreamMaoMao";
     repo = "hycov";
-    rev = version;
+    tag = version;
     hash = "sha256-NRnxbkuiq1rQ+uauo7D+CEe73iGqxsWxTQa+1SEPnXQ=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix
index 7e789586cda9..c0332e9d97bf 100644
--- a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix
+++ b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix
@@ -26,7 +26,7 @@ python.pkgs.buildPythonPackage {
   src = fetchFromGitHub {
     owner = "tobi-wan-kenobi";
     repo = "bumblebee-status";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+RCg2XZv0AJnexi7vnQhEXB1qSoKBN1yKWm3etdys1s=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
index 325e47c1b0d5..daef4df091e3 100644
--- a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
+++ b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "333fred";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3";
   };
 
diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
index 753cb3b4eb9e..7d5fd1f69c39 100644
--- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix
+++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "i3ipc-glib";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "01fzvrbnzcwx0vxw29igfpza9zwzp2s7msmzb92v01z0rz0y5m0p";
   };
 
diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix
index 68471ad4bc0d..4da56cb8d10d 100644
--- a/pkgs/applications/window-managers/i3/lock-blur.nix
+++ b/pkgs/applications/window-managers/i3/lock-blur.nix
@@ -14,7 +14,7 @@ i3lock-color.overrideAttrs (oldAttrs: rec {
   src = fetchFromGitHub {
     owner = "karulont";
     repo = "i3lock-blur";
-    rev = version;
+    tag = version;
     sha256 = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index cea706f8e84f..fef12c476827 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PandorasFox";
     repo = "i3lock-color";
-    rev = version;
+    tag = version;
     sha256 = "sha256-fuLeglRif2bruyQRqiL3nm3q6qxoHcPdVdL+QjGBR/k=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 7eb1bfe94713..a7e5065a3b7b 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "i3";
     repo = "i3lock";
-    rev = version;
+    tag = version;
     sha256 = "sha256-OyV6GSLnNV3GUqrfs3OBnIaBvicH2PXgeY4acOk5dR4=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix
index c0e04baeda08..bb8585772975 100644
--- a/pkgs/applications/window-managers/i3/wmfocus.nix
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-94MgE2j8HaS8IyzHEDtoqTls2A8xD96v2iAFx9XfMcw=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix
index dd2efb0a022c..9bcae9649c69 100644
--- a/pkgs/applications/window-managers/i3/wsr.nix
+++ b/pkgs/applications/window-managers/i3/wsr.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "roosta";
     repo = "i3wsr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RTJ+up3mt6KuMkTBCXDUmztxwEQCeyAjuhhOUrdIfTo=";
   };
 
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index a307f359dd94..8c68d0d5e82d 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-odGqHdm8xnjEcXmpKMy51HEhbjcROLL3hRSdlbmTr2g=";
   };
 
diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix
index f157eee58114..e28e268e1fc3 100644
--- a/pkgs/applications/window-managers/lemonbar/default.nix
+++ b/pkgs/applications/window-managers/lemonbar/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LemonBoy";
     repo = "bar";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OLhgu0kmMZhjv/VST8AXvIH+ysMq72m4TEOypdnatlU=";
   };
 
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index be926cdc5a82..49e1f3b2b853 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "stumpwm";
     repo = "stumpwm";
-    rev = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-Ba2HcAmNcZvnqU0jpLTxsBe8L+4aHbO/oM4Bp/IYEC0=";
   };
 
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index d2c123ebc55c..9d553dd8993f 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://git.suckless.org/tabbed";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-KpMWBnnoF4AGRKrG30NQsVt0CFfJXVdlXLLag0Dq0sU=";
   };
 
diff --git a/pkgs/applications/window-managers/wayfire/firedecor.nix b/pkgs/applications/window-managers/wayfire/firedecor.nix
index 573a78abb0bc..285a041b3a70 100644
--- a/pkgs/applications/window-managers/wayfire/firedecor.nix
+++ b/pkgs/applications/window-managers/wayfire/firedecor.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mntmn";
     repo = "Firedecor";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-7or8HkmIZnLpXEZzUhJ3u8SIPfIQFgn32Ju/5OzK06Y=";
   };
 
diff --git a/pkgs/build-support/dlang/builddubpackage/default.nix b/pkgs/build-support/dlang/builddubpackage/default.nix
index 31454d5cd69b..a835784c2ed0 100644
--- a/pkgs/build-support/dlang/builddubpackage/default.nix
+++ b/pkgs/build-support/dlang/builddubpackage/default.nix
@@ -55,7 +55,7 @@ let
       inherit pname version;
       src = fetchgit {
         url = repository;
-        rev = version;
+        tag = version;
         inherit sha256;
       };
     };
diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix
index e3f89bacf54c..44e7592823dc 100644
--- a/pkgs/build-support/mitm-cache/default.nix
+++ b/pkgs/build-support/mitm-cache/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chayleaf";
     repo = "mitm-cache";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eY8mgmQB8wXQ7YJbLvdjXEEgGD+/RDywjvehJYf7ckE=";
   };
 
diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix
index 197a12a90747..59ba4349191d 100644
--- a/pkgs/by-name/_1/_1fps/package.nix
+++ b/pkgs/by-name/_1/_1fps/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "1fpsvideo";
     repo = "1fps";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3uPGFxEWmKQxQWPmotZI29GykUGQDjtDjFPps4QMs0M=";
   };
 
diff --git a/pkgs/by-name/_2/_20kly/package.nix b/pkgs/by-name/_2/_20kly/package.nix
index e860a01fe15d..56cbe0f02fb9 100644
--- a/pkgs/by-name/_2/_20kly/package.nix
+++ b/pkgs/by-name/_2/_20kly/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "20kly";
     repo = "20kly";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1zxsxg49a02k7zidx3kgk2maa0vv0n1f9wrl5vch07sq3ghvpphx";
   };
 
diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix
index dc3fc2e45384..2f6fa4b5a7df 100644
--- a/pkgs/by-name/_2/_2ship2harkinian/package.nix
+++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix
@@ -74,7 +74,7 @@ let
     src = fetchFromGitHub {
       owner = "ladislav-zezula";
       repo = "StormLib";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc=";
     };
     nativeBuildInputs = prev.nativeBuildInputs ++ [ pkg-config ];
diff --git a/pkgs/by-name/_3/_3mux/package.nix b/pkgs/by-name/_3/_3mux/package.nix
index f56a328ce644..57c247a4e172 100644
--- a/pkgs/by-name/_3/_3mux/package.nix
+++ b/pkgs/by-name/_3/_3mux/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aaronjanse";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QT4QXTlJf2NfTqXE4GF759EoW6Ri12lxDyodyEFc+ag=";
   };
 
diff --git a/pkgs/by-name/_3/_3proxy/package.nix b/pkgs/by-name/_3/_3proxy/package.nix
index c85a8cb392c2..2403efe6b346 100644
--- a/pkgs/by-name/_3/_3proxy/package.nix
+++ b/pkgs/by-name/_3/_3proxy/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "3proxy";
     repo = "3proxy";
-    rev = version;
+    tag = version;
     sha256 = "sha256-uy6flZ1a7o02pr5O0pgl9zCjh8mE9W5JxotJeBMB16A=";
   };
 
diff --git a/pkgs/by-name/_6/_6tunnel/package.nix b/pkgs/by-name/_6/_6tunnel/package.nix
index b0f025ea297c..d5eea8e44ece 100644
--- a/pkgs/by-name/_6/_6tunnel/package.nix
+++ b/pkgs/by-name/_6/_6tunnel/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wojtekka";
     repo = "6tunnel";
-    rev = version;
+    tag = version;
     sha256 = "0zsx9d6xz5w8zvrqsm8r625gpbqqhjzvjdzc3z8yix668yg8ff8h";
   };
 
diff --git a/pkgs/by-name/_7/_7z2hashcat/package.nix b/pkgs/by-name/_7/_7z2hashcat/package.nix
index 7e9bfd670850..64627fe036f1 100644
--- a/pkgs/by-name/_7/_7z2hashcat/package.nix
+++ b/pkgs/by-name/_7/_7z2hashcat/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "philsmd";
     repo = "7z2hashcat";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-BmpO2VLcuUtQaN4qmLm0YQEfK5iE+2hw4k6uBbwcFS4=";
   };
 
diff --git a/pkgs/by-name/_9/_9pfs/package.nix b/pkgs/by-name/_9/_9pfs/package.nix
index 7305505aecb2..9d31973a4a52 100644
--- a/pkgs/by-name/_9/_9pfs/package.nix
+++ b/pkgs/by-name/_9/_9pfs/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ftrvxmtrx";
     repo = "9pfs";
-    rev = version;
+    tag = version;
     sha256 = "sha256-nlJ4Zh13T78r0Dn3Ky/XLhipeMbMFbn0qGCJnUCBd3Y=";
   };
 
diff --git a/pkgs/by-name/aa/aaa/package.nix b/pkgs/by-name/aa/aaa/package.nix
index 6a763316eca7..ae0977521040 100644
--- a/pkgs/by-name/aa/aaa/package.nix
+++ b/pkgs/by-name/aa/aaa/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DomesticMoth";
     repo = "aaa";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix
index 6ac9ace5603f..024ee5066fa1 100644
--- a/pkgs/by-name/aa/aaaaxy/package.nix
+++ b/pkgs/by-name/aa/aaaaxy/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "divVerent";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0geit1ZDsNOPhpdmOeT1xSnQ3oitMiMY14zoGG8hsGU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
index d54b303919c7..c939b753f919 100644
--- a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
+++ b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "aarch64-esr-decoder";
-    rev = version;
+    tag = version;
     hash = "sha256-U9i5L3s4oQOIqlECSaKkHxS2Vzr6SY4tIUpvl3+oSl0=";
   };
 
diff --git a/pkgs/by-name/aa/aardvark-dns/package.nix b/pkgs/by-name/aa/aardvark-dns/package.nix
index f946ea4ba59f..1bdad26ce404 100644
--- a/pkgs/by-name/aa/aardvark-dns/package.nix
+++ b/pkgs/by-name/aa/aardvark-dns/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "aardvark-dns";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mWaB1E/n/N2Tb5bqrMJX2XfPvZBCG+dxar3kGCHgv0I=";
   };
 
diff --git a/pkgs/by-name/aa/aaxtomp3/package.nix b/pkgs/by-name/aa/aaxtomp3/package.nix
index b2ffb9bb3697..bdcb6f0ef709 100644
--- a/pkgs/by-name/aa/aaxtomp3/package.nix
+++ b/pkgs/by-name/aa/aaxtomp3/package.nix
@@ -24,7 +24,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "krumpetpirate";
     repo = "aaxtomp3";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg=";
   };
 
diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix
index 436e38f35b79..008a1c6a7087 100644
--- a/pkgs/by-name/ab/ab-av1/package.nix
+++ b/pkgs/by-name/ab/ab-av1/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alexheretic";
     repo = "ab-av1";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dDD0hnKov5cgNoc1m/0rG/cx2ZaB7TmLfcXdm8myRUQ=";
   };
 
diff --git a/pkgs/by-name/ab/abaddon/package.nix b/pkgs/by-name/ab/abaddon/package.nix
index 7df9c694be08..5230137992ee 100644
--- a/pkgs/by-name/ab/abaddon/package.nix
+++ b/pkgs/by-name/ab/abaddon/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uowuo";
     repo = "abaddon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FPhHy+4BmaoGrHGsc5o79Au9JcH5C+iWTYQYwnTLaUY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ab/abbaye-des-morts/package.nix b/pkgs/by-name/ab/abbaye-des-morts/package.nix
index a2908ed9e502..767d187a5475 100644
--- a/pkgs/by-name/ab/abbaye-des-morts/package.nix
+++ b/pkgs/by-name/ab/abbaye-des-morts/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nevat";
     repo = "abbayedesmorts-gpl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-IU7E1zmeif9CdoBxzmh7MG2jElGGnEZyKnK7eYFrjsQ=";
   };
 
diff --git a/pkgs/by-name/ab/abbreviate/package.nix b/pkgs/by-name/ab/abbreviate/package.nix
index 400e168b1ed5..fa5092e86915 100644
--- a/pkgs/by-name/ab/abbreviate/package.nix
+++ b/pkgs/by-name/ab/abbreviate/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dnnrly";
     repo = "abbreviate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-foGg+o+BbPsfpph+XHIfyPaknQD1N1rcZW58kgZ5HYM=";
   };
 
diff --git a/pkgs/by-name/ab/abi-compliance-checker/package.nix b/pkgs/by-name/ab/abi-compliance-checker/package.nix
index 0d4f133ab16f..f1c5556f0272 100644
--- a/pkgs/by-name/ab/abi-compliance-checker/package.nix
+++ b/pkgs/by-name/ab/abi-compliance-checker/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lvc";
     repo = "abi-compliance-checker";
-    rev = version;
+    tag = version;
     sha256 = "1f1f9j2nf9j83sfl2ljadch99v6ha8rq8xm7ax5akc05hjpyckij";
   };
 
diff --git a/pkgs/by-name/ab/abi-dumper/package.nix b/pkgs/by-name/ab/abi-dumper/package.nix
index a681a48d28c2..f1dcf7974b3a 100644
--- a/pkgs/by-name/ab/abi-dumper/package.nix
+++ b/pkgs/by-name/ab/abi-dumper/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lvc";
     repo = "abi-dumper";
-    rev = version;
+    tag = version;
     sha256 = "sha256-BefDMeKHx4MNU6SyX5UpQnwdI+zqap7zunsgdWG/2xc=";
   };
 
diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix
index 0258e55330d1..26eae7be938d 100644
--- a/pkgs/by-name/ab/abracadabra/package.nix
+++ b/pkgs/by-name/ab/abracadabra/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KejPi";
     repo = "AbracaDABra";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yCjMinDCoBTOC5Ks4MUd0MQeitfrIe8bI3Q4ahz36kQ=";
   };
 
diff --git a/pkgs/by-name/ab/abuild/package.nix b/pkgs/by-name/ab/abuild/package.nix
index 33d2495bbcab..dd37bec14b30 100644
--- a/pkgs/by-name/ab/abuild/package.nix
+++ b/pkgs/by-name/ab/abuild/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.alpinelinux.org";
     owner = "alpine";
     repo = "abuild";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-gNmje4USaklwmsVGs4NMFoharEk2syCmDdQ/SCSMKsI=";
   };
 
diff --git a/pkgs/by-name/ac/acc/package.nix b/pkgs/by-name/ac/acc/package.nix
index 894aa7ce588e..1201ce882c4f 100644
--- a/pkgs/by-name/ac/acc/package.nix
+++ b/pkgs/by-name/ac/acc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zdoom";
     repo = "acc";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-HGF4O4LcMDY4f/ZuBbkvx5Wd86+8Ict624eKTJ88/rQ=";
   };
 
diff --git a/pkgs/by-name/ac/acr/package.nix b/pkgs/by-name/ac/acr/package.nix
index 5e8297c11a60..c19428f66488 100644
--- a/pkgs/by-name/ac/acr/package.nix
+++ b/pkgs/by-name/ac/acr/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "radareorg";
     repo = "acr";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-GgF2sen7RcnuXrtLzkeGllMvY65LffR+jPPqUhbsOGk=";
   };
 
diff --git a/pkgs/by-name/ac/acsccid/package.nix b/pkgs/by-name/ac/acsccid/package.nix
index 37a49bfbabc3..8eb009a94651 100644
--- a/pkgs/by-name/ac/acsccid/package.nix
+++ b/pkgs/by-name/ac/acsccid/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acshk";
     repo = "acsccid";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3";
   };
 
diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix
index 8eb5e3aaf86b..b504d51345d1 100644
--- a/pkgs/by-name/ac/action-validator/package.nix
+++ b/pkgs/by-name/ac/action-validator/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mpalmer";
     repo = "action-validator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lJHGx/GFddIwVVXRj75Z/l5CH/yuw/uIhr02Qkjruww=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ad/adapta-backgrounds/package.nix b/pkgs/by-name/ad/adapta-backgrounds/package.nix
index 109fe4c512ca..4c4c0a071697 100644
--- a/pkgs/by-name/ad/adapta-backgrounds/package.nix
+++ b/pkgs/by-name/ad/adapta-backgrounds/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-backgrounds";
-    rev = version;
+    tag = version;
     sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj";
   };
 
diff --git a/pkgs/by-name/ad/adapta-gtk-theme/package.nix b/pkgs/by-name/ad/adapta-gtk-theme/package.nix
index 67d3ffe76968..e2dec31b85c0 100644
--- a/pkgs/by-name/ad/adapta-gtk-theme/package.nix
+++ b/pkgs/by-name/ad/adapta-gtk-theme/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
-    rev = version;
+    tag = version;
     sha256 = "19skrhp10xx07hbd0lr3d619vj2im35d8p9rmb4v4zacci804q04";
   };
 
diff --git a/pkgs/by-name/ad/adapta-kde-theme/package.nix b/pkgs/by-name/ad/adapta-kde-theme/package.nix
index 67ba82d42556..54c5cb2de524 100644
--- a/pkgs/by-name/ad/adapta-kde-theme/package.nix
+++ b/pkgs/by-name/ad/adapta-kde-theme/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "adapta-kde";
-    rev = version;
+    tag = version;
     sha256 = "1q85678sff8is2kwvgd703ckcns42gdga2c1rqlp61gb6bqf09j8";
   };
 
diff --git a/pkgs/by-name/ad/adbtuifm/package.nix b/pkgs/by-name/ad/adbtuifm/package.nix
index f92b0c16653f..e6b6e6134df4 100644
--- a/pkgs/by-name/ad/adbtuifm/package.nix
+++ b/pkgs/by-name/ad/adbtuifm/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "darkhz";
     repo = "adbtuifm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TK93O9XwMrsrQT3EG0969HYMtYkK0a4PzG9FSTqHxAY=";
   };
   vendorHash = "sha256-voVoowjM90OGWXF4REEevO8XEzT7azRYiDay4bnGBks=";
diff --git a/pkgs/by-name/ad/addlicense/package.nix b/pkgs/by-name/ad/addlicense/package.nix
index fdff6455a630..528282c13828 100644
--- a/pkgs/by-name/ad/addlicense/package.nix
+++ b/pkgs/by-name/ad/addlicense/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "addlicense";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YMMHj6wctKtJi/rrcMIrLmNw/uvO6wCwokgYRQxcsFw=";
   };
 
diff --git a/pkgs/by-name/ad/adementary-theme/package.nix b/pkgs/by-name/ad/adementary-theme/package.nix
index 9c844a14655f..f3602d778131 100644
--- a/pkgs/by-name/ad/adementary-theme/package.nix
+++ b/pkgs/by-name/ad/adementary-theme/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hrdwrrsk";
     repo = "adementary-theme";
-    rev = version;
+    tag = version;
     sha256 = "14y5s18g9r2c1ciw1skfksn09gvqgy8vjvwbr0z8gacf0jc2apqk";
   };
 
diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix
index 10d98113e0c3..bf4449b23ebf 100644
--- a/pkgs/by-name/ad/adguardian/package.nix
+++ b/pkgs/by-name/ad/adguardian/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Lissy93";
     repo = "AdGuardian-Term";
-    rev = version;
+    tag = version;
     hash = "sha256-WxrSmCwLnXXs5g/hN3xWE66P5n0RD/L9MJpf5N2iNtY=";
   };
 
diff --git a/pkgs/by-name/ad/adif-multitool/package.nix b/pkgs/by-name/ad/adif-multitool/package.nix
index 97c676cc805e..e9dcc76b0675 100644
--- a/pkgs/by-name/ad/adif-multitool/package.nix
+++ b/pkgs/by-name/ad/adif-multitool/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "flwyd";
     repo = "adif-multitool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qeAH8UTyEZn8As3wTjluONpjeT/5l9zicN5+8uwnbLo=";
   };
 
diff --git a/pkgs/by-name/ad/adrgen/package.nix b/pkgs/by-name/ad/adrgen/package.nix
index e018fd97c083..868caf3b7526 100644
--- a/pkgs/by-name/ad/adrgen/package.nix
+++ b/pkgs/by-name/ad/adrgen/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "asiermarques";
     repo = "adrgen";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2ZE/orsfwL59Io09c4yfXt2enVmpSM/QHlUMgyd9RYQ=";
   };
 
diff --git a/pkgs/by-name/ad/adrs/package.nix b/pkgs/by-name/ad/adrs/package.nix
index ff607c4d23b6..953831d6cf31 100644
--- a/pkgs/by-name/ad/adrs/package.nix
+++ b/pkgs/by-name/ad/adrs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "joshrotenberg";
     repo = "adrs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-C9Kg7xY3Q0xsd2DlUcc3OM+/hyzmwz55oi6Ul3K7zkM=";
   };
 
diff --git a/pkgs/by-name/ad/advancecomp/package.nix b/pkgs/by-name/ad/advancecomp/package.nix
index fe6d79f732ca..21f8780a29a7 100644
--- a/pkgs/by-name/ad/advancecomp/package.nix
+++ b/pkgs/by-name/ad/advancecomp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amadvance";
     repo = "advancecomp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MwXdXT/ZEvTcYV4DjhCUFflrPKBFu0fk5PmaWt4MMOU=";
   };
 
diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix
index 4504ed3d2781..015ff45435e7 100644
--- a/pkgs/by-name/ae/aeron-cpp/package.nix
+++ b/pkgs/by-name/ae/aeron-cpp/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "real-logic";
     repo = "aeron";
-    rev = version;
+    tag = version;
     hash = "sha256-sROEZVOfScrlqMLbfrPtw3LQCQ5TfMcrLiP6j/Z9rSM=";
   };
 
diff --git a/pkgs/by-name/ae/aerospike/package.nix b/pkgs/by-name/ae/aerospike/package.nix
index 5a7de5fc4b53..a898c0c04ecf 100644
--- a/pkgs/by-name/ae/aerospike/package.nix
+++ b/pkgs/by-name/ae/aerospike/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aerospike";
     repo = "aerospike-server";
-    rev = version;
+    tag = version;
     hash = "sha256-Ou7lSQHkudE0cuhXUtx9EI3z+udfnHI+CXdgoef2TIw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ae/aether-lv2/package.nix b/pkgs/by-name/ae/aether-lv2/package.nix
index ac81726cbdee..b2b998e778c1 100644
--- a/pkgs/by-name/ae/aether-lv2/package.nix
+++ b/pkgs/by-name/ae/aether-lv2/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Dougal-s";
     repo = "aether";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0xhih4smjxn87s0f4gaab51d8594qlp0lyypzxl5lm37j1i9zigs";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/af/afflib/package.nix b/pkgs/by-name/af/afflib/package.nix
index 2193411b6a63..416987b88fbc 100644
--- a/pkgs/by-name/af/afflib/package.nix
+++ b/pkgs/by-name/af/afflib/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sshock";
     repo = "AFFLIBv3";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CBDkeUzHnRBkLUYl0JuQcVnQWap0l7dAca1deZVoNDM=";
   };
 
diff --git a/pkgs/by-name/af/afio/package.nix b/pkgs/by-name/af/afio/package.nix
index c33888ee293f..f2421773190d 100644
--- a/pkgs/by-name/af/afio/package.nix
+++ b/pkgs/by-name/af/afio/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kholtman";
     repo = "afio";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1vbxl66r5rp5a1qssjrkfsjqjjgld1cq57c871gd0m4qiq9rmcfy";
   };
 
diff --git a/pkgs/by-name/af/afsctool/package.nix b/pkgs/by-name/af/afsctool/package.nix
index 4ebcd4e1da67..17f9a4c3d5fa 100644
--- a/pkgs/by-name/af/afsctool/package.nix
+++ b/pkgs/by-name/af/afsctool/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RJVB";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cZ0P9cygj+5GgkDRpQk7P9z8zh087fpVfrYXMRRVUAI=";
   };
 
diff --git a/pkgs/by-name/af/afterburn/package.nix b/pkgs/by-name/af/afterburn/package.nix
index 7d763191735f..65236fc9fcdf 100644
--- a/pkgs/by-name/af/afterburn/package.nix
+++ b/pkgs/by-name/af/afterburn/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "coreos";
     repo = "afterburn";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-j2eQUro0Rx1axBAaZDNICRrkygb4JAyxVAER/5BXXLY=";
   };
 
diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix
index 7661e5264872..78b1cce6e10d 100644
--- a/pkgs/by-name/af/afterstep/package.nix
+++ b/pkgs/by-name/af/afterstep/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "afterstep";
     repo = "afterstep";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-j1ADTRZ3Mxv9VNZWhWCFMnM/CJfkphdrgbw9Ca3bBw0=";
   };
 
diff --git a/pkgs/by-name/af/afuse/package.nix b/pkgs/by-name/af/afuse/package.nix
index 81b168a4712e..91d04ad73613 100644
--- a/pkgs/by-name/af/afuse/package.nix
+++ b/pkgs/by-name/af/afuse/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pcarrier";
     repo = "afuse";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KpysJRvDx+12BSl9pIGRqbJAM4W1NbzxMgDycGCr2RM=";
   };
 
diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix
index 74146a1e546c..4026aaf3272e 100644
--- a/pkgs/by-name/ag/agate/package.nix
+++ b/pkgs/by-name/ag/agate/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mbrubeck";
     repo = "agate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3IVl11eG9gSriOddgzgF0FecdldBxEOE/UXlFDKGyic=";
   };
 
diff --git a/pkgs/by-name/ag/agdsn-zsh-config/package.nix b/pkgs/by-name/ag/agdsn-zsh-config/package.nix
index e430f3c69ccb..f7ee3274653b 100644
--- a/pkgs/by-name/ag/agdsn-zsh-config/package.nix
+++ b/pkgs/by-name/ag/agdsn-zsh-config/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agdsn";
     repo = "agdsn-zsh-config";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8POQPk/hsJBMJ/ZJe9XzVj7Rd7C2+QnpzgYbUR0s3Fc=";
   };
 
diff --git a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
index e5ee7c0a4040..0b8b7109abf3 100644
--- a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
+++ b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "olastor";
     repo = "age-plugin-fido2-hmac";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q77j+b0GDJhkCDLJYfIH2ZXqiwTC+ZM8CqXFv11UFaE=";
   };
 
diff --git a/pkgs/by-name/ag/agebox/package.nix b/pkgs/by-name/ag/agebox/package.nix
index 5267e0984456..fcabd3a3c9d5 100644
--- a/pkgs/by-name/ag/agebox/package.nix
+++ b/pkgs/by-name/ag/agebox/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slok";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/FTNvGV7PsJmpSU1dI/kjfiY5G7shomvLd3bvFqORfg=";
   };
 
diff --git a/pkgs/by-name/ag/agenda/package.nix b/pkgs/by-name/ag/agenda/package.nix
index ee1d83855686..312929935b75 100644
--- a/pkgs/by-name/ag/agenda/package.nix
+++ b/pkgs/by-name/ag/agenda/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dahenson";
     repo = "agenda";
-    rev = version;
+    tag = version;
     sha256 = "sha256-tzGcqCxIkoBNskpadEqv289Sj5bij9u+LdYySiGdop8=";
   };
 
diff --git a/pkgs/by-name/ag/agenix-cli/package.nix b/pkgs/by-name/ag/agenix-cli/package.nix
index 9455a397cd2f..55d87f7a172e 100644
--- a/pkgs/by-name/ag/agenix-cli/package.nix
+++ b/pkgs/by-name/ag/agenix-cli/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cole-h";
     repo = "agenix-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0+QVY1sDhGF4hAN6m2FdKZgm9V1cuGGjY4aitRBnvKg=";
   };
 
diff --git a/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix b/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix
index 30ce835feda9..e9ff9c886a75 100644
--- a/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix
+++ b/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agkozak";
     repo = "agkozak-zsh-prompt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FC9LIZaS6fV20qq6cJC/xQvfsM3DHXatVleH7yBgoNg=";
   };
 
diff --git a/pkgs/by-name/ag/agola/package.nix b/pkgs/by-name/ag/agola/package.nix
index 65eac2d281e1..d7745fd80f51 100644
--- a/pkgs/by-name/ag/agola/package.nix
+++ b/pkgs/by-name/ag/agola/package.nix
@@ -15,7 +15,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "agola-io";
     repo = "agola";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ggi0Eb4vO5zBoIrIIa3MFwOIW0IBS8yGF6eveBb+lgY=";
   };
 
diff --git a/pkgs/by-name/ah/aha/package.nix b/pkgs/by-name/ah/aha/package.nix
index 279f148e1359..175e024e1e59 100644
--- a/pkgs/by-name/ah/aha/package.nix
+++ b/pkgs/by-name/ah/aha/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "1gywad0rvvz3c5balz8cxsnx0562hj2ngzqyr8zsy2mb4pn0lpgv";
-    rev = version;
+    tag = version;
     repo = "aha";
     owner = "theZiz";
   };
diff --git a/pkgs/by-name/ah/ahoviewer/package.nix b/pkgs/by-name/ah/ahoviewer/package.nix
index cf1f95645ffd..46be801c1b92 100644
--- a/pkgs/by-name/ah/ahoviewer/package.nix
+++ b/pkgs/by-name/ah/ahoviewer/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ahodesuka";
     repo = "ahoviewer";
-    rev = version;
+    tag = version;
     sha256 = "1avdl4qcpznvf3s2id5qi1vnzy4wgh6vxpnrz777a1s4iydxpcd8";
   };
 
diff --git a/pkgs/by-name/ai/aiac/package.nix b/pkgs/by-name/ai/aiac/package.nix
index 82b3238ccbb8..d1d6d3268b22 100644
--- a/pkgs/by-name/ai/aiac/package.nix
+++ b/pkgs/by-name/ai/aiac/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gofireflyio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Lk3Bmzg1owkIWzz7jgq1YpdPyRzyZ7aNoWPIU5aWzu0=";
   };
 
diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix
index a05dead8c537..800adcb271a4 100644
--- a/pkgs/by-name/ai/aiken/package.nix
+++ b/pkgs/by-name/ai/aiken/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aiken-lang";
     repo = "aiken";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zbtsSEWgzhMeRMLb/ocsbz28lYXbSgucnPLVB9z7iwo=";
   };
 
diff --git a/pkgs/by-name/ai/ain/package.nix b/pkgs/by-name/ai/ain/package.nix
index 3b6d29815fc9..a8da1a0a3302 100644
--- a/pkgs/by-name/ai/ain/package.nix
+++ b/pkgs/by-name/ai/ain/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jonaslu";
     repo = "ain";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JEavBPnF3WW6oCZ1OC8g1dZev4qC7bi74/q2nvXK3mo=";
   };
 
diff --git a/pkgs/by-name/ai/air/package.nix b/pkgs/by-name/ai/air/package.nix
index f3d47001a7b2..76e38e3db5f3 100644
--- a/pkgs/by-name/ai/air/package.nix
+++ b/pkgs/by-name/ai/air/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "air-verse";
     repo = "air";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+PgJR9+adeko86jUs6/mvkZLgVuIMyd6fv8xxOZB4tE=";
   };
 
diff --git a/pkgs/by-name/ai/aircrack-ng/package.nix b/pkgs/by-name/ai/aircrack-ng/package.nix
index fdc2284305e8..2aacd3d5fa91 100644
--- a/pkgs/by-name/ai/aircrack-ng/package.nix
+++ b/pkgs/by-name/ai/aircrack-ng/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aircrack-ng";
     repo = "aircrack-ng";
-    rev = version;
+    tag = version;
     hash = "sha256-niQDwiqi5GtBW5HIn0endnqPb/MqllcjsjXw4pTyFKY=";
   };
 
diff --git a/pkgs/by-name/ai/airshipper/package.nix b/pkgs/by-name/ai/airshipper/package.nix
index 20eb366cd1fa..0aea3c8e65fb 100644
--- a/pkgs/by-name/ai/airshipper/package.nix
+++ b/pkgs/by-name/ai/airshipper/package.nix
@@ -64,7 +64,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitLab {
     owner = "Veloren";
     repo = "airshipper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MHwyXCAqdBzdJlYzSeUXr6bJdTVHcjJ/kGcuAsZCCW8=";
   };
 
diff --git a/pkgs/by-name/ai/airspy/package.nix b/pkgs/by-name/ai/airspy/package.nix
index c6f19b1a47bd..dcc82f1afaea 100644
--- a/pkgs/by-name/ai/airspy/package.nix
+++ b/pkgs/by-name/ai/airspy/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "airspy";
     repo = "airspyone_host";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1v7sfkkxc6f8ny1p9xrax1agkl6q583mjx8k0lrrwdz31rf9qgw9";
   };
 
diff --git a/pkgs/by-name/ai/airspyhf/package.nix b/pkgs/by-name/ai/airspyhf/package.nix
index cc545cc91c12..972a80ebe038 100644
--- a/pkgs/by-name/ai/airspyhf/package.nix
+++ b/pkgs/by-name/ai/airspyhf/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "airspy";
     repo = "airspyhf";
-    rev = version;
+    tag = version;
     hash = "sha256-RKTMEDPeKcerJZtXTn8eAShxDcZUMgeQg/+7pEpMyVg=";
   };
 
diff --git a/pkgs/by-name/ai/aixlog/package.nix b/pkgs/by-name/ai/aixlog/package.nix
index 4504e8f964f2..44b76be3e101 100644
--- a/pkgs/by-name/ai/aixlog/package.nix
+++ b/pkgs/by-name/ai/aixlog/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "badaix";
     repo = "aixlog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Xhle7SODRZlHT3798mYIzBi1Mqjz8ai74/UnbVWetiY=";
   };
 
diff --git a/pkgs/by-name/ak/akira-unstable/package.nix b/pkgs/by-name/ak/akira-unstable/package.nix
index c6b880c69e5c..59ba5bfde4a2 100644
--- a/pkgs/by-name/ak/akira-unstable/package.nix
+++ b/pkgs/by-name/ak/akira-unstable/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "akiraux";
     repo = "Akira";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qrqmSCwA0kQVFD1gzutks9gMr7My7nw/KJs/VPisa0w=";
   };
 
diff --git a/pkgs/by-name/al/alarm-clock-applet/package.nix b/pkgs/by-name/al/alarm-clock-applet/package.nix
index 1648badc73fd..36fc05d4e453 100644
--- a/pkgs/by-name/al/alarm-clock-applet/package.nix
+++ b/pkgs/by-name/al/alarm-clock-applet/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "alarm-clock";
-    rev = version;
+    tag = version;
     hash = "sha256-10hkWWEsAUJnGeu35bR5d0RFKd9CKDZI7WGMzmEM3rI=";
   };
 
diff --git a/pkgs/by-name/al/albatross/package.nix b/pkgs/by-name/al/albatross/package.nix
index 09e220a94d04..d016fc18f944 100644
--- a/pkgs/by-name/al/albatross/package.nix
+++ b/pkgs/by-name/al/albatross/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "Albatross";
     owner = "shimmerproject";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0mq87n2hxy44nzr567av24n5nqjaljhi1afxrn3mpjqdbkq7lx88";
   };
 
diff --git a/pkgs/by-name/al/alegreya-sans/package.nix b/pkgs/by-name/al/alegreya-sans/package.nix
index 13b10ac4a9d5..72a982fa4734 100644
--- a/pkgs/by-name/al/alegreya-sans/package.nix
+++ b/pkgs/by-name/al/alegreya-sans/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "huertatipografica";
     repo = "Alegreya-Sans";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0xz5lq9fh0pj02ifazhddzh792qkxkz1z6ylj26d93wshc90jl5g";
   };
 
diff --git a/pkgs/by-name/al/alegreya/package.nix b/pkgs/by-name/al/alegreya/package.nix
index b13656ef901f..289369b8d582 100644
--- a/pkgs/by-name/al/alegreya/package.nix
+++ b/pkgs/by-name/al/alegreya/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "huertatipografica";
     repo = "Alegreya";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1m5xr95y6qxxv2ryvhfck39d6q5hxsr51f530fshg53x48l2mpwr";
   };
 
diff --git a/pkgs/by-name/al/alejandra/package.nix b/pkgs/by-name/al/alejandra/package.nix
index 0c39e55ecce1..352aa0ee54fc 100644
--- a/pkgs/by-name/al/alejandra/package.nix
+++ b/pkgs/by-name/al/alejandra/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kamadorueda";
     repo = "alejandra";
-    rev = version;
+    tag = version;
     hash = "sha256-g0SSfTWZ5mtMOpQic+eqq9sXMy1E/7yKxxfupZd9V4A=";
   };
 
diff --git a/pkgs/by-name/al/alertmanager-irc-relay/package.nix b/pkgs/by-name/al/alertmanager-irc-relay/package.nix
index 2d034dc5608c..290f571b78ef 100644
--- a/pkgs/by-name/al/alertmanager-irc-relay/package.nix
+++ b/pkgs/by-name/al/alertmanager-irc-relay/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "alertmanager-irc-relay";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Rl7o2QPa/IU1snlx/LiJxQok9pnkw9XANnJsu41vNlY=";
   };
 
diff --git a/pkgs/by-name/al/alertmanager-webhook-logger/package.nix b/pkgs/by-name/al/alertmanager-webhook-logger/package.nix
index b256a389ab04..e31c3e9b5056 100644
--- a/pkgs/by-name/al/alertmanager-webhook-logger/package.nix
+++ b/pkgs/by-name/al/alertmanager-webhook-logger/package.nix
@@ -8,7 +8,7 @@
 buildGoModule rec {
   pname = "alertmanager-webhook-logger";
   version = "1.0";
-  rev = "${version}";
+  rev = version;
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix
index ff6921cb57d9..d6eb6b07bf9e 100644
--- a/pkgs/by-name/al/algia/package.nix
+++ b/pkgs/by-name/al/algia/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "algia";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-i7rSmLFtUFSA1pW5IShYnTxjtwZ5z31OP4kVcMQgMxA=";
   };
 
diff --git a/pkgs/by-name/al/algolia-cli/package.nix b/pkgs/by-name/al/algolia-cli/package.nix
index 1f1debffbd5d..ae39b75a36c4 100644
--- a/pkgs/by-name/al/algolia-cli/package.nix
+++ b/pkgs/by-name/al/algolia-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "algolia";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VqY0h0Z3ocmgw0uFI4f6B5C/bTt3zoUXBlYPgOPxBo0=";
   };
 
diff --git a/pkgs/by-name/al/alice-lg/package.nix b/pkgs/by-name/al/alice-lg/package.nix
index 54dbef8f7377..018d0c47c963 100644
--- a/pkgs/by-name/al/alice-lg/package.nix
+++ b/pkgs/by-name/al/alice-lg/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alice-lg";
     repo = "alice-lg";
-    rev = version;
+    tag = version;
     hash = "sha256-BbwTLHDtpa8HCECIiy+UxyQiLf9iAD2GzE0azXk7QGU=";
   };
 
diff --git a/pkgs/by-name/al/alienarena/package.nix b/pkgs/by-name/al/alienarena/package.nix
index 06982ef32274..4ca2ffb49534 100644
--- a/pkgs/by-name/al/alienarena/package.nix
+++ b/pkgs/by-name/al/alienarena/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alienarena";
     repo = "alienarena";
-    rev = version;
+    tag = version;
     hash = "sha256-ri0p/0onI5DU7kDxwdFxRyT1LQLVe89VNEYPXPgilOs=";
   };
 
diff --git a/pkgs/by-name/al/align/package.nix b/pkgs/by-name/al/align/package.nix
index 12666a286b8f..166ee9532007 100644
--- a/pkgs/by-name/al/align/package.nix
+++ b/pkgs/by-name/al/align/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Guitarbum722";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "17gs3417633z71kc6l5zqg4b3rjhpn2v8qs8rnfrk4nbwzz4nrq3";
   };
 
diff --git a/pkgs/by-name/al/allmark/package.nix b/pkgs/by-name/al/allmark/package.nix
index 6f11a067b15c..0d6ed32a322b 100644
--- a/pkgs/by-name/al/allmark/package.nix
+++ b/pkgs/by-name/al/allmark/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "andreaskoch";
     repo = "allmark";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JfNn/e+cSq1pkeXs7A2dMsyhwOnh7x2bwm6dv6NOjLU=";
   };
 
diff --git a/pkgs/by-name/al/almonds/package.nix b/pkgs/by-name/al/almonds/package.nix
index d8ec911b7304..3b4a60db5434 100644
--- a/pkgs/by-name/al/almonds/package.nix
+++ b/pkgs/by-name/al/almonds/package.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Tenchi2xh";
     repo = "Almonds";
-    rev = version;
+    tag = version;
     sha256 = "0j8d8jizivnfx8lpc4w6sbqj5hq35nfz0vdg7ld80sc5cs7jr3ws";
   };
 
diff --git a/pkgs/by-name/al/alp/package.nix b/pkgs/by-name/al/alp/package.nix
index e0e18e919397..1de39c8c3fd3 100644
--- a/pkgs/by-name/al/alp/package.nix
+++ b/pkgs/by-name/al/alp/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gernotfeichter";
     repo = "alp";
-    rev = version;
+    tag = version;
     hash = "sha256-tE8qKNXLKvFcnDULVkJJ/EJyEsvATCk/3YFkZCmpHSo=";
   };
   vendorHash = "sha256-AHPVhtm6La7HWuxJfpxTsS5wFTUZUJoVyebLGYhNKTg=";
diff --git a/pkgs/by-name/al/alpaca-proxy/package.nix b/pkgs/by-name/al/alpaca-proxy/package.nix
index 2c69ba00cd05..072b4c8c5214 100644
--- a/pkgs/by-name/al/alpaca-proxy/package.nix
+++ b/pkgs/by-name/al/alpaca-proxy/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "samuong";
     repo = "alpaca";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1CMuZl1bVlofogPwA2wRuQPlXNE2EM1B8rDDDaJGq64=";
   };
 
diff --git a/pkgs/by-name/al/alpine-make-rootfs/package.nix b/pkgs/by-name/al/alpine-make-rootfs/package.nix
index c16f44c6ad1f..a4ca51ba7495 100644
--- a/pkgs/by-name/al/alpine-make-rootfs/package.nix
+++ b/pkgs/by-name/al/alpine-make-rootfs/package.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alpinelinux";
     repo = "alpine-make-rootfs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sNqaMBtbklSBcKxsc3ROI30bE1PUzJJeZqLqC9p3H+U=";
   };
 
diff --git a/pkgs/by-name/al/alpine-make-vm-image/package.nix b/pkgs/by-name/al/alpine-make-vm-image/package.nix
index ea1270252e1a..28c187d8026a 100644
--- a/pkgs/by-name/al/alpine-make-vm-image/package.nix
+++ b/pkgs/by-name/al/alpine-make-vm-image/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alpinelinux";
     repo = "alpine-make-vm-image";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N7S9MlTpLIL5Od+buS7q64v8fmN+wbYK1FH/YW+nMP8=";
   };
 
diff --git a/pkgs/by-name/al/alpnpass/package.nix b/pkgs/by-name/al/alpnpass/package.nix
index a8d77f9d8cbc..d6a4511d628d 100644
--- a/pkgs/by-name/al/alpnpass/package.nix
+++ b/pkgs/by-name/al/alpnpass/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "VerSprite";
     repo = "alpnpass";
-    rev = version;
+    tag = version;
     hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g=";
   };
 
diff --git a/pkgs/by-name/al/alsa-scarlett-gui/package.nix b/pkgs/by-name/al/alsa-scarlett-gui/package.nix
index ca24560d3ab9..8edcd60bc5e7 100644
--- a/pkgs/by-name/al/alsa-scarlett-gui/package.nix
+++ b/pkgs/by-name/al/alsa-scarlett-gui/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "geoffreybennett";
     repo = "alsa-scarlett-gui";
-    rev = version;
+    tag = version;
     hash = "sha256-DkfpMK0T67B4mnriignf4hx6Ifddls0rN0SxyfEsPZg=";
   };
 
diff --git a/pkgs/by-name/al/alttab/package.nix b/pkgs/by-name/al/alttab/package.nix
index 9a81b905f3a6..15ff4dad4d80 100644
--- a/pkgs/by-name/al/alttab/package.nix
+++ b/pkgs/by-name/al/alttab/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sagb";
     repo = "alttab";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1+hk0OeSriXPyefv3wOgeiW781PL4VP5Luvt+RS5jmg=";
   };
 
diff --git a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
index 978b8cbb1c69..8cfd4ebf5160 100644
--- a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
+++ b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "amazon-ecr-credential-helper";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kX1I8HsOJKFogqpfTgFBedM6BObdkpYfYwx3tS2IdMo=";
   };
 
diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix
index 6a9ed594d886..20a93e05e89e 100644
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "amber-lang";
     repo = "amber";
-    rev = version;
+    tag = version;
     hash = "sha256-N9G/2G8+vrpr1/K7XLwgW+X2oAyAaz4qvN+EbLOCU1Q=";
   };
 
diff --git a/pkgs/by-name/am/amber-secret/package.nix b/pkgs/by-name/am/amber-secret/package.nix
index c62940c467d1..d933c2136e76 100644
--- a/pkgs/by-name/am/amber-secret/package.nix
+++ b/pkgs/by-name/am/amber-secret/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fpco";
     repo = "amber";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM=";
   };
 
diff --git a/pkgs/by-name/am/amber-theme/package.nix b/pkgs/by-name/am/amber-theme/package.nix
index a6396363a849..5ac30cd315d2 100644
--- a/pkgs/by-name/am/amber-theme/package.nix
+++ b/pkgs/by-name/am/amber-theme/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "amber-theme";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OrdBeAD+gdIu6u8ESE9PtqYadSuJ8nx1Z8fB4D9y4W4=";
   };
 
diff --git a/pkgs/by-name/am/amd-blis/package.nix b/pkgs/by-name/am/amd-blis/package.nix
index 9e798a882edd..8af040a1c1f5 100644
--- a/pkgs/by-name/am/amd-blis/package.nix
+++ b/pkgs/by-name/am/amd-blis/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amd";
     repo = "blis";
-    rev = version;
+    tag = version;
     hash = "sha256-E6JmV4W0plFJfOAPK1Vn7qkmFalwl6OjqSpxYnhAPmw=";
   };
 
diff --git a/pkgs/by-name/am/amd-libflame/package.nix b/pkgs/by-name/am/amd-libflame/package.nix
index 6022742e05fc..a94b36c5583f 100644
--- a/pkgs/by-name/am/amd-libflame/package.nix
+++ b/pkgs/by-name/am/amd-libflame/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amd";
     repo = "libflame";
-    rev = version;
+    tag = version;
     hash = "sha256-Shsv5Zd59FN5tq1LY7QqPRtAHEysHIVbPeKIIZ/2eMw=";
   };
 
diff --git a/pkgs/by-name/am/amdctl/package.nix b/pkgs/by-name/am/amdctl/package.nix
index cdf983395bc4..63fe47c113b3 100644
--- a/pkgs/by-name/am/amdctl/package.nix
+++ b/pkgs/by-name/am/amdctl/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kevinlekiller";
     repo = "amdctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2wBk/9aAD7ARMGbcVxk+CzEvUf8U4RS4ZwTCj8cHNNo=";
   };
 
diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix
index a4627056ac62..fdc343766925 100644
--- a/pkgs/by-name/am/amdgpu_top/package.nix
+++ b/pkgs/by-name/am/amdgpu_top/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Umio-Yasuno";
     repo = "amdgpu_top";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OvxrcVjngIW/fVIPX1XhbGImAeDifoLzlaZpXUYS9FA=";
   };
 
diff --git a/pkgs/by-name/am/amf-headers/package.nix b/pkgs/by-name/am/amf-headers/package.nix
index 45ed5afaaedb..f7d25bd478f7 100644
--- a/pkgs/by-name/am/amf-headers/package.nix
+++ b/pkgs/by-name/am/amf-headers/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GPUOpen-LibrariesAndSDKs";
     repo = "AMF";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-u6gvdc1acemd01TO5EbuF3H7HkEJX4GUx73xCo71yPY=";
   };
 
diff --git a/pkgs/by-name/am/amfora/package.nix b/pkgs/by-name/am/amfora/package.nix
index bb335a505bb2..df9f059111be 100644
--- a/pkgs/by-name/am/amfora/package.nix
+++ b/pkgs/by-name/am/amfora/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "makeworld-the-better-one";
     repo = "amfora";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KOuKgxH3n4rdF+oj/TwEcRqX1sn4A9e23FNwQMhMVO4=";
   };
 
diff --git a/pkgs/by-name/am/aml/package.nix b/pkgs/by-name/am/aml/package.nix
index a901a7270de6..ffb1e33a9211 100644
--- a/pkgs/by-name/am/aml/package.nix
+++ b/pkgs/by-name/am/aml/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "any1";
     repo = "aml";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q=";
   };
 
diff --git a/pkgs/by-name/am/amneziawg-go/package.nix b/pkgs/by-name/am/amneziawg-go/package.nix
index fa5f47cffa81..57d3994b7b53 100644
--- a/pkgs/by-name/am/amneziawg-go/package.nix
+++ b/pkgs/by-name/am/amneziawg-go/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amneziawg-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Xw2maGmNnx0+GO3OWS1Gu77oB9wh2dv+WobypQotUMA=";
   };
 
diff --git a/pkgs/by-name/am/amoco/package.nix b/pkgs/by-name/am/amoco/package.nix
index 42e76b5bd4e1..89a8bd69b8bd 100644
--- a/pkgs/by-name/am/amoco/package.nix
+++ b/pkgs/by-name/am/amoco/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bdcht";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3+1ssFyU7SKFJgDYBQY0kVjmTHOD71D2AjnH+4bfLXo=";
   };
 
diff --git a/pkgs/by-name/am/amphetype/package.nix b/pkgs/by-name/am/amphetype/package.nix
index 286a2cc162cb..2244f68a5bfc 100644
--- a/pkgs/by-name/am/amphetype/package.nix
+++ b/pkgs/by-name/am/amphetype/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
   src = fetchFromGitLab {
     owner = "franksh";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pve2f+XMfFokMCtW3KdeOJ9Ey330Gwv/dk1+WBtrBEQ=";
   };
 
diff --git a/pkgs/by-name/am/amqpcat/package.nix b/pkgs/by-name/am/amqpcat/package.nix
index 1f4d7d8dc1ca..f34e594af1c8 100644
--- a/pkgs/by-name/am/amqpcat/package.nix
+++ b/pkgs/by-name/am/amqpcat/package.nix
@@ -14,7 +14,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "cloudamqp";
     repo = "amqpcat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QLVFAcymj7dERbUiRcseiDuuKgrQ8n4LbkdhUyXPcWw=";
   };
 
diff --git a/pkgs/by-name/am/ams-lv2/package.nix b/pkgs/by-name/am/ams-lv2/package.nix
index 00b4916fe55e..7634e2efe1f8 100644
--- a/pkgs/by-name/am/ams-lv2/package.nix
+++ b/pkgs/by-name/am/ams-lv2/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "blablack";
     repo = "ams-lv2";
-    rev = version;
+    tag = version;
     sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk";
   };
 
diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix
index 73e1ad752ec5..360c9ef34649 100644
--- a/pkgs/by-name/am/amule/package.nix
+++ b/pkgs/by-name/am/amule/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amule-project";
     repo = "amule";
-    rev = version;
+    tag = version;
     sha256 = "1nm4vxgmisn1b6l3drmz0q04x067j2i8lw5rnf0acaapwlp8qwvi";
   };
 
diff --git a/pkgs/by-name/an/analog/package.nix b/pkgs/by-name/an/analog/package.nix
index 11777f147a24..b8f0fa94aaeb 100644
--- a/pkgs/by-name/an/analog/package.nix
+++ b/pkgs/by-name/an/analog/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "c-amie";
     repo = "analog-ce";
-    rev = version;
+    tag = version;
     sha256 = "sha256-NCturEibnpl6+paUZezksHzP33WtAzfIolvBLeEHXjY=";
   };
 
diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix
index 0c497b16f119..14dd97949d8f 100644
--- a/pkgs/by-name/an/anchor/package.nix
+++ b/pkgs/by-name/an/anchor/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "coral-xyz";
     repo = "anchor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rwf2PWHoUl8Rkmktb2u7veRrIcLT3syi7M2OZxdxjG4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/an/anders/package.nix b/pkgs/by-name/an/anders/package.nix
index 9943da5a735d..4c512c9629be 100644
--- a/pkgs/by-name/an/anders/package.nix
+++ b/pkgs/by-name/an/anders/package.nix
@@ -13,7 +13,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "groupoid";
     repo = "anders";
-    rev = version;
+    tag = version;
     sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4=";
   };
 
diff --git a/pkgs/by-name/an/android-udev-rules/package.nix b/pkgs/by-name/an/android-udev-rules/package.nix
index a1dcffe21cd8..3a3e7a0b46e2 100644
--- a/pkgs/by-name/an/android-udev-rules/package.nix
+++ b/pkgs/by-name/an/android-udev-rules/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
-    rev = version;
+    tag = version;
     hash = "sha256-QADyZ3FHVuxX/PfsRt2ijwJRCksQb1Hz5lSgYJlyb1Q=";
   };
 
diff --git a/pkgs/by-name/an/anew/package.nix b/pkgs/by-name/an/anew/package.nix
index 01df45bf9380..1475a5072812 100644
--- a/pkgs/by-name/an/anew/package.nix
+++ b/pkgs/by-name/an/anew/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "anew";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NQSs99/2GPOtXkO7k+ar16G4Ecu4CPGMd/CTwEhcyto=";
   };
 
diff --git a/pkgs/by-name/an/anewer/package.nix b/pkgs/by-name/an/anewer/package.nix
index 5541e23b86cc..a284c68bb6f4 100644
--- a/pkgs/by-name/an/anewer/package.nix
+++ b/pkgs/by-name/an/anewer/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ysf";
     repo = "anewer";
-    rev = version;
+    tag = version;
     sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d";
   };
 
diff --git a/pkgs/by-name/an/angband/package.nix b/pkgs/by-name/an/angband/package.nix
index ac2d60a74480..e0a2ba70b245 100644
--- a/pkgs/by-name/an/angband/package.nix
+++ b/pkgs/by-name/an/angband/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "angband";
     repo = "angband";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-XH2FUTJJaH5TqV2UD1CKKAXE4CRAb6zfg1UQ79a15k0=";
   };
 
diff --git a/pkgs/by-name/an/angle-grinder/package.nix b/pkgs/by-name/an/angle-grinder/package.nix
index 9c9a827a01ce..3a254e46d43a 100644
--- a/pkgs/by-name/an/angle-grinder/package.nix
+++ b/pkgs/by-name/an/angle-grinder/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rcoh";
     repo = "angle-grinder";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1SZho04qJcNi84ZkDmxoVkLx9VJX04QINZQ6ZEoCq+c=";
   };
 
diff --git a/pkgs/by-name/an/angsd/package.nix b/pkgs/by-name/an/angsd/package.nix
index 3a63cced6076..f9c6d2775d62 100644
--- a/pkgs/by-name/an/angsd/package.nix
+++ b/pkgs/by-name/an/angsd/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "ANGSD";
     repo = "angsd";
     sha256 = "sha256-Ppxgy54pAnqJUzNX5c12NHjKTQyEEcPSpCEEVOyZ/LA=";
-    rev = version;
+    tag = version;
   };
 
   patches = [
diff --git a/pkgs/by-name/an/anime-downloader/package.nix b/pkgs/by-name/an/anime-downloader/package.nix
index 4d8c2f932625..aff031306455 100644
--- a/pkgs/by-name/an/anime-downloader/package.nix
+++ b/pkgs/by-name/an/anime-downloader/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "anime-dl";
     repo = "anime-downloader";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o=";
   };
 
diff --git a/pkgs/by-name/an/anko/package.nix b/pkgs/by-name/an/anko/package.nix
index ddfef902dfc8..946599af780d 100644
--- a/pkgs/by-name/an/anko/package.nix
+++ b/pkgs/by-name/an/anko/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "anko";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZVNkQu5IxBx3f+FkUWc36EOEcY176wQJ2ravLPQAHAA=";
   };
 
diff --git a/pkgs/by-name/an/annextimelog/package.nix b/pkgs/by-name/an/annextimelog/package.nix
index da260dbce7ba..97370f770a4c 100644
--- a/pkgs/by-name/an/annextimelog/package.nix
+++ b/pkgs/by-name/an/annextimelog/package.nix
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "nobodyinperson";
     repo = "annextimelog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+3PkG33qKckagSVvVdqkypulO7uu5AMOv8fQiP8IUbs=";
   };
 
diff --git a/pkgs/by-name/an/annotator/package.nix b/pkgs/by-name/an/annotator/package.nix
index 2846180b1564..a6f9324a3781 100644
--- a/pkgs/by-name/an/annotator/package.nix
+++ b/pkgs/by-name/an/annotator/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phase1geo";
     repo = "annotator";
-    rev = version;
+    tag = version;
     hash = "sha256-VHvznkGvrE8o9qq+ijrIStSavq46dS8BqclWEWZ8mG8=";
   };
 
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index 1e01858c5097..11ab67ad2618 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -71,7 +71,7 @@ let
     src = fetchFromGitHub {
       owner = "AOMediaCodec";
       repo = "libavif";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs=";
     };
   };
diff --git a/pkgs/by-name/an/ansible-cmdb/package.nix b/pkgs/by-name/an/ansible-cmdb/package.nix
index d88ae7ec2f63..99cf731a88da 100644
--- a/pkgs/by-name/an/ansible-cmdb/package.nix
+++ b/pkgs/by-name/an/ansible-cmdb/package.nix
@@ -26,7 +26,7 @@ buildPythonApplication {
   src = fetchFromGitHub {
     owner = "fboender";
     repo = "ansible-cmdb";
-    rev = version;
+    tag = version;
     hash = "sha256-HOFLX8fiid+xJOVYNyVbz5FunrhteAUPlvS3ctclVHo=";
   };
 
diff --git a/pkgs/by-name/an/antibody/package.nix b/pkgs/by-name/an/antibody/package.nix
index 470716d81ce8..a526eadc61ae 100644
--- a/pkgs/by-name/an/antibody/package.nix
+++ b/pkgs/by-name/an/antibody/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "getantibody";
     repo = "antibody";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-If7XAwtg1WqkDkrJ6qYED+DjwHWloPu3P7X9rUd5ikU=";
   };
 
diff --git a/pkgs/by-name/an/antora-lunr-extension/package.nix b/pkgs/by-name/an/antora-lunr-extension/package.nix
index 2f6a6bef6429..b0ed88129957 100644
--- a/pkgs/by-name/an/antora-lunr-extension/package.nix
+++ b/pkgs/by-name/an/antora-lunr-extension/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitLab {
     owner = "antora";
     repo = "antora-lunr-extension";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4=";
   };
 
diff --git a/pkgs/by-name/an/antora/package.nix b/pkgs/by-name/an/antora/package.nix
index 60a5a1dbb20f..9f40af7698a0 100644
--- a/pkgs/by-name/an/antora/package.nix
+++ b/pkgs/by-name/an/antora/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitLab {
     owner = "antora";
     repo = "antora";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hkavYC2LO8NRIRwHNWIJLRDkVnhAB4Di3IqL8uGt+U8=";
   };
 
diff --git a/pkgs/by-name/an/any-nix-shell/package.nix b/pkgs/by-name/an/any-nix-shell/package.nix
index 3ef59864af47..5e746b87e7bb 100644
--- a/pkgs/by-name/an/any-nix-shell/package.nix
+++ b/pkgs/by-name/an/any-nix-shell/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "haslersn";
     repo = "any-nix-shell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-t6+LKSGWmkHQhfqw/4Ztz4QgDXQ2RZr9R/mMEEA3jlY=";
   };
 
diff --git a/pkgs/by-name/ao/aocl-utils/package.nix b/pkgs/by-name/ao/aocl-utils/package.nix
index 1dc44ad7c08c..64b35e22a71f 100644
--- a/pkgs/by-name/ao/aocl-utils/package.nix
+++ b/pkgs/by-name/ao/aocl-utils/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amd";
     repo = "aocl-utils";
-    rev = version;
+    tag = version;
     hash = "sha256-96j3Sw+Ts+CZzjPpUlt8cRYO5z0iASo+W/x1nrrAyQE=";
   };
 
diff --git a/pkgs/by-name/ap/aperture/package.nix b/pkgs/by-name/ap/aperture/package.nix
index 7e47e02c12ab..16ebdfd689bc 100644
--- a/pkgs/by-name/ap/aperture/package.nix
+++ b/pkgs/by-name/ap/aperture/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "aperture";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PsmaNJxWkXiFDA7IGhT+Kx1GUvv23c8L8Jz21/b48oo=";
   };
 
diff --git a/pkgs/by-name/ap/apfel/package.nix b/pkgs/by-name/ap/apfel/package.nix
index 7c8ca609fd27..5afecc9172ae 100644
--- a/pkgs/by-name/ap/apfel/package.nix
+++ b/pkgs/by-name/ap/apfel/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scarrazza";
     repo = "apfel";
-    rev = version;
+    tag = version;
     hash = "sha256-0Ix7KwEZUG/NmGJ380DVJbUA0PcoEJDlcGSc09l5Tbc=";
   };
 
diff --git a/pkgs/by-name/ap/apfelgrid/package.nix b/pkgs/by-name/ap/apfelgrid/package.nix
index 45b6d88d715b..7ca3c7209973 100644
--- a/pkgs/by-name/ap/apfelgrid/package.nix
+++ b/pkgs/by-name/ap/apfelgrid/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nhartland";
     repo = "APFELgrid";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0l0cyxd00kmb5aggzwsxg83ah0qiwav0shbxkxwrz3dvw78n89jk";
   };
 
diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix
index 3d152b13369c..ba3e22dfdfa9 100644
--- a/pkgs/by-name/ap/api-linter/package.nix
+++ b/pkgs/by-name/ap/api-linter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "api-linter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eLs5F3wghAfPfRQgAtW220xlzs7Un8sPpRpfvzc8Jfw=";
   };
 
diff --git a/pkgs/by-name/ap/aporetic/package.nix b/pkgs/by-name/ap/aporetic/package.nix
index acfd47d95aca..f47729d58a08 100644
--- a/pkgs/by-name/ap/aporetic/package.nix
+++ b/pkgs/by-name/ap/aporetic/package.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "protesilaos";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-5lPViAo9SztOdds6HEmKJpT17tgcxmU/voXDffxTMDI=";
   };
   privateBuildPlan = src.outPath + "/private-build-plans.toml";
diff --git a/pkgs/by-name/ap/appeditor/package.nix b/pkgs/by-name/ap/appeditor/package.nix
index 989345f505cb..1ad16c0bbbb9 100644
--- a/pkgs/by-name/ap/appeditor/package.nix
+++ b/pkgs/by-name/ap/appeditor/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "donadigo";
     repo = "appeditor";
-    rev = version;
+    tag = version;
     sha256 = "sha256-A0YasHw5osGrgUPiUPuRBnv1MR/Pth6jVHGEx/klOGY=";
   };
 
diff --git a/pkgs/by-name/ap/appimageupdate/package.nix b/pkgs/by-name/ap/appimageupdate/package.nix
index b1af05103d8a..8c6dd63b4ba4 100644
--- a/pkgs/by-name/ap/appimageupdate/package.nix
+++ b/pkgs/by-name/ap/appimageupdate/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AppImageCommunity";
     repo = "AppImageUpdate";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-b2RqSw0Ksn9OLxQV9+3reBiqrty+Kx9OwV93jlvuPnY=";
   };
 
diff --git a/pkgs/by-name/ap/appindicator-sharp/package.nix b/pkgs/by-name/ap/appindicator-sharp/package.nix
index 40373d4e61af..4f56ec5d3096 100644
--- a/pkgs/by-name/ap/appindicator-sharp/package.nix
+++ b/pkgs/by-name/ap/appindicator-sharp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stsundermann";
     repo = "appindicator-sharp";
-    rev = version;
+    tag = version;
     sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l";
   };
 
diff --git a/pkgs/by-name/ap/approxmc/package.nix b/pkgs/by-name/ap/approxmc/package.nix
index 20460dc5428b..1fd090bd7c13 100644
--- a/pkgs/by-name/ap/approxmc/package.nix
+++ b/pkgs/by-name/ap/approxmc/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "meelgroup";
     repo = "approxmc";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-rADPC7SVwzjUN5jb7Wt341oGfr6+LszIaBUe8QgmpRU=";
   };
 
diff --git a/pkgs/by-name/ap/apt-mirror/package.nix b/pkgs/by-name/ap/apt-mirror/package.nix
index 8f606e921af0..dfc9031c156e 100644
--- a/pkgs/by-name/ap/apt-mirror/package.nix
+++ b/pkgs/by-name/ap/apt-mirror/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "apt-mirror";
     repo = "apt-mirror";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-GNsyXP/O56Y+8QhoSfMm+ig5lK/K3Cm085jxRt9ZRmI=";
   };
 
diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index c95aea8d14ee..c9636a013827 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "salsa.debian.org";
     owner = "apt-team";
     repo = "apt";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-B4rFOt4J94/XkFw09sdvfogdY1b5R6QYnNC3HVUV9pc=";
   };
 
diff --git a/pkgs/by-name/ap/aptdec/package.nix b/pkgs/by-name/ap/aptdec/package.nix
index 4645933e4c0c..ef2ce7375ac8 100644
--- a/pkgs/by-name/ap/aptdec/package.nix
+++ b/pkgs/by-name/ap/aptdec/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Xerbo";
     repo = "aptdec";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5Pr2PlCPSEIWnThJXKcQEudmxhLJC2sVa9BfAOEKHB4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ap/aptly/package.nix b/pkgs/by-name/ap/aptly/package.nix
index f04824a05fb3..73653cd8ba9c 100644
--- a/pkgs/by-name/ap/aptly/package.nix
+++ b/pkgs/by-name/ap/aptly/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aptly-dev";
     repo = "aptly";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LqGOLXXaGfQfoj2r+aY9SdOKUDI9+22EsHKBhHMidyk=";
   };
 
diff --git a/pkgs/by-name/ar/arangodb/package.nix b/pkgs/by-name/ar/arangodb/package.nix
index ae27027bd993..79dcbc11e400 100644
--- a/pkgs/by-name/ar/arangodb/package.nix
+++ b/pkgs/by-name/ar/arangodb/package.nix
@@ -31,7 +31,7 @@ gcc10Stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-64iTxhG8qKTSrTlH/BWDJNnLf8VnaCteCKfQ9D2lGDQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ar/aravis/package.nix b/pkgs/by-name/ar/aravis/package.nix
index 7f2f7ce4a2f3..dab2cb13c444 100644
--- a/pkgs/by-name/ar/aravis/package.nix
+++ b/pkgs/by-name/ar/aravis/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AravisProject";
     repo = "aravis";
-    rev = version;
+    tag = version;
     sha256 = "sha256-D6zcTCaFJxJ2VhhsgEFu5+3Xx1MJov4ryrtA0VkjZlY=";
   };
 
diff --git a/pkgs/by-name/ar/arc-icon-theme/package.nix b/pkgs/by-name/ar/arc-icon-theme/package.nix
index 646a0d14c7da..7d17fdfc09c7 100644
--- a/pkgs/by-name/ar/arc-icon-theme/package.nix
+++ b/pkgs/by-name/ar/arc-icon-theme/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "horst3180";
     repo = "arc-icon-theme";
-    rev = version;
+    tag = version;
     hash = "sha256-TfYtzwo69AC5hHbzEqB4r5Muqvn/eghCGSlmjMCFA7I=";
   };
 
diff --git a/pkgs/by-name/ar/arc-kde-theme/package.nix b/pkgs/by-name/ar/arc-kde-theme/package.nix
index 2cc355efbe6d..b1cb4b83928e 100644
--- a/pkgs/by-name/ar/arc-kde-theme/package.nix
+++ b/pkgs/by-name/ar/arc-kde-theme/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "arc-kde";
-    rev = version;
+    tag = version;
     sha256 = "sha256-dxk8YpJB4XaZHD/O+WvQUFKJD2TE38VZyC5orn4N7BA=";
   };
 
diff --git a/pkgs/by-name/ar/arc-theme/package.nix b/pkgs/by-name/ar/arc-theme/package.nix
index 8f6e90986c6f..8fe22d49dfe7 100644
--- a/pkgs/by-name/ar/arc-theme/package.nix
+++ b/pkgs/by-name/ar/arc-theme/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jnsh";
     repo = "arc-theme";
-    rev = version;
+    tag = version;
     sha256 = "sha256-7VmqsUCeG5GwmrVdt9BJj0eZ/1v+no/05KwGFb7E9ns=";
   };
 
diff --git a/pkgs/by-name/ar/archiver/package.nix b/pkgs/by-name/ar/archiver/package.nix
index ed8f4c909ccf..4dff0e25adf9 100644
--- a/pkgs/by-name/ar/archiver/package.nix
+++ b/pkgs/by-name/ar/archiver/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mholt";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-l9exOq8QF3WSQ/+WQr0NfPeRQ/R6VQwfT+YS76BBwd8=";
   };
 
diff --git a/pkgs/by-name/ar/ardugotools/package.nix b/pkgs/by-name/ar/ardugotools/package.nix
index 16191343ab64..554c79d30b6a 100644
--- a/pkgs/by-name/ar/ardugotools/package.nix
+++ b/pkgs/by-name/ar/ardugotools/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "randomouscrap98";
     repo = "ardugotools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SqeUcYa8XscwaJaCSIoZ9lEtRJ0hN01XJDyCJFX2dTc=";
   };
 
diff --git a/pkgs/by-name/ar/arduino-ci/package.nix b/pkgs/by-name/ar/arduino-ci/package.nix
index af301786fee7..31e63437b75e 100644
--- a/pkgs/by-name/ar/arduino-ci/package.nix
+++ b/pkgs/by-name/ar/arduino-ci/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pololu";
     repo = "arduino-ci";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9RbBxgwsSQ7oGGKr1Vsn9Ug9AsacoRgvQgd9jbRQ034=";
   };
 
diff --git a/pkgs/by-name/ar/arduino-create-agent/package.nix b/pkgs/by-name/ar/arduino-create-agent/package.nix
index 093eee137e65..fbce7d5a62e0 100644
--- a/pkgs/by-name/ar/arduino-create-agent/package.nix
+++ b/pkgs/by-name/ar/arduino-create-agent/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "arduino";
     repo = "arduino-create-agent";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-L77LDMe6KTwQ2qAx3OT1O27h4DhAjZzcs8WL/N7E8hI=";
   };
 
diff --git a/pkgs/by-name/ar/arduino-mk/package.nix b/pkgs/by-name/ar/arduino-mk/package.nix
index eb03147af25b..9f6b8168aeb8 100644
--- a/pkgs/by-name/ar/arduino-mk/package.nix
+++ b/pkgs/by-name/ar/arduino-mk/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sudar";
     repo = "Arduino-Makefile";
-    rev = version;
+    tag = version;
     sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x";
   };
 
diff --git a/pkgs/by-name/ar/arduinoOTA/package.nix b/pkgs/by-name/ar/arduinoOTA/package.nix
index 218b38db301d..8a72811a33b0 100644
--- a/pkgs/by-name/ar/arduinoOTA/package.nix
+++ b/pkgs/by-name/ar/arduinoOTA/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "arduino";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-HaNMkeV/PDEotYp8+rUKFaBxGbZO8qA99Yp2sa6glz8=";
   };
 
diff --git a/pkgs/by-name/ar/ares-cli/package.nix b/pkgs/by-name/ar/ares-cli/package.nix
index 180507184c6f..85ff020f5197 100644
--- a/pkgs/by-name/ar/ares-cli/package.nix
+++ b/pkgs/by-name/ar/ares-cli/package.nix
@@ -10,7 +10,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "webos-tools";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tSnmIDDDEhhQBrjZ5bujmCaYpetTjpdCGUjKomue+Bc=";
   };
 
diff --git a/pkgs/by-name/ar/argagg/package.nix b/pkgs/by-name/ar/argagg/package.nix
index b38cd986f77f..ed666babe0f0 100644
--- a/pkgs/by-name/ar/argagg/package.nix
+++ b/pkgs/by-name/ar/argagg/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vietjtnguyen";
     repo = "argagg";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-G0PzoKpUyb1MaziLvHgasq98jPODUu4EgPzywRjuIN8=";
   };
 
diff --git a/pkgs/by-name/ar/argbash/package.nix b/pkgs/by-name/ar/argbash/package.nix
index a3fe1d4026f2..424201ab9db0 100644
--- a/pkgs/by-name/ar/argbash/package.nix
+++ b/pkgs/by-name/ar/argbash/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "matejak";
     repo = "argbash";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-G739q6OhsXEldpIxiyOU51AmG4RChMqaN1t2wOy6sPU=";
   };
 
diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix
index 051d4e83e0bd..b75f841e98fa 100644
--- a/pkgs/by-name/ar/argc/package.nix
+++ b/pkgs/by-name/ar/argc/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sigoden";
     repo = "argc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sviGDwxbCBsNY5viV7Qim6B/COd1Uz0Wj/6n/Ge+A50=";
   };
 
diff --git a/pkgs/by-name/ar/argo-expr/package.nix b/pkgs/by-name/ar/argo-expr/package.nix
index 9048d604a6b2..178564864167 100644
--- a/pkgs/by-name/ar/argo-expr/package.nix
+++ b/pkgs/by-name/ar/argo-expr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "blacha";
     repo = "argo-expr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XQnPFzT3PRmKeAQXLzBE5R2VvXotzxmsq+u9u5iE1QA=";
   };
 
diff --git a/pkgs/by-name/ar/argo-rollouts/package.nix b/pkgs/by-name/ar/argo-rollouts/package.nix
index f4e1f3419e04..ad363c122527 100644
--- a/pkgs/by-name/ar/argo-rollouts/package.nix
+++ b/pkgs/by-name/ar/argo-rollouts/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-rollouts";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-C2Ha3Sdq5IOHEc9S4jb4g6do6a4Gkm4E0BVFq5TnJDM=";
   };
 
diff --git a/pkgs/by-name/ar/argocd-autopilot/package.nix b/pkgs/by-name/ar/argocd-autopilot/package.nix
index 3121f2648aa1..a7fb62b6170a 100644
--- a/pkgs/by-name/ar/argocd-autopilot/package.nix
+++ b/pkgs/by-name/ar/argocd-autopilot/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "argoproj-labs";
     repo = "argocd-autopilot";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZJVlmZX/eQnOM2mlAe7DOyvykjgi5DHMqHoPAHPZlXM=";
   };
 
diff --git a/pkgs/by-name/ar/argocd-vault-plugin/package.nix b/pkgs/by-name/ar/argocd-vault-plugin/package.nix
index e3e7496c5db2..98cb556b44d9 100644
--- a/pkgs/by-name/ar/argocd-vault-plugin/package.nix
+++ b/pkgs/by-name/ar/argocd-vault-plugin/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "argoproj-labs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rWNR4GVivuEprdX/xhwk/9SReeJ19UWDWx8Bf8z6CTI=";
   };
 
diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index 1f03ca226775..6edd23f25c7f 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ilXJWPvu3qwzuUN6AsQNyzrTHdQO51IFZcvZiQ/+/tU=";
   };
 
diff --git a/pkgs/by-name/ar/argp-standalone/package.nix b/pkgs/by-name/ar/argp-standalone/package.nix
index 893aded31cff..eb566ed184b9 100644
--- a/pkgs/by-name/ar/argp-standalone/package.nix
+++ b/pkgs/by-name/ar/argp-standalone/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "argp-standalone";
     repo = "argp-standalone";
-    rev = version;
+    tag = version;
     sha256 = "jWnoWVnUVDQlsC9ru7oB9PdtZuyCCNqGnMqF/f2m0ZY=";
   };
 
diff --git a/pkgs/by-name/ar/argparse/package.nix b/pkgs/by-name/ar/argparse/package.nix
index fdc58a33f769..d2f6a9561ee2 100644
--- a/pkgs/by-name/ar/argparse/package.nix
+++ b/pkgs/by-name/ar/argparse/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "p-ranav";
     repo = "argparse";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-w4IU8Yr+zPFOo7xR4YMHlqNJcEov4KU/ppDYrgsGlxM=";
   };
 
diff --git a/pkgs/by-name/ar/ariang/package.nix b/pkgs/by-name/ar/ariang/package.nix
index 6636ab31cf36..e71ee1ab9d2c 100644
--- a/pkgs/by-name/ar/ariang/package.nix
+++ b/pkgs/by-name/ar/ariang/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mayswind";
     repo = "AriaNg";
-    rev = version;
+    tag = version;
     hash = "sha256-YABoDBPrxII0uw4Cyy1A4AcLQ3Uo28dJa/F4LTI7f5Y=";
   };
 
diff --git a/pkgs/by-name/ar/arjun-cnf/package.nix b/pkgs/by-name/ar/arjun-cnf/package.nix
index b257a607c94c..0bd257eecd18 100644
--- a/pkgs/by-name/ar/arjun-cnf/package.nix
+++ b/pkgs/by-name/ar/arjun-cnf/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "meelgroup";
     repo = "arjun";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-5duc05s654HLjbf+dPgyMn6QUVvB0vLji3M4S2o/QYU=";
   };
 
diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix
index 90e3c5ac8608..9fb8c61a4fba 100644
--- a/pkgs/by-name/ar/arkade/package.nix
+++ b/pkgs/by-name/ar/arkade/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
-    rev = version;
+    tag = version;
     hash = "sha256-V6ms3Av0/g2S7Q2NLltz7CnnvE1m+cemmwoHKL1e0tM=";
   };
 
diff --git a/pkgs/by-name/ar/arp-scan/package.nix b/pkgs/by-name/ar/arp-scan/package.nix
index 3f41678c5b21..a1216e9d8876 100644
--- a/pkgs/by-name/ar/arp-scan/package.nix
+++ b/pkgs/by-name/ar/arp-scan/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "royhills";
     repo = "arp-scan";
-    rev = version;
+    tag = version;
     sha256 = "sha256-BS+ItZd6cSMX92M6XGYrIeAiCB2iBdvbMvKdLfwawLQ=";
   };
 
diff --git a/pkgs/by-name/ar/arpa2cm/package.nix b/pkgs/by-name/ar/arpa2cm/package.nix
index 148d4df2c397..9505754388bc 100644
--- a/pkgs/by-name/ar/arpa2cm/package.nix
+++ b/pkgs/by-name/ar/arpa2cm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "arpa2cm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk=";
   };
 
diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix
index a25e9aa232bc..a6c6e492fa3f 100644
--- a/pkgs/by-name/ar/arsenal/package.nix
+++ b/pkgs/by-name/ar/arsenal/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Orange-Cyberdefense";
     repo = "arsenal";
-    rev = version;
+    tag = version;
     sha256 = "sha256-NbNXyR5aNKvRJU9JWGk/ndwU1bhNgDOdcRqBkAY9nPA=";
   };
 
diff --git a/pkgs/by-name/ar/artem/package.nix b/pkgs/by-name/ar/artem/package.nix
index a04e31e6b3f5..dfa7b4497539 100644
--- a/pkgs/by-name/ar/artem/package.nix
+++ b/pkgs/by-name/ar/artem/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "finefindus";
     repo = "artem";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-C3Co+hXstVN/WADIpzqr7f3muAgQL0Zbnz6VI1XNo4U=";
   };
 
diff --git a/pkgs/by-name/as/ascii-image-converter/package.nix b/pkgs/by-name/as/ascii-image-converter/package.nix
index a74990a9b548..cd36a1f0e1a8 100644
--- a/pkgs/by-name/as/ascii-image-converter/package.nix
+++ b/pkgs/by-name/as/ascii-image-converter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TheZoraiz";
     repo = "ascii-image-converter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-svM/TzGQU/QgjqHboy0470+A6p4kR76typ9gnfjfAJk=";
   };
 
diff --git a/pkgs/by-name/as/asciigraph/package.nix b/pkgs/by-name/as/asciigraph/package.nix
index ec9151cd9a90..c9c924048937 100644
--- a/pkgs/by-name/as/asciigraph/package.nix
+++ b/pkgs/by-name/as/asciigraph/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "guptarohit";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+4aGkumO42cloHWV8qEEJ5bj8TTdtfXTWGFCgCRE4Mg=";
   };
 
diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix
index a79fa32aae9b..d3add2fd3a72 100644
--- a/pkgs/by-name/as/asciinema-agg/package.nix
+++ b/pkgs/by-name/as/asciinema-agg/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "asciinema";
     repo = "agg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bCE59NeITaCwgajgyXgP6jxtV7aPihPaZ/Uzh39Po1k=";
   };
 
diff --git a/pkgs/by-name/as/asciinema-automation/package.nix b/pkgs/by-name/as/asciinema-automation/package.nix
index abdaddde453d..780cd2c8bd69 100644
--- a/pkgs/by-name/as/asciinema-automation/package.nix
+++ b/pkgs/by-name/as/asciinema-automation/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "PierreMarchand20";
     repo = "asciinema_automation";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SjUsPrhoNz2NTPAkmUH0Csv6hbDc6nyKdckGqV5S3GY=";
   };
 
diff --git a/pkgs/by-name/as/asciinema/package.nix b/pkgs/by-name/as/asciinema/package.nix
index f84c93eb3faa..be38b4947869 100644
--- a/pkgs/by-name/as/asciinema/package.nix
+++ b/pkgs/by-name/as/asciinema/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "asciinema";
     repo = "asciinema";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UegLwpJ+uc9cW3ozLQJsQBjIGD7+vzzwzQFRV5gmDmI=";
   };
 
diff --git a/pkgs/by-name/as/asciiquarium-transparent/package.nix b/pkgs/by-name/as/asciiquarium-transparent/package.nix
index e82c054b017a..3ee69c2233b0 100644
--- a/pkgs/by-name/as/asciiquarium-transparent/package.nix
+++ b/pkgs/by-name/as/asciiquarium-transparent/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nothub";
     repo = "asciiquarium";
-    rev = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-zQyVIfwmhF3WsCeIZLwjDufvKzAfjLxaK2s7WTedqCg=";
   };
 
diff --git a/pkgs/by-name/as/asdf-vm/package.nix b/pkgs/by-name/as/asdf-vm/package.nix
index 1acbce85e93a..7565da9d6045 100644
--- a/pkgs/by-name/as/asdf-vm/package.nix
+++ b/pkgs/by-name/as/asdf-vm/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "asdf-vm";
     repo = "asdf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-quDgoYi+3hZUEAzXWTHuL5UK1T+4o7+G67w0UzZOjJA=";
   };
 
diff --git a/pkgs/by-name/as/asfa/package.nix b/pkgs/by-name/as/asfa/package.nix
index 1dd940c1a6fa..0ff5cb4037be 100644
--- a/pkgs/by-name/as/asfa/package.nix
+++ b/pkgs/by-name/as/asfa/package.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "obreitwi";
     repo = "asfa";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ARdUlACxmbjmOTuNW2oiVUcfd5agR4rcp9aMQYUAYsw=";
   };
 in
diff --git a/pkgs/by-name/as/ashuffle/package.nix b/pkgs/by-name/as/ashuffle/package.nix
index e809869b43e6..146b55e2223d 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-XnibLlwUspI2aveWfMg/TOe59vK6Z2WEnF7gafUmx6E=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix
index 45c370cd81f2..a9dd759706ad 100644
--- a/pkgs/by-name/as/asm-lsp/package.nix
+++ b/pkgs/by-name/as/asm-lsp/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "bergercookie";
     repo = "asm-lsp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RAyiE+Msmr/Qt5v7rWuUTAji383XLKxeMQJove2b1NE=";
   };
 
diff --git a/pkgs/by-name/as/asmfmt/package.nix b/pkgs/by-name/as/asmfmt/package.nix
index 598ec7fd563d..4f51f3700b8e 100644
--- a/pkgs/by-name/as/asmfmt/package.nix
+++ b/pkgs/by-name/as/asmfmt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "klauspost";
     repo = "asmfmt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc=";
   };
 
diff --git a/pkgs/by-name/as/asn1editor/package.nix b/pkgs/by-name/as/asn1editor/package.nix
index fa6c1c6bee9b..ffe8ce23c6f8 100644
--- a/pkgs/by-name/as/asn1editor/package.nix
+++ b/pkgs/by-name/as/asn1editor/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Futsch1";
     repo = "asn1editor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mgluhC2DMS4OyS/BoWqBdVf7GcxquOtOKTHZ/hbiHQM=";
   };
 
diff --git a/pkgs/by-name/as/asouldocs/package.nix b/pkgs/by-name/as/asouldocs/package.nix
index f5392796fdde..f0bdd69c7f36 100644
--- a/pkgs/by-name/as/asouldocs/package.nix
+++ b/pkgs/by-name/as/asouldocs/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "asoul-sig";
     repo = "asouldocs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ctRE7aF3Qj+fI/m0CuLA6x7E+mY6s1+UfBJI5YFea4g=";
   };
 
diff --git a/pkgs/by-name/as/aspcud/package.nix b/pkgs/by-name/as/aspcud/package.nix
index 4c72083c2c76..1742095c0078 100644
--- a/pkgs/by-name/as/aspcud/package.nix
+++ b/pkgs/by-name/as/aspcud/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "potassco";
     repo = "aspcud";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PdRfpmH7zF5dn+feoijtzdSUjaYhjHwyAUfuYoWCL9E=";
   };
 
diff --git a/pkgs/by-name/as/assaultcube/package.nix b/pkgs/by-name/as/assaultcube/package.nix
index ec7fc9f43e2f..dc1f0f71b602 100644
--- a/pkgs/by-name/as/assaultcube/package.nix
+++ b/pkgs/by-name/as/assaultcube/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "assaultcube";
     repo = "AC";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0qv339zw9q5q1y7bghca03gw7z4v89sl4lbr6h3b7siy08mcwiz9";
   };
 
diff --git a/pkgs/by-name/as/assemblyscript/package.nix b/pkgs/by-name/as/assemblyscript/package.nix
index cff941fe1413..2b4bd4e64dc4 100644
--- a/pkgs/by-name/as/assemblyscript/package.nix
+++ b/pkgs/by-name/as/assemblyscript/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "AssemblyScript";
     repo = "assemblyscript";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Wop7S7GvvXFcONER+TYIygLkAZpCdhMlPz3hhWSOZro=";
   };
 
diff --git a/pkgs/by-name/as/assetfinder/package.nix b/pkgs/by-name/as/assetfinder/package.nix
index b27ecc9e1a4b..b121093b899d 100644
--- a/pkgs/by-name/as/assetfinder/package.nix
+++ b/pkgs/by-name/as/assetfinder/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "assetfinder";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7+YF1VXBcFehKw9JzurmXNu8yeZPdqfQEuaqwtR4AuA=";
   };
 
diff --git a/pkgs/by-name/as/assh/package.nix b/pkgs/by-name/as/assh/package.nix
index f66cb33959d8..c26b1b3859cd 100644
--- a/pkgs/by-name/as/assh/package.nix
+++ b/pkgs/by-name/as/assh/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "advanced-ssh-config";
     owner = "moul";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rvJJZqVSBdaJ154NV6RaxbymsSsHbKnlJDeR6KHQE7M=";
   };
 
diff --git a/pkgs/by-name/as/assign-lb-ip/package.nix b/pkgs/by-name/as/assign-lb-ip/package.nix
index f3fa137a6392..a8eb225d93b9 100644
--- a/pkgs/by-name/as/assign-lb-ip/package.nix
+++ b/pkgs/by-name/as/assign-lb-ip/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Nordix";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Sfi58wcX61HNCmlDoparTqnfsuxu6barSnV0uYlC+ng=";
   };
 
diff --git a/pkgs/by-name/as/assimp/package.nix b/pkgs/by-name/as/assimp/package.nix
index 4aaa2ed60876..e37ca11f9a9e 100644
--- a/pkgs/by-name/as/assimp/package.nix
+++ b/pkgs/by-name/as/assimp/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "assimp";
     repo = "assimp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sOYhYHBz3Tg+pi1OIJ1mGmsjEc6dPO6nFH0aolfpLRA=";
   };
 
diff --git a/pkgs/by-name/as/astartectl/package.nix b/pkgs/by-name/as/astartectl/package.nix
index f5c5be3aad9c..1ca3c3ea4e1b 100644
--- a/pkgs/by-name/as/astartectl/package.nix
+++ b/pkgs/by-name/as/astartectl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "astarte-platform";
     repo = "astartectl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T4/lkeipE7GWq1zTxkoV3MfADlduFKtGuB/dsI4YZZw=";
   };
 
diff --git a/pkgs/by-name/as/astc-encoder/package.nix b/pkgs/by-name/as/astc-encoder/package.nix
index 5ea47e927550..33e2f4fa7764 100644
--- a/pkgs/by-name/as/astc-encoder/package.nix
+++ b/pkgs/by-name/as/astc-encoder/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ARM-software";
     repo = "astc-encoder";
-    rev = version;
+    tag = version;
     sha256 = "sha256-rCyi5Nla2IXsLD+rLMTN1h3B9umlNN0epZmPi/IFHPQ=";
   };
 
diff --git a/pkgs/by-name/as/asterisk-module-sccp/package.nix b/pkgs/by-name/as/asterisk-module-sccp/package.nix
index a81ef23cca00..8e7d51adce9b 100644
--- a/pkgs/by-name/as/asterisk-module-sccp/package.nix
+++ b/pkgs/by-name/as/asterisk-module-sccp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chan-sccp";
     repo = "chan-sccp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Lonsh7rx3C17LU5pZpZuFxlki0iotDt+FivggFJbldU=";
   };
 
diff --git a/pkgs/by-name/as/astromenace/package.nix b/pkgs/by-name/as/astromenace/package.nix
index d59a9d6f0c9e..b9e7837ac85b 100644
--- a/pkgs/by-name/as/astromenace/package.nix
+++ b/pkgs/by-name/as/astromenace/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "viewizard";
     repo = "astromenace";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W6d+8iw7/r2qJbE75U7egxqvK2HXaKzk+GtnspZRAxk=";
   };
 
diff --git a/pkgs/by-name/as/astronomer/package.nix b/pkgs/by-name/as/astronomer/package.nix
index 7df5c42af4e4..2fe1cebfe134 100644
--- a/pkgs/by-name/as/astronomer/package.nix
+++ b/pkgs/by-name/as/astronomer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Ullaakut";
     repo = "astronomer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4hUfJI2BRZl3Trk8F2qLZAyA57kq0oW9/e13atj/BVg=";
   };
 
diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix
index e82ebcd62f22..1b3cd702ff2e 100644
--- a/pkgs/by-name/as/async-profiler/package.nix
+++ b/pkgs/by-name/as/async-profiler/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jvm-profiling-tools";
     repo = "async-profiler";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0CCJoRjRLq4LpiRD0ibzK8So9qSQymePCTYUI60Oy2k=";
   };
 
diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix
index fd17a1e8b909..a51fe88db7c1 100644
--- a/pkgs/by-name/at/atac/package.nix
+++ b/pkgs/by-name/at/atac/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Julien-cpsn";
     repo = "ATAC";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7y4DDoGguHfU4JxnMyRmjrqJ4gg76C9WSmZ8ey+Mitg=";
   };
 
diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix
index f4aa1ef22121..828cf50e22f3 100644
--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gomods";
     repo = "athens";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6NBdif8rQ1aj4nTYXhrWyErzRv0q8WpIheRnb2FCnkU=";
   };
 
diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix
index 170208d48855..5d35bde41309 100644
--- a/pkgs/by-name/at/atlantis/package.nix
+++ b/pkgs/by-name/at/atlantis/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "runatlantis";
     repo = "atlantis";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6/e3h4et5xzo0Eoh5I90FW9drOUSut1Wz7MgTSlVXGk=";
   };
   ldflags = [
diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix
index e91e6feea075..32d04b18539d 100644
--- a/pkgs/by-name/at/atlas/package.nix
+++ b/pkgs/by-name/at/atlas/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ariga";
     repo = "atlas";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iM+Qy8tQAjonXpt36WWIEIAmtqnR0wWtMMxIh76Fv0U=";
   };
 
diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix
index f4f5ac70cf52..d1748e24dd18 100644
--- a/pkgs/by-name/at/atmos/package.nix
+++ b/pkgs/by-name/at/atmos/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudposse";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-shhkaPYU1N3Q7eu8CyZXYrR11kxb+r9II4lpfRWTOas=";
   };
 
diff --git a/pkgs/by-name/at/atomic-operator/package.nix b/pkgs/by-name/at/atomic-operator/package.nix
index 89d7e6840451..5e262aee43a4 100644
--- a/pkgs/by-name/at/atomic-operator/package.nix
+++ b/pkgs/by-name/at/atomic-operator/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "swimlane";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-DyNqu3vndyLkmfybCfTbgxk3t/ALg7IAkAMg4kBkH7Q=";
   };
 
diff --git a/pkgs/by-name/at/atomic-swap/package.nix b/pkgs/by-name/at/atomic-swap/package.nix
index 5267433fcf69..88af744d0647 100644
--- a/pkgs/by-name/at/atomic-swap/package.nix
+++ b/pkgs/by-name/at/atomic-swap/package.nix
@@ -17,7 +17,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "AthanorLabs";
     repo = "atomic-swap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MOylUZ6BrvlxUrsZ5gg3JzW9ROG5UXeGhq3YoPZKdHs=";
   };
 
diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index 0de5a7b65d14..46213e6ddc84 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "atuinsh";
     repo = "atuin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P/q4XYhpXo9kwiltA0F+rQNSlqI+s8TSi5v5lFJWJ/4=";
   };
 
diff --git a/pkgs/by-name/au/audio-sharing/package.nix b/pkgs/by-name/au/audio-sharing/package.nix
index 955d8ad736e3..a4314ba3df72 100644
--- a/pkgs/by-name/au/audio-sharing/package.nix
+++ b/pkgs/by-name/au/audio-sharing/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "AudioSharing";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-yUMiy5DaCPfCmBIGCXpqtvSSmQl5wo6vsLdW7Tt/Wfo=";
   };
 
diff --git a/pkgs/by-name/au/audiowaveform/package.nix b/pkgs/by-name/au/audiowaveform/package.nix
index 2d5d23cb35bb..405baa28b1c4 100644
--- a/pkgs/by-name/au/audiowaveform/package.nix
+++ b/pkgs/by-name/au/audiowaveform/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bbc";
     repo = "audiowaveform";
-    rev = version;
+    tag = version;
     sha256 = "sha256-FcQq0xWs3jH2MfhFQ5r5Vaz8B3akBHBSg8Z/k9An/Wg=";
   };
 
diff --git a/pkgs/by-name/au/augustus/package.nix b/pkgs/by-name/au/augustus/package.nix
index e2aa70b1694f..cf054280d1e8 100644
--- a/pkgs/by-name/au/augustus/package.nix
+++ b/pkgs/by-name/au/augustus/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Keriew";
     repo = "augustus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UWJmxirRJJqvL4ZSjBvFepeKVvL77+WMp4YdZuFNEkg=";
   };
 
diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index 86c096f829ed..c0d6f2a4ba50 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -178,7 +178,7 @@ let
         src = fetchFromGitHub {
           owner = "encode";
           repo = "django-rest-framework";
-          rev = version;
+          tag = version;
           hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4=";
         };
 
diff --git a/pkgs/by-name/au/authz0/package.nix b/pkgs/by-name/au/authz0/package.nix
index fa500b9b8064..e6fada631e37 100644
--- a/pkgs/by-name/au/authz0/package.nix
+++ b/pkgs/by-name/au/authz0/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hahwul";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NrArxuhzd57NIdM4d9p/wfCB1e6l83pV+cjjCgZ9YtM=";
   };
 
diff --git a/pkgs/by-name/au/autokey/package.nix b/pkgs/by-name/au/autokey/package.nix
index 9e2b40106a22..799e1542bec8 100644
--- a/pkgs/by-name/au/autokey/package.nix
+++ b/pkgs/by-name/au/autokey/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "autokey";
     repo = "autokey";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d1WJLqkdC7QgzuYdnxYhajD3DtCpgceWCAxGrk0KKew=";
   };
 
diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index 8347e677dced..7a2b8f33bf71 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = "automatic-timezoned";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-j7wQ7jUiXpiDdGBDSiGkIcnnrwkJZESiwB4yqxp0moU=";
   };
 
diff --git a/pkgs/by-name/au/automaticcomponenttoolkit/package.nix b/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
index ab3dd790aa06..fb8abce7a854 100644
--- a/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
+++ b/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Autodesk";
     repo = "AutomaticComponentToolkit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1r0sbw82cf9dbcj3vgnbd4sc1lklzvijic2z5wgkvs21azcm0yzh";
   };
 
diff --git a/pkgs/by-name/au/automirror/package.nix b/pkgs/by-name/au/automirror/package.nix
index 8d8376542d28..f6b334fd0359 100644
--- a/pkgs/by-name/au/automirror/package.nix
+++ b/pkgs/by-name/au/automirror/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "schlomo";
     repo = "automirror";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1syyf7dcm8fbyw31cpgmacg80h7pg036dayaaf0svvdsk0hqlsch";
   };
 
diff --git a/pkgs/by-name/au/automysqlbackup/package.nix b/pkgs/by-name/au/automysqlbackup/package.nix
index 24f8dea0e6cd..da92e32ccfb2 100644
--- a/pkgs/by-name/au/automysqlbackup/package.nix
+++ b/pkgs/by-name/au/automysqlbackup/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sixhop";
     repo = "automysqlbackup";
-    rev = version;
+    tag = version;
     sha256 = "sha256-C0p1AY4yIxybQ6a/HsE3ZTHumtvQw5kKM51Ap+Se0ZI=";
   };
 
diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix
index 3713dd359c3d..9d5b9cbe8665 100644
--- a/pkgs/by-name/au/autoprefixer/package.nix
+++ b/pkgs/by-name/au/autoprefixer/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "postcss";
     repo = "autoprefixer";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-25FVNUXMEuzPJtpld/GHEppspa2ns7fAuniBCltSync=";
   };
 
diff --git a/pkgs/by-name/au/autoraise/package.nix b/pkgs/by-name/au/autoraise/package.nix
index 9f0f1a19aa86..8a31a54e7f98 100644
--- a/pkgs/by-name/au/autoraise/package.nix
+++ b/pkgs/by-name/au/autoraise/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sbmpost";
     repo = "AutoRaise";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OsvmNHpQ46+cWkR4Nz/9oIgSFSWLfCwZnAnRKRiNm5E=";
   };
 
diff --git a/pkgs/by-name/au/autorestic/package.nix b/pkgs/by-name/au/autorestic/package.nix
index 4df100e0bfaf..31f322ef7b0e 100644
--- a/pkgs/by-name/au/autorestic/package.nix
+++ b/pkgs/by-name/au/autorestic/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cupcakearmy";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rladzcW6l5eR6ICj4kKd4e2R9vRIV/1enCzHLFdQDlk=";
   };
 
diff --git a/pkgs/by-name/au/autotiling-rs/package.nix b/pkgs/by-name/au/autotiling-rs/package.nix
index 93547ad1bc41..8a28c960559e 100644
--- a/pkgs/by-name/au/autotiling-rs/package.nix
+++ b/pkgs/by-name/au/autotiling-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ammgws";
     repo = "autotiling-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LQbmF2M6pWa0QEbKF770x8TFLMGrJeq5HnXHvLrDDPA=";
   };
 
diff --git a/pkgs/by-name/au/autotrace/package.nix b/pkgs/by-name/au/autotrace/package.nix
index 40be3cef2fa8..983a215a4697 100644
--- a/pkgs/by-name/au/autotrace/package.nix
+++ b/pkgs/by-name/au/autotrace/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "autotrace";
     repo = "autotrace";
-    rev = version;
+    tag = version;
     hash = "sha256-8qqB6oKmbz95dNLtdLvb69cEj/P7TzdoKEyJ8+4ITzs=";
   };
 
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 3bea156c1c91..006194e38158 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation (
       src = fetchFromGitHub {
         owner = "AvaloniaUI";
         repo = "Avalonia";
-        rev = version;
+        tag = version;
         fetchSubmodules = true;
         hash = "sha256-Du8DEsZKl7rnVH9YZKAWTCpEQ/5HrNlgacgK/46kx/o=";
       };
diff --git a/pkgs/by-name/av/aviator/package.nix b/pkgs/by-name/av/aviator/package.nix
index 17b7a7d2e7cf..12bb580c456b 100644
--- a/pkgs/by-name/av/aviator/package.nix
+++ b/pkgs/by-name/av/aviator/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "herrjulz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Oa4z8n+q7LKWMnwk+xj9UunzOa3ChaPBCTo828yYJGQ=";
   };
 
diff --git a/pkgs/by-name/av/avizo/package.nix b/pkgs/by-name/av/avizo/package.nix
index 47a44f05aa73..606b0f1870d3 100644
--- a/pkgs/by-name/av/avizo/package.nix
+++ b/pkgs/by-name/av/avizo/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "misterdanb";
     repo = "avizo";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Vj8OrNlAstl0AXTeVAPdEf5JgnAmJwl9s3Jdc0ZiYQc=";
   };
 
diff --git a/pkgs/by-name/av/avra/package.nix b/pkgs/by-name/av/avra/package.nix
index 1d7c1556380a..61f106ce8517 100644
--- a/pkgs/by-name/av/avra/package.nix
+++ b/pkgs/by-name/av/avra/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ro5bert";
     repo = "avra";
-    rev = version;
+    tag = version;
     hash = "sha256-joOj89WZ9Si5fcu1w1VHj5fOcnB9N2313Yb29A+nCCY=";
   };
 
diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix
index 5f412c36b8e6..29fefa700f39 100644
--- a/pkgs/by-name/aw/await/package.nix
+++ b/pkgs/by-name/aw/await/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "slavaGanzin";
     repo = "await";
-    rev = version;
+    tag = version;
     hash = "sha256-Yrit1WdWIfjwqbjvyjrPT3EqSSkooYX+uoOstbxy//I=";
   };
 
diff --git a/pkgs/by-name/aw/awatcher/package.nix b/pkgs/by-name/aw/awatcher/package.nix
index 9dd509ecdf28..3961efc6f8bc 100644
--- a/pkgs/by-name/aw/awatcher/package.nix
+++ b/pkgs/by-name/aw/awatcher/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "2e3s";
     repo = "awatcher";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bxFc6oM+evIQTjrsWmb7dXOUlSjurjc4CzHpxB+667c=";
   };
 
diff --git a/pkgs/by-name/aw/awf/package.nix b/pkgs/by-name/aw/awf/package.nix
index 9423dda218c6..9560ed02e71b 100644
--- a/pkgs/by-name/aw/awf/package.nix
+++ b/pkgs/by-name/aw/awf/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "valr";
     repo = "awf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-auth/package.nix b/pkgs/by-name/aw/aws-c-auth/package.nix
index d915ec34e562..010b19a650e4 100644
--- a/pkgs/by-name/aw/aws-c-auth/package.nix
+++ b/pkgs/by-name/aw/aws-c-auth/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-auth";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-p8D79BRjaPlhzap/FWbqMlkrbVELSgeJW8CljxBAaCI=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-common/package.nix b/pkgs/by-name/aw/aws-c-common/package.nix
index 2c33c7f38b49..190009747a84 100644
--- a/pkgs/by-name/aw/aws-c-common/package.nix
+++ b/pkgs/by-name/aw/aws-c-common/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-common";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sA6CsLLHh4Ce/+ffl4OhisMSgdrD+EmXvTNGSq7/vvk=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-compression/package.nix b/pkgs/by-name/aw/aws-c-compression/package.nix
index dfd3f53b2935..a593fc2ef4a7 100644
--- a/pkgs/by-name/aw/aws-c-compression/package.nix
+++ b/pkgs/by-name/aw/aws-c-compression/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-compression";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-EjvOf2UMju6pycPdYckVxqQ34VOhrIIyvK+O3AVRED4=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-event-stream/package.nix b/pkgs/by-name/aw/aws-c-event-stream/package.nix
index 24ad66a12d85..5a291f643fc5 100644
--- a/pkgs/by-name/aw/aws-c-event-stream/package.nix
+++ b/pkgs/by-name/aw/aws-c-event-stream/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-event-stream";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lg1qS/u5Fi8nt/tv2ekd8dgQ7rlrF3DrRxqidAoEywY=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-http/package.nix b/pkgs/by-name/aw/aws-c-http/package.nix
index 37a52c7c985f..d0a5641a5982 100644
--- a/pkgs/by-name/aw/aws-c-http/package.nix
+++ b/pkgs/by-name/aw/aws-c-http/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-http";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3nT64dFUcuwPfhQDwY5MTe/xPdr7XZMBpVL7V0y9tng=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-mqtt/package.nix b/pkgs/by-name/aw/aws-c-mqtt/package.nix
index 1734aea049ad..ff78ffac13b6 100644
--- a/pkgs/by-name/aw/aws-c-mqtt/package.nix
+++ b/pkgs/by-name/aw/aws-c-mqtt/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-mqtt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gIoC3OG6VFzNH9/DjuC42eCIuN+w1AikaGAbx6ao8qQ=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-s3/package.nix b/pkgs/by-name/aw/aws-c-s3/package.nix
index 0282ca459b94..0faf13d738c4 100644
--- a/pkgs/by-name/aw/aws-c-s3/package.nix
+++ b/pkgs/by-name/aw/aws-c-s3/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-s3";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UE42U3UszobaUdo0ry9IlwTbSbGqmYkux19ILrVgUZY=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-sdkutils/package.nix b/pkgs/by-name/aw/aws-c-sdkutils/package.nix
index 2de7db683f34..82b39fbd5c0d 100644
--- a/pkgs/by-name/aw/aws-c-sdkutils/package.nix
+++ b/pkgs/by-name/aw/aws-c-sdkutils/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-sdkutils";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Z9c+uBiGMXW5v+khdNaElhno16ikBO4voTzwd2mP6rA=";
   };
 
diff --git a/pkgs/by-name/aw/aws-checksums/package.nix b/pkgs/by-name/aw/aws-checksums/package.nix
index 6e1645620942..ec6d606be2ad 100644
--- a/pkgs/by-name/aw/aws-checksums/package.nix
+++ b/pkgs/by-name/aw/aws-checksums/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-checksums";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hiqV6FrOZ19YIxL3UKBuexLJwoC2mY7lqysnV7ze0gg=";
   };
 
diff --git a/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix b/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
index 423e02117daf..d1acec866719 100644
--- a/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
+++ b/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sktan";
     repo = "aws-codeartifact-proxy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+P0AIg5m7nePy+Yd445nVfLVxya80Om9lJTPKZeTshc=";
   };
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/by-name/aw/aws-crt-cpp/package.nix b/pkgs/by-name/aw/aws-crt-cpp/package.nix
index 3cf463a5fdf1..1404d5b2851c 100644
--- a/pkgs/by-name/aw/aws-crt-cpp/package.nix
+++ b/pkgs/by-name/aw/aws-crt-cpp/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-crt-cpp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Uv1BHM39f9soq7kziedqRhHqQ/xwnqcz++1UM5nuo8g=";
   };
 
diff --git a/pkgs/by-name/aw/aws-gate/package.nix b/pkgs/by-name/aw/aws-gate/package.nix
index b7282325d761..51822e511954 100644
--- a/pkgs/by-name/aw/aws-gate/package.nix
+++ b/pkgs/by-name/aw/aws-gate/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xen0l";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-9w2jP4s1HXf1gYiXX05Dt2iXt0bR0U48yc8h9T5M+EQ=";
   };
 
diff --git a/pkgs/by-name/aw/aws-lambda-rie/package.nix b/pkgs/by-name/aw/aws-lambda-rie/package.nix
index a259673271c9..028577305fcb 100644
--- a/pkgs/by-name/aw/aws-lambda-rie/package.nix
+++ b/pkgs/by-name/aw/aws-lambda-rie/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-lambda-runtime-interface-emulator";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zbeaWbvWk3duBfdUb70G/O4gO20NSHiwuTUZjtGlM3Q=";
   };
 
diff --git a/pkgs/by-name/aw/aws-rotate-key/package.nix b/pkgs/by-name/aw/aws-rotate-key/package.nix
index b75901f3b0dc..248fab061641 100644
--- a/pkgs/by-name/aw/aws-rotate-key/package.nix
+++ b/pkgs/by-name/aw/aws-rotate-key/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Fullscreen";
     repo = "aws-rotate-key";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fYpgHHOw0k/8WLGhq+uVOvoF4Wff6wzTXuN8r4D+TmU=";
   };
 
diff --git a/pkgs/by-name/aw/aws-signing-helper/package.nix b/pkgs/by-name/aw/aws-signing-helper/package.nix
index 3b9ee9e1b363..7caa586ed600 100644
--- a/pkgs/by-name/aw/aws-signing-helper/package.nix
+++ b/pkgs/by-name/aw/aws-signing-helper/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "rolesanywhere-credential-helper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CIUhO+5gMIknB3NwYwaBbtZEkW2x/U2Bi9Qbqn9bLuc=";
   };
   vendorHash = "sha256-QKKgBIocJoGbfs78PxNBLBi4KTDPtSuhzvsb6OBhNWQ=";
diff --git a/pkgs/by-name/aw/aws-sso-cli/package.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix
index 99412edca5e0..b473b3b877b4 100644
--- a/pkgs/by-name/aw/aws-sso-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sso-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "synfinatic";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VEI+vCNeNoFOE+2j/OUjRszXsUQP2E1iUdPUW9X3tHk=";
   };
   vendorHash = "sha256-a57RtK8PxwaRrSA6W6R//GacZ+pK8mBi4ZASS5NvShE=";
diff --git a/pkgs/by-name/aw/aws-sso-creds/package.nix b/pkgs/by-name/aw/aws-sso-creds/package.nix
index 3a7a5f115f67..a4533dbc4074 100644
--- a/pkgs/by-name/aw/aws-sso-creds/package.nix
+++ b/pkgs/by-name/aw/aws-sso-creds/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jaxxstorm";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QYE+HvvBEWPxopVP8QMqb4lNRyAtVDewuiWzja9XdM4=";
   };
   vendorHash = "sha256-2EDpyw7Mqhvc0i6+UjWfNlvndRYJDaezRkOy9PBeD1Y=";
diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index bd08e2269a09..c1c0bae1a601 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "99designs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Qs4vxFgehWQYYECBGBSU8YI/BHLwOQUO5wBlNEUzD7c=";
   };
 
diff --git a/pkgs/by-name/aw/awsbck/package.nix b/pkgs/by-name/aw/awsbck/package.nix
index b43f46683510..0cd7179f7c7f 100644
--- a/pkgs/by-name/aw/awsbck/package.nix
+++ b/pkgs/by-name/aw/awsbck/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "beeb";
     repo = "awsbck";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-C5QaOxZ9DQuda+slf8uqPQYVgDtS5Lhm3AFn8K2G/T4=";
   };
 
diff --git a/pkgs/by-name/aw/awslogs/package.nix b/pkgs/by-name/aw/awslogs/package.nix
index e90da6b3fee4..93ba02e9f1fa 100644
--- a/pkgs/by-name/aw/awslogs/package.nix
+++ b/pkgs/by-name/aw/awslogs/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jorgebastida";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-o6xZqwlqAy01P+TZ0rB5rpEddWNUBzzHp7/cycpcwes=";
   };
 
diff --git a/pkgs/by-name/aw/awsls/package.nix b/pkgs/by-name/aw/awsls/package.nix
index 4ea289d01b55..94ef12ea71c3 100644
--- a/pkgs/by-name/aw/awsls/package.nix
+++ b/pkgs/by-name/aw/awsls/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jckuester";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-iy9tohmVUtNXYVfe6pZ+pbbLlcK6Fu1GgzTWMD+3xP0=";
   };
 
diff --git a/pkgs/by-name/aw/awsrm/package.nix b/pkgs/by-name/aw/awsrm/package.nix
index 20d0e120ed43..a9a9ffb01496 100644
--- a/pkgs/by-name/aw/awsrm/package.nix
+++ b/pkgs/by-name/aw/awsrm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jckuester";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KAujqYDtZbCBRO5WK9b9mxqe84ZllbBoO2tLnDH/bdo=";
   };
 
diff --git a/pkgs/by-name/aw/awsweeper/package.nix b/pkgs/by-name/aw/awsweeper/package.nix
index 2a37ef68238e..8e41ee296cdd 100644
--- a/pkgs/by-name/aw/awsweeper/package.nix
+++ b/pkgs/by-name/aw/awsweeper/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jckuester";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5D/4Z8ADlA+4+2EINmP5OfX5exzhfbq2TydPRlJDA6Y=";
   };
 
diff --git a/pkgs/by-name/ax/axmldec/package.nix b/pkgs/by-name/ax/axmldec/package.nix
index 7d8fba5a6d0d..6bc4a94e4d5d 100644
--- a/pkgs/by-name/ax/axmldec/package.nix
+++ b/pkgs/by-name/ax/axmldec/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ytsutano";
     repo = "axmldec";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-LFDZZbRDa8mQmglgS4DA/OqXp0HJZ2uqg1hbStdgvUw=";
   };
diff --git a/pkgs/by-name/ay/ayatana-ido/package.nix b/pkgs/by-name/ay/ayatana-ido/package.nix
index 904788c65c51..1639e1dbfe6e 100644
--- a/pkgs/by-name/ay/ayatana-ido/package.nix
+++ b/pkgs/by-name/ay/ayatana-ido/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-ido";
-    rev = version;
+    tag = version;
     sha256 = "sha256-KeErrT2umMaIVfLDr4CcQCmFrMb8/h6pNYbunuC/JtI=";
   };
 
diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix
index 98680949229f..8c25649b146a 100644
--- a/pkgs/by-name/az/azimuth/package.nix
+++ b/pkgs/by-name/az/azimuth/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mdsteele";
     repo = "azimuth";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1znfvpmqiixd977jv748glk5zc4cmhw5813zp81waj07r9b0828r";
   };
 
diff --git a/pkgs/by-name/az/azpainter/package.nix b/pkgs/by-name/az/azpainter/package.nix
index 256f18b8a7e4..d6191bd97634 100644
--- a/pkgs/by-name/az/azpainter/package.nix
+++ b/pkgs/by-name/az/azpainter/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "azelpg";
     repo = "azpainter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5rNLGF/mkW+rBH9vuIPCJHciyf4NhG17Es+X6l4xIoQ=";
   };
 
diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/package.nix b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix
index fa7bf76cc32f..492ae4366e17 100644
--- a/pkgs/by-name/az/azure-artifacts-credprovider/package.nix
+++ b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix
@@ -11,7 +11,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "artifacts-credprovider";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JbcoDs4c/+uKIgVWZkuo4jqd1hlqe+H949jNfkDwZls=";
   };
   pname = "azure-artifacts-credprovider";
diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix
index 1e0fdda3c287..4defed9758d5 100644
--- a/pkgs/by-name/az/azurite/package.nix
+++ b/pkgs/by-name/az/azurite/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "Azurite";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aH9FAT49y4k87lzerQdgLqi+ZlucORQX4w1NBFtEfMw=";
   };
 
diff --git a/pkgs/by-name/b6/b612/package.nix b/pkgs/by-name/b6/b612/package.nix
index 1fee278400e5..77e0b38f3c1b 100644
--- a/pkgs/by-name/b6/b612/package.nix
+++ b/pkgs/by-name/b6/b612/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "polarsys";
     repo = "b612";
-    rev = version;
+    tag = version;
     hash = "sha256-uyBC8UNOwztCHXhR9XZuWDwrty0eClbo0E+gI1PmjEg=";
   };
 
diff --git a/pkgs/by-name/ba/babeltrace2/package.nix b/pkgs/by-name/ba/babeltrace2/package.nix
index ec9f15e679f8..be77bf5922f0 100644
--- a/pkgs/by-name/ba/babeltrace2/package.nix
+++ b/pkgs/by-name/ba/babeltrace2/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "efficios";
     repo = "babeltrace";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L4YTqPxvWynUBnmAQnlJ2RNbEv9MhBxQOsqbWix8ZwU=";
   };
 
diff --git a/pkgs/by-name/ba/backdown/package.nix b/pkgs/by-name/ba/backdown/package.nix
index 412f7eee97e8..c92de1809045 100644
--- a/pkgs/by-name/ba/backdown/package.nix
+++ b/pkgs/by-name/ba/backdown/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "backdown";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3+XmMRZz3SHF1sL+/CUvu4uQ2scE4ACpcC0r4nWhdkM=";
   };
 
diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix
index 1b963d940c7d..0cf81d84679e 100644
--- a/pkgs/by-name/ba/backgroundremover/package.nix
+++ b/pkgs/by-name/ba/backgroundremover/package.nix
@@ -21,7 +21,7 @@ let
     src = fetchFromGitHub {
       owner = "nadermx";
       repo = "backgroundremover";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-tQ8J3xamOzPPSbFMxIDYKv1TzK1AVwF/DWXdZlrlYvM=";
     };
 
diff --git a/pkgs/by-name/ba/backlight-auto/package.nix b/pkgs/by-name/ba/backlight-auto/package.nix
index 3d8dc7338a9c..6b77230e2a42 100644
--- a/pkgs/by-name/ba/backlight-auto/package.nix
+++ b/pkgs/by-name/ba/backlight-auto/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lf94";
     repo = "backlight-auto";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-QPymwlDrgKM/SXDzJdmfzWLSLU2D7egif1OIUE+SHoI=";
   };
 
diff --git a/pkgs/by-name/ba/backward-cpp/package.nix b/pkgs/by-name/ba/backward-cpp/package.nix
index 84e877ec9642..878e8ae9304a 100644
--- a/pkgs/by-name/ba/backward-cpp/package.nix
+++ b/pkgs/by-name/ba/backward-cpp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bombela";
     repo = "backward-cpp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw=";
   };
 
diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix
index 9dc855b9ded8..cd7975c71b9a 100644
--- a/pkgs/by-name/ba/badger/package.nix
+++ b/pkgs/by-name/ba/badger/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "badger";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W3vPTLGI7YT7dFklJnOcpfYqQ9aBCsel9L6q4WNincY=";
   };
 
diff --git a/pkgs/by-name/ba/badrobot/package.nix b/pkgs/by-name/ba/badrobot/package.nix
index b43b46894d58..d90d91469108 100644
--- a/pkgs/by-name/ba/badrobot/package.nix
+++ b/pkgs/by-name/ba/badrobot/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "controlplaneio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-U3b5Xw+GjnAEXteivztHdcAcXx7DYtgaUbW5oax0mIk=";
   };
   vendorHash = "sha256-oYdkCEdrw1eE5tnKveeJM3upRy8hOVc24JNN1bLX+ec=";
diff --git a/pkgs/by-name/ba/badvpn/package.nix b/pkgs/by-name/ba/badvpn/package.nix
index d5fc259f1904..9f3372510b09 100644
--- a/pkgs/by-name/ba/badvpn/package.nix
+++ b/pkgs/by-name/ba/badvpn/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ambrop72";
     repo = "badvpn";
-    rev = version;
+    tag = version;
     sha256 = "sha256-bLTDpq3ohUP+KooPvhv1/AZfdo0HwB3g9QOuE2E/pmY=";
   };
 
diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix
index 02cf013e0635..d110f779944b 100644
--- a/pkgs/by-name/ba/baidupcs-go/package.nix
+++ b/pkgs/by-name/ba/baidupcs-go/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "qjfoidnh";
     repo = "BaiduPCS-Go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-C88q2tNNuX+tIvYKHbRE76xfPe81UHqfezyRXzrxzlc=";
   };
 
diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index 2672e0fb03db..25116735b3e1 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -27,7 +27,7 @@ buildNpmPackage' rec {
   src = fetchFromGitHub {
     owner = "balena-io";
     repo = "balena-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-44r0dbcX/KRmfucNy4p/OMrKFC2J8P9eQpwTOTOmwS4=";
   };
 
diff --git a/pkgs/by-name/ba/balls/package.nix b/pkgs/by-name/ba/balls/package.nix
index 04f6d701bb0f..7a0cba8ff0ca 100644
--- a/pkgs/by-name/ba/balls/package.nix
+++ b/pkgs/by-name/ba/balls/package.nix
@@ -13,7 +13,7 @@ buildNimPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "disruptek";
     repo = "balls";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-CMYkMkekVI0C1WUds+KBbRfjMte42kBAB2ddtQp8d+k=";
   };
 
diff --git a/pkgs/by-name/ba/bam/package.nix b/pkgs/by-name/ba/bam/package.nix
index 21493a5530b1..b4c0c0fc2a2d 100644
--- a/pkgs/by-name/ba/bam/package.nix
+++ b/pkgs/by-name/ba/bam/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matricks";
     repo = "bam";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6";
   };
 
diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index 69290e946837..ac83ba7fbf2c 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bambulab";
     repo = "BambuStudio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LvAi3I5lnnumhOUagyej28uVy0Lgd3e19HNQXOUWSvQ=";
   };
 
diff --git a/pkgs/by-name/ba/bamf/package.nix b/pkgs/by-name/ba/bamf/package.nix
index d79106094b6d..9b29908bf13f 100644
--- a/pkgs/by-name/ba/bamf/package.nix
+++ b/pkgs/by-name/ba/bamf/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.launchpad.net/~unity-team/bamf";
-    rev = version;
+    tag = version;
     sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ=";
   };
 
diff --git a/pkgs/by-name/ba/bandwhich/package.nix b/pkgs/by-name/ba/bandwhich/package.nix
index 65a9950e3061..6649de803055 100644
--- a/pkgs/by-name/ba/bandwhich/package.nix
+++ b/pkgs/by-name/ba/bandwhich/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "imsnif";
     repo = "bandwhich";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gXPX5drVXsfkssPMdhqIpFsYNSbelE9mKwO+nGEy4Qs=";
   };
 
diff --git a/pkgs/by-name/ba/bankstown-lv2/package.nix b/pkgs/by-name/ba/bankstown-lv2/package.nix
index 4ae21dc9ea9b..31a320167a27 100644
--- a/pkgs/by-name/ba/bankstown-lv2/package.nix
+++ b/pkgs/by-name/ba/bankstown-lv2/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chadmed";
     repo = "bankstown";
-    rev = version;
+    tag = version;
     hash = "sha256-IThXEY+mvT2MCw0PSWU/182xbUafd6dtm6hNjieLlKg=";
   };
 
diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix
index 93e6de1921e6..5cc2d39e6f06 100644
--- a/pkgs/by-name/ba/bant/package.nix
+++ b/pkgs/by-name/ba/bant/package.nix
@@ -25,7 +25,7 @@ buildBazelPackage rec {
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "bant";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Qq35WhRFpmQwWPupcjnUo/SEFRSRynVIx+PiHEsGED8=";
   };
 
diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix
index b0d677f0310d..86b20dbc246a 100644
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "baresip";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo=";
   };
   prePatch =
diff --git a/pkgs/by-name/ba/bartib/package.nix b/pkgs/by-name/ba/bartib/package.nix
index 11c27676d2ba..5f88bf20b107 100644
--- a/pkgs/by-name/ba/bartib/package.nix
+++ b/pkgs/by-name/ba/bartib/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nikolassv";
     repo = "bartib";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eVLacxKD8seD8mxVN1D3HhKZkIDXsEsSisZnFbmhpSk=";
   };
 
diff --git a/pkgs/by-name/ba/base16-universal-manager/package.nix b/pkgs/by-name/ba/base16-universal-manager/package.nix
index 8918ddd20f31..eeb5fad6d0d3 100644
--- a/pkgs/by-name/ba/base16-universal-manager/package.nix
+++ b/pkgs/by-name/ba/base16-universal-manager/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pinpox";
     repo = "base16-universal-manager";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9KflJ863j0VeOyu6j6O28VafetRrM8FW818qCvqhaoY=";
   };
 
diff --git a/pkgs/by-name/ba/base16384/package.nix b/pkgs/by-name/ba/base16384/package.nix
index b5d004c7d71d..3612ceed31ee 100644
--- a/pkgs/by-name/ba/base16384/package.nix
+++ b/pkgs/by-name/ba/base16384/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fumiama";
     repo = "base16384";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2HZeom+8eEH4CrphCoOV+wJbqhYKVUcAQrYLyEVACkQ=";
   };
 
diff --git a/pkgs/by-name/ba/bash-env-json/package.nix b/pkgs/by-name/ba/bash-env-json/package.nix
index cf1c63ad2518..ec901aea6b4f 100644
--- a/pkgs/by-name/ba/bash-env-json/package.nix
+++ b/pkgs/by-name/ba/bash-env-json/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tesujimath";
     repo = "bash-env-json";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-gyqj5r11DOfXd23LT7qwRLEoWvpHUbxbd28QJnlWTaQ=";
   };
 
diff --git a/pkgs/by-name/ba/bash-preexec/package.nix b/pkgs/by-name/ba/bash-preexec/package.nix
index 74c76239599d..52a3fe370597 100644
--- a/pkgs/by-name/ba/bash-preexec/package.nix
+++ b/pkgs/by-name/ba/bash-preexec/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "rcaloras";
     repo = "bash-preexec";
-    rev = version;
+    tag = version;
     sha256 = "sha256-+FU5n7EkY78X5nUiW3WN9+6Bf6oiPjsG2MSRCleooFs=";
   };
 
diff --git a/pkgs/by-name/ba/bashSnippets/package.nix b/pkgs/by-name/ba/bashSnippets/package.nix
index 0dc28d54d75a..1c529322e923 100644
--- a/pkgs/by-name/ba/bashSnippets/package.nix
+++ b/pkgs/by-name/ba/bashSnippets/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "alexanderepstein";
     repo = "Bash-Snippets";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "044nxgd3ic2qr6hgq5nymn3dyf5i4s8mv5z4az6jvwlrjnvbg8cp";
   };
 
diff --git a/pkgs/by-name/ba/bash_unit/package.nix b/pkgs/by-name/ba/bash_unit/package.nix
index f50f0bc9bfa1..b127eee37980 100644
--- a/pkgs/by-name/ba/bash_unit/package.nix
+++ b/pkgs/by-name/ba/bash_unit/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pgrange";
     repo = "bash_unit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-n5ehN7NrWID72xP7EYOk/mpnQJaDn71esIugWrLbZr0=";
   };
 
diff --git a/pkgs/by-name/ba/bashcards/package.nix b/pkgs/by-name/ba/bashcards/package.nix
index bf0f03f9a80e..4d6a2114d1bc 100644
--- a/pkgs/by-name/ba/bashcards/package.nix
+++ b/pkgs/by-name/ba/bashcards/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rpearce";
     repo = "bashcards";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1rpqrh0022sbrjvd55a0jvpdqhhka5msf8dsz6adbbmxy3xzgdid";
   };
 
diff --git a/pkgs/by-name/ba/bashmount/package.nix b/pkgs/by-name/ba/bashmount/package.nix
index 915d09a2c5cf..da584d14f5e0 100644
--- a/pkgs/by-name/ba/bashmount/package.nix
+++ b/pkgs/by-name/ba/bashmount/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jamielinux";
     repo = "bashmount";
-    rev = version;
+    tag = version;
     sha256 = "1irw47s6i1qwxd20cymzlfw5sv579cw877l27j3p66qfhgadwxrl";
   };
 
diff --git a/pkgs/by-name/ba/bastet/package.nix b/pkgs/by-name/ba/bastet/package.nix
index ef77b94218b3..593707065c44 100644
--- a/pkgs/by-name/ba/bastet/package.nix
+++ b/pkgs/by-name/ba/bastet/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fph";
     repo = "bastet";
-    rev = version;
+    tag = version;
     sha256 = "09kamxapm9jw9przpsgjfg33n9k94bccv65w95dakj0br33a75wn";
   };
 
diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix
index 02a542c0f0b0..d3ea84ce766a 100644
--- a/pkgs/by-name/ba/bat/package.nix
+++ b/pkgs/by-name/ba/bat/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "bat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-82IhLhw0TdaMh21phBxcUZ5JI5xOXb0DrwnBmPwyfAQ=";
   };
 
diff --git a/pkgs/by-name/ba/bato/package.nix b/pkgs/by-name/ba/bato/package.nix
index 2c840dd1075a..cee994e610d1 100644
--- a/pkgs/by-name/ba/bato/package.nix
+++ b/pkgs/by-name/ba/bato/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "doums";
     repo = "bato";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-i2gw8vXiKutq26ACzkVXH3kED7jAngSv2mNo9P3qXnA=";
   };
 
diff --git a/pkgs/by-name/ba/bats/package.nix b/pkgs/by-name/ba/bats/package.nix
index 91683dc96c3f..fcfbfb2097fd 100644
--- a/pkgs/by-name/ba/bats/package.nix
+++ b/pkgs/by-name/ba/bats/package.nix
@@ -33,7 +33,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bats-core";
     repo = "bats-core";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+qmCeLixfLak09XxgSe6ONcH1IoHGl5Au0s9JyNm95g=";
   };
 
diff --git a/pkgs/by-name/ba/batsignal/package.nix b/pkgs/by-name/ba/batsignal/package.nix
index ef6e34c57e8f..a3b3cedf19c1 100644
--- a/pkgs/by-name/ba/batsignal/package.nix
+++ b/pkgs/by-name/ba/batsignal/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "electrickite";
     repo = "batsignal";
-    rev = version;
+    tag = version;
     sha256 = "sha256-yngd2yP6XtRp8y8ZUd0NISdf8+8wJvpLogrQQMdB0lA=";
   };
 
diff --git a/pkgs/by-name/ba/bazel-buildtools/package.nix b/pkgs/by-name/ba/bazel-buildtools/package.nix
index 4b51c84c5ab6..f9286b2e2c95 100644
--- a/pkgs/by-name/ba/bazel-buildtools/package.nix
+++ b/pkgs/by-name/ba/bazel-buildtools/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "buildtools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m1z3i1rddwXZK5VF4qwhaMCS5U3FZ5SawJz/IgdRgdU=";
   };
 
diff --git a/pkgs/by-name/ba/bazel-gazelle/package.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix
index 5bfcb0b5ad6e..1230680ec575 100644
--- a/pkgs/by-name/ba/bazel-gazelle/package.nix
+++ b/pkgs/by-name/ba/bazel-gazelle/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cGRE+AX62U6lZbUEid0QWb9zMTiIemop6Gqrqvz5+nk=";
   };
 
diff --git a/pkgs/by-name/ba/bazel-kazel/package.nix b/pkgs/by-name/ba/bazel-kazel/package.nix
index 9144af8cf614..2be5b089d82a 100644
--- a/pkgs/by-name/ba/bazel-kazel/package.nix
+++ b/pkgs/by-name/ba/bazel-kazel/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "repo-infra";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Y9VOlFrFmJQCQuwf3UztHGuJqmq/lSibTbI3oGjtNuE=";
   };
 
diff --git a/pkgs/by-name/ba/bazel-remote/package.nix b/pkgs/by-name/ba/bazel-remote/package.nix
index bfe3fe7b9744..345b4b44ba3e 100644
--- a/pkgs/by-name/ba/bazel-remote/package.nix
+++ b/pkgs/by-name/ba/bazel-remote/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buchgr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vNj1w08g7364DcN2reIdamMxKNApKquf/CvFZx3Gu7A=";
   };
 
diff --git a/pkgs/by-name/ba/bazel-watcher/package.nix b/pkgs/by-name/ba/bazel-watcher/package.nix
index a53c794767a0..5b3ace88c7dd 100644
--- a/pkgs/by-name/ba/bazel-watcher/package.nix
+++ b/pkgs/by-name/ba/bazel-watcher/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "bazel-watcher";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5cRj04e5VVG4NSe4LOLkZIrerT4laLEDeXCqTiJj6MM=";
   };
 
diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix
index 85018dfb7ce5..2a202d00810a 100644
--- a/pkgs/by-name/ba/bazelisk/package.nix
+++ b/pkgs/by-name/ba/bazelisk/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1/J/Y2NlIghxQS/5CnGX+2z+glOeOZVEgSE4KWft9Zw=";
   };
 
diff --git a/pkgs/by-name/bb/bbin/package.nix b/pkgs/by-name/bb/bbin/package.nix
index f4a69d09e79b..e52bbb4173ac 100644
--- a/pkgs/by-name/bb/bbin/package.nix
+++ b/pkgs/by-name/bb/bbin/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "babashka";
     repo = "bbin";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-26uZqHSLi+qnilyPWt/2mCr1wyu1flxNd+jq9zbumrg=";
   };
 
diff --git a/pkgs/by-name/bc/bc-ur/package.nix b/pkgs/by-name/bc/bc-ur/package.nix
index 62c7cf0d8a20..48e5f8a85f8f 100644
--- a/pkgs/by-name/bc/bc-ur/package.nix
+++ b/pkgs/by-name/bc/bc-ur/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BlockchainCommons";
     repo = "bc-ur";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-j7nmAZH1OL7R5H3jqQomg7kwPOvIHMqrfSk7mq/f7Cg=";
   };
 
diff --git a/pkgs/by-name/bc/bcache-tools/package.nix b/pkgs/by-name/bc/bcache-tools/package.nix
index c070b5c10c94..40bc2e3d2e2d 100644
--- a/pkgs/by-name/bc/bcache-tools/package.nix
+++ b/pkgs/by-name/bc/bcache-tools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "g2p";
     repo = "bcache-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6gy0ymecMgEHXbwp/nXHlrUEeDFnmFXWZZPlzP292g4=";
   };
 
diff --git a/pkgs/by-name/bc/bcal/package.nix b/pkgs/by-name/bc/bcal/package.nix
index 20e29c252b8c..7c3d4a6ed9d3 100644
--- a/pkgs/by-name/bc/bcal/package.nix
+++ b/pkgs/by-name/bc/bcal/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "bcal";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PleWU2yyJzkUAZEvEYoCGdpEXqOgRvZK9zXTYrxRtQU=";
   };
 
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/bd/bdf2sfd/package.nix b/pkgs/by-name/bd/bdf2sfd/package.nix
index a1aac904fa2a..6f80caafaa8e 100644
--- a/pkgs/by-name/bd/bdf2sfd/package.nix
+++ b/pkgs/by-name/bd/bdf2sfd/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcambus";
     repo = "bdf2sfd";
-    rev = version;
+    tag = version;
     sha256 = "sha256-L1fIPZdVP4px73VbnEA6sb28WrmsNUJ2tqLeGPpwDbA=";
   };
 
diff --git a/pkgs/by-name/bd/bdsync/package.nix b/pkgs/by-name/bd/bdsync/package.nix
index 009bf3b6d855..4fd3645f49ed 100644
--- a/pkgs/by-name/bd/bdsync/package.nix
+++ b/pkgs/by-name/bd/bdsync/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rolffokkens";
     repo = "bdsync";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-58yoF6s0WjH+1mTY7X5OX53YgcnDmGxoCR8Kvl6lP+A=";
   };
 
diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix
index aefdee98f3f8..4462285b2c59 100644
--- a/pkgs/by-name/be/beancount-language-server/package.nix
+++ b/pkgs/by-name/be/beancount-language-server/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "polarmutex";
     repo = "beancount-language-server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aqWenvNAdDL7B7J1hvt+JXT73SJJKu9KFlpUReOp3s4=";
   };
 
diff --git a/pkgs/by-name/be/beanstalkd/package.nix b/pkgs/by-name/be/beanstalkd/package.nix
index f7cce03717ed..2404dd756fcb 100644
--- a/pkgs/by-name/be/beanstalkd/package.nix
+++ b/pkgs/by-name/be/beanstalkd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kr";
     repo = "beanstalkd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xoudhPad4diGGE8iZaY1/4LiENlKT2dYcIR6wlQdlTU=";
   };
 
diff --git a/pkgs/by-name/be/bear/package.nix b/pkgs/by-name/be/bear/package.nix
index 5ace2224e728..21888ed4b4f3 100644
--- a/pkgs/by-name/be/bear/package.nix
+++ b/pkgs/by-name/be/bear/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rizsotto";
     repo = "bear";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-fWNMjqF5PCjGfFGReKIUiJ5lv8z6j7HeBn5hvbnV2V4=";
   };
 
diff --git a/pkgs/by-name/be/beats/package.nix b/pkgs/by-name/be/beats/package.nix
index 2c21e45952ab..5eeff2287d50 100644
--- a/pkgs/by-name/be/beats/package.nix
+++ b/pkgs/by-name/be/beats/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "j0hax";
     repo = "beats";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1rdvsqrjpily74y8vwch711401585xckb4p41cfwrmj6vf44jhif";
   };
 
diff --git a/pkgs/by-name/be/bedops/package.nix b/pkgs/by-name/be/bedops/package.nix
index 70e8a99a7d7a..2088cfd9cd4e 100644
--- a/pkgs/by-name/be/bedops/package.nix
+++ b/pkgs/by-name/be/bedops/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bedops";
     repo = "bedops";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VJBoi1+tHA4oOVOsClUfimB+mOV5ZSQsDcDq3vAZwBA=";
   };
 
diff --git a/pkgs/by-name/be/bedtools/package.nix b/pkgs/by-name/be/bedtools/package.nix
index 67ba0d019e47..bed7dee3e7f9 100644
--- a/pkgs/by-name/be/bedtools/package.nix
+++ b/pkgs/by-name/be/bedtools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arq5x";
     repo = "bedtools2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rrk+FSv1bGL0D1lrIOsQu2AT7cw2T4lkDiCnzil5fpg=";
   };
 
diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix
index 3ad451df6c4f..532be65f9011 100644
--- a/pkgs/by-name/be/bee/package.nix
+++ b/pkgs/by-name/be/bee/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ethersphere";
     repo = "bee";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-44mjSeV8imatPpNkRSA5Uewunvkc5j6Eo+gKya+dqzE=";
   };
 
diff --git a/pkgs/by-name/be/beefi/package.nix b/pkgs/by-name/be/beefi/package.nix
index 1c8c084711a0..5834cd848e33 100644
--- a/pkgs/by-name/be/beefi/package.nix
+++ b/pkgs/by-name/be/beefi/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jfeick";
     repo = "beefi";
-    rev = version;
+    tag = version;
     sha256 = "1180avalbw414q1gnfqdgc9zg3k9y0401kw9qvcn51qph81d04v5";
   };
 
diff --git a/pkgs/by-name/be/beep/package.nix b/pkgs/by-name/be/beep/package.nix
index b1a37e5f9851..1e061afc5ced 100644
--- a/pkgs/by-name/be/beep/package.nix
+++ b/pkgs/by-name/be/beep/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spkr-beep";
     repo = "beep";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gDgGI9F+wW2cN89IwP93PkMv6vixJA2JckF78nxZ+TU=";
   };
 
diff --git a/pkgs/by-name/be/bees/package.nix b/pkgs/by-name/be/bees/package.nix
index 8bff2ce41d70..31034551c336 100644
--- a/pkgs/by-name/be/bees/package.nix
+++ b/pkgs/by-name/be/bees/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Zygo";
     repo = "bees";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-f3P3BEd8uO6QOZ1/2hBzdcuOSggYvHxW3g9pGftKO8g=";
   };
 
diff --git a/pkgs/by-name/be/behdad-fonts/package.nix b/pkgs/by-name/be/behdad-fonts/package.nix
index d61be9664231..590d22563421 100644
--- a/pkgs/by-name/be/behdad-fonts/package.nix
+++ b/pkgs/by-name/be/behdad-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "font-store";
     repo = "BehdadFont";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gKfzxo3/bCMKXl2d6SP07ahIiNrUyrk/SN5XLND2lWY=";
   };
 
diff --git a/pkgs/by-name/be/beidconnect/package.nix b/pkgs/by-name/be/beidconnect/package.nix
index 5acd92acefab..737482f22025 100644
--- a/pkgs/by-name/be/beidconnect/package.nix
+++ b/pkgs/by-name/be/beidconnect/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Fedict";
     repo = "fts-beidconnect";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-xkBldXOlgLMgrvzm7ajXzJ92mpXrxHD1RX4DeBxU3kk=";
   };
 
diff --git a/pkgs/by-name/be/bemenu/package.nix b/pkgs/by-name/be/bemenu/package.nix
index ace85ff9ec1b..dda60cc67611 100644
--- a/pkgs/by-name/be/bemenu/package.nix
+++ b/pkgs/by-name/be/bemenu/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Cloudef";
     repo = "bemenu";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-0vpqJ2jydTt6aVni0ma0g+80PFz+C4xJ5M77sMODkSg=";
   };
 
diff --git a/pkgs/by-name/be/benchexec/package.nix b/pkgs/by-name/be/benchexec/package.nix
index bca21cbc4506..b992caa71598 100644
--- a/pkgs/by-name/be/benchexec/package.nix
+++ b/pkgs/by-name/be/benchexec/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "sosy-lab";
     repo = "benchexec";
-    rev = version;
+    tag = version;
     hash = "sha256-lokz7klAQAascij0T/T43/PrbMh6ZUAvFnIqg13pVUk=";
   };
 
diff --git a/pkgs/by-name/be/bencode/package.nix b/pkgs/by-name/be/bencode/package.nix
index 776f1dcddf0d..9073e03a426e 100644
--- a/pkgs/by-name/be/bencode/package.nix
+++ b/pkgs/by-name/be/bencode/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fbdtemme";
     repo = "bencode";
-    rev = version;
+    tag = version;
     hash = "sha256-zpxvADZfYTUdlNLMZJSCanPL40EGl9BBCxR7oDhvOTw=";
   };
 
diff --git a/pkgs/by-name/be/bento4/package.nix b/pkgs/by-name/be/bento4/package.nix
index 2b7dc79faf2d..37c3eb671ca0 100644
--- a/pkgs/by-name/be/bento4/package.nix
+++ b/pkgs/by-name/be/bento4/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "axiomatic-systems";
     repo = "Bento4";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Qy8D3cbCVHmLAaXtiF64rL2oRurXNCtd5Dsgt0W7WdY=";
   };
 
diff --git a/pkgs/by-name/be/bepass/package.nix b/pkgs/by-name/be/bepass/package.nix
index 02d8b58a2208..231c46769269 100644
--- a/pkgs/by-name/be/bepass/package.nix
+++ b/pkgs/by-name/be/bepass/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bepass-org";
     repo = "bepass";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ruOhPWNs1WWM3r6X+6ch0HoDCu/a+IkBQiCr0Wh6yS8=";
   };
 
diff --git a/pkgs/by-name/be/berglas/package.nix b/pkgs/by-name/be/berglas/package.nix
index d5412784ba4a..4c0fe69484e7 100644
--- a/pkgs/by-name/be/berglas/package.nix
+++ b/pkgs/by-name/be/berglas/package.nix
@@ -40,7 +40,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bW8D8g4FPx0i4iPP7Pvm0UpaJFNsECR3kuHEZn8NLx0=";
   };
 
diff --git a/pkgs/by-name/be/berry/package.nix b/pkgs/by-name/be/berry/package.nix
index 0236acba7362..f63ddf7304b2 100644
--- a/pkgs/by-name/be/berry/package.nix
+++ b/pkgs/by-name/be/berry/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "JLErvin";
     repo = "berry";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-xMJRiLNtwVRQf9HiCF3ClLKEmdDNxcY35IYxe+L7+Hk=";
   };
 
diff --git a/pkgs/by-name/be/bettercap/package.nix b/pkgs/by-name/be/bettercap/package.nix
index e0d5de396d28..1d565afcb7cf 100644
--- a/pkgs/by-name/be/bettercap/package.nix
+++ b/pkgs/by-name/be/bettercap/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OND8WPqU/95rKykqMAPWmDsJ+AjsjGjrncZ2/m3mpt0=";
   };
 
diff --git a/pkgs/by-name/be/betterlockscreen/package.nix b/pkgs/by-name/be/betterlockscreen/package.nix
index ba1fce2551e0..d2d1c0f465c8 100644
--- a/pkgs/by-name/be/betterlockscreen/package.nix
+++ b/pkgs/by-name/be/betterlockscreen/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "betterlockscreen";
     repo = "betterlockscreen";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-59Ct7XIfZqU3yaW9FO7UV8SSMLdcZMPRc7WJangxFPo=";
   };
 
diff --git a/pkgs/by-name/bf/bfc/package.nix b/pkgs/by-name/bf/bfc/package.nix
index 72a38083412d..01d9b52b4116 100644
--- a/pkgs/by-name/bf/bfc/package.nix
+++ b/pkgs/by-name/bf/bfc/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Wilfred";
     repo = "bfc";
-    rev = version;
+    tag = version;
     hash = "sha256-5pcvwCtXWEexvV3TS62dZ6Opg8ANP2L8B0Z8u/OQENU=";
   };
 
diff --git a/pkgs/by-name/bf/bfs/package.nix b/pkgs/by-name/bf/bfs/package.nix
index 681a4db2e52d..1783ae619134 100644
--- a/pkgs/by-name/bf/bfs/package.nix
+++ b/pkgs/by-name/bf/bfs/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
-    rev = version;
+    tag = version;
     hash = "sha256-TXnoy+VWkS5ilW6QEtE6vd80FaJ/nIWGaeBJ/cjvquM=";
   };
 
diff --git a/pkgs/by-name/bg/bgpdump/package.nix b/pkgs/by-name/bg/bgpdump/package.nix
index 93b5528f16ae..fe9ec551ef7c 100644
--- a/pkgs/by-name/bg/bgpdump/package.nix
+++ b/pkgs/by-name/bg/bgpdump/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RIPE-NCC";
     repo = "bgpdump";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1HXMf9mHManR7jhonU2Agon0YFXOlM9APIN1Zm840AM=";
   };
 
diff --git a/pkgs/by-name/bg/bgpq3/package.nix b/pkgs/by-name/bg/bgpq3/package.nix
index de42af14b940..f4e95173b8f8 100644
--- a/pkgs/by-name/bg/bgpq3/package.nix
+++ b/pkgs/by-name/bg/bgpq3/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "snar";
     repo = "bgpq3";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rOpggVlXKaf3KBhfZ2lVooDaQA0iRjSbsLXF02GEyBw=";
   };
 
diff --git a/pkgs/by-name/bg/bgpq4/package.nix b/pkgs/by-name/bg/bgpq4/package.nix
index fab207596ba4..b5ff94576863 100644
--- a/pkgs/by-name/bg/bgpq4/package.nix
+++ b/pkgs/by-name/bg/bgpq4/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bgp";
     repo = "bgpq4";
-    rev = version;
+    tag = version;
     sha256 = "sha256-3mfFj9KoQbDe0gH7Le03N1Yds/bTEmY+OiXNaOtHkpY=";
   };
 
diff --git a/pkgs/by-name/bg/bgs/package.nix b/pkgs/by-name/bg/bgs/package.nix
index c37dfa311cbe..05aed4d4ebbf 100644
--- a/pkgs/by-name/bg/bgs/package.nix
+++ b/pkgs/by-name/bg/bgs/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gottox";
     repo = "bgs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "V8GP+xLSiCvaYZt8Bi3/3KlTBaGnMYQUeNCHwH6Ejzo=";
   };
 
diff --git a/pkgs/by-name/bi/bibata-cursors/package.nix b/pkgs/by-name/bi/bibata-cursors/package.nix
index 0c0253b4ae8e..2a32f8b5e0b1 100644
--- a/pkgs/by-name/bi/bibata-cursors/package.nix
+++ b/pkgs/by-name/bi/bibata-cursors/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ful1e5";
     repo = "Bibata_Cursor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kIKidw1vditpuxO1gVuZeUPdWBzkiksO/q2R/+DUdEc=";
   };
 
diff --git a/pkgs/by-name/bi/biber-for-tectonic/package.nix b/pkgs/by-name/bi/biber-for-tectonic/package.nix
index baa7b05aeda7..56d3629b9902 100644
--- a/pkgs/by-name/bi/biber-for-tectonic/package.nix
+++ b/pkgs/by-name/bi/biber-for-tectonic/package.nix
@@ -41,7 +41,7 @@ in
     src = fetchFromGitHub {
       owner = "plk";
       repo = "biber";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-Tt2sN2b2NGxcWyZDj5uXNGC8phJwFRiyH72n3yhFCi0=";
     };
     patches = [
diff --git a/pkgs/by-name/bi/biblatex-check/package.nix b/pkgs/by-name/bi/biblatex-check/package.nix
index 79cc1264a057..5e9a327fe7c4 100644
--- a/pkgs/by-name/bi/biblatex-check/package.nix
+++ b/pkgs/by-name/bi/biblatex-check/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Pezmc";
     repo = "BibLatex-Check";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8oHX56+kRWWl8t22DqLAFinjPngRMo3vXxXuVXBwutM=";
   };
 
diff --git a/pkgs/by-name/bi/biblesync/package.nix b/pkgs/by-name/bi/biblesync/package.nix
index c3047c802326..486244f71329 100644
--- a/pkgs/by-name/bi/biblesync/package.nix
+++ b/pkgs/by-name/bi/biblesync/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "karlkleinpaste";
     repo = "biblesync";
-    rev = version;
+    tag = version;
     sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s";
   };
 
diff --git a/pkgs/by-name/bi/bibtex-tidy/package.nix b/pkgs/by-name/bi/bibtex-tidy/package.nix
index 24d58f7c7299..419f0116f2cb 100644
--- a/pkgs/by-name/bi/bibtex-tidy/package.nix
+++ b/pkgs/by-name/bi/bibtex-tidy/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "FlamingTempura";
     repo = "bibtex-tidy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sMgy29deEfc3DFSC0Z4JZCeNAFpBKNYj+mJnFI1pSY4=";
   };
 
diff --git a/pkgs/by-name/bi/bic/package.nix b/pkgs/by-name/bi/bic/package.nix
index 452e14250925..f17f2ca435ef 100644
--- a/pkgs/by-name/bi/bic/package.nix
+++ b/pkgs/by-name/bi/bic/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hexagonal-sun";
     repo = "bic";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ws46h1ngzk14dspmsggj9535yl04v9wh8v4gb234n34rdkdsyyw";
   };
 
diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix
index ee9dcb13c301..f92deb956ceb 100644
--- a/pkgs/by-name/bi/bicep/package.nix
+++ b/pkgs/by-name/bi/bicep/package.nix
@@ -15,7 +15,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "bicep";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vyPRLPTvQkwN7unlIHs6DvpjXnXyW1PDtH9hhIOgN1A=";
   };
 
diff --git a/pkgs/by-name/bi/binbloom/package.nix b/pkgs/by-name/bi/binbloom/package.nix
index d87670431d56..88df0e40be08 100644
--- a/pkgs/by-name/bi/binbloom/package.nix
+++ b/pkgs/by-name/bi/binbloom/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "quarkslab";
     repo = "binbloom";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ox4o9RPtqMsme//8dVatNUo+mA/6dM9eI/T5lsuSAus=";
   };
 
diff --git a/pkgs/by-name/bi/bindle/package.nix b/pkgs/by-name/bi/bindle/package.nix
index 88867342500c..e944f0819a29 100644
--- a/pkgs/by-name/bi/bindle/package.nix
+++ b/pkgs/by-name/bi/bindle/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "deislabs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xehn74fqP0tEtP4Qy9TRGv+P2QoHZLxRHzGoY5cQuv0=";
   };
 
diff --git a/pkgs/by-name/bi/bingo/package.nix b/pkgs/by-name/bi/bingo/package.nix
index 10da22668ad9..c359e22bd49d 100644
--- a/pkgs/by-name/bi/bingo/package.nix
+++ b/pkgs/by-name/bi/bingo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bwplotka";
     repo = "bingo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bzh6P+J8EoewjOofwWXMgtSXAhESetD3y9EiqLNOT54=";
   };
 
diff --git a/pkgs/by-name/bi/bingrep/package.nix b/pkgs/by-name/bi/bingrep/package.nix
index b34902338703..c29a1ba85a83 100644
--- a/pkgs/by-name/bi/bingrep/package.nix
+++ b/pkgs/by-name/bi/bingrep/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "m4b";
     repo = "bingrep";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bHu3/f25U1QtRZv1z5OQSDMayOpLU6tbNaV00K55ZY8=";
   };
 
diff --git a/pkgs/by-name/bi/binserve/package.nix b/pkgs/by-name/bi/binserve/package.nix
index df1cf540b52c..7c1a28f6e4fe 100644
--- a/pkgs/by-name/bi/binserve/package.nix
+++ b/pkgs/by-name/bi/binserve/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mufeedvh";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s=";
   };
 
diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix
index e1fdd004f087..6f8080285f66 100644
--- a/pkgs/by-name/bi/binsider/package.nix
+++ b/pkgs/by-name/bi/binsider/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "binsider";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FNaYMp+vrFIziBzZ8//+ppq7kwRjBJypqsxg42XwdEs=";
   };
 
diff --git a/pkgs/by-name/bi/biodiff/package.nix b/pkgs/by-name/bi/biodiff/package.nix
index db5c85034295..cbbbeda77d23 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/biosdevname/package.nix b/pkgs/by-name/bi/biosdevname/package.nix
index c1085956f00b..1bbb0c158d2f 100644
--- a/pkgs/by-name/bi/biosdevname/package.nix
+++ b/pkgs/by-name/bi/biosdevname/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dell";
     repo = "biosdevname";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "19wbb79x9h79k55sgd4dylvdbhhrvfaiaknbw9s1wvfmirkxa1dz";
   };
 
diff --git a/pkgs/by-name/bi/bird-lg/package.nix b/pkgs/by-name/bi/bird-lg/package.nix
index 8bb1180a8fa2..581a61b28200 100644
--- a/pkgs/by-name/bi/bird-lg/package.nix
+++ b/pkgs/by-name/bi/bird-lg/package.nix
@@ -14,7 +14,7 @@ let
       src = fetchFromGitHub {
         owner = "xddxdd";
         repo = "bird-lg-go";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-j81cfHqXNsTM93ofxXz+smkjN8OdJXxtm9z5LdzC+r8=";
       };
 
diff --git a/pkgs/by-name/bi/birdwatcher/package.nix b/pkgs/by-name/bi/birdwatcher/package.nix
index 21b1212c4216..cb27663b59ee 100644
--- a/pkgs/by-name/bi/birdwatcher/package.nix
+++ b/pkgs/by-name/bi/birdwatcher/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alice-lg";
     repo = "birdwatcher";
-    rev = version;
+    tag = version;
     hash = "sha256-TTU5TYWD/KSh/orDdQnNrQJ/G7z5suBu7psF9V6AAIw=";
   };
 
diff --git a/pkgs/by-name/bi/biscuit-cli/package.nix b/pkgs/by-name/bi/biscuit-cli/package.nix
index 676c2008d152..40e63f06c162 100644
--- a/pkgs/by-name/bi/biscuit-cli/package.nix
+++ b/pkgs/by-name/bi/biscuit-cli/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "biscuit-auth";
     repo = "biscuit-cli";
-    rev = version;
+    tag = version;
     sha256 = "sha256-BLDJ4Rzu48sAklbv021XSzmATRd+D01yGHqJt6kvjGw=";
   };
 
diff --git a/pkgs/by-name/bi/bit/package.nix b/pkgs/by-name/bi/bit/package.nix
index 38750cf58f87..f9941e4677c6 100644
--- a/pkgs/by-name/bi/bit/package.nix
+++ b/pkgs/by-name/bi/bit/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chriswalz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-18R0JGbG5QBDghF4SyhXaKe9UY5UzF7Ap0Y061Z1SZ8=";
   };
 
diff --git a/pkgs/by-name/bi/bitbake-language-server/package.nix b/pkgs/by-name/bi/bitbake-language-server/package.nix
index d0f441fad9dc..c51ca3feba81 100644
--- a/pkgs/by-name/bi/bitbake-language-server/package.nix
+++ b/pkgs/by-name/bi/bitbake-language-server/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Freed-Wu";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-NLDQ2P5peweugkoNYskpCyCEgBwVFA7RTs8+NvH8fj8=";
   };
 
diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix
index cb040646f516..be7d2818e179 100644
--- a/pkgs/by-name/bi/bitbox/package.nix
+++ b/pkgs/by-name/bi/bitbox/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BitBoxSwiss";
     repo = "bitbox-wallet-app";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-2oGVQ022NGOHLo7TBdeXG3ng1nYW8fyLwSV0hJdAl9I=";
   };
diff --git a/pkgs/by-name/bi/bitbucket-cli/package.nix b/pkgs/by-name/bi/bitbucket-cli/package.nix
index f5927ec44de5..80e52bcb40ee 100644
--- a/pkgs/by-name/bi/bitbucket-cli/package.nix
+++ b/pkgs/by-name/bi/bitbucket-cli/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "swisscom";
     repo = "bitbucket-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8Qvlv/S5IkRk+2D/Pnb0+FP7ryHh1kSRJCiUjSO0OtI=";
   };
 
diff --git a/pkgs/by-name/bi/bitlbee-discord/package.nix b/pkgs/by-name/bi/bitlbee-discord/package.nix
index 4be2d69cf9f0..e3356027cef5 100644
--- a/pkgs/by-name/bi/bitlbee-discord/package.nix
+++ b/pkgs/by-name/bi/bitlbee-discord/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "0.4.3";
 
   src = fetchFromGitHub {
-    rev = version;
+    tag = version;
     owner = "sm00th";
     repo = "bitlbee-discord";
     sha256 = "00qgdvrp7hv02n0ns685igp810zxmv3adsama8601122al6x041n";
diff --git a/pkgs/by-name/bi/bitlbee-facebook/package.nix b/pkgs/by-name/bi/bitlbee-facebook/package.nix
index 086675c4f043..0e653390601b 100644
--- a/pkgs/by-name/bi/bitlbee-facebook/package.nix
+++ b/pkgs/by-name/bi/bitlbee-facebook/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "1.2.2";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "bitlbee";
     repo = "bitlbee-facebook";
     sha256 = "1qiiiq17ybylbhwgbwsvmshb517589r8yy5rsh1rfaylmlcxyy7z";
diff --git a/pkgs/by-name/bi/bitlbee-steam/package.nix b/pkgs/by-name/bi/bitlbee-steam/package.nix
index 02e6f5468c9d..5ae5af68163b 100644
--- a/pkgs/by-name/bi/bitlbee-steam/package.nix
+++ b/pkgs/by-name/bi/bitlbee-steam/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   pname = "bitlbee-steam";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "bitlbee";
     repo = "bitlbee-steam";
     sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq";
diff --git a/pkgs/by-name/bi/bitmagnet/package.nix b/pkgs/by-name/bi/bitmagnet/package.nix
index 74dce225c498..0c17df59ac8a 100644
--- a/pkgs/by-name/bi/bitmagnet/package.nix
+++ b/pkgs/by-name/bi/bitmagnet/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bitmagnet-io";
     repo = "bitmagnet";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KgpKpnOVtS3VoIqKhIzDvbdR54M014tQj2/ufhWMZDo=";
   };
 
diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix
index cd04a4cde2b5..9cdfc862d079 100644
--- a/pkgs/by-name/bi/bitrise/package.nix
+++ b/pkgs/by-name/bi/bitrise/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bitrise-io";
     repo = "bitrise";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j7Gbr+j/5RnM7S6eRZZkmlXgY+vBgfTJ5ZaLz8o7pww=";
   };
 
diff --git a/pkgs/by-name/bi/bitwise/package.nix b/pkgs/by-name/bi/bitwise/package.nix
index 44744927c45b..ec47e39ea5bf 100644
--- a/pkgs/by-name/bi/bitwise/package.nix
+++ b/pkgs/by-name/bi/bitwise/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mellowcandle";
     repo = "bitwise";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-x+ky1X0c0bQZnkNvNNuXN2BoMDtDSCt/8dBAG92jCCQ=";
   };
 
diff --git a/pkgs/by-name/bi/bitwuzla/package.nix b/pkgs/by-name/bi/bitwuzla/package.nix
index 4fb78ff4e646..a560268b22cd 100644
--- a/pkgs/by-name/bi/bitwuzla/package.nix
+++ b/pkgs/by-name/bi/bitwuzla/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bitwuzla";
     repo = "bitwuzla";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-S8CtK8WEehUdOoqOmu5KnoqHFpCGrYWjZKv1st4M7bo=";
   };
 
diff --git a/pkgs/by-name/bj/bjumblr/package.nix b/pkgs/by-name/bj/bjumblr/package.nix
index af4c7d0d6407..e5c590cf0e04 100644
--- a/pkgs/by-name/bj/bjumblr/package.nix
+++ b/pkgs/by-name/bj/bjumblr/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BJumblr";
-    rev = version;
+    tag = version;
     sha256 = "sha256-qSoGmWUGaMjx/bkiCJ/qb4LBbuFPXXlJ0e9hrFBXzwE=";
   };
 
diff --git a/pkgs/by-name/bk/bkt/package.nix b/pkgs/by-name/bk/bkt/package.nix
index b425f55b1c5c..6d660815afe9 100644
--- a/pkgs/by-name/bk/bkt/package.nix
+++ b/pkgs/by-name/bk/bkt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dimo414";
     repo = "bkt";
-    rev = version;
+    tag = version;
     sha256 = "sha256-XQK7oZfutqCvFoGzMH5G5zoGvqB8YaXSdrwjS/SVTNU=";
   };
 
diff --git a/pkgs/by-name/bl/blahaj/package.nix b/pkgs/by-name/bl/blahaj/package.nix
index 258da854cfb8..b82d7275aabf 100644
--- a/pkgs/by-name/bl/blahaj/package.nix
+++ b/pkgs/by-name/bl/blahaj/package.nix
@@ -15,7 +15,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "BLAHAJ";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CmMF9jDKUo+c8dYc2UEHKdBDE4dgwExcRS5sSUsUJik=";
   };
 
diff --git a/pkgs/by-name/bl/blahtexml/package.nix b/pkgs/by-name/bl/blahtexml/package.nix
index bc451c32034e..32dcc8f59bf4 100644
--- a/pkgs/by-name/bl/blahtexml/package.nix
+++ b/pkgs/by-name/bl/blahtexml/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gvanas";
     repo = "blahtexml";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DL5DyfARHHbwWBVHSa/VwHzNaAx/v7EDdnw1GLOk+y0=";
   };
 
diff --git a/pkgs/by-name/bl/blanket/package.nix b/pkgs/by-name/bl/blanket/package.nix
index 631bc5062921..01fa8b368f6c 100644
--- a/pkgs/by-name/bl/blanket/package.nix
+++ b/pkgs/by-name/bl/blanket/package.nix
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rafaelmardojai";
     repo = "blanket";
-    rev = version;
+    tag = version;
     hash = "sha256-mY7c5i0me7mMbD8c6eGJeaZpR8XI5QVL4n3M+j15Z1c=";
   };
 
diff --git a/pkgs/by-name/bl/blasfeo/package.nix b/pkgs/by-name/bl/blasfeo/package.nix
index 8053b628b59f..854927fd73c7 100644
--- a/pkgs/by-name/bl/blasfeo/package.nix
+++ b/pkgs/by-name/bl/blasfeo/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "giaf";
     repo = "blasfeo";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-p1pxqJ38h6RKXMg1t+2RHlfmRKPuM18pbUarUx/w9lw=";
   };
 
diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix
index ca4e9e144231..9f0fdd79267f 100644
--- a/pkgs/by-name/bl/blendfarm/package.nix
+++ b/pkgs/by-name/bl/blendfarm/package.nix
@@ -50,7 +50,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "LogicReinc";
     repo = "LogicReinc.BlendFarm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2w2tdl5n0IFTuthY97NYMeyRe2r72jaKFfoNSjWQMM4=";
   };
 
diff --git a/pkgs/by-name/bl/blflash/package.nix b/pkgs/by-name/bl/blflash/package.nix
index 3371f727a374..3459c1af2731 100644
--- a/pkgs/by-name/bl/blflash/package.nix
+++ b/pkgs/by-name/bl/blflash/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "spacemeowx2";
     repo = "blflash";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lv5bUbq5AnZVeR8V0A4pamY9ZIQAhLmvZEr+CRMPcj0=";
   };
 
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/bl/blis/package.nix b/pkgs/by-name/bl/blis/package.nix
index 4e69653da83b..40ffe614694d 100644
--- a/pkgs/by-name/bl/blis/package.nix
+++ b/pkgs/by-name/bl/blis/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flame";
     repo = "blis";
-    rev = version;
+    tag = version;
     sha256 = "sha256-joOTyHT87PelKNhL9+1lLqMz22WsENa+Rom41grBb0Y=";
   };
 
diff --git a/pkgs/by-name/bl/blitz/package.nix b/pkgs/by-name/bl/blitz/package.nix
index f54c1861deba..e5e44fddc2f2 100644
--- a/pkgs/by-name/bl/blitz/package.nix
+++ b/pkgs/by-name/bl/blitz/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "blitzpp";
     repo = "blitz";
-    rev = version;
+    tag = version;
     hash = "sha256-wZDg+4lCd9iHvxuQQE/qs58NorkxZ0+mf+8PKQ57CDE=";
   };
 
diff --git a/pkgs/by-name/bl/blockbook/package.nix b/pkgs/by-name/bl/blockbook/package.nix
index b246fc368970..990ac40bb7ca 100644
--- a/pkgs/by-name/bl/blockbook/package.nix
+++ b/pkgs/by-name/bl/blockbook/package.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trezor";
     repo = "blockbook";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-98tp3QYaHfhVIiJ4xkA3bUanXwK1q05t+YNroFtBUxE=";
   };
 
diff --git a/pkgs/by-name/bl/blockhash/package.nix b/pkgs/by-name/bl/blockhash/package.nix
index aa956b0360fa..d668bc3ea2e8 100644
--- a/pkgs/by-name/bl/blockhash/package.nix
+++ b/pkgs/by-name/bl/blockhash/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "commonsmachinery";
     repo = "blockhash";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QoqFTCfWtXIrFF3Yx4NfOa9cSjHtCSKz3k3i0u9Qx9M=";
   };
 
diff --git a/pkgs/by-name/bl/blocky/package.nix b/pkgs/by-name/bl/blocky/package.nix
index e2a39acd6905..c0b53c9ee9b2 100644
--- a/pkgs/by-name/bl/blocky/package.nix
+++ b/pkgs/by-name/bl/blocky/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "0xERR0R";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yd9qncTuzf7p1hIYHzzXyxAx1C1QiuQAIYSKcjCiF0E=";
   };
 
diff --git a/pkgs/by-name/bl/blogc/package.nix b/pkgs/by-name/bl/blogc/package.nix
index a90f54da0bd0..48d20f5382b9 100644
--- a/pkgs/by-name/bl/blogc/package.nix
+++ b/pkgs/by-name/bl/blogc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "blogc";
     repo = "blogc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YAwGgV5Vllz8JlIASbGIkdRzpciQbgPiXl5DjiSEJyE=";
   };
 
diff --git a/pkgs/by-name/bl/blueberry/package.nix b/pkgs/by-name/bl/blueberry/package.nix
index 1bcd602ccac5..8c57e161a1ba 100644
--- a/pkgs/by-name/bl/blueberry/package.nix
+++ b/pkgs/by-name/bl/blueberry/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-MyIjcTyKn1aC2th6fCOw4cIqrRKatk2s4QD5R9cm83A=";
   };
 
diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix
index 5f9fd46c3aa0..b5eb85dfdda9 100644
--- a/pkgs/by-name/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "B-Lang-org";
     repo = "bsc";
-    rev = version;
+    tag = version;
     sha256 = "sha256-gA/vfAkkM2cuArN99JZVYEWTIJqg82HlC+BHNVS5Ot0=";
   };
 
diff --git a/pkgs/by-name/bl/bluetui/package.nix b/pkgs/by-name/bl/bluetui/package.nix
index 4fd147ff5699..35a2700fda54 100644
--- a/pkgs/by-name/bl/bluetui/package.nix
+++ b/pkgs/by-name/bl/bluetui/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pythops";
     repo = "bluetui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JgxzpFpz/fyFZwyxTtAkG9XB5qkxj46lUnZ3mM44dHk=";
   };
 
diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix
index 3d6e2cc30e1a..d252e459d47c 100644
--- a/pkgs/by-name/bl/bluetuith/package.nix
+++ b/pkgs/by-name/bl/bluetuith/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "darkhz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yXH/koNT4ec/SOZhSU01iPNAfD1MdMjM2+wNmjXWsrk=";
   };
 
diff --git a/pkgs/by-name/bl/bluewalker/package.nix b/pkgs/by-name/bl/bluewalker/package.nix
index 8f2872f6045b..4d4e4d5c6508 100644
--- a/pkgs/by-name/bl/bluewalker/package.nix
+++ b/pkgs/by-name/bl/bluewalker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "jtaimisto";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wAzBlCczsLfHboGYIsyN7dGwz52CMw+L3XQ0njfLVR0=";
   };
 
diff --git a/pkgs/by-name/bl/blugon/package.nix b/pkgs/by-name/bl/blugon/package.nix
index f580ffd9d774..eb9f6bb543b1 100644
--- a/pkgs/by-name/bl/blugon/package.nix
+++ b/pkgs/by-name/bl/blugon/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jumper149";
     repo = "blugon";
-    rev = version;
+    tag = version;
     sha256 = "1i67v8jxvavgax3dwvns200iwwdcvgki04liq0x64q52lg0vrh7m";
   };
 
diff --git a/pkgs/by-name/bl/blur-effect/package.nix b/pkgs/by-name/bl/blur-effect/package.nix
index cfc183ff1517..b194a7884134 100644
--- a/pkgs/by-name/bl/blur-effect/package.nix
+++ b/pkgs/by-name/bl/blur-effect/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sonald";
     repo = "blur-effect";
-    rev = version;
+    tag = version;
     sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj";
   };
 
diff --git a/pkgs/by-name/bm/bmaptool/package.nix b/pkgs/by-name/bm/bmaptool/package.nix
index c97b13d26a38..839042264058 100644
--- a/pkgs/by-name/bm/bmaptool/package.nix
+++ b/pkgs/by-name/bm/bmaptool/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yoctoproject";
     repo = "bmaptool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YPY3sNuZ/TASNBPH94iqG6AuBRq5KjioKiuxAcu94+I=";
   };
 
diff --git a/pkgs/by-name/bm/bmon/package.nix b/pkgs/by-name/bm/bmon/package.nix
index 49dfc9e71fad..79e856e60c41 100644
--- a/pkgs/by-name/bm/bmon/package.nix
+++ b/pkgs/by-name/bm/bmon/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tgraf";
     repo = "bmon";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ilba872c09mnlvylslv4hqv6c9cz36l76q74rr99jvis1dg69gf";
   };
 
diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
index e737a3374f5f..6d2c8081c1b0 100644
--- a/pkgs/by-name/bn/bngblaster/package.nix
+++ b/pkgs/by-name/bn/bngblaster/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "bngblaster";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-HqwyqUkLYoXTjx01pB8sL3hBXwLqe441M+LTqBhaZ58=";
   };
 
diff --git a/pkgs/by-name/bo/boa/package.nix b/pkgs/by-name/bo/boa/package.nix
index e3a5a8430d3b..01676a427123 100644
--- a/pkgs/by-name/bo/boa/package.nix
+++ b/pkgs/by-name/bo/boa/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "boa-dev";
     repo = "boa";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ROzdOanfHNPwHXA0SzU2fpuBonbDbgDqH+ZgOjwK/tg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/bo/bob/package.nix b/pkgs/by-name/bo/bob/package.nix
index 2b4f0769f68c..028aab41a0e3 100644
--- a/pkgs/by-name/bo/bob/package.nix
+++ b/pkgs/by-name/bo/bob/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "benchkram";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-zmWfOLBb+GWw9v6LdCC7/WaP1Wz7UipPwqkmI1+rG8Q=";
   };
 
diff --git a/pkgs/by-name/bo/boca/package.nix b/pkgs/by-name/bo/boca/package.nix
index 93bde7439f40..e5a570a1e506 100644
--- a/pkgs/by-name/bo/boca/package.nix
+++ b/pkgs/by-name/bo/boca/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "enzo1982";
     repo = "boca";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HIYUMFj5yiEC+liZLMXD9otPyoEb1sxHlECTYtYXc2I=";
   };
 
diff --git a/pkgs/by-name/bo/boltbrowser/package.nix b/pkgs/by-name/bo/boltbrowser/package.nix
index 48c6c3eb93eb..b8639680b273 100644
--- a/pkgs/by-name/bo/boltbrowser/package.nix
+++ b/pkgs/by-name/bo/boltbrowser/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "br0xen";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-3t0U1bSJbo3RJZe+PwaUeuzSt23Gs++WRe/uehfa4cA=";
   };
 
diff --git a/pkgs/by-name/bo/bom/package.nix b/pkgs/by-name/bo/bom/package.nix
index 9a057938d525..eaf5e854eb3c 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 = pname;
-    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/bo/bombadillo/package.nix b/pkgs/by-name/bo/bombadillo/package.nix
index 74ae65823939..48c137047466 100644
--- a/pkgs/by-name/bo/bombadillo/package.nix
+++ b/pkgs/by-name/bo/bombadillo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
 
   src = fetchgit {
     url = "https://tildegit.org/sloum/bombadillo.git";
-    rev = version;
+    tag = version;
     hash = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0=";
   };
 
diff --git a/pkgs/by-name/bo/bombardier/package.nix b/pkgs/by-name/bo/bombardier/package.nix
index db1a64994eca..fb61ca883eca 100644
--- a/pkgs/by-name/bo/bombardier/package.nix
+++ b/pkgs/by-name/bo/bombardier/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "codesenberg";
     repo = "bombardier";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FoaiUky0WcipkGN8KIpSd+iizinlqtHC5lskvNCnx/Y=";
   };
 
diff --git a/pkgs/by-name/bo/bomutils/package.nix b/pkgs/by-name/bo/bomutils/package.nix
index 3b60711df4e5..91d835b8c3ec 100644
--- a/pkgs/by-name/bo/bomutils/package.nix
+++ b/pkgs/by-name/bo/bomutils/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hogliux";
     repo = "bomutils";
-    rev = version;
+    tag = version;
     sha256 = "1i7nhbq1fcbrjwfg64znz8p4l7662f7qz2l6xcvwd5z93dnmgmdr";
   };
 
diff --git a/pkgs/by-name/bo/bonk/package.nix b/pkgs/by-name/bo/bonk/package.nix
index ab6d9c7e3748..fe3411532d5d 100644
--- a/pkgs/by-name/bo/bonk/package.nix
+++ b/pkgs/by-name/bo/bonk/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "elliot40404";
     repo = "bonk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sAMIteNkGRqmE7BQD/TNC01K3eQQTLKuc0jcxHxtKF8=";
   };
 
diff --git a/pkgs/by-name/bo/bonzomatic/package.nix b/pkgs/by-name/bo/bonzomatic/package.nix
index 4ca7879051e2..85d329a21e42 100644
--- a/pkgs/by-name/bo/bonzomatic/package.nix
+++ b/pkgs/by-name/bo/bonzomatic/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gargaj";
     repo = "bonzomatic";
-    rev = version;
+    tag = version;
     sha256 = "sha256-hwK3C+p1hRwnuY2/vBrA0QsJGIcJatqq+U5/hzVCXEg=";
   };
 
diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix
index 71ef9beadd79..44418ba44c12 100644
--- a/pkgs/by-name/bo/boogie/package.nix
+++ b/pkgs/by-name/bo/boogie/package.nix
@@ -13,7 +13,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "boogie-org";
     repo = "boogie";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IWtYbb1IFB6DLIYYTP+q7q+h/0aqonxr/mWwf+83aRo=";
   };
 
diff --git a/pkgs/by-name/bo/boolector/package.nix b/pkgs/by-name/bo/boolector/package.nix
index d9c6d5de82cc..8915bdb63f69 100644
--- a/pkgs/by-name/bo/boolector/package.nix
+++ b/pkgs/by-name/bo/boolector/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "boolector";
     repo = "boolector";
-    rev = version;
+    tag = version;
     hash = "sha256-CdfpXUbU1+yEmrNyl+hvHlJfpzzzx356naim6vRafDg=";
   };
 
diff --git a/pkgs/by-name/bo/boops/package.nix b/pkgs/by-name/bo/boops/package.nix
index 8e5cfe9865ea..2d3addead3ea 100644
--- a/pkgs/by-name/bo/boops/package.nix
+++ b/pkgs/by-name/bo/boops/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BOops";
-    rev = version;
+    tag = version;
     sha256 = "0nvpawk58g189z96xnjs4pyri5az3ckdi9mhi0i9s0a7k4gdkarr";
   };
 
diff --git a/pkgs/by-name/bo/boost-sml/package.nix b/pkgs/by-name/bo/boost-sml/package.nix
index 901be3c83fb8..748e50dee72f 100644
--- a/pkgs/by-name/bo/boost-sml/package.nix
+++ b/pkgs/by-name/bo/boost-sml/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "boost-ext";
     repo = "sml";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IvZwkhZe9pcyJhZdn4VkWMRUN6Ow8qs3zB6JtWb5pKk=";
   };
 
diff --git a/pkgs/by-name/bo/booster/package.nix b/pkgs/by-name/bo/booster/package.nix
index 37e67b1215f4..5fde9434a802 100644
--- a/pkgs/by-name/bo/booster/package.nix
+++ b/pkgs/by-name/bo/booster/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "anatol";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-uHxPzuD3PxKAI2JOZd7lcLvcqYqk9gW9yeZgOS1Y7x4=";
   };
 
diff --git a/pkgs/by-name/bo/bootc/package.nix b/pkgs/by-name/bo/bootc/package.nix
index a2a7fa796bf3..b8c417ae61a4 100644
--- a/pkgs/by-name/bo/bootc/package.nix
+++ b/pkgs/by-name/bo/bootc/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "bootc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-p1+j62MllmPcvWnijieSZmlgwYy76X17fv12Haetz78=";
   };
 
diff --git a/pkgs/by-name/bo/bootiso/package.nix b/pkgs/by-name/bo/bootiso/package.nix
index c91a0db713f7..beb510612ab5 100644
--- a/pkgs/by-name/bo/bootiso/package.nix
+++ b/pkgs/by-name/bo/bootiso/package.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jsamr";
     repo = "bootiso";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1l09d543b73r0wbpsj5m6kski8nq48lbraq1myxhidkgl3mm3d5i";
   };
 
diff --git a/pkgs/by-name/bo/bootspec/package.nix b/pkgs/by-name/bo/bootspec/package.nix
index 8ba4b349371c..309be29d89b1 100644
--- a/pkgs/by-name/bo/bootspec/package.nix
+++ b/pkgs/by-name/bo/bootspec/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "bootspec";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5IGSMHeL0eKfl7teDejAckYQjc8aeLwfwIQSzQ8YaAg=";
   };
 
diff --git a/pkgs/by-name/bo/borealis-cursors/package.nix b/pkgs/by-name/bo/borealis-cursors/package.nix
index 7d1b99953ad4..886ae7a7e218 100644
--- a/pkgs/by-name/bo/borealis-cursors/package.nix
+++ b/pkgs/by-name/bo/borealis-cursors/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "alvatip";
     repo = "Borealis-cursors";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-1qgyU0Npbx/AgqGbmF/BWtlVC0KsKtgC48SL/HtkDrk=";
   };
 
diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix
index 65e30e9c8014..9b6e8ba212ba 100644
--- a/pkgs/by-name/bo/bosh-cli/package.nix
+++ b/pkgs/by-name/bo/bosh-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GTxl0lsM1BMWTUAQfNYkJupDUCnXWavTnRZrkaCRpPc=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/bo/bossa-arduino/package.nix b/pkgs/by-name/bo/bossa-arduino/package.nix
index 519b9820278b..635840270da9 100644
--- a/pkgs/by-name/bo/bossa-arduino/package.nix
+++ b/pkgs/by-name/bo/bossa-arduino/package.nix
@@ -7,7 +7,7 @@ bossa.overrideAttrs (attrs: rec {
   src = fetchFromGitHub {
     owner = "arduino";
     repo = "BOSSA";
-    rev = version;
+    tag = version;
     sha256 = "sha256-sBJ6QMd7cTClDnGCeOU0FT6IczEjqqRxCD7kef5GuY8=";
   };
 })
diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix
index 1a108f0a712d..1aa463aeeebd 100644
--- a/pkgs/by-name/bo/bossa/package.nix
+++ b/pkgs/by-name/bo/bossa/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shumatech";
     repo = "BOSSA";
-    rev = version;
+    tag = version;
     sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw=";
   };
 
diff --git a/pkgs/by-name/bo/bowtie/package.nix b/pkgs/by-name/bo/bowtie/package.nix
index 5f13cdb5470d..82e3ab72bf91 100644
--- a/pkgs/by-name/bo/bowtie/package.nix
+++ b/pkgs/by-name/bo/bowtie/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BenLangmead";
     repo = "bowtie";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mWItmrTMPst/NnzSpxxTHcBztDqHPCza9yOsZPwp7G4=";
   };
 
diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix
index d4e2933bc4b4..9440c861e2b0 100644
--- a/pkgs/by-name/bo/boxbuddy/package.nix
+++ b/pkgs/by-name/bo/boxbuddy/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Dvlv";
     repo = "BoxBuddyRS";
-    rev = version;
+    tag = version;
     hash = "sha256-9BGgm4yRjCarJIGP/G9gPj/qsYWb96XGJmpgLj3XCdM=";
   };
 
diff --git a/pkgs/by-name/bo/boxes/package.nix b/pkgs/by-name/bo/boxes/package.nix
index 476eae96fe76..0125db7919a8 100644
--- a/pkgs/by-name/bo/boxes/package.nix
+++ b/pkgs/by-name/bo/boxes/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ascii-boxes";
     repo = "boxes";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dvhb5KWBQt7g4n0ZTQMcJQljIfavV3g8i+P3PWB6Gwk=";
   };
 
diff --git a/pkgs/by-name/bo/boxfort/package.nix b/pkgs/by-name/bo/boxfort/package.nix
index 65ab07307b42..1e3dcc08774a 100644
--- a/pkgs/by-name/bo/boxfort/package.nix
+++ b/pkgs/by-name/bo/boxfort/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Snaipe";
     repo = "BoxFort";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "jmtWTOkOlqVZ7tFya3IrQjr714Y8TzAVY5Cq+RzDuRs=";
   };
 
diff --git a/pkgs/by-name/bo/boxxy/package.nix b/pkgs/by-name/bo/boxxy/package.nix
index a6084d3ede78..90352d8436a5 100644
--- a/pkgs/by-name/bo/boxxy/package.nix
+++ b/pkgs/by-name/bo/boxxy/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "queer";
     repo = "boxxy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6pb3yyC4/kpe8S67B3pzsSu3PfQyOWpiYi0JTBQk3lU=";
   };
 
diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix
index 705e28a646bf..97b84cd3987e 100644
--- a/pkgs/by-name/bp/bpftrace/package.nix
+++ b/pkgs/by-name/bp/bpftrace/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bpftrace";
     repo = "bpftrace";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OAT8nw5fFhKINK8Jy+RJXSvfU40G4fpR/5J1GPoyewY=";
   };
 
diff --git a/pkgs/by-name/bp/bpp-core/package.nix b/pkgs/by-name/bp/bpp-core/package.nix
index 546270e84766..ef9e6d21455d 100644
--- a/pkgs/by-name/bp/bpp-core/package.nix
+++ b/pkgs/by-name/bp/bpp-core/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BioPP";
     repo = "bpp-core";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0ma2cl677l7s0n5sffh66cy9lxp5wycm50f121g8rx85p95vkgwv";
   };
 
diff --git a/pkgs/by-name/bp/bpp-phyl/package.nix b/pkgs/by-name/bp/bpp-phyl/package.nix
index c119d389cd45..46ae8ae17d25 100644
--- a/pkgs/by-name/bp/bpp-phyl/package.nix
+++ b/pkgs/by-name/bp/bpp-phyl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BioPP";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "192zks6wyk903n06c2lbsscdhkjnfwms8p7jblsmk3lvjhdipb20";
   };
 
diff --git a/pkgs/by-name/bp/bpp-popgen/package.nix b/pkgs/by-name/bp/bpp-popgen/package.nix
index b9bfdc311aab..c80f4d45a438 100644
--- a/pkgs/by-name/bp/bpp-popgen/package.nix
+++ b/pkgs/by-name/bp/bpp-popgen/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BioPP";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0bz0fhrq3dri6a0hvfc3zlvrns8mrzzlnicw5pyfa812gc1qwfvh";
   };
 
diff --git a/pkgs/by-name/bp/bpp-seq/package.nix b/pkgs/by-name/bp/bpp-seq/package.nix
index 1f9955a8d8ee..2017e42ea9fc 100644
--- a/pkgs/by-name/bp/bpp-seq/package.nix
+++ b/pkgs/by-name/bp/bpp-seq/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BioPP";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1mc09g8jswzsa4wgrfv59jxn15ys3q8s0227p1j838wkphlwn2qk";
   };
 
diff --git a/pkgs/by-name/bp/bppsuite/package.nix b/pkgs/by-name/bp/bppsuite/package.nix
index cc8e94672f49..5134a9f797e3 100644
--- a/pkgs/by-name/bp/bppsuite/package.nix
+++ b/pkgs/by-name/bp/bppsuite/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BioPP";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1wdwcgczqbc3m116vakvi0129wm3acln3cfc7ivqnalwvi6lrpds";
   };
 
diff --git a/pkgs/by-name/br/braincurses/package.nix b/pkgs/by-name/br/braincurses/package.nix
index 2a6a67b17aed..419248c40c00 100644
--- a/pkgs/by-name/br/braincurses/package.nix
+++ b/pkgs/by-name/br/braincurses/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bderrly";
     repo = "braincurses";
-    rev = version;
+    tag = version;
     sha256 = "0gpny9wrb0zj3lr7iarlgn9j4367awj09v3hhxz9r9a6yhk4anf5";
   };
 
diff --git a/pkgs/by-name/br/break-time/package.nix b/pkgs/by-name/br/break-time/package.nix
index 141d8d0b2765..912cb5e466b6 100644
--- a/pkgs/by-name/br/break-time/package.nix
+++ b/pkgs/by-name/br/break-time/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cdepillabout";
     repo = "break-time";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-q79JXaBwd/oKtJPvK2+72pY2YvaR3of2CMC8cF6wwQ8=";
   };
 
diff --git a/pkgs/by-name/br/brev-cli/package.nix b/pkgs/by-name/br/brev-cli/package.nix
index f4bc9b3468ec..ee775ee8866b 100644
--- a/pkgs/by-name/br/brev-cli/package.nix
+++ b/pkgs/by-name/br/brev-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "brevdev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gqx/aOTpoN7nfstlFl4EulQ9Kzm/YlYOOiyrWIoJvcU=";
   };
 
diff --git a/pkgs/by-name/br/brial/package.nix b/pkgs/by-name/br/brial/package.nix
index d82ac052d737..0935e51ac906 100644
--- a/pkgs/by-name/br/brial/package.nix
+++ b/pkgs/by-name/br/brial/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BRiAl";
     repo = "BRiAl";
-    rev = version;
+    tag = version;
     sha256 = "sha256-y6nlqRBJRWohGDAKe/F37qBP1SgtFHR1HD+erFJReOM=";
   };
 
diff --git a/pkgs/by-name/br/brickd/package.nix b/pkgs/by-name/br/brickd/package.nix
index 95eafd3d7a97..609b0b7d546d 100644
--- a/pkgs/by-name/br/brickd/package.nix
+++ b/pkgs/by-name/br/brickd/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Tinkerforge";
     repo = "brickd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6w2Ew+dLMmdRf9CF3TdKHa0d5ZgmX5lKIR+5t3QAWFQ=";
   };
 
diff --git a/pkgs/by-name/br/brig/package.nix b/pkgs/by-name/br/brig/package.nix
index f4914eeda873..762741eb6325 100644
--- a/pkgs/by-name/br/brig/package.nix
+++ b/pkgs/by-name/br/brig/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sahib";
     repo = "brig";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600";
   };
 
diff --git a/pkgs/by-name/br/brightnessctl/package.nix b/pkgs/by-name/br/brightnessctl/package.nix
index 843af6877465..e8d86c5b8b33 100644
--- a/pkgs/by-name/br/brightnessctl/package.nix
+++ b/pkgs/by-name/br/brightnessctl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Hummer12007";
     repo = "brightnessctl";
-    rev = version;
+    tag = version;
     sha256 = "0immxc7almmpg80n3bdn834p3nrrz7bspl2syhb04s3lawa5y2lq";
   };
 
diff --git a/pkgs/by-name/br/brillo/package.nix b/pkgs/by-name/br/brillo/package.nix
index ed67064892d4..2b15a7ac4ceb 100644
--- a/pkgs/by-name/br/brillo/package.nix
+++ b/pkgs/by-name/br/brillo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cameronnemo";
     repo = "brillo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+BUyM3FFnsk87NFaD9FBwdLqf6wsNhX+FDB7nqhgAmM=";
   };
 
diff --git a/pkgs/by-name/br/brmodelo/package.nix b/pkgs/by-name/br/brmodelo/package.nix
index bcc9e5c2df60..0a35c6a623e7 100644
--- a/pkgs/by-name/br/brmodelo/package.nix
+++ b/pkgs/by-name/br/brmodelo/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "chcandido";
     repo = "brmodelo";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-YJcGfrcB+Qw35bMnqVs/tBzMGVj2DmfhRZ0YsSGGGSc=";
   };
 
diff --git a/pkgs/by-name/br/brook/package.nix b/pkgs/by-name/br/brook/package.nix
index 19ed8ed89519..4d88128ea0ee 100644
--- a/pkgs/by-name/br/brook/package.nix
+++ b/pkgs/by-name/br/brook/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "txthinking";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rfCqYI0T/nbK+rlPGl5orLo3qHKITesdFNtXc/ECATA=";
   };
 
diff --git a/pkgs/by-name/br/broom/package.nix b/pkgs/by-name/br/broom/package.nix
index 6c7d0cb264c5..f58e1f83dc73 100644
--- a/pkgs/by-name/br/broom/package.nix
+++ b/pkgs/by-name/br/broom/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "a-camarillo";
     repo = "broom";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-a2hUgYpiKm/dZWLRuCZKuGStmZ/7jDtLRAjd/B57Vxw=";
   };
 
diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix
index ad607142586c..426d3d75aa52 100644
--- a/pkgs/by-name/br/broot/package.nix
+++ b/pkgs/by-name/br/broot/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "broot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xLmVqYjQqjWMBm2A5OJl2wFIvxbWviX//J10BnKgWyk=";
   };
 
diff --git a/pkgs/by-name/br/browserpass/package.nix b/pkgs/by-name/br/browserpass/package.nix
index 3c8fbaad9a7b..133f5f03c544 100644
--- a/pkgs/by-name/br/browserpass/package.nix
+++ b/pkgs/by-name/br/browserpass/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "browserpass";
     repo = "browserpass-native";
-    rev = version;
+    tag = version;
     sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U=";
   };
 
diff --git a/pkgs/by-name/br/browsh/package.nix b/pkgs/by-name/br/browsh/package.nix
index f14b7662e8cb..d39d27b59c1b 100644
--- a/pkgs/by-name/br/browsh/package.nix
+++ b/pkgs/by-name/br/browsh/package.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "browsh-org";
     repo = "browsh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KbBVcNuERBL94LuRx872zpjQTzR6c5GalsBoNR52SuQ=";
   };
 
diff --git a/pkgs/by-name/br/brunsli/package.nix b/pkgs/by-name/br/brunsli/package.nix
index 398d7b034698..960a9ee119b7 100644
--- a/pkgs/by-name/br/brunsli/package.nix
+++ b/pkgs/by-name/br/brunsli/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "brunsli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZcrRz2xSoRepgG8KZYY/JzgONerItW0e6mH1PYsko98=";
   };
 
diff --git a/pkgs/by-name/br/bruteforce-luks/package.nix b/pkgs/by-name/br/bruteforce-luks/package.nix
index 018181123154..1070911a7fc4 100644
--- a/pkgs/by-name/br/bruteforce-luks/package.nix
+++ b/pkgs/by-name/br/bruteforce-luks/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "glv2";
     repo = "bruteforce-luks";
-    rev = version;
+    tag = version;
     hash = "sha256-t07YyfCjaXQs/OMekcPNBT8DeSRtq2+8tUpsPP2pG7o=";
   };
 
diff --git a/pkgs/by-name/br/bruteforce-salted-openssl/package.nix b/pkgs/by-name/br/bruteforce-salted-openssl/package.nix
index c7f77cf9926a..743f09e7d980 100644
--- a/pkgs/by-name/br/bruteforce-salted-openssl/package.nix
+++ b/pkgs/by-name/br/bruteforce-salted-openssl/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "glv2";
     repo = "bruteforce-salted-openssl";
-    rev = version;
+    tag = version;
     hash = "sha256-hXB4CUQ5pihKmahyK359cgQACrs6YH1gHmZJAuTXgQM=";
   };
 
diff --git a/pkgs/by-name/br/bruteforce-wallet/package.nix b/pkgs/by-name/br/bruteforce-wallet/package.nix
index b97d94dd5373..ffb4b44d87a0 100644
--- a/pkgs/by-name/br/bruteforce-wallet/package.nix
+++ b/pkgs/by-name/br/bruteforce-wallet/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "glv2";
     repo = "bruteforce-wallet";
-    rev = version;
+    tag = version;
     hash = "sha256-ngzG39c/bWv++PHVgce9r1PXElFhpgYoAepbqD/1Dq0=";
   };
 
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/bs/bschaffl/package.nix b/pkgs/by-name/bs/bschaffl/package.nix
index e79c070e35d3..d99738ef42a7 100644
--- a/pkgs/by-name/bs/bschaffl/package.nix
+++ b/pkgs/by-name/bs/bschaffl/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "bschaffl";
-    rev = version;
+    tag = version;
     sha256 = "sha256-zfhPYH4eUNWHV27ZtX2IIvobyPdKs5yGr/ryJRQa6as=";
   };
 
diff --git a/pkgs/by-name/bs/bsequencer/package.nix b/pkgs/by-name/bs/bsequencer/package.nix
index 965195fe0360..9752f02a5574 100644
--- a/pkgs/by-name/bs/bsequencer/package.nix
+++ b/pkgs/by-name/bs/bsequencer/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BSEQuencer";
-    rev = version;
+    tag = version;
     sha256 = "sha256-1PSICm5mw37nO3gkHA9MNUH+CFULeOZURjimYEA/dXA=";
   };
 
diff --git a/pkgs/by-name/bs/bshapr/package.nix b/pkgs/by-name/bs/bshapr/package.nix
index 884ae2cb47bd..3dd4ff96c482 100644
--- a/pkgs/by-name/bs/bshapr/package.nix
+++ b/pkgs/by-name/bs/bshapr/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BShapr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9I4DPRl6i/VL8Etw3qLGZkP45BGsbxFxNOvRy3B3I+M=";
   };
 
diff --git a/pkgs/by-name/bs/bslizr/package.nix b/pkgs/by-name/bs/bslizr/package.nix
index ecd0622094cd..67bc8b89c7cf 100644
--- a/pkgs/by-name/bs/bslizr/package.nix
+++ b/pkgs/by-name/bs/bslizr/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BSlizr";
-    rev = version;
+    tag = version;
     sha256 = "sha256-5DvVkTz79CLvZMZ3XnI0COIfxnhERDSvzbVoJAcqNRI=";
   };
 
diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index 83aa6961c2ff..421cb9737670 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "bspwm";
-    rev = version;
+    tag = version;
     sha256 = "0qlv7b4c2mmjfd65y100d11x8iqyg5f6lfiws3cgmpjidhdygnxc";
   };
 
diff --git a/pkgs/by-name/bt/btc-rpc-explorer/package.nix b/pkgs/by-name/bt/btc-rpc-explorer/package.nix
index 912c34f69ed8..09ed71b77ba7 100644
--- a/pkgs/by-name/bt/btc-rpc-explorer/package.nix
+++ b/pkgs/by-name/bt/btc-rpc-explorer/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "janoside";
     repo = "btc-rpc-explorer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZGg3jwSl1XyzS9hMa2YqwExhHSNgrsUmSscZtfF2h54=";
   };
 
diff --git a/pkgs/by-name/bt/btcd/package.nix b/pkgs/by-name/bt/btcd/package.nix
index 3ea386726b76..a40f7f3ea534 100644
--- a/pkgs/by-name/bt/btcd/package.nix
+++ b/pkgs/by-name/bt/btcd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "btcsuite";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-83eiVYXpyiGgLmYxj3rFk4CHG7F9UQ3vk1ZHm64Cm4A=";
   };
 
diff --git a/pkgs/by-name/bt/btcpayserver/package.nix b/pkgs/by-name/bt/btcpayserver/package.nix
index a863bbf155b3..0a66d9239534 100644
--- a/pkgs/by-name/bt/btcpayserver/package.nix
+++ b/pkgs/by-name/bt/btcpayserver/package.nix
@@ -13,7 +13,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "btcpayserver";
     repo = "btcpayserver";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LOyGNdlU8wvDFmYQ2v1H3Z12++ChVrGM53zBTWCCiCk=";
   };
 
diff --git a/pkgs/by-name/bt/btdu/package.nix b/pkgs/by-name/bt/btdu/package.nix
index 6612306aa49e..7f3dfd80eff0 100644
--- a/pkgs/by-name/bt/btdu/package.nix
+++ b/pkgs/by-name/bt/btdu/package.nix
@@ -13,7 +13,7 @@ buildDubPackage rec {
   src = fetchFromGitHub {
     owner = "CyberShadow";
     repo = "btdu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B8ojxdXibeNEZay9S5lzpB6bTKNB2ZI6AQ3XKUHioE0=";
   };
 
diff --git a/pkgs/by-name/bt/btfs/package.nix b/pkgs/by-name/bt/btfs/package.nix
index b24519e5b0f2..8dfdb2bdbb57 100644
--- a/pkgs/by-name/bt/btfs/package.nix
+++ b/pkgs/by-name/bt/btfs/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "johang";
     repo = "btfs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fkS0U/MqFRQNi+n7NE4e1cnNICvfST2IQ9FMoJUyj6w=";
   };
 
diff --git a/pkgs/by-name/bt/btrfs-assistant/package.nix b/pkgs/by-name/bt/btrfs-assistant/package.nix
index fce0bd8fc6eb..f16d1d96da80 100644
--- a/pkgs/by-name/bt/btrfs-assistant/package.nix
+++ b/pkgs/by-name/bt/btrfs-assistant/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "btrfs-assistant";
     repo = "btrfs-assistant";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-I4nbQmHwk84qN1SngKzKnPtQN5Dz1QSSEpHJxV8wkJw=";
   };
 
diff --git a/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix b/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix
index e11e98f74c84..1c482c2d1c05 100644
--- a/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix
+++ b/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hunleyd";
     repo = "btrfs-auto-snapshot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QpuwkGaYAkpu5hYyb360Mr5tHsZc2LzMlKtpS8CyyhI=";
   };
 
diff --git a/pkgs/by-name/bt/btrfs-heatmap/package.nix b/pkgs/by-name/bt/btrfs-heatmap/package.nix
index ff7bc2a9462d..055a860cc4a7 100644
--- a/pkgs/by-name/bt/btrfs-heatmap/package.nix
+++ b/pkgs/by-name/bt/btrfs-heatmap/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "knorrie";
     repo = "btrfs-heatmap";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yCkuZqWwxrs2eS7EXY6pAOVVVSq7dAMxJtf581gX8vg=";
   };
 
diff --git a/pkgs/by-name/bt/btrfs-snap/package.nix b/pkgs/by-name/bt/btrfs-snap/package.nix
index 862acb1495c0..bbf9db4e99c7 100644
--- a/pkgs/by-name/bt/btrfs-snap/package.nix
+++ b/pkgs/by-name/bt/btrfs-snap/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jf647";
     repo = "btrfs-snap";
-    rev = version;
+    tag = version;
     sha256 = "sha256-SDzLjgNRuR9XpmcYCD9T10MLS+//+pWFGDiTAb8NiLQ=";
   };
   buildInputs = [ bash ];
diff --git a/pkgs/by-name/bu/bubblewrap/package.nix b/pkgs/by-name/bu/bubblewrap/package.nix
index eba4f666e176..c8f50b3474c4 100644
--- a/pkgs/by-name/bu/bubblewrap/package.nix
+++ b/pkgs/by-name/bu/bubblewrap/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "bubblewrap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8IDMLQPeO576N1lizVudXUmTV6hNOiowjzRpEWBsZ+U=";
   };
 
diff --git a/pkgs/by-name/bu/buckle/package.nix b/pkgs/by-name/bu/buckle/package.nix
index dba26f270221..58214e87c9b4 100644
--- a/pkgs/by-name/bu/buckle/package.nix
+++ b/pkgs/by-name/bu/buckle/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "benbrittain";
     repo = "buckle";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eWhcDzw+6I5N0dse5avwhcQ/y6YZ6b3QKyBwWBrA/xo=";
   };
 
diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix
index ba104a09d707..41820f077550 100644
--- a/pkgs/by-name/bu/buf/package.nix
+++ b/pkgs/by-name/bu/buf/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/6SDsIVyorDWjOkdUB1t0vAA2VLy6MiGyiFo+2rUfEU=";
   };
 
diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix
index 1482119defbf..8995a240865e 100644
--- a/pkgs/by-name/bu/buffer/package.nix
+++ b/pkgs/by-name/bu/buffer/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "cheywood";
     repo = "buffer";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-W6LTTQvIMAB99q2W11EBlBknJnOuv4ptgf5SSM422Cg=";
   };
 
diff --git a/pkgs/by-name/bu/bufisk/package.nix b/pkgs/by-name/bu/bufisk/package.nix
index 05ec70526546..05f11b86a277 100644
--- a/pkgs/by-name/bu/bufisk/package.nix
+++ b/pkgs/by-name/bu/bufisk/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "bufisk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pVnqvQn7jwpx6T3sS4eA29JeJdh0GrPVm0J8n2UjJTw=";
   };
 
diff --git a/pkgs/by-name/bu/bugstalker/package.nix b/pkgs/by-name/bu/bugstalker/package.nix
index b1393ba65ae9..8633f397e695 100644
--- a/pkgs/by-name/bu/bugstalker/package.nix
+++ b/pkgs/by-name/bu/bugstalker/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "godzie44";
     repo = "BugStalker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JacRt+zNwL7hdpdh5h9Mxztqi47f5eUbcZyx6ct/5Bc=";
   };
 
diff --git a/pkgs/by-name/bu/buildkit-nix/package.nix b/pkgs/by-name/bu/buildkit-nix/package.nix
index 99431c4beaa6..4167bd74fb23 100644
--- a/pkgs/by-name/bu/buildkit-nix/package.nix
+++ b/pkgs/by-name/bu/buildkit-nix/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "reproducible-containers";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-i8KQLLL36iP26jIj10fZLtYpS57Xni4eIQEJG4ixWy8=";
   };
 
diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix
index 210e4d6f61cb..e02e0c6f856d 100644
--- a/pkgs/by-name/bu/buildkit/package.nix
+++ b/pkgs/by-name/bu/buildkit/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2zLXkiouPLmjxveoggsr+WUmdcZEN+FzeiVR1Dk6EA8=";
   };
 
diff --git a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
index 5cc2d5900e33..939dd40e3914 100644
--- a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
+++ b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "buildkite-agent-metrics";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AVFQ3GP4YDQ6d9NSeol3Eobxzmoa9bRyCAKTsDbyZyQ=";
   };
 
diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix
index 4af365c8d316..69c39c6802e0 100644
--- a/pkgs/by-name/bu/buildkite-agent/package.nix
+++ b/pkgs/by-name/bu/buildkite-agent/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "agent";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5COo5vXecXLhYAy3bcaYvmluFdfEKGgiTbhat8T3AV8=";
   };
 
diff --git a/pkgs/by-name/bu/buildkite-cli/package.nix b/pkgs/by-name/bu/buildkite-cli/package.nix
index 7e57c0f790d5..0bdad092f45b 100644
--- a/pkgs/by-name/bu/buildkite-cli/package.nix
+++ b/pkgs/by-name/bu/buildkite-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zRACKFs4AZkWg2OqFIyiLuM1V6GyIPmtyxSOjfHkL6U=";
   };
 
diff --git a/pkgs/by-name/bu/buku/package.nix b/pkgs/by-name/bu/buku/package.nix
index edd09870b813..c62752958cef 100644
--- a/pkgs/by-name/bu/buku/package.nix
+++ b/pkgs/by-name/bu/buku/package.nix
@@ -30,7 +30,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kPVlfTYUusf5CZnKB53WZcCHo3MEnA2bLUHTRPGPn+8=";
   };
 
diff --git a/pkgs/by-name/bu/bukubrow/package.nix b/pkgs/by-name/bu/bukubrow/package.nix
index 746ef775921f..43b8ebf36a2c 100644
--- a/pkgs/by-name/bu/bukubrow/package.nix
+++ b/pkgs/by-name/bu/bukubrow/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SamHH";
     repo = "bukubrow-host";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xz5Agsm+ATQXXgpPGN4EQ00i1t8qUlrviNHauVdCu4U=";
   };
 
diff --git a/pkgs/by-name/bu/bulky/package.nix b/pkgs/by-name/bu/bulky/package.nix
index 0312d2565b6c..375a065143b4 100644
--- a/pkgs/by-name/bu/bulky/package.nix
+++ b/pkgs/by-name/bu/bulky/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "bulky";
-    rev = version;
+    tag = version;
     hash = "sha256-+mA8b1PEfp151hks4T/I+dMYlJa6yYz1wWnafe+w9y8=";
   };
 
diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix
index 8319b0115871..d6cf50c94bf2 100644
--- a/pkgs/by-name/bu/bulloak/package.nix
+++ b/pkgs/by-name/bu/bulloak/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alexfertel";
     repo = "bulloak";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OAjy8SXaD+2/C5jLNIezv/KdrPHlwJC5L1LwGhqBWQs=";
   };
 
diff --git a/pkgs/by-name/bu/bully/package.nix b/pkgs/by-name/bu/bully/package.nix
index 91cf6c834dfb..a49c7559b328 100644
--- a/pkgs/by-name/bu/bully/package.nix
+++ b/pkgs/by-name/bu/bully/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kimocoder";
     repo = "bully";
-    rev = version;
+    tag = version;
     sha256 = "1n2754a5z44g414a0hj3cmi9q5lwnzyvmvzskrj2nci8c8m2kgnf";
   };
 
diff --git a/pkgs/by-name/bu/bump/package.nix b/pkgs/by-name/bu/bump/package.nix
index e2ae2ebaaf65..4be37c59cc76 100644
--- a/pkgs/by-name/bu/bump/package.nix
+++ b/pkgs/by-name/bu/bump/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mroth";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-a+vmpmWb/jICNdErkvCQKNIdaKtSrIJZ3BApLvKG/hg=";
   };
 
diff --git a/pkgs/by-name/bu/bundix/package.nix b/pkgs/by-name/bu/bundix/package.nix
index 7a79eae438d5..5be47b5a0fb0 100644
--- a/pkgs/by-name/bu/bundix/package.nix
+++ b/pkgs/by-name/bu/bundix/package.nix
@@ -18,7 +18,7 @@ buildRubyGem rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "bundix";
-    rev = version;
+    tag = version;
     hash = "sha256-QnNdseCSwQYhO/ybzWsflMEk68TMgPU3HqXJ7av3SHE=";
   };
 
diff --git a/pkgs/by-name/bu/bunnyfetch/package.nix b/pkgs/by-name/bu/bunnyfetch/package.nix
index f4cc317f6010..b4b3ac1f83ad 100644
--- a/pkgs/by-name/bu/bunnyfetch/package.nix
+++ b/pkgs/by-name/bu/bunnyfetch/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Rosettea";
     repo = "bunnyfetch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6MnjCXc9/8twdf8PHKsVJY1yWYwUf5R01vtQFJbyy7M=";
   };
 
diff --git a/pkgs/by-name/bu/bunyan-rs/package.nix b/pkgs/by-name/bu/bunyan-rs/package.nix
index 0b7f2a6f57a1..296621fa6aec 100644
--- a/pkgs/by-name/bu/bunyan-rs/package.nix
+++ b/pkgs/by-name/bu/bunyan-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LukeMathWalker";
     repo = "bunyan";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA=";
   };
 
diff --git a/pkgs/by-name/bu/bup/package.nix b/pkgs/by-name/bu/bup/package.nix
index a6f00096dafb..7c94db0336e6 100644
--- a/pkgs/by-name/bu/bup/package.nix
+++ b/pkgs/by-name/bu/bup/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     repo = "bup";
     owner = "bup";
-    rev = version;
+    tag = version;
     hash = "sha256-tuOUml4gF4i7bE2xtjJJol1gRAfYv73RghUYwIDsGyM=";
   };
 
diff --git a/pkgs/by-name/bu/burp/package.nix b/pkgs/by-name/bu/burp/package.nix
index 6479c15eeb76..896fab40e2ba 100644
--- a/pkgs/by-name/bu/burp/package.nix
+++ b/pkgs/by-name/bu/burp/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grke";
     repo = "burp";
-    rev = version;
+    tag = version;
     sha256 = "sha256-y6kRd1jD6t+Q6d5t7W9MDuk+m2Iq1THQkP50PJwI7Nc=";
   };
 
diff --git a/pkgs/by-name/bu/bustools/package.nix b/pkgs/by-name/bu/bustools/package.nix
index 2ed9fb52bad9..be05c010f5db 100644
--- a/pkgs/by-name/bu/bustools/package.nix
+++ b/pkgs/by-name/bu/bustools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BUStools";
     repo = "bustools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0Y+9T9V+l20hqxpKbSWsEB0tt8A/ctYcoPN2n/roxvg=";
   };
 
diff --git a/pkgs/by-name/bu/butane/package.nix b/pkgs/by-name/bu/butane/package.nix
index ddd3d18e237d..c979592fa90e 100644
--- a/pkgs/by-name/bu/butane/package.nix
+++ b/pkgs/by-name/bu/butane/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "coreos";
     repo = "butane";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UJRHqvfCeKxbE+SRQZEm797WqwGpwjlqol8z36l3nS4=";
   };
 
diff --git a/pkgs/by-name/bu/buttermanager/package.nix b/pkgs/by-name/bu/buttermanager/package.nix
index 7c15ca68290a..179f91e7fd87 100644
--- a/pkgs/by-name/bu/buttermanager/package.nix
+++ b/pkgs/by-name/bu/buttermanager/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "egara";
     repo = "buttermanager";
-    rev = version;
+    tag = version;
     hash = "sha256-/U5IVJvYCw/YzBWjQ949YP9uoxsTNRJ5FO7rrI6Cvhs=";
   };
 
diff --git a/pkgs/by-name/by/byobu/package.nix b/pkgs/by-name/by/byobu/package.nix
index 42dbc0613f90..3dc68f50d381 100644
--- a/pkgs/by-name/by/byobu/package.nix
+++ b/pkgs/by-name/by/byobu/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "dustinkirkland";
     repo = "byobu";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-h+3BEMfBRozmpqFNRyfKzjKgevaYm8v7DsJMwkhiCQ4=";
   };
 
diff --git a/pkgs/by-name/by/bytecode-viewer/package.nix b/pkgs/by-name/by/bytecode-viewer/package.nix
index 13aa8359eb69..01039341a708 100644
--- a/pkgs/by-name/by/bytecode-viewer/package.nix
+++ b/pkgs/by-name/by/bytecode-viewer/package.nix
@@ -16,7 +16,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "Konloch";
     repo = "bytecode-viewer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-opAUmkEcWPOrcxAL+I1rBQXwHmvzbu0+InTnsg9r+z8=";
   };
 
diff --git a/pkgs/by-name/c-/c-for-go/package.nix b/pkgs/by-name/c-/c-for-go/package.nix
index 32026dbc053e..29208d128657 100644
--- a/pkgs/by-name/c-/c-for-go/package.nix
+++ b/pkgs/by-name/c-/c-for-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xlab";
     repo = "c-for-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XU+gmQBhQjoiKINfgPQ6bVvslPEFOvF3ZbRaWZE/ZzA=";
   };
 
diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix
index 941dde968ba1..477c8cb5ac8e 100644
--- a/pkgs/by-name/c2/c2fmzq/package.nix
+++ b/pkgs/by-name/c2/c2fmzq/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "c2FmZQ";
     repo = "c2FmZQ";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2Hdsakol6uHOITg8qgMTXZMtgvExKUrThxr/J93vInc=";
   };
 
diff --git a/pkgs/by-name/c2/c2nim/package.nix b/pkgs/by-name/c2/c2nim/package.nix
index 7aeee7f65058..dec295a2b1c8 100644
--- a/pkgs/by-name/c2/c2nim/package.nix
+++ b/pkgs/by-name/c2/c2nim/package.nix
@@ -10,7 +10,7 @@ buildNimPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nim-lang";
     repo = "c2nim";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-E8sAhTFIWAnlfWyuvqK8h8g7Puf5ejLEqgLNb5N17os=";
   };
   meta = finalAttrs.src.meta // {
diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix
index 6122da0739a9..d69f604e24f0 100644
--- a/pkgs/by-name/c2/c2patool/package.nix
+++ b/pkgs/by-name/c2/c2patool/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "contentauth";
     repo = "c2patool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3OaCsy6xt2Pc/Cqm3qbbpr7kiQiA2BM/LqIQnuw73MY=";
   };
 
diff --git a/pkgs/by-name/c3/c3-lsp/package.nix b/pkgs/by-name/c3/c3-lsp/package.nix
index 9bd26fde545e..6becc1d62f16 100644
--- a/pkgs/by-name/c3/c3-lsp/package.nix
+++ b/pkgs/by-name/c3/c3-lsp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pherrymason";
     repo = "c3-lsp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MScpFh4J4jVJI5WtW4tfNB18YDpxs+ass1HmXyOO5VM=";
   };
 
diff --git a/pkgs/by-name/ca/cabal-cli/package.nix b/pkgs/by-name/ca/cabal-cli/package.nix
index 11cb241ad18f..270834241ffa 100644
--- a/pkgs/by-name/ca/cabal-cli/package.nix
+++ b/pkgs/by-name/ca/cabal-cli/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "cabal-club";
     repo = "cabal-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DZ+F+pgPc8WuiBhLgxNO5es5lA996fJdvZyg6QjfrHg=";
   };
 
diff --git a/pkgs/by-name/ca/cadvisor/package.nix b/pkgs/by-name/ca/cadvisor/package.nix
index 450bb669c9d2..b90da320c92e 100644
--- a/pkgs/by-name/ca/cadvisor/package.nix
+++ b/pkgs/by-name/ca/cadvisor/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EXhKX4Za+fdJcSrrbH1te533jyEVLmhgd3I9LcOCz2Q=";
   };
 
diff --git a/pkgs/by-name/ca/cadzinho/package.nix b/pkgs/by-name/ca/cadzinho/package.nix
index 4c20b1e545e0..a9280b1ef470 100644
--- a/pkgs/by-name/ca/cadzinho/package.nix
+++ b/pkgs/by-name/ca/cadzinho/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zecruel";
     repo = "CadZinho";
-    rev = version;
+    tag = version;
     hash = "sha256-AHojy6lYLEyeBaYiIzo6MdQCM3jX5ENNTKgU+PGSD00=";
   };
 
diff --git a/pkgs/by-name/ca/caf/package.nix b/pkgs/by-name/ca/caf/package.nix
index 3731792b8b48..e2299157d2b0 100644
--- a/pkgs/by-name/ca/caf/package.nix
+++ b/pkgs/by-name/ca/caf/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "actor-framework";
     repo = "actor-framework";
-    rev = version;
+    tag = version;
     hash = "sha256-1DJ8VYBTC4Kd6IQZoj4AjP3CoHhb+bmtBEozc5T0R/0=";
   };
 
diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix
index 8b279efeed57..13fac0e664d4 100644
--- a/pkgs/by-name/ca/cairo-lang/package.nix
+++ b/pkgs/by-name/ca/cairo-lang/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "starkware-libs";
     repo = "cairo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VOyqKeiPJ3/VOqcdQXC/rZnTriC2ScmAQ4IlouHjvpI=";
   };
 
diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/package.nix b/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
index c55a3a214f1f..6cbec1a6c08e 100644
--- a/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
+++ b/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "calamares-nixos-extensions";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Tmp/sWQmhiZe2dmA+msCMPwPlBd1Oa3q5X+QP+CoAWI=";
   };
 
diff --git a/pkgs/by-name/ca/calendar-cli/package.nix b/pkgs/by-name/ca/calendar-cli/package.nix
index 38c5e282c063..7004262bb0f3 100644
--- a/pkgs/by-name/ca/calendar-cli/package.nix
+++ b/pkgs/by-name/ca/calendar-cli/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tobixen";
     repo = "calendar-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-w35ySLnfxXZR/a7BrPLYqXs2kqkuYhh5PcgNxJqjDtE=";
   };
 
diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix
index 5cb58eb82b24..6f219e32909d 100644
--- a/pkgs/by-name/ca/caligula/package.nix
+++ b/pkgs/by-name/ca/caligula/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ifd3f";
     repo = "caligula";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VwbVDfiGiVFefsxoQ1FBDHyYLp0sOKnnVZctklyO+Tw=";
   };
 
diff --git a/pkgs/by-name/ca/cameractrls/package.nix b/pkgs/by-name/ca/cameractrls/package.nix
index d56b75124ddc..4c7042ba5eba 100644
--- a/pkgs/by-name/ca/cameractrls/package.nix
+++ b/pkgs/by-name/ca/cameractrls/package.nix
@@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "soyersoyer";
     repo = "cameractrls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MM+Py8tHtqJWIGmGg3RaIhJa0E1zM3hXOnTOqXPuejw=";
   };
 
diff --git a/pkgs/by-name/ca/cameradar/package.nix b/pkgs/by-name/ca/cameradar/package.nix
index 329a41babd1a..082ec3745581 100644
--- a/pkgs/by-name/ca/cameradar/package.nix
+++ b/pkgs/by-name/ca/cameradar/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Ullaakut";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GOqmz/aiOLGMfs9rQBIEQSgBycPzhu8BohcAc2U+gBw=";
   };
 
diff --git a/pkgs/by-name/ca/can-utils/package.nix b/pkgs/by-name/ca/can-utils/package.nix
index 8d377fdb3997..86704aea674a 100644
--- a/pkgs/by-name/ca/can-utils/package.nix
+++ b/pkgs/by-name/ca/can-utils/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-can";
     repo = "can-utils";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wum0hqPj3rCHHubNsOnj89tvrRQxoXrGQvZFcMKAGME=";
   };
 
diff --git a/pkgs/by-name/ca/canta-theme/package.nix b/pkgs/by-name/ca/canta-theme/package.nix
index 4f327102f1bf..c664a2177125 100644
--- a/pkgs/by-name/ca/canta-theme/package.nix
+++ b/pkgs/by-name/ca/canta-theme/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "canta-theme";
-    rev = version;
+    tag = version;
     sha256 = "05h42nrggb6znzjcbh4lqqfcm41h4r85n3vwimp3l4lq5p90igr2";
   };
 
diff --git a/pkgs/by-name/ca/canto-curses/package.nix b/pkgs/by-name/ca/canto-curses/package.nix
index 78be4ecaeb2d..e49e77010e57 100644
--- a/pkgs/by-name/ca/canto-curses/package.nix
+++ b/pkgs/by-name/ca/canto-curses/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "themoken";
     repo = "canto-curses";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1vzb9n1j4gxigzll6654ln79lzbrrm6yy0lyazd9kldyl349b8sr";
   };
 
diff --git a/pkgs/by-name/ca/canto-daemon/package.nix b/pkgs/by-name/ca/canto-daemon/package.nix
index 1a26d98de253..d2c57ee39ad1 100644
--- a/pkgs/by-name/ca/canto-daemon/package.nix
+++ b/pkgs/by-name/ca/canto-daemon/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "themoken";
     repo = "canto-next";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0fmsdn28z09bvivdkqcla5bnalky7k744iir25z70bv4pz1jcvnk";
   };
 
diff --git a/pkgs/by-name/ca/cantoolz/package.nix b/pkgs/by-name/ca/cantoolz/package.nix
index 7d2d8d9c8c83..7e757fd145c0 100644
--- a/pkgs/by-name/ca/cantoolz/package.nix
+++ b/pkgs/by-name/ca/cantoolz/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CANToolz";
     repo = "CANToolz";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0ROWx1CsKtjxmbCgPYZpvr37VKsEsWCwMehf0/0/cnY=";
   };
 
diff --git a/pkgs/by-name/ca/caper/package.nix b/pkgs/by-name/ca/caper/package.nix
index f7dc73b829de..24288a87f0d8 100644
--- a/pkgs/by-name/ca/caper/package.nix
+++ b/pkgs/by-name/ca/caper/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "niksu";
     repo = "caper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TSryjz0NrGdkc+6vmfBqsuVpV3N9FvteTFsVqpUcm0w=";
   };
 
diff --git a/pkgs/by-name/ca/capnproto-java/package.nix b/pkgs/by-name/ca/capnproto-java/package.nix
index e960dc968bda..f97673ec1d32 100644
--- a/pkgs/by-name/ca/capnproto-java/package.nix
+++ b/pkgs/by-name/ca/capnproto-java/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "capnproto";
     repo = "capnproto-java";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7uYtRHKsJvbE1b0HbNXGbRXpkUHHLjMDIWLlOUcQWDk=";
   };
 
diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix
index 9334d336e364..7a73bdf8ff6f 100644
--- a/pkgs/by-name/ca/capnproto/package.nix
+++ b/pkgs/by-name/ca/capnproto/package.nix
@@ -36,7 +36,7 @@ clangStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "capnproto";
     repo = "capnproto";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gxkko7LFyJNlxpTS+CWOd/p9x/778/kNIXfpDGiKM2A=";
   };
 
diff --git a/pkgs/by-name/ca/caprice32/package.nix b/pkgs/by-name/ca/caprice32/package.nix
index 0b173cbe4af3..5411bfd404c3 100644
--- a/pkgs/by-name/ca/caprice32/package.nix
+++ b/pkgs/by-name/ca/caprice32/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     repo = "caprice32";
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "ColinPitrat";
     sha256 = "0hng5krwgc1h9bz1xlkp2hwnvas965nd7sb3z9mb2m6x9ghxlacz";
   };
diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix
index 17d78ba28d9b..199ac3a43ee3 100644
--- a/pkgs/by-name/ca/caprine/package.nix
+++ b/pkgs/by-name/ca/caprine/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "sindresorhus";
     repo = "caprine";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yfCilJ62m7nKe8B+4puwAbNgr2g1P7HaKIhFINdv0/k=";
   };
 
diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix
index 5deac4688fef..1c9d9ecc4e27 100644
--- a/pkgs/by-name/ca/capslock/package.nix
+++ b/pkgs/by-name/ca/capslock/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "capslock";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kRuEcrx9LBzCpXFWlc9bSsgZt84T8R8VFdbAWAseSPQ=";
   };
 
diff --git a/pkgs/by-name/ca/capypdf/package.nix b/pkgs/by-name/ca/capypdf/package.nix
index 3ada4db8cd48..5ece5c85e42b 100644
--- a/pkgs/by-name/ca/capypdf/package.nix
+++ b/pkgs/by-name/ca/capypdf/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jpakkane";
     repo = "capypdf";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-aaZHIBXOdKysxAk/011b9Di/QHH5vgF+/g3tWPn6d/k=";
   };
 
diff --git a/pkgs/by-name/ca/carbon-now-cli/package.nix b/pkgs/by-name/ca/carbon-now-cli/package.nix
index d391128c56b2..dbc70fc11523 100644
--- a/pkgs/by-name/ca/carbon-now-cli/package.nix
+++ b/pkgs/by-name/ca/carbon-now-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mixn";
     repo = "carbon-now-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-J7H1oofgosFGxoHzcx+UxaRbqGwqrmk6MYmMISpNB6w=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix
index 6495652b190b..add501d496ea 100644
--- a/pkgs/by-name/ca/cargo-about/package.nix
+++ b/pkgs/by-name/ca/cargo-about/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-about";
-    rev = version;
+    tag = version;
     sha256 = "sha256-h5+Fp6+yGa1quJENsCv6WE4NC2A+ceIGMXVWyeTPPLQ=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-autoinherit/package.nix b/pkgs/by-name/ca/cargo-autoinherit/package.nix
index f444b846eb5f..075f5e1ca916 100644
--- a/pkgs/by-name/ca/cargo-autoinherit/package.nix
+++ b/pkgs/by-name/ca/cargo-autoinherit/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mainmatter";
     repo = "cargo-autoinherit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A4Ooqt/Cb8yyc4Y9DKZuFEVUux1ot+IVkPsSDylM6G4=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix
index 98607fe755ff..acd75880ba6a 100644
--- a/pkgs/by-name/ca/cargo-benchcmp/package.nix
+++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "cargo-benchcmp";
-    rev = version;
+    tag = version;
     hash = "sha256-J8KFI0V/mOhUlYtVnFAQgPIpXL9/dLhOFxSly4bR00I=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index e82557f33b24..0794ff09ee61 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cargo-bins";
     repo = "cargo-binstall";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mGb6ZHi6XGYiVe0NHcBx7MWtcSDK2/wXpM4j0GiczEk=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
index 3a4c056117ba..fab41bf8377f 100644
--- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
+++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "cargo-bisect-rustc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7HiM1oRuLSfRaum66duag/w8ncFdxRLF0yeSGlIey0Y=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bitbake/package.nix b/pkgs/by-name/ca/cargo-bitbake/package.nix
index d2aa69377924..6495780b181c 100644
--- a/pkgs/by-name/ca/cargo-bitbake/package.nix
+++ b/pkgs/by-name/ca/cargo-bitbake/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "meta-rust";
     repo = "cargo-bitbake";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+ovC4nZwHzf9hjfv2LcnTztM2m++tpC3mUSS/I0l6Ck=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bloat/package.nix b/pkgs/by-name/ca/cargo-bloat/package.nix
index fc82a2f38e47..cda683a061c2 100644
--- a/pkgs/by-name/ca/cargo-bloat/package.nix
+++ b/pkgs/by-name/ca/cargo-bloat/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "RazrFalcon";
     repo = "cargo-bloat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B71VX7cJe1giOLmk3cQE8Zxr7fKGyQkoXRuM+NzBcb8=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bootimage/package.nix b/pkgs/by-name/ca/cargo-bootimage/package.nix
index 346c408d7021..9d45a5304d81 100644
--- a/pkgs/by-name/ca/cargo-bootimage/package.nix
+++ b/pkgs/by-name/ca/cargo-bootimage/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-osdev";
     repo = "bootimage";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "12p18mk3l473is3ydv3zmn6s7ck8wgjwavllimcpja3yjilxm3zg";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix
index af31e5f60aab..2c2a4528b44f 100644
--- a/pkgs/by-name/ca/cargo-bump/package.nix
+++ b/pkgs/by-name/ca/cargo-bump/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rustadopt";
     repo = "cargo-bump";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PhA7uC2gJcBnUQPWgZC51p/KTSxSGld3m+dd6BhW6q8=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
index d56c65f42581..bc53cb5c6bea 100644
--- a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = "cargo-bundle-licenses";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pTxZ9s8ZccylMfEiifYmJuBB+riZ37QJSAMpVuSgLzs=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-cache/package.nix b/pkgs/by-name/ca/cargo-cache/package.nix
index 90fd9685b3d7..83ad6074e2e0 100644
--- a/pkgs/by-name/ca/cargo-cache/package.nix
+++ b/pkgs/by-name/ca/cargo-cache/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "matthiaskrgr";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-q9tYKXK8RqiqbDZ/lTxUI1Dm/h28/yZR8rTQuq+roZs=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-careful/package.nix b/pkgs/by-name/ca/cargo-careful/package.nix
index 849ec6df3eb3..aade7b851e06 100644
--- a/pkgs/by-name/ca/cargo-careful/package.nix
+++ b/pkgs/by-name/ca/cargo-careful/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "RalfJung";
     repo = "cargo-careful";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pYfyqsS+bGwSP6YZAtI+8iMXdID/hrCiX+cuYoYiZmc=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix
index 9d052d9df626..f1a79f85946b 100644
--- a/pkgs/by-name/ca/cargo-component/package.nix
+++ b/pkgs/by-name/ca/cargo-component/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "cargo-component";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pW3hhcsMzKSWmUX8HwAtZCB+v9B4qXw6WUGODhPtW+Q=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-cranky/package.nix b/pkgs/by-name/ca/cargo-cranky/package.nix
index d99831848cb4..0597103120ed 100644
--- a/pkgs/by-name/ca/cargo-cranky/package.nix
+++ b/pkgs/by-name/ca/cargo-cranky/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ericseppanen";
     repo = "cargo-cranky";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3ARl3z+2nz05UaKf8ChN6mvPY2qMjUNxGnGJ1P0xkas=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-criterion/package.nix b/pkgs/by-name/ca/cargo-criterion/package.nix
index 5a33f8caacf7..64acf7763c02 100644
--- a/pkgs/by-name/ca/cargo-criterion/package.nix
+++ b/pkgs/by-name/ca/cargo-criterion/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bheisler";
     repo = "cargo-criterion";
-    rev = version;
+    tag = version;
     sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix
index 56d9951cb20a..b68693b2fe0e 100644
--- a/pkgs/by-name/ca/cargo-deadlinks/package.nix
+++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "deadlinks";
     repo = "cargo-deadlinks";
-    rev = version;
+    tag = version;
     sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh";
   };
 
diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix
index f54a2c67e987..45ac3e65c1bd 100644
--- a/pkgs/by-name/ca/cargo-deb/package.nix
+++ b/pkgs/by-name/ca/cargo-deb/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = "cargo-deb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E0PU0j0n1ITP65D+p1upn3cBFBKkoCbyHe6S5XxDAyU=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index 61bfb416f9af..1f18bcaee54b 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-deny";
-    rev = version;
+    tag = version;
     hash = "sha256-u93x0w6gSPxDCrp9bNJDCxLBZfh8EhXU4qvhklI4GKY=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-dephell/package.nix b/pkgs/by-name/ca/cargo-dephell/package.nix
index d0fbd26e846e..00ea26c923c0 100644
--- a/pkgs/by-name/ca/cargo-dephell/package.nix
+++ b/pkgs/by-name/ca/cargo-dephell/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mimoo";
     repo = "cargo-dephell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NOjkKttA+mwPCpl4uiRIYD58DlMomVFpwnM9KGfWd+w=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix
index a8310189dc1e..2ed74c228386 100644
--- a/pkgs/by-name/ca/cargo-diet/package.nix
+++ b/pkgs/by-name/ca/cargo-diet/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "the-lean-crate";
     repo = "cargo-diet";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SuJ1H/2YfSVVigdgLUd9veMClI7ZT7xkkyQ4PfXoQdQ=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix
index d97e19fb6a5e..1c5beeac3d2a 100644
--- a/pkgs/by-name/ca/cargo-dist/package.nix
+++ b/pkgs/by-name/ca/cargo-dist/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "axodotdev";
     repo = "cargo-dist";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0mKCwb7nvl8BRtQyweItkMT0PrKRGTvpB9Acgro7QSM=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-docset/package.nix b/pkgs/by-name/ca/cargo-docset/package.nix
index ac2195ee3cb0..9537e60967b7 100644
--- a/pkgs/by-name/ca/cargo-docset/package.nix
+++ b/pkgs/by-name/ca/cargo-docset/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Robzz";
     repo = "cargo-docset";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o2CSQiU9fEoS3eRmwphtYGZTwn3mstRm2Tlvval83+U=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-duplicates/package.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix
index 8ab9656c8c22..7b8f28de0b49 100644
--- a/pkgs/by-name/ca/cargo-duplicates/package.nix
+++ b/pkgs/by-name/ca/cargo-duplicates/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Keruspe";
     repo = "cargo-duplicates";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JzS1+BHSCEcZM5MokbQsck/AGJ7EeSwbzjNz0uLQsgE=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-espmonitor/package.nix b/pkgs/by-name/ca/cargo-espmonitor/package.nix
index d0d356bd47f5..8e9f46e4346b 100644
--- a/pkgs/by-name/ca/cargo-espmonitor/package.nix
+++ b/pkgs/by-name/ca/cargo-espmonitor/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espmonitor";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "hWFdim84L2FfG6p9sEf+G5Uq4yhp5kv1ZMdk4sMHa+4=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index bdf13f371b85..ca7ad9c39df7 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cargo-expand";
-    rev = version;
+    tag = version;
     hash = "sha256-PSiuTw3H3vl4Tnts5eOTd1v8SLPvYZCkuQ/pTSa3O18=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-feature/package.nix b/pkgs/by-name/ca/cargo-feature/package.nix
index ca7a1c465d42..875d3ff48d69 100644
--- a/pkgs/by-name/ca/cargo-feature/package.nix
+++ b/pkgs/by-name/ca/cargo-feature/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Riey";
     repo = "cargo-feature";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UPpqkz/PwoMaJan9itfldjyTmZmiMb6PzCyu9Vtjj1s=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-features-manager/package.nix b/pkgs/by-name/ca/cargo-features-manager/package.nix
index 6a6b75b46561..49150057b63c 100644
--- a/pkgs/by-name/ca/cargo-features-manager/package.nix
+++ b/pkgs/by-name/ca/cargo-features-manager/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ToBinio";
     repo = "cargo-features-manager";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NjXJCrLsX52M7CBg8wdgwlK3gaGiznfdRGz7BAbVVPk=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-fuzz/package.nix b/pkgs/by-name/ca/cargo-fuzz/package.nix
index b238b5f05e47..16ad0196d593 100644
--- a/pkgs/by-name/ca/cargo-fuzz/package.nix
+++ b/pkgs/by-name/ca/cargo-fuzz/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-fuzz";
     repo = "cargo-fuzz";
-    rev = version;
+    tag = version;
     hash = "sha256-PC36O5+eB+yVLpz+EywBDGcMAtHl79FYwUo/l/JL8hM=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix
index 3c4d01d28f37..ea8933ee8e7c 100644
--- a/pkgs/by-name/ca/cargo-generate/package.nix
+++ b/pkgs/by-name/ca/cargo-generate/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cargo-generate";
     repo = "cargo-generate";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-iOZCSd6jF1OF7ScjpsMlvMjsFHyg6QJJ6qk0OxrARho=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-i18n/package.nix b/pkgs/by-name/ca/cargo-i18n/package.nix
index bf367aee4074..2a705c2322a6 100644
--- a/pkgs/by-name/ca/cargo-i18n/package.nix
+++ b/pkgs/by-name/ca/cargo-i18n/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kellpossible";
     repo = "cargo-i18n";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-azwQlXsoCgNB/TjSBBE+taUR1POBJXaPnS5Sr+HVR90=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix
index 51dde7bc7058..e3f1e1893c27 100644
--- a/pkgs/by-name/ca/cargo-leptos/package.nix
+++ b/pkgs/by-name/ca/cargo-leptos/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "leptos-rs";
     repo = "cargo-leptos";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SjpfM963Zux+H5QhK8prvDLuI56fP5PqX5gcVbthRx4=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-limit/package.nix b/pkgs/by-name/ca/cargo-limit/package.nix
index b977ddefb39e..b3774bc233de 100644
--- a/pkgs/by-name/ca/cargo-limit/package.nix
+++ b/pkgs/by-name/ca/cargo-limit/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alopatindev";
     repo = "cargo-limit";
-    rev = version;
+    tag = version;
     sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
index 1ad5df27c772..3cee860e2671 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     inherit owner;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-iJrnNDSMich5OzEbPgnQWLVz6Zj/MUIzEsaBzqVdoDg=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
index 027ff4b7c512..d357ae3ae026 100644
--- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cargo-llvm-lines";
-    rev = version;
+    tag = version;
     hash = "sha256-qKdxnISussiyp1ylahS7qOdMfOGwJnlbWrgEHf/L2y0=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix
index 33851806f7ea..59175916ab3c 100644
--- a/pkgs/by-name/ca/cargo-local-registry/package.nix
+++ b/pkgs/by-name/ca/cargo-local-registry/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dhovart";
     repo = "cargo-local-registry";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hG6OSi0I7Y6KZacGR9MCC+e7YcDcvaVfR3LSOjqz23A=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-machete/package.nix b/pkgs/by-name/ca/cargo-machete/package.nix
index 4f4a47448051..ff65b177e3a5 100644
--- a/pkgs/by-name/ca/cargo-machete/package.nix
+++ b/pkgs/by-name/ca/cargo-machete/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bnjbvr";
     repo = "cargo-machete";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0vlau3leAAonV5E9NAtSqw45eKoZBzHx0BmoEY86Eq8=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix
index 5581bad62b2a..c5a754bc1a8f 100644
--- a/pkgs/by-name/ca/cargo-make/package.nix
+++ b/pkgs/by-name/ca/cargo-make/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sagiegurari";
     repo = "cargo-make";
-    rev = version;
+    tag = version;
     hash = "sha256-hrUd4J15cDyd78BVVzi8jiDqJI1dE35WUdOo6Tq8gH8=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix
index f97aa1bdf8a7..e2ce9dfc00cd 100644
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sourcefrog";
     repo = "cargo-mutants";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aTGuCkPk1GYUlRXCdNIy94d5zHxUPpNNFN4aapf8s0U=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-outdated/package.nix b/pkgs/by-name/ca/cargo-outdated/package.nix
index d76f344a63a6..98bee3a81a79 100644
--- a/pkgs/by-name/ca/cargo-outdated/package.nix
+++ b/pkgs/by-name/ca/cargo-outdated/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kbknapp";
     repo = "cargo-outdated";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ey11ANSflWGnCsn6M9GupgC4DE5mWww6vw5pK0CFdLo=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-pgo/package.nix b/pkgs/by-name/ca/cargo-pgo/package.nix
index d4a837ba2b16..a8b908427a0e 100644
--- a/pkgs/by-name/ca/cargo-pgo/package.nix
+++ b/pkgs/by-name/ca/cargo-pgo/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kobzol";
     repo = "cargo-pgo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FmZllibhesZY/8kIMnx4VfQrYF6+/cai7Gozda/3bMY=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix
index 83a620f87305..c57317fd21b0 100644
--- a/pkgs/by-name/ca/cargo-play/package.nix
+++ b/pkgs/by-name/ca/cargo-play/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fanzeyi";
     repo = "cargo-play";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-raze/package.nix b/pkgs/by-name/ca/cargo-raze/package.nix
index b3e40543ed3f..c3ce7c8488ce 100644
--- a/pkgs/by-name/ca/cargo-raze/package.nix
+++ b/pkgs/by-name/ca/cargo-raze/package.nix
@@ -14,7 +14,7 @@ let
   src = fetchFromGitHub {
     owner = "google";
     repo = "cargo-raze";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dn1MrF+FYBG+vD5AfXCwmzskmKK/TXArnMWW2BAfFFQ=";
   };
 in
diff --git a/pkgs/by-name/ca/cargo-readme/package.nix b/pkgs/by-name/ca/cargo-readme/package.nix
index bb50a2f5d795..504b21085766 100644
--- a/pkgs/by-name/ca/cargo-readme/package.nix
+++ b/pkgs/by-name/ca/cargo-readme/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "webern";
     repo = "cargo-readme";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-rr/package.nix b/pkgs/by-name/ca/cargo-rr/package.nix
index 87d3490e6cec..387a66e53676 100644
--- a/pkgs/by-name/ca/cargo-rr/package.nix
+++ b/pkgs/by-name/ca/cargo-rr/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "danielzfranklin";
     repo = "cargo-rr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index f35310fe2f32..bca7894d4e19 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "Boshen";
     repo = "cargo-shear";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FvZJ0RFa5b9BQuZ1fmkvJhZj59yAsKSkKoTE0Emzdos=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix
index 157a1f175e8c..2287b7b59972 100644
--- a/pkgs/by-name/ca/cargo-shuttle/package.nix
+++ b/pkgs/by-name/ca/cargo-shuttle/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shuttle-hq";
     repo = "shuttle";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RXt9qcLepJJA+MMFm26UMLuwgh8V13DoBueY1Z+W63w=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-sort/package.nix b/pkgs/by-name/ca/cargo-sort/package.nix
index 75e32f0aa49e..6e09b98b180f 100644
--- a/pkgs/by-name/ca/cargo-sort/package.nix
+++ b/pkgs/by-name/ca/cargo-sort/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "devinr528";
     repo = "cargo-sort";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-supply-chain/package.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix
index 95431b78947f..ec62f3a0da86 100644
--- a/pkgs/by-name/ca/cargo-supply-chain/package.nix
+++ b/pkgs/by-name/ca/cargo-supply-chain/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-secure-code";
     repo = "cargo-supply-chain";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KjeYB9TFbuJ2KPaObeM0ADs5F8uJJ6/czMPQjBUgIk8=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-sweep/package.nix b/pkgs/by-name/ca/cargo-sweep/package.nix
index da258b64fcfa..27291cb4418e 100644
--- a/pkgs/by-name/ca/cargo-sweep/package.nix
+++ b/pkgs/by-name/ca/cargo-sweep/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "holmgr";
     repo = "cargo-sweep";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix
index a2ebd230797f..d3abe519950b 100644
--- a/pkgs/by-name/ca/cargo-swift/package.nix
+++ b/pkgs/by-name/ca/cargo-swift/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "antoniusnaumann";
     repo = "cargo-swift";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T8cIZJwnA3bFMIEezMrh5LRXV1SRCAVLanQm7rmc0sU=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-sync-readme/package.nix b/pkgs/by-name/ca/cargo-sync-readme/package.nix
index f80d99c916e6..11ff34bae613 100644
--- a/pkgs/by-name/ca/cargo-sync-readme/package.nix
+++ b/pkgs/by-name/ca/cargo-sync-readme/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "phaazon";
     repo = "cargo-sync-readme";
-    rev = version;
+    tag = version;
     sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix
index c1efbb8ca254..5bec28db8c98 100644
--- a/pkgs/by-name/ca/cargo-temp/package.nix
+++ b/pkgs/by-name/ca/cargo-temp/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yozhgoor";
     repo = "cargo-temp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-71kAlZKSBnROZ8wXe4kQa8nNug5/hk6NKsqHoQU5pWc=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix
index 60d3394df4e6..2c0b3efec85a 100644
--- a/pkgs/by-name/ca/cargo-typify/package.nix
+++ b/pkgs/by-name/ca/cargo-typify/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "oxidecomputer";
     repo = "typify";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vokhWIY5iikTyADrqxp6DIq+tJ+xdFPebDFTddJnstA=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-wipe/package.nix b/pkgs/by-name/ca/cargo-wipe/package.nix
index fe6a8704c5c9..e37d662a4476 100644
--- a/pkgs/by-name/ca/cargo-wipe/package.nix
+++ b/pkgs/by-name/ca/cargo-wipe/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mihai-dinculescu";
     repo = "cargo-wipe";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xMYpZ6a8HdULblkfEqnqLjX8OVFJWx8MHDGNhuFzdTc=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-wizard/package.nix b/pkgs/by-name/ca/cargo-wizard/package.nix
index 1096c2324439..7b9ba2177acb 100644
--- a/pkgs/by-name/ca/cargo-wizard/package.nix
+++ b/pkgs/by-name/ca/cargo-wizard/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kobzol";
     repo = "cargo-wizard";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oFPSgjXZ+Kq59tV/7s6WPF6FHXENoZv8D245yyT0E9E=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-xbuild/package.nix b/pkgs/by-name/ca/cargo-xbuild/package.nix
index 973edf44d469..97f2d8035398 100644
--- a/pkgs/by-name/ca/cargo-xbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-xbuild/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-osdev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-29rCjmzxxIjR5nBN2J3xxP+r8NnPIJV90FkSQQEBbo4=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index 5cdbbea67be7..73776b9579eb 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-cross";
     repo = "cargo-xwin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bzyEIBOa0yqjAYjWGw4Fbb8Cv3yCCfJ4vV0q600Rwyk=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index 8ecc440197a6..ce109f0577eb 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "messense";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-S/Xx487z8LFjCSrB9tQTJy4+AQial2Dptg5xZqzPkVE=";
   };
 
diff --git a/pkgs/by-name/ca/carl/package.nix b/pkgs/by-name/ca/carl/package.nix
index c0e5ead27701..e2b1560cf50e 100644
--- a/pkgs/by-name/ca/carl/package.nix
+++ b/pkgs/by-name/ca/carl/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "b1rger";
     repo = "carl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+l11eP+1qKrWbZhyUJgQ8FgQ+2rncx778F5RPzCfvV4=";
   };
 
diff --git a/pkgs/by-name/ca/caroline/package.nix b/pkgs/by-name/ca/caroline/package.nix
index 3ef2e4b35251..98bec7df49ee 100644
--- a/pkgs/by-name/ca/caroline/package.nix
+++ b/pkgs/by-name/ca/caroline/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dcharles525";
     repo = "caroline";
-    rev = version;
+    tag = version;
     hash = "sha256-v423h9EC/h6B9VABhkvmYcyYXKPpvqhI8O7ZjbO637k";
   };
 
diff --git a/pkgs/by-name/ca/carp/package.nix b/pkgs/by-name/ca/carp/package.nix
index 5325019c7785..83583cb78c22 100644
--- a/pkgs/by-name/ca/carp/package.nix
+++ b/pkgs/by-name/ca/carp/package.nix
@@ -14,7 +14,7 @@ haskellPackages.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "carp-lang";
     repo = "Carp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-B7SBzjegFzL2gGivIJE6BZcLD3f0Bsh8yndjScG2TZI=";
   };
 
diff --git a/pkgs/by-name/ca/carto/package.nix b/pkgs/by-name/ca/carto/package.nix
index 1183c7bdd983..79973de850b2 100644
--- a/pkgs/by-name/ca/carto/package.nix
+++ b/pkgs/by-name/ca/carto/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "carto";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TylMgb2EI52uFmVeMJiQltgNCSh6MutFwUjsYC7gfEA=";
   };
 
diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix
index 8cf856a27a8f..cbc1b277c448 100644
--- a/pkgs/by-name/ca/casadi/package.nix
+++ b/pkgs/by-name/ca/casadi/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "casadi";
     repo = "casadi";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-WumXAWO65XnNQqHMqAwfj2Y+KGOVTWx95qIuyE1M9us=";
   };
 
diff --git a/pkgs/by-name/ca/cassette/package.nix b/pkgs/by-name/ca/cassette/package.nix
index 7dfe2e770e06..aca0e7e91d2b 100644
--- a/pkgs/by-name/ca/cassette/package.nix
+++ b/pkgs/by-name/ca/cassette/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Rirusha";
     repo = "Cassette";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DXCOrCntOgUPYMVRqC4jDNTFgUjShCBoYQgLtSnuz6U=";
   };
 
diff --git a/pkgs/by-name/ca/cassowary/package.nix b/pkgs/by-name/ca/cassowary/package.nix
index f2f255e7ac5c..2aca23d73ee0 100644
--- a/pkgs/by-name/ca/cassowary/package.nix
+++ b/pkgs/by-name/ca/cassowary/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rogerwelin";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zaG4HrdTGXTalMFz/huRW32RZBQx55AvUi29tz6vFD8=";
   };
 
diff --git a/pkgs/by-name/ca/castero/package.nix b/pkgs/by-name/ca/castero/package.nix
index bc1d84690fb0..bf079dbf17c7 100644
--- a/pkgs/by-name/ca/castero/package.nix
+++ b/pkgs/by-name/ca/castero/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xgi";
     repo = "castero";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6/7oCKBMEcQeJ8PaFP15Xef9sQRYCpigtzINv2M6GUY=";
   };
 
diff --git a/pkgs/by-name/ca/castnow/package.nix b/pkgs/by-name/ca/castnow/package.nix
index cff938b11551..1423f61502f7 100644
--- a/pkgs/by-name/ca/castnow/package.nix
+++ b/pkgs/by-name/ca/castnow/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "xat";
     repo = "castnow";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vAjeDPH+Lu/vj3GhwytXqpbSkg5hKpXsMRNV+8TUeio=";
   };
 
diff --git a/pkgs/by-name/ca/catatonit/package.nix b/pkgs/by-name/ca/catatonit/package.nix
index 1844d936d6b5..1360d783b92e 100644
--- a/pkgs/by-name/ca/catatonit/package.nix
+++ b/pkgs/by-name/ca/catatonit/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sc/T4WjCPFfwUWxlBx07mQTmcOApblHygfVT824HcJM=";
   };
 
diff --git a/pkgs/by-name/ca/catch/package.nix b/pkgs/by-name/ca/catch/package.nix
index 96bb28887d19..6e071cce8b52 100644
--- a/pkgs/by-name/ca/catch/package.nix
+++ b/pkgs/by-name/ca/catch/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1gdp5wm8khn02g2miz381llw3191k7309qj8s3jd6sasj01rhf23";
   };
 
diff --git a/pkgs/by-name/ca/catimg/package.nix b/pkgs/by-name/ca/catimg/package.nix
index 9b2df1c394ec..56e05248870e 100644
--- a/pkgs/by-name/ca/catimg/package.nix
+++ b/pkgs/by-name/ca/catimg/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "posva";
     repo = "catimg";
-    rev = version;
+    tag = version;
     sha256 = "0a2dswbv4xddb2l2d55hc43lzvjwrjs5z9am7v6i0p0mi2fmc89s";
   };
 
diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix
index 7687535405e8..4fb0032958fb 100644
--- a/pkgs/by-name/ca/catnip/package.nix
+++ b/pkgs/by-name/ca/catnip/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "noriah";
     repo = "catnip";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9gneteQIzbMNjg/08uq+pCbs2a32He2gL+hovxcJFzE=";
   };
 
diff --git a/pkgs/by-name/ca/catppuccin-cursors/package.nix b/pkgs/by-name/ca/catppuccin-cursors/package.nix
index 6bd4bfc0a378..13c39d2149db 100644
--- a/pkgs/by-name/ca/catppuccin-cursors/package.nix
+++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "cursors";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qis6p+/m7+DdRDYzLq9yB2eZGpfZe5z5xRsa/1HoIG4=";
   };
 
diff --git a/pkgs/by-name/ca/catppuccin-grub/package.nix b/pkgs/by-name/ca/catppuccin-grub/package.nix
index 7472007f0220..73a52f84f652 100644
--- a/pkgs/by-name/ca/catppuccin-grub/package.nix
+++ b/pkgs/by-name/ca/catppuccin-grub/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "grub";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0=";
   };
 
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/ca/catppuccin-kde/package.nix b/pkgs/by-name/ca/catppuccin-kde/package.nix
index 7569d0f253d1..0414d49960ed 100644
--- a/pkgs/by-name/ca/catppuccin-kde/package.nix
+++ b/pkgs/by-name/ca/catppuccin-kde/package.nix
@@ -58,7 +58,7 @@ lib.checkListOfEnum "Invalid accent, valid accents are ${toString validAccents}"
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "kde";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-pfG0L4eSXLYLZM8Mhla4yalpEro74S9kc0sOmQtnG3w=";
     };
 
diff --git a/pkgs/by-name/ca/catppuccin-sddm/package.nix b/pkgs/by-name/ca/catppuccin-sddm/package.nix
index 1de2521a5f42..5a1b9fb5c155 100644
--- a/pkgs/by-name/ca/catppuccin-sddm/package.nix
+++ b/pkgs/by-name/ca/catppuccin-sddm/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "sddm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SdpkuonPLgCgajW99AzJaR8uvdCPi4MdIxS5eB+Q9WQ=";
   };
 
diff --git a/pkgs/by-name/ca/catppuccinifier-cli/package.nix b/pkgs/by-name/ca/catppuccinifier-cli/package.nix
index eff6c9216011..f29ca2ceec1c 100644
--- a/pkgs/by-name/ca/catppuccinifier-cli/package.nix
+++ b/pkgs/by-name/ca/catppuccinifier-cli/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lighttigerXIV";
     repo = "catppuccinifier";
-    rev = version;
+    tag = version;
     hash = "sha256-CEjdCr7QgyQw+1VmeEyt95R0HKE0lAKZHrwahaxgJoU=";
   };
 
diff --git a/pkgs/by-name/ca/cava/package.nix b/pkgs/by-name/ca/cava/package.nix
index 8deb020998ad..98be634953f0 100644
--- a/pkgs/by-name/ca/cava/package.nix
+++ b/pkgs/by-name/ca/cava/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "karlstav";
     repo = "cava";
-    rev = version;
+    tag = version;
     hash = "sha256-oKEUddzg7Gt3uu6x9D65JX0PvuC59r7Psb9VZz3+nCc=";
   };
 
diff --git a/pkgs/by-name/ca/cayley/package.nix b/pkgs/by-name/ca/cayley/package.nix
index f6afb01a2e42..a0a29947113b 100644
--- a/pkgs/by-name/ca/cayley/package.nix
+++ b/pkgs/by-name/ca/cayley/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cayleygraph";
     repo = "cayley";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jIX0v6ujiQvEAb/mKkrpNgsY0YLkJYHy2sUfQnooE48=";
   };
 
diff --git a/pkgs/by-name/cb/cbatticon/package.nix b/pkgs/by-name/cb/cbatticon/package.nix
index f5050e42624f..9e0e4b9d7b7a 100644
--- a/pkgs/by-name/cb/cbatticon/package.nix
+++ b/pkgs/by-name/cb/cbatticon/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "valr";
     repo = "cbatticon";
-    rev = version;
+    tag = version;
     sha256 = "sha256-VQjJujF9lnVvQxV+0YqodLgnI9F90JKDAGBu5nM/Q/c=";
   };
 
diff --git a/pkgs/by-name/cb/cbconvert/package.nix b/pkgs/by-name/cb/cbconvert/package.nix
index 1b0c195df670..4c49410f1fc7 100644
--- a/pkgs/by-name/cb/cbconvert/package.nix
+++ b/pkgs/by-name/cb/cbconvert/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gen2brain";
     repo = "cbconvert";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-C2Eox6fpKS0fPB7KFgBn62HKbWYacSVMJK0CkT6+FBU=";
   };
 
diff --git a/pkgs/by-name/cb/cbfmt/package.nix b/pkgs/by-name/cb/cbfmt/package.nix
index 1486293f4f6b..1d44be612872 100644
--- a/pkgs/by-name/cb/cbfmt/package.nix
+++ b/pkgs/by-name/cb/cbfmt/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lukas-reineke";
     repo = "cbfmt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/ZvL1ZHXcmE1n+hHvJeSqmnI9nSHJ+zM9lLNx0VQfIE=";
   };
 
diff --git a/pkgs/by-name/cb/cbmp/package.nix b/pkgs/by-name/cb/cbmp/package.nix
index 402c3233529d..1eba5d150d4f 100644
--- a/pkgs/by-name/cb/cbmp/package.nix
+++ b/pkgs/by-name/cb/cbmp/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "ful1e5";
     repo = "cbmp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vOEz2KGJLCiiX+Or9y0JE9UF7sYbwaSCVm5iBv4jIdI=";
   };
 
diff --git a/pkgs/by-name/cb/cbonsai/package.nix b/pkgs/by-name/cb/cbonsai/package.nix
index 9feb1f3ba012..6c1d58dc46d8 100644
--- a/pkgs/by-name/cb/cbonsai/package.nix
+++ b/pkgs/by-name/cb/cbonsai/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "jallbrit";
     repo = "cbonsai";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XFK6DiIb8CzVubTnEMkqRW8xZkX/SWjUsrfS+I7LOs8=";
   };
 
diff --git a/pkgs/by-name/cc/ccls/package.nix b/pkgs/by-name/cc/ccls/package.nix
index 5e40d5fc0f40..89230db86a85 100644
--- a/pkgs/by-name/cc/ccls/package.nix
+++ b/pkgs/by-name/cc/ccls/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MaskRay";
     repo = "ccls";
-    rev = version;
+    tag = version;
     sha256 = "sha256-0hZ4VnscnKYBrXy58IjeoeDxja1oNq0mNaQGPmej5BA=";
   };
 
diff --git a/pkgs/by-name/cc/cconv/package.nix b/pkgs/by-name/cc/cconv/package.nix
index cc739c86ce3b..cc01f902b705 100644
--- a/pkgs/by-name/cc/cconv/package.nix
+++ b/pkgs/by-name/cc/cconv/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xiaoyjy";
     repo = "cconv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "RAFl/+I+usUfeG/l17F3ltThK7G4+TekyQGwzQIgeH8=";
   };
 
diff --git a/pkgs/by-name/cd/cddlib/package.nix b/pkgs/by-name/cd/cddlib/package.nix
index a745c3a5b42e..6df087acd07c 100644
--- a/pkgs/by-name/cd/cddlib/package.nix
+++ b/pkgs/by-name/cd/cddlib/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cddlib";
     repo = "cddlib";
-    rev = version;
+    tag = version;
     sha256 = "09s8323h5w9j6mpl1yc6lm770dkskfxd2ayyafkcjllmnncxzfa0";
   };
   buildInputs = [ gmp ];
diff --git a/pkgs/by-name/cd/cde/package.nix b/pkgs/by-name/cd/cde/package.nix
index d61c888d482b..fb2e9c92b47d 100644
--- a/pkgs/by-name/cd/cde/package.nix
+++ b/pkgs/by-name/cd/cde/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "usnistgov";
     repo = "corr-CDE";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-s375gtqBWx0GGXALXR+fN4bb3tmpvPNu/3bNz+75UWU=";
   };
 
diff --git a/pkgs/by-name/cd/cdogs-sdl/package.nix b/pkgs/by-name/cd/cdogs-sdl/package.nix
index 0fe49ca587a6..3690a0a47f04 100644
--- a/pkgs/by-name/cd/cdogs-sdl/package.nix
+++ b/pkgs/by-name/cd/cdogs-sdl/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "cdogs-sdl";
     owner = "cxong";
-    rev = version;
+    tag = version;
     sha256 = "sha256-I4v13CPdA2KYwhlIJjz+qgKe2EoXUtV6iWeadrg4Usc=";
   };
 
diff --git a/pkgs/by-name/cd/cdwe/package.nix b/pkgs/by-name/cd/cdwe/package.nix
index 39c8935faedc..5ceca51cfb60 100644
--- a/pkgs/by-name/cd/cdwe/package.nix
+++ b/pkgs/by-name/cd/cdwe/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "synoet";
     repo = "cdwe";
-    rev = version;
+    tag = version;
     hash = "sha256-6NWhx82BXhWhbI18k5gE3vEkw9v5gstE8ICJhtq68rM=";
   };
 
diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix
index e4c1fdaba998..5b475ab7d9c8 100644
--- a/pkgs/by-name/ce/cel-go/package.nix
+++ b/pkgs/by-name/ce/cel-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "cel-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-t451e3Pkkt4pmBvS0DBSHOVg7P8ipJd28XyiQ6P/QIQ=";
   };
 
diff --git a/pkgs/by-name/ce/celeste/package.nix b/pkgs/by-name/ce/celeste/package.nix
index 48ef60083dde..68f6f1a3e39e 100644
--- a/pkgs/by-name/ce/celeste/package.nix
+++ b/pkgs/by-name/ce/celeste/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hwittenborn";
     repo = "celeste";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Yj2PvAlAkwLaSE27KnzEmiRAD5K/YVGbF4+N3uhDVT8=";
   };
 
diff --git a/pkgs/by-name/ce/celeste64/package.nix b/pkgs/by-name/ce/celeste64/package.nix
index e24921723e4b..8e61492852ff 100644
--- a/pkgs/by-name/ce/celeste64/package.nix
+++ b/pkgs/by-name/ce/celeste64/package.nix
@@ -25,7 +25,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     repo = "Celeste64";
     owner = "ExOK";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XRAjDYIqYaQYCWNNT7UuLDKDBgq3vqxtCzay7pGICtA=";
   };
   projectFile = "Celeste64.csproj";
diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix
index 28c90ea1d828..7b7f0407f3e6 100644
--- a/pkgs/by-name/ce/cemu/package.nix
+++ b/pkgs/by-name/ce/cemu/package.nix
@@ -45,7 +45,7 @@ let
     src = fetchFromGitHub {
       owner = "ocornut";
       repo = "imgui";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-J4gz4rnydu8JlzqNC/OIoVoRcgeFd6B1Qboxu5drOKY=";
     };
   };
diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix
index 7e11eefbca64..1726946979ba 100644
--- a/pkgs/by-name/ce/centerpiece/package.nix
+++ b/pkgs/by-name/ce/centerpiece/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "friedow";
     repo = "centerpiece";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tZNwMPL1ITWVvoywojsd5j0GIVQt6pOKFLwi7jwqLKg=";
   };
 
diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix
index e96f82a984b6..17a373172c93 100644
--- a/pkgs/by-name/ce/centrifugo/package.nix
+++ b/pkgs/by-name/ce/centrifugo/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "centrifugal";
     repo = "centrifugo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FDtAkoN1bdqVUEP0obbXBfQfVRpZN5YXbU1KT1yXWuI=";
   };
 
diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix
index 8db4efbf105c..56948961c43a 100644
--- a/pkgs/by-name/ce/ceph-csi/package.nix
+++ b/pkgs/by-name/ce/ceph-csi/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ceph";
     repo = "ceph-csi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Wa5elZbQotgeb4pH9DIZd48CQyBJ0O5y1SidIb/iyGY=";
   };
 
diff --git a/pkgs/by-name/ce/cero/package.nix b/pkgs/by-name/ce/cero/package.nix
index 77c88389a9c2..6785ff9a523c 100644
--- a/pkgs/by-name/ce/cero/package.nix
+++ b/pkgs/by-name/ce/cero/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "glebarez";
     repo = "cero";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-t2u6Q8CatUIQKk146uor367vr85O6KU8Gf8LZFZTESU=";
   };
 
diff --git a/pkgs/by-name/ce/certgraph/package.nix b/pkgs/by-name/ce/certgraph/package.nix
index 7f5eac96c4e5..99b4adc87283 100644
--- a/pkgs/by-name/ce/certgraph/package.nix
+++ b/pkgs/by-name/ce/certgraph/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lanrat";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-7tvPiJHZE9X7I79DFNF1ZAQiaAkrtrXiD2fY7AkbWMk=";
   };
 
diff --git a/pkgs/by-name/ce/certigo/package.nix b/pkgs/by-name/ce/certigo/package.nix
index bf5286c1a693..01491cb6729f 100644
--- a/pkgs/by-name/ce/certigo/package.nix
+++ b/pkgs/by-name/ce/certigo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "square";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+j1NeQJPDwQxXVYnHNmL49Li2IMH+9ehS0HSM3kqyxU=";
   };
 
diff --git a/pkgs/by-name/ce/certinfo/package.nix b/pkgs/by-name/ce/certinfo/package.nix
index 073c6ce3ed9c..51df4b5fb636 100644
--- a/pkgs/by-name/ce/certinfo/package.nix
+++ b/pkgs/by-name/ce/certinfo/package.nix
@@ -14,7 +14,7 @@ buildGo123Module rec {
   src = fetchFromGitHub {
     owner = "pete911";
     repo = "certinfo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BI5gYWKGMU0wLvnArG41bLWj+9ipe/GARKRX0fwz4ag=";
   };
 
diff --git a/pkgs/by-name/ce/certmgr/package.nix b/pkgs/by-name/ce/certmgr/package.nix
index 6a81e0952791..8341404c3701 100644
--- a/pkgs/by-name/ce/certmgr/package.nix
+++ b/pkgs/by-name/ce/certmgr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "certmgr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MgNPU06bv31tdfUnigcmct8UTVztNLXcmTg3H/J7mic=";
   };
 
diff --git a/pkgs/by-name/ce/certspotter/package.nix b/pkgs/by-name/ce/certspotter/package.nix
index 51993f07cd4e..3c3ac8a256fb 100644
--- a/pkgs/by-name/ce/certspotter/package.nix
+++ b/pkgs/by-name/ce/certspotter/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SSLMate";
     repo = "certspotter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nyeqpDMRZRuHjfl3cI/I00KpVg3udjr0B8MEBZcF7nY=";
   };
 
diff --git a/pkgs/by-name/ce/certstrap/package.nix b/pkgs/by-name/ce/certstrap/package.nix
index 3cc981bf68a6..a4e9a8d3c5b4 100644
--- a/pkgs/by-name/ce/certstrap/package.nix
+++ b/pkgs/by-name/ce/certstrap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "square";
     repo = "certstrap";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mbZtomR8nnawXr3nGVSEuVObe79M1CqTlYN/aEpKmcU=";
   };
 
diff --git a/pkgs/by-name/ce/cewl/package.nix b/pkgs/by-name/ce/cewl/package.nix
index e415a1bdc950..46b1b5df963d 100644
--- a/pkgs/by-name/ce/cewl/package.nix
+++ b/pkgs/by-name/ce/cewl/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "digininja";
     repo = "CeWL";
-    rev = version;
+    tag = version;
     sha256 = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc=";
   };
 
diff --git a/pkgs/by-name/ce/cewler/package.nix b/pkgs/by-name/ce/cewler/package.nix
index a146ef653f64..a3e88538e29b 100644
--- a/pkgs/by-name/ce/cewler/package.nix
+++ b/pkgs/by-name/ce/cewler/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "roys";
     repo = "cewler";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lVI3p6YMugQ3yKHFNxISmUY7XZMuX/TXvVUoZfIeJog=";
   };
 
diff --git a/pkgs/by-name/cf/cf-terraforming/package.nix b/pkgs/by-name/cf/cf-terraforming/package.nix
index 2bbcce278f66..e69bcd5dbe75 100644
--- a/pkgs/by-name/cf/cf-terraforming/package.nix
+++ b/pkgs/by-name/cf/cf-terraforming/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cf-terraforming";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-iv4vQRQNYBl2v2TAK11VJbVCQB1jw51NjGJ80aIGPbQ=";
   };
 
diff --git a/pkgs/by-name/cf/cf-tool/package.nix b/pkgs/by-name/cf/cf-tool/package.nix
index 044a7f7e602b..ae2c9384c5e5 100644
--- a/pkgs/by-name/cf/cf-tool/package.nix
+++ b/pkgs/by-name/cf/cf-tool/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sempr";
     repo = "cf-tool";
-    rev = version;
+    tag = version;
     hash = "sha256-D+mJJw1+ImCrFpsv8HmaAwWqjYvUWouh8mgQ7hJxMrc=";
   };
 
diff --git a/pkgs/by-name/cf/cf-vault/package.nix b/pkgs/by-name/cf/cf-vault/package.nix
index 47f49ab1b817..ec1dd2b9dcf6 100644
--- a/pkgs/by-name/cf/cf-vault/package.nix
+++ b/pkgs/by-name/cf/cf-vault/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jacobbednarz";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-vp9ufjNZabY/ck2lIT+QpD6IgaVj1BkBRTjPxkb6IjQ=";
   };
 
diff --git a/pkgs/by-name/cf/cfdyndns/package.nix b/pkgs/by-name/cf/cfdyndns/package.nix
index 66bf5369ce27..924f00bd3fd5 100644
--- a/pkgs/by-name/cf/cfdyndns/package.nix
+++ b/pkgs/by-name/cf/cfdyndns/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nrdxp";
     repo = "cfdyndns";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OV1YRcZDzYy1FP1Bqp9m+Jxgu6Vc0aWpbAffNcdIW/4=";
   };
 
diff --git a/pkgs/by-name/cf/cfm/package.nix b/pkgs/by-name/cf/cfm/package.nix
index 119fe1d8c79e..e68b7501a5f6 100644
--- a/pkgs/by-name/cf/cfm/package.nix
+++ b/pkgs/by-name/cf/cfm/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "willeccles";
     repo = "cfm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-uXL0RO9P+NYSZ0xCv91KzjHOJJI500YUT8IJkFS86pE=";
   };
 
diff --git a/pkgs/by-name/cf/cfs-zen-tweaks/package.nix b/pkgs/by-name/cf/cfs-zen-tweaks/package.nix
index 509978486d46..8e30e69ed758 100644
--- a/pkgs/by-name/cf/cfs-zen-tweaks/package.nix
+++ b/pkgs/by-name/cf/cfs-zen-tweaks/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "igo95862";
     repo = "cfs-zen-tweaks";
-    rev = version;
+    tag = version;
     hash = "sha256-E3sNWWXm0NEqLCzFccd/nfYby+/b/MVjIHeGlDxV1W4=";
   };
 
diff --git a/pkgs/by-name/cf/cfssl/package.nix b/pkgs/by-name/cf/cfssl/package.nix
index 8d18fe922bd3..f8d33f8127d8 100644
--- a/pkgs/by-name/cf/cfssl/package.nix
+++ b/pkgs/by-name/cf/cfssl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cfssl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Xczpv6tLJiy2dXoGJ0QUmXwOn0p6S+lm2oz61oytQec=";
   };
 
diff --git a/pkgs/by-name/cg/cg3/package.nix b/pkgs/by-name/cg/cg3/package.nix
index e4e142d641ee..b225085af77f 100644
--- a/pkgs/by-name/cg/cg3/package.nix
+++ b/pkgs/by-name/cg/cg3/package.nix
@@ -17,7 +17,7 @@ let
     src = fetchFromGitHub {
       owner = "GrammarSoft";
       repo = "cg3";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-TiEhhk90w5GibGZ4yalIf+4qLA8NoU6+GIPN6QNTz2A=";
     };
 
diff --git a/pkgs/by-name/cg/cglm/package.nix b/pkgs/by-name/cg/cglm/package.nix
index 2a5272dd06d2..46a95c5d97fc 100644
--- a/pkgs/by-name/cg/cglm/package.nix
+++ b/pkgs/by-name/cg/cglm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "recp";
     repo = "cglm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-caDw9Sqf4hS2JNbNxG/xaFIvO6oIlvT+hZQhdX37BKw=";
   };
 
diff --git a/pkgs/by-name/cg/cgminer/package.nix b/pkgs/by-name/cg/cgminer/package.nix
index 2104e05a834b..9121ddc9b488 100644
--- a/pkgs/by-name/cg/cgminer/package.nix
+++ b/pkgs/by-name/cg/cgminer/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ckolivas";
     repo = "cgminer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5";
   };
 
diff --git a/pkgs/by-name/cg/cgreen/package.nix b/pkgs/by-name/cg/cgreen/package.nix
index e3c557fc9ce7..46f8941d8e99 100644
--- a/pkgs/by-name/cg/cgreen/package.nix
+++ b/pkgs/by-name/cg/cgreen/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cgreen-devs";
     repo = "cgreen";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-W4MdB3acZcxavjRupJa4eXAv9g4QgYXFAQWOLoHrQZ8=";
   };
 
diff --git a/pkgs/by-name/cg/cgt-calc/package.nix b/pkgs/by-name/cg/cgt-calc/package.nix
index 23a33881ab63..830252977582 100644
--- a/pkgs/by-name/cg/cgt-calc/package.nix
+++ b/pkgs/by-name/cg/cgt-calc/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "KapJI";
     repo = "capital-gains-calculator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-y/Y05wG89nccXyxfjqazyPJhd8dOkfwRJre+Rzx97Hw=";
   };
 
diff --git a/pkgs/by-name/ch/chain-bench/package.nix b/pkgs/by-name/ch/chain-bench/package.nix
index 4fde0f9ce10c..9e12f3432407 100644
--- a/pkgs/by-name/ch/chain-bench/package.nix
+++ b/pkgs/by-name/ch/chain-bench/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5+jSbXbT1UwHMVeZ07qcY8Is88ddHdr7QlgcbQK+8FA=";
   };
   vendorHash = "sha256-uN4TSAxb229NhcWmiQmWBajla9XKnpiZrXOWJxt/mic=";
diff --git a/pkgs/by-name/ch/chamber/package.nix b/pkgs/by-name/ch/chamber/package.nix
index 4f6dd8670f67..7914b1cb64ff 100644
--- a/pkgs/by-name/ch/chamber/package.nix
+++ b/pkgs/by-name/ch/chamber/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "segmentio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1ySOlP0sFk3+IRt/zstZK6lEE2pzoVSiZz3wFxdesgc=";
   };
 
diff --git a/pkgs/by-name/ch/changelogger/package.nix b/pkgs/by-name/ch/changelogger/package.nix
index f0b911d15c18..89a432c23f53 100644
--- a/pkgs/by-name/ch/changelogger/package.nix
+++ b/pkgs/by-name/ch/changelogger/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MarkusFreitag";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-XDiO8r1HpdsfBKzFLnsWdxte2EqL1blPH21137fNm5M=";
   };
 
diff --git a/pkgs/by-name/ch/changetower/package.nix b/pkgs/by-name/ch/changetower/package.nix
index e3496e4fe279..ce24680b622a 100644
--- a/pkgs/by-name/ch/changetower/package.nix
+++ b/pkgs/by-name/ch/changetower/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Dc4ts";
     repo = "ChangeTower";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P20kzsFTR6kVWUD6mt3T3sge/ioIYgeREfy40oxlDBU=";
   };
 
diff --git a/pkgs/by-name/ch/changie/package.nix b/pkgs/by-name/ch/changie/package.nix
index 7be69fdfbdf4..e1801e4c2b6e 100644
--- a/pkgs/by-name/ch/changie/package.nix
+++ b/pkgs/by-name/ch/changie/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "miniscruff";
     repo = "changie";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zLRMH5TxEz/fspMOPAMTEqO19fj9PZsRh6zddbTqSXM=";
   };
 
diff --git a/pkgs/by-name/ch/charasay/package.nix b/pkgs/by-name/ch/charasay/package.nix
index 8b4c188a9d6d..694c577637ae 100644
--- a/pkgs/by-name/ch/charasay/package.nix
+++ b/pkgs/by-name/ch/charasay/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "latipun7";
     repo = "charasay";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NB2GDDFH9IW/c0acMojYHuzPrx0J3tjlDqjQa6ZRbN4=";
   };
 
diff --git a/pkgs/by-name/ch/charliecloud/package.nix b/pkgs/by-name/ch/charliecloud/package.nix
index dd831bd34ebd..eeb308201717 100644
--- a/pkgs/by-name/ch/charliecloud/package.nix
+++ b/pkgs/by-name/ch/charliecloud/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hpc";
     repo = "charliecloud";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kdaVlwE3vdCxsmJTOUwx8J+9UcBuXbKDwS2MHX2ZPPM=";
   };
 
diff --git a/pkgs/by-name/ch/charm-freeze/package.nix b/pkgs/by-name/ch/charm-freeze/package.nix
index d5da8ac2253c..1dcad10c1a93 100644
--- a/pkgs/by-name/ch/charm-freeze/package.nix
+++ b/pkgs/by-name/ch/charm-freeze/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "freeze";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1zc62m1uS8Bl6x54SG2///PWfiKbZood6VBibbsFX7I=";
   };
 
diff --git a/pkgs/by-name/ch/charm/package.nix b/pkgs/by-name/ch/charm/package.nix
index 908df7793a2d..0275938800f0 100644
--- a/pkgs/by-name/ch/charm/package.nix
+++ b/pkgs/by-name/ch/charm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "charm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-RtUHJIMbodICEDIhjH/QZlAS7dxBsL/uNYA2IoObAg0=";
   };
 
diff --git a/pkgs/by-name/ch/chart-testing/package.nix b/pkgs/by-name/ch/chart-testing/package.nix
index bc580ea44807..37c3b46b14f2 100644
--- a/pkgs/by-name/ch/chart-testing/package.nix
+++ b/pkgs/by-name/ch/chart-testing/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "helm";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q56ZM+YzL7RRC3RD3xO3K0hIDomKun5xmSKuiDTq1cU=";
   };
 
diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix
index fa8b090c740c..d912272c6fb3 100644
--- a/pkgs/by-name/ch/chatd/package.nix
+++ b/pkgs/by-name/ch/chatd/package.nix
@@ -19,7 +19,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "BruceMacD";
     repo = "chatd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6z5QoJk81NEP115uW+2ah7vxpDz8XQUmMLESPsZT9uU=";
   };
 
diff --git a/pkgs/by-name/ch/chatgpt-cli/package.nix b/pkgs/by-name/ch/chatgpt-cli/package.nix
index 61982d798fdb..6bce713b72d0 100644
--- a/pkgs/by-name/ch/chatgpt-cli/package.nix
+++ b/pkgs/by-name/ch/chatgpt-cli/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "j178";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+U5fDG/t1x7F4h+D3rVdgvYICoQDH7dd5GUNOCkXw/Q=";
   };
 
diff --git a/pkgs/by-name/ch/chatgpt-shell-cli/package.nix b/pkgs/by-name/ch/chatgpt-shell-cli/package.nix
index f18028cac42a..33ef1f643032 100644
--- a/pkgs/by-name/ch/chatgpt-shell-cli/package.nix
+++ b/pkgs/by-name/ch/chatgpt-shell-cli/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "0xacx";
     repo = "chatgpt-shell-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-hYLrUya4UCsIB1J/n+jp1jFRCEqnGFJOr3ATxm0zwdY=";
   };
 
diff --git a/pkgs/by-name/ch/cheat/package.nix b/pkgs/by-name/ch/cheat/package.nix
index 6d964df186b1..6caa772fef06 100644
--- a/pkgs/by-name/ch/cheat/package.nix
+++ b/pkgs/by-name/ch/cheat/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cheat";
     repo = "cheat";
-    rev = version;
+    tag = version;
     sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE=";
   };
 
diff --git a/pkgs/by-name/ch/checkmake/package.nix b/pkgs/by-name/ch/checkmake/package.nix
index 400552061f8b..11647cfeb4eb 100644
--- a/pkgs/by-name/ch/checkmake/package.nix
+++ b/pkgs/by-name/ch/checkmake/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mrtazz";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Ql8XSQA/w7wT9GbmYOM2vG15GVqj9LxOGIu8Wqp9Wao=";
   };
 
diff --git a/pkgs/by-name/ch/checkmate/package.nix b/pkgs/by-name/ch/checkmate/package.nix
index 64b8bf9b2fd6..abcbacb7ab5f 100644
--- a/pkgs/by-name/ch/checkmate/package.nix
+++ b/pkgs/by-name/ch/checkmate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adedayo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XzzN4oIG6E4NsMGl4HzFlgAGhkRieRn+jyA0bT8fcrg=";
   };
 
diff --git a/pkgs/by-name/ch/checksec/package.nix b/pkgs/by-name/ch/checksec/package.nix
index c479c7f14510..db61cfffa46f 100644
--- a/pkgs/by-name/ch/checksec/package.nix
+++ b/pkgs/by-name/ch/checksec/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "slimm609";
     repo = "checksec.sh";
-    rev = version;
+    tag = version;
     hash = "sha256-BWtchWXukIDSLJkFX8M/NZBvfi7vUE2j4yFfS0KEZDo=";
   };
 
diff --git a/pkgs/by-name/ch/chelf/package.nix b/pkgs/by-name/ch/chelf/package.nix
index 940a74cfb2de..b6f4f82f4e3c 100644
--- a/pkgs/by-name/ch/chelf/package.nix
+++ b/pkgs/by-name/ch/chelf/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gottox";
     repo = "chelf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0xwd84aynyqsi2kcndbff176vmhrak3jmn3lfcwya59653pppjr6";
   };
 
diff --git a/pkgs/by-name/ch/cherry/package.nix b/pkgs/by-name/ch/cherry/package.nix
index 727601743e0c..d9554124b5d6 100644
--- a/pkgs/by-name/ch/cherry/package.nix
+++ b/pkgs/by-name/ch/cherry/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "turquoise-hexagon";
     repo = "cherry";
-    rev = version;
+    tag = version;
     sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586";
   };
 
diff --git a/pkgs/by-name/ch/chess-tui/package.nix b/pkgs/by-name/ch/chess-tui/package.nix
index e914e3c88cbc..6bda89faa126 100644
--- a/pkgs/by-name/ch/chess-tui/package.nix
+++ b/pkgs/by-name/ch/chess-tui/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "thomas-mauran";
     repo = "chess-tui";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-LtxaZ/7p/lqStoUmckVVaegQp02Ci3L46fMFEgledj4=";
   };
 
diff --git a/pkgs/by-name/ch/chez-matchable/package.nix b/pkgs/by-name/ch/chez-matchable/package.nix
index 1b595f432ce5..80a38ed0c4b4 100644
--- a/pkgs/by-name/ch/chez-matchable/package.nix
+++ b/pkgs/by-name/ch/chez-matchable/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fedeinthemix";
     repo = "chez-matchable";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UYoT8Kp1FTfiL22ntrFXFcAB1HGVrJ6p9JgvhUKi+Yo=";
   };
 
diff --git a/pkgs/by-name/ch/chez-mit/package.nix b/pkgs/by-name/ch/chez-mit/package.nix
index a12f7a7a06d8..d7a8b88dee0e 100644
--- a/pkgs/by-name/ch/chez-mit/package.nix
+++ b/pkgs/by-name/ch/chez-mit/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fedeinthemix";
     repo = "chez-mit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TmoLA0zLETKE+PsrGS5dce9xLQUIKwSNixRSVjbrOlk=";
   };
 
diff --git a/pkgs/by-name/ch/chez-scmutils/package.nix b/pkgs/by-name/ch/chez-scmutils/package.nix
index 853a4aa1a72d..6ccbc597b013 100644
--- a/pkgs/by-name/ch/chez-scmutils/package.nix
+++ b/pkgs/by-name/ch/chez-scmutils/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fedeinthemix";
     repo = "chez-scmutils";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-y2ug7GfmkJC6jddgB8YllsumjmGxFJxTGTpPf1Vcs/s=";
   };
 
diff --git a/pkgs/by-name/ch/chez-srfi/package.nix b/pkgs/by-name/ch/chez-srfi/package.nix
index 5b1e72851ba6..a0c5d541f543 100644
--- a/pkgs/by-name/ch/chez-srfi/package.nix
+++ b/pkgs/by-name/ch/chez-srfi/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fedeinthemix";
     repo = "chez-srfi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yBhRNfoEt1LOn3/zd/yOWwfErN/qG/tQZnDRqEf8j/0=";
   };
 
diff --git a/pkgs/by-name/ch/chibi/package.nix b/pkgs/by-name/ch/chibi/package.nix
index 5108d2c707f2..ea363e1e9d3c 100644
--- a/pkgs/by-name/ch/chibi/package.nix
+++ b/pkgs/by-name/ch/chibi/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ashinn";
     repo = "chibi-scheme";
-    rev = version;
+    tag = version;
     sha256 = "sha256-i+xiaYwM7a+0T824VSuh7UUNI6HV9KpqzQPE1WAZ+As=";
   };
 
diff --git a/pkgs/by-name/ch/chirpstack-concentratord/package.nix b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
index f01d68e48672..8f1841848b94 100644
--- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix
+++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-concentratord";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RFjBeFGK0HzRPeCCU5Un3c3XSg8hmXo+7DWP6tfsDgw=";
   };
 
diff --git a/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix b/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix
index b5ca232a7822..2b835acf1342 100644
--- a/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix
+++ b/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-gateway-bridge";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nVrYyvoN6jayXAwivwxhijNeLEcGICTWJ4T9EBs5uaI=";
   };
 
diff --git a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
index 16f2cf22ffa7..b1241b331806 100644
--- a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
+++ b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-mqtt-forwarder";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jbu8O1Wag6KpN49VyXsYO8os95ctZjzuxKXoDMLyiKU=";
   };
 
diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix
index 7abde58978fe..aee84c72223b 100644
--- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix
+++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-rest-api";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yYuSciMsQudGqBPNqj28TZgCGtZb9j7mtEkBR8tbEm4=";
   };
 
diff --git a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
index 6c07e39e421a..876d4c2d17a7 100644
--- a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
+++ b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-udp-forwarder";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Snj5nKyFsq8WJJNw1d8O/YX/dZ/tCTVBw5R8kXJvsa4=";
   };
 
diff --git a/pkgs/by-name/ch/chit/package.nix b/pkgs/by-name/ch/chit/package.nix
index dc9fa955817f..8d8057faccef 100644
--- a/pkgs/by-name/ch/chit/package.nix
+++ b/pkgs/by-name/ch/chit/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "peterheesterman";
     repo = "chit";
-    rev = version;
+    tag = version;
     sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz";
   };
 
diff --git a/pkgs/by-name/ch/cholmod-extra/package.nix b/pkgs/by-name/ch/cholmod-extra/package.nix
index cbc6669c4c9e..ba149490eba9 100644
--- a/pkgs/by-name/ch/cholmod-extra/package.nix
+++ b/pkgs/by-name/ch/cholmod-extra/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "cholmod-extra";
     owner = "jluttine";
-    rev = version;
+    tag = version;
     sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg";
   };
 
diff --git a/pkgs/by-name/ch/choose-gui/package.nix b/pkgs/by-name/ch/choose-gui/package.nix
index da7d1e6e7be9..fe953146855c 100644
--- a/pkgs/by-name/ch/choose-gui/package.nix
+++ b/pkgs/by-name/ch/choose-gui/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chipsenkbeil";
     repo = "choose";
-    rev = version;
+    tag = version;
     hash = "sha256-oR0GgMinKcBHaZWdE7O+mdbiLKKjkweECKbi80bjW+c=";
   };
 
diff --git a/pkgs/by-name/ch/choose/package.nix b/pkgs/by-name/ch/choose/package.nix
index a56d726f4a60..c3fa9264366a 100644
--- a/pkgs/by-name/ch/choose/package.nix
+++ b/pkgs/by-name/ch/choose/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "theryangeary";
     repo = "choose";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ojmib9yri/Yj1VSwwssbXv+ThnZjUXLTmOpfPGdGFaU=";
   };
 
diff --git a/pkgs/by-name/ch/chopchop/package.nix b/pkgs/by-name/ch/chopchop/package.nix
index 5d75efb611d8..001580863eb9 100644
--- a/pkgs/by-name/ch/chopchop/package.nix
+++ b/pkgs/by-name/ch/chopchop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "michelin";
     repo = "ChopChop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qSBQdcS6d0tctSHRbkY4T7s6Zj7xI2abaPUvNKh1M2E=";
   };
 
diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix
index 20c100d07f31..956bd8e25e2c 100644
--- a/pkgs/by-name/ch/chroma/package.nix
+++ b/pkgs/by-name/ch/chroma/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alecthomas";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     inherit (srcInfo) sha256;
   };
 
diff --git a/pkgs/by-name/ch/chrome-export/package.nix b/pkgs/by-name/ch/chrome-export/package.nix
index ce8e8acf606c..15987751547c 100644
--- a/pkgs/by-name/ch/chrome-export/package.nix
+++ b/pkgs/by-name/ch/chrome-export/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bdesham";
     repo = "chrome-export";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0p1914wfjggjavw7a0dh2nb7z97z3wrkwrpwxkdc2pj5w5lv405m";
   };
 
diff --git a/pkgs/by-name/ch/chruby-fish/package.nix b/pkgs/by-name/ch/chruby-fish/package.nix
index 620a63c1fa52..98c1c11982b0 100644
--- a/pkgs/by-name/ch/chruby-fish/package.nix
+++ b/pkgs/by-name/ch/chruby-fish/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JeanMertz";
     repo = "chruby-fish";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "15q0ywsn9pcypbpvlq0wb41x4igxm9bsvhg9a05dqw1n437qjhyb";
   };
 
diff --git a/pkgs/by-name/ci/ciano/package.nix b/pkgs/by-name/ci/ciano/package.nix
index 650526eec16f..40a3f8257859 100644
--- a/pkgs/by-name/ci/ciano/package.nix
+++ b/pkgs/by-name/ci/ciano/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "robertsanseries";
     repo = "ciano";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-nubm6vBWwsHrrmvFAL/cIzYPxg9B1EhnpC79IJMNuFY=";
   };
 
diff --git a/pkgs/by-name/ci/ciao/package.nix b/pkgs/by-name/ci/ciao/package.nix
index 025ec757b86b..f7cfb23efdc1 100644
--- a/pkgs/by-name/ci/ciao/package.nix
+++ b/pkgs/by-name/ci/ciao/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ciao-lang";
     repo = "ciao";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vjDiYL6yVfLo7NrVKdYRxMUrg7aqQHTezqNoDJcsEuI=";
   };
 
diff --git a/pkgs/by-name/ci/cicero-tui/package.nix b/pkgs/by-name/ci/cicero-tui/package.nix
index c78751b54c1c..c29c63dea3ec 100644
--- a/pkgs/by-name/ci/cicero-tui/package.nix
+++ b/pkgs/by-name/ci/cicero-tui/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "eyeplum";
     repo = "cicero-tui";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-2raSkIycXCdT/TSlaQviI6Eql7DONgRVsPP2B2YuW8U=";
   };
 
diff --git a/pkgs/by-name/ci/cidr-merger/package.nix b/pkgs/by-name/ci/cidr-merger/package.nix
index 5626be5d1d91..be4758c60d31 100644
--- a/pkgs/by-name/ci/cidr-merger/package.nix
+++ b/pkgs/by-name/ci/cidr-merger/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zhanhb";
     repo = "cidr-merger";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Kb+89VP7JhBrTE4MM3H/dqoIBgDLnVhKqkgHdymYCgk=";
   };
 
diff --git a/pkgs/by-name/ci/cie-middleware-linux/package.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix
index 7647f20c69a7..c69749a4364a 100644
--- a/pkgs/by-name/ci/cie-middleware-linux/package.nix
+++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix
@@ -26,7 +26,7 @@ let
   src = fetchFromGitHub {
     owner = "M0rf30";
     repo = "cie-middleware-linux";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2P/1hQTmeQ6qE7RgAeLOZTszcLcIpa2XX1S2ahXRHcc=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix
index 1252761cc1bb..39ff7569f0be 100644
--- a/pkgs/by-name/ci/cinnamon-common/package.nix
+++ b/pkgs/by-name/ci/cinnamon-common/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon";
-    rev = version;
+    tag = version;
     hash = "sha256-WBdzlourYf2oEXUMbzNcNNsc8lBo6ujAy/K1Y6nGOjU=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix
index 1b87565edaf5..e3403a526ebf 100644
--- a/pkgs/by-name/ci/cinnamon-control-center/package.nix
+++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-control-center";
-    rev = version;
+    tag = version;
     hash = "sha256-1Z+kXvBmENNXIqdZgPDx7ZSwJMFAm2oMih6eFFAsA/A=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix
index 1016119236ba..8b97ffa2d020 100644
--- a/pkgs/by-name/ci/cinnamon-desktop/package.nix
+++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-desktop";
-    rev = version;
+    tag = version;
     hash = "sha256-YKGVuT28MLcLO9T8ZJqbHqMN0SAn1P1l8JTDBo4n838=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-menus/package.nix b/pkgs/by-name/ci/cinnamon-menus/package.nix
index 4c423800bcdb..3205d2aef554 100644
--- a/pkgs/by-name/ci/cinnamon-menus/package.nix
+++ b/pkgs/by-name/ci/cinnamon-menus/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-menus";
-    rev = version;
+    tag = version;
     hash = "sha256-ug1RSP2TBrypi0aGhF05k39koY3rGgJi0LuWyuuICd0=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
index 83f1072f95e6..e1e5de06b8f8 100644
--- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix
+++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-screensaver";
-    rev = version;
+    tag = version;
     hash = "sha256-XlEu/aBwNeu+CC6IRnFTF6LUnb7VY2+OOGsdCvQYweA=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix
index 45dd7591357d..48cefb82fc88 100644
--- a/pkgs/by-name/ci/cinnamon-session/package.nix
+++ b/pkgs/by-name/ci/cinnamon-session/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-session";
-    rev = version;
+    tag = version;
     hash = "sha256-4uTKcmwfEytoAy4CFiOedYJqmPtBFBHk0P1gEGgm6pU=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
index 76a2b434c81e..65f79a3ae575 100644
--- a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
+++ b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-settings-daemon";
-    rev = version;
+    tag = version;
     hash = "sha256-L7+OgymYoYBdprw66RW8tiGA7XGWjTBpDpXhli8Fjoo=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-translations/package.nix b/pkgs/by-name/ci/cinnamon-translations/package.nix
index b75620366732..04799ec56dce 100644
--- a/pkgs/by-name/ci/cinnamon-translations/package.nix
+++ b/pkgs/by-name/ci/cinnamon-translations/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-translations";
-    rev = version;
+    tag = version;
     hash = "sha256-By09Y4iHZz3XR7tRd5MyXK5BKOr01yJzTTLQHEZ00q0=";
   };
 
diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index c8a1b5da5b19..35dcd5d30e57 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -18,7 +18,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MyVKRWhLXxz4h2/2OtpmYrLYiZeNOMEetHwl4NklkOA=";
   };
 
diff --git a/pkgs/by-name/ci/cipher/package.nix b/pkgs/by-name/ci/cipher/package.nix
index b93049e9d4d2..35b8d36e09ef 100644
--- a/pkgs/by-name/ci/cipher/package.nix
+++ b/pkgs/by-name/ci/cipher/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arshubham";
     repo = "cipher";
-    rev = version;
+    tag = version;
     sha256 = "00azc5ck17zkdypfza6x1viknwhimd9fqgk2ybff3mx6aphmla7a";
   };
 
diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix
index 93f2e791c8c2..bdad718e9e2f 100644
--- a/pkgs/by-name/ci/circleci-cli/package.nix
+++ b/pkgs/by-name/ci/circleci-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0hikYA7oU3tTHZdEcxDzMXCg13+muk6V7MyqJwExm0A=";
   };
 
diff --git a/pkgs/by-name/ci/circom/package.nix b/pkgs/by-name/ci/circom/package.nix
index d74ae936bd3c..d3daafe836c0 100644
--- a/pkgs/by-name/ci/circom/package.nix
+++ b/pkgs/by-name/ci/circom/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "iden3";
     repo = "circom";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BSInX4owuamRWnlKL1yJJOyzRIiE55TIzCk2TdX7aOQ=";
   };
 
diff --git a/pkgs/by-name/ci/circumflex/package.nix b/pkgs/by-name/ci/circumflex/package.nix
index b2d65ddb6479..204c267bb7d3 100644
--- a/pkgs/by-name/ci/circumflex/package.nix
+++ b/pkgs/by-name/ci/circumflex/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bensadeh";
     repo = "circumflex";
-    rev = version;
+    tag = version;
     hash = "sha256-qponQtfpAXQxpAhkXaylgzpsvbccTIz9kmhdI4tPuNQ=";
   };
 
diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix
index 6bdb50af35dc..2e19baedd6af 100644
--- a/pkgs/by-name/ci/cirrus-cli/package.nix
+++ b/pkgs/by-name/ci/cirrus-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = "cirrus-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nh6nvH26mYPHmjixTk3sn65JXVT5QSj7cX8yfEYaoD4=";
   };
 
diff --git a/pkgs/by-name/ci/cirrusgo/package.nix b/pkgs/by-name/ci/cirrusgo/package.nix
index 27b88bc477df..4d235d1a0318 100644
--- a/pkgs/by-name/ci/cirrusgo/package.nix
+++ b/pkgs/by-name/ci/cirrusgo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Ph33rr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FYI/Ldu91YB/4wCiVADeYxYQOeBGro1msY5VXsnixw4=";
   };
 
diff --git a/pkgs/by-name/ci/cista/package.nix b/pkgs/by-name/ci/cista/package.nix
index b1822ae7bbd0..6cf28e4a4c58 100644
--- a/pkgs/by-name/ci/cista/package.nix
+++ b/pkgs/by-name/ci/cista/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "felixguendling";
     repo = "cista";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+DcxnckoXVSc+gXt21fxKkx4J1khLsQPuxYH9CBRrfE=";
   };
 
diff --git a/pkgs/by-name/ci/citations/package.nix b/pkgs/by-name/ci/citations/package.nix
index 7fc6357ac63b..3a902b39d630 100644
--- a/pkgs/by-name/ci/citations/package.nix
+++ b/pkgs/by-name/ci/citations/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "citations";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-aJp9UrfRXAsnHFGgMTHGRgCvlPEa62r9/0hEp5YKRzE=";
   };
 
diff --git a/pkgs/by-name/ci/civetweb/package.nix b/pkgs/by-name/ci/civetweb/package.nix
index 5691d1af3233..5855577e9ff1 100644
--- a/pkgs/by-name/ci/civetweb/package.nix
+++ b/pkgs/by-name/ci/civetweb/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "civetweb";
     repo = "civetweb";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4=";
   };
 
diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix
index 7aac936bfe5a..d1841ea70a94 100644
--- a/pkgs/by-name/ci/civo/package.nix
+++ b/pkgs/by-name/ci/civo/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "civo";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-30uv9vVjfjZWsUhwrgY7TYs8cAkv+v/TdsSW+VmupJM=";
   };
 
diff --git a/pkgs/by-name/cj/cjose/package.nix b/pkgs/by-name/cj/cjose/package.nix
index 53785ab7cec0..54718e090068 100644
--- a/pkgs/by-name/cj/cjose/package.nix
+++ b/pkgs/by-name/cj/cjose/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zmartzone";
     repo = "cjose";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk=";
   };
 
diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix
index 0c9fce38f415..4f7d727c5cfd 100644
--- a/pkgs/by-name/cj/cjs/package.nix
+++ b/pkgs/by-name/cj/cjs/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cjs";
-    rev = version;
+    tag = version;
     hash = "sha256-2lkIWroOo3hxu9/L/Ty7CADzVrZ0ohyHVmm65NoNlD4=";
   };
 
diff --git a/pkgs/by-name/cj/cjson/package.nix b/pkgs/by-name/cj/cjson/package.nix
index 7f1eac88571a..3c5c37416ece 100644
--- a/pkgs/by-name/cj/cjson/package.nix
+++ b/pkgs/by-name/cj/cjson/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DaveGamble";
     repo = "cJSON";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UgUWc/+Zie2QNijxKK5GFe4Ypk97EidG8nTiiHhn5Ys=";
   };
 
diff --git a/pkgs/by-name/cl/cl-wordle/package.nix b/pkgs/by-name/cl/cl-wordle/package.nix
index 80ec161a6ad6..153aa7958bc8 100644
--- a/pkgs/by-name/cl/cl-wordle/package.nix
+++ b/pkgs/by-name/cl/cl-wordle/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "conradludgate";
     repo = "wordle";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wFTvzAzboUFQg3fauIwIdRChK7rmLES92jK+8ff1D3s=";
   };
 
diff --git a/pkgs/by-name/cl/clair/package.nix b/pkgs/by-name/cl/clair/package.nix
index c0f1450e05c1..126c61c38570 100644
--- a/pkgs/by-name/cl/clair/package.nix
+++ b/pkgs/by-name/cl/clair/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "quay";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-itIjDdTKQ0PCfOkefXxqu6MpdWK3F1j6ArvaInQd/hc=";
   };
 
diff --git a/pkgs/by-name/cl/clairvoyant/package.nix b/pkgs/by-name/cl/clairvoyant/package.nix
index 6c95b62474db..84277744b4b3 100644
--- a/pkgs/by-name/cl/clairvoyant/package.nix
+++ b/pkgs/by-name/cl/clairvoyant/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "clairvoyant";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-CSORiNPqzliIpslV28NRPs/+bc9iblsLTPOm1WxxTjc=";
   };
 
diff --git a/pkgs/by-name/cl/clamtk/package.nix b/pkgs/by-name/cl/clamtk/package.nix
index d9f7821bad0b..2cce11d44beb 100644
--- a/pkgs/by-name/cl/clamtk/package.nix
+++ b/pkgs/by-name/cl/clamtk/package.nix
@@ -15,7 +15,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "dave-theunsub";
     repo = "clamtk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ClBsBXbGj67zgrkA9EjgK7s3OmXOJA+xV5xLGOcMsbI=";
   };
 
diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix
index 2a119ac37b8e..edc303b9742b 100644
--- a/pkgs/by-name/cl/clang-uml/package.nix
+++ b/pkgs/by-name/cl/clang-uml/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bkryza";
     repo = "clang-uml";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-mY6kJnwWLgCeKXSquNTxsnr4S3bKwedgiRixzyLWTK8=";
   };
 
diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix
index d7366c96a0a0..e3241ff1f3ed 100644
--- a/pkgs/by-name/cl/clap/package.nix
+++ b/pkgs/by-name/cl/clap/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "free-audio";
     repo = "clap";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-QyIuuiwFg5DP2Ao/LOKYiBXxKHQ0FbFhssIIUnEQz+c=";
   };
 
diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix
index b264ae2d0138..2596c1adfd89 100644
--- a/pkgs/by-name/cl/clapboard/package.nix
+++ b/pkgs/by-name/cl/clapboard/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bjesus";
     repo = "clapboard";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TM07BcluIh+MEcVg1ApZu85rj36ZBUfn125A0eALNMo=";
   };
 
diff --git a/pkgs/by-name/cl/classicube/package.nix b/pkgs/by-name/cl/classicube/package.nix
index dd5beefbafe6..5cd74c1d8e24 100644
--- a/pkgs/by-name/cl/classicube/package.nix
+++ b/pkgs/by-name/cl/classicube/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "UnknownShadow200";
     repo = "ClassiCube";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ZITyfxkQB4Jpm2ZsQyM+ouPLqCVmGB7UZRXDSU/BX0k=";
   };
 
diff --git a/pkgs/by-name/cl/claws/package.nix b/pkgs/by-name/cl/claws/package.nix
index d189fa3690c0..7d6f7707d8d8 100644
--- a/pkgs/by-name/cl/claws/package.nix
+++ b/pkgs/by-name/cl/claws/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.4.1";
 
   src = fetchFromGitHub {
-    rev = version;
+    tag = version;
     owner = "thehowl";
     repo = pname;
     hash = "sha256-3zzUBeYfu9x3vRGX1DionLnAs1e44tFj8Z1dpVwjdCg=";
diff --git a/pkgs/by-name/cl/clblast/package.nix b/pkgs/by-name/cl/clblast/package.nix
index 8f93b2d236a5..a62d5dd46520 100644
--- a/pkgs/by-name/cl/clblast/package.nix
+++ b/pkgs/by-name/cl/clblast/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CNugteren";
     repo = "CLBlast";
-    rev = version;
+    tag = version;
     hash = "sha256-fzenYFCAQ0B2NQgh5OaErv/yNEzjznB6ogRapqfL6P4=";
   };
 
diff --git a/pkgs/by-name/cl/clean-css-cli/package.nix b/pkgs/by-name/cl/clean-css-cli/package.nix
index 195aa7537d1b..4bcfbde05c60 100644
--- a/pkgs/by-name/cl/clean-css-cli/package.nix
+++ b/pkgs/by-name/cl/clean-css-cli/package.nix
@@ -9,7 +9,7 @@ let
   src = fetchFromGitHub {
     owner = "clean-css";
     repo = "clean-css-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tsFNcQg55uY2gL5xLLLS6INLlYzbsU6M3hnsYeOFGEw=";
   };
 in
diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index 4c2b76aa1ca3..667ac0b2981a 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -18,7 +18,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "CleverCloud";
     repo = "clever-tools";
-    rev = version;
+    tag = version;
     hash = "sha256-n4rmgOeooLPGLkgBjSBKkevbDPujAORc2i63LiINpcU=";
   };
 
diff --git a/pkgs/by-name/cl/clfft/package.nix b/pkgs/by-name/cl/clfft/package.nix
index a7eedd645738..f601b07b52fc 100644
--- a/pkgs/by-name/cl/clfft/package.nix
+++ b/pkgs/by-name/cl/clfft/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "clMathLibraries";
     repo = "clFFT";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w=";
   };
 
diff --git a/pkgs/by-name/cl/cli-visualizer/package.nix b/pkgs/by-name/cl/cli-visualizer/package.nix
index 5fa6cd2f5143..24495967eefa 100644
--- a/pkgs/by-name/cl/cli-visualizer/package.nix
+++ b/pkgs/by-name/cl/cli-visualizer/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dpayne";
     repo = "cli-visualizer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "003mbbwsz43mg3d7llphpypqa9g7rs1p1cdbqi1mbc2bfrc1gcq2";
   };
 
diff --git a/pkgs/by-name/cl/cli53/package.nix b/pkgs/by-name/cl/cli53/package.nix
index 14508c89ca6d..035fb0bed495 100644
--- a/pkgs/by-name/cl/cli53/package.nix
+++ b/pkgs/by-name/cl/cli53/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "barnybug";
     repo = "cli53";
-    rev = version;
+    tag = version;
     sha256 = "sha256-wfb3lK/WB/B8gd4BOqh+Ol10cNZdsoCoQ+hM33+goM8=";
   };
 
diff --git a/pkgs/by-name/cl/cliam/package.nix b/pkgs/by-name/cl/cliam/package.nix
index c1084bf82620..4c39f8a78339 100644
--- a/pkgs/by-name/cl/cliam/package.nix
+++ b/pkgs/by-name/cl/cliam/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "securisec";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-59nPoH0+k1umMwFg95hQHOr/SRGKqr1URFG7xtVRiTs=";
   };
 
diff --git a/pkgs/by-name/cl/clib/package.nix b/pkgs/by-name/cl/clib/package.nix
index 37c0841d75b4..808d7184be38 100644
--- a/pkgs/by-name/cl/clib/package.nix
+++ b/pkgs/by-name/cl/clib/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   pname = "clib";
 
   src = fetchFromGitHub {
-    rev = version;
+    tag = version;
     owner = "clibs";
     repo = "clib";
     sha256 = "sha256-uL8prMk2DrYLjCmZW8DdbCg5FJ5uksT3vIATyOW2ZzY=";
diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix
index e1bd2d3d888a..2bc18d08bf88 100644
--- a/pkgs/by-name/cl/click/package.nix
+++ b/pkgs/by-name/cl/click/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "click";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tYSbyDipZg6Qj/CWk1QVUT5AG8ncTt+5V1+ekpmsKXA=";
   };
 
diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix
index 741103455c39..98feb9ae9bec 100644
--- a/pkgs/by-name/cl/clickable/package.nix
+++ b/pkgs/by-name/cl/clickable/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "clickable";
     repo = "clickable";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5fymmsZUYwB+wc1X7Y1HwwJbGRjQPwkk9JLTxnfH8fo=";
   };
 
diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix
index 5ffa4cf9151c..25907a0ea288 100644
--- a/pkgs/by-name/cl/clickhouse-backup/package.nix
+++ b/pkgs/by-name/cl/clickhouse-backup/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Altinity";
     repo = "clickhouse-backup";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8yvhDpSOklkWIi10o0QBd8bUB9qOF+nDhgaOD8G5FqU=";
   };
 
diff --git a/pkgs/by-name/cl/clifm/package.nix b/pkgs/by-name/cl/clifm/package.nix
index 9adfe65a1401..7fbd770c52dc 100644
--- a/pkgs/by-name/cl/clifm/package.nix
+++ b/pkgs/by-name/cl/clifm/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leo-arch";
     repo = "clifm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RAxhjDNaNkMSIJaca1NNiMQNaEZ3WDAvaWzN3u/PceA=";
   };
 
diff --git a/pkgs/by-name/cl/clima/package.nix b/pkgs/by-name/cl/clima/package.nix
index 1e73159f8062..a541443116d1 100644
--- a/pkgs/by-name/cl/clima/package.nix
+++ b/pkgs/by-name/cl/clima/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "clima";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CRnAxhkuCTyHR4uQofA51Dm3+YKqm3iwBkFNkbLTv1A=";
   };
 
diff --git a/pkgs/by-name/cl/cling/package.nix b/pkgs/by-name/cl/cling/package.nix
index 63b4a681745c..b4177c87b984 100644
--- a/pkgs/by-name/cl/cling/package.nix
+++ b/pkgs/by-name/cl/cling/package.nix
@@ -54,7 +54,7 @@ let
     clingSrc = fetchFromGitHub {
       owner = "root-project";
       repo = "cling";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-Ye8EINzt+dyNvUIRydACXzb/xEPLm0YSkz08Xxw3xp4=";
     };
 
diff --git a/pkgs/by-name/cl/clipboard-jh/package.nix b/pkgs/by-name/cl/clipboard-jh/package.nix
index d2d0651f5123..b816d9b464dc 100644
--- a/pkgs/by-name/cl/clipboard-jh/package.nix
+++ b/pkgs/by-name/cl/clipboard-jh/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Slackadays";
     repo = "clipboard";
-    rev = version;
+    tag = version;
     hash = "sha256-3SloqijgbX3XIwdO2VBOd61or7tnByi7w45dCBKTkm8=";
   };
 
diff --git a/pkgs/by-name/cl/clipman/package.nix b/pkgs/by-name/cl/clipman/package.nix
index 2db613c3fb10..d88c24d4fc9e 100644
--- a/pkgs/by-name/cl/clipman/package.nix
+++ b/pkgs/by-name/cl/clipman/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kuW74iUVLfIUWf3gaKM7IuMU1nfpU9SbSsfeZDbYGhY=";
   };
 
diff --git a/pkgs/by-name/cl/clipmenu/package.nix b/pkgs/by-name/cl/clipmenu/package.nix
index bf2c414a61df..b39af3742463 100644
--- a/pkgs/by-name/cl/clipmenu/package.nix
+++ b/pkgs/by-name/cl/clipmenu/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cdown";
     repo = "clipmenu";
-    rev = version;
+    tag = version;
     sha256 = "sha256-nvctEwyho6kl4+NXi76jT2kG7nchmI2a7mgxlgjXA5A=";
   };
 
diff --git a/pkgs/by-name/cl/clipp/package.nix b/pkgs/by-name/cl/clipp/package.nix
index f2965a422e72..d5c46b3481a5 100644
--- a/pkgs/by-name/cl/clipp/package.nix
+++ b/pkgs/by-name/cl/clipp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "muellan";
     repo = "clipp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0rq80ba2krwzvcg4r2g1al88453c7lz6ziri2s1ygv8inp9r775s";
   };
 
diff --git a/pkgs/by-name/cl/clipqr/package.nix b/pkgs/by-name/cl/clipqr/package.nix
index 22c6bd779f8d..4eb7db3e08af 100644
--- a/pkgs/by-name/cl/clipqr/package.nix
+++ b/pkgs/by-name/cl/clipqr/package.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "imatt-foss";
     repo = "clipqr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iuA6RqclMm1CWaiM1kpOpgfYvKaYGOIwFQkLr/nCL5M=";
   };
 
diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix
index 5cda92da7892..a4df123670a9 100644
--- a/pkgs/by-name/cl/clipse/package.nix
+++ b/pkgs/by-name/cl/clipse/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "savedra1";
     repo = "clipse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yUkHT7SZT7Eudvk1n43V+WGWqUKtXaV+p4ySMK/XzQw=";
   };
 
diff --git a/pkgs/by-name/cl/clipster/package.nix b/pkgs/by-name/cl/clipster/package.nix
index f73265d4fccf..7b5699f43aac 100644
--- a/pkgs/by-name/cl/clipster/package.nix
+++ b/pkgs/by-name/cl/clipster/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mrichar1";
     repo = "clipster";
-    rev = version;
+    tag = version;
     sha256 = "sha256-MLLkFsBBQtb7RFQN+uoEmuCn5bnbkYsqoyWGZtTCI2U=";
   };
 
diff --git a/pkgs/by-name/cl/cliquer/package.nix b/pkgs/by-name/cl/cliquer/package.nix
index 33d9c0704a98..465be3038833 100644
--- a/pkgs/by-name/cl/cliquer/package.nix
+++ b/pkgs/by-name/cl/cliquer/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dimpase";
     repo = "autocliquer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "00gcmrhi2fjn8b246w5a3b0pl7p6haxy5wjvd9kcqib1xanz59z4";
   };
 
diff --git a/pkgs/by-name/cl/cloak-pt/package.nix b/pkgs/by-name/cl/cloak-pt/package.nix
index bcd3441bb43f..88b1bd0e67b5 100644
--- a/pkgs/by-name/cl/cloak-pt/package.nix
+++ b/pkgs/by-name/cl/cloak-pt/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "cbeuw";
     repo = "Cloak";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JbwjsLVOxQc6v47+6rG2f1JLS8ieZI6jYV/twtaVx9M=";
   };
 
diff --git a/pkgs/by-name/cl/cloc/package.nix b/pkgs/by-name/cl/cloc/package.nix
index ab6d1639a9ca..dd2756c2487e 100644
--- a/pkgs/by-name/cl/cloc/package.nix
+++ b/pkgs/by-name/cl/cloc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "AlDanial";
     repo = "cloc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-x02TEm+VYSqj0gSF/Eg+4LkSd2/LapHHSBlZziTKBDQ=";
   };
 
diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix
index e9ed88881c7b..890046c3a09a 100644
--- a/pkgs/by-name/cl/clojure-lsp/package.nix
+++ b/pkgs/by-name/cl/clojure-lsp/package.nix
@@ -15,7 +15,7 @@ buildGraalvmNativeImage rec {
   src = fetchFromGitHub {
     owner = "clojure-lsp";
     repo = "clojure-lsp";
-    rev = version;
+    tag = version;
     hash = "sha256-3CKY3t2NWGAQNWYhmyiq3IJDMp81Q0LDCrS23XJeIys=";
   };
 
diff --git a/pkgs/by-name/cl/clolcat/package.nix b/pkgs/by-name/cl/clolcat/package.nix
index 328fd8c27779..161f715ec689 100644
--- a/pkgs/by-name/cl/clolcat/package.nix
+++ b/pkgs/by-name/cl/clolcat/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IchMageBaume";
     repo = "clolcat";
-    rev = version;
+    tag = version;
     sha256 = "sha256-fLa239dwEXe4Jyy5ntgfU9V0h5wrBsvq6/s2HCis7Sc=";
   };
 
diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix
index bfaf3e536471..dc128fcb9369 100644
--- a/pkgs/by-name/cl/cloud-hypervisor/package.nix
+++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cloud-hypervisor";
     repo = "cloud-hypervisor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PmgHO3gRE/LfLiRC+sAQXKUeclweVUNJV2ihpkvx0Wg=";
   };
 
diff --git a/pkgs/by-name/cl/cloudbrute/package.nix b/pkgs/by-name/cl/cloudbrute/package.nix
index b3695975e9c9..8ec708fd2327 100644
--- a/pkgs/by-name/cl/cloudbrute/package.nix
+++ b/pkgs/by-name/cl/cloudbrute/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "0xsha";
     repo = "CloudBrute";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L233VdQolSPDPDXQALLvF5seb3peHiLRiZuj2RqdaRU=";
   };
 
diff --git a/pkgs/by-name/cl/cloudflare-dyndns/package.nix b/pkgs/by-name/cl/cloudflare-dyndns/package.nix
index cf013c5d69ac..4102b5081aaa 100644
--- a/pkgs/by-name/cl/cloudflare-dyndns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-dyndns/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kissgyorgy";
     repo = "cloudflare-dyndns";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tI6qdNxIMEuAR+BcqsRi2EBXTQnfdDLKW7Y+fbcmlao=";
   };
 
diff --git a/pkgs/by-name/cl/cloudflare-utils/package.nix b/pkgs/by-name/cl/cloudflare-utils/package.nix
index d1f35537098c..7b444d00a133 100644
--- a/pkgs/by-name/cl/cloudflare-utils/package.nix
+++ b/pkgs/by-name/cl/cloudflare-utils/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Cyb3r-Jak3";
     repo = "cloudflare-utils";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LbqH48ysOp2s+e+52doHIyaxUbzzCdJqhdvLuIJ3CCc=";
   };
 
diff --git a/pkgs/by-name/cl/cloudfoundry-cli/package.nix b/pkgs/by-name/cl/cloudfoundry-cli/package.nix
index 90db90e6abed..15341c651b3c 100644
--- a/pkgs/by-name/cl/cloudfoundry-cli/package.nix
+++ b/pkgs/by-name/cl/cloudfoundry-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-W9hshsq02AiDVNFYMoIWCei04b7pPTmIP2+fMyLgcDY=";
   };
   vendorHash = "sha256-6pAcDdCCp64o6VuSSLyLtnLPD5OxSt4o3eUpRhJzXTI=";
diff --git a/pkgs/by-name/cl/cloudlens/package.nix b/pkgs/by-name/cl/cloudlens/package.nix
index c36a5a50a131..99dd0d6a4b31 100644
--- a/pkgs/by-name/cl/cloudlens/package.nix
+++ b/pkgs/by-name/cl/cloudlens/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "one2nc";
     repo = "cloudlens";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-b0i9xaIm42RKWzzZdSAmapbmZDmTpCa4IxVsM9eSMqM=";
   };
 
diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix
index 9ad4f6940528..282725857292 100644
--- a/pkgs/by-name/cl/cloudlog/package.nix
+++ b/pkgs/by-name/cl/cloudlog/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
-    rev = version;
+    tag = version;
     hash = "sha256-SW9ZW6IcxG+KonfgRHnCRo7P9KqfDCrS5MjnRKHvN1k=";
   };
 
diff --git a/pkgs/by-name/cl/cloudmonkey/package.nix b/pkgs/by-name/cl/cloudmonkey/package.nix
index 8505984541db..f4ff5e1cdc08 100644
--- a/pkgs/by-name/cl/cloudmonkey/package.nix
+++ b/pkgs/by-name/cl/cloudmonkey/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "cloudstack-cloudmonkey";
-    rev = version;
+    tag = version;
     sha256 = "sha256-mkEGOZw7GDIFnYUpgvCetA4dU9R1m4q6MOUDG0TWN64=";
   };
 
diff --git a/pkgs/by-name/cl/clpeak/package.nix b/pkgs/by-name/cl/clpeak/package.nix
index bf8285ca8969..a9a0a5c4ee6b 100644
--- a/pkgs/by-name/cl/clpeak/package.nix
+++ b/pkgs/by-name/cl/clpeak/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "krrishnarraj";
     repo = "clpeak";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     sha256 = "1wkjpvn4r89c3y06rv7gfpwpqw6ljmqwz0w0mljl9y5hn1r4pkx2";
   };
diff --git a/pkgs/by-name/cl/clubhouse-cli/package.nix b/pkgs/by-name/cl/clubhouse-cli/package.nix
index f77b9419988b..4df52ed5d5fb 100644
--- a/pkgs/by-name/cl/clubhouse-cli/package.nix
+++ b/pkgs/by-name/cl/clubhouse-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "andjosh";
     repo = "clubhouse-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OGUEPWKL3GBIQHEDljX1gXMRDEztIrJT5ivAIcyW91k=";
   };
 
diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix
index ac81adcf2569..129df0715f36 100644
--- a/pkgs/by-name/cl/clusterctl/package.nix
+++ b/pkgs/by-name/cl/clusterctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cluster-api";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XXtVGIpoR2JfkR7urfHuh6xKoIvsF42NV+4yjxb8nls=";
   };
 
diff --git a/pkgs/by-name/cm/cm256cc/package.nix b/pkgs/by-name/cm/cm256cc/package.nix
index a608a421eda1..c1e373ab97a0 100644
--- a/pkgs/by-name/cm/cm256cc/package.nix
+++ b/pkgs/by-name/cm/cm256cc/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "cm256cc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-T7ZUVVYGdzAialse//MoqWCVNBpbZvzWMAKc0cw7O9k=";
   };
 
diff --git a/pkgs/by-name/cm/cmakerc/package.nix b/pkgs/by-name/cm/cmakerc/package.nix
index d7635c735f14..eeaeae660612 100644
--- a/pkgs/by-name/cm/cmakerc/package.nix
+++ b/pkgs/by-name/cm/cmakerc/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vector-of-bool";
     repo = "cmrc";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-++16WAs2K9BKk8384yaSI/YD1CdtdyXVBIjGhqi4JIk=";
   };
 
diff --git a/pkgs/by-name/cm/cmark-gfm/package.nix b/pkgs/by-name/cm/cmark-gfm/package.nix
index 48c1b6ec8b3b..ebb05bcf15ab 100644
--- a/pkgs/by-name/cm/cmark-gfm/package.nix
+++ b/pkgs/by-name/cm/cmark-gfm/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "github";
     repo = "cmark-gfm";
-    rev = version;
+    tag = version;
     sha256 = "sha256-HiSGtRsSbW03R6aKoMVVFOLrwP5aXtpeXUC/bE5M/qo=";
   };
 
diff --git a/pkgs/by-name/cm/cmark/package.nix b/pkgs/by-name/cm/cmark/package.nix
index 690f3cbe3aaf..29e659338491 100644
--- a/pkgs/by-name/cm/cmark/package.nix
+++ b/pkgs/by-name/cm/cmark/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "commonmark";
     repo = "cmark";
-    rev = version;
+    tag = version;
     sha256 = "sha256-+JLw7zCjjozjq1RhRQGFqHj/MTUTq3t7A0V3T2U2PQk=";
   };
 
diff --git a/pkgs/by-name/cm/cmatrix/package.nix b/pkgs/by-name/cm/cmatrix/package.nix
index 756cc96e8987..c712b873c6a5 100644
--- a/pkgs/by-name/cm/cmatrix/package.nix
+++ b/pkgs/by-name/cm/cmatrix/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "abishekvashok";
     repo = "cmatrix";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1h9jz4m4s5l8c3figaq46ja0km1gimrkfxm4dg7mf4s84icmasbm";
   };
 
diff --git a/pkgs/by-name/cm/cmctl/package.nix b/pkgs/by-name/cm/cmctl/package.nix
index 7f72b847e4d8..78b8b4116244 100644
--- a/pkgs/by-name/cm/cmctl/package.nix
+++ b/pkgs/by-name/cm/cmctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cert-manager";
     repo = "cert-manager";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZvrR8k1jiyAMUKM9VA6vKH2uhMKnd22OQe08CIlxXjs=";
   };
 
diff --git a/pkgs/by-name/cm/cmd-wrapped/package.nix b/pkgs/by-name/cm/cmd-wrapped/package.nix
index 41d40eb271be..499147aa1ad1 100644
--- a/pkgs/by-name/cm/cmd-wrapped/package.nix
+++ b/pkgs/by-name/cm/cmd-wrapped/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "YiNNx";
     repo = "cmd-wrapped";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tIvwJo33Jz9cPq6o4Ytc3VqkxEaxt0W9Fd8CNp+7vAE=";
   };
 
diff --git a/pkgs/by-name/cm/cmdstan/package.nix b/pkgs/by-name/cm/cmdstan/package.nix
index 7be852409821..7c962fd1e37b 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/cm/cminpack/package.nix b/pkgs/by-name/cm/cminpack/package.nix
index 08f5ea016148..26d322efbce8 100644
--- a/pkgs/by-name/cm/cminpack/package.nix
+++ b/pkgs/by-name/cm/cminpack/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "devernay";
     repo = "cminpack";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eFJ43cHbSbWld+gPpMaNiBy1X5TIcN9aVxjh8PxvVDU=";
   };
 
diff --git a/pkgs/by-name/cm/cmrt/package.nix b/pkgs/by-name/cm/cmrt/package.nix
index 60d17e593c6b..c2d12ddc7554 100644
--- a/pkgs/by-name/cm/cmrt/package.nix
+++ b/pkgs/by-name/cm/cmrt/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "cmrt";
-    rev = version;
+    tag = version;
     sha256 = "sha256-W6MQI41J9CKeM1eILCkvmW34cbCC8YeEF2mE+Ci8o7s=";
   };
 
diff --git a/pkgs/by-name/cm/cmusfm/package.nix b/pkgs/by-name/cm/cmusfm/package.nix
index 996103874d1f..895907e8c78a 100644
--- a/pkgs/by-name/cm/cmusfm/package.nix
+++ b/pkgs/by-name/cm/cmusfm/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Arkq";
     repo = "cmusfm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CA585ZpkxMMLgzv81QB2kKMFg5R5CwKS9xAYrU+pAxs=";
   };
 
diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix
index 2058ba3fc98f..d28217a4f8d4 100644
--- a/pkgs/by-name/cn/cntb/package.nix
+++ b/pkgs/by-name/cn/cntb/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "contabo";
     repo = "cntb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4QS1fkXVcGxhZDPRLDc0xKl4jr8W4og/Qf591i3gzxk=";
     # docs contains two files with the same name but different cases,
     # this leads to a different hash on case insensitive filesystems (e.g. darwin)
diff --git a/pkgs/by-name/cn/cntr/package.nix b/pkgs/by-name/cn/cntr/package.nix
index 3810e450a1d8..d6e1333f6a31 100644
--- a/pkgs/by-name/cn/cntr/package.nix
+++ b/pkgs/by-name/cn/cntr/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "cntr";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2tqPxbi8sKoEPq0/zQFsOrStEmQGlU8s81ohTfKeOmE=";
   };
 
diff --git a/pkgs/by-name/co/cobra-cli/package.nix b/pkgs/by-name/co/cobra-cli/package.nix
index c0883a60c71b..c28e509c66fa 100644
--- a/pkgs/by-name/co/cobra-cli/package.nix
+++ b/pkgs/by-name/co/cobra-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "spf13";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-E0I/Pxw4biOv7aGVzGlQOFXnxkc+zZaEoX1JmyMh6UE=";
   };
 
diff --git a/pkgs/by-name/co/coc-css/package.nix b/pkgs/by-name/co/coc-css/package.nix
index bf595960b7e8..644b6a3e8f4b 100644
--- a/pkgs/by-name/co/coc-css/package.nix
+++ b/pkgs/by-name/co/coc-css/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "neoclide";
     repo = "coc-css";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ASFg5LM1NbpK+Df1TPs+O13WmZktw+BtfsCJagF5nUc=";
   };
 
diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix
index 8511e41249a3..6f5f9dfc93c2 100644
--- a/pkgs/by-name/co/cocogitto/package.nix
+++ b/pkgs/by-name/co/cocogitto/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "oknozor";
     repo = "cocogitto";
-    rev = version;
+    tag = version;
     hash = "sha256-ij5vpIpqCYGNPNWPY47rWmMLEgBh+wtVmLRt11S14rE=";
   };
 
diff --git a/pkgs/by-name/co/cod/package.nix b/pkgs/by-name/co/cod/package.nix
index 6dd5ef4d82a5..ba01827d7dda 100644
--- a/pkgs/by-name/co/cod/package.nix
+++ b/pkgs/by-name/co/cod/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dim-an";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mT7OkR8fXXTE3TPx9AmH6ehKGLk4CP9euBPs2zVAJnI=";
   };
 
diff --git a/pkgs/by-name/co/code-minimap/package.nix b/pkgs/by-name/co/code-minimap/package.nix
index 5d6806d3fa4a..420a1bc5c07d 100644
--- a/pkgs/by-name/co/code-minimap/package.nix
+++ b/pkgs/by-name/co/code-minimap/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "code-minimap";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-unf7gFc/tQiUw3VqQ0KC96Srxn1E27WsmJviSggaCF4=";
   };
 
diff --git a/pkgs/by-name/co/code2prompt/package.nix b/pkgs/by-name/co/code2prompt/package.nix
index 03c5e6e7b0a8..469710160bf3 100644
--- a/pkgs/by-name/co/code2prompt/package.nix
+++ b/pkgs/by-name/co/code2prompt/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mufeedvh";
     repo = "code2prompt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KZqh0Vq4Mn56PhUO1JUzVpNBAGOZqUAsj31Cj5K+Lyk=";
   };
 
diff --git a/pkgs/by-name/co/codebraid/package.nix b/pkgs/by-name/co/codebraid/package.nix
index 9c31dc624501..43c3fe897519 100644
--- a/pkgs/by-name/co/codebraid/package.nix
+++ b/pkgs/by-name/co/codebraid/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gpoore";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E9vzGK9ZEVwF+UBpSkdM+hm6vINen/A+LgnnPpc77QQ=";
   };
 
diff --git a/pkgs/by-name/co/codec2/package.nix b/pkgs/by-name/co/codec2/package.nix
index 23e4896dbeca..15c983dac7ad 100644
--- a/pkgs/by-name/co/codec2/package.nix
+++ b/pkgs/by-name/co/codec2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "drowe67";
     repo = "codec2";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-69Mp4o3MgV98Fqfai4txv5jQw2WpoPuoWcwHsNAFPQM=";
   };
 
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/codeowners/package.nix b/pkgs/by-name/co/codeowners/package.nix
index 067870f13b79..e2f82d0b2c0d 100644
--- a/pkgs/by-name/co/codeowners/package.nix
+++ b/pkgs/by-name/co/codeowners/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hmarr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PMT3ihxCD4TNgTZOD4KB9Od1djIhnlMa8zuD6t1OieU=";
   };
 
diff --git a/pkgs/by-name/co/codesearch/package.nix b/pkgs/by-name/co/codesearch/package.nix
index fb93208c1020..39dfb05e4f48 100644
--- a/pkgs/by-name/co/codesearch/package.nix
+++ b/pkgs/by-name/co/codesearch/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "codesearch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-i03w8PZ31j5EutUZaamZsHz+z4qgX4prePbj5DLA78s=";
   };
 
diff --git a/pkgs/by-name/co/codespelunker/package.nix b/pkgs/by-name/co/codespelunker/package.nix
index a0c6ea798703..a1f2105df58a 100644
--- a/pkgs/by-name/co/codespelunker/package.nix
+++ b/pkgs/by-name/co/codespelunker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "boyter";
     repo = "cs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FZf3aRozpXWTRDrNDRxb1dGBXiLVEYOUd8a/hqzThps=";
   };
 
diff --git a/pkgs/by-name/co/codevis/package.nix b/pkgs/by-name/co/codevis/package.nix
index 9e910dfe4ab3..29531d004f95 100644
--- a/pkgs/by-name/co/codevis/package.nix
+++ b/pkgs/by-name/co/codevis/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sloganking";
     repo = "codevis";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LZ6NsoyEPUvgcVdbG7U2Vzuz/TLLraScvW97PocUNpU=";
   };
 
diff --git a/pkgs/by-name/co/coffeescript/package.nix b/pkgs/by-name/co/coffeescript/package.nix
index 0153c233d76a..9cf6b39511d7 100644
--- a/pkgs/by-name/co/coffeescript/package.nix
+++ b/pkgs/by-name/co/coffeescript/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jashkenas";
     repo = "coffeescript";
-    rev = version;
+    tag = version;
     hash = "sha256-vr46LKICX61rFPCkZ3G+8gJykg+MO43YRJnZGM3RoY0=";
   };
 
diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix
index 1dcef0357088..96cf41ed9889 100644
--- a/pkgs/by-name/co/cog/package.nix
+++ b/pkgs/by-name/co/cog/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "igalia";
     repo = "cog";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eF7rvOjZntcMmn622342yqfp4ksZ6R/FFBT36bYCViE=";
   };
 
diff --git a/pkgs/by-name/co/cointop/package.nix b/pkgs/by-name/co/cointop/package.nix
index 14f2c8a17c60..c767e01fb0ca 100644
--- a/pkgs/by-name/co/cointop/package.nix
+++ b/pkgs/by-name/co/cointop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "miguelmota";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-NAw1uoBL/FnNLJ86L9aBCOY65aJn1DDGK0Cd0IO2kr0=";
   };
 
diff --git a/pkgs/by-name/co/coldsnap/package.nix b/pkgs/by-name/co/coldsnap/package.nix
index c669088be099..5403ccfa5360 100644
--- a/pkgs/by-name/co/coldsnap/package.nix
+++ b/pkgs/by-name/co/coldsnap/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "coldsnap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tlQ4PDrYnnbsxXRbrIoF08aSy7VP+iXgTKf0A8MITpo=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/co/colima/package.nix b/pkgs/by-name/co/colima/package.nix
index 5337a0c85cde..c804964e2929 100644
--- a/pkgs/by-name/co/colima/package.nix
+++ b/pkgs/by-name/co/colima/package.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "abiosoft";
     repo = pname;
-    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/colloid-gtk-theme/package.nix b/pkgs/by-name/co/colloid-gtk-theme/package.nix
index de4cdee70ffe..58d6ecb39269 100644
--- a/pkgs/by-name/co/colloid-gtk-theme/package.nix
+++ b/pkgs/by-name/co/colloid-gtk-theme/package.nix
@@ -62,7 +62,7 @@ lib.checkListOfEnum "${pname}: theme variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      rev = version;
+      tag = version;
       hash = "sha256-70HDn87acG0me+zbXk6AoGmakY6VLuawq1ubgGcRZVk=";
     };
 
diff --git a/pkgs/by-name/co/colloid-icon-theme/package.nix b/pkgs/by-name/co/colloid-icon-theme/package.nix
index 03b93d6848cd..3ab0ab69ded9 100644
--- a/pkgs/by-name/co/colloid-icon-theme/package.nix
+++ b/pkgs/by-name/co/colloid-icon-theme/package.nix
@@ -49,7 +49,7 @@ lib.checkListOfEnum "${pname}: scheme variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      rev = version;
+      tag = version;
       hash = "sha256-x2SSaIkKm1415avO7R6TPkpghM30HmMdjMFUUyPWZsk=";
     };
 
diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix
index b888cf190d47..a4926ad7cb1f 100644
--- a/pkgs/by-name/co/colmena/package.nix
+++ b/pkgs/by-name/co/colmena/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zhaofengli";
     repo = "colmena";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ=";
   };
 
diff --git a/pkgs/by-name/co/coloquinte/package.nix b/pkgs/by-name/co/coloquinte/package.nix
index 8a326beca66b..011bb03e2ef4 100644
--- a/pkgs/by-name/co/coloquinte/package.nix
+++ b/pkgs/by-name/co/coloquinte/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "coloquinte";
     repo = "PlaceRoute";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-bPDXaNZCNBM0qiu+46cL/zH/41lwqHPqfqTzJaERgVQ=";
   };
 
diff --git a/pkgs/by-name/co/colordiff/package.nix b/pkgs/by-name/co/colordiff/package.nix
index 11b906b06f3b..6cdaa7128c17 100644
--- a/pkgs/by-name/co/colordiff/package.nix
+++ b/pkgs/by-name/co/colordiff/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "daveewart";
     repo = "colordiff";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TNOw6dqsT0dOIddRoGwEF85CaQF8ICMFUi+GiG5WWpk=";
   };
 
diff --git a/pkgs/by-name/co/colstr/package.nix b/pkgs/by-name/co/colstr/package.nix
index 8e0185c10281..6aaec623692b 100644
--- a/pkgs/by-name/co/colstr/package.nix
+++ b/pkgs/by-name/co/colstr/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "git.sleeping.town";
     owner = "wonder";
     repo = "colstr";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-0V2S/yYu5L7qxkT4Zf18x9+cHoPMztFmgSywpxF8QqA=";
   };
 
diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix
index 572d67065d2c..1f9d61f027b4 100644
--- a/pkgs/by-name/co/comma/package.nix
+++ b/pkgs/by-name/co/comma/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "comma";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XXe0SSdH2JZLx0o+vHDtdlDRtVn7nouIngipbXhmhiQ=";
   };
 
diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix
index 297d36ddb179..105b8daa28ea 100644
--- a/pkgs/by-name/co/commafeed/package.nix
+++ b/pkgs/by-name/co/commafeed/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "Athou";
     repo = "commafeed";
-    rev = version;
+    tag = version;
     hash = "sha256-Qc2l/CSVK+8k7b3RZA8hQsGTq29OvkDMbMzHcnPm/yE=";
   };
 
diff --git a/pkgs/by-name/co/commandergenius/package.nix b/pkgs/by-name/co/commandergenius/package.nix
index a9b0afe5d19d..9b2690964b94 100644
--- a/pkgs/by-name/co/commandergenius/package.nix
+++ b/pkgs/by-name/co/commandergenius/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "Dringgstein";
     repo = "Commander-Genius";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4WfHdgn8frcDVa3Va6vo/jZihf09vIs+bNdAxScgovE=";
   };
 
diff --git a/pkgs/by-name/co/commit-formatter/package.nix b/pkgs/by-name/co/commit-formatter/package.nix
index 624ffd71879d..373a1cdbac85 100644
--- a/pkgs/by-name/co/commit-formatter/package.nix
+++ b/pkgs/by-name/co/commit-formatter/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Eliot00";
     repo = "commit-formatter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "EYzhb9jJ4MzHxIbaTb1MxeXUgoxTwcnq5JdxAv2uNcA=";
   };
 
diff --git a/pkgs/by-name/co/commitizen-go/package.nix b/pkgs/by-name/co/commitizen-go/package.nix
index 103249165d5b..60e6c0b2d49c 100644
--- a/pkgs/by-name/co/commitizen-go/package.nix
+++ b/pkgs/by-name/co/commitizen-go/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lintingzhen";
     repo = "commitizen-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pAWdIQ3icXEv79s+sUVhQclsNcZg+PTZZ6I6JPo7pNg=";
   };
 
diff --git a/pkgs/by-name/co/commitmsgfmt/package.nix b/pkgs/by-name/co/commitmsgfmt/package.nix
index 45ca63918896..53901db6102e 100644
--- a/pkgs/by-name/co/commitmsgfmt/package.nix
+++ b/pkgs/by-name/co/commitmsgfmt/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "mkjeldsen";
     repo = "commitmsgfmt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HEkPnTO1HeJg8gpHFSUTkEVBPWJ0OdfUhNn9iGfaDD4=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/co/comodoro/package.nix b/pkgs/by-name/co/comodoro/package.nix
index 3b2ce0093d42..9cd97cc5c909 100644
--- a/pkgs/by-name/co/comodoro/package.nix
+++ b/pkgs/by-name/co/comodoro/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "soywod";
     repo = "comodoro";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Y9SuxqI8wvoF0+X6CLNDlSFCwlSU8R73NYF/LjACP18=";
   };
 
diff --git a/pkgs/by-name/co/compdb/package.nix b/pkgs/by-name/co/compdb/package.nix
index c840cd85b1fd..a261e204f37e 100644
--- a/pkgs/by-name/co/compdb/package.nix
+++ b/pkgs/by-name/co/compdb/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Sarcasm";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-nFAgTrup6V5oE+LP4UWDOCgTVCv2v9HbQbkGW+oDnTg=";
   };
 
diff --git a/pkgs/by-name/co/compile-daemon/package.nix b/pkgs/by-name/co/compile-daemon/package.nix
index d348a82e7f21..5950d3558948 100644
--- a/pkgs/by-name/co/compile-daemon/package.nix
+++ b/pkgs/by-name/co/compile-daemon/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "githubnemo";
     repo = "CompileDaemon";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gpyXy7FO7ZVXJrkzcKHFez4S/dGiijXfZ9eSJtNlm58=";
   };
 
diff --git a/pkgs/by-name/co/complete-alias/package.nix b/pkgs/by-name/co/complete-alias/package.nix
index fb51e7c99fa7..0c3dd2867498 100644
--- a/pkgs/by-name/co/complete-alias/package.nix
+++ b/pkgs/by-name/co/complete-alias/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cykerway";
     repo = "complete-alias";
-    rev = version;
+    tag = version;
     sha256 = "18lmdb3inphxyjv08ing5wckqnjq0m5zfl0f15mqzlvf2ypar63x";
   };
 
diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index 0965a7b60436..725bfe8b0a13 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "adaszko";
     repo = "complgen";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-spyRH3zzuuGZeQ8iFTa+hc/b4nYSiNIMOEWmc8+jJO0=";
   };
 
diff --git a/pkgs/by-name/co/compose2nix/package.nix b/pkgs/by-name/co/compose2nix/package.nix
index 550eb49b1271..cd4d6089f2ee 100644
--- a/pkgs/by-name/co/compose2nix/package.nix
+++ b/pkgs/by-name/co/compose2nix/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aksiksi";
     repo = "compose2nix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rFnnbRVVv/N5021Al3vmjFAui1cTp8NBZDBNQo8CsXM=";
   };
 
diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix
index 5543a40bf771..2e7225f4e4dd 100644
--- a/pkgs/by-name/co/compsize/package.nix
+++ b/pkgs/by-name/co/compsize/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kilobyte";
     repo = "compsize";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8=";
   };
 
diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index 6f9de3711b87..6a4fc7d94818 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kivikakk";
     repo = "comrak";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-chgg/6BJlCTOWPQ0jnE4l5O/lk0iA4xSwdWURKMF+f8=";
   };
 
diff --git a/pkgs/by-name/co/conceal/package.nix b/pkgs/by-name/co/conceal/package.nix
index 37c276d22096..7be9bbc76525 100644
--- a/pkgs/by-name/co/conceal/package.nix
+++ b/pkgs/by-name/co/conceal/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "TD-Sky";
     repo = "conceal";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BYLDSRgBba6SoGsL/NTV/OTG1/V9RSr8lisj42JqBRM=";
   };
 
diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix
index 89af36894092..7e11061e5cd5 100644
--- a/pkgs/by-name/co/conduwuit/package.nix
+++ b/pkgs/by-name/co/conduwuit/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "girlbossceo";
     repo = "conduwuit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE=";
   };
 
diff --git a/pkgs/by-name/co/configurable-http-proxy/package.nix b/pkgs/by-name/co/configurable-http-proxy/package.nix
index cf8d346d85ff..16cca147f0d9 100644
--- a/pkgs/by-name/co/configurable-http-proxy/package.nix
+++ b/pkgs/by-name/co/configurable-http-proxy/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jupyterhub";
     repo = "configurable-http-proxy";
-    rev = version;
+    tag = version;
     hash = "sha256-nj6+GmBw5YSQs23rWVh3qU4jdzRdbPyx43QmZ3LRwn4=";
   };
 
diff --git a/pkgs/by-name/co/confluencepot/package.nix b/pkgs/by-name/co/confluencepot/package.nix
index 1bbcd0d4b3bd..fef98c2274e9 100644
--- a/pkgs/by-name/co/confluencepot/package.nix
+++ b/pkgs/by-name/co/confluencepot/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SIFalcon";
     repo = "confluencePot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jIbL6prOUII8o9FghIYa80BytJ9SSuyj/TZmAxwAbJk=";
   };
 
diff --git a/pkgs/by-name/co/conform/package.nix b/pkgs/by-name/co/conform/package.nix
index 771368833456..1951ad732818 100644
--- a/pkgs/by-name/co/conform/package.nix
+++ b/pkgs/by-name/co/conform/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "conform";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5knN+lTedUdgWG8rb3zuJAxx9N0lt7LjJvmSJhdTSgw=";
   };
 
diff --git a/pkgs/by-name/co/conjure/package.nix b/pkgs/by-name/co/conjure/package.nix
index 5a8ea6082a41..09ab8e693b0b 100644
--- a/pkgs/by-name/co/conjure/package.nix
+++ b/pkgs/by-name/co/conjure/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nate-xyz";
     repo = "conjure";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qWeqUQxTTnmJt40Jm1qDTGGuSQikkurzOux8sZsmDQk=";
   };
 
diff --git a/pkgs/by-name/co/conmon-rs/package.nix b/pkgs/by-name/co/conmon-rs/package.nix
index 6d2014c86b0c..d9d6f254bc38 100644
--- a/pkgs/by-name/co/conmon-rs/package.nix
+++ b/pkgs/by-name/co/conmon-rs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "conmon-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1kGAUAmiPI9zE8LE7G2r0Gy0YM+BUy2MxY7IQOu2ZDQ=";
   };
 
diff --git a/pkgs/by-name/co/conmon/package.nix b/pkgs/by-name/co/conmon/package.nix
index 3d6910ec56cb..d534fd46bb54 100644
--- a/pkgs/by-name/co/conmon/package.nix
+++ b/pkgs/by-name/co/conmon/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "conmon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XsVWcJsUc0Fkn7qGRJDG5xrQAsJr6KN7zMy3AtPuMTo=";
   };
 
diff --git a/pkgs/by-name/co/connman-gtk/package.nix b/pkgs/by-name/co/connman-gtk/package.nix
index fb784c8aae7a..9786cc1202a1 100644
--- a/pkgs/by-name/co/connman-gtk/package.nix
+++ b/pkgs/by-name/co/connman-gtk/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jgke";
     repo = "connman-gtk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2bfoGXzy4wXRALLXEEa7vPWbsBNUhE31nn7dDkuHYCY=";
   };
 
diff --git a/pkgs/by-name/co/conserve/package.nix b/pkgs/by-name/co/conserve/package.nix
index 2095e4091881..caa71d872f22 100644
--- a/pkgs/by-name/co/conserve/package.nix
+++ b/pkgs/by-name/co/conserve/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sourcefrog";
     repo = "conserve";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rdZTx0wFFtWt3EcpvWHY6m+8TEHEj53vhVpdRp5wbos=";
   };
 
diff --git a/pkgs/by-name/co/conserver/package.nix b/pkgs/by-name/co/conserver/package.nix
index cb741ecc4590..40bc1c771e40 100644
--- a/pkgs/by-name/co/conserver/package.nix
+++ b/pkgs/by-name/co/conserver/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bstansell";
     repo = "conserver";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LiCknqitBoa8E8rNMVgp1004CwkW8G4O5XGKe4NfZI8=";
   };
 
diff --git a/pkgs/by-name/co/console-bridge/package.nix b/pkgs/by-name/co/console-bridge/package.nix
index 384f305977c9..755ed01cd02d 100644
--- a/pkgs/by-name/co/console-bridge/package.nix
+++ b/pkgs/by-name/co/console-bridge/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ros";
     repo = "console_bridge";
-    rev = version;
+    tag = version;
     sha256 = "sha256-M3GocT0hodw3Sc2NHcFDiPVZ1XN7BqIUuYLW8OaXMqM=";
   };
 
diff --git a/pkgs/by-name/co/construct/package.nix b/pkgs/by-name/co/construct/package.nix
index 1869e1acd7ad..a30b08b9f8cb 100644
--- a/pkgs/by-name/co/construct/package.nix
+++ b/pkgs/by-name/co/construct/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Thomas-de-Bock";
     repo = "construct";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ENso0y7yEaXzGXzZOnlZ1L7+j/qayJL+f55/NYLz2ew=";
   };
 
diff --git a/pkgs/by-name/co/consul-alerts/package.nix b/pkgs/by-name/co/consul-alerts/package.nix
index 5cf18d05c0b1..541364d98701 100644
--- a/pkgs/by-name/co/consul-alerts/package.nix
+++ b/pkgs/by-name/co/consul-alerts/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.6.0";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "AcalephStorage";
     repo = "consul-alerts";
     sha256 = "0836zicv76sd6ljhbbii1mrzh65pch10w3gfa128iynaviksbgn5";
diff --git a/pkgs/by-name/co/consul-template/package.nix b/pkgs/by-name/co/consul-template/package.nix
index ca14013c21b2..30f8c45f19f0 100644
--- a/pkgs/by-name/co/consul-template/package.nix
+++ b/pkgs/by-name/co/consul-template/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "consul-template";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iqBcY7FYCO4qqQRAHxA2sxTnyL5c0vLVWKuhqvX0oJE=";
   };
 
diff --git a/pkgs/by-name/co/container-structure-test/package.nix b/pkgs/by-name/co/container-structure-test/package.nix
index c640369c381d..86b18a02d41e 100644
--- a/pkgs/by-name/co/container-structure-test/package.nix
+++ b/pkgs/by-name/co/container-structure-test/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = "container-structure-test";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KLLACXUn6dtVCI+gCMHU9hoAJBOAVyhfwxtzsopWS4U=";
   };
   vendorHash = "sha256-pBq76HJ+nluOMOs9nqBKp1mr1LuX2NERXo48g8ezE9k=";
diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix
index 8e80f0f9ed14..90b3c244cc5a 100644
--- a/pkgs/by-name/co/containerlab/package.nix
+++ b/pkgs/by-name/co/containerlab/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "srl-labs";
     repo = "containerlab";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wTVGvaosHhQleRDytCdA1R4YKlzgGN4nWRZx6Ok+O3U=";
   };
 
diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix
index 2a56fd2830a7..321daaa2e5c1 100644
--- a/pkgs/by-name/co/convco/package.nix
+++ b/pkgs/by-name/co/convco/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "convco";
     repo = "convco";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-s0rcSekJLe99oxi6JD8VL1S6nqQTUFTn5pdgxnknbaY=";
   };
 
diff --git a/pkgs/by-name/co/convimg/package.nix b/pkgs/by-name/co/convimg/package.nix
index 202cc987b1f4..9318e298a9f2 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/co/convos/package.nix b/pkgs/by-name/co/convos/package.nix
index f71868f38886..4fbafa6c4db0 100644
--- a/pkgs/by-name/co/convos/package.nix
+++ b/pkgs/by-name/co/convos/package.nix
@@ -17,7 +17,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "convos-chat";
     repo = "convos";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dBvXo8y4OMKcb0imgnnzoklnPN3YePHDvy5rIBOkTfs=";
   };
 
diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix
index a45cbf962503..a155eeebe5c7 100644
--- a/pkgs/by-name/co/cook-cli/package.nix
+++ b/pkgs/by-name/co/cook-cli/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cooklang";
     repo = "cookcli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1m2+etJG+33fPTxBF8qT/U9WiZGcSn9r0WlK5PDL6/Q=";
   };
 
diff --git a/pkgs/by-name/co/copilot-cli/package.nix b/pkgs/by-name/co/copilot-cli/package.nix
index a04f46bf5f42..ae391655309a 100644
--- a/pkgs/by-name/co/copilot-cli/package.nix
+++ b/pkgs/by-name/co/copilot-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iipDvjPCNtk6wHjukgtnWzz0qwAJOU9DpolesNM2ELo=";
   };
 
diff --git a/pkgs/by-name/co/copilot-node-server/package.nix b/pkgs/by-name/co/copilot-node-server/package.nix
index 9dac4e80164b..002398ba3915 100644
--- a/pkgs/by-name/co/copilot-node-server/package.nix
+++ b/pkgs/by-name/co/copilot-node-server/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jfcherng";
     repo = "copilot-node-server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yOqA2Xo4c7u0g6RQYt9joQk8mI9KE0xTAnLjln9atmg=";
   };
 
diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix
index c11f14947429..6a8daf2a6c7c 100644
--- a/pkgs/by-name/co/coppwr/package.nix
+++ b/pkgs/by-name/co/coppwr/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dimtpap";
     repo = "coppwr";
-    rev = version;
+    tag = version;
     hash = "sha256-5TgK/0UN05P3WENch4sBo/Sy9FaMmyH/gZ+6qUyM1z0=";
   };
 
diff --git a/pkgs/by-name/co/coq2html/package.nix b/pkgs/by-name/co/coq2html/package.nix
index 5768962265cd..cf4603085a93 100644
--- a/pkgs/by-name/co/coq2html/package.nix
+++ b/pkgs/by-name/co/coq2html/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xavierleroy";
     repo = "coq2html";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dBXYeRwBhBWXJfdULLzfgZU+WD6WC6R8wV2eS1zAkq8=";
   };
 
diff --git a/pkgs/by-name/co/cordless/package.nix b/pkgs/by-name/co/cordless/package.nix
index f58b6752ea63..dc937f1260af 100644
--- a/pkgs/by-name/co/cordless/package.nix
+++ b/pkgs/by-name/co/cordless/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Bios-Marcel";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-nOHLI0N4d8aC7KaWdLezSpVU1DS1fkfW5UO7cVYCbis=";
   };
 
diff --git a/pkgs/by-name/co/cordova/package.nix b/pkgs/by-name/co/cordova/package.nix
index 394fc87059ac..568566383c11 100644
--- a/pkgs/by-name/co/cordova/package.nix
+++ b/pkgs/by-name/co/cordova/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "cordova-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-fEV7NlRcRpyeRplsdXHI2U4/89DsvKQpVwHD5juiNPo=";
   };
 
diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix
index c0c8d6d97acc..452dfd9777c7 100644
--- a/pkgs/by-name/co/coredns/package.nix
+++ b/pkgs/by-name/co/coredns/package.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "coredns";
     repo = "coredns";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8LZMS1rAqEZ8k1IWSRkQ2O650oqHLP0P31T8oUeE4fw=";
   };
 
diff --git a/pkgs/by-name/co/corerad/package.nix b/pkgs/by-name/co/corerad/package.nix
index 462cd493e830..ce659722f2db 100644
--- a/pkgs/by-name/co/corerad/package.nix
+++ b/pkgs/by-name/co/corerad/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "corerad";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tVK4chDV26vpuTaqVWe498j8ijZN2OOhe97LLE+xK9Y=";
   };
 
diff --git a/pkgs/by-name/co/coreth/package.nix b/pkgs/by-name/co/coreth/package.nix
index e17c06da1a5d..d0f9e448d123 100644
--- a/pkgs/by-name/co/coreth/package.nix
+++ b/pkgs/by-name/co/coreth/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ava-labs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YUqrbTjye0eNNuf9hGQXtMidRq6y3m3pSKzIRVECy9E=";
   };
 
diff --git a/pkgs/by-name/co/corkscrew/package.nix b/pkgs/by-name/co/corkscrew/package.nix
index 00a1f54697f3..284072403972 100644
--- a/pkgs/by-name/co/corkscrew/package.nix
+++ b/pkgs/by-name/co/corkscrew/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bryanpkc";
     repo = "corkscrew";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JiddvTbuOysenrVWGUEyKSzpCF1PJaYWQUdz3FuLCdw=";
   };
 
diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix
index b6ff5c566804..8d605d967b00 100644
--- a/pkgs/by-name/co/coroot-node-agent/package.nix
+++ b/pkgs/by-name/co/coroot-node-agent/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot-node-agent";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3rr8LWaEhhAvzJisVj2uLK3O5us5/XEOpl7RFL2GBxw=";
   };
 
diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix
index 05c5a5dc8f81..34c1c2a8f9a3 100644
--- a/pkgs/by-name/co/coroot/package.nix
+++ b/pkgs/by-name/co/coroot/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pGNlXXggy32vnbbjGNCev8HzUltls1ElGVULPhOwoRQ=";
   };
 
diff --git a/pkgs/by-name/co/corrosion/package.nix b/pkgs/by-name/co/corrosion/package.nix
index cdd2debdaa61..ec09b7710ddf 100644
--- a/pkgs/by-name/co/corrosion/package.nix
+++ b/pkgs/by-name/co/corrosion/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "corrosion-rs";
     repo = "corrosion";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/Xq0SKaKuOgrMXbgw+Aa59NEnU1mPQhARoh7EqV01K8=";
   };
 
diff --git a/pkgs/by-name/co/cosmopolitan/package.nix b/pkgs/by-name/co/cosmopolitan/package.nix
index fd8821dd8a1a..4dc2981d2e39 100644
--- a/pkgs/by-name/co/cosmopolitan/package.nix
+++ b/pkgs/by-name/co/cosmopolitan/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jart";
     repo = "cosmopolitan";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-DTL1dXH+LhaxWpiCrsNjV74Bw5+kPbhEAA2Z1NKiPDk=";
   };
 
diff --git a/pkgs/by-name/co/costa/package.nix b/pkgs/by-name/co/costa/package.nix
index 0c39de81e3be..6cdf8c88dfe3 100644
--- a/pkgs/by-name/co/costa/package.nix
+++ b/pkgs/by-name/co/costa/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eth-cscs";
     repo = "COSTA";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jiAyZXC7wiuEnOLsQFFLxhN3AsGXN09q/gHC2Hrb2gg=";
   };
 
diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix
index 69535aef9427..50416348d116 100644
--- a/pkgs/by-name/co/cotp/package.nix
+++ b/pkgs/by-name/co/cotp/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "replydev";
     repo = "cotp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5wVIjh16AYwrzjbPgvjsQhihu/vwdQfzU2kZS6eSTWs=";
   };
 
diff --git a/pkgs/by-name/co/couchbase-shell/package.nix b/pkgs/by-name/co/couchbase-shell/package.nix
index d765aeeea45c..b74f103cc28e 100644
--- a/pkgs/by-name/co/couchbase-shell/package.nix
+++ b/pkgs/by-name/co/couchbase-shell/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "couchbaselabs";
     repo = "couchbase-shell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wqOU94rPqIO128uL9iyVzWcAgqnDUPUy1+Qq1hSkvHA=";
   };
 
diff --git a/pkgs/by-name/co/coulr/package.nix b/pkgs/by-name/co/coulr/package.nix
index c7db6a671b15..ba9cdc61901e 100644
--- a/pkgs/by-name/co/coulr/package.nix
+++ b/pkgs/by-name/co/coulr/package.nix
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Huluti";
     repo = "Coulr";
-    rev = version;
+    tag = version;
     hash = "sha256-1xnL5AWl/rLQu3i9m6uxbS4QT+690hmEW8kYTwkg7Gw=";
   };
 
diff --git a/pkgs/by-name/co/cowpatty/package.nix b/pkgs/by-name/co/cowpatty/package.nix
index f264c18c0c56..735de69c250b 100644
--- a/pkgs/by-name/co/cowpatty/package.nix
+++ b/pkgs/by-name/co/cowpatty/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "joswr1ght";
     repo = "cowpatty";
-    rev = version;
+    tag = version;
     sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s";
   };
 
diff --git a/pkgs/by-name/co/coz/package.nix b/pkgs/by-name/co/coz/package.nix
index 90e08f176aaf..715d22aae4ae 100644
--- a/pkgs/by-name/co/coz/package.nix
+++ b/pkgs/by-name/co/coz/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "plasma-umass";
     repo = "coz";
-    rev = version;
+    tag = version;
     hash = "sha256-tvFXInxjodB0jEgEKgnOGapiVPomBG1hvrhYtG2X5jI=";
   };
 
diff --git a/pkgs/by-name/co/coze/package.nix b/pkgs/by-name/co/coze/package.nix
index 2149283645f6..208f4f3bc6d5 100644
--- a/pkgs/by-name/co/coze/package.nix
+++ b/pkgs/by-name/co/coze/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Cyphrme";
     repo = "Coze_cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/Cznx5Q0a9vVrC4oAoBmAkejT1505AQzzCW/wi3itv4=";
   };
 
diff --git a/pkgs/by-name/co/cozy/package.nix b/pkgs/by-name/co/cozy/package.nix
index d0182f75792a..809ade74697b 100644
--- a/pkgs/by-name/co/cozy/package.nix
+++ b/pkgs/by-name/co/cozy/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "geigi";
     repo = "cozy";
-    rev = version;
+    tag = version;
     hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw";
   };
 
diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix
index 64673800373e..be6a03efd462 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/cp437/package.nix b/pkgs/by-name/cp/cp437/package.nix
index e5cae69edd0e..12a3952127f9 100644
--- a/pkgs/by-name/cp/cp437/package.nix
+++ b/pkgs/by-name/cp/cp437/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "keaston";
     repo = "cp437";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "18f4mnfnyviqclbhmbhix80k823481ypkwbp26qfvhnxdgzbggcc";
   };
 
diff --git a/pkgs/by-name/cp/cpcfs/package.nix b/pkgs/by-name/cp/cpcfs/package.nix
index b726e17a1f66..66bd97912eb4 100644
--- a/pkgs/by-name/cp/cpcfs/package.nix
+++ b/pkgs/by-name/cp/cpcfs/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "derikz";
     repo = "cpcfs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0rfbry0qy8mv746mzk9zdfffkdgq4w7invgb5cszjma2cp83q3i2";
   };
 
diff --git a/pkgs/by-name/cp/cplay-ng/package.nix b/pkgs/by-name/cp/cplay-ng/package.nix
index 82b331616607..7bed3b0532b8 100644
--- a/pkgs/by-name/cp/cplay-ng/package.nix
+++ b/pkgs/by-name/cp/cplay-ng/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xi";
     repo = "cplay-ng";
-    rev = version;
+    tag = version;
     hash = "sha256-6mphhoLDkGZ2r+elzLlPl3B8fNz3loqrQB8x8276AHI=";
   };
 
diff --git a/pkgs/by-name/cp/cpp-hocon/package.nix b/pkgs/by-name/cp/cpp-hocon/package.nix
index 7d6a65aa61c9..f4547d399ec0 100644
--- a/pkgs/by-name/cp/cpp-hocon/package.nix
+++ b/pkgs/by-name/cp/cpp-hocon/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "0b24anpwkmvbsn5klnr58vxksw00ci9pjhwzx7a61kplyhsaiydw";
-    rev = version;
+    tag = version;
     repo = "cpp-hocon";
     owner = "puppetlabs";
   };
diff --git a/pkgs/by-name/cp/cpp-jwt/package.nix b/pkgs/by-name/cp/cpp-jwt/package.nix
index 838916f65566..d090735225d7 100644
--- a/pkgs/by-name/cp/cpp-jwt/package.nix
+++ b/pkgs/by-name/cp/cpp-jwt/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arun11299";
     repo = "cpp-jwt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5hVsFanTCT/uLLXrnb2kMvmL6qs9RXVkvxdWaT6m4mk=";
   };
 
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/cp/cppclean/package.nix b/pkgs/by-name/cp/cppclean/package.nix
index c260929b2d9e..7cf3aad5af16 100644
--- a/pkgs/by-name/cp/cppclean/package.nix
+++ b/pkgs/by-name/cp/cppclean/package.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "myint";
     repo = "cppclean";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "081bw7kkl7mh3vwyrmdfrk3fgq8k5laacx7hz8fjpchrvdrkqph0";
   };
 
diff --git a/pkgs/by-name/cp/cppe/package.nix b/pkgs/by-name/cp/cppe/package.nix
index ff4757daab1a..fb65e208780a 100644
--- a/pkgs/by-name/cp/cppe/package.nix
+++ b/pkgs/by-name/cp/cppe/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maxscheurer";
     repo = "cppe";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw=";
   };
 
diff --git a/pkgs/by-name/cp/cppzmq/package.nix b/pkgs/by-name/cp/cppzmq/package.nix
index a100bbdb9bc8..afb7b9b574f0 100644
--- a/pkgs/by-name/cp/cppzmq/package.nix
+++ b/pkgs/by-name/cp/cppzmq/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "cppzmq";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HTdaV1cLbwGYuikS9EAVvAOdLmCoWlvVXlpYsUwY5IA=";
   };
 
diff --git a/pkgs/by-name/cp/cpu-energy-meter/package.nix b/pkgs/by-name/cp/cpu-energy-meter/package.nix
index 42d496badab3..9b2cba67a502 100644
--- a/pkgs/by-name/cp/cpu-energy-meter/package.nix
+++ b/pkgs/by-name/cp/cpu-energy-meter/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sosy-lab";
     repo = "cpu-energy-meter";
-    rev = version;
+    tag = version;
     hash = "sha256-QW65Z8mRYLHcyLeOtNAHjwPNWAUP214wqIYclK+whFw=";
   };
 
diff --git a/pkgs/by-name/cp/cpu_features/package.nix b/pkgs/by-name/cp/cpu_features/package.nix
index 2e0c26314192..27ad09456a04 100644
--- a/pkgs/by-name/cp/cpu_features/package.nix
+++ b/pkgs/by-name/cp/cpu_features/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "cpu_features";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uXN5crzgobNGlLpbpuOxR+9QVtZKrWhxC/UjQEakJwk=";
   };
 
diff --git a/pkgs/by-name/cp/cpufetch/package.nix b/pkgs/by-name/cp/cpufetch/package.nix
index cc3d961d8149..65bd2066b5d7 100644
--- a/pkgs/by-name/cp/cpufetch/package.nix
+++ b/pkgs/by-name/cp/cpufetch/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Dr-Noob";
     repo = "cpufetch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sE3i2rw8W362BExFEImjw/t17qX8D4/0Ty8jG63bjbk=";
   };
 
diff --git a/pkgs/by-name/cp/cpulimit/package.nix b/pkgs/by-name/cp/cpulimit/package.nix
index 3e143ac49887..8f639461f234 100644
--- a/pkgs/by-name/cp/cpulimit/package.nix
+++ b/pkgs/by-name/cp/cpulimit/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opsengine";
     repo = "cpulimit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1dz045yhcsw1rdamzpz4bk8mw888in7fyqk1q1b3m1yk4pd1ahkh";
   };
 
diff --git a/pkgs/by-name/cp/cpuminer/package.nix b/pkgs/by-name/cp/cpuminer/package.nix
index eb8be6375be6..4ba26ea0e394 100644
--- a/pkgs/by-name/cp/cpuminer/package.nix
+++ b/pkgs/by-name/cp/cpuminer/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pooler";
     repo = "cpuminer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0f44i0z8rid20c2hiyp92xq0q0mjj537r05sa6vdbc0nl0a5q40i";
   };
 
diff --git a/pkgs/by-name/cp/cpuset/package.nix b/pkgs/by-name/cp/cpuset/package.nix
index f9af9b8893b6..d953a4e82035 100644
--- a/pkgs/by-name/cp/cpuset/package.nix
+++ b/pkgs/by-name/cp/cpuset/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lpechacek";
     repo = "cpuset";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fW0SXNI10pb6FTn/2TOqxP9qlys0KL/H9m//NjslUaY=";
   };
 
diff --git a/pkgs/by-name/cq/cq/package.nix b/pkgs/by-name/cq/cq/package.nix
index 59b7637022f7..7fb8048a2596 100644
--- a/pkgs/by-name/cq/cq/package.nix
+++ b/pkgs/by-name/cq/cq/package.nix
@@ -20,7 +20,7 @@ buildGraalvmNativeImage rec {
   build-src = fetchFromGitHub {
     owner = "markus-wa";
     repo = "cq";
-    rev = version;
+    tag = version;
     hash = "sha256-yjAC2obipdmh+JlHzVUTMtTXN2VKe4WKkyJyu2Q93c8=";
   };
 
diff --git a/pkgs/by-name/cr/crabz/package.nix b/pkgs/by-name/cr/crabz/package.nix
index 5a8c587433fc..6031cef4066b 100644
--- a/pkgs/by-name/cr/crabz/package.nix
+++ b/pkgs/by-name/cr/crabz/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = "crabz";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GJHxo4WD/XMudwxOHdNwY1M+b/DFJMpU0uD3sOvO5YU=";
   };
 
diff --git a/pkgs/by-name/cr/crackxls/package.nix b/pkgs/by-name/cr/crackxls/package.nix
index b14153eb44bc..30754237a5f2 100644
--- a/pkgs/by-name/cr/crackxls/package.nix
+++ b/pkgs/by-name/cr/crackxls/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GavinSmith0123";
     repo = "crackxls2003";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz";
   };
 
diff --git a/pkgs/by-name/cr/craftos-pc/package.nix b/pkgs/by-name/cr/craftos-pc/package.nix
index 24ea3494efcf..da22b32a360d 100644
--- a/pkgs/by-name/cr/craftos-pc/package.nix
+++ b/pkgs/by-name/cr/craftos-pc/package.nix
@@ -20,13 +20,13 @@ let
   craftos2-lua = fetchFromGitHub {
     owner = "MCJack123";
     repo = "craftos2-lua";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OCHN/ef83X4r5hZcPfFFvNJHjINCTiK+COf369/WPsA=";
   };
   craftos2-rom = fetchFromGitHub {
     owner = "McJack123";
     repo = "craftos2-rom";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YidLt/JLwBMW0LMo5Q5PV6wGhF0J72FGX+iWYn6v0Z4=";
   };
 in
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MCJack123";
     repo = "craftos2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DbxAsXxpsa42dF6DaLmgIa+Hs/PPqJ4dE97PoKxG2Ig=";
   };
 
diff --git a/pkgs/by-name/cr/crate2nix/package.nix b/pkgs/by-name/cr/crate2nix/package.nix
index a03e6acf44bb..fc9b160be790 100644
--- a/pkgs/by-name/cr/crate2nix/package.nix
+++ b/pkgs/by-name/cr/crate2nix/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "crate2nix";
-    rev = version;
+    tag = version;
     hash = "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE=";
   };
 
diff --git a/pkgs/by-name/cr/crawley/package.nix b/pkgs/by-name/cr/crawley/package.nix
index fa0e0b0fc9fa..698ea7d1763a 100644
--- a/pkgs/by-name/cr/crawley/package.nix
+++ b/pkgs/by-name/cr/crawley/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "s0rg";
     repo = "crawley";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vc3HHkX0BFVSJi1Ll9T8IgYh5P6rzi4FowE7Jdy/tO8=";
   };
 
diff --git a/pkgs/by-name/cr/crc/package.nix b/pkgs/by-name/cr/crc/package.nix
index f94350a168f6..6bf1b969eb67 100644
--- a/pkgs/by-name/cr/crc/package.nix
+++ b/pkgs/by-name/cr/crc/package.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "crc-org";
     repo = "crc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = gitHash;
   };
 
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/crd2pulumi/package.nix b/pkgs/by-name/cr/crd2pulumi/package.nix
index f14c9851b715..f103e713825f 100644
--- a/pkgs/by-name/cr/crd2pulumi/package.nix
+++ b/pkgs/by-name/cr/crd2pulumi/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "crd2pulumi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PqEQrmSfcPH+GSGnuv6xpAm/2gAyTmLf81C+e25Un4s=";
   };
 
diff --git a/pkgs/by-name/cr/cre2/package.nix b/pkgs/by-name/cr/cre2/package.nix
index fff9b4ddbf94..af0ffe28b910 100644
--- a/pkgs/by-name/cr/cre2/package.nix
+++ b/pkgs/by-name/cr/cre2/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "marcomaggi";
     repo = "cre2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q";
   };
 
diff --git a/pkgs/by-name/cr/create-react-app/package.nix b/pkgs/by-name/cr/create-react-app/package.nix
index 2a2d2172d9f4..6d84d1128a02 100644
--- a/pkgs/by-name/cr/create-react-app/package.nix
+++ b/pkgs/by-name/cr/create-react-app/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "create-react-app";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nUvJRxBZ98ogSkbw8ciFYtZRQNFD6pLThoEjeDMcGm0=";
   };
 
diff --git a/pkgs/by-name/cr/credential-detector/package.nix b/pkgs/by-name/cr/credential-detector/package.nix
index 145f12910e82..c8fef2331019 100644
--- a/pkgs/by-name/cr/credential-detector/package.nix
+++ b/pkgs/by-name/cr/credential-detector/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ynori7";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-20ySTLpjTc1X0iJsbzbeLmWF0xYzzREGOqEWrB2X1GQ=";
   };
 
diff --git a/pkgs/by-name/cr/credhub-cli/package.nix b/pkgs/by-name/cr/credhub-cli/package.nix
index 8a918197881f..fb37b7dbb9d2 100644
--- a/pkgs/by-name/cr/credhub-cli/package.nix
+++ b/pkgs/by-name/cr/credhub-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudfoundry-incubator";
     repo = "credhub-cli";
-    rev = version;
+    tag = version;
     sha256 = "sha256-5963iZ7fDNs+J96+GSoGcjKLCqu8u3obAWE9+9oEBGU=";
   };
 
diff --git a/pkgs/by-name/cr/creep/package.nix b/pkgs/by-name/cr/creep/package.nix
index 844754b80eeb..d3a1123d4ad9 100644
--- a/pkgs/by-name/cr/creep/package.nix
+++ b/pkgs/by-name/cr/creep/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "romeovs";
     repo = "creep";
-    rev = version;
+    tag = version;
     sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n";
   };
 
diff --git a/pkgs/by-name/cr/crex/package.nix b/pkgs/by-name/cr/crex/package.nix
index 3958fd61d1e1..c597425c16fe 100644
--- a/pkgs/by-name/cr/crex/package.nix
+++ b/pkgs/by-name/cr/crex/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "octobanana";
     repo = "crex";
-    rev = version;
+    tag = version;
     sha256 = "086rvwl494z48acgsq3yq11qh1nxm8kbf11adn16aszai4d4ipr3";
   };
 
diff --git a/pkgs/by-name/cr/cri-tools/package.nix b/pkgs/by-name/cr/cri-tools/package.nix
index c0da20906e86..975fa44e2780 100644
--- a/pkgs/by-name/cr/cri-tools/package.nix
+++ b/pkgs/by-name/cr/cri-tools/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wdtsx5DIg+65VRRUPai5d8Tk/zQ4MhVjXNFKK4NCBFs=";
   };
 
diff --git a/pkgs/by-name/cr/critcmp/package.nix b/pkgs/by-name/cr/critcmp/package.nix
index 5c85eaa6b4ee..e9a50c43a0e2 100644
--- a/pkgs/by-name/cr/critcmp/package.nix
+++ b/pkgs/by-name/cr/critcmp/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "critcmp";
-    rev = version;
+    tag = version;
     hash = "sha256-cf78R9siH0RFbx+vXTs71VblpsQokL6Uo32N3X4lV2I=";
   };
 
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/cr/criu/package.nix b/pkgs/by-name/cr/criu/package.nix
index 728a1ad28939..0ecdc6a976ff 100644
--- a/pkgs/by-name/cr/criu/package.nix
+++ b/pkgs/by-name/cr/criu/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "checkpoint-restore";
     repo = "criu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Z4prbaPYRdN/fPdBwDz7D3/gKybh2ulA3UM1LZGeAK0=";
   };
 
diff --git a/pkgs/by-name/cr/crlfuzz/package.nix b/pkgs/by-name/cr/crlfuzz/package.nix
index f9b750da7642..0b71af9f4747 100644
--- a/pkgs/by-name/cr/crlfuzz/package.nix
+++ b/pkgs/by-name/cr/crlfuzz/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dwisiswant0";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rqhdxOQmZCRtq+IZygKLleb5GoKP2akyEc3rbGcnZmw=";
   };
 
diff --git a/pkgs/by-name/cr/croaring/package.nix b/pkgs/by-name/cr/croaring/package.nix
index 70d6a6884709..eb8c497c2cdd 100644
--- a/pkgs/by-name/cr/croaring/package.nix
+++ b/pkgs/by-name/cr/croaring/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RoaringBitmap";
     repo = "CRoaring";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WaFyJ/6zstJ05e3vfrwhaZKQsjRAEvVTs688Hw0fr94=";
   };
 
diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix
index 8493b0ed7279..a5a20f4e6b49 100644
--- a/pkgs/by-name/cr/croc/package.nix
+++ b/pkgs/by-name/cr/croc/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "schollz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tRWkokgs2SZglkgzK+UxwzbTk99GcPgDBcgJkMURNJ8=";
   };
 
diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix
index 7b812d84ebb1..b3e2aa60405a 100644
--- a/pkgs/by-name/cr/crossplane-cli/package.nix
+++ b/pkgs/by-name/cr/crossplane-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "crossplane";
     repo = "crossplane";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pQIiVdDWy3+PrqhvVHDwgGHHCQCYWtWt9ympc8QbBcE=";
   };
 
diff --git a/pkgs/by-name/cr/crudini/package.nix b/pkgs/by-name/cr/crudini/package.nix
index ae8387c374b3..db5ed5f2e519 100644
--- a/pkgs/by-name/cr/crudini/package.nix
+++ b/pkgs/by-name/cr/crudini/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pixelb";
     repo = "crudini";
-    rev = version;
+    tag = version;
     hash = "sha256-BU4u7uBsNyDOwWUjOIlBWcf1AeUXXZ+johAe+bjws1U=";
   };
 
diff --git a/pkgs/by-name/cr/crumbs/package.nix b/pkgs/by-name/cr/crumbs/package.nix
index cc0a7aab71e7..fdf14674ddd4 100644
--- a/pkgs/by-name/cr/crumbs/package.nix
+++ b/pkgs/by-name/cr/crumbs/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fasseg";
     repo = "crumbs";
-    rev = version;
+    tag = version;
     sha256 = "0jjvydn4i4n9xv8vsal2jxpa95mk2lw6myv0gx9wih242k9vy0l7";
   };
 
diff --git a/pkgs/by-name/cr/crun/package.nix b/pkgs/by-name/cr/crun/package.nix
index 05c6cd7168af..901a6532d27d 100644
--- a/pkgs/by-name/cr/crun/package.nix
+++ b/pkgs/by-name/cr/crun/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "crun";
-    rev = version;
+    tag = version;
     hash = "sha256-uAB/IJ1psGKvOTVhj00VlNadxSKTXvg1eU97bngVblw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cr/cryfs/package.nix b/pkgs/by-name/cr/cryfs/package.nix
index b6563a677939..8e850e03e2dd 100644
--- a/pkgs/by-name/cr/cryfs/package.nix
+++ b/pkgs/by-name/cr/cryfs/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cryfs";
     repo = "cryfs";
-    rev = version;
+    tag = version;
     hash = "sha256-OkJhLg+YzS3kDhlpUQe9A+OiVBPG/iKs6OU7aKFJ5wY=";
   };
 
diff --git a/pkgs/by-name/cr/crypto-tracker/package.nix b/pkgs/by-name/cr/crypto-tracker/package.nix
index 34c3c6340959..b56118a5dbf8 100644
--- a/pkgs/by-name/cr/crypto-tracker/package.nix
+++ b/pkgs/by-name/cr/crypto-tracker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Nox04";
     repo = "crypto-tracker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8tTaXpHZWcDq0Jfa9Hf258VYwfimLhYjCAzD4X/Ow0s=";
   };
 
diff --git a/pkgs/by-name/cr/cryptominisat/package.nix b/pkgs/by-name/cr/cryptominisat/package.nix
index 9c99d0c0555f..c97351bbee69 100644
--- a/pkgs/by-name/cr/cryptominisat/package.nix
+++ b/pkgs/by-name/cr/cryptominisat/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "msoos";
     repo = "cryptominisat";
-    rev = version;
+    tag = version;
     hash = "sha256-8oH9moMjQEWnQXKmKcqmXuXcYkEyvr4hwC1bC4l26mo=";
   };
 
diff --git a/pkgs/by-name/cr/cryptpad/package.nix b/pkgs/by-name/cr/cryptpad/package.nix
index 94087f88b86b..b149dc131857 100644
--- a/pkgs/by-name/cr/cryptpad/package.nix
+++ b/pkgs/by-name/cr/cryptpad/package.nix
@@ -82,7 +82,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "cryptpad";
     repo = "cryptpad";
-    rev = version;
+    tag = version;
     hash = "sha256-oSrDajaCEc7I2AsDzKoO34ffd4OeXDwFDGm45yQDSvE=";
   };
 
diff --git a/pkgs/by-name/cr/crystal2nix/package.nix b/pkgs/by-name/cr/crystal2nix/package.nix
index 8232e8e42d7e..006e9ed0fb82 100644
--- a/pkgs/by-name/cr/crystal2nix/package.nix
+++ b/pkgs/by-name/cr/crystal2nix/package.nix
@@ -13,7 +13,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "peterhoeg";
     repo = "crystal2nix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gb2vgKWVXwYWfUUcFvOLFF0qB4CTBekEllpyKduU1Mo=";
   };
 
diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix
index 0771b7942c79..8cc8fe053a6b 100644
--- a/pkgs/by-name/cs/csdr/package.nix
+++ b/pkgs/by-name/cs/csdr/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jketterl";
     repo = "csdr";
-    rev = version;
+    tag = version;
     sha256 = "sha256-LdVzeTTIvDQIXRdcz/vpQu/fUgtE8nx1kIEfoiwxrUg=";
   };
 
diff --git a/pkgs/by-name/cs/cshatag/package.nix b/pkgs/by-name/cs/cshatag/package.nix
index 16dedcf39cff..a1e2dcaef455 100644
--- a/pkgs/by-name/cs/cshatag/package.nix
+++ b/pkgs/by-name/cs/cshatag/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-RqQPbqfliKg7XPA/C9D7Aq1SsN+tAW44tAFHt9p8Py0=";
   };
 
diff --git a/pkgs/by-name/cs/csound-manual/package.nix b/pkgs/by-name/cs/csound-manual/package.nix
index 7cfdd0a1fdcc..4da103f2a6a2 100644
--- a/pkgs/by-name/cs/csound-manual/package.nix
+++ b/pkgs/by-name/cs/csound-manual/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "csound";
     repo = "manual";
-    rev = version;
+    tag = version;
     sha256 = "sha256-W8MghqUBr3V7LPgNwU6Ugw16wdK3G37zAPuasMlZ2+I=";
   };
 
diff --git a/pkgs/by-name/cs/css-checker/package.nix b/pkgs/by-name/cs/css-checker/package.nix
index ef5038ec9cb7..1e39bb37dcd9 100644
--- a/pkgs/by-name/cs/css-checker/package.nix
+++ b/pkgs/by-name/cs/css-checker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ruilisi";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lD2uF8zhJG8pVepqxyKKj4GZNB883uDV/9dCMFYJbRs=";
   };
 
diff --git a/pkgs/by-name/cs/csv-tui/package.nix b/pkgs/by-name/cs/csv-tui/package.nix
index d851ee8aed69..f4eb3ed9ad6f 100644
--- a/pkgs/by-name/cs/csv-tui/package.nix
+++ b/pkgs/by-name/cs/csv-tui/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nathangavin";
     repo = "csv-tui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T8T9fW4E/wigktSomoc+xPkVqX5T3OnTmL4XIT5YXe8=";
   };
 
diff --git a/pkgs/by-name/cs/csv2parquet/package.nix b/pkgs/by-name/cs/csv2parquet/package.nix
index 9701b177393b..f642904256df 100644
--- a/pkgs/by-name/cs/csv2parquet/package.nix
+++ b/pkgs/by-name/cs/csv2parquet/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "domoritz";
     repo = "csv2parquet";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-499DC0kLvvP5Oq2WYRb9BIppTdfm41u8hwrPU8b66Zw=";
   };
 
diff --git a/pkgs/by-name/cs/csvdiff/package.nix b/pkgs/by-name/cs/csvdiff/package.nix
index 7653b8479c8a..67e3eb3cc852 100644
--- a/pkgs/by-name/cs/csvdiff/package.nix
+++ b/pkgs/by-name/cs/csvdiff/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aswinkarthik";
     repo = "csvdiff";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-66R5XxrNQ1YMMQicw0VCF/XzRo//5Gqdjlher/uMoTE=";
   };
 
diff --git a/pkgs/by-name/cs/csview/package.nix b/pkgs/by-name/cs/csview/package.nix
index c23c56c8f2f4..99c77070e083 100644
--- a/pkgs/by-name/cs/csview/package.nix
+++ b/pkgs/by-name/cs/csview/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "csview";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JFuqaGwCSfEIncBgLu6gGaOvAC5vojKFjruWcuSghS0=";
   };
 
diff --git a/pkgs/by-name/cs/csvq/package.nix b/pkgs/by-name/cs/csvq/package.nix
index fa1b244dec0f..b02c21369459 100644
--- a/pkgs/by-name/cs/csvq/package.nix
+++ b/pkgs/by-name/cs/csvq/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mithrandie";
     repo = "csvq";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1UK+LSMKryoUf2UWbGt8MU3zs5hH2WdpA2v/jBaIHYE=";
   };
 
diff --git a/pkgs/by-name/cs/csvquote/package.nix b/pkgs/by-name/cs/csvquote/package.nix
index 7a3b1c8bab15..3efefd92ced4 100644
--- a/pkgs/by-name/cs/csvquote/package.nix
+++ b/pkgs/by-name/cs/csvquote/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dbro";
     repo = "csvquote";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-847JAoDEfA9K4LB8z9cqSw+GTImqmITBylB/4odLDb0=";
   };
 
diff --git a/pkgs/by-name/cs/csvs-to-sqlite/package.nix b/pkgs/by-name/cs/csvs-to-sqlite/package.nix
index 171c2c418d67..d68f0efdf2df 100644
--- a/pkgs/by-name/cs/csvs-to-sqlite/package.nix
+++ b/pkgs/by-name/cs/csvs-to-sqlite/package.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "simonw";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-wV6htULG3lg2IhG2bXmc/9vjcK8/+WA7jm3iJu4ZoOE=";
   };
 
diff --git a/pkgs/by-name/cs/csxcad/package.nix b/pkgs/by-name/cs/csxcad/package.nix
index 5482166b4d76..019e21638cce 100644
--- a/pkgs/by-name/cs/csxcad/package.nix
+++ b/pkgs/by-name/cs/csxcad/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "CSXCAD";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-SSV5ulx3rCJg99I/oOQbqe+gOSs+BfcCo6UkWHVhnSs=";
   };
 
diff --git a/pkgs/by-name/ct/ctlptl/package.nix b/pkgs/by-name/ct/ctlptl/package.nix
index c2f832e33062..873995b57bb0 100644
--- a/pkgs/by-name/ct/ctlptl/package.nix
+++ b/pkgs/by-name/ct/ctlptl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tilt-dev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-O6oAkYzkBUecwAcLjPIR7D/k4REWND8TWdstPNVJ0MU=";
   };
 
diff --git a/pkgs/by-name/ct/ctodo/package.nix b/pkgs/by-name/ct/ctodo/package.nix
index c70ac00b5b4a..43fd1ffa10e8 100644
--- a/pkgs/by-name/ct/ctodo/package.nix
+++ b/pkgs/by-name/ct/ctodo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Acolarh";
     repo = "ctodo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0mqy5b35cbdwfpbs91ilsgz3wc4cky38xfz9pnr4q88q1vybigna";
   };
 
diff --git a/pkgs/by-name/ct/ctop/package.nix b/pkgs/by-name/ct/ctop/package.nix
index 1af537b225d2..7e0475f17f8a 100644
--- a/pkgs/by-name/ct/ctop/package.nix
+++ b/pkgs/by-name/ct/ctop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bcicen";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-tojSzgpoGQg6MwV/MVpQpCA5w6bZO+9IOvfkw0Ydr6c=";
   };
 
diff --git a/pkgs/by-name/ct/ctpv/package.nix b/pkgs/by-name/ct/ctpv/package.nix
index aeac6bdee939..46be87fb1b0f 100644
--- a/pkgs/by-name/ct/ctpv/package.nix
+++ b/pkgs/by-name/ct/ctpv/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NikitaIvanovV";
     repo = "ctpv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3BQi4m44hBmPkJBFNCg6d9YKRbDZwLxdzBb/NDWTQP4=";
   };
 
diff --git a/pkgs/by-name/ct/ctre/package.nix b/pkgs/by-name/ct/ctre/package.nix
index f0418ae956e8..6aeff7cce6b2 100644
--- a/pkgs/by-name/ct/ctre/package.nix
+++ b/pkgs/by-name/ct/ctre/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hanickadot";
     repo = "compile-time-regular-expressions";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Fmx8eKo4UHSYQa5RL70VmaogQj+ILVA1gfpaVE8+MlQ=";
   };
 
diff --git a/pkgs/by-name/ct/ctypes_sh/package.nix b/pkgs/by-name/ct/ctypes_sh/package.nix
index 4d0c3e13bae7..f4ab54e6984f 100644
--- a/pkgs/by-name/ct/ctypes_sh/package.nix
+++ b/pkgs/by-name/ct/ctypes_sh/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "taviso";
     repo = "ctypes.sh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4";
   };
 
diff --git a/pkgs/by-name/cu/cuelsp/package.nix b/pkgs/by-name/cu/cuelsp/package.nix
index 948478fc0806..8ae7de09887f 100644
--- a/pkgs/by-name/cu/cuelsp/package.nix
+++ b/pkgs/by-name/cu/cuelsp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dagger";
     repo = "cuelsp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+E49TR2D26HSTwgwO1XFkIwXr5lmvv9l3KtR8dVT/cQ=";
   };
 
diff --git a/pkgs/by-name/cu/cuetools/package.nix b/pkgs/by-name/cu/cuetools/package.nix
index 2bd13b7a6b55..df3fccf8d505 100644
--- a/pkgs/by-name/cu/cuetools/package.nix
+++ b/pkgs/by-name/cu/cuetools/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "svend";
     repo = "cuetools";
-    rev = version;
+    tag = version;
     sha256 = "02ksv1ahf1v4cr2xbclsfv5x17m9ivzbssb5r8xjm97yh8a7spa3";
   };
 
diff --git a/pkgs/by-name/cu/cuetsy/package.nix b/pkgs/by-name/cu/cuetsy/package.nix
index e7afa8b140ad..4fadb72cefe9 100644
--- a/pkgs/by-name/cu/cuetsy/package.nix
+++ b/pkgs/by-name/cu/cuetsy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "cuetsy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dirzVR4j5K1+EHbeRi4rHwRxkyveySoM7qJzvOlGp+0=";
   };
 
diff --git a/pkgs/by-name/cu/cunicu/package.nix b/pkgs/by-name/cu/cunicu/package.nix
index ea6e16c32300..85f03a9801b4 100644
--- a/pkgs/by-name/cu/cunicu/package.nix
+++ b/pkgs/by-name/cu/cunicu/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cunicu";
     repo = "cunicu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1y9olRSPu2akvE728oXBr70Pt03xj65R2GaOlZ/7RTg=";
   };
 
diff --git a/pkgs/by-name/cu/cups-browsed/package.nix b/pkgs/by-name/cu/cups-browsed/package.nix
index 169bfda6e3bc..8e8810d1b068 100644
--- a/pkgs/by-name/cu/cups-browsed/package.nix
+++ b/pkgs/by-name/cu/cups-browsed/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenPrinting";
     repo = "cups-browsed";
-    rev = version;
+    tag = version;
     hash = "sha256-Cfk28rxxgzzQs7B+tNmeUzDYL1eCx9zYwRsS/J6QX9s=";
   };
 
diff --git a/pkgs/by-name/cu/curlie/package.nix b/pkgs/by-name/cu/curlie/package.nix
index b215a3dfb105..7a31d02aec1e 100644
--- a/pkgs/by-name/cu/curlie/package.nix
+++ b/pkgs/by-name/cu/curlie/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YOsq3cB+Pn2eC1Dky3fobBRR7GMxcf/tvWr6i3Vq/BE=";
   };
 
diff --git a/pkgs/by-name/cu/curlpp/package.nix b/pkgs/by-name/cu/curlpp/package.nix
index eb2c8f8f95e6..58264f1c9d92 100644
--- a/pkgs/by-name/cu/curlpp/package.nix
+++ b/pkgs/by-name/cu/curlpp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jpbarrette";
     repo = "curlpp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1b0ylnnrhdax4kwjq64r1fk0i24n5ss6zfzf4hxwgslny01xiwrk";
   };
 
diff --git a/pkgs/by-name/cu/cursewords/package.nix b/pkgs/by-name/cu/cursewords/package.nix
index f4f3d808cab3..dba1285b4189 100644
--- a/pkgs/by-name/cu/cursewords/package.nix
+++ b/pkgs/by-name/cu/cursewords/package.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "thisisparker";
     repo = "cursewords";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ssr15kSdWmyMFFG5uCregrpGQ3rI2cMXqY9+/a3gs84=";
   };
 
diff --git a/pkgs/by-name/cv/cvc4/package.nix b/pkgs/by-name/cv/cvc4/package.nix
index 62fc9a50e06f..55f9774806a1 100644
--- a/pkgs/by-name/cv/cvc4/package.nix
+++ b/pkgs/by-name/cv/cvc4/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cvc4";
     repo = "cvc4";
-    rev = version;
+    tag = version;
     sha256 = "1rhs4pvzaa1wk00czrczp58b2cxfghpsnq534m0l3snnya2958jp";
   };
 
diff --git a/pkgs/by-name/cw/cw/package.nix b/pkgs/by-name/cw/cw/package.nix
index 8e3da631217e..85ab0a4ca712 100644
--- a/pkgs/by-name/cw/cw/package.nix
+++ b/pkgs/by-name/cw/cw/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lucagrulla";
     repo = "cw";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JsWwvVEr7kSjUy0S6wVcn24Xyo4OHr5/uqmnjw6v+RI=";
   };
 
diff --git a/pkgs/by-name/cw/cwe-client-cli/package.nix b/pkgs/by-name/cw/cwe-client-cli/package.nix
index 19bed845691f..2dbe9e1bac5e 100644
--- a/pkgs/by-name/cw/cwe-client-cli/package.nix
+++ b/pkgs/by-name/cw/cwe-client-cli/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NotBalds";
     repo = "cwe-client-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7zzmYwuQ+Sg8hf1zuKtKUMgk0Is1YJB4WdOKdxtWRA0=";
   };
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/cw/cwm/package.nix b/pkgs/by-name/cw/cwm/package.nix
index e68e8b2aef33..2998d54bd797 100644
--- a/pkgs/by-name/cw/cwm/package.nix
+++ b/pkgs/by-name/cw/cwm/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "cwm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L3u4mH2UH2pTHhSPVr5dUi94b9DheslkIWL6EgQ05yA=";
   };
 
diff --git a/pkgs/by-name/cx/cxx-rs/package.nix b/pkgs/by-name/cx/cxx-rs/package.nix
index 88d0bf8d6637..9b4051998d5b 100644
--- a/pkgs/by-name/cx/cxx-rs/package.nix
+++ b/pkgs/by-name/cx/cxx-rs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cxx";
-    rev = version;
+    tag = version;
     sha256 = "sha256-KQlbJvULdc94SM0sx6JtukZPpaX4Gojc6Qgr20V3/VI=";
   };
 
diff --git a/pkgs/by-name/cx/cxxopts/package.nix b/pkgs/by-name/cx/cxxopts/package.nix
index 667a6450d1ed..7b2b0ece9066 100644
--- a/pkgs/by-name/cx/cxxopts/package.nix
+++ b/pkgs/by-name/cx/cxxopts/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jarro2783";
     repo = "cxxopts";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-aOF3owz7SIV4trJY0PnMtIcwqoUpDbB3tNxZcsl9dzM=";
   };
 
diff --git a/pkgs/by-name/cy/cyan/package.nix b/pkgs/by-name/cy/cyan/package.nix
index 327994945850..3a582fafa45b 100644
--- a/pkgs/by-name/cy/cyan/package.nix
+++ b/pkgs/by-name/cy/cyan/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rodlie";
     repo = "cyan";
-    rev = version;
+    tag = version;
     hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94=";
   };
 
diff --git a/pkgs/by-name/cy/cyclone-scheme/package.nix b/pkgs/by-name/cy/cyclone-scheme/package.nix
index 178c427c63ae..6c51f2bf7748 100644
--- a/pkgs/by-name/cy/cyclone-scheme/package.nix
+++ b/pkgs/by-name/cy/cyclone-scheme/package.nix
@@ -15,7 +15,7 @@ let
     src = fetchFromGitHub {
       owner = "justinethier";
       repo = "cyclone-bootstrap";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-kJBPb0Ej32HveY/vdGpH2gyxSwq8Xq7muneFIw3Y7hM=";
     };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "justinethier";
     repo = "cyclone";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4U/uOTbFpPTC9BmO6Wkhy4PY8UCFVt5eHSGqrOlKT/U=";
   };
 
diff --git a/pkgs/by-name/cy/cyclonedds-cxx/package.nix b/pkgs/by-name/cy/cyclonedds-cxx/package.nix
index 4e556d718c26..2415281edaa3 100644
--- a/pkgs/by-name/cy/cyclonedds-cxx/package.nix
+++ b/pkgs/by-name/cy/cyclonedds-cxx/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eclipse-cyclonedds";
     repo = "cyclonedds-cxx";
-    rev = version;
+    tag = version;
     hash = "sha256-whFVEQec/Ca+dr6R7z9mMrNg315z3oIWchVT+vQ36So=";
   };
 
diff --git a/pkgs/by-name/cy/cyclonedds/package.nix b/pkgs/by-name/cy/cyclonedds/package.nix
index dca6111c6cc5..fe1eea2ec06c 100644
--- a/pkgs/by-name/cy/cyclonedds/package.nix
+++ b/pkgs/by-name/cy/cyclonedds/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eclipse-cyclonedds";
     repo = "cyclonedds";
-    rev = version;
+    tag = version;
     sha256 = "sha256-MQVUZ7PkxauoPpfxlhhAtsKztMe9tcZOpOzshuz/eb8=";
   };
 
diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix
index e231f25a9f01..997f74716193 100644
--- a/pkgs/by-name/cy/cyme/package.nix
+++ b/pkgs/by-name/cy/cyme/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tuna-f1sh";
     repo = "cyme";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KAHCeM1rAPGi98PrcVJtzkhTWGWFwf37VuSQTjqXSEg=";
   };
 
diff --git a/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix b/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix
index 922d38422877..68b90dc7120b 100644
--- a/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix
+++ b/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moriyoshi";
     repo = "cyrus-sasl-xoauth2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lI8uKtVxrziQ8q/Ss+QTgg1xTObZUTAzjL3MYmtwyd8=";
   };
 
diff --git a/pkgs/by-name/d-/d-seams/package.nix b/pkgs/by-name/d-/d-seams/package.nix
index 2ac502514a8a..bca65b751ad1 100644
--- a/pkgs/by-name/d-/d-seams/package.nix
+++ b/pkgs/by-name/d-/d-seams/package.nix
@@ -24,7 +24,7 @@ clangStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "d-SEAMS";
     repo = "seams-core";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i";
   };
 
diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix
index a86a6d505721..7faecf85dcc9 100644
--- a/pkgs/by-name/da/dablin/package.nix
+++ b/pkgs/by-name/da/dablin/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Opendigitalradio";
     repo = "dablin";
-    rev = version;
+    tag = version;
     sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc=";
   };
 
diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix
index fb13ce6b10c3..b9bf28bc94ef 100644
--- a/pkgs/by-name/da/dae/package.nix
+++ b/pkgs/by-name/da/dae/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "daeuniverse";
     repo = "dae";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yW3GDflTd9I4RreWtLQE92aP7BnswJHx44jmTZ81kP8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/da/daktilo/package.nix b/pkgs/by-name/da/daktilo/package.nix
index dde3104c7622..b323712612ae 100644
--- a/pkgs/by-name/da/daktilo/package.nix
+++ b/pkgs/by-name/da/daktilo/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "daktilo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gIBWonJGX6IpxyBeMulcfQEExsG1GrBVQLZbBBA1ruc=";
   };
 
diff --git a/pkgs/by-name/da/dapper/package.nix b/pkgs/by-name/da/dapper/package.nix
index f367aae65d9f..b28d85236c0d 100644
--- a/pkgs/by-name/da/dapper/package.nix
+++ b/pkgs/by-name/da/dapper/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "dapper";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-V+lHnOmIWjI1qmoJ7+pp+cGmJAtSeY+r2I9zykswQzM=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix
index 22bea35fd699..3d0b084c7444 100644
--- a/pkgs/by-name/da/dapr-cli/package.nix
+++ b/pkgs/by-name/da/dapr-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dapr";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ex6H5N5h5ScacyakgFDh8/xJMfS6Q6d2FmfcBXiCl+4=";
   };
 
diff --git a/pkgs/by-name/da/darkhttpd/package.nix b/pkgs/by-name/da/darkhttpd/package.nix
index 5adf1b1be34e..3dc1aebf898c 100644
--- a/pkgs/by-name/da/darkhttpd/package.nix
+++ b/pkgs/by-name/da/darkhttpd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emikulic";
     repo = "darkhttpd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dcNoGU08tu950PlwSghoZwGSaSbP8NJ5qhWUi3bAtZY=";
   };
 
diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix
index 29e620568ab5..4d8ea5b85411 100644
--- a/pkgs/by-name/da/darklua/package.nix
+++ b/pkgs/by-name/da/darklua/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "seaofvoices";
     repo = "darklua";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D83cLJ6voLvgZ51qLoCUzBG83VFB3Y7HxuaZHpaiOn4=";
   };
 
diff --git a/pkgs/by-name/da/darkman/package.nix b/pkgs/by-name/da/darkman/package.nix
index 34c4748a3743..d68d7a0ccfb8 100644
--- a/pkgs/by-name/da/darkman/package.nix
+++ b/pkgs/by-name/da/darkman/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "WhyNotHugo";
     repo = "darkman";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o=";
   };
 
diff --git a/pkgs/by-name/da/darktile/package.nix b/pkgs/by-name/da/darktile/package.nix
index c2e7928fbdad..5a3bfdfef170 100644
--- a/pkgs/by-name/da/darktile/package.nix
+++ b/pkgs/by-name/da/darktile/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = "darktile";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-M3vySAyYwqscR9n0GGXp1ttO/mhdSCponZNYJRBBI18=";
   };
 
diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix
index d8247bf18f97..f5a2f841666b 100644
--- a/pkgs/by-name/da/dart-sass/package.nix
+++ b/pkgs/by-name/da/dart-sass/package.nix
@@ -27,7 +27,7 @@ buildDartApplication rec {
   src = fetchFromGitHub {
     owner = "sass";
     repo = "dart-sass";
-    rev = version;
+    tag = version;
     hash = "sha256-HYuKSZLLL3Eg1FPrHK25H1GLuyC/xL9i0DM9eQ6Ry9U=";
   };
 
diff --git a/pkgs/by-name/da/dasel/package.nix b/pkgs/by-name/da/dasel/package.nix
index efdc7eaa41e9..b613c3f1365c 100644
--- a/pkgs/by-name/da/dasel/package.nix
+++ b/pkgs/by-name/da/dasel/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TomWright";
     repo = "dasel";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vq4lRCsqD2hmQw0yH84Wji5LeJ/aiMGJJIyCDvATA+I=";
   };
 
diff --git a/pkgs/by-name/da/dashing/package.nix b/pkgs/by-name/da/dashing/package.nix
index 58fb7f68b1ba..95d72db7020c 100644
--- a/pkgs/by-name/da/dashing/package.nix
+++ b/pkgs/by-name/da/dashing/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "technosophos";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-CcEgGPnJGrTXrgo82u5dxQTB/YjFBhHdsv7uggsHG1Y=";
   };
 
diff --git a/pkgs/by-name/da/dasht/package.nix b/pkgs/by-name/da/dasht/package.nix
index a40c25b85b2f..641aa94a5a75 100644
--- a/pkgs/by-name/da/dasht/package.nix
+++ b/pkgs/by-name/da/dasht/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sunaku";
     repo = "dasht";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "08wssmifxi7pnvn9gqrvpzpkc2qpkfbzbhxh0dk1gff2y2211qqk";
   };
 
diff --git a/pkgs/by-name/da/dasm/package.nix b/pkgs/by-name/da/dasm/package.nix
index 578d49a7639f..40d53fe36b13 100644
--- a/pkgs/by-name/da/dasm/package.nix
+++ b/pkgs/by-name/da/dasm/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dasm-assembler";
     repo = "dasm";
-    rev = version;
+    tag = version;
     sha256 = "1bna0bj503xyn5inwzzsrsgi9qg8p20by4dfk7azj91ynw56pl41";
   };
 
diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix
index 3b1d7284116f..d3fc57c52a7f 100644
--- a/pkgs/by-name/da/datafusion-cli/package.nix
+++ b/pkgs/by-name/da/datafusion-cli/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     name = "datafusion-cli-source";
     owner = "apache";
     repo = "arrow-datafusion";
-    rev = version;
+    tag = version;
     sha256 = "sha256-XIxUp4i68psNtKoFR/uVJHCToz681m2q8qUhtMQKCLo=";
   };
 
diff --git a/pkgs/by-name/da/dav1d/package.nix b/pkgs/by-name/da/dav1d/package.nix
index cbd651e68ee7..ba2e4e71ac4d 100644
--- a/pkgs/by-name/da/dav1d/package.nix
+++ b/pkgs/by-name/da/dav1d/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "videolan";
     repo = "dav1d";
-    rev = version;
+    tag = version;
     hash = "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g=";
   };
 
diff --git a/pkgs/by-name/db/db-rest/package.nix b/pkgs/by-name/db/db-rest/package.nix
index 6aa4e722d169..00272e77f95f 100644
--- a/pkgs/by-name/db/db-rest/package.nix
+++ b/pkgs/by-name/db/db-rest/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "derhuerst";
     repo = "db-rest";
-    rev = version;
+    tag = version;
     hash = "sha256-1iJ26l6C6GevNkoDVMztPHiH3YsutJa3xWAsfYvgR9U=";
   };
 
diff --git a/pkgs/by-name/db/dbcsr/package.nix b/pkgs/by-name/db/dbcsr/package.nix
index 0fdcc217eb6d..7d536b1cfa17 100644
--- a/pkgs/by-name/db/dbcsr/package.nix
+++ b/pkgs/by-name/db/dbcsr/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cp2k";
     repo = "dbcsr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YXySNw3+DiY7E57W1ypeWLyawwcWVGlmTM4Kgj7Nnmo=";
   };
 
diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix
index 703ab3dcfb90..7015e403746b 100644
--- a/pkgs/by-name/db/dblab/package.nix
+++ b/pkgs/by-name/db/dblab/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "danvergara";
     repo = "dblab";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-a0452fNr78FDhVoBF8RkKbtamvc5e6gEbTOeRdgGQs4=";
   };
 
diff --git a/pkgs/by-name/db/dbqn/package.nix b/pkgs/by-name/db/dbqn/package.nix
index 81be3e7141ff..5755b5c6d43f 100644
--- a/pkgs/by-name/db/dbqn/package.nix
+++ b/pkgs/by-name/db/dbqn/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dzaima";
     repo = "BQN";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AUfT7l7zr/pyG63wX8FMej8RUg7tXC1aroCrunjyw/8=";
   };
 
diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix
index b9ab77c35dd5..46630b9e2b9a 100644
--- a/pkgs/by-name/db/dbus-cpp/package.nix
+++ b/pkgs/by-name/db/dbus-cpp/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/dbus-cpp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-t8SzPRUuKeEchT8vAsITf8MwbgHA+mR5C9CnkdVyX7s=";
   };
 
diff --git a/pkgs/by-name/dc/dcap/package.nix b/pkgs/by-name/dc/dcap/package.nix
index 1a1014d8e88b..e93dde53ed24 100644
--- a/pkgs/by-name/dc/dcap/package.nix
+++ b/pkgs/by-name/dc/dcap/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dCache";
     repo = "dcap";
-    rev = version;
+    tag = version;
     sha256 = "sha256-hn4nkFTIbSUUhvf9UfsEqVhphAdNWmATaCrv8jOuC0Y=";
   };
 
diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix
index e1604260e3c5..aea0db99e1fd 100644
--- a/pkgs/by-name/dd/ddccontrol-db/package.nix
+++ b/pkgs/by-name/dd/ddccontrol-db/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ddccontrol";
     repo = "ddccontrol-db";
-    rev = version;
+    tag = version;
     sha256 = "sha256-KhZp0gGGK27hAtfAwuff7VI9Z3D4MtMxkNW6l6B56Xw=";
   };
 
diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix
index 864381aa4d47..c7c58987c53a 100644
--- a/pkgs/by-name/dd/ddccontrol/package.nix
+++ b/pkgs/by-name/dd/ddccontrol/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ddccontrol";
     repo = "ddccontrol";
-    rev = version;
+    tag = version;
     sha256 = "sha256-qyD6i44yH3EufIW+LA/LBMW20Tejb49zvsDfv6YFD6c=";
   };
 
diff --git a/pkgs/by-name/dd/ddclient/package.nix b/pkgs/by-name/dd/ddclient/package.nix
index ff13221d3202..7f2585054510 100644
--- a/pkgs/by-name/dd/ddclient/package.nix
+++ b/pkgs/by-name/dd/ddclient/package.nix
@@ -19,7 +19,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "ddclient";
     repo = "ddclient";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-RCE24RKcW4EhicOTwgz5UE/gzqLxw+UNNk960vFx5Gs=";
   };
 
diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix
index 353905fa0979..359af3200b45 100644
--- a/pkgs/by-name/dd/ddev/package.nix
+++ b/pkgs/by-name/dd/ddev/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ddev";
     repo = "ddev";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sd8Ux3zkKd9L2phv0dovWHSIpLS/OXCNwxTGGcvBQ3c=";
   };
 
diff --git a/pkgs/by-name/dd/ddgr/package.nix b/pkgs/by-name/dd/ddgr/package.nix
index 01a331802e5d..814a303cbd4a 100644
--- a/pkgs/by-name/dd/ddgr/package.nix
+++ b/pkgs/by-name/dd/ddgr/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "ddgr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-88cCQm3eViy0OwSyCTlnW7uuiFwz2/6Wz45QzxCgXxg=";
   };
 
diff --git a/pkgs/by-name/dd/ddh/package.nix b/pkgs/by-name/dd/ddh/package.nix
index 1f8c86ee663a..294eb19e82bb 100644
--- a/pkgs/by-name/dd/ddh/package.nix
+++ b/pkgs/by-name/dd/ddh/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "darakian";
     repo = "ddh";
-    rev = version;
+    tag = version;
     sha256 = "XFfTpX4c821pcTAJZFUjdqM940fRoBwkJC6KTknXtCw=";
   };
 
diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix
index 378c3ddfe77a..3f32ae4b003a 100644
--- a/pkgs/by-name/dd/ddns-go/package.nix
+++ b/pkgs/by-name/dd/ddns-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jeessy2";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QGvXUYeT01+P843gBX+IJWTyPg0cPI9jZWh3tAcmEqE=";
   };
 
diff --git a/pkgs/by-name/dd/ddns-updater/package.nix b/pkgs/by-name/dd/ddns-updater/package.nix
index 1d3364428a5b..2df254d93e29 100644
--- a/pkgs/by-name/dd/ddns-updater/package.nix
+++ b/pkgs/by-name/dd/ddns-updater/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "qdm12";
     repo = "ddns-updater";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Vvk3owtSpwstmC5UaVyUEY+FW25KA+nYp2dOqiP4HTs=";
   };
 
diff --git a/pkgs/by-name/dd/dduper/package.nix b/pkgs/by-name/dd/dduper/package.nix
index 34bf7fc39d97..83274d8fc7f6 100644
--- a/pkgs/by-name/dd/dduper/package.nix
+++ b/pkgs/by-name/dd/dduper/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lakshmipathi";
     repo = "dduper";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09ncdawxkffldadqhfblqlkdl05q2qmywxyg6p61fv3dr2f2v5wm";
   };
 
diff --git a/pkgs/by-name/de/deadnix/package.nix b/pkgs/by-name/de/deadnix/package.nix
index 3382c7264172..952a0a9da729 100644
--- a/pkgs/by-name/de/deadnix/package.nix
+++ b/pkgs/by-name/de/deadnix/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "astro";
     repo = "deadnix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xaaXGzTd+t1GjD2KpiS/c8acv6bXufv/lTN+ACRGVJw=";
   };
 
diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix
index 55aa9d8a918a..768d50d5778b 100644
--- a/pkgs/by-name/de/decker/package.nix
+++ b/pkgs/by-name/de/decker/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JohnEarnest";
     repo = "Decker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6rKfIMEWMig1LAaLk1eSUHnc2104FuN5wTVpf1SgCtg=";
   };
 
diff --git a/pkgs/by-name/de/decktape/package.nix b/pkgs/by-name/de/decktape/package.nix
index 7f5a1bf304e0..3efb31d4f1e9 100644
--- a/pkgs/by-name/de/decktape/package.nix
+++ b/pkgs/by-name/de/decktape/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "astefanutti";
     repo = "decktape";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-V7JoYtwP7iQYFi/WhFpkELs7mNKF6CqrMyjWhxLkcTA=";
   };
 
diff --git a/pkgs/by-name/de/deepfilternet/package.nix b/pkgs/by-name/de/deepfilternet/package.nix
index 71d0e0c9f645..03938824436a 100644
--- a/pkgs/by-name/de/deepfilternet/package.nix
+++ b/pkgs/by-name/de/deepfilternet/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Rikorose";
     repo = "DeepFilterNet";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5bYbfO1kmduNm9YV5niaaPvRIDRmPt4QOX7eKpK+sWY=";
   };
 
diff --git a/pkgs/by-name/de/deepsea/package.nix b/pkgs/by-name/de/deepsea/package.nix
index 5fb90e4ab991..6e00bdb75766 100644
--- a/pkgs/by-name/de/deepsea/package.nix
+++ b/pkgs/by-name/de/deepsea/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dsnezhkov";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "02s03sha8vwp7dsaw3z446pskhb6wmy0hyj0mhpbx58sf147rkig";
   };
 
diff --git a/pkgs/by-name/de/deepsource/package.nix b/pkgs/by-name/de/deepsource/package.nix
index 191076648a5a..28397bfc732a 100644
--- a/pkgs/by-name/de/deepsource/package.nix
+++ b/pkgs/by-name/de/deepsource/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DeepSourceCorp";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6uNb4cQVerrlW/eUkjmlO1i1YKYX3qaVdo0i5cczt+I=";
   };
 
diff --git a/pkgs/by-name/de/deer/package.nix b/pkgs/by-name/de/deer/package.nix
index 9cee98d1ff4c..431be4955aa4 100644
--- a/pkgs/by-name/de/deer/package.nix
+++ b/pkgs/by-name/de/deer/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Vifon";
     repo = "deer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xnbnbi0zk2xsyn8dqsmyxqlfnl36pb1wwibnlp0dxixw6sfymyl";
   };
 
diff --git a/pkgs/by-name/de/degit/package.nix b/pkgs/by-name/de/degit/package.nix
index 8d044a9e2f2a..693b2fc08eb5 100644
--- a/pkgs/by-name/de/degit/package.nix
+++ b/pkgs/by-name/de/degit/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Rich-Harris";
     repo = "degit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Vw/gtmKywi5faSCs7Wek80nmnqcPHXlQarD5qMwlsQE=";
   };
 
diff --git a/pkgs/by-name/de/dehydrated/package.nix b/pkgs/by-name/de/dehydrated/package.nix
index 236b71c8c29a..2111e311414b 100644
--- a/pkgs/by-name/de/dehydrated/package.nix
+++ b/pkgs/by-name/de/dehydrated/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lukas2511";
     repo = "dehydrated";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-K08eeruyT5vKzK3PzfCkubZiHbf9Yq7wzD1z69MeDtY=";
   };
 
diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix
index 0c7d6883db31..3ab3a8581310 100644
--- a/pkgs/by-name/de/deja-dup/package.nix
+++ b/pkgs/by-name/de/deja-dup/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "deja-dup";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-MjZ+NkNAzwEnC9R48Q5Cb3+c5jM7ooOv7+5TQ6Xo4LM=";
   };
 
diff --git a/pkgs/by-name/de/dejsonlz4/package.nix b/pkgs/by-name/de/dejsonlz4/package.nix
index b59e0fdffd3f..1d79525965db 100644
--- a/pkgs/by-name/de/dejsonlz4/package.nix
+++ b/pkgs/by-name/de/dejsonlz4/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "avih";
     repo = "dejsonlz4";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh";
   };
 
diff --git a/pkgs/by-name/de/delve/package.nix b/pkgs/by-name/de/delve/package.nix
index 686df217888b..7b62ed9f3fe6 100644
--- a/pkgs/by-name/de/delve/package.nix
+++ b/pkgs/by-name/de/delve/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-delve";
     repo = "delve";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QAFCJ5oQYHDXrNLptRdAWzzbX6J9XVgnmsB3eZ3Lko8=";
   };
 
diff --git a/pkgs/by-name/de/demoit/package.nix b/pkgs/by-name/de/demoit/package.nix
index a67e01f24239..b87c8d7554ad 100644
--- a/pkgs/by-name/de/demoit/package.nix
+++ b/pkgs/by-name/de/demoit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dgageot";
     repo = "demoit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3g0k2Oau0d9tXYDtxHpUKvAQ1FnGhjRP05YVTlmgLhM=";
   };
 
diff --git a/pkgs/by-name/de/denaro/package.nix b/pkgs/by-name/de/denaro/package.nix
index c1a1e6cdc10d..809a7e88b42c 100644
--- a/pkgs/by-name/de/denaro/package.nix
+++ b/pkgs/by-name/de/denaro/package.nix
@@ -20,7 +20,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "NickvisionApps";
     repo = "Denaro";
-    rev = version;
+    tag = version;
     hash = "sha256-fEhwup8SiYvKH2FtzruEFsj8axG5g3YJ917aqc8dn/8=";
   };
 
diff --git a/pkgs/by-name/de/dendrite/package.nix b/pkgs/by-name/de/dendrite/package.nix
index b7c61341a7b3..595dcd4aad6e 100644
--- a/pkgs/by-name/de/dendrite/package.nix
+++ b/pkgs/by-name/de/dendrite/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "dendrite";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-b/kybHF9WcP88kQuG7LB0/pgflYUeWNqEHfUyKfUCIU=";
   };
 
diff --git a/pkgs/by-name/de/dep-tree/package.nix b/pkgs/by-name/de/dep-tree/package.nix
index 3b63c653b10e..b1b27b164348 100644
--- a/pkgs/by-name/de/dep-tree/package.nix
+++ b/pkgs/by-name/de/dep-tree/package.nix
@@ -40,7 +40,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "gabotechs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m+afcnwVvPrD+S7c/kfE8mqlD7kO+VPI6sSXCCjXWZM=";
   };
 
diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index 9ad93c9d4cfa..5988a2ed7d79 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -44,7 +44,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "dependabot";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BD95YCPKoU/crlBPWYejI6kydpXhmYNAgtMEGi+iRsY=";
   };
 
diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix
index b710995a1173..a82dcf2e4ab9 100644
--- a/pkgs/by-name/de/dependency-track/package.nix
+++ b/pkgs/by-name/de/dependency-track/package.nix
@@ -24,7 +24,7 @@ let
     src = fetchFromGitHub {
       owner = "DependencyTrack";
       repo = "frontend";
-      rev = version;
+      tag = version;
       hash = "sha256-JuZM/IJd+6xtiC2Tq4ecArmT24D1m8J719UZG+iP2s0=";
     };
 
@@ -49,7 +49,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "DependencyTrack";
     repo = "dependency-track";
-    rev = version;
+    tag = version;
     hash = "sha256-GcA6Vv3H0gujkRYxipLg9ydk/HorNzwWkEAjKnMrHro=";
   };
 
diff --git a/pkgs/by-name/de/der-ascii/package.nix b/pkgs/by-name/de/der-ascii/package.nix
index 90c4651363c9..170252620987 100644
--- a/pkgs/by-name/de/der-ascii/package.nix
+++ b/pkgs/by-name/de/der-ascii/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xGzxq5AHvzLUOp9VUcI9JMwrCpVIrpDvenWUOEBP6pA=";
   };
   vendorHash = null;
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/deskew/package.nix b/pkgs/by-name/de/deskew/package.nix
index e5c699d11b1d..4cdffcfef4d2 100644
--- a/pkgs/by-name/de/deskew/package.nix
+++ b/pkgs/by-name/de/deskew/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "galfar";
     repo = "deskew";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xghVOEMkQ/mXpOzJqMaT3SII7xneMNoFqRlqjtzmDnA=";
   };
 
diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix
index 0aa7d96ce5f7..2dcf0f84c140 100644
--- a/pkgs/by-name/de/desktop-postflop/package.nix
+++ b/pkgs/by-name/de/desktop-postflop/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "b-inary";
     repo = "desktop-postflop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pOPxNHM4mseIuyyWNoU0l+dGvfURH0+9+rmzRIF0I5s=";
   };
 
diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix
index df1eeece456a..ac33498581fd 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/de/detox/package.nix b/pkgs/by-name/de/detox/package.nix
index 8ce5c3496ccb..2f43f63f22e6 100644
--- a/pkgs/by-name/de/detox/package.nix
+++ b/pkgs/by-name/de/detox/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dharple";
     repo = "detox";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cTuK5EIimRVZ1nfuTa1ds6xrawYIAbwNNIkNONd9y4Q=";
   };
 
diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index d3ebaef3882a..4e475a5caa54 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "cachix";
     repo = "devenv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OjdnHKQ+eWA8YvPUpl3xxyaNK91c9sMebqXgVdN8Lm4=";
   };
 
diff --git a/pkgs/by-name/de/devour/package.nix b/pkgs/by-name/de/devour/package.nix
index 3550652c54b5..12283aea3444 100644
--- a/pkgs/by-name/de/devour/package.nix
+++ b/pkgs/by-name/de/devour/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "salman-abedin";
     repo = "devour";
-    rev = version;
+    tag = version;
     sha256 = "1qq5l6d0fn8azg7sj7a4m2jsmhlpswl5793clcxs1p34vy4wb2lp";
   };
 
diff --git a/pkgs/by-name/de/devspace/package.nix b/pkgs/by-name/de/devspace/package.nix
index 6b14032d6476..c2894cea1ecb 100644
--- a/pkgs/by-name/de/devspace/package.nix
+++ b/pkgs/by-name/de/devspace/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "devspace-sh";
     repo = "devspace";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aD7A9GGFnX1w5MehmhqYE+wEREASyKFxusE5GFFgwbs=";
   };
 
diff --git a/pkgs/by-name/de/dex-oidc/package.nix b/pkgs/by-name/de/dex-oidc/package.nix
index 1cfde8295079..9aaf22def210 100644
--- a/pkgs/by-name/de/dex-oidc/package.nix
+++ b/pkgs/by-name/de/dex-oidc/package.nix
@@ -14,7 +14,7 @@ buildGo124Module rec {
   src = fetchFromGitHub {
     owner = "dexidp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FbjNOyECgf26+Z48YwF9uMN8C3zMRshD3VOjoRbA0ys=";
   };
 
diff --git a/pkgs/by-name/de/dex/package.nix b/pkgs/by-name/de/dex/package.nix
index a353f1525284..c0cdf5f05772 100644
--- a/pkgs/by-name/de/dex/package.nix
+++ b/pkgs/by-name/de/dex/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jceb";
     repo = "dex";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1fgSz4f6W+Dr3mo4vQY8buD2dNC8RBMGrwCTOIzH7rQ=";
   };
 
diff --git a/pkgs/by-name/df/dfrs/package.nix b/pkgs/by-name/df/dfrs/package.nix
index a7ec54118952..b305747cd55f 100644
--- a/pkgs/by-name/df/dfrs/package.nix
+++ b/pkgs/by-name/df/dfrs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "anthraxx";
     repo = "dfrs";
-    rev = version;
+    tag = version;
     sha256 = "01h00328kbw83q11yrsvcly69p0hql3kw49b4jx6gwkrdm8c2amk";
   };
 
diff --git a/pkgs/by-name/df/dftd4/package.nix b/pkgs/by-name/df/dftd4/package.nix
index e3e54eba9c6b..0a303aad8eb7 100644
--- a/pkgs/by-name/df/dftd4/package.nix
+++ b/pkgs/by-name/df/dftd4/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dftd4";
     repo = "dftd4";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dixPCLH5dWkE2/7ghGEXJmX2/g1DN30dB4jX2d7fmio=";
   };
 
diff --git a/pkgs/by-name/dg/dgraph/package.nix b/pkgs/by-name/dg/dgraph/package.nix
index 631ee7a1293f..2db642a60e58 100644
--- a/pkgs/by-name/dg/dgraph/package.nix
+++ b/pkgs/by-name/dg/dgraph/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "dgraph";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WAjoAbd8tGpianZXfrvRbRCdbkVP/gO/ekotT5KyrG8=";
   };
 
diff --git a/pkgs/by-name/dh/dhcpcd/package.nix b/pkgs/by-name/dh/dhcpcd/package.nix
index 7394fea8f83f..fc339560ed48 100644
--- a/pkgs/by-name/dh/dhcpcd/package.nix
+++ b/pkgs/by-name/dh/dhcpcd/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NetworkConfiguration";
     repo = "dhcpcd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Qtg9jOFMR/9oWJDmoNNcEAMxG6G1F187HF4MMBJIoTw=";
   };
 
diff --git a/pkgs/by-name/dh/dhewm3/package.nix b/pkgs/by-name/dh/dhewm3/package.nix
index fe6d3059c172..c1447f78e89f 100644
--- a/pkgs/by-name/dh/dhewm3/package.nix
+++ b/pkgs/by-name/dh/dhewm3/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dhewm";
     repo = "dhewm3";
-    rev = version;
+    tag = version;
     sha256 = "sha256-losqnxnjRPOczjrRPyyOxCeg9TNScXLcXADgo9Bxm5k=";
   };
 
diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix
index 439237d27497..cc940001b65f 100644
--- a/pkgs/by-name/di/di-tui/package.nix
+++ b/pkgs/by-name/di/di-tui/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "acaloiaro";
     repo = "di-tui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jX+2wdnkJPEtCWoMNbwgn3c+LsEktYa5lIfSXY0Wsew=";
   };
 
diff --git a/pkgs/by-name/di/diamond/package.nix b/pkgs/by-name/di/diamond/package.nix
index a0104ed26108..54f253aae6d8 100644
--- a/pkgs/by-name/di/diamond/package.nix
+++ b/pkgs/by-name/di/diamond/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bbuchfink";
     repo = "diamond";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-X/6sOClMFGBYksMrVfM1Y7MM3NmBEiRpmLg4Rbatc+w=";
   };
 
diff --git a/pkgs/by-name/di/dictu/package.nix b/pkgs/by-name/di/dictu/package.nix
index c2a051c00895..d40b8af11e21 100644
--- a/pkgs/by-name/di/dictu/package.nix
+++ b/pkgs/by-name/di/dictu/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dictu-lang";
     repo = "dictu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Tahi2K8Q/KPc9MN7yWhkqp/MzXfzJzrGSsvnTCyI03U=";
   };
 
diff --git a/pkgs/by-name/di/didder/package.nix b/pkgs/by-name/di/didder/package.nix
index bb58cde741aa..cf0e54151e77 100644
--- a/pkgs/by-name/di/didder/package.nix
+++ b/pkgs/by-name/di/didder/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "makew0rld";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wYAudEyOLxbNfk4M720absGkuWXcaBPyBAcmBNBaaWU=";
   };
 
diff --git a/pkgs/by-name/di/didyoumean/package.nix b/pkgs/by-name/di/didyoumean/package.nix
index 6af7fdffe2d0..eeebf52f766d 100644
--- a/pkgs/by-name/di/didyoumean/package.nix
+++ b/pkgs/by-name/di/didyoumean/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hisbaan";
     repo = "didyoumean";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PSEoh1OMElFJ8m4er1vBMkQak3JvLjd+oWNWA46cows=";
   };
 
diff --git a/pkgs/by-name/di/diff-so-fancy/package.nix b/pkgs/by-name/di/diff-so-fancy/package.nix
index 8fdb73636830..d86cbc0ff9db 100644
--- a/pkgs/by-name/di/diff-so-fancy/package.nix
+++ b/pkgs/by-name/di/diff-so-fancy/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "so-fancy";
     repo = "diff-so-fancy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yF+LI1lsE1qwOc3u7mtc+uu0N/8m4bZD5qP+xFraaTI=";
   };
 
diff --git a/pkgs/by-name/di/diffoci/package.nix b/pkgs/by-name/di/diffoci/package.nix
index 7f3a5aa322e6..e4ea6b2de3cf 100644
--- a/pkgs/by-name/di/diffoci/package.nix
+++ b/pkgs/by-name/di/diffoci/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "reproducible-containers";
     repo = "diffoci";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rCSLHlHUWS0wEnN8R2v1h+kQ7K62VQPfZmySHGSFZlQ=";
   };
 
diff --git a/pkgs/by-name/di/diffsitter/package.nix b/pkgs/by-name/di/diffsitter/package.nix
index 8af332254fbb..1dbb07be43fb 100644
--- a/pkgs/by-name/di/diffsitter/package.nix
+++ b/pkgs/by-name/di/diffsitter/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "afnanenayet";
     repo = "diffsitter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ta7JcSPEgpJwieYvtZnNMFvsYvz4FuxthhmKMYe2XUE=";
     fetchSubmodules = false;
   };
diff --git a/pkgs/by-name/di/diffuse/package.nix b/pkgs/by-name/di/diffuse/package.nix
index 41f5c6ba08da..2feb03b2ff41 100644
--- a/pkgs/by-name/di/diffuse/package.nix
+++ b/pkgs/by-name/di/diffuse/package.nix
@@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "MightyCreak";
     repo = "diffuse";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "6GdUtdVhhIQL1cD9/e7Byv37PVKXmzVWhJC6GROK7OA=";
   };
 
diff --git a/pkgs/by-name/di/digital/package.nix b/pkgs/by-name/di/digital/package.nix
index 2925915ea9bf..3a2e31169e6d 100644
--- a/pkgs/by-name/di/digital/package.nix
+++ b/pkgs/by-name/di/digital/package.nix
@@ -47,7 +47,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "hneemann";
     repo = "Digital";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6XaM3U1x/yvoCrkJ2nMtBmj972gCFlWn3F4DM7TLWgw=";
   };
 
diff --git a/pkgs/by-name/di/digitemp/package.nix b/pkgs/by-name/di/digitemp/package.nix
index f42c44fbcf5a..72785f43d421 100644
--- a/pkgs/by-name/di/digitemp/package.nix
+++ b/pkgs/by-name/di/digitemp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bcl";
     repo = "digitemp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "19zka5fcdxhhginaspak76l984iqq9v2j6qrwvi5mvca7bcj8f72";
   };
 
diff --git a/pkgs/by-name/di/dinit/package.nix b/pkgs/by-name/di/dinit/package.nix
index 0aa23f46e645..bbab1f4ef23f 100644
--- a/pkgs/by-name/di/dinit/package.nix
+++ b/pkgs/by-name/di/dinit/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "davmac314";
     repo = "dinit";
-    rev = "v${version}";
+    tag = "v${version}";
     # fix for case-insensitive filesystems
     postFetch = ''
       [ -f "$out/BUILD" ] && rm "$out/BUILD"
diff --git a/pkgs/by-name/di/diopser/package.nix b/pkgs/by-name/di/diopser/package.nix
index 4ff1fe3a1cdc..34a03e03eb5a 100644
--- a/pkgs/by-name/di/diopser/package.nix
+++ b/pkgs/by-name/di/diopser/package.nix
@@ -23,7 +23,7 @@ let
     src = fetchFromGitHub {
       owner = "Naios";
       repo = "function2";
-      rev = version;
+      tag = version;
       hash = "sha256-JceZU8ZvtYhFheh8BjMvjjZty4hcYxHEK+IIo5X4eSk=";
     };
   };
diff --git a/pkgs/by-name/di/dippi/package.nix b/pkgs/by-name/di/dippi/package.nix
index 14865ba980ec..a68bb308e70c 100644
--- a/pkgs/by-name/di/dippi/package.nix
+++ b/pkgs/by-name/di/dippi/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "dippi";
-    rev = version;
+    tag = version;
     hash = "sha256-BYI3WqMDxzERlqtq7ISQ+U1FTrpKh5OJBMo/AsdmdlQ=";
   };
 
diff --git a/pkgs/by-name/di/directx-headers/package.nix b/pkgs/by-name/di/directx-headers/package.nix
index 2c8773045ab5..3f8ac0d26993 100644
--- a/pkgs/by-name/di/directx-headers/package.nix
+++ b/pkgs/by-name/di/directx-headers/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "DirectX-Headers";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1s/lrvUUOBGVAtfyAG2b/9raQVj2Hcjw9/RtqBO7ENA=";
   };
 
diff --git a/pkgs/by-name/di/direnv/package.nix b/pkgs/by-name/di/direnv/package.nix
index b2ef901d02b0..39c556b6bd61 100644
--- a/pkgs/by-name/di/direnv/package.nix
+++ b/pkgs/by-name/di/direnv/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-C4FkBS+2MZGGlpWb7ng4Aa9IvqEuY716M5h2W3b8N1E=";
   };
 
diff --git a/pkgs/by-name/di/dirstalk/package.nix b/pkgs/by-name/di/dirstalk/package.nix
index a1bc915da1d5..a6e46db53908 100644
--- a/pkgs/by-name/di/dirstalk/package.nix
+++ b/pkgs/by-name/di/dirstalk/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stefanoj3";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-gSMkTGzMDI+scG3FQ0u0liUDL4qOPPW2UWLlAQcmmaA=";
   };
 
diff --git a/pkgs/by-name/di/discocss/package.nix b/pkgs/by-name/di/discocss/package.nix
index 353b9b7a798d..27cde2616d4b 100644
--- a/pkgs/by-name/di/discocss/package.nix
+++ b/pkgs/by-name/di/discocss/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mlvzk";
     repo = "discocss";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-of7OMgbuwebnFmbefGD1/dOhyTX1Hy7TccnWSRCweW0=";
   };
 
diff --git a/pkgs/by-name/di/discord-sh/package.nix b/pkgs/by-name/di/discord-sh/package.nix
index 7276a9529d3b..c6379b297e62 100644
--- a/pkgs/by-name/di/discord-sh/package.nix
+++ b/pkgs/by-name/di/discord-sh/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ChaoticWeg";
     repo = "discord.sh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZOGhwR9xFzkm+q0Gm8mSXZ9toXG4xGPNwBQMCVanCbY=";
   };
 
diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix
index 985fd506bd60..86ee9d00c70a 100644
--- a/pkgs/by-name/di/discordchatexporter-cli/package.nix
+++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "tyrrrz";
     repo = "discordchatexporter";
-    rev = version;
+    tag = version;
     hash = "sha256-r9bvTgqKQY605BoUlysSz4WJMxn2ibNh3EhoMYCfV3c=";
   };
 
diff --git a/pkgs/by-name/di/discordchatexporter-desktop/package.nix b/pkgs/by-name/di/discordchatexporter-desktop/package.nix
index ad643bceca4d..4bd52b917ca1 100644
--- a/pkgs/by-name/di/discordchatexporter-desktop/package.nix
+++ b/pkgs/by-name/di/discordchatexporter-desktop/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "tyrrrz";
     repo = "discordchatexporter";
-    rev = version;
+    tag = version;
     hash = "sha256-Dc6OSWUTFftP2tyRFoxHm+TsnSMDfx627DhmYnPie9w=";
   };
 
diff --git a/pkgs/by-name/di/discount/package.nix b/pkgs/by-name/di/discount/package.nix
index e7eac8e0a91c..3f94e6cbef01 100644
--- a/pkgs/by-name/di/discount/package.nix
+++ b/pkgs/by-name/di/discount/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Orc";
     repo = "discount";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fFSlW9qnH3NL9civ793LrScOJSuRe9i377BgpNzOXa0=";
   };
 
diff --git a/pkgs/by-name/di/discourse-mail-receiver/package.nix b/pkgs/by-name/di/discourse-mail-receiver/package.nix
index 40fa65bdb5b4..95a93e976136 100644
--- a/pkgs/by-name/di/discourse-mail-receiver/package.nix
+++ b/pkgs/by-name/di/discourse-mail-receiver/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "mail-receiver";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ob4Hb88odlFf5vSC9qhikhJowo4C5LksVmMuJRMNoI4=";
   };
 
diff --git a/pkgs/by-name/di/disfetch/package.nix b/pkgs/by-name/di/disfetch/package.nix
index a1ebd5275efe..451bfb9d182a 100644
--- a/pkgs/by-name/di/disfetch/package.nix
+++ b/pkgs/by-name/di/disfetch/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "q60";
     repo = "disfetch";
-    rev = version;
+    tag = version;
     sha256 = "sha256-xzOE+Pnx0qb3B9vWWrF5Q0nhUo0QYBUO6j6al8N3deY=";
   };
 
diff --git a/pkgs/by-name/di/diskrsync/package.nix b/pkgs/by-name/di/diskrsync/package.nix
index 94b2c5a0f495..79172655e421 100644
--- a/pkgs/by-name/di/diskrsync/package.nix
+++ b/pkgs/by-name/di/diskrsync/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dop251";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hM70WD+M3jwze0IG84WTFf1caOUk2s9DQ7pR+KNIt1M=";
   };
 
diff --git a/pkgs/by-name/di/diskscan/package.nix b/pkgs/by-name/di/diskscan/package.nix
index bbb737a7d498..880445dfd0e4 100644
--- a/pkgs/by-name/di/diskscan/package.nix
+++ b/pkgs/by-name/di/diskscan/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baruch";
     repo = "diskscan";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2y1ncPg9OKxqImBN5O5kXrTsuwZ/Cg/8exS7lWyZY1c=";
   };
 
diff --git a/pkgs/by-name/di/dislocker/package.nix b/pkgs/by-name/di/dislocker/package.nix
index d84ae19dbb0d..fc28e67284eb 100644
--- a/pkgs/by-name/di/dislocker/package.nix
+++ b/pkgs/by-name/di/dislocker/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aorimn";
     repo = "dislocker";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ak68s1v5dwh8y2dy5zjybmrh0pnqralmyqzis67y21m87g47h2k";
   };
 
diff --git a/pkgs/by-name/di/dismap/package.nix b/pkgs/by-name/di/dismap/package.nix
index 4d84aed8961d..01ccd1770cd7 100644
--- a/pkgs/by-name/di/dismap/package.nix
+++ b/pkgs/by-name/di/dismap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zhzyker";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YjjiS6iLIQvrPS378v2nyrgwWBJ9YtDeNTPz0ze05mU=";
   };
 
diff --git a/pkgs/by-name/di/dispad/package.nix b/pkgs/by-name/di/dispad/package.nix
index c74e108ded06..2ad65333d7bd 100644
--- a/pkgs/by-name/di/dispad/package.nix
+++ b/pkgs/by-name/di/dispad/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BlueDragonX";
     repo = "dispad";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PtwvaNtnCm3Y+6vlxPDc21RyIA2v3vkMOHpoGFxNFng=";
   };
 
diff --git a/pkgs/by-name/di/distrobox-tui/package.nix b/pkgs/by-name/di/distrobox-tui/package.nix
index e61cd34e9fd5..56ceafcfd142 100644
--- a/pkgs/by-name/di/distrobox-tui/package.nix
+++ b/pkgs/by-name/di/distrobox-tui/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "phanirithvij";
     repo = "distrobox-tui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uOeJ9f2yXszGUYTxMLwvXCRkmT9Uo7mkZVhpf5HVhbg=";
   };
 
diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix
index c7970e436c50..ee4fe066cfc9 100644
--- a/pkgs/by-name/di/distrobox/package.nix
+++ b/pkgs/by-name/di/distrobox/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "89luca89";
     repo = "distrobox";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-wTu+8SQZaf8TKkjyvKqTvIWnCZTiPnozybTu5uKXEJk=";
   };
 
diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix
index 5d491178bd3b..0cb4811124cd 100644
--- a/pkgs/by-name/di/diswall/package.nix
+++ b/pkgs/by-name/di/diswall/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dis-works";
     repo = "diswall-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-t2ZBi3ab6OUWzc0L0Hq/ay+s3KNDMeu6mkYxti48BuE=";
   };
 
diff --git a/pkgs/by-name/di/dive/package.nix b/pkgs/by-name/di/dive/package.nix
index 1feb042f3e59..7da6bc623ce5 100644
--- a/pkgs/by-name/di/dive/package.nix
+++ b/pkgs/by-name/di/dive/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wagoodman";
     repo = "dive";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PXimdEgcPS1QQbhkaI2a55EIyWMIZTwRWj0Wx81nqcQ=";
   };
 
diff --git a/pkgs/by-name/dj/djenrandom/package.nix b/pkgs/by-name/dj/djenrandom/package.nix
index 5a88117159ca..4f2ff9daf1f7 100644
--- a/pkgs/by-name/dj/djenrandom/package.nix
+++ b/pkgs/by-name/dj/djenrandom/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dj-on-github";
     repo = "djenrandom";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-r5UT8z8vvFZDffsl6CqBXuvBaZ/sl1WLxJi26CxkpAw=";
   };
 
diff --git a/pkgs/by-name/dj/djent/package.nix b/pkgs/by-name/dj/djent/package.nix
index a5d0d45313a7..26cf5aa44893 100644
--- a/pkgs/by-name/dj/djent/package.nix
+++ b/pkgs/by-name/dj/djent/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dj-on-github";
     repo = "djent";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-inMh7l/6LlrVnIin+L+fj+4Lchk0Xvt09ngVrCuvphE=";
   };
 
diff --git a/pkgs/by-name/dk/dkh/package.nix b/pkgs/by-name/dk/dkh/package.nix
index 038d51583f01..750ed11d9267 100644
--- a/pkgs/by-name/dk/dkh/package.nix
+++ b/pkgs/by-name/dk/dkh/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psi4";
     repo = "dkh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1wb4qmb9f8rnrwnnw1gdhzx1fmhy628bxfrg56khxy3j5ljxkhck";
   };
 
diff --git a/pkgs/by-name/dl/dl-librescore/package.nix b/pkgs/by-name/dl/dl-librescore/package.nix
index 31051981140d..da75fc8869ad 100644
--- a/pkgs/by-name/dl/dl-librescore/package.nix
+++ b/pkgs/by-name/dl/dl-librescore/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "LibreScore";
     repo = "dl-librescore";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DwDlGTFdqAAsEWrhnieuaeYQ0N8COB/7b49xPJackJQ=";
   };
 
diff --git a/pkgs/by-name/dl/dleyna-connector-dbus/package.nix b/pkgs/by-name/dl/dleyna-connector-dbus/package.nix
index f0b64e2f6361..b93b6e6c8364 100644
--- a/pkgs/by-name/dl/dleyna-connector-dbus/package.nix
+++ b/pkgs/by-name/dl/dleyna-connector-dbus/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phako";
     repo = "dleyna-connector-dbus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "WDmymia9MD3BRU6BOCzCIMrz9V0ACRzmEGqjbbuUmlA=";
   };
 
diff --git a/pkgs/by-name/dl/dleyna-core/package.nix b/pkgs/by-name/dl/dleyna-core/package.nix
index 92f021ae594a..a24db43e4814 100644
--- a/pkgs/by-name/dl/dleyna-core/package.nix
+++ b/pkgs/by-name/dl/dleyna-core/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phako";
     repo = "dleyna-core";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "i4L9+iyAdBNtgImbD54jkjYL5hvzeZ2OaAyFrcFmuG0=";
   };
 
diff --git a/pkgs/by-name/dl/dleyna-renderer/package.nix b/pkgs/by-name/dl/dleyna-renderer/package.nix
index d4d0adb60244..70d684087a1b 100644
--- a/pkgs/by-name/dl/dleyna-renderer/package.nix
+++ b/pkgs/by-name/dl/dleyna-renderer/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phako";
     repo = "dleyna-renderer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bGasT3XCa7QHV3D7z59TSHoqWksNSIgaO0z9zYfHHuw=";
   };
 
diff --git a/pkgs/by-name/dl/dleyna-server/package.nix b/pkgs/by-name/dl/dleyna-server/package.nix
index 6850d3d8200c..070b0ea15242 100644
--- a/pkgs/by-name/dl/dleyna-server/package.nix
+++ b/pkgs/by-name/dl/dleyna-server/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phako";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jlF9Lr/NG+Fsy/bB7aLb7xOLqel8GueJK5luo9rsDME=";
   };
 
diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix
index 507fbe4a4300..821391a29974 100644
--- a/pkgs/by-name/dm/dmarc-report-converter/package.nix
+++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tierpod";
     repo = "dmarc-report-converter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j1uFPCyxLqO3BMxl/02wILj5HGag9qjxCTB8ZxZHEGo=";
   };
 
diff --git a/pkgs/by-name/dm/dmrconfig/package.nix b/pkgs/by-name/dm/dmrconfig/package.nix
index 2821b9996c46..4951438eafb7 100644
--- a/pkgs/by-name/dm/dmrconfig/package.nix
+++ b/pkgs/by-name/dm/dmrconfig/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sergev";
     repo = "dmrconfig";
-    rev = version;
+    tag = version;
     sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab";
   };
 
diff --git a/pkgs/by-name/dn/dnadd/package.nix b/pkgs/by-name/dn/dnadd/package.nix
index 566f034174c9..92eae364af7c 100644
--- a/pkgs/by-name/dn/dnadd/package.nix
+++ b/pkgs/by-name/dn/dnadd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JoeLancaster";
     repo = "dnadd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1vzbgz8y9gj4lszsx4iczfbrj373sl4wi43j7rp46zfcbw323d4r";
   };
 
diff --git a/pkgs/by-name/dn/dnglab/package.nix b/pkgs/by-name/dn/dnglab/package.nix
index f7e023281c3e..da7ce56bc124 100644
--- a/pkgs/by-name/dn/dnglab/package.nix
+++ b/pkgs/by-name/dn/dnglab/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dnglab";
     repo = "dnglab";
-    rev = "v${version}";
+    tag = "v${version}";
     # darwin/linux hash mismatch
     postFetch = ''
       rm -rf "$out"/rawler/data/testdata/cameras/Canon/{"EOS REBEL T7i","EOS Rebel T7i"}
diff --git a/pkgs/by-name/dn/dnscrypt-proxy/package.nix b/pkgs/by-name/dn/dnscrypt-proxy/package.nix
index 0084aa0c5120..7214a6aaa4c6 100644
--- a/pkgs/by-name/dn/dnscrypt-proxy/package.nix
+++ b/pkgs/by-name/dn/dnscrypt-proxy/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DNSCrypt";
     repo = "dnscrypt-proxy";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/D5RE8AbI9i9TVdFQCYW8OLPU4TgIIDRsZfWEyXo92g=";
   };
 
diff --git a/pkgs/by-name/dn/dnsdbq/package.nix b/pkgs/by-name/dn/dnsdbq/package.nix
index 9070dd89767e..6f4584c84724 100644
--- a/pkgs/by-name/dn/dnsdbq/package.nix
+++ b/pkgs/by-name/dn/dnsdbq/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dnsdb";
     repo = "dnsdbq";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5Pi8xFZXnU3abIsH9m6xqrQ6NnEtAbhMU6HXsOYP0gg=";
   };
 
diff --git a/pkgs/by-name/dn/dnsenum/package.nix b/pkgs/by-name/dn/dnsenum/package.nix
index 74ad415f9358..77c958f9b74b 100644
--- a/pkgs/by-name/dn/dnsenum/package.nix
+++ b/pkgs/by-name/dn/dnsenum/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fwaeytens";
     repo = "dnsenum";
-    rev = version;
+    tag = version;
     sha256 = "1bg1ljv6klic13wq4r53bg6inhc74kqwm3w210865b1v1n8wj60v";
   };
 
diff --git a/pkgs/by-name/dn/dnsname-cni/package.nix b/pkgs/by-name/dn/dnsname-cni/package.nix
index c147822b43b5..25a69c9b3168 100644
--- a/pkgs/by-name/dn/dnsname-cni/package.nix
+++ b/pkgs/by-name/dn/dnsname-cni/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "dnsname";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kebN1OLMOrBKBz4aBV0VYm+LmLm6S0mKnVgG2u5I+d4=";
   };
 
diff --git a/pkgs/by-name/dn/dnspeep/package.nix b/pkgs/by-name/dn/dnspeep/package.nix
index 091b0cfb36e8..7a45b2bda26e 100644
--- a/pkgs/by-name/dn/dnspeep/package.nix
+++ b/pkgs/by-name/dn/dnspeep/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jvns";
     repo = "dnspeep";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QpUbHiMDQFRCTVyjrO9lfQQ62Z3qanv0j+8eEXjE3n4=";
   };
 
diff --git a/pkgs/by-name/dn/dnsperf/package.nix b/pkgs/by-name/dn/dnsperf/package.nix
index 6c6abd4db0b7..d4a73d028c0f 100644
--- a/pkgs/by-name/dn/dnsperf/package.nix
+++ b/pkgs/by-name/dn/dnsperf/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DNS-OARC";
     repo = "dnsperf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eDDVNFMjj+0wEBe1qO6r4Bai554Sp+EmP86reJ/VXGk=";
   };
 
diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix
index 724c016a474d..b88a5db5bdb7 100644
--- a/pkgs/by-name/dn/dnsproxy/package.nix
+++ b/pkgs/by-name/dn/dnsproxy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = "dnsproxy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lxrb6DIYompvLX3R7HI63C7ZbNW76J28Xnt7AHTVwmQ=";
   };
 
diff --git a/pkgs/by-name/dn/dnstake/package.nix b/pkgs/by-name/dn/dnstake/package.nix
index 21d922961273..0164a0d8bf93 100644
--- a/pkgs/by-name/dn/dnstake/package.nix
+++ b/pkgs/by-name/dn/dnstake/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pwnesia";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM=";
   };
 
diff --git a/pkgs/by-name/do/do-agent/package.nix b/pkgs/by-name/do/do-agent/package.nix
index b22911ed1b7f..6371bd17ef5d 100644
--- a/pkgs/by-name/do/do-agent/package.nix
+++ b/pkgs/by-name/do/do-agent/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "do-agent";
-    rev = version;
+    tag = version;
     sha256 = "sha256-XzZ9UmEA45ipVU0AHLZ+HeW/rmlBtgLXgyyGF1O1nqE=";
   };
 
diff --git a/pkgs/by-name/do/doas-sudo-shim/package.nix b/pkgs/by-name/do/doas-sudo-shim/package.nix
index 22536ae6d0b0..c3c33a0b0c29 100644
--- a/pkgs/by-name/do/doas-sudo-shim/package.nix
+++ b/pkgs/by-name/do/doas-sudo-shim/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jirutka";
     repo = "doas-sudo-shim";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jgakKxglJi4LcxXsSE4mEdY/44kPxVb/jF7CgX7dllA=";
   };
 
diff --git a/pkgs/by-name/do/doas/package.nix b/pkgs/by-name/do/doas/package.nix
index 7da262cacbae..0e90ffb01439 100644
--- a/pkgs/by-name/do/doas/package.nix
+++ b/pkgs/by-name/do/doas/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Duncaen";
     repo = "OpenDoas";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "9uOQ2Ta5HzEpbCz2vbqZEEksPuIjL8lvmfmynfqxMeM=";
   };
 
diff --git a/pkgs/by-name/do/doc2go/package.nix b/pkgs/by-name/do/doc2go/package.nix
index e2b3d2edc3e7..3b165fa31d2d 100644
--- a/pkgs/by-name/do/doc2go/package.nix
+++ b/pkgs/by-name/do/doc2go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "doc2go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-b4L20/9jm+bFGdNsHmcwSnzcmr3Il9XoV20284Ba8PU=";
   };
   vendorHash = "sha256-d5ZRMFi7GIfDHsYRNvMnDdfnGhTM1sA0WDYD2aDoEd0=";
diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix
index 7038b1d52e1a..b4daa870965a 100644
--- a/pkgs/by-name/do/docfd/package.nix
+++ b/pkgs/by-name/do/docfd/package.nix
@@ -28,7 +28,7 @@ buildDunePackage' rec {
   src = fetchFromGitHub {
     owner = "darrenldl";
     repo = "docfd";
-    rev = version;
+    tag = version;
     hash = "sha256-ZD1nKl/hfidlTGdBnNINt2EmlUmFWaJjSvY3wkyJJcg=";
   };
 
diff --git a/pkgs/by-name/do/dockbarx/package.nix b/pkgs/by-name/do/dockbarx/package.nix
index 3b478a8606f7..51f0b47840c7 100644
--- a/pkgs/by-name/do/dockbarx/package.nix
+++ b/pkgs/by-name/do/dockbarx/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xuzhen";
     repo = "dockbarx";
-    rev = version;
+    tag = version;
     sha256 = "sha256-J/5KpHptGzgRF1qIGrgjkRR3in5pE0ffkiYVTR3iZKY=";
   };
 
diff --git a/pkgs/by-name/do/docker-compose-language-service/package.nix b/pkgs/by-name/do/docker-compose-language-service/package.nix
index 412836babbbd..637c5d4d9a97 100644
--- a/pkgs/by-name/do/docker-compose-language-service/package.nix
+++ b/pkgs/by-name/do/docker-compose-language-service/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "compose-language-service";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UBnABi7DMKrAFkRA8H6us/Oq4yM0mJ+kwOm0Rt8XnGw=";
   };
 
diff --git a/pkgs/by-name/do/docker-credential-helpers/package.nix b/pkgs/by-name/do/docker-credential-helpers/package.nix
index a11cd5fb1a20..221e2447f66c 100644
--- a/pkgs/by-name/do/docker-credential-helpers/package.nix
+++ b/pkgs/by-name/do/docker-credential-helpers/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "docker";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5KrBiihpWY04PjI9M7NRS5fRu+ochzqRLvX+ZBj/wq8=";
   };
 
diff --git a/pkgs/by-name/do/docker-ls/package.nix b/pkgs/by-name/do/docker-ls/package.nix
index bde78aad278f..6b272d73b552 100644
--- a/pkgs/by-name/do/docker-ls/package.nix
+++ b/pkgs/by-name/do/docker-ls/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mayflower";
     repo = "docker-ls";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4+REt0NH4S367qFsyJncVedUrC4t1zw5o0CLTiQfIz8=";
   };
 
diff --git a/pkgs/by-name/do/docker-slim/package.nix b/pkgs/by-name/do/docker-slim/package.nix
index b0e24cdf81f7..56cd14147703 100644
--- a/pkgs/by-name/do/docker-slim/package.nix
+++ b/pkgs/by-name/do/docker-slim/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slimtoolkit";
     repo = "slim";
-    rev = version;
+    tag = version;
     hash = "sha256-X+1euWp4W53axbiBpL82bUPfod/JNhGVGWgOqKyhz6A=";
   };
 
diff --git a/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix b/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix
index e4e481b9e988..f64f0f3889fb 100644
--- a/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix
+++ b/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "rcjsuen";
     repo = "dockerfile-language-server-nodejs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xhb540hXATfSo+O+BAYt4VWOa6QHLzKHoi0qKrdBVjw=";
   };
 
diff --git a/pkgs/by-name/do/dockle/package.nix b/pkgs/by-name/do/dockle/package.nix
index 80f84ffd58e4..f62f138a9246 100644
--- a/pkgs/by-name/do/dockle/package.nix
+++ b/pkgs/by-name/do/dockle/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goodwithtech";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YoDgTKhXpN4UVF/+NDFxaEFwMj81RJaqfjr29t1UdLY=";
   };
 
diff --git a/pkgs/by-name/do/dockutil/package.nix b/pkgs/by-name/do/dockutil/package.nix
index 264523e970fd..ef45a363ae12 100644
--- a/pkgs/by-name/do/dockutil/package.nix
+++ b/pkgs/by-name/do/dockutil/package.nix
@@ -37,7 +37,7 @@ let
     src = fetchFromGitHub {
       owner = "kcrawford";
       repo = "dockutil";
-      rev = finalAttrs.version;
+      tag = finalAttrs.version;
       hash = "sha256-mmk4vVZhq4kt05nI/dDM1676FDWyf4wTSwY2YzqKsLU=";
     };
 
diff --git a/pkgs/by-name/do/docopt_cpp/package.nix b/pkgs/by-name/do/docopt_cpp/package.nix
index 2b45d2e9c15d..7f170040d4e1 100644
--- a/pkgs/by-name/do/docopt_cpp/package.nix
+++ b/pkgs/by-name/do/docopt_cpp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "docopt";
     repo = "docopt.cpp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";
   };
 
diff --git a/pkgs/by-name/do/doctave/package.nix b/pkgs/by-name/do/doctave/package.nix
index 854a56de0709..a59582cff7f8 100644
--- a/pkgs/by-name/do/doctave/package.nix
+++ b/pkgs/by-name/do/doctave/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "doctave";
     repo = "doctave";
-    rev = version;
+    tag = version;
     hash = "sha256-8mGSFQozyLoGua9mwyqfDcYNMtbeWp9Phb0vaje+AJ0=";
   };
 
diff --git a/pkgs/by-name/do/doctest/package.nix b/pkgs/by-name/do/doctest/package.nix
index 793a4af00f58..36ca68bde32b 100644
--- a/pkgs/by-name/do/doctest/package.nix
+++ b/pkgs/by-name/do/doctest/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "doctest";
     repo = "doctest";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hotO6QVpPn8unYTaQHFgi40A3oLUd++I3aTe293e4Aw=";
   };
 
diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix
index 50dc42dc2eac..681036ddce23 100644
--- a/pkgs/by-name/do/doctl/package.nix
+++ b/pkgs/by-name/do/doctl/package.nix
@@ -41,7 +41,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "doctl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-B3qozldNmCYLCuBoWMHycf9gNKbvUvPHK2CDOvMYEt8=";
   };
 
diff --git a/pkgs/by-name/do/doctoc/package.nix b/pkgs/by-name/do/doctoc/package.nix
index faded51f4431..4ad3f5001889 100644
--- a/pkgs/by-name/do/doctoc/package.nix
+++ b/pkgs/by-name/do/doctoc/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "thlorenz";
     repo = "doctoc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LYVxW8bZ4M87CmBvPyp4y0IeL9UFawwAKnUWHEWB5Gs=";
   };
 
diff --git a/pkgs/by-name/do/docui/package.nix b/pkgs/by-name/do/docui/package.nix
index 5c8c5302f5c3..bfddee135d37 100644
--- a/pkgs/by-name/do/docui/package.nix
+++ b/pkgs/by-name/do/docui/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "skanehira";
     repo = "docui";
-    rev = version;
+    tag = version;
     hash = "sha256-tHv1caNGiWC9Dc/qR4ij9xGM1lotT0KyrpJpdBsHyks=";
   };
 
diff --git a/pkgs/by-name/do/documenso/package.nix b/pkgs/by-name/do/documenso/package.nix
index 71b15e2b29b8..78e29db16233 100644
--- a/pkgs/by-name/do/documenso/package.nix
+++ b/pkgs/by-name/do/documenso/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "documenso";
     repo = "documenso";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uKOJVZ0GRHo/CYvd/Ix/tq1WDhutRji1tSGdcITsNlo=";
   };
 
diff --git a/pkgs/by-name/do/documize-community/package.nix b/pkgs/by-name/do/documize-community/package.nix
index 842428c79914..8596ebc17955 100644
--- a/pkgs/by-name/do/documize-community/package.nix
+++ b/pkgs/by-name/do/documize-community/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "documize";
     repo = "community";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Kv4BsFB08rkGRkePFIkjjuhK1TnLPS4m+PUlgKG5cTQ=";
   };
 
diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix
index 1ce408dfdabc..5248f37ca7dd 100644
--- a/pkgs/by-name/do/docuum/package.nix
+++ b/pkgs/by-name/do/docuum/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "stepchowfun";
     repo = "docuum";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nWd6h39jU1eZWPFMxhxActsmrs9k0TDMlealuzTa+o0=";
   };
 
diff --git a/pkgs/by-name/do/doge/package.nix b/pkgs/by-name/do/doge/package.nix
index c12e8345abf8..5d1e29d913a1 100644
--- a/pkgs/by-name/do/doge/package.nix
+++ b/pkgs/by-name/do/doge/package.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Olivia5k";
     repo = "doge";
-    rev = version;
+    tag = version;
     hash = "sha256-CZw9Pz9YPVmDMOfDp5yIp/yStOvXEzAgb/HvKpxhQ8I=";
   };
 
diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix
index 0a6a950e93f1..11afcc923173 100644
--- a/pkgs/by-name/do/dogedns/package.nix
+++ b/pkgs/by-name/do/dogedns/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Dj-Codeman";
     repo = "doge";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3wOka+MKSy2x3100eF0d9A5Jc0qFSNCiLsisHO1Uldc=";
   };
 
diff --git a/pkgs/by-name/do/doggo/package.nix b/pkgs/by-name/do/doggo/package.nix
index 27fee11d3874..771fb5b1ca1f 100644
--- a/pkgs/by-name/do/doggo/package.nix
+++ b/pkgs/by-name/do/doggo/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mr-karan";
     repo = "doggo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SbTwVvE699MCgfUXifnJ1oMNN8TdLg8P03Xx5hrQxF8=";
   };
 
diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index d97f45c3a14b..9f3768cc0190 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-d4n4Cz4FvSMznTqHs5cD18Y1xE6p8umGr7PqtI5k6Zg=";
   };
 
diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix
index 7b4398e1e2bb..aa5670b4be21 100644
--- a/pkgs/by-name/do/done/package.nix
+++ b/pkgs/by-name/do/done/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "done-devs";
     repo = "done";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SbeP7PnJd7jjdXa9uDIAlMAJLOrYHqNP5p9gQclb6RU=";
   };
 
diff --git a/pkgs/by-name/do/dool/package.nix b/pkgs/by-name/do/dool/package.nix
index 1be266859149..d03154a9dcee 100644
--- a/pkgs/by-name/do/dool/package.nix
+++ b/pkgs/by-name/do/dool/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scottchiefbaker";
     repo = "dool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eyWt8gWPGiU8YavX8KT018upSB6xg8eAyRZ84snrvoY=";
   };
 
diff --git a/pkgs/by-name/do/door-knocker/package.nix b/pkgs/by-name/do/door-knocker/package.nix
index 37429ed2f5cd..6baedaa57b4d 100644
--- a/pkgs/by-name/do/door-knocker/package.nix
+++ b/pkgs/by-name/do/door-knocker/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "tytan652";
     repo = "door-knocker";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-6QHjmjR2ioR0I6JXtJ0Q+9Dl1fcTnQCGgWlcyFt9WoA=";
   };
 
diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix
index c1e5796fb5d0..5abf6dc49a48 100644
--- a/pkgs/by-name/do/doppler/package.nix
+++ b/pkgs/by-name/do/doppler/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dopplerhq";
     repo = "cli";
-    rev = version;
+    tag = version;
     hash = "sha256-CHPaY8Z8ov+loIViQceD4ZW26MtXN1hpkY00p3Yy1n4=";
   };
 
diff --git a/pkgs/by-name/do/dorkscout/package.nix b/pkgs/by-name/do/dorkscout/package.nix
index 28991f77b5f2..c32690ecfb5f 100644
--- a/pkgs/by-name/do/dorkscout/package.nix
+++ b/pkgs/by-name/do/dorkscout/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "R4yGM";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-v0OgEfl6L92ux+2GbSPHEgkmA/ZobQHB66O2LlEhVUA=";
   };
 
diff --git a/pkgs/by-name/do/dosfstools/package.nix b/pkgs/by-name/do/dosfstools/package.nix
index 9446485273d3..20a665ac85b7 100644
--- a/pkgs/by-name/do/dosfstools/package.nix
+++ b/pkgs/by-name/do/dosfstools/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dosfstools";
     repo = "dosfstools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-2gxB0lQixiHOHw8uTetHekaM57fvUd9zOzSxWnvUz/c=";
   };
 
diff --git a/pkgs/by-name/do/dot-language-server/package.nix b/pkgs/by-name/do/dot-language-server/package.nix
index cb94613eb588..4d78d42b5d92 100644
--- a/pkgs/by-name/do/dot-language-server/package.nix
+++ b/pkgs/by-name/do/dot-language-server/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "nikeee";
     repo = "dot-language-server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NGkobMZrvWlW/jteFowZgGUVQiNm3bS5gv5tN2485VA=";
   };
 
diff --git a/pkgs/by-name/do/dotconf/package.nix b/pkgs/by-name/do/dotconf/package.nix
index 02d999ce46d5..b537cd2e9d9e 100644
--- a/pkgs/by-name/do/dotconf/package.nix
+++ b/pkgs/by-name/do/dotconf/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "williamh";
     repo = "dotconf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6Du26Ffz08DLGg6uIiPi8Sgjf691MM2kn0qXe3oFeTw=";
   };
 
diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix
index 5db7d841e907..e681917413c8 100644
--- a/pkgs/by-name/do/dotenv-cli/package.nix
+++ b/pkgs/by-name/do/dotenv-cli/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "entropitor";
     repo = "dotenv-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cqJGw6z0m1ImFEmG2jfcYjaKVhrGyM4hbOAHC7xNAFY=";
   };
 
diff --git a/pkgs/by-name/do/dotnet-outdated/package.nix b/pkgs/by-name/do/dotnet-outdated/package.nix
index 83ae0d4b0037..14fd3ae82a6f 100644
--- a/pkgs/by-name/do/dotnet-outdated/package.nix
+++ b/pkgs/by-name/do/dotnet-outdated/package.nix
@@ -11,7 +11,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "dotnet-outdated";
     repo = "dotnet-outdated";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ah5VOCIkSRkeDWk/KYHIc/OELo0T/HuJl0LEUiumlu0=";
   };
 
diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix
index 87339d21f6f9..3c74d93bef8b 100644
--- a/pkgs/by-name/do/dotter/package.nix
+++ b/pkgs/by-name/do/dotter/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SuperCuber";
     repo = "dotter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7YExvmuliTL9oagXNUtZ7ZOPyELcS+igK1tXdhG0kQk=";
   };
 
diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix
index 508a6d576cb2..e6a9f91851d9 100644
--- a/pkgs/by-name/do/double-conversion/package.nix
+++ b/pkgs/by-name/do/double-conversion/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "double-conversion";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM=";
   };
 
diff --git a/pkgs/by-name/do/double-entry-generator/package.nix b/pkgs/by-name/do/double-entry-generator/package.nix
index f57f8b185b9d..00bd6e347a27 100644
--- a/pkgs/by-name/do/double-entry-generator/package.nix
+++ b/pkgs/by-name/do/double-entry-generator/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner = "deb-sig";
     repo = "double-entry-generator";
     hash = "sha256-2Y8Spj1LAVZsUgChDYDCZ63pTH+nqs2ff9xcmC+gr0c=";
-    rev = "v${version}";
+    tag = "v${version}";
   };
 
   vendorHash = "sha256-Xedva9oGteOnv3rP4Wo3sOHIPyuy2TYwkZV2BAuxY4M=";
diff --git a/pkgs/by-name/do/dovecot_fts_xapian/package.nix b/pkgs/by-name/do/dovecot_fts_xapian/package.nix
index 6b0f6e5afbd7..a49b69065f27 100644
--- a/pkgs/by-name/do/dovecot_fts_xapian/package.nix
+++ b/pkgs/by-name/do/dovecot_fts_xapian/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grosjo";
     repo = "fts-xapian";
-    rev = version;
+    tag = version;
     hash = "sha256-jHXeCJVdRWGdLMooh5cq5ZeZPM5fDo1lO6U5VMcwf3g=";
   };
 
diff --git a/pkgs/by-name/dp/dpt-rp1-py/package.nix b/pkgs/by-name/dp/dpt-rp1-py/package.nix
index 27be986648ef..6d92a2f3cc86 100644
--- a/pkgs/by-name/dp/dpt-rp1-py/package.nix
+++ b/pkgs/by-name/dp/dpt-rp1-py/package.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "janten";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0zvf09b9rzpx5b0w81ziqd7v321hfhgsgvshdx23karj2hf75bvj";
   };
 
diff --git a/pkgs/by-name/dr/dr14_tmeter/package.nix b/pkgs/by-name/dr/dr14_tmeter/package.nix
index fe141c096fb1..97b0cb0565e4 100644
--- a/pkgs/by-name/dr/dr14_tmeter/package.nix
+++ b/pkgs/by-name/dr/dr14_tmeter/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "simon-r";
     repo = "dr14_t.meter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1nfsasi7kx0myxkahbd7rz8796mcf5nsadrsjjpx2kgaaw5nkv1m";
   };
 
diff --git a/pkgs/by-name/dr/dracut/package.nix b/pkgs/by-name/dr/dracut/package.nix
index 071a70095adf..5f69a03679de 100644
--- a/pkgs/by-name/dr/dracut/package.nix
+++ b/pkgs/by-name/dr/dracut/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dracutdevs";
     repo = "dracut";
-    rev = version;
+    tag = version;
     hash = "sha256-zSyC2SnSQkmS/mDpBXG2DtVVanRRI9COKQJqYZZCPJM=";
   };
 
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/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix
index 21622ff9aefb..a77cf0154f69 100644
--- a/pkgs/by-name/dr/dreamchess/package.nix
+++ b/pkgs/by-name/dr/dreamchess/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "dreamchess";
     repo = "dreamchess";
-    rev = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-qus/RjwdAl9SuDXfLVKTPImqrvPF3xSDVlbXYLM3JNE=";
   };
 
diff --git a/pkgs/by-name/dr/driftctl/package.nix b/pkgs/by-name/dr/driftctl/package.nix
index 9a95d19f4e4f..b6d33cafea2f 100644
--- a/pkgs/by-name/dr/driftctl/package.nix
+++ b/pkgs/by-name/dr/driftctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "snyk";
     repo = "driftctl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-IDKfW0NCEsgKXpHA7SwkHjMeoGAIYITlDVR/vI/b9hk=";
   };
 
diff --git a/pkgs/by-name/dr/drip/package.nix b/pkgs/by-name/dr/drip/package.nix
index 9e7de6a3bb0f..9ee7ffacb3dc 100644
--- a/pkgs/by-name/dr/drip/package.nix
+++ b/pkgs/by-name/dr/drip/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "drip";
     owner = "ninjudd";
-    rev = version;
+    tag = version;
     sha256 = "1zl62wdwfak6z725asq5lcqb506la1aavj7ag78lvp155wyh8aq1";
   };
 
diff --git a/pkgs/by-name/dr/drive/package.nix b/pkgs/by-name/dr/drive/package.nix
index 7eb4412744ee..5e74bc141d2f 100644
--- a/pkgs/by-name/dr/drive/package.nix
+++ b/pkgs/by-name/dr/drive/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "odeke-em";
     repo = "drive";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mNOeOB0Tn5eqULFJZuE18PvLoHtnspv4AElmgEQKXcU=";
   };
 
diff --git a/pkgs/by-name/dr/droidcam/package.nix b/pkgs/by-name/dr/droidcam/package.nix
index b7f9ce79874a..4d331fe9f110 100644
--- a/pkgs/by-name/dr/droidcam/package.nix
+++ b/pkgs/by-name/dr/droidcam/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aramg";
     repo = "droidcam";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Pwq7PDj+MH1wzrUyfva2F2+oELm4Sb1EJPUUCsHYb7k=";
   };
 
diff --git a/pkgs/by-name/dr/drone-scp/package.nix b/pkgs/by-name/dr/drone-scp/package.nix
index 07d38d2e6623..626385c33a8d 100644
--- a/pkgs/by-name/dr/drone-scp/package.nix
+++ b/pkgs/by-name/dr/drone-scp/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "appleboy";
     repo = "drone-scp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cVgKWdhmCdjEHGazZ1FMAOJMVyU5pl8aIgwFMhxlhzg=";
   };
 
diff --git a/pkgs/by-name/dr/dropwatch/package.nix b/pkgs/by-name/dr/dropwatch/package.nix
index 0fbf7865dd63..4480df877891 100644
--- a/pkgs/by-name/dr/dropwatch/package.nix
+++ b/pkgs/by-name/dr/dropwatch/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nhorman";
     repo = "dropwatch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TbhgcX5WzuigP5/Mj5JuK7O/UKcu70D7dcOcvo4fxeQ=";
   };
 
diff --git a/pkgs/by-name/dr/dry/package.nix b/pkgs/by-name/dr/dry/package.nix
index d92189012dc1..63b76a1a74b1 100644
--- a/pkgs/by-name/dr/dry/package.nix
+++ b/pkgs/by-name/dr/dry/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "moncho";
     repo = "dry";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JGtPX6BrB3q2EQyF6x2A5Wsn5DudOSVt3IxBAjjwlC8=";
   };
 
diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix
index 96f619706a79..1ee33025df14 100644
--- a/pkgs/by-name/ds/dsda-doom/package.nix
+++ b/pkgs/by-name/ds/dsda-doom/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kraflab";
     repo = "dsda-doom";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-66o/k5DvyKxwa0sZPCfSycVRxEhrRhUJXJVz2p817OE=";
   };
 
diff --git a/pkgs/by-name/ds/dsq/package.nix b/pkgs/by-name/ds/dsq/package.nix
index b32ca150c12f..3b77a1133ba4 100644
--- a/pkgs/by-name/ds/dsq/package.nix
+++ b/pkgs/by-name/ds/dsq/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "multiprocessio";
     repo = "dsq";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FZBJe+2y4HV3Pgeap4yvD0a8M/j+6pAJEFpoQVVE1ec=";
   };
 
diff --git a/pkgs/by-name/ds/dstask/package.nix b/pkgs/by-name/ds/dstask/package.nix
index 54e8a95355b7..e01ca34d09d6 100644
--- a/pkgs/by-name/ds/dstask/package.nix
+++ b/pkgs/by-name/ds/dstask/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "naggie";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xZFQQDK+yGAv4IbuNe2dvNa3GDASeJY2mOYw94goAIM=";
   };
 
diff --git a/pkgs/by-name/ds/dstep/package.nix b/pkgs/by-name/ds/dstep/package.nix
index 14a3c3b7cd58..57f1e747f6a3 100644
--- a/pkgs/by-name/ds/dstep/package.nix
+++ b/pkgs/by-name/ds/dstep/package.nix
@@ -13,7 +13,7 @@ buildDubPackage rec {
   src = fetchFromGitHub {
     owner = "jacob-carlborg";
     repo = "dstep";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZFz2+GtBk3StqXo/9x47xrDFdz5XujHR62hj0p3AjcY=";
   };
 
diff --git a/pkgs/by-name/ds/dstp/package.nix b/pkgs/by-name/ds/dstp/package.nix
index c06a34434a56..a8ad7eda817b 100644
--- a/pkgs/by-name/ds/dstp/package.nix
+++ b/pkgs/by-name/ds/dstp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ycd";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QODp9IbIc2Z7N/xfRd0UV9r8t6RndOjdGe9hQXJyiN0=";
   };
 
diff --git a/pkgs/by-name/ds/dsvpn/package.nix b/pkgs/by-name/ds/dsvpn/package.nix
index 23f640d149a0..f9723ad152b6 100644
--- a/pkgs/by-name/ds/dsvpn/package.nix
+++ b/pkgs/by-name/ds/dsvpn/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = "dsvpn";
-    rev = version;
+    tag = version;
     sha256 = "1gbj3slwmq990qxsbsaxasi98alnnzv3adp6f8w8sxd4gi6qxhdh";
   };
 
diff --git a/pkgs/by-name/dt/dtcmp/package.nix b/pkgs/by-name/dt/dtcmp/package.nix
index abf24f17ec90..433d8107d274 100644
--- a/pkgs/by-name/dt/dtcmp/package.nix
+++ b/pkgs/by-name/dt/dtcmp/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LLNL";
     repo = "dtcmp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Dc+c8JCc5D23CtpwiWkHCqngywEZXw7cYsRiSYiQdWk=";
   };
 
diff --git a/pkgs/by-name/dt/dtool/package.nix b/pkgs/by-name/dt/dtool/package.nix
index 3d154e94567f..0a4c6071797a 100644
--- a/pkgs/by-name/dt/dtool/package.nix
+++ b/pkgs/by-name/dt/dtool/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "guoxbin";
     repo = "dtool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m4H+ANwEbK6vGW3oIVZqnqvMiAKxNJf2TLIGh/G6AU4=";
   };
 
diff --git a/pkgs/by-name/dt/dtrx/package.nix b/pkgs/by-name/dt/dtrx/package.nix
index 837f434fb981..e3abff42ca19 100644
--- a/pkgs/by-name/dt/dtrx/package.nix
+++ b/pkgs/by-name/dt/dtrx/package.nix
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dtrx-py";
     repo = "dtrx";
-    rev = version;
+    tag = version;
     sha256 = "sha256-LB3F6jcqQPRsjFO4L2fPAPnacDAdtcaadgGbwXA9LAw=";
   };
 
diff --git a/pkgs/by-name/du/duc/package.nix b/pkgs/by-name/du/duc/package.nix
index ad33cea6cae2..214c3b6ff6c3 100644
--- a/pkgs/by-name/du/duc/package.nix
+++ b/pkgs/by-name/du/duc/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zevv";
     repo = "duc";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ZLNsyp82UnsveEfDKzH8WfRh/Y/PQlXq8Ma+jIZl9Gk=";
   };
 
diff --git a/pkgs/by-name/du/duf/package.nix b/pkgs/by-name/du/duf/package.nix
index dce3c1588834..87ab46f39d2b 100644
--- a/pkgs/by-name/du/duf/package.nix
+++ b/pkgs/by-name/du/duf/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "muesli";
     repo = "duf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bVuqX88KY+ky+fd1FU9GWP78jQc4fRDk9yRSeIesHyI=";
   };
 
diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix
index b62086b95b52..e51049d63b91 100644
--- a/pkgs/by-name/du/dufs/package.nix
+++ b/pkgs/by-name/du/dufs/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sigoden";
     repo = "dufs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KkuP9UE9VT9aJ50QH1Y/2f+t0tLOMyNovxCaLq0Jz0s=";
   };
 
diff --git a/pkgs/by-name/du/dum/package.nix b/pkgs/by-name/du/dum/package.nix
index 928ccc53afe6..2f4ac2dde888 100644
--- a/pkgs/by-name/du/dum/package.nix
+++ b/pkgs/by-name/du/dum/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "egoist";
     repo = "dum";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rkdQb4TI7lfWE4REJYsIJwMcmM/78jjgQrd0ZvKJxk8=";
   };
 
diff --git a/pkgs/by-name/du/dumb-init/package.nix b/pkgs/by-name/du/dumb-init/package.nix
index 50ab44df870a..4a4f073302cc 100644
--- a/pkgs/by-name/du/dumb-init/package.nix
+++ b/pkgs/by-name/du/dumb-init/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = "dumb-init";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-aRh0xfmp+ToXIYjYaducTpZUHndZ5HlFZpFhzJ3yKgs=";
   };
 
diff --git a/pkgs/by-name/du/dumb/package.nix b/pkgs/by-name/du/dumb/package.nix
index 48d25f2601fd..03ffd43ef905 100644
--- a/pkgs/by-name/du/dumb/package.nix
+++ b/pkgs/by-name/du/dumb/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kode54";
     repo = "dumb";
-    rev = version;
+    tag = version;
     sha256 = "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6";
   };
 
diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix
index a1176888b5a0..0da62b306e36 100644
--- a/pkgs/by-name/du/dumbpipe/package.nix
+++ b/pkgs/by-name/du/dumbpipe/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "dumbpipe";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xQHVEJ+EgsrboXbPg7pGXXMjyedSLooqkTt/yYZACSo=";
   };
 
diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix
index f07a24780f5c..370c0c39d5ce 100644
--- a/pkgs/by-name/du/dummyhttp/package.nix
+++ b/pkgs/by-name/du/dummyhttp/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "dummyhttp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LgOIL4kg3cH0Eo+Z+RGwxZTPzCNSGAdKT7N8tZWHSQQ=";
   };
 
diff --git a/pkgs/by-name/du/dump1090/package.nix b/pkgs/by-name/du/dump1090/package.nix
index d61dbe92411e..44cbe813d7fa 100644
--- a/pkgs/by-name/du/dump1090/package.nix
+++ b/pkgs/by-name/du/dump1090/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flightaware";
     repo = "dump1090";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rc4mg+Px+0p2r38wxIah/rHqWjHSU0+KCPgqj/Gl3oo=";
   };
 
diff --git a/pkgs/by-name/du/dupd/package.nix b/pkgs/by-name/du/dupd/package.nix
index 71cd9e53c194..1495e626aaf7 100644
--- a/pkgs/by-name/du/dupd/package.nix
+++ b/pkgs/by-name/du/dupd/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jvirkki";
     repo = "dupd";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ZiQroJ5fjBCIjU+M8KRA0N3Mrg9h0NVtfYUIS4cYyhw=";
   };
 
diff --git a/pkgs/by-name/du/dupe-krill/package.nix b/pkgs/by-name/du/dupe-krill/package.nix
index a641d7045033..7b76a1fd9741 100644
--- a/pkgs/by-name/du/dupe-krill/package.nix
+++ b/pkgs/by-name/du/dupe-krill/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = "dupe-krill";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ze9OQHNtujzn2rY24bmFUkz5AYsjoMrwqm4jyQoF53Y=";
   };
 
diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index 89e2eb0b9235..151458a05591 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "markfasheh";
     repo = "duperemove";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T17XkR6AUvOerg9FN4SxTfoMavVXnxujtrA4p4GEnFE=";
   };
 
diff --git a/pkgs/by-name/du/duplicacy/package.nix b/pkgs/by-name/du/duplicacy/package.nix
index d1a4ea570da7..1e8257433ade 100644
--- a/pkgs/by-name/du/duplicacy/package.nix
+++ b/pkgs/by-name/du/duplicacy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gilbertchen";
     repo = "duplicacy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JxBS40g97GPTzKXW+k0RrwLBuK4ItLvnVHzBZRSOEIM=";
   };
 
diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index 720bfee00efd..d2ef83496158 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MmlCTF7tZBBOCnyhUjTatDjajFMGd+Nk2kYyxjzZc04=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
diff --git a/pkgs/by-name/du/dutree/package.nix b/pkgs/by-name/du/dutree/package.nix
index d6f1d42a4b8c..57d8c3202389 100644
--- a/pkgs/by-name/du/dutree/package.nix
+++ b/pkgs/by-name/du/dutree/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nachoparker";
     repo = "dutree";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "17lm8jd07bi499mywg2iq669im34j4x4yhc8a3adxn12f8j0dfg7";
     # test directory has files with unicode names which causes hash mismatches
     # It is also not used by any tests or parts of build process
diff --git a/pkgs/by-name/dy/dyff/package.nix b/pkgs/by-name/dy/dyff/package.nix
index 9c2e026bfa1d..70232d946023 100644
--- a/pkgs/by-name/dy/dyff/package.nix
+++ b/pkgs/by-name/dy/dyff/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "homeport";
     repo = "dyff";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dioahL3dWK+rNAcThv2vYyoGaIIFhcd5li9gtwjtGzM=";
   };
 
diff --git a/pkgs/by-name/dy/dynamic-colors/package.nix b/pkgs/by-name/dy/dynamic-colors/package.nix
index b59e413cf87a..38f6c7b4c5b6 100644
--- a/pkgs/by-name/dy/dynamic-colors/package.nix
+++ b/pkgs/by-name/dy/dynamic-colors/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "peterhoeg";
     repo = "dynamic-colors";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jSdwq9WwYZP8MK6z7zJa0q93xfanr6iuvAt8YQkQxxE=";
   };
 
diff --git a/pkgs/by-name/dy/dynamic-wallpaper/package.nix b/pkgs/by-name/dy/dynamic-wallpaper/package.nix
index 786db004d7a3..6985d9e88381 100644
--- a/pkgs/by-name/dy/dynamic-wallpaper/package.nix
+++ b/pkgs/by-name/dy/dynamic-wallpaper/package.nix
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dusansimic";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-DAdx34EYO8ysQzbWrAIPoghhibwFtoqCi8oyDVyO5lk=";
   };
 
diff --git a/pkgs/by-name/dy/dynein/package.nix b/pkgs/by-name/dy/dynein/package.nix
index 75fcbb6ffe83..e04eeefe245b 100644
--- a/pkgs/by-name/dy/dynein/package.nix
+++ b/pkgs/by-name/dy/dynein/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "dynein";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GU/zZ7IJPfpRbrWjrVwPDSFjFfMLoG/c8DDWlN6nZ94=";
   };
 
diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix
index 4425ee65be01..cccfad948a9c 100644
--- a/pkgs/by-name/dy/dysk/package.nix
+++ b/pkgs/by-name/dy/dysk/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "dysk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VJFcdxwj+038d9oj178e0uGQQyKF9JbDytxDmit2tiA=";
   };
 
diff --git a/pkgs/by-name/ea/ea/package.nix b/pkgs/by-name/ea/ea/package.nix
index 7c4a649f2ab9..3e18fe6e5f67 100644
--- a/pkgs/by-name/ea/ea/package.nix
+++ b/pkgs/by-name/ea/ea/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dduan";
     repo = "ea";
-    rev = version;
+    tag = version;
     hash = "sha256-VXSSe5d7VO3LfjumzN9a7rrKRedOtOzTdLVQWgV1ED8=";
   };
 
diff --git a/pkgs/by-name/ea/each/package.nix b/pkgs/by-name/ea/each/package.nix
index 27ae4b17e104..6f01f5170598 100644
--- a/pkgs/by-name/ea/each/package.nix
+++ b/pkgs/by-name/ea/each/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "arraypad";
     repo = "each";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5Aa/uHWrU4bpWd28Uddnuhmi6guHy09W9AU8sAfea6I=";
   };
 
diff --git a/pkgs/by-name/ea/earlybird/package.nix b/pkgs/by-name/ea/earlybird/package.nix
index 336082800ba4..f39281d89769 100644
--- a/pkgs/by-name/ea/earlybird/package.nix
+++ b/pkgs/by-name/ea/earlybird/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "americanexpress";
     repo = "earlybird";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-guSm/ha4ICaOcoynvAwFeojE6ikaCykMcdfskD/ehTw=";
   };
 
diff --git a/pkgs/by-name/ea/earthly/package.nix b/pkgs/by-name/ea/earthly/package.nix
index 193cf4991cc9..99d81d663604 100644
--- a/pkgs/by-name/ea/earthly/package.nix
+++ b/pkgs/by-name/ea/earthly/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "earthly";
     repo = "earthly";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7yw2SmwWsPBCH0LOaZSruYeZ5qL+njGuExy8+11Ni78=";
   };
 
diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix
index 274c71c9d748..acab9100ea23 100644
--- a/pkgs/by-name/ea/earthlyls/package.nix
+++ b/pkgs/by-name/ea/earthlyls/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "glehmann";
     repo = "earthlyls";
-    rev = version;
+    tag = version;
     hash = "sha256-GnFzfCjT4kjb9WViKIFDkIU7zVpiI6HDuUeddgHGQuc=";
   };
 
diff --git a/pkgs/by-name/ea/easeprobe/package.nix b/pkgs/by-name/ea/easeprobe/package.nix
index e52927a00dfd..b6a54b208563 100644
--- a/pkgs/by-name/ea/easeprobe/package.nix
+++ b/pkgs/by-name/ea/easeprobe/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "megaease";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-XPbRtW3UIc6N1D1LKDYxgTHGVmiGDnam+r5Eg4uBa7w=";
   };
 
diff --git a/pkgs/by-name/ea/eask-cli/package.nix b/pkgs/by-name/ea/eask-cli/package.nix
index 1e826d8cf3f0..9554b57607d8 100644
--- a/pkgs/by-name/ea/eask-cli/package.nix
+++ b/pkgs/by-name/ea/eask-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "emacs-eask";
     repo = "cli";
-    rev = version;
+    tag = version;
     hash = "sha256-xMay2HGw5vGvGIrbjCk0LNn5bvSiHbnpjfdGdO7BpQ4=";
   };
 
diff --git a/pkgs/by-name/ea/easyjson/package.nix b/pkgs/by-name/ea/easyjson/package.nix
index 97d6ddd6f845..2733a213de0d 100644
--- a/pkgs/by-name/ea/easyjson/package.nix
+++ b/pkgs/by-name/ea/easyjson/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mailru";
     repo = "easyjson";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m2WZwi6TM6hiBlCQOe+rxF5z3vvnYqtHQX8d7y5NLgI=";
   };
   vendorHash = "sha256-BsksTYmfPQezbWfIWX0NhuMbH4VvktrEx06C2Nb/FYE=";
diff --git a/pkgs/by-name/ea/easyloggingpp/package.nix b/pkgs/by-name/ea/easyloggingpp/package.nix
index 8aa369284f6f..82b002aca893 100644
--- a/pkgs/by-name/ea/easyloggingpp/package.nix
+++ b/pkgs/by-name/ea/easyloggingpp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amrayn";
     repo = "easyloggingpp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-R4NdwsUywgJoK5E/OdZXFds6iBKOsMa0E+2PDdQbV6E=";
   };
 
diff --git a/pkgs/by-name/ea/easypdkprog/package.nix b/pkgs/by-name/ea/easypdkprog/package.nix
index b4c86551e142..b14d4075d084 100644
--- a/pkgs/by-name/ea/easypdkprog/package.nix
+++ b/pkgs/by-name/ea/easypdkprog/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "free-pdk";
     repo = "easy-pdk-programmer-software";
-    rev = version;
+    tag = version;
     sha256 = "0hc3gdmn6l01z63hzzwdhbdyy288gh5v219bsfm8fb1498vpnd6f";
   };
 
diff --git a/pkgs/by-name/ea/easyrsa/package.nix b/pkgs/by-name/ea/easyrsa/package.nix
index 96d3a0fe49dd..cdb0e40c8e91 100644
--- a/pkgs/by-name/ea/easyrsa/package.nix
+++ b/pkgs/by-name/ea/easyrsa/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "easy-rsa";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gNuVijMAHVKEHU0Z6INKUZt68qSg5ssxSaXOH/+MU1I=";
   };
 
diff --git a/pkgs/by-name/eb/ebusd/package.nix b/pkgs/by-name/eb/ebusd/package.nix
index d0549942bcc9..a003f64f06ad 100644
--- a/pkgs/by-name/eb/ebusd/package.nix
+++ b/pkgs/by-name/eb/ebusd/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "john30";
     repo = "ebusd";
-    rev = version;
+    tag = version;
     sha256 = "sha256-+3QOB7/yCgR4j2UGfhWQ5s5sldoNfWSzX7qa//FHeJ4=";
   };
 
diff --git a/pkgs/by-name/ec/ec2-metadata-mock/package.nix b/pkgs/by-name/ec/ec2-metadata-mock/package.nix
index d8a00b226135..b0986ca13ac1 100644
--- a/pkgs/by-name/ec/ec2-metadata-mock/package.nix
+++ b/pkgs/by-name/ec/ec2-metadata-mock/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-ec2-metadata-mock";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8X6LBGo496fG0Chhvg3jAaUF6mp8psCzHd+Es75z27Y=";
   };
 
diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix
index 147d3944581f..d71a6bf65a4e 100644
--- a/pkgs/by-name/ec/ecc/package.nix
+++ b/pkgs/by-name/ec/ecc/package.nix
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "eunomia-bpf";
     repo = "eunomia-bpf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KfYCC+TJbmjHrV46LoshD+uXcaBVMKk6+cN7TZKKYp4=";
   };
 
diff --git a/pkgs/by-name/ec/ecdsautils/package.nix b/pkgs/by-name/ec/ecdsautils/package.nix
index 6b7dec6e11e6..9aafd283e36b 100644
--- a/pkgs/by-name/ec/ecdsautils/package.nix
+++ b/pkgs/by-name/ec/ecdsautils/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = pkgs.fetchFromGitHub {
     owner = "freifunk-gluon";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vGHLAX/XOtePvdT/rljCOdlILHVO20mCt6p+MUi13dg=";
   };
 
diff --git a/pkgs/by-name/ec/eclint/package.nix b/pkgs/by-name/ec/eclint/package.nix
index 3928cb5ef5b9..5db7f350c351 100644
--- a/pkgs/by-name/ec/eclint/package.nix
+++ b/pkgs/by-name/ec/eclint/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "greut";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XY+D0bRIgWTm2VH+uDVodYeyGeu+8Xyyq4xDvTDLii4=";
   };
 
diff --git a/pkgs/by-name/ec/ecos/package.nix b/pkgs/by-name/ec/ecos/package.nix
index ed8104e73a59..952a5340be31 100644
--- a/pkgs/by-name/ec/ecos/package.nix
+++ b/pkgs/by-name/ec/ecos/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "embotech";
     repo = "ecos";
-    rev = version;
+    tag = version;
     sha256 = "1hsndim5kjvcwk5svqa4igawzahj982180xj1d7yd0dbjlgxc7w7";
   };
 
diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix
index b3096e533c7a..7b82b21ee9e5 100644
--- a/pkgs/by-name/ec/ecs-agent/package.nix
+++ b/pkgs/by-name/ec/ecs-agent/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "1.91.2";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "aws";
     repo = pname;
     hash = "sha256-7f1qJ9dgouhj+DGikdIzUREPraAA/1y/5lYA8fbIoJo=";
diff --git a/pkgs/by-name/ed/edge-runtime/package.nix b/pkgs/by-name/ed/edge-runtime/package.nix
index e6133bf1389e..3c4985e47b1e 100644
--- a/pkgs/by-name/ed/edge-runtime/package.nix
+++ b/pkgs/by-name/ed/edge-runtime/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "supabase";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-w0iSKHT6aIixKh1bHg1lOQNEw/emKK7R2iLzWjb2Pnk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ed/editline/package.nix b/pkgs/by-name/ed/editline/package.nix
index 7df7fe83936e..23e022338f40 100644
--- a/pkgs/by-name/ed/editline/package.nix
+++ b/pkgs/by-name/ed/editline/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "editline";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-0FeDUVCUahbweH24nfaZwa7j7lSfZh1TnQK7KYqO+3g=";
   };
 
diff --git a/pkgs/by-name/ed/editorconfig-checker/package.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix
index b9cda0e91a62..18d67de47875 100644
--- a/pkgs/by-name/ed/editorconfig-checker/package.nix
+++ b/pkgs/by-name/ed/editorconfig-checker/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "editorconfig-checker";
     repo = "editorconfig-checker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LoOuP98vRj/kzyWKKsXNPfE+9IELrKBtdSZvP7GtMew=";
   };
 
diff --git a/pkgs/by-name/ed/edwood/package.nix b/pkgs/by-name/ed/edwood/package.nix
index 04fc2084ffb1..f8c5914ed7d2 100644
--- a/pkgs/by-name/ed/edwood/package.nix
+++ b/pkgs/by-name/ed/edwood/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rjkroege";
     repo = "edwood";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jKDwNq/iMFqVpPq14kZa+T5fES54f4BAujXUwGlbiTE=";
   };
 
diff --git a/pkgs/by-name/ef/eff/package.nix b/pkgs/by-name/ef/eff/package.nix
index 95e041383fdf..5d5532c6461f 100644
--- a/pkgs/by-name/ef/eff/package.nix
+++ b/pkgs/by-name/ef/eff/package.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "matijapretnar";
     repo = "eff";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0U61y41CA0YaoNk9Hsj7j6eb2V6Ku3MAjW9lMEimiC0=";
   };
 
diff --git a/pkgs/by-name/ef/efficient-compression-tool/package.nix b/pkgs/by-name/ef/efficient-compression-tool/package.nix
index 7b01069437d9..48bc4b6e9d86 100644
--- a/pkgs/by-name/ef/efficient-compression-tool/package.nix
+++ b/pkgs/by-name/ef/efficient-compression-tool/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fhanau";
     repo = "Efficient-Compression-Tool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TSV5QXf6GuHAwQrde3Zo9MA1rtpAhtRg0UTzMkBnHB8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ef/effitask/package.nix b/pkgs/by-name/ef/effitask/package.nix
index 636e39c75117..73bb0f4db3fe 100644
--- a/pkgs/by-name/ef/effitask/package.nix
+++ b/pkgs/by-name/ef/effitask/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sanpii";
     repo = "effitask";
-    rev = version;
+    tag = version;
     sha256 = "sha256-6BA/TCCqVh5rtgGkUgk8nIqUzozipC5rrkbXMDWYpdQ=";
   };
 
diff --git a/pkgs/by-name/ef/efivar/package.nix b/pkgs/by-name/ef/efivar/package.nix
index 40a964bfc72c..c51f9d702729 100644
--- a/pkgs/by-name/ef/efivar/package.nix
+++ b/pkgs/by-name/ef/efivar/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rhboot";
     repo = "efivar";
-    rev = version;
+    tag = version;
     hash = "sha256-s/1k5a3n33iLmSpKQT5u08xoj8ypjf2Vzln88OBrqf0=";
   };
 
diff --git a/pkgs/by-name/ef/efm-langserver/package.nix b/pkgs/by-name/ef/efm-langserver/package.nix
index d87544198d27..93a3396b5315 100644
--- a/pkgs/by-name/ef/efm-langserver/package.nix
+++ b/pkgs/by-name/ef/efm-langserver/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "efm-langserver";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3ZrWc8/4aC5TOoL9vybkMZC9HkIL43TokebFcJYyrcI=";
   };
 
diff --git a/pkgs/by-name/ef/efmt/package.nix b/pkgs/by-name/ef/efmt/package.nix
index 4210168ee020..615ac8c3024c 100644
--- a/pkgs/by-name/ef/efmt/package.nix
+++ b/pkgs/by-name/ef/efmt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sile";
     repo = "efmt";
-    rev = version;
+    tag = version;
     hash = "sha256-l+DiOMUTEF6btsgkfgDtY45fH6GyqKBqHjuTfCF/ybA=";
   };
 
diff --git a/pkgs/by-name/eg/eg25-manager/package.nix b/pkgs/by-name/eg/eg25-manager/package.nix
index f76b07173fc9..405d9fa36161 100644
--- a/pkgs/by-name/eg/eg25-manager/package.nix
+++ b/pkgs/by-name/eg/eg25-manager/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "mobian1";
     repo = "eg25-manager";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Zna+JplmYrxPYsXToJ3vKOPzPMZYB3bEdfT8GIAHATs=";
   };
 
diff --git a/pkgs/by-name/eg/eget/package.nix b/pkgs/by-name/eg/eget/package.nix
index 401795ba0e4f..09dcf3557b56 100644
--- a/pkgs/by-name/eg/eget/package.nix
+++ b/pkgs/by-name/eg/eget/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zyedidia";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jhVUYyp6t5LleVotQQme07IJVdVnIOVFFtKEmzt8e2k=";
   };
 
diff --git a/pkgs/by-name/eg/egglog/package.nix b/pkgs/by-name/eg/egglog/package.nix
index 1a46064ac5bd..85d5df3d9abc 100644
--- a/pkgs/by-name/eg/egglog/package.nix
+++ b/pkgs/by-name/eg/egglog/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "egraphs-good";
     repo = "egglog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j+3qknmezKqHVxvfmG9oPFtWOzJsimGXYe5PWX694mI=";
   };
 
diff --git a/pkgs/by-name/eg/egl-wayland/package.nix b/pkgs/by-name/eg/egl-wayland/package.nix
index 2756fdc2ceb9..e9ca994cf333 100644
--- a/pkgs/by-name/eg/egl-wayland/package.nix
+++ b/pkgs/by-name/eg/egl-wayland/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nvidia";
     repo = "egl-wayland";
-    rev = version;
+    tag = version;
     hash = "sha256-Vu0XPcFKQJ+nypNMX1tw17whVWceZ0YlqvEEmEbTQaU=";
   };
 
diff --git a/pkgs/by-name/eg/eglexternalplatform/package.nix b/pkgs/by-name/eg/eglexternalplatform/package.nix
index d07a0c48a017..795d1b214336 100644
--- a/pkgs/by-name/eg/eglexternalplatform/package.nix
+++ b/pkgs/by-name/eg/eglexternalplatform/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nvidia";
     repo = "eglexternalplatform";
-    rev = version;
+    tag = version;
     hash = "sha256-tDKh1oSnOSG/XztHHYCwg1tDB7M6olOtJ8te+uan9ko=";
   };
 
diff --git a/pkgs/by-name/eg/ego/package.nix b/pkgs/by-name/eg/ego/package.nix
index f9fd2574c322..b61eb33ba71c 100644
--- a/pkgs/by-name/eg/ego/package.nix
+++ b/pkgs/by-name/eg/ego/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "intgr";
     repo = "ego";
-    rev = version;
+    tag = version;
     hash = "sha256-613RM7Ldye0wHAH3VMhzhyT5WVTybph3gS/WNMrsgGI=";
   };
 
diff --git a/pkgs/by-name/ei/eiciel/package.nix b/pkgs/by-name/ei/eiciel/package.nix
index 0866b0070c32..628cc2d79e2b 100644
--- a/pkgs/by-name/ei/eiciel/package.nix
+++ b/pkgs/by-name/ei/eiciel/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rofirrim";
     repo = "eiciel";
-    rev = version;
+    tag = version;
     sha256 = "sha256-gpuxx1Ts9HCO+3C+Z3k1tVA+1Mip8/Bd+FvWisVdsVY=";
   };
 
diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix
index 31582364cbeb..534a361dbd05 100644
--- a/pkgs/by-name/ei/eigenlayer/package.nix
+++ b/pkgs/by-name/ei/eigenlayer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Layr-Labs";
     repo = "eigenlayer-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5JOI1JBHiM9gPuBQv/7lWtfpAEdPLueVaSDnN8G4llA=";
   };
 
diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix
index 91c06efbb0d1..1846f50301e2 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/ej/ejs/package.nix b/pkgs/by-name/ej/ejs/package.nix
index 90934f9002ec..c53c8b21e6d8 100644
--- a/pkgs/by-name/ej/ejs/package.nix
+++ b/pkgs/by-name/ej/ejs/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "mde";
     repo = "ejs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3Rq+7oiYJlIY7sGPasx728sz2zj0ndAvKpHGsQX4tlc=";
   };
 
diff --git a/pkgs/by-name/ej/ejson/package.nix b/pkgs/by-name/ej/ejson/package.nix
index 90553d5aec95..4329ffdc202b 100644
--- a/pkgs/by-name/ej/ejson/package.nix
+++ b/pkgs/by-name/ej/ejson/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "ejson";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-s/VeBajNZI0XNs1PwWMpHAF0Wrh1/ZQUvUZBnUCoPBM=";
   };
 
diff --git a/pkgs/by-name/ej/ejson2env/package.nix b/pkgs/by-name/ej/ejson2env/package.nix
index 9e34d3ea335c..f806dd862c58 100644
--- a/pkgs/by-name/ej/ejson2env/package.nix
+++ b/pkgs/by-name/ej/ejson2env/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9i84nHIuAR7PG6/v8O5GEi6xToJk0c+knpVPOPx+1b8=";
   };
 
diff --git a/pkgs/by-name/ej/ejsonkms/package.nix b/pkgs/by-name/ej/ejsonkms/package.nix
index 5a2f549fc85d..9f128c1b1be7 100644
--- a/pkgs/by-name/ej/ejsonkms/package.nix
+++ b/pkgs/by-name/ej/ejsonkms/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "envato";
     repo = "ejsonkms";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kk/+EOZ1g6SiIajcKXf6lVnll/NRWgwbFO2j07HERBI=";
   };
 
diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index f0f14cadd358..13e40d0a29ab 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-USWeMzJ1k+sJx2p3FzFhbO48m61WUuCvp7Juwa9jtus=";
   };
 
diff --git a/pkgs/by-name/el/elan/package.nix b/pkgs/by-name/el/elan/package.nix
index db820df47826..8aa6434554a2 100644
--- a/pkgs/by-name/el/elan/package.nix
+++ b/pkgs/by-name/el/elan/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "leanprover";
     repo = "elan";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6/5yIIO0Avf6YpD7+7B30bnwtcPXi2k4RqWFO8hBaII=";
   };
 
diff --git a/pkgs/by-name/el/elektroid/package.nix b/pkgs/by-name/el/elektroid/package.nix
index cc4f8202ba04..da3bd78a405f 100644
--- a/pkgs/by-name/el/elektroid/package.nix
+++ b/pkgs/by-name/el/elektroid/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "dagargo";
     repo = "elektroid";
-    rev = version;
+    tag = version;
     hash = "sha256-YJcvJlnRUhwjQ6P3jgjyDtoJhuije1uY77mGNGZure0=";
   };
 
diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix
index a6548b041c25..32516b7558ae 100644
--- a/pkgs/by-name/el/element-desktop/keytar/default.nix
+++ b/pkgs/by-name/el/element-desktop/keytar/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shiftkey";
     repo = "node-keytar";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = pinData.srcHash;
   };
 
diff --git a/pkgs/by-name/el/element-desktop/seshat/default.nix b/pkgs/by-name/el/element-desktop/seshat/default.nix
index cafc33f1eaf8..00fdc97d3cf3 100644
--- a/pkgs/by-name/el/element-desktop/seshat/default.nix
+++ b/pkgs/by-name/el/element-desktop/seshat/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "seshat";
-    rev = version;
+    tag = version;
     hash = pinData.srcHash;
   };
 
diff --git a/pkgs/by-name/el/element/package.nix b/pkgs/by-name/el/element/package.nix
index 1645db9ce4ff..ea5e14d1b87d 100644
--- a/pkgs/by-name/el/element/package.nix
+++ b/pkgs/by-name/el/element/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-06RDZnie0Lv7i95AwnBGl6PPucuj8pIT6DHW3e3mu1o=";
   };
 
diff --git a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix
index d798058ac647..5555406204fc 100644
--- a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix
+++ b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "elementary-xfce";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ncPL76HCC9n4wTciGeqb+YAUcCE9EeOpWGM5DRYUCYg=";
   };
 
diff --git a/pkgs/by-name/el/elf-info/package.nix b/pkgs/by-name/el/elf-info/package.nix
index 776a386483f6..e67c66f670f9 100644
--- a/pkgs/by-name/el/elf-info/package.nix
+++ b/pkgs/by-name/el/elf-info/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kevin-lesenechal";
     repo = "elf-info";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wbFVuoarOoxV9FqmuHJ9eZlG4rRqy1rsnuqbGorC2Rk=";
   };
 
diff --git a/pkgs/by-name/el/elf2nucleus/package.nix b/pkgs/by-name/el/elf2nucleus/package.nix
index d7387ee55958..9b79da5a17e2 100644
--- a/pkgs/by-name/el/elf2nucleus/package.nix
+++ b/pkgs/by-name/el/elf2nucleus/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "elf2nucleus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FAIOtGfGow+0DrPPEBEfvaiinNZLQlGWKJ4DkMj63OA=";
   };
 
diff --git a/pkgs/by-name/el/elfcat/package.nix b/pkgs/by-name/el/elfcat/package.nix
index b0c5dc1265e4..0ce2a94190fd 100644
--- a/pkgs/by-name/el/elfcat/package.nix
+++ b/pkgs/by-name/el/elfcat/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ruslashev";
     repo = "elfcat";
-    rev = version;
+    tag = version;
     sha256 = "sha256-lmoOwxRGXcInoFb2YDawLKaebkcUftzpPZ1iTXbl++c=";
   };
 
diff --git a/pkgs/by-name/el/elfinfo/package.nix b/pkgs/by-name/el/elfinfo/package.nix
index 7f34cccaa11b..8d09b41b1b7f 100644
--- a/pkgs/by-name/el/elfinfo/package.nix
+++ b/pkgs/by-name/el/elfinfo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "elfinfo";
-    rev = version;
+    tag = version;
     sha256 = "sha256-HnjHOjanStqmDXnc6Z9w0beCMJFf/ndWbYxoDEaOws4=";
   };
 
diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix
index c5a1475eaaae..28232b9a74d2 100644
--- a/pkgs/by-name/el/ell/package.nix
+++ b/pkgs/by-name/el/ell/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
-    rev = version;
+    tag = version;
     hash = "sha256-nbfWjV0zPPx2kcnD/aRaWSXUGIqrUX7Z4U45ASk5Ric=";
   };
 
diff --git a/pkgs/by-name/el/elm-land/package.nix b/pkgs/by-name/el/elm-land/package.nix
index efd66003ec97..a98da2a2cc59 100644
--- a/pkgs/by-name/el/elm-land/package.nix
+++ b/pkgs/by-name/el/elm-land/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "elm-land";
     repo = "elm-land";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PFyiVTH2Cek377YZwaCmvDToQCaxWQvJrQkRhyNI2Wg=";
   };
 
diff --git a/pkgs/by-name/el/elogind/package.nix b/pkgs/by-name/el/elogind/package.nix
index ed9345d5fbf7..a906217d096e 100644
--- a/pkgs/by-name/el/elogind/package.nix
+++ b/pkgs/by-name/el/elogind/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elogind";
     repo = "elogind";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4KZr/NiiGVwzdDROhiX3GEQTUyIGva6ezb+xC2U3bkg=";
   };
 
diff --git a/pkgs/by-name/el/eludris/package.nix b/pkgs/by-name/el/eludris/package.nix
index f91938cb3ccd..57eacb3a1b9e 100644
--- a/pkgs/by-name/el/eludris/package.nix
+++ b/pkgs/by-name/el/eludris/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "eludris";
     repo = "eludris";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TVYgimkGUSITB3IaMlMd10PWomqyJRvONvJwiW85U4M=";
   };
 
diff --git a/pkgs/by-name/el/elvish/package.nix b/pkgs/by-name/el/elvish/package.nix
index b321018b3c31..b1506f715f1f 100644
--- a/pkgs/by-name/el/elvish/package.nix
+++ b/pkgs/by-name/el/elvish/package.nix
@@ -15,7 +15,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "elves";
     repo = "elvish";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+qkr0ziHWs3MVhBoqAxrwwbsQVvmGHRKrlqiujqBKvs=";
   };
 
diff --git a/pkgs/by-name/em/emacs-lsp-booster/package.nix b/pkgs/by-name/em/emacs-lsp-booster/package.nix
index f81a4fcfc8c2..635d9d7d212a 100644
--- a/pkgs/by-name/em/emacs-lsp-booster/package.nix
+++ b/pkgs/by-name/em/emacs-lsp-booster/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "blahgeek";
     repo = "emacs-lsp-booster";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uP/xJfXQtk8oaG5Zk+dw+C2fVFdjpUZTDASFuj1+eYs=";
   };
 
diff --git a/pkgs/by-name/em/emacspeak/package.nix b/pkgs/by-name/em/emacspeak/package.nix
index 6be5907fe188..0797b4722b71 100644
--- a/pkgs/by-name/em/emacspeak/package.nix
+++ b/pkgs/by-name/em/emacspeak/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tvraman";
     repo = "emacspeak";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-npS/wlqI7nBde/2S/rzp79jdfYXIIhgsVs5VizxEDAQ=";
   };
 
diff --git a/pkgs/by-name/em/emmet-ls/package.nix b/pkgs/by-name/em/emmet-ls/package.nix
index fa988b483e71..7cd04b10ee52 100644
--- a/pkgs/by-name/em/emmet-ls/package.nix
+++ b/pkgs/by-name/em/emmet-ls/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "aca";
     repo = "emmet-ls";
-    rev = version;
+    tag = version;
     hash = "sha256-TmsJpVLF9FZf/6uOM9LZBKC6S3bMPjA3QMiRMPaY9Dg=";
   };
 
diff --git a/pkgs/by-name/em/emoji-picker/package.nix b/pkgs/by-name/em/emoji-picker/package.nix
index 76a5c8edda73..42e21831ad06 100644
--- a/pkgs/by-name/em/emoji-picker/package.nix
+++ b/pkgs/by-name/em/emoji-picker/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bcongdon";
     repo = "ep";
-    rev = version;
+    tag = version;
     hash = "sha256-ElUsmuJ43kOsu4cGvNytM+xHTfuzMo0jcG8Z1cIeHJs=";
   };
 
diff --git a/pkgs/by-name/em/emojify/package.nix b/pkgs/by-name/em/emojify/package.nix
index f812a206920a..69045b04ff62 100644
--- a/pkgs/by-name/em/emojify/package.nix
+++ b/pkgs/by-name/em/emojify/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mrowa44";
     repo = "emojify";
-    rev = version;
+    tag = version;
     hash = "sha256-6cV+S8wTqJxPGsxiJ3hP6/CYPMWdF3qnz4ddL+F/oJU=";
   };
 
diff --git a/pkgs/by-name/em/emote/package.nix b/pkgs/by-name/em/emote/package.nix
index 1854bc1b1bcc..8ac75fc0d2f8 100644
--- a/pkgs/by-name/em/emote/package.nix
+++ b/pkgs/by-name/em/emote/package.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tom-james-watson";
     repo = "Emote";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-c5EY1Cc3oD8EG1oTChbl10jJlNeAETQbAFGoA9Lw5PY=";
   };
 
diff --git a/pkgs/by-name/em/emptty/package.nix b/pkgs/by-name/em/emptty/package.nix
index c87ea85fe6b2..6c935791bf82 100644
--- a/pkgs/by-name/em/emptty/package.nix
+++ b/pkgs/by-name/em/emptty/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tvrzna";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xZfR4sn20fDaTNAxuxVflpr+8AFg5Z7vesO7P8Jxw6A=";
   };
 
diff --git a/pkgs/by-name/em/emulsion-palette/package.nix b/pkgs/by-name/em/emulsion-palette/package.nix
index a55fde901ff6..d64840f53252 100644
--- a/pkgs/by-name/em/emulsion-palette/package.nix
+++ b/pkgs/by-name/em/emulsion-palette/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = "emulsion";
-    rev = version;
+    tag = version;
     sha256 = "sha256-xG7yZKbbNao/pzFhdTMof/lw9K12NKZi47YRaEd65ok=";
   };
 
diff --git a/pkgs/by-name/en/enc/package.nix b/pkgs/by-name/en/enc/package.nix
index eab08379eb98..9318f6bd8771 100644
--- a/pkgs/by-name/en/enc/package.nix
+++ b/pkgs/by-name/en/enc/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "life4";
     repo = "enc";
-    rev = version;
+    tag = version;
     hash = "sha256-6CUSJCE37R6nypqxTEs4tk/Eqg7+ZNGKPit38Zz3r84=";
   };
 
diff --git a/pkgs/by-name/en/enchive/package.nix b/pkgs/by-name/en/enchive/package.nix
index 51f7113b09dd..5bb683f2028a 100644
--- a/pkgs/by-name/en/enchive/package.nix
+++ b/pkgs/by-name/en/enchive/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skeeto";
     repo = "enchive";
-    rev = version;
+    tag = version;
     sha256 = "0fdrfc5l42lj2bvmv9dmkmhmm7qiszwk7cmdvnqad3fs7652g0qa";
   };
 
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/en/endgame-singularity/package.nix b/pkgs/by-name/en/endgame-singularity/package.nix
index 38b8a4fcab45..8c85558439c4 100644
--- a/pkgs/by-name/en/endgame-singularity/package.nix
+++ b/pkgs/by-name/en/endgame-singularity/package.nix
@@ -14,7 +14,7 @@ let
   main_src = fetchFromGitHub {
     owner = "singularity";
     repo = "singularity";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl";
   };
 
diff --git a/pkgs/by-name/en/endlessh-go/package.nix b/pkgs/by-name/en/endlessh-go/package.nix
index 59ef7f8b973d..2b1327fa113b 100644
--- a/pkgs/by-name/en/endlessh-go/package.nix
+++ b/pkgs/by-name/en/endlessh-go/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shizunge";
     repo = "endlessh-go";
-    rev = version;
+    tag = version;
     hash = "sha256-CLmlcuRb5dt1oPNdBfx0ql1Zmn/HahcmhVA0k50i6yA=";
   };
 
diff --git a/pkgs/by-name/en/endlessh/package.nix b/pkgs/by-name/en/endlessh/package.nix
index 6a95fe42d23b..78f9211031f7 100644
--- a/pkgs/by-name/en/endlessh/package.nix
+++ b/pkgs/by-name/en/endlessh/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skeeto";
     repo = "endlessh";
-    rev = version;
+    tag = version;
     hash = "sha256-yHQzDrjZycDL/2oSQCJjxbZQJ30FoixVG1dnFyTKPH4=";
   };
 
diff --git a/pkgs/by-name/en/endlines/package.nix b/pkgs/by-name/en/endlines/package.nix
index b03a0d733535..40985cd39267 100644
--- a/pkgs/by-name/en/endlines/package.nix
+++ b/pkgs/by-name/en/endlines/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mdolidon";
     repo = "endlines";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-M0IyY/WXR8qv9/qx5G0pG3EKqMoZAP3fJTZ6sSSMMyQ=";
   };
 
diff --git a/pkgs/by-name/en/enjarify/package.nix b/pkgs/by-name/en/enjarify/package.nix
index 743daf548346..a5fc914a5b7c 100644
--- a/pkgs/by-name/en/enjarify/package.nix
+++ b/pkgs/by-name/en/enjarify/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "enjarify";
-    rev = version;
+    tag = version;
     sha256 = "sha256-VDBC5n2jWLNJsilX+PV1smL5JeBDj23jYFRwdObXwYs=";
   };
 
diff --git a/pkgs/by-name/en/enkei/package.nix b/pkgs/by-name/en/enkei/package.nix
index c6a7fd761164..75728a1a8cec 100644
--- a/pkgs/by-name/en/enkei/package.nix
+++ b/pkgs/by-name/en/enkei/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fia0";
     repo = "enkei";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-COU2JtiJcPRA3Jno0qLEIVgimYBWfn5Pgc1OMImsJtI=";
   };
 
diff --git a/pkgs/by-name/en/ent-go/package.nix b/pkgs/by-name/en/ent-go/package.nix
index 91991af8ec2e..3c8d06593715 100644
--- a/pkgs/by-name/en/ent-go/package.nix
+++ b/pkgs/by-name/en/ent-go/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ent";
     repo = "ent";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rKGzYOdNaSbFyHIuytuppYjpiTz1/tcvXel1SjtwEhA=";
   };
 
diff --git a/pkgs/by-name/en/entropy/package.nix b/pkgs/by-name/en/entropy/package.nix
index 8d2315b565ad..0b8db154b5ab 100644
--- a/pkgs/by-name/en/entropy/package.nix
+++ b/pkgs/by-name/en/entropy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "EwenQuim";
     repo = "entropy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Wj+WSJ2dt4mE0yoMSYIQVNVklBxaTXwP2XND4+76VCI=";
   };
 
diff --git a/pkgs/by-name/en/entt/package.nix b/pkgs/by-name/en/entt/package.nix
index c871e15d0469..0c5270d8d89c 100644
--- a/pkgs/by-name/en/entt/package.nix
+++ b/pkgs/by-name/en/entt/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skypjack";
     repo = "entt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IPAM7fr/tvSOMKWUbXbloNAnlp5t7J0ynSsTMZ2jKYs=";
   };
 
diff --git a/pkgs/by-name/en/entwine/package.nix b/pkgs/by-name/en/entwine/package.nix
index 6331900b107c..2c092aeae8e0 100644
--- a/pkgs/by-name/en/entwine/package.nix
+++ b/pkgs/by-name/en/entwine/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "connormanning";
     repo = "entwine";
-    rev = version;
+    tag = version;
     sha256 = "sha256-1dy5NafKX0E4MwFIggnr7bQIeB1KvqnNaQQUUAs6Bq8=";
   };
 
diff --git a/pkgs/by-name/en/enum4linux/package.nix b/pkgs/by-name/en/enum4linux/package.nix
index 524bb58d436f..dcccd00b3921 100644
--- a/pkgs/by-name/en/enum4linux/package.nix
+++ b/pkgs/by-name/en/enum4linux/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CiscoCXSecurity";
     repo = "enum4linux";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/R0P4Ft9Y0LZwKwhDGAe36UKviih6CNbJbj1lcNKEkM=";
   };
 
diff --git a/pkgs/by-name/en/envconsul/package.nix b/pkgs/by-name/en/envconsul/package.nix
index a7144c07e7a1..17fed9b0c87d 100644
--- a/pkgs/by-name/en/envconsul/package.nix
+++ b/pkgs/by-name/en/envconsul/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "envconsul";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hPq+r4DOMu2elOpaT0xDQoelUb1D/zYM/a6fZZdu/AY=";
   };
 
diff --git a/pkgs/by-name/en/envfs/package.nix b/pkgs/by-name/en/envfs/package.nix
index 6dd4a3472547..486b0a2e4496 100644
--- a/pkgs/by-name/en/envfs/package.nix
+++ b/pkgs/by-name/en/envfs/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "envfs";
-    rev = version;
+    tag = version;
     hash = "sha256-kOfnKguvJQHW/AfQOetxVefjoEj7ec5ew6fumhOwP08=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix
index d54fb62c911c..be10fe499243 100644
--- a/pkgs/by-name/en/envio/package.nix
+++ b/pkgs/by-name/en/envio/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "envio-cli";
     repo = "envio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-je0DBoBIayFK//Aija5bnO/2z+hxNWgVkwOgxMyq5s4=";
   };
 
diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix
index 2c764b8d8076..604434715acb 100644
--- a/pkgs/by-name/en/envision-unwrapped/package.nix
+++ b/pkgs/by-name/en/envision-unwrapped/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "gabmus";
     repo = "envision";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-J1zctfFOyu+uLpctTiAe5OWBM7nXanzQocTGs1ToUMA=";
   };
 
diff --git a/pkgs/by-name/en/envsubst/package.nix b/pkgs/by-name/en/envsubst/package.nix
index d439da5e3437..e272c49614e1 100644
--- a/pkgs/by-name/en/envsubst/package.nix
+++ b/pkgs/by-name/en/envsubst/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "a8m";
     repo = "envsubst";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eByxrLf/F8Ih8v+0TunghF4m42TLPeRRFnqN3Ib6e14=";
   };
 
diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index 7155cda71398..3c3b708cb830 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -12,7 +12,7 @@ llvmPackages.stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Yyn0yWcOWb379rzaA+KW0KiLVg0nbIwJJQ8NhQAsuN8=";
   };
 
diff --git a/pkgs/by-name/ep/epeg/package.nix b/pkgs/by-name/ep/epeg/package.nix
index 6f02069ab731..8c74cc340c1d 100644
--- a/pkgs/by-name/ep/epeg/package.nix
+++ b/pkgs/by-name/ep/epeg/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mattes";
     repo = "epeg";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lttqarR8gScNIlSrc5uU3FLfvwxxJ2A1S4oESUW7oIw=";
   };
 
diff --git a/pkgs/by-name/ep/epgstation/package.nix b/pkgs/by-name/ep/epgstation/package.nix
index 5d71ece6e0cc..e4e3ca55e2d1 100644
--- a/pkgs/by-name/ep/epgstation/package.nix
+++ b/pkgs/by-name/ep/epgstation/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "l3tnun";
     repo = "EPGStation";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig=";
   };
 
diff --git a/pkgs/by-name/ep/ephemeral/package.nix b/pkgs/by-name/ep/ephemeral/package.nix
index 2d755b3ee371..d65d6eba23da 100644
--- a/pkgs/by-name/ep/ephemeral/package.nix
+++ b/pkgs/by-name/ep/ephemeral/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ephemeral";
-    rev = version;
+    tag = version;
     sha256 = "sha256-07HO8nC2Pwz2EAea4ZzmqyMfQdgX8FVqDepdA6j/NT8=";
   };
 
diff --git a/pkgs/by-name/ep/epilys-bb/package.nix b/pkgs/by-name/ep/epilys-bb/package.nix
index 3fb42e80a170..13eb1cf9d8bd 100644
--- a/pkgs/by-name/ep/epilys-bb/package.nix
+++ b/pkgs/by-name/ep/epilys-bb/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "epilys";
     repo = "bb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-szeEBiolg2rVD2XZoNrncUYnA8KPhWwhQPYsjuxp904=";
   };
 
diff --git a/pkgs/by-name/ep/epm/package.nix b/pkgs/by-name/ep/epm/package.nix
index 0d3e05c6c781..0f4246a473eb 100644
--- a/pkgs/by-name/ep/epm/package.nix
+++ b/pkgs/by-name/ep/epm/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jimjag";
     repo = "epm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o4B5lWBeve+U70FDgF1DrtNrXxaEY4etkPpwbqF7fmc=";
   };
 
diff --git a/pkgs/by-name/ep/epr/package.nix b/pkgs/by-name/ep/epr/package.nix
index 0cdda2e45535..a8b6937d85d8 100644
--- a/pkgs/by-name/ep/epr/package.nix
+++ b/pkgs/by-name/ep/epr/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "wustho";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1qsqYlqGlCRhl7HINrcTDt5bGlb7g5PmaERylT+UvEg=";
   };
 
diff --git a/pkgs/by-name/er/er-patcher/package.nix b/pkgs/by-name/er/er-patcher/package.nix
index e9d3c56a1c04..6d57794f84ab 100644
--- a/pkgs/by-name/er/er-patcher/package.nix
+++ b/pkgs/by-name/er/er-patcher/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gurrgur";
     repo = "er-patcher";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-D+XYZI3kmK5sb+i8RxtODTvbTgzhpDzwB/JM61ddcTA=";
   };
 
diff --git a/pkgs/by-name/er/erdtree/package.nix b/pkgs/by-name/er/erdtree/package.nix
index 685ebdad70e9..6b4f5d600fee 100644
--- a/pkgs/by-name/er/erdtree/package.nix
+++ b/pkgs/by-name/er/erdtree/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "solidiquis";
     repo = "erdtree";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rm3j1exvdlJtMXgFeRmzr3YU/sLpQFL3PCa8kLVlinM=";
   };
 
diff --git a/pkgs/by-name/er/eresi/package.nix b/pkgs/by-name/er/eresi/package.nix
index 817cd76ef664..0cb76a2e79b4 100644
--- a/pkgs/by-name/er/eresi/package.nix
+++ b/pkgs/by-name/er/eresi/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thorkill";
     repo = "eresi";
-    rev = version;
+    tag = version;
     sha256 = "0a5a7mh2zw9lcdrl8n1mqccrc0xcgj7743l7l4kslkh722fxv625";
   };
 
diff --git a/pkgs/by-name/er/erg/package.nix b/pkgs/by-name/er/erg/package.nix
index 0c3b0e3836d3..37ae53e67612 100644
--- a/pkgs/by-name/er/erg/package.nix
+++ b/pkgs/by-name/er/erg/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "erg-lang";
     repo = "erg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P59PUdwSGZHiQltyMhL683pt8mM96cDko9zfaep9lYU=";
   };
 
diff --git a/pkgs/by-name/er/ergochat/package.nix b/pkgs/by-name/er/ergochat/package.nix
index 3a0de73fdf32..51c24f215449 100644
--- a/pkgs/by-name/er/ergochat/package.nix
+++ b/pkgs/by-name/er/ergochat/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ergochat";
     repo = "ergo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8qZ5pnbCYN/j8B5cS456HVK2hDGqJwrPo1k4oagJrqU=";
   };
 
diff --git a/pkgs/by-name/er/ericw-tools/package.nix b/pkgs/by-name/er/ericw-tools/package.nix
index dba4b02f9de7..d4b5e82f1c88 100644
--- a/pkgs/by-name/er/ericw-tools/package.nix
+++ b/pkgs/by-name/er/ericw-tools/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ericwa";
     repo = "ericw-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "11sap7qv0rlhw8q25azvhgjcwiql3zam09q0gim3i04cg6fkh0vp";
   };
   postUnpack = ''
diff --git a/pkgs/by-name/er/erigon/package.nix b/pkgs/by-name/er/erigon/package.nix
index afc0879a9631..7f8ab5a5caf3 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 = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-63wh9D5D9qzABEvKCBxBRHYuGBnlX+hrme56STkyoQU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/er/eris-go/package.nix b/pkgs/by-name/er/eris-go/package.nix
index 10c1444b79ae..7c4d369af8fb 100644
--- a/pkgs/by-name/er/eris-go/package.nix
+++ b/pkgs/by-name/er/eris-go/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
     domain = "codeberg.org";
     owner = "eris";
     repo = "eris-go";
-    rev = version;
+    tag = version;
     hash = "sha256-v4pN+fVwYoir3GLneWhg/azsg7ifvcKAksoqDkkQGwk=";
   };
 
diff --git a/pkgs/by-name/er/errbot/package.nix b/pkgs/by-name/er/errbot/package.nix
index 8ff4c4cf431a..0f24494ba3a4 100644
--- a/pkgs/by-name/er/errbot/package.nix
+++ b/pkgs/by-name/er/errbot/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "errbotio";
     repo = "errbot";
-    rev = version;
+    tag = version;
     hash = "sha256-UdqzBrlcb9NkuVo8ChADJmaKevadoGLyZUrckStb5ko=";
   };
 
diff --git a/pkgs/by-name/er/errcheck/package.nix b/pkgs/by-name/er/errcheck/package.nix
index fd0a880cce74..005665607a27 100644
--- a/pkgs/by-name/er/errcheck/package.nix
+++ b/pkgs/by-name/er/errcheck/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kisielk";
     repo = "errcheck";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DhOoJL4InJHl4ImIrhV086a++srC5E4LF2VQb838+L8=";
   };
 
diff --git a/pkgs/by-name/es/esbuild-config/package.nix b/pkgs/by-name/es/esbuild-config/package.nix
index 2edcf890a7af..2fd26d4aa08d 100644
--- a/pkgs/by-name/es/esbuild-config/package.nix
+++ b/pkgs/by-name/es/esbuild-config/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bpierre";
     repo = "esbuild-config";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-u3LgecKfgPSN5xMyqBjeAn4/XswM3iEGbZ+JGrVF1Co=";
   };
 
diff --git a/pkgs/by-name/es/escambo/package.nix b/pkgs/by-name/es/escambo/package.nix
index 24341716dd78..f45dd11d58fb 100644
--- a/pkgs/by-name/es/escambo/package.nix
+++ b/pkgs/by-name/es/escambo/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CleoMenezesJr";
     repo = "escambo";
-    rev = version;
+    tag = version;
     hash = "sha256-jMlix8nlCaVLZEhqzb6LRNrD3DUZMTIjqrRKo6nFbQA=";
   };
 
diff --git a/pkgs/by-name/es/esdm/package.nix b/pkgs/by-name/es/esdm/package.nix
index 176bdf1a07fc..f1b8cc91137a 100644
--- a/pkgs/by-name/es/esdm/package.nix
+++ b/pkgs/by-name/es/esdm/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "esdm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5XctrI02pfCgK1P76AaSkMjiQqav6LX3SMjKr4F44sw=";
   };
 
diff --git a/pkgs/by-name/es/esh/package.nix b/pkgs/by-name/es/esh/package.nix
index 1dbd3ea54e27..9358a40b0643 100644
--- a/pkgs/by-name/es/esh/package.nix
+++ b/pkgs/by-name/es/esh/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jirutka";
     repo = "esh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ddaji5nplf1dyvgkrhqjy8m5djaycqcfhjv30yprj1avjymlj6w";
   };
 
diff --git a/pkgs/by-name/es/eslint_d/package.nix b/pkgs/by-name/es/eslint_d/package.nix
index 58d8f25d491a..50f48a1b46d8 100644
--- a/pkgs/by-name/es/eslint_d/package.nix
+++ b/pkgs/by-name/es/eslint_d/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mantoni";
     repo = "eslint_d.js";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Mu3dSgRIC2L9IImKixJfaUsltlajY0cYdXOSikNQuPo=";
   };
 
diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix
index b335ff256c18..26ae2ffb0a40 100644
--- a/pkgs/by-name/es/esp-generate/package.nix
+++ b/pkgs/by-name/es/esp-generate/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "esp-generate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yk7iv5nq2b/1OY77818I7mXW96YxjwwJS3iiv1KXVHs=";
   };
 
diff --git a/pkgs/by-name/es/espeakup/package.nix b/pkgs/by-name/es/espeakup/package.nix
index cf440d4b6d80..8c1e0258ca00 100644
--- a/pkgs/by-name/es/espeakup/package.nix
+++ b/pkgs/by-name/es/espeakup/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-speakup";
     repo = "espeakup";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Qjdg1kParsnpb8Lv51wXLdrLufxtbBTsP8B3t53islI=";
   };
 
diff --git a/pkgs/by-name/es/espresso/package.nix b/pkgs/by-name/es/espresso/package.nix
index 9e44a32cf0de..480825a07110 100644
--- a/pkgs/by-name/es/espresso/package.nix
+++ b/pkgs/by-name/es/espresso/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chipsalliance";
     repo = "espresso";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-z5By57VbmIt4sgRgvECnLbZklnDDWUA6fyvWVyXUzsI=";
   };
 
diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix
index cc0916d2f808..596ab5074921 100644
--- a/pkgs/by-name/es/espup/package.nix
+++ b/pkgs/by-name/es/espup/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espup";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sPWGpQi9JrkdaPV2jvwaY9zjb8urK+ibhvxw/CC2UOQ=";
   };
 
diff --git a/pkgs/by-name/et/et/package.nix b/pkgs/by-name/et/et/package.nix
index cc73253dd6ea..9510624fcd00 100644
--- a/pkgs/by-name/et/et/package.nix
+++ b/pkgs/by-name/et/et/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oxzi";
     repo = "et";
-    rev = version;
+    tag = version;
     sha256 = "0i0lgmnly8n7y4y6pb10pxgxyz8s5zk26k8z1g1578v1wan01lnq";
   };
 
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/et/ethash/package.nix b/pkgs/by-name/et/ethash/package.nix
index d3338399f103..bb9d22eb4287 100644
--- a/pkgs/by-name/et/ethash/package.nix
+++ b/pkgs/by-name/et/ethash/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chfast";
     repo = "ethash";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sLa+lXC+UvqFEoC/ZfoRlotkNhUaqhLtDKHtbH2xa/k=";
   };
 
diff --git a/pkgs/by-name/et/etherguard/package.nix b/pkgs/by-name/et/etherguard/package.nix
index fc0d0d3b8dc1..320e0c3a3139 100644
--- a/pkgs/by-name/et/etherguard/package.nix
+++ b/pkgs/by-name/et/etherguard/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "KusakabeShi";
     repo = "EtherGuard-VPN";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-67ocXHf+AN3nyPt4636ZJHGRqWSjkpTiDvU5243urBw=";
   };
 
diff --git a/pkgs/by-name/et/ets/package.nix b/pkgs/by-name/et/ets/package.nix
index 66ed5045dd61..05f8c274f330 100644
--- a/pkgs/by-name/et/ets/package.nix
+++ b/pkgs/by-name/et/ets/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gdubicki";
     repo = "ets";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LnNd4rAMJliWKbL4uVl11BAa9FPUcLwVSWnFe1vEk7g=";
   };
 
diff --git a/pkgs/by-name/et/ettercap/package.nix b/pkgs/by-name/et/ettercap/package.nix
index 29d558b35896..40ac2a5760bf 100644
--- a/pkgs/by-name/et/ettercap/package.nix
+++ b/pkgs/by-name/et/ettercap/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ettercap";
     repo = "ettercap";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1sdf1ssa81ib6k0mc5m2jzbjl4jd1yv6ahv5dwx2x9w4b2pyqg1c";
   };
 
diff --git a/pkgs/by-name/ev/evans/package.nix b/pkgs/by-name/ev/evans/package.nix
index 8deac905eff6..1133e061fb7d 100644
--- a/pkgs/by-name/ev/evans/package.nix
+++ b/pkgs/by-name/ev/evans/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ktr0731";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-V5M7vXlBSQFX2YZ+Vjt63hLziWy0yuAbCMmSZFEO0OA=";
   };
 
diff --git a/pkgs/by-name/ev/evebox/package.nix b/pkgs/by-name/ev/evebox/package.nix
index 1e01e425b73e..4a296b18b563 100644
--- a/pkgs/by-name/ev/evebox/package.nix
+++ b/pkgs/by-name/ev/evebox/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jasonish";
     repo = "evebox";
-    rev = version;
+    tag = version;
     hash = "sha256-vakCBDyL/Su55tkn/SJ5ShZcYC8l+p2acpve/fTN0uI=";
   };
 
diff --git a/pkgs/by-name/ev/evscript/package.nix b/pkgs/by-name/ev/evscript/package.nix
index 0043bb0eb3c4..8306df43e517 100644
--- a/pkgs/by-name/ev/evscript/package.nix
+++ b/pkgs/by-name/ev/evscript/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "valpackett";
     repo = "evscript";
-    rev = version;
+    tag = version;
     hash = "sha256-lCXDDLovUb5aSOPTyVJL25v1JT1BGrrUlUR0Mu0XX4Q=";
   };
 
diff --git a/pkgs/by-name/ev/evsieve/package.nix b/pkgs/by-name/ev/evsieve/package.nix
index ca2324cbfc7a..6d2b91f42a2a 100644
--- a/pkgs/by-name/ev/evsieve/package.nix
+++ b/pkgs/by-name/ev/evsieve/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "KarsMulder";
     repo = "evsieve";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UV5m8DmFtkCU/DoBJNBCdvhU/jYtU5+WnnhKwxZNl9g=";
   };
 
diff --git a/pkgs/by-name/ex/exaile/package.nix b/pkgs/by-name/ex/exaile/package.nix
index 8668a70dbed3..327199ea4793 100644
--- a/pkgs/by-name/ex/exaile/package.nix
+++ b/pkgs/by-name/ex/exaile/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exaile";
     repo = "exaile";
-    rev = version;
+    tag = version;
     sha256 = "sha256-9SK0nvGdz2j6qp1JTmSuLezxX/kB93CZReSfAnfKZzg=";
   };
 
diff --git a/pkgs/by-name/ex/exfat/package.nix b/pkgs/by-name/ex/exfat/package.nix
index 3d7d66648a40..70ab6db3c3b4 100644
--- a/pkgs/by-name/ex/exfat/package.nix
+++ b/pkgs/by-name/ex/exfat/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "relan";
     repo = "exfat";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5m8fiItEOO6piR132Gxq6SHOPN1rAFTuTVE+UI0V00k=";
   };
 
diff --git a/pkgs/by-name/ex/exfatprogs/package.nix b/pkgs/by-name/ex/exfatprogs/package.nix
index c0c14768eeac..4ff3b8bb62e7 100644
--- a/pkgs/by-name/ex/exfatprogs/package.nix
+++ b/pkgs/by-name/ex/exfatprogs/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exfatprogs";
     repo = "exfatprogs";
-    rev = version;
+    tag = version;
     sha256 = "sha256-lPPUjSc6ti/CqSChWrsBLWCtASN95Cnj+O6FbVvFeDA=";
   };
 
diff --git a/pkgs/by-name/ex/exhaustive/package.nix b/pkgs/by-name/ex/exhaustive/package.nix
index d322c54b1f8e..c4ebe1923fad 100644
--- a/pkgs/by-name/ex/exhaustive/package.nix
+++ b/pkgs/by-name/ex/exhaustive/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nishanths";
     repo = "exhaustive";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OLIdtKzCqnBkzdUSIl+UlENeMl3zrBE47pLWPg+6qXw=";
   };
 
diff --git a/pkgs/by-name/ex/exhibit/package.nix b/pkgs/by-name/ex/exhibit/package.nix
index 73fe81102632..757500740ec1 100644
--- a/pkgs/by-name/ex/exhibit/package.nix
+++ b/pkgs/by-name/ex/exhibit/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Nokse22";
     repo = "Exhibit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yNS6q7XbWda2+so9QRS/c4uYaVPo7b4JCite5nzc3Eo=";
   };
 
diff --git a/pkgs/by-name/ex/exiflooter/package.nix b/pkgs/by-name/ex/exiflooter/package.nix
index 68eb8d9cab4f..3ad0aec78074 100644
--- a/pkgs/by-name/ex/exiflooter/package.nix
+++ b/pkgs/by-name/ex/exiflooter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aydinnyunus";
     repo = "exiflooter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E7fxV+w8N9xi8UuaKBTZBzPjIHJt9/U+oVIu2+Ond+Y=";
   };
 
diff --git a/pkgs/by-name/ex/exiv2/package.nix b/pkgs/by-name/ex/exiv2/package.nix
index f86a8cacab9d..9183340f0363 100644
--- a/pkgs/by-name/ex/exiv2/package.nix
+++ b/pkgs/by-name/ex/exiv2/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exiv2";
     repo = "exiv2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+Fe0+wkWWtM3MNgY6qp34/kC8jkOjOLusnd9WquYpA8=";
   };
 
diff --git a/pkgs/by-name/ex/exoscale-cli/package.nix b/pkgs/by-name/ex/exoscale-cli/package.nix
index f5370d1d1ab9..c670e01f3fda 100644
--- a/pkgs/by-name/ex/exoscale-cli/package.nix
+++ b/pkgs/by-name/ex/exoscale-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "exoscale";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PO6LIp5eortBEygdIRf2LpPJalSEMGosW8KtqBV/MlM=";
   };
 
diff --git a/pkgs/by-name/ex/expected-lite/package.nix b/pkgs/by-name/ex/expected-lite/package.nix
index 80e94ff8815d..821dad4397a8 100644
--- a/pkgs/by-name/ex/expected-lite/package.nix
+++ b/pkgs/by-name/ex/expected-lite/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martinmoene";
     repo = "expected-lite";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8Lf+R7wC7f2YliXqhR6pwVVSLZ6qheu7YOV5jHc0Cjc=";
   };
 
diff --git a/pkgs/by-name/ex/expenses/package.nix b/pkgs/by-name/ex/expenses/package.nix
index a2a71735ed03..a59d71775f5b 100644
--- a/pkgs/by-name/ex/expenses/package.nix
+++ b/pkgs/by-name/ex/expenses/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "manojkarthick";
     repo = "expenses";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sqsogF2swMvYZL7Kj+ealrB1AAgIe7ZXXDLRdHL6Q+0=";
   };
 
diff --git a/pkgs/by-name/ex/exportarr/package.nix b/pkgs/by-name/ex/exportarr/package.nix
index 329fa3b7aa90..e5027a392383 100644
--- a/pkgs/by-name/ex/exportarr/package.nix
+++ b/pkgs/by-name/ex/exportarr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "onedr0p";
     repo = "exportarr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iNcdD2zigBZ2phtCkHRV0GZPrEjopV0K+vin1Zkb3Oo=";
   };
 
diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix
index e39d8754bdfc..7f6ea93dd41a 100644
--- a/pkgs/by-name/ex/expr/package.nix
+++ b/pkgs/by-name/ex/expr/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "expr-lang";
     repo = "expr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-teP/14czczNiz0kxoLNmZQg/AvcDuB8K4jdQpJf5JLQ=";
   };
 
diff --git a/pkgs/by-name/ex/exprtk/package.nix b/pkgs/by-name/ex/exprtk/package.nix
index 814caaed2566..b943d12fea64 100644
--- a/pkgs/by-name/ex/exprtk/package.nix
+++ b/pkgs/by-name/ex/exprtk/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ArashPartow";
     repo = "exprtk";
-    rev = version;
+    tag = version;
     hash = "sha256-A4UzNYZZGgTJOw9G4Jg1wJZhxguFRohNEcwmwUOAX18=";
   };
 
diff --git a/pkgs/by-name/ex/extest/package.nix b/pkgs/by-name/ex/extest/package.nix
index 229cd97a66e3..f8e832778306 100644
--- a/pkgs/by-name/ex/extest/package.nix
+++ b/pkgs/by-name/ex/extest/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Supreeeme";
     repo = "extest";
-    rev = version;
+    tag = version;
     hash = "sha256-qdTF4n3uhkl3WFT+7bAlwCjxBx3ggTN6i3WzFg+8Jrw=";
   };
 
diff --git a/pkgs/by-name/ex/extra-container/package.nix b/pkgs/by-name/ex/extra-container/package.nix
index b38cd67ee42c..fe3f0a4415df 100644
--- a/pkgs/by-name/ex/extra-container/package.nix
+++ b/pkgs/by-name/ex/extra-container/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "erikarvstedt";
     repo = "extra-container";
-    rev = version;
+    tag = version;
     hash = "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU=";
   };
 
diff --git a/pkgs/by-name/ex/extrace/package.nix b/pkgs/by-name/ex/extrace/package.nix
index 6d2491acfa85..73ccc92fa13c 100644
--- a/pkgs/by-name/ex/extrace/package.nix
+++ b/pkgs/by-name/ex/extrace/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "extrace";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Jy/Ac3NcqBkW0kHyypMAVUGAQ41qWM96BbLAym06ogM=";
   };
 
diff --git a/pkgs/by-name/ex/extract_url/package.nix b/pkgs/by-name/ex/extract_url/package.nix
index b7b8e4824f75..0c1cb6b23325 100644
--- a/pkgs/by-name/ex/extract_url/package.nix
+++ b/pkgs/by-name/ex/extract_url/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "m3m0ryh0l3";
     repo = "extracturl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "05589lp15jmcpbj4y9a3hmf6n2gsqrm4ybcyh3hd4j6pc7hmnhny";
   };
 
diff --git a/pkgs/by-name/ex/extractpdfmark/package.nix b/pkgs/by-name/ex/extractpdfmark/package.nix
index 8594820134f3..52385682d835 100644
--- a/pkgs/by-name/ex/extractpdfmark/package.nix
+++ b/pkgs/by-name/ex/extractpdfmark/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trueroad";
     repo = "extractpdfmark";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pNc/SWAtQWMbB2+lIQkJdBYSZ97iJXK71mS59qQa7Hs=";
   };
 
diff --git a/pkgs/by-name/ex/extrude/package.nix b/pkgs/by-name/ex/extrude/package.nix
index 469678b7ec55..3a2a889d7c2d 100644
--- a/pkgs/by-name/ex/extrude/package.nix
+++ b/pkgs/by-name/ex/extrude/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7gCEBhnNU5CqC5n0KP4Dd/fmddPRwNqyMFXTrRrJjfU=";
   };
 
diff --git a/pkgs/by-name/ey/eyedropper/package.nix b/pkgs/by-name/ey/eyedropper/package.nix
index 65c800acdf51..d4eddfb82975 100644
--- a/pkgs/by-name/ey/eyedropper/package.nix
+++ b/pkgs/by-name/ey/eyedropper/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FineFindus";
     repo = "eyedropper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FyGj0180Wn8iIDTdDqnNEvFYegwdWCsCq+hmyTTUIo4=";
   };
 
diff --git a/pkgs/by-name/ey/eyewitness/package.nix b/pkgs/by-name/ey/eyewitness/package.nix
index 1daaa89dc0c6..d5eb4221418f 100644
--- a/pkgs/by-name/ey/eyewitness/package.nix
+++ b/pkgs/by-name/ey/eyewitness/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "redsiege";
     repo = "EyeWitness";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nSPpPbwqagc5EadQ4AHgLhjQ0kDjmbdcwE/PL5FDL4I=";
   };
 
diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix
index 8e09f58bf632..7170bfd1d0d1 100644
--- a/pkgs/by-name/ez/ezquake/package.nix
+++ b/pkgs/by-name/ez/ezquake/package.nix
@@ -25,7 +25,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/f1/f1viewer/package.nix b/pkgs/by-name/f1/f1viewer/package.nix
index 363d914548ef..fa5e5b0873ba 100644
--- a/pkgs/by-name/f1/f1viewer/package.nix
+++ b/pkgs/by-name/f1/f1viewer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SoMuchForSubtlety";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jXC2dENXuqicNQqTHyZKsjibDvjta/npQmf3+uivjX0=";
   };
 
diff --git a/pkgs/by-name/f2/f2/package.nix b/pkgs/by-name/f2/f2/package.nix
index 8980fa1f554e..28383e316a90 100644
--- a/pkgs/by-name/f2/f2/package.nix
+++ b/pkgs/by-name/f2/f2/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ayoisaiah";
     repo = "f2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-AjuWaSEP2X3URZBPD05laV32ms/pULooSQKXUz8sqsU=";
   };
 
diff --git a/pkgs/by-name/f3/f3/package.nix b/pkgs/by-name/f3/f3/package.nix
index 5526cedf27e6..4a56146ea24d 100644
--- a/pkgs/by-name/f3/f3/package.nix
+++ b/pkgs/by-name/f3/f3/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AltraMayor";
     repo = "f3";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZajlFGXJcYUVe/wUFfdPYVW8stOo1Aqe8uD2Bm9KIk0=";
   };
 
diff --git a/pkgs/by-name/fa/faad2/package.nix b/pkgs/by-name/fa/faad2/package.nix
index d4fa16c7f68c..6ab41f536afc 100644
--- a/pkgs/by-name/fa/faad2/package.nix
+++ b/pkgs/by-name/fa/faad2/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "knik0";
     repo = "faad2";
-    rev = version;
+    tag = version;
     hash = "sha256-JvmblrmE3doUMUwObBN2b+Ej+CDBWNemBsyYSCXGwo8=";
   };
 
diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix
index 990fe98ba67c..3347015141ad 100644
--- a/pkgs/by-name/fa/faas-cli/package.nix
+++ b/pkgs/by-name/fa/faas-cli/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openfaas";
     repo = "faas-cli";
-    rev = version;
+    tag = version;
     sha256 = "sha256-pCzYfsL4ZQOyxEpg//Edh+dengXkx6G+OWMNPfIPM+o=";
   };
 
diff --git a/pkgs/by-name/fa/faba-icon-theme/package.nix b/pkgs/by-name/fa/faba-icon-theme/package.nix
index e110514e72f9..81f757ce658c 100644
--- a/pkgs/by-name/fa/faba-icon-theme/package.nix
+++ b/pkgs/by-name/fa/faba-icon-theme/package.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moka-project";
     repo = "faba-icon-theme";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";
   };
 
diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index 02a3c2b0b8b9..b8986eff2e40 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wFVb2IdYB1T7wozQcjxLE7uVRsIFkPL5rS/8V0LnRcg=";
   };
 
diff --git a/pkgs/by-name/fa/fabs/package.nix b/pkgs/by-name/fa/fabs/package.nix
index 69bcd4c13797..2cdf6639534e 100644
--- a/pkgs/by-name/fa/fabs/package.nix
+++ b/pkgs/by-name/fa/fabs/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "openafs-contrib";
     repo = "fabs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ejAcCwrOWGX0zsMw224f9GTWlozNYC0gU6LdTk0XqH0=";
   };
 
diff --git a/pkgs/by-name/fa/facedetect/package.nix b/pkgs/by-name/fa/facedetect/package.nix
index ecb532bb710f..2653ffff7542 100644
--- a/pkgs/by-name/fa/facedetect/package.nix
+++ b/pkgs/by-name/fa/facedetect/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wavexx";
     repo = "facedetect";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0mddh71cjbsngpvjli406ndi2x613y39ydgb8bi4z1jp063865sd";
   };
 
diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix
index 720ff17dac1a..b37b98df35ea 100644
--- a/pkgs/by-name/fa/fail2ban/package.nix
+++ b/pkgs/by-name/fa/fail2ban/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fail2ban";
     repo = "fail2ban";
-    rev = version;
+    tag = version;
     hash = "sha256-0xPNhbu6/p/cbHOr5Y+PXbMbt5q/S13S5100ZZSdylE=";
   };
 
diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix
index b8217680fd93..363026114afc 100644
--- a/pkgs/by-name/fa/faircamp/package.nix
+++ b/pkgs/by-name/fa/faircamp/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "simonrepp";
     repo = "faircamp";
-    rev = version;
+    tag = version;
     hash = "sha256-InBPQk8dIwsCfvo24/0ggK/tipHaC0owPbZtrrIT/FY=";
   };
 
diff --git a/pkgs/by-name/fa/fakechroot/package.nix b/pkgs/by-name/fa/fakechroot/package.nix
index d73c6355dd61..ec9febb51df0 100644
--- a/pkgs/by-name/fa/fakechroot/package.nix
+++ b/pkgs/by-name/fa/fakechroot/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dex4er";
     repo = "fakechroot";
-    rev = version;
+    tag = version;
     sha256 = "0xgnwazrmrg4gm30xjxdn6sx3lhqvxahrh6gmy3yfswxc30pmg86";
   };
 
diff --git a/pkgs/by-name/fa/falcoctl/package.nix b/pkgs/by-name/fa/falcoctl/package.nix
index 0734f0a91b6b..12144dd9c2c2 100644
--- a/pkgs/by-name/fa/falcoctl/package.nix
+++ b/pkgs/by-name/fa/falcoctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "falcosecurity";
     repo = "falcoctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-X4fZBTEbOIQbfmuxDODEkYW43ntVIkwFDULYq+ps+9s=";
   };
 
diff --git a/pkgs/by-name/fa/fan2go/package.nix b/pkgs/by-name/fa/fan2go/package.nix
index 579b516b06b0..1d28eeeca9c4 100644
--- a/pkgs/by-name/fa/fan2go/package.nix
+++ b/pkgs/by-name/fa/fan2go/package.nix
@@ -12,7 +12,7 @@ buildGo123Module rec {
   src = fetchFromGitHub {
     owner = "markusressel";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-eSHeHBzDvzsDAck0zexwR8drasisvlQNTeowv92E2uc=";
   };
 
diff --git a/pkgs/by-name/fa/fanbox-dl/package.nix b/pkgs/by-name/fa/fanbox-dl/package.nix
index d3d0e7050960..6e1af3fadcdc 100644
--- a/pkgs/by-name/fa/fanbox-dl/package.nix
+++ b/pkgs/by-name/fa/fanbox-dl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hareku";
     repo = "fanbox-dl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-el9+pusnqui7G+x05lJsLjnZ4OymvBVSCa7ReJTgqLw=";
   };
 
diff --git a/pkgs/by-name/fa/fanctl/package.nix b/pkgs/by-name/fa/fanctl/package.nix
index eafe3ec82a4d..e0e9c5398c8b 100644
--- a/pkgs/by-name/fa/fanctl/package.nix
+++ b/pkgs/by-name/fa/fanctl/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "mcoffin";
     repo = "fanctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw=";
   };
 
diff --git a/pkgs/by-name/fa/faraday/package.nix b/pkgs/by-name/fa/faraday/package.nix
index 3aa54ddbcd2e..c2ce1b7e50f3 100644
--- a/pkgs/by-name/fa/faraday/package.nix
+++ b/pkgs/by-name/fa/faraday/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "faraday";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KiGj24sBeClmzW60lRrvXwgXf3My7jhHTY+VhIMMp0k=";
   };
 
diff --git a/pkgs/by-name/fa/fasole/package.nix b/pkgs/by-name/fa/fasole/package.nix
index 48c59b4c667f..653351a5279a 100644
--- a/pkgs/by-name/fa/fasole/package.nix
+++ b/pkgs/by-name/fa/fasole/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ProggerX";
     repo = "fasole";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qcCJgz/YXfd8+9ST1U4YFxLLd25D8HrfZzsDGpKgCdM=";
   };
 
diff --git a/pkgs/by-name/fa/fastd/package.nix b/pkgs/by-name/fa/fastd/package.nix
index bb883d23549e..ae0c3dd05532 100644
--- a/pkgs/by-name/fa/fastd/package.nix
+++ b/pkgs/by-name/fa/fastd/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "neocturne";
     repo = "fastd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Sz6VEjKziL/w2a4VWFfMPDYvm7UZh5A/NmzP10rJ2r8=";
   };
 
diff --git a/pkgs/by-name/fa/fastddsgen/package.nix b/pkgs/by-name/fa/fastddsgen/package.nix
index 3ac2a2b050ec..cbf8a10d5dce 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-5M1N0f1kVaIC5dkLb5ft0Da8CqzVRQlyr1otQdMvtow=";
   };
diff --git a/pkgs/by-name/fa/fastp/package.nix b/pkgs/by-name/fa/fastp/package.nix
index 89ae4a59486d..412d0cde9f75 100644
--- a/pkgs/by-name/fa/fastp/package.nix
+++ b/pkgs/by-name/fa/fastp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenGene";
     repo = "fastp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Jl2Os/6yLWXTDv6irInYlUHpz6QTw8CEMVGFXblAay0=";
   };
 
diff --git a/pkgs/by-name/fa/fastpbkdf2/package.nix b/pkgs/by-name/fa/fastpbkdf2/package.nix
index 7ce1605a5f1b..3bf566396403 100644
--- a/pkgs/by-name/fa/fastpbkdf2/package.nix
+++ b/pkgs/by-name/fa/fastpbkdf2/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ctz";
     repo = "fastpbkdf2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2";
   };
 
diff --git a/pkgs/by-name/fa/fatcat/package.nix b/pkgs/by-name/fa/fatcat/package.nix
index aa75ed92f1c5..0ab0f2eb4652 100644
--- a/pkgs/by-name/fa/fatcat/package.nix
+++ b/pkgs/by-name/fa/fatcat/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gregwar";
     repo = "fatcat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/iGNVP7Bz/UZAR+dFxAKMKM9jm07h0x0F3VGpdxlHdk=";
   };
 
diff --git a/pkgs/by-name/fa/fatrace/package.nix b/pkgs/by-name/fa/fatrace/package.nix
index d8c6ce4bd191..3b9bc9c45f15 100644
--- a/pkgs/by-name/fa/fatrace/package.nix
+++ b/pkgs/by-name/fa/fatrace/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martinpitt";
     repo = "fatrace";
-    rev = version;
+    tag = version;
     sha256 = "sha256-QkavhxORENQSLUg4tq+W1WB7zSYYinWOOYPqNbv+pEI=";
   };
 
diff --git a/pkgs/by-name/fa/fatresize/package.nix b/pkgs/by-name/fa/fatresize/package.nix
index e6ac6c06236e..60de2e0ed9db 100644
--- a/pkgs/by-name/fa/fatresize/package.nix
+++ b/pkgs/by-name/fa/fatresize/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ya-mouse";
     repo = "fatresize";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1vhz84kxfyl0q7mkqn68nvzzly0a4xgzv76m6db0bk7xyczv1qr2";
   };
 
diff --git a/pkgs/by-name/fa/faudio/package.nix b/pkgs/by-name/fa/faudio/package.nix
index 64b8c69ca56e..6143b45ecacc 100644
--- a/pkgs/by-name/fa/faudio/package.nix
+++ b/pkgs/by-name/fa/faudio/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FAudio";
-    rev = version;
+    tag = version;
     sha256 = "sha256-nPU225LLQYN0D1LUsp9XGm2bCcB5WLpD3TcGDiWCe0c=";
   };
 
diff --git a/pkgs/by-name/fa/faustPhysicalModeling/package.nix b/pkgs/by-name/fa/faustPhysicalModeling/package.nix
index a2e928592842..93676d555d76 100644
--- a/pkgs/by-name/fa/faustPhysicalModeling/package.nix
+++ b/pkgs/by-name/fa/faustPhysicalModeling/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
-    rev = version;
+    tag = version;
     sha256 = "sha256-j5ADlKZriwLARpEJ/4xgvyAhF5ld9Hl2gXZS3NPJJj8=";
   };
 
diff --git a/pkgs/by-name/fb/fbcat/package.nix b/pkgs/by-name/fb/fbcat/package.nix
index 60eaa92533bf..a8e2dea1d9cd 100644
--- a/pkgs/by-name/fb/fbcat/package.nix
+++ b/pkgs/by-name/fb/fbcat/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jwilk";
     repo = "fbcat";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ORzcd8XGy2BfwuPK5UX+K5Z+FYkb+tdg/gHl3zHjvbk=";
   };
 
diff --git a/pkgs/by-name/fb/fbjni/package.nix b/pkgs/by-name/fb/fbjni/package.nix
index 991e9531b7c5..978c71098296 100644
--- a/pkgs/by-name/fb/fbjni/package.nix
+++ b/pkgs/by-name/fb/fbjni/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "fbjni";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-97KqfFWtR3VJe2s0D60L3dsIDm4kMa0hpkKoZSAEoVY=";
   };
 
diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix
index 2c015d35e8c3..d237a513f0d6 100644
--- a/pkgs/by-name/fb/fblog/package.nix
+++ b/pkgs/by-name/fb/fblog/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "brocode";
     repo = "fblog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YOHLw8YCgOGB1Nn2tD+EnicKd/tiMk07OWv+49btbpw=";
   };
 
diff --git a/pkgs/by-name/fb/fbmark/package.nix b/pkgs/by-name/fb/fbmark/package.nix
index b6215b96ddf3..15943ab5c47d 100644
--- a/pkgs/by-name/fb/fbmark/package.nix
+++ b/pkgs/by-name/fb/fbmark/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "caramelli";
     repo = "fbmark";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0n2czl2sy1k6r5ri0hp7jgq84xcwrx4x43bqvw1b4na99mqhyahn";
   };
 
diff --git a/pkgs/by-name/fb/fbmenugen/package.nix b/pkgs/by-name/fb/fbmenugen/package.nix
index f2152a5115f4..37e6e629691b 100644
--- a/pkgs/by-name/fb/fbmenugen/package.nix
+++ b/pkgs/by-name/fb/fbmenugen/package.nix
@@ -18,7 +18,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "trizen";
     repo = "fbmenugen";
-    rev = version;
+    tag = version;
     sha256 = "A0yhoK/cPp3JlNZacgLaDhaU838PpFna7luQKNDvyOg=";
   };
 
diff --git a/pkgs/by-name/fc/fcft/package.nix b/pkgs/by-name/fc/fcft/package.nix
index be0327dcc688..16b6a58616e4 100644
--- a/pkgs/by-name/fc/fcft/package.nix
+++ b/pkgs/by-name/fc/fcft/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "fcft";
-    rev = version;
+    tag = version;
     hash = "sha256:08fr6zcqk4qp1k3r0di6v60qfyd3q5k9jnxzlsx2p1lh0nils0xa";
   };
 
diff --git a/pkgs/by-name/fc/fcgi/package.nix b/pkgs/by-name/fc/fcgi/package.nix
index 08e34c4b5914..d2b59d7988f4 100644
--- a/pkgs/by-name/fc/fcgi/package.nix
+++ b/pkgs/by-name/fc/fcgi/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FastCGI-Archives";
     repo = "fcgi2";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-GI2RL0djfCej7bBhxR6cK/FrTbDYEl75SEfQFgl0ctA=";
   };
 
diff --git a/pkgs/by-name/fc/fcgiwrap/package.nix b/pkgs/by-name/fc/fcgiwrap/package.nix
index a40a60ca4723..63f967eb3deb 100644
--- a/pkgs/by-name/fc/fcgiwrap/package.nix
+++ b/pkgs/by-name/fc/fcgiwrap/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gnosek";
     repo = "fcgiwrap";
-    rev = version;
+    tag = version;
     hash = "sha256-znAsZk+aB2XO2NK8Mjc+DLwykYKHolnVQPErlaAx3Oc=";
   };
 
diff --git a/pkgs/by-name/fc/fcitx5-material-color/package.nix b/pkgs/by-name/fc/fcitx5-material-color/package.nix
index 8b5147df9b82..2307e28492c1 100644
--- a/pkgs/by-name/fc/fcitx5-material-color/package.nix
+++ b/pkgs/by-name/fc/fcitx5-material-color/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hosxy";
     repo = "Fcitx5-Material-Color";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-i9JHIJ+cHLTBZUNzj9Ujl3LIdkCllTWpO1Ta4OT1LTc=";
   };
 
diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
index 6a3a7f36396b..33cd60dcf121 100644
--- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
+++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openvanilla";
     repo = "fcitx5-mcbopomofo";
-    rev = version;
+    tag = version;
     hash = "sha256-fHDNhZhSVgVuZLfRA3eJErm1gwhUZJw+emCXfeO5HVo=";
   };
 
diff --git a/pkgs/by-name/fc/fcl/package.nix b/pkgs/by-name/fc/fcl/package.nix
index 194056f635eb..034bd2724a0c 100644
--- a/pkgs/by-name/fc/fcl/package.nix
+++ b/pkgs/by-name/fc/fcl/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flexible-collision-library";
     repo = "fcl";
-    rev = version;
+    tag = version;
     sha256 = "0f5lhg6f9np7w16s6wz4mb349bycil1irk8z8ylfjwllxi4n6x7a";
   };
 
diff --git a/pkgs/by-name/fc/fcppt/package.nix b/pkgs/by-name/fc/fcppt/package.nix
index ac0fd7582900..7a8bb2013e0f 100644
--- a/pkgs/by-name/fc/fcppt/package.nix
+++ b/pkgs/by-name/fc/fcppt/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "freundlich";
     repo = "fcppt";
-    rev = version;
+    tag = version;
     sha256 = "1pcmi2ck12nanw1rnwf8lmyx85iq20897k6daxx3hw5f23j1kxv6";
   };
 
diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix
index 13c16bcff36a..cd8c86b386ab 100644
--- a/pkgs/by-name/fd/fd/package.nix
+++ b/pkgs/by-name/fd/fd/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B+lOohoPH7UkRxRNTzSVt0SDrqEwh4hIvBF3uWliDEI=";
   };
 
diff --git a/pkgs/by-name/fd/fdk-aac-encoder/package.nix b/pkgs/by-name/fd/fdk-aac-encoder/package.nix
index 706f3e37c06d..144dcb5477e1 100644
--- a/pkgs/by-name/fd/fdk-aac-encoder/package.nix
+++ b/pkgs/by-name/fd/fdk-aac-encoder/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nu774";
     repo = "fdkaac";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nVVeYk7t4+n/BsOKs744stsvgJd+zNnbASk3bAgFTpk=";
   };
 
diff --git a/pkgs/by-name/fd/fdm/package.nix b/pkgs/by-name/fd/fdm/package.nix
index 80aa96a507ca..8447fb523281 100644
--- a/pkgs/by-name/fd/fdm/package.nix
+++ b/pkgs/by-name/fd/fdm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nicm";
     repo = "fdm";
-    rev = version;
+    tag = version;
     hash = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0=";
   };
 
diff --git a/pkgs/by-name/fd/fdupes/package.nix b/pkgs/by-name/fd/fdupes/package.nix
index 83e336b07d8f..e4997886ea0d 100644
--- a/pkgs/by-name/fd/fdupes/package.nix
+++ b/pkgs/by-name/fd/fdupes/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "adrianlopezroche";
     repo = "fdupes";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-epregz+i2mML5zCQErQDJFUFUxnUoqcBlUPGPJ4tcmc=";
   };
 
diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix
index 06527893d2cf..5517d949e090 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-c7qa6MmENCEjZz8b/xyCcCO2+iI5dI8hJynBW3haSWE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix
index 5332b713891e..e34c64a411c6 100644
--- a/pkgs/by-name/fe/fedimint/package.nix
+++ b/pkgs/by-name/fe/fedimint/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fedimint";
     repo = "fedimint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dhZYOfXepOnt1lQEgrM/y++5V58weiiTMAyMKl2t37Q=";
   };
 
diff --git a/pkgs/by-name/fe/feed2imap-go/package.nix b/pkgs/by-name/fe/feed2imap-go/package.nix
index f2696e33799b..6d50862fdc67 100644
--- a/pkgs/by-name/fe/feed2imap-go/package.nix
+++ b/pkgs/by-name/fe/feed2imap-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Necoro";
     repo = "feed2imap-go";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LMtuGrNRVG3/2cgZFS7YlVmassbWDhH/nQgPh08NmpA=";
   };
 
diff --git a/pkgs/by-name/fe/feedgnuplot/package.nix b/pkgs/by-name/fe/feedgnuplot/package.nix
index 9d1590ba947b..2f1ded654dea 100644
--- a/pkgs/by-name/fe/feedgnuplot/package.nix
+++ b/pkgs/by-name/fe/feedgnuplot/package.nix
@@ -25,7 +25,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "dkogan";
     repo = "feedgnuplot";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-r5rszxr65lSozkUNaqfBn4I4XjLtvQ6T/BG366JXLRM=";
   };
 
diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index b54d3be19c72..e28d50c4c10f 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -16,7 +16,7 @@ let
   src = fetchFromGitHub {
     owner = "jeffvli";
     repo = "feishin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Tjh68b+41YrMNB14AZ3jXqBXDOmaaOYQKXJOyTUF474=";
   };
 
diff --git a/pkgs/by-name/fe/fend/package.nix b/pkgs/by-name/fe/fend/package.nix
index f27ea5128db4..0923fb335208 100644
--- a/pkgs/by-name/fe/fend/package.nix
+++ b/pkgs/by-name/fe/fend/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "printfn";
     repo = "fend";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FaPP7344rb5789CeDv9L4lysiTrK+7UoEbH8IK/6N3k=";
   };
 
diff --git a/pkgs/by-name/fe/ferretdb/package.nix b/pkgs/by-name/fe/ferretdb/package.nix
index 438365de4091..3adf25ddb4bd 100644
--- a/pkgs/by-name/fe/ferretdb/package.nix
+++ b/pkgs/by-name/fe/ferretdb/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FerretDB";
     repo = "FerretDB";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WMejspnk2PvJhvNGi4h+DF+fzipuOMcS1QWim5DnAhQ=";
   };
 
diff --git a/pkgs/by-name/fe/fet-sh/package.nix b/pkgs/by-name/fe/fet-sh/package.nix
index d0fd407cf57e..5fef51e228d5 100644
--- a/pkgs/by-name/fe/fet-sh/package.nix
+++ b/pkgs/by-name/fe/fet-sh/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "6gk";
     repo = "fet.sh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xhX2nVteC3T3IjQh++mYlm0btDJQbyQa6b8sGualV0E=";
   };
 
diff --git a/pkgs/by-name/fe/fetch-scm/package.nix b/pkgs/by-name/fe/fetch-scm/package.nix
index 9ea2f12fa208..13bf35051de1 100644
--- a/pkgs/by-name/fe/fetch-scm/package.nix
+++ b/pkgs/by-name/fe/fetch-scm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KikyTokamuro";
     repo = "fetch.scm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WdYi8EVxQ6xPtld8JyZlUmgpxroevBehtkRANovMh2E=";
   };
 
diff --git a/pkgs/by-name/fe/fetchit/package.nix b/pkgs/by-name/fe/fetchit/package.nix
index 9e77a9154615..d7e7d0710ae9 100644
--- a/pkgs/by-name/fe/fetchit/package.nix
+++ b/pkgs/by-name/fe/fetchit/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "fetchit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hxS/+/fbYOpMJ5VfvvG5l7wWKBUUR22rYn9X79DzUUk=";
   };
 
diff --git a/pkgs/by-name/ff/ff2mpv-rust/package.nix b/pkgs/by-name/ff/ff2mpv-rust/package.nix
index 3f7ac2a3e56f..d6eafe03e95d 100644
--- a/pkgs/by-name/ff/ff2mpv-rust/package.nix
+++ b/pkgs/by-name/ff/ff2mpv-rust/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ryze312";
     repo = "ff2mpv-rust";
-    rev = version;
+    tag = version;
     hash = "sha256-3ZKVa1pRorzTM6jCXak/aTq9iyDGT7fWLOcCotLYlkc=";
   };
 
diff --git a/pkgs/by-name/ff/ff2mpv/package.nix b/pkgs/by-name/ff/ff2mpv/package.nix
index f9f865675b50..835d7f241c50 100644
--- a/pkgs/by-name/ff/ff2mpv/package.nix
+++ b/pkgs/by-name/ff/ff2mpv/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "woodruffw";
     repo = "ff2mpv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Xx18EX/MxLrnwZGwMFZJxJURUpjU2P01CQue5XbZ3fw=";
   };
 
diff --git a/pkgs/by-name/ff/ffcast/package.nix b/pkgs/by-name/ff/ffcast/package.nix
index 68aab967e3c4..5d592779d390 100644
--- a/pkgs/by-name/ff/ffcast/package.nix
+++ b/pkgs/by-name/ff/ffcast/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ropery";
     repo = "FFcast";
-    rev = version;
+    tag = version;
     sha256 = "sha256-kxqwDGEguFTFHkQzXctXqxslt0+bYnfUdQ8C/8+eTXo=";
   };
 
diff --git a/pkgs/by-name/ff/fff/package.nix b/pkgs/by-name/ff/fff/package.nix
index 3ffc8ac9f6e7..7b6894bd0d52 100644
--- a/pkgs/by-name/ff/fff/package.nix
+++ b/pkgs/by-name/ff/fff/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "fff";
-    rev = version;
+    tag = version;
     sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg";
   };
 
diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix
index 81edec825164..d34fa570b7c4 100644
--- a/pkgs/by-name/ff/ffizer/package.nix
+++ b/pkgs/by-name/ff/ffizer/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ffizer";
     repo = "ffizer";
-    rev = version;
+    tag = version;
     hash = "sha256-ZX6Zv6ioAO33Cc5WCVBgJWlOmNvbVgckMylRnphpOdw=";
   };
 
diff --git a/pkgs/by-name/ff/fflas-ffpack/package.nix b/pkgs/by-name/ff/fflas-ffpack/package.nix
index 3b07162240d2..71e897433298 100644
--- a/pkgs/by-name/ff/fflas-ffpack/package.nix
+++ b/pkgs/by-name/ff/fflas-ffpack/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linbox-team";
     repo = "fflas-ffpack";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Eztc2jUyKRVUiZkYEh+IFHkDuPIy+Gx3ZW/MsuOVaMc=";
   };
 
diff --git a/pkgs/by-name/ff/ffms/package.nix b/pkgs/by-name/ff/ffms/package.nix
index 61db0ad742ed..a7dd689abe4e 100644
--- a/pkgs/by-name/ff/ffms/package.nix
+++ b/pkgs/by-name/ff/ffms/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FFMS";
     repo = "ffms2";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Ildl8hbKSFGh4MUBK+k8uYMDrOZD9NSMdPAWIIaGy4E=";
   };
 
diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix
index d8126f791aa7..6001fbfc7713 100644
--- a/pkgs/by-name/fh/fh/package.nix
+++ b/pkgs/by-name/fh/fh/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "fh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yOqXcn/OMfC97t002V8yzZn1PhuV8lIp5szPA7eys1Q=";
   };
 
diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix
index dbe215a34360..2e127c4189dd 100644
--- a/pkgs/by-name/fh/fheroes2/package.nix
+++ b/pkgs/by-name/fh/fheroes2/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ihhub";
     repo = "fheroes2";
-    rev = version;
+    tag = version;
     hash = "sha256-CowCP+gZuGSXWbALYBkmyn+RlDgOGho/Px34GutrBX0=";
   };
 
diff --git a/pkgs/by-name/fi/fiano/package.nix b/pkgs/by-name/fi/fiano/package.nix
index 3f09e5af9c40..8bf0677d5d05 100644
--- a/pkgs/by-name/fi/fiano/package.nix
+++ b/pkgs/by-name/fi/fiano/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxboot";
     repo = "fiano";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QX0XMec99YbYWyfRThhwDaNjKstkUEz6wsisBynprmg=";
   };
 
diff --git a/pkgs/by-name/fi/fiche/package.nix b/pkgs/by-name/fi/fiche/package.nix
index 4361019d55f7..e79613644f00 100644
--- a/pkgs/by-name/fi/fiche/package.nix
+++ b/pkgs/by-name/fi/fiche/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "solusipse";
     repo = "fiche";
-    rev = version;
+    tag = version;
     sha256 = "1102r39xw17kip7mjp987jy8na333gw9vxv31f7v8q05cr7d7kfb";
   };
 
diff --git a/pkgs/by-name/fi/fido2luks/package.nix b/pkgs/by-name/fi/fido2luks/package.nix
index 1580090c1ae3..ca4c8de5b497 100644
--- a/pkgs/by-name/fi/fido2luks/package.nix
+++ b/pkgs/by-name/fi/fido2luks/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shimunn";
     repo = "fido2luks";
-    rev = version;
+    tag = version;
     hash = "sha256-bXwaFiRHURvS5KtTqIj+3GlGNbEulDgMDP51ZiO1w9o=";
   };
 
diff --git a/pkgs/by-name/fi/figurine/package.nix b/pkgs/by-name/fi/figurine/package.nix
index 88bb4ff21b8f..5f3ff724fde1 100644
--- a/pkgs/by-name/fi/figurine/package.nix
+++ b/pkgs/by-name/fi/figurine/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "arsham";
     repo = "figurine";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1q6Y7oEntd823nWosMcKXi6c3iWsBTxPnSH4tR6+XYs=";
   };
 
diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index af275fdd7531..d4b8802d8426 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -11,7 +11,7 @@ let
   src = fetchFromGitHub {
     owner = "filebrowser";
     repo = "filebrowser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zLM1fLrucIhzGdTTDu81ZnTIipK+iRnPhgfMiT1P+yg=";
   };
 
diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index 114f38ce4453..ff1d3f72f8e9 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-96DSnobVyG50iS6NyCMpZ74KWEtkCyNdFyGXLwrSZxo=";
   };
 
diff --git a/pkgs/by-name/fi/fileshelter/package.nix b/pkgs/by-name/fi/fileshelter/package.nix
index 093348d39de2..127fd4676444 100644
--- a/pkgs/by-name/fi/fileshelter/package.nix
+++ b/pkgs/by-name/fi/fileshelter/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "epoupon";
     repo = "fileshelter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "07n70wwqj7lqdxs3wya1m8bwg8l6lgmmlfpwyv3r3s4dfzb1b3ka";
   };
 
diff --git a/pkgs/by-name/fi/filter-audio/package.nix b/pkgs/by-name/fi/filter-audio/package.nix
index ae1d63a1e1de..9c7f56587fc2 100644
--- a/pkgs/by-name/fi/filter-audio/package.nix
+++ b/pkgs/by-name/fi/filter-audio/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "irungentoo";
     repo = "filter_audio";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1dv4pram317c1w97cjsv9f6r8cdxhgri7ib0v364z08pk7r2avfn";
   };
 
diff --git a/pkgs/by-name/fi/filterpath/package.nix b/pkgs/by-name/fi/filterpath/package.nix
index 68f5132e4ab0..014b08205893 100644
--- a/pkgs/by-name/fi/filterpath/package.nix
+++ b/pkgs/by-name/fi/filterpath/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Sigmanificient";
     repo = "filterpath";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-9rHooXgpvfNNeWxS8UF6hmb8vCz+xKABrJNd+AgKFJs=";
   };
 
diff --git a/pkgs/by-name/fi/filtron/package.nix b/pkgs/by-name/fi/filtron/package.nix
index f4083022478a..3522b82a49a8 100644
--- a/pkgs/by-name/fi/filtron/package.nix
+++ b/pkgs/by-name/fi/filtron/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = "filtron";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RihxlJvbHq5PaJz89NHl/wyXrKjSiC4XYAs7LSKAo6E=";
   };
 
diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index 02c93f920022..6d03dcb27ec6 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -16,7 +16,7 @@ flutter327.buildFlutterApplication {
   src = fetchFromGitHub {
     owner = "jmshrv";
     repo = "finamp";
-    rev = version;
+    tag = version;
     hash = "sha256-SDzKB5KLHkJ3xcJY67TNBXDiDlBOApKrh4x0OZR/K/M=";
   };
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/fi/find-cursor/package.nix b/pkgs/by-name/fi/find-cursor/package.nix
index 5e385d8fd94b..c6d4977ff661 100644
--- a/pkgs/by-name/fi/find-cursor/package.nix
+++ b/pkgs/by-name/fi/find-cursor/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arp242";
     repo = "find-cursor";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/Dw4bOTCnpCbeI0YJ5DJ9Q2AGBognylUk7xYGn0KIA8=";
   };
 
diff --git a/pkgs/by-name/fi/findex/package.nix b/pkgs/by-name/fi/findex/package.nix
index 11da0a804933..1c7cbdec1213 100644
--- a/pkgs/by-name/fi/findex/package.nix
+++ b/pkgs/by-name/fi/findex/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mdgaziur";
     repo = "findex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IpgmeH5oREstud0nw4i2xYeZcJYG6eCWyw3hhid/DfU=";
   };
 
diff --git a/pkgs/by-name/fi/fioctl/package.nix b/pkgs/by-name/fi/fioctl/package.nix
index 26d5ba7b9f89..1d72f7f535ce 100644
--- a/pkgs/by-name/fi/fioctl/package.nix
+++ b/pkgs/by-name/fi/fioctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "foundriesio";
     repo = "fioctl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hZ8jkIbNY2z4M7sHCYq6vVacetThcoYPJjkr8PFQmQA=";
   };
 
diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix
index 30016c7bc11f..bea6339e8529 100644
--- a/pkgs/by-name/fi/firecracker/package.nix
+++ b/pkgs/by-name/fi/firecracker/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "firecracker-microvm";
     repo = "firecracker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Iqhj4BteFTBhhgQmyJVNdRHrXd/kaMRbOJ3eRKilYpw=";
   };
 
diff --git a/pkgs/by-name/fi/firectl/package.nix b/pkgs/by-name/fi/firectl/package.nix
index ec6e30949ae9..94e7ccb0edd7 100644
--- a/pkgs/by-name/fi/firectl/package.nix
+++ b/pkgs/by-name/fi/firectl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "firecracker-microvm";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3MNNgFRq4goWdHFyqWNMAl2K0eKfd03BF05i82FIzNE=";
   };
 
diff --git a/pkgs/by-name/fi/firefox-sync-client/package.nix b/pkgs/by-name/fi/firefox-sync-client/package.nix
index a82b8adf701c..62164a1bf197 100644
--- a/pkgs/by-name/fi/firefox-sync-client/package.nix
+++ b/pkgs/by-name/fi/firefox-sync-client/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Mikescher";
     repo = "firefox-sync-client";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ax+v4a8bVuym1bp9dliXX85PXJk2Qlik3ME+adGiL1s=";
   };
 
diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix
index 5e1818a36630..ed7972d3069a 100644
--- a/pkgs/by-name/fi/firefoxpwa/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "filips123";
     repo = "PWAsForFirefox";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-u6zKB5+P/f3qM5Sqmhk2ts1AhgRN8Oq877uKQuJ6Uao=";
   };
 
diff --git a/pkgs/by-name/fi/firejail/package.nix b/pkgs/by-name/fi/firejail/package.nix
index dcf9348383c4..c939e8187be2 100644
--- a/pkgs/by-name/fi/firejail/package.nix
+++ b/pkgs/by-name/fi/firejail/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "netblue30";
     repo = "firejail";
-    rev = version;
+    tag = version;
     sha256 = "sha256-BKEW2IWatzePGREAA479eaP6bJb1i2fRs/GZcyLinrM=";
   };
 
diff --git a/pkgs/by-name/fi/firestarter/package.nix b/pkgs/by-name/fi/firestarter/package.nix
index 748f2b44e726..9c354df8d55e 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/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix
index 5fe266ea17e3..946efaa69413 100644
--- a/pkgs/by-name/fi/firewalld/package.nix
+++ b/pkgs/by-name/fi/firewalld/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "firewalld";
     repo = "firewalld";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ubE1zMIOcdg2+mgXsk6brCZxS1XkvJYwVY3E+UXIIiU=";
   };
 
diff --git a/pkgs/by-name/fi/firmware-manager/package.nix b/pkgs/by-name/fi/firmware-manager/package.nix
index 534c18095aa0..50d2e5b3bb60 100644
--- a/pkgs/by-name/fi/firmware-manager/package.nix
+++ b/pkgs/by-name/fi/firmware-manager/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "firmware-manager";
-    rev = version;
+    tag = version;
     hash = "sha256-Q+LJJ4xK583fAcwuOFykt6GKT0rVJgmTt+zUX4o4Tm4=";
   };
 
diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index 8fd0f00138a2..c9c8f8364dae 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lichess-org";
     repo = "fishnet";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JhllThFiHeC/5AAFwwZQ0mgbENIWP1cA7aD01DeDVL8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fi/fission/package.nix b/pkgs/by-name/fi/fission/package.nix
index e9e046e9cb47..1da3ecd8b7eb 100644
--- a/pkgs/by-name/fi/fission/package.nix
+++ b/pkgs/by-name/fi/fission/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fission";
     repo = "fission";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Tl7aKibVbNAKOa1tycKtEzdJ8rJHBMa8PTUm0i7DKA4=";
   };
 
diff --git a/pkgs/by-name/fi/fits-cloudctl/package.nix b/pkgs/by-name/fi/fits-cloudctl/package.nix
index 95a0461cdcc8..ee648063f4d1 100644
--- a/pkgs/by-name/fi/fits-cloudctl/package.nix
+++ b/pkgs/by-name/fi/fits-cloudctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fi-ts";
     repo = "cloudctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-O3wX7IW2puMg0xhOf9BUfxzCMCKHxtPJxOCpc+wY0Ao=";
   };
 
diff --git a/pkgs/by-name/fi/fityk/package.nix b/pkgs/by-name/fi/fityk/package.nix
index b20eb0ea4a3e..0dbea200605b 100644
--- a/pkgs/by-name/fi/fityk/package.nix
+++ b/pkgs/by-name/fi/fityk/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wojdyr";
     repo = "fityk";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-m2RaZMYT6JGwa3sOUVsBIzCdZetTbiygaInQWoJ4m1o=";
   };
 
diff --git a/pkgs/by-name/fl/flaca/package.nix b/pkgs/by-name/fl/flaca/package.nix
index 9fa928f5d300..f5f2416b1ba3 100644
--- a/pkgs/by-name/fl/flaca/package.nix
+++ b/pkgs/by-name/fl/flaca/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
       source = fetchFromGitHub {
         owner = "Blobfolio";
         repo = "flaca";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-GpxOTu7yjJ9IFMKVkgjLeKGNEUiKw0ZeWQorfhaOTsg=";
       };
       lockFile = fetchurl {
diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix
index 0155d14ea793..d97d9060e3a2 100644
--- a/pkgs/by-name/fl/flake-checker/package.nix
+++ b/pkgs/by-name/fl/flake-checker/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "flake-checker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-K5E1sarWIUl4QavHBoS8sPr5Cp8ZndWjLYDLm++d7v0=";
   };
 
diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix
index b54936e1a895..72c06bc5be19 100644
--- a/pkgs/by-name/fl/flake-edit/package.nix
+++ b/pkgs/by-name/fl/flake-edit/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "a-kenji";
     repo = "flake-edit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7n8WANm9AijZYI5nlnevLI+aZtV55teroeQIEld7tkE=";
   };
 
diff --git a/pkgs/by-name/fl/flamerobin/package.nix b/pkgs/by-name/fl/flamerobin/package.nix
index a49ed58d3859..83dec165c614 100644
--- a/pkgs/by-name/fl/flamerobin/package.nix
+++ b/pkgs/by-name/fl/flamerobin/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mariuz";
     repo = "flamerobin";
-    rev = version;
+    tag = version;
     sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA=";
   };
 
diff --git a/pkgs/by-name/fl/flann/package.nix b/pkgs/by-name/fl/flann/package.nix
index d68def287d01..206120d09e36 100644
--- a/pkgs/by-name/fl/flann/package.nix
+++ b/pkgs/by-name/fl/flann/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flann-lib";
     repo = "flann";
-    rev = version;
+    tag = version;
     sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
   };
 
diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix
index c2087c612665..0ee4c34d3212 100644
--- a/pkgs/by-name/fl/flare-signal/package.nix
+++ b/pkgs/by-name/fl/flare-signal/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.com";
     owner = "schmiddi-on-mobile";
     repo = "flare";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-qj34x/e5Nc3wPdFaHFZHQ8uCMHIlxfVNyvlp7eb3tSo=";
   };
 
diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix
index 1d50138ea3c4..bcb447778538 100644
--- a/pkgs/by-name/fl/flarectl/package.nix
+++ b/pkgs/by-name/fl/flarectl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflare-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2LdsqCqRTruTHYPwuI9Gm07cpvQNOrZvIl6rjZU+0aU=";
   };
 
diff --git a/pkgs/by-name/fl/flat-remix-gnome/package.nix b/pkgs/by-name/fl/flat-remix-gnome/package.nix
index 2be7cc4aeb98..b66c71bb3754 100644
--- a/pkgs/by-name/fl/flat-remix-gnome/package.nix
+++ b/pkgs/by-name/fl/flat-remix-gnome/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = "flat-remix-gnome";
-    rev = version;
+    tag = version;
     hash = "sha256-Ho2tqJgitSdk/i2jH5jhD3XLyy6BXUhyhb6UV7g1waM=";
   };
 
diff --git a/pkgs/by-name/fl/flat-remix-gtk/package.nix b/pkgs/by-name/fl/flat-remix-gtk/package.nix
index 5d112edd2051..fa544fa8ab16 100644
--- a/pkgs/by-name/fl/flat-remix-gtk/package.nix
+++ b/pkgs/by-name/fl/flat-remix-gtk/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = "flat-remix-gtk";
-    rev = version;
+    tag = version;
     sha256 = "sha256-EWe84bLG14RkCNbHp0S5FbUQ5/Ye/KbCk3gPTsGg9oQ=";
   };
 
diff --git a/pkgs/by-name/fl/flatcc/package.nix b/pkgs/by-name/fl/flatcc/package.nix
index 7c13f453f423..a4f8d6e6742f 100644
--- a/pkgs/by-name/fl/flatcc/package.nix
+++ b/pkgs/by-name/fl/flatcc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dvidelabs";
     repo = "flatcc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0/IZ7eX6b4PTnlSSdoOH0FsORGK9hrLr1zlr/IHsJFQ=";
   };
 
diff --git a/pkgs/by-name/fl/flavours/package.nix b/pkgs/by-name/fl/flavours/package.nix
index 2abafb852874..c0b9637b5b06 100644
--- a/pkgs/by-name/fl/flavours/package.nix
+++ b/pkgs/by-name/fl/flavours/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Misterio77";
     repo = "flavours";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SOsHvcfDdUpb0x5VZ1vZJnGaIiWWOPgnAwKYNXzfUfI=";
   };
 
diff --git a/pkgs/by-name/fl/flawz/package.nix b/pkgs/by-name/fl/flawz/package.nix
index 3e7ffcc60516..f13a595271b2 100644
--- a/pkgs/by-name/fl/flawz/package.nix
+++ b/pkgs/by-name/fl/flawz/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "flawz";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7p/BUXrElJutUcRMu+LxdsMxA6lCDnaci0fDaKGsawI=";
   };
 
diff --git a/pkgs/by-name/fl/flex-ncat/package.nix b/pkgs/by-name/fl/flex-ncat/package.nix
index 7e6abf1edeb2..b5660c8d2705 100644
--- a/pkgs/by-name/fl/flex-ncat/package.nix
+++ b/pkgs/by-name/fl/flex-ncat/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kc2g-flex-tools";
     repo = "nCAT";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hbsrs9lgpxNqG8mmXsft01LmpX4dBpl1ncpdTWBgrUQ=";
   };
 
diff --git a/pkgs/by-name/fl/flex-ndax/package.nix b/pkgs/by-name/fl/flex-ndax/package.nix
index abc0e79ff7cc..892e5e441eb7 100644
--- a/pkgs/by-name/fl/flex-ndax/package.nix
+++ b/pkgs/by-name/fl/flex-ndax/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kc2g-flex-tools";
     repo = "nDAX";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FCF22apO6uAc24H36SkvfKEKdyqY4l+j7ABdOnhZP6M=";
   };
 
diff --git a/pkgs/by-name/fl/flexcpp/package.nix b/pkgs/by-name/fl/flexcpp/package.nix
index fe1938d6cd0d..7049096c6f38 100644
--- a/pkgs/by-name/fl/flexcpp/package.nix
+++ b/pkgs/by-name/fl/flexcpp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "0s25d9jsfsqvm34rwf48cxwz23aq1zja3cqlzfz3z33p29wwazwz";
-    rev = version;
+    tag = version;
     repo = "flexcpp";
     owner = "fbb-git";
   };
diff --git a/pkgs/by-name/fl/flintlock/package.nix b/pkgs/by-name/fl/flintlock/package.nix
index dccfa5f33a5d..ae4b5ecf6b83 100644
--- a/pkgs/by-name/fl/flintlock/package.nix
+++ b/pkgs/by-name/fl/flintlock/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = "flintlock";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Kbk94sqj0aPsVonPsiu8kbjhIOURB1kX9Lt3NURL+jk=";
   };
 
diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix
index adc4dea819d1..bb0c1edf3340 100644
--- a/pkgs/by-name/fl/flip-link/package.nix
+++ b/pkgs/by-name/fl/flip-link/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "knurling-rs";
     repo = "flip-link";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Nw43I8EIlNGPptsLVxFBapFp6qdFoUOEicHc9FTcm2g=";
   };
 
diff --git a/pkgs/by-name/fl/flitter/package.nix b/pkgs/by-name/fl/flitter/package.nix
index 05dee0723c00..2b9e26ab3a68 100644
--- a/pkgs/by-name/fl/flitter/package.nix
+++ b/pkgs/by-name/fl/flitter/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alexozer";
     repo = "flitter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8e13kSQEjzzf+j4uTrocVioZjJ6lAz+80dLfWwjPb9o=";
   };
 
diff --git a/pkgs/by-name/fl/flock/package.nix b/pkgs/by-name/fl/flock/package.nix
index c571f076bb16..6acd402641e1 100644
--- a/pkgs/by-name/fl/flock/package.nix
+++ b/pkgs/by-name/fl/flock/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "discoteq";
     repo = "flock";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cCpckORtogs6Nt7c5q2+z0acXAnALdLV6uzxa5ng3s4=";
   };
 
diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix
index 083d79d9861b..9ad923c6fde8 100644
--- a/pkgs/by-name/fl/flood/package.nix
+++ b/pkgs/by-name/fl/flood/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "flood";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sIwXx9DA+vRW4pf6jyqcsla0khh8fdpvVTZ5pLrUhhc=";
   };
 
diff --git a/pkgs/by-name/fl/flottbot/package.nix b/pkgs/by-name/fl/flottbot/package.nix
index 7cb26990622e..b61a7cbb66a6 100644
--- a/pkgs/by-name/fl/flottbot/package.nix
+++ b/pkgs/by-name/fl/flottbot/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "target";
     repo = "flottbot";
-    rev = version;
+    tag = version;
     hash = "sha256-Z17CkJhxIwoF3Fa0doDfE6N2eUtiBeEEhDwDUoWCCQ8=";
   };
 
diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix
index f7e539bae1bc..8b40d3cb066c 100644
--- a/pkgs/by-name/fl/flowblade/package.nix
+++ b/pkgs/by-name/fl/flowblade/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jliljebl";
     repo = "flowblade";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5w8mGFPOawbUwinzVLSCUZWGxuyxhi1/3tOrmQyfUUg=";
   };
 
diff --git a/pkgs/by-name/fl/flowtime/package.nix b/pkgs/by-name/fl/flowtime/package.nix
index 534c57904241..a3e0b18b491d 100644
--- a/pkgs/by-name/fl/flowtime/package.nix
+++ b/pkgs/by-name/fl/flowtime/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Diego-Ivan";
     repo = "Flowtime";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-J0Pscv0ZOpA/LV2mPTLOmDPQpfZhizTghatGnrJHToE=";
   };
 
diff --git a/pkgs/by-name/fl/fluent-gtk-theme/package.nix b/pkgs/by-name/fl/fluent-gtk-theme/package.nix
index 137f8a92dd1b..792a21001cd4 100644
--- a/pkgs/by-name/fl/fluent-gtk-theme/package.nix
+++ b/pkgs/by-name/fl/fluent-gtk-theme/package.nix
@@ -65,7 +65,7 @@ lib.checkListOfEnum "${pname}: theme variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = "fluent-gtk-theme";
-      rev = finalAttrs.version;
+      tag = finalAttrs.version;
       hash = "sha256-ONhW68UUrFiv5hxkR7XI8U/5+qM+tYLIS2OM05pqJi0=";
     };
 
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 9897087b6870..d6febebb3dad 100644
--- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
+++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fzyzcjy";
     repo = "flutter_rust_bridge";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pvKCiv7hUgetTXXp+NCs04Qo9xWaLUE2T1yHENhTGl4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index ee82e71dbcf9..fc65c532abe5 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fluxcd";
     repo = "flux2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = srcHash;
   };
 
diff --git a/pkgs/by-name/fl/fluxctl/package.nix b/pkgs/by-name/fl/fluxctl/package.nix
index 5e2ed5b0f53e..50e3f84d4136 100644
--- a/pkgs/by-name/fl/fluxctl/package.nix
+++ b/pkgs/by-name/fl/fluxctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = "flux";
-    rev = version;
+    tag = version;
     sha256 = "sha256-rKZ0fI9UN4oq6gfDMNR2+kCazlDexE1+UVzQ3xgkSA8=";
   };
 
diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix
index c915657f0c08..8225833588a8 100644
--- a/pkgs/by-name/fl/fly/package.nix
+++ b/pkgs/by-name/fl/fly/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-myvYACdTqnEb8aBpBeCA1qvcnF0lwYbSo6kMgSz7iiA=";
   };
 
diff --git a/pkgs/by-name/fl/flycast/package.nix b/pkgs/by-name/fl/flycast/package.nix
index 9753ca8e4978..d8155edf93b8 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-1Rso7/S95+8KPoKa+3oFPJBWE+YGw4Qqo3Hn+crxNio=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index 35b6127ae73b..355aceec4315 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eCAnOoP5YQL/UCKex/lGiY28JswJTBmg+AIRrrDaAmc=";
   };
 
diff --git a/pkgs/by-name/fm/fm-tune/package.nix b/pkgs/by-name/fm/fm-tune/package.nix
index 8240b2d652f1..2c3716cfc07c 100644
--- a/pkgs/by-name/fm/fm-tune/package.nix
+++ b/pkgs/by-name/fm/fm-tune/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "viraptor";
     repo = "fm_tune";
-    rev = version;
+    tag = version;
     hash = "sha256-pwL2G1Ni1Ixw/N0diSoGGIoVrtmF92mWZ5i57OOvkX4=";
   };
 
diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix
index 2ecde032d33a..d620b9e09ec4 100644
--- a/pkgs/by-name/fn/fn-cli/package.nix
+++ b/pkgs/by-name/fn/fn-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fnproject";
     repo = "cli";
-    rev = version;
+    tag = version;
     hash = "sha256-myLoLpEiyVTDsFx97AFiS9KNAOQd7NU+W8PJl95a7k0=";
   };
 
diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix
index 08862d304a6f..289e16d671c5 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/fn/fnm/package.nix b/pkgs/by-name/fn/fnm/package.nix
index 43905399e693..0f855d5a8615 100644
--- a/pkgs/by-name/fn/fnm/package.nix
+++ b/pkgs/by-name/fn/fnm/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Schniz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WW+jWaClDn78Fw/xj6WvnEUlBI99HA5hQFUpwsYKmbI=";
   };
 
diff --git a/pkgs/by-name/fn/fnott/package.nix b/pkgs/by-name/fn/fnott/package.nix
index 77d998ea5929..2208418f4f64 100644
--- a/pkgs/by-name/fn/fnott/package.nix
+++ b/pkgs/by-name/fn/fnott/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "fnott";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-C0GvpjOrcelk/KNNDQ7/02Ai7xy8FVzmLcuC2je5wYA=";
   };
 
diff --git a/pkgs/by-name/fo/focus-stack/package.nix b/pkgs/by-name/fo/focus-stack/package.nix
index 683a42192274..b456fef60015 100644
--- a/pkgs/by-name/fo/focus-stack/package.nix
+++ b/pkgs/by-name/fo/focus-stack/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PetteriAimonen";
     repo = "focus-stack";
-    rev = version;
+    tag = version;
     hash = "sha256-SoECgBMjWI+n7H6p3hf8J5E9UCLHGiiz5WAsEEioJsU=";
   };
 
diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix
index c942a2e62d71..8de99716e60f 100644
--- a/pkgs/by-name/fo/follow/package.nix
+++ b/pkgs/by-name/fo/follow/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RSSNext";
     repo = "Follow";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TPzrQo6214fXQmF45p5agQ1zqLYzpmMpYb89ASPsWio=";
   };
 
diff --git a/pkgs/by-name/fo/fondo/package.nix b/pkgs/by-name/fo/fondo/package.nix
index 51eafc5f8450..d7d9ee28069f 100644
--- a/pkgs/by-name/fo/fondo/package.nix
+++ b/pkgs/by-name/fo/fondo/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "calo001";
     repo = "fondo";
-    rev = version;
+    tag = version;
     sha256 = "sha256-JiDbkVs+EZRWRohSiuh8xFFgEhbnMYZfnZtz5Z4Wdb0=";
   };
 
diff --git a/pkgs/by-name/fo/font-config-info/package.nix b/pkgs/by-name/fo/font-config-info/package.nix
index db25a630cbaa..d3146b430e8f 100644
--- a/pkgs/by-name/fo/font-config-info/package.nix
+++ b/pkgs/by-name/fo/font-config-info/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "derat";
     repo = "font-config-info";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "14z7hg9c7q8wliyqv68kp080mmk2rh6kpww6pn87hy7lwq20l2b7";
   };
 
diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix
index 243c36a26c87..ae512ee612b2 100644
--- a/pkgs/by-name/fo/font-manager/package.nix
+++ b/pkgs/by-name/fo/font-manager/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FontManager";
     repo = "font-manager";
-    rev = version;
+    tag = version;
     hash = "sha256-x7ZRC/xwF6Y2BhbtApVZ4hPZGNGaJiilqpxLyax9r2g=";
   };
 
diff --git a/pkgs/by-name/fo/fontfinder/package.nix b/pkgs/by-name/fo/fontfinder/package.nix
index bde673c84a56..0cfc389d8295 100644
--- a/pkgs/by-name/fo/fontfinder/package.nix
+++ b/pkgs/by-name/fo/fontfinder/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mmstick";
     repo = "fontfinder";
-    rev = version;
+    tag = version;
     hash = "sha256-C4KqEdqToVnPXFPWvNkl/md9L2W4NxRd5jvZ4E7CtfA=";
   };
 
diff --git a/pkgs/by-name/fo/fontfor/package.nix b/pkgs/by-name/fo/fontfor/package.nix
index 165b36aab0a5..5317d97916c7 100644
--- a/pkgs/by-name/fo/fontfor/package.nix
+++ b/pkgs/by-name/fo/fontfor/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "7sDream";
     repo = "fontfor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gJl9SPL/KeYFzKIjwWPVR1iVy6h/W7OP7xE7krhYaY8=";
   };
 
diff --git a/pkgs/by-name/fo/fontforge/package.nix b/pkgs/by-name/fo/fontforge/package.nix
index 86d50584db48..6837d6ec53d3 100644
--- a/pkgs/by-name/fo/fontforge/package.nix
+++ b/pkgs/by-name/fo/fontforge/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fontforge";
     repo = "fontforge";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/RYhvL+Z4n4hJ8dmm+jbA1Ful23ni2DbCRZC5A3+pP0=";
   };
 
diff --git a/pkgs/by-name/fo/fontpreview/package.nix b/pkgs/by-name/fo/fontpreview/package.nix
index 5ec5203c870c..ca3be8f702c8 100644
--- a/pkgs/by-name/fo/fontpreview/package.nix
+++ b/pkgs/by-name/fo/fontpreview/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sdushantha";
     repo = "fontpreview";
-    rev = version;
+    tag = version;
     sha256 = "0g3i2k6n2yhp88rrcf0hp6ils7836db7hx73hw9qnpcbmckz0i4w";
   };
 
diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix
index b667d212b46b..5615fb1efe89 100644
--- a/pkgs/by-name/fo/foot/package.nix
+++ b/pkgs/by-name/fo/foot/package.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "foot";
-    rev = version;
+    tag = version;
     hash = "sha256:19hkw4g2l00wasmk5dn34rf3bhqh6zbwwhvz98bdcv90p761jws4";
   };
 
diff --git a/pkgs/by-name/fo/forge-sparks/package.nix b/pkgs/by-name/fo/forge-sparks/package.nix
index 64f78c60b953..b28a8d5eb7db 100644
--- a/pkgs/by-name/fo/forge-sparks/package.nix
+++ b/pkgs/by-name/fo/forge-sparks/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rafaelmardojai";
     repo = "forge-sparks";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-H607u/VBuzzoYrYZc8fLqCQMZ+jRJOVZ34U8yKHfmYk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fo/fork-cleaner/package.nix b/pkgs/by-name/fo/fork-cleaner/package.nix
index 3ccc31f2d3e7..f2fcd76e0166 100644
--- a/pkgs/by-name/fo/fork-cleaner/package.nix
+++ b/pkgs/by-name/fo/fork-cleaner/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "fork-cleaner";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JNmpcDwmxR+s4regOWz8FAJllBNRfOCmVwkDs7tlChA=";
   };
 
diff --git a/pkgs/by-name/fo/formatter/package.nix b/pkgs/by-name/fo/formatter/package.nix
index 634ca15c9c3e..6367ebbf05ab 100644
--- a/pkgs/by-name/fo/formatter/package.nix
+++ b/pkgs/by-name/fo/formatter/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Djaler";
     repo = "Formatter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-8lZ0jUwHuc3Kntz73Btj6dJvkW2bvShu2KWTSQszbJo=";
   };
 
diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix
index 1469d6233642..46219e06f887 100644
--- a/pkgs/by-name/fo/fortune-kind/package.nix
+++ b/pkgs/by-name/fo/fortune-kind/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cafkafk";
     repo = "fortune-kind";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Tpg0Jq2EhkwQuz5ZOtv6Rb5YESSlmzLoJPTxYJNNgac=";
   };
 
diff --git a/pkgs/by-name/fo/foxmarks/package.nix b/pkgs/by-name/fo/foxmarks/package.nix
index 984239dfb0b9..1c5aa6e55c92 100644
--- a/pkgs/by-name/fo/foxmarks/package.nix
+++ b/pkgs/by-name/fo/foxmarks/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zer0-x";
     repo = "foxmarks";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6lJ9acVo444RMxc3wUakBz4zT74oNUpwoP69rdf2mmE=";
   };
 
diff --git a/pkgs/by-name/fp/fpp/package.nix b/pkgs/by-name/fp/fpp/package.nix
index c065782c33ea..8b62c31cdfe7 100644
--- a/pkgs/by-name/fp/fpp/package.nix
+++ b/pkgs/by-name/fp/fpp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "PathPicker";
-    rev = version;
+    tag = version;
     sha256 = "sha256-4BkdGvG/RyF3JBnd/X5r5nboEHG4aqahcYHDunMv2zU=";
   };
 
diff --git a/pkgs/by-name/fp/fprettify/package.nix b/pkgs/by-name/fp/fprettify/package.nix
index 5443dcf9647f..6cc173ed96d0 100644
--- a/pkgs/by-name/fp/fprettify/package.nix
+++ b/pkgs/by-name/fp/fprettify/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pseewald";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "17v52rylmsy3m3j5fcb972flazykz2rvczqfh8mxvikvd6454zyj";
   };
 
diff --git a/pkgs/by-name/fq/fq/package.nix b/pkgs/by-name/fq/fq/package.nix
index b388edd34a3f..16bb24005826 100644
--- a/pkgs/by-name/fq/fq/package.nix
+++ b/pkgs/by-name/fq/fq/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wader";
     repo = "fq";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-I3mVAPNWjRHG0td1ulzGOthiNybfWLx1HgwPjFfBHCo=";
   };
 
diff --git a/pkgs/by-name/fr/frangipanni/package.nix b/pkgs/by-name/fr/frangipanni/package.nix
index 1a0711f1bf6c..1efcd7843a5f 100644
--- a/pkgs/by-name/fr/frangipanni/package.nix
+++ b/pkgs/by-name/fr/frangipanni/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "birchb1024";
     repo = "frangipanni";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jIXyqwZWfCBSDTTodHTct4V5rjYv7h4Vcw7cXOFk17w=";
   };
 
diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix
index ddf57d3fd792..3d5bf88b17cc 100644
--- a/pkgs/by-name/fr/fre/package.nix
+++ b/pkgs/by-name/fr/fre/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "camdencheek";
     repo = "fre";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cYqEPohqUmewvBUoGJQfa4ATxw2uny5+nUKtNzrxK38=";
   };
 
diff --git a/pkgs/by-name/fr/freac/package.nix b/pkgs/by-name/fr/freac/package.nix
index 15f374baf8bb..fa485d9da1a2 100644
--- a/pkgs/by-name/fr/freac/package.nix
+++ b/pkgs/by-name/fr/freac/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "enzo1982";
     repo = "freac";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bHoRxxhSM7ipRkiBG7hEa1Iw8Z3tOHQ/atngC/3X1a4=";
   };
 
diff --git a/pkgs/by-name/fr/frece/package.nix b/pkgs/by-name/fr/frece/package.nix
index 806c1496418b..396d00d98aaa 100644
--- a/pkgs/by-name/fr/frece/package.nix
+++ b/pkgs/by-name/fr/frece/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "YodaEmbedding";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CAiIqT5KuzrqbV9FVK3nZUe8MDs2KDdsKplJMI7rN9w=";
   };
 
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 642c2fdf55a4..d967d7d3183e 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -68,7 +68,7 @@ freecad-utils.makeCustomizable (
     src = fetchFromGitHub {
       owner = "FreeCAD";
       repo = "FreeCAD";
-      rev = finalAttrs.version;
+      tag = finalAttrs.version;
       hash = "sha256-u7RYSImUMAgKaAQSAGCFha++RufpZ/QuHAirbSFOUCI=";
       fetchSubmodules = true;
     };
diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index 91b50105ce87..fa516f1bc602 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FreeRDP";
     repo = "FreeRDP";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-3hBssoD6l0d1DC5SRhE7HQlcoxNPjz3G8jbQx2rzp60=";
   };
 
diff --git a/pkgs/by-name/fr/freewheeling/package.nix b/pkgs/by-name/fr/freewheeling/package.nix
index 039604733b56..5198de376ded 100644
--- a/pkgs/by-name/fr/freewheeling/package.nix
+++ b/pkgs/by-name/fr/freewheeling/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "free-wheeling";
     repo = "freewheeling";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4";
   };
 
diff --git a/pkgs/by-name/fr/freeze/package.nix b/pkgs/by-name/fr/freeze/package.nix
index 38846028c086..cdaf8540e0e9 100644
--- a/pkgs/by-name/fr/freeze/package.nix
+++ b/pkgs/by-name/fr/freeze/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "optiv";
     repo = "Freeze";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BE5MvCU+NfEccauOdWNty/FwMiWwLttPh7eE9+UzEMY=";
   };
 
diff --git a/pkgs/by-name/fr/frei/package.nix b/pkgs/by-name/fr/frei/package.nix
index 8ad8cf1a7f5c..b33a3a93a44e 100644
--- a/pkgs/by-name/fr/frei/package.nix
+++ b/pkgs/by-name/fr/frei/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alexcoder04";
     repo = "frei";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jCUr3fREawA0J8Q0U07wCpBQrjPyH0l/6tih6C9kJWc=";
   };
 
diff --git a/pkgs/by-name/fr/frei0r/package.nix b/pkgs/by-name/fr/frei0r/package.nix
index 77df045e964d..d2a4e6992135 100644
--- a/pkgs/by-name/fr/frei0r/package.nix
+++ b/pkgs/by-name/fr/frei0r/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dyne";
     repo = "frei0r";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uKYCJD88TnrJTTnzCCietNt01QPeFW+hhnjcBNKUWsY=";
   };
 
diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix
index 126e6526f6a1..d4db49794a86 100644
--- a/pkgs/by-name/fr/fricas/package.nix
+++ b/pkgs/by-name/fr/fricas/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fricas";
     repo = "fricas";
-    rev = version;
+    tag = version;
     sha256 = "sha256-EX/boSs6rK4RrJ5W6Rd0TSHsbQsNiFI1evFuNPBMeu8=";
   };
 
diff --git a/pkgs/by-name/fr/friture/package.nix b/pkgs/by-name/fr/friture/package.nix
index 9f729bda96f3..f3c1202ed7f5 100644
--- a/pkgs/by-name/fr/friture/package.nix
+++ b/pkgs/by-name/fr/friture/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tlecomte";
     repo = "friture";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1Swkk7bhQTSo17Gj0i1VNiIt+fSXgDIeWfJ9LpoUEHg=";
   };
 
diff --git a/pkgs/by-name/fr/frogmouth/package.nix b/pkgs/by-name/fr/frogmouth/package.nix
index 29680ad507a5..38a07d0fc6fb 100644
--- a/pkgs/by-name/fr/frogmouth/package.nix
+++ b/pkgs/by-name/fr/frogmouth/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "frogmouth";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0fcCON/M9JklE7X9aRfzTkEFG4ckJqLoQlYCSrWHHGQ=";
   };
 
diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix
index 09708fd6130a..55f587818824 100644
--- a/pkgs/by-name/fr/frp/package.nix
+++ b/pkgs/by-name/fr/frp/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fatedier";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-speKU15zsg7jpPP3X6/QovHWtQxzHbVMWz4YLsZhE8A=";
   };
 
diff --git a/pkgs/by-name/fr/frugal/package.nix b/pkgs/by-name/fr/frugal/package.nix
index 2380581c5e7a..4ea3018b8a48 100644
--- a/pkgs/by-name/fr/frugal/package.nix
+++ b/pkgs/by-name/fr/frugal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Workiva";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-giPlv3pf0hz2zlQ/9o12SGfwFLCtpN96tfQwP9AaPNo=";
   };
 
diff --git a/pkgs/by-name/fs/fsarchiver/package.nix b/pkgs/by-name/fs/fsarchiver/package.nix
index 90068d7cfcbf..efa3d315cd18 100644
--- a/pkgs/by-name/fs/fsarchiver/package.nix
+++ b/pkgs/by-name/fs/fsarchiver/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "fdupoux";
     repo = "fsarchiver";
-    rev = version;
+    tag = version;
     sha256 = "sha256-bEwNqPQRpjfOVTUog9wsZfS5yQ7Z21pHolPRLlbzHAA=";
   };
 
diff --git a/pkgs/by-name/fs/fscan/package.nix b/pkgs/by-name/fs/fscan/package.nix
index 857539e1077f..1ee3daeed709 100644
--- a/pkgs/by-name/fs/fscan/package.nix
+++ b/pkgs/by-name/fs/fscan/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shadow1ng";
     repo = "fscan";
-    rev = version;
+    tag = version;
     hash = "sha256-paW48xpxl/d3abDsBCPwbmSZ8yoFhlTU+VPg/Egq0eY=";
   };
 
diff --git a/pkgs/by-name/fs/fscrypt-experimental/package.nix b/pkgs/by-name/fs/fscrypt-experimental/package.nix
index 71f1f63a0773..7dcf19d13430 100644
--- a/pkgs/by-name/fs/fscrypt-experimental/package.nix
+++ b/pkgs/by-name/fs/fscrypt-experimental/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscrypt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-US1jw0XK1BcP037XPhttzBloDU62m4BVSIbsGs9LaJU=";
   };
 
diff --git a/pkgs/by-name/fs/fsearch/package.nix b/pkgs/by-name/fs/fsearch/package.nix
index 6d32a282d7c1..88f384acfe79 100644
--- a/pkgs/by-name/fs/fsearch/package.nix
+++ b/pkgs/by-name/fs/fsearch/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cboxdoerfer";
     repo = "fsearch";
-    rev = version;
+    tag = version;
     hash = "sha256-VBcoDxh4ip2zLBcXVHDe9s1lVRQF4bZJKsGUt6sPcos=";
   };
 
diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix
index 78d06b0c0f9a..c729d1707b17 100644
--- a/pkgs/by-name/fs/fselect/package.nix
+++ b/pkgs/by-name/fs/fselect/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jhspetersson";
     repo = "fselect";
-    rev = version;
+    tag = version;
     sha256 = "sha256-S7SFcOhFl5dVgUl2qlsE/Bizq8v0NPKPqBggzPGoOu8=";
   };
 
diff --git a/pkgs/by-name/fs/fsharp/package.nix b/pkgs/by-name/fs/fsharp/package.nix
index 716d637a84e8..b382dd7ff90b 100644
--- a/pkgs/by-name/fs/fsharp/package.nix
+++ b/pkgs/by-name/fs/fsharp/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "fsharp";
-    rev = version;
+    tag = version;
     sha256 = "sha256-dgTEM2aL8lVjVMuW0+HLc+TUA39IiuBv/RfHYNURh5s=";
   };
 
diff --git a/pkgs/by-name/fs/fsql/package.nix b/pkgs/by-name/fs/fsql/package.nix
index 56b9215027f6..b4c25d9bc8d3 100644
--- a/pkgs/by-name/fs/fsql/package.nix
+++ b/pkgs/by-name/fs/fsql/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kshvmdn";
     repo = "fsql";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-U6TPszqsZvoz+9GIB0wNYMRJqIDLOp/BZO3/k8FC0Gs=";
   };
 
diff --git a/pkgs/by-name/fs/fsrx/package.nix b/pkgs/by-name/fs/fsrx/package.nix
index b917a5454cbd..9b52dd5b9c09 100644
--- a/pkgs/by-name/fs/fsrx/package.nix
+++ b/pkgs/by-name/fs/fsrx/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "thatvegandev";
     repo = "fsrx";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA=";
   };
 
diff --git a/pkgs/by-name/fs/fstrm/package.nix b/pkgs/by-name/fs/fstrm/package.nix
index 899ee38533a0..4c0edeedd12d 100644
--- a/pkgs/by-name/fs/fstrm/package.nix
+++ b/pkgs/by-name/fs/fstrm/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "farsightsec";
     repo = "fstrm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/WFP2g3Vuf/qaY8pprY8XFAlpEE+0SJUlFNWfa+7ZlE=";
   };
 
diff --git a/pkgs/by-name/ft/ftgl/package.nix b/pkgs/by-name/ft/ftgl/package.nix
index 6de0411e833c..2068a7c4c328 100644
--- a/pkgs/by-name/ft/ftgl/package.nix
+++ b/pkgs/by-name/ft/ftgl/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "frankheckenbach";
     repo = "ftgl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6TDNGoMeBLnucmHRgEDIVWcjlJb7N0sTluqBwRMMWn4=";
   };
 
diff --git a/pkgs/by-name/fu/fuc/package.nix b/pkgs/by-name/fu/fuc/package.nix
index 8783a634fc47..f7fed7307c76 100644
--- a/pkgs/by-name/fu/fuc/package.nix
+++ b/pkgs/by-name/fu/fuc/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SUPERCILEX";
     repo = "fuc";
-    rev = version;
+    tag = version;
     hash = "sha256-ZEiMyX85woPOKaMtw8qqrUXUhY8Ewm71I25inUMH1GQ=";
   };
 
diff --git a/pkgs/by-name/fu/fuchsia-cursor/package.nix b/pkgs/by-name/fu/fuchsia-cursor/package.nix
index 2d567fd33410..ef6b5713c31a 100644
--- a/pkgs/by-name/fu/fuchsia-cursor/package.nix
+++ b/pkgs/by-name/fu/fuchsia-cursor/package.nix
@@ -31,7 +31,7 @@ lib.checkListOfEnum "${pname}: theme variants" [ "Fuchsia" "Fuchsia-Pop" "Fuchsi
     src = fetchFromGitHub {
       owner = "ful1e5";
       repo = "fuchsia-cursor";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-WnDtUsjRXT7bMppgwU5BIDqphP69DmPzQM/0qXES5tM=";
     };
 
diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix
index 2b375496b83e..724543b86928 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 = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CfkHGHxeDUxHWX98FgmA4RNCVlgi9XA9eYkb+G5cZTA=";
     # 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/fu/function-runner/package.nix b/pkgs/by-name/fu/function-runner/package.nix
index a64b9788accb..115e00d39c06 100644
--- a/pkgs/by-name/fu/function-runner/package.nix
+++ b/pkgs/by-name/fu/function-runner/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "function-runner";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-i1RxK5NlKNV0mVm4vio557pM2claBTHTo8vmaNQPEvw=";
   };
 
diff --git a/pkgs/by-name/fu/functionalplus/package.nix b/pkgs/by-name/fu/functionalplus/package.nix
index e86e15666de8..faf25febb74a 100644
--- a/pkgs/by-name/fu/functionalplus/package.nix
+++ b/pkgs/by-name/fu/functionalplus/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Dobiasd";
     repo = "FunctionalPlus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eKCOi5g8YdKgxaI/mLlqB2m1zwrU9DOSrQF+PW2DBBQ=";
   };
 
diff --git a/pkgs/by-name/fu/fundoc/package.nix b/pkgs/by-name/fu/fundoc/package.nix
index fb1dfc72d2ae..8ca8ab852970 100644
--- a/pkgs/by-name/fu/fundoc/package.nix
+++ b/pkgs/by-name/fu/fundoc/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "daynin";
     repo = "fundoc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8WWaYgfqGWrTV2EEeSPz1BN2ur7gsxFiHeDNMJdVDcw=";
   };
 
diff --git a/pkgs/by-name/fu/funzzy/package.nix b/pkgs/by-name/fu/funzzy/package.nix
index 64b5ae43073b..7d6c1523ecc3 100644
--- a/pkgs/by-name/fu/funzzy/package.nix
+++ b/pkgs/by-name/fu/funzzy/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cristianoliveira";
     repo = "funzzy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3EHZvgHlM3ldX6SEyqGf6MZIrDFOLXbKTZnJNczT570=";
   };
 
diff --git a/pkgs/by-name/fu/fuse-overlayfs/package.nix b/pkgs/by-name/fu/fuse-overlayfs/package.nix
index dccfb4c24a64..9832c83f4e3b 100644
--- a/pkgs/by-name/fu/fuse-overlayfs/package.nix
+++ b/pkgs/by-name/fu/fuse-overlayfs/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "fuse-overlayfs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A70AxYPKph/5zRNFRDWrwl8Csc8Vf1gmOLJ39ixJgL0=";
   };
 
diff --git a/pkgs/by-name/fu/fusionInventory/package.nix b/pkgs/by-name/fu/fusionInventory/package.nix
index 4c73b269217c..6b69cf90da78 100644
--- a/pkgs/by-name/fu/fusionInventory/package.nix
+++ b/pkgs/by-name/fu/fusionInventory/package.nix
@@ -18,7 +18,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "fusioninventory";
     repo = "fusioninventory-agent";
-    rev = version;
+    tag = version;
     sha256 = "1hbp5a9m03n6a80xc8z640zs71qhqk4ifafr6fp0vvzzvq097ip2";
   };
 
diff --git a/pkgs/by-name/fu/fuzzel/package.nix b/pkgs/by-name/fu/fuzzel/package.nix
index beb5d346dbcb..309541dc88a4 100644
--- a/pkgs/by-name/fu/fuzzel/package.nix
+++ b/pkgs/by-name/fu/fuzzel/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "fuzzel";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-FM5HvPfLVmuKpS3/0m2QM/lSRcWsVpnwtJ++L3Uo5Dc=";
   };
 
diff --git a/pkgs/by-name/fu/fuzzylite/package.nix b/pkgs/by-name/fu/fuzzylite/package.nix
index 3bdc571d12c5..75a851a6550f 100644
--- a/pkgs/by-name/fu/fuzzylite/package.nix
+++ b/pkgs/by-name/fu/fuzzylite/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fuzzylite";
     repo = "fuzzylite";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-i1txeUE/ZSRggwLDtpS8dd4uuZfHX9w3zRH0gBgGXnk=";
   };
   sourceRoot = "${src.name}/fuzzylite";
diff --git a/pkgs/by-name/fv/fvwm2/package.nix b/pkgs/by-name/fv/fvwm2/package.nix
index 52b9f2059022..e235a950caf7 100644
--- a/pkgs/by-name/fv/fvwm2/package.nix
+++ b/pkgs/by-name/fv/fvwm2/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fvwmorg";
     repo = "fvwm";
-    rev = version;
+    tag = version;
     hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg=";
   };
 
diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix
index 6ab018ebb4c0..de6c8704c15d 100644
--- a/pkgs/by-name/fv/fvwm3/package.nix
+++ b/pkgs/by-name/fv/fvwm3/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fvwmorg";
     repo = "fvwm3";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-y1buTWO1vHzloh2e4EK1dkD0uQa7lIFUbNMkEe5x6Vo=";
   };
 
diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix
index 5bc5eb315ebd..a268832a3e98 100644
--- a/pkgs/by-name/fw/fw/package.nix
+++ b/pkgs/by-name/fw/fw/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "brocode";
     repo = "fw";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bq8N49qArdF0EFIGiK4lCsC0CZxwmeo0R8OiehrifTg=";
   };
 
diff --git a/pkgs/by-name/fw/fwanalyzer/package.nix b/pkgs/by-name/fw/fwanalyzer/package.nix
index 667c558f9693..f5617c719132 100644
--- a/pkgs/by-name/fw/fwanalyzer/package.nix
+++ b/pkgs/by-name/fw/fwanalyzer/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cruise-automation";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-fcqtyfpxdjD+1GsYl05RSJaFDoLSYQDdWcQV6a+vNGA=";
   };
 
diff --git a/pkgs/by-name/fx/fx-cast-bridge/package.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix
index 99e7e80a9431..253add9458b8 100644
--- a/pkgs/by-name/fx/fx-cast-bridge/package.nix
+++ b/pkgs/by-name/fx/fx-cast-bridge/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "hensm";
     repo = "fx_cast";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg=";
   };
   sourceRoot = "${src.name}/app";
diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix
index 85130c463ffa..a83d7d58b881 100644
--- a/pkgs/by-name/fx/fx/package.nix
+++ b/pkgs/by-name/fx/fx/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "antonmedv";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-EirlA/gcW77UP9I4pVCjjG3pSYnCPw+idX9YS1izEpY=";
   };
 
diff --git a/pkgs/by-name/fy/fyi/package.nix b/pkgs/by-name/fy/fyi/package.nix
index cf6cc59ddc40..5dd2ba51e6e4 100644
--- a/pkgs/by-name/fy/fyi/package.nix
+++ b/pkgs/by-name/fy/fyi/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "fyi";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-UGkShHziREQTkQUlbFXT1144BiBApFVbCvu5A1DuoMI=";
   };
 
diff --git a/pkgs/by-name/fy/fypp/package.nix b/pkgs/by-name/fy/fypp/package.nix
index 391b1f4db6ea..20e9f6611db8 100644
--- a/pkgs/by-name/fy/fypp/package.nix
+++ b/pkgs/by-name/fy/fypp/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "aradi";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-MgGVlOqOIrIVoDfBMVpFLT26mhYndxans2hfo/+jdoA=";
   };
 
diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix
index 4be376fac6d2..2d48082e2997 100644
--- a/pkgs/by-name/fz/fzf-make/package.nix
+++ b/pkgs/by-name/fz/fzf-make/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kyu08";
     repo = "fzf-make";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OioPl2uJVepMsR1PYHpASj3yQ10bCaGFxI1wQR61EsA=";
   };
 
diff --git a/pkgs/by-name/fz/fzf-obc/package.nix b/pkgs/by-name/fz/fzf-obc/package.nix
index eaecae3adce8..f4433da724d3 100644
--- a/pkgs/by-name/fz/fzf-obc/package.nix
+++ b/pkgs/by-name/fz/fzf-obc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rockandska";
     repo = "fzf-obc";
-    rev = version;
+    tag = version;
     sha256 = "sha256-KIAlDpt1Udl+RLp3728utgQ9FCjZz/OyoG92MOJmgPI=";
   };
 
diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix
index 5ca024df633f..a9a8cdbaf9f6 100644
--- a/pkgs/by-name/fz/fzf/package.nix
+++ b/pkgs/by-name/fz/fzf/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PKfVG2eYsg3J1OixDzXsmxCtsuFhdEGyxuYtwPEdVi8=";
   };
 
diff --git a/pkgs/by-name/fz/fzy/package.nix b/pkgs/by-name/fz/fzy/package.nix
index 98842aa0cb97..cd44741397ce 100644
--- a/pkgs/by-name/fz/fzy/package.nix
+++ b/pkgs/by-name/fz/fzy/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jhawthorn";
     repo = "fzy";
-    rev = version;
+    tag = version;
     sha256 = "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k";
   };
 
diff --git a/pkgs/by-name/g3/g3kb-switch/package.nix b/pkgs/by-name/g3/g3kb-switch/package.nix
index d6851ceb9004..8095ddf8730b 100644
--- a/pkgs/by-name/g3/g3kb-switch/package.nix
+++ b/pkgs/by-name/g3/g3kb-switch/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lyokha";
     repo = "g3kb-switch";
-    rev = version;
+    tag = version;
     hash = "sha256-kTJfV0xQmWuxibUlfC1qJX2J2nrZ4wimdf/nGciQq0Y=";
   };
 
diff --git a/pkgs/by-name/ga/gabutdm/package.nix b/pkgs/by-name/ga/gabutdm/package.nix
index 1744c4f01aa5..e6eb8cb6a72e 100644
--- a/pkgs/by-name/ga/gabutdm/package.nix
+++ b/pkgs/by-name/ga/gabutdm/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gabutakut";
     repo = "gabutdm";
-    rev = version;
+    tag = version;
     hash = "sha256-FKOgoJ0QreYk3PgvUoQMczC3tXkthw86/Y3pnm6tTQk=";
   };
 
diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix
index b8266e9baf36..bb9e94679ac1 100644
--- a/pkgs/by-name/ga/galaxis/package.nix
+++ b/pkgs/by-name/ga/galaxis/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "esr";
     repo = "galaxis";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-fSzifGoSdWyFGt99slzAsqCMDoeLbBqQGXujX8QAfGc=";
   };
 
diff --git a/pkgs/by-name/ga/galerio/package.nix b/pkgs/by-name/ga/galerio/package.nix
index eab5e1f4ba95..6329866d51b3 100644
--- a/pkgs/by-name/ga/galerio/package.nix
+++ b/pkgs/by-name/ga/galerio/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dbrgn";
     repo = "galerio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JR/YfMUs5IHBRr3uYqHXLNcr23YHyDvgH2y/1ip+2Y8=";
   };
 
diff --git a/pkgs/by-name/ga/gambit-chess/package.nix b/pkgs/by-name/ga/gambit-chess/package.nix
index 8a3485276625..54b7e4243b90 100644
--- a/pkgs/by-name/ga/gambit-chess/package.nix
+++ b/pkgs/by-name/ga/gambit-chess/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maaslalani";
     repo = "gambit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RLbD9JK1yJn30WWg7KWDjJoj4WXIoy3Kb8t2F8rFPuk=";
   };
 
diff --git a/pkgs/by-name/ga/game-devices-udev-rules/package.nix b/pkgs/by-name/ga/game-devices-udev-rules/package.nix
index f4b50120ef20..7aed2d543895 100644
--- a/pkgs/by-name/ga/game-devices-udev-rules/package.nix
+++ b/pkgs/by-name/ga/game-devices-udev-rules/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "fabiscafe";
     repo = "game-devices-udev";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-dWWo3qXnxdLP68NuFKM4/Cw5yE6uAsWzj0vZa9UTT0U=";
   };
 
diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix
index 2c22af0be73b..74b04c4e3df8 100644
--- a/pkgs/by-name/ga/game-rs/package.nix
+++ b/pkgs/by-name/ga/game-rs/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "amanse";
     repo = "game-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FuZl2yNre5jNSfHqF3tjiGwg5mRKbYer2FOPpLy0OrA=";
   };
 
diff --git a/pkgs/by-name/ga/gamecube-tools/package.nix b/pkgs/by-name/ga/gamecube-tools/package.nix
index edf3e5b21684..9adb34d8b7cd 100644
--- a/pkgs/by-name/ga/gamecube-tools/package.nix
+++ b/pkgs/by-name/ga/gamecube-tools/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "devkitPro";
     repo = "gamecube-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GsTmwyxBc36Qg+UGy+cRAjGW1eh1XxV0s94B14ZJAjU=";
   };
 
diff --git a/pkgs/by-name/ga/gammu/package.nix b/pkgs/by-name/ga/gammu/package.nix
index e914f59357e4..fc6efc78a11f 100644
--- a/pkgs/by-name/ga/gammu/package.nix
+++ b/pkgs/by-name/ga/gammu/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gammu";
     repo = "gammu";
-    rev = version;
+    tag = version;
     sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I=";
   };
 
diff --git a/pkgs/by-name/ga/gandom-fonts/package.nix b/pkgs/by-name/ga/gandom-fonts/package.nix
index 13c9fe1b40ab..e3fd8efceeb1 100644
--- a/pkgs/by-name/ga/gandom-fonts/package.nix
+++ b/pkgs/by-name/ga/gandom-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "gandom-font";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nez8T0TtRLyXxIIR69LrVGde5ThCvA0fLXkYLyYQRV8=";
   };
 
diff --git a/pkgs/by-name/ga/gargoyle/package.nix b/pkgs/by-name/ga/gargoyle/package.nix
index 7fb5dd5eb010..ea046cd6a955 100644
--- a/pkgs/by-name/ga/gargoyle/package.nix
+++ b/pkgs/by-name/ga/gargoyle/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "garglk";
     repo = "garglk";
-    rev = version;
+    tag = version;
     sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz";
   };
 
diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index 050d1db2b80c..c60367a698b5 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/YOC13ut1k48vx/LapcShNfi83LxbC62yxKuanlUI9k=";
   };
 
diff --git a/pkgs/by-name/ga/gavin-bc/package.nix b/pkgs/by-name/ga/gavin-bc/package.nix
index 5cb9eaf1d887..63a3226f4fef 100644
--- a/pkgs/by-name/ga/gavin-bc/package.nix
+++ b/pkgs/by-name/ga/gavin-bc/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "git.gavinhoward.com";
     owner = "gavin";
     repo = "bc";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-V0L5OmpcI0Zu5JvESjuhp4wEs5Bu/CvjF6B5WllTEqo=";
   };
 
diff --git a/pkgs/by-name/gb/gbenchmark/package.nix b/pkgs/by-name/gb/gbenchmark/package.nix
index 10bcbd52c866..7c93d9dd19e8 100644
--- a/pkgs/by-name/gb/gbenchmark/package.nix
+++ b/pkgs/by-name/gb/gbenchmark/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "benchmark";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5xDg1duixLoWIuy59WT0r5ZBAvTR6RPP7YrhBYkMxc8=";
   };
 
diff --git a/pkgs/by-name/gb/gbsplay/package.nix b/pkgs/by-name/gb/gbsplay/package.nix
index cf77782b3646..e0638fcf1efb 100644
--- a/pkgs/by-name/gb/gbsplay/package.nix
+++ b/pkgs/by-name/gb/gbsplay/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mmitch";
     repo = "gbsplay";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-I2T77HGuzp6IYQOd8RSaWYCXy8fwz7PtMxtO5IoAzdw=";
   };
 
diff --git a/pkgs/by-name/gc/gci/package.nix b/pkgs/by-name/gc/gci/package.nix
index a4a587971c0e..fe50e58b37eb 100644
--- a/pkgs/by-name/gc/gci/package.nix
+++ b/pkgs/by-name/gc/gci/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "daixiang0";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BlR7lQnp9WMjSN5IJOK2HIKXIAkn5Pemf8qbMm83+/w=";
   };
 
diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix
index 135790f60afc..b2e13a74ca4d 100644
--- a/pkgs/by-name/gc/gcli/package.nix
+++ b/pkgs/by-name/gc/gcli/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "herrhotzenplotz";
     repo = "gcli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N5dzGhyXPDWcm/cNUSUQt4rR+PzaD1OUssRO3Sdfmoo=";
   };
 
diff --git a/pkgs/by-name/gc/gcov2lcov/package.nix b/pkgs/by-name/gc/gcov2lcov/package.nix
index 63c98769567b..6d0c0dd2dc43 100644
--- a/pkgs/by-name/gc/gcov2lcov/package.nix
+++ b/pkgs/by-name/gc/gcov2lcov/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jandelgado";
     repo = "gcov2lcov";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ifXpT5jGNaStqvzP5Rq6Hf6PFhpiKMRC+eSYOZfzt+s=";
   };
 
diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index f7ddc88d40b4..cdf88354c95f 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SWbIfAE/pmokhJO0rimfHqxqOH23HrJRTJHDikNC7TI=";
   };
 
diff --git a/pkgs/by-name/gc/gcstar/package.nix b/pkgs/by-name/gc/gcstar/package.nix
index b9638506c33c..eb89036fb65b 100644
--- a/pkgs/by-name/gc/gcstar/package.nix
+++ b/pkgs/by-name/gc/gcstar/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "Kerenoc";
     repo = "GCstar";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg=";
   };
 
diff --git a/pkgs/by-name/gd/gdlv/package.nix b/pkgs/by-name/gd/gdlv/package.nix
index 87858f7a6752..80faa829e3bf 100644
--- a/pkgs/by-name/gd/gdlv/package.nix
+++ b/pkgs/by-name/gd/gdlv/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aarzilli";
     repo = "gdlv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6NU7bhURdXM4EjVnsXVf9XFOUgHyVEI0kr15q9OnUTQ=";
   };
 
diff --git a/pkgs/by-name/gd/gdrive/package.nix b/pkgs/by-name/gd/gdrive/package.nix
index 79da48c59a9c..699f36f71454 100644
--- a/pkgs/by-name/gd/gdrive/package.nix
+++ b/pkgs/by-name/gd/gdrive/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prasmussen";
     repo = "gdrive";
-    rev = version;
+    tag = version;
     hash = "sha256-2dJmGFHfGSroucn4WgiV2NExBs5wtMDe2kX1jDBwbRs=";
   };
 
diff --git a/pkgs/by-name/gd/gdrive3/package.nix b/pkgs/by-name/gd/gdrive3/package.nix
index 07dd3f449d13..3d4078bdd048 100644
--- a/pkgs/by-name/gd/gdrive3/package.nix
+++ b/pkgs/by-name/gd/gdrive3/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "glotlabs";
     repo = "gdrive";
-    rev = version;
+    tag = version;
     hash = "sha256-1yJg+rEhKTGXC7mlHxnWGUuAm9/RwhD6/Xg/GBKyQMw=";
   };
 
diff --git a/pkgs/by-name/gd/gdtoolkit_3/package.nix b/pkgs/by-name/gd/gdtoolkit_3/package.nix
index 8469a1a647d7..d5ec6fd8a01d 100644
--- a/pkgs/by-name/gd/gdtoolkit_3/package.nix
+++ b/pkgs/by-name/gd/gdtoolkit_3/package.nix
@@ -16,7 +16,7 @@ let
         src = fetchFromGitHub {
           owner = "lark-parser";
           repo = "lark";
-          rev = version;
+          tag = version;
           hash = "sha256-KN9buVlH8hJ8t0ZP5yefeYM5vH5Gg7a7TEDGKJYpozs=";
           fetchSubmodules = true;
         };
diff --git a/pkgs/by-name/gd/gdtoolkit_4/package.nix b/pkgs/by-name/gd/gdtoolkit_4/package.nix
index 2c44701b0a67..6a54331f67fb 100644
--- a/pkgs/by-name/gd/gdtoolkit_4/package.nix
+++ b/pkgs/by-name/gd/gdtoolkit_4/package.nix
@@ -16,7 +16,7 @@ let
         src = fetchFromGitHub {
           owner = "lark-parser";
           repo = "lark";
-          rev = version;
+          tag = version;
           hash = "sha256-Dc7wbMBY8CSeP4JE3hBk5m1lwzmCnNTkVoLdIukRw1Q=";
           fetchSubmodules = true;
         };
diff --git a/pkgs/by-name/ge/gebaar-libinput/package.nix b/pkgs/by-name/ge/gebaar-libinput/package.nix
index cba94577b938..d207c03598e1 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/geek-life/package.nix b/pkgs/by-name/ge/geek-life/package.nix
index b84c87fe18e0..ab1416569fd0 100644
--- a/pkgs/by-name/ge/geek-life/package.nix
+++ b/pkgs/by-name/ge/geek-life/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ajaxray";
     repo = "geek-life";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7B/4pDOVXef2MaWKvzkUZH0/KM/O1gJjI3xPjEXqc/E=";
   };
 
diff --git a/pkgs/by-name/ge/geeqie/package.nix b/pkgs/by-name/ge/geeqie/package.nix
index 34acd23d3e58..28d8431412a8 100644
--- a/pkgs/by-name/ge/geeqie/package.nix
+++ b/pkgs/by-name/ge/geeqie/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BestImageViewer";
     repo = "geeqie";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-k2FXj2ZKZzB5XpCcWzEv7Q1ozATfU3221XKcOFdWOGU=";
   };
 
diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix
index fe8db0de28c1..34b8fb11733f 100644
--- a/pkgs/by-name/ge/geesefs/package.nix
+++ b/pkgs/by-name/ge/geesefs/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "yandex-cloud";
     repo = "geesefs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KkKdqSev6xpYfEjDSLVs/gKc3NCvLrzukNEQT2Wuk+A=";
   };
 
diff --git a/pkgs/by-name/ge/gef/package.nix b/pkgs/by-name/ge/gef/package.nix
index 8100e46bc53c..1af39c799a84 100644
--- a/pkgs/by-name/ge/gef/package.nix
+++ b/pkgs/by-name/ge/gef/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hugsy";
     repo = "gef";
-    rev = version;
+    tag = version;
     sha256 = "sha256-JM9zH1wWEdjpBafnxMIFtePjXWf3UOXhBSWZCXEOzKw=";
   };
 
diff --git a/pkgs/by-name/ge/gemget/package.nix b/pkgs/by-name/ge/gemget/package.nix
index 96326b5fdbb1..ae36348694dd 100644
--- a/pkgs/by-name/ge/gemget/package.nix
+++ b/pkgs/by-name/ge/gemget/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "makeworld-the-better-one";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-P5+yRaf2HioKOclJMMm8bJ8/BtBbNEeYU57TceZVqQ8=";
   };
 
diff --git a/pkgs/by-name/ge/gemrb/package.nix b/pkgs/by-name/ge/gemrb/package.nix
index 69d139328916..b8e496c63eea 100644
--- a/pkgs/by-name/ge/gemrb/package.nix
+++ b/pkgs/by-name/ge/gemrb/package.nix
@@ -33,7 +33,7 @@ let
   src = fetchFromGitHub {
     owner = "gemrb";
     repo = "gemrb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+aPnOJQGRblqcrblVU5ZwA8CZqeT19rxEtn3GLuofYU=";
   };
 
diff --git a/pkgs/by-name/ge/gen-license/package.nix b/pkgs/by-name/ge/gen-license/package.nix
index d55dda6ebc21..b63124cea6c6 100644
--- a/pkgs/by-name/ge/gen-license/package.nix
+++ b/pkgs/by-name/ge/gen-license/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nexxeln";
     repo = "license-generator";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-VOmt8JXd2+ykhkhupv/I4RfXz9P0eEesW3JGAoXStUI=";
   };
 
diff --git a/pkgs/by-name/ge/gen-oath-safe/package.nix b/pkgs/by-name/ge/gen-oath-safe/package.nix
index 170f154959bd..70c379156bdb 100644
--- a/pkgs/by-name/ge/gen-oath-safe/package.nix
+++ b/pkgs/by-name/ge/gen-oath-safe/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mcepl";
     repo = "gen-oath-safe";
-    rev = version;
+    tag = version;
     sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp";
   };
 
diff --git a/pkgs/by-name/ge/genact/package.nix b/pkgs/by-name/ge/genact/package.nix
index 00ecfe4e5c55..05f4c30c4d44 100644
--- a/pkgs/by-name/ge/genact/package.nix
+++ b/pkgs/by-name/ge/genact/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "genact";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Rn9kJWutWKPj9cLu2ZJKITmC+I8/ikhCAoIp00Yg6ZA=";
   };
 
diff --git a/pkgs/by-name/ge/genann/package.nix b/pkgs/by-name/ge/genann/package.nix
index ccccceee85ff..6fa6b175ff76 100644
--- a/pkgs/by-name/ge/genann/package.nix
+++ b/pkgs/by-name/ge/genann/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "codeplea";
     repo = "genann";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0z45ndpd4a64i6jayr4yxfcr5h87bsmhm7lfgnbp35pnfywiclmq";
   };
 
diff --git a/pkgs/by-name/ge/genext2fs/package.nix b/pkgs/by-name/ge/genext2fs/package.nix
index 0a3fcaaa023b..be529fcea240 100644
--- a/pkgs/by-name/ge/genext2fs/package.nix
+++ b/pkgs/by-name/ge/genext2fs/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bestouff";
     repo = "genext2fs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9LAU5XuCwwEhU985MzZ2X+YYibvyECULQSn9X2jdj5I=";
   };
 
diff --git a/pkgs/by-name/ge/genxword/package.nix b/pkgs/by-name/ge/genxword/package.nix
index a71628c42146..0cdca0d1a57f 100644
--- a/pkgs/by-name/ge/genxword/package.nix
+++ b/pkgs/by-name/ge/genxword/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "riverrun";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "17h8saja45bv612yk0pra9ncbp2mjnx5n10q25nqhl765ks4bmb5";
   };
 
diff --git a/pkgs/by-name/ge/geo/package.nix b/pkgs/by-name/ge/geo/package.nix
index 2edea658c43d..d18ecb19cb2d 100644
--- a/pkgs/by-name/ge/geo/package.nix
+++ b/pkgs/by-name/ge/geo/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "geo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lwFBevf3iP90LgnfUqweCjPBJPr2vMFtRqQXXUC+cRA=";
   };
 
diff --git a/pkgs/by-name/ge/geoipupdate/package.nix b/pkgs/by-name/ge/geoipupdate/package.nix
index 45a37d824c21..3cfc95d4b5b1 100644
--- a/pkgs/by-name/ge/geoipupdate/package.nix
+++ b/pkgs/by-name/ge/geoipupdate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maxmind";
     repo = "geoipupdate";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-XfQ5W2JbPBIAh5iF4jj9UJ4eLhhRHRwFPs0VWrBQVNA=";
   };
 
diff --git a/pkgs/by-name/ge/geonkick/package.nix b/pkgs/by-name/ge/geonkick/package.nix
index d54b9797d59c..4ec1f4e133e9 100644
--- a/pkgs/by-name/ge/geonkick/package.nix
+++ b/pkgs/by-name/ge/geonkick/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "Geonkick-Synthesizer";
     repo = "geonkick";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QtBzrYW/yYnWSXyHV63gKzgdAR5kamij9Z0g+15CTPg=";
   };
 
diff --git a/pkgs/by-name/ge/gephi/package.nix b/pkgs/by-name/ge/gephi/package.nix
index 731177a07cac..67f9ae4c06a3 100644
--- a/pkgs/by-name/ge/gephi/package.nix
+++ b/pkgs/by-name/ge/gephi/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "gephi";
     repo = "gephi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZNSEaiD32zFfF2ISKa1CmcT9Nq6r5i2rNHooQAcVbn4=";
   };
 
diff --git a/pkgs/by-name/ge/gerbera/package.nix b/pkgs/by-name/ge/gerbera/package.nix
index f24956165ee8..a265cf9cbad2 100644
--- a/pkgs/by-name/ge/gerbera/package.nix
+++ b/pkgs/by-name/ge/gerbera/package.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "gerbera";
     owner = "gerbera";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3X8/8ewqXy9tvy4S9frmPENhsYTwaW6SydtJeiyVH1I=";
   };
 
diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix
index d8910592aed6..297f11f438d9 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/ge/gerrit-queue/package.nix b/pkgs/by-name/ge/gerrit-queue/package.nix
index f0558a1b55a5..7c44ec2573f7 100644
--- a/pkgs/by-name/ge/gerrit-queue/package.nix
+++ b/pkgs/by-name/ge/gerrit-queue/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "flokli";
     repo = "gerrit-queue";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JkAYqqet6y89RTBU9FuxkMwJiGM6opL0reXbojSal3Y=";
   };
   vendorHash = "sha256-+Ig4D46NphzpWKXO23Haea9EqVtpda8v9zLPJkbe3bQ=";
diff --git a/pkgs/by-name/ge/get_iplayer/package.nix b/pkgs/by-name/ge/get_iplayer/package.nix
index 649acec9aa34..71d49a2782cd 100644
--- a/pkgs/by-name/ge/get_iplayer/package.nix
+++ b/pkgs/by-name/ge/get_iplayer/package.nix
@@ -17,7 +17,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "get-iplayer";
     repo = "get_iplayer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fqzrgmtqy7dlmGEaTXAqpdt9HqZCVooJ0Vf6/JUKihw=";
   };
 
diff --git a/pkgs/by-name/ge/getdata/package.nix b/pkgs/by-name/ge/getdata/package.nix
index aef0692613c2..43ccda1aec83 100644
--- a/pkgs/by-name/ge/getdata/package.nix
+++ b/pkgs/by-name/ge/getdata/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ketiltrout";
     repo = "getdata";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fuFakbkxDwDp6Z9VITPIB8NiYRSp98Ub1y5SC6W5S1E=";
   };
 
diff --git a/pkgs/by-name/ge/getoptions/package.nix b/pkgs/by-name/ge/getoptions/package.nix
index 344658b1962a..c7816bb19fa6 100644
--- a/pkgs/by-name/ge/getoptions/package.nix
+++ b/pkgs/by-name/ge/getoptions/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ko1nksm";
     repo = "getoptions";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hapOGPibqt2Mm6k73v63gHxrX+lifZ8xcwzj8vWbtgo=";
   };
 
diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix
index 53a20c7308a3..cd1119805df4 100644
--- a/pkgs/by-name/ge/gex/package.nix
+++ b/pkgs/by-name/ge/gex/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Piturnah";
     repo = "gex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Xer7a3UtFIv3idchI7DfZ5u6qgDW/XFWi5ihtcREXqo=";
   };
 
diff --git a/pkgs/by-name/gf/gflags/package.nix b/pkgs/by-name/gf/gflags/package.nix
index b01b862804e3..c87006e1783c 100644
--- a/pkgs/by-name/gf/gflags/package.nix
+++ b/pkgs/by-name/gf/gflags/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gflags";
     repo = "gflags";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0";
   };
 
diff --git a/pkgs/by-name/gf/gfold/package.nix b/pkgs/by-name/gf/gfold/package.nix
index 9bd3a11726e9..67896c95d620 100644
--- a/pkgs/by-name/gf/gfold/package.nix
+++ b/pkgs/by-name/gf/gfold/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "nickgerace";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-7PnqhS80Ozh5ZQNQ8iYgCiFT0JDLzhA09NV1HgrCOww=";
   };
 
diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix
index ac3834f5ad3f..1aa687da39b1 100644
--- a/pkgs/by-name/gf/gforth/package.nix
+++ b/pkgs/by-name/gf/gforth/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "forthy42";
     repo = "gforth";
-    rev = version;
+    tag = version;
     hash = "sha256-rXtmmENBt9RMdLPq8GDyndh4+CYnCmz6NYpe3kH5OwU=";
   };
 
diff --git a/pkgs/by-name/gf/gfshare/package.nix b/pkgs/by-name/gf/gfshare/package.nix
index 98f402081649..77f30ea22186 100644
--- a/pkgs/by-name/gf/gfshare/package.nix
+++ b/pkgs/by-name/gf/gfshare/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.gitano.org.uk/libgfshare.git";
-    rev = version;
+    tag = version;
     sha256 = "0s37xn9pr5p820hd40489xwra7kg3gzqrxhc2j9rnxnd489hl0pr";
   };
 
diff --git a/pkgs/by-name/gf/gfxreconstruct/package.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix
index 5c52ad7f60e4..6f2314b228a7 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/gg/gg-scm/package.nix b/pkgs/by-name/gg/gg-scm/package.nix
index e3794f8bd258..498c8f177b6b 100644
--- a/pkgs/by-name/gg/gg-scm/package.nix
+++ b/pkgs/by-name/gg/gg-scm/package.nix
@@ -21,7 +21,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "gg-scm";
     repo = "gg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qw0KWhCkJVYRhDBNtiNactWGGMHjBwdQ1Po4lQQbaj4=";
   };
   postPatch = ''
diff --git a/pkgs/by-name/gh/gh-actions-cache/package.nix b/pkgs/by-name/gh/gh-actions-cache/package.nix
index 0d48923a2874..e3e574bd2489 100644
--- a/pkgs/by-name/gh/gh-actions-cache/package.nix
+++ b/pkgs/by-name/gh/gh-actions-cache/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "actions";
     repo = "gh-actions-cache";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GVha3xxLTBTiKfAjGb2q9btsGYzWQivGLyZ4Gg0s/N0=";
   };
 
diff --git a/pkgs/by-name/gh/gh-contribs/package.nix b/pkgs/by-name/gh/gh-contribs/package.nix
index 46d11241d4f9..1881c9aa4fcb 100644
--- a/pkgs/by-name/gh/gh-contribs/package.nix
+++ b/pkgs/by-name/gh/gh-contribs/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MintArchit";
     repo = "gh-contribs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fqyxq/lpMcLXOYY0MNI5uv8Go2erpg7dEIsEI+ExSVI=";
   };
 
diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix
index b739d8d357ce..a0e2d2cfa554 100644
--- a/pkgs/by-name/gh/gh-dash/package.nix
+++ b/pkgs/by-name/gh/gh-dash/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dlvhdr";
     repo = "gh-dash";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qtSJbp9BGX4669fl/B1Z6rGG3432Nj1IQ+aYfIE9W50=";
   };
 
diff --git a/pkgs/by-name/gh/gh-f/package.nix b/pkgs/by-name/gh/gh-f/package.nix
index c479a1f875d5..761eb0420d70 100644
--- a/pkgs/by-name/gh/gh-f/package.nix
+++ b/pkgs/by-name/gh/gh-f/package.nix
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = "gh-f";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-62FVFW2KLdH0uonIf3OVBFMGLcCteMjydaLAjWtxwUo=";
   };
 
diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix
index 2cd13236cea1..5f420072aea4 100644
--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@@ -12,7 +12,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-gei";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-orDjHgyqwBo/LOuujCp/6p4G0SWDA/ZDWvtTfH1ofrU=";
   };
 
diff --git a/pkgs/by-name/gh/gh-i/package.nix b/pkgs/by-name/gh/gh-i/package.nix
index c4dbf1ba6aef..e5cc1e2f45fd 100644
--- a/pkgs/by-name/gh/gh-i/package.nix
+++ b/pkgs/by-name/gh/gh-i/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = "gh-i";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-k1xfQxRh8T0SINtbFlIVNFEODYU0RhBAkjudOv1bLvw=";
   };
 
diff --git a/pkgs/by-name/gh/gh-markdown-preview/package.nix b/pkgs/by-name/gh/gh-markdown-preview/package.nix
index 65191d3e44c6..4b4f890695e1 100644
--- a/pkgs/by-name/gh/gh-markdown-preview/package.nix
+++ b/pkgs/by-name/gh/gh-markdown-preview/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yusukebe";
     repo = "gh-markdown-preview";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5jxGFZqYkhFQ4Rx4jbI+fes9ezsuXa+VZowk5Jzhi3I=";
   };
 
diff --git a/pkgs/by-name/gh/gh-ost/package.nix b/pkgs/by-name/gh/gh-ost/package.nix
index 29b0e58ef0f3..c370b8bbad6c 100644
--- a/pkgs/by-name/gh/gh-ost/package.nix
+++ b/pkgs/by-name/gh/gh-ost/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-ost";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TTc69dWasqMVwwJNo+M9seMKEWgerZ2ZR7dwDfM1gWI=";
   };
 
diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix
index c032eaf3c222..ad0661681729 100644
--- a/pkgs/by-name/gh/gh-poi/package.nix
+++ b/pkgs/by-name/gh/gh-poi/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "seachicken";
     repo = "gh-poi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-foUv6+QIfPlYwgTwxFvEgGeOw/mpC80+ntHo29LQbB8=";
   };
 
diff --git a/pkgs/by-name/gh/gh-s/package.nix b/pkgs/by-name/gh/gh-s/package.nix
index 93ca5454b29b..7e2573eb29e8 100644
--- a/pkgs/by-name/gh/gh-s/package.nix
+++ b/pkgs/by-name/gh/gh-s/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = "gh-s";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hLfaAtWiJHCJ7MFz8dg4SJJB2cNY1gKUEwMAdRB4lr8=";
   };
 
diff --git a/pkgs/by-name/gh/gh-screensaver/package.nix b/pkgs/by-name/gh/gh-screensaver/package.nix
index 2481b2688281..43564e4f53c4 100644
--- a/pkgs/by-name/gh/gh-screensaver/package.nix
+++ b/pkgs/by-name/gh/gh-screensaver/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vilmibm";
     repo = "gh-screensaver";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MqwaqXGP4E+46vpgftZ9bttmMyENuojBnS6bWacmYLE=";
   };
 
diff --git a/pkgs/by-name/gh/ghbackup/package.nix b/pkgs/by-name/gh/ghbackup/package.nix
index 4bdacd3044eb..476440cd18d2 100644
--- a/pkgs/by-name/gh/ghbackup/package.nix
+++ b/pkgs/by-name/gh/ghbackup/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "qvl";
     repo = "ghbackup";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3LSe805VrbUGjqjnhTJD2KBVZ4rq+4Z3l4d0I1MrBMA=";
   };
 
diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix
index 0da0ca63a6d9..73b443ac28bf 100644
--- a/pkgs/by-name/gh/ghciwatch/package.nix
+++ b/pkgs/by-name/gh/ghciwatch/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MercuryTechnologies";
     repo = "ghciwatch";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-K7BNGRilzi01loE0yS4CZFDNz8TQ9Z+fELO5HUvGObE=";
   };
 
diff --git a/pkgs/by-name/gh/ghfetch/package.nix b/pkgs/by-name/gh/ghfetch/package.nix
index 86784b083ea6..1bd7bb3aab2a 100644
--- a/pkgs/by-name/gh/ghfetch/package.nix
+++ b/pkgs/by-name/gh/ghfetch/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "orangekame3";
     repo = "ghfetch";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Cmyd/wrobHPyG9ExUSfSsTwFUfbo9iuvmAr0uqunWWw=";
   };
 
diff --git a/pkgs/by-name/gh/ghorg/package.nix b/pkgs/by-name/gh/ghorg/package.nix
index ad35083adb0d..981e1300ca3f 100644
--- a/pkgs/by-name/gh/ghorg/package.nix
+++ b/pkgs/by-name/gh/ghorg/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gabrie30";
     repo = "ghorg";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-tsR7cBpDa311rLI1CTXD2LLl3j2PxkBeQsjkUP99iIo=";
   };
 
diff --git a/pkgs/by-name/gh/ghost/package.nix b/pkgs/by-name/gh/ghost/package.nix
index 9750eb5f94a1..360d47cd2fb1 100644
--- a/pkgs/by-name/gh/ghost/package.nix
+++ b/pkgs/by-name/gh/ghost/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "EntySec";
     repo = "Ghost";
-    rev = version;
+    tag = version;
     sha256 = "13p3inw7v55na8438awr692v9vb7zgf5ggxpha9r3m8vfm3sb4iz";
   };
 
diff --git a/pkgs/by-name/gh/ghostie/package.nix b/pkgs/by-name/gh/ghostie/package.nix
index 1737072421f6..32ca8ce5a934 100644
--- a/pkgs/by-name/gh/ghostie/package.nix
+++ b/pkgs/by-name/gh/ghostie/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "attriaayush";
     repo = "ghostie";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lEjJLmBA3dlIVxc8E+UvR7u154QGeCfEbxdgUxAS3Cw=";
   };
 
diff --git a/pkgs/by-name/gh/ghosttohugo/package.nix b/pkgs/by-name/gh/ghosttohugo/package.nix
index 58cde575b477..390555cb67ba 100644
--- a/pkgs/by-name/gh/ghosttohugo/package.nix
+++ b/pkgs/by-name/gh/ghosttohugo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jbarone";
     repo = "ghostToHugo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lYqjwLPvSX9/HaFvSwtkvxbCToTwfDPeVivNfazZwQA=";
   };
 
diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix
index 2a3221b08c9e..f14d0c03243d 100644
--- a/pkgs/by-name/gh/ghostunnel/package.nix
+++ b/pkgs/by-name/gh/ghostunnel/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ghostunnel";
     repo = "ghostunnel";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NnRm1HEdfK6WI5ntilLSwdR2B5czG5CIcMFzl2TzEds=";
   };
 
diff --git a/pkgs/by-name/gh/ghq/package.nix b/pkgs/by-name/gh/ghq/package.nix
index a096a25db3e7..99e4f3a5aca1 100644
--- a/pkgs/by-name/gh/ghq/package.nix
+++ b/pkgs/by-name/gh/ghq/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "x-motemen";
     repo = "ghq";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5elUUZxhKZArtToEDfjYam7GS6m30GpbBLlUNy6dIyo=";
   };
 
diff --git a/pkgs/by-name/gh/ghr/package.nix b/pkgs/by-name/gh/ghr/package.nix
index 389df793a491..cbf9dea362fb 100644
--- a/pkgs/by-name/gh/ghr/package.nix
+++ b/pkgs/by-name/gh/ghr/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tcnksm";
     repo = "ghr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Is0D8tElv86s++NV6upu8RXvce65uPWQGIOl0Ftxf/M=";
   };
 
diff --git a/pkgs/by-name/gh/ghz/package.nix b/pkgs/by-name/gh/ghz/package.nix
index a5d37a552d22..6751417c0e55 100644
--- a/pkgs/by-name/gh/ghz/package.nix
+++ b/pkgs/by-name/gh/ghz/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bojand";
     repo = "ghz";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-EzyQbMoR4veHbc9VaNfiXMi18wXbTbDPfDxo5NCk7CE=";
   };
 
diff --git a/pkgs/by-name/gi/gImageReader/package.nix b/pkgs/by-name/gi/gImageReader/package.nix
index dee339979213..52aaef317cbd 100644
--- a/pkgs/by-name/gi/gImageReader/package.nix
+++ b/pkgs/by-name/gi/gImageReader/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "manisandro";
     repo = "gImageReader";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yBkVeufRRoSAc20/8mV39widBPloHFz12K7B4Y9xiWg=";
   };
 
diff --git a/pkgs/by-name/gi/gi-crystal/package.nix b/pkgs/by-name/gi/gi-crystal/package.nix
index a783ece5d4ad..d2d39fdd673d 100644
--- a/pkgs/by-name/gi/gi-crystal/package.nix
+++ b/pkgs/by-name/gi/gi-crystal/package.nix
@@ -12,7 +12,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "hugopl";
     repo = "gi-crystal";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0LsYREn4zWLQYUTpNWJhLLHWmg7UQzxOoQiAMmw3ZXQ=";
   };
 
diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix
index fc875f7685dc..2cd77fe9ff1c 100644
--- a/pkgs/by-name/gi/giada/package.nix
+++ b/pkgs/by-name/gi/giada/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "monocasual";
     repo = "giada";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-vTOUS9mI4B3yRNnM2dNCH7jgMuD3ztdhe1FMgXUIt58=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gi/gibo/package.nix b/pkgs/by-name/gi/gibo/package.nix
index 9663311e6812..46a2ff4f0c07 100644
--- a/pkgs/by-name/gi/gibo/package.nix
+++ b/pkgs/by-name/gi/gibo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simonwhitaker";
     repo = "gibo";
-    rev = version;
+    tag = version;
     sha256 = "07j3sv9ar9l074krajw8nfmsfmdp836irsbd053dbqk2v880gfm6";
   };
 
diff --git a/pkgs/by-name/gi/gifgen/package.nix b/pkgs/by-name/gi/gifgen/package.nix
index 896d1a71a543..373912e41be8 100644
--- a/pkgs/by-name/gi/gifgen/package.nix
+++ b/pkgs/by-name/gi/gifgen/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lukechilds";
     repo = "gifgen";
-    rev = version;
+    tag = version;
     hash = "sha256-ni9RL4LyMejmu8vm5HC8WSTqAPQMBQNRDOZ4ZfvrkSU=";
   };
 
diff --git a/pkgs/by-name/gi/gifski/package.nix b/pkgs/by-name/gi/gifski/package.nix
index eb0ee73c73a9..ba42096ef2ae 100644
--- a/pkgs/by-name/gi/gifski/package.nix
+++ b/pkgs/by-name/gi/gifski/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "gifski";
-    rev = version;
+    tag = version;
     hash = "sha256-IjQ2PqjXhNvXknVxfphSSwQEWBuTkSxMFrbwd2trlVI=";
   };
 
diff --git a/pkgs/by-name/gi/gimme-aws-creds/package.nix b/pkgs/by-name/gi/gimme-aws-creds/package.nix
index ade8ddb80cce..e3dfb8cfca57 100644
--- a/pkgs/by-name/gi/gimme-aws-creds/package.nix
+++ b/pkgs/by-name/gi/gimme-aws-creds/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Nike-Inc";
     repo = "gimme-aws-creds";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fsFYcfbLeYV6tpOGgNrFmYjcUAmdsx5zwUbvcctwFVs=";
   };
 
diff --git a/pkgs/by-name/gi/gimoji/package.nix b/pkgs/by-name/gi/gimoji/package.nix
index ea4c142d369e..663e6a994388 100644
--- a/pkgs/by-name/gi/gimoji/package.nix
+++ b/pkgs/by-name/gi/gimoji/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zeenix";
     repo = "gimoji";
-    rev = version;
+    tag = version;
     hash = "sha256-X1IiDnnRXiZBL/JBDfioKc/724TnVKaEjZLrNwX5SoA=";
   };
 
diff --git a/pkgs/by-name/gi/gimx/package.nix b/pkgs/by-name/gi/gimx/package.nix
index b2e1372fc35f..0df3a8cae97f 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/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix
index 0e852265f0db..715f86999adf 100644
--- a/pkgs/by-name/gi/ginkgo/package.nix
+++ b/pkgs/by-name/gi/ginkgo/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "onsi";
     repo = "ginkgo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lDSw4BPYZ5wOuaoUtSSkdbcOpKAEuLsSwldrASpM6mA=";
   };
   vendorHash = "sha256-uqpib3k5PtQOsndic0GV1rYBeVlY5Tpg931yHfU6dWI=";
diff --git a/pkgs/by-name/gi/gio-sharp/package.nix b/pkgs/by-name/gi/gio-sharp/package.nix
index 67047b2e4fed..7919ed6489db 100644
--- a/pkgs/by-name/gi/gio-sharp/package.nix
+++ b/pkgs/by-name/gi/gio-sharp/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "gio-sharp";
 
-    rev = version;
+    tag = version;
     sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig";
   };
 
diff --git a/pkgs/by-name/gi/giph/package.nix b/pkgs/by-name/gi/giph/package.nix
index a31e134dac57..8480d811c33b 100644
--- a/pkgs/by-name/gi/giph/package.nix
+++ b/pkgs/by-name/gi/giph/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phisch";
     repo = "giph";
-    rev = version;
+    tag = version;
     sha256 = "19l46m1f32b3bagzrhaqsfnl5n3wbrmg3sdy6fdss4y1yf6nqayk";
   };
 
diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix
index 3b1bb6f0a6a4..d724320ec660 100644
--- a/pkgs/by-name/gi/gir-rs/package.nix
+++ b/pkgs/by-name/gi/gir-rs/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "gtk-rs";
     repo = "gir";
-    rev = version;
+    tag = version;
     sha256 = "sha256-GAAK4ej16e5/sjnPOVWs4ul1H9sqa+tDE8ky9tbB9No=";
   };
 
diff --git a/pkgs/by-name/gi/girouette/package.nix b/pkgs/by-name/gi/girouette/package.nix
index 36092e7bb808..38f838f68425 100644
--- a/pkgs/by-name/gi/girouette/package.nix
+++ b/pkgs/by-name/gi/girouette/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gourlaysama";
     repo = "girouette";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CROd44lCCXlWF8X/9HyjtTjSlCUFkyke+BjkD4uUqXo=";
   };
 
diff --git a/pkgs/by-name/gi/git-annex-remote-rclone/package.nix b/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
index 903c0286020b..7fc05f6458df 100644
--- a/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
+++ b/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DanielDent";
     repo = "git-annex-remote-rclone";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-B6x67XXE4BHd3x7a8pQlqPPmpy0c62ziDAldB4QpqQ4=";
   };
 
diff --git a/pkgs/by-name/gi/git-autoshare/package.nix b/pkgs/by-name/gi/git-autoshare/package.nix
index a685f182ef9b..69aa41cbd298 100644
--- a/pkgs/by-name/gi/git-autoshare/package.nix
+++ b/pkgs/by-name/gi/git-autoshare/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "acsone";
     repo = "git-autoshare";
-    rev = version;
+    tag = version;
     hash = "sha256-F8wcAayIR6MH8e0cQSwFJn/AVSLG3tVil80APjcFG/0=";
   };
 
diff --git a/pkgs/by-name/gi/git-backup-go/package.nix b/pkgs/by-name/gi/git-backup-go/package.nix
index 41fa743ccc5d..ce4653ef6677 100644
--- a/pkgs/by-name/gi/git-backup-go/package.nix
+++ b/pkgs/by-name/gi/git-backup-go/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ChappIO";
     repo = "git-backup";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Z32ThzmGkF89wsYqJnP/Koz4/2mulkrvvnUKHE6Crks=";
   };
 
diff --git a/pkgs/by-name/gi/git-branchless/package.nix b/pkgs/by-name/gi/git-branchless/package.nix
index acfa061a27fc..156b38f65dce 100644
--- a/pkgs/by-name/gi/git-branchless/package.nix
+++ b/pkgs/by-name/gi/git-branchless/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "arxanas";
     repo = "git-branchless";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8uv+sZRr06K42hmxgjrKk6FDEngUhN/9epixRYKwE3U=";
   };
 
diff --git a/pkgs/by-name/gi/git-bug-migration/package.nix b/pkgs/by-name/gi/git-bug-migration/package.nix
index 9bc2f1b30f41..2427f6f052a5 100644
--- a/pkgs/by-name/gi/git-bug-migration/package.nix
+++ b/pkgs/by-name/gi/git-bug-migration/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MichaelMure";
     repo = "git-bug-migration";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ=";
   };
 
diff --git a/pkgs/by-name/gi/git-bug/package.nix b/pkgs/by-name/gi/git-bug/package.nix
index 5423593e92de..9138cd22d2b5 100644
--- a/pkgs/by-name/gi/git-bug/package.nix
+++ b/pkgs/by-name/gi/git-bug/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "git-bug";
     repo = "git-bug";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8";
   };
 
diff --git a/pkgs/by-name/gi/git-chglog/package.nix b/pkgs/by-name/gi/git-chglog/package.nix
index 26b05361c7fc..07e14686aa3b 100644
--- a/pkgs/by-name/gi/git-chglog/package.nix
+++ b/pkgs/by-name/gi/git-chglog/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "git-chglog";
     repo = "git-chglog";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rTJn2vUrEnmG2japqCxHv3BR9MpmMfpMLO2FBP6ONbw=";
   };
 
diff --git a/pkgs/by-name/gi/git-cliff/package.nix b/pkgs/by-name/gi/git-cliff/package.nix
index 880c9c899594..cac5fd34353f 100644
--- a/pkgs/by-name/gi/git-cliff/package.nix
+++ b/pkgs/by-name/gi/git-cliff/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "git-cliff";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B421xXt7TrBJVwi04vygnw9t5o7/KLVpuItQtwV4E24=";
   };
 
diff --git a/pkgs/by-name/gi/git-codereview/package.nix b/pkgs/by-name/gi/git-codereview/package.nix
index a732301b1f43..41986048b7bc 100644
--- a/pkgs/by-name/gi/git-codereview/package.nix
+++ b/pkgs/by-name/gi/git-codereview/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "golang";
     repo = "review";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZKu/roqkTIJWwvgKWrrDN5UL53n7QVsUqpqtXnunwiQ=";
   };
 
diff --git a/pkgs/by-name/gi/git-credential-keepassxc/package.nix b/pkgs/by-name/gi/git-credential-keepassxc/package.nix
index fec95af3a761..4d906d9cbbd8 100644
--- a/pkgs/by-name/gi/git-credential-keepassxc/package.nix
+++ b/pkgs/by-name/gi/git-credential-keepassxc/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Frederick888";
     repo = "git-credential-keepassxc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qxNzWuuIoK9BJLVcWtrER+MyA5cyd03xAwGljh8DZC4=";
   };
 
diff --git a/pkgs/by-name/gi/git-credential-oauth/package.nix b/pkgs/by-name/gi/git-credential-oauth/package.nix
index 008deae36e63..6f2d8ab31c40 100644
--- a/pkgs/by-name/gi/git-credential-oauth/package.nix
+++ b/pkgs/by-name/gi/git-credential-oauth/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hickford";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-u5lTl0vZLf8P6k/W4I4qhiUPrIEsynEP0rbQt8pIEWM=";
   };
 
diff --git a/pkgs/by-name/gi/git-crypt/package.nix b/pkgs/by-name/gi/git-crypt/package.nix
index e83dbe7e7adb..2dfeb8922012 100644
--- a/pkgs/by-name/gi/git-crypt/package.nix
+++ b/pkgs/by-name/gi/git-crypt/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AGWA";
     repo = "git-crypt";
-    rev = version;
+    tag = version;
     sha256 = "sha256-GcGCX6hoKL+sNLAeGEzZpaM+cdFjcNlwYExfOFEPi0I=";
   };
 
diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix
index f98afaf57f86..c0a082fc6644 100644
--- a/pkgs/by-name/gi/git-dive/package.nix
+++ b/pkgs/by-name/gi/git-dive/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gitext-rs";
     repo = "git-dive";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sy2qNFn8JLE173HVWfFXBx21jcx4kpFMwi9a0m38lso=";
   };
 
diff --git a/pkgs/by-name/gi/git-extras/package.nix b/pkgs/by-name/gi/git-extras/package.nix
index 630542f0e4e0..18d3b5e82581 100644
--- a/pkgs/by-name/gi/git-extras/package.nix
+++ b/pkgs/by-name/gi/git-extras/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tj";
     repo = "git-extras";
-    rev = version;
+    tag = version;
     sha256 = "sha256-0XZwEhDjh+rL6ZEWb60+GUw7hFOS3Xr32hgPNJcOL9I=";
   };
 
diff --git a/pkgs/by-name/gi/git-ftp/package.nix b/pkgs/by-name/gi/git-ftp/package.nix
index 85e56bb310ba..d485a8a04333 100644
--- a/pkgs/by-name/gi/git-ftp/package.nix
+++ b/pkgs/by-name/gi/git-ftp/package.nix
@@ -23,7 +23,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "git-ftp";
     repo = "git-ftp";
-    rev = version;
+    tag = version;
     sha256 = "1hxkqf7jbrx24q18yxpnd3dxzh4xk6asymwkylp1x7zg6mcci87d";
   };
 
diff --git a/pkgs/by-name/gi/git-get/package.nix b/pkgs/by-name/gi/git-get/package.nix
index ccdfbf5e67f2..3471ea548f0c 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 = pname;
-    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/git-hound/package.nix b/pkgs/by-name/gi/git-hound/package.nix
index 67431b03b747..a2117fb5fd6e 100644
--- a/pkgs/by-name/gi/git-hound/package.nix
+++ b/pkgs/by-name/gi/git-hound/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tillson";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W+rYDyRIw4jWWO4UZkUHFq/D/7ZXM+y5vdbclk6S0ro=";
   };
 
diff --git a/pkgs/by-name/gi/git-hub/package.nix b/pkgs/by-name/gi/git-hub/package.nix
index 33f3ea47d452..891f50e3c24b 100644
--- a/pkgs/by-name/gi/git-hub/package.nix
+++ b/pkgs/by-name/gi/git-hub/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sociomantic-tsunami";
     repo = "git-hub";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fb/WDmBx1Vayu4fLeG+D1nmHJJawgIAAXcQsABsenBo=";
   };
 
diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix
index e8937ae98db9..344a233ff51c 100644
--- a/pkgs/by-name/gi/git-igitt/package.nix
+++ b/pkgs/by-name/gi/git-igitt/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "mlange-42";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-JXEWnekL9Mtw0S3rI5aeO1HB9kJ7bRJDJ6EJ4ATlFeQ=";
   };
 
diff --git a/pkgs/by-name/gi/git-ignore/package.nix b/pkgs/by-name/gi/git-ignore/package.nix
index 992c25b89a3c..c0cb55f03f29 100644
--- a/pkgs/by-name/gi/git-ignore/package.nix
+++ b/pkgs/by-name/gi/git-ignore/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sondr3";
     repo = "git-ignore";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KIdhsbD9v2kCM2C/kSJCleyniEz4Bw7UxBsF762fnJs=";
   };
 
diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix
index 240927c7a8c0..240b2f6c46c5 100644
--- a/pkgs/by-name/gi/git-instafix/package.nix
+++ b/pkgs/by-name/gi/git-instafix/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "quodlibetor";
     repo = "git-instafix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Uz+KQ8cQT3v97EtmbAv2II30dUrFD0hMo/GhnqcdBOs=";
   };
 
diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
index 729f87171641..d29c9aafb425 100644
--- a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
+++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MitMaro";
     repo = "git-interactive-rebase-tool";
-    rev = version;
+    tag = version;
     hash = "sha256-NlnESZua4OP7rhMoER/VgBST9THqISQ0LCG1ZakNTqs=";
   };
 
diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix
index d0ca3b0f5c00..15aa1b1c96e3 100644
--- a/pkgs/by-name/gi/git-mit/package.nix
+++ b/pkgs/by-name/gi/git-mit/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "PurpleBooth";
     repo = "git-mit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+7rl4wxVQq4bLBsnLSeJD+1kkRuf7FCi81pXGrNNOPI=";
   };
 
diff --git a/pkgs/by-name/gi/git-my/package.nix b/pkgs/by-name/gi/git-my/package.nix
index 7ad13dda2f6e..16a3689b6922 100644
--- a/pkgs/by-name/gi/git-my/package.nix
+++ b/pkgs/by-name/gi/git-my/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "davidosomething";
     repo = "git-my";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-GzBNtsCrs2M0UBc1FVE+4yUNLpjDGUfekc/LIvgvUUo=";
   };
 
diff --git a/pkgs/by-name/gi/git-nomad/package.nix b/pkgs/by-name/gi/git-nomad/package.nix
index 296bac2ec541..b88581530354 100644
--- a/pkgs/by-name/gi/git-nomad/package.nix
+++ b/pkgs/by-name/gi/git-nomad/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rraval";
     repo = "git-nomad";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-G/i+mCKZSe8tPMuCLzymkU9SGyFNHY74cGhcC4ru0/k=";
   };
 
diff --git a/pkgs/by-name/gi/git-octopus/package.nix b/pkgs/by-name/gi/git-octopus/package.nix
index 3fae553d19e6..5846d919abbc 100644
--- a/pkgs/by-name/gi/git-octopus/package.nix
+++ b/pkgs/by-name/gi/git-octopus/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lesfurets";
     repo = "git-octopus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "14p61xk7jankp6gc26xciag9fnvm7r9vcbhclcy23f4ghf4q4sj1";
   };
 
diff --git a/pkgs/by-name/gi/git-open/package.nix b/pkgs/by-name/gi/git-open/package.nix
index 61dbfbd172d4..75bb834a66de 100644
--- a/pkgs/by-name/gi/git-open/package.nix
+++ b/pkgs/by-name/gi/git-open/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-open";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bZOknoRMkPqm1pFFFbvrHrSi90ANLEE5fLcABYHov6Q=";
   };
 
diff --git a/pkgs/by-name/gi/git-pr/package.nix b/pkgs/by-name/gi/git-pr/package.nix
index 2edcddc5acf8..07ec5aac695c 100644
--- a/pkgs/by-name/gi/git-pr/package.nix
+++ b/pkgs/by-name/gi/git-pr/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "picosh";
     repo = "git-pr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2A2rP7yr8faVoIYAWprr+t7MwDPerhsuOjWWEl1mhXw=";
   };
 
diff --git a/pkgs/by-name/gi/git-privacy/package.nix b/pkgs/by-name/gi/git-privacy/package.nix
index e058e8d5ced3..570133f9c573 100644
--- a/pkgs/by-name/gi/git-privacy/package.nix
+++ b/pkgs/by-name/gi/git-privacy/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "EMPRI-DEVOPS";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-b2RkRL8/mZwqc3xCs+oltzualhQtp/7F9POlLlT3UUU=";
   };
 
diff --git a/pkgs/by-name/gi/git-quick-stats/package.nix b/pkgs/by-name/gi/git-quick-stats/package.nix
index 9088148dd9ea..f6c41cfc2230 100644
--- a/pkgs/by-name/gi/git-quick-stats/package.nix
+++ b/pkgs/by-name/gi/git-quick-stats/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "git-quick-stats";
     owner = "arzzen";
-    rev = version;
+    tag = version;
     sha256 = "sha256-k8JydRHjEJ4z5uJXCijF7DB9hULbLQ6YfJgFJLX4Ug4=";
   };
 
diff --git a/pkgs/by-name/gi/git-quickfix/package.nix b/pkgs/by-name/gi/git-quickfix/package.nix
index 3649ffb7d400..c1b0b59cd4b2 100644
--- a/pkgs/by-name/gi/git-quickfix/package.nix
+++ b/pkgs/by-name/gi/git-quickfix/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "siedentop";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-IAjet/bDG/Hf/whS+yrEQSquj8s5DEmFis+5ysLLuxs=";
   };
 
diff --git a/pkgs/by-name/gi/git-radar/package.nix b/pkgs/by-name/gi/git-radar/package.nix
index 6b53ea4e067b..455b739b6aa8 100644
--- a/pkgs/by-name/gi/git-radar/package.nix
+++ b/pkgs/by-name/gi/git-radar/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaeldfallen";
     repo = "git-radar";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0c3zp8s4w7m4s71qgwk1jyfc8yzw34f2hi43x1w437ypgabwg81j";
   };
 
diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix
index 28766f08da6a..ce0c1ff392a6 100644
--- a/pkgs/by-name/gi/git-repo/package.nix
+++ b/pkgs/by-name/gi/git-repo/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mPmOnq9j9vnfTynGbOoChLslpyTpIzH6+B2fv5PTHZY=";
   };
 
diff --git a/pkgs/by-name/gi/git-run/package.nix b/pkgs/by-name/gi/git-run/package.nix
index a50242ccef3a..a8a4374f2dbd 100644
--- a/pkgs/by-name/gi/git-run/package.nix
+++ b/pkgs/by-name/gi/git-run/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mixu";
     repo = "gr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WPnar87p0GYf6ehhVEUeZd2pTjS95Zl6NpiJuIOQ5Tc=";
   };
 
diff --git a/pkgs/by-name/gi/git-secrets/package.nix b/pkgs/by-name/gi/git-secrets/package.nix
index 314bdecb74d7..fe58996cded6 100644
--- a/pkgs/by-name/gi/git-secrets/package.nix
+++ b/pkgs/by-name/gi/git-secrets/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "git-secrets";
-    rev = version;
+    tag = version;
     sha256 = "10lnxg0q855zi3d6804ivlrn6dc817kilzdh05mmz8a0ccvm2qc7";
   };
 
diff --git a/pkgs/by-name/gi/git-sim/package.nix b/pkgs/by-name/gi/git-sim/package.nix
index 093a54006f7a..c58d73380995 100644
--- a/pkgs/by-name/gi/git-sim/package.nix
+++ b/pkgs/by-name/gi/git-sim/package.nix
@@ -44,7 +44,7 @@ buildPythonApplication {
   src = fetchFromGitHub {
     owner = "initialcommit-com";
     repo = "git-sim";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4jHkAlF2SAzHjBi8pmAJ0TKkcLxw+6EdGsXnHZUMILw=";
   };
 
diff --git a/pkgs/by-name/gi/git-sizer/package.nix b/pkgs/by-name/gi/git-sizer/package.nix
index df6e00c22da5..b17bc572c3aa 100644
--- a/pkgs/by-name/gi/git-sizer/package.nix
+++ b/pkgs/by-name/gi/git-sizer/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "github";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-On7QBTzKfnuuzwMQ8m1odxGqfIKL+EDg5V05Kxuhmqw=";
   };
 
diff --git a/pkgs/by-name/gi/git-standup/package.nix b/pkgs/by-name/gi/git-standup/package.nix
index ce0acd7f4f40..1b25ff935304 100644
--- a/pkgs/by-name/gi/git-standup/package.nix
+++ b/pkgs/by-name/gi/git-standup/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kamranahmedse";
     repo = "git-standup";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-x7Z4w4UzshXYc25ag6HopRrKbP+/ELkFPdsUBaUE1vY=";
   };
 
diff --git a/pkgs/by-name/gi/git-subrepo/package.nix b/pkgs/by-name/gi/git-subrepo/package.nix
index 1d3a84f12436..47b4bd5f99f4 100644
--- a/pkgs/by-name/gi/git-subrepo/package.nix
+++ b/pkgs/by-name/gi/git-subrepo/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ingydotnet";
     repo = "git-subrepo";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Fwh4haGXVDsLexe/1kjUhY4lF6u5cTrAwivZiOkPig0=";
   };
 
diff --git a/pkgs/by-name/gi/git-subtrac/package.nix b/pkgs/by-name/gi/git-subtrac/package.nix
index 9a454cad5af6..1dfa6fa665e6 100644
--- a/pkgs/by-name/gi/git-subtrac/package.nix
+++ b/pkgs/by-name/gi/git-subtrac/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "apenwarr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3Z1AbPPsTBa3rqfvNAMBz7CIRq/zc9q5/TcLJWYSNlw=";
   };
 
diff --git a/pkgs/by-name/gi/git-team/package.nix b/pkgs/by-name/gi/git-team/package.nix
index 081c8dc5e71d..1cd32659809c 100644
--- a/pkgs/by-name/gi/git-team/package.nix
+++ b/pkgs/by-name/gi/git-team/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hekmekk";
     repo = "git-team";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+j5d1tImVHaTx63uzLdh2YNCFa1ErAVv4OMwxOutBQ4=";
   };
 
diff --git a/pkgs/by-name/gi/git-test/package.nix b/pkgs/by-name/gi/git-test/package.nix
index 388be610c084..23b04d944ffc 100644
--- a/pkgs/by-name/gi/git-test/package.nix
+++ b/pkgs/by-name/gi/git-test/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spotify";
     repo = "git-test";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "01h3f0andv1p7pwir3k6n01v92hgr5zbjadfwl144yjw9x37fm2f";
   };
 
diff --git a/pkgs/by-name/gi/git-trim/package.nix b/pkgs/by-name/gi/git-trim/package.nix
index 1c4019f3c5a3..8480e828d373 100644
--- a/pkgs/by-name/gi/git-trim/package.nix
+++ b/pkgs/by-name/gi/git-trim/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "foriequal0";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM=";
   };
 
diff --git a/pkgs/by-name/gi/git-vendor/package.nix b/pkgs/by-name/gi/git-vendor/package.nix
index b8132fc6cdb2..bec7095f54d4 100644
--- a/pkgs/by-name/gi/git-vendor/package.nix
+++ b/pkgs/by-name/gi/git-vendor/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "brettlangdon";
     repo = "git-vendor";
-    rev = "v${version}";
+    tag = "v${version}";
     inherit sha256;
   };
 
diff --git a/pkgs/by-name/gi/git-when-merged/package.nix b/pkgs/by-name/gi/git-when-merged/package.nix
index d4df916a75c6..c608d34db3bc 100644
--- a/pkgs/by-name/gi/git-when-merged/package.nix
+++ b/pkgs/by-name/gi/git-when-merged/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mhagger";
     repo = "git-when-merged";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Yp/GNzD+7EPlk/kzZnT1eiSNsSxpYEiZezRbUU3HfLc=";
   };
 
diff --git a/pkgs/by-name/gi/git-who/package.nix b/pkgs/by-name/gi/git-who/package.nix
index bc646ec29ff6..d0e7adab1b0f 100644
--- a/pkgs/by-name/gi/git-who/package.nix
+++ b/pkgs/by-name/gi/git-who/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sinclairtarget";
     repo = "git-who";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-64Hb2+ZCXJis19V0WDyZ0SHZX99Dqxr3UGQTQZSCAp8=";
   };
 
diff --git a/pkgs/by-name/gi/git2-cpp/package.nix b/pkgs/by-name/gi/git2-cpp/package.nix
index 18d50cc242a8..974b07bd2c59 100644
--- a/pkgs/by-name/gi/git2-cpp/package.nix
+++ b/pkgs/by-name/gi/git2-cpp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ken-matsui";
     repo = "git2-cpp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-2jKSQW6dUCIKtl33paSTuZdYAaYdFnILx/Gxv/ghFiI=";
   };
 
diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix
index 03f5377faced..681cfaaf8e16 100644
--- a/pkgs/by-name/gi/gitaly/git.nix
+++ b/pkgs/by-name/gi/gitaly/git.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "git";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6KI8V6TDh8DYizvHFeaXBz5HlEPLNQzEZAEplVsvZUc=";
   };
 
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 59a5dfa0729b..ec306192b3d6 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitaly";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-uyXxNuHQUlXCNQcrEIoaJXpatfM5fcIk5MCNYt8QW9A=";
     };
 
diff --git a/pkgs/by-name/gi/gitbatch/package.nix b/pkgs/by-name/gi/gitbatch/package.nix
index f00fc4d95be1..aecb6865550e 100644
--- a/pkgs/by-name/gi/gitbatch/package.nix
+++ b/pkgs/by-name/gi/gitbatch/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "isacikgoz";
     repo = "gitbatch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ovmdbyPRSebwmW6AW55jBgBKaNdY6w5/wrpUF2cMKw8=";
   };
 
diff --git a/pkgs/by-name/gi/gitcs/package.nix b/pkgs/by-name/gi/gitcs/package.nix
index eec5ebc7203b..89a8b94403f6 100644
--- a/pkgs/by-name/gi/gitcs/package.nix
+++ b/pkgs/by-name/gi/gitcs/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knbr13";
     repo = "gitcs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IyhVVRTKftZIzqMH5pBUMLPIk8bk0rVAxPKD6bABP68=";
   };
 
diff --git a/pkgs/by-name/gi/gitflow/package.nix b/pkgs/by-name/gi/gitflow/package.nix
index d25041e1bf6d..7a55f8211e31 100644
--- a/pkgs/by-name/gi/gitflow/package.nix
+++ b/pkgs/by-name/gi/gitflow/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "petervanderdoes";
     repo = "gitflow";
-    rev = version;
+    tag = version;
     sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8=";
   };
 
diff --git a/pkgs/by-name/gi/gitfs/package.nix b/pkgs/by-name/gi/gitfs/package.nix
index 3b9cf7cfe17b..fdba510b0cc3 100644
--- a/pkgs/by-name/gi/gitfs/package.nix
+++ b/pkgs/by-name/gi/gitfs/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "PressLabs";
     repo = "gitfs";
-    rev = version;
+    tag = version;
     sha256 = "1jzwdwan8ndvp2lw6j7zbvg5k9rgf2d8dcxjrwc6bwyk59xdxn4p";
   };
 
diff --git a/pkgs/by-name/gi/githooks/package.nix b/pkgs/by-name/gi/githooks/package.nix
index 262c17e334f6..794cfa39069b 100644
--- a/pkgs/by-name/gi/githooks/package.nix
+++ b/pkgs/by-name/gi/githooks/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gabyx";
     repo = "githooks";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pTSC8ruNiPzQO1C6j+G+WFX3pz/mWPukuWkKUSYdfHw=";
   };
 
diff --git a/pkgs/by-name/gi/github-commenter/package.nix b/pkgs/by-name/gi/github-commenter/package.nix
index 1bf88c51cebd..5151253dd79c 100644
--- a/pkgs/by-name/gi/github-commenter/package.nix
+++ b/pkgs/by-name/gi/github-commenter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudposse";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-x3/ae22ub9Us3mvSmvq9ohlkujvZCUfSrmZeQNvIWzE=";
   };
 
diff --git a/pkgs/by-name/gi/github-markdown-toc-go/package.nix b/pkgs/by-name/gi/github-markdown-toc-go/package.nix
index a80ac4af93b6..2159148c408d 100644
--- a/pkgs/by-name/gi/github-markdown-toc-go/package.nix
+++ b/pkgs/by-name/gi/github-markdown-toc-go/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ekalinin";
     repo = "github-markdown-toc.go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tZGAvbC9lrNhtRubCJUkQShRsfCsaAeI6XHhSp4FkS0=";
   };
 
diff --git a/pkgs/by-name/gi/gitjacker/package.nix b/pkgs/by-name/gi/gitjacker/package.nix
index a438550c4a5c..281f06006bae 100644
--- a/pkgs/by-name/gi/gitjacker/package.nix
+++ b/pkgs/by-name/gi/gitjacker/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = "gitjacker";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rEn9FpcRfEt2yGepIPEAO9m8JeVb+nMhYMBWhC/barc=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix
index 1dc740ba16f2..fb797e394fbf 100644
--- a/pkgs/by-name/gi/gitlab-ci-local/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "firecow";
     repo = "gitlab-ci-local";
-    rev = version;
+    tag = version;
     hash = "sha256-4Hn/I0PJ5w+Wb3tI8szy4I/vHso85GTFyT2Ek+WbYxs=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
index 83ef36cce08d..fb33c4bb8410 100644
--- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alesbrelih";
     repo = "gitlab-ci-ls";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-SVsQnY/TrFQXgvT5goXQqb5MYxU7untDq361EY7KRDQ=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
index 744fc4dd5361..1a37fc998a76 100644
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-elasticsearch-indexer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jrUNOxqc/k4a/34nHEatGnBorTlh/EuHnEs/GfFRUcI=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 7edd5a1c238e..0c6a1629c225 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B/v0jj5hoNmF9cygvi9eLQ4pLuZ1+wIyNnJN2uCAXdE=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-release-cli/package.nix b/pkgs/by-name/gi/gitlab-release-cli/package.nix
index 7e827c7d3c38..887ddc2afe34 100644
--- a/pkgs/by-name/gi/gitlab-release-cli/package.nix
+++ b/pkgs/by-name/gi/gitlab-release-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "release-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-J+9BbzZYLR4Ie01NtjZRCcL/HtR78BiTEqFimfni/ps=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix
index c6b1e749983a..0a2b33ee2edc 100644
--- a/pkgs/by-name/gi/gitlab-shell/package.nix
+++ b/pkgs/by-name/gi/gitlab-shell/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6bRiw8TC7E/eUc0Zwp46kLbe5QzZ+nXL6YY2u+mjFRw=";
   };
 
diff --git a/pkgs/by-name/gi/gitless/package.nix b/pkgs/by-name/gi/gitless/package.nix
index 3a571c13da3f..91f84f950925 100644
--- a/pkgs/by-name/gi/gitless/package.nix
+++ b/pkgs/by-name/gi/gitless/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "goldstar611";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-XDB1i2b1reMCM6i1uK3IzTnsoLXO7jldYtNlYUo1AoQ=";
   };
 
diff --git a/pkgs/by-name/gi/gitls/package.nix b/pkgs/by-name/gi/gitls/package.nix
index e03454b74a14..d6fd755d98cf 100644
--- a/pkgs/by-name/gi/gitls/package.nix
+++ b/pkgs/by-name/gi/gitls/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hahwul";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kLkH/nNidd1QNPKvo7fxZwMhTgd4AVB8Ofw0Wo0z6c0=";
   };
 
diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix
index 867bc19a9bd8..8dd46958a57b 100644
--- a/pkgs/by-name/gi/gitnr/package.nix
+++ b/pkgs/by-name/gi/gitnr/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "reemus-dev";
     repo = "gitnr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9vx+bGfYuJuafZUY2ZT4SAgrNcSXuMe1kHH/lrpItvM=";
   };
 
diff --git a/pkgs/by-name/gi/gitolite/package.nix b/pkgs/by-name/gi/gitolite/package.nix
index 0a4b4b9a2df6..139041388817 100644
--- a/pkgs/by-name/gi/gitolite/package.nix
+++ b/pkgs/by-name/gi/gitolite/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sitaramc";
     repo = "gitolite";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/VBu+aepIrxWc2padPa/WoXbIdKfIwqmA/M8d1GE5FI=";
   };
 
diff --git a/pkgs/by-name/gi/gitopper/package.nix b/pkgs/by-name/gi/gitopper/package.nix
index e1b5d8b9674f..0e23be0be50b 100644
--- a/pkgs/by-name/gi/gitopper/package.nix
+++ b/pkgs/by-name/gi/gitopper/package.nix
@@ -15,7 +15,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "miekg";
     repo = "gitopper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-y0gzoXSIQDQ6TMVsAijPaN0sRqFEtTKyd297YxXAukM=";
   };
 
diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix
index 3a3c636ba646..348039a3b94f 100644
--- a/pkgs/by-name/gi/gitoxide/package.nix
+++ b/pkgs/by-name/gi/gitoxide/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "GitoxideLabs";
     repo = "gitoxide";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hrCWt4cCnlH3NKH5Uugf/rvVN+YpbeZgZ/lhnQGZ2I0=";
   };
 
diff --git a/pkgs/by-name/gi/gitprompt-rs/package.nix b/pkgs/by-name/gi/gitprompt-rs/package.nix
index 888167b3b2bd..f47603f9ac12 100644
--- a/pkgs/by-name/gi/gitprompt-rs/package.nix
+++ b/pkgs/by-name/gi/gitprompt-rs/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "9ary";
     repo = "gitprompt-rs";
-    rev = version;
+    tag = version;
     hash = "sha256-U0ylhgD86lbXvt6jMLaEQdL/zbcbXnfrA72FMEzBkN0=";
   };
 
diff --git a/pkgs/by-name/gi/gitrs/package.nix b/pkgs/by-name/gi/gitrs/package.nix
index d6a3942e7320..b0d3507dd46e 100644
--- a/pkgs/by-name/gi/gitrs/package.nix
+++ b/pkgs/by-name/gi/gitrs/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mccurdyc";
     repo = "gitrs";
-    rev = version;
+    tag = version;
     hash = "sha256-+43XJroPNWmdUC6FDL84rZWrJm5fzuUXfpDkAMyVQQg=";
   };
 
diff --git a/pkgs/by-name/gi/gitsign/package.nix b/pkgs/by-name/gi/gitsign/package.nix
index 3fc0d48b32d7..6ea33d91d5cc 100644
--- a/pkgs/by-name/gi/gitsign/package.nix
+++ b/pkgs/by-name/gi/gitsign/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MOj3bpVgeZlsvJqPD5mAud7jSHsRPCKvYAe2aQ4rWcw=";
   };
   vendorHash = "sha256-POB8mSGyW45RSbNq9Vp/LW3jEtnHi7zufihXFTnWEfw=";
diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix
index 6be2cb9f6f0f..43d2a262081f 100644
--- a/pkgs/by-name/gi/gitstatus/package.nix
+++ b/pkgs/by-name/gi/gitstatus/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "gitstatus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-b+9bwJ87VV6rbOPobkwMkDXGH34STjYPlt8wCRR5tEc=";
   };
 
diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix
index de8ebf6d45df..ba76edf32c8d 100644
--- a/pkgs/by-name/gi/gittuf/package.nix
+++ b/pkgs/by-name/gi/gittuf/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gittuf";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gvRr+Q5XCfhtIOdxQdDwLXvo/+GHDuxaEcEpctevWew=";
   };
 
diff --git a/pkgs/by-name/gi/gitty/package.nix b/pkgs/by-name/gi/gitty/package.nix
index f077396684d6..c5838f67df5d 100644
--- a/pkgs/by-name/gi/gitty/package.nix
+++ b/pkgs/by-name/gi/gitty/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "muesli";
     repo = "gitty";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-g0D6nJiHY7cz72DSmdQZsj9Vgv/VOp0exTcLsaypGiU=";
   };
 
diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix
index 240fe153c07f..1856579890b7 100644
--- a/pkgs/by-name/gi/gitu/package.nix
+++ b/pkgs/by-name/gi/gitu/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "altsem";
     repo = "gitu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-c2YVcE+a/9Z6qTLEbcSFE6393SEeudyvdbzCRJfszcc=";
   };
 
diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix
index f1db72724190..b6361fdf3a2a 100644
--- a/pkgs/by-name/gi/gitui/package.nix
+++ b/pkgs/by-name/gi/gitui/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "extrawurst";
     repo = "gitui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jKJ1XnF6S7clyFGN2o3bHnYpC4ckl/lNXscmf6GRLbI=";
   };
 
diff --git a/pkgs/by-name/gi/gitwatch/package.nix b/pkgs/by-name/gi/gitwatch/package.nix
index 468618c604d9..3e34b48f2b8a 100644
--- a/pkgs/by-name/gi/gitwatch/package.nix
+++ b/pkgs/by-name/gi/gitwatch/package.nix
@@ -17,7 +17,7 @@ runCommand "gitwatch"
     src = fetchFromGitHub {
       owner = "gitwatch";
       repo = "gitwatch";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-KuWD2FAMi2vZ/7e4fIg97DGuAPEV9b9iOuF8NIGFVpE=";
     };
     nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/gi/gixy/package.nix b/pkgs/by-name/gi/gixy/package.nix
index 5d1bfb65d4c2..2cb1d7a27886 100644
--- a/pkgs/by-name/gi/gixy/package.nix
+++ b/pkgs/by-name/gi/gixy/package.nix
@@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yandex";
     repo = "gixy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "14arz3fjidb8z37m08xcpih1391varj8s0v3gri79z3qb4zq5k6b";
   };
 
diff --git a/pkgs/by-name/gj/gjo/package.nix b/pkgs/by-name/gj/gjo/package.nix
index cdb84410bf18..2bf11e1269a6 100644
--- a/pkgs/by-name/gj/gjo/package.nix
+++ b/pkgs/by-name/gj/gjo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "skanehira";
     repo = "gjo";
-    rev = version;
+    tag = version;
     hash = "sha256-vEk5MZqwAMgqMLjwRJwnbx8nVyF3U2iUz0S3L0GmCh4=";
   };
 
diff --git a/pkgs/by-name/gl/glas/package.nix b/pkgs/by-name/gl/glas/package.nix
index 45f7ae6715ff..1c76688287c0 100644
--- a/pkgs/by-name/gl/glas/package.nix
+++ b/pkgs/by-name/gl/glas/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "maurobalbi";
     repo = "glas";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jMpFxzosaCedwsJ8URlR3Gd/mnlgSBEfA3oIymmEPFU=";
   };
 
diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix
index 845080180656..806ff04c9057 100644
--- a/pkgs/by-name/gl/glauth/package.nix
+++ b/pkgs/by-name/gl/glauth/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "glauth";
     repo = "glauth";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FOhtL8nIm5kuKRxFtkrDyUU2z1K22ZdHaes3GY0KmfQ=";
   };
 
diff --git a/pkgs/by-name/gl/glava/package.nix b/pkgs/by-name/gl/glava/package.nix
index 742fbe2a72d0..8d7a6b9767c5 100644
--- a/pkgs/by-name/gl/glava/package.nix
+++ b/pkgs/by-name/gl/glava/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wacossusca34";
     repo = "glava";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0kqkjxmpqkmgby05lsf6c6iwm45n33jk5qy6gi3zvjx4q4yzal1i";
   };
 
diff --git a/pkgs/by-name/gl/glbinding/package.nix b/pkgs/by-name/gl/glbinding/package.nix
index 91d92fa27d7c..c9caa096a188 100644
--- a/pkgs/by-name/gl/glbinding/package.nix
+++ b/pkgs/by-name/gl/glbinding/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cginternals";
     repo = "glbinding";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-EHvudihHL/MEVo0lbSqxrgc6TJnPH8Ia6bCJK0yNCbg=";
   };
 
diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix
index fa740ddbaccf..d05cd69a781d 100644
--- a/pkgs/by-name/gl/glfw3/package.nix
+++ b/pkgs/by-name/gl/glfw3/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "glfw";
     repo = "GLFW";
-    rev = version;
+    tag = version;
     hash = "sha256-FcnQPDeNHgov1Z07gjFze0VMz2diOrpbKZCsI96ngz0=";
   };
 
diff --git a/pkgs/by-name/gl/glicol-cli/package.nix b/pkgs/by-name/gl/glicol-cli/package.nix
index 3bb374b47600..b8763263a64f 100644
--- a/pkgs/by-name/gl/glicol-cli/package.nix
+++ b/pkgs/by-name/gl/glicol-cli/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "glicol";
     repo = "glicol-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v90FfF4vP5UPy8VnQFvYMKiCrledgNMpWbJR59Cv6a0=";
   };
 
diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix
index 3df8b59ba5a4..d5919e99e1d2 100644
--- a/pkgs/by-name/gl/glide-media-player/package.nix
+++ b/pkgs/by-name/gl/glide-media-player/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "philn";
     repo = "glide";
-    rev = version;
+    tag = version;
     hash = "sha256-gmBXUj6LxC7VDH/ni8neYivysagqcbI/UCUq9Ly3D24=";
   };
 
diff --git a/pkgs/by-name/gl/glider/package.nix b/pkgs/by-name/gl/glider/package.nix
index 86d33e603021..d7aac90e46c4 100644
--- a/pkgs/by-name/gl/glider/package.nix
+++ b/pkgs/by-name/gl/glider/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nadoo";
     repo = "glider";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LrIHdI1/55llENjDgFJxh2KKsJf/tLT3P9L9jhLhfS0=";
   };
 
diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix
index c7f5633a021b..e151ea000fab 100644
--- a/pkgs/by-name/gl/glitter/package.nix
+++ b/pkgs/by-name/gl/glitter/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "milo123459";
     repo = "glitter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dImQLC7owPf2EB5COO5vjN3a6k7gJ88D2hMSUW2/wn4=";
   };
 
diff --git a/pkgs/by-name/gl/glm/package.nix b/pkgs/by-name/gl/glm/package.nix
index 1cda3e6bf26b..9e16c220827d 100644
--- a/pkgs/by-name/gl/glm/package.nix
+++ b/pkgs/by-name/gl/glm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "g-truc";
     repo = "glm";
-    rev = version;
+    tag = version;
     sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE=";
   };
 
diff --git a/pkgs/by-name/gl/glmark2/package.nix b/pkgs/by-name/gl/glmark2/package.nix
index 1ba60f3588c4..ea3be247c405 100644
--- a/pkgs/by-name/gl/glmark2/package.nix
+++ b/pkgs/by-name/gl/glmark2/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "glmark2";
     repo = "glmark2";
-    rev = version;
+    tag = version;
     sha256 = "sha256-WCvc5GqrAdpIKQ4LVqwO6ZGbzBgLCl49NxiGJynIjSQ=";
   };
 
diff --git a/pkgs/by-name/gl/global-platform-pro/package.nix b/pkgs/by-name/gl/global-platform-pro/package.nix
index 4c16e4a67f3e..d193f4071de4 100644
--- a/pkgs/by-name/gl/global-platform-pro/package.nix
+++ b/pkgs/by-name/gl/global-platform-pro/package.nix
@@ -31,7 +31,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "martinpaljak";
     repo = "GlobalPlatformPro";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yy2WOLDetBrbNRf6HvvPdNPD51ujXomI2a2Hj6eVx1Q=";
   };
 
diff --git a/pkgs/by-name/gl/globalarrays/package.nix b/pkgs/by-name/gl/globalarrays/package.nix
index c0fafce47561..d24937bbb886 100644
--- a/pkgs/by-name/gl/globalarrays/package.nix
+++ b/pkgs/by-name/gl/globalarrays/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GlobalArrays";
     repo = "ga";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bMX538yen9cINPCtgf7SUGGsNRJugMrveqXtChHzPkk=";
   };
 
diff --git a/pkgs/by-name/gl/globalping-cli/package.nix b/pkgs/by-name/gl/globalping-cli/package.nix
index 255ee632f171..b1281d987b62 100644
--- a/pkgs/by-name/gl/globalping-cli/package.nix
+++ b/pkgs/by-name/gl/globalping-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jsdelivr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UB2vYdyJ2+H8rFyJn1KBNnWoGUlRjwYorWXqoB9WDu0=";
   };
 
diff --git a/pkgs/by-name/gl/glog/package.nix b/pkgs/by-name/gl/glog/package.nix
index 58246c2f059f..f00913dd9a43 100644
--- a/pkgs/by-name/gl/glog/package.nix
+++ b/pkgs/by-name/gl/glog/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "glog";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4=";
   };
 
diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index 3886d04d19c8..37ecc7d14e64 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qn4hQKl3E36q7HsgOVWz+eRceKGysyy5rHXzQnOc7JY=";
   };
 
diff --git a/pkgs/by-name/gl/glow/package.nix b/pkgs/by-name/gl/glow/package.nix
index 63922ea660e7..a28005a589f7 100644
--- a/pkgs/by-name/gl/glow/package.nix
+++ b/pkgs/by-name/gl/glow/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "glow";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pYXzm6HEqxJRPDdiUb+yij3iA2FhFYZOdRvQ69grcuU=";
   };
 
diff --git a/pkgs/by-name/gl/glowing-bear/package.nix b/pkgs/by-name/gl/glowing-bear/package.nix
index f1a352c8e773..cd822ad87d24 100644
--- a/pkgs/by-name/gl/glowing-bear/package.nix
+++ b/pkgs/by-name/gl/glowing-bear/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "0.9.0";
 
   src = fetchFromGitHub {
-    rev = version;
+    tag = version;
     owner = "glowing-bear";
     repo = "glowing-bear";
     sha256 = "0lf0j72m6rwlgqssdxf0m9si99lah08lww7q7i08p5i5lpv6zh2s";
diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix
index fc2de8e52d78..dad097648cf9 100644
--- a/pkgs/by-name/gl/glrnvim/package.nix
+++ b/pkgs/by-name/gl/glrnvim/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "beeender";
     repo = "glrnvim";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-n3t3s3fzmBGXRDydYxNJ13itKul8dyLNW6HP8Di4hY0=";
   };
 
diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix
index 6feecafc1612..74d6811d2cb5 100644
--- a/pkgs/by-name/gl/glslang/package.nix
+++ b/pkgs/by-name/gl/glslang/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
-    rev = version;
+    tag = version;
     hash = "sha256-E1Zenf7XSGoozx4hxdOlMu+XZ6mJROSu7jIVYPWe3go=";
   };
 
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/gluesql/package.nix b/pkgs/by-name/gl/gluesql/package.nix
index b619ebd527ae..4b4f5e146b4c 100644
--- a/pkgs/by-name/gl/gluesql/package.nix
+++ b/pkgs/by-name/gl/gluesql/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "gluesql";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-z2fpyPJfyPtO13Ly7XRmMW3rp6G3jNLsMMFz83Wmr0E=";
   };
 
diff --git a/pkgs/by-name/gl/glui/package.nix b/pkgs/by-name/gl/glui/package.nix
index a703550a7ded..15b0786f13ed 100644
--- a/pkgs/by-name/gl/glui/package.nix
+++ b/pkgs/by-name/gl/glui/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libglui";
     repo = "glui";
-    rev = version;
+    tag = version;
     sha256 = "0qg2y8w95s03zay1qsqs8pqxxlg6l9kwm7rrs1qmx0h22sxb360i";
   };
 
diff --git a/pkgs/by-name/gl/glusterfs/package.nix b/pkgs/by-name/gl/glusterfs/package.nix
index efe75a0f89cc..24f1b8f84784 100644
--- a/pkgs/by-name/gl/glusterfs/package.nix
+++ b/pkgs/by-name/gl/glusterfs/package.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gluster";
     repo = "glusterfs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZClMfozeFO3266fkuCSV04QwpZaYa8B0uq2lTPEN2rQ=";
   };
   inherit buildInputs propagatedBuildInputs;
diff --git a/pkgs/by-name/gl/glyr/package.nix b/pkgs/by-name/gl/glyr/package.nix
index 9303d4c9e7d5..b1f6ac3ade7b 100644
--- a/pkgs/by-name/gl/glyr/package.nix
+++ b/pkgs/by-name/gl/glyr/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sahib";
     repo = "glyr";
-    rev = version;
+    tag = version;
     sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr";
   };
 
diff --git a/pkgs/by-name/gm/gmailctl/package.nix b/pkgs/by-name/gm/gmailctl/package.nix
index 900157a20cce..f33d5be8a3ef 100644
--- a/pkgs/by-name/gm/gmailctl/package.nix
+++ b/pkgs/by-name/gm/gmailctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mbrt";
     repo = "gmailctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-euYl7GKidkOFsSxrEnSBIdBNZOKuBBaS3LNQOZy9R9g=";
   };
 
diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix
index 28b52a9eae45..428ab0bfb521 100644
--- a/pkgs/by-name/gm/gmid/package.nix
+++ b/pkgs/by-name/gm/gmid/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "omar-polo";
     repo = "gmid";
-    rev = version;
+    tag = version;
     hash = "sha256-JyiGkVF9aRJXgWAwZEnGgaD+IiH3UzamfTAcWyN0now=";
   };
 
diff --git a/pkgs/by-name/gn/gnirehtet/package.nix b/pkgs/by-name/gn/gnirehtet/package.nix
index 15024ae92ece..e9ed7f711e62 100644
--- a/pkgs/by-name/gn/gnirehtet/package.nix
+++ b/pkgs/by-name/gn/gnirehtet/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Genymobile";
     repo = "gnirehtet";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ewLYCZgkjbh6lR9e4iTddCIrB+5dxyviIXhOqlZsLqc=";
   };
   passthru = {
diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix
index 73fe10e42abe..ed67be3e6fbd 100644
--- a/pkgs/by-name/gn/gnmic/package.nix
+++ b/pkgs/by-name/gn/gnmic/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openconfig";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rdT1gCALEsPiyN+4RKmJ36CUkYmbkIyi56JjVkzzkp8=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-extension-manager/package.nix b/pkgs/by-name/gn/gnome-extension-manager/package.nix
index bdc7a3f91992..e25c15d95375 100644
--- a/pkgs/by-name/gn/gnome-extension-manager/package.nix
+++ b/pkgs/by-name/gn/gnome-extension-manager/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mjakeman";
     repo = "extension-manager";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0AK7wU04gQCS/3FvoAwAEmaP/jC23EduOSRncLjt4l8=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-firmware/package.nix b/pkgs/by-name/gn/gnome-firmware/package.nix
index dc736a30ef2e..64ea09068784 100644
--- a/pkgs/by-name/gn/gnome-firmware/package.nix
+++ b/pkgs/by-name/gn/gnome-firmware/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "gnome-firmware";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-dI9tE/I+14IhYZ+IDLErPunlT4L29AudbZXh0at4jKQ=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix
index d252c33ce474..90fbfc3d5b62 100644
--- a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix
+++ b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xapp-project";
     repo = "gnome-online-accounts-gtk";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-/d6ezujW/yeZV95zv/12ttUEUliZARtEGFoCXe6Dp/I=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-pass-search-provider/package.nix b/pkgs/by-name/gn/gnome-pass-search-provider/package.nix
index 69e06977c9c2..8063b937af20 100644
--- a/pkgs/by-name/gn/gnome-pass-search-provider/package.nix
+++ b/pkgs/by-name/gn/gnome-pass-search-provider/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jle64";
     repo = "gnome-pass-search-provider";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-PDR8fbDoT8IkHiTopQp0zd4DQg7JlacA6NdKYKYmrWw=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix
index 738aff462e90..763ef8bd4e86 100644
--- a/pkgs/by-name/gn/gnome-pomodoro/package.nix
+++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-ZdTMaCzjA7tsXmnlHGl8MFGGViVPwMZuiu91q5v/v9U=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix
index 10eae3e97d68..e9451606da2f 100644
--- a/pkgs/by-name/gn/gnome-session/ctl.nix
+++ b/pkgs/by-name/gn/gnome-session/ctl.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-RY0+iIwwjd7268m3EYrZ1yUBLHXmaWddtSxqgUUH6qQ=";
   };
 
diff --git a/pkgs/by-name/gn/gnostic/package.nix b/pkgs/by-name/gn/gnostic/package.nix
index 44ea7bf06a62..c10c759bd342 100644
--- a/pkgs/by-name/gn/gnostic/package.nix
+++ b/pkgs/by-name/gn/gnostic/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Wpe+rK4XMfMZYhR1xTEr0nsEjRGkSDA7aiLeBbGcRpA=";
   };
 
diff --git a/pkgs/by-name/gn/gnss-sdr/package.nix b/pkgs/by-name/gn/gnss-sdr/package.nix
index e3a242b42d53..d90e2d668b45 100644
--- a/pkgs/by-name/gn/gnss-sdr/package.nix
+++ b/pkgs/by-name/gn/gnss-sdr/package.nix
@@ -28,7 +28,7 @@ gnuradio.pkgs.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gnss-sdr";
     repo = "gnss-sdr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-IbkYdw1pwI+FMnZMChsxMz241Kv4EzMcBb0mm6/jq1k=";
   };
 
diff --git a/pkgs/by-name/gn/gnss-share/package.nix b/pkgs/by-name/gn/gnss-share/package.nix
index 4c99144b05ff..179a7464ceb1 100644
--- a/pkgs/by-name/gn/gnss-share/package.nix
+++ b/pkgs/by-name/gn/gnss-share/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "postmarketOS";
     repo = "gnss-share";
-    rev = version;
+    tag = version;
     hash = "sha256-4X1oiQWn2oZPw/14hNyZ0a6FEwoykotBisY6lk6lj2k=";
   };
   vendorHash = "sha256-dmE6hfKUqEr7BMNi/HMUOk4jDB0dPXEMkWQyWj6XpY4=";
diff --git a/pkgs/by-name/gn/gnu-efi_3/package.nix b/pkgs/by-name/gn/gnu-efi_3/package.nix
index ad04a677616e..bb3982b5cbba 100644
--- a/pkgs/by-name/gn/gnu-efi_3/package.nix
+++ b/pkgs/by-name/gn/gnu-efi_3/package.nix
@@ -10,7 +10,7 @@ gnu-efi.overrideAttrs (
     src = fetchFromGitHub {
       owner = "ncroxon";
       repo = "gnu-efi";
-      rev = finalAttrs.version;
+      tag = finalAttrs.version;
       hash = "sha256-xtiKglLXm9m4li/8tqbOsyM6ThwGhyu/g4kw5sC4URY=";
     };
     passthru.tests = {
diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix
index 0646e82f9032..dd37827859db 100644
--- a/pkgs/by-name/gn/gnucash/package.nix
+++ b/pkgs/by-name/gn/gnucash/package.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
     src = fetchFromGitHub {
       owner = "Gnucash";
       repo = "gnucash-docs";
-      rev = version;
+      tag = version;
       hash = "sha256-uXpIAsucVUaAlqYTKfrfBg04Kb5Mza67l0ZU6fxkSUY=";
     };
 
diff --git a/pkgs/by-name/go/go-2fa/package.nix b/pkgs/by-name/go/go-2fa/package.nix
index 55d777523dd2..6506e62b55d5 100644
--- a/pkgs/by-name/go/go-2fa/package.nix
+++ b/pkgs/by-name/go/go-2fa/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rsc";
     repo = "2fa";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cB5iADZwvJQwwK1GockE2uicFlqFMEAY6xyeXF5lnUY=";
   };
 
diff --git a/pkgs/by-name/go/go-audit/package.nix b/pkgs/by-name/go/go-audit/package.nix
index f562f8fb8c51..70d26390d05b 100644
--- a/pkgs/by-name/go/go-audit/package.nix
+++ b/pkgs/by-name/go/go-audit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slackhq";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Li/bMgl/wj9bHpXW5gwWvb7BvyBPzeLCP979J2kyRCM=";
   };
 
diff --git a/pkgs/by-name/go/go-bindata/package.nix b/pkgs/by-name/go/go-bindata/package.nix
index d3f48c5bdd34..62b9fd51d856 100644
--- a/pkgs/by-name/go/go-bindata/package.nix
+++ b/pkgs/by-name/go/go-bindata/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kevinburke";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3/1RqJrv1fsPKsZpurp2dHsMg8FJBcFlI/pwwCf5H6E=";
   };
 
diff --git a/pkgs/by-name/go/go-blueprint/package.nix b/pkgs/by-name/go/go-blueprint/package.nix
index 87019c44fe02..ef6c8c9ba257 100644
--- a/pkgs/by-name/go/go-blueprint/package.nix
+++ b/pkgs/by-name/go/go-blueprint/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Melkeydev";
     repo = "go-blueprint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8J+PxFHrNkX2McBn1tO7Q1X4tWtMWDIRsxzKtRhM/Jk=";
   };
 
diff --git a/pkgs/by-name/go/go-callvis/package.nix b/pkgs/by-name/go/go-callvis/package.nix
index 4a06f4d363a8..11133a33cf35 100644
--- a/pkgs/by-name/go/go-callvis/package.nix
+++ b/pkgs/by-name/go/go-callvis/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ofabry";
     repo = "go-callvis";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gCQjxJH03QAg6MZx5NJUJR6tKP02ThIa5BGN6A/0ejM=";
   };
 
diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix
index 80939ef6e3dd..fd3e8b9a78b4 100644
--- a/pkgs/by-name/go/go-camo/package.nix
+++ b/pkgs/by-name/go/go-camo/package.nix
@@ -13,7 +13,7 @@ buildGo124Module rec {
   src = fetchFromGitHub {
     owner = "cactus";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uf/r+QDukuFbbsFQal0mfZaGHZYk1fGn8Kt1ipFD/vI=";
   };
 
diff --git a/pkgs/by-name/go/go-containerregistry/package.nix b/pkgs/by-name/go/go-containerregistry/package.nix
index bd307c577a14..7e9c99ee91a8 100644
--- a/pkgs/by-name/go/go-containerregistry/package.nix
+++ b/pkgs/by-name/go/go-containerregistry/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HiksVzVuY4uub7Lwfyh3GN8wpH2MgIjKSO4mQJZeNvs=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/go/go-cover-treemap/package.nix b/pkgs/by-name/go/go-cover-treemap/package.nix
index de358e4c8428..f152c3e80940 100644
--- a/pkgs/by-name/go/go-cover-treemap/package.nix
+++ b/pkgs/by-name/go/go-cover-treemap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nikolaydubina";
     repo = "go-cover-treemap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MSkPot8uYcr8pxsIkJh2FThVK9xpzkN9Y69KeiQnQlA=";
   };
 
diff --git a/pkgs/by-name/go/go-cqhttp/package.nix b/pkgs/by-name/go/go-cqhttp/package.nix
index 5fb59710c74e..a1134f7c154f 100644
--- a/pkgs/by-name/go/go-cqhttp/package.nix
+++ b/pkgs/by-name/go/go-cqhttp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Mrs4s";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mKenmsGdVg60zjVMTfbEtqtPcJdJo60Nz6IUQ9RB7j0=";
   };
 
diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix
index 767e4e85b136..cbfd1da56625 100644
--- a/pkgs/by-name/go/go-critic/package.nix
+++ b/pkgs/by-name/go/go-critic/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-critic";
     repo = "go-critic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0AOhq7OhSHub4I6XXL018hg6i2ERkIbZCrO9osNjvHw=";
   };
 
diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix
index 8f5eb3c77d01..1276aa3f6e70 100644
--- a/pkgs/by-name/go/go-dnscollector/package.nix
+++ b/pkgs/by-name/go/go-dnscollector/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dmachard";
     repo = "go-dnscollector";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rJHU/hDmnANziJj/K2FGccZjWFe8eyggtjIc2nt0pgo=";
   };
 
diff --git a/pkgs/by-name/go/go-errorlint/package.nix b/pkgs/by-name/go/go-errorlint/package.nix
index d0bfac3a4cef..5c179ce0d572 100644
--- a/pkgs/by-name/go/go-errorlint/package.nix
+++ b/pkgs/by-name/go/go-errorlint/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "polyfloyd";
     repo = "go-errorlint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xO9AC1z3JNTRVEpM/FF8x+AMfmspU64kUywvpMb2yxM=";
   };
 
diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix
index 5c6035799e8d..472a885dd4a4 100644
--- a/pkgs/by-name/go/go-ethereum/package.nix
+++ b/pkgs/by-name/go/go-ethereum/package.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BdNv0rx+9/F0leNj2AAej8psy8X8HysDrIXheVOOkSo=";
   };
 
diff --git a/pkgs/by-name/go/go-graft/package.nix b/pkgs/by-name/go/go-graft/package.nix
index 5f7d2d339cb2..358e6249b014 100644
--- a/pkgs/by-name/go/go-graft/package.nix
+++ b/pkgs/by-name/go/go-graft/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mzz2017";
     repo = "gg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU=";
   };
 
diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix
index df58a2f56ae3..cbcd09de8a08 100644
--- a/pkgs/by-name/go/go-ios/package.nix
+++ b/pkgs/by-name/go/go-ios/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "danielpaulus";
     repo = "go-ios";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YThPGxKtGEv/jTlvtWvdJFjk+1+GLuKAtH0ivNlmr6A=";
   };
 
diff --git a/pkgs/by-name/go/go-jet/package.nix b/pkgs/by-name/go/go-jet/package.nix
index e4e3e054ab96..f9867650da20 100644
--- a/pkgs/by-name/go/go-jet/package.nix
+++ b/pkgs/by-name/go/go-jet/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "jet";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-abk/mcukxIgAD9Oxh3H4+xrSoY30aW7EXZxEXXlriHA=";
   };
 
diff --git a/pkgs/by-name/go/go-jira/package.nix b/pkgs/by-name/go/go-jira/package.nix
index 35ad78247600..6639ec2fc76d 100644
--- a/pkgs/by-name/go/go-jira/package.nix
+++ b/pkgs/by-name/go/go-jira/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "1.0.28";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "go-jira";
     repo = "jira";
     sha256 = "sha256-h/x77xGqdOxPBxdchElZU9GFgjnNo89o9gx4fYM5dME=";
diff --git a/pkgs/by-name/go/go-jsonnet/package.nix b/pkgs/by-name/go/go-jsonnet/package.nix
index 9e00f8d68cf1..d4b8060a3cfb 100644
--- a/pkgs/by-name/go/go-jsonnet/package.nix
+++ b/pkgs/by-name/go/go-jsonnet/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P69tguBrFF/CSCOfHjCfBT5710oJdhZDh3kMCbc32eE=";
   };
 
diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix
index c94afc6622b9..57cf7f12b3af 100644
--- a/pkgs/by-name/go/go-judge/package.nix
+++ b/pkgs/by-name/go/go-judge/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "criyle";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AmbhfCKUpvZt/me73EhBQqw8yDnItn1zKiemf/JRz24=";
   };
 
diff --git a/pkgs/by-name/go/go-junit-report/package.nix b/pkgs/by-name/go/go-junit-report/package.nix
index a6eabc0b573f..fe5e2f7e73cf 100644
--- a/pkgs/by-name/go/go-junit-report/package.nix
+++ b/pkgs/by-name/go/go-junit-report/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jstemmer";
     repo = "go-junit-report";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-s4XVjACmpd10C5k+P3vtcS/aWxI6UkSUPyxzLhD2vRI=";
   };
 
diff --git a/pkgs/by-name/go/go-libp2p-daemon/package.nix b/pkgs/by-name/go/go-libp2p-daemon/package.nix
index 0f9c7e06dc5a..f6d0a1f031a4 100644
--- a/pkgs/by-name/go/go-libp2p-daemon/package.nix
+++ b/pkgs/by-name/go/go-libp2p-daemon/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "libp2p";
     repo = "go-libp2p-daemon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N/5V03HQTr7dIvMpIVRlIhEaV2f+aDF36esWMjT96HA=";
   };
 
diff --git a/pkgs/by-name/go/go-licence-detector/package.nix b/pkgs/by-name/go/go-licence-detector/package.nix
index dd08b14598d4..5db590b65ded 100644
--- a/pkgs/by-name/go/go-licence-detector/package.nix
+++ b/pkgs/by-name/go/go-licence-detector/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "go-licence-detector";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-43MyzEF7BZ7pcgzDvXx9SjXGHaLozmWkGWUO/yf6K98=";
   };
 
diff --git a/pkgs/by-name/go/go-license-detector/package.nix b/pkgs/by-name/go/go-license-detector/package.nix
index 2b5be457f252..1a1fdfd55600 100644
--- a/pkgs/by-name/go/go-license-detector/package.nix
+++ b/pkgs/by-name/go/go-license-detector/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-enry";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-S9LKXjn5dL5FETOOAk+bs7bIVdu2x7MIhfjpZuXzuLo=";
   };
 
diff --git a/pkgs/by-name/go/go-md2man/package.nix b/pkgs/by-name/go/go-md2man/package.nix
index f06d54a10974..cbf04849842b 100644
--- a/pkgs/by-name/go/go-md2man/package.nix
+++ b/pkgs/by-name/go/go-md2man/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   vendorHash = "sha256-aMLL/tmRLyGze3RSB9dKnoTv5ZK1eRtgV8fkajWEbU0=";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "cpuguy83";
     repo = "go-md2man";
     sha256 = "sha256-wJnHgp+NPchXkR71ARLMjo4VryzgGkz2tYWPsC+3eFo=";
diff --git a/pkgs/by-name/go/go-migrate/package.nix b/pkgs/by-name/go/go-migrate/package.nix
index f5857b03ad37..c77b11992fd5 100644
--- a/pkgs/by-name/go/go-migrate/package.nix
+++ b/pkgs/by-name/go/go-migrate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "golang-migrate";
     repo = "migrate";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DRWJ5USabSQtNkyDjz8P7eOS2QBE1KaD8K8XYORBVGo=";
   };
 
diff --git a/pkgs/by-name/go/go-minimock/package.nix b/pkgs/by-name/go/go-minimock/package.nix
index 5b1440b0752b..c80e62053365 100644
--- a/pkgs/by-name/go/go-minimock/package.nix
+++ b/pkgs/by-name/go/go-minimock/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gojuno";
     repo = "minimock";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D5U1KfWXe9qtcFQKDoISC6Hq5axMO37WsyFjpPOyyo4=";
   };
 
diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix
index 99cd99afeaaa..c906d27c5474 100644
--- a/pkgs/by-name/go/go-mockery/package.nix
+++ b/pkgs/by-name/go/go-mockery/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vektra";
     repo = "mockery";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-X0cHpv4o6pzgjg7+ULCuFkspeff95WFtJbVHqy4LxAg=";
   };
 
diff --git a/pkgs/by-name/go/go-mod-graph-chart/package.nix b/pkgs/by-name/go/go-mod-graph-chart/package.nix
index 9a435833bba9..a2ba1866abb5 100644
--- a/pkgs/by-name/go/go-mod-graph-chart/package.nix
+++ b/pkgs/by-name/go/go-mod-graph-chart/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "PaulXu-cn";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vitUZXQyAj72ed9Gukr/sAT/iWWMhwsxjZhf2a9CM7I=";
   };
 
diff --git a/pkgs/by-name/go/go-motion/package.nix b/pkgs/by-name/go/go-motion/package.nix
index 9a950ac86407..95062c6acc3a 100644
--- a/pkgs/by-name/go/go-motion/package.nix
+++ b/pkgs/by-name/go/go-motion/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fatih";
     repo = "motion";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7vkMhjO4JUAf0sUcKiMjqJ5GzLb//QoHd7Cagerx4/s=";
   };
 
diff --git a/pkgs/by-name/go/go-mtpfs/package.nix b/pkgs/by-name/go/go-mtpfs/package.nix
index f6e6e667cc59..874aaf0447ef 100644
--- a/pkgs/by-name/go/go-mtpfs/package.nix
+++ b/pkgs/by-name/go/go-mtpfs/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hanwen";
     repo = "go-mtpfs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HVfB8/MImgZZLx4tcrlYOfQjpAdHMHshEaSsd+n758w=";
   };
 
diff --git a/pkgs/by-name/go/go-musicfox/package.nix b/pkgs/by-name/go/go-musicfox/package.nix
index 1125622d4752..f91cb9f0791c 100644
--- a/pkgs/by-name/go/go-musicfox/package.nix
+++ b/pkgs/by-name/go/go-musicfox/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-musicfox";
     repo = "go-musicfox";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pzB57XeDD8lfJMkP9/k1rrszYXYYzQt2UekH2Atiqjw=";
   };
 
diff --git a/pkgs/by-name/go/go-org/package.nix b/pkgs/by-name/go/go-org/package.nix
index dabed8503e25..1079bde007d8 100644
--- a/pkgs/by-name/go/go-org/package.nix
+++ b/pkgs/by-name/go/go-org/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "niklasfasching";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BPCQxl0aJ9PrEC5o5dc5uBbX8eYAxqB+qMLXo1LwCoA=";
   };
 
diff --git a/pkgs/by-name/go/go-passbolt-cli/package.nix b/pkgs/by-name/go/go-passbolt-cli/package.nix
index d2c4341d90cb..abdd01b59bdd 100644
--- a/pkgs/by-name/go/go-passbolt-cli/package.nix
+++ b/pkgs/by-name/go/go-passbolt-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "passbolt";
     repo = "go-passbolt-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BtMPOmp9dbi/HoNigEeGWIYXRh1/gorV8ycrtWw9I8s=";
   };
 
diff --git a/pkgs/by-name/go/go-protobuf/package.nix b/pkgs/by-name/go/go-protobuf/package.nix
index b55e3b15a3eb..90fc3137cdd9 100644
--- a/pkgs/by-name/go/go-protobuf/package.nix
+++ b/pkgs/by-name/go/go-protobuf/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "golang";
     repo = "protobuf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-AfyZ6xlqmrsVqtoKV1XMEo/Vba9Kpu1EgwfF6pPSZ64=";
   };
 
diff --git a/pkgs/by-name/go/go-rice/package.nix b/pkgs/by-name/go/go-rice/package.nix
index 85127bc363d3..371d981aacc5 100644
--- a/pkgs/by-name/go/go-rice/package.nix
+++ b/pkgs/by-name/go/go-rice/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GeertJohan";
     repo = "go.rice";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jO4otde/m52L2NrE88aXRjdGDBNxnbP1Zt+5fEqfNIc=";
   };
 
diff --git a/pkgs/by-name/go/go-shadowsocks2/package.nix b/pkgs/by-name/go/go-shadowsocks2/package.nix
index d3398e2d7c7c..9e06f5b2e5a8 100644
--- a/pkgs/by-name/go/go-shadowsocks2/package.nix
+++ b/pkgs/by-name/go/go-shadowsocks2/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shadowsocks";
     repo = "go-shadowsocks2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-z2+5q8XlxMN7x86IOMJ0qbrW4Wrm1gp8GWew51yBRFg=";
   };
 
diff --git a/pkgs/by-name/go/go-swag/package.nix b/pkgs/by-name/go/go-swag/package.nix
index 7193d56ba312..41677b996b29 100644
--- a/pkgs/by-name/go/go-swag/package.nix
+++ b/pkgs/by-name/go/go-swag/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "swaggo";
     repo = "swag";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wqBT7uan5XL51HHDGINRH9NTb1tybF44d/rWRxl6Lak=";
   };
 
diff --git a/pkgs/by-name/go/go-symbols/package.nix b/pkgs/by-name/go/go-symbols/package.nix
index 786e9d93a700..6ddad0fe28f9 100644
--- a/pkgs/by-name/go/go-symbols/package.nix
+++ b/pkgs/by-name/go/go-symbols/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "acroca";
     repo = "go-symbols";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P2N4Hqrazu02CWOfAu7/KGlpjzjN65hkyWI1S5nh33s=";
   };
 
diff --git a/pkgs/by-name/go/go-toml/package.nix b/pkgs/by-name/go/go-toml/package.nix
index d22898102778..e93fd5e1e9f6 100644
--- a/pkgs/by-name/go/go-toml/package.nix
+++ b/pkgs/by-name/go/go-toml/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "pelletier";
     repo = "go-toml";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+l89SvJ/4SxVItys1ROLOv2hZ5euU1MF21Yn0siQHUM=";
   };
 
diff --git a/pkgs/by-name/go/go-tools/package.nix b/pkgs/by-name/go/go-tools/package.nix
index 27feb8aeeec3..f61085c886ad 100644
--- a/pkgs/by-name/go/go-tools/package.nix
+++ b/pkgs/by-name/go/go-tools/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dominikh";
     repo = "go-tools";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ekSOXaVSFdzM76tcj1hbtzhYw4fnFX3VkTnsGtJanXg=";
   };
 
diff --git a/pkgs/by-name/go/goa/package.nix b/pkgs/by-name/go/goa/package.nix
index b97d284f4e37..5df7eb8cdb34 100644
--- a/pkgs/by-name/go/goa/package.nix
+++ b/pkgs/by-name/go/goa/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goadesign";
     repo = "goa";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+MAK/qRvwMfjifeXmBjDWKmQ75LAbIUjZ6rvqw1Xv3I=";
   };
   vendorHash = "sha256-/5tcIvJpJPVMOL6XBAjXbiHeCwpB0YOLv5hRhd5zG7Q=";
diff --git a/pkgs/by-name/go/goat-cli/package.nix b/pkgs/by-name/go/goat-cli/package.nix
index 58d12c4f5b83..848c5b7388e3 100644
--- a/pkgs/by-name/go/goat-cli/package.nix
+++ b/pkgs/by-name/go/goat-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "goat";
     owner = "studio-b12";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7inoRBVR7zmt0jUFAGYjoYT2cdda0qgzyXLL+GiBFMg=";
   };
 
diff --git a/pkgs/by-name/go/goatcounter/package.nix b/pkgs/by-name/go/goatcounter/package.nix
index a19bf73d3100..67758185717a 100644
--- a/pkgs/by-name/go/goatcounter/package.nix
+++ b/pkgs/by-name/go/goatcounter/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "arp242";
     repo = "goatcounter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lwiLk/YYxX4QwSDjpU/mAikumGXYMzleRzmPjZGruZU=";
   };
 
diff --git a/pkgs/by-name/go/goawk/package.nix b/pkgs/by-name/go/goawk/package.nix
index 36f1382ce6db..633789f0f1bb 100644
--- a/pkgs/by-name/go/goawk/package.nix
+++ b/pkgs/by-name/go/goawk/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "benhoyt";
     repo = "goawk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PQtayS2403ldNiE/xMQ/Oy+BsZB1ixDALuZcjhRyxLY=";
   };
 
diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix
index 12f6e8f38c7e..f78da1468568 100644
--- a/pkgs/by-name/go/gobang/package.nix
+++ b/pkgs/by-name/go/gobang/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "tako8ki";
     repo = "gobang";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RinfQhG7iCp0Xcs9kLs3I2/wjkJEgCjFYe3mS+FY9Ak=";
   };
 
diff --git a/pkgs/by-name/go/gobble/package.nix b/pkgs/by-name/go/gobble/package.nix
index 5f4b46d036b4..a39bf2ec302b 100644
--- a/pkgs/by-name/go/gobble/package.nix
+++ b/pkgs/by-name/go/gobble/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "EmperorPenguin18";
     repo = "gobble";
-    rev = version;
+    tag = version;
     hash = "sha256-g4154Axvjp9jbE0lvMeNGM+v2UxkAsZqt9kPv5bhVK8=";
   };
 
diff --git a/pkgs/by-name/go/gobby/package.nix b/pkgs/by-name/go/gobby/package.nix
index 18f48b758d68..b30bdf06ab12 100644
--- a/pkgs/by-name/go/gobby/package.nix
+++ b/pkgs/by-name/go/gobby/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gobby";
     repo = "gobby";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "06cbc2y4xkw89jaa0ayhgh7fxr5p2nv3jjs8h2xcbbbgwaw08lk0";
   };
 
diff --git a/pkgs/by-name/go/gobetween/package.nix b/pkgs/by-name/go/gobetween/package.nix
index ca795661eeee..36a5a3314ecf 100644
--- a/pkgs/by-name/go/gobetween/package.nix
+++ b/pkgs/by-name/go/gobetween/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yyyar";
     repo = "gobetween";
-    rev = version;
+    tag = version;
     sha256 = "0bxf89l53sqan9qq23rwawjkcanv9p61sw56zjqhyx78f0bh0zbc";
   };
 
diff --git a/pkgs/by-name/go/gobgp/package.nix b/pkgs/by-name/go/gobgp/package.nix
index 9572b5677212..40d1dc4c07e6 100644
--- a/pkgs/by-name/go/gobgp/package.nix
+++ b/pkgs/by-name/go/gobgp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "osrg";
     repo = "gobgp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vyMC3FcfMHVsRosLkTYgCawiTIcJs0R5GgSZERRPHnE=";
   };
 
diff --git a/pkgs/by-name/go/gocode-gomod/package.nix b/pkgs/by-name/go/gocode-gomod/package.nix
index 9aec956c578e..33868a7a1b0a 100644
--- a/pkgs/by-name/go/gocode-gomod/package.nix
+++ b/pkgs/by-name/go/gocode-gomod/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stamblerre";
     repo = "gocode";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "YAOYrPPKgnjCErq8+iW0Le51clGBv0MJy2Nnn7UVo/s=";
   };
 
diff --git a/pkgs/by-name/go/goconst/package.nix b/pkgs/by-name/go/goconst/package.nix
index 6d1546d69f42..670085c1d0c6 100644
--- a/pkgs/by-name/go/goconst/package.nix
+++ b/pkgs/by-name/go/goconst/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jgautheron";
     repo = "goconst";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GpOZJ5/5aNw1o8fk2RSAx200v6AZ+pbNu/25i8OSS1Y=";
   };
 
diff --git a/pkgs/by-name/go/gocover-cobertura/package.nix b/pkgs/by-name/go/gocover-cobertura/package.nix
index a301d7d2551a..5a7694ce2faf 100644
--- a/pkgs/by-name/go/gocover-cobertura/package.nix
+++ b/pkgs/by-name/go/gocover-cobertura/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "boumenot";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Cxv1iuCYHSI0BFR1OLbeDIQfVLlMDxlTgU7ljpXWHjU=";
   };
 
diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix
index d894040fd55b..9609ebf284e6 100644
--- a/pkgs/by-name/go/gocryptfs/package.nix
+++ b/pkgs/by-name/go/gocryptfs/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0iCCIAOAzLIeZ+eZYJTVXgOyKIsQnKe/XazFVECZDTM=";
   };
 
diff --git a/pkgs/by-name/go/gocyclo/package.nix b/pkgs/by-name/go/gocyclo/package.nix
index cd5447ef9c8e..c6a1b10ccbb9 100644
--- a/pkgs/by-name/go/gocyclo/package.nix
+++ b/pkgs/by-name/go/gocyclo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fzipp";
     repo = "gocyclo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1IwtGUqshpLDyxH5NNkGUads1TKLs48eslNnFylGUPA=";
   };
 
diff --git a/pkgs/by-name/go/goda/package.nix b/pkgs/by-name/go/goda/package.nix
index 64249f441c92..aa7ba4c964c7 100644
--- a/pkgs/by-name/go/goda/package.nix
+++ b/pkgs/by-name/go/goda/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "loov";
     repo = "goda";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g/sScj5VDQjpWmZN+1YqKJHixGwSBJi6v6YiGklSsjw=";
   };
 
diff --git a/pkgs/by-name/go/godu/package.nix b/pkgs/by-name/go/godu/package.nix
index e034badc0ae7..4ed9e07e8b07 100644
--- a/pkgs/by-name/go/godu/package.nix
+++ b/pkgs/by-name/go/godu/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "viktomas";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-z1LCPweaf8e/HWkSrRCiMYZl4F4dKo4/wDkWgY+eTvk=";
   };
 
diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix
index e3f3f337892d..d8d3845f1150 100644
--- a/pkgs/by-name/go/goeland/package.nix
+++ b/pkgs/by-name/go/goeland/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slurdge";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4xhw6L6CuwW2MepwGvpVLVafMcU/g0bn/2M/8ZSRF/U=";
   };
 
diff --git a/pkgs/by-name/go/gof5/package.nix b/pkgs/by-name/go/gof5/package.nix
index 82047971cd3b..361ae0695670 100644
--- a/pkgs/by-name/go/gof5/package.nix
+++ b/pkgs/by-name/go/gof5/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kayrus";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "10qh7rj8s540ghjdvymly53vny3n0qd0z0ixy24n026jjhgjvnpl";
   };
 
diff --git a/pkgs/by-name/go/goflow/package.nix b/pkgs/by-name/go/goflow/package.nix
index fa1ffe01aeb2..65fa88d4390f 100644
--- a/pkgs/by-name/go/goflow/package.nix
+++ b/pkgs/by-name/go/goflow/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dNu/z48wzUExGsfpKSWmLwhtqbs/Xi+4PFKRjTxt9DI=";
   };
 
diff --git a/pkgs/by-name/go/goflow2/package.nix b/pkgs/by-name/go/goflow2/package.nix
index 61ae91512caf..00957c6008d5 100644
--- a/pkgs/by-name/go/goflow2/package.nix
+++ b/pkgs/by-name/go/goflow2/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "netsampler";
     repo = "goflow2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-H+YeW1FOx4hE8ad8sEWFQPxl8IOZ+xIaiSk1a5w+0+Y=";
   };
 
diff --git a/pkgs/by-name/go/gofumpt/package.nix b/pkgs/by-name/go/gofumpt/package.nix
index 12435ba1918d..b3275b146dea 100644
--- a/pkgs/by-name/go/gofumpt/package.nix
+++ b/pkgs/by-name/go/gofumpt/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mJM0uKztX0OUQvynnxeKL9yft7X/Eh28ERg8SbZC5Ws=";
   };
 
diff --git a/pkgs/by-name/go/gogup/package.nix b/pkgs/by-name/go/gogup/package.nix
index 6d2d7d63e9c6..3f38285cc59d 100644
--- a/pkgs/by-name/go/gogup/package.nix
+++ b/pkgs/by-name/go/gogup/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nao1215";
     repo = "gup";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5ZeiW8WPpfQfLe02lXRIOvQ9T9yslmYuYLt7ftqHfqc=";
   };
 
diff --git a/pkgs/by-name/go/goimports-reviser/package.nix b/pkgs/by-name/go/goimports-reviser/package.nix
index de3539d7c7a8..3d11f6cb91ee 100644
--- a/pkgs/by-name/go/goimports-reviser/package.nix
+++ b/pkgs/by-name/go/goimports-reviser/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "incu6us";
     repo = "goimports-reviser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MMF5gzUbL8j9NTGKT1Xz177Z0SqdeKObBa6TEguK5aI=";
   };
   vendorHash = "sha256-BAV7vMWRgBZaL2Pya4QiVcY54VIiHT++Dz4ZZ92FGgM=";
diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix
index 365b7bc336c0..346fdb20073d 100644
--- a/pkgs/by-name/go/gojq/package.nix
+++ b/pkgs/by-name/go/gojq/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "itchyny";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zJkeghN3btF/fZZeuClHV1ndB/2tTTMljEukMYe7UWU=";
   };
 
diff --git a/pkgs/by-name/go/gojsontoyaml/package.nix b/pkgs/by-name/go/gojsontoyaml/package.nix
index 3057639d858d..5d4be494d666 100644
--- a/pkgs/by-name/go/gojsontoyaml/package.nix
+++ b/pkgs/by-name/go/gojsontoyaml/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "brancz";
     repo = "gojsontoyaml";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ebxz2uTH7XwD3j6JnsfET6aCGYjvsCjow/sU9pagg50=";
   };
 
diff --git a/pkgs/by-name/go/gokart/package.nix b/pkgs/by-name/go/gokart/package.nix
index aa3b53fb0e3b..d05cbb6f528d 100644
--- a/pkgs/by-name/go/gokart/package.nix
+++ b/pkgs/by-name/go/gokart/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-G1IjlJ/rmviFWy6RFfLtP+bhfYcDuB97leimU39YCoQ=";
   };
 
diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index 4d1517f03fc9..bf4965300347 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -12,7 +12,7 @@ buildGo124Module rec {
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+IndC9znKgVGiFWW0aCNjhxPwX1kDFnfG2+SKEQ15Rc=";
   };
 
diff --git a/pkgs/by-name/go/goldwarden/package.nix b/pkgs/by-name/go/goldwarden/package.nix
index eddf57bfbbfa..6366249bd31e 100644
--- a/pkgs/by-name/go/goldwarden/package.nix
+++ b/pkgs/by-name/go/goldwarden/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "quexten";
     repo = "goldwarden";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wAQFx0DKLLKztETAz1eM+eBFiAkSCgd8qqRtLV1Kz9g=";
   };
 
diff --git a/pkgs/by-name/go/golex/package.nix b/pkgs/by-name/go/golex/package.nix
index 99884d4d2d02..d94606af065e 100644
--- a/pkgs/by-name/go/golex/package.nix
+++ b/pkgs/by-name/go/golex/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "cznic";
     repo = "golex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0Z2oE00vGnH2BBNmKAjRhy//fEbT5AQ+CKLIUr+NPwY=";
   };
 
diff --git a/pkgs/by-name/go/golines/package.nix b/pkgs/by-name/go/golines/package.nix
index 2d341924e80b..d0b8ee391cf9 100644
--- a/pkgs/by-name/go/golines/package.nix
+++ b/pkgs/by-name/go/golines/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "segmentio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-D0gI9BA0vgM1DBqwolNTfPsTCWuOGrcu5gAVFEdyVGg=";
   };
 
diff --git a/pkgs/by-name/go/gomapenum/package.nix b/pkgs/by-name/go/gomapenum/package.nix
index 5153e358cf37..d88363fdad05 100644
--- a/pkgs/by-name/go/gomapenum/package.nix
+++ b/pkgs/by-name/go/gomapenum/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nodauf";
     repo = "GoMapEnum";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-a0JpHk5pUe+MkcmJl871JwkOfFDg3S4yOzFIeXCReLE=";
   };
 
diff --git a/pkgs/by-name/go/gomarkdoc/package.nix b/pkgs/by-name/go/gomarkdoc/package.nix
index f4c7bb49a5fd..457d8b50a04d 100644
--- a/pkgs/by-name/go/gomarkdoc/package.nix
+++ b/pkgs/by-name/go/gomarkdoc/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "princjef";
     repo = "gomarkdoc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eMH+F1ZXAKHqnrvOJvCETm2NiDwY03IFHrDNYr3jaW8=";
   };
 
diff --git a/pkgs/by-name/go/gomatrix/package.nix b/pkgs/by-name/go/gomatrix/package.nix
index 387b0ed1063a..b77d85c97617 100644
--- a/pkgs/by-name/go/gomatrix/package.nix
+++ b/pkgs/by-name/go/gomatrix/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GeertJohan";
     repo = "gomatrix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VeRHVR8InfU+vEw2F/w3KFbNVSKS8ziRlQ98f3cuBfM=";
   };
 
diff --git a/pkgs/by-name/go/gomodifytags/package.nix b/pkgs/by-name/go/gomodifytags/package.nix
index 567499f9e6d3..2bfd00ceea7a 100644
--- a/pkgs/by-name/go/gomodifytags/package.nix
+++ b/pkgs/by-name/go/gomodifytags/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fatih";
     repo = "gomodifytags";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-XVjSRW7FzXbGmGT+xH4tNg9PVXvgmhQXTIrYYZ346/M=";
   };
 
diff --git a/pkgs/by-name/go/gomtree/package.nix b/pkgs/by-name/go/gomtree/package.nix
index 3e06b58fad51..0627c5b4ed4d 100644
--- a/pkgs/by-name/go/gomtree/package.nix
+++ b/pkgs/by-name/go/gomtree/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vbatts";
     repo = "go-mtree";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MDX16z4H1fyuV5atEsZHReJyvC+MRdeA54DORCFtpqI=";
   };
 
diff --git a/pkgs/by-name/go/gomuks/package.nix b/pkgs/by-name/go/gomuks/package.nix
index 3dc22caaa00a..92267590af2f 100644
--- a/pkgs/by-name/go/gomuks/package.nix
+++ b/pkgs/by-name/go/gomuks/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tulir";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bDJXo8d9K5UO599HDaABpfwc9/dJJy+9d24KMVZHyvI=";
   };
 
diff --git a/pkgs/by-name/go/gonic/package.nix b/pkgs/by-name/go/gonic/package.nix
index d8b28ba56194..1fa12c7a3dfa 100644
--- a/pkgs/by-name/go/gonic/package.nix
+++ b/pkgs/by-name/go/gonic/package.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sentriz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+8rKODoADU2k1quKvbijjs/6S/hpkegHhG7Si0LSE0k=";
   };
 
diff --git a/pkgs/by-name/go/goodhosts/package.nix b/pkgs/by-name/go/goodhosts/package.nix
index dfb80b8a902a..eda8929ddc0b 100644
--- a/pkgs/by-name/go/goodhosts/package.nix
+++ b/pkgs/by-name/go/goodhosts/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goodhosts";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZasS7AYGYPV+nzp9JbJC5pD0yQ+ik+QnuL+3qC1uqFk=";
   };
 
diff --git a/pkgs/by-name/go/goodvibes/package.nix b/pkgs/by-name/go/goodvibes/package.nix
index 653f3cf1ed9a..4e721a94bf85 100644
--- a/pkgs/by-name/go/goodvibes/package.nix
+++ b/pkgs/by-name/go/goodvibes/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "goodvibes";
     repo = "goodvibes";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AHw8KlU1lmgH837GOpxGBgngwRIs5XV3+TvH4MuCx54=";
   };
 
diff --git a/pkgs/by-name/go/google-authenticator/package.nix b/pkgs/by-name/go/google-authenticator/package.nix
index 3eacb27aabee..4218bdc18868 100644
--- a/pkgs/by-name/go/google-authenticator/package.nix
+++ b/pkgs/by-name/go/google-authenticator/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "google-authenticator-libpam";
-    rev = version;
+    tag = version;
     hash = "sha256-cLMX5SdKvyQr3annc/Hhhz6XgY+BypRHASKRh6xTdmo=";
   };
 
diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix
index 3b8a0fe9f0f4..32890336d9f8 100644
--- a/pkgs/by-name/go/google-cloud-cpp/package.nix
+++ b/pkgs/by-name/go/google-cloud-cpp/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-cpp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gCq8Uc+s/rnJWsGlI7f+tvAZHH8K69+H/leUOKE2GCY=";
   };
 
diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
index 1a5ad6bd543c..3542fc166aee 100644
--- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
+++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "cloud-sql-proxy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IZSWJhA3M+d16KKOY6MULibvTNrf7InuNR/ahYznQHY=";
   };
 
diff --git a/pkgs/by-name/go/google-guest-configs/package.nix b/pkgs/by-name/go/google-guest-configs/package.nix
index 5a3bf68579a9..6c155fbaeba5 100644
--- a/pkgs/by-name/go/google-guest-configs/package.nix
+++ b/pkgs/by-name/go/google-guest-configs/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "guest-configs";
-    rev = version;
+    tag = version;
     sha256 = "sha256-0SRu6p/DsHNNI20mkXJitt/Ee5S2ooiy5hNmD+ndecM=";
   };
 
diff --git a/pkgs/by-name/go/google-guest-oslogin/package.nix b/pkgs/by-name/go/google-guest-oslogin/package.nix
index cf963b728d6f..373aebdcfd2c 100644
--- a/pkgs/by-name/go/google-guest-oslogin/package.nix
+++ b/pkgs/by-name/go/google-guest-oslogin/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "guest-oslogin";
-    rev = version;
+    tag = version;
     sha256 = "sha256-9QCB94HVbeLjioJuSN1Aa+EqFncojPoWFxw5mS9bDGw=";
   };
 
diff --git a/pkgs/by-name/go/google-play/package.nix b/pkgs/by-name/go/google-play/package.nix
index c404013adc2d..c4754e81f38b 100644
--- a/pkgs/by-name/go/google-play/package.nix
+++ b/pkgs/by-name/go/google-play/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "3052";
     repo = "google";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Wf7k76TXBr10FIclo/Ny8MLDDSNXu54JTDS0vfw4UXA=";
   };
 
diff --git a/pkgs/by-name/go/goose-lang/package.nix b/pkgs/by-name/go/goose-lang/package.nix
index 5cacc12e5943..5760441de163 100644
--- a/pkgs/by-name/go/goose-lang/package.nix
+++ b/pkgs/by-name/go/goose-lang/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goose-lang";
     repo = "goose";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LAuWd/KeVdvPY45wL8g0MBTMrRCHcu/Ti3+IUvtcFUY=";
   };
 
diff --git a/pkgs/by-name/go/goose/package.nix b/pkgs/by-name/go/goose/package.nix
index adcd30979bc1..86557b7f9f6c 100644
--- a/pkgs/by-name/go/goose/package.nix
+++ b/pkgs/by-name/go/goose/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pressly";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-C/FeXsmKmSA8unpqT5TcNOsSaQNzc4JTv5hkfeb760E=";
   };
 
diff --git a/pkgs/by-name/go/gopacked/package.nix b/pkgs/by-name/go/gopacked/package.nix
index 9c482c172bc6..336d00ba78c7 100644
--- a/pkgs/by-name/go/gopacked/package.nix
+++ b/pkgs/by-name/go/gopacked/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tulir";
     repo = "gopacked";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PpOLLqgUQf09grZlJ7bXTxAowzDusmVN8PHfaGlGGQ8=";
   };
 
diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix
index c8ac712834e1..bd6a01f9e097 100644
--- a/pkgs/by-name/go/gopass-jsonapi/package.nix
+++ b/pkgs/by-name/go/gopass-jsonapi/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-jsonapi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nayg7NTJH6bAPiguyuN37JivfWkpOUX/xI/+PHDi3UI=";
   };
 
diff --git a/pkgs/by-name/go/gopatch/package.nix b/pkgs/by-name/go/gopatch/package.nix
index ad7a50f3d82e..269ede71e6f2 100644
--- a/pkgs/by-name/go/gopatch/package.nix
+++ b/pkgs/by-name/go/gopatch/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "uber-go";
     repo = "gopatch";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zP5zC71icrVvzKzBBlxfX9h5JlKd89cf32Q6eZatX44=";
   };
 
diff --git a/pkgs/by-name/go/gophernotes/package.nix b/pkgs/by-name/go/gophernotes/package.nix
index f4829ba509a3..e4d24195efd9 100644
--- a/pkgs/by-name/go/gophernotes/package.nix
+++ b/pkgs/by-name/go/gophernotes/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopherdata";
     repo = "gophernotes";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cGlYgay/t6XIl0U9XvrHkqNxZ6BXtXi0TIANY1WdZ3Y=";
   };
 
diff --git a/pkgs/by-name/go/gophish/package.nix b/pkgs/by-name/go/gophish/package.nix
index 04c4e53425cf..20112f3382c4 100644
--- a/pkgs/by-name/go/gophish/package.nix
+++ b/pkgs/by-name/go/gophish/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gophish";
     repo = "gophish";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6OUhRB2d8k7h9tI3IPKy9f1KoEx1mvGbxQZF1sCngqs=";
   };
 
diff --git a/pkgs/by-name/go/gopkgs/package.nix b/pkgs/by-name/go/gopkgs/package.nix
index f4b8c3a86cb2..5f575192945d 100644
--- a/pkgs/by-name/go/gopkgs/package.nix
+++ b/pkgs/by-name/go/gopkgs/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "2.1.2";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "uudashr";
     repo = "gopkgs";
     hash = "sha256-ll5fhwzzCNL0UtMLNSGOY6Yyy0EqI8OZ1iqWad4KU8k=";
diff --git a/pkgs/by-name/go/gopro/package.nix b/pkgs/by-name/go/gopro/package.nix
index 296a25f045ff..59eb6ced2cff 100644
--- a/pkgs/by-name/go/gopro/package.nix
+++ b/pkgs/by-name/go/gopro/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KonradIT";
     repo = "gopro-linux";
-    rev = version;
+    tag = version;
     sha256 = "0sb9vpiadrq8g4ag828h8mvq01fg0306j0wjwkxdmwfqync1128l";
   };
 
diff --git a/pkgs/by-name/go/gops/package.nix b/pkgs/by-name/go/gops/package.nix
index 2aeb490fa3f6..f1cb2e72c0be 100644
--- a/pkgs/by-name/go/gops/package.nix
+++ b/pkgs/by-name/go/gops/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "gops";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HNM487WSfNWNF31ccDIdotsEG8Mj2C7V85UI47a9drU=";
   };
 
diff --git a/pkgs/by-name/go/gopsuinfo/package.nix b/pkgs/by-name/go/gopsuinfo/package.nix
index 37b1d4123c22..66d34bdbf953 100644
--- a/pkgs/by-name/go/gopsuinfo/package.nix
+++ b/pkgs/by-name/go/gopsuinfo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "gopsuinfo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-h+CdiQh7IguCduIMCCI/UPIUAdXlNSHdkz6hrG10h3c=";
   };
 
diff --git a/pkgs/by-name/go/gore/package.nix b/pkgs/by-name/go/gore/package.nix
index 35609e4655bb..ae69c32ae84e 100644
--- a/pkgs/by-name/go/gore/package.nix
+++ b/pkgs/by-name/go/gore/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "motemen";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7mhfegSSRE9FnKz+tWYMEtEKc+hayPQE8EEOEu33CjU=";
   };
 
diff --git a/pkgs/by-name/go/goread/package.nix b/pkgs/by-name/go/goread/package.nix
index 380d7937ab68..51aad410be5a 100644
--- a/pkgs/by-name/go/goread/package.nix
+++ b/pkgs/by-name/go/goread/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TypicalAM";
     repo = "goread";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2C/PejWCwLdWu9n2hpbm3u/UrD56JCJqG+A7xnn/bP4=";
   };
 
diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index d1c06ea578ad..874f881f44fd 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-F9gUntTqllTYrRTuUj4tWMrHArM8BflCROPBsOdIsFA=";
   };
 
diff --git a/pkgs/by-name/go/goreman/package.nix b/pkgs/by-name/go/goreman/package.nix
index 9a572a8a41b8..cdc89f97194a 100644
--- a/pkgs/by-name/go/goreman/package.nix
+++ b/pkgs/by-name/go/goreman/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "goreman";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hOFnLxHsrauOrsbJYKNrwFFT5yYX/rdZUVjscBIGDLo=";
   };
 
diff --git a/pkgs/by-name/go/goreplay/package.nix b/pkgs/by-name/go/goreplay/package.nix
index bea28693a6df..3ce175ff1c0a 100644
--- a/pkgs/by-name/go/goreplay/package.nix
+++ b/pkgs/by-name/go/goreplay/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buger";
     repo = "goreplay";
-    rev = version;
+    tag = version;
     sha256 = "sha256-FiY9e5FgpPu+K8eoO8TsU3xSaSoPPDxYEu0oi/S8Q1w=";
   };
 
diff --git a/pkgs/by-name/go/goresym/package.nix b/pkgs/by-name/go/goresym/package.nix
index e498701b9707..348c9d2ac4de 100644
--- a/pkgs/by-name/go/goresym/package.nix
+++ b/pkgs/by-name/go/goresym/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mandiant";
     repo = "goresym";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tt13vHe6wE27kv+1HVXytY1hKmOt6rWJaMBgLRCvO2E=";
   };
 
diff --git a/pkgs/by-name/go/gorilla-cli/package.nix b/pkgs/by-name/go/gorilla-cli/package.nix
index 58d362fe9351..9f845de1f4aa 100644
--- a/pkgs/by-name/go/gorilla-cli/package.nix
+++ b/pkgs/by-name/go/gorilla-cli/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gorilla-llm";
     repo = "gorilla-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-3h3QtBDKswTDL7zNM2C4VWiGCqknm/bxhP9sw4ieIcQ=";
   };
 
diff --git a/pkgs/by-name/go/gortr/package.nix b/pkgs/by-name/go/gortr/package.nix
index 79c8c4175993..de90887c57ff 100644
--- a/pkgs/by-name/go/gortr/package.nix
+++ b/pkgs/by-name/go/gortr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W6+zCLPcORGcRJF0F6/LRPap4SNVn/oKGs21T4nSNO0=";
   };
 
diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix
index 79b2d9bfd682..cfa30b2bb121 100644
--- a/pkgs/by-name/go/gosec/package.nix
+++ b/pkgs/by-name/go/gosec/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "securego";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MQ/dDK2t9H7bSsr5MMtlKySLAJIDimRbpATHyOYxrBo=";
   };
 
diff --git a/pkgs/by-name/go/gosimports/package.nix b/pkgs/by-name/go/gosimports/package.nix
index 72826ccc9da8..57076d914405 100644
--- a/pkgs/by-name/go/gosimports/package.nix
+++ b/pkgs/by-name/go/gosimports/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rinchsan";
     repo = "gosimports";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xM1CGW8UB+VHN+2Rm6cF/1bOBVDeUG+6kxUxUcvP7FM=";
   };
 
diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix
index f64a23db5df7..f5640de41aa9 100644
--- a/pkgs/by-name/go/gosmee/package.nix
+++ b/pkgs/by-name/go/gosmee/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "gosmee";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B+0Qod9U7bTQKXkbZJ0eQ6DkPdq56EI2tf/3i8wP/TI=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/go/gospider/package.nix b/pkgs/by-name/go/gospider/package.nix
index 6b3f226106c2..9e0da71a7c45 100644
--- a/pkgs/by-name/go/gospider/package.nix
+++ b/pkgs/by-name/go/gospider/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jaeles-project";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1EnKheHaS1kxw0cjxCahT3rUWBXiqxjKefrDBI2xIvY=";
   };
 
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/go/gostatic/package.nix b/pkgs/by-name/go/gostatic/package.nix
index 6b0ce598ca88..0a6363181316 100644
--- a/pkgs/by-name/go/gostatic/package.nix
+++ b/pkgs/by-name/go/gostatic/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "piranha";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-pxk9tauB7u0oe6g4maHh+dREZXKwMz44v3KB43yYW6c=";
   };
 
diff --git a/pkgs/by-name/go/gosu/package.nix b/pkgs/by-name/go/gosu/package.nix
index d2213d926c5e..99a877a63809 100644
--- a/pkgs/by-name/go/gosu/package.nix
+++ b/pkgs/by-name/go/gosu/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tianon";
     repo = "gosu";
-    rev = version;
+    tag = version;
     hash = "sha256-ziviUXqCpCGECewyZNLDKSjnpmz/3i5DKrIKZlLwl4o=";
   };
 
diff --git a/pkgs/by-name/go/gotest/package.nix b/pkgs/by-name/go/gotest/package.nix
index 4c565840fee6..54c9efa0b34d 100644
--- a/pkgs/by-name/go/gotest/package.nix
+++ b/pkgs/by-name/go/gotest/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rakyll";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1v11ccrjghq7nsz0f91r17di14yixsw28vs0m3dwzwqkh1a20img";
   };
 
diff --git a/pkgs/by-name/go/gotestdox/package.nix b/pkgs/by-name/go/gotestdox/package.nix
index c9a0c55ccf92..3eb24d354ded 100644
--- a/pkgs/by-name/go/gotestdox/package.nix
+++ b/pkgs/by-name/go/gotestdox/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bitfield";
     repo = "gotestdox";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AZDXMwADOjcaMiofMWoHp+eSnD3a8iFtwpWDKl9Ess8=";
   };
 
diff --git a/pkgs/by-name/go/gotestfmt/package.nix b/pkgs/by-name/go/gotestfmt/package.nix
index f0b7babdde9c..b9d876dd1aea 100644
--- a/pkgs/by-name/go/gotestfmt/package.nix
+++ b/pkgs/by-name/go/gotestfmt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gotesttools";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7mLn2axlHoXau9JtLhk1zwzhxkFGHgYPo7igI+IAsP4=";
   };
 
diff --git a/pkgs/by-name/go/gotests/package.nix b/pkgs/by-name/go/gotests/package.nix
index d0ad80fbb9da..5afbeaa81628 100644
--- a/pkgs/by-name/go/gotests/package.nix
+++ b/pkgs/by-name/go/gotests/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cweill";
     repo = "gotests";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6IzUpAsFUgF2FwiC17OfDn1M+8WYFQPpRyXbkpHIztw=";
   };
 
diff --git a/pkgs/by-name/go/gotify-cli/package.nix b/pkgs/by-name/go/gotify-cli/package.nix
index 9dc87997cc37..2b70e2f5e262 100644
--- a/pkgs/by-name/go/gotify-cli/package.nix
+++ b/pkgs/by-name/go/gotify-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gotify";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GwPIGWEpj5GjGV9bz3LctZctHQe+Vywoc1piNb9vAAw=";
   };
 
diff --git a/pkgs/by-name/go/gotify-desktop/package.nix b/pkgs/by-name/go/gotify-desktop/package.nix
index 6ebaeef8d379..99da97b9dbde 100644
--- a/pkgs/by-name/go/gotify-desktop/package.nix
+++ b/pkgs/by-name/go/gotify-desktop/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "gotify-desktop";
-    rev = version;
+    tag = version;
     sha256 = "sha256-P6zZAd3381/JamrEdbZRVFouhDsPNy1cNAjy4K3jGro=";
   };
 
diff --git a/pkgs/by-name/go/gotify-server/package.nix b/pkgs/by-name/go/gotify-server/package.nix
index 3946198e2fbc..37dd1a36c70a 100644
--- a/pkgs/by-name/go/gotify-server/package.nix
+++ b/pkgs/by-name/go/gotify-server/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gotify";
     repo = "server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6PmJnRBovyufrSB+uMbU+bqhZb1bEs39MxBVMnnE6f8=";
   };
 
diff --git a/pkgs/by-name/go/gotools/package.nix b/pkgs/by-name/go/gotools/package.nix
index ab00c3f10ef6..5d167d7834d8 100644
--- a/pkgs/by-name/go/gotools/package.nix
+++ b/pkgs/by-name/go/gotools/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "golang";
     repo = "tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yUkdZSe/GV0w1qK8aQjcFE4tNKYC8f4JeFgPiv8GlQc=";
   };
 
diff --git a/pkgs/by-name/go/gotraceui/package.nix b/pkgs/by-name/go/gotraceui/package.nix
index 9730a2e6df91..dece0b1c089a 100644
--- a/pkgs/by-name/go/gotraceui/package.nix
+++ b/pkgs/by-name/go/gotraceui/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dominikh";
     repo = "gotraceui";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Rforuh9YlTv/mTpQm0+BaY+Ssc4DAiDCzVkIerP5Uz0=";
   };
 
diff --git a/pkgs/by-name/go/gotree/package.nix b/pkgs/by-name/go/gotree/package.nix
index bdefbb5badb5..4c304ab500c3 100644
--- a/pkgs/by-name/go/gotree/package.nix
+++ b/pkgs/by-name/go/gotree/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "elbachir-one";
     repo = "gt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sWKqfDWwMfj4shg/MxHu7Zr4WE5pxAzHHmsjU3jQY10=";
   };
 
diff --git a/pkgs/by-name/go/gotty/package.nix b/pkgs/by-name/go/gotty/package.nix
index 38f040f0bb52..f7853d8264b4 100644
--- a/pkgs/by-name/go/gotty/package.nix
+++ b/pkgs/by-name/go/gotty/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sorenisanerd";
     repo = "gotty";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VSu0ASnLmRzOGOEKqb/zB43+HxEwMpKLpbdbWY5QrEk=";
   };
 
diff --git a/pkgs/by-name/go/gotypist/package.nix b/pkgs/by-name/go/gotypist/package.nix
index 5806a6cded23..ee5d70c02f8d 100644
--- a/pkgs/by-name/go/gotypist/package.nix
+++ b/pkgs/by-name/go/gotypist/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pb-";
     repo = "gotypist";
-    rev = version;
+    tag = version;
     sha256 = "0khl2f6bl121slw9mlf4qzsdarpk1v3vry11f3dvz7pb1q6zjj11";
   };
 
diff --git a/pkgs/by-name/go/govc/package.nix b/pkgs/by-name/go/govc/package.nix
index f9caec412a5b..4b238a5eddbe 100644
--- a/pkgs/by-name/go/govc/package.nix
+++ b/pkgs/by-name/go/govc/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   subPackages = [ "govc" ];
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "vmware";
     repo = "govmomi";
     sha256 = "sha256-vwvhVC+Avi55uenlW68tWGREEHRZw8RUjgiC0r7BgQ4=";
diff --git a/pkgs/by-name/go/govee2mqtt/package.nix b/pkgs/by-name/go/govee2mqtt/package.nix
index 82f8151452d5..9604abfe0cc3 100644
--- a/pkgs/by-name/go/govee2mqtt/package.nix
+++ b/pkgs/by-name/go/govee2mqtt/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wez";
     repo = "govee2mqtt";
-    rev = version;
+    tag = version;
     hash = "sha256-iGOj0a4+wLd8QlM1tr+NYfd2tuwgHV+u5dt0zf+WscY=";
   };
 
diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix
index a41a636445c4..9647af6bb3b5 100644
--- a/pkgs/by-name/go/goverlay/package.nix
+++ b/pkgs/by-name/go/goverlay/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "benjamimgois";
     repo = "goverlay";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Vxmmsf/l3OK1Q6UKdhCWvU4WPJkdQG2Hn+s9tS+D5KM=";
   };
 
diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix
index 581840505d15..d1435ce5ef4c 100644
--- a/pkgs/by-name/go/gowall/package.nix
+++ b/pkgs/by-name/go/gowall/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Achno";
     repo = "gowall";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QKukWA8TB0FoNHu0Wyco55x4oBY+E33qdoT/SaXW6DE=";
   };
 
diff --git a/pkgs/by-name/go/gox/package.nix b/pkgs/by-name/go/gox/package.nix
index 8ff5fda50bf1..60237500c1e2 100644
--- a/pkgs/by-name/go/gox/package.nix
+++ b/pkgs/by-name/go/gox/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mitchellh";
     repo = "gox";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7";
   };
 
diff --git a/pkgs/by-name/go/goxlr-utility/package.nix b/pkgs/by-name/go/goxlr-utility/package.nix
index d38d7c6be0a1..0a420a5a1468 100644
--- a/pkgs/by-name/go/goxlr-utility/package.nix
+++ b/pkgs/by-name/go/goxlr-utility/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "GoXLR-on-Linux";
     repo = "goxlr-utility";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aThIu+3eNHCKS6lsio7cLZeIMg0509qkE0YQ6M6vPAI=";
   };
 
diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index 3bbb52e5fb7a..abc436fd55a6 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gpac";
     repo = "gpac";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM=";
   };
 
diff --git a/pkgs/by-name/gp/gpart/package.nix b/pkgs/by-name/gp/gpart/package.nix
index 7fa84d64e956..83fd9ce584b2 100644
--- a/pkgs/by-name/gp/gpart/package.nix
+++ b/pkgs/by-name/gp/gpart/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   # GitHub repository 'collating patches for gpart from all distributions':
   src = fetchFromGitHub {
     sha256 = "1lsd9k876p944k9s6sxqk5yh9yr7m42nbw9vlsllin7pd4djl4ya";
-    rev = version;
+    tag = version;
     repo = "gpart";
     owner = "baruch";
   };
diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix
index 2fd26d1dd832..b6562c60d7c0 100644
--- a/pkgs/by-name/gp/gpauth/package.nix
+++ b/pkgs/by-name/gp/gpauth/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yuezk";
     repo = "GlobalProtect-openconnect";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MY4JvftrC6sR8M0dFvnGZOkvHIhPRcyct9AG/8527gw=";
   };
 
diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix
index f6d62b87eb20..8df390b6700d 100644
--- a/pkgs/by-name/gp/gpclient/package.nix
+++ b/pkgs/by-name/gp/gpclient/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yuezk";
     repo = "GlobalProtect-openconnect";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MY4JvftrC6sR8M0dFvnGZOkvHIhPRcyct9AG/8527gw=";
   };
 
diff --git a/pkgs/by-name/gp/gphotos-sync/package.nix b/pkgs/by-name/gp/gphotos-sync/package.nix
index 9b89e9c53b5e..25bf5b45d33b 100644
--- a/pkgs/by-name/gp/gphotos-sync/package.nix
+++ b/pkgs/by-name/gp/gphotos-sync/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gilesknap";
     repo = "gphotos-sync";
-    rev = version;
+    tag = version;
     hash = "sha256-iTqD/oUQqC7Fju8SEPkSZX7FC9tE4eRCewiJR8STmEw=";
   };
 
diff --git a/pkgs/by-name/gp/gpick/package.nix b/pkgs/by-name/gp/gpick/package.nix
index 8a895b34e9c2..9f4ea8346b2a 100644
--- a/pkgs/by-name/gp/gpick/package.nix
+++ b/pkgs/by-name/gp/gpick/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thezbyg";
     repo = "gpick";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Z17YpdAAr2wvDFkrAosyCN6Y/wsFVkiB9IDvXuP9lYo=";
   };
 
diff --git a/pkgs/by-name/gp/gpodder/package.nix b/pkgs/by-name/gp/gpodder/package.nix
index 738983a6322f..522ded5a6cc3 100644
--- a/pkgs/by-name/gp/gpodder/package.nix
+++ b/pkgs/by-name/gp/gpodder/package.nix
@@ -19,7 +19,7 @@ python311Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "kEhyV1o8VSQW9qMx6m5avj6LnJuVTONDd6msRuc8t/4=";
   };
 
diff --git a/pkgs/by-name/gp/gptman/package.nix b/pkgs/by-name/gp/gptman/package.nix
index 96f6b2009688..e094ce90dcb4 100644
--- a/pkgs/by-name/gp/gptman/package.nix
+++ b/pkgs/by-name/gp/gptman/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-disk-partition-management";
     repo = "gptman";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ebV61EilGggix6JSN/MW4Ka0itkSpvikLDSO005TTYY=";
   };
 
diff --git a/pkgs/by-name/gp/gpustat/package.nix b/pkgs/by-name/gp/gpustat/package.nix
index 40e8417b2d58..5fbc5f5dcf4f 100644
--- a/pkgs/by-name/gp/gpustat/package.nix
+++ b/pkgs/by-name/gp/gpustat/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "arduano";
     repo = "gpustat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg=";
   };
 
diff --git a/pkgs/by-name/gp/gpuvis/package.nix b/pkgs/by-name/gp/gpuvis/package.nix
index f8c14cca6961..76b946f58c9f 100644
--- a/pkgs/by-name/gp/gpuvis/package.nix
+++ b/pkgs/by-name/gp/gpuvis/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mikesart";
     repo = "gpuvis";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-a9eAYDsiwyzZc4FAPo0wANysisIT4qCHLh2PrYswJtw=";
   };
 
diff --git a/pkgs/by-name/gp/gpx-viewer/package.nix b/pkgs/by-name/gp/gpx-viewer/package.nix
index 12a2d49c10ba..1510cc520b85 100644
--- a/pkgs/by-name/gp/gpx-viewer/package.nix
+++ b/pkgs/by-name/gp/gpx-viewer/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DaveDavenport";
     repo = "gpx-viewer";
-    rev = version;
+    tag = version;
     hash = "sha256-6AChX0UEIrQExaq3oo9Be5Sr13+POHFph7pZegqcjio=";
   };
 
diff --git a/pkgs/by-name/gp/gpx/package.nix b/pkgs/by-name/gp/gpx/package.nix
index bc1113b99b20..164501595035 100644
--- a/pkgs/by-name/gp/gpx/package.nix
+++ b/pkgs/by-name/gp/gpx/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "markwal";
     repo = "GPX";
-    rev = version;
+    tag = version;
     sha256 = "1izs8s5npkbfrsyk17429hyl1vyrbj9dp6vmdlbb2vh6mfgl54h8";
   };
 
diff --git a/pkgs/by-name/gp/gpxlab/package.nix b/pkgs/by-name/gp/gpxlab/package.nix
index 07d09dd0edad..0e3f45f8594e 100644
--- a/pkgs/by-name/gp/gpxlab/package.nix
+++ b/pkgs/by-name/gp/gpxlab/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BourgeoisLab";
     repo = "GPXLab";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84";
   };
 
diff --git a/pkgs/by-name/gp/gpython/package.nix b/pkgs/by-name/gp/gpython/package.nix
index 2891dd308d86..5c73d12b9a18 100644
--- a/pkgs/by-name/gp/gpython/package.nix
+++ b/pkgs/by-name/gp/gpython/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-python";
     repo = "gpython";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xqwq27u41Jgoh7t9UDyatuBQswr+h3xio5AV/npncHc=";
   };
 
diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix
index 1891f035c073..1b40db51d0cb 100644
--- a/pkgs/by-name/gq/gql/package.nix
+++ b/pkgs/by-name/gq/gql/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AmrDeveloper";
     repo = "GQL";
-    rev = version;
+    tag = version;
     hash = "sha256-5n95+BcdjdjZyT3fvRv8acPV3jK9IppsKklI0zuA5mw=";
   };
 
diff --git a/pkgs/by-name/gq/gqlgenc/package.nix b/pkgs/by-name/gq/gqlgenc/package.nix
index 760f744e5d55..b72bf8e4b3bb 100644
--- a/pkgs/by-name/gq/gqlgenc/package.nix
+++ b/pkgs/by-name/gq/gqlgenc/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yamashou";
     repo = "gqlgenc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-RGHfDrFr2HO4i+YQeNzYrEcU+Xe286f3f5g/yUmpxpA=";
   };
 
diff --git a/pkgs/by-name/gq/gqlint/package.nix b/pkgs/by-name/gq/gqlint/package.nix
index c0d955d7d072..9b5dbcd38453 100644
--- a/pkgs/by-name/gq/gqlint/package.nix
+++ b/pkgs/by-name/gq/gqlint/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "happylinks";
     repo = "gqlint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m/Y7i3+93UdPnKQlZUHgtRbfSmJ1xYjao+bU+zxMgHw=";
   };
 
diff --git a/pkgs/by-name/gr/gr-framework/package.nix b/pkgs/by-name/gr/gr-framework/package.nix
index 51d63e78d187..7b6b9da48a49 100644
--- a/pkgs/by-name/gr/gr-framework/package.nix
+++ b/pkgs/by-name/gr/gr-framework/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sciapp";
     repo = "gr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vCcXWgoaWcaNRgIk9CrXp8eTII/CBOHR1iDncC/Cd4k=";
   };
 
diff --git a/pkgs/by-name/gr/grabserial/package.nix b/pkgs/by-name/gr/grabserial/package.nix
index 72ccf1499dbb..2ed684044b0b 100644
--- a/pkgs/by-name/gr/grabserial/package.nix
+++ b/pkgs/by-name/gr/grabserial/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tbird20d";
     repo = "grabserial";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0ryk4w8q6zfmia71nwnk5b7xaxw0sf45dw9q50xp7k76i3k5f9f3";
   };
 
diff --git a/pkgs/by-name/gr/gradescope-submit/package.nix b/pkgs/by-name/gr/gradescope-submit/package.nix
index 8cd424e93907..1cda10224e07 100644
--- a/pkgs/by-name/gr/gradescope-submit/package.nix
+++ b/pkgs/by-name/gr/gradescope-submit/package.nix
@@ -11,7 +11,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "nmittu";
     repo = "gradescope-submit";
-    rev = version;
+    tag = version;
     hash = "sha256-BVNXipgw0wz3PRGYvur8jrXZw/6i0fZ+MOZHzXzlFOk=";
   };
 
diff --git a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
index cd40c8407763..ba0ca1a2536a 100644
--- a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
+++ b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.7.2";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "esnet";
     repo = "gdg";
     sha256 = "sha256-0F4kdyQ4TXV2vb2IkPx7CisTmJAQjlSRtOAFhmZqaD8=";
diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix
index ff8edbff0abd..238d3c70b819 100644
--- a/pkgs/by-name/gr/grafana-image-renderer/package.nix
+++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix
@@ -19,7 +19,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana-image-renderer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-twB2V5iecLEMTrp+prFmDoJvcGLVQlLJ+DTSl/9V8S8=";
   };
 
diff --git a/pkgs/by-name/gr/grafana-kiosk/package.nix b/pkgs/by-name/gr/grafana-kiosk/package.nix
index 7ae16243d7f9..df6a2166e056 100644
--- a/pkgs/by-name/gr/grafana-kiosk/package.nix
+++ b/pkgs/by-name/gr/grafana-kiosk/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana-kiosk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kh62qGMVHNTssQMEBwLaEW0tRtP3iWMrxXeQU+fe+44=";
   };
 
diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index 69f76cdf2946..764c674980fd 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1tI9X2eIKuWEWJBbN4UAw8yeRrjgfqcenJyTNMk5rqU=";
   };
 
diff --git a/pkgs/by-name/gr/grafana-reporter/package.nix b/pkgs/by-name/gr/grafana-reporter/package.nix
index 04a740d1bddb..edbfbbb20d6c 100644
--- a/pkgs/by-name/gr/grafana-reporter/package.nix
+++ b/pkgs/by-name/gr/grafana-reporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   version = "2.3.1";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "IzakMarais";
     repo = "reporter";
     hash = "sha256-lsraJwx56I2Gn8CePWUlQu1qdMp78P4xwPzLxetYUcw=";
diff --git a/pkgs/by-name/gr/grafterm/package.nix b/pkgs/by-name/gr/grafterm/package.nix
index f0b698397e95..b47011ab09d3 100644
--- a/pkgs/by-name/gr/grafterm/package.nix
+++ b/pkgs/by-name/gr/grafterm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slok";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0pM36rAmwx/P1KAlmVaGoSj8eb9JucYycNC2R867dVo=";
   };
 
diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 510d676a1549..8072763eb13c 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "common-fate";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xHpYtHG0fJ/VvJ/4lJ90ept3yGzJRnmtFQFbYxJtxwY=";
   };
 
diff --git a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix
index 2c0701e56b6c..93946c9ce504 100644
--- a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix
+++ b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "GrapheneOS";
     repo = "hardened_malloc";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-8EIdJmnPdJgES+8QwWzL1oKVqO62CQdtjyMgFw+P0+g=";
   };
 
diff --git a/pkgs/by-name/gr/graphene/package.nix b/pkgs/by-name/gr/graphene/package.nix
index 20ad68fb42b3..25b3bdbea5de 100644
--- a/pkgs/by-name/gr/graphene/package.nix
+++ b/pkgs/by-name/gr/graphene/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ebassi";
     repo = "graphene";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "P6JQhSktzvyMHatP/iojNGXPmcsxsFxdYerXzS23ojI=";
   };
 
diff --git a/pkgs/by-name/gr/graphite-cursors/package.nix b/pkgs/by-name/gr/graphite-cursors/package.nix
index 306a35d767c4..d83a00212639 100644
--- a/pkgs/by-name/gr/graphite-cursors/package.nix
+++ b/pkgs/by-name/gr/graphite-cursors/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "graphite-cursors";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Kopl2NweYrq9rhw+0EUMhY/pfGo4g387927TZAhI5/A=";
   };
 
diff --git a/pkgs/by-name/gr/graphite-gtk-theme/package.nix b/pkgs/by-name/gr/graphite-gtk-theme/package.nix
index 1cfef4fcfaaf..feb27ca7c485 100644
--- a/pkgs/by-name/gr/graphite-gtk-theme/package.nix
+++ b/pkgs/by-name/gr/graphite-gtk-theme/package.nix
@@ -67,7 +67,7 @@ lib.checkListOfEnum "${pname}: theme variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      rev = version;
+      tag = version;
       hash = "sha256-k93l/7DF0HSKPfiIxzBLz0mBflgbdYJyGLEmWZx3q7o=";
     };
 
diff --git a/pkgs/by-name/gr/graphqurl/package.nix b/pkgs/by-name/gr/graphqurl/package.nix
index 779f8b3c3f8a..08e82e906eb5 100644
--- a/pkgs/by-name/gr/graphqurl/package.nix
+++ b/pkgs/by-name/gr/graphqurl/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "hasura";
     repo = "graphqurl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q46DX/luUwBoVskKy9+hXOkpGmlh+lNRvwfcTn6DPN8=";
   };
 
diff --git a/pkgs/by-name/gr/graphwar/package.nix b/pkgs/by-name/gr/graphwar/package.nix
index 97481a1dab3c..8b8dcd649e4d 100644
--- a/pkgs/by-name/gr/graphwar/package.nix
+++ b/pkgs/by-name/gr/graphwar/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "catabriga";
     repo = "graphwar";
-    rev = version;
+    tag = version;
     sha256 = "sha256-t3Y576dXWp2Mj6OSQN5cm9FuNBWNqKq6xxkVRbjIBgE=";
   };
 
diff --git a/pkgs/by-name/gr/gravit/package.nix b/pkgs/by-name/gr/gravit/package.nix
index 53b92adac0c4..993e9ae43d49 100644
--- a/pkgs/by-name/gr/gravit/package.nix
+++ b/pkgs/by-name/gr/gravit/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gak";
     repo = "gravit";
-    rev = version;
+    tag = version;
     hash = "sha256-JuqnLLD5+Ec8kQI0SK98V1O6TTbGM6+yKn5KCHe85eM=";
   };
 
diff --git a/pkgs/by-name/gr/greybird/package.nix b/pkgs/by-name/gr/greybird/package.nix
index 49cb7ea1ea55..3da2f5f05925 100644
--- a/pkgs/by-name/gr/greybird/package.nix
+++ b/pkgs/by-name/gr/greybird/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "greybird";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-De8y+LRQ26UKrUECLCcbCg7p9Z+aRssQ/7YzegAUPw4=";
   };
 
diff --git a/pkgs/by-name/gr/gridtracker/package.nix b/pkgs/by-name/gr/gridtracker/package.nix
index 16788295631c..084643246b1d 100644
--- a/pkgs/by-name/gr/gridtracker/package.nix
+++ b/pkgs/by-name/gr/gridtracker/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "gridtracker.org";
     repo = "gridtracker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6WgP13JVOzYnYtCDH3qCQXT70X9j4yqlUb18FFf1aSY=";
   };
 
diff --git a/pkgs/by-name/gr/grip-search/package.nix b/pkgs/by-name/gr/grip-search/package.nix
index 5b9b622d929a..0789def61679 100644
--- a/pkgs/by-name/gr/grip-search/package.nix
+++ b/pkgs/by-name/gr/grip-search/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sc0ty";
     repo = "grip";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0bkqarylgzhis6fpj48qbifcd6a26cgnq8784hgnm707rq9kb0rx";
   };
 
diff --git a/pkgs/by-name/gr/grit/package.nix b/pkgs/by-name/gr/grit/package.nix
index cdf1aca545f1..ee0d2bf0e811 100644
--- a/pkgs/by-name/gr/grit/package.nix
+++ b/pkgs/by-name/gr/grit/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "climech";
     repo = "grit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-c8wBwmXFjpst6UxL5zmTxMR4bhzpHYljQHiJFKiNDms=";
   };
 
diff --git a/pkgs/by-name/gr/grive2/package.nix b/pkgs/by-name/gr/grive2/package.nix
index c5e2b90c4390..ab2592df1d0f 100644
--- a/pkgs/by-name/gr/grive2/package.nix
+++ b/pkgs/by-name/gr/grive2/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vitalif";
     repo = "grive2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-P6gitA5cXfNbNDy4ohRLyXj/5dUXkCkOdE/9rJPzNCg=";
   };
 
diff --git a/pkgs/by-name/gr/grizzly/package.nix b/pkgs/by-name/gr/grizzly/package.nix
index ad46068b7a30..83e397335378 100644
--- a/pkgs/by-name/gr/grizzly/package.nix
+++ b/pkgs/by-name/gr/grizzly/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1caG2QIBfbCgg9TLsW4XB0w+4dqUkQEsdWwRazbWeQA=";
   };
 
diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix
index b3ba15f3e364..d38f76600ab9 100644
--- a/pkgs/by-name/gr/grml-zsh-config/package.nix
+++ b/pkgs/by-name/gr/grml-zsh-config/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grml";
     repo = "grml-etc-core";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7UiP6CUP/qArOfcrFtpiNUBBwkcCSrvsPb29SSqSkmg=";
   };
 
diff --git a/pkgs/by-name/gr/grmon/package.nix b/pkgs/by-name/gr/grmon/package.nix
index df610dec3ecb..f07f44723848 100644
--- a/pkgs/by-name/gr/grmon/package.nix
+++ b/pkgs/by-name/gr/grmon/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bcicen";
     repo = "grmon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0J7f4DMADUut3Da0F1eTDsT1Hlk0rfInwzbcVcQNzg8=";
   };
 
diff --git a/pkgs/by-name/gr/grobi/package.nix b/pkgs/by-name/gr/grobi/package.nix
index 5841700709ad..862dc676cd17 100644
--- a/pkgs/by-name/gr/grobi/package.nix
+++ b/pkgs/by-name/gr/grobi/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   pname = "grobi";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "fd0";
     repo = "grobi";
     hash = "sha256-evgDY+OjfQ0ngf4j/D4yOeITHQXmBmw8KiJhLKjdVAw=";
diff --git a/pkgs/by-name/gr/gron/package.nix b/pkgs/by-name/gr/gron/package.nix
index 8290fd91eb4f..4f6572085c3d 100644
--- a/pkgs/by-name/gr/gron/package.nix
+++ b/pkgs/by-name/gr/gron/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "gron";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZkAfAQsaFX7npyDcBDFS4Xa8kOMVH6yGfxGD7c0iQ+o=";
   };
 
diff --git a/pkgs/by-name/gr/grpc-client-cli/package.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix
index c1a9082d3262..22a84d80dfaf 100644
--- a/pkgs/by-name/gr/grpc-client-cli/package.nix
+++ b/pkgs/by-name/gr/grpc-client-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vadimi";
     repo = "grpc-client-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+Njo3cqqWhQMYsO7VLScPemmBMCf55khzLqBmODqEng=";
   };
 
diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index c46f56491ac1..9c20dcb1a2a9 100644
--- a/pkgs/by-name/gr/grpc/package.nix
+++ b/pkgs/by-name/gr/grpc/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kJhGAhqu25Q2g6BWkVGp6nGYrWdBnMhoMu6e7ifNbgk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix
index b42c9c89e35e..88b651526203 100644
--- a/pkgs/by-name/gr/grpc_cli/package.nix
+++ b/pkgs/by-name/gr/grpc_cli/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QKSdMpfl0pdKy/r4z8VKcGN0gsQmx9lBRHlCjaaF5Sg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gr/grpcui/package.nix b/pkgs/by-name/gr/grpcui/package.nix
index 979a97ca1e83..c8dc6d4c74d5 100644
--- a/pkgs/by-name/gr/grpcui/package.nix
+++ b/pkgs/by-name/gr/grpcui/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fullstorydev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Tmema+cMPDGuX6Y8atow58GdGMj7croHyj8oiDXSEYk=";
   };
 
diff --git a/pkgs/by-name/gr/grpcurl/package.nix b/pkgs/by-name/gr/grpcurl/package.nix
index 7fc0556564bb..4803fc008d58 100644
--- a/pkgs/by-name/gr/grpcurl/package.nix
+++ b/pkgs/by-name/gr/grpcurl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fullstorydev";
     repo = "grpcurl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bgjlCK3sTRrz1FhAs7mQbaea2gMS7liLXU6z02FPTfg=";
   };
 
diff --git a/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix b/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix
index 13fbef973cdb..16c02eda1dd0 100644
--- a/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix
+++ b/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jmattheis";
     repo = "gruvbox-dark-gtk";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-C681o89MTGNp1l3DLQsRpH9HQdmdCXZzk0F0rNhcyL4=";
   };
 
diff --git a/pkgs/by-name/gs/gsctl/package.nix b/pkgs/by-name/gs/gsctl/package.nix
index bdab9d5b6cbc..d3e98ab83c0c 100644
--- a/pkgs/by-name/gs/gsctl/package.nix
+++ b/pkgs/by-name/gs/gsctl/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "giantswarm";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-eemPsrSFwgUR1Jz7283jjwMkoJR38QiaiilI9G0IQuo=";
   };
 
diff --git a/pkgs/by-name/gs/gsimplecal/package.nix b/pkgs/by-name/gs/gsimplecal/package.nix
index 3ed9edbfae05..9d9bc153400d 100644
--- a/pkgs/by-name/gs/gsimplecal/package.nix
+++ b/pkgs/by-name/gs/gsimplecal/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dmedvinsky";
     repo = "gsimplecal";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Q8vK+rIRr+Tzwq0Xw5a1pYoLkSwF6PEdqc3/Dk01++o=";
   };
 
diff --git a/pkgs/by-name/gs/gsocket/package.nix b/pkgs/by-name/gs/gsocket/package.nix
index 02f50b5c024c..d124b42980c9 100644
--- a/pkgs/by-name/gs/gsocket/package.nix
+++ b/pkgs/by-name/gs/gsocket/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hackerschoice";
     repo = "gsocket";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7ph7YaY8rbfzvEh1ABgl3Jg15d6WBP4pywFn/nXjPKY=";
   };
 
diff --git a/pkgs/by-name/gs/gspeech/package.nix b/pkgs/by-name/gs/gspeech/package.nix
index f4e133064e79..52f8e9af5605 100644
--- a/pkgs/by-name/gs/gspeech/package.nix
+++ b/pkgs/by-name/gs/gspeech/package.nix
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mothsart";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0z11yxvgi8m2xjmmf56zla91jpmf0a4imwi9qqz6bp51pw4sk8gp";
   };
 
diff --git a/pkgs/by-name/gs/gst/package.nix b/pkgs/by-name/gs/gst/package.nix
index e0411e873b4c..1c72e148c53b 100644
--- a/pkgs/by-name/gs/gst/package.nix
+++ b/pkgs/by-name/gs/gst/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "uetchy";
     repo = "gst";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NhbGHTYucfqCloVirkaDlAtQfhWP2cw4I+t/ysvvkR0=";
   };
 
diff --git a/pkgs/by-name/gs/gst123/package.nix b/pkgs/by-name/gs/gst123/package.nix
index 46b2fa3008f7..c7f1e2557b59 100644
--- a/pkgs/by-name/gs/gst123/package.nix
+++ b/pkgs/by-name/gs/gst123/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "swesterfeld";
     repo = "gst123";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-7qS7JJ7EY1uFGX3FxBxgH6LzK4XUoTPHR0QVwUWRz+g=";
   };
 
diff --git a/pkgs/by-name/gt/gtest/package.nix b/pkgs/by-name/gt/gtest/package.nix
index 2678e192a375..9191aca181f9 100644
--- a/pkgs/by-name/gt/gtest/package.nix
+++ b/pkgs/by-name/gt/gtest/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "googletest";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-01PK9LxqHno89gypd7ze5gDP4V3en2J5g6JZRqohDB0=";
   };
 
diff --git a/pkgs/by-name/gt/gtg/package.nix b/pkgs/by-name/gt/gtg/package.nix
index ea9a67cfd284..07770443c91f 100644
--- a/pkgs/by-name/gt/gtg/package.nix
+++ b/pkgs/by-name/gt/gtg/package.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "getting-things-gnome";
     repo = "gtg";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-O8qBD92P2g8QrBdMXa6j0Ozk+W80Ny5yk0KNTy7ekfE=";
   };
 
diff --git a/pkgs/by-name/gt/gthree/package.nix b/pkgs/by-name/gt/gthree/package.nix
index f4fb6033ddd4..288fe3d6ff10 100644
--- a/pkgs/by-name/gt/gthree/package.nix
+++ b/pkgs/by-name/gt/gthree/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexlarsson";
     repo = "gthree";
-    rev = version;
+    tag = version;
     sha256 = "09fcnjc3j21lh5fjf067wm35sb4qni4vgzing61kixnn2shy79iy";
   };
 
diff --git a/pkgs/by-name/gt/gti/package.nix b/pkgs/by-name/gt/gti/package.nix
index faf0dcfc8468..e1e6624c4608 100644
--- a/pkgs/by-name/gt/gti/package.nix
+++ b/pkgs/by-name/gt/gti/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rwos";
     repo = "gti";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DUDCFcaB38Xkp3lLfEhjGC0j430dphXFBVhGzm7/Bp0=";
   };
 
diff --git a/pkgs/by-name/gt/gtk-sharp-beans/package.nix b/pkgs/by-name/gt/gtk-sharp-beans/package.nix
index c01f39ef028c..ca5cc914f7a9 100644
--- a/pkgs/by-name/gt/gtk-sharp-beans/package.nix
+++ b/pkgs/by-name/gt/gtk-sharp-beans/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "gtk-sharp-beans";
 
-    rev = version;
+    tag = version;
     sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1";
   };
 
diff --git a/pkgs/by-name/gt/gtkclipblock/package.nix b/pkgs/by-name/gt/gtkclipblock/package.nix
index c6cce92c1fa3..f7763d0c3de7 100644
--- a/pkgs/by-name/gt/gtkclipblock/package.nix
+++ b/pkgs/by-name/gt/gtkclipblock/package.nix
@@ -24,7 +24,7 @@ let
   src = fetchFromGitHub {
     owner = "notpeelz";
     repo = "gtkclipblock";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ok/D7M0KekN8zf8AzhcOLtedbYVRHHv3m9zEHsJfcPM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gt/gtkhash/package.nix b/pkgs/by-name/gt/gtkhash/package.nix
index e28674b5cd70..582f3a317498 100644
--- a/pkgs/by-name/gt/gtkhash/package.nix
+++ b/pkgs/by-name/gt/gtkhash/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "gtkhash";
     owner = "gtkhash";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XpgTolpTSsW3i0xk19tt4cn9qANoeiq7YnBBR6g8ioU=";
   };
 
diff --git a/pkgs/by-name/gt/gtkterm/package.nix b/pkgs/by-name/gt/gtkterm/package.nix
index 0b11db2e5566..e7808eaeb374 100644
--- a/pkgs/by-name/gt/gtkterm/package.nix
+++ b/pkgs/by-name/gt/gtkterm/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wvdakker";
     repo = "gtkterm";
-    rev = version;
+    tag = version;
     sha256 = "sha256-oGqOXIu5P3KfdV6Unm7Nz+BRhb5Z6rne0+e0wZ2EcAI=";
   };
 
diff --git a/pkgs/by-name/gt/gtop/package.nix b/pkgs/by-name/gt/gtop/package.nix
index 331c95b9b98f..845297dc5337 100644
--- a/pkgs/by-name/gt/gtop/package.nix
+++ b/pkgs/by-name/gt/gtop/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "aksakalli";
     repo = "gtop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FKbaUV28d0JH9tmTSJBFYQrM5iensnIpcXUFFvXDMe4=";
   };
 
diff --git a/pkgs/by-name/gt/gtrash/package.nix b/pkgs/by-name/gt/gtrash/package.nix
index c1e1bd8d9297..da4945b20090 100644
--- a/pkgs/by-name/gt/gtrash/package.nix
+++ b/pkgs/by-name/gt/gtrash/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "umlx5h";
     repo = "gtrash";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-odvj0YY18aishVWz5jWcLDvkYJLQ97ZSGpumxvxui4Y=";
   };
 
diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix
index c3425c3bfd1c..035057ea4879 100644
--- a/pkgs/by-name/gt/gtree/package.nix
+++ b/pkgs/by-name/gt/gtree/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ddddddO";
     repo = "gtree";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d+cFESWQyu2laj1pLepEWoHnFHaSKytfWkmD4yuFf78=";
   };
 
diff --git a/pkgs/by-name/gt/gtt/package.nix b/pkgs/by-name/gt/gtt/package.nix
index 56b69c97ea06..09b4a25e91a7 100644
--- a/pkgs/by-name/gt/gtt/package.nix
+++ b/pkgs/by-name/gt/gtt/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "eeeXun";
     repo = "gtt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ghdf8UQA+SfsBiD5bPrNZM8sPE+Xhbhn18iNl3xLh8c=";
   };
 
diff --git a/pkgs/by-name/gu/guacamole-server/package.nix b/pkgs/by-name/gu/guacamole-server/package.nix
index a146225be312..ae255aa65604 100644
--- a/pkgs/by-name/gu/guacamole-server/package.nix
+++ b/pkgs/by-name/gu/guacamole-server/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "guacamole-server";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ZrUaoWkZ3I/LxE7csDXXeUZ92jZDhkZ1c8EQU0gI1yY=";
   };
 
diff --git a/pkgs/by-name/gu/gubbi-font/package.nix b/pkgs/by-name/gu/gubbi-font/package.nix
index dbc5109a318e..f253ed576fed 100644
--- a/pkgs/by-name/gu/gubbi-font/package.nix
+++ b/pkgs/by-name/gu/gubbi-font/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aravindavk";
     repo = "gubbi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "10w9i3pmjvs1b3xclrgn4q5a95ss4ipldbxbqrys2dmfivx7i994";
   };
 
diff --git a/pkgs/by-name/gu/gucharmap/package.nix b/pkgs/by-name/gu/gucharmap/package.nix
index fc1db49d5c8c..0803cb1196ce 100644
--- a/pkgs/by-name/gu/gucharmap/package.nix
+++ b/pkgs/by-name/gu/gucharmap/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "gucharmap";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-UaXgQIhAoI27iYWgZuZeO7Lv6J9pj06HPp0SZs/5abM=";
   };
 
diff --git a/pkgs/by-name/gu/guetzli/package.nix b/pkgs/by-name/gu/guetzli/package.nix
index 2ecb32068b3e..ac88df8e2515 100644
--- a/pkgs/by-name/gu/guetzli/package.nix
+++ b/pkgs/by-name/gu/guetzli/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "google";
     repo = "guetzli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1wy9wfvyradp0aigfv8yijvj0dgb5kpq2yf2xki15f605jc1r5dm";
   };
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gu/guff/package.nix b/pkgs/by-name/gu/guff/package.nix
index 17be43aba7bd..ca07e19402dd 100644
--- a/pkgs/by-name/gu/guff/package.nix
+++ b/pkgs/by-name/gu/guff/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "silentbicycle";
     repo = "guff";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0n8mc9j3044j4b3vgc94ryd2j9ik6g73fqja54yxfdfrks4ksyds";
   };
 
diff --git a/pkgs/by-name/gu/guile-aspell/package.nix b/pkgs/by-name/gu/guile-aspell/package.nix
index dbb87edb5d03..d8631aea7469 100644
--- a/pkgs/by-name/gu/guile-aspell/package.nix
+++ b/pkgs/by-name/gu/guile-aspell/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "spk121";
     repo = "guile-aspell";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-CvLECZLwf4MujAQCL3I81O5xFvq6ezVhV0BjbqI3mR0=";
   };
 
diff --git a/pkgs/by-name/gu/guile-fibers/package.nix b/pkgs/by-name/gu/guile-fibers/package.nix
index a2a6468941dd..759f4889047d 100644
--- a/pkgs/by-name/gu/guile-fibers/package.nix
+++ b/pkgs/by-name/gu/guile-fibers/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wingo";
     repo = "fibers";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jJKA5JEHsmqQ/IKb1aNmOtoVaGKNjcgTKyo5VCiJbXM=";
   };
 
diff --git a/pkgs/by-name/gu/guile-git/package.nix b/pkgs/by-name/gu/guile-git/package.nix
index cf9c2cc02654..d13c44ab5bff 100644
--- a/pkgs/by-name/gu/guile-git/package.nix
+++ b/pkgs/by-name/gu/guile-git/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "guile-git";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lFBoA1VBJRHcZkP3h2gnlXQrMjDFWS4jl9RlF8VVf/Q=";
   };
 
diff --git a/pkgs/by-name/gu/guile-hoot/package.nix b/pkgs/by-name/gu/guile-hoot/package.nix
index 76213c206727..95c1fc2b5933 100644
--- a/pkgs/by-name/gu/guile-hoot/package.nix
+++ b/pkgs/by-name/gu/guile-hoot/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "spritely";
     repo = "guile-hoot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xPU4uLyh3gd2ubyGednCqB3uzKrabhXQhs6vBc8z0ps=";
   };
 
diff --git a/pkgs/by-name/gu/guilt/package.nix b/pkgs/by-name/gu/guilt/package.nix
index 77152b5930bc..890f4e0a596e 100644
--- a/pkgs/by-name/gu/guilt/package.nix
+++ b/pkgs/by-name/gu/guilt/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeffpc";
     repo = "guilt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7OgRbMGYWtGvrZxKfJe0CkpmU3AUkPebF5NyTsfXeGA=";
   };
 
diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix
index e242ac853313..30953ad2ecec 100644
--- a/pkgs/by-name/gu/gum/package.nix
+++ b/pkgs/by-name/gu/gum/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-77102I7pOGfpPBSGelsA/9GJYos05akF0kdmr522RC0=";
   };
 
diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix
index 571fd8408252..37069b02ab73 100644
--- a/pkgs/by-name/gu/gumbo/package.nix
+++ b/pkgs/by-name/gu/gumbo/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "gumbo-parser";
     repo = "gumbo-parser";
-    rev = version;
+    tag = version;
     hash = "sha256-QpGOBKNPBryCXZKKEQMv9TXJiNyXESBFiR4wM0lmjiI=";
   };
 
diff --git a/pkgs/by-name/gu/gummi/package.nix b/pkgs/by-name/gu/gummi/package.nix
index 8c7af62fde9f..bba2b4ea1f64 100644
--- a/pkgs/by-name/gu/gummi/package.nix
+++ b/pkgs/by-name/gu/gummi/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = pkgs.fetchFromGitHub {
     owner = "alexandervdm";
     repo = "gummi";
-    rev = version;
+    tag = version;
     sha256 = "sha256-71n71KjLmICp4gznd27NlbyA3kayje3hYk/cwkOXEO0=";
   };
 
diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix
index e43ac701772a..2003a8dd8755 100644
--- a/pkgs/by-name/gu/gummy/package.nix
+++ b/pkgs/by-name/gu/gummy/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "fusco";
     repo = "gummy";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ic+kTBoirMX6g79NdNoeFbNNo1LYg/z+nlt/GAB6UyQ=";
   };
 
diff --git a/pkgs/by-name/gu/gungnir/package.nix b/pkgs/by-name/gu/gungnir/package.nix
index dee944503a40..f064524a9f15 100644
--- a/pkgs/by-name/gu/gungnir/package.nix
+++ b/pkgs/by-name/gu/gungnir/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "g0ldencybersec";
     repo = "gungnir";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-42qaVLEFAV6/6xMVM+mLi0Acp26AKOHvs4EUK2y09as=";
   };
 
diff --git a/pkgs/by-name/gu/gut/package.nix b/pkgs/by-name/gu/gut/package.nix
index 4d854f5d43d4..371e5b8dd6b5 100644
--- a/pkgs/by-name/gu/gut/package.nix
+++ b/pkgs/by-name/gu/gut/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "julien040";
     repo = "gut";
-    rev = version;
+    tag = version;
     hash = "sha256-3A6CwGIZGnTFkMRxDdDg/WpUQezNmGjjSz4Rj/6t1GI=";
   };
 
diff --git a/pkgs/by-name/gv/gvproxy/package.nix b/pkgs/by-name/gv/gvproxy/package.nix
index 154d385cbba3..96bb2f374bbe 100644
--- a/pkgs/by-name/gv/gvproxy/package.nix
+++ b/pkgs/by-name/gv/gvproxy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "gvisor-tap-vsock";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rWZYwQ/wWYAbM0RRNcNboWzKUuNNPDigIFFbFdXDNuo=";
   };
 
diff --git a/pkgs/by-name/gw/gwc/package.nix b/pkgs/by-name/gw/gwc/package.nix
index ee0c97523fcd..ced4f0860841 100644
--- a/pkgs/by-name/gw/gwc/package.nix
+++ b/pkgs/by-name/gw/gwc/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AlisterH";
     repo = "gwc";
-    rev = version;
+    tag = version;
     sha256 = "sha256-hRwy++gZiW/olIIeiVTpdIjPLIHgvgVUGEaUX9tpFbY=";
   };
 
diff --git a/pkgs/by-name/gx/gx/package.nix b/pkgs/by-name/gx/gx/package.nix
index d78c07643b60..f6e2cbc0c2ba 100644
--- a/pkgs/by-name/gx/gx/package.nix
+++ b/pkgs/by-name/gx/gx/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "whyrusleeping";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jGtUsb2gm8dN45wniD+PYoUlk8m1ssrfj1a7PPYEYuo=";
   };
 
diff --git a/pkgs/by-name/gx/gxkb/package.nix b/pkgs/by-name/gx/gxkb/package.nix
index 2692a6523926..295c0750b21b 100644
--- a/pkgs/by-name/gx/gxkb/package.nix
+++ b/pkgs/by-name/gx/gxkb/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zen-tools";
     repo = "gxkb";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oBIBIkj4p6HlF0PRQtI/K5dhLs7pbPxN7Cgr/YZaI1s=";
   };
 
diff --git a/pkgs/by-name/gx/gxml/package.nix b/pkgs/by-name/gx/gxml/package.nix
index 771c4f6039ea..b490e71255f3 100644
--- a/pkgs/by-name/gx/gxml/package.nix
+++ b/pkgs/by-name/gx/gxml/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "gxml";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-/gaWuUytBsvAsC95ee6MtTW6g3ltGbkD+JWqrAjJLDc=";
   };
 
diff --git a/pkgs/by-name/gx/gxplugins-lv2/package.nix b/pkgs/by-name/gx/gxplugins-lv2/package.nix
index 7ed2538bc6ac..e819e752119c 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/ha/habitat/package.nix b/pkgs/by-name/ha/habitat/package.nix
index e33b1c62e48e..eea463412353 100644
--- a/pkgs/by-name/ha/habitat/package.nix
+++ b/pkgs/by-name/ha/habitat/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "habitat-sh";
     repo = "habitat";
-    rev = version;
+    tag = version;
     hash = "sha256-+5If4veDOGTTIhYxhAiq1cC4Sy6vAmjX5hrmUmpGlFU=";
   };
 
diff --git a/pkgs/by-name/ha/hackedbox/package.nix b/pkgs/by-name/ha/hackedbox/package.nix
index 6a4bcff5915c..008602d4dddc 100644
--- a/pkgs/by-name/ha/hackedbox/package.nix
+++ b/pkgs/by-name/ha/hackedbox/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "hackedbox";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-hxfbEj7UxQ19xhetmdi0iyK6ceLUfUvAAyyTbNivlLQ=";
   };
 
diff --git a/pkgs/by-name/ha/hackrf/package.nix b/pkgs/by-name/ha/hackrf/package.nix
index 999353e527bd..5e341c524326 100644
--- a/pkgs/by-name/ha/hackrf/package.nix
+++ b/pkgs/by-name/ha/hackrf/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "hackrf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-b3nGrk2P6ZLYBSCSD7c0aIApCh3ZoVDcFftybqm4vx0=";
   };
 
diff --git a/pkgs/by-name/ha/hacompanion/package.nix b/pkgs/by-name/ha/hacompanion/package.nix
index 327d54960ba0..01d69223bb9f 100644
--- a/pkgs/by-name/ha/hacompanion/package.nix
+++ b/pkgs/by-name/ha/hacompanion/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tobias-kuendig";
     repo = "hacompanion";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6fj9Gs/ezISx5Llele5mrTFR0IiQzzm1wWcAywTaFPk=";
   };
 
diff --git a/pkgs/by-name/ha/hacpack/package.nix b/pkgs/by-name/ha/hacpack/package.nix
index d6d4ea59a104..1344411adcd9 100644
--- a/pkgs/by-name/ha/hacpack/package.nix
+++ b/pkgs/by-name/ha/hacpack/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "The-4n";
     repo = "hacpack";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0d846l36w1n9rxv79fbyhl2zdbqhlgrvk21b9vzr9x77yki89ygs";
   };
 
diff --git a/pkgs/by-name/ha/hactool/package.nix b/pkgs/by-name/ha/hactool/package.nix
index 8bc55829d8a5..442e6a3bc83a 100644
--- a/pkgs/by-name/ha/hactool/package.nix
+++ b/pkgs/by-name/ha/hactool/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SciresM";
     repo = "hactool";
-    rev = version;
+    tag = version;
     sha256 = "0305ngsnwm8npzgyhyifasi4l802xnfz19r0kbzzniirmcn4082d";
   };
 
diff --git a/pkgs/by-name/ha/hakrawler/package.nix b/pkgs/by-name/ha/hakrawler/package.nix
index 61ba00d2c06b..ef94f2bf94ce 100644
--- a/pkgs/by-name/ha/hakrawler/package.nix
+++ b/pkgs/by-name/ha/hakrawler/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hakluke";
     repo = "hakrawler";
-    rev = version;
+    tag = version;
     hash = "sha256-ZJG5KlIlzaztG27NoSlILj0I94cm2xZq28qx1ebrSmc=";
   };
 
diff --git a/pkgs/by-name/ha/halfempty/package.nix b/pkgs/by-name/ha/halfempty/package.nix
index 2647a889a2b1..42b3feb262f4 100644
--- a/pkgs/by-name/ha/halfempty/package.nix
+++ b/pkgs/by-name/ha/halfempty/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "googleprojectzero";
     repo = "halfempty";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YGq6fneAMo2jCpLPrjzRJ0eeOsStKaK5L+lwQfqcfpY=";
   };
 
diff --git a/pkgs/by-name/ha/halp/package.nix b/pkgs/by-name/ha/halp/package.nix
index d90f793c3a7f..f88039440167 100644
--- a/pkgs/by-name/ha/halp/package.nix
+++ b/pkgs/by-name/ha/halp/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "halp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SeBponGeQWKjbiS4GL8YA7y92BqLL+ja6ZSKAI3CeRM=";
   };
 
diff --git a/pkgs/by-name/ha/handlr-regex/package.nix b/pkgs/by-name/ha/handlr-regex/package.nix
index 9d125e0d7c9d..423bf6e261e4 100644
--- a/pkgs/by-name/ha/handlr-regex/package.nix
+++ b/pkgs/by-name/ha/handlr-regex/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Anomalocaridid";
     repo = "handlr-regex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZQAUqR0u+2kBLGyeT7qTcfwF87LY2qRClZ0T3WH78+w=";
   };
 
diff --git a/pkgs/by-name/ha/hans/package.nix b/pkgs/by-name/ha/hans/package.nix
index 8314ef012ef2..8f59ae45d158 100644
--- a/pkgs/by-name/ha/hans/package.nix
+++ b/pkgs/by-name/ha/hans/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "sha256-r6IDs8Seys94LBNnedcfVX5aW8x//ZN0Yh/DGTg8niA=";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "hans";
     owner = "friedrich";
   };
diff --git a/pkgs/by-name/ha/hap-py/package.nix b/pkgs/by-name/ha/hap-py/package.nix
index e86245297da3..82093f800006 100644
--- a/pkgs/by-name/ha/hap-py/package.nix
+++ b/pkgs/by-name/ha/hap-py/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Illumina";
     repo = "hap.py";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-K8XXhioMGMHw56MKvp0Eo8S6R36JczBzGRaBz035zRQ=";
   };
   # For illumina script
diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix
index 2c5ec6ee66f2..aaca11d0ef7b 100644
--- a/pkgs/by-name/ha/harbor-cli/package.nix
+++ b/pkgs/by-name/ha/harbor-cli/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Vfr7e5UQ34TkirywuYJPrkxRA6yJp3/ivfCJOnh34MY=";
   };
 
diff --git a/pkgs/by-name/ha/harminv/package.nix b/pkgs/by-name/ha/harminv/package.nix
index bf266a20af75..a7b03925ec0d 100644
--- a/pkgs/by-name/ha/harminv/package.nix
+++ b/pkgs/by-name/ha/harminv/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = "harminv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HV8xylK2IOvbONYGgyaqAabp6xA7/uvN4DU7upIlZh0=";
   };
 
diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 2f6765b866ab..cb81ade12047 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g+noAc+vKli2T8C2EAK4ejw/2DWZPhtKbezyt53iHYg=";
   };
 
diff --git a/pkgs/by-name/ha/harsh/package.nix b/pkgs/by-name/ha/harsh/package.nix
index b38bfcafd9bc..a4e5fca8e92d 100644
--- a/pkgs/by-name/ha/harsh/package.nix
+++ b/pkgs/by-name/ha/harsh/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wakatara";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-M19JX+a1dFq05UZmPJyhkhxDwNBRQTPE8mdKbCER+4M=";
   };
 
diff --git a/pkgs/by-name/ha/hash-slinger/package.nix b/pkgs/by-name/ha/hash-slinger/package.nix
index c6a9ecd04be3..2d78003835e9 100644
--- a/pkgs/by-name/ha/hash-slinger/package.nix
+++ b/pkgs/by-name/ha/hash-slinger/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "letoams";
     repo = "hash-slinger";
-    rev = version;
+    tag = version;
     sha256 = "sha256-c6IZHUFuhcccUWZYSOUGFbKpTtwMclIvEvDX8gE5d8o=";
   };
 
diff --git a/pkgs/by-name/ha/hashcat-utils/package.nix b/pkgs/by-name/ha/hashcat-utils/package.nix
index 826792c26ecb..d327885aedf9 100644
--- a/pkgs/by-name/ha/hashcat-utils/package.nix
+++ b/pkgs/by-name/ha/hashcat-utils/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hashcat";
     repo = "hashcat-utils";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0wgc6wv7i6cs95rgzzx3zqm14xxbjyajvcqylz8w97d8kk4x4wjr";
   };
 
diff --git a/pkgs/by-name/ha/hashi-up/package.nix b/pkgs/by-name/ha/hashi-up/package.nix
index 29f0e3875c7b..8e467d35519b 100644
--- a/pkgs/by-name/ha/hashi-up/package.nix
+++ b/pkgs/by-name/ha/hashi-up/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jsiebens";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PdZ8X2pJ5TfT0bJ4/P/XbMTv+yyL5/1AxIFHnL/qNcg=";
   };
 
diff --git a/pkgs/by-name/ha/hashit/package.nix b/pkgs/by-name/ha/hashit/package.nix
index 16530905c333..b1157a1de96f 100644
--- a/pkgs/by-name/ha/hashit/package.nix
+++ b/pkgs/by-name/ha/hashit/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "artemanufrij";
     repo = "hashit";
-    rev = version;
+    tag = version;
     sha256 = "1s8fbzg1z2ypn55xg1pfm5xh15waq55fkp49j8rsqiq8flvg6ybf";
   };
 
diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix
index a7821df0c014..953e95175f92 100644
--- a/pkgs/by-name/ha/hashlink/package.nix
+++ b/pkgs/by-name/ha/hashlink/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "HaxeFoundation";
     repo = "hashlink";
-    rev = version;
+    tag = version;
     sha256 = "sha256-nVr+fDdna8EEHvIiXsccWFRTYzXfb4GG1zrfL+O6zLA=";
   };
 
diff --git a/pkgs/by-name/ha/haveged/package.nix b/pkgs/by-name/ha/haveged/package.nix
index 266c31d2fe4f..27eff231f06f 100644
--- a/pkgs/by-name/ha/haveged/package.nix
+++ b/pkgs/by-name/ha/haveged/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jirka-h";
     repo = "haveged";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tq4OXLlyC6exJEZ80H1gQQRBgYGbu+3kGz99RxsyauI=";
   };
 
diff --git a/pkgs/by-name/ha/havoc/package.nix b/pkgs/by-name/ha/havoc/package.nix
index 9abe79999b43..2948a29abf0f 100644
--- a/pkgs/by-name/ha/havoc/package.nix
+++ b/pkgs/by-name/ha/havoc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ii8";
     repo = "havoc";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-YCZdAlIDptVLMUko40gfp2BCAbhGNsYyVTDB14VTNSE=";
   };
 
diff --git a/pkgs/by-name/hb/hblock/package.nix b/pkgs/by-name/hb/hblock/package.nix
index 44cb953f09c2..39b9f5f4b16a 100644
--- a/pkgs/by-name/hb/hblock/package.nix
+++ b/pkgs/by-name/hb/hblock/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hectorm";
     repo = "hblock";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cke3MppQm8p8B9+5IcvCplw6CtyRbgq46wHqli7U77I=";
   };
 
diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix
index 906370d04b4b..220184b0e3fa 100644
--- a/pkgs/by-name/hc/hck/package.nix
+++ b/pkgs/by-name/hc/hck/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = "hck";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XnkLKslZY2nvjO5ZeTIBJ0Y47/JPhfIS/F5KKqm5iwI=";
   };
 
diff --git a/pkgs/by-name/hc/hcl2json/package.nix b/pkgs/by-name/hc/hcl2json/package.nix
index 103f8b4a143e..3a55a03e34fd 100644
--- a/pkgs/by-name/hc/hcl2json/package.nix
+++ b/pkgs/by-name/hc/hcl2json/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tmccombs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fgRrIJnl7lV3a2+d9/F141xCAKOj0WmeNlrtEwdl1qA=";
   };
 
diff --git a/pkgs/by-name/hc/hcledit/package.nix b/pkgs/by-name/hc/hcledit/package.nix
index 3a1a5cdc25d6..291d6ae7012f 100644
--- a/pkgs/by-name/hc/hcledit/package.nix
+++ b/pkgs/by-name/hc/hcledit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "minamijoyo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4PBEcOK16YXQhrQ6Yrtcb6vTE6h6sSY3Ymuxi+mEUt8=";
   };
 
diff --git a/pkgs/by-name/hc/hclfmt/package.nix b/pkgs/by-name/hc/hclfmt/package.nix
index a5770aef2aea..ad5dfa78ded3 100644
--- a/pkgs/by-name/hc/hclfmt/package.nix
+++ b/pkgs/by-name/hc/hclfmt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "hcl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0RRvkOBPVrdbZo9zbVgZletKNXPBsN7pa7fsyfI9hXg=";
   };
 
diff --git a/pkgs/by-name/hc/hcxdumptool/package.nix b/pkgs/by-name/hc/hcxdumptool/package.nix
index 9072ec49a6c7..54c795e85993 100644
--- a/pkgs/by-name/hc/hcxdumptool/package.nix
+++ b/pkgs/by-name/hc/hcxdumptool/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ZerBea";
     repo = "hcxdumptool";
-    rev = version;
+    tag = version;
     sha256 = "sha256-InMyDUEH135Y1RYJ3z1+RQxPMi7+QMf670S/S2ZL9vg=";
   };
 
diff --git a/pkgs/by-name/hc/hcxtools/package.nix b/pkgs/by-name/hc/hcxtools/package.nix
index 76fda256617d..2851e62902b9 100644
--- a/pkgs/by-name/hc/hcxtools/package.nix
+++ b/pkgs/by-name/hc/hcxtools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ZerBea";
     repo = "hcxtools";
-    rev = version;
+    tag = version;
     sha256 = "sha256-8VfGiIXl/F2wgCMuS3+lt9sT/re9YgoRKwzgSHCir04=";
   };
 
diff --git a/pkgs/by-name/hd/hd-idle/package.nix b/pkgs/by-name/hd/hd-idle/package.nix
index c87179f74c1a..c91e0d8e351e 100644
--- a/pkgs/by-name/hd/hd-idle/package.nix
+++ b/pkgs/by-name/hd/hd-idle/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adelolmo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WHJcysTN9LHI1WnDuFGTyTirxXirpLpJIeNDj4sZGY0=";
   };
 
diff --git a/pkgs/by-name/hd/hdaps-gl/package.nix b/pkgs/by-name/hd/hdaps-gl/package.nix
index 0152919e9b17..09a873ea208f 100644
--- a/pkgs/by-name/hd/hdaps-gl/package.nix
+++ b/pkgs/by-name/hd/hdaps-gl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-thinkpad";
     repo = "hdaps-gl";
-    rev = version;
+    tag = version;
     sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh";
   };
 
diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix
index 1a0eaea6c2f6..091e2232473a 100644
--- a/pkgs/by-name/hd/hdf5-blosc/package.nix
+++ b/pkgs/by-name/hd/hdf5-blosc/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "hdf5-blosc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1nj2bm1v6ymm3fmyvhbn6ih5fgdiapavlfghh1pvbmhw71cysyqs";
   };
 
diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix
index 9de71c9ec74f..6a5d0f202efc 100644
--- a/pkgs/by-name/hd/hdrop/package.nix
+++ b/pkgs/by-name/hd/hdrop/package.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Schweber";
     repo = "hdrop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T+hyC3YfTMn5txFlFbm/+wKWj21vuwIN5lfe+iiAm8c=";
   };
 
diff --git a/pkgs/by-name/hd/hdt/package.nix b/pkgs/by-name/hd/hdt/package.nix
index 179054dcab06..17ab425d73e3 100644
--- a/pkgs/by-name/hd/hdt/package.nix
+++ b/pkgs/by-name/hd/hdt/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rdfhdt";
     repo = "hdt-cpp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1vsq80jnix6cy78ayag7v8ajyw7h8dqyad1q6xkf2hzz3skvr34z";
   };
 
diff --git a/pkgs/by-name/he/headache/package.nix b/pkgs/by-name/he/headache/package.nix
index bb4747960b83..8e45fba5fc40 100644
--- a/pkgs/by-name/he/headache/package.nix
+++ b/pkgs/by-name/he/headache/package.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "frama-c";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UXQIIsCyJZN4qos7Si7LLm9vQueOduUmLeYHuyT2GZo=";
   };
 
diff --git a/pkgs/by-name/he/headphones/package.nix b/pkgs/by-name/he/headphones/package.nix
index 816dee0e0d1a..2b9c6a543c06 100644
--- a/pkgs/by-name/he/headphones/package.nix
+++ b/pkgs/by-name/he/headphones/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rembo10";
     repo = "headphones";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "195v0ylhqd49bqq3dpig5nh0kivmwgmn0977fknix9j14jpvmd3b";
   };
 
diff --git a/pkgs/by-name/he/headsetcontrol/package.nix b/pkgs/by-name/he/headsetcontrol/package.nix
index 4ca12f94739d..e39f41ab7b22 100644
--- a/pkgs/by-name/he/headsetcontrol/package.nix
+++ b/pkgs/by-name/he/headsetcontrol/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Sapd";
     repo = "HeadsetControl";
-    rev = version;
+    tag = version;
     sha256 = "sha256-N1c94iAJgCPhGNDCGjMINg0AL2wPX5gVIsJ+pzn/l9Y=";
   };
 
diff --git a/pkgs/by-name/he/heatseeker/package.nix b/pkgs/by-name/he/heatseeker/package.nix
index 7843e5f8660e..241f05150600 100644
--- a/pkgs/by-name/he/heatseeker/package.nix
+++ b/pkgs/by-name/he/heatseeker/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rschmitt";
     repo = "heatseeker";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-SU5HLAFA7IHnVhsmVtxskteeKKIEvvVSqHIeEk5BkfA=";
   };
 
diff --git a/pkgs/by-name/he/hebcal/package.nix b/pkgs/by-name/he/hebcal/package.nix
index c21900545a89..fa4aff64352f 100644
--- a/pkgs/by-name/he/hebcal/package.nix
+++ b/pkgs/by-name/he/hebcal/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hebcal";
     repo = "hebcal";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-iWp2S3s8z/y4dZ66Ogqu7Yf4gTUvSS1J5F7d0ifRbcY=";
   };
 
diff --git a/pkgs/by-name/he/hedgedoc-cli/package.nix b/pkgs/by-name/he/hedgedoc-cli/package.nix
index 78eb00563a88..672a3c1192be 100644
--- a/pkgs/by-name/he/hedgedoc-cli/package.nix
+++ b/pkgs/by-name/he/hedgedoc-cli/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "hedgedoc";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "uz+lkRRUTRr8WR295esNEbgjlZ/Em7mBk6Nx0BWLfg4=";
   };
 
diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix
index b2c50a52c8ce..382c60153a14 100644
--- a/pkgs/by-name/he/heh/package.nix
+++ b/pkgs/by-name/he/heh/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ndd7xv";
     repo = "heh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w=";
   };
 
diff --git a/pkgs/by-name/he/helio-workstation/package.nix b/pkgs/by-name/he/helio-workstation/package.nix
index 198a5a67a60f..d1b48f00cc33 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-o8vMHt6ypHY7HOHnhMifQphxGb5MjSg3hREVOnIdqfc=";
   };
diff --git a/pkgs/by-name/he/heliocron/package.nix b/pkgs/by-name/he/heliocron/package.nix
index f0bf7a9e693f..d4b9fd18fa8a 100644
--- a/pkgs/by-name/he/heliocron/package.nix
+++ b/pkgs/by-name/he/heliocron/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mfreeborn";
     repo = "heliocron";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5rzFz29Bpy2GR6bEt2DdCq9RtpdcY3SK/KnZrBrHUvk=";
   };
 
diff --git a/pkgs/by-name/he/helm-dashboard/package.nix b/pkgs/by-name/he/helm-dashboard/package.nix
index e3ebea92a4ce..cc3b5f61aae0 100644
--- a/pkgs/by-name/he/helm-dashboard/package.nix
+++ b/pkgs/by-name/he/helm-dashboard/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "komodorio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hjIo2AEXNcFK0z4op59NnC2R8GspF5t808DZ72AxgMw=";
   };
 
diff --git a/pkgs/by-name/he/helm-docs/package.nix b/pkgs/by-name/he/helm-docs/package.nix
index bcc89207c394..49cd304d73e2 100644
--- a/pkgs/by-name/he/helm-docs/package.nix
+++ b/pkgs/by-name/he/helm-docs/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "norwoodj";
     repo = "helm-docs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-a7alzjh+vjJPw/g9yaYkOUvwpgiqCrtKTBkV1EuGYtk=";
   };
 
diff --git a/pkgs/by-name/he/helm-ls/package.nix b/pkgs/by-name/he/helm-ls/package.nix
index 3ffedc478a9c..3ca337b87852 100644
--- a/pkgs/by-name/he/helm-ls/package.nix
+++ b/pkgs/by-name/he/helm-ls/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mrjosh";
     repo = "helm-ls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-k/JJoLRykIY/ZmjqG+ZzXuMPQRcoumqisPKrD9PPyd0=";
   };
 
diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix
index f97fdd7c6192..141ec152dc32 100644
--- a/pkgs/by-name/he/helmsman/package.nix
+++ b/pkgs/by-name/he/helmsman/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Praqma";
     repo = "helmsman";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-k/rgQttCA4Ahip9zV+z9zbVSy8NKUTIR4/pluqpP/1c=";
   };
 
diff --git a/pkgs/by-name/he/herbe/package.nix b/pkgs/by-name/he/herbe/package.nix
index a3759ebfd978..64121e31ea64 100644
--- a/pkgs/by-name/he/herbe/package.nix
+++ b/pkgs/by-name/he/herbe/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dudik";
     repo = "herbe";
-    rev = version;
+    tag = version;
     sha256 = "0358i5jmmlsvy2j85ij7m1k4ar2jr5lsv7y1c58dlf9710h186cv";
   };
 
diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix
index 0495cd4f62cc..26616cc38ff4 100644
--- a/pkgs/by-name/he/hermitcli/package.nix
+++ b/pkgs/by-name/he/hermitcli/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.44.4";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "cashapp";
     repo = "hermit";
     hash = "sha256-fmIFonhzhLHzcRWWC4l3wDHmoXUy3vm//tA497rI0LE=";
diff --git a/pkgs/by-name/he/hetzner-kube/package.nix b/pkgs/by-name/he/hetzner-kube/package.nix
index beb912964904..5e21009e2de6 100644
--- a/pkgs/by-name/he/hetzner-kube/package.nix
+++ b/pkgs/by-name/he/hetzner-kube/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xetys";
     repo = "hetzner-kube";
-    rev = version;
+    tag = version;
     hash = "sha256-XHvR+31yq0o3txMBHh2rCh2peDlG5Kh3hdl0LGm9D8c=";
   };
 
diff --git a/pkgs/by-name/he/hex/package.nix b/pkgs/by-name/he/hex/package.nix
index b85d1d3836e8..8e401268a8fb 100644
--- a/pkgs/by-name/he/hex/package.nix
+++ b/pkgs/by-name/he/hex/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sitkevij";
     repo = "hex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YctXDhCMJvDQLPsuhzdyYDUIlFE2vKltNtrFFeE7YE8=";
   };
 
diff --git a/pkgs/by-name/he/hexbinhex/package.nix b/pkgs/by-name/he/hexbinhex/package.nix
index a4a012bdad74..be0f164dfd8b 100644
--- a/pkgs/by-name/he/hexbinhex/package.nix
+++ b/pkgs/by-name/he/hexbinhex/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dj-on-github";
     repo = "hexbinhex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nfOmiF+t5QtAl1I7CSz26C9SGo7ZkdSziO2eiHbk6pA=";
   };
 
diff --git a/pkgs/by-name/he/hexchat/package.nix b/pkgs/by-name/he/hexchat/package.nix
index 1834fceda867..e239f3720369 100644
--- a/pkgs/by-name/he/hexchat/package.nix
+++ b/pkgs/by-name/he/hexchat/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hexchat";
     repo = "hexchat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rgaXqXbBWlfSyz+CT0jRLyfGOR1cYYnRhEAu7AsaWus=";
   };
 
diff --git a/pkgs/by-name/he/hexcurse/package.nix b/pkgs/by-name/he/hexcurse/package.nix
index f5f7350792e2..c0f10df93824 100644
--- a/pkgs/by-name/he/hexcurse/package.nix
+++ b/pkgs/by-name/he/hexcurse/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LonnyGomes";
     repo = "hexcurse";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk";
   };
   buildInputs = [ ncurses ];
diff --git a/pkgs/by-name/he/hexd/package.nix b/pkgs/by-name/he/hexd/package.nix
index 5893d1cf9ed0..e106450931a3 100644
--- a/pkgs/by-name/he/hexd/package.nix
+++ b/pkgs/by-name/he/hexd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FireyFly";
     repo = "hexd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-b/dROBQVPEiMBTcu4MTi6Lf6ChkFZqZrJ1V0j54rrFY=";
   };
 
diff --git a/pkgs/by-name/he/hexdino/package.nix b/pkgs/by-name/he/hexdino/package.nix
index 73d8627ef2ca..01453cb914b7 100644
--- a/pkgs/by-name/he/hexdino/package.nix
+++ b/pkgs/by-name/he/hexdino/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Luz";
     repo = "hexdino";
-    rev = version;
+    tag = version;
     hash = "sha256-glbyftCJiP0/5trW7DOcVCU2q4ZH3zFK96eyGuYR8eY=";
   };
 
diff --git a/pkgs/by-name/he/hexedit/package.nix b/pkgs/by-name/he/hexedit/package.nix
index e592d6633b6c..fc6c05449a9b 100644
--- a/pkgs/by-name/he/hexedit/package.nix
+++ b/pkgs/by-name/he/hexedit/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pixel";
     repo = "hexedit";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI=";
   };
 
diff --git a/pkgs/by-name/he/hexo-cli/package.nix b/pkgs/by-name/he/hexo-cli/package.nix
index fcce2db7eacf..1edc31ee12e5 100644
--- a/pkgs/by-name/he/hexo-cli/package.nix
+++ b/pkgs/by-name/he/hexo-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "hexojs";
     repo = "hexo-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mtbg9Fa9LBqG/aNfm4yEo4ymuaxuqhymkO1q6mYA2Fs=";
   };
 
diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix
index 54d2d39dba45..0bd9abf411d5 100644
--- a/pkgs/by-name/he/hextazy/package.nix
+++ b/pkgs/by-name/he/hextazy/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "0xfalafel";
     repo = "hextazy";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-j8KY8OTYG+Hl86OppbMyAFBSA89TO7hc8mcNgTGTlgM=";
   };
 
diff --git a/pkgs/by-name/he/hey/package.nix b/pkgs/by-name/he/hey/package.nix
index 08735573fb5a..5324bc2b5203 100644
--- a/pkgs/by-name/he/hey/package.nix
+++ b/pkgs/by-name/he/hey/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rakyll";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0gsdksrzlwpba14a43ayyy41l1hxpw4ayjpvqyd4ycakddlkvgzb";
   };
 
diff --git a/pkgs/by-name/he/heygpt/package.nix b/pkgs/by-name/he/heygpt/package.nix
index fce8cc8469f4..fd053c05bb4f 100644
--- a/pkgs/by-name/he/heygpt/package.nix
+++ b/pkgs/by-name/he/heygpt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fuyufjh";
     repo = "heygpt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oP0yIdYytXSsbZ2pNaZ8Rrak1qJsudTe/oP6dGncGUM=";
   };
 
diff --git a/pkgs/by-name/hh/hhpc/package.nix b/pkgs/by-name/hh/hhpc/package.nix
index 048490fbe9c2..c739c25af2dc 100644
--- a/pkgs/by-name/hh/hhpc/package.nix
+++ b/pkgs/by-name/hh/hhpc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aktau";
     repo = "hhpc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1djsw1r38mh6zx0rbyn2cfa931hyddib4fl3i27c4z7xinl709ss";
   };
 
diff --git a/pkgs/by-name/hi/hidviz/package.nix b/pkgs/by-name/hi/hidviz/package.nix
index e3f154965be8..e6e9bee3a496 100644
--- a/pkgs/by-name/hi/hidviz/package.nix
+++ b/pkgs/by-name/hi/hidviz/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hidviz";
     repo = "hidviz";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9crHFYVNNxJjwJojwqB8qdAGyr1Ieux9qC3m3rpIJw0=";
   };
 
diff --git a/pkgs/by-name/hi/highfive/package.nix b/pkgs/by-name/hi/highfive/package.nix
index db3e6a19f6c8..db9390cb1f3e 100644
--- a/pkgs/by-name/hi/highfive/package.nix
+++ b/pkgs/by-name/hi/highfive/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BlueBrain";
     repo = "HighFive";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Nv+nbel/xGlGTB8sKF0EM1xwz/ZEri5uGB7ma6Ba6fo=";
   };
 
diff --git a/pkgs/by-name/hi/highlight-assertions/package.nix b/pkgs/by-name/hi/highlight-assertions/package.nix
index 3d5be23b51f1..2b2bb315a17d 100644
--- a/pkgs/by-name/hi/highlight-assertions/package.nix
+++ b/pkgs/by-name/hi/highlight-assertions/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "thehamsta";
     repo = "highlight-assertions";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg=";
   };
 
diff --git a/pkgs/by-name/hi/himalaya/package.nix b/pkgs/by-name/hi/himalaya/package.nix
index 404813aa2de7..58e5f42c8deb 100644
--- a/pkgs/by-name/hi/himalaya/package.nix
+++ b/pkgs/by-name/hi/himalaya/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage {
     inherit hash;
     owner = "pimalaya";
     repo = "himalaya";
-    rev = "v${version}";
+    tag = "v${version}";
   };
 
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/hi/hime/package.nix b/pkgs/by-name/hi/hime/package.nix
index c6e35809dbcd..0b9845eb08d4 100644
--- a/pkgs/by-name/hi/hime/package.nix
+++ b/pkgs/by-name/hi/hime/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "hime";
     owner = "hime-ime";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fCqet+foQjI+LpTQ/6Egup1GzXELlL2hgbh0dCKLwPI=";
   };
 
diff --git a/pkgs/by-name/hi/hiraeth/package.nix b/pkgs/by-name/hi/hiraeth/package.nix
index c69ec6ac34fa..126d64509eec 100644
--- a/pkgs/by-name/hi/hiraeth/package.nix
+++ b/pkgs/by-name/hi/hiraeth/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lukaswrz";
     repo = "hiraeth";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GPDGwrYVy9utp5u4iyf0PqIAlI/izcwAsj4yFStYmTE=";
   };
 
diff --git a/pkgs/by-name/hi/hiredis/package.nix b/pkgs/by-name/hi/hiredis/package.nix
index b4b2304da600..e244b45b23bc 100644
--- a/pkgs/by-name/hi/hiredis/package.nix
+++ b/pkgs/by-name/hi/hiredis/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "redis";
     repo = "hiredis";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZxUITm3OcbERcvaNqGQU46bEfV+jN6safPalG0TVfBg=";
   };
 
diff --git a/pkgs/by-name/hi/hisat2/package.nix b/pkgs/by-name/hi/hisat2/package.nix
index 3feeb435579d..2532ceeb169e 100644
--- a/pkgs/by-name/hi/hisat2/package.nix
+++ b/pkgs/by-name/hi/hisat2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DaehwanKimLab";
     repo = "hisat2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0lmzdhzjkvxw7n5w40pbv5fgzd4cz0f9pxczswn3d4cr0k10k754";
   };
 
diff --git a/pkgs/by-name/hi/hishtory/package.nix b/pkgs/by-name/hi/hishtory/package.nix
index 9ea3a3cfa6bb..ece3658b32b5 100644
--- a/pkgs/by-name/hi/hishtory/package.nix
+++ b/pkgs/by-name/hi/hishtory/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ddworken";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nh3dNm+5h+3moeO1PUS6tPkftojMSSWSr0m/5n2iO2w=";
   };
 
diff --git a/pkgs/by-name/hi/hivemind/package.nix b/pkgs/by-name/hi/hivemind/package.nix
index 0e01aa8aa42b..5fda5385fe7a 100644
--- a/pkgs/by-name/hi/hivemind/package.nix
+++ b/pkgs/by-name/hi/hivemind/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DarthSim";
     repo = "hivemind";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YUR9OwRuH1xSPs8iTsSIjLCt2TyYH357IAYULGTyYUc=";
   };
 
diff --git a/pkgs/by-name/hj/hjson-go/package.nix b/pkgs/by-name/hj/hjson-go/package.nix
index f0b906ad0808..1d21e353244b 100644
--- a/pkgs/by-name/hj/hjson-go/package.nix
+++ b/pkgs/by-name/hj/hjson-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hjson";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fonPxk/9ue8LzHTdKpuHJcucQoMl4P6gq+tbjS8Ui7Q=";
   };
 
diff --git a/pkgs/by-name/hn/hn-text/package.nix b/pkgs/by-name/hn/hn-text/package.nix
index e07f31a34230..41d6a2ac9412 100644
--- a/pkgs/by-name/hn/hn-text/package.nix
+++ b/pkgs/by-name/hn/hn-text/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "piqoni";
     repo = "hn-text";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YoPdYuNlWrLITyd2XeCOeGy70Ews1rvtOQzYZAQTI+Y=";
   };
 
diff --git a/pkgs/by-name/ho/hoard/package.nix b/pkgs/by-name/ho/hoard/package.nix
index 52d8badc95fb..5e44bb1d2d17 100644
--- a/pkgs/by-name/ho/hoard/package.nix
+++ b/pkgs/by-name/ho/hoard/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Hyde46";
     repo = "hoard";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-c9iSbxkHwLOeATkO7kzTyLD0VAwZUzCvw5c4FyuR5/E=";
   };
 
diff --git a/pkgs/by-name/ho/hof/package.nix b/pkgs/by-name/ho/hof/package.nix
index f7866ddc15e8..78abe71e2475 100644
--- a/pkgs/by-name/ho/hof/package.nix
+++ b/pkgs/by-name/ho/hof/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hofstadter-io";
     repo = "hof";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-okc11mXqB/PaXd0vsRuIIL70qWSFprvsZJtE6PvCaIg=";
   };
 
diff --git a/pkgs/by-name/ho/holo-build/package.nix b/pkgs/by-name/ho/holo-build/package.nix
index 0ed9d9232b56..9746b39608c7 100644
--- a/pkgs/by-name/ho/holo-build/package.nix
+++ b/pkgs/by-name/ho/holo-build/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "holocm";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0lypbgf96bcc4m3968xa4il1zwprsdyc0pw6pl9mqq7djxabikd0";
   };
 
diff --git a/pkgs/by-name/ho/hologram/package.nix b/pkgs/by-name/ho/hologram/package.nix
index 705e6d87af6c..7cd4fada0abb 100644
--- a/pkgs/by-name/ho/hologram/package.nix
+++ b/pkgs/by-name/ho/hologram/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "AdRoll";
     repo = "hologram";
-    rev = version;
+    tag = version;
     hash = "sha256-b65mplfDuwk8lEfJLKBY7BF0yGRksxHjwbEW6A7moo4=";
   };
 
diff --git a/pkgs/by-name/ho/holos/package.nix b/pkgs/by-name/ho/holos/package.nix
index df879231f1b9..5526f0e33909 100644
--- a/pkgs/by-name/ho/holos/package.nix
+++ b/pkgs/by-name/ho/holos/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "holos-run";
     repo = "holos";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4LCNKPf+b7O9DHCmOzaI8clCbmikyAAG+6C3I0aQdMg=";
   };
 
diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix
index 5df79e2f4928..bdd87400eb47 100644
--- a/pkgs/by-name/ho/homebox/package.nix
+++ b/pkgs/by-name/ho/homebox/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "sysadminsmedia";
     repo = "homebox";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6iNlx0lBVU/awUZHqRYFKe84D86EJNFF7Nm1XChs75w=";
   };
 in
diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index eaad9c42bd8f..662eca86e72a 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bastienwirtz";
     repo = "homer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Fh6qV2eU7VRskbPun7OcJmqgjILVE8w5lV70xH6znmc=";
   };
 
diff --git a/pkgs/by-name/ho/honcho/package.nix b/pkgs/by-name/ho/honcho/package.nix
index d60201187883..57665c79847e 100644
--- a/pkgs/by-name/ho/honcho/package.nix
+++ b/pkgs/by-name/ho/honcho/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nickstenning";
     repo = "honcho";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1y0r8dw4pqcq7r4n58ixjdg1iy60lp0gxsd7d2jmhals16ij71rj";
   };
 
diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix
index 690636870e80..8a01b645c5c7 100644
--- a/pkgs/by-name/ho/honeycomb-refinery/package.nix
+++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "honeycombio";
     repo = "refinery";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SU9JbyUuBMqPw4XcoF5s8CgBn7+V/rHBAwpXJk373jg=";
   };
 
diff --git a/pkgs/by-name/ho/honggfuzz/package.nix b/pkgs/by-name/ho/honggfuzz/package.nix
index 945020445950..fcbc8bbf10fd 100644
--- a/pkgs/by-name/ho/honggfuzz/package.nix
+++ b/pkgs/by-name/ho/honggfuzz/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-/ra6g0qjjC8Lo8/n2XEbwnZ95yDHcGhYd5+TTvQ6FAc=";
   };
 
diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
index 31c980998aa4..5ac52d1e1594 100644
--- a/pkgs/by-name/ho/horizon-eda/base.nix
+++ b/pkgs/by-name/ho/horizon-eda/base.nix
@@ -29,7 +29,7 @@ rec {
   src = fetchFromGitHub {
     owner = "horizon-eda";
     repo = "horizon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0ikCR10r/WPb+H+Ut2GO6y4A/9bctJLanL/RR4r9GWs=";
   };
 
diff --git a/pkgs/by-name/ho/horst/package.nix b/pkgs/by-name/ho/horst/package.nix
index cb9d6492ad61..5c437b40c204 100644
--- a/pkgs/by-name/ho/horst/package.nix
+++ b/pkgs/by-name/ho/horst/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "br101";
     repo = "horst";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a";
   };
 
diff --git a/pkgs/by-name/ho/host-spawn/package.nix b/pkgs/by-name/ho/host-spawn/package.nix
index 95b06655d7d8..1ed16566353d 100644
--- a/pkgs/by-name/ho/host-spawn/package.nix
+++ b/pkgs/by-name/ho/host-spawn/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "1player";
     repo = "host-spawn";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-V8WI0TyJw+dkCyG8huIrg6VDFI2Kmak7bI/GXU8RI/w=";
   };
 
diff --git a/pkgs/by-name/ho/hostapd-mana/package.nix b/pkgs/by-name/ho/hostapd-mana/package.nix
index 8da50a57c6b6..63da70138fc2 100644
--- a/pkgs/by-name/ho/hostapd-mana/package.nix
+++ b/pkgs/by-name/ho/hostapd-mana/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sensepost";
     repo = "hostapd-mana";
-    rev = version;
+    tag = version;
     hash = "sha256-co5LMJAUYSdcvhLv1gfjDvdVqdSXgjtFoiQ7+KxR07M=";
   };
 
diff --git a/pkgs/by-name/ho/hostctl/package.nix b/pkgs/by-name/ho/hostctl/package.nix
index a5838703674c..5c9ce5fd9960 100644
--- a/pkgs/by-name/ho/hostctl/package.nix
+++ b/pkgs/by-name/ho/hostctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "guumaster";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9BbPHqAZKw8Rpjpdd/e9ip3V0Eh06tEFt/skQ97ij4g=";
   };
 
diff --git a/pkgs/by-name/ho/hostess/package.nix b/pkgs/by-name/ho/hostess/package.nix
index 28ab7185d9df..3dc73e08d357 100644
--- a/pkgs/by-name/ho/hostess/package.nix
+++ b/pkgs/by-name/ho/hostess/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cbednarski";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1izszf60nsa6pyxx3kd8qdrz3h47ylm17r9hzh9wk37f61pmm42j";
   };
 
diff --git a/pkgs/by-name/ho/hostmux/package.nix b/pkgs/by-name/ho/hostmux/package.nix
index cc3dcf8339bb..dfab97320719 100644
--- a/pkgs/by-name/ho/hostmux/package.nix
+++ b/pkgs/by-name/ho/hostmux/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hukl";
     repo = "hostmux";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Rh8eyKoUydixj+X7muWleZW9u8djCQAyexIfRWIOr0o=";
   };
 
diff --git a/pkgs/by-name/ho/hound/package.nix b/pkgs/by-name/ho/hound/package.nix
index 2c3b99633932..5641c225b674 100644
--- a/pkgs/by-name/ho/hound/package.nix
+++ b/pkgs/by-name/ho/hound/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hound-search";
     repo = "hound";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Qdk57zLjTXLdDEmB6K+sZAym5s0BekJJa/CpYeOBOcY=";
   };
 
diff --git a/pkgs/by-name/ho/hover/package.nix b/pkgs/by-name/ho/hover/package.nix
index 140be9ca8ddf..866f764149ed 100644
--- a/pkgs/by-name/ho/hover/package.nix
+++ b/pkgs/by-name/ho/hover/package.nix
@@ -49,7 +49,7 @@ let
     vendorHash = "sha256-GDoX5d2aDfaAx9JsKuS4r8137t3swT6rgcCghmaThSM=";
 
     src = fetchFromGitHub {
-      rev = "v${version}";
+      tag = "v${version}";
       owner = "go-flutter-desktop";
       repo = pname;
       sha256 = "sha256-ch59Wx4g72u7x99807ppURI4I+5aJ/W8Zr35q8X68v4=";
diff --git a/pkgs/by-name/ho/howard-hinnant-date/package.nix b/pkgs/by-name/ho/howard-hinnant-date/package.nix
index 757131dc83c2..4ef9c03bc200 100644
--- a/pkgs/by-name/ho/howard-hinnant-date/package.nix
+++ b/pkgs/by-name/ho/howard-hinnant-date/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "HowardHinnant";
     repo = "date";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qfrmH3NRyrDVmHRmmWzM5Zz37E7RFXJqaV1Rq2E59qs=";
   };
 
diff --git a/pkgs/by-name/hp/hpe-ltfs/package.nix b/pkgs/by-name/hp/hpe-ltfs/package.nix
index b17c45e8c56f..3a316cd97f10 100644
--- a/pkgs/by-name/hp/hpe-ltfs/package.nix
+++ b/pkgs/by-name/hp/hpe-ltfs/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   pname = "hpe-ltfs";
 
   src = fetchFromGitHub {
-    rev = version;
+    tag = version;
     owner = "nix-community";
     repo = "hpe-ltfs";
     sha256 = "193593hsc8nf5dn1fkxhzs1z4fpjh64hdkc8q6n9fgplrpxdlr4s";
diff --git a/pkgs/by-name/hp/hpx/package.nix b/pkgs/by-name/hp/hpx/package.nix
index 2e13c016433e..1296d4d6beb4 100644
--- a/pkgs/by-name/hp/hpx/package.nix
+++ b/pkgs/by-name/hp/hpx/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "STEllAR-GROUP";
     repo = "hpx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yrKG0n5BhrUNXjFWZRpb38/GYQlvMr0PSqUbhmZlgm0=";
   };
 
diff --git a/pkgs/by-name/hr/hr/package.nix b/pkgs/by-name/hr/hr/package.nix
index 3a995fc06115..4f8f4af360de 100644
--- a/pkgs/by-name/hr/hr/package.nix
+++ b/pkgs/by-name/hr/hr/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LuRsT";
     repo = "hr";
-    rev = version;
+    tag = version;
     sha256 = "sha256-05num4v8C3n+uieKQJVLOzu9OOMBsUMPqq08Ou6gmYQ=";
   };
 
diff --git a/pkgs/by-name/hr/hred/package.nix b/pkgs/by-name/hr/hred/package.nix
index d946f8665b07..af78fa19604c 100644
--- a/pkgs/by-name/hr/hred/package.nix
+++ b/pkgs/by-name/hr/hred/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "danburzo";
     repo = "hred";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+0+WQRI8rdIMbPN0eBUdsWUMWDCxZhTRLiFo1WRd2xc=";
   };
 
diff --git a/pkgs/by-name/hs/hsd/package.nix b/pkgs/by-name/hs/hsd/package.nix
index d259a7bf851d..ef384fda26a3 100644
--- a/pkgs/by-name/hs/hsd/package.nix
+++ b/pkgs/by-name/hs/hsd/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "handshake-org";
     repo = "hsd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bmvoykpaYQDWLYKOwgKZ1V6ivzDJFM1Yo+ATkzKTP2s=";
   };
 
diff --git a/pkgs/by-name/hs/hsetroot/package.nix b/pkgs/by-name/hs/hsetroot/package.nix
index 48a281f3bc90..d926b341eecb 100644
--- a/pkgs/by-name/hs/hsetroot/package.nix
+++ b/pkgs/by-name/hs/hsetroot/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "himdel";
     repo = "hsetroot";
-    rev = version;
+    tag = version;
     sha256 = "1jbk5hlxm48zmjzkaq5946s58rqwg1v1ds2sdyd2ba029hmvr722";
   };
 
diff --git a/pkgs/by-name/hs/hstr/package.nix b/pkgs/by-name/hs/hstr/package.nix
index a92128622780..5fa385c5d91f 100644
--- a/pkgs/by-name/hs/hstr/package.nix
+++ b/pkgs/by-name/hs/hstr/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dvorka";
     repo = "hstr";
-    rev = version;
+    tag = version;
     hash = "sha256-OuLy1aiEwUJDGy3+UXYF1Vx1nNXic46WIZEM1xrIPfA=";
   };
 
diff --git a/pkgs/by-name/ht/htcondor/package.nix b/pkgs/by-name/ht/htcondor/package.nix
index 64cfb8bb516e..c1aeb40d6161 100644
--- a/pkgs/by-name/ht/htcondor/package.nix
+++ b/pkgs/by-name/ht/htcondor/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "htcondor";
     repo = "htcondor";
 
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-F8uI8Stvao7VKULTcOjv/nFUhFHxqd00gRNe6tkKgPE=";
   };
 
diff --git a/pkgs/by-name/ht/html-minifier/package.nix b/pkgs/by-name/ht/html-minifier/package.nix
index 81bf3e65fdf8..64bb00f8e8f0 100644
--- a/pkgs/by-name/ht/html-minifier/package.nix
+++ b/pkgs/by-name/ht/html-minifier/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "kangax";
     repo = "html-minifier";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OAykAqBxgr7tbeXXfSH23DALf7Eoh3VjDKNKWGAL3+A=";
   };
 
diff --git a/pkgs/by-name/ht/html-tidy/package.nix b/pkgs/by-name/ht/html-tidy/package.nix
index 00fa778dd53a..8bffd1a235ea 100644
--- a/pkgs/by-name/ht/html-tidy/package.nix
+++ b/pkgs/by-name/ht/html-tidy/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "htacg";
     repo = "tidy-html5";
-    rev = version;
+    tag = version;
     hash = "sha256-vzVWQodwzi3GvC9IcSQniYBsbkJV20iZanF33A0Gpe0=";
   };
 
diff --git a/pkgs/by-name/ht/html2text/package.nix b/pkgs/by-name/ht/html2text/package.nix
index 7e6e46d6033f..a7db7f51b545 100644
--- a/pkgs/by-name/ht/html2text/package.nix
+++ b/pkgs/by-name/ht/html2text/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "grobian";
     repo = "html2text";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7Ch51nJ5BeRqs4PEIPnjCGk+Nm2ydgJQCtkcpihXun8=";
   };
 
diff --git a/pkgs/by-name/ht/htmlhint/package.nix b/pkgs/by-name/ht/htmlhint/package.nix
index 2c7f09ee60db..c496f3be7885 100644
--- a/pkgs/by-name/ht/htmlhint/package.nix
+++ b/pkgs/by-name/ht/htmlhint/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "htmlhint";
     repo = "HTMLHint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6R+/uwqWpuTjUnFeUFMzZBzhlFBxYceYZfLLuaYhc6k=";
   };
 
diff --git a/pkgs/by-name/ht/htmltest/package.nix b/pkgs/by-name/ht/htmltest/package.nix
index 9eed514e874d..70e02c56e107 100644
--- a/pkgs/by-name/ht/htmltest/package.nix
+++ b/pkgs/by-name/ht/htmltest/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wjdp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8tkk476kGEfHo3XGu3/0r6fhX1c4vkYiUACpw0uEu2g=";
   };
 
diff --git a/pkgs/by-name/ht/htmx-lsp/package.nix b/pkgs/by-name/ht/htmx-lsp/package.nix
index 74e67231ee8e..3d7ba84f8444 100644
--- a/pkgs/by-name/ht/htmx-lsp/package.nix
+++ b/pkgs/by-name/ht/htmx-lsp/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ThePrimeagen";
     repo = "htmx-lsp";
-    rev = version;
+    tag = version;
     hash = "sha256-CvQ+vgo3+qUOj0SS6/NrapzXkP98tpiZbGhRHJxEqeo=";
   };
 
diff --git a/pkgs/by-name/ht/htop-vim/package.nix b/pkgs/by-name/ht/htop-vim/package.nix
index 937d212c37eb..6f6e6f604183 100644
--- a/pkgs/by-name/ht/htop-vim/package.nix
+++ b/pkgs/by-name/ht/htop-vim/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "htop-dev";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-4M2Kzy/tTpIZzpyubnXWywQh7Np5InT4sYkVG2v6wWs";
   };
 
diff --git a/pkgs/by-name/ht/htpdate/package.nix b/pkgs/by-name/ht/htpdate/package.nix
index 46eb31755623..a97ef2b77f9d 100644
--- a/pkgs/by-name/ht/htpdate/package.nix
+++ b/pkgs/by-name/ht/htpdate/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "twekkel";
     repo = "htpdate";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-X7r95Uc4oGB0eVum5D7pC4tebZIyyz73g6Q/D0cjuFM=";
   };
 
diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix
index c1458d5b16b9..88c2cef103bd 100644
--- a/pkgs/by-name/ht/httm/package.nix
+++ b/pkgs/by-name/ht/httm/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = "httm";
-    rev = version;
+    tag = version;
     hash = "sha256-QMw5FrI5GCaUrUPaxqGDBtz7RPcCFQn+jntmyertzhM=";
   };
 
diff --git a/pkgs/by-name/ht/http-parser/package.nix b/pkgs/by-name/ht/http-parser/package.nix
index 30e33e13130a..6cdc9f4e5906 100644
--- a/pkgs/by-name/ht/http-parser/package.nix
+++ b/pkgs/by-name/ht/http-parser/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "http-parser";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c";
   };
 
diff --git a/pkgs/by-name/ht/http-server/package.nix b/pkgs/by-name/ht/http-server/package.nix
index 015a50bcbd62..c76d8b3455cc 100644
--- a/pkgs/by-name/ht/http-server/package.nix
+++ b/pkgs/by-name/ht/http-server/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "http-party";
     repo = "http-server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-M/YC721QWJfz5sYX6RHm1U9WPHVRBD0ZL2/ceYItnhs=";
   };
 
diff --git a/pkgs/by-name/ht/httplab/package.nix b/pkgs/by-name/ht/httplab/package.nix
index fd2257ef8f90..c4688aa67807 100644
--- a/pkgs/by-name/ht/httplab/package.nix
+++ b/pkgs/by-name/ht/httplab/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "qustavo";
     repo = "httplab";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UL1i8JpgofXUB+jtW2EtSR1pM/Fdqnbg2EXPJAjc0H0=";
   };
 
diff --git a/pkgs/by-name/ht/httpref/package.nix b/pkgs/by-name/ht/httpref/package.nix
index fb04d45c3d51..8c299c873380 100644
--- a/pkgs/by-name/ht/httpref/package.nix
+++ b/pkgs/by-name/ht/httpref/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dnnrly";
     repo = "httpref";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T5fR9cyqsM6Kw6kFqZedoSxyvFkkxNpuErscwiUTMa0=";
   };
 
diff --git a/pkgs/by-name/ht/httprobe/package.nix b/pkgs/by-name/ht/httprobe/package.nix
index a1c2b4da34dc..a4d5a4665ba4 100644
--- a/pkgs/by-name/ht/httprobe/package.nix
+++ b/pkgs/by-name/ht/httprobe/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "httprobe";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-k/Ev+zpYF+DcnQvMbbRzoJ4co83q3pi/D9T4DhtGR/I=";
   };
 
diff --git a/pkgs/by-name/ht/httpstat/package.nix b/pkgs/by-name/ht/httpstat/package.nix
index a267bbaf4d5b..606f622b0fa1 100644
--- a/pkgs/by-name/ht/httpstat/package.nix
+++ b/pkgs/by-name/ht/httpstat/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "reorx";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-zUdis41sQpJ1E3LdNwaCVj6gexi/Rk21IBUgoFISiDM=";
   };
   doCheck = false; # No tests
diff --git a/pkgs/by-name/hu/hubicfuse/package.nix b/pkgs/by-name/hu/hubicfuse/package.nix
index 1cf774bc0b9b..d88d055f2ce5 100644
--- a/pkgs/by-name/hu/hubicfuse/package.nix
+++ b/pkgs/by-name/hu/hubicfuse/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TurboGit";
     repo = "hubicfuse";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1x988hfffxgvqxh083pv3lj5031fz03sbgiiwrjpaiywfbhm8ffr";
   };
 
diff --git a/pkgs/by-name/hu/hueadm/package.nix b/pkgs/by-name/hu/hueadm/package.nix
index 51986732b1d5..93087a75dce7 100644
--- a/pkgs/by-name/hu/hueadm/package.nix
+++ b/pkgs/by-name/hu/hueadm/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "bahamas10";
     repo = "hueadm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QNjkfE8V/lUkYP8NAf11liKXILBk3wSNm3NSrgaH+nc=";
   };
 
diff --git a/pkgs/by-name/hu/humioctl/package.nix b/pkgs/by-name/hu/humioctl/package.nix
index 34fc374f4f54..e91b06362aec 100644
--- a/pkgs/by-name/hu/humioctl/package.nix
+++ b/pkgs/by-name/hu/humioctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "humio";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2vkzde4l6GIIBzzNSewCtaVlBqkqpZQGXjw7VdJFPaE=";
   };
 
diff --git a/pkgs/by-name/hu/hunt/package.nix b/pkgs/by-name/hu/hunt/package.nix
index 6c4c255ea472..a9f5f714c23e 100644
--- a/pkgs/by-name/hu/hunt/package.nix
+++ b/pkgs/by-name/hu/hunt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LyonSyonII";
     repo = "hunt-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-aNU4Ik033+kl9ZPHFzaAXZ6Hs+b7m5s0lpr1oovmWm0=";
   };
 
diff --git a/pkgs/by-name/hu/husky/package.nix b/pkgs/by-name/hu/husky/package.nix
index e749644bc33c..f6b410813fdc 100644
--- a/pkgs/by-name/hu/husky/package.nix
+++ b/pkgs/by-name/hu/husky/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "typicode";
     repo = "husky";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KoF2+vikgFyCGjfKeaqkC720UVMuvCIn9ApDPKbudsA=";
   };
 
diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix
index 6edf714d2919..5892c95468ea 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RDp5NY9VYD0gylvzYpg9BytfRdQ6dim1jJtv32yeF3k=";
   };
 
diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix
index 9e6da40732ba..f588804d1b61 100644
--- a/pkgs/by-name/hw/hwinfo/package.nix
+++ b/pkgs/by-name/hw/hwinfo/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-mTkDyfdAwjJwBEp/bOYRz0zfzPSzOUEI5hp+mridZsA=";
   };
 
diff --git a/pkgs/by-name/hy/hydroxide/package.nix b/pkgs/by-name/hy/hydroxide/package.nix
index 34decc37b134..21a3449ecc59 100644
--- a/pkgs/by-name/hy/hydroxide/package.nix
+++ b/pkgs/by-name/hy/hydroxide/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "emersion";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VAbMcON75dTS+1lUqmveN2WruQCCmK3kB86e+vKM64U=";
   };
 
diff --git a/pkgs/by-name/hy/hyp2mat/package.nix b/pkgs/by-name/hy/hyp2mat/package.nix
index 5e92f8b4eee6..4f4c1f2a8b22 100644
--- a/pkgs/by-name/hy/hyp2mat/package.nix
+++ b/pkgs/by-name/hy/hyp2mat/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "koendv";
     repo = "hyp2mat";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "03ibk51swxfl7pfrhcrfiffdi4mnf8kla0g1xj1lsrvrjwapfx03";
   };
 
diff --git a/pkgs/by-name/hy/hyperbeam/package.nix b/pkgs/by-name/hy/hyperbeam/package.nix
index 883c65e0c0c9..c801e33d9e93 100644
--- a/pkgs/by-name/hy/hyperbeam/package.nix
+++ b/pkgs/by-name/hy/hyperbeam/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "holepunchto";
     repo = "hyperbeam";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g3eGuol3g1yfGHDSzI1wQXMxJudGCt4PHHdmtiRQS/Q=";
   };
 
diff --git a/pkgs/by-name/hy/hyperledger-fabric/package.nix b/pkgs/by-name/hy/hyperledger-fabric/package.nix
index f86e6e83012c..9aab44c7902f 100644
--- a/pkgs/by-name/hy/hyperledger-fabric/package.nix
+++ b/pkgs/by-name/hy/hyperledger-fabric/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hyperledger";
     repo = "fabric";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ev9a+d15kr6apKyGR5xTa/2I3cByyPSTW2Y+HAQk9GU=";
   };
 
diff --git a/pkgs/by-name/hy/hyperlink/package.nix b/pkgs/by-name/hy/hyperlink/package.nix
index 602d34cf8465..e1583a5035ca 100644
--- a/pkgs/by-name/hy/hyperlink/package.nix
+++ b/pkgs/by-name/hy/hyperlink/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "untitaker";
     repo = "hyperlink";
-    rev = version;
+    tag = version;
     hash = "sha256-sx1OW056s40uhwwgGtNKiPkKSUy7/ZzSYGnjc0UKh/E=";
   };
 
diff --git a/pkgs/by-name/hy/hyperpotamus/package.nix b/pkgs/by-name/hy/hyperpotamus/package.nix
index d0c293fff008..812645a52bd2 100644
--- a/pkgs/by-name/hy/hyperpotamus/package.nix
+++ b/pkgs/by-name/hy/hyperpotamus/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "pmarkert";
     repo = "hyperpotamus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dExkvObz+PNjqAZnigZHs/DCSHq31jDg9pgFmmtPmWk=";
   };
 
diff --git a/pkgs/by-name/hy/hypershell/package.nix b/pkgs/by-name/hy/hypershell/package.nix
index 32a394eb7780..06611de63f9a 100644
--- a/pkgs/by-name/hy/hypershell/package.nix
+++ b/pkgs/by-name/hy/hypershell/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "holepunchto";
     repo = "hypershell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UWXlcY65elw+xKLte5KE5eyFLDZmEVQBSwsSpv9G7ng=";
   };
 
diff --git a/pkgs/by-name/hy/hypnotix/package.nix b/pkgs/by-name/hy/hypnotix/package.nix
index 739a6f5531e1..e4ac8888ff53 100644
--- a/pkgs/by-name/hy/hypnotix/package.nix
+++ b/pkgs/by-name/hy/hypnotix/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "hypnotix";
-    rev = version;
+    tag = version;
     hash = "sha256-mM6NeDtRoPUSQ/smtvpYJ3qqeqiPHquP96ChJgSJWL0=";
   };
 
diff --git a/pkgs/by-name/hy/hyprdim/package.nix b/pkgs/by-name/hy/hyprdim/package.nix
index 895d25fbfe9a..369cfb69ee3c 100644
--- a/pkgs/by-name/hy/hyprdim/package.nix
+++ b/pkgs/by-name/hy/hyprdim/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "donovanglover";
     repo = "hyprdim";
-    rev = version;
+    tag = version;
     hash = "sha256-o06HnN/E8QWRFOqd9Sxolm4g/fI5+6hYITptnRNAFag=";
   };
 
diff --git a/pkgs/by-name/hy/hyprkeys/package.nix b/pkgs/by-name/hy/hyprkeys/package.nix
index 672f98e764c7..87c17ddc6bb9 100644
--- a/pkgs/by-name/hy/hyprkeys/package.nix
+++ b/pkgs/by-name/hy/hyprkeys/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "Hyprkeys";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-u2NTSth9gminIEcbxgGm/2HHyzuwf/YPNQV4VzR14Kk=";
   };
 
diff --git a/pkgs/by-name/hy/hyprland-activewindow/package.nix b/pkgs/by-name/hy/hyprland-activewindow/package.nix
index cd501f14cedb..940bb3dbdf6d 100644
--- a/pkgs/by-name/hy/hyprland-activewindow/package.nix
+++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "FieldOfClay";
     repo = "hyprland-activewindow";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oH3BsS0KqnNdYe7HWHlfRSiUJx+vC3IveN+mcEgwZLs=";
   };
 
diff --git a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
index c53b6987794f..d5fcbee70f2f 100644
--- a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
+++ b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "hyprland-autoname-workspaces";
-    rev = version;
+    tag = version;
     hash = "sha256-M/3mqO7G2E5NW2uE+X8P4UhEl0r1fPXuxyb1NowJQnY=";
   };
 
diff --git a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix
index 6e3c3426903b..d2e7e3383a6d 100644
--- a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix
+++ b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "coffebar";
     repo = "hyprland-monitor-attached";
-    rev = version;
+    tag = version;
     hash = "sha256-+bgOOm1B513COcWdUIJ/+GREQH5CR8/RNOcZVkjO2hI=";
   };
 
diff --git a/pkgs/by-name/hy/hyprland-per-window-layout/package.nix b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
index f4df99e3e114..2cbde7a73c41 100644
--- a/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
+++ b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "coffebar";
     repo = "hyprland-per-window-layout";
-    rev = version;
+    tag = version;
     hash = "sha256-Bwdh+Cy5LTRSBDfk4r28FmPRUEHYI++nKRhS9eSSbyg=";
   };
 
diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix
index 7a4b12d06f41..263d2a5cfbbb 100644
--- a/pkgs/by-name/hy/hyprland-workspaces/package.nix
+++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "FieldofClay";
     repo = "hyprland-workspaces";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-a5P99aSqhlZqClXAoaUNv/jmuM5duLDf+OzMeKGwDVI=";
   };
 
diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix
index ac7f9b559992..978af5f2962e 100644
--- a/pkgs/by-name/hy/hyprls/package.nix
+++ b/pkgs/by-name/hy/hyprls/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "hyprls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4PtoZWESEkRaZ4HOgXLWXRPhG1+JlWuMiYZtjbbLcz4=";
   };
 
diff --git a/pkgs/by-name/hy/hyprnome/package.nix b/pkgs/by-name/hy/hyprnome/package.nix
index e9027f1bea35..21d82326c7e5 100644
--- a/pkgs/by-name/hy/hyprnome/package.nix
+++ b/pkgs/by-name/hy/hyprnome/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "donovanglover";
     repo = "hyprnome";
-    rev = version;
+    tag = version;
     hash = "sha256-GZn7qS1J6QSanWdy17sMBbwJ77iMij2jKRgPdrjt6tM=";
   };
 
diff --git a/pkgs/by-name/hy/hyprnotify/package.nix b/pkgs/by-name/hy/hyprnotify/package.nix
index d89277c5cda1..c60610a6b1d8 100644
--- a/pkgs/by-name/hy/hyprnotify/package.nix
+++ b/pkgs/by-name/hy/hyprnotify/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "codelif";
     repo = "hyprnotify";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+vBOHXaCWEoQ/Lk9VwP55XqlhSzSS9hoVg4FQOj8dIU=";
   };
 
diff --git a/pkgs/by-name/hy/hyprshot/package.nix b/pkgs/by-name/hy/hyprshot/package.nix
index 98666e17b84e..0b4126c0a0bc 100644
--- a/pkgs/by-name/hy/hyprshot/package.nix
+++ b/pkgs/by-name/hy/hyprshot/package.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Gustash";
     repo = "hyprshot";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-9taTmV357cWglMGuN3NLq3bfNneFthwV6y+Ml4qEeHA=";
   };
 
diff --git a/pkgs/by-name/i3/i3-volume/package.nix b/pkgs/by-name/i3/i3-volume/package.nix
index b91e64e7e78d..c48665f1e062 100644
--- a/pkgs/by-name/i3/i3-volume/package.nix
+++ b/pkgs/by-name/i3/i3-volume/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hastinbe";
     repo = "i3-volume";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vmyfEXJ/5TRWIJQCblYcy8owI03F+ARNAEd0ni5ublM=";
   };
 
diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix
index b43e766ee9f6..00e602024660 100644
--- a/pkgs/by-name/i3/i3bar-river/package.nix
+++ b/pkgs/by-name/i3/i3bar-river/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MaxVerevkin";
     repo = "i3bar-river";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0ux0woVp9HVCJf/oND2AKHj30eNC/w1WDnlPafLTgxM=";
   };
 
diff --git a/pkgs/by-name/i3/i3minator/package.nix b/pkgs/by-name/i3/i3minator/package.nix
index 2c56f1d521f2..1adff48ea3f9 100644
--- a/pkgs/by-name/i3/i3minator/package.nix
+++ b/pkgs/by-name/i3/i3minator/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "carlesso";
     repo = "i3minator";
-    rev = version;
+    tag = version;
     sha256 = "07dic5d2m0zw0psginpl43xn0mpxw7wilj49d02knz69f7c416lm";
   };
 
diff --git a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
index 9d33fa0d6440..ab5e80023a13 100644
--- a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
+++ b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "flosell";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-xIhe+Mnvog+xRu1qMA7yxS1pCs91cr5EcaJroO+0zJ8=";
   };
 
diff --git a/pkgs/by-name/ia/iamy/package.nix b/pkgs/by-name/ia/iamy/package.nix
index 5d8e7afa92f2..e11c51783562 100644
--- a/pkgs/by-name/ia/iamy/package.nix
+++ b/pkgs/by-name/ia/iamy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "99designs";
     repo = "iamy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oH3ijZaWXI0TdVQN9gzp5ypWzY7OqSxDh7VBoZo42Cs=";
   };
 
diff --git a/pkgs/by-name/ia/ianny/package.nix b/pkgs/by-name/ia/ianny/package.nix
index 27d4899ee101..152ed107e686 100644
--- a/pkgs/by-name/ia/ianny/package.nix
+++ b/pkgs/by-name/ia/ianny/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zefr0x";
     repo = "ianny";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-F8Uc2BsQ5f7yaUXXDhLvyyYKUDAuvP9cCR2h3vblr0g=";
   };
 
diff --git a/pkgs/by-name/ib/ibus-theme-tools/package.nix b/pkgs/by-name/ib/ibus-theme-tools/package.nix
index 414f5d134c2c..2e549e180975 100644
--- a/pkgs/by-name/ib/ibus-theme-tools/package.nix
+++ b/pkgs/by-name/ib/ibus-theme-tools/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "IBus-Theme-Tools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0i8vwnikwd1bfpv4xlgzc51gn6s18q58nqhvcdiyjzcmy3z344c2";
   };
 
diff --git a/pkgs/by-name/ic/ic-keysmith/package.nix b/pkgs/by-name/ic/ic-keysmith/package.nix
index 560e36b32e09..44433dc1922d 100644
--- a/pkgs/by-name/ic/ic-keysmith/package.nix
+++ b/pkgs/by-name/ic/ic-keysmith/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dfinity";
     repo = "keysmith";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+wYWIoPYc7qpTRS4Zlxp50Up8obZOmfQpiT0SWwVJE0=";
   };
 
diff --git a/pkgs/by-name/ic/ical2orgpy/package.nix b/pkgs/by-name/ic/ical2orgpy/package.nix
index 0ca92ac24413..4402f5436340 100644
--- a/pkgs/by-name/ic/ical2orgpy/package.nix
+++ b/pkgs/by-name/ic/ical2orgpy/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ical2org-py";
     repo = "ical2org.py";
-    rev = version;
+    tag = version;
     hash = "sha256-vBi1WYXMuDFS/PnwFQ/fqN5+gIvtylXidfZklyd6LcI=";
   };
 
diff --git a/pkgs/by-name/ic/icecream/package.nix b/pkgs/by-name/ic/icecream/package.nix
index 719d8ddd1a7f..79d07cbb2871 100644
--- a/pkgs/by-name/ic/icecream/package.nix
+++ b/pkgs/by-name/ic/icecream/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "icecc";
     repo = "icecream";
-    rev = version;
+    tag = version;
     sha256 = "sha256-nBdUbWNmTxKpkgFM3qbooNQISItt5eNKtnnzpBGVbd4=";
   };
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index 397fb528ddd3..cfa97638698e 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ice-wm";
     repo = "icewm";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-4JF2ZAp8dx2fpSYRUz4I8US3oIZrSS90oljuxQDm38A=";
   };
 
diff --git a/pkgs/by-name/ic/icnsify/package.nix b/pkgs/by-name/ic/icnsify/package.nix
index 0b8b94925133..8dba40f7d274 100644
--- a/pkgs/by-name/ic/icnsify/package.nix
+++ b/pkgs/by-name/ic/icnsify/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "uncenter";
     repo = "icnsify";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v8jwN29S6ZTt2XkPpZM+lJugbP9ClzPhqu52mdwdP00=";
   };
 
diff --git a/pkgs/by-name/ic/icoextract/package.nix b/pkgs/by-name/ic/icoextract/package.nix
index 8565bff672fd..945e828e6348 100644
--- a/pkgs/by-name/ic/icoextract/package.nix
+++ b/pkgs/by-name/ic/icoextract/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jlu5";
     repo = "icoextract";
-    rev = version;
+    tag = version;
     hash = "sha256-McVG8966NCEpzc9biawLvUgbQUtterkIud/9GwOeltI=";
   };
 
diff --git a/pkgs/by-name/ic/iconpack-jade/package.nix b/pkgs/by-name/ic/iconpack-jade/package.nix
index ee7090ab5fd1..4b4749afc60f 100644
--- a/pkgs/by-name/ic/iconpack-jade/package.nix
+++ b/pkgs/by-name/ic/iconpack-jade/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = "iconpack-jade";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0pwz3l5i93s84iwkn1jq8a150ma96788a0n41xq2cgy00j8h8xh0";
   };
 
diff --git a/pkgs/by-name/ic/iconpack-obsidian/package.nix b/pkgs/by-name/ic/iconpack-obsidian/package.nix
index e349b8f291c5..87124d7b7883 100644
--- a/pkgs/by-name/ic/iconpack-obsidian/package.nix
+++ b/pkgs/by-name/ic/iconpack-obsidian/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = "iconpack-obsidian";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1f32isq1xyn9b6p1nx5rssqgg9gw0jp9ld19860xk29fspmlfb8n";
   };
 
diff --git a/pkgs/by-name/ic/icr/package.nix b/pkgs/by-name/ic/icr/package.nix
index 22468e862816..6e058c0699de 100644
--- a/pkgs/by-name/ic/icr/package.nix
+++ b/pkgs/by-name/ic/icr/package.nix
@@ -19,7 +19,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "crystal-community";
     repo = "icr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-29B/i8oEjwNOYjnc78QcYTl6fC/M9VfAVCCBjLBKp0Q=";
   };
 
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/id/id3/package.nix b/pkgs/by-name/id/id3/package.nix
index e0cd063141c5..53e0e654d0c5 100644
--- a/pkgs/by-name/id/id3/package.nix
+++ b/pkgs/by-name/id/id3/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "squell";
     repo = "id3";
-    rev = version;
+    tag = version;
     hash = "sha256-+h1wwgTB7CpbjyUAK+9BNRhmy83D+1I+cZ70E1m3ENk=";
   };
 
diff --git a/pkgs/by-name/id/ideogram/package.nix b/pkgs/by-name/id/ideogram/package.nix
index 9d9c2bbff5d9..e6b555f8cfd6 100644
--- a/pkgs/by-name/id/ideogram/package.nix
+++ b/pkgs/by-name/id/ideogram/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ideogram";
-    rev = version;
+    tag = version;
     sha256 = "1zkr7x022khn5g3sq2dkxzy1hiiz66vl81s3i5sb9qr88znh79p1";
   };
 
diff --git a/pkgs/by-name/id/idsk/package.nix b/pkgs/by-name/id/idsk/package.nix
index 22e69135e55e..1ba0d439238f 100644
--- a/pkgs/by-name/id/idsk/package.nix
+++ b/pkgs/by-name/id/idsk/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cpcsdk";
     repo = "idsk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rYClWq1Nl3COoG+eOJyFDTvBSzpHpGminU4bndZs6xc=";
   };
 
diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix
index 566a66f016d7..3de8f6e6c714 100644
--- a/pkgs/by-name/ie/ieda/package.nix
+++ b/pkgs/by-name/ie/ieda/package.nix
@@ -29,7 +29,7 @@ let
     src = fetchFromGitHub {
       owner = "google";
       repo = "glog";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-xqRp9vaauBkKz2CXbh/Z4TWqhaUtqfbsSlbYZR/kW9s=";
     };
   });
diff --git a/pkgs/by-name/if/ifrextractor-rs/package.nix b/pkgs/by-name/if/ifrextractor-rs/package.nix
index cf0772806659..ede6cfad8f5f 100644
--- a/pkgs/by-name/if/ifrextractor-rs/package.nix
+++ b/pkgs/by-name/if/ifrextractor-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LongSoft";
     repo = "ifrextractor-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zpoOThjkL2Hu/ytxdqWcr2GXzN4Cm8hph7PJhSF5BlU=";
   };
 
diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix
index 38bf62bf443c..8954a7da8ac1 100644
--- a/pkgs/by-name/ig/igir/package.nix
+++ b/pkgs/by-name/ig/igir/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "emmercm";
     repo = "igir";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NG0ZP8LOm7fZVecErTuLOfbp1yvXwHnwPkWTBzUJXWE=";
   };
 
diff --git a/pkgs/by-name/ig/igmpproxy/package.nix b/pkgs/by-name/ig/igmpproxy/package.nix
index b3c6b196f617..8b54d30bcf12 100644
--- a/pkgs/by-name/ig/igmpproxy/package.nix
+++ b/pkgs/by-name/ig/igmpproxy/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pali";
     repo = "igmpproxy";
-    rev = version;
+    tag = version;
     sha256 = "sha256-kv8XtZ/z8zPHYSZ4k4arn2Y+L2xegr2DwhvlguJV820=";
   };
 
diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix
index 8f66cb6b0e99..42bb0e431e6b 100644
--- a/pkgs/by-name/ig/ignite-cli/package.nix
+++ b/pkgs/by-name/ig/ignite-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "cli";
     owner = "ignite";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d7+T0VlmKQgmAJ8eyDg8JDL9HHJbU+nOTvJP0GTuIRY=";
   };
 
diff --git a/pkgs/by-name/ig/igprof/package.nix b/pkgs/by-name/ig/igprof/package.nix
index 2b5d3cf946a0..52fe99e3905f 100644
--- a/pkgs/by-name/ig/igprof/package.nix
+++ b/pkgs/by-name/ig/igprof/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "igprof";
     repo = "igprof";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw=";
   };
 
diff --git a/pkgs/by-name/ig/igraph/package.nix b/pkgs/by-name/ig/igraph/package.nix
index de3fc033f947..274b1f6fad20 100644
--- a/pkgs/by-name/ig/igraph/package.nix
+++ b/pkgs/by-name/ig/igraph/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "igraph";
     repo = "igraph";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-TSAVRLeOWh3IQ9X0Zr4CQS+h1vTeUZnzMp/IYujGMn0=";
   };
 
diff --git a/pkgs/by-name/ih/ihp-new/package.nix b/pkgs/by-name/ih/ihp-new/package.nix
index 1d2914f4af7d..025c6a840856 100644
--- a/pkgs/by-name/ih/ihp-new/package.nix
+++ b/pkgs/by-name/ih/ihp-new/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "digitallyinduced";
     repo = "ihp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DmaIr9kF+TG24wVNPVufxC74TYMCLziLYS9hCZHBDTc=";
   };
 
diff --git a/pkgs/by-name/ii/iir1/package.nix b/pkgs/by-name/ii/iir1/package.nix
index a0e6ffd1bccd..a01e9f71ffef 100644
--- a/pkgs/by-name/ii/iir1/package.nix
+++ b/pkgs/by-name/ii/iir1/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "berndporr";
     repo = "iir1";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-8u+V3+p/nVfl1Izht27OE6D1kkA6all6aUEL9APwXmk=";
   };
 
diff --git a/pkgs/by-name/ik/ike-scan/package.nix b/pkgs/by-name/ik/ike-scan/package.nix
index 754ab2afa6c5..78809b62924d 100644
--- a/pkgs/by-name/ik/ike-scan/package.nix
+++ b/pkgs/by-name/ik/ike-scan/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "royhills";
     repo = "ike-scan";
-    rev = version;
+    tag = version;
     sha256 = "sha256-mbfg8p3y4aKoXpmLuF9GXAMPEqV5CsvetwGCRDJ9UNY=";
   };
 
diff --git a/pkgs/by-name/ik/ikill/package.nix b/pkgs/by-name/ik/ikill/package.nix
index 5399dce37303..bbaaa215ffea 100644
--- a/pkgs/by-name/ik/ikill/package.nix
+++ b/pkgs/by-name/ik/ikill/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pjmp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hOQBBwxkVnTkAZJi84qArwAo54fMC0zS+IeYMV04kUs=";
   };
 
diff --git a/pkgs/by-name/il/illum/package.nix b/pkgs/by-name/il/illum/package.nix
index 57e0d2568a17..3c0bacbb2fed 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/image-roll/package.nix b/pkgs/by-name/im/image-roll/package.nix
index 8698289f3fef..76e557316e3d 100644
--- a/pkgs/by-name/im/image-roll/package.nix
+++ b/pkgs/by-name/im/image-roll/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "weclaw1";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-CC40TU38bJFnbJl2EHqeB9RBvbVUrBmRdZVS2GxqGu4=";
   };
 
diff --git a/pkgs/by-name/im/imagelol/package.nix b/pkgs/by-name/im/imagelol/package.nix
index fadf9b716226..96db303444ab 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/im/imageworsener/package.nix b/pkgs/by-name/im/imageworsener/package.nix
index 7c108002c217..9146b5e5246f 100644
--- a/pkgs/by-name/im/imageworsener/package.nix
+++ b/pkgs/by-name/im/imageworsener/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jsummers";
     repo = "imageworsener";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-1f5x8Ph994Kkjo38NudXL+UF0fpR8BmZfaGPxc8RENU=";
   };
 
diff --git a/pkgs/by-name/im/imaginary/package.nix b/pkgs/by-name/im/imaginary/package.nix
index dfe07024292e..57f29436bca5 100644
--- a/pkgs/by-name/im/imaginary/package.nix
+++ b/pkgs/by-name/im/imaginary/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "h2non";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oEkFoZMaNNJPMisqpIneeLK/sA23gaTWJ4nqtDHkrwA=";
   };
 
diff --git a/pkgs/by-name/im/imaginer/package.nix b/pkgs/by-name/im/imaginer/package.nix
index 598d6fb2b93c..8eaef667c92c 100644
--- a/pkgs/by-name/im/imaginer/package.nix
+++ b/pkgs/by-name/im/imaginer/package.nix
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ImaginerApp";
     repo = "Imaginer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-x1ZnmfaMfxnITiuFDlMPfTU8KZbd1ME9jDevnlsrbJs=";
   };
 
diff --git a/pkgs/by-name/im/imath/package.nix b/pkgs/by-name/im/imath/package.nix
index 9a3ddc0a1a5b..06e0cfc5bcba 100644
--- a/pkgs/by-name/im/imath/package.nix
+++ b/pkgs/by-name/im/imath/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "imath";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-r4FNyNsWdmpZrHOpSvaSUWRYhAU+qnW4lE5uYPKn7Mw=";
   };
 
diff --git a/pkgs/by-name/im/img-cat/package.nix b/pkgs/by-name/im/img-cat/package.nix
index ef8493e75740..e43c835b3baa 100644
--- a/pkgs/by-name/im/img-cat/package.nix
+++ b/pkgs/by-name/im/img-cat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trashhalo";
     repo = "imgcat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L2Yvp+UR6q45ctKsi0v45lKkSE7eJsUPvG7lpX8M6nQ=";
   };
 
diff --git a/pkgs/by-name/im/img/package.nix b/pkgs/by-name/im/img/package.nix
index 71fd68fb0fae..d6211b72a267 100644
--- a/pkgs/by-name/im/img/package.nix
+++ b/pkgs/by-name/im/img/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "genuinetools";
     repo = "img";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0r5hihzp2679ki9hr3p0f085rafy2hc8kpkdhnd4m5k4iibqib08";
   };
 
diff --git a/pkgs/by-name/im/imgcat/package.nix b/pkgs/by-name/im/imgcat/package.nix
index aaaa5b0bc065..68f798f67501 100644
--- a/pkgs/by-name/im/imgcat/package.nix
+++ b/pkgs/by-name/im/imgcat/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eddieantonio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-miFjlahTI0GDpgsjnA/K1R4R5654M8AoK78CycoLTqA=";
   };
 
diff --git a/pkgs/by-name/im/imgcrypt/package.nix b/pkgs/by-name/im/imgcrypt/package.nix
index 6b30c5b5d2b4..0faeb995e93a 100644
--- a/pkgs/by-name/im/imgcrypt/package.nix
+++ b/pkgs/by-name/im/imgcrypt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containerd";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-81jfoWHYYenGQFcQI9kk8uPnv6FcyOtcJjpo1ykdtOI=";
   };
 
diff --git a/pkgs/by-name/im/imgpatchtools/package.nix b/pkgs/by-name/im/imgpatchtools/package.nix
index ddb57ba74c8f..2739b0bb51e2 100644
--- a/pkgs/by-name/im/imgpatchtools/package.nix
+++ b/pkgs/by-name/im/imgpatchtools/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "erfanoabdi";
     repo = "imgpatchtools";
-    rev = version;
+    tag = version;
     sha256 = "sha256-7TOkqaXPui14VcSmMmYJ1Wg+s85wrgp+E0XcCB0Ml7M=";
   };
 
diff --git a/pkgs/by-name/im/imgpkg/package.nix b/pkgs/by-name/im/imgpkg/package.nix
index b6286b1fbc51..9f2607f71aa1 100644
--- a/pkgs/by-name/im/imgpkg/package.nix
+++ b/pkgs/by-name/im/imgpkg/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "imgpkg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DuLxNH0fcVPvZYG4AYtaT8kJysTLRNX2tB6UBhQoP9Q=";
   };
 
diff --git a/pkgs/by-name/im/imgproxy/package.nix b/pkgs/by-name/im/imgproxy/package.nix
index 77375d6c3725..31e6951b78ba 100644
--- a/pkgs/by-name/im/imgproxy/package.nix
+++ b/pkgs/by-name/im/imgproxy/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
     owner = pname;
     repo = pname;
     hash = "sha256-aI+rWXt+tioHFGBJk/RkYeo7JaV+10jurx7YKX448Yk=";
-    rev = "v${version}";
+    tag = "v${version}";
   };
 
   vendorHash = "sha256-L18vxiFXBlKeipMm1N/c+F+zHDQYN5CHjYwa4xi9I3s=";
diff --git a/pkgs/by-name/im/imgur-screenshot/package.nix b/pkgs/by-name/im/imgur-screenshot/package.nix
index c9d29bfe92c6..496551f5ab5b 100644
--- a/pkgs/by-name/im/imgur-screenshot/package.nix
+++ b/pkgs/by-name/im/imgur-screenshot/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jomo";
     repo = "imgur-screenshot";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0fkhvfraijbrw806pgij41bn1hc3r7l7l3snkicmshxj83lmsd5k";
   };
 
diff --git a/pkgs/by-name/im/imgurbash2/package.nix b/pkgs/by-name/im/imgurbash2/package.nix
index 10bb01e7690f..49ef9a5e6de8 100644
--- a/pkgs/by-name/im/imgurbash2/package.nix
+++ b/pkgs/by-name/im/imgurbash2/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ram-on";
     repo = "imgurbash2";
-    rev = version;
+    tag = version;
     sha256 = "sha256-7J3LquzcYX0wBR6kshz7VuPv/TftTzKFdWcgsML2DnI=";
   };
 
diff --git a/pkgs/by-name/im/immudb/package.nix b/pkgs/by-name/im/immudb/package.nix
index 7bf5429977ef..130c462ba3f3 100644
--- a/pkgs/by-name/im/immudb/package.nix
+++ b/pkgs/by-name/im/immudb/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "codenotary";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sQLxHHaKdqocjJVXuuuQqx+BNubl6bjVcp50r4kPQEs=";
   };
 
diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix
index e18039349a03..29394c8f4a3f 100644
--- a/pkgs/by-name/im/impala/package.nix
+++ b/pkgs/by-name/im/impala/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pythops";
     repo = "impala";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NPNzvqnuYXrHCOLN0kZwtzPiKVdl6UFnb/S/XtG+sEY=";
   };
 
diff --git a/pkgs/by-name/im/impl/package.nix b/pkgs/by-name/im/impl/package.nix
index 3f08de58dd9a..1692246f975a 100644
--- a/pkgs/by-name/im/impl/package.nix
+++ b/pkgs/by-name/im/impl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "josharian";
     repo = "impl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0TSyg7YEPur+h0tkDxI3twr2PzT7tmo3shKgmSSJ6qk=";
   };
 
diff --git a/pkgs/by-name/im/implot/package.nix b/pkgs/by-name/im/implot/package.nix
index 541e85c73f58..fe75d96e6c5c 100644
--- a/pkgs/by-name/im/implot/package.nix
+++ b/pkgs/by-name/im/implot/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "epezent";
     repo = "implot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/wkVsgz3wiUVZBCgRl2iDD6GWb+AoHN+u0aeqHHgem0=";
   };
 
diff --git a/pkgs/by-name/im/imtui/package.nix b/pkgs/by-name/im/imtui/package.nix
index 4bb5187ab518..3ada44d24b05 100644
--- a/pkgs/by-name/im/imtui/package.nix
+++ b/pkgs/by-name/im/imtui/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ggerganov";
     repo = "imtui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eHQPDEfxKGLdiOi0lUUgqJcmme1XJLSPAafT223YK+U=";
   };
 
diff --git a/pkgs/by-name/in/inadyn/package.nix b/pkgs/by-name/in/inadyn/package.nix
index 09963d89646e..e7ac6084151c 100644
--- a/pkgs/by-name/in/inadyn/package.nix
+++ b/pkgs/by-name/in/inadyn/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "inadyn";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-aQHJtnMDaHF1XY9lwQVR6f78Zk2UI7OC3Oxt1r1KMak=";
   };
 
diff --git a/pkgs/by-name/in/infamousPlugins/package.nix b/pkgs/by-name/in/infamousPlugins/package.nix
index 29df008ab9da..e2322b5b1f89 100644
--- a/pkgs/by-name/in/infamousPlugins/package.nix
+++ b/pkgs/by-name/in/infamousPlugins/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ssj71";
     repo = "infamousPlugins";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-AhW4hLmCxz7yHMdxM6kOvtCXk1jEg/XtyPgt4yk1xqs=";
   };
 
diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix
index 27bc9f6a4419..2161a1d27dab 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-NDxgWHTMyntNtUb/+7bvrR64PNRPcovQd/IIgcLo5JQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/in/inflow/package.nix b/pkgs/by-name/in/inflow/package.nix
index 32416963105d..e734b15c46e3 100644
--- a/pkgs/by-name/in/inflow/package.nix
+++ b/pkgs/by-name/in/inflow/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stephen-huan";
     repo = "inflow";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xKUqkrPwITai8g6U1NiNieAip/AzISgFfFtvR30hLNk=";
   };
 
diff --git a/pkgs/by-name/in/infra-arcana/package.nix b/pkgs/by-name/in/infra-arcana/package.nix
index bbe5e0f262b9..a139d0f73ae3 100644
--- a/pkgs/by-name/in/infra-arcana/package.nix
+++ b/pkgs/by-name/in/infra-arcana/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "martin-tornqvist";
     repo = "ia";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MI+wH0+1f41JYXT2hzDs3RrrR3eTfOzgtCa5T6m8oQc=";
   };
 
diff --git a/pkgs/by-name/in/infra/package.nix b/pkgs/by-name/in/infra/package.nix
index e42727704b2d..11bd0f3ff7eb 100644
--- a/pkgs/by-name/in/infra/package.nix
+++ b/pkgs/by-name/in/infra/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "infrahq";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-uz4wimhOfeHSL949m+biIhjfDwwEGnTiJWaz/r3Rsko=";
   };
 
diff --git a/pkgs/by-name/in/infracost/package.nix b/pkgs/by-name/in/infracost/package.nix
index ab848711f600..5504c5fa90aa 100644
--- a/pkgs/by-name/in/infracost/package.nix
+++ b/pkgs/by-name/in/infracost/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "infracost";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "infracost";
     sha256 = "sha256-cnZ7ASYm1IhlqskWMEWzaAG6XKEex7P3akjmYUjHSzc=";
   };
diff --git a/pkgs/by-name/in/inframap/package.nix b/pkgs/by-name/in/inframap/package.nix
index ddfe0ce63dcd..a725f96ec49f 100644
--- a/pkgs/by-name/in/inframap/package.nix
+++ b/pkgs/by-name/in/inframap/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cycloidio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jV9mMJNSsRWdbvHr7OvF1cF2KVqxUEjlM9AaVMxNqBI=";
   };
 
diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix
index 426a1a79e0e4..57455c3be283 100644
--- a/pkgs/by-name/in/infrastructure-agent/package.nix
+++ b/pkgs/by-name/in/infrastructure-agent/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "newrelic";
     repo = "infrastructure-agent";
-    rev = version;
+    tag = version;
     hash = "sha256-odB40XRZyFuHX82RzxIvW3SAwglOyYRiApWUfRhOEmk=";
   };
 
diff --git a/pkgs/by-name/in/ingress2gateway/package.nix b/pkgs/by-name/in/ingress2gateway/package.nix
index 33ac44c47dc3..620efa509772 100644
--- a/pkgs/by-name/in/ingress2gateway/package.nix
+++ b/pkgs/by-name/in/ingress2gateway/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0w2ZM1g2rr46bN8BNgrkmb3tOQw0FZTMLp/koW01c5I=";
   };
 
diff --git a/pkgs/by-name/in/inhibridge/package.nix b/pkgs/by-name/in/inhibridge/package.nix
index bc38f63fa349..097dd15a32a5 100644
--- a/pkgs/by-name/in/inhibridge/package.nix
+++ b/pkgs/by-name/in/inhibridge/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "Scrumplex";
     repo = "inhibridge";
-    rev = version;
+    tag = version;
     hash = "sha256-cKVw3Gd4Ml8BeXjZqTN6ToeRzO9PI+Sn45gpltlRuWM=";
   };
 
diff --git a/pkgs/by-name/in/initool/package.nix b/pkgs/by-name/in/initool/package.nix
index 12c7a2409453..b455f199d0ed 100644
--- a/pkgs/by-name/in/initool/package.nix
+++ b/pkgs/by-name/in/initool/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dbohdan";
     repo = "initool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PROsyYw8xdnn0PX+3OyUPaybQbTmO88G2koeZhBfwjg=";
   };
 
diff --git a/pkgs/by-name/in/inklecate/package.nix b/pkgs/by-name/in/inklecate/package.nix
index 3c635a6060c1..b7a0402e661e 100644
--- a/pkgs/by-name/in/inklecate/package.nix
+++ b/pkgs/by-name/in/inklecate/package.nix
@@ -13,7 +13,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "inkle";
     repo = "ink";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
   };
 
diff --git a/pkgs/by-name/in/inotify-tools/package.nix b/pkgs/by-name/in/inotify-tools/package.nix
index 10c48bffe7c0..9e8eed5a0c27 100644
--- a/pkgs/by-name/in/inotify-tools/package.nix
+++ b/pkgs/by-name/in/inotify-tools/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     repo = "inotify-tools";
     owner = "inotify-tools";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-6kM2JzxRcwUjUmbUWGnQ+gAvZcn7C32/enRwiYiuQGU=";
   };
 
diff --git a/pkgs/by-name/in/inputmodule-control/package.nix b/pkgs/by-name/in/inputmodule-control/package.nix
index 0133a868ad8b..6c135f5f673b 100644
--- a/pkgs/by-name/in/inputmodule-control/package.nix
+++ b/pkgs/by-name/in/inputmodule-control/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "FrameworkComputer";
     repo = "inputmodule-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5sqTkaGqmKDDH7byDZ84rzB3FTu9AKsWxA6EIvUrLCU=";
   };
 
diff --git a/pkgs/by-name/in/inriafonts/package.nix b/pkgs/by-name/in/inriafonts/package.nix
index 4504c41967b6..251b1a217d3a 100644
--- a/pkgs/by-name/in/inriafonts/package.nix
+++ b/pkgs/by-name/in/inriafonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BlackFoundry";
     repo = "InriaFonts";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CMKkwGuUEVYavnFi15FCk7Xloyk97w+LhAZ6mpIv5xg=";
   };
 
diff --git a/pkgs/by-name/in/inspector/package.nix b/pkgs/by-name/in/inspector/package.nix
index c9d0957f7225..f0e21059c9bf 100644
--- a/pkgs/by-name/in/inspector/package.nix
+++ b/pkgs/by-name/in/inspector/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Nokse22";
     repo = "inspector";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tjQCF2Tyv7/NWgrwHu+JPpnLECfDmQS77EVLBt+cRTs=";
   };
 
diff --git a/pkgs/by-name/in/inspectrum/package.nix b/pkgs/by-name/in/inspectrum/package.nix
index 06647204ef6e..01fa9475825f 100644
--- a/pkgs/by-name/in/inspectrum/package.nix
+++ b/pkgs/by-name/in/inspectrum/package.nix
@@ -17,7 +17,7 @@ gnuradioMinimal.pkgs.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "miek";
     repo = "inspectrum";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yY2W2hQpj8TIxiQBSbQHq0J16n74OfIwMDxFt3mLZYc=";
   };
 
diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index 1d2d2fc87ed8..8f3ca7786e98 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -156,7 +156,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "inspircd";
     repo = "inspircd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Aulhg2CbtcpsxkH5kXkp4EoZF5/F9pOXJc1S08S5P08=";
   };
 
diff --git a/pkgs/by-name/in/insulator2/package.nix b/pkgs/by-name/in/insulator2/package.nix
index 9e5d2c2eac0f..efcde6bbb4a5 100644
--- a/pkgs/by-name/in/insulator2/package.nix
+++ b/pkgs/by-name/in/insulator2/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrewinci";
     repo = "insulator2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-34JRIB7/x7miReWOxR/m+atjfUiE3XGyh9OBSbMg3m4=";
   };
 
diff --git a/pkgs/by-name/in/integresql/package.nix b/pkgs/by-name/in/integresql/package.nix
index da724b573cdd..f5a2524d56ba 100644
--- a/pkgs/by-name/in/integresql/package.nix
+++ b/pkgs/by-name/in/integresql/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "allaboutapps";
     repo = "integresql";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-heRa1H4ZSCZzSMCejhakBpJfnEnGQLmNFERKqMxbC04=";
   };
 
diff --git a/pkgs/by-name/in/intel-cmt-cat/package.nix b/pkgs/by-name/in/intel-cmt-cat/package.nix
index 0b356aa6d4c7..d690840a5dc5 100644
--- a/pkgs/by-name/in/intel-cmt-cat/package.nix
+++ b/pkgs/by-name/in/intel-cmt-cat/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "intel-cmt-cat";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-e4sbQNpUCZaZDhLLRVDXHXsEelZaZIdc8n3ksUnAkKQ=";
   };
 
diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
index a4640733e400..dccc3a7bfc94 100644
--- a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
-    rev = version;
+    tag = version;
     hash = "sha256-POImMopbrhVXuSx2MQ9mwPNKQx7BljyikKhu6M4hZME=";
   };
 
diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix
index e2fec783cb76..5b5fd02569c7 100644
--- a/pkgs/by-name/in/intelli-shell/package.nix
+++ b/pkgs/by-name/in/intelli-shell/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lasantosr";
     repo = "intelli-shell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D7hB1vKi54L7hU3TqTvzxXIr6XohfYLUTidR6wFJmfo=";
   };
 
diff --git a/pkgs/by-name/in/interlock/package.nix b/pkgs/by-name/in/interlock/package.nix
index be844503163c..4433785d8b43 100644
--- a/pkgs/by-name/in/interlock/package.nix
+++ b/pkgs/by-name/in/interlock/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "usbarmory";
     repo = "interlock";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YXa4vErt3YnomTKAXCv8yUVhcc0ST47n9waW5E8QZzY=";
   };
 
diff --git a/pkgs/by-name/in/intermodal/package.nix b/pkgs/by-name/in/intermodal/package.nix
index 6bea24f23585..82caf01cf318 100644
--- a/pkgs/by-name/in/intermodal/package.nix
+++ b/pkgs/by-name/in/intermodal/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "casey";
     repo = "intermodal";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N3TumAwHcHDuVyY4t6FPNOO28D7xX5jheCTodfn71/Q=";
   };
 
diff --git a/pkgs/by-name/in/invoice/package.nix b/pkgs/by-name/in/invoice/package.nix
index fa1851636dc1..d51363530ead 100644
--- a/pkgs/by-name/in/invoice/package.nix
+++ b/pkgs/by-name/in/invoice/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maaslalani";
     repo = "invoice";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WtQ4nF31uIoplY18GZNs41ZOCxmbIu71YpEGk8aTGww=";
   };
 
diff --git a/pkgs/by-name/in/invoice2data/package.nix b/pkgs/by-name/in/invoice2data/package.nix
index e6871a503bba..41eb3220416d 100644
--- a/pkgs/by-name/in/invoice2data/package.nix
+++ b/pkgs/by-name/in/invoice2data/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "invoice-x";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pAvkp8xkHYi/7ymbxaT7/Jhu44j2P8emm8GyXC6IBnI=";
   };
 
diff --git a/pkgs/by-name/in/inxi/package.nix b/pkgs/by-name/in/inxi/package.nix
index 72ac2b9aaa72..fe79a99b5680 100644
--- a/pkgs/by-name/in/inxi/package.nix
+++ b/pkgs/by-name/in/inxi/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "smxi";
     repo = "inxi";
-    rev = version;
+    tag = version;
     hash = "sha256-LyIKjXdfE2sK81zFpXPneaFyfKqa4tU4GfXtt89TZOg=";
   };
 
diff --git a/pkgs/by-name/io/ioccheck/package.nix b/pkgs/by-name/io/ioccheck/package.nix
index 1cc7b79667ce..5bac36b6d306 100644
--- a/pkgs/by-name/io/ioccheck/package.nix
+++ b/pkgs/by-name/io/ioccheck/package.nix
@@ -14,7 +14,7 @@ let
         src = fetchFromGitHub {
           owner = "carpedm20";
           repo = "emoji";
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I=";
         };
       };
@@ -27,7 +27,7 @@ let
         src = fetchFromGitHub {
           owner = "tweepy";
           repo = "tweepy";
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-3BbQeCaAhlz9h5GnhficNubJHu4kTpnCDM4oKzlti0w=";
         };
         doCheck = false;
diff --git a/pkgs/by-name/io/ioping/package.nix b/pkgs/by-name/io/ioping/package.nix
index a228153ae4ef..fa13dd304ff7 100644
--- a/pkgs/by-name/io/ioping/package.nix
+++ b/pkgs/by-name/io/ioping/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "koct9i";
     repo = "ioping";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "10bv36bqga8sdifxzywzzpjil7vmy62psirz7jbvlsq1bw71aiid";
   };
 
diff --git a/pkgs/by-name/io/ior/package.nix b/pkgs/by-name/io/ior/package.nix
index d0c018ebdcaf..b00255cd6226 100644
--- a/pkgs/by-name/io/ior/package.nix
+++ b/pkgs/by-name/io/ior/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hpc";
     repo = "ior";
-    rev = version;
+    tag = version;
     sha256 = "sha256-pSjptDfiPlaToXe1yHyk9MQMC9PqcVSjqAmWLD11iOM=";
   };
 
diff --git a/pkgs/by-name/io/ios-deploy/package.nix b/pkgs/by-name/io/ios-deploy/package.nix
index 21b6fc5b4f9c..d4cc4162bda8 100644
--- a/pkgs/by-name/io/ios-deploy/package.nix
+++ b/pkgs/by-name/io/ios-deploy/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ios-control";
     repo = "ios-deploy";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-TVGC+f+1ow3b93CK3PhIL70le5SZxxb2ug5OkIg8XCA=";
   };
 
diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 006137bbc3db..5b73abb84aab 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -61,7 +61,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Yosl6dqbYLsX1whkSazHHlbZ4zhJ5jSZmrdi22BLBJM=";
   };
 
diff --git a/pkgs/by-name/io/iotop-c/package.nix b/pkgs/by-name/io/iotop-c/package.nix
index 4cd9f5a47049..cafc1019cd24 100644
--- a/pkgs/by-name/io/iotop-c/package.nix
+++ b/pkgs/by-name/io/iotop-c/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Tomas-M";
     repo = "iotop";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-o8OJnZjrDbzzhwfzRWmyCmhBWxMVKRDeDWWBCXy3C90=";
   };
 
diff --git a/pkgs/by-name/io/ioztat/package.nix b/pkgs/by-name/io/ioztat/package.nix
index 7d1b1dd4a623..e1c87bfcfd65 100644
--- a/pkgs/by-name/io/ioztat/package.nix
+++ b/pkgs/by-name/io/ioztat/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jimsalterjrs";
     repo = "ioztat";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8svMijgVxSuquPFO2Q2HeqGLdMkwhiujS1DSxC/LRRk=";
   };
 
diff --git a/pkgs/by-name/ip/ip2location-c/package.nix b/pkgs/by-name/ip/ip2location-c/package.nix
index 929e5772b572..0d9f0ba3b618 100644
--- a/pkgs/by-name/ip/ip2location-c/package.nix
+++ b/pkgs/by-name/ip/ip2location-c/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chrislim2888";
     repo = "IP2Location-C-Library";
-    rev = version;
+    tag = version;
     sha256 = "sha256-3/cLoGV7go4S1ew73IJzJEMTlLnvM3adl+/Sb7mPrZY=";
   };
 
diff --git a/pkgs/by-name/ip/ip2unix/package.nix b/pkgs/by-name/ip/ip2unix/package.nix
index c134eedcdeda..e6588c57b5b0 100644
--- a/pkgs/by-name/ip/ip2unix/package.nix
+++ b/pkgs/by-name/ip/ip2unix/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nixcloud";
     repo = "ip2unix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+p5wQbX35LAjZ4vIE4AhI4M6gQ7gVviqf9jJDAr9xg8";
   };
 
diff --git a/pkgs/by-name/ip/ipatool/package.nix b/pkgs/by-name/ip/ipatool/package.nix
index 91610e91f4e3..369f49d4cb5b 100644
--- a/pkgs/by-name/ip/ipatool/package.nix
+++ b/pkgs/by-name/ip/ipatool/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "majd";
     repo = "ipatool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NdxYrTy8SzPmy3C9wOQYMdzKKumDMeYe+k8Nu2ku/RY=";
   };
 
diff --git a/pkgs/by-name/ip/iperf3d/package.nix b/pkgs/by-name/ip/iperf3d/package.nix
index 326d9d19dc7e..832d3fa11546 100644
--- a/pkgs/by-name/ip/iperf3d/package.nix
+++ b/pkgs/by-name/ip/iperf3d/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wobcom";
     repo = "iperf3d";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pMwGoBgFRVY+H51k+YCamzHgBoaJVwEVqY0CvMPvE0w=";
   };
 
diff --git a/pkgs/by-name/ip/ipfs-cluster/package.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix
index 813f40030fa4..1ce4ea5d705d 100644
--- a/pkgs/by-name/ip/ipfs-cluster/package.nix
+++ b/pkgs/by-name/ip/ipfs-cluster/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ipfs-cluster";
     repo = "ipfs-cluster";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CpMnhqRlikKdPT3/tsLpKdKm6icePDsmqEnUEBwvCT0=";
   };
 
diff --git a/pkgs/by-name/ip/ipfs-upload-client/package.nix b/pkgs/by-name/ip/ipfs-upload-client/package.nix
index cde82f861487..171781a389cd 100644
--- a/pkgs/by-name/ip/ipfs-upload-client/package.nix
+++ b/pkgs/by-name/ip/ipfs-upload-client/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "infura";
     repo = "ipfs-upload-client";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BT/LC+PKzAjxM7P2Iis28OlJmrZRbCwfd6kPEL3oaaI=";
   };
 
diff --git a/pkgs/by-name/ip/ipget/package.nix b/pkgs/by-name/ip/ipget/package.nix
index 93af9fef9526..fd640012eba1 100644
--- a/pkgs/by-name/ip/ipget/package.nix
+++ b/pkgs/by-name/ip/ipget/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "ipget";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0dly7XbTNGyfvZd6wYn7Nz3CVRGaZvc4LIuHvX5Asbg=";
   };
 
diff --git a/pkgs/by-name/ip/ipgrep/package.nix b/pkgs/by-name/ip/ipgrep/package.nix
index 42e8a9305614..7cbde6aa1639 100644
--- a/pkgs/by-name/ip/ipgrep/package.nix
+++ b/pkgs/by-name/ip/ipgrep/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-NrhcUFQM+L66KaDRRpAoC+z5s54a+1fqEepTRXVZ5Qs=";
   };
 
diff --git a/pkgs/by-name/ip/iplan/package.nix b/pkgs/by-name/ip/iplan/package.nix
index 9bce3b9683bc..820035626462 100644
--- a/pkgs/by-name/ip/iplan/package.nix
+++ b/pkgs/by-name/ip/iplan/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iman-salmani";
     repo = "iplan";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BIoxaE8c3HmvPjgj4wcZK9YFTZ0wr9338AIdYEoAiqs=";
   };
 
diff --git a/pkgs/by-name/ip/ipp-usb/package.nix b/pkgs/by-name/ip/ipp-usb/package.nix
index 76fa581d83d0..2ef20ce673e8 100644
--- a/pkgs/by-name/ip/ipp-usb/package.nix
+++ b/pkgs/by-name/ip/ipp-usb/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openprinting";
     repo = "ipp-usb";
-    rev = version;
+    tag = version;
     sha256 = "sha256-LcThjiN/MRk4ISWWRT4g/eLvuhzM8pIDAcSlM5us3nQ=";
   };
 
diff --git a/pkgs/by-name/ip/iptraf-ng/package.nix b/pkgs/by-name/ip/iptraf-ng/package.nix
index 6a60973477b2..1ff9e8d5fcef 100644
--- a/pkgs/by-name/ip/iptraf-ng/package.nix
+++ b/pkgs/by-name/ip/iptraf-ng/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iptraf-ng";
     repo = "iptraf-ng";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-SM1cJYNnZlGl3eWaYd8DlPrV4AL9nck1tjdOn0CHVUw=";
   };
 
diff --git a/pkgs/by-name/ip/ipv6calc/package.nix b/pkgs/by-name/ip/ipv6calc/package.nix
index 53059e5567be..742a48a50d3e 100644
--- a/pkgs/by-name/ip/ipv6calc/package.nix
+++ b/pkgs/by-name/ip/ipv6calc/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pbiering";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-ObJn7T7dGp6HjICWHWAbJjgHM08FrJx31AxIMmIexuQ=";
   };
 
diff --git a/pkgs/by-name/iq/iqtree/package.nix b/pkgs/by-name/iq/iqtree/package.nix
index 67fb7b145025..39db76a94519 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/ir/ir-standard-fonts/package.nix b/pkgs/by-name/ir/ir-standard-fonts/package.nix
index 7bb101e09bf8..7fb0ebac1900 100644
--- a/pkgs/by-name/ir/ir-standard-fonts/package.nix
+++ b/pkgs/by-name/ir/ir-standard-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "molaeiali";
     repo = "ir-standard-fonts";
-    rev = version;
+    tag = version;
     hash = "sha256-o1d8SBX3nf7g6Gh4OP+JRS+LNrHTQOIiHhW3VNCkDV0=";
   };
 
diff --git a/pkgs/by-name/ir/irccat/package.nix b/pkgs/by-name/ir/irccat/package.nix
index e1851f473d18..77284e46904c 100644
--- a/pkgs/by-name/ir/irccat/package.nix
+++ b/pkgs/by-name/ir/irccat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "irccloud";
     repo = "irccat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts=";
   };
 
diff --git a/pkgs/by-name/ir/iredis/package.nix b/pkgs/by-name/ir/iredis/package.nix
index ee9636a700e1..a4b3e7c8d25e 100644
--- a/pkgs/by-name/ir/iredis/package.nix
+++ b/pkgs/by-name/ir/iredis/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "laixintao";
     repo = "iredis";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wfjr/FVmKgkP8FMKxw6e8U+lfZQZ2q52REC0mU8Xp7Q=";
   };
 
diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix
index e230987a0e9e..f9af82b0434d 100644
--- a/pkgs/by-name/ir/iroh/package.nix
+++ b/pkgs/by-name/ir/iroh/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "iroh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uavWluu7rVY2lZXDRsKApcZMB7TJsGuhJzieZPMXdvE=";
   };
 
diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix
index 076c44fcb4f1..74310b62985a 100644
--- a/pkgs/by-name/ir/ironbar/package.nix
+++ b/pkgs/by-name/ir/ironbar/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = "ironbar";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UtBO1XaghmzKv9qfhfoLi4ke+mf+Mtgh4f4UpCeEVDg=";
   };
 
diff --git a/pkgs/by-name/ir/irqbalance/package.nix b/pkgs/by-name/ir/irqbalance/package.nix
index 5b97c7225290..5d8a11a4afff 100644
--- a/pkgs/by-name/ir/irqbalance/package.nix
+++ b/pkgs/by-name/ir/irqbalance/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "irqbalance";
     repo = "irqbalance";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7es7wwsPnDSF37uL5SCgAQB+u+qGWmWDHOh3JkHuXMs=";
   };
 
diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix
index 06d70daee3cc..06a275186832 100644
--- a/pkgs/by-name/ir/irrd/package.nix
+++ b/pkgs/by-name/ir/irrd/package.nix
@@ -58,7 +58,7 @@ py.pkgs.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "irrdnet";
     repo = "irrd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UIOKXU92JEOeVdpYLNmDBtLn0u3LMdKItcn9bFd9u8g=";
   };
 
diff --git a/pkgs/by-name/ir/irssi/package.nix b/pkgs/by-name/ir/irssi/package.nix
index 4c4a1ccb04df..9fbeb937e44c 100644
--- a/pkgs/by-name/ir/irssi/package.nix
+++ b/pkgs/by-name/ir/irssi/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "irssi";
     repo = "irssi";
-    rev = version;
+    tag = version;
     hash = "sha256-D+KMjkweStMqVhoQoiJPFt/G0vdf7x2FjYCvqGS8UqY=";
   };
 
diff --git a/pkgs/by-name/is/isolate/package.nix b/pkgs/by-name/is/isolate/package.nix
index 18eef4c57a74..b256f86ff334 100644
--- a/pkgs/by-name/is/isolate/package.nix
+++ b/pkgs/by-name/is/isolate/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ioi";
     repo = "isolate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kKXkXPVB9ojyIERvEdkHkXC//Agin8FPcpTBmTxh/ZE=";
   };
 
diff --git a/pkgs/by-name/is/isomd5sum/package.nix b/pkgs/by-name/is/isomd5sum/package.nix
index 78d6a34b7c81..ecb58ef55a38 100644
--- a/pkgs/by-name/is/isomd5sum/package.nix
+++ b/pkgs/by-name/is/isomd5sum/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rhinstaller";
     repo = "isomd5sum";
-    rev = version;
+    tag = version;
     sha256 = "sha256-c/4CQtAzatfG1Z3SfyB2OZmfJRMnyrZZTqSApsK7R+Q=";
   };
 
diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix
index cdfdeb0a6bc6..963b7848311e 100644
--- a/pkgs/by-name/is/ispc/package.nix
+++ b/pkgs/by-name/is/ispc/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-T8tFJaHkb6XpKA2s9tlNfJE7n0YJx30KTBIng+dmQ2c=";
   };
 
diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix
index 1a4b2f80e207..c525b31a1d9b 100644
--- a/pkgs/by-name/is/istioctl/package.nix
+++ b/pkgs/by-name/is/istioctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
-    rev = version;
+    tag = version;
     hash = "sha256-DAr7JHZsop1+BuPKC5mD+9pL4JFEp6jjjeSvX+I9uH0=";
   };
   vendorHash = "sha256-dhAJEjKq1wfti2j2xt3NoQUoVRgowIKJhUfJxsFG5yw=";
diff --git a/pkgs/by-name/it/it-tools/package.nix b/pkgs/by-name/it/it-tools/package.nix
index 75bba8012aaa..039fa3130343 100644
--- a/pkgs/by-name/it/it-tools/package.nix
+++ b/pkgs/by-name/it/it-tools/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CorentinTh";
     repo = "it-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SQAZv+9tINRH10lewcuv8G2qwfulLOP8sGjX47LxeUk=";
   };
 
diff --git a/pkgs/by-name/it/itch/package.nix b/pkgs/by-name/it/itch/package.nix
index 5ce46f34f1d8..d6235fbb52fe 100644
--- a/pkgs/by-name/it/itch/package.nix
+++ b/pkgs/by-name/it/itch/package.nix
@@ -25,7 +25,7 @@ let
     fetchFromGitHub {
       owner = "itchio";
       repo = "itch";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-jugg+hdP0y0OkFhdQuEI9neWDuNf2p3+DQuwxe09Zck=";
       sparseCheckout = [ sparseCheckout ];
     }
diff --git a/pkgs/by-name/it/itchiodl/package.nix b/pkgs/by-name/it/itchiodl/package.nix
index a5e1e3e1f055..b538c3366a92 100644
--- a/pkgs/by-name/it/itchiodl/package.nix
+++ b/pkgs/by-name/it/itchiodl/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Emersont1";
     repo = "itchio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XuNkqTAT9LlSwruchGQbombAKHZvKhpnqLfvJdDcrj0=";
   };
 
diff --git a/pkgs/by-name/it/ite-backlight/package.nix b/pkgs/by-name/it/ite-backlight/package.nix
index 6e4a73d35521..d4349ab09e57 100644
--- a/pkgs/by-name/it/ite-backlight/package.nix
+++ b/pkgs/by-name/it/ite-backlight/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hexagonal-sun";
     repo = "ite-backlight";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1hany4bn93mac9qyz97r1l858d48zdvvmn3mabzr3441ivqr9j0a";
   };
 
diff --git a/pkgs/by-name/it/itools/package.nix b/pkgs/by-name/it/itools/package.nix
index 6a54e031b05c..100102bf10f2 100644
--- a/pkgs/by-name/it/itools/package.nix
+++ b/pkgs/by-name/it/itools/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "arabeyes-org";
     repo = "itools";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-DxTZaq2SlEmy9k7iAdjctpPkk+2rIaF+xEcfXj/ERWw=";
   };
 
diff --git a/pkgs/by-name/iu/iucode-tool/package.nix b/pkgs/by-name/iu/iucode-tool/package.nix
index fc92bb67e6c4..fee67da98637 100644
--- a/pkgs/by-name/iu/iucode-tool/package.nix
+++ b/pkgs/by-name/iu/iucode-tool/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "iucode-tool";
     repo = "iucode-tool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ajDpywgyerbvgern0b8T4jJUWisMzwrhwKO1g7iOtBE=";
   };
 
diff --git a/pkgs/by-name/iv/ivan/package.nix b/pkgs/by-name/iv/ivan/package.nix
index e681b7dfb47b..2406e8c0fc69 100644
--- a/pkgs/by-name/iv/ivan/package.nix
+++ b/pkgs/by-name/iv/ivan/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Attnam";
     repo = "ivan";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5Ijy28LLx1TGnZE6ZNQXPYfvW2KprF+91fKx2MzLEms=";
   };
 
diff --git a/pkgs/by-name/iv/ivy/package.nix b/pkgs/by-name/iv/ivy/package.nix
index e3a552bd6e4d..42febb739b75 100644
--- a/pkgs/by-name/iv/ivy/package.nix
+++ b/pkgs/by-name/iv/ivy/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.3.4";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "robpike";
     repo = "ivy";
     hash = "sha256-/Q929ZXv3F6MZ+FdWKfbThNDT3JpvQw7WLGnbmitdOg=";
diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix
index 86b4dd7f86de..51d98db84b74 100644
--- a/pkgs/by-name/iw/iwd/package.nix
+++ b/pkgs/by-name/iw/iwd/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
-    rev = version;
+    tag = version;
     hash = "sha256-+CoXoTlQu7ofXPueia1t1vpeH092fYBxLYB+xV4WNEs=";
   };
 
diff --git a/pkgs/by-name/iw/iwgtk/package.nix b/pkgs/by-name/iw/iwgtk/package.nix
index e080ce417423..5b95eb9d32eb 100644
--- a/pkgs/by-name/iw/iwgtk/package.nix
+++ b/pkgs/by-name/iw/iwgtk/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "j-lentz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/Nxti4PfYVLnIiBgtAuR3KGI8dULszuSdTp+2DzBfbs=";
   };
 
diff --git a/pkgs/by-name/j/j/package.nix b/pkgs/by-name/j/j/package.nix
index 53d18a9254c1..b4354a1626ce 100644
--- a/pkgs/by-name/j/j/package.nix
+++ b/pkgs/by-name/j/j/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jsoftware";
     repo = "jsource";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-Afa2QzzgJYijcavurgGH/qwyofNn4rtFMIHzlqJwFGU=";
   };
 
diff --git a/pkgs/by-name/ja/jake/package.nix b/pkgs/by-name/ja/jake/package.nix
index 6de177080419..6a959390af52 100644
--- a/pkgs/by-name/ja/jake/package.nix
+++ b/pkgs/by-name/ja/jake/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jakejs";
     repo = "jake";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rYWr/ACr14/WE88Gk6Kpyl2pq1XRHSfZGXHrwbGC8hQ=";
   };
 
diff --git a/pkgs/by-name/ja/janus-gateway/package.nix b/pkgs/by-name/ja/janus-gateway/package.nix
index fe9f92b04d68..38e883c54d25 100644
--- a/pkgs/by-name/ja/janus-gateway/package.nix
+++ b/pkgs/by-name/ja/janus-gateway/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "meetecho";
     repo = "janus-gateway";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Y4MdbB706aziKPxM9y/3uCKpc60dMDlV0xgugDjfa7A=";
   };
 
diff --git a/pkgs/by-name/ja/jarowinkler-cpp/package.nix b/pkgs/by-name/ja/jarowinkler-cpp/package.nix
index 80333b4dd390..f27c84ff3246 100644
--- a/pkgs/by-name/ja/jarowinkler-cpp/package.nix
+++ b/pkgs/by-name/ja/jarowinkler-cpp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "jarowinkler-cpp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GuwDSCYTfSwqTnzZSft3ufVSKL7255lVvbJhBxKxjJw=";
   };
 
diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix
index 2fb25136e503..ab6bdbd6268a 100644
--- a/pkgs/by-name/ja/jasp-desktop/package.nix
+++ b/pkgs/by-name/ja/jasp-desktop/package.nix
@@ -23,7 +23,7 @@ let
   src = fetchFromGitHub {
     owner = "jasp-stats";
     repo = "jasp-desktop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SACGyNVxa6rFjloRQrEVtUgujEEF7WYL8Qhw6ZqLwdQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ja/javascript-typescript-langserver/package.nix b/pkgs/by-name/ja/javascript-typescript-langserver/package.nix
index a68a6761872d..958e86c247b5 100644
--- a/pkgs/by-name/ja/javascript-typescript-langserver/package.nix
+++ b/pkgs/by-name/ja/javascript-typescript-langserver/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "javascript-typescript-langserver";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vd7Hj0jPFgK0u3CBlMfOFERmW+w9CnKIY9nvs48KqsI=";
   };
 
diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix
index e40d01930184..506f84f7c66d 100644
--- a/pkgs/by-name/ja/jay/package.nix
+++ b/pkgs/by-name/ja/jay/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mahkoh";
     repo = "jay";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dUp3QYno2rB3wuJmSvBpCqowSpfMQIJqUYc0lDVqVPA=";
   };
 
diff --git a/pkgs/by-name/jb/jbig2enc/package.nix b/pkgs/by-name/jb/jbig2enc/package.nix
index 95b38a0a905a..d498fe8cb0f6 100644
--- a/pkgs/by-name/jb/jbig2enc/package.nix
+++ b/pkgs/by-name/jb/jbig2enc/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agl";
     repo = "jbig2enc";
-    rev = version;
+    tag = version;
     hash = "sha256-B19l2NdMq+wWKQ5f/y5aoPiBtQnn6sqpaIoyIq+ugTg=";
   };
 
diff --git a/pkgs/by-name/jb/jbofihe/package.nix b/pkgs/by-name/jb/jbofihe/package.nix
index 199ee632c19c..08562f5c9302 100644
--- a/pkgs/by-name/jb/jbofihe/package.nix
+++ b/pkgs/by-name/jb/jbofihe/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lojban";
     repo = "jbofihe";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xx7x1256sjncyzx656jl6jl546vn8zz0siymqalz6v9yf341p98";
   };
 
diff --git a/pkgs/by-name/jc/jcal/package.nix b/pkgs/by-name/jc/jcal/package.nix
index 7bcfdfa47387..0cda16bdf298 100644
--- a/pkgs/by-name/jc/jcal/package.nix
+++ b/pkgs/by-name/jc/jcal/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fzerorubigd";
     repo = "jcal";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vJc5uijZlvohEtiS03LYlqtswVE38S9/ejlHrmZ0wqA=";
   };
 
diff --git a/pkgs/by-name/jd/jd-diff-patch/package.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix
index 873e8510e699..61b07de93e1c 100644
--- a/pkgs/by-name/jd/jd-diff-patch/package.nix
+++ b/pkgs/by-name/jd/jd-diff-patch/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "josephburnett";
     repo = "jd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-chCxbbRZEE29KVnTQWID889kJ2H4qJGVL+vsxzr6VtA=";
   };
 
diff --git a/pkgs/by-name/je/jefferson/package.nix b/pkgs/by-name/je/jefferson/package.nix
index d1b95dd2df0a..45917a7171e4 100644
--- a/pkgs/by-name/je/jefferson/package.nix
+++ b/pkgs/by-name/je/jefferson/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "onekey-sec";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6eh4i9N3aArU8+W8K341pp9J0QYEojDiMrEc8yax4SY=";
   };
 
diff --git a/pkgs/by-name/je/jellycli/package.nix b/pkgs/by-name/je/jellycli/package.nix
index 94d83f6f7f82..38893c35a56c 100644
--- a/pkgs/by-name/je/jellycli/package.nix
+++ b/pkgs/by-name/je/jellycli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tryffel";
     repo = "jellycli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1awzcxnf175a794rhzbmqxxjss77mfa1yrr0wgdxaivrlkibxjys";
   };
 
diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
index 005a35d26f03..ab46a7b31c65 100644
--- a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
+++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
@@ -13,7 +13,7 @@ in
   source = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-ffmpeg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zaBu/hhFIMjneb7yUzToaJJAaSptxLld8zOvfGckHLY=";
   };
 }).overrideAttrs
diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index c9d29fb19d82..9b30a6abe3c3 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -20,7 +20,7 @@ buildNpmPackage rec {
     fetchFromGitHub {
       owner = "jellyfin";
       repo = "jellyfin-web";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-jX9Qut8YsJRyKI2L7Aww4+6G8z741WzN37CUx3KWQfY=";
     };
 
diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix
index 8c241d5f237a..d593597e6cd5 100644
--- a/pkgs/by-name/je/jellyfin/package.nix
+++ b/pkgs/by-name/je/jellyfin/package.nix
@@ -18,7 +18,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GWpzX8DvCafHb5V9it0ZPTXKm+NbLS7Oepe/CcMiFuI=";
   };
 
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/jf/jf/package.nix b/pkgs/by-name/jf/jf/package.nix
index 067d548d06f6..1537cea3b8b7 100644
--- a/pkgs/by-name/jf/jf/package.nix
+++ b/pkgs/by-name/jf/jf/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sayanarijit";
     repo = "jf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A29OvGdG6PyeKMf5RarEOrfnNSmXhXri0AlECHWep6M=";
   };
 
diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix
index e440594a62cb..ac6baa4fa7e5 100644
--- a/pkgs/by-name/jf/jfmt/package.nix
+++ b/pkgs/by-name/jf/jfmt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "scruffystuffs";
     repo = "${pname}.rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80=";
   };
 
diff --git a/pkgs/by-name/jf/jftui/package.nix b/pkgs/by-name/jf/jftui/package.nix
index 7bc4cbb10639..c2612a63ee03 100644
--- a/pkgs/by-name/jf/jftui/package.nix
+++ b/pkgs/by-name/jf/jftui/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Aanok";
     repo = "jftui";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-w5DK9B3D3/9VExAQktigVPim33VfpoQPHUZefAS3pWQ=";
   };
 
diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix
index 9c0821ae38a7..8f3dbd091e5b 100644
--- a/pkgs/by-name/jg/jgmenu/package.nix
+++ b/pkgs/by-name/jg/jgmenu/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "johanmalm";
     repo = "jgmenu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vuSpiZZYe0l5va9dHM54gaoI9x8qXH1gJORUS5489jQ=";
   };
 
diff --git a/pkgs/by-name/jh/jhead/package.nix b/pkgs/by-name/jh/jhead/package.nix
index 7e85789f4f21..aa0f6af61253 100644
--- a/pkgs/by-name/jh/jhead/package.nix
+++ b/pkgs/by-name/jh/jhead/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Matthias-Wandel";
     repo = "jhead";
-    rev = version;
+    tag = version;
     hash = "sha256-d1cuy4kkwY/21UcpNN6judrFxGVyEH+b+0TaZw9hP2E=";
   };
 
diff --git a/pkgs/by-name/ji/jid/package.nix b/pkgs/by-name/ji/jid/package.nix
index f7af65b01f42..ce41ae56984c 100644
--- a/pkgs/by-name/ji/jid/package.nix
+++ b/pkgs/by-name/ji/jid/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "simeji";
     repo = "jid";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fZzEbVNGsDNQ/FhII+meQvKeyrgxn3wtFW8VfNmJz5U=";
   };
 
diff --git a/pkgs/by-name/ji/jikken/package.nix b/pkgs/by-name/ji/jikken/package.nix
index c75aaddbe037..a04766386252 100644
--- a/pkgs/by-name/ji/jikken/package.nix
+++ b/pkgs/by-name/ji/jikken/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jikkenio";
     repo = "jikken";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WJxrCCDe39RYwHb+zbr7ugFsFsP5Uc/arw3s6USQoN4=";
   };
 
diff --git a/pkgs/by-name/ji/jimtcl/package.nix b/pkgs/by-name/ji/jimtcl/package.nix
index 13181a2c0e5c..93fa1f6237b4 100644
--- a/pkgs/by-name/ji/jimtcl/package.nix
+++ b/pkgs/by-name/ji/jimtcl/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "msteveb";
     repo = "jimtcl";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY=";
   };
 
diff --git a/pkgs/by-name/ji/jinja2-cli/package.nix b/pkgs/by-name/ji/jinja2-cli/package.nix
index 2b1392b4ecde..8c9800e319fc 100644
--- a/pkgs/by-name/ji/jinja2-cli/package.nix
+++ b/pkgs/by-name/ji/jinja2-cli/package.nix
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mattrobenolt";
     repo = "jinja2-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-67gYt0nZX+VTVaoSxVXGzbRiXD7EMsVBFWC8wHo+Vw0=";
   };
 
diff --git a/pkgs/by-name/ji/jiq/package.nix b/pkgs/by-name/ji/jiq/package.nix
index 4123eed59212..e188bdf0c2e7 100644
--- a/pkgs/by-name/ji/jiq/package.nix
+++ b/pkgs/by-name/ji/jiq/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fiatjaf";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-txhttYngN+dofA3Yp3gZUZPRRZWGug9ysXq1Q0RP7ig=";
   };
 
diff --git a/pkgs/by-name/ji/jiten/package.nix b/pkgs/by-name/ji/jiten/package.nix
index 000c25ec2a1d..ce6ba26dae25 100644
--- a/pkgs/by-name/ji/jiten/package.nix
+++ b/pkgs/by-name/ji/jiten/package.nix
@@ -17,14 +17,14 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "obfusk";
     repo = "jiten";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "13bdx136sirbhxdhvpq5kf0r6q1xvm5zyzp454z51gy0v6rn0qrp";
   };
 
   nonFreeData = fetchFromGitHub {
     owner = "obfusk";
     repo = "jiten-nonfree-data";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "16sz8i0sw7ggy6kijcx4qyl2zr6xj789x4iav0yyllx12dfgp5b1";
   };
 
diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
index 0be61315c429..725a9390f365 100644
--- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix
+++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
@@ -30,7 +30,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jitsi";
     repo = "jitsi-meet-electron";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Pk62BpfXblRph3ktxy8eF9umRmPRZbZGjRWduy+3z+s=";
   };
 
diff --git a/pkgs/by-name/ji/jitterentropy-rngd/package.nix b/pkgs/by-name/ji/jitterentropy-rngd/package.nix
index 184688d8972d..35758fac7e1d 100644
--- a/pkgs/by-name/ji/jitterentropy-rngd/package.nix
+++ b/pkgs/by-name/ji/jitterentropy-rngd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "jitterentropy-rngd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LDym636ss3B1G/vrqatu9g5vbVEeDX0JQcxZ/IxGeY0=";
   };
 
diff --git a/pkgs/by-name/ji/jitterentropy/package.nix b/pkgs/by-name/ji/jitterentropy/package.nix
index c86203432849..ac06ebc746f7 100644
--- a/pkgs/by-name/ji/jitterentropy/package.nix
+++ b/pkgs/by-name/ji/jitterentropy/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "jitterentropy-library";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A1Y+7CqzoQ6xoTwWU8gfq+dYJ+PiIpqtOOZSL0uVby4=";
   };
 
diff --git a/pkgs/by-name/jj/jj/package.nix b/pkgs/by-name/jj/jj/package.nix
index a9def5cf35d5..3039d285f28f 100644
--- a/pkgs/by-name/jj/jj/package.nix
+++ b/pkgs/by-name/jj/jj/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tidwall";
     repo = "jj";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Yijap5ZghTBe1ahkQgjjxuo++SriJWXgRqrNXIVQ0os=";
   };
 
diff --git a/pkgs/by-name/jm/jmc2obj/package.nix b/pkgs/by-name/jm/jmc2obj/package.nix
index b4abf1aff21c..c6f7a54cf201 100644
--- a/pkgs/by-name/jm/jmc2obj/package.nix
+++ b/pkgs/by-name/jm/jmc2obj/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "jmc2obj";
     repo = "j-mc-2-obj";
-    rev = version;
+    tag = version;
     hash = "sha256-c0qLryv9Gx9BlKXmwSKkK5/v3Wypny841htNfsNNxpg=";
   };
 
diff --git a/pkgs/by-name/jm/jmespath/package.nix b/pkgs/by-name/jm/jmespath/package.nix
index eb3c8fbe5901..880688453565 100644
--- a/pkgs/by-name/jm/jmespath/package.nix
+++ b/pkgs/by-name/jm/jmespath/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jmespath";
     repo = "go-jmespath";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-djA/7TCmAqCsht28b1itoiWd8Mtdsn/5uLxyT23K/qM=";
   };
 
diff --git a/pkgs/by-name/jm/jmtpfs/package.nix b/pkgs/by-name/jm/jmtpfs/package.nix
index 5c0540193ba6..3793fc6c2efa 100644
--- a/pkgs/by-name/jm/jmtpfs/package.nix
+++ b/pkgs/by-name/jm/jmtpfs/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "jmtpfs";
     owner = "JasonFerrara";
   };
diff --git a/pkgs/by-name/jn/jna/package.nix b/pkgs/by-name/jn/jna/package.nix
index 7e88631425f7..0892e06727a8 100644
--- a/pkgs/by-name/jn/jna/package.nix
+++ b/pkgs/by-name/jn/jna/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "java-native-access";
     repo = "jna";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-4i7iQaxH4wS35cIvMfcNf4kUGI+uIoHNpZkQrs4oAyk=";
   };
 
diff --git a/pkgs/by-name/jo/jo/package.nix b/pkgs/by-name/jo/jo/package.nix
index 1c9bb4365a9e..ab4b4650671e 100644
--- a/pkgs/by-name/jo/jo/package.nix
+++ b/pkgs/by-name/jo/jo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jpmens";
     repo = "jo";
-    rev = version;
+    tag = version;
     sha256 = "sha256-1q4/RpxfoAdtY3m8bBuj7bhD17V+4dYo3Vb8zMbI1YU=";
   };
 
diff --git a/pkgs/by-name/jo/jobber/package.nix b/pkgs/by-name/jo/jobber/package.nix
index bd8a5967a4a4..5f53063b1d7c 100644
--- a/pkgs/by-name/jo/jobber/package.nix
+++ b/pkgs/by-name/jo/jobber/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dshearer";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mLYyrscvT/VK9ehwkPUq4RbwHb+6Wjvt7ZXk/fI0HT4=";
   };
 
diff --git a/pkgs/by-name/jo/johnny/package.nix b/pkgs/by-name/jo/johnny/package.nix
index 77d69c1b4e94..21afe4315a34 100644
--- a/pkgs/by-name/jo/johnny/package.nix
+++ b/pkgs/by-name/jo/johnny/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openwall";
     repo = "johnny";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fwRvyQbRO63iVt9AHlfl+Cv4NRFQmyVsZUQLxmzGjAY=";
   };
 
diff --git a/pkgs/by-name/jo/joker/package.nix b/pkgs/by-name/jo/joker/package.nix
index a6f72ab65ce8..2371067c4d0e 100644
--- a/pkgs/by-name/jo/joker/package.nix
+++ b/pkgs/by-name/jo/joker/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "1.4.1";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "candid82";
     repo = "joker";
     sha256 = "sha256-Hylb7yTc7ocmm1fnTkwYTt/GwudXLZSRTh9p+38Euqk=";
diff --git a/pkgs/by-name/jo/jose/package.nix b/pkgs/by-name/jo/jose/package.nix
index ce721eaa9a41..79d94b921baf 100644
--- a/pkgs/by-name/jo/jose/package.nix
+++ b/pkgs/by-name/jo/jose/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "latchset";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rMNPJaCtVpbwIkMQzBNpmRct6S/NelTwjmsuB0RP6R8=";
   };
 
diff --git a/pkgs/by-name/jo/jot/package.nix b/pkgs/by-name/jo/jot/package.nix
index bb0312f0208c..b2a1d772efa5 100644
--- a/pkgs/by-name/jo/jot/package.nix
+++ b/pkgs/by-name/jo/jot/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shashwatah";
     repo = "jot";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM=";
   };
 
diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix
index 7f9579cf8578..7c24b137f145 100644
--- a/pkgs/by-name/jo/jotdown/package.nix
+++ b/pkgs/by-name/jo/jotdown/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hellux";
     repo = "jotdown";
-    rev = version;
+    tag = version;
     hash = "sha256-1s0J6TF/iDSqKUF4/sgq2irSPENjinftPFZnMgE8Dn8=";
   };
 
diff --git a/pkgs/by-name/jo/joularjx/package.nix b/pkgs/by-name/jo/joularjx/package.nix
index 80a8d568c119..e7ceb483755b 100644
--- a/pkgs/by-name/jo/joularjx/package.nix
+++ b/pkgs/by-name/jo/joularjx/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "joular";
     repo = "joularjx";
-    rev = version;
+    tag = version;
     hash = "sha256-/Drv6PVMmz3QNEu8zMokTKBZeYWMjuKczu18qKqNAx4=";
   };
 
diff --git a/pkgs/by-name/jo/jove/package.nix b/pkgs/by-name/jo/jove/package.nix
index e2af8e44261e..2d24fb97d704 100644
--- a/pkgs/by-name/jo/jove/package.nix
+++ b/pkgs/by-name/jo/jove/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jonmacs";
     repo = "jove";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ZBq2zCml637p9VgedpOrUn2jSc5L0pthdgRS7YsB3zs=";
   };
 
diff --git a/pkgs/by-name/jp/jp/package.nix b/pkgs/by-name/jp/jp/package.nix
index bdba45d5e83f..fb926cf96b27 100644
--- a/pkgs/by-name/jp/jp/package.nix
+++ b/pkgs/by-name/jp/jp/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.2.1";
 
   src = fetchFromGitHub {
-    rev = version;
+    tag = version;
     owner = "jmespath";
     repo = "jp";
     hash = "sha256-a3WvLAdUZk+Y+L+opPDMBvdN5x5B6nAi/lL8JHJG/gY=";
diff --git a/pkgs/by-name/jp/jp2a/package.nix b/pkgs/by-name/jp/jp2a/package.nix
index 7c004b5d5eb4..d28e8a1d5409 100644
--- a/pkgs/by-name/jp/jp2a/package.nix
+++ b/pkgs/by-name/jp/jp2a/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Talinx";
     repo = "jp2a";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TyXEaHemKfCMyGwK6P2vVL9gPWRLbkaNP0g+/UYGSVc=";
   };
 
diff --git a/pkgs/by-name/jp/jpegoptim/package.nix b/pkgs/by-name/jp/jpegoptim/package.nix
index c842b9217123..e7b98368b06a 100644
--- a/pkgs/by-name/jp/jpegoptim/package.nix
+++ b/pkgs/by-name/jp/jpegoptim/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tjko";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3p3kcUur1u09ROdKXG5H8eilu463Rzbn2yfYo5o6+KM=";
   };
 
diff --git a/pkgs/by-name/jq/jqp/package.nix b/pkgs/by-name/jq/jqp/package.nix
index eb4fe385a9cb..19cdaa1fa1cf 100644
--- a/pkgs/by-name/jq/jqp/package.nix
+++ b/pkgs/by-name/jq/jqp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "noahgorstein";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-i22qALVa8EUaTwgN6DocGJArNyOvkQbFuH++EQKBuIc=";
   };
 
diff --git a/pkgs/by-name/jr/jrsonnet/package.nix b/pkgs/by-name/jr/jrsonnet/package.nix
index 4c646a9bac5f..e2642cc11e39 100644
--- a/pkgs/by-name/jr/jrsonnet/package.nix
+++ b/pkgs/by-name/jr/jrsonnet/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.4.2";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "CertainLach";
     repo = "jrsonnet";
     sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A=";
diff --git a/pkgs/by-name/js/json-fortran/package.nix b/pkgs/by-name/js/json-fortran/package.nix
index 924a018c3344..ecbffb43cc48 100644
--- a/pkgs/by-name/js/json-fortran/package.nix
+++ b/pkgs/by-name/js/json-fortran/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jacobwilliams";
     repo = "json-fortran";
-    rev = version;
+    tag = version;
     hash = "sha256-MMHMyEPZYz7dkYX1OA9D1kgRCTpzTVussJbh4rWHlyU=";
   };
 
diff --git a/pkgs/by-name/js/json-plot/package.nix b/pkgs/by-name/js/json-plot/package.nix
index 7b0f08c523ad..84eb16433231 100644
--- a/pkgs/by-name/js/json-plot/package.nix
+++ b/pkgs/by-name/js/json-plot/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sgreben";
     repo = "jp";
-    rev = version;
+    tag = version;
     hash = "sha256-WWARAh/CF3lGli3VLRzAGaCA8xQyryPi8WcuwvdInjk=";
   };
 
diff --git a/pkgs/by-name/js/json2hcl/package.nix b/pkgs/by-name/js/json2hcl/package.nix
index 8c4883faa1ef..ed97a6496ba2 100644
--- a/pkgs/by-name/js/json2hcl/package.nix
+++ b/pkgs/by-name/js/json2hcl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kvz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-h7DudYVWvDRCbjoIgOoCIudf7ZfUfWXp5OJ4ni0nm6c=";
   };
 
diff --git a/pkgs/by-name/js/jsoncpp/package.nix b/pkgs/by-name/js/jsoncpp/package.nix
index 0ca65befe5f8..76a567595dbd 100644
--- a/pkgs/by-name/js/jsoncpp/package.nix
+++ b/pkgs/by-name/js/jsoncpp/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "open-source-parsers";
     repo = "jsoncpp";
-    rev = version;
+    tag = version;
     sha256 = "sha256-3msc3B8NyF8PUlNaAHdUDfCpcUmz8JVW2X58USJ5HRw=";
   };
 
diff --git a/pkgs/by-name/js/jsonfmt/package.nix b/pkgs/by-name/js/jsonfmt/package.nix
index 0c4e5e716d0e..d3733b2a7fcb 100644
--- a/pkgs/by-name/js/jsonfmt/package.nix
+++ b/pkgs/by-name/js/jsonfmt/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "jsonfmt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4SNpW/+4S4sEwjM7b9ClqKqwqFFVbCVv5VnftGIHtjo=";
   };
 
diff --git a/pkgs/by-name/js/jsonld-cli/package.nix b/pkgs/by-name/js/jsonld-cli/package.nix
index d65ca60a30d9..91f5068b592e 100644
--- a/pkgs/by-name/js/jsonld-cli/package.nix
+++ b/pkgs/by-name/js/jsonld-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "digitalbazaar";
     repo = "jsonld-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GandTCcRYd0c0SlSdsCAcaTKfwD4g1cwHuoxA62aD74=";
   };
 
diff --git a/pkgs/by-name/js/jsonnet-bundler/package.nix b/pkgs/by-name/js/jsonnet-bundler/package.nix
index 4750a17cd0cf..6373070ee78e 100644
--- a/pkgs/by-name/js/jsonnet-bundler/package.nix
+++ b/pkgs/by-name/js/jsonnet-bundler/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jsonnet-bundler";
     repo = "jsonnet-bundler";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VaYfjDSDst1joN2MnDVdz9SGGMamhYxfNM/a2mJf8Lo=";
   };
 
diff --git a/pkgs/by-name/js/jsonnet/package.nix b/pkgs/by-name/js/jsonnet/package.nix
index 498cf26dadf2..d19a142c321a 100644
--- a/pkgs/by-name/js/jsonnet/package.nix
+++ b/pkgs/by-name/js/jsonnet/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "google";
     repo = "jsonnet";
     sha256 = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y=";
diff --git a/pkgs/by-name/jt/jtag-remote-server/package.nix b/pkgs/by-name/jt/jtag-remote-server/package.nix
index 62ec3bea3033..883ecf307034 100644
--- a/pkgs/by-name/jt/jtag-remote-server/package.nix
+++ b/pkgs/by-name/jt/jtag-remote-server/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jiegec";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qtgO0BO2hvWi/E2RzGTTuQynKbh7/OLeoLcm60dqro8=";
   };
 
diff --git a/pkgs/by-name/jt/jtbl/package.nix b/pkgs/by-name/jt/jtbl/package.nix
index ff5d4e1d4ad8..d67da85780ac 100644
--- a/pkgs/by-name/jt/jtbl/package.nix
+++ b/pkgs/by-name/jt/jtbl/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kellyjonbrazil";
     repo = "jtbl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ILQwUpjNueaYR5hxOWd5kZSPhVoFnnS2FcttyKSTPr8=";
   };
 
diff --git a/pkgs/by-name/jt/jtc/package.nix b/pkgs/by-name/jt/jtc/package.nix
index 2200ea54331e..b8f0d66e63c6 100644
--- a/pkgs/by-name/jt/jtc/package.nix
+++ b/pkgs/by-name/jt/jtc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ldn-softdev";
     repo = "jtc";
-    rev = version;
+    tag = version;
     sha256 = "sha256-VATRlOOV4wBInLOm9J0Dp2vhtL5mb0Yxdl/ya0JiqEU=";
   };
 
diff --git a/pkgs/by-name/ju/jugglinglab/package.nix b/pkgs/by-name/ju/jugglinglab/package.nix
index a391cac9205b..6d8d5c62a8d2 100644
--- a/pkgs/by-name/ju/jugglinglab/package.nix
+++ b/pkgs/by-name/ju/jugglinglab/package.nix
@@ -25,7 +25,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "jkboyce";
     repo = "jugglinglab";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Y87uHFpVs4A/wErNO2ZF6Su0v4LEvaE9nIysrqFoY8w=";
   };
 
diff --git a/pkgs/by-name/ju/juicefs/package.nix b/pkgs/by-name/ju/juicefs/package.nix
index ed05bc42ad40..c2f2fed873ce 100644
--- a/pkgs/by-name/ju/juicefs/package.nix
+++ b/pkgs/by-name/ju/juicefs/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "juicedata";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qe8uhSSLeOsr0FmgoOVeZeIpP4Bv5/Viz5N90PGdc9o=";
   };
 
diff --git a/pkgs/by-name/ju/juicity/package.nix b/pkgs/by-name/ju/juicity/package.nix
index 55311296d837..692de2a3696f 100644
--- a/pkgs/by-name/ju/juicity/package.nix
+++ b/pkgs/by-name/ju/juicity/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "juicity";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4sej/nb7d58+hSCaD6KIfDsqiGmgECPIbRKR65TbMBM=";
   };
 
diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix
index 0398dc0346f8..fa567c4c1e4c 100644
--- a/pkgs/by-name/ju/juju/package.nix
+++ b/pkgs/by-name/ju/juju/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "juju";
     repo = "juju";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kXSqOifUkx6ReXBrB19Zx6TbiloaG+G90cIo/+ysIHk=";
   };
 
diff --git a/pkgs/by-name/ju/julius/package.nix b/pkgs/by-name/ju/julius/package.nix
index 2d9cec42ba95..661d18699374 100644
--- a/pkgs/by-name/ju/julius/package.nix
+++ b/pkgs/by-name/ju/julius/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bvschaik";
     repo = "julius";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-I5GTaVWzz0ryGLDSS3rzxp+XFVXZa9hZmgwon/6r83A=";
   };
 
diff --git a/pkgs/by-name/ju/jump/package.nix b/pkgs/by-name/ju/jump/package.nix
index 02b97d03a839..5338804e21ef 100644
--- a/pkgs/by-name/ju/jump/package.nix
+++ b/pkgs/by-name/ju/jump/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gsamokovarov";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nlCuotEiAX2+xx7T8jWZo2p4LNLhWXDdcU6DxJprgx0=";
   };
 
diff --git a/pkgs/by-name/ju/jumpapp/package.nix b/pkgs/by-name/ju/jumpapp/package.nix
index fd6a3b8c7276..a893c2cb3480 100644
--- a/pkgs/by-name/ju/jumpapp/package.nix
+++ b/pkgs/by-name/ju/jumpapp/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mkropat";
     repo = "jumpapp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9sh0+zpDxwqRGC1jUgGTDdSDRdAFsL12mQ/Opwh/UBc=";
   };
 
diff --git a/pkgs/by-name/ju/jumppad/package.nix b/pkgs/by-name/ju/jumppad/package.nix
index 7fb20e5a272a..1c1bf061709e 100644
--- a/pkgs/by-name/ju/jumppad/package.nix
+++ b/pkgs/by-name/ju/jumppad/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jumppad-labs";
     repo = "jumppad";
-    rev = version;
+    tag = version;
     hash = "sha256-V+FDPNNNP7HMg0Somoj3EhGuhhq/Du8JcCBE/Ut2V1s=";
   };
   vendorHash = "sha256-BuXbizA/OJiP11kSIO476tWPYPzGTKmzPHeyIqs8pWc=";
diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix
index a3839536694b..65b4d660f9b0 100644
--- a/pkgs/by-name/ju/jumpy/package.nix
+++ b/pkgs/by-name/ju/jumpy/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fishfolk";
     repo = "jumpy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ggePJH2kKJ17aOWRKUnLyolIdSzlc6Axf5Iw74iFfek=";
   };
 
diff --git a/pkgs/by-name/ju/junction/package.nix b/pkgs/by-name/ju/junction/package.nix
index 23f0887f7c23..78046c550f39 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-0zY6Dp0aKHtBHSTiGbI5o6876BsARbo8/BbArl0RaMY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ju/junkie/package.nix b/pkgs/by-name/ju/junkie/package.nix
index cd4e0af4de58..6f123dae26d6 100644
--- a/pkgs/by-name/ju/junkie/package.nix
+++ b/pkgs/by-name/ju/junkie/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rixed";
     repo = "junkie";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0kfdjgch667gfb3qpiadd2dj3fxc7r19nr620gffb1ahca02wq31";
   };
 
diff --git a/pkgs/by-name/jw/jwtinfo/package.nix b/pkgs/by-name/jw/jwtinfo/package.nix
index 75de488a9ef7..6cc107ea0922 100644
--- a/pkgs/by-name/jw/jwtinfo/package.nix
+++ b/pkgs/by-name/jw/jwtinfo/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "lmammino";
     repo = "jwtinfo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FDN9K7KnMro2BluHB7I0HTDdT9YXxi8UcOoBhKx/5dA=";
   };
 
diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix
index 2350f9673073..9583ce92bfe1 100644
--- a/pkgs/by-name/jw/jwx/package.nix
+++ b/pkgs/by-name/jw/jwx/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lestrrat-go";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UXiF3X1jLk4dCGKmZlx9V08hzNJV+s/K2Wei9i+A6dg=";
   };
 
diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix
index f234e0eba9ee..0ac7c87a115c 100644
--- a/pkgs/by-name/jx/jx/package.nix
+++ b/pkgs/by-name/jx/jx/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eEvQ7kZRY6gxunb8wDETXvZ6PYmLktDISMZoQFZEUmM=";
   };
 
diff --git a/pkgs/by-name/k2/k2tf/package.nix b/pkgs/by-name/k2/k2tf/package.nix
index 1bf631353dcb..fe52751c9ed5 100644
--- a/pkgs/by-name/k2/k2tf/package.nix
+++ b/pkgs/by-name/k2/k2tf/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sl1pm4t";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zkkRzCTZCvbwBj4oIhTo5d3PvqLMJPzT3zV9jU3PEJs=";
   };
 
diff --git a/pkgs/by-name/k3/k3sup/package.nix b/pkgs/by-name/k3/k3sup/package.nix
index 95da794a686d..031a87506e3a 100644
--- a/pkgs/by-name/k3/k3sup/package.nix
+++ b/pkgs/by-name/k3/k3sup/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "k3sup";
-    rev = version;
+    tag = version;
     sha256 = "sha256-WmvCmG/wk63VnfJTFk3HhiaLzCe9O6kdUc7GpYNAwP4=";
   };
 
diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix
index 14c95944d2c5..01d89c3ba741 100644
--- a/pkgs/by-name/k6/k6/package.nix
+++ b/pkgs/by-name/k6/k6/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wU/Kelv/5N86xHJT6E5dfdzBgSYiTYZJ8rkjLyU7RAo=";
   };
 
diff --git a/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix
index 17c12ad9e415..decf8d0e5228 100644
--- a/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix
+++ b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BDBkPXDg9DruIt5f7RrpStFeuTGiOOpsb6JiKaCTOOk=";
   };
 
diff --git a/pkgs/by-name/k8/k8sgpt/package.nix b/pkgs/by-name/k8/k8sgpt/package.nix
index 325fea286a53..84b5f8680e4d 100644
--- a/pkgs/by-name/k8/k8sgpt/package.nix
+++ b/pkgs/by-name/k8/k8sgpt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "k8sgpt-ai";
     repo = "k8sgpt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GKRI5qry2eYPP3/BTjS7qnIp7lX/uAR0s40y/oECaeY=";
   };
 
diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 20677c9c43be..5ed4ae5855fb 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "derailed";
     repo = "k9s";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QGymGiTHT3Qnf9l/hhE3lgJ7TBBjKMe2k1aJ32khU0E=";
   };
 
diff --git a/pkgs/by-name/ka/kaf/package.nix b/pkgs/by-name/ka/kaf/package.nix
index 697d6ca51305..733a9cbc2ff3 100644
--- a/pkgs/by-name/ka/kaf/package.nix
+++ b/pkgs/by-name/ka/kaf/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "birdayz";
     repo = "kaf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SKQg3BCwvVwjZUkTjrMlSrfa8tu2VC8+ckMZpBJhnZE=";
   };
 
diff --git a/pkgs/by-name/ka/kail/package.nix b/pkgs/by-name/ka/kail/package.nix
index c25223395763..f83c8f2e9378 100644
--- a/pkgs/by-name/ka/kail/package.nix
+++ b/pkgs/by-name/ka/kail/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "boz";
     repo = "kail";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-G8U7UEYhgkcFbKeHOjbpf9AY6NW0hBgv6aARuzapE3M=";
   };
 
diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix
index 80e0c4b31c74..3c4bc6e6f4ac 100644
--- a/pkgs/by-name/ka/kakoune-lsp/package.nix
+++ b/pkgs/by-name/ka/kakoune-lsp/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kakoune-lsp";
     repo = "kakoune-lsp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2jD0meehUNGvmywOY4D9CwP1qswD7QCPlctLBjngzvE=";
   };
 
diff --git a/pkgs/by-name/ka/kalamine/package.nix b/pkgs/by-name/ka/kalamine/package.nix
index 0d379dd1d126..db69d895b531 100644
--- a/pkgs/by-name/ka/kalamine/package.nix
+++ b/pkgs/by-name/ka/kalamine/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "OneDeadKey";
     repo = "kalamine";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eDOwoI7S0l48oOWWDaBbDlC0A8RtPEA+FDCHpPur0OQ=";
   };
 
diff --git a/pkgs/by-name/ka/kalker/package.nix b/pkgs/by-name/ka/kalker/package.nix
index 62d73f96b129..2fd479caad58 100644
--- a/pkgs/by-name/ka/kalker/package.nix
+++ b/pkgs/by-name/ka/kalker/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PaddiM8";
     repo = "kalker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fFeHL+Q1Y0J3rOgbFA952rjae/OQgHTznDI0Kya1KMQ=";
   };
 
diff --git a/pkgs/by-name/ka/kamp/package.nix b/pkgs/by-name/ka/kamp/package.nix
index f20546aaf340..fa691314358f 100644
--- a/pkgs/by-name/ka/kamp/package.nix
+++ b/pkgs/by-name/ka/kamp/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vbauerster";
     repo = "kamp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-coBKVqSqYBpf0PdWKIODnbfQxbOyp5Di45+O66ZGK1Q=";
   };
 
diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix
index 1b949d4efc1d..0d29831bb8f1 100644
--- a/pkgs/by-name/ka/kanata/package.nix
+++ b/pkgs/by-name/ka/kanata/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jtroo";
     repo = "kanata";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-w/PeSqj51gJOWmAV5UPMprntdzinX/IL49D2ZUMfeSM=";
   };
 
diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix
index 1169e8b9bbeb..5f7ee87bc6f6 100644
--- a/pkgs/by-name/ka/kanidm-provision/package.nix
+++ b/pkgs/by-name/ka/kanidm-provision/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "oddlama";
     repo = "kanidm-provision";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pgPjkj0nMb5j3EvyJTTDpfmh0WigAcMzoleF5EOqBAM=";
   };
 
diff --git a/pkgs/by-name/ka/kaniko/package.nix b/pkgs/by-name/ka/kaniko/package.nix
index 901b047bf963..6abb8e2056fa 100644
--- a/pkgs/by-name/ka/kaniko/package.nix
+++ b/pkgs/by-name/ka/kaniko/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = "kaniko";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8SLE9s+P6Xh4PzrvTwUtIAtkG9Gor/fGBwrqq/fz0UM=";
   };
 
diff --git a/pkgs/by-name/ka/kanjidraw/package.nix b/pkgs/by-name/ka/kanjidraw/package.nix
index 14a90b18723b..2d99d39ac566 100644
--- a/pkgs/by-name/ka/kanjidraw/package.nix
+++ b/pkgs/by-name/ka/kanjidraw/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "obfusk";
     repo = "kanjidraw";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "03ag8vkbf85qww857ii8hcnn8bh5qa7rsmhka0v9vfxk272ifbyq";
   };
 
diff --git a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
index a7586ec00d2d..496fd562ca8c 100644
--- a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
+++ b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "olegkapitonov";
     repo = "kapitonov-plugins-pack";
-    rev = version;
+    tag = version;
     sha256 = "1mxi7b1vrzg25x85lqk8c77iziqrqyz18mqkfjlz09sxp5wfs9w4";
   };
 
diff --git a/pkgs/by-name/ka/kapowbang/package.nix b/pkgs/by-name/ka/kapowbang/package.nix
index d4e8e9cdd66c..85a9f2499190 100644
--- a/pkgs/by-name/ka/kapowbang/package.nix
+++ b/pkgs/by-name/ka/kapowbang/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "BBVA";
     repo = "kapow";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HUZ1Uf8Z2YbYvqKEUHckKAZ5q+C83zafi3UjemqHFM4=";
   };
 
diff --git a/pkgs/by-name/ka/kapp/package.nix b/pkgs/by-name/ka/kapp/package.nix
index cefc16d1036f..bdd6cf948fb5 100644
--- a/pkgs/by-name/ka/kapp/package.nix
+++ b/pkgs/by-name/ka/kapp/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "kapp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vgb4VtMKYncO4TPlMj2HrgZvjoOsOc2cYy+EBDKnGcM=";
   };
 
diff --git a/pkgs/by-name/ka/kappanhang/package.nix b/pkgs/by-name/ka/kappanhang/package.nix
index 62e76c912db0..956e9176d2ff 100644
--- a/pkgs/by-name/ka/kappanhang/package.nix
+++ b/pkgs/by-name/ka/kappanhang/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nonoo";
     repo = "kappanhang";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-l0V2NVzLsnpPe5EJcr5i9U7OGaYzNRDd1f/ogrdCnvk=";
   };
 
diff --git a/pkgs/by-name/ka/karlender/package.nix b/pkgs/by-name/ka/karlender/package.nix
index b293bcbb1133..1743e18ca9c3 100644
--- a/pkgs/by-name/ka/karlender/package.nix
+++ b/pkgs/by-name/ka/karlender/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "floers";
     repo = "karlender";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PwXSJq4uBtgIA2aQ5AZawEMmHoVS2Z9haVHyJ2oyXUs=";
   };
 
diff --git a/pkgs/by-name/ka/karma-runner/package.nix b/pkgs/by-name/ka/karma-runner/package.nix
index 594267f143ca..ea0f32394006 100644
--- a/pkgs/by-name/ka/karma-runner/package.nix
+++ b/pkgs/by-name/ka/karma-runner/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "karma-runner";
     repo = "karma";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v6IiLz65NS8GwM/FPqRxR5qcFDDu7EqloR0SIensdDI=";
   };
 
diff --git a/pkgs/by-name/ka/karma/package.nix b/pkgs/by-name/ka/karma/package.nix
index c4c6822eea05..bd224b86f233 100644
--- a/pkgs/by-name/ka/karma/package.nix
+++ b/pkgs/by-name/ka/karma/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prymitive";
     repo = "karma";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SW/nmJcSk/LmoKLuD5stsSaRGaJctl6hVSODNCT9i64=";
   };
 
diff --git a/pkgs/by-name/ka/karmor/package.nix b/pkgs/by-name/ka/karmor/package.nix
index 20737002e2af..b79d333e83cd 100644
--- a/pkgs/by-name/ka/karmor/package.nix
+++ b/pkgs/by-name/ka/karmor/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubearmor";
     repo = "kubearmor-client";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3WPelRhvK/9LY+TFDExcltszE1wVRr1MMY9Xjijj0so=";
   };
 
diff --git a/pkgs/by-name/ka/kata-runtime/package.nix b/pkgs/by-name/ka/kata-runtime/package.nix
index fa06ba0ea733..f0582e682bcb 100644
--- a/pkgs/by-name/ka/kata-runtime/package.nix
+++ b/pkgs/by-name/ka/kata-runtime/package.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kata-containers";
     repo = "kata-containers";
-    rev = version;
+    tag = version;
     hash = "sha256-Ir+/ZZJHm6E+044wczU3UvL+Py9Wprgw2QKJaYyDrKU=";
   };
 
diff --git a/pkgs/by-name/ka/katago/package.nix b/pkgs/by-name/ka/katago/package.nix
index f4b32cdeae8e..4d9da62e9de9 100644
--- a/pkgs/by-name/ka/katago/package.nix
+++ b/pkgs/by-name/ka/katago/package.nix
@@ -52,7 +52,7 @@ stdenv'.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lightvector";
     repo = "katago";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hZc8LlOxnVqJqyqOSIWKv3550QOaGr79xgqsAQ8B8SM=";
   };
 
diff --git a/pkgs/by-name/ka/kaufkauflist/package.nix b/pkgs/by-name/ka/kaufkauflist/package.nix
index 8fb3073405a4..cfe240684959 100644
--- a/pkgs/by-name/ka/kaufkauflist/package.nix
+++ b/pkgs/by-name/ka/kaufkauflist/package.nix
@@ -18,7 +18,7 @@ let
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
-            rev = "v${version}";
+            tag = "v${version}";
             hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/by-name/kb/kb/package.nix b/pkgs/by-name/kb/kb/package.nix
index f05cf7e325b6..047678c6a484 100644
--- a/pkgs/by-name/kb/kb/package.nix
+++ b/pkgs/by-name/kb/kb/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gnebbia";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-K8EAqZbl2e0h03fFwaKIclZTZARDQp1tRo44znxwW0I=";
   };
 
diff --git a/pkgs/by-name/kb/kbdlight/package.nix b/pkgs/by-name/kb/kbdlight/package.nix
index efb971d634fc..0ca47b264764 100644
--- a/pkgs/by-name/kb/kbdlight/package.nix
+++ b/pkgs/by-name/kb/kbdlight/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hobarrera";
     repo = "kbdlight";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1f08aid1xrbl4sb5447gkip9lnvkia1c4ap0v8zih5s9w8v72bny";
   };
 
diff --git a/pkgs/by-name/kb/kbld/package.nix b/pkgs/by-name/kb/kbld/package.nix
index dac56864246e..d1efdd54bf67 100644
--- a/pkgs/by-name/kb/kbld/package.nix
+++ b/pkgs/by-name/kb/kbld/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "kbld";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ikrxgukixnUCwwEt5FBzTmpjpjkjgtYTjr/AwNZ9kiI=";
   };
 
diff --git a/pkgs/by-name/kb/kbst/package.nix b/pkgs/by-name/kb/kbst/package.nix
index 93fa27fc26ca..9694229fe6e6 100644
--- a/pkgs/by-name/kb/kbst/package.nix
+++ b/pkgs/by-name/kb/kbst/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kbst";
     repo = "kbst";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tbSYNJp/gzEz+wEAe3bvIiZL5axZvW+bxqTOBkYSpMY=";
   };
 
diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix
index d100621bff69..5ebc15d93996 100644
--- a/pkgs/by-name/kb/kbt/package.nix
+++ b/pkgs/by-name/kb/kbt/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bloznelis";
     repo = "kbt";
-    rev = version;
+    tag = version;
     hash = "sha256-ROCZDa5eyGF9yE+zdZ4snzdz8+jk+H6ZnqsnCe8JtJw=";
   };
 
diff --git a/pkgs/by-name/kc/kcat/package.nix b/pkgs/by-name/kc/kcat/package.nix
index 22d64830edb9..7dc2045c65be 100644
--- a/pkgs/by-name/kc/kcat/package.nix
+++ b/pkgs/by-name/kc/kcat/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "edenhill";
     repo = "kcat";
-    rev = version;
+    tag = version;
     sha256 = "sha256-pCIYNx0GYPGDYzTLq9h/LbOrJjhKWLAV4gq07Ikl5O4=";
   };
 
diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix
index 2a4abe1194ce..c9a605fc4e11 100644
--- a/pkgs/by-name/kc/kcl/package.nix
+++ b/pkgs/by-name/kc/kcl/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ron+8pK/1VYwL0HO97QvBpWhKeAlhM+sVi1Djc++4n4=";
   };
 
diff --git a/pkgs/by-name/kc/kcli/package.nix b/pkgs/by-name/kc/kcli/package.nix
index ab609f2d8752..1c295f5acbf5 100644
--- a/pkgs/by-name/kc/kcli/package.nix
+++ b/pkgs/by-name/kc/kcli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cswank";
     repo = "kcli";
-    rev = version;
+    tag = version;
     sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls";
   };
 
diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix
index aaa3a3cca342..6ac95fbd4041 100644
--- a/pkgs/by-name/kc/kclvm/package.nix
+++ b/pkgs/by-name/kc/kclvm/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "kcl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OMPo2cT0ngwHuGghVSfGoDgf+FThj2GsZ3Myb1wSxQM=";
   };
 
diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix
index 4d350cebdf48..e71dee4949f0 100644
--- a/pkgs/by-name/kc/kclvm_cli/package.nix
+++ b/pkgs/by-name/kc/kclvm_cli/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "kcl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wRmLXR1r/FtZVfc6jifEj0jS0U0HIgJzBtuuzLQchjo=";
   };
 
diff --git a/pkgs/by-name/kc/kconf/package.nix b/pkgs/by-name/kc/kconf/package.nix
index 52ed756298ca..10203309632f 100644
--- a/pkgs/by-name/kc/kconf/package.nix
+++ b/pkgs/by-name/kc/kconf/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "particledecay";
     repo = "kconf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bLyLXkXOZRFaplv5sY0TgFffvbA3RUwz6b+7h3MN7kA=";
   };
 
diff --git a/pkgs/by-name/kc/kcov/package.nix b/pkgs/by-name/kc/kcov/package.nix
index cab93025030b..1745d83e4b75 100644
--- a/pkgs/by-name/kc/kcov/package.nix
+++ b/pkgs/by-name/kc/kcov/package.nix
@@ -22,7 +22,7 @@ let
     src = fetchFromGitHub {
       owner = "SimonKagstrom";
       repo = "kcov";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-hRJYuHNSXyRoUDBF/yIPXPcBBxZoTO5cgoB2tBhKPwY=";
     };
 
diff --git a/pkgs/by-name/kc/kcp/package.nix b/pkgs/by-name/kc/kcp/package.nix
index b939e335718e..fe01141b0c2e 100644
--- a/pkgs/by-name/kc/kcp/package.nix
+++ b/pkgs/by-name/kc/kcp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skywind3000";
     repo = "kcp";
-    rev = version;
+    tag = version;
     hash = "sha256-yW40x4T++4rB7hoabGN8qiSN7octyoUYEfE9oDlLxjU=";
   };
 
diff --git a/pkgs/by-name/kd/kdigger/package.nix b/pkgs/by-name/kd/kdigger/package.nix
index db021362c0fa..b65dc518b8f6 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 = pname;
-    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/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix
index 9dd569ba0296..96760fd1a5c0 100644
--- a/pkgs/by-name/kd/kdlfmt/package.nix
+++ b/pkgs/by-name/kd/kdlfmt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hougesen";
     repo = "kdlfmt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nnr3QXEXQGbJKjVvQXqhJ+iFBgI++AKK3wKMt2OqIYc=";
   };
 
diff --git a/pkgs/by-name/kd/kdocker/package.nix b/pkgs/by-name/kd/kdocker/package.nix
index b02db7ebe101..6b696dbb519f 100644
--- a/pkgs/by-name/kd/kdocker/package.nix
+++ b/pkgs/by-name/kd/kdocker/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "user-none";
     repo = "KDocker";
-    rev = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-ckTi/w2Yynsl3aJzV9Uxfc7WxJtcCt44glJyqEEZrig=";
   };
 
diff --git a/pkgs/by-name/kd/kdotool/package.nix b/pkgs/by-name/kd/kdotool/package.nix
index f63b96ef0898..0047e0e05436 100644
--- a/pkgs/by-name/kd/kdotool/package.nix
+++ b/pkgs/by-name/kd/kdotool/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jinliu";
     repo = "kdotool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qx4bWAFQcoLM/r4aNzmoZdjclw8ccAW8lKLda6ON1aQ=";
   };
 
diff --git a/pkgs/by-name/ke/keepalived/package.nix b/pkgs/by-name/ke/keepalived/package.nix
index f7cc87b06e14..1096978976cc 100644
--- a/pkgs/by-name/ke/keepalived/package.nix
+++ b/pkgs/by-name/ke/keepalived/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acassen";
     repo = "keepalived";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+IwV8ifQ8gWN4eR9Fgvw3HV3WJDmy3urEQDLngoMdm8=";
   };
 
diff --git a/pkgs/by-name/ke/keepass-keepasshttp/package.nix b/pkgs/by-name/ke/keepass-keepasshttp/package.nix
index e63a771b8cfc..7f4c10bb479e 100644
--- a/pkgs/by-name/ke/keepass-keepasshttp/package.nix
+++ b/pkgs/by-name/ke/keepass-keepasshttp/package.nix
@@ -14,7 +14,7 @@ let
     src = fetchFromGitHub {
       owner = "pfn";
       repo = "keepasshttp";
-      # rev = version;
+      # tag = version;
       # for 1.8.4.2 the tag is at the wrong commit (they fixed stuff
       # afterwards and didn't move the tag), hence reference by commitid
       rev = "c2c4eb5388a02169400cba7a67be325caabdcc37";
diff --git a/pkgs/by-name/ke/keepassxc-go/package.nix b/pkgs/by-name/ke/keepassxc-go/package.nix
index 1e6cf584d6d2..f9210338298a 100644
--- a/pkgs/by-name/ke/keepassxc-go/package.nix
+++ b/pkgs/by-name/ke/keepassxc-go/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MarkusFreitag";
     repo = "keepassxc-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-seCeHNEj5GxAI7BVMPzh+YuoxivmTwvhVCqY5LKHpQk=";
   };
 
diff --git a/pkgs/by-name/ke/keeperrl/package.nix b/pkgs/by-name/ke/keeperrl/package.nix
index ea8c74e92d14..749e60683d4e 100644
--- a/pkgs/by-name/ke/keeperrl/package.nix
+++ b/pkgs/by-name/ke/keeperrl/package.nix
@@ -22,7 +22,7 @@ let
   free_src = fetchFromGitHub {
     owner = "miki151";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-0sww+ppctXvxMouclG3OdXpcNgrrOZJw9z8s2GhJ+IE=";
   };
 
diff --git a/pkgs/by-name/ke/keepmenu/package.nix b/pkgs/by-name/ke/keepmenu/package.nix
index c584834311cc..0cf4865fe1d1 100644
--- a/pkgs/by-name/ke/keepmenu/package.nix
+++ b/pkgs/by-name/ke/keepmenu/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "keepmenu";
-    rev = version;
+    tag = version;
     hash = "sha256-Kzt2RqyYvOWnbkflwTHzlnpUaruVQvdGys57DDpH9o8=";
   };
 
diff --git a/pkgs/by-name/ke/kepubify/package.nix b/pkgs/by-name/ke/kepubify/package.nix
index 901cd6cba8b0..acb5b78655e2 100644
--- a/pkgs/by-name/ke/kepubify/package.nix
+++ b/pkgs/by-name/ke/kepubify/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pgaskin";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-H6W+C5twXit7Z9hLIJKAftbnvYDA9HAb9tR6yeQGRKI=";
   };
 
diff --git a/pkgs/by-name/ke/kermit-terminal/package.nix b/pkgs/by-name/ke/kermit-terminal/package.nix
index c19cae129bd1..135f43e1bec8 100644
--- a/pkgs/by-name/ke/kermit-terminal/package.nix
+++ b/pkgs/by-name/ke/kermit-terminal/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "kermit";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-rhlUnRfyd7PmtMSyP+tiu+TxZNb/YyS0Yc5IkWft7/4=";
   };
 
diff --git a/pkgs/by-name/ke/kernel-hardening-checker/package.nix b/pkgs/by-name/ke/kernel-hardening-checker/package.nix
index 05a25f28ad7c..3dce8a607041 100644
--- a/pkgs/by-name/ke/kernel-hardening-checker/package.nix
+++ b/pkgs/by-name/ke/kernel-hardening-checker/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "a13xp0p0v";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gxDaOb14jFezxe/qHZF3e52o7obVL0WMIKxwIj3j5QY=";
   };
 
diff --git a/pkgs/by-name/ke/kestrel/package.nix b/pkgs/by-name/ke/kestrel/package.nix
index 85ee8fbd1a9b..47a1743d89b5 100644
--- a/pkgs/by-name/ke/kestrel/package.nix
+++ b/pkgs/by-name/ke/kestrel/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "finfet";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bKQBOk9yUqgnufRyyqXatsRHpesbM49rAkz0dD5XE80=";
   };
 
diff --git a/pkgs/by-name/ke/keto/package.nix b/pkgs/by-name/ke/keto/package.nix
index 4913a13a6d28..3837f2ec0fd0 100644
--- a/pkgs/by-name/ke/keto/package.nix
+++ b/pkgs/by-name/ke/keto/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "ory";
     repo = "keto";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DQiE7PvRnOzdRITRl7LgUDmCJO5/aUzbFdEIyiofZfU=";
   };
 
diff --git a/pkgs/by-name/ke/key-rack/package.nix b/pkgs/by-name/ke/key-rack/package.nix
index 2f5b9bc356c6..e677294b8df7 100644
--- a/pkgs/by-name/ke/key-rack/package.nix
+++ b/pkgs/by-name/ke/key-rack/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "sophie-h";
     repo = "key-rack";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-mthXtTlyrIChaKKwKosTsV1hK9OQ/zLScjrq6D3CRsg=";
   };
 
diff --git a/pkgs/by-name/ke/keycard-cli/package.nix b/pkgs/by-name/ke/keycard-cli/package.nix
index d30150600405..1dd78e90ff31 100644
--- a/pkgs/by-name/ke/keycard-cli/package.nix
+++ b/pkgs/by-name/ke/keycard-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "status-im";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-K2XxajprpPjfIs8rrnf2coIEQjPnir9/U0fTvqV2++g=";
   };
 
diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix
index eb63215f9162..0d21650182d1 100644
--- a/pkgs/by-name/ke/keychain/package.nix
+++ b/pkgs/by-name/ke/keychain/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "funtoo";
     repo = "keychain";
-    rev = version;
+    tag = version;
     sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj";
   };
 
diff --git a/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix b/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
index 35b6a01ded3f..a5cbd85f3780 100644
--- a/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
+++ b/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
@@ -11,7 +11,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "sventorben";
     repo = "keycloak-restrict-client-auth";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Pk0tj8cTHSBwVIzINE7GLA5b/eI97wuOTvO7UoXBStM=";
   };
 
diff --git a/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix b/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix
index 4bc5a3f5141d..62dc5aa96de0 100644
--- a/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix
+++ b/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix
@@ -11,7 +11,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "Captain-P-Goldfish";
     repo = "scim-for-keycloak";
-    rev = version;
+    tag = version;
     hash = "sha256-kHjCVkcD8C0tIaMExDlyQmcWMhypisR1nyG93laB8WU=";
   };
 
diff --git a/pkgs/by-name/ke/keyfinder-cli/package.nix b/pkgs/by-name/ke/keyfinder-cli/package.nix
index c4b708918c85..f79d755dd427 100644
--- a/pkgs/by-name/ke/keyfinder-cli/package.nix
+++ b/pkgs/by-name/ke/keyfinder-cli/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "keyfinder-cli";
     owner = "EvanPurkhiser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA=";
   };
 
diff --git a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
index daf7309de2b3..737d16cb09fb 100644
--- a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
+++ b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mschneider82";
     repo = "keylight-control";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xC/JRM8vyqAsxPpf37P3pZv6i73s+CLQt6Sh4nMxwzM=";
   };
 
diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix
index a191e193905d..0456573d780f 100644
--- a/pkgs/by-name/ke/keymapper/package.nix
+++ b/pkgs/by-name/ke/keymapper/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "houmain";
     repo = "keymapper";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Dq9oyCMMXWBDxX2Bj/IsrjBIxREwMQ12F5/SJ+sQfNY=";
   };
 
diff --git a/pkgs/by-name/ke/keymapviz/package.nix b/pkgs/by-name/ke/keymapviz/package.nix
index 1188ce02597b..e646d490f50b 100644
--- a/pkgs/by-name/ke/keymapviz/package.nix
+++ b/pkgs/by-name/ke/keymapviz/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yskoht";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-eCvwgco22uPEDDsT8FfTRon1xCGy5p1PBp0pDfNprMs=";
   };
 
diff --git a/pkgs/by-name/ke/keystone/package.nix b/pkgs/by-name/ke/keystone/package.nix
index efa845b4e7b7..235cfd6544c6 100644
--- a/pkgs/by-name/ke/keystone/package.nix
+++ b/pkgs/by-name/ke/keystone/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "keystone-engine";
     repo = "keystone";
-    rev = version;
+    tag = version;
     sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa";
   };
 
diff --git a/pkgs/by-name/kf/kfilt/package.nix b/pkgs/by-name/kf/kfilt/package.nix
index fe6f315e8fe2..817b1cdf18e2 100644
--- a/pkgs/by-name/kf/kfilt/package.nix
+++ b/pkgs/by-name/kf/kfilt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ryane";
     repo = "kfilt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TUhZKf4fJyJF/qDmvs4jqAMVTXN4MXE+YLc4FcOVlwo=";
   };
 
diff --git a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
index 60fb02025d95..bcdf72c93fd0 100644
--- a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
+++ b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-ICD-Loader";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A+Rd/3LyBoUW2MrRDMOcwsTqTADuNxSQdF1HHgfq3mY=";
   };
 
diff --git a/pkgs/by-name/kh/khronos/package.nix b/pkgs/by-name/kh/khronos/package.nix
index 167403b1cf2e..d501dcea3823 100644
--- a/pkgs/by-name/kh/khronos/package.nix
+++ b/pkgs/by-name/kh/khronos/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = "khronos";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2mO2ZMDxZ7sx2EVTN0tsAv8MisGxlK/1h61N+hOqyGI=";
   };
 
diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix
index 0f88f8f83657..6d1d8901252a 100644
--- a/pkgs/by-name/ki/kibi/package.nix
+++ b/pkgs/by-name/ki/kibi/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ilai-deutel";
     repo = "kibi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ox1qKWxJlUIFzEqeyzG2kqZix3AHnOKFrlpf6O5QM+k=";
   };
 
diff --git a/pkgs/by-name/ki/kickoff/package.nix b/pkgs/by-name/ki/kickoff/package.nix
index 2935b823d656..2e62f74176c4 100644
--- a/pkgs/by-name/ki/kickoff/package.nix
+++ b/pkgs/by-name/ki/kickoff/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "j0ru";
     repo = "kickoff";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q/+Ik8L58LxOllpEosYyvD38RJb+NIQHslYpgGSwjKc=";
   };
 
diff --git a/pkgs/by-name/ki/kickstart/package.nix b/pkgs/by-name/ki/kickstart/package.nix
index 464de7d1ec80..a51561cca024 100644
--- a/pkgs/by-name/ki/kickstart/package.nix
+++ b/pkgs/by-name/ki/kickstart/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Keats";
     repo = "kickstart";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4POxv6fIrp+wKb9V+6Y2YPx3FXp3hpnkq+62H9TwGII=";
   };
 
diff --git a/pkgs/by-name/ki/kicli/package.nix b/pkgs/by-name/ki/kicli/package.nix
index 3c1769bdd2ea..a06da4af68b5 100644
--- a/pkgs/by-name/ki/kicli/package.nix
+++ b/pkgs/by-name/ki/kicli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "anned20";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Mt1lHOC8gBcLQ6kArUvlPrH+Y/63mIQTCsUY2UTJE2c=";
   };
 
diff --git a/pkgs/by-name/ki/kikoplay/package.nix b/pkgs/by-name/ki/kikoplay/package.nix
index d56f8004a0bd..1fadb89ce22a 100644
--- a/pkgs/by-name/ki/kikoplay/package.nix
+++ b/pkgs/by-name/ki/kikoplay/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KikoPlayProject";
     repo = "KikoPlay";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-y+sT0aHDvKFNaJIxnGxDXZXUiCzuXVF7FPc8t//RMW4=";
   };
 
diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix
index 9cbad3d0c47a..19cea7779c15 100644
--- a/pkgs/by-name/ki/kind/package.nix
+++ b/pkgs/by-name/ki/kind/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   version = "0.27.0";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "kubernetes-sigs";
     repo = "kind";
     hash = "sha256-J0M/enjufNmEMm43zo5fi5hL1LfaemNwR6nCClVCJNA=";
diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix
index e485a958fee4..e59803ddd97c 100644
--- a/pkgs/by-name/ki/kine/package.nix
+++ b/pkgs/by-name/ki/kine/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "k3s-io";
     repo = "kine";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Fb73warUgPX/FQT/zDnn3r7SP2tw142Npg2rhK8BEqI=";
   };
 
diff --git a/pkgs/by-name/ki/kirc/package.nix b/pkgs/by-name/ki/kirc/package.nix
index fe686ff30cb4..83d94169098e 100644
--- a/pkgs/by-name/ki/kirc/package.nix
+++ b/pkgs/by-name/ki/kirc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mcpcpc";
     repo = "kirc";
-    rev = version;
+    tag = version;
     hash = "sha256-LiJZnFQMnyBEqeyyyqM56XXoYjbZPCWLfLX9OB/f+YM=";
   };
 
diff --git a/pkgs/by-name/ki/kissfft/package.nix b/pkgs/by-name/ki/kissfft/package.nix
index 03d0e7d04584..cdef56fe24b3 100644
--- a/pkgs/by-name/ki/kissfft/package.nix
+++ b/pkgs/by-name/ki/kissfft/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mborgerding";
     repo = "kissfft";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ukikTVnmKomKXTo6zc+PhpZzEkzXN2imFwZOYlfR3Pk=";
   };
 
diff --git a/pkgs/by-name/ki/kiterunner/package.nix b/pkgs/by-name/ki/kiterunner/package.nix
index 8ac6052fa452..2e469aa390a6 100644
--- a/pkgs/by-name/ki/kiterunner/package.nix
+++ b/pkgs/by-name/ki/kiterunner/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "assetnote";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vIYPpkbqyk0zH10DGp2FF0aI4lFpsZavulBIiR/3kiA=";
   };
 
diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix
index cc60333b66b2..61f84af77d50 100644
--- a/pkgs/by-name/ki/kitex/package.nix
+++ b/pkgs/by-name/ki/kitex/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudwego";
     repo = "kitex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1dgQgc9XljawyH+MIDPNqcwHMH0yW2BMY8TZnc+P13I=";
   };
 
diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix
index 448f01e1cd55..2a24a55da363 100644
--- a/pkgs/by-name/ki/kitsas/package.nix
+++ b/pkgs/by-name/ki/kitsas/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "artoh";
     repo = "kitupiikki";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4FCfpUFfi+N207SEAKz8nLpVS8MxfmDwM6r6i5pyqEM=";
   };
 
diff --git a/pkgs/by-name/ki/kittysay/package.nix b/pkgs/by-name/ki/kittysay/package.nix
index 7ab11b806168..aa325061d325 100644
--- a/pkgs/by-name/ki/kittysay/package.nix
+++ b/pkgs/by-name/ki/kittysay/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "uncenter";
     repo = "kittysay";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZYHrDBJ8cTqJAh2KUGSCsS1bY/emHRodPxZX2vxAhDs=";
   };
 
diff --git a/pkgs/by-name/kl/klick/package.nix b/pkgs/by-name/kl/klick/package.nix
index 2326a26acf8c..a58858ec98f1 100644
--- a/pkgs/by-name/kl/klick/package.nix
+++ b/pkgs/by-name/kl/klick/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Allfifthstuning";
     repo = "klick";
-    rev = version;
+    tag = version;
     hash = "sha256-jHyeVCmyy9ipbVaF7GSW19DOVpU9EQJoLcGq9uos+eY=";
   };
 
diff --git a/pkgs/by-name/kl/klipperscreen/package.nix b/pkgs/by-name/kl/klipperscreen/package.nix
index 3a242ab34729..18459a1bdc2f 100644
--- a/pkgs/by-name/kl/klipperscreen/package.nix
+++ b/pkgs/by-name/kl/klipperscreen/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "KlipperScreen";
     repo = "KlipperScreen";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MxuUmkuEnfFC0iPwNUc0Wh8bIEl1J1FMgGEYMjHePZ8=";
   };
 
diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix
index 9c0e15bce9d4..d94522fe0124 100644
--- a/pkgs/by-name/kl/klog-rs/package.nix
+++ b/pkgs/by-name/kl/klog-rs/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tobifroe";
     repo = "klog";
-    rev = version;
+    tag = version;
     hash = "sha256-t53HC5eBC587jyvJKxlG3B3Im7RM6bDcZfUO4npgGfM=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/kl/klog-time-tracker/package.nix b/pkgs/by-name/kl/klog-time-tracker/package.nix
index 9805ecb6c983..842267ace2a4 100644
--- a/pkgs/by-name/kl/klog-time-tracker/package.nix
+++ b/pkgs/by-name/kl/klog-time-tracker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jotaen";
     repo = "klog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xwVbI4rXtcZrnTvp0vdHMbYRoWCsxIuGZF922eC/sfw=";
   };
 
diff --git a/pkgs/by-name/kl/kluctl/package.nix b/pkgs/by-name/kl/kluctl/package.nix
index 743672a9a276..5d5473119847 100644
--- a/pkgs/by-name/kl/kluctl/package.nix
+++ b/pkgs/by-name/kl/kluctl/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kluctl";
     repo = "kluctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qtntImc+fiRPMUHVM4A8d2e17zklV47CJ10M9A8oa7k=";
   };
 
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/km/kmon/package.nix b/pkgs/by-name/km/kmon/package.nix
index 6222a438ad23..9a9b0a387c78 100644
--- a/pkgs/by-name/km/kmon/package.nix
+++ b/pkgs/by-name/km/kmon/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "kmon";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DzbbeVZifuxgmIu3yNv6EI7Jyh8MA0/oSaR5IEPNUN8=";
   };
 
diff --git a/pkgs/by-name/km/kmsvnc/package.nix b/pkgs/by-name/km/kmsvnc/package.nix
index 238ea9ba372d..264f2af76c5b 100644
--- a/pkgs/by-name/km/kmsvnc/package.nix
+++ b/pkgs/by-name/km/kmsvnc/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "isjerryxiao";
     repo = "kmsvnc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fOryY9pkeRXjfOq4ZcUKBrBDMWEljLChwXSAbeMNXhw=";
   };
 
diff --git a/pkgs/by-name/kn/knightos-genkfs/package.nix b/pkgs/by-name/kn/knightos-genkfs/package.nix
index b91d29537a6f..459bea995690 100644
--- a/pkgs/by-name/kn/knightos-genkfs/package.nix
+++ b/pkgs/by-name/kn/knightos-genkfs/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "genkfs";
-    rev = version;
+    tag = version;
     sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp";
   };
 
diff --git a/pkgs/by-name/kn/knightos-kcc/package.nix b/pkgs/by-name/kn/knightos-kcc/package.nix
index e43d2cd29a33..7d521e58049d 100644
--- a/pkgs/by-name/kn/knightos-kcc/package.nix
+++ b/pkgs/by-name/kn/knightos-kcc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "kcc";
-    rev = version;
+    tag = version;
     sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp";
   };
 
diff --git a/pkgs/by-name/kn/knightos-kimg/package.nix b/pkgs/by-name/kn/knightos-kimg/package.nix
index 732fc6f8e2b4..2dda3add9043 100644
--- a/pkgs/by-name/kn/knightos-kimg/package.nix
+++ b/pkgs/by-name/kn/knightos-kimg/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "kimg";
-    rev = version;
+    tag = version;
     sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3";
   };
 
diff --git a/pkgs/by-name/kn/knightos-kpack/package.nix b/pkgs/by-name/kn/knightos-kpack/package.nix
index 3d4cc0595fea..8c55ee62c207 100644
--- a/pkgs/by-name/kn/knightos-kpack/package.nix
+++ b/pkgs/by-name/kn/knightos-kpack/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "kpack";
-    rev = version;
+    tag = version;
     sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8";
   };
 
diff --git a/pkgs/by-name/kn/knightos-mkrom/package.nix b/pkgs/by-name/kn/knightos-mkrom/package.nix
index 100da9137d29..83361371094c 100644
--- a/pkgs/by-name/kn/knightos-mkrom/package.nix
+++ b/pkgs/by-name/kn/knightos-mkrom/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "mkrom";
-    rev = version;
+    tag = version;
     sha256 = "sha256-YFrh0tOGiM90uvU9ZWopW1+9buHDQtetuOtPDSYYaXw=";
   };
 
diff --git a/pkgs/by-name/kn/knightos-mktiupgrade/package.nix b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
index 850a35df20d2..f3394d828901 100644
--- a/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
+++ b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "mktiupgrade";
-    rev = version;
+    tag = version;
     sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm";
   };
 
diff --git a/pkgs/by-name/kn/knightos-patchrom/package.nix b/pkgs/by-name/kn/knightos-patchrom/package.nix
index 097fffc85698..9b4938632385 100644
--- a/pkgs/by-name/kn/knightos-patchrom/package.nix
+++ b/pkgs/by-name/kn/knightos-patchrom/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "patchrom";
-    rev = version;
+    tag = version;
     sha256 = "0yc4q7n3k7k6rx3cxq5ddd5r0la8gw1287a74kql6gwkxjq0jmcv";
   };
 
diff --git a/pkgs/by-name/kn/knightos-scas/package.nix b/pkgs/by-name/kn/knightos-scas/package.nix
index a04b03e6d10f..8bfa98f04a6e 100644
--- a/pkgs/by-name/kn/knightos-scas/package.nix
+++ b/pkgs/by-name/kn/knightos-scas/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "scas";
-    rev = version;
+    tag = version;
     sha256 = "sha256-JGQE+orVDKKJsTt8sIjPX+3yhpZkujISroQ6g19+MzU=";
   };
 
diff --git a/pkgs/by-name/kn/knightos-z80e/package.nix b/pkgs/by-name/kn/knightos-z80e/package.nix
index 0b39ebfa0999..28b670e3295b 100644
--- a/pkgs/by-name/kn/knightos-z80e/package.nix
+++ b/pkgs/by-name/kn/knightos-z80e/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "z80e";
-    rev = version;
+    tag = version;
     sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc=";
   };
 
diff --git a/pkgs/by-name/kn/knit/package.nix b/pkgs/by-name/kn/knit/package.nix
index 82d1a2fe8982..7b43c3dc9ae9 100644
--- a/pkgs/by-name/kn/knit/package.nix
+++ b/pkgs/by-name/kn/knit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zyedidia";
     repo = "knit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zxwEJnQZpOEJhV7jx2ClS3XmMfGBiq8AHR26TOIBJVw=";
   };
 
diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix
index a29b3135c981..049c4badec4a 100644
--- a/pkgs/by-name/kn/knossosnet/package.nix
+++ b/pkgs/by-name/kn/knossosnet/package.nix
@@ -13,7 +13,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "KnossosNET";
     repo = "Knossos.NET";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vlSiM6kskV4wfBZF7Rv5ICyqKG0Zhz/iU8kflYOaf0U=";
   };
 
diff --git a/pkgs/by-name/ko/kodi-cli/package.nix b/pkgs/by-name/ko/kodi-cli/package.nix
index 8c49c224fd80..438fc6edc4c3 100644
--- a/pkgs/by-name/ko/kodi-cli/package.nix
+++ b/pkgs/by-name/ko/kodi-cli/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nawar";
     repo = "kodi-cli";
-    rev = version;
+    tag = version;
     sha256 = "0f9wdq2fg8hlpk3qbjfkb3imprxkvdrhxfkcvr3dwfma0j2yfwam";
   };
 
diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix
index 6f4c6761cdcb..2446befbff99 100644
--- a/pkgs/by-name/ko/kokkos/package.nix
+++ b/pkgs/by-name/ko/kokkos/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kokkos";
     repo = "kokkos";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-4Or6Z/ZXH/WmA8GW6/Odn9+w7E/jdBDMCkWSpMf5Zoc=";
   };
 
diff --git a/pkgs/by-name/ko/kolla/package.nix b/pkgs/by-name/ko/kolla/package.nix
index 678366edb305..f8f292216921 100644
--- a/pkgs/by-name/ko/kolla/package.nix
+++ b/pkgs/by-name/ko/kolla/package.nix
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
     owner = "openstack";
     repo = "kolla";
     hash = "sha256-jLD6ILihymQlWkkpGYC4OX8BKLpQurAK6Y5Xpju+QAI=";
-    rev = version;
+    tag = version;
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ko/kompose/package.nix b/pkgs/by-name/ko/kompose/package.nix
index bad37825a1f4..4bbceae87c29 100644
--- a/pkgs/by-name/ko/kompose/package.nix
+++ b/pkgs/by-name/ko/kompose/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kompose";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-M1d1pSIMRIlLKob9D8MzrUuPm+h9C5sSC8L+uIdU1Ic=";
   };
 
diff --git a/pkgs/by-name/ko/konbucase/package.nix b/pkgs/by-name/ko/konbucase/package.nix
index 905f63f5aa51..ed66a328c6dc 100644
--- a/pkgs/by-name/ko/konbucase/package.nix
+++ b/pkgs/by-name/ko/konbucase/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ryonakano";
     repo = "konbucase";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-md7drxg1JuW6TRJauKOk4Aqjx/V1RVZ+POa5v6DtKwk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ko/kondo/package.nix b/pkgs/by-name/ko/kondo/package.nix
index 051dc8236e2b..92f4975974cc 100644
--- a/pkgs/by-name/ko/kondo/package.nix
+++ b/pkgs/by-name/ko/kondo/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tbillington";
     repo = "kondo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OqOmOujnyLTqwzNvLWudQi+xa5v37JTtyUXaItnpnfs=";
   };
 
diff --git a/pkgs/by-name/ko/konf/package.nix b/pkgs/by-name/ko/konf/package.nix
index 90ee378839ed..d39bc674ce34 100644
--- a/pkgs/by-name/ko/konf/package.nix
+++ b/pkgs/by-name/ko/konf/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SimonTheLeg";
     repo = "konf-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GSrR2uLeGodmE1egRtvTyWhJckYUnI97n7dnmjPvu3k=";
   };
 
diff --git a/pkgs/by-name/ko/konstraint/package.nix b/pkgs/by-name/ko/konstraint/package.nix
index dc23321f593f..f18fd1282f0d 100644
--- a/pkgs/by-name/ko/konstraint/package.nix
+++ b/pkgs/by-name/ko/konstraint/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "plexsystems";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-45zCzjzbKYLsLxmo7yGbbyeYP1WyULD9d+nnNLP9Zzo=";
   };
   vendorHash = "sha256-ZPK3+x0GOMs2RXxIs90BvEg25lb/j11J9zECaMHg4zY=";
diff --git a/pkgs/by-name/ko/kontroll/package.nix b/pkgs/by-name/ko/kontroll/package.nix
index a2113c918648..245a01ee2a47 100644
--- a/pkgs/by-name/ko/kontroll/package.nix
+++ b/pkgs/by-name/ko/kontroll/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zsa";
     repo = "kontroll";
-    rev = version;
+    tag = version;
     hash = "sha256-k7Twbjl8umk3PeIv3ivCLdhZFgTTV8WdfIAoGAD/pEk=";
   };
 
diff --git a/pkgs/by-name/ko/kooha/package.nix b/pkgs/by-name/ko/kooha/package.nix
index c466270cac12..466494ae3cb7 100644
--- a/pkgs/by-name/ko/kooha/package.nix
+++ b/pkgs/by-name/ko/kooha/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SeaDve";
     repo = "Kooha";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Z+PMSV6fipfHBrqGS24SOgGJS173Vct12sVzCGZL0IA=";
   };
 
diff --git a/pkgs/by-name/ko/kool/package.nix b/pkgs/by-name/ko/kool/package.nix
index 5a419b22c44f..cca84cc59a0a 100644
--- a/pkgs/by-name/ko/kool/package.nix
+++ b/pkgs/by-name/ko/kool/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kool-dev";
     repo = "kool";
-    rev = version;
+    tag = version;
     hash = "sha256-UVdkymG9Ni83NhGRAXalJiLbpn3xzNl0quew+vDfyec=";
   };
 
diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix
index af32830388e7..87463c030d95 100644
--- a/pkgs/by-name/ko/kor/package.nix
+++ b/pkgs/by-name/ko/kor/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yonahd";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VK5G8J851rsIEt2ljrTWFPCxhIBTgLkMlEMVb9kJcOs=";
   };
 
diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix
index d1b830abf4aa..b83bb39abc92 100644
--- a/pkgs/by-name/ko/kord/package.nix
+++ b/pkgs/by-name/ko/kord/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "twitchax";
     repo = "kord";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CeMh6yB4fGoxtGLbkQe4OMMvBM0jesyP+8JtU5kCP84=";
   };
 
diff --git a/pkgs/by-name/ko/kore/package.nix b/pkgs/by-name/ko/kore/package.nix
index 34b5612d9b1f..e8ce7e40370d 100644
--- a/pkgs/by-name/ko/kore/package.nix
+++ b/pkgs/by-name/ko/kore/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jorisvink";
     repo = "kore";
-    rev = version;
+    tag = version;
     sha256 = "sha256-p0M2P02xwww5EnT28VnEtj5b+/jkPW3YkJMuK79vp4k=";
   };
 
diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix
index bb1969b3ac19..2df720694dc4 100644
--- a/pkgs/by-name/ko/koreader/package.nix
+++ b/pkgs/by-name/ko/koreader/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src_repo = fetchFromGitHub {
     repo = "koreader";
     owner = "koreader";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     sha256 = "sha256-EI8UOQuwhJqcAp8QnLYhI0K+uV/7ZqxdHNk8mPkDWA0=";
   };
diff --git a/pkgs/by-name/ko/koruri/package.nix b/pkgs/by-name/ko/koruri/package.nix
index 412b4a0fa152..d93e93a5c446 100644
--- a/pkgs/by-name/ko/koruri/package.nix
+++ b/pkgs/by-name/ko/koruri/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Koruri";
     repo = "Koruri";
-    rev = version;
+    tag = version;
     hash = "sha256-zL9UtT15mWvsXgGJqbTs6cOsQaoh/0AIAyQ5z7JpTXk=";
   };
 
diff --git a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix
index 8ee1ed750260..4e051c4a94f4 100644
--- a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix
+++ b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "Kotlin";
     repo = "kotlin-interactive-shell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3DTyo7rPswpEVzFkcprT6FD+ITGJ+qCXFKXEGoCK+oE=";
   };
 
diff --git a/pkgs/by-name/kp/kpt/package.nix b/pkgs/by-name/kp/kpt/package.nix
index 9c6de4cb3b80..93e0c43fc15a 100644
--- a/pkgs/by-name/kp/kpt/package.nix
+++ b/pkgs/by-name/kp/kpt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kptdev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MVrJUsMpt1L56ezy2b2G6Aac9kpe4QgfSosR+PeTuBQ=";
   };
 
diff --git a/pkgs/by-name/kr/kraft/package.nix b/pkgs/by-name/kr/kraft/package.nix
index 04718b428d44..c4f2bc962fa2 100644
--- a/pkgs/by-name/kr/kraft/package.nix
+++ b/pkgs/by-name/kr/kraft/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "unikraft";
     repo = "kraftkit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rwowlwP56IAdogEL6/SBGDtvOW7FhO4+2vTWI755HXI=";
   };
 
diff --git a/pkgs/by-name/kr/krankerl/package.nix b/pkgs/by-name/kr/krankerl/package.nix
index 03a78ec3eb71..bf81b38c60a7 100644
--- a/pkgs/by-name/kr/krankerl/package.nix
+++ b/pkgs/by-name/kr/krankerl/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ChristophWurst";
     repo = "krankerl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fFtjQFkNB5vn9nlFJI6nRdqxB9PmOGl3ySZ5LG2tgPg=";
   };
 
diff --git a/pkgs/by-name/kr/krapslog/package.nix b/pkgs/by-name/kr/krapslog/package.nix
index ceef566a4169..2b5d89523179 100644
--- a/pkgs/by-name/kr/krapslog/package.nix
+++ b/pkgs/by-name/kr/krapslog/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "acj";
     repo = "krapslog-rs";
-    rev = version;
+    tag = version;
     sha256 = "sha256-wRziLNMwLZBCn330FNC9x6loCCyuC+31Kh51ZI/j1Cc=";
   };
 
diff --git a/pkgs/by-name/kr/kratos/package.nix b/pkgs/by-name/kr/kratos/package.nix
index 9da5b1e6e129..8df35ba76b22 100644
--- a/pkgs/by-name/kr/kratos/package.nix
+++ b/pkgs/by-name/kr/kratos/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "ory";
     repo = "kratos";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FJrBwjWBYwoiy8rWXn+jaVc1b35So1Rb9SjkUlNwAqE=";
   };
 
diff --git a/pkgs/by-name/kr/krelay/package.nix b/pkgs/by-name/kr/krelay/package.nix
index 6390e08d1f54..591f29e05240 100644
--- a/pkgs/by-name/kr/krelay/package.nix
+++ b/pkgs/by-name/kr/krelay/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knight42";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TonkGh4j+xLGgSpspCedg6c2NpIZIzp5pv8VtWFssPk=";
   };
 
diff --git a/pkgs/by-name/kr/krew/package.nix b/pkgs/by-name/kr/krew/package.nix
index 2fc475b41e9b..6b407f08cee6 100644
--- a/pkgs/by-name/kr/krew/package.nix
+++ b/pkgs/by-name/kr/krew/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "krew";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3GoC2HEp9XJe853/JYvX9kAAcFf7XxglVEeU9oQ/5Ms=";
   };
 
diff --git a/pkgs/by-name/kr/kronosnet/package.nix b/pkgs/by-name/kr/kronosnet/package.nix
index dfaf1379c679..1b2feef3e204 100644
--- a/pkgs/by-name/kr/kronosnet/package.nix
+++ b/pkgs/by-name/kr/kronosnet/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kronosnet";
     repo = "kronosnet";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Ydu7qS2Wuy5c5pCv1X8SdEIx8sTvfGusCJwltkb3YXQ=";
   };
 
diff --git a/pkgs/by-name/kr/krop/package.nix b/pkgs/by-name/kr/krop/package.nix
index 889cd4317e04..4aabe5a93ca5 100644
--- a/pkgs/by-name/kr/krop/package.nix
+++ b/pkgs/by-name/kr/krop/package.nix
@@ -33,7 +33,7 @@ py.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "arminstraub";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ygzc7vlwszqmsd3v1dsqp1dpsn6inx7g8gck63alvf88dbn8m3s";
   };
 
diff --git a/pkgs/by-name/kr/krunner-vscodeprojects/package.nix b/pkgs/by-name/kr/krunner-vscodeprojects/package.nix
index 07316f77b59e..c266c013075f 100644
--- a/pkgs/by-name/kr/krunner-vscodeprojects/package.nix
+++ b/pkgs/by-name/kr/krunner-vscodeprojects/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alex1701c";
     repo = "krunner-vscodeprojects";
-    rev = version;
+    tag = version;
     hash = "sha256-a24MFSXYFR4VVUVMOAY0n0sKqY0L9lUhnpgSeDFtceI=";
   };
 
diff --git a/pkgs/by-name/ks/ks/package.nix b/pkgs/by-name/ks/ks/package.nix
index 73fe7a1b8d7e..71ba2286a0aa 100644
--- a/pkgs/by-name/ks/ks/package.nix
+++ b/pkgs/by-name/ks/ks/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "loteoo";
     repo = "ks";
-    rev = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-v05wqlG7Utq1b7ctvDY9MCdjHVVZZNNzuHaIBwuRjEE=";
   };
 
diff --git a/pkgs/by-name/ks/ksmbd-tools/package.nix b/pkgs/by-name/ks/ksmbd-tools/package.nix
index 0a13560f08bd..7e234b52a35e 100644
--- a/pkgs/by-name/ks/ksmbd-tools/package.nix
+++ b/pkgs/by-name/ks/ksmbd-tools/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cifsd-team";
     repo = "ksmbd-tools";
-    rev = version;
+    tag = version;
     sha256 = "sha256-f2B+24AboAWLIrtuHWn8YMEPzWahIafc3kfx0zKyz8g=";
   };
 
diff --git a/pkgs/by-name/ks/ksuperkey/package.nix b/pkgs/by-name/ks/ksuperkey/package.nix
index 44afd8773aef..10c68e672c7e 100644
--- a/pkgs/by-name/ks/ksuperkey/package.nix
+++ b/pkgs/by-name/ks/ksuperkey/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hanschen";
     repo = "ksuperkey";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1dvgf356fihfav8pjzww1q6vgd96c5h18dh8vpv022g9iipiwq8a";
   };
 
diff --git a/pkgs/by-name/kt/kt/package.nix b/pkgs/by-name/kt/kt/package.nix
index 8070bd50d09c..2eafd19ff10b 100644
--- a/pkgs/by-name/kt/kt/package.nix
+++ b/pkgs/by-name/kt/kt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fgeller";
     repo = "kt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1UGsiMMmAyIQZ62hNIi0uzyX2uNL03EWupIazjznqDc=";
   };
 
diff --git a/pkgs/by-name/kt/ktop/package.nix b/pkgs/by-name/kt/ktop/package.nix
index 964a44fffe1d..f5b60308742a 100644
--- a/pkgs/by-name/kt/ktop/package.nix
+++ b/pkgs/by-name/kt/ktop/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vladimirvivien";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oxyEkDY53HjBgjWRajlcg+8Kx092lyLkPgOJleioO7o=";
   };
 
diff --git a/pkgs/by-name/kt/ktunnel/package.nix b/pkgs/by-name/kt/ktunnel/package.nix
index 66fcee188903..4eadd6676b12 100644
--- a/pkgs/by-name/kt/ktunnel/package.nix
+++ b/pkgs/by-name/kt/ktunnel/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "omrikiei";
     repo = "ktunnel";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rcUCIUIyBCSuMly7y0GUNQCdJUgsj7Oi6Hpz23uXoJw=";
   };
 
diff --git a/pkgs/by-name/kt/ktx-tools/package.nix b/pkgs/by-name/kt/ktx-tools/package.nix
index 7c4da8a5c2fe..ad3ce863a79d 100644
--- a/pkgs/by-name/kt/ktx-tools/package.nix
+++ b/pkgs/by-name/kt/ktx-tools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "KTX-Software";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bDdRdVFbVmN8fEGRLnPLOXsV6lfYU9Lg4nW0GuCj6AU=";
   };
 
diff --git a/pkgs/by-name/ku/kube-capacity/package.nix b/pkgs/by-name/ku/kube-capacity/package.nix
index aad7b224c8dc..82cc34c40e99 100644
--- a/pkgs/by-name/ku/kube-capacity/package.nix
+++ b/pkgs/by-name/ku/kube-capacity/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.8.0";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "robscott";
     repo = pname;
     sha256 = "sha256-zAwCz4Qs1OF/CdSmy9p4X9hL9iNkAH/EeSU2GgekzV8=";
diff --git a/pkgs/by-name/ku/kube-linter/package.nix b/pkgs/by-name/ku/kube-linter/package.nix
index e71fc89c0ff9..d0e9493e9031 100644
--- a/pkgs/by-name/ku/kube-linter/package.nix
+++ b/pkgs/by-name/ku/kube-linter/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-abfNzf+84BWHpvLQZKyzl7WBt7UHj2zqzKq3VCqAwwY=";
   };
 
diff --git a/pkgs/by-name/ku/kube-prompt/package.nix b/pkgs/by-name/ku/kube-prompt/package.nix
index 8ce8a8960840..2b7a0ab6ed0c 100644
--- a/pkgs/by-name/ku/kube-prompt/package.nix
+++ b/pkgs/by-name/ku/kube-prompt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "c-bata";
     repo = "kube-prompt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9OWsITbC7YO51QzsRwDWvojU54DiuGJhkSGwmesEj9w=";
   };
 
diff --git a/pkgs/by-name/ku/kube-router/package.nix b/pkgs/by-name/ku/kube-router/package.nix
index ceec86cf0626..e8d02ff181a7 100644
--- a/pkgs/by-name/ku/kube-router/package.nix
+++ b/pkgs/by-name/ku/kube-router/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudnativelabs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bt7BnMIq/tkRL8d1pf/gG5qBq/1yiMqXDpBrIICo780=";
   };
 
diff --git a/pkgs/by-name/ku/kube-score/package.nix b/pkgs/by-name/ku/kube-score/package.nix
index 95000b724f82..3dd86804516a 100644
--- a/pkgs/by-name/ku/kube-score/package.nix
+++ b/pkgs/by-name/ku/kube-score/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zegl";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YsbefR6WkFef5nhbD9ACQ7Xx572RsHlL2zY78RtTtsQ=";
   };
 
diff --git a/pkgs/by-name/ku/kube-state-metrics/package.nix b/pkgs/by-name/ku/kube-state-metrics/package.nix
index 9ece423c3f0d..26448c4ea442 100644
--- a/pkgs/by-name/ku/kube-state-metrics/package.nix
+++ b/pkgs/by-name/ku/kube-state-metrics/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kube-state-metrics";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-s46K5V7lwqeQ4qjaCPAoMoKLikezT+Ik5bJAkkJ5Q40=";
   };
 
diff --git a/pkgs/by-name/ku/kubebuilder/package.nix b/pkgs/by-name/ku/kubebuilder/package.nix
index ac165c9c7a5d..beb33bf31adc 100644
--- a/pkgs/by-name/ku/kubebuilder/package.nix
+++ b/pkgs/by-name/ku/kubebuilder/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "kubebuilder";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KXT7rW4HH9sSidqofp86tHClfpRQPnMo1K1LzfDyL3I=";
   };
 
diff --git a/pkgs/by-name/ku/kubecfg/package.nix b/pkgs/by-name/ku/kubecfg/package.nix
index 721f31daac8f..f298c358062e 100644
--- a/pkgs/by-name/ku/kubecfg/package.nix
+++ b/pkgs/by-name/ku/kubecfg/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubecfg";
     repo = "kubecfg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-27xek+rLJK7jbqi9QDuWdA9KrO5QXUPAj9IRXVxiS8Q=";
   };
 
diff --git a/pkgs/by-name/ku/kubecm/package.nix b/pkgs/by-name/ku/kubecm/package.nix
index 476ed8e114f2..e9b483de0e1a 100644
--- a/pkgs/by-name/ku/kubecm/package.nix
+++ b/pkgs/by-name/ku/kubecm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sunny0826";
     repo = "kubecm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-z0uQhAfyrK2LKs4hwnHGE7hKQwhLGCmp7yN58ehDn/w=";
   };
 
diff --git a/pkgs/by-name/ku/kubecolor/package.nix b/pkgs/by-name/ku/kubecolor/package.nix
index 56f75358792d..e2a99c6bfe88 100644
--- a/pkgs/by-name/ku/kubecolor/package.nix
+++ b/pkgs/by-name/ku/kubecolor/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubecolor";
     repo = "kubecolor";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Q3Bl1ejuSpiMpQgiqKa2x/g02hNx326GM2MIDoi7q7o=";
   };
 
diff --git a/pkgs/by-name/ku/kubeconform/package.nix b/pkgs/by-name/ku/kubeconform/package.nix
index dfef2b5a74b3..11c4f1d5fc5f 100644
--- a/pkgs/by-name/ku/kubeconform/package.nix
+++ b/pkgs/by-name/ku/kubeconform/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yannh";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Yq9lJ3rSG8v/PeofkZrnO2nzEgtyB5vtNafKabp8hnQ=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix
index 5db7f96f0baa..317c9ed981ec 100644
--- a/pkgs/by-name/ku/kubectl-cnpg/package.nix
+++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudnative-pg";
     repo = "cloudnative-pg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lAcCOHYtEO2v08REvJXvx+S6YzOsh6EcSUTmOXcpks8=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-df-pv/package.nix b/pkgs/by-name/ku/kubectl-df-pv/package.nix
index 5160659ce06a..3d33633508ea 100644
--- a/pkgs/by-name/ku/kubectl-df-pv/package.nix
+++ b/pkgs/by-name/ku/kubectl-df-pv/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yashbhutwala";
     repo = "kubectl-df-pv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FxKqkxLMNfCXuahKTMod6kWKZ/ucYeIEFcS8BmpbLWg=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-doctor/package.nix b/pkgs/by-name/ku/kubectl-doctor/package.nix
index c8a6ac0b0a42..591cfe40226d 100644
--- a/pkgs/by-name/ku/kubectl-doctor/package.nix
+++ b/pkgs/by-name/ku/kubectl-doctor/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "emirozer";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-example/package.nix b/pkgs/by-name/ku/kubectl-example/package.nix
index 981fb6e3afcd..a23915161fb6 100644
--- a/pkgs/by-name/ku/kubectl-example/package.nix
+++ b/pkgs/by-name/ku/kubectl-example/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "seredot";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YvB4l+7GLSyYWX2Fbk4gT2WLaQpNxeV0aHY3Pg+9LCM=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-explore/package.nix b/pkgs/by-name/ku/kubectl-explore/package.nix
index 0d524a891b74..b67c116b4ea5 100644
--- a/pkgs/by-name/ku/kubectl-explore/package.nix
+++ b/pkgs/by-name/ku/kubectl-explore/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "keisku";
     repo = "kubectl-explore";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RCLOqe4Ptac2YVDjWYG5H5geUMUsmh6klQfk92XvjI4=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix
index 408e688a0844..5251465a9e45 100644
--- a/pkgs/by-name/ku/kubectl-gadget/package.nix
+++ b/pkgs/by-name/ku/kubectl-gadget/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "inspektor-gadget";
     repo = "inspektor-gadget";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zAFDbSbNvFtQeJhyeG1tgFwwFgluiX1Y5BmSUsE4z3c=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-graph/package.nix b/pkgs/by-name/ku/kubectl-graph/package.nix
index f0bbb4906e91..2bb60891aebb 100644
--- a/pkgs/by-name/ku/kubectl-graph/package.nix
+++ b/pkgs/by-name/ku/kubectl-graph/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "steveteuber";
     repo = "kubectl-graph";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5N1eC8J0nHEgFUCHEn5b3kUDj6MWejouQBKkdJKsaAo=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-images/package.nix b/pkgs/by-name/ku/kubectl-images/package.nix
index aac821504bd8..76b547d11084 100644
--- a/pkgs/by-name/ku/kubectl-images/package.nix
+++ b/pkgs/by-name/ku/kubectl-images/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chenjiandongx";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FHfj2qRypqQA0Vj9Hq7wuYd0xmpD+IZj3MkwKljQio0=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-klock/package.nix b/pkgs/by-name/ku/kubectl-klock/package.nix
index aae2d47da28d..405974494f6b 100644
--- a/pkgs/by-name/ku/kubectl-klock/package.nix
+++ b/pkgs/by-name/ku/kubectl-klock/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "applejag";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-S7cpVRVboLkU+GgvwozJmfFAO29tKpPlk+r9mbVLxF8=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-ktop/package.nix b/pkgs/by-name/ku/kubectl-ktop/package.nix
index bfcedb7a34e6..fa4db97e0563 100644
--- a/pkgs/by-name/ku/kubectl-ktop/package.nix
+++ b/pkgs/by-name/ku/kubectl-ktop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vladimirvivien";
     repo = "ktop";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oxyEkDY53HjBgjWRajlcg+8Kx092lyLkPgOJleioO7o=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-neat/package.nix b/pkgs/by-name/ku/kubectl-neat/package.nix
index 0514ef5c6df5..d51f038eaf72 100644
--- a/pkgs/by-name/ku/kubectl-neat/package.nix
+++ b/pkgs/by-name/ku/kubectl-neat/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "itaysk";
     repo = "kubectl-neat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j8v0zJDBqHzmLamIZPW9UvMe9bv/m3JUQKY+wsgMTFk=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-node-shell/package.nix b/pkgs/by-name/ku/kubectl-node-shell/package.nix
index 8b1afed54972..3c1a869102c1 100644
--- a/pkgs/by-name/ku/kubectl-node-shell/package.nix
+++ b/pkgs/by-name/ku/kubectl-node-shell/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kvaps";
     repo = "kubectl-node-shell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jLwnWp/XS4SOyf5v46DPy2Nc6LatF6AzNvHiGVNpsto=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-tree/package.nix b/pkgs/by-name/ku/kubectl-tree/package.nix
index 46b9f9674a7e..05f48419d64b 100644
--- a/pkgs/by-name/ku/kubectl-tree/package.nix
+++ b/pkgs/by-name/ku/kubectl-tree/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ahmetb";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-J4/fiTECcTE0N2E+MPrQKE9Msvvm8DLdvLbnDUnUo74=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-validate/package.nix b/pkgs/by-name/ku/kubectl-validate/package.nix
index 25209129c5d2..ad3f86e9efdd 100644
--- a/pkgs/by-name/ku/kubectl-validate/package.nix
+++ b/pkgs/by-name/ku/kubectl-validate/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "kubectl-validate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0r3ffrZSRtSe5CgvocRhoJz0zqUsx9vtABP2h1o9vCw=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-view-secret/package.nix b/pkgs/by-name/ku/kubectl-view-secret/package.nix
index 63df059f6cb3..7f6d5dead07b 100644
--- a/pkgs/by-name/ku/kubectl-view-secret/package.nix
+++ b/pkgs/by-name/ku/kubectl-view-secret/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "elsesiy";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-l7pyS3eQDETrGCN7+Q0xhm+9Ocpk+qxTNMu4SMq+IDU=";
   };
 
diff --git a/pkgs/by-name/ku/kubectx/package.nix b/pkgs/by-name/ku/kubectx/package.nix
index 1cfcb192b3d1..66c955e6e283 100644
--- a/pkgs/by-name/ku/kubectx/package.nix
+++ b/pkgs/by-name/ku/kubectx/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ahmetb";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HVmtUhdMjbkyMpTgbsr5Mm286F9Q7zbc5rOxi7OBZEg=";
   };
 
diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix
index 68a4dcce1135..562c9825f801 100644
--- a/pkgs/by-name/ku/kubedock/package.nix
+++ b/pkgs/by-name/ku/kubedock/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "joyrex2001";
     repo = "kubedock";
-    rev = version;
+    tag = version;
     hash = "sha256-O8heDxfYmBV4sSdBZOQri+FMHJMrRW9+kai1S62ffQY=";
   };
 
diff --git a/pkgs/by-name/ku/kubedog/package.nix b/pkgs/by-name/ku/kubedog/package.nix
index 25367f1a6d08..bc91f260448c 100644
--- a/pkgs/by-name/ku/kubedog/package.nix
+++ b/pkgs/by-name/ku/kubedog/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "werf";
     repo = "kubedog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xBTz1Ux2W0A0leOPNu0yONiz55LiYcYiviKEi8xsUTU=";
   };
 
diff --git a/pkgs/by-name/ku/kubefetch/package.nix b/pkgs/by-name/ku/kubefetch/package.nix
index 4a771efc824a..6f81c9636e6c 100644
--- a/pkgs/by-name/ku/kubefetch/package.nix
+++ b/pkgs/by-name/ku/kubefetch/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jkulzer";
     repo = "kubefetch";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-1NbbQ9f81DbfvpGayhMYdOTOZrDg2hdZi+qUOr2mntY=";
   };
 
diff --git a/pkgs/by-name/ku/kubefwd/package.nix b/pkgs/by-name/ku/kubefwd/package.nix
index de0b6d9003e0..72c03033e8b6 100644
--- a/pkgs/by-name/ku/kubefwd/package.nix
+++ b/pkgs/by-name/ku/kubefwd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "txn2";
     repo = "kubefwd";
-    rev = version;
+    tag = version;
     hash = "sha256-xTd/1h9fW2GbZ2u3RsExbQouRZot9CUDuqNLItRySxM=";
   };
 
diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix
index 30e5da39200f..a130356f9821 100644
--- a/pkgs/by-name/ku/kubelogin-oidc/package.nix
+++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "int128";
     repo = "kubelogin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fX0Hjb0j6KbdGuFdy5MaZc3zL/EOVXFTTNlIUQZjnsc=";
   };
 
diff --git a/pkgs/by-name/ku/kubelogin/package.nix b/pkgs/by-name/ku/kubelogin/package.nix
index eb184bcb2cb1..818951642aff 100644
--- a/pkgs/by-name/ku/kubelogin/package.nix
+++ b/pkgs/by-name/ku/kubelogin/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-upToPltob3P8EwDUbl9F3COGCxnz6NZNrZ/wxv5pBQU=";
   };
 
diff --git a/pkgs/by-name/ku/kubemq-community/package.nix b/pkgs/by-name/ku/kubemq-community/package.nix
index b531534b03b5..7fad5995a02e 100644
--- a/pkgs/by-name/ku/kubemq-community/package.nix
+++ b/pkgs/by-name/ku/kubemq-community/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubemq-io";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oAo/O3T3wtfCumT2kjoyXKfCFHijVzSmxhslaKaeF3Y=";
   };
 
diff --git a/pkgs/by-name/ku/kubemqctl/package.nix b/pkgs/by-name/ku/kubemqctl/package.nix
index f8d0960db38d..2470651d8bc1 100644
--- a/pkgs/by-name/ku/kubemqctl/package.nix
+++ b/pkgs/by-name/ku/kubemqctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubemq-io";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PaB5+Sy2ccEQz+wuz88w/M4NXayKA41/ugSPJdtjfiE=";
   };
 
diff --git a/pkgs/by-name/ku/kubent/package.nix b/pkgs/by-name/ku/kubent/package.nix
index c49a00940220..f2e88651de77 100644
--- a/pkgs/by-name/ku/kubent/package.nix
+++ b/pkgs/by-name/ku/kubent/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "doitintl";
     repo = "kube-no-trouble";
-    rev = version;
+    tag = version;
     hash = "sha256-7bn7DxbZ/Nqob7ZEWRy1UVg97FiJN5JWEgpH1CDz6jQ=";
   };
 
diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix
index 8b4f4e9c1b9e..0068b7fe7990 100644
--- a/pkgs/by-name/ku/kubeone/package.nix
+++ b/pkgs/by-name/ku/kubeone/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubermatic";
     repo = "kubeone";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pMY86Ucp5nuH63YgAh60l3WZYDPvM8LcTaV9QS2BzAA=";
   };
 
diff --git a/pkgs/by-name/ku/kubeprompt/package.nix b/pkgs/by-name/ku/kubeprompt/package.nix
index 4b2488f07a4a..76a942089db6 100644
--- a/pkgs/by-name/ku/kubeprompt/package.nix
+++ b/pkgs/by-name/ku/kubeprompt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jlesquembre";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-is6Rz0tw/g4HyGJMTHj+r390HZAytVhfGVRzZ5wKZkU=";
   };
 
diff --git a/pkgs/by-name/ku/kubepug/package.nix b/pkgs/by-name/ku/kubepug/package.nix
index 339039be21b4..4bcecba841eb 100644
--- a/pkgs/by-name/ku/kubepug/package.nix
+++ b/pkgs/by-name/ku/kubepug/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubepug";
     repo = "kubepug";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VNxaYQy81U0JWd6KS0jCvMexpyWL4v1cKpjxLRkxBLE=";
   };
 
diff --git a/pkgs/by-name/ku/kubergrunt/package.nix b/pkgs/by-name/ku/kubergrunt/package.nix
index e5900a7132c1..b52cbfa8489b 100644
--- a/pkgs/by-name/ku/kubergrunt/package.nix
+++ b/pkgs/by-name/ku/kubergrunt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "kubergrunt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ros126t4QEhWnItScaY1ntcGI/YMpeC2f2yQrzSZ7w4=";
   };
 
diff --git a/pkgs/by-name/ku/kubernetes-code-generator/package.nix b/pkgs/by-name/ku/kubernetes-code-generator/package.nix
index 006a7ace7cac..f03b5b9bee16 100644
--- a/pkgs/by-name/ku/kubernetes-code-generator/package.nix
+++ b/pkgs/by-name/ku/kubernetes-code-generator/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GKF6DXvyZujInOZbV0ePUu71BEl1s/chNTN1PucdIYw=";
   };
 
diff --git a/pkgs/by-name/ku/kubernetes-metrics-server/package.nix b/pkgs/by-name/ku/kubernetes-metrics-server/package.nix
index 9264facf3ae3..946d334d7b72 100644
--- a/pkgs/by-name/ku/kubernetes-metrics-server/package.nix
+++ b/pkgs/by-name/ku/kubernetes-metrics-server/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "metrics-server";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-e9iFOe2iZaKbYNUk0vuyzcGDCNxot34kRH06L5UQs4I=";
   };
 
diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix
index 27027d2bbefd..bac6519c034b 100644
--- a/pkgs/by-name/ku/kubernetes-polaris/package.nix
+++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "polaris";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/pj52K33IimsnrSoSRhHy+WgzzRwGZQiBsNf1+L1B3c=";
   };
 
diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix
index ae7316ffe7be..00a223f705b6 100644
--- a/pkgs/by-name/ku/kubernix/package.nix
+++ b/pkgs/by-name/ku/kubernix/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "saschagrunert";
     repo = "kubernix";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "04dzfdzjwcwwaw9min322g30q0saxpq5kqzld4f22fmk820ki6gp";
   };
 
diff --git a/pkgs/by-name/ku/kubeseal/package.nix b/pkgs/by-name/ku/kubeseal/package.nix
index 8855283133c2..141c62f5f008 100644
--- a/pkgs/by-name/ku/kubeseal/package.nix
+++ b/pkgs/by-name/ku/kubeseal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bitnami-labs";
     repo = "sealed-secrets";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-unPqjheT8/2gVQAwvzOvHtG4qTqggf9o0M5iLwl1eh4=";
   };
 
diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix
index 8a1ad1760eba..ccb00b2c3f9c 100644
--- a/pkgs/by-name/ku/kubeshark/package.nix
+++ b/pkgs/by-name/ku/kubeshark/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubeshark";
     repo = "kubeshark";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Mxj42D+MxYn0/csI/ZsMdU8xOz8P/IzsHr7vtmlQPa0=";
   };
 
diff --git a/pkgs/by-name/ku/kubespy/package.nix b/pkgs/by-name/ku/kubespy/package.nix
index 6a28cc19c305..f686a43ffb87 100644
--- a/pkgs/by-name/ku/kubespy/package.nix
+++ b/pkgs/by-name/ku/kubespy/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   version = "0.6.3";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "pulumi";
     repo = "kubespy";
     sha256 = "sha256-l/vOIFvCQHq+gOr38SpVZ8ShZdI1bP4G5PY4hKhkCU0=";
diff --git a/pkgs/by-name/ku/kubeswitch/package.nix b/pkgs/by-name/ku/kubeswitch/package.nix
index e87c44dbc967..a5ee795151f2 100644
--- a/pkgs/by-name/ku/kubeswitch/package.nix
+++ b/pkgs/by-name/ku/kubeswitch/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "danielfoehrKn";
     repo = "kubeswitch";
-    rev = version;
+    tag = version;
     hash = "sha256-899hHqXxx2OuWII4ego6F62EnFIszaYqTTcU9wO2csw=";
   };
 
diff --git a/pkgs/by-name/ku/kubetail/package.nix b/pkgs/by-name/ku/kubetail/package.nix
index dd34d5042548..714bbd5bb6c6 100644
--- a/pkgs/by-name/ku/kubetail/package.nix
+++ b/pkgs/by-name/ku/kubetail/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "johanhaleby";
     repo = "kubetail";
-    rev = version;
+    tag = version;
     sha256 = "sha256-RbbZHKXRtbs42cCbw+xb8TLul6ebUeCiNclMFF39c3M=";
   };
 
diff --git a/pkgs/by-name/ku/kubevela/package.nix b/pkgs/by-name/ku/kubevela/package.nix
index 7c794db80f55..6049eb6f4363 100644
--- a/pkgs/by-name/ku/kubevela/package.nix
+++ b/pkgs/by-name/ku/kubevela/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubevela";
     repo = "kubevela";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YfIYQSJynI4Ou4oiq7yxZlfdCnpuwsuUUPYKDmFdIKg=";
   };
 
diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix
index ba8da889fd96..da319e4fbb27 100644
--- a/pkgs/by-name/ku/kubevirt/package.nix
+++ b/pkgs/by-name/ku/kubevirt/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubevirt";
     repo = "kubevirt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Hjqk3A/GtpcT++GyiYBL24X99IrwXzQMXRqTKgOD6Ak=";
   };
 
diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix
index dda318d49bd0..1c84b703cdcf 100644
--- a/pkgs/by-name/ku/kubevpn/package.nix
+++ b/pkgs/by-name/ku/kubevpn/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "KubeNetworks";
     repo = "kubevpn";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E/1MV/EjG9MU2xiCFC0jAvIwSAfyNCrhKcfedH5DPN0=";
   };
 
diff --git a/pkgs/by-name/ku/kubexit/package.nix b/pkgs/by-name/ku/kubexit/package.nix
index 477e380c956c..73b420638502 100644
--- a/pkgs/by-name/ku/kubexit/package.nix
+++ b/pkgs/by-name/ku/kubexit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "karlkfi";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Kzom+/Xad6SI9czw4xvmTbJ+bNB9mF2oSq37IFn384U=";
   };
 
diff --git a/pkgs/by-name/ku/kulala-fmt/package.nix b/pkgs/by-name/ku/kulala-fmt/package.nix
index 1644e7900e98..fe58134ba8fd 100644
--- a/pkgs/by-name/ku/kulala-fmt/package.nix
+++ b/pkgs/by-name/ku/kulala-fmt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mistweaverco";
     repo = "kulala-fmt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yq7DMrt+g5wM/tynI7Cf6MBJs/d+fP3IppndKnTJMTw=";
   };
 
diff --git a/pkgs/by-name/ku/kuro/package.nix b/pkgs/by-name/ku/kuro/package.nix
index 5fb26933e51e..8094bd67d14c 100644
--- a/pkgs/by-name/ku/kuro/package.nix
+++ b/pkgs/by-name/ku/kuro/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "davidsmorais";
     repo = "kuro";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9Z/r5T5ZI5aBghHmwiJcft/x/wTRzDlbIupujN2RFfU=";
   };
 
diff --git a/pkgs/by-name/ku/kuttl/package.nix b/pkgs/by-name/ku/kuttl/package.nix
index a2c44232cc1b..e35a73eaae12 100644
--- a/pkgs/by-name/ku/kuttl/package.nix
+++ b/pkgs/by-name/ku/kuttl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kudobuilder";
     repo = "kuttl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-M9sZNrze7v1dj0j+hOo30kB87YKxFF/hZJ7R2C/Pzwg=";
   };
 
diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix
index 7ab72bcd1d9d..20c2a78d6ad7 100644
--- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix
+++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kyverno";
     repo = "chainsaw";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BxSJu71/KhVtWEOw2V+nteZnvyyoGvrbWQmHGqDtLa0=";
   };
 
diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix
index d11556754e3b..8f6295174dce 100644
--- a/pkgs/by-name/ky/kyverno/package.nix
+++ b/pkgs/by-name/ky/kyverno/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kyverno";
     repo = "kyverno";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XkFxgBn4x/2H7j0nZufzmfGltY9ROOjEWqxmQrO7RNw=";
   };
 
diff --git a/pkgs/by-name/la/LAStools/package.nix b/pkgs/by-name/la/LAStools/package.nix
index e91b8b224de7..469b59e0c6a5 100644
--- a/pkgs/by-name/la/LAStools/package.nix
+++ b/pkgs/by-name/la/LAStools/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LAStools";
     repo = "LAStools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-IyZjM8YvIVB0VPNuEhmHHw7EuKw5RanB2qhCnBD1fRY=";
   };
 
diff --git a/pkgs/by-name/la/lab/package.nix b/pkgs/by-name/la/lab/package.nix
index 6d3b4cc4b53d..7d413ddec614 100644
--- a/pkgs/by-name/la/lab/package.nix
+++ b/pkgs/by-name/la/lab/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zaquestion";
     repo = "lab";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VCvjP/bSd/0ywvNWPsseXn/SPkdp+BsXc/jTvB11EOk=";
   };
 
diff --git a/pkgs/by-name/la/labelImg/package.nix b/pkgs/by-name/la/labelImg/package.nix
index b61092095590..a8f617face4d 100644
--- a/pkgs/by-name/la/labelImg/package.nix
+++ b/pkgs/by-name/la/labelImg/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tzutalin";
     repo = "labelImg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU=";
   };
   nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix
index 85a5c338e4c9..1c914efc6c57 100644
--- a/pkgs/by-name/la/lact/package.nix
+++ b/pkgs/by-name/la/lact/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ilya-zlobintsev";
     repo = "LACT";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-goNwLtVjNY3O/BhFrCcM3X11dtM34XgfHL6bh+YFoIY=";
   };
 
diff --git a/pkgs/by-name/la/lalrpop/package.nix b/pkgs/by-name/la/lalrpop/package.nix
index 35c040efdf89..100f7129bbae 100644
--- a/pkgs/by-name/la/lalrpop/package.nix
+++ b/pkgs/by-name/la/lalrpop/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lalrpop";
     repo = "lalrpop";
-    rev = version;
+    tag = version;
     hash = "sha256-cFwBck+bdOjhF6rQQj03MOO+XCsrII5c4Xvhsw12ETA=";
   };
 
diff --git a/pkgs/by-name/la/lambda-delta/package.nix b/pkgs/by-name/la/lambda-delta/package.nix
index 79cad5959801..f35060da4121 100644
--- a/pkgs/by-name/la/lambda-delta/package.nix
+++ b/pkgs/by-name/la/lambda-delta/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dseagrav";
     repo = "ld";
-    rev = version;
+    tag = version;
     sha256 = "02m43fj9dzc1i1jl01qwnhjiq1rh03jw1xq59sx2h3bhn7dk941x";
   };
 
diff --git a/pkgs/by-name/la/laminar/package.nix b/pkgs/by-name/la/laminar/package.nix
index 9d5a1d2f7e9b..62af738e4a0a 100644
--- a/pkgs/by-name/la/laminar/package.nix
+++ b/pkgs/by-name/la/laminar/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ohwgiles";
     repo = "laminar";
-    rev = version;
+    tag = version;
     hash = "sha256-eo5WzvmjBEe0LAfZdQ/U0XepEE2kdWKKiyE4HOi3RXk=";
   };
   patches = [ ./patches/no-network.patch ];
diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix
index a32cc9cc4956..bcc3ec21e6ca 100644
--- a/pkgs/by-name/la/lan-mouse/package.nix
+++ b/pkgs/by-name/la/lan-mouse/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "feschber";
     repo = "lan-mouse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ofiNgJbmf35pfRvZB3ZmMkCJuM7yYgNL+Dd5mZZqyNk=";
   };
 
diff --git a/pkgs/by-name/la/lanzaboote-tool/package.nix b/pkgs/by-name/la/lanzaboote-tool/package.nix
index e6883bb8a15e..e40a5f2ee3ca 100644
--- a/pkgs/by-name/la/lanzaboote-tool/package.nix
+++ b/pkgs/by-name/la/lanzaboote-tool/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "lanzaboote";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=";
   };
 
diff --git a/pkgs/by-name/la/lastpass-cli/package.nix b/pkgs/by-name/la/lastpass-cli/package.nix
index 6fb4c732c92a..2284cb85bf58 100644
--- a/pkgs/by-name/la/lastpass-cli/package.nix
+++ b/pkgs/by-name/la/lastpass-cli/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lastpass";
     repo = "lastpass-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Q0ZG5Ehg29STLeAerMoLfzjaH9JyPk7269RgiPmDJV8=";
   };
 
diff --git a/pkgs/by-name/la/laszip/package.nix b/pkgs/by-name/la/laszip/package.nix
index 270d715db99e..495a194f99c2 100644
--- a/pkgs/by-name/la/laszip/package.nix
+++ b/pkgs/by-name/la/laszip/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "LASzip";
     repo = "LASzip";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-9fzal54YaocONtguOCxnP7h1LejQPQ0dKFiCzfvTjCY=";
   };
 
diff --git a/pkgs/by-name/la/latex2html/package.nix b/pkgs/by-name/la/latex2html/package.nix
index 73d2ab3f4238..07362c435595 100644
--- a/pkgs/by-name/la/latex2html/package.nix
+++ b/pkgs/by-name/la/latex2html/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xylIU2GY/1t9mA8zJzEjHwAIlvVxZmUAUdQ/IXEy+Wg=";
   };
 
diff --git a/pkgs/by-name/la/lavanda-gtk-theme/package.nix b/pkgs/by-name/la/lavanda-gtk-theme/package.nix
index 3a77a82fc7d1..e6b9f590640b 100644
--- a/pkgs/by-name/la/lavanda-gtk-theme/package.nix
+++ b/pkgs/by-name/la/lavanda-gtk-theme/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "Lavanda-gtk-theme";
-    rev = version;
+    tag = version;
     hash = "sha256-2ryhdgLHSNXdV9QesdB0rpXkr3i2vVqXWDDC5fNuL1c=";
   };
 
diff --git a/pkgs/by-name/la/lavat/package.nix b/pkgs/by-name/la/lavat/package.nix
index 12beae650e52..07aacbf3967e 100644
--- a/pkgs/by-name/la/lavat/package.nix
+++ b/pkgs/by-name/la/lavat/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "AngelJumbo";
     repo = "lavat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wGtuYgZS03gXYgdNdugGu/UlROQTrQ3C1inJ/aTUBKk=";
   };
 
diff --git a/pkgs/by-name/la/layan-gtk-theme/package.nix b/pkgs/by-name/la/layan-gtk-theme/package.nix
index aea277dcadf0..f4cae56bb072 100644
--- a/pkgs/by-name/la/layan-gtk-theme/package.nix
+++ b/pkgs/by-name/la/layan-gtk-theme/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "layan-gtk-theme";
-    rev = version;
+    tag = version;
     sha256 = "sha256-R8QxDMOXzDIfioAvvescLAu6NjJQ9zhf/niQTXZr+yA=";
   };
 
diff --git a/pkgs/by-name/la/lazycli/package.nix b/pkgs/by-name/la/lazycli/package.nix
index 8352f93ccfeb..e3d867328dc8 100644
--- a/pkgs/by-name/la/lazycli/package.nix
+++ b/pkgs/by-name/la/lazycli/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazycli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1qq167hc7pp9l0m40ysphfljakmm8hjjnhpldvb0kbc825h0z8z5";
   };
 
diff --git a/pkgs/by-name/la/lazydocker/package.nix b/pkgs/by-name/la/lazydocker/package.nix
index d3b35e970731..5d4b3553fccd 100644
--- a/pkgs/by-name/la/lazydocker/package.nix
+++ b/pkgs/by-name/la/lazydocker/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazydocker";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cVjDdrxmGt+hj/WWP9B3BT739k9SSr4ryye5qWb3XNM=";
   };
 
diff --git a/pkgs/by-name/la/lazyjj/package.nix b/pkgs/by-name/la/lazyjj/package.nix
index 894d869c7958..d1ab22328f14 100644
--- a/pkgs/by-name/la/lazyjj/package.nix
+++ b/pkgs/by-name/la/lazyjj/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Cretezy";
     repo = "lazyjj";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Pz2q+uyr8r5G5Zs5mC/nvHdK6hTpiLBzjgUmvd5dwZw=";
   };
 
diff --git a/pkgs/by-name/la/lazymc/package.nix b/pkgs/by-name/la/lazymc/package.nix
index d598a4ca7c07..bb90466cdb4a 100644
--- a/pkgs/by-name/la/lazymc/package.nix
+++ b/pkgs/by-name/la/lazymc/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "timvisee";
     repo = "lazymc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uMjM3w78qWnB/sNXRcxl30KJRm0I3BPEOr5IRU8FI0s=";
   };
 
diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix
index 9ca3eb727e77..9d05b6540300 100644
--- a/pkgs/by-name/la/lazysql/package.nix
+++ b/pkgs/by-name/la/lazysql/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jorgerojas26";
     repo = "lazysql";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fpzcCCLkUJGuTfQiADwLL2238LP0TJJMYAXUwCfPkFM=";
   };
 
diff --git a/pkgs/by-name/lb/lbzip2/package.nix b/pkgs/by-name/lb/lbzip2/package.nix
index b08fa3c46516..3b544a0e5664 100644
--- a/pkgs/by-name/lb/lbzip2/package.nix
+++ b/pkgs/by-name/lb/lbzip2/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kjn";
     repo = "lbzip2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8";
   };
 
diff --git a/pkgs/by-name/lc/lcdf-typetools/package.nix b/pkgs/by-name/lc/lcdf-typetools/package.nix
index 4cac4a5b3e09..cd4aaf01053b 100644
--- a/pkgs/by-name/lc/lcdf-typetools/package.nix
+++ b/pkgs/by-name/lc/lcdf-typetools/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kohler";
     repo = "lcdf-typetools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hoILYYCef2R1v6aN9V+FoYnXYaKsnGN2jlpb/QFAN/w=";
   };
 
diff --git a/pkgs/by-name/lc/lcdproc/package.nix b/pkgs/by-name/lc/lcdproc/package.nix
index 81c2971b9103..91ff86e4e062 100644
--- a/pkgs/by-name/lc/lcdproc/package.nix
+++ b/pkgs/by-name/lc/lcdproc/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lcdproc";
     repo = "lcdproc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1r885zv1gsh88j43x6fvzbdgfkh712a227d369h4fdcbnnfd0kpm";
   };
 
diff --git a/pkgs/by-name/lc/lcm/package.nix b/pkgs/by-name/lc/lcm/package.nix
index dd2c4df711f6..66c5d8409a2c 100644
--- a/pkgs/by-name/lc/lcm/package.nix
+++ b/pkgs/by-name/lc/lcm/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lcm-proj";
     repo = "lcm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-043AJzalfx+qcCoxQgPU4T/DcUH0pXOE4v1aJaW3aXs=";
   };
 
diff --git a/pkgs/by-name/lc/lcov/package.nix b/pkgs/by-name/lc/lcov/package.nix
index bde039d51a66..49fbaa9205f0 100644
--- a/pkgs/by-name/lc/lcov/package.nix
+++ b/pkgs/by-name/lc/lcov/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-test-project";
     repo = "lcov";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-31318or9AQ7iyu9DNQEvf5jaDzrneOOqOXu0HF1eag4=";
   };
 
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/ldproxy/package.nix b/pkgs/by-name/ld/ldproxy/package.nix
index a1816eccef18..5f88b255bf57 100644
--- a/pkgs/by-name/ld/ldproxy/package.nix
+++ b/pkgs/by-name/ld/ldproxy/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "embuild";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YH2CPb3uBlPncd+KkP25xhCVvDB7HDxJuSqWOJ1LT3k=";
   };
 
diff --git a/pkgs/by-name/le/leaf/package.nix b/pkgs/by-name/le/leaf/package.nix
index 31cac3531b68..c7db20645ffa 100644
--- a/pkgs/by-name/le/leaf/package.nix
+++ b/pkgs/by-name/le/leaf/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "IogaMaster";
     repo = "leaf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-y0NO9YcOO7T7Cqc+/WeactwBAkeUqdCca87afOlO1Bk=";
   };
 
diff --git a/pkgs/by-name/le/leaps/package.nix b/pkgs/by-name/le/leaps/package.nix
index 6c053c8343c2..b3c58dafafa6 100644
--- a/pkgs/by-name/le/leaps/package.nix
+++ b/pkgs/by-name/le/leaps/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Jeffail";
     repo = "leaps";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9AYE8+K6B6/odwNR+UhTTqmJ1RD6HhKvtC3WibWUZic=";
   };
 
diff --git a/pkgs/by-name/le/leatherman/package.nix b/pkgs/by-name/le/leatherman/package.nix
index b73192f0b788..19bc24ffbffe 100644
--- a/pkgs/by-name/le/leatherman/package.nix
+++ b/pkgs/by-name/le/leatherman/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "sha256-rfh4JLnLekx9UhyLH6eDJUeItPROmY/Lc6mcWpbGb3s=";
-    rev = version;
+    tag = version;
     repo = "leatherman";
     owner = "puppetlabs";
   };
diff --git a/pkgs/by-name/le/ledger-autosync/package.nix b/pkgs/by-name/le/ledger-autosync/package.nix
index 16c273f75a78..58c1b1d84d11 100644
--- a/pkgs/by-name/le/ledger-autosync/package.nix
+++ b/pkgs/by-name/le/ledger-autosync/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "egh";
     repo = "ledger-autosync";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bbFjDdxYr85OPjdvY3JYtCe/8Epwi+8JN60PKVKbqe0=";
   };
 
diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix
index ab0bac61435d..2807230604b5 100644
--- a/pkgs/by-name/le/ledger/package.nix
+++ b/pkgs/by-name/le/ledger/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ledger";
     repo = "ledger";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Uym4s8EyzXHlISZqThcb6P1H5bdgD9vmdIOLkk5ikG0=";
   };
 
diff --git a/pkgs/by-name/le/ledger2beancount/package.nix b/pkgs/by-name/le/ledger2beancount/package.nix
index ee6c17494df0..9932a0ba4e65 100644
--- a/pkgs/by-name/le/ledger2beancount/package.nix
+++ b/pkgs/by-name/le/ledger2beancount/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "beancount";
     repo = "ledger2beancount";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2LIP3ljK1HMAwjk2ueIf9pFL+UUnGDgx9GYNtRztdFY=";
   };
 
diff --git a/pkgs/by-name/le/ledmon/package.nix b/pkgs/by-name/le/ledmon/package.nix
index 767467c7ffec..a377b2ab0856 100644
--- a/pkgs/by-name/le/ledmon/package.nix
+++ b/pkgs/by-name/le/ledmon/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "ledmon";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1lz59606vf2sws5xwijxyffm8kxcf8p9qbdpczsq1b5mm3dk6lvp";
   };
 
diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix
index 8293ff5bd89a..b4b641e371af 100644
--- a/pkgs/by-name/le/leetgo/package.nix
+++ b/pkgs/by-name/le/leetgo/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "j178";
     repo = "leetgo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KEfRsaBsMCKO66HW71gNzHzZkun1yo6a05YqAvafomM=";
   };
 
diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index cfdd201fcd93..5857eddff7c5 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -15,7 +15,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "evilmartians";
     repo = "lefthook";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JBDEVgMUVZceXSppq26xJcsKRlHmIBK5UN5uehmG/VU=";
   };
 
diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix
index 99e1862dd5f9..bef9442cc1f5 100644
--- a/pkgs/by-name/le/legba/package.nix
+++ b/pkgs/by-name/le/legba/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "legba";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ioH/dy+d20p81iLLIcer+1fVib60TJ5Ezr6UlsL+F9g=";
   };
 
diff --git a/pkgs/by-name/le/legendary-heroic/package.nix b/pkgs/by-name/le/legendary-heroic/package.nix
index c0fbd88df158..e7eddad54a40 100644
--- a/pkgs/by-name/le/legendary-heroic/package.nix
+++ b/pkgs/by-name/le/legendary-heroic/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "legendary";
-    rev = version;
+    tag = version;
     sha256 = "sha256-+aywgd5RZfkmVuA0MaF2/Ie4a5If/zQxvVCcTfGpQpE=";
   };
 
diff --git a/pkgs/by-name/le/legit-web/package.nix b/pkgs/by-name/le/legit-web/package.nix
index e39960f67ef2..f436b61d7c30 100644
--- a/pkgs/by-name/le/legit-web/package.nix
+++ b/pkgs/by-name/le/legit-web/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "legit";
     owner = "icyphox";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2XeIAeneSKf8TSWOunvRJ7N+3IrmOUjS79ZubsGne9E=";
   };
 
diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix
index 3ad399a88725..e1ce477d849b 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-xGC3ZGQ1dA0485/IPHsmX2NO1QOPp/nHMLBZvcC4Om8=";
     # Lemminx reads this git information at runtime from a git.properties
     # file on the classpath
diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix
index 5e4d0d09e11e..61c75c07319d 100644
--- a/pkgs/by-name/le/lemmy-help/package.nix
+++ b/pkgs/by-name/le/lemmy-help/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "numToStr";
     repo = "lemmy-help";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HcIvHuuzQj4HsRJyn1A9nXiGDGAcz1nqTsC7sROt7OI=";
   };
 
diff --git a/pkgs/by-name/le/lensfun/package.nix b/pkgs/by-name/le/lensfun/package.nix
index c6d058c55b67..3c9a70703927 100644
--- a/pkgs/by-name/le/lensfun/package.nix
+++ b/pkgs/by-name/le/lensfun/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "lensfun";
     repo = "lensfun";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FyYilIz9ssSHG6S02Z2bXy7fjSY51+SWW3v8bm7sLvY=";
   };
 
diff --git a/pkgs/by-name/le/leptonica/package.nix b/pkgs/by-name/le/leptonica/package.nix
index c9950cba2174..b8570d136b5f 100644
--- a/pkgs/by-name/le/leptonica/package.nix
+++ b/pkgs/by-name/le/leptonica/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DanBloomBerg";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-meiSi0qL4i/KCMe5wsRK1/mbuRLHUb55DDOnxkrXZSs=";
   };
 
diff --git a/pkgs/by-name/le/leptosfmt/package.nix b/pkgs/by-name/le/leptosfmt/package.nix
index 99e546aa1600..48d9b4344838 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/le/lessc/package.nix b/pkgs/by-name/le/lessc/package.nix
index ae8dd4d91fc1..082f6d6d96ff 100644
--- a/pkgs/by-name/le/lessc/package.nix
+++ b/pkgs/by-name/le/lessc/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "less";
     repo = "less.js";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vO/1laFb1yC+OESXTx9KuGdwSNC9Iv49F3V7kfXnyJU=";
   };
   sourceRoot = "${src.name}/packages/less";
diff --git a/pkgs/by-name/le/lesspass-cli/package.nix b/pkgs/by-name/le/lesspass-cli/package.nix
index 5ef005aec7e8..b435a9fe7a82 100644
--- a/pkgs/by-name/le/lesspass-cli/package.nix
+++ b/pkgs/by-name/le/lesspass-cli/package.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = repo;
     repo = repo;
-    rev = version;
+    tag = version;
     sha256 = "126zk248s9r72qk9b8j27yvb8gglw49kazwz0sd69b5kkxvhz2dh";
   };
   sourceRoot = "${src.name}/cli";
diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix
index 862d3119052b..6dc1e9236ef7 100644
--- a/pkgs/by-name/le/lesspipe/package.nix
+++ b/pkgs/by-name/le/lesspipe/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wofr06";
     repo = "lesspipe";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GCtcIXGrMH6LOKxjnB2SkUSChQnMj5d939i2atvqK+Q=";
   };
 
diff --git a/pkgs/by-name/le/levant/package.nix b/pkgs/by-name/le/levant/package.nix
index b998742f1c45..6fafe83d858d 100644
--- a/pkgs/by-name/le/levant/package.nix
+++ b/pkgs/by-name/le/levant/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "levant";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pinrBLzBMptqzMMiQmZob6B5rNNyQsaEkuECFFyTkrw=";
   };
 
diff --git a/pkgs/by-name/le/leveldb/package.nix b/pkgs/by-name/le/leveldb/package.nix
index 899135413fbc..de005198555a 100644
--- a/pkgs/by-name/le/leveldb/package.nix
+++ b/pkgs/by-name/le/leveldb/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "leveldb";
-    rev = version;
+    tag = version;
     sha256 = "sha256-RL+dfSFZZzWvUobSqiPbuC4nDiGzjIIukbVJZRacHbI=";
   };
 
diff --git a/pkgs/by-name/le/lexido/package.nix b/pkgs/by-name/le/lexido/package.nix
index 103d44b4763d..1435d0c4b67f 100644
--- a/pkgs/by-name/le/lexido/package.nix
+++ b/pkgs/by-name/le/lexido/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "micr0-dev";
     repo = "lexido";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zJP14dbC/Oz15CA3PRD0RfEYOrfulL2fWYHwFxhLKO4=";
   };
 
diff --git a/pkgs/by-name/li/lianad/package.nix b/pkgs/by-name/li/lianad/package.nix
index a22b73bb4982..d9fee6484568 100644
--- a/pkgs/by-name/li/lianad/package.nix
+++ b/pkgs/by-name/li/lianad/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wizardsardine";
     repo = "liana";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nuwbJxpcapk01qwGAZ2z9nKjHNqE1BMikz3hWrCAGsA=";
   };
 
diff --git a/pkgs/by-name/li/lib3270/package.nix b/pkgs/by-name/li/lib3270/package.nix
index 62fc3147541d..a5d29a19a49f 100644
--- a/pkgs/by-name/li/lib3270/package.nix
+++ b/pkgs/by-name/li/lib3270/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PerryWerneck";
     repo = "lib3270";
-    rev = version;
+    tag = version;
     hash = "sha256-w6Bg+TvSDAuZwtu/nyAIuq6pgheM5nXtfuryECfnKng=";
   };
 
diff --git a/pkgs/by-name/li/libGDSII/package.nix b/pkgs/by-name/li/libGDSII/package.nix
index bbf2e36a86be..3daee22fa242 100644
--- a/pkgs/by-name/li/libGDSII/package.nix
+++ b/pkgs/by-name/li/libGDSII/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "HomerReid";
     repo = "libGDSII";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EXEt7l69etcBdDdEDlD1ODOdhTBZCVjgY1jhRUDd/W0=";
   };
 
diff --git a/pkgs/by-name/li/libad9361/package.nix b/pkgs/by-name/li/libad9361/package.nix
index 6b0e62dcd159..968891b4491e 100644
--- a/pkgs/by-name/li/libad9361/package.nix
+++ b/pkgs/by-name/li/libad9361/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "analogdevicesinc";
     repo = "libad9361-iio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9e66qSrKpczatZY9lPAzi/6f7lHChnl2+Pih53oa28Y=";
   };
 
diff --git a/pkgs/by-name/li/libaosd/package.nix b/pkgs/by-name/li/libaosd/package.nix
index bc6aa9c97dd7..06de075d0ebb 100644
--- a/pkgs/by-name/li/libaosd/package.nix
+++ b/pkgs/by-name/li/libaosd/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "atheme-legacy";
     repo = "libaosd";
-    rev = version;
+    tag = version;
     sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a";
   };
 
diff --git a/pkgs/by-name/li/libappimage/package.nix b/pkgs/by-name/li/libappimage/package.nix
index 8d2a1013aff8..08e9e563fe9f 100644
--- a/pkgs/by-name/li/libappimage/package.nix
+++ b/pkgs/by-name/li/libappimage/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AppImageCommunity";
     repo = "libappimage";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-V9Ilo0zFo9Urke+jCA4CSQB5tpzLC/S5jmon+bA+TEU=";
   };
 
diff --git a/pkgs/by-name/li/libargon2/package.nix b/pkgs/by-name/li/libargon2/package.nix
index 0dbedc23577c..fcd9545f54ad 100644
--- a/pkgs/by-name/li/libargon2/package.nix
+++ b/pkgs/by-name/li/libargon2/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "P-H-C";
     repo = "phc-winner-argon2";
-    rev = version;
+    tag = version;
     sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i";
   };
 
diff --git a/pkgs/by-name/li/libargs/package.nix b/pkgs/by-name/li/libargs/package.nix
index a6841f541bf7..38ea107d88f0 100644
--- a/pkgs/by-name/li/libargs/package.nix
+++ b/pkgs/by-name/li/libargs/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Taywee";
     repo = "args";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2gH3h3QAl0+XVULt/fR2UUGKNIxTUmnRRdxPOFdpVy4=";
   };
 
diff --git a/pkgs/by-name/li/libaribcaption/package.nix b/pkgs/by-name/li/libaribcaption/package.nix
index 353f31c0e128..454049fe1274 100644
--- a/pkgs/by-name/li/libaribcaption/package.nix
+++ b/pkgs/by-name/li/libaribcaption/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xqq";
     repo = "libaribcaption";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-x6l0ZrTktSsqfDLVRXpQtUOruhfc8RF3yT991UVZiKA=";
   };
 
diff --git a/pkgs/by-name/li/libast/package.nix b/pkgs/by-name/li/libast/package.nix
index c7bbce07f119..4e0015d8b52b 100644
--- a/pkgs/by-name/li/libast/package.nix
+++ b/pkgs/by-name/li/libast/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mej";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-rnqToFi+d6D6O+JDHQxkVjTc/0RBag6Jqv4uDcE4PNc=";
   };
 
diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix
index 131574187409..53563268a58a 100644
--- a/pkgs/by-name/li/libation/package.nix
+++ b/pkgs/by-name/li/libation/package.nix
@@ -17,7 +17,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "rmcrackan";
     repo = "Libation";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FD3f2Cba1xN15BloyRQ/m/vDovhN8x0AlfeJk+LGVV4=";
   };
 
diff --git a/pkgs/by-name/li/libaudec/package.nix b/pkgs/by-name/li/libaudec/package.nix
index 073191c7a9d3..b804dcc12ec0 100644
--- a/pkgs/by-name/li/libaudec/package.nix
+++ b/pkgs/by-name/li/libaudec/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zrythm";
     repo = "libaudec";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8morbrq8zG+2N3ruMeJa85ci9P0wPQOfZ5H56diFEAo=";
   };
 
diff --git a/pkgs/by-name/li/libavif/package.nix b/pkgs/by-name/li/libavif/package.nix
index ab244bcc28ba..0f4c5304cb3c 100644
--- a/pkgs/by-name/li/libavif/package.nix
+++ b/pkgs/by-name/li/libavif/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AOMediaCodec";
     repo = "libavif";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kop1S4A/+hP2YdgoMXP7OMVPc2eoRnHpoBrPnW6KWyM=";
   };
 
diff --git a/pkgs/by-name/li/libayatana-appindicator/package.nix b/pkgs/by-name/li/libayatana-appindicator/package.nix
index 86eb9214c197..52aa0a365a07 100644
--- a/pkgs/by-name/li/libayatana-appindicator/package.nix
+++ b/pkgs/by-name/li/libayatana-appindicator/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "libayatana-appindicator";
-    rev = version;
+    tag = version;
     sha256 = "sha256-NzaWQBb2Ez1ik23wCgW1ZQh1/rY7GcPlLvaSgV7uXrA=";
   };
 
diff --git a/pkgs/by-name/li/libayatana-indicator/package.nix b/pkgs/by-name/li/libayatana-indicator/package.nix
index 852c61d3ea13..402ca77c49b4 100644
--- a/pkgs/by-name/li/libayatana-indicator/package.nix
+++ b/pkgs/by-name/li/libayatana-indicator/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "libayatana-indicator";
-    rev = version;
+    tag = version;
     sha256 = "sha256-OsguZ+jl274uPSCTFHq/ZwUE3yHR7MlUPHCpfmn1F7A=";
   };
 
diff --git a/pkgs/by-name/li/libb64/package.nix b/pkgs/by-name/li/libb64/package.nix
index 2f73c45d0d9e..5786052163ec 100644
--- a/pkgs/by-name/li/libb64/package.nix
+++ b/pkgs/by-name/li/libb64/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libb64";
     repo = "libb64";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9loDftr769qnIi00MueO86kjha2EiG9pnCLogp0Iq3c=";
   };
 
diff --git a/pkgs/by-name/li/libbase58/package.nix b/pkgs/by-name/li/libbase58/package.nix
index 94f7c4ec8bc7..427c009af46a 100644
--- a/pkgs/by-name/li/libbase58/package.nix
+++ b/pkgs/by-name/li/libbase58/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bitcoin";
     repo = "libbase58";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CU55V89GbcYnrhwTPFMd13EGeCk/x9nQswUZ2JsYsUU=";
   };
 
diff --git a/pkgs/by-name/li/libbaseencode/package.nix b/pkgs/by-name/li/libbaseencode/package.nix
index d37276b64c2a..32aa0466fd97 100644
--- a/pkgs/by-name/li/libbaseencode/package.nix
+++ b/pkgs/by-name/li/libbaseencode/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "paolostivanin";
     repo = "libbaseencode";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WiE+ZMX4oZieER1pu43aSWytkxfkQdX+S3JI98XPpL4=";
   };
 
diff --git a/pkgs/by-name/li/libblockdev/package.nix b/pkgs/by-name/li/libblockdev/package.nix
index c44e74aa0e59..2b03aa45a844 100644
--- a/pkgs/by-name/li/libblockdev/package.nix
+++ b/pkgs/by-name/li/libblockdev/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "libblockdev";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Q7610i+2PQi+Oza3c2SwPneljrb+1cuFA4K4DQTpt8A=";
   };
 
diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix
index 08f53f158f14..b3268c19459c 100644
--- a/pkgs/by-name/li/libbytesize/package.nix
+++ b/pkgs/by-name/li/libbytesize/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "libbytesize";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-scOnucn7xp6KKEtkpwfyrdzcntJF2l0h0fsQotcceLc=";
   };
 
diff --git a/pkgs/by-name/li/libcaca/package.nix b/pkgs/by-name/li/libcaca/package.nix
index d72b124854f0..024579e10370 100644
--- a/pkgs/by-name/li/libcaca/package.nix
+++ b/pkgs/by-name/li/libcaca/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cacalabs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw=";
   };
 
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/libccd/package.nix b/pkgs/by-name/li/libccd/package.nix
index 8040dd7adcd6..c1b9b9fae779 100644
--- a/pkgs/by-name/li/libccd/package.nix
+++ b/pkgs/by-name/li/libccd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "danfis";
     repo = "libccd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0sfmn5pd7k5kyhbxnd689xmsa5v843r7sska96dlysqpljd691jc";
   };
 
diff --git a/pkgs/by-name/li/libcdada/package.nix b/pkgs/by-name/li/libcdada/package.nix
index e944a448710e..c03efc84939b 100644
--- a/pkgs/by-name/li/libcdada/package.nix
+++ b/pkgs/by-name/li/libcdada/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "msune";
     repo = "libcdada";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-x//22FvgxIGL9H2whMAVCTyI9gAjlMWkEmpOAcoeOgE=";
   };
 
diff --git a/pkgs/by-name/li/libcgroup/package.nix b/pkgs/by-name/li/libcgroup/package.nix
index a796c9f5b9f0..75c8f08c1d19 100644
--- a/pkgs/by-name/li/libcgroup/package.nix
+++ b/pkgs/by-name/li/libcgroup/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libcgroup";
     repo = "libcgroup";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-CnejQcOyW3QzHuvsAdKe4M4XgmG9ufRaEBdO48+8ZqQ=";
   };
diff --git a/pkgs/by-name/li/libchardet/package.nix b/pkgs/by-name/li/libchardet/package.nix
index ba922c6f98cf..49face3750cd 100644
--- a/pkgs/by-name/li/libchardet/package.nix
+++ b/pkgs/by-name/li/libchardet/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Joungkyun";
     repo = "libchardet";
-    rev = version;
+    tag = version;
     sha256 = "sha256-JhEiWM3q8X+eEBHxv8k9yYOaTGoJOzI+/iFYC0gZJJs=";
   };
 
diff --git a/pkgs/by-name/li/libcint/package.nix b/pkgs/by-name/li/libcint/package.nix
index a8460668b908..15dd86cbbb6e 100644
--- a/pkgs/by-name/li/libcint/package.nix
+++ b/pkgs/by-name/li/libcint/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sunqm";
     repo = "libcint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-URJcC0ib87ejrTCglCjhC2tQHNc5TRvo4CQ52N58n+4=";
   };
 
diff --git a/pkgs/by-name/li/libcircle/package.nix b/pkgs/by-name/li/libcircle/package.nix
index fc59d955226c..5330271b5c4c 100644
--- a/pkgs/by-name/li/libcircle/package.nix
+++ b/pkgs/by-name/li/libcircle/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hpc";
     repo = "libcircle";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EfnoNL6wo6qQES6XzMtpTpYcsJ8V2gy32i26wiTldH0=";
   };
 
diff --git a/pkgs/by-name/li/libck/package.nix b/pkgs/by-name/li/libck/package.nix
index 13963ef721c1..dfd95d5ab0fe 100644
--- a/pkgs/by-name/li/libck/package.nix
+++ b/pkgs/by-name/li/libck/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "concurrencykit";
     repo = "ck";
-    rev = version;
+    tag = version;
     sha256 = "sha256-lxJ8WsZ3pBGf4sFYj5+tR37EYDZqpksaoohiIKA4pRI=";
   };
 
diff --git a/pkgs/by-name/li/libcmis/package.nix b/pkgs/by-name/li/libcmis/package.nix
index 6eb64381b979..17694faf89b5 100644
--- a/pkgs/by-name/li/libcmis/package.nix
+++ b/pkgs/by-name/li/libcmis/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tdf";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw=";
   };
 
diff --git a/pkgs/by-name/li/libconfuse/package.nix b/pkgs/by-name/li/libconfuse/package.nix
index 3a13c2a67780..7075ad658963 100644
--- a/pkgs/by-name/li/libconfuse/package.nix
+++ b/pkgs/by-name/li/libconfuse/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "1npfk5jv59kk4n8pkyx89fn9s6p8x3gbffs42jaw24frgxfgp8ca";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "libconfuse";
     owner = "martinh";
   };
diff --git a/pkgs/by-name/li/libcork/package.nix b/pkgs/by-name/li/libcork/package.nix
index ffcf1683533b..1d0d8bb3a12d 100644
--- a/pkgs/by-name/li/libcork/package.nix
+++ b/pkgs/by-name/li/libcork/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dcreager";
     repo = "libcork";
-    rev = version;
+    tag = version;
     sha256 = "152gqnmr6wfmflf5l6447am4clmg3p69pvy3iw7yhaawjqa797sk";
   };
 
diff --git a/pkgs/by-name/li/libcotp/package.nix b/pkgs/by-name/li/libcotp/package.nix
index 176ecf3f699d..5fa5b4149837 100644
--- a/pkgs/by-name/li/libcotp/package.nix
+++ b/pkgs/by-name/li/libcotp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "paolostivanin";
     repo = "libcotp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Ol/vWaXcbDcy+d8V//fK4SYUpnYmwuYJxkO3/+kqgdM=";
   };
 
diff --git a/pkgs/by-name/li/libcouchbase/package.nix b/pkgs/by-name/li/libcouchbase/package.nix
index 295bab16ea77..75539f7d07c4 100644
--- a/pkgs/by-name/li/libcouchbase/package.nix
+++ b/pkgs/by-name/li/libcouchbase/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
-    rev = version;
+    tag = version;
     sha256 = "sha256-dvXRbAdgb1WmKLijYkx6+js60ZxK1Tl2aTFSF7EpN74=";
   };
 
diff --git a/pkgs/by-name/li/libcpr/package.nix b/pkgs/by-name/li/libcpr/package.nix
index 7c917f58ea67..8b3c7fa4870c 100644
--- a/pkgs/by-name/li/libcpr/package.nix
+++ b/pkgs/by-name/li/libcpr/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "libcpr";
     repo = "cpr";
-    rev = version;
+    tag = version;
     hash = "sha256-nKX9AYVC4e3B+vOzXWZu8S4I5BNpKnqkFJ2e8bVAUE4=";
   };
 
diff --git a/pkgs/by-name/li/libcpr_1_10_5/package.nix b/pkgs/by-name/li/libcpr_1_10_5/package.nix
index 2164dcce331a..ec7a1181e132 100644
--- a/pkgs/by-name/li/libcpr_1_10_5/package.nix
+++ b/pkgs/by-name/li/libcpr_1_10_5/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "libcpr";
     repo = "cpr";
-    rev = version;
+    tag = version;
     hash = "sha256-mAuU2uF8d+aHvCmotgIrBi/pUp1jkP6G0f98M76zjOw=";
   };
 
diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix
index f7240bdabf54..ac1cb93104e5 100644
--- a/pkgs/by-name/li/libcpuid/package.nix
+++ b/pkgs/by-name/li/libcpuid/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "anrieff";
     repo = "libcpuid";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/28yo1V4/xYMirt2bNTB/l9Xl8NgRmxTitOW21TY8gE=";
   };
 
diff --git a/pkgs/by-name/li/libcsptr/package.nix b/pkgs/by-name/li/libcsptr/package.nix
index d055ec74479f..81db33a90b1a 100644
--- a/pkgs/by-name/li/libcsptr/package.nix
+++ b/pkgs/by-name/li/libcsptr/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Snaipe";
     repo = "libcsptr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0i1498h2i6zq3fn3zf3iw7glv6brn597165hnibgwccqa8sh3ich";
   };
 
diff --git a/pkgs/by-name/li/libctl/package.nix b/pkgs/by-name/li/libctl/package.nix
index 0ae65471c74c..77d9a9a0cfd4 100644
--- a/pkgs/by-name/li/libctl/package.nix
+++ b/pkgs/by-name/li/libctl/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = "libctl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "uOydBWYPXSBUi+4MM6FNx6B5l2to7Ny9Uc1MMTV9bGA=";
   };
 
diff --git a/pkgs/by-name/li/libcue/package.nix b/pkgs/by-name/li/libcue/package.nix
index e21cbea72161..1a38630a2900 100644
--- a/pkgs/by-name/li/libcue/package.nix
+++ b/pkgs/by-name/li/libcue/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lipnitsk";
     repo = "libcue";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZMUUa8CmpFNparPsM/P2yvRto9E85EdTxpID5sKQbNI=";
   };
 
diff --git a/pkgs/by-name/li/libcyaml/package.nix b/pkgs/by-name/li/libcyaml/package.nix
index beb458f400fc..ef41d42ba829 100644
--- a/pkgs/by-name/li/libcyaml/package.nix
+++ b/pkgs/by-name/li/libcyaml/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tlsa";
     repo = "libcyaml";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JIN/cvh9PRl4/K0Z3WZtSCA3casBxyaxNxjXZZdQRWQ=";
   };
 
diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix
index d90b6e0faef7..af8dd198ef1a 100644
--- a/pkgs/by-name/li/libdatachannel/package.nix
+++ b/pkgs/by-name/li/libdatachannel/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "paullouisageneau";
     repo = "libdatachannel";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Xn2RfPFvCIx7gTFqxXbFVJZDkphZR94SAHJ+0ombf+8=";
   };
 
diff --git a/pkgs/by-name/li/libdict/package.nix b/pkgs/by-name/li/libdict/package.nix
index 3548d65073ef..5debdbb59383 100644
--- a/pkgs/by-name/li/libdict/package.nix
+++ b/pkgs/by-name/li/libdict/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "libdict";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-GFK2yjtxAwwstoJQGCXxwNKxn3LL74FBxad7JdOn0pU=";
   };
 
diff --git a/pkgs/by-name/li/libdivsufsort/package.nix b/pkgs/by-name/li/libdivsufsort/package.nix
index 9a229a015875..12c2c5650039 100644
--- a/pkgs/by-name/li/libdivsufsort/package.nix
+++ b/pkgs/by-name/li/libdivsufsort/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "y-256";
     repo = "libdivsufsort";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-4p+L1bq9SBgWSHXx+WYWAe60V2g1AN+zlJvC+F367Tk=";
   };
 
diff --git a/pkgs/by-name/li/libdmtx/package.nix b/pkgs/by-name/li/libdmtx/package.nix
index 62d1c3e05b44..b551b59bf1dd 100644
--- a/pkgs/by-name/li/libdmtx/package.nix
+++ b/pkgs/by-name/li/libdmtx/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dmtx";
     repo = "libdmtx";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/sV+t7RAr5dTwfUsGz0KEZYgm0DzQWRdiwrbbEbC1OY=";
   };
 
diff --git a/pkgs/by-name/li/libdynd/package.nix b/pkgs/by-name/li/libdynd/package.nix
index 8bfc3412e341..70301b274777 100644
--- a/pkgs/by-name/li/libdynd/package.nix
+++ b/pkgs/by-name/li/libdynd/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libdynd";
     repo = "libdynd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0fkd5rawqni1cq51fmr76iw7ll4fmbahfwv4rglnsabbkylf73pr";
   };
 
diff --git a/pkgs/by-name/li/libebur128/package.nix b/pkgs/by-name/li/libebur128/package.nix
index c99256063037..ab9d2c2dcd8e 100644
--- a/pkgs/by-name/li/libebur128/package.nix
+++ b/pkgs/by-name/li/libebur128/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jiixyj";
     repo = "libebur128";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y=";
   };
 
diff --git a/pkgs/by-name/li/libedgetpu/package.nix b/pkgs/by-name/li/libedgetpu/package.nix
index 563e4d56dda1..04c3f7654b10 100644
--- a/pkgs/by-name/li/libedgetpu/package.nix
+++ b/pkgs/by-name/li/libedgetpu/package.nix
@@ -19,7 +19,7 @@ let
     src = fetchFromGitHub {
       owner = "google";
       repo = "flatbuffers";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE=";
     };
   });
diff --git a/pkgs/by-name/li/libemf2svg/package.nix b/pkgs/by-name/li/libemf2svg/package.nix
index fcddf49be644..1196a01a3f5d 100644
--- a/pkgs/by-name/li/libemf2svg/package.nix
+++ b/pkgs/by-name/li/libemf2svg/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kakwa";
     repo = "libemf2svg";
-    rev = version;
+    tag = version;
     sha256 = "04g6dp5xadszqjyjl162x26mfhhwinia65hbkl3mv70bs4an9898";
   };
 
diff --git a/pkgs/by-name/li/liberation-sans-narrow/package.nix b/pkgs/by-name/li/liberation-sans-narrow/package.nix
index d984362686ce..bec055c12b3b 100644
--- a/pkgs/by-name/li/liberation-sans-narrow/package.nix
+++ b/pkgs/by-name/li/liberation-sans-narrow/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "liberationfonts";
     repo = "liberation-sans-narrow";
-    rev = version;
+    tag = version;
     sha256 = "1qw554jbdnqkg6pjjl4cqkgsalq3398kzvww2naw30vykcz752bm";
   };
 
diff --git a/pkgs/by-name/li/liberfa/package.nix b/pkgs/by-name/li/liberfa/package.nix
index 7a31b881b1e2..21441ee0416e 100644
--- a/pkgs/by-name/li/liberfa/package.nix
+++ b/pkgs/by-name/li/liberfa/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "liberfa";
     repo = "erfa";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-NtHYgiN5mo3kWC2H+5TUDbU1nFrwuhNyOIhg2jZbssM=";
   };
 
diff --git a/pkgs/by-name/li/libesmtp/package.nix b/pkgs/by-name/li/libesmtp/package.nix
index 981521b177c4..02f7993d03c0 100644
--- a/pkgs/by-name/li/libesmtp/package.nix
+++ b/pkgs/by-name/li/libesmtp/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libesmtp";
     repo = "libESMTP";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1bhh8hlsl9597x0bnfl563k2c09b61qnkb9mfyqcmzlq63m1zw5y";
   };
 
diff --git a/pkgs/by-name/li/libetebase/package.nix b/pkgs/by-name/li/libetebase/package.nix
index 7e96c533262a..ec67e4071d91 100644
--- a/pkgs/by-name/li/libetebase/package.nix
+++ b/pkgs/by-name/li/libetebase/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "etesync";
     repo = "libetebase";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sqvfzXHqVeiw+VKWPtCYv0USNpbfBE7ILUiqXZtLmgI=";
   };
 
diff --git a/pkgs/by-name/li/libetpan/package.nix b/pkgs/by-name/li/libetpan/package.nix
index e1612b75b231..7f96bbd18e0f 100644
--- a/pkgs/by-name/li/libetpan/package.nix
+++ b/pkgs/by-name/li/libetpan/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dinhviethoa";
     repo = "libetpan";
-    rev = version;
+    tag = version;
     hash = "sha256-lukeWURNsRPTuFk2q2XVnwkKz5Y+PRiPba5GPQCw6jw=";
   };
 
diff --git a/pkgs/by-name/li/libevdevc/package.nix b/pkgs/by-name/li/libevdevc/package.nix
index 0eb423dd6720..63ca82465383 100644
--- a/pkgs/by-name/li/libevdevc/package.nix
+++ b/pkgs/by-name/li/libevdevc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hugegreenbug";
     repo = "libevdevc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0ry30krfizh87yckmmv8n082ad91mqhhbbynx1lfidqzb6gdy2dd";
   };
 
diff --git a/pkgs/by-name/li/libexsid/package.nix b/pkgs/by-name/li/libexsid/package.nix
index e6bd0eb7997f..17896f9c71dd 100644
--- a/pkgs/by-name/li/libexsid/package.nix
+++ b/pkgs/by-name/li/libexsid/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "exsid-driver";
-    rev = version;
+    tag = version;
     sha256 = "1qbiri549fma8c72nmj3cpz3sn1vc256kfafnygkmkzg7wdmgi7r";
   };
 
diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix
index a9bec3b1ecc7..7632da882e43 100644
--- a/pkgs/by-name/li/libfabric/package.nix
+++ b/pkgs/by-name/li/libfabric/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ofiwg";
     repo = "libfabric";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TK45SCPyFIMhliBYBEMPSKX/UtHGPj075SlTNB92O0Y=";
   };
 
diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix
index 9eba7b189c1f..75b8a608cbbf 100644
--- a/pkgs/by-name/li/libfaketime/package.nix
+++ b/pkgs/by-name/li/libfaketime/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wolfcw";
     repo = "libfaketime";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ=";
   };
 
diff --git a/pkgs/by-name/li/libfann/package.nix b/pkgs/by-name/li/libfann/package.nix
index 2cccdac05c1d..5075b71fc489 100644
--- a/pkgs/by-name/li/libfann/package.nix
+++ b/pkgs/by-name/li/libfann/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libfann";
     repo = "fann";
-    rev = version;
+    tag = version;
     sha256 = "0awbs0vjsrdglqiaybb0ln13ciizmyrw9ahllahvgbq4nr0nvf6y";
   };
 
diff --git a/pkgs/by-name/li/libff/package.nix b/pkgs/by-name/li/libff/package.nix
index 3a48a3145a44..77984c840e90 100644
--- a/pkgs/by-name/li/libff/package.nix
+++ b/pkgs/by-name/li/libff/package.nix
@@ -17,7 +17,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/libfixposix/package.nix b/pkgs/by-name/li/libfixposix/package.nix
index db66032af7e8..19fcb24f7cd5 100644
--- a/pkgs/by-name/li/libfixposix/package.nix
+++ b/pkgs/by-name/li/libfixposix/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sionescu";
     repo = "libfixposix";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5qA6ytbqE+/05XQGxP9/4vEs9gFcuI3k7eJJYucW7fM=";
   };
 
diff --git a/pkgs/by-name/li/libfreeaptx/package.nix b/pkgs/by-name/li/libfreeaptx/package.nix
index 3c7291f060e7..8f1e445a21bb 100644
--- a/pkgs/by-name/li/libfreeaptx/package.nix
+++ b/pkgs/by-name/li/libfreeaptx/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iamthehorker";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo=";
   };
 
diff --git a/pkgs/by-name/li/libgadu/package.nix b/pkgs/by-name/li/libgadu/package.nix
index 32cb229b441b..f0ba8e09d4c5 100644
--- a/pkgs/by-name/li/libgadu/package.nix
+++ b/pkgs/by-name/li/libgadu/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wojtekka";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1s16cripy5w9k12534qb012iwc5m9qcjyrywgsziyn3kl3i0aa8h";
   };
 
diff --git a/pkgs/by-name/li/libgbinder/package.nix b/pkgs/by-name/li/libgbinder/package.nix
index e7c1458e8fc4..2f2a3bbf6f13 100644
--- a/pkgs/by-name/li/libgbinder/package.nix
+++ b/pkgs/by-name/li/libgbinder/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mer-hybris";
     repo = "libgbinder";
-    rev = version;
+    tag = version;
     sha256 = "sha256-f5yfAmCpjI4T0XKBiGPQ3JWLuYg+SlrQwYeY/HIrycY=";
   };
 
diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix
index e1572fed66a0..c04f5abe8ba5 100644
--- a/pkgs/by-name/li/libgedit-gfls/package.nix
+++ b/pkgs/by-name/li/libgedit-gfls/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     group = "World";
     owner = "gedit";
     repo = "libgedit-gfls";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-kMkqEly8RDc5eKqUupQD4tkVIXxL1rt4e/OCAPoutIg=";
   };
 
diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix
index 124201c92962..a493901b5ee5 100644
--- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix
+++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     group = "World";
     owner = "gedit";
     repo = "libgedit-gtksourceview";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-3HnlYLa1Zy1GRpX5fjEoXUzfB9X6nydpVjZTzJyhvIs=";
   };
 
diff --git a/pkgs/by-name/li/libgen-cli/package.nix b/pkgs/by-name/li/libgen-cli/package.nix
index b296e9e140a2..dd6abc08d7e1 100644
--- a/pkgs/by-name/li/libgen-cli/package.nix
+++ b/pkgs/by-name/li/libgen-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ciehanski";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-EicXsxAvVe/umpcOn4dVlTexaAol1qYPg/h5MU5dysM=";
   };
 
diff --git a/pkgs/by-name/li/libgeotiff/package.nix b/pkgs/by-name/li/libgeotiff/package.nix
index c591b0cb7c1e..3dff45fdf5bc 100644
--- a/pkgs/by-name/li/libgeotiff/package.nix
+++ b/pkgs/by-name/li/libgeotiff/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "libgeotiff";
-    rev = version;
+    tag = version;
     hash = "sha256-oiuooLejCRI1DFTjhgYoePtKS+OAGnW6OBzgITcY500=";
   };
 
diff --git a/pkgs/by-name/li/libgestures/package.nix b/pkgs/by-name/li/libgestures/package.nix
index 144a457c1987..1dccf87f9b22 100644
--- a/pkgs/by-name/li/libgestures/package.nix
+++ b/pkgs/by-name/li/libgestures/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hugegreenbug";
     repo = "libgestures";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0dfvads2adzx4k8cqc1rbwrk1jm2wn9wl2jk51m26xxpmh1g0zab";
   };
   patches = [ ./include-fix.patch ];
diff --git a/pkgs/by-name/li/libglibutil/package.nix b/pkgs/by-name/li/libglibutil/package.nix
index 132106b30250..29f64f23e318 100644
--- a/pkgs/by-name/li/libglibutil/package.nix
+++ b/pkgs/by-name/li/libglibutil/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sailfishos";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-UJsKjvigZuwDL4DyjUE6fXEecgoHrTE+5pO0hVyCwP4=";
   };
 
diff --git a/pkgs/by-name/li/libharu/package.nix b/pkgs/by-name/li/libharu/package.nix
index 78402032198a..fd77c8a63213 100644
--- a/pkgs/by-name/li/libharu/package.nix
+++ b/pkgs/by-name/li/libharu/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libharu";
     repo = "libharu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v2vudB95OdYPiLxS9Al5lsAInsvmharhPWdnUmCl+Bs=";
   };
 
diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix
index a076ecc234f2..0468afa67705 100644
--- a/pkgs/by-name/li/libheif/package.nix
+++ b/pkgs/by-name/li/libheif/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "strukturag";
     repo = "libheif";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Z21E2b4E9jGtwR1RpFMAbGsWFw6jXn++WexlzdoyZzE=";
   };
 
diff --git a/pkgs/by-name/li/libhomfly/package.nix b/pkgs/by-name/li/libhomfly/package.nix
index 9cae6196d83c..81653b4843d4 100644
--- a/pkgs/by-name/li/libhomfly/package.nix
+++ b/pkgs/by-name/li/libhomfly/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "miguelmarco";
     repo = "libhomfly";
-    rev = version;
+    tag = version;
     sha256 = "sha256-s1Hgy6S9+uREKsgjOVQdQfnds6oSLo5UWTrt5DJnY2s=";
   };
 
diff --git a/pkgs/by-name/li/libhttpserver/package.nix b/pkgs/by-name/li/libhttpserver/package.nix
index 3bf538dfbdeb..faaeec00352f 100644
--- a/pkgs/by-name/li/libhttpserver/package.nix
+++ b/pkgs/by-name/li/libhttpserver/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "etr";
     repo = "libhttpserver";
-    rev = version;
+    tag = version;
     hash = "sha256-Pc3Fvd8D4Ymp7dG9YgU58mDceOqNfhWE1JtnpVaNx/Y=";
   };
 
diff --git a/pkgs/by-name/li/libhwy/package.nix b/pkgs/by-name/li/libhwy/package.nix
index c282d8420a34..e0c848afffe4 100644
--- a/pkgs/by-name/li/libhwy/package.nix
+++ b/pkgs/by-name/li/libhwy/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "highway";
-    rev = version;
+    tag = version;
     hash = "sha256-Z+mAR9nSAbCskUvo6oK79Yd85bu0HtI2aR5THS1EozM=";
   };
 
diff --git a/pkgs/by-name/li/libical/package.nix b/pkgs/by-name/li/libical/package.nix
index b3f5a63ab6f1..d74bb6ad0b57 100644
--- a/pkgs/by-name/li/libical/package.nix
+++ b/pkgs/by-name/li/libical/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libical";
     repo = "libical";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZJXxi1LOZyEpgdcmoK0pe5IA3+l9WY0zLu6Ttzy1QSc=";
   };
 
diff --git a/pkgs/by-name/li/libid3tag/package.nix b/pkgs/by-name/li/libid3tag/package.nix
index e287ee6cdcd2..93f090299b8d 100644
--- a/pkgs/by-name/li/libid3tag/package.nix
+++ b/pkgs/by-name/li/libid3tag/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "tenacityteam";
     repo = "libid3tag";
-    rev = version;
+    tag = version;
     hash = "sha256-6/49rk7pmIpJRj32WmxC171NtdIOaMNhX8RD7o6Jbzs=";
   };
 
diff --git a/pkgs/by-name/li/libimagequant/package.nix b/pkgs/by-name/li/libimagequant/package.nix
index b9a4acaf44fe..b357c6b8cb45 100644
--- a/pkgs/by-name/li/libimagequant/package.nix
+++ b/pkgs/by-name/li/libimagequant/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "libimagequant";
-    rev = version;
+    tag = version;
     hash = "sha256-2P8FiRfOuCHxJrB+rnDDOFsrFjPv5GMBK/5sq7eb32w=";
   };
 
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/libimobiledevice-glue/package.nix b/pkgs/by-name/li/libimobiledevice-glue/package.nix
index 01a0ea4f8494..29a00599af87 100644
--- a/pkgs/by-name/li/libimobiledevice-glue/package.nix
+++ b/pkgs/by-name/li/libimobiledevice-glue/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Fu0zQIryESRaTGzDlAaewX9Yo2nPEeUxmcb3yPJLuSI=";
   };
 
diff --git a/pkgs/by-name/li/libinotify-kqueue/package.nix b/pkgs/by-name/li/libinotify-kqueue/package.nix
index 130a3e803382..649fe1b9c024 100644
--- a/pkgs/by-name/li/libinotify-kqueue/package.nix
+++ b/pkgs/by-name/li/libinotify-kqueue/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libinotify-kqueue";
     repo = "libinotify-kqueue";
-    rev = version;
+    tag = version;
     sha256 = "sha256-m59GWrx5C+JXDbhVdKx+SNSn8wwIKyW+KlXabNi17A0=";
   };
 
diff --git a/pkgs/by-name/li/libinstpatch/package.nix b/pkgs/by-name/li/libinstpatch/package.nix
index c9a82bd33613..43a98dd968a3 100644
--- a/pkgs/by-name/li/libinstpatch/package.nix
+++ b/pkgs/by-name/li/libinstpatch/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swami";
     repo = "libinstpatch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OU6/slrPDgzn9tvXZJKSWbcFbpS/EAsOi52FtjeYdvA=";
   };
 
diff --git a/pkgs/by-name/li/libipt/package.nix b/pkgs/by-name/li/libipt/package.nix
index 33e01b9d7a83..834efe0eedc0 100644
--- a/pkgs/by-name/li/libipt/package.nix
+++ b/pkgs/by-name/li/libipt/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "libipt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rO2Mf2/BfKlPh1wHe0qTuyQAyqpSB/j3Q+JWpNDyNm0=";
   };
 
diff --git a/pkgs/by-name/li/libirecovery/package.nix b/pkgs/by-name/li/libirecovery/package.nix
index f9be0ab0146b..7391fcaea365 100644
--- a/pkgs/by-name/li/libirecovery/package.nix
+++ b/pkgs/by-name/li/libirecovery/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-R+oBC7F4op0qoIk3d/WqS4MwzZY3WMAMIqlJfJb188Q=";
   };
 
diff --git a/pkgs/by-name/li/libiscsi/package.nix b/pkgs/by-name/li/libiscsi/package.nix
index 6067083ef57a..309fb9f7a1bd 100644
--- a/pkgs/by-name/li/libiscsi/package.nix
+++ b/pkgs/by-name/li/libiscsi/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sahlberg";
     repo = "libiscsi";
-    rev = version;
+    tag = version;
     sha256 = "sha256-idiK9JowKhGAk5F5qJ57X14Q2Y0TbIKRI02onzLPkas=";
   };
 
diff --git a/pkgs/by-name/li/libite/package.nix b/pkgs/by-name/li/libite/package.nix
index 74dffc4d6450..63433b69937c 100644
--- a/pkgs/by-name/li/libite/package.nix
+++ b/pkgs/by-name/li/libite/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "libite";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-q1NoHSiPmFPwkTJqg3L5fEBXF/JjRWvA9e4d532ILE8=";
   };
 
diff --git a/pkgs/by-name/li/libjcat/package.nix b/pkgs/by-name/li/libjcat/package.nix
index ed834efe1f29..f042ef55c83d 100644
--- a/pkgs/by-name/li/libjcat/package.nix
+++ b/pkgs/by-name/li/libjcat/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "libjcat";
-    rev = version;
+    tag = version;
     sha256 = "sha256-3Ttk5nwVLB/Ll4Xz25JODOKHsGrOxKeSF2f+6QhDI2Q=";
   };
 
diff --git a/pkgs/by-name/li/libjpeg_turbo/package.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix
index 26baf7f7ed5c..20b8b7df2b14 100644
--- a/pkgs/by-name/li/libjpeg_turbo/package.nix
+++ b/pkgs/by-name/li/libjpeg_turbo/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libjpeg-turbo";
     repo = "libjpeg-turbo";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ZNqhOfZtWcMv10VWIUxn7MSy4KhW/jBrgC1tUFKczqs=";
   };
 
diff --git a/pkgs/by-name/li/libjson-rpc-cpp/package.nix b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
index b2e3417c0920..559f4889ed93 100644
--- a/pkgs/by-name/li/libjson-rpc-cpp/package.nix
+++ b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "cinemast";
     repo = "libjson-rpc-cpp";
     sha256 = "sha256-YCCZN4y88AixQeo24pk6YHfSCsJz8jJ97Dg40KM08cQ=";
-    rev = "v${version}";
+    tag = "v${version}";
   };
 
   env.NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2";
diff --git a/pkgs/by-name/li/libjwt/package.nix b/pkgs/by-name/li/libjwt/package.nix
index d4ebba5f1842..18a5460b98f0 100644
--- a/pkgs/by-name/li/libjwt/package.nix
+++ b/pkgs/by-name/li/libjwt/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "benmcollins";
     repo = "libjwt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0gFMeSW4gfbI6MUctcN8UuKhMDswaT8BzHTV2VuwZzc=";
   };
 
diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix
index e9860f5867f2..1bdd82b4f4a3 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/libkcapi/package.nix b/pkgs/by-name/li/libkcapi/package.nix
index 97009bbe40f9..1f08c5f0655c 100644
--- a/pkgs/by-name/li/libkcapi/package.nix
+++ b/pkgs/by-name/li/libkcapi/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "libkcapi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xOI29cjhUGUeHLaYIrPA5ZwwCE9lBdZG6kaW0lo1uL8=";
   };
 
diff --git a/pkgs/by-name/li/libkeyfinder/package.nix b/pkgs/by-name/li/libkeyfinder/package.nix
index f25158df9913..c20402a3ead8 100644
--- a/pkgs/by-name/li/libkeyfinder/package.nix
+++ b/pkgs/by-name/li/libkeyfinder/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mixxxdj";
     repo = "libkeyfinder";
-    rev = version;
+    tag = version;
     hash = "sha256-Et8u5j/ke9u2bwHFriPCCBiXkPel37gwx+kwuViAr4o=";
   };
 
diff --git a/pkgs/by-name/li/libkqueue/package.nix b/pkgs/by-name/li/libkqueue/package.nix
index cfb21e6906b7..c3191c57cbef 100644
--- a/pkgs/by-name/li/libkqueue/package.nix
+++ b/pkgs/by-name/li/libkqueue/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mheily";
     repo = "libkqueue";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5Zds9sqHkFldJf3ThTPOiaGKohmFcIzY0ARDA0iswVk=";
   };
 
diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix
index a83011a56fa1..5547b2418f53 100644
--- a/pkgs/by-name/li/libks/package.nix
+++ b/pkgs/by-name/li/libks/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = "libks";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zKL+ukAdKiCC4wh55hnZpebFraIdKWDFsRfhVzhUNj0=";
   };
 
diff --git a/pkgs/by-name/li/libksi/package.nix b/pkgs/by-name/li/libksi/package.nix
index 49fd7cd3d09f..da7c2221c50c 100644
--- a/pkgs/by-name/li/libksi/package.nix
+++ b/pkgs/by-name/li/libksi/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Guardtime";
     repo = "libksi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zEWxJpv0MeGUq/xkM26tDoauFyw53enGyWVhlX0jlYI=";
   };
 
diff --git a/pkgs/by-name/li/liblaxjson/package.nix b/pkgs/by-name/li/liblaxjson/package.nix
index 905cc1cb9a16..8898da8d81ac 100644
--- a/pkgs/by-name/li/liblaxjson/package.nix
+++ b/pkgs/by-name/li/liblaxjson/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrewrk";
     repo = "liblaxjson";
-    rev = version;
+    tag = version;
     sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s";
   };
 
diff --git a/pkgs/by-name/li/liblc3/package.nix b/pkgs/by-name/li/liblc3/package.nix
index 4428d1e5220b..9e437d416684 100644
--- a/pkgs/by-name/li/liblc3/package.nix
+++ b/pkgs/by-name/li/liblc3/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "google";
     repo = "liblc3";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4KsvCQ1JZaj0yCT7En7ZcNk0rA8LyDwwcSga2IoVd6A=";
   };
 
diff --git a/pkgs/by-name/li/liblcf/package.nix b/pkgs/by-name/li/liblcf/package.nix
index 71e4fb69a3b9..f6f1ecdf210d 100644
--- a/pkgs/by-name/li/liblcf/package.nix
+++ b/pkgs/by-name/li/liblcf/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EasyRPG";
     repo = "liblcf";
-    rev = version;
+    tag = version;
     hash = "sha256-jJGIsNw7wplTL5FBWGL8osb9255o9ZaWgl77R+RLDMM=";
   };
 
diff --git a/pkgs/by-name/li/liblsl/package.nix b/pkgs/by-name/li/liblsl/package.nix
index b923bb0b4c22..154d57cd2367 100644
--- a/pkgs/by-name/li/liblsl/package.nix
+++ b/pkgs/by-name/li/liblsl/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sccn";
     repo = "liblsl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-nmu7Kxk4U5sGO8Od9JR4id4V4mjeibj4AHjUYhpGPeo=";
   };
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/li/libmbd/package.nix b/pkgs/by-name/li/libmbd/package.nix
index ce975085ab8f..3faccd790bd9 100644
--- a/pkgs/by-name/li/libmbd/package.nix
+++ b/pkgs/by-name/li/libmbd/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libmbd";
     repo = "libMBD";
-    rev = version;
+    tag = version;
     hash = "sha256-ctUaBLPaZHoV1rU3u1idvPLGbvC9Z17YBxYKCaL7EMk=";
   };
 
diff --git a/pkgs/by-name/li/libmesode/package.nix b/pkgs/by-name/li/libmesode/package.nix
index 3633b47d1593..483066129aa8 100644
--- a/pkgs/by-name/li/libmesode/package.nix
+++ b/pkgs/by-name/li/libmesode/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "profanity-im";
     repo = "libmesode";
-    rev = version;
+    tag = version;
     sha256 = "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654";
   };
 
diff --git a/pkgs/by-name/li/libmicrodns/package.nix b/pkgs/by-name/li/libmicrodns/package.nix
index 0d60242be1bc..0f64b01cca5d 100644
--- a/pkgs/by-name/li/libmicrodns/package.nix
+++ b/pkgs/by-name/li/libmicrodns/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "videolabs";
     repo = "libmicrodns";
-    rev = version;
+    tag = version;
     sha256 = "05vgka45c1frnv4q7pbz0bggsn5xaykh4xpklh9yb6d6qj7dbx0b";
   };
 
diff --git a/pkgs/by-name/li/libmodbus/package.nix b/pkgs/by-name/li/libmodbus/package.nix
index 96e7b0d2b46b..b3053a9c4dfd 100644
--- a/pkgs/by-name/li/libmodbus/package.nix
+++ b/pkgs/by-name/li/libmodbus/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stephane";
     repo = "libmodbus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d/diR9yeV0WY0C6wqxYZfOjEKFeWTvN73MxcWtXPOJc=";
   };
 
diff --git a/pkgs/by-name/li/libmodule/package.nix b/pkgs/by-name/li/libmodule/package.nix
index dbb2505e5c18..204685a26075 100644
--- a/pkgs/by-name/li/libmodule/package.nix
+++ b/pkgs/by-name/li/libmodule/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedeDP";
     repo = "libmodule";
-    rev = version;
+    tag = version;
     sha256 = "sha256-wkRiDWO9wUyxkAeqvm99u22Jq4xnQJx6zS7Sb+R8iMg=";
   };
 
diff --git a/pkgs/by-name/li/libmongocrypt/package.nix b/pkgs/by-name/li/libmongocrypt/package.nix
index fe97c5de7a1c..38d160b0733a 100644
--- a/pkgs/by-name/li/libmongocrypt/package.nix
+++ b/pkgs/by-name/li/libmongocrypt/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "libmongocrypt";
-    rev = version;
+    tag = version;
     hash = "sha256-I4KG2BHAovin9EaF8lNzJzucARvi0Qptz5Y9gTt3WkE=";
   };
 
diff --git a/pkgs/by-name/li/libmowgli/package.nix b/pkgs/by-name/li/libmowgli/package.nix
index 2f2575a3a183..dce02a004e32 100644
--- a/pkgs/by-name/li/libmowgli/package.nix
+++ b/pkgs/by-name/li/libmowgli/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "atheme";
     repo = "libmowgli-2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jlw6ixMoIdIjmQ86N+KN+Gez218sw894POkcCYnT0s0=";
   };
 
diff --git a/pkgs/by-name/li/libmpack/package.nix b/pkgs/by-name/li/libmpack/package.nix
index 00b8d72d28b6..2a8abe625c99 100644
--- a/pkgs/by-name/li/libmpack/package.nix
+++ b/pkgs/by-name/li/libmpack/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libmpack";
     repo = "libmpack";
-    rev = version;
+    tag = version;
     sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2";
   };
 
diff --git a/pkgs/by-name/li/libmsym/package.nix b/pkgs/by-name/li/libmsym/package.nix
index 5f47cca2f08b..f2c936410898 100644
--- a/pkgs/by-name/li/libmsym/package.nix
+++ b/pkgs/by-name/li/libmsym/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mcodev31";
     repo = "libmsym";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "k+OEwrA/saupP/wX6Ii5My0vffiJ0X9xMCTrliMSMik=";
   };
 
diff --git a/pkgs/by-name/li/libmypaint/package.nix b/pkgs/by-name/li/libmypaint/package.nix
index 76a98bb5f219..7958cdddd3eb 100644
--- a/pkgs/by-name/li/libmypaint/package.nix
+++ b/pkgs/by-name/li/libmypaint/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mypaint";
     repo = "libmypaint";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ppgpmnhph9h8ayx9776f79a0bxbdszfw9c6bw7c3ffy2yk40178";
   };
 
diff --git a/pkgs/by-name/li/libmysofa/package.nix b/pkgs/by-name/li/libmysofa/package.nix
index 67961dc1cf6c..bba36cd18c16 100644
--- a/pkgs/by-name/li/libmysofa/package.nix
+++ b/pkgs/by-name/li/libmysofa/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hoene";
     repo = "libmysofa";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jvib1hGPJEY2w/KjlD7iTtRy1s8LFG+Qhb2d6xdpUyc=";
   };
 
diff --git a/pkgs/by-name/li/libnabo/package.nix b/pkgs/by-name/li/libnabo/package.nix
index 58bec38657e4..03b647fb5f47 100644
--- a/pkgs/by-name/li/libnabo/package.nix
+++ b/pkgs/by-name/li/libnabo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ethz-asl";
     repo = "libnabo";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/XXRwiLLaEvp+Q+c6lBiuWBb9by6o0pDf8wFtBNp7o8=";
   };
 
diff --git a/pkgs/by-name/li/libnats-c/package.nix b/pkgs/by-name/li/libnats-c/package.nix
index 9dce5480e0f3..5dd433a0e861 100644
--- a/pkgs/by-name/li/libnats-c/package.nix
+++ b/pkgs/by-name/li/libnats-c/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "nats.c";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hPudV1d+6QkHJzs7Mk47v8LVBfR3UTES/UyhdtMkNJA=";
   };
 
diff --git a/pkgs/by-name/li/libndctl/package.nix b/pkgs/by-name/li/libndctl/package.nix
index d2ccec80a570..4c4a09a097ef 100644
--- a/pkgs/by-name/li/libndctl/package.nix
+++ b/pkgs/by-name/li/libndctl/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pmem";
     repo = "ndctl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gG1Rz5AtDLzikGFr8A3l25ypd+VoLw2oWjszy9ogDLk=";
   };
 
diff --git a/pkgs/by-name/li/libnet/package.nix b/pkgs/by-name/li/libnet/package.nix
index c8a6c712c1d6..325dbc4b1356 100644
--- a/pkgs/by-name/li/libnet/package.nix
+++ b/pkgs/by-name/li/libnet/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sam-github";
     repo = "libnet";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P3LaDMMNPyEnA8nO1Bm7H0mW/hVBr0cFdg+p2JmWcGI=";
   };
 
diff --git a/pkgs/by-name/li/libnsl/package.nix b/pkgs/by-name/li/libnsl/package.nix
index d03bc44888de..54b3657ce70a 100644
--- a/pkgs/by-name/li/libnsl/package.nix
+++ b/pkgs/by-name/li/libnsl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thkukuk";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bCToqXVE4RZcoZ2eTNZcVHyzKlWyIpSAssQCOZcfmEA=";
   };
 
diff --git a/pkgs/by-name/li/libnss-mysql/package.nix b/pkgs/by-name/li/libnss-mysql/package.nix
index 432f75bdd0a6..91ffccf18426 100644
--- a/pkgs/by-name/li/libnss-mysql/package.nix
+++ b/pkgs/by-name/li/libnss-mysql/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "saknopper";
     repo = "libnss-mysql";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1fhsswa3h2nkhjkyjxxqnj07rlx6bmfvd8j521snimx2jba8h0d6";
   };
 
diff --git a/pkgs/by-name/li/libnss_nis/package.nix b/pkgs/by-name/li/libnss_nis/package.nix
index 7ac586d41aec..1ff37f49ae8d 100644
--- a/pkgs/by-name/li/libnss_nis/package.nix
+++ b/pkgs/by-name/li/libnss_nis/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thkukuk";
     repo = "libnss_nis";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dt5wL+v98Heg6395BOwNssXLXmoOKFnRXGqlOknYYPs=";
   };
 
diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix
index f3d4764bed74..499f67244aa7 100644
--- a/pkgs/by-name/li/libnvidia-container/package.nix
+++ b/pkgs/by-name/li/libnvidia-container/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "libnvidia-container";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JmJKvAOEPyjVx2Frd0tAMBjnAUTMpMh1KBt6wr5RRmk=";
   };
 
@@ -65,13 +65,13 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i \
-      -e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \
+      -e 's/^REVISION ?=.*/REVISION = ${src.tag}/' \
       -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
       mk/common.mk
 
     sed -i \
       -e 's/^GIT_TAG ?=.*/GIT_TAG = ${version}/' \
-      -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${src.rev}/' \
+      -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${src.tag}/' \
       versions.mk
 
     mkdir -p deps/src/nvidia-modprobe-${modprobeVersion}
diff --git a/pkgs/by-name/li/libofx/package.nix b/pkgs/by-name/li/libofx/package.nix
index e305e6e66a32..06fd89964700 100644
--- a/pkgs/by-name/li/libofx/package.nix
+++ b/pkgs/by-name/li/libofx/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LibOFX";
     repo = "libofx";
-    rev = version;
+    tag = version;
     sha256 = "sha256-KOQrEAt1jHrOpPQ7QbGUADe0i7sQXNH2fblPRzT0EIg=";
   };
 
diff --git a/pkgs/by-name/li/libomemo-c/package.nix b/pkgs/by-name/li/libomemo-c/package.nix
index e1f87d39b180..79a259995bd8 100644
--- a/pkgs/by-name/li/libomemo-c/package.nix
+++ b/pkgs/by-name/li/libomemo-c/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dino";
     repo = "libomemo-c";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GvHMp0FWoApbYLMhKfNxSBel1xxWWF3TZ4lnkLvu2s4=";
   };
 
diff --git a/pkgs/by-name/li/libopenaptx/package.nix b/pkgs/by-name/li/libopenaptx/package.nix
index a4abae533817..cb9c1d9ddd42 100644
--- a/pkgs/by-name/li/libopenaptx/package.nix
+++ b/pkgs/by-name/li/libopenaptx/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pali";
     repo = "libopenaptx";
-    rev = version;
+    tag = version;
     sha256 = "sha256-4FYKxw1U+efCfzKOPSDJH8a/dG0KV+anJDgxjqzD80k=";
   };
 
diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix
index 09722df40864..4c66dcf4e2ca 100644
--- a/pkgs/by-name/li/liboqs/package.nix
+++ b/pkgs/by-name/li/liboqs/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "open-quantum-safe";
     repo = "liboqs";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ngjN1JdmnvMn+UXJeCiBwF1Uf7kTOjHVBL99xzoZVFY=";
   };
 
diff --git a/pkgs/by-name/li/libosmo-netif/package.nix b/pkgs/by-name/li/libosmo-netif/package.nix
index 4dcca92df361..bce5e26f86ed 100644
--- a/pkgs/by-name/li/libosmo-netif/package.nix
+++ b/pkgs/by-name/li/libosmo-netif/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmo-netif";
-    rev = version;
+    tag = version;
     hash = "sha256-X2sRjhlB63ffkLB4c/M11iFpprG0DUzq2NL6mRN9H+c=";
   };
 
diff --git a/pkgs/by-name/li/libosmo-sigtran/package.nix b/pkgs/by-name/li/libosmo-sigtran/package.nix
index dee2431912a7..eafc8076fa83 100644
--- a/pkgs/by-name/li/libosmo-sigtran/package.nix
+++ b/pkgs/by-name/li/libosmo-sigtran/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   # fetchFromGitea hangs
   src = fetchgit {
     url = "https://gitea.osmocom.org/osmocom/libosmo-sigtran.git";
-    rev = version;
+    tag = version;
     hash = "sha256-/MUFTo5Uo60CZV0ZTDVLVgEXrNw9kX5gafq7rJb82Do=";
   };
 
diff --git a/pkgs/by-name/li/libosmoabis/package.nix b/pkgs/by-name/li/libosmoabis/package.nix
index 0fb61587d710..7aefbec3b3e1 100644
--- a/pkgs/by-name/li/libosmoabis/package.nix
+++ b/pkgs/by-name/li/libosmoabis/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmo-abis";
-    rev = version;
+    tag = version;
     hash = "sha256-TxK+r+GhqPjvFYA3AX3JXjRwhEyjoLcPTR1lpkgSlUo=";
   };
 
diff --git a/pkgs/by-name/li/libosmocore/package.nix b/pkgs/by-name/li/libosmocore/package.nix
index 368853d48455..66d4d9fc4a53 100644
--- a/pkgs/by-name/li/libosmocore/package.nix
+++ b/pkgs/by-name/li/libosmocore/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmocore";
-    rev = version;
+    tag = version;
     hash = "sha256-W5XLiIgevGtHRjrRTx/7rnPYacOAW9QJW0rocyWgFt4=";
   };
 
diff --git a/pkgs/by-name/li/libow/package.nix b/pkgs/by-name/li/libow/package.nix
index b8b86b0321b3..bc913777d1ec 100644
--- a/pkgs/by-name/li/libow/package.nix
+++ b/pkgs/by-name/li/libow/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "owfs";
     repo = "owfs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s";
   };
 
diff --git a/pkgs/by-name/li/libowlevelzs/package.nix b/pkgs/by-name/li/libowlevelzs/package.nix
index 6bc0c5fa5371..e8a9dd1ab5c6 100644
--- a/pkgs/by-name/li/libowlevelzs/package.nix
+++ b/pkgs/by-name/li/libowlevelzs/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fogti";
     repo = "libowlevelzs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY=";
   };
 
diff --git a/pkgs/by-name/li/libplist/package.nix b/pkgs/by-name/li/libplist/package.nix
index ad66cd6baebe..ee4ecf44c3bb 100644
--- a/pkgs/by-name/li/libplist/package.nix
+++ b/pkgs/by-name/li/libplist/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = "libplist";
-    rev = version;
+    tag = version;
     hash = "sha256-hitRcOjbF+L9Og9/qajqFqOhKfRn9+iWLoCKmS9dT80=";
   };
 
diff --git a/pkgs/by-name/li/libpointmatcher/package.nix b/pkgs/by-name/li/libpointmatcher/package.nix
index 8b19232f1fe7..95b0a4c8dbb2 100644
--- a/pkgs/by-name/li/libpointmatcher/package.nix
+++ b/pkgs/by-name/li/libpointmatcher/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "norlab-ulaval";
     repo = "libpointmatcher";
-    rev = version;
+    tag = version;
     hash = "sha256-OkfWdim0JDKiBx5spYpkMyFrLQP3AMWBVDpzmFwqNFM=";
   };
 
diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix
index d796d55cf600..3e58f2bcbcc9 100644
--- a/pkgs/by-name/li/libportal/package.nix
+++ b/pkgs/by-name/li/libportal/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flatpak";
     repo = "libportal";
-    rev = version;
+    tag = version;
     sha256 = "sha256-CXI4rBr9wxLUX537d6SNNf8YFR/J6YdeROlFt3edeOU=";
   };
 
diff --git a/pkgs/by-name/li/libppd/package.nix b/pkgs/by-name/li/libppd/package.nix
index c268cd552028..5b4b2d1a3165 100644
--- a/pkgs/by-name/li/libppd/package.nix
+++ b/pkgs/by-name/li/libppd/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenPrinting";
     repo = "libppd";
-    rev = version;
+    tag = version;
     hash = "sha256-8ofCv+tKgBk9GoGD4lmBPB/S4ABZ6cWGOk/KqDsEzNk=";
   };
 
diff --git a/pkgs/by-name/li/libpqxx/package.nix b/pkgs/by-name/li/libpqxx/package.nix
index 0e1dc11f2e90..58f0e71a43be 100644
--- a/pkgs/by-name/li/libpqxx/package.nix
+++ b/pkgs/by-name/li/libpqxx/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jtv";
     repo = "libpqxx";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-llsnd1bxAyiEgo9PfWYdQp1RPPk1oF/02IgMvPhodZ0=";
   };
 
diff --git a/pkgs/by-name/li/libproxy/package.nix b/pkgs/by-name/li/libproxy/package.nix
index 67ccc456dc74..c6f4463de9d4 100644
--- a/pkgs/by-name/li/libproxy/package.nix
+++ b/pkgs/by-name/li/libproxy/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libproxy";
     repo = "libproxy";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Z70TjLk5zulyYMAK+uMDhpsdvLa6m25pY8jahUA6ASE=";
   };
 
diff --git a/pkgs/by-name/li/libqb/package.nix b/pkgs/by-name/li/libqb/package.nix
index 094a1c53790f..aa60833e5815 100644
--- a/pkgs/by-name/li/libqb/package.nix
+++ b/pkgs/by-name/li/libqb/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ClusterLabs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZjxC7W4U8T68mZy/OvWj/e4W9pJIj2lVDoEjxXYr/G8=";
   };
 
diff --git a/pkgs/by-name/li/libr3/package.nix b/pkgs/by-name/li/libr3/package.nix
index 046547fdd053..4fe8f083dfdb 100644
--- a/pkgs/by-name/li/libr3/package.nix
+++ b/pkgs/by-name/li/libr3/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "c9s";
     repo = "r3";
-    rev = version;
+    tag = version;
     sha256 = "09cixbms817p6nb77wz3rxp0znnac8ybycvsrrzgwlbfn58a3zwl";
   };
 
diff --git a/pkgs/by-name/li/libraqm/package.nix b/pkgs/by-name/li/libraqm/package.nix
index 9df38707bcb3..11349d3d4bd9 100644
--- a/pkgs/by-name/li/libraqm/package.nix
+++ b/pkgs/by-name/li/libraqm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "HOST-Oman";
     repo = "libraqm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KhGE66GS5rIieVXJUFA3jSsXEpbdnzN0VIAF/zOelU4=";
   };
 
diff --git a/pkgs/by-name/li/libratbag/package.nix b/pkgs/by-name/li/libratbag/package.nix
index 8cd47c2fa0e1..a65ac3e04871 100644
--- a/pkgs/by-name/li/libratbag/package.nix
+++ b/pkgs/by-name/li/libratbag/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libratbag";
     repo = "libratbag";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc=";
   };
 
diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix
index b16a69fea358..5fcebc97e649 100644
--- a/pkgs/by-name/li/libraw/package.nix
+++ b/pkgs/by-name/li/libraw/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LibRaw";
     repo = "LibRaw";
-    rev = version;
+    tag = version;
     hash = "sha256-QFyRQ0V7din/rnkRvEWf521kSzN7HwJ3kZiQ43PAmVI=";
   };
 
diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix
index eb6f10ea8a74..26e2121f3eeb 100644
--- a/pkgs/by-name/li/librearp/package.nix
+++ b/pkgs/by-name/li/librearp/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "LibreArp";
     repo = "LibreArp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-jEpES68NuHhelUq/L46CxEeadk3LbuPZ72JaGDbw8fg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libredwg/package.nix b/pkgs/by-name/li/libredwg/package.nix
index ce2cd032d0c7..ec618aeb6e8e 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/libreelec-dvb-firmware/package.nix b/pkgs/by-name/li/libreelec-dvb-firmware/package.nix
index 6841383511f2..51d88c0d4394 100644
--- a/pkgs/by-name/li/libreelec-dvb-firmware/package.nix
+++ b/pkgs/by-name/li/libreelec-dvb-firmware/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "dvb-firmware";
     owner = "LibreElec";
-    rev = version;
+    tag = version;
     sha256 = "sha256-uEobcv5kqGxIOfSVVKH+iT7DHPF13OFiRF7c1GIUqtU=";
   };
 
diff --git a/pkgs/by-name/li/librelp/package.nix b/pkgs/by-name/li/librelp/package.nix
index 00e8ef09be0a..063ad76f703a 100644
--- a/pkgs/by-name/li/librelp/package.nix
+++ b/pkgs/by-name/li/librelp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rsyslog";
     repo = "librelp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VJlvFiOsIyiu0kBU8NkObtt9j2ElrSzJtvE8wtSlOus=";
   };
 
diff --git a/pkgs/by-name/li/librem/package.nix b/pkgs/by-name/li/librem/package.nix
index 8d75bb111661..6fd0bad9bc8e 100644
--- a/pkgs/by-name/li/librem/package.nix
+++ b/pkgs/by-name/li/librem/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "rem";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MsXSUxFH89EqxMe4285xFV1Tsqmv2l5RnEeli48O3XQ=";
   };
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/li/librespeed-cli/package.nix b/pkgs/by-name/li/librespeed-cli/package.nix
index 627686d58d1b..106e5583e1f5 100644
--- a/pkgs/by-name/li/librespeed-cli/package.nix
+++ b/pkgs/by-name/li/librespeed-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "librespeed";
     repo = "speedtest-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8=";
   };
 
diff --git a/pkgs/by-name/li/libretro-core-info/package.nix b/pkgs/by-name/li/libretro-core-info/package.nix
index bbb65756751b..a908f6b4225e 100644
--- a/pkgs/by-name/li/libretro-core-info/package.nix
+++ b/pkgs/by-name/li/libretro-core-info/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-core-info";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T/La/Y9txRX8SHAyOi45KcQA8zb3puXdfTKlPSm42+U=";
   };
 
diff --git a/pkgs/by-name/li/librime/package.nix b/pkgs/by-name/li/librime/package.nix
index e219a6c5c10c..d366a69aadbc 100644
--- a/pkgs/by-name/li/librime/package.nix
+++ b/pkgs/by-name/li/librime/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rime";
     repo = "librime";
-    rev = version;
+    tag = version;
     sha256 = "sha256-pv1I/YFzPLOmBDcT4HcrJWSikPEErEB5UzGrGqfJBvg=";
   };
 
diff --git a/pkgs/by-name/li/librsync/package.nix b/pkgs/by-name/li/librsync/package.nix
index 02efdd531fa1..11bb5835f9e6 100644
--- a/pkgs/by-name/li/librsync/package.nix
+++ b/pkgs/by-name/li/librsync/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "librsync";
     repo = "librsync";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fiOby8tOhv0KJ+ZwAWfh/ynqHlYC9kNqKfxNl3IhzR8=";
   };
 
diff --git a/pkgs/by-name/li/librtprocess/package.nix b/pkgs/by-name/li/librtprocess/package.nix
index 8796373c6776..64f4493ddf20 100644
--- a/pkgs/by-name/li/librtprocess/package.nix
+++ b/pkgs/by-name/li/librtprocess/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CarVac";
     repo = "librtprocess";
-    rev = version;
+    tag = version;
     hash = "sha256-/1o6SWUor+ZBQ6RsK2PoDRu03jcVRG58PNYFttriH2w=";
   };
 
diff --git a/pkgs/by-name/li/libsass/package.nix b/pkgs/by-name/li/libsass/package.nix
index 0dd16c7535ed..75b273e96d73 100644
--- a/pkgs/by-name/li/libsass/package.nix
+++ b/pkgs/by-name/li/libsass/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sass";
     repo = "libsass";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-FkLL3OAJXDptRQY6ZkYbss2pcc40f/wasIvEIyHRQFo=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
diff --git a/pkgs/by-name/li/libscrypt/package.nix b/pkgs/by-name/li/libscrypt/package.nix
index 33ed0870466c..5ad907efd2b1 100644
--- a/pkgs/by-name/li/libscrypt/package.nix
+++ b/pkgs/by-name/li/libscrypt/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "technion";
     repo = "libscrypt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QWWqC10bENemG5FYEog87tT7IxDaBJUDqu6j/sO3sYE=";
   };
 
diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix
index deceacddcdce..5e08c79f504f 100644
--- a/pkgs/by-name/li/libserdes/package.nix
+++ b/pkgs/by-name/li/libserdes/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "confluentinc";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rg4SWa9nIDT6JrnnCDwdiFE1cvpUn0HWHn+bPkXMHQ4=";
   };
 
diff --git a/pkgs/by-name/li/libsignal-protocol-c/package.nix b/pkgs/by-name/li/libsignal-protocol-c/package.nix
index 7cfa79b425aa..6b3e01227bc5 100644
--- a/pkgs/by-name/li/libsignal-protocol-c/package.nix
+++ b/pkgs/by-name/li/libsignal-protocol-c/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal-protocol-c";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0z5p03vk15i6h870azfjgyfgxhv31q2vq6rfhnybrnkxq2wqzwhk";
   };
 
diff --git a/pkgs/by-name/li/libsmartcols/package.nix b/pkgs/by-name/li/libsmartcols/package.nix
index ad6378cb1a3f..a0b5cb05e1bd 100644
--- a/pkgs/by-name/li/libsmartcols/package.nix
+++ b/pkgs/by-name/li/libsmartcols/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "karelzak";
     repo = "util-linux";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-X39os2iHqSrrYP6HVHPOkuTfc6vNB3pmsOP3VjW50fI=";
   };
 
diff --git a/pkgs/by-name/li/libsmbios/package.nix b/pkgs/by-name/li/libsmbios/package.nix
index a878b9d154d6..e9b81c35b806 100644
--- a/pkgs/by-name/li/libsmbios/package.nix
+++ b/pkgs/by-name/li/libsmbios/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dell";
     repo = "libsmbios";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i";
   };
 
diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix
index d332ebfc0358..a7f55c086dfc 100644
--- a/pkgs/by-name/li/libsolv/package.nix
+++ b/pkgs/by-name/li/libsolv/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "libsolv";
-    rev = version;
+    tag = version;
     hash = "sha256-3HOW3bip+0LKegwO773upeKKLiLv7JWUGEJcFiH0lcw=";
   };
 
diff --git a/pkgs/by-name/li/libspatialaudio/package.nix b/pkgs/by-name/li/libspatialaudio/package.nix
index ef7275e2076e..9d552c013b06 100644
--- a/pkgs/by-name/li/libspatialaudio/package.nix
+++ b/pkgs/by-name/li/libspatialaudio/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "videolabs";
     repo = "libspatialaudio";
-    rev = version;
+    tag = version;
     hash = "sha256-sPnQPD41AceXM4uGqWXMYhuQv0TUkA6TZP8ChxUFIoI=";
   };
 
diff --git a/pkgs/by-name/li/libspatialindex/package.nix b/pkgs/by-name/li/libspatialindex/package.nix
index ad39600beb19..31d055a9ca68 100644
--- a/pkgs/by-name/li/libspatialindex/package.nix
+++ b/pkgs/by-name/li/libspatialindex/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libspatialindex";
     repo = "libspatialindex";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-a2CzRLHdQMnVhHZhwYsye4X644r8gp1m6vU2CJpSRpU=";
   };
 
diff --git a/pkgs/by-name/li/libspecbleach/package.nix b/pkgs/by-name/li/libspecbleach/package.nix
index 7a6957958b79..29a1e2a67f54 100644
--- a/pkgs/by-name/li/libspecbleach/package.nix
+++ b/pkgs/by-name/li/libspecbleach/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lucianodato";
     repo = "libspecbleach";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Tw5nrGVAeoiMH00efJwcU+QLmKDZZTXHQPSV9x789TM=";
   };
 
diff --git a/pkgs/by-name/li/libspf2/package.nix b/pkgs/by-name/li/libspf2/package.nix
index b606ab7fef62..a3e398d4b1b2 100644
--- a/pkgs/by-name/li/libspf2/package.nix
+++ b/pkgs/by-name/li/libspf2/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "helsinki-systems";
     repo = "libspf2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tkCHP3B1sBb0+scHBjX5lCvaeSrZryfaGKye02LFlYs=";
   };
 
diff --git a/pkgs/by-name/li/libspiro/package.nix b/pkgs/by-name/li/libspiro/package.nix
index e3f37999e53b..fd50d83e7401 100644
--- a/pkgs/by-name/li/libspiro/package.nix
+++ b/pkgs/by-name/li/libspiro/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fontforge";
     repo = "libspiro";
-    rev = version;
+    tag = version;
     sha256 = "sha256-psEF1SWkire6ngEUcMU0xnGYaT8ktqDCBlBckToGUMg=";
   };
 
diff --git a/pkgs/by-name/li/libspng/package.nix b/pkgs/by-name/li/libspng/package.nix
index 15d8d7cf2a64..077d19916ef1 100644
--- a/pkgs/by-name/li/libspng/package.nix
+++ b/pkgs/by-name/li/libspng/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "randy408";
     repo = "libspng";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BiRuPQEKVJYYgfUsglIuxrBoJBFiQ0ygQmAFrVvCz4Q=";
   };
 
diff --git a/pkgs/by-name/li/libstemmer/package.nix b/pkgs/by-name/li/libstemmer/package.nix
index 2df64013e2b6..804007c9b042 100644
--- a/pkgs/by-name/li/libstemmer/package.nix
+++ b/pkgs/by-name/li/libstemmer/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "snowballstem";
     repo = "snowball";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qXrypwv/I+5npvGHGsHveijoui0ZnoGYhskCfLkewVE=";
   };
 
diff --git a/pkgs/by-name/li/libstrophe/package.nix b/pkgs/by-name/li/libstrophe/package.nix
index 25b10bf1a78e..216f50dda81e 100644
--- a/pkgs/by-name/li/libstrophe/package.nix
+++ b/pkgs/by-name/li/libstrophe/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "strophe";
     repo = "libstrophe";
-    rev = version;
+    tag = version;
     hash = "sha256-53O8hHyw9y0Bzs+BpGouAxuSGJxh6NSNNWZqi7RHAsY=";
   };
 
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/libsv/package.nix b/pkgs/by-name/li/libsv/package.nix
index 4136c6471407..da3e1a92907e 100644
--- a/pkgs/by-name/li/libsv/package.nix
+++ b/pkgs/by-name/li/libsv/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uael";
     repo = "sv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sc7WTRY8XTm5+J+zlS7tGa2f+2d7apj+XHyBafZXXeE=";
   };
 
diff --git a/pkgs/by-name/li/libtickit/package.nix b/pkgs/by-name/li/libtickit/package.nix
index b0ae23194ccf..a096406292a3 100644
--- a/pkgs/by-name/li/libtickit/package.nix
+++ b/pkgs/by-name/li/libtickit/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "leonerd";
     repo = "libtickit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q8JMNFxmnyOiUso4nXLZjJIBFYR/EF6g45lxVeY0f1s=";
   };
 
diff --git a/pkgs/by-name/li/libtins/package.nix b/pkgs/by-name/li/libtins/package.nix
index 20a14280cb7b..539aaa0fded8 100644
--- a/pkgs/by-name/li/libtins/package.nix
+++ b/pkgs/by-name/li/libtins/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mfontanini";
     repo = "libtins";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zL4C2Cgs9Y3NebL8MPQBO5j8Bm6xhl8ZggQBPJLRn0o=";
   };
 
diff --git a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix
index 9d3c64255893..e4130aac20c2 100644
--- a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix
+++ b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "arvidn";
     repo = "libtorrent";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HkpaOCBL+0Kc7M9DmnW2dUGC+b60a7n5n3i1SyRfkb4=";
   };
 
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 b544b1c6f77e..9577469107ff 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
@@ -28,7 +28,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/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix
index 1b5ff8e0c9d3..78e1157c8c96 100644
--- a/pkgs/by-name/li/libtorrent/package.nix
+++ b/pkgs/by-name/li/libtorrent/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "libtorrent";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ejDne7vaV+GYP6M0n3VAEva4UHuxRGwfc2rgxf7U/EM=";
   };
 
diff --git a/pkgs/by-name/li/libtpms/package.nix b/pkgs/by-name/li/libtpms/package.nix
index 4deb7b7e261e..0aadae0c65f7 100644
--- a/pkgs/by-name/li/libtpms/package.nix
+++ b/pkgs/by-name/li/libtpms/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stefanberger";
     repo = "libtpms";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YKs/XYJ8UItOtSinl28/G9XFVzobFd4ZDKtClQDLXFk=";
   };
 
diff --git a/pkgs/by-name/li/libucl/package.nix b/pkgs/by-name/li/libucl/package.nix
index 620b933898b8..094ca57a20a4 100644
--- a/pkgs/by-name/li/libucl/package.nix
+++ b/pkgs/by-name/li/libucl/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "libucl";
-    rev = version;
+    tag = version;
     sha256 = "sha256-esNEVBa660rl3Oo2SLaLrFThFkjbqtZ1r0tjMq3h6cM=";
   };
 
diff --git a/pkgs/by-name/li/libucontext/package.nix b/pkgs/by-name/li/libucontext/package.nix
index 375fc20164ac..7e1347d67d4e 100644
--- a/pkgs/by-name/li/libucontext/package.nix
+++ b/pkgs/by-name/li/libucontext/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kaniini";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fk3ZKkp3dsyeF6SOWSccr5MkKEwS4AAuosD/h+6wjSw=";
   };
 
diff --git a/pkgs/by-name/li/libudev-zero/package.nix b/pkgs/by-name/li/libudev-zero/package.nix
index 104c80c498f9..f2802d68db87 100644
--- a/pkgs/by-name/li/libudev-zero/package.nix
+++ b/pkgs/by-name/li/libudev-zero/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "illiliti";
     repo = "libudev-zero";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-NXDof1tfr66ywYhCBDlPa+8DUfFj6YH0dvSaxHFqsXI=";
   };
 
diff --git a/pkgs/by-name/li/libudev0-shim/package.nix b/pkgs/by-name/li/libudev0-shim/package.nix
index 55f51b8b412d..b74b60e808d8 100644
--- a/pkgs/by-name/li/libudev0-shim/package.nix
+++ b/pkgs/by-name/li/libudev0-shim/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "archlinux";
     repo = "libudev0-shim";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1460qm6rp1cqnns39lj24z7191m8sbpvbjabqbzb55dkdd2kw50z";
   };
 
diff --git a/pkgs/by-name/li/libuev/package.nix b/pkgs/by-name/li/libuev/package.nix
index 430eb6a0fc21..44cb398349d5 100644
--- a/pkgs/by-name/li/libuev/package.nix
+++ b/pkgs/by-name/li/libuev/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "libuev";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-x1Sk7IuhlBQPFL7Rq4tmEanBxI/WaQ2L5fpUyEWOoi8=";
   };
 
diff --git a/pkgs/by-name/li/libuldaq/package.nix b/pkgs/by-name/li/libuldaq/package.nix
index cb5adc4c4560..7e571e337685 100644
--- a/pkgs/by-name/li/libuldaq/package.nix
+++ b/pkgs/by-name/li/libuldaq/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mccdaq";
     repo = "uldaq";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DA1mxu94z5xDpGK9OBwD02HXlOATv/slqZ4lz5GM7QM=";
   };
 
diff --git a/pkgs/by-name/li/libuninameslist/package.nix b/pkgs/by-name/li/libuninameslist/package.nix
index a1df422c7183..ac65843ed894 100644
--- a/pkgs/by-name/li/libuninameslist/package.nix
+++ b/pkgs/by-name/li/libuninameslist/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fontforge";
     repo = "libuninameslist";
-    rev = version;
+    tag = version;
     hash = "sha256-Pi30c3To57AzY59i39JVG2IUkGnq7CEAQkqJ1f5AZhw=";
   };
 
diff --git a/pkgs/by-name/li/libusbmuxd/package.nix b/pkgs/by-name/li/libusbmuxd/package.nix
index cb77300acec0..a3b0603b5f7d 100644
--- a/pkgs/by-name/li/libusbmuxd/package.nix
+++ b/pkgs/by-name/li/libusbmuxd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-coQqNGPsqrOYbBjO0eQZQNK8ZTB+ZzfMWvQ6Z1by9PY=";
   };
 
diff --git a/pkgs/by-name/li/libusbp/package.nix b/pkgs/by-name/li/libusbp/package.nix
index 7e6a921d3aea..623f1b076946 100644
--- a/pkgs/by-name/li/libusbp/package.nix
+++ b/pkgs/by-name/li/libusbp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pololu";
     repo = "libusbp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-hFvQceUapzlD021KIOJbSXX7qv1IQMuEudRHYeCkbS8=";
   };
 
diff --git a/pkgs/by-name/li/libv3270/package.nix b/pkgs/by-name/li/libv3270/package.nix
index 8f5e3a8b4808..3afc5bccdc75 100644
--- a/pkgs/by-name/li/libv3270/package.nix
+++ b/pkgs/by-name/li/libv3270/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PerryWerneck";
     repo = "libv3270";
-    rev = version;
+    tag = version;
     hash = "sha256-Z3FvxPa1pfeECxfB5ZL6gwhkbTKFpfO3D/zLVLF+uiI=";
   };
 
diff --git a/pkgs/by-name/li/libvarlink/package.nix b/pkgs/by-name/li/libvarlink/package.nix
index ac1f4c26fe1a..a32d87951aee 100644
--- a/pkgs/by-name/li/libvarlink/package.nix
+++ b/pkgs/by-name/li/libvarlink/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "varlink";
     repo = "libvarlink";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-/BWbbDFLxa1da5ewrt3DG/+096dZ+s6p8VdcRGDiEiU=";
   };
 
diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix
index 0f035821e476..24f05186e2ff 100644
--- a/pkgs/by-name/li/libvdpau-va-gl/package.nix
+++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "i-rinat";
     repo = "libvdpau-va-gl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld";
   };
 
diff --git a/pkgs/by-name/li/libversion/package.nix b/pkgs/by-name/li/libversion/package.nix
index c1f1af764b0d..0a6131259869 100644
--- a/pkgs/by-name/li/libversion/package.nix
+++ b/pkgs/by-name/li/libversion/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "repology";
     repo = "libversion";
-    rev = version;
+    tag = version;
     hash = "sha256-REmXD0NFd7Af01EU/f2IGoTKiju6ErTI7WUinvrAzaA=";
   };
 
diff --git a/pkgs/by-name/li/libverto/package.nix b/pkgs/by-name/li/libverto/package.nix
index 7d148878bdf4..f8f2d091fcde 100644
--- a/pkgs/by-name/li/libverto/package.nix
+++ b/pkgs/by-name/li/libverto/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "libverto";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-csoJ0WdKyrza8kBSMKoaItKvcbijI6Wl8nWCbywPScQ=";
   };
 
diff --git a/pkgs/by-name/li/libvibrant/package.nix b/pkgs/by-name/li/libvibrant/package.nix
index c6dab911b41e..cb4681fecac4 100644
--- a/pkgs/by-name/li/libvibrant/package.nix
+++ b/pkgs/by-name/li/libvibrant/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libvibrant";
     repo = "libvibrant";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-APja211+U0WVuCRz8f3VIAQLF4oPhh0CJ3Y5EgSJnh0=";
   };
 
diff --git a/pkgs/by-name/li/libvisio2svg/package.nix b/pkgs/by-name/li/libvisio2svg/package.nix
index b82a14cc5319..79d1973f25bd 100644
--- a/pkgs/by-name/li/libvisio2svg/package.nix
+++ b/pkgs/by-name/li/libvisio2svg/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kakwa";
     repo = "libvisio2svg";
-    rev = version;
+    tag = version;
     sha256 = "14m37mmib1596c76j9w178jqhwxyih2sy5w5q9xglh8cmlfn1hfx";
   };
 
diff --git a/pkgs/by-name/li/libvpx/package.nix b/pkgs/by-name/li/libvpx/package.nix
index 41cc90a17954..005edeca8969 100644
--- a/pkgs/by-name/li/libvpx/package.nix
+++ b/pkgs/by-name/li/libvpx/package.nix
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "webmproject";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ewkx1okhpa05jn4DyN8pkl6UJoz4Ymw4jRe6GN1lWuA=";
   };
 
diff --git a/pkgs/by-name/li/libwebp/package.nix b/pkgs/by-name/li/libwebp/package.nix
index c47827091eba..01d36c9accc3 100644
--- a/pkgs/by-name/li/libwebp/package.nix
+++ b/pkgs/by-name/li/libwebp/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "webmproject";
     repo = "libwebp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DMHP7DVWXrTsqU0m9tc783E6dNO0EQoSXZTn5kZOtTg=";
   };
 
diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix
index 84e55117c74b..80481be98442 100644
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "warmcat";
     repo = "libwebsockets";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KOAhIVn4G5u0A1TE75Xv7iYO3/i8foqWYecH0kJHdBM=";
   };
 
diff --git a/pkgs/by-name/li/libwhereami/package.nix b/pkgs/by-name/li/libwhereami/package.nix
index f21551ca0242..a21d126632ed 100644
--- a/pkgs/by-name/li/libwhereami/package.nix
+++ b/pkgs/by-name/li/libwhereami/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "05fc28dri2h858kxbvldk5b6wd5is3fjcdsiqj3nxf95i66bb3xp";
-    rev = version;
+    tag = version;
     repo = "libwhereami";
     owner = "puppetlabs";
   };
diff --git a/pkgs/by-name/li/libwhich/package.nix b/pkgs/by-name/li/libwhich/package.nix
index 4dc97d33a7e7..b104b67c1b2c 100644
--- a/pkgs/by-name/li/libwhich/package.nix
+++ b/pkgs/by-name/li/libwhich/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vtjnash";
     repo = "libwhich";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JNIWdI12sL3TZqVA3GeH0KbgqFDbMsEdecea3392Goc=";
   };
 
diff --git a/pkgs/by-name/li/libwmf/package.nix b/pkgs/by-name/li/libwmf/package.nix
index 7e55740b0376..1aa01987815f 100644
--- a/pkgs/by-name/li/libwmf/package.nix
+++ b/pkgs/by-name/li/libwmf/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "caolanm";
     repo = "libwmf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vffohx57OvQKu8DfNXNBm9bPsA8KgkQWs/3mmFn7L6M=";
   };
 
diff --git a/pkgs/by-name/li/libx86emu/package.nix b/pkgs/by-name/li/libx86emu/package.nix
index 6449b67a7600..38b5dd4a8ba9 100644
--- a/pkgs/by-name/li/libx86emu/package.nix
+++ b/pkgs/by-name/li/libx86emu/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wfeldt";
     repo = "libx86emu";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ilAmGlkMeuG0FlygMdE3NreFPJJF6g/26C8C5grvjrk=";
   };
 
diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix
index 55c58f9518a6..b64fb634b36b 100644
--- a/pkgs/by-name/li/libxls/package.nix
+++ b/pkgs/by-name/li/libxls/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libxls";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KbITHQ9s2RUeo8zR53R9s4WUM6z8zzddz1k47So0Mlw=";
   };
 
diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix
index d814ee010450..6d56d01f027a 100644
--- a/pkgs/by-name/li/libxmlb/package.nix
+++ b/pkgs/by-name/li/libxmlb/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "libxmlb";
-    rev = version;
+    tag = version;
     hash = "sha256-+gs1GqDVnt0uf/0vjUj+c9CRnUtaYfngBsjSs4ZwVXs=";
   };
 
diff --git a/pkgs/by-name/li/libxo/package.nix b/pkgs/by-name/li/libxo/package.nix
index f8747a754e0e..2db30f3b8817 100644
--- a/pkgs/by-name/li/libxo/package.nix
+++ b/pkgs/by-name/li/libxo/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Juniper";
     repo = "libxo";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ElSxegY2ejw7IuIMznfVpl29Wyvpx9k1BdXregzYsoQ=";
   };
 
diff --git a/pkgs/by-name/li/libxsmm/package.nix b/pkgs/by-name/li/libxsmm/package.nix
index fcb99e8c346c..e7dd1cccb253 100644
--- a/pkgs/by-name/li/libxsmm/package.nix
+++ b/pkgs/by-name/li/libxsmm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libxsmm";
     repo = "libxsmm";
-    rev = version;
+    tag = version;
     sha256 = "sha256-s/NEFU4IwQPLyPLwMmrrpMDd73q22Sk2BNid/kedawY=";
   };
 
diff --git a/pkgs/by-name/li/libyaml/package.nix b/pkgs/by-name/li/libyaml/package.nix
index 9ab641e5543d..e722475782d3 100644
--- a/pkgs/by-name/li/libyaml/package.nix
+++ b/pkgs/by-name/li/libyaml/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yaml";
     repo = "libyaml";
-    rev = version;
+    tag = version;
     sha256 = "18zsnsxc53pans4a01cs4401a2cjk3qi098hi440pj4zijifgcsb";
   };
 
diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix
index ca097a219486..4cb3b025dd0b 100644
--- a/pkgs/by-name/li/libyang/package.nix
+++ b/pkgs/by-name/li/libyang/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CESNET";
     repo = "libyang";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5oJV8gr2rwvSdpX5w3gmIw/LTrWtXVnl6oLr/soNTDk=";
   };
 
diff --git a/pkgs/by-name/li/libytnef/package.nix b/pkgs/by-name/li/libytnef/package.nix
index 9b3bf8c5e3fe..efee9e6000c7 100644
--- a/pkgs/by-name/li/libytnef/package.nix
+++ b/pkgs/by-name/li/libytnef/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Yeraze";
     repo = "ytnef";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kQb45Da0T7wWi1IivA8Whk+ECL2nyFf7Gc0gK1HKj2c=";
   };
 
diff --git a/pkgs/by-name/li/libzbc/package.nix b/pkgs/by-name/li/libzbc/package.nix
index d7c00b7b296e..ccb8c58cd5d0 100644
--- a/pkgs/by-name/li/libzbc/package.nix
+++ b/pkgs/by-name/li/libzbc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "westerndigitalcorporation";
     repo = "libzbc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8+HF5Wf6lQHbi8Vp2tpom1FO56lQ5RyYsgs8ii+2RD0=";
   };
 
diff --git a/pkgs/by-name/li/libzbd/package.nix b/pkgs/by-name/li/libzbd/package.nix
index 2276e1dfc4d5..a27c8cbd12d8 100644
--- a/pkgs/by-name/li/libzbd/package.nix
+++ b/pkgs/by-name/li/libzbd/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "westerndigitalcorporation";
     repo = "libzbd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-iMQjOWsgsS+uI8mqoOXHRAV1+SIu1McUAcrsY+/zcu8=";
   };
 
diff --git a/pkgs/by-name/li/license-go/package.nix b/pkgs/by-name/li/license-go/package.nix
index 17491272b426..474e85daafcd 100644
--- a/pkgs/by-name/li/license-go/package.nix
+++ b/pkgs/by-name/li/license-go/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "nishanths";
     repo = "license";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Rz/eIGa3xLjirPMOs4otfmwy4OzJgopKPbka2OKt8Fo=";
   };
 
diff --git a/pkgs/by-name/li/licenseclassifier/package.nix b/pkgs/by-name/li/licenseclassifier/package.nix
index ad12323a4ecc..513438ea1761 100644
--- a/pkgs/by-name/li/licenseclassifier/package.nix
+++ b/pkgs/by-name/li/licenseclassifier/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "licenseclassifier";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j+8hX8W0VD0h09Qmu7POnHT8f8+SeG5Si1fI0CDIwuo=";
   };
 
diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix
index a5a4ac228048..b1265a6f5a74 100644
--- a/pkgs/by-name/li/licensure/package.nix
+++ b/pkgs/by-name/li/licensure/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chasinglogic";
     repo = "licensure";
-    rev = version;
+    tag = version;
     hash = "sha256-3kZzYDKMLRdYzxa9+wVeTFJk186MJZfGfzRXgY9tI4Y=";
   };
 
diff --git a/pkgs/by-name/li/lifecycled/package.nix b/pkgs/by-name/li/lifecycled/package.nix
index 8605f701fe1b..4f9f3711a9c3 100644
--- a/pkgs/by-name/li/lifecycled/package.nix
+++ b/pkgs/by-name/li/lifecycled/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "lifecycled";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zskN2T0+1xZPjppggeGpPFuQ8/AgPNyN77F33rDoghc=";
   };
 
diff --git a/pkgs/by-name/li/lightdm-mini-greeter/package.nix b/pkgs/by-name/li/lightdm-mini-greeter/package.nix
index 632e471c9203..19cd73498b47 100644
--- a/pkgs/by-name/li/lightdm-mini-greeter/package.nix
+++ b/pkgs/by-name/li/lightdm-mini-greeter/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "prikhi";
     repo = "lightdm-mini-greeter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Pm7ExfusFIPktX2C4UE07qgOVhcWhVxnaD3QARpmu7Y=";
   };
 
diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix
index 67cd39a37d71..ccc8e9b727ed 100644
--- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix
+++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "slick-greeter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-YSSAFH6azXVk527CmZ6RM2hBdzziTdXeOmYZKusF/DQ=";
   };
 
diff --git a/pkgs/by-name/li/lightdm-tiny-greeter/package.nix b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix
index 46a5ff29365c..1cd478f8cd6f 100644
--- a/pkgs/by-name/li/lightdm-tiny-greeter/package.nix
+++ b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "off-world";
     repo = "lightdm-tiny-greeter";
-    rev = version;
+    tag = version;
     sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6";
   };
 
diff --git a/pkgs/by-name/li/lightlocker/package.nix b/pkgs/by-name/li/lightlocker/package.nix
index efcee4bdeea1..ca916c54cdce 100644
--- a/pkgs/by-name/li/lightlocker/package.nix
+++ b/pkgs/by-name/li/lightlocker/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "the-cavalry";
     repo = "light-locker";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1z5lcd02gqax65qc14hj5khifg7gr53zy3s5i6apba50lbdlfk46";
   };
 
diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix
index c68648a0ee3d..b37d35905ae1 100644
--- a/pkgs/by-name/li/lightning-loop/package.nix
+++ b/pkgs/by-name/li/lightning-loop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "loop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zgKKYHDRYXPslPHay/V2DAL1jQfeX5qPWUQQtuvp1M0=";
   };
 
diff --git a/pkgs/by-name/li/lightning-pool/package.nix b/pkgs/by-name/li/lightning-pool/package.nix
index af93ba7c1e83..1d9c9aca2752 100644
--- a/pkgs/by-name/li/lightning-pool/package.nix
+++ b/pkgs/by-name/li/lightning-pool/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "pool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lSc/zOZ5VpmaZ7jrlGvSaczrgOtAMS9tDUxcMoFdBmQ=";
   };
 
diff --git a/pkgs/by-name/li/lightspark/package.nix b/pkgs/by-name/li/lightspark/package.nix
index 89d6900fba94..61b286bd37d9 100644
--- a/pkgs/by-name/li/lightspark/package.nix
+++ b/pkgs/by-name/li/lightspark/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lightspark";
     repo = "lightspark";
-    rev = version;
+    tag = version;
     hash = "sha256-2+Kmwj2keCMR7UbKbY6UvrkX4CnW61elres8ltiZuUg=";
   };
 
diff --git a/pkgs/by-name/li/lightwalletd/package.nix b/pkgs/by-name/li/lightwalletd/package.nix
index 2f3779f337b9..d7cacbdde911 100644
--- a/pkgs/by-name/li/lightwalletd/package.nix
+++ b/pkgs/by-name/li/lightwalletd/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zcash";
     repo = "lightwalletd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-M9xfV2T8L+nssrJj29QmPiErNMpfpT8BY/30Vj8wPjY=";
   };
 
diff --git a/pkgs/by-name/li/lilipod/package.nix b/pkgs/by-name/li/lilipod/package.nix
index 9d26c94d7bda..61511892d3c4 100644
--- a/pkgs/by-name/li/lilipod/package.nix
+++ b/pkgs/by-name/li/lilipod/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "89luca89";
     repo = "lilipod";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PqeYNLr4uXe+H+DLENlUpl1H2wV6VJvDoA+MVP3SRqY=";
   };
 
diff --git a/pkgs/by-name/li/limesurvey/package.nix b/pkgs/by-name/li/limesurvey/package.nix
index d8b44edb8470..c0a88bdcf8f8 100644
--- a/pkgs/by-name/li/limesurvey/package.nix
+++ b/pkgs/by-name/li/limesurvey/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LimeSurvey";
     repo = "LimeSurvey";
-    rev = version;
+    tag = version;
     hash = "sha256-2ZRN2zbrrGWTXgsPeRWsQbg1qw2vVIAwzUI0LWgCL9g=";
   };
 
diff --git a/pkgs/by-name/li/linbox/package.nix b/pkgs/by-name/li/linbox/package.nix
index b1fa335a04a7..ef08f86fcf1f 100644
--- a/pkgs/by-name/li/linbox/package.nix
+++ b/pkgs/by-name/li/linbox/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linbox-team";
     repo = "linbox";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mW84a98KPLqcHMjX3LIYTmVe0ngUdz6RJLpoDaAqKU8=";
   };
 
diff --git a/pkgs/by-name/li/linenoise-ng/package.nix b/pkgs/by-name/li/linenoise-ng/package.nix
index 1b9ad3f243c4..6c4dcb1f329f 100644
--- a/pkgs/by-name/li/linenoise-ng/package.nix
+++ b/pkgs/by-name/li/linenoise-ng/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arangodb";
     repo = "linenoise-ng";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "176iz0kj0p8d8i3jqps4z8xkxwl3f1986q88i9xg5fvqgpzsxp20";
   };
 
diff --git a/pkgs/by-name/li/lineselect/package.nix b/pkgs/by-name/li/lineselect/package.nix
index 5386172232ea..53260101d2dd 100644
--- a/pkgs/by-name/li/lineselect/package.nix
+++ b/pkgs/by-name/li/lineselect/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "chfritz";
     repo = "lineselect";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dCmLD4Wjsdlta2xsFCMj1zWQr4HWCfcWsKVmrTND4Yw=";
   };
 
diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix
index 493ce3831e51..3a4b62863930 100644
--- a/pkgs/by-name/li/lint-staged/package.nix
+++ b/pkgs/by-name/li/lint-staged/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "okonet";
     repo = "lint-staged";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xZ4fKwryGHVD1AhSKJVvBGIDJin10YejKxDp1yMi8Pg=";
   };
 
diff --git a/pkgs/by-name/li/linux_logo/package.nix b/pkgs/by-name/li/linux_logo/package.nix
index 85da3509bd6c..17c8c6c4b51a 100644
--- a/pkgs/by-name/li/linux_logo/package.nix
+++ b/pkgs/by-name/li/linux_logo/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "deater";
     repo = "linux_logo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yBAxPwgKyFFIX0wuG7oG+FbEDpA5cPwyyJgWrFErJ7I=";
   };
 
diff --git a/pkgs/by-name/li/linuxptp/package.nix b/pkgs/by-name/li/linuxptp/package.nix
index 3b02c68f1221..d0ccefb2d163 100644
--- a/pkgs/by-name/li/linuxptp/package.nix
+++ b/pkgs/by-name/li/linuxptp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nwtime";
     repo = "linuxptp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-w1buo+D8Mnd6ytMhQYhvCDqt+RejlNSN/iVjrDR+Khk=";
   };
 
diff --git a/pkgs/by-name/li/liquidprompt/package.nix b/pkgs/by-name/li/liquidprompt/package.nix
index 45ea18b01f37..117af914d304 100644
--- a/pkgs/by-name/li/liquidprompt/package.nix
+++ b/pkgs/by-name/li/liquidprompt/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "liquidprompt";
     repo = "liquidprompt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZVzFGe3ItWsN23iyGpxZEN2KtviYKI8x/sDa2MRio/Y=";
   };
 
diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix
index ba73f3ceb1f7..a36c2abb67d6 100644
--- a/pkgs/by-name/li/listmonk/package.nix
+++ b/pkgs/by-name/li/listmonk/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knadh";
     repo = "listmonk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eNX+2ens+mz2V8ZBHtFFHDVbi64AAiiREElMjh67Dd8=";
   };
 
diff --git a/pkgs/by-name/li/listmonk/stuffbin.nix b/pkgs/by-name/li/listmonk/stuffbin.nix
index 44234a418076..b4e69db01b89 100644
--- a/pkgs/by-name/li/listmonk/stuffbin.nix
+++ b/pkgs/by-name/li/listmonk/stuffbin.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knadh";
     repo = "stuffbin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-M72xNh7bKUMLzA+M8bJB++kJ5KCrkboQm1v8BasP3Yo=";
   };
 
diff --git a/pkgs/by-name/li/lite/package.nix b/pkgs/by-name/li/lite/package.nix
index fd19d3bd1f83..96ce93552663 100644
--- a/pkgs/by-name/li/lite/package.nix
+++ b/pkgs/by-name/li/lite/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rxi";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0wxqfb4ly8g7w5qph76xys95b55ackkags8jgd1nasmiyi8gcd5a";
   };
 
diff --git a/pkgs/by-name/li/litecli/package.nix b/pkgs/by-name/li/litecli/package.nix
index cece9764e1b5..99e6ca14a7c3 100644
--- a/pkgs/by-name/li/litecli/package.nix
+++ b/pkgs/by-name/li/litecli/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dbcli";
     repo = "litecli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TPwzXfb4n6wTe6raQ5IowKdhGkKrf2pmSS2+Q03NKYk=";
   };
 
diff --git a/pkgs/by-name/li/litefs/package.nix b/pkgs/by-name/li/litefs/package.nix
index 5277cda5c178..92bb4e8e3478 100644
--- a/pkgs/by-name/li/litefs/package.nix
+++ b/pkgs/by-name/li/litefs/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "superfly";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-I12bKImZkvAMyfwb6r/NxE+BcUk+SalN+cIDXP0q4xA=";
   };
 
diff --git a/pkgs/by-name/li/litestream/package.nix b/pkgs/by-name/li/litestream/package.nix
index fdb205a271ed..13b904dcb737 100644
--- a/pkgs/by-name/li/litestream/package.nix
+++ b/pkgs/by-name/li/litestream/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "benbjohnson";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-p858gK+ICKDQ+/LUiBaxF/kfrZzQAXnYMZDFU8kNCJ4=";
   };
 
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/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix
index 4cbb41fec40d..28d939d04f9c 100644
--- a/pkgs/by-name/li/litmusctl/package.nix
+++ b/pkgs/by-name/li/litmusctl/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "litmuschaos";
     repo = "litmusctl";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-Saj5sx5YkcKsnMrnIzPcLok+mgEZSh9p8rnfQbJhAeU=";
   };
 
diff --git a/pkgs/by-name/li/little_boxes/package.nix b/pkgs/by-name/li/little_boxes/package.nix
index 7d9178af1469..12ac0edbfb59 100644
--- a/pkgs/by-name/li/little_boxes/package.nix
+++ b/pkgs/by-name/li/little_boxes/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "giodamelio";
     repo = "little_boxes";
-    rev = version;
+    tag = version;
     hash = "sha256-Quh09K5meiA39ih/orJWF2WfkuZdymxub1dZvns/q3E=";
   };
 
diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix
index 93f03ec7a786..8777d1bf8570 100644
--- a/pkgs/by-name/li/littlefs-fuse/package.nix
+++ b/pkgs/by-name/li/littlefs-fuse/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "littlefs-project";
     repo = "littlefs-fuse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RZpGLFVNo3WEXVU7V2tFjRs8iYN1Ge6AN4Bcq3d6mtc=";
   };
   buildInputs = [ fuse ];
diff --git a/pkgs/by-name/li/live-chart/package.nix b/pkgs/by-name/li/live-chart/package.nix
index 942fe3545562..49d917e7062c 100644
--- a/pkgs/by-name/li/live-chart/package.nix
+++ b/pkgs/by-name/li/live-chart/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lcallarec";
     repo = "live-chart";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-SOZJ9sVrmsZybs5BVXWmqBJ/P7SZI/X8TGWHXGvXAU8=";
   };
 
diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index 66ede7d221c3..15d877a2d421 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lomirus";
     repo = "live-server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8NM3XJ7RC7cUNKN1DPW2huvkx7tfA8zDrETkwDMbaT8=";
   };
 
diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix
index ea9716c6fd70..80e0dfa8ccf7 100644
--- a/pkgs/by-name/li/livekit-cli/package.nix
+++ b/pkgs/by-name/li/livekit-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-J5tg3nm2pEemEZcIpObcxH+G4ByzvUtoSyy92CcWr6M=";
   };
 
diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index 4f023ced0b09..17681088d3be 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j8alEPvSMdYpQLdWwaoSG5ZYgO17O1BMa71omeCb2Ug=";
   };
 
diff --git a/pkgs/by-name/li/lizardfs/package.nix b/pkgs/by-name/li/lizardfs/package.nix
index a7aead761da0..d0c5d2079d74 100644
--- a/pkgs/by-name/li/lizardfs/package.nix
+++ b/pkgs/by-name/li/lizardfs/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lizardfs";
     repo = "lizardfs";
-    rev = version;
+    tag = version;
     sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q=";
   };
 
diff --git a/pkgs/by-name/lk/lksctp-tools/package.nix b/pkgs/by-name/lk/lksctp-tools/package.nix
index 8958dff70378..11bf2429d538 100644
--- a/pkgs/by-name/lk/lksctp-tools/package.nix
+++ b/pkgs/by-name/lk/lksctp-tools/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sctp";
     repo = "lksctp-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+vbdNvHuJLYp901QgtBzMejlbzMyr9Z1eXxR3Zy7eAE=";
   };
 
diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix
index 6931256080b2..1adec65f2cdd 100644
--- a/pkgs/by-name/ll/lldap/package.nix
+++ b/pkgs/by-name/ll/lldap/package.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitHub {
       owner = "lldap";
       repo = "lldap";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-iQ+Vv9kx/pWHoa/WZChBK+FD2r1avzWWz57bnnzRjUg=";
     };
 
diff --git a/pkgs/by-name/ll/llpp/package.nix b/pkgs/by-name/ll/llpp/package.nix
index 686831fd92dc..713f2aa52d7c 100644
--- a/pkgs/by-name/ll/llpp/package.nix
+++ b/pkgs/by-name/ll/llpp/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "criticic";
     repo = "llpp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B/jKvBtBwMOErUVmGFGXXIT8FzMl1DFidfDCHIH41TU=";
   };
 
diff --git a/pkgs/by-name/lm/lmdbxx/package.nix b/pkgs/by-name/lm/lmdbxx/package.nix
index f36619273025..46b4a9cefc6d 100644
--- a/pkgs/by-name/lm/lmdbxx/package.nix
+++ b/pkgs/by-name/lm/lmdbxx/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hoytech";
     repo = "lmdbxx";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-7CxQZdgHVvmof6wVR9Mzic6tg89XJT3Z1ICGRs7PZYo=";
   };
 
diff --git a/pkgs/by-name/lm/lmp/package.nix b/pkgs/by-name/lm/lmp/package.nix
index f651b1d9046e..77a6e7786f27 100644
--- a/pkgs/by-name/lm/lmp/package.nix
+++ b/pkgs/by-name/lm/lmp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "0xInfection";
     repo = "LogMePwn";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VL/Hp7YaXNcV9JPb3kgRHcdhJJ5p3KHUf3hHbT3gKVk=";
   };
 
diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix
index 8cec68695abd..3904867ed63c 100644
--- a/pkgs/by-name/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "epoupon";
     repo = "lms";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-H+ibj7eroIWti2Mxa+V5pzE1NE7b3H3/ThVIDqweWf8=";
   };
 
diff --git a/pkgs/by-name/ln/lnd/package.nix b/pkgs/by-name/ln/lnd/package.nix
index ec161dd4219f..5cac89fedd99 100644
--- a/pkgs/by-name/ln/lnd/package.nix
+++ b/pkgs/by-name/ln/lnd/package.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightningnetwork";
     repo = "lnd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7Y1GcZoj7Uk0PGd0B0J4hXpb5voqmM2f/Ie4FRHI3iQ=";
   };
 
diff --git a/pkgs/by-name/ln/lndconnect/package.nix b/pkgs/by-name/ln/lndconnect/package.nix
index d5105e6fc1c0..51d71addad7a 100644
--- a/pkgs/by-name/ln/lndconnect/package.nix
+++ b/pkgs/by-name/ln/lndconnect/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "LN-Zap";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cuZkVeFUQq7+kQo/YjXCMPANUL5QooAWgegcoWo3M0c=";
   };
 
diff --git a/pkgs/by-name/ln/lndhub-go/package.nix b/pkgs/by-name/ln/lndhub-go/package.nix
index a8be86ad8a03..99db6d50d586 100644
--- a/pkgs/by-name/ln/lndhub-go/package.nix
+++ b/pkgs/by-name/ln/lndhub-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "getAlby";
     repo = "lndhub.go";
-    rev = version;
+    tag = version;
     sha256 = "sha256-17vvC6J0VdXouGfX4k1kCVRlkXbNSX3AT8QIY8uKDUE=";
   };
 
diff --git a/pkgs/by-name/ln/lndinit/package.nix b/pkgs/by-name/ln/lndinit/package.nix
index 183465512d6f..e45ec2ce600e 100644
--- a/pkgs/by-name/ln/lndinit/package.nix
+++ b/pkgs/by-name/ln/lndinit/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "lndinit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KXCObRUhXTEeb48hnQYrnb55g+nJomr52IIVpFDn+nY=";
   };
 
diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix
index 14832660a7a9..e98685b45a9b 100644
--- a/pkgs/by-name/lo/local-ai/package.nix
+++ b/pkgs/by-name/lo/local-ai/package.nix
@@ -335,7 +335,7 @@ let
   src = fetchFromGitHub {
     owner = "go-skynet";
     repo = "LocalAI";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eHylgEbPNQ8CVLlstkeQH6jqYOKfvel1uU5ro8DkLJs=";
   };
 
diff --git a/pkgs/by-name/lo/locate-dominating-file/package.nix b/pkgs/by-name/lo/locate-dominating-file/package.nix
index ece548fc56c7..b996694afc03 100644
--- a/pkgs/by-name/lo/locate-dominating-file/package.nix
+++ b/pkgs/by-name/lo/locate-dominating-file/package.nix
@@ -16,7 +16,7 @@ resholve.mkDerivation {
   src = fetchFromGitHub {
     owner = "roman";
     repo = "locate-dominating-file";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gwh6fAw7BV7VFIkQN02QIhK47uxpYheMk64UeLyp2IY=";
   };
 
diff --git a/pkgs/by-name/lo/log4j-sniffer/package.nix b/pkgs/by-name/lo/log4j-sniffer/package.nix
index 4e5102574abb..1311087cbbf0 100644
--- a/pkgs/by-name/lo/log4j-sniffer/package.nix
+++ b/pkgs/by-name/lo/log4j-sniffer/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "palantir";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pO6difzNvQvKQtRLyksXmExtQHlnnwyF3iNEmSBgUmU=";
   };
 
diff --git a/pkgs/by-name/lo/log4j-vuln-scanner/package.nix b/pkgs/by-name/lo/log4j-vuln-scanner/package.nix
index 784a3db24ec9..e9380f333b2c 100644
--- a/pkgs/by-name/lo/log4j-vuln-scanner/package.nix
+++ b/pkgs/by-name/lo/log4j-vuln-scanner/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hillu";
     repo = "local-log4j-vuln-scanner";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YMD2233EdrrF1SLjwiRcNr53b7Rf5Tu8CZC43QhSY7c=";
   };
 
diff --git a/pkgs/by-name/lo/logiops_0_2_3/package.nix b/pkgs/by-name/lo/logiops_0_2_3/package.nix
index 99c8415134cc..0ddf9681e9fd 100644
--- a/pkgs/by-name/lo/logiops_0_2_3/package.nix
+++ b/pkgs/by-name/lo/logiops_0_2_3/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pixlone";
     repo = "logiops";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1v728hbIM2ODtB+r6SYzItczRJCsbuTvhYD2OUM1+/E=";
   };
 
diff --git a/pkgs/by-name/lo/logrotate/package.nix b/pkgs/by-name/lo/logrotate/package.nix
index 3f454af211ab..ff1810247e81 100644
--- a/pkgs/by-name/lo/logrotate/package.nix
+++ b/pkgs/by-name/lo/logrotate/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "logrotate";
     repo = "logrotate";
-    rev = version;
+    tag = version;
     sha256 = "sha256-D7E2mpC7v2kbsb1EyhR6hLvGbnIvGB2MK1n1gptYyKI=";
   };
 
diff --git a/pkgs/by-name/lo/lokalise2-cli/package.nix b/pkgs/by-name/lo/lokalise2-cli/package.nix
index 32cfb4202228..9912f7422ea8 100644
--- a/pkgs/by-name/lo/lokalise2-cli/package.nix
+++ b/pkgs/by-name/lo/lokalise2-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lokalise";
     repo = "lokalise-cli-2-go";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-R8vzHuWkNznq/eeXUVHm9SJJmRV2B2WXKQFEHil+HiY=";
   };
 
diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix
index 45ea60a7ea13..7acc4ede9527 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-R9yLrXzXeu7gUoV+CDOAu89p2YmPP0ImAWq2fod722c=";
   };
diff --git a/pkgs/by-name/lo/lolcode/package.nix b/pkgs/by-name/lo/lolcode/package.nix
index ff96112289c1..3b84753802b0 100644
--- a/pkgs/by-name/lo/lolcode/package.nix
+++ b/pkgs/by-name/lo/lolcode/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "justinmeza";
     repo = "lci";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VMBW3/sw+1kI6iuOckSPU1TIeY6QORcSfFLFkRYw3Gs=";
   };
 
diff --git a/pkgs/by-name/lo/longview/package.nix b/pkgs/by-name/lo/longview/package.nix
index d35bd0592ea6..a0a18a6c653a 100644
--- a/pkgs/by-name/lo/longview/package.nix
+++ b/pkgs/by-name/lo/longview/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linode";
     repo = "longview";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1i9lli8iw8sb1bd633i82fzhx5gz85ma9d1hra41pkv2p3h823pa";
   };
 
diff --git a/pkgs/by-name/lo/looking-glass-client/package.nix b/pkgs/by-name/lo/looking-glass-client/package.nix
index 5e8ee0d2a684..4b21f6c252f7 100644
--- a/pkgs/by-name/lo/looking-glass-client/package.nix
+++ b/pkgs/by-name/lo/looking-glass-client/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gnif";
     repo = "LookingGlass";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-I84oVLeS63mnR19vTalgvLvA5RzCPTXV+tSsw+ImDwQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/lo/lorem/package.nix b/pkgs/by-name/lo/lorem/package.nix
index ed6bb0111784..5690ca2aa440 100644
--- a/pkgs/by-name/lo/lorem/package.nix
+++ b/pkgs/by-name/lo/lorem/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World/design";
     repo = "lorem";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-q6gpxxNebf2G/lT5wWXT/lVp3zR8QLWB8/sdK+wLTJ8=";
   };
 
diff --git a/pkgs/by-name/lo/lorien/package.nix b/pkgs/by-name/lo/lorien/package.nix
index 345be9574959..37e8de25239f 100644
--- a/pkgs/by-name/lo/lorien/package.nix
+++ b/pkgs/by-name/lo/lorien/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mbrlabs";
     repo = "Lorien";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mPv/3hyLGF3IUy6cKfGoABidIsyw4UfmhfhS4AD72K8=";
   };
 
diff --git a/pkgs/by-name/lo/loudgain/package.nix b/pkgs/by-name/lo/loudgain/package.nix
index 0a29ea0e7e3d..2524d255e80b 100644
--- a/pkgs/by-name/lo/loudgain/package.nix
+++ b/pkgs/by-name/lo/loudgain/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Moonbase59";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XLj+n0GlY/GAkJlW2JVMd0jxMzgdv/YeSTuF6QUIGwU=";
   };
 
diff --git a/pkgs/by-name/lo/lounge-gtk-theme/package.nix b/pkgs/by-name/lo/lounge-gtk-theme/package.nix
index aec0a74eaf18..1b6d367a48a6 100644
--- a/pkgs/by-name/lo/lounge-gtk-theme/package.nix
+++ b/pkgs/by-name/lo/lounge-gtk-theme/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "monday15";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0ima0aa5j296xn4y0d1zj6vcdrdpnihqdidj7bncxzgbnli1vazs";
   };
 
diff --git a/pkgs/by-name/lo/lout/package.nix b/pkgs/by-name/lo/lout/package.nix
index 44b01867093c..f7785f3bee3b 100644
--- a/pkgs/by-name/lo/lout/package.nix
+++ b/pkgs/by-name/lo/lout/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "william8000";
     repo = "lout";
-    rev = version;
+    tag = version;
     hash = "sha256-bXLhkJqhv8pftDZYv6vn9ycy5u3vde+m3gCPvWJz2M8=";
   };
 
diff --git a/pkgs/by-name/lp/lparchive2epub/package.nix b/pkgs/by-name/lp/lparchive2epub/package.nix
index e7024017bacc..7faeeec370c1 100644
--- a/pkgs/by-name/lp/lparchive2epub/package.nix
+++ b/pkgs/by-name/lp/lparchive2epub/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Arwalk";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-z8/cIevqPKo7Eukk4WVxgSjzO1EYUYWD8orAdUKR8z8=";
   };
 
diff --git a/pkgs/by-name/lp/lprint/package.nix b/pkgs/by-name/lp/lprint/package.nix
index e2aca674b63f..fad268369203 100644
--- a/pkgs/by-name/lp/lprint/package.nix
+++ b/pkgs/by-name/lp/lprint/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = "lprint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1OOLGQ8S4oRNSJanX/AzJ+g5F+jYnE/+o+ie5ucY22U=";
   };
 
diff --git a/pkgs/by-name/lr/lr/package.nix b/pkgs/by-name/lr/lr/package.nix
index b4b2807f3f50..f70a1eda2ae3 100644
--- a/pkgs/by-name/lr/lr/package.nix
+++ b/pkgs/by-name/lr/lr/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chneukirchen";
     repo = "lr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TcP0jLFemdmWzGa4/RX7N6xUUTgKsI7IEOD7GfuuPWI=";
   };
 
diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix
index 1bf3282df317..ee9cea863987 100644
--- a/pkgs/by-name/lr/lrcget/package.nix
+++ b/pkgs/by-name/lr/lrcget/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tranxuanthang";
     repo = "lrcget";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-3dBjQ1fO1q8JCQFvvV8LWBCD8cKFkFmm8ufC/Xihmj4=";
   };
 
diff --git a/pkgs/by-name/lr/lrdf/package.nix b/pkgs/by-name/lr/lrdf/package.nix
index 4c11211c1a19..b58838e3c87f 100644
--- a/pkgs/by-name/lr/lrdf/package.nix
+++ b/pkgs/by-name/lr/lrdf/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swh";
     repo = "LRDF";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4";
   };
 
diff --git a/pkgs/by-name/lr/lrzip/package.nix b/pkgs/by-name/lr/lrzip/package.nix
index e1b257fcd09a..56b4bfb70bcd 100644
--- a/pkgs/by-name/lr/lrzip/package.nix
+++ b/pkgs/by-name/lr/lrzip/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ckolivas";
     repo = "lrzip";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Mb324ojtLV0S10KhL7Vjf3DhSOtCy1pFMTzvLkTnpXM=";
   };
 
diff --git a/pkgs/by-name/ls/ls-lint/package.nix b/pkgs/by-name/ls/ls-lint/package.nix
index 2d6627d132b2..41c3e2c8a2c9 100644
--- a/pkgs/by-name/ls/ls-lint/package.nix
+++ b/pkgs/by-name/ls/ls-lint/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "loeffel-io";
     repo = "ls-lint";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QAUmQAa1gNS2LLyFmOsydOVKZoZMWzu9y7SgbIq1ESk=";
   };
 
diff --git a/pkgs/by-name/ls/lsd/package.nix b/pkgs/by-name/ls/lsd/package.nix
index e3602446f902..dd9c6bb6dd39 100644
--- a/pkgs/by-name/ls/lsd/package.nix
+++ b/pkgs/by-name/ls/lsd/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lsd-rs";
     repo = "lsd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LlMcBMb40yN+rlvGVsh7JaC3j9sF60YxitQQXe1q/oI=";
   };
 
diff --git a/pkgs/by-name/ls/lsd2dsl/package.nix b/pkgs/by-name/ls/lsd2dsl/package.nix
index 73ad7e21a23e..c981016a2756 100644
--- a/pkgs/by-name/ls/lsd2dsl/package.nix
+++ b/pkgs/by-name/ls/lsd2dsl/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nongeneric";
     repo = "lsd2dsl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0UsxDNpuWpBrfjh4q3JhZnOyXhHatSa3t/cApiG2JzM=";
   };
 
diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix
index bfa38767ab47..7fb1fb0194b8 100644
--- a/pkgs/by-name/ls/lsh/package.nix
+++ b/pkgs/by-name/ls/lsh/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "latitudesh";
     repo = "lsh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0YpjG4u+wb4LRWzfTddKFwut0MBzEch+HZijmZiVXpE=";
   };
   vendorHash = "sha256-ogdyzfayleka4Y8x74ZtttD7MaeCl1qP/rQi9x0tMto=";
diff --git a/pkgs/by-name/ls/lsix/package.nix b/pkgs/by-name/ls/lsix/package.nix
index 9f6a7c26bd8f..8c6a0469e656 100644
--- a/pkgs/by-name/ls/lsix/package.nix
+++ b/pkgs/by-name/ls/lsix/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hackerb9";
     repo = "lsix";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-msTG7otjzksg/2XyPDy31LEb7uGXSgB8fzfHvad9nPA=";
   };
 
diff --git a/pkgs/by-name/ls/lsof/package.nix b/pkgs/by-name/ls/lsof/package.nix
index 617fca8861d3..69edb88f1f3f 100644
--- a/pkgs/by-name/ls/lsof/package.nix
+++ b/pkgs/by-name/ls/lsof/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lsof-org";
     repo = "lsof";
-    rev = version;
+    tag = version;
     hash = "sha256-JyvQV/JOMaL/3jUr6O0YIzJU/JcXVR65CJf5ip7334w=";
   };
 
diff --git a/pkgs/by-name/lt/ltc-tools/package.nix b/pkgs/by-name/lt/ltc-tools/package.nix
index 926b212b3a95..ec3eed049a96 100644
--- a/pkgs/by-name/lt/ltc-tools/package.nix
+++ b/pkgs/by-name/lt/ltc-tools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "x42";
     repo = "ltc-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al";
   };
 
diff --git a/pkgs/by-name/lt/ltunify/package.nix b/pkgs/by-name/lt/ltunify/package.nix
index 14b54abeb52b..5b4e7d767506 100644
--- a/pkgs/by-name/lt/ltunify/package.nix
+++ b/pkgs/by-name/lt/ltunify/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Lekensteyn";
     repo = "ltunify";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9avri/2H0zv65tkBsIi9yVxx3eVS9oCkVCCFdjXqSgI=";
   };
 
diff --git a/pkgs/by-name/lu/luabridge/package.nix b/pkgs/by-name/lu/luabridge/package.nix
index 4dd60b10cba5..07d43b4ce0c2 100644
--- a/pkgs/by-name/lu/luabridge/package.nix
+++ b/pkgs/by-name/lu/luabridge/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinniefalco";
     repo = "LuaBridge";
-    rev = version;
+    tag = version;
     sha256 = "sha256-gXrBNzE41SH98Xz480+uHQlxHjMHzs23AImxil5LZ0g=";
   };
 
diff --git a/pkgs/by-name/lu/luaformatter/package.nix b/pkgs/by-name/lu/luaformatter/package.nix
index 06bded91452f..df0ef7898076 100644
--- a/pkgs/by-name/lu/luaformatter/package.nix
+++ b/pkgs/by-name/lu/luaformatter/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Koihik";
     repo = "LuaFormatter";
-    rev = version;
+    tag = version;
     sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0";
   };
 
diff --git a/pkgs/by-name/lu/luakit/package.nix b/pkgs/by-name/lu/luakit/package.nix
index 7222f712b1dd..45cac55871ab 100644
--- a/pkgs/by-name/lu/luakit/package.nix
+++ b/pkgs/by-name/lu/luakit/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "luakit";
     repo = "luakit";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo=";
   };
 
diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix
index 62c7ca64567d..190a94192e31 100644
--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
-    rev = version;
+    tag = version;
     hash = "sha256-AEPUdqQ+uIWxSTOwwbZ8tWSz3VKKHa1D08o6oeEREkg=";
   };
 
diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix
index a1adfb2babbe..e3aa999054a0 100644
--- a/pkgs/by-name/lu/lubelogger/package.nix
+++ b/pkgs/by-name/lu/lubelogger/package.nix
@@ -12,7 +12,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "hargata";
     repo = "lubelog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZlB9lyfC4xrLWAb+Jbo6eI/LuYjvgMEauQeLxGCqy88=";
   };
 
diff --git a/pkgs/by-name/lu/lucky-cli/package.nix b/pkgs/by-name/lu/lucky-cli/package.nix
index 6ee31e492fa0..e51ac7069987 100644
--- a/pkgs/by-name/lu/lucky-cli/package.nix
+++ b/pkgs/by-name/lu/lucky-cli/package.nix
@@ -13,7 +13,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "luckyframework";
     repo = "lucky_cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mDUx9cQoYpU9kSAls36kzNVYZ8a4aqHEMIWfzS41NBk=";
   };
 
diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix
index b3ebe3f092e0..8302205f1fea 100644
--- a/pkgs/by-name/lu/ludtwig/package.nix
+++ b/pkgs/by-name/lu/ludtwig/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MalteJanz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3E1W6AlGQ9AhMzLvTV5KBjlKiWXyi7rFwHOdU3CIp60=";
   };
 
diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix
index c616f6c4dce7..19225fbb7305 100644
--- a/pkgs/by-name/lu/ludusavi/package.nix
+++ b/pkgs/by-name/lu/ludusavi/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mtkennerly";
     repo = "ludusavi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N2dDi47Z2PifMNlYE6Lk1nHxfpvwoL6h2QkUPthlh4A=";
   };
 
diff --git a/pkgs/by-name/lu/luminous-ttv/package.nix b/pkgs/by-name/lu/luminous-ttv/package.nix
index 9d1fe61b0449..c9787b4528bc 100644
--- a/pkgs/by-name/lu/luminous-ttv/package.nix
+++ b/pkgs/by-name/lu/luminous-ttv/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AlyoshaVasilieva";
     repo = "luminous-ttv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pT+hiREKdzw9MKv28QpLK6LmHvnRci26f0DlcXns2rA=";
   };
 
diff --git a/pkgs/by-name/lu/lunatic/package.nix b/pkgs/by-name/lu/lunatic/package.nix
index ac508ee88afc..64d4b0cb175b 100644
--- a/pkgs/by-name/lu/lunatic/package.nix
+++ b/pkgs/by-name/lu/lunatic/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lunatic-solutions";
     repo = "lunatic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uMMssZaPDZn3bOtQIho+GvUCPmzRllv7eJ+SJuKaYtg=";
   };
 
diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix
index bf7c742bdd28..533423438817 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-KZt3w+nhJjz3ZLtLzJz0zpFTwQ28OmFWnCsLbo36Ryc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/lu/luneta/package.nix b/pkgs/by-name/lu/luneta/package.nix
index 698e8b84a328..3b1cdd9afc55 100644
--- a/pkgs/by-name/lu/luneta/package.nix
+++ b/pkgs/by-name/lu/luneta/package.nix
@@ -12,7 +12,7 @@ buildDubPackage rec {
   src = fetchFromGitHub {
     owner = "fbeline";
     repo = "luneta";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pYE8hccXT87JIMh71PtXzVQBegTzU7bdpVEaV2VkaEk=";
   };
 
diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix
index 4d096143fbfc..6347e98a957e 100644
--- a/pkgs/by-name/lu/lutgen/package.nix
+++ b/pkgs/by-name/lu/lutgen/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ozwaldorf";
     repo = "lutgen-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jmMVeDDVb/TuxulDYj+8y4Kl42EJTAWb3tAsanfWduE=";
   };
 
diff --git a/pkgs/by-name/lu/lux/package.nix b/pkgs/by-name/lu/lux/package.nix
index 6510caf5e25e..36c86a545d70 100644
--- a/pkgs/by-name/lu/lux/package.nix
+++ b/pkgs/by-name/lu/lux/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "iawia002";
     repo = "lux";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3d8EQ7GzufZvMfjHbVMdpuGE+vPdSir4diSnB29v0sw=";
   };
 
diff --git a/pkgs/by-name/lv/lv2bm/package.nix b/pkgs/by-name/lv/lv2bm/package.nix
index bbf1ab10b2f8..ee39fca6ce7f 100644
--- a/pkgs/by-name/lv/lv2bm/package.nix
+++ b/pkgs/by-name/lv/lv2bm/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moddevices";
     repo = "lv2bm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0vlppxfb9zbmffazs1kiyb79py66s8x9hihj36m2vz86zsq7ybl0";
   };
 
diff --git a/pkgs/by-name/lv/lv_font_conv/package.nix b/pkgs/by-name/lv/lv_font_conv/package.nix
index 132adafe343a..ccc5eec31167 100644
--- a/pkgs/by-name/lv/lv_font_conv/package.nix
+++ b/pkgs/by-name/lv/lv_font_conv/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "lvgl";
     repo = "lv_font_conv";
-    rev = version;
+    tag = version;
     hash = "sha256-tm6xPOW0pOO02M10O1H7ww+yXWq/DJtbDmlfrJ6Lp4Y=";
   };
 
diff --git a/pkgs/by-name/lw/lwan/package.nix b/pkgs/by-name/lw/lwan/package.nix
index 2034caffd516..af72fde12894 100644
--- a/pkgs/by-name/lw/lwan/package.nix
+++ b/pkgs/by-name/lw/lwan/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lpereira";
     repo = "lwan";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-otiPH+e+auMCyeOTq4LJYaBNv+I91kOCww7DCepQTAQ=";
   };
 
diff --git a/pkgs/by-name/lw/lwgrp/package.nix b/pkgs/by-name/lw/lwgrp/package.nix
index a043c27d8512..f2ac9e8b2712 100644
--- a/pkgs/by-name/lw/lwgrp/package.nix
+++ b/pkgs/by-name/lw/lwgrp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LLNL";
     repo = "lwgrp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZpxxcCqK+qdvnCvobeBV6htRF8wThiQgVFYgEigqmIE=";
   };
 
diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix
index 966d93df2ac8..3e3f5aa0a8a2 100644
--- a/pkgs/by-name/lx/lxcfs/package.nix
+++ b/pkgs/by-name/lx/lxcfs/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+Xlx1E6ggB/Vx3yOJGgh4UfEvaVyT7uOttaxelDA7Iw=";
   };
 
diff --git a/pkgs/by-name/lx/lxd-image-server/package.nix b/pkgs/by-name/lx/lxd-image-server/package.nix
index cc17908a5da1..34119bddb457 100644
--- a/pkgs/by-name/lx/lxd-image-server/package.nix
+++ b/pkgs/by-name/lx/lxd-image-server/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Avature";
     repo = "lxd-image-server";
-    rev = version;
+    tag = version;
     sha256 = "yx8aUmMfSzyWaM6M7+WcL6ouuWwOpqLzODWSdNgwCwo=";
   };
 
diff --git a/pkgs/by-name/lx/lxgw-fusionkai/package.nix b/pkgs/by-name/lx/lxgw-fusionkai/package.nix
index 99c7a8e3e37f..bedce52adb5f 100644
--- a/pkgs/by-name/lx/lxgw-fusionkai/package.nix
+++ b/pkgs/by-name/lx/lxgw-fusionkai/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxgw";
     repo = "FusionKai";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pEISoFEsv8SJOGa2ud/nV1yvl8T9kakfKENu3mfYA5A=";
   };
 
diff --git a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
index 0587b72220cf..3665421da49b 100644
--- a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
+++ b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "MrReplikant";
     repo = "lxqt-panel-profiles";
-    rev = version;
+    tag = version;
     hash = "sha256-YGjgTLodVTtDzP/SOEg+Ehf1LYggTnG1H1rN5m1jaNM=";
   };
 
diff --git a/pkgs/by-name/ly/lynis/package.nix b/pkgs/by-name/ly/lynis/package.nix
index 30584284c6c8..e51927003265 100644
--- a/pkgs/by-name/ly/lynis/package.nix
+++ b/pkgs/by-name/ly/lynis/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-OnEEdJGU7ma6f7aA6ihgixHWZGZDmx7nzqmJH3p+ijk=";
   };
 
diff --git a/pkgs/by-name/ly/lyra/package.nix b/pkgs/by-name/ly/lyra/package.nix
index a52e8896e9e4..b1a54fc812fd 100644
--- a/pkgs/by-name/ly/lyra/package.nix
+++ b/pkgs/by-name/ly/lyra/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bfgroup";
     repo = "lyra";
-    rev = version;
+    tag = version;
     sha256 = "sha256-tS2SPLiKaL8C35AmOXyJPstFUfynkE/A53rurqiySbI=";
   };
 
diff --git a/pkgs/by-name/lz/lzbench/package.nix b/pkgs/by-name/lz/lzbench/package.nix
index a2256ac206fe..59e72da67398 100644
--- a/pkgs/by-name/lz/lzbench/package.nix
+++ b/pkgs/by-name/lz/lzbench/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "inikep";
     repo = "lzbench";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-946AcnD9z60Oihm2pseS8D5j6pGdYeCxmhTLNcW9Mmc=";
   };
 
diff --git a/pkgs/by-name/lz/lzsa/package.nix b/pkgs/by-name/lz/lzsa/package.nix
index 85866a2243c2..6e9fa15b93fb 100644
--- a/pkgs/by-name/lz/lzsa/package.nix
+++ b/pkgs/by-name/lz/lzsa/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "emmanuel-marty";
     repo = "lzsa";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-XaPtMW9INv/wzMXvlyXgE3VfFJCY/5R/HFGhV3ZKvGs=";
   };
 
diff --git a/pkgs/by-name/m-/m-cli/package.nix b/pkgs/by-name/m-/m-cli/package.nix
index 4faa5c6dc184..b54db2ea9a42 100644
--- a/pkgs/by-name/m-/m-cli/package.nix
+++ b/pkgs/by-name/m-/m-cli/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rgcr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KzlE1DdVMLnGmcOS1a2HK4pASofD1EHpdqbzVVIxeb4=";
   };
 
diff --git a/pkgs/by-name/m1/m17-cxx-demod/package.nix b/pkgs/by-name/m1/m17-cxx-demod/package.nix
index d5d391ecc17e..fa127c91937f 100644
--- a/pkgs/by-name/m1/m17-cxx-demod/package.nix
+++ b/pkgs/by-name/m1/m17-cxx-demod/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mobilinkd";
     repo = "m17-cxx-demod";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mvppkFBmmPVqvlqIqrbwGrOBih5zS5sZrV/usEhHiws=";
   };
 
diff --git a/pkgs/by-name/m4/m4acut/package.nix b/pkgs/by-name/m4/m4acut/package.nix
index 22b7fa486048..994a81780586 100644
--- a/pkgs/by-name/m4/m4acut/package.nix
+++ b/pkgs/by-name/m4/m4acut/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nu774";
     repo = "m4acut";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1hzf9f1fzmlpnxjaxhs2w22wzb28vd87ycaddnix1mmhvh3nvzkd";
   };
 
diff --git a/pkgs/by-name/m4/m4ri/package.nix b/pkgs/by-name/m4/m4ri/package.nix
index a7d750da16e6..0ff87c813391 100644
--- a/pkgs/by-name/m4/m4ri/package.nix
+++ b/pkgs/by-name/m4/m4ri/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "malb";
     repo = "m4ri";
-    rev = version;
+    tag = version;
     hash = "sha256-YoCTI4dLy95xuRJyNugIzGxE40B9pCWxRQtsyS/1Pds=";
   };
 
diff --git a/pkgs/by-name/m4/m4rie/package.nix b/pkgs/by-name/m4/m4rie/package.nix
index 270638f4d730..d5b55e0e5f39 100644
--- a/pkgs/by-name/m4/m4rie/package.nix
+++ b/pkgs/by-name/m4/m4rie/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "malb";
     repo = "m4rie";
-    rev = version;
+    tag = version;
     hash = "sha256-tw6ZX8hKfr9wQLF2nuO1dSkkTYZX6pzNWMlWfzLqQNE=";
   };
 
diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix
index bf74f70ffd5a..c054c78c09f8 100644
--- a/pkgs/by-name/ma/maa-cli/package.nix
+++ b/pkgs/by-name/ma/maa-cli/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MaaAssistantArknights";
     repo = "maa-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KoKMfZrI3V73hbZGm0Xx8VxL7ENicSApropLm02B098=";
   };
 
diff --git a/pkgs/by-name/ma/macchanger/package.nix b/pkgs/by-name/ma/macchanger/package.nix
index e65e1cca5fcb..2ea246a2b626 100644
--- a/pkgs/by-name/ma/macchanger/package.nix
+++ b/pkgs/by-name/ma/macchanger/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alobbs";
     repo = "macchanger";
-    rev = version;
+    tag = version;
     sha256 = "1hypx6sxhd2b1nsxj314hpkhj7q4x9p2kfaaf20rjkkkig0nck9r";
   };
 
diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix
index bf3e0b657d72..91d291541a9c 100644
--- a/pkgs/by-name/ma/macchina/package.nix
+++ b/pkgs/by-name/ma/macchina/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Macchina-CLI";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GZO9xGc3KGdq2WdA10m/XV8cNAlQjUZFUVu1CzidJ5c=";
   };
 
diff --git a/pkgs/by-name/ma/macdylibbundler/package.nix b/pkgs/by-name/ma/macdylibbundler/package.nix
index 3aa0b704783b..b6c83fe21643 100644
--- a/pkgs/by-name/ma/macdylibbundler/package.nix
+++ b/pkgs/by-name/ma/macdylibbundler/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "auriamg";
     repo = "macdylibbundler";
-    rev = version;
+    tag = version;
     sha256 = "0j4ij48jf5izgymzxxaakf6vc50w9q0761yir6nfj1n6qlnrlidf";
   };
 
diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix
index f8579fb30f36..9e6a75191ac5 100644
--- a/pkgs/by-name/ma/mackerel-agent/package.nix
+++ b/pkgs/by-name/ma/mackerel-agent/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mackerelio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sh5hbhWlyu70Wm2zTQeKiQr/nYi6bG4g6a/yvEnd/DU=";
   };
 
diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix
index 63113960f5ec..2438ab2c8576 100644
--- a/pkgs/by-name/ma/mackup/package.nix
+++ b/pkgs/by-name/ma/mackup/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lra";
     repo = "mackup";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-eWSBl8BTg2FLI21DQcnepBFPF08bfm0V8lYB4mMbAiw=";
   };
 
diff --git a/pkgs/by-name/ma/macmon/package.nix b/pkgs/by-name/ma/macmon/package.nix
index 2123287ba177..156571b9f306 100644
--- a/pkgs/by-name/ma/macmon/package.nix
+++ b/pkgs/by-name/ma/macmon/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vladkens";
     repo = "macmon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Uc+UjlCeG7W++l7d/3tSkIVbUi8IbNn3A5fqyshG+xE=";
   };
 
diff --git a/pkgs/by-name/ma/maddy/package.nix b/pkgs/by-name/ma/maddy/package.nix
index 636d65e1cb36..2f4d0c958009 100644
--- a/pkgs/by-name/ma/maddy/package.nix
+++ b/pkgs/by-name/ma/maddy/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "foxcpp";
     repo = "maddy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cR5qRUYQnFfm+ZOwwwNNRo1odq/ntI2QlGmhJBTjaF4=";
   };
 
diff --git a/pkgs/by-name/ma/madonctl/package.nix b/pkgs/by-name/ma/madonctl/package.nix
index 69c60bdab649..21b6ccc57971 100644
--- a/pkgs/by-name/ma/madonctl/package.nix
+++ b/pkgs/by-name/ma/madonctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "McKael";
     repo = "madonctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mo185EKjLkiujAKcAFM1XqkXWvcfYbnv+r3dF9ywaf8=";
   };
 
diff --git a/pkgs/by-name/ma/maeparser/package.nix b/pkgs/by-name/ma/maeparser/package.nix
index 96d696917834..5b9d9d15fc7e 100644
--- a/pkgs/by-name/ma/maeparser/package.nix
+++ b/pkgs/by-name/ma/maeparser/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "schrodinger";
     repo = "maeparser";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+eCTOU0rqFQC87wcxgINGLsULfbIr/wKxQTkRR59JVc=";
   };
 
diff --git a/pkgs/by-name/ma/mage/package.nix b/pkgs/by-name/ma/mage/package.nix
index a4217149813f..8a78079fb299 100644
--- a/pkgs/by-name/ma/mage/package.nix
+++ b/pkgs/by-name/ma/mage/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "magefile";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-aZPv3+F4VMiThjR0nFP+mKQLI9zKj2jaOawClROnT34=";
   };
 
diff --git a/pkgs/by-name/ma/magic-wormhole-rs/package.nix b/pkgs/by-name/ma/magic-wormhole-rs/package.nix
index 9125fe5b0378..525176911bf2 100644
--- a/pkgs/by-name/ma/magic-wormhole-rs/package.nix
+++ b/pkgs/by-name/ma/magic-wormhole-rs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "magic-wormhole";
     repo = "magic-wormhole.rs";
-    rev = version;
+    tag = version;
     sha256 = "sha256-01u1DJNd/06q9dH/Y4E5kj5gb2CA7EKdoPtMhzCLtso=";
   };
 
diff --git a/pkgs/by-name/ma/mailhog/package.nix b/pkgs/by-name/ma/mailhog/package.nix
index 8d73256cf5ae..cc828a96e8bd 100644
--- a/pkgs/by-name/ma/mailhog/package.nix
+++ b/pkgs/by-name/ma/mailhog/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mailhog";
     repo = "MailHog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-flxEp9iXLLm/FPP8udlnpbHQpGnqxAhgyOIUUJAJgog=";
   };
 
diff --git a/pkgs/by-name/ma/mailsy/package.nix b/pkgs/by-name/ma/mailsy/package.nix
index 7bda524ab227..ccc01c89bc8e 100644
--- a/pkgs/by-name/ma/mailsy/package.nix
+++ b/pkgs/by-name/ma/mailsy/package.nix
@@ -10,7 +10,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "BalliAsghar";
     repo = "Mailsy";
-    rev = version;
+    tag = version;
     hash = "sha256-RnOWvu023SOcN83xEEkYFwgDasOmkMwSzJ/QYjvTBDo=";
   };
 
diff --git a/pkgs/by-name/ma/maim/package.nix b/pkgs/by-name/ma/maim/package.nix
index 431fc3d774d0..6b871abe09d5 100644
--- a/pkgs/by-name/ma/maim/package.nix
+++ b/pkgs/by-name/ma/maim/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/tZqSJnKe8GiffSz9VIFKuxMktRld+hA4ZWP4TZQrlg=";
   };
 
diff --git a/pkgs/by-name/ma/mainsail/package.nix b/pkgs/by-name/ma/mainsail/package.nix
index 3f0c7578f18d..5b50994ba7b4 100644
--- a/pkgs/by-name/ma/mainsail/package.nix
+++ b/pkgs/by-name/ma/mainsail/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mainsail-crew";
     repo = "mainsail";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rXavUkoFRw5fWCisdz/eD+wL1Sc+vExyjskVEIN4QNQ=";
   };
 
diff --git a/pkgs/by-name/ma/maizzle/package.nix b/pkgs/by-name/ma/maizzle/package.nix
index 4ba98e8d436f..2c3c9952692a 100644
--- a/pkgs/by-name/ma/maizzle/package.nix
+++ b/pkgs/by-name/ma/maizzle/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "maizzle";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Nzl4Pp1jY+LaQgLDJHjEdDA8b6MOfMXZNpvazPdmrTA=";
   };
 
diff --git a/pkgs/by-name/ma/maker-panel/package.nix b/pkgs/by-name/ma/maker-panel/package.nix
index 2bbf17a417ca..4155a9f6594b 100644
--- a/pkgs/by-name/ma/maker-panel/package.nix
+++ b/pkgs/by-name/ma/maker-panel/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "twitchyliquid64";
     repo = "maker-panel";
-    rev = version;
+    tag = version;
     sha256 = "0dlsy0c46781sb652kp80pvga7pzx6xla64axir92fcgg8k803bi";
   };
 
diff --git a/pkgs/by-name/ma/makerpm/package.nix b/pkgs/by-name/ma/makerpm/package.nix
index f7b0d884da7d..b433cb32f7f3 100644
--- a/pkgs/by-name/ma/makerpm/package.nix
+++ b/pkgs/by-name/ma/makerpm/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ivan-tkatchev";
     repo = "makerpm";
-    rev = version;
+    tag = version;
     sha256 = "089dkbh5705ppyi920rd0ksjc0143xmvnhm8qrx93rsgwc1ggi1y";
   };
 
diff --git a/pkgs/by-name/ma/makima/package.nix b/pkgs/by-name/ma/makima/package.nix
index 9540668604be..988d6dc6e053 100644
--- a/pkgs/by-name/ma/makima/package.nix
+++ b/pkgs/by-name/ma/makima/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cyber-sushi";
     repo = "makima";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kC0GJ1K7DMfkYxaYog5y1y0DMfFjZ7iD7pGQQE67N9o=";
   };
 
diff --git a/pkgs/by-name/ma/malt/package.nix b/pkgs/by-name/ma/malt/package.nix
index f7919e15673a..36fbbc347a98 100644
--- a/pkgs/by-name/ma/malt/package.nix
+++ b/pkgs/by-name/ma/malt/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "memtt";
     repo = "malt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Hq6XDxcjH5ronprnV1CwumGqBg9RXYpJ+WANqoBA2/c=";
   };
 
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/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix
index 18fe73e6260c..8c99050f375c 100644
--- a/pkgs/by-name/ma/manga-tui/package.nix
+++ b/pkgs/by-name/ma/manga-tui/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "josueBarretogit";
     repo = "manga-tui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L5KZaBJDG0z6NUGPJfbOkKCp1xQEzqfJ9GREx189VqU=";
   };
 
diff --git a/pkgs/by-name/ma/mangal/package.nix b/pkgs/by-name/ma/mangal/package.nix
index 332c1d33ec25..300e258f07ff 100644
--- a/pkgs/by-name/ma/mangal/package.nix
+++ b/pkgs/by-name/ma/mangal/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "metafates";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nbJdePlzZFM2ihbvFIMKyYZ9C0uKjU3TE5VLduLvtKE=";
   };
 
diff --git a/pkgs/by-name/ma/mangareader/package.nix b/pkgs/by-name/ma/mangareader/package.nix
index 3ef038be0e79..8d53cceef22e 100644
--- a/pkgs/by-name/ma/mangareader/package.nix
+++ b/pkgs/by-name/ma/mangareader/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "g-fb";
     repo = "mangareader";
-    rev = version;
+    tag = version;
     hash = "sha256-XX0VaXVYmAs5vmgwslflKIYx1peITp4VmReLkv1nV3I=";
   };
 
diff --git a/pkgs/by-name/ma/manifest-tool/package.nix b/pkgs/by-name/ma/manifest-tool/package.nix
index 4880edc5d18b..fe3739c7bc9b 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-tehdgYH73tmzjhJmTQuMWvciGYIyc6VeIMS2fFO7YP4=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/ma/manix/package.nix b/pkgs/by-name/ma/manix/package.nix
index 278ddec52a45..91c542f4664d 100644
--- a/pkgs/by-name/ma/manix/package.nix
+++ b/pkgs/by-name/ma/manix/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "manix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-b/3NvY+puffiQFCQuhRMe81x2wm3vR01MR3iwe/gJkw=";
   };
 
diff --git a/pkgs/by-name/ma/manticoresearch/package.nix b/pkgs/by-name/ma/manticoresearch/package.nix
index 48c2cb16d222..638621fd9efa 100644
--- a/pkgs/by-name/ma/manticoresearch/package.nix
+++ b/pkgs/by-name/ma/manticoresearch/package.nix
@@ -23,7 +23,7 @@ let
     src = fetchFromGitHub {
       owner = "manticoresoftware";
       repo = "columnar";
-      rev = finalAttrs.version;
+      tag = finalAttrs.version;
       hash = "sha256-TGFGFfoyHnPSr2U/9dpqFLUN3Dt2jDQrTF/xxDY4pdE=";
     };
     nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ma/map-cmd/package.nix b/pkgs/by-name/ma/map-cmd/package.nix
index e11af51aa70f..37ce36a11b15 100644
--- a/pkgs/by-name/ma/map-cmd/package.nix
+++ b/pkgs/by-name/ma/map-cmd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "soveran";
     repo = "map";
-    rev = version;
+    tag = version;
     sha256 = "sha256-yGzmhZwv1qKy0JNcSzqL996APQO8OGWQ1GBkEkKTOXA=";
   };
 
diff --git a/pkgs/by-name/ma/mapscii/package.nix b/pkgs/by-name/ma/mapscii/package.nix
index 1fb76d1b3f1c..b2b940d2e431 100644
--- a/pkgs/by-name/ma/mapscii/package.nix
+++ b/pkgs/by-name/ma/mapscii/package.nix
@@ -10,7 +10,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "rastapasta";
     repo = "mapscii";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IFVX3l2b3pu0nfMZebVix0mwHUvnE2NUNrB3+jr3G2Q=";
   };
 
diff --git a/pkgs/by-name/ma/marathonctl/package.nix b/pkgs/by-name/ma/marathonctl/package.nix
index 3a1f344e53af..ae941c274c12 100644
--- a/pkgs/by-name/ma/marathonctl/package.nix
+++ b/pkgs/by-name/ma/marathonctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shoenig";
     repo = "marathonctl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MigmvOwYa0uYPexchS4MP74I1Tp6QHYuQVSOh1+FrMg=";
   };
 
diff --git a/pkgs/by-name/ma/mari0/package.nix b/pkgs/by-name/ma/mari0/package.nix
index deb7d959bc14..2619bd5a7185 100644
--- a/pkgs/by-name/ma/mari0/package.nix
+++ b/pkgs/by-name/ma/mari0/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Stabyourself";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa";
   };
 
diff --git a/pkgs/by-name/ma/marisa/package.nix b/pkgs/by-name/ma/marisa/package.nix
index 2ff016940d30..3bd9c173a46c 100644
--- a/pkgs/by-name/ma/marisa/package.nix
+++ b/pkgs/by-name/ma/marisa/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "s-yata";
     repo = "marisa-trie";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1hy8hfksizk1af6kg8z3b9waiz6d5ggd73fiqcvmhfgra36dscyq";
   };
 
diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix
index ebf3adf13240..c3ab695f2454 100644
--- a/pkgs/by-name/ma/mark/package.nix
+++ b/pkgs/by-name/ma/mark/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kovetskiy";
     repo = "mark";
-    rev = version;
+    tag = version;
     sha256 = "sha256-t70Od27w/ZT/EHKAgjPBx39Oo4dS1aWL3up7TVlNAuI=";
   };
 
diff --git a/pkgs/by-name/ma/markdown-link-check/package.nix b/pkgs/by-name/ma/markdown-link-check/package.nix
index 36cecc5c1ef4..7974a1c5d372 100644
--- a/pkgs/by-name/ma/markdown-link-check/package.nix
+++ b/pkgs/by-name/ma/markdown-link-check/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "tcort";
     repo = "markdown-link-check";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UuzfIJL3nHIbGFQrs9ya+QiS/sM0z1GCHbJGLQBN5pE=";
   };
 
diff --git a/pkgs/by-name/ma/markdownlint-cli/package.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix
index a0e65f253922..a32717ddd5f8 100644
--- a/pkgs/by-name/ma/markdownlint-cli/package.nix
+++ b/pkgs/by-name/ma/markdownlint-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "igorshubovych";
     repo = "markdownlint-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1CQVj2iFywimK9sBJ60u9xH5qm/stEOA0yAHcUSAdY8=";
   };
 
diff --git a/pkgs/by-name/ma/marked-man/package.nix b/pkgs/by-name/ma/marked-man/package.nix
index ffbe51602c5a..5a206e51632b 100644
--- a/pkgs/by-name/ma/marked-man/package.nix
+++ b/pkgs/by-name/ma/marked-man/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "kapouer";
     repo = "marked-man";
-    rev = version;
+    tag = version;
     hash = "sha256-RzPKahYxBdWZi1SwIv7Ju1cAQ4s0ANkCivFJItPYGCY=";
   };
 
diff --git a/pkgs/by-name/ma/marker/package.nix b/pkgs/by-name/ma/marker/package.nix
index 2a5165da2b3b..9b0bee306fd0 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/markets/package.nix b/pkgs/by-name/ma/markets/package.nix
index b06f5fa4fd32..26350640534d 100644
--- a/pkgs/by-name/ma/markets/package.nix
+++ b/pkgs/by-name/ma/markets/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bitstower";
     repo = "markets";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/g/r/1i69PmPND40zIID3Nun0I4ZFT1EFoNf1qprBjI=";
   };
 
diff --git a/pkgs/by-name/ma/markscribe/package.nix b/pkgs/by-name/ma/markscribe/package.nix
index 9dac443919f3..621fce6a760f 100644
--- a/pkgs/by-name/ma/markscribe/package.nix
+++ b/pkgs/by-name/ma/markscribe/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "muesli";
     repo = "markscribe";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-I8WSG9rMqgf2QADQetlYTSUIQH1Iv8cMVw/3uIwEDPc=";
   };
 
diff --git a/pkgs/by-name/ma/marksman/package.nix b/pkgs/by-name/ma/marksman/package.nix
index 444b35a6ee94..fab88201dafc 100644
--- a/pkgs/by-name/ma/marksman/package.nix
+++ b/pkgs/by-name/ma/marksman/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "artempyanykh";
     repo = "marksman";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2OisUZHmf7k8vLkBGJG1HXNxaXmRF64x//bDK57S9to=";
   };
 
diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix
index baabb4624d87..7c3cf07ef4ee 100644
--- a/pkgs/by-name/ma/markuplinkchecker/package.nix
+++ b/pkgs/by-name/ma/markuplinkchecker/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "becheran";
     repo = "mlc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-16ZGYUP7h6WmwjadLHqOQClejZ35LwavFgjs9x3NYVo=";
   };
 
diff --git a/pkgs/by-name/ma/marp-cli/package.nix b/pkgs/by-name/ma/marp-cli/package.nix
index 13b2ac65373c..dd4bf17cbc8d 100644
--- a/pkgs/by-name/ma/marp-cli/package.nix
+++ b/pkgs/by-name/ma/marp-cli/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "marp-team";
     repo = "marp-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T3VZEXk3bhr17/BWlBx9beEbNhG2y/AnNf7+a1Adi2k=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-icons/package.nix b/pkgs/by-name/ma/marwaita-icons/package.nix
index 531468767b44..9d7b6b232b02 100644
--- a/pkgs/by-name/ma/marwaita-icons/package.nix
+++ b/pkgs/by-name/ma/marwaita-icons/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-icons";
-    rev = version;
+    tag = version;
     hash = "sha256-UehujziT13kA9ltjyCvbSDTEpR8ISxoBpoLj22Zih8k=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-mint/package.nix b/pkgs/by-name/ma/marwaita-mint/package.nix
index af733a08135a..6c8d612ab40d 100644
--- a/pkgs/by-name/ma/marwaita-mint/package.nix
+++ b/pkgs/by-name/ma/marwaita-mint/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-mint";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Bvo4IRE1yXu4SDvyDY8mrMyZivqYEVQwkdSH+UZruSI=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-orange/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix
index 84cfff18cdc1..4fdac8b10805 100644
--- a/pkgs/by-name/ma/marwaita-orange/package.nix
+++ b/pkgs/by-name/ma/marwaita-orange/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-orange";
-    rev = version;
+    tag = version;
     hash = "sha256-/F/nboht7YG9pXVv7/ZvZ4QkxfB+h201G1KZLRohM80=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-red/package.nix b/pkgs/by-name/ma/marwaita-red/package.nix
index 47022469591e..f4475a4966f4 100644
--- a/pkgs/by-name/ma/marwaita-red/package.nix
+++ b/pkgs/by-name/ma/marwaita-red/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-red";
-    rev = version;
+    tag = version;
     hash = "sha256-21U3Z53v2PDJ7Io9WZypQiZPM4mjTa3z6W+vE9qNouA=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-teal/package.nix b/pkgs/by-name/ma/marwaita-teal/package.nix
index 76d8c73829b6..48cdbabb4e63 100644
--- a/pkgs/by-name/ma/marwaita-teal/package.nix
+++ b/pkgs/by-name/ma/marwaita-teal/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-teal";
-    rev = version;
+    tag = version;
     hash = "sha256-63VJrmb0TcsXT1JM77+ZxN4kOZPBlqR2ANAhY041QCA=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-x/package.nix b/pkgs/by-name/ma/marwaita-x/package.nix
index c150cfba92b3..889be4d08558 100644
--- a/pkgs/by-name/ma/marwaita-x/package.nix
+++ b/pkgs/by-name/ma/marwaita-x/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-x";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-x5b3aaasYbxFGvdNNF6vIrF/ZZWBGbdS2kEuB1rwOlA=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-yellow/package.nix b/pkgs/by-name/ma/marwaita-yellow/package.nix
index 2b1346214753..ef790ee467fd 100644
--- a/pkgs/by-name/ma/marwaita-yellow/package.nix
+++ b/pkgs/by-name/ma/marwaita-yellow/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-yellow";
-    rev = version;
+    tag = version;
     hash = "sha256-1nGQvN6xacMoRyT7WkNC2lKX/QnXA7pCBz1kIo0aOwA=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita/package.nix b/pkgs/by-name/ma/marwaita/package.nix
index 7f0b14b5a310..084b269818f5 100644
--- a/pkgs/by-name/ma/marwaita/package.nix
+++ b/pkgs/by-name/ma/marwaita/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita";
-    rev = version;
+    tag = version;
     hash = "sha256-NFXvaKASWltskCSOidXDNVZpFpdpCTnuWjpfETxiI8U=";
   };
 
diff --git a/pkgs/by-name/ma/masklint/package.nix b/pkgs/by-name/ma/masklint/package.nix
index d950ca90fd4d..736711fd5d28 100644
--- a/pkgs/by-name/ma/masklint/package.nix
+++ b/pkgs/by-name/ma/masklint/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "brumhard";
     repo = "masklint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Dku2pDUCblopHtoj6viUqHVpVH5GDApp+QLjor38j7g=";
   };
 
diff --git a/pkgs/by-name/ma/masscan/package.nix b/pkgs/by-name/ma/masscan/package.nix
index c067e1ac54dc..e837be81daea 100644
--- a/pkgs/by-name/ma/masscan/package.nix
+++ b/pkgs/by-name/ma/masscan/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "robertdavidgraham";
     repo = "masscan";
-    rev = version;
+    tag = version;
     sha256 = "sha256-mnGC/moQANloR5ODwRjzJzBa55OEZ9QU+9WpAHxQE/g=";
   };
 
diff --git a/pkgs/by-name/ma/massdns/package.nix b/pkgs/by-name/ma/massdns/package.nix
index 1f6d19fcaeb2..b96f0ec3ad40 100644
--- a/pkgs/by-name/ma/massdns/package.nix
+++ b/pkgs/by-name/ma/massdns/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "blechschmidt";
     repo = "massdns";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hrnAg5ErPt93RV4zobRGVtcKt4aM2tC52r08T7+vRGc=";
   };
 
diff --git a/pkgs/by-name/ma/massren/package.nix b/pkgs/by-name/ma/massren/package.nix
index 0ae0c0c33205..1b1c44a073b6 100644
--- a/pkgs/by-name/ma/massren/package.nix
+++ b/pkgs/by-name/ma/massren/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "laurent22";
     repo = "massren";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64=";
   };
 
diff --git a/pkgs/by-name/ma/mastodon-archive/package.nix b/pkgs/by-name/ma/mastodon-archive/package.nix
index 09bfc3c5eebd..24106d649ffe 100644
--- a/pkgs/by-name/ma/mastodon-archive/package.nix
+++ b/pkgs/by-name/ma/mastodon-archive/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kensanata";
     repo = "mastodon-backup";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-b4bYQshz7mwxEfpRYV7ze4C8hz58R9cVp58wHvGFb0A=";
   };
 
diff --git a/pkgs/by-name/ma/mastotool/package.nix b/pkgs/by-name/ma/mastotool/package.nix
index c14432ab819f..caa53d10db05 100644
--- a/pkgs/by-name/ma/mastotool/package.nix
+++ b/pkgs/by-name/ma/mastotool/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "muesli";
     repo = "mastotool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KmYUt2WXLY6i17dZ+o5HOTyMwbQnynY7IT43LIEN3B0=";
   };
 
diff --git a/pkgs/by-name/ma/matcha-gtk-theme/package.nix b/pkgs/by-name/ma/matcha-gtk-theme/package.nix
index 74d5dde06f25..2efbaf43fbb2 100644
--- a/pkgs/by-name/ma/matcha-gtk-theme/package.nix
+++ b/pkgs/by-name/ma/matcha-gtk-theme/package.nix
@@ -29,7 +29,7 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      rev = version;
+      tag = version;
       sha256 = "trQwRZ/JKIS8TcRIg0eL5GmB/yymDwqqNued0ddRuqU=";
     };
 
diff --git a/pkgs/by-name/ma/matcha-rss-digest/package.nix b/pkgs/by-name/ma/matcha-rss-digest/package.nix
index bdc81f69f977..d19905ffa1d5 100644
--- a/pkgs/by-name/ma/matcha-rss-digest/package.nix
+++ b/pkgs/by-name/ma/matcha-rss-digest/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "piqoni";
     repo = "matcha";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Zs6Och5CsqN2mpnCLgV1VkH4+CV1fklfP20A22rE5y0=";
   };
 
diff --git a/pkgs/by-name/ma/matchbox-server/package.nix b/pkgs/by-name/ma/matchbox-server/package.nix
index 4967fef7851b..694b40680b26 100644
--- a/pkgs/by-name/ma/matchbox-server/package.nix
+++ b/pkgs/by-name/ma/matchbox-server/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "poseidon";
     repo = "matchbox";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-u1VY+zEx2YToz+WxVFaUDzY7HM9OeokbR/FmzcR3UJ8=";
   };
 
diff --git a/pkgs/by-name/ma/materia-kde-theme/package.nix b/pkgs/by-name/ma/materia-kde-theme/package.nix
index 990bc77b0762..6db7298dd158 100644
--- a/pkgs/by-name/ma/materia-kde-theme/package.nix
+++ b/pkgs/by-name/ma/materia-kde-theme/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "materia-kde";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/LA+H2ekxuO1RpfaPJruRGeWPVopA0rZUxU4Mh7YQ0s=";
   };
 
diff --git a/pkgs/by-name/ma/materia-theme/package.nix b/pkgs/by-name/ma/materia-theme/package.nix
index 24c0e7a42ebc..2615b9bde11e 100644
--- a/pkgs/by-name/ma/materia-theme/package.nix
+++ b/pkgs/by-name/ma/materia-theme/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1fsicmcni70jkl4jb3fvh7yv0v9jhb8nwjzdq8vfwn256qyk0xvl";
   };
 
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/ma/material-icons/package.nix b/pkgs/by-name/ma/material-icons/package.nix
index a8dfb57c9cc7..a3aa128f6657 100644
--- a/pkgs/by-name/ma/material-icons/package.nix
+++ b/pkgs/by-name/ma/material-icons/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "google";
     repo = "material-design-icons";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-wX7UejIYUxXOnrH2WZYku9ljv4ZAlvgk8EEJJHOCCjE=";
   };
 
diff --git a/pkgs/by-name/ma/material-maker/package.nix b/pkgs/by-name/ma/material-maker/package.nix
index 8a3714fc9b94..96b8cdcf4336 100644
--- a/pkgs/by-name/ma/material-maker/package.nix
+++ b/pkgs/by-name/ma/material-maker/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "RodZill4";
     repo = "material-maker";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-vyagu7xL4ITt+xyoYyCcF8qq6L9sR6Ltdl6NwfrbZdA=";
   };
 
diff --git a/pkgs/by-name/ma/math-preview/package.nix b/pkgs/by-name/ma/math-preview/package.nix
index 08a577ebaac3..eac4456dee7b 100644
--- a/pkgs/by-name/ma/math-preview/package.nix
+++ b/pkgs/by-name/ma/math-preview/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitLab {
     owner = "matsievskiysv";
     repo = "math-preview";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P3TZ/D6D2PvwPV6alSrDEQujzgI8DhK4VOuCC0BCIFo=";
   };
 
diff --git a/pkgs/by-name/ma/mathjax-node-cli/package.nix b/pkgs/by-name/ma/mathjax-node-cli/package.nix
index b8c275e8c690..89465e37bbda 100644
--- a/pkgs/by-name/ma/mathjax-node-cli/package.nix
+++ b/pkgs/by-name/ma/mathjax-node-cli/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mathjax";
     repo = "mathjax-node-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-jFSn/Ftm1iNOAmMadHYfy2jm0H/+hP2XCyyNbJqfhkY=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-alertmanager/package.nix b/pkgs/by-name/ma/matrix-alertmanager/package.nix
index f528d8539862..2ed004ef8f2b 100644
--- a/pkgs/by-name/ma/matrix-alertmanager/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jaywink";
     repo = "matrix-alertmanager";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GwASazYgZTYrMn696VL+JKEjECoCKxr2VWj2zae8U/E=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-appservice-discord/package.nix b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
index dcd43ba0d852..6c085c114bc4 100644
--- a/pkgs/by-name/ma/matrix-appservice-discord/package.nix
+++ b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
@@ -23,7 +23,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "matrix-appservice-discord";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = pin.srcHash;
   };
 
diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix
index 6dcea572c57f..8cdd1db04aec 100644
--- a/pkgs/by-name/ma/matrix-conduit/package.nix
+++ b/pkgs/by-name/ma/matrix-conduit/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "famedly";
     repo = "conduit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mQLfRAun2G/LDnw3jyFGJbOqpxh2PL8IGzFELRfAgAI=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-corporal/package.nix b/pkgs/by-name/ma/matrix-corporal/package.nix
index e15c4657a2fa..fc77b7817334 100644
--- a/pkgs/by-name/ma/matrix-corporal/package.nix
+++ b/pkgs/by-name/ma/matrix-corporal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "devture";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-KSKPTbF1hhzLyD+iL4+hW9EuV+xFYzSzHu1DSGXWm90=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-hook/package.nix b/pkgs/by-name/ma/matrix-hook/package.nix
index 244ba93eec09..b9b80dfb40af 100644
--- a/pkgs/by-name/ma/matrix-hook/package.nix
+++ b/pkgs/by-name/ma/matrix-hook/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pinpox";
     repo = "matrix-hook";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YmDsibVlAWLEG5QcqDImVb6RJfrfW6zrFnOEMO3Zxcw=";
   };
   vendorHash = "sha256-185Wz9IpJRBmunl+KGj/iy37YeszbT3UYzyk9V994oQ=";
diff --git a/pkgs/by-name/ma/matrix-media-repo/package.nix b/pkgs/by-name/ma/matrix-media-repo/package.nix
index f15eb89e33e8..e1f5afe86dbf 100644
--- a/pkgs/by-name/ma/matrix-media-repo/package.nix
+++ b/pkgs/by-name/ma/matrix-media-repo/package.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "t2bot";
     repo = "matrix-media-repo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-trVn+Mn98aJLQCpQX1+qps/uuA5+8zeDoM94eauxHO8=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix
index a9d7ab36dd76..e49baa6e07ea 100644
--- a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix
+++ b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "matrix-rust-sdk-crypto-nodejs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g86RPfhF9XHpbXhHRbyhl920VazCrQyRQrYV6tVCHy4=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index 2090477f2050..c31e53e4f726 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DNUKbb+d3BBp8guas6apQ4yFeXCc0Ilijtbt1hZkap4=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/pam.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/pam.nix
index 5f535a6be4d7..884f1e29e9f9 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/pam.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/pam.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "14mRh4X0r";
     repo = "matrix-synapse-pam";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0jgz49cwiyih5cg3hr4byva04zjnq8aj7rima9874la9fc5sd2wf";
   };
 
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix
index ab4bb4aa8e78..65997d2f8323 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "rust-http-rendezvous-server";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-minwa+7HLTNSBtBtt5pnoHsFnNEh834nsVw80+FIQi8=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix
index d2455a0009b2..e1419b5b0337 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "devture";
     repo = "matrix-synapse-shared-secret-auth";
-    rev = version;
+    tag = version;
     sha256 = "sha256-qzXKwTEOMtdvsxoU3Xh3vQyhK+Q18LfkeSts7EyDIXE=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-zulip-bridge/package.nix b/pkgs/by-name/ma/matrix-zulip-bridge/package.nix
index 89d577665a1a..1cddac750415 100644
--- a/pkgs/by-name/ma/matrix-zulip-bridge/package.nix
+++ b/pkgs/by-name/ma/matrix-zulip-bridge/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "GearKite";
     repo = "MatrixZulipBridge";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5bDqZb8xx5SjThZUSmOcctwo6B15cjkIwA26QNfED2A=";
   };
 
diff --git a/pkgs/by-name/ma/matterircd/package.nix b/pkgs/by-name/ma/matterircd/package.nix
index 686418886992..895f98303b29 100644
--- a/pkgs/by-name/ma/matterircd/package.nix
+++ b/pkgs/by-name/ma/matterircd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "42wim";
     repo = "matterircd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qA07i31fGLLIfWoCBW1f5nvf4AWEIkSXZh22F6rRnpM=";
   };
 
diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index 5f8ae3cdb2d3..392704f65b7e 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-k4s0kh68kycc8MSVkD64X547mWmFW4UuToDIcZ87OSc=";
   };
 
diff --git a/pkgs/by-name/ma/maturin/pyo3-test/default.nix b/pkgs/by-name/ma/maturin/pyo3-test/default.nix
index 8e0219d396a9..31d2dc32b595 100644
--- a/pkgs/by-name/ma/maturin/pyo3-test/default.nix
+++ b/pkgs/by-name/ma/maturin/pyo3-test/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "pyo3";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA=";
   };
 
diff --git a/pkgs/by-name/ma/mautrix-discord/package.nix b/pkgs/by-name/ma/mautrix-discord/package.nix
index b3943084ca55..71a3627ac7fb 100644
--- a/pkgs/by-name/ma/mautrix-discord/package.nix
+++ b/pkgs/by-name/ma/mautrix-discord/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "discord";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KRfbxPblOL4JznnGx9Jj5XXEWEKzan5xWvAwYmP7yGc=";
   };
 
diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix
index 928d67fbe8b7..cc7022fc3209 100644
--- a/pkgs/by-name/ma/mautrix-meta/package.nix
+++ b/pkgs/by-name/ma/mautrix-meta/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "meta";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UWW5h4e6usxVkMH1TDGt62/ThlAhbeqivnYFIKPOqXE=";
   };
 
diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix
index 12438c912bc9..ac3ae0cfd554 100644
--- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix
+++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "whatsapp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6Fnkw/lf64T0EXpWvSSnIRBuHJVt01Ft8Ks43/jvtZ0=";
   };
 
diff --git a/pkgs/by-name/ma/maxcso/package.nix b/pkgs/by-name/ma/maxcso/package.nix
index d0f670578d86..f9e36d2695b7 100644
--- a/pkgs/by-name/ma/maxcso/package.nix
+++ b/pkgs/by-name/ma/maxcso/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "unknownbrackets";
     repo = "maxcso";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6LjR1ZMZsi6toz9swPzNmSAlrUykwvVdYi1mR8Ctq5U=";
   };
 
diff --git a/pkgs/by-name/ma/maxflow/package.nix b/pkgs/by-name/ma/maxflow/package.nix
index 5615fc005456..ddd4f60b0776 100644
--- a/pkgs/by-name/ma/maxflow/package.nix
+++ b/pkgs/by-name/ma/maxflow/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gerddie";
     repo = "maxflow";
-    rev = version;
+    tag = version;
     hash = "sha256-a84SxGMnfBEaoMEeeIFffTOtErSN5yzZBrAUDjkalGY=";
   };
 
diff --git a/pkgs/by-name/ma/maxlib/package.nix b/pkgs/by-name/ma/maxlib/package.nix
index 02e78af05757..abe1d8727266 100644
--- a/pkgs/by-name/ma/maxlib/package.nix
+++ b/pkgs/by-name/ma/maxlib/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "electrickery";
     repo = "pd-maxlib";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "10w9qfgn26lj3zqjksf2r1wsjpf5xy4dx22jay9l6idy9q62mxsn";
   };
 
diff --git a/pkgs/by-name/mb/mbelib/package.nix b/pkgs/by-name/mb/mbelib/package.nix
index ec79289e1d33..563e80760300 100644
--- a/pkgs/by-name/mb/mbelib/package.nix
+++ b/pkgs/by-name/mb/mbelib/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "szechyjs";
     repo = "mbelib";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0v6b7nf8fgxy7vzgcwffqyql5zhldrz30c88k1ylbjp78hwh4rif";
   };
 
diff --git a/pkgs/by-name/mb/mblaze/package.nix b/pkgs/by-name/mb/mblaze/package.nix
index 69f19859ca11..580d54842ece 100644
--- a/pkgs/by-name/mb/mblaze/package.nix
+++ b/pkgs/by-name/mb/mblaze/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "mblaze";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-398wiXJ/iG9ZfPGDZc57xH37lft3NpEZuLE0Qhb2GGc=";
   };
 
diff --git a/pkgs/by-name/mb/mbpfan/package.nix b/pkgs/by-name/mb/mbpfan/package.nix
index 83bf9a2d1dc8..a686bbde0c8a 100644
--- a/pkgs/by-name/mb/mbpfan/package.nix
+++ b/pkgs/by-name/mb/mbpfan/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dgraziotin";
     repo = "mbpfan";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-F9IWUcILOuLn5K4zRSU5jn+1Wk1xy0CONSI6JTXU2pA=";
   };
   installPhase = ''
diff --git a/pkgs/by-name/mb/mbtileserver/package.nix b/pkgs/by-name/mb/mbtileserver/package.nix
index 12c64e6c9c43..20364e746455 100644
--- a/pkgs/by-name/mb/mbtileserver/package.nix
+++ b/pkgs/by-name/mb/mbtileserver/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "consbio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-RLaAhc24zdCFvpSN2LZXNyS1ygg9zCi4jEj8owdreWU=";
   };
 
diff --git a/pkgs/by-name/mb/mbusd/package.nix b/pkgs/by-name/mb/mbusd/package.nix
index d3331da67f47..c72c563750d2 100644
--- a/pkgs/by-name/mb/mbusd/package.nix
+++ b/pkgs/by-name/mb/mbusd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "3cky";
     repo = "mbusd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RQRSqlbPwBhw0SiNSP+euMVAwVBJo3lx0qB5gyWA+cM=";
   };
 
diff --git a/pkgs/by-name/mc/mcfly-fzf/package.nix b/pkgs/by-name/mc/mcfly-fzf/package.nix
index c7dcfc4192ac..2fdcc66c7a79 100644
--- a/pkgs/by-name/mc/mcfly-fzf/package.nix
+++ b/pkgs/by-name/mc/mcfly-fzf/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bnprks";
     repo = "mcfly-fzf";
-    rev = version;
+    tag = version;
     hash = "sha256-ZdsbkN+/NLA0vor6/eEdAI7V5m5GEi+phcJQ89Jp4fk=";
   };
 
diff --git a/pkgs/by-name/mc/mcfly/package.nix b/pkgs/by-name/mc/mcfly/package.nix
index 104592c80cc3..4665dd1119ed 100644
--- a/pkgs/by-name/mc/mcfly/package.nix
+++ b/pkgs/by-name/mc/mcfly/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cantino";
     repo = "mcfly";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eRuMsUN5zRWsM5BqYHI9iSfoHHMu5ugZDjeDc1GGQL8=";
   };
 
diff --git a/pkgs/by-name/mc/mcontrolcenter/package.nix b/pkgs/by-name/mc/mcontrolcenter/package.nix
index 13fa0a150ea9..09baa2405e74 100644
--- a/pkgs/by-name/mc/mcontrolcenter/package.nix
+++ b/pkgs/by-name/mc/mcontrolcenter/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "dmitry-s93";
     repo = "MControlCenter";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Gl+YnbUbwtwF2WHT39bIKh48qSIMe3fpzxgdvifR4DQ=";
   };
 
diff --git a/pkgs/by-name/mc/mcpp/package.nix b/pkgs/by-name/mc/mcpp/package.nix
index 6ca62d1fe8c7..7a27a3e251da 100644
--- a/pkgs/by-name/mc/mcpp/package.nix
+++ b/pkgs/by-name/mc/mcpp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "mcpp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-T4feegblOeG+NU+c+PAobf8HT8KDSfcINkRAa1hNpkY=";
   };
 
diff --git a/pkgs/by-name/mc/mcrcon/package.nix b/pkgs/by-name/mc/mcrcon/package.nix
index 107674b96afd..d0cf49cd34cf 100644
--- a/pkgs/by-name/mc/mcrcon/package.nix
+++ b/pkgs/by-name/mc/mcrcon/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Tiiffi";
     repo = "mcrcon";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cedeKsZgEyu0jqN4kBSgMJzFNUfCVXCEwH3M54miSG4=";
   };
 
diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix
index 9f65bd075fe7..617841bd7211 100644
--- a/pkgs/by-name/mc/mctc-lib/package.nix
+++ b/pkgs/by-name/mc/mctc-lib/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grimme-lab";
     repo = "mctc-lib";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zR4J9gOKwUIfDZsHMdX/t+mKdTpHKYTZQBYxQMWC8Vk=";
   };
 
diff --git a/pkgs/by-name/mc/mcumgr-client/package.nix b/pkgs/by-name/mc/mcumgr-client/package.nix
index 21b12fc2501b..4aceb4b503f4 100644
--- a/pkgs/by-name/mc/mcumgr-client/package.nix
+++ b/pkgs/by-name/mc/mcumgr-client/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vouch-opensource";
     repo = "mcumgr-client";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P5ykIVdWAxuCblMe7kzjswEca/+MsqpizCGUHIpR4qc=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-alerts/package.nix b/pkgs/by-name/md/mdbook-alerts/package.nix
index 22fde5a1ee22..6aca71caa273 100644
--- a/pkgs/by-name/md/mdbook-alerts/package.nix
+++ b/pkgs/by-name/md/mdbook-alerts/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lambdalisue";
     repo = "rs-mdbook-alerts";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MZS9TESITj3tzdaXYu5S2QUCW7cZuTpH1skFKeVi/sQ=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix
index 2a0d2922dfa0..20a0dadb8aa6 100644
--- a/pkgs/by-name/md/mdbook-d2/package.nix
+++ b/pkgs/by-name/md/mdbook-d2/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "danieleades";
     repo = "mdbook-d2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PsPCbuSK8JlNZOqFbxCK0f8h+7EC4tNFtjBfJqiPi7Q=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix
index 430e3f32f30a..4a079393ac71 100644
--- a/pkgs/by-name/md/mdbook-emojicodes/package.nix
+++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "blyxyas";
     repo = "mdbook-emojicodes";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-dlvfY2AMBvTl0j9YaT+u4CeWQGGihFD8AZaAK4/hUWU=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
index fd18fe07fc96..dd0b866dc73e 100644
--- a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
+++ b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "joelcourtney";
     repo = "mdbook-kroki-preprocessor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3BxIhJK0YWZBEbbNwMKixo1icEn+QKJwoskgIEaZcGQ=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-open-on-gh/package.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix
index 75f3ee01b38f..bfbd562ec470 100644
--- a/pkgs/by-name/md/mdbook-open-on-gh/package.nix
+++ b/pkgs/by-name/md/mdbook-open-on-gh/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "badboy";
     repo = "mdbook-open-on-gh";
-    rev = version;
+    tag = version;
     hash = "sha256-73738Vei7rQ67LQIOrHPGOtsBnHClaXClRWDmA5pP58=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-pagetoc/package.nix b/pkgs/by-name/md/mdbook-pagetoc/package.nix
index 8d4334615488..4f9c29fbc99f 100644
--- a/pkgs/by-name/md/mdbook-pagetoc/package.nix
+++ b/pkgs/by-name/md/mdbook-pagetoc/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "slowsage";
     repo = "mdbook-pagetoc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A8J3cKSA//NGIVK3uE43YH3ph9DHGFlg7uOo10j2Kh8=";
   };
 
diff --git a/pkgs/by-name/md/mdbtools/package.nix b/pkgs/by-name/md/mdbtools/package.nix
index 381245fef2c7..5e6558b3ef42 100644
--- a/pkgs/by-name/md/mdbtools/package.nix
+++ b/pkgs/by-name/md/mdbtools/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mdbtools";
     repo = "mdbtools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-XWkFgQZKx9/pjVNEqfp9BwgR7w3fVxQ/bkJEYUvCXPs=";
   };
 
diff --git a/pkgs/by-name/md/mdds/package.nix b/pkgs/by-name/md/mdds/package.nix
index 55e2f3aa6ebe..5c2ded82c79d 100644
--- a/pkgs/by-name/md/mdds/package.nix
+++ b/pkgs/by-name/md/mdds/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "mdds";
     repo = "mdds";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-a412LpgDiYM8TMToaUrTlHtblYS1HehzrDOwvIAAxiA=";
   };
 
diff --git a/pkgs/by-name/md/mdhtml/package.nix b/pkgs/by-name/md/mdhtml/package.nix
index 5c58990b162f..7465d8424388 100644
--- a/pkgs/by-name/md/mdhtml/package.nix
+++ b/pkgs/by-name/md/mdhtml/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
     domain = "codeberg.org";
     owner = "Tomkoid";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Fv5XpWA2ebqXdA+46gZQouuZ3XxH4WDj/W6xJ0ETg8E=";
   };
 
diff --git a/pkgs/by-name/md/mdns/package.nix b/pkgs/by-name/md/mdns/package.nix
index d2d47f574a8c..bc12565a83fe 100644
--- a/pkgs/by-name/md/mdns/package.nix
+++ b/pkgs/by-name/md/mdns/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mjansson";
     repo = "mdns";
-    rev = version;
+    tag = version;
     hash = "sha256-2uv+Ibnbl6hsdjFqPhcHXbv+nIEIT4+tgtwGndpZCqo=";
   };
 
diff --git a/pkgs/by-name/md/mdp/package.nix b/pkgs/by-name/md/mdp/package.nix
index d2b979d83f4f..05c9c9851ca8 100644
--- a/pkgs/by-name/md/mdp/package.nix
+++ b/pkgs/by-name/md/mdp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "visit1985";
     repo = "mdp";
-    rev = version;
+    tag = version;
     sha256 = "1m9a0vvyw2m55cn7zcq011vrjkiaj5a3g5g6f2dpq953gyi7gff9";
   };
 
diff --git a/pkgs/by-name/md/mdr/package.nix b/pkgs/by-name/md/mdr/package.nix
index f0b2d4fa9114..beac62ebde09 100644
--- a/pkgs/by-name/md/mdr/package.nix
+++ b/pkgs/by-name/md/mdr/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MichaelMure";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ibM3303pXnseAFP9qFTOzj0G/SxRPX+UeRfbJ+MCABk=";
   };
 
diff --git a/pkgs/by-name/md/mdsh/package.nix b/pkgs/by-name/md/mdsh/package.nix
index 5333d33477db..5313c7b2f383 100644
--- a/pkgs/by-name/md/mdsh/package.nix
+++ b/pkgs/by-name/md/mdsh/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zimbatm";
     repo = "mdsh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DQdm6911SNzVxUXpZ4mMumjonThhhEJnM/3GjbCjyuY=";
   };
 
diff --git a/pkgs/by-name/me/me_cleaner/package.nix b/pkgs/by-name/me/me_cleaner/package.nix
index 6957173c7687..841d4a3baa4f 100644
--- a/pkgs/by-name/me/me_cleaner/package.nix
+++ b/pkgs/by-name/me/me_cleaner/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "corna";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4";
   };
 
diff --git a/pkgs/by-name/me/measureme/package.nix b/pkgs/by-name/me/measureme/package.nix
index 4a0e426d3f6f..06c9b77f21d0 100644
--- a/pkgs/by-name/me/measureme/package.nix
+++ b/pkgs/by-name/me/measureme/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "measureme";
-    rev = version;
+    tag = version;
     hash = "sha256-Zgl8iyBDVwqZnbfqC06DMuo0S/hV6pl812hkiovmS+I=";
   };
 
diff --git a/pkgs/by-name/me/med/package.nix b/pkgs/by-name/me/med/package.nix
index 23811de16cbf..4f0dfd6b43d1 100644
--- a/pkgs/by-name/me/med/package.nix
+++ b/pkgs/by-name/me/med/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "allencch";
     repo = "med";
-    rev = version;
+    tag = version;
     hash = "sha256-m2lVRSNaklB0Xfqgtyc0lNWXfTD8wTWsE06eGv4FOBE=";
   };
 
diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix
index 18850c1bcdbb..bb9c7587c582 100644
--- a/pkgs/by-name/me/media-downloader/package.nix
+++ b/pkgs/by-name/me/media-downloader/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mhogomchungu";
     repo = "media-downloader";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-rNcEPE1BoCltpV5A3ugc7NI2ASfLXuPC9NNbc4Gn8BA=";
   };
 
diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix
index 6d6ebbe587a0..3acf79b0a66a 100644
--- a/pkgs/by-name/me/mediamtx/package.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LPyyPHTdV9cUDRKSlP+XaMyb+yhSj4Jq0tnT7AnTRqw=";
   };
 
diff --git a/pkgs/by-name/me/mediasynclite/package.nix b/pkgs/by-name/me/mediasynclite/package.nix
index 2b532d229220..eba8147bb1e5 100644
--- a/pkgs/by-name/me/mediasynclite/package.nix
+++ b/pkgs/by-name/me/mediasynclite/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iBroadcastMediaServices";
     repo = "MediaSyncLiteLinux";
-    rev = version;
+    tag = version;
     hash = "sha256-ToSkR6tPJMBCcj1NUBAywKjCAPlpmh+ngIopFrT2PIA=";
   };
 
diff --git a/pkgs/by-name/me/mednaffe/package.nix b/pkgs/by-name/me/mednaffe/package.nix
index c21689a9be44..c2de3b0e13a7 100644
--- a/pkgs/by-name/me/mednaffe/package.nix
+++ b/pkgs/by-name/me/mednaffe/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AmatCoder";
     repo = "mednaffe";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ZizW0EeY/Cc68m87cnbLAkx3G/ULyFT5b6Ku2ObzFRU=";
   };
 
diff --git a/pkgs/by-name/me/meg/package.nix b/pkgs/by-name/me/meg/package.nix
index 7a0973ff92af..3e0713b8c87e 100644
--- a/pkgs/by-name/me/meg/package.nix
+++ b/pkgs/by-name/me/meg/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "meg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uhfPNpvuuC9kBYUBCGE6X46TeZ5QxIcnDQ4HRrn2mT4=";
   };
 
diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix
index 642af48e9099..9926da584de8 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/me/megahit/package.nix b/pkgs/by-name/me/megahit/package.nix
index 84b8953a0556..b6792a95ccde 100644
--- a/pkgs/by-name/me/megahit/package.nix
+++ b/pkgs/by-name/me/megahit/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "voutcn";
     repo = "megahit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1r5d9nkdmgjsbrpj43q9hy3s8jwsabaz3ji561v18hy47v58923c";
   };
 
diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix
index 2bc12b537c87..634848a48143 100644
--- a/pkgs/by-name/me/megapixels/package.nix
+++ b/pkgs/by-name/me/megapixels/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "megapixels-org";
     repo = "Megapixels";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ZXr0gmO72zKHwORn4p8zKuGcdICvb5+L/Q9d/ty8zwA=";
   };
 
diff --git a/pkgs/by-name/me/megatools/package.nix b/pkgs/by-name/me/megatools/package.nix
index 0f303363ca2f..d575e879b4a3 100644
--- a/pkgs/by-name/me/megatools/package.nix
+++ b/pkgs/by-name/me/megatools/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://megous.com/git/megatools";
-    rev = version;
+    tag = version;
     sha256 = "sha256-AdvQqaRTsKTqdfNfFiWtA9mIPVGuui+Ru9TUARVG0+Q=";
   };
 
diff --git a/pkgs/by-name/me/mekuteriya/package.nix b/pkgs/by-name/me/mekuteriya/package.nix
index a00375d5e0a5..98bae6881dfe 100644
--- a/pkgs/by-name/me/mekuteriya/package.nix
+++ b/pkgs/by-name/me/mekuteriya/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "frectonz";
     repo = "mek-ut-er-ya";
-    rev = version;
+    tag = version;
     hash = "sha256-bWp2UNrhCHY2DQWusGS9L9/jI2r23F34yLpuE6nuOD0=";
   };
 
diff --git a/pkgs/by-name/me/mela/package.nix b/pkgs/by-name/me/mela/package.nix
index 1bdaf081ac3a..0985125db12a 100644
--- a/pkgs/by-name/me/mela/package.nix
+++ b/pkgs/by-name/me/mela/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vbertone";
     repo = "MELA";
-    rev = version;
+    tag = version;
     sha256 = "01sgd4mwx4n58x95brphp4dskqkkx8434bvsr38r5drg9na5nc9y";
   };
 
diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix
index 2504292861c9..40ff93f6934a 100644
--- a/pkgs/by-name/me/melange/package.nix
+++ b/pkgs/by-name/me/melange/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3/iENeBC2kaHu3G5eWiRJgj/NbjOfj4/1LjrXQYedVo=";
     # 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/me/melt/package.nix b/pkgs/by-name/me/melt/package.nix
index 39284acc1522..aa7c660a55c6 100644
--- a/pkgs/by-name/me/melt/package.nix
+++ b/pkgs/by-name/me/melt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "melt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rZJSjWmcVPri/BmGrm+fDi2WgtPReQ9lesmBhMsdddo=";
   };
 
diff --git a/pkgs/by-name/me/meme-image-generator/package.nix b/pkgs/by-name/me/meme-image-generator/package.nix
index 98a643d4754a..0876002450c1 100644
--- a/pkgs/by-name/me/meme-image-generator/package.nix
+++ b/pkgs/by-name/me/meme-image-generator/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nomad-software";
     repo = "meme";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L+JpNg9X3RSNXTozv2H1n2JiQx75i9gFGaQmDFaMIf0=";
   };
 
diff --git a/pkgs/by-name/me/memo/package.nix b/pkgs/by-name/me/memo/package.nix
index 5973477ffa2d..d5bbfa03d32e 100644
--- a/pkgs/by-name/me/memo/package.nix
+++ b/pkgs/by-name/me/memo/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mrVanDalo";
     repo = "memo";
-    rev = version;
+    tag = version;
     sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp";
   };
 
diff --git a/pkgs/by-name/me/memtest_vulkan/package.nix b/pkgs/by-name/me/memtest_vulkan/package.nix
index 2b699d306fe7..26c1b15106fa 100644
--- a/pkgs/by-name/me/memtest_vulkan/package.nix
+++ b/pkgs/by-name/me/memtest_vulkan/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "GpuZelenograd";
     repo = "memtest_vulkan";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8tmQtycK7D5bol9v5VL8VkROZbSCndHo+uBvqqFTZjw=";
   };
 
diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix
index d8198f7ff418..e348d031e73a 100644
--- a/pkgs/by-name/me/meow/package.nix
+++ b/pkgs/by-name/me/meow/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PixelSergey";
     repo = "meow";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iskpT0CU/cGp+8myWaVmdw/uC0VoP8Sv+qbjpDDKS3o=";
   };
 
diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix
index 52fdad672cbe..dc8ec7b5ab6e 100644
--- a/pkgs/by-name/me/mercure/package.nix
+++ b/pkgs/by-name/me/mercure/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dunglas";
     repo = "mercure";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-igPb2b3q3gGewg9DhSBVCSnFvwbGxIOQTCN1sEzdSJE=";
   };
 
diff --git a/pkgs/by-name/me/merkaartor/package.nix b/pkgs/by-name/me/merkaartor/package.nix
index 8d3abd715a43..371bd48a4fb5 100644
--- a/pkgs/by-name/me/merkaartor/package.nix
+++ b/pkgs/by-name/me/merkaartor/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openstreetmap";
     repo = "merkaartor";
-    rev = version;
+    tag = version;
     hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec=";
   };
 
diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix
index 058bf0dcde6d..f3967c3888cc 100644
--- a/pkgs/by-name/me/mermaid-cli/package.nix
+++ b/pkgs/by-name/me/mermaid-cli/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "mermaid-js";
     repo = "mermaid-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-hj6pnucms6OcLuIebnlHMQj2K8zMbyuWzvVkZh029Sw=";
   };
 
diff --git a/pkgs/by-name/me/mermaid-filter/package.nix b/pkgs/by-name/me/mermaid-filter/package.nix
index d34f0eb5b0b0..c766671110c2 100644
--- a/pkgs/by-name/me/mermaid-filter/package.nix
+++ b/pkgs/by-name/me/mermaid-filter/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "raghur";
     repo = "mermaid-filter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GG2RWr5nVe6PCcTEJLmPyKL2j7ggSyNnHZAffNvPukg=";
   };
 
diff --git a/pkgs/by-name/me/meshoptimizer/package.nix b/pkgs/by-name/me/meshoptimizer/package.nix
index 25289d655e04..44c2014571dc 100644
--- a/pkgs/by-name/me/meshoptimizer/package.nix
+++ b/pkgs/by-name/me/meshoptimizer/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "meshoptimizer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vA9FXpJuLJS510MZgVZ96LAUbjXth4CFNkXMEV0DpYg=";
   };
 
diff --git a/pkgs/by-name/me/meson-tools/package.nix b/pkgs/by-name/me/meson-tools/package.nix
index 714ed7f763a7..320beefc0038 100644
--- a/pkgs/by-name/me/meson-tools/package.nix
+++ b/pkgs/by-name/me/meson-tools/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "afaerber";
     repo = "meson-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1bvshfa9pa012yzdwapi3nalpgcwmfq7d3n3w3mlr357a6kq64qk";
   };
 
diff --git a/pkgs/by-name/me/mesos-dns/package.nix b/pkgs/by-name/me/mesos-dns/package.nix
index 1ae38d4ac4cb..6ecf370bf823 100644
--- a/pkgs/by-name/me/mesos-dns/package.nix
+++ b/pkgs/by-name/me/mesos-dns/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "m3scluster";
     repo = "mesos-dns";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/zcjQ2AxZ17rAxrRmfztj5gH1pu2QswJgaCE022FieU=";
   };
 
diff --git a/pkgs/by-name/me/messer-slim/package.nix b/pkgs/by-name/me/messer-slim/package.nix
index 6c90806992ed..555554de99e1 100644
--- a/pkgs/by-name/me/messer-slim/package.nix
+++ b/pkgs/by-name/me/messer-slim/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MesserLab";
     repo = "SLiM";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Hgh1ianEdITRUIDKLiLW32kQlPlXKIfN4PSv3cOXTGI=";
   };
 
diff --git a/pkgs/by-name/me/metadata-cleaner/package.nix b/pkgs/by-name/me/metadata-cleaner/package.nix
index 1f42f6b474f3..3b3aede756f4 100644
--- a/pkgs/by-name/me/metadata-cleaner/package.nix
+++ b/pkgs/by-name/me/metadata-cleaner/package.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "rmnvgr";
     repo = "metadata-cleaner";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-J+nwgLbAFoh1gq3J4cqQEShZJCSZesyCjT9DfkCWIHs=";
   };
 
diff --git a/pkgs/by-name/me/metal-cli/package.nix b/pkgs/by-name/me/metal-cli/package.nix
index b13d6bb0d162..b7040f23a0cd 100644
--- a/pkgs/by-name/me/metal-cli/package.nix
+++ b/pkgs/by-name/me/metal-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "equinix";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+hpsGFZHuVhh+fKVcap0vhoUmRs3xPgUwW8SD56m6uI=";
   };
 
diff --git a/pkgs/by-name/me/metamath/package.nix b/pkgs/by-name/me/metamath/package.nix
index 884aa8ab4814..02aa05b266fc 100644
--- a/pkgs/by-name/me/metamath/package.nix
+++ b/pkgs/by-name/me/metamath/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "metamath";
     repo = "metamath-exe";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Cg1dgz+uphDlGhKH3mTywtAccWinC5+pwNv4TB3YAnI=";
   };
 
diff --git a/pkgs/by-name/me/metastore/package.nix b/pkgs/by-name/me/metastore/package.nix
index 32d85ff6cc4e..ae98a18ad6be 100644
--- a/pkgs/by-name/me/metastore/package.nix
+++ b/pkgs/by-name/me/metastore/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "przemoc";
     repo = "metastore";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0mb10wfckswqgi0bq25ncgabnd3iwj7s7hhg3wpcyfgckdynwizv";
   };
 
diff --git a/pkgs/by-name/me/meteor-git/package.nix b/pkgs/by-name/me/meteor-git/package.nix
index 7123b8860b73..5e01ecc10926 100644
--- a/pkgs/by-name/me/meteor-git/package.nix
+++ b/pkgs/by-name/me/meteor-git/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stefanlogue";
     repo = "meteor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DWnwofNJhILdVITRDh8MNlGl6PSENCS2PkaFm1o+MW8=";
   };
 
diff --git a/pkgs/by-name/me/metersLv2/package.nix b/pkgs/by-name/me/metersLv2/package.nix
index beeaeb4f5ebf..5d038a9539fd 100644
--- a/pkgs/by-name/me/metersLv2/package.nix
+++ b/pkgs/by-name/me/metersLv2/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "x42";
     repo = "meters.lv2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eGXTbE83bJEDqTBltL6ZX9qa/OotCFmUxpE/aLqGELU=";
   };
 
diff --git a/pkgs/by-name/me/mev-boost/package.nix b/pkgs/by-name/me/mev-boost/package.nix
index f99e1b0ce3fb..d0338c1e9071 100644
--- a/pkgs/by-name/me/mev-boost/package.nix
+++ b/pkgs/by-name/me/mev-boost/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "flashbots";
     repo = "mev-boost";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EFPVBSSIef3cTrYp3X1xCEOtYcGpuW/GZXHXX+0wGd8=";
   };
 
diff --git a/pkgs/by-name/mg/mgitstatus/package.nix b/pkgs/by-name/mg/mgitstatus/package.nix
index da906e08f922..ef9001be3af1 100644
--- a/pkgs/by-name/mg/mgitstatus/package.nix
+++ b/pkgs/by-name/mg/mgitstatus/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fboender";
     repo = "multi-git-status";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-DToyP6TD9up0k2/skMW3el6hNvKD+c8q2zWpk0QZGRA=";
   };
 
diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix
index 2f5d08158f94..cee54373f85a 100644
--- a/pkgs/by-name/mi/microbin/package.nix
+++ b/pkgs/by-name/mi/microbin/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "szabodanika";
     repo = "microbin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fsRpqSYDsuV0M6Xar2GVoyTgCPT39dcKJ6eW4YXCkQ0=";
   };
 
diff --git a/pkgs/by-name/mi/microcom/package.nix b/pkgs/by-name/mi/microcom/package.nix
index b70adcd0ff01..a1c1f313aef7 100644
--- a/pkgs/by-name/mi/microcom/package.nix
+++ b/pkgs/by-name/mi/microcom/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pengutronix";
     repo = "microcom";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CT/myxOK4U3DzliGsa45WMIFcYLjcoxx6w5S1NL5c7Y=";
   };
 
diff --git a/pkgs/by-name/mi/microdnf/package.nix b/pkgs/by-name/mi/microdnf/package.nix
index db9d8910f39f..44430e70450e 100644
--- a/pkgs/by-name/mi/microdnf/package.nix
+++ b/pkgs/by-name/mi/microdnf/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "microdnf";
-    rev = version;
+    tag = version;
     hash = "sha256-xWHE05CeX8I8YO0gqf5FDiqLexirwKdyCe4grclOVYc=";
   };
 
diff --git a/pkgs/by-name/mi/micromdm/package.nix b/pkgs/by-name/mi/micromdm/package.nix
index 05cb4e691b6e..e7f6e305d3c2 100644
--- a/pkgs/by-name/mi/micromdm/package.nix
+++ b/pkgs/by-name/mi/micromdm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "micromdm";
     repo = "micromdm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o/HK1bjaUwsSQG7QbYe0gFnD/OKV00cHXLXpftNa3iY=";
   };
 
diff --git a/pkgs/by-name/mi/micronucleus/package.nix b/pkgs/by-name/mi/micronucleus/package.nix
index 51369ef5a704..f4382df67dec 100644
--- a/pkgs/by-name/mi/micronucleus/package.nix
+++ b/pkgs/by-name/mi/micronucleus/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "micronucleus";
     repo = "micronucleus";
-    rev = version;
+    tag = version;
     sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in";
   };
 
diff --git a/pkgs/by-name/mi/microplane/package.nix b/pkgs/by-name/mi/microplane/package.nix
index fcae4cf42b71..2b3b4b6b08e7 100644
--- a/pkgs/by-name/mi/microplane/package.nix
+++ b/pkgs/by-name/mi/microplane/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Clever";
     repo = "microplane";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3QPxH4ZR02bkL2uKoJpLW9e7q1LjSlWw5jo0jxegeiM=";
   };
 
diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix
index fb75f70d01c8..8634a90dac48 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-Hn5TtLBKK9kn9x3U2ZcU9O2CS272rcDD0HA+Xva3G4w=";
     fetchSubmodules = true;
 
diff --git a/pkgs/by-name/mi/microscheme/package.nix b/pkgs/by-name/mi/microscheme/package.nix
index 8c7841904438..2e704c1fd76d 100644
--- a/pkgs/by-name/mi/microscheme/package.nix
+++ b/pkgs/by-name/mi/microscheme/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ryansuchocki";
     repo = "microscheme";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "5qTWsBCfj5DCZ3f9W1bdo6WAc1DZqVxg8D7pwC95duQ=";
   };
 
diff --git a/pkgs/by-name/mi/microserver/package.nix b/pkgs/by-name/mi/microserver/package.nix
index 84f46fd49e25..b696239174c1 100644
--- a/pkgs/by-name/mi/microserver/package.nix
+++ b/pkgs/by-name/mi/microserver/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "robertohuertasm";
     repo = "microserver";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VgzOdJ1JLe0acjRYvaysCPox5acFmc4VD2f6HZWxT8M=";
   };
 
diff --git a/pkgs/by-name/mi/microsocks/package.nix b/pkgs/by-name/mi/microsocks/package.nix
index 8cd33c602e02..ecc03c487d9e 100644
--- a/pkgs/by-name/mi/microsocks/package.nix
+++ b/pkgs/by-name/mi/microsocks/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rofl0r";
     repo = "microsocks";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5NR2gtm+uMkjmkV/dv3DzSedfNvYpHZgFHVSrybl0Tk=";
   };
 
diff --git a/pkgs/by-name/mi/microsoft-gsl/package.nix b/pkgs/by-name/mi/microsoft-gsl/package.nix
index 1ababa6047a5..9ab73ca3465f 100644
--- a/pkgs/by-name/mi/microsoft-gsl/package.nix
+++ b/pkgs/by-name/mi/microsoft-gsl/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "GSL";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cXDFqt2KgMFGfdh6NGE+JmP4R0Wm9LNHM0eIblYe6zU=";
   };
 
diff --git a/pkgs/by-name/mi/midi-trigger/package.nix b/pkgs/by-name/mi/midi-trigger/package.nix
index c05218a923bd..957e3ba6e18c 100644
--- a/pkgs/by-name/mi/midi-trigger/package.nix
+++ b/pkgs/by-name/mi/midi-trigger/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "unclechu";
     repo = "MIDI-Trigger";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-tMnN8mTd6Bm46ZIDy0JPSVe77xCZws2XwQLQexDWPgU=";
   };
 
diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index eff21c563892..dee9d84a2386 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Hy5Uy6lC3d8N2lsnGLrcN/D5/eiycp7X7h6V8vo3tPA=";
   };
 
diff --git a/pkgs/by-name/mi/migra/package.nix b/pkgs/by-name/mi/migra/package.nix
index 48fa2a1e5c07..a5b158b56857 100644
--- a/pkgs/by-name/mi/migra/package.nix
+++ b/pkgs/by-name/mi/migra/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "djrobstep";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-LSCJA5Ym1LuV3EZl6gnl9jTHGc8A1LXmR1fj0ZZc+po=";
   };
 
diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
index 760dd240bcf3..27d38e7d222b 100644
--- a/pkgs/by-name/mi/mihomo/package.nix
+++ b/pkgs/by-name/mi/mihomo/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "mihomo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A/+BUnW7ge4y99W2rAUBAAqxO1L0M9oO0WSnLN1NnXQ=";
   };
 
diff --git a/pkgs/by-name/mi/miller/package.nix b/pkgs/by-name/mi/miller/package.nix
index 9c2567906453..8910de89b028 100644
--- a/pkgs/by-name/mi/miller/package.nix
+++ b/pkgs/by-name/mi/miller/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "johnkerl";
     repo = "miller";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eHiYIw/sQMXLow2Vy4zFTGeON28LmG0pK2Uca4ooInU=";
   };
 
diff --git a/pkgs/by-name/mi/millet/package.nix b/pkgs/by-name/mi/millet/package.nix
index da0694ebe84f..e073567873a2 100644
--- a/pkgs/by-name/mi/millet/package.nix
+++ b/pkgs/by-name/mi/millet/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "azdavis";
     repo = "millet";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ffna9qsCTRHnUstgCDZxHweHteYVA/xiAtOkzCw2ltI=";
   };
 
diff --git a/pkgs/by-name/mi/millipixels/package.nix b/pkgs/by-name/mi/millipixels/package.nix
index 2022d8e50bcc..d0ed2e3ac1ba 100644
--- a/pkgs/by-name/mi/millipixels/package.nix
+++ b/pkgs/by-name/mi/millipixels/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "Librem5";
     repo = "millipixels";
-    rev = "v${version}";
+    tag = "v${version}";
     domain = "source.puri.sm";
     hash = "sha256-pRREQRYyD9+dpRvcfsNiNthFy08Yeup9xDn+x+RWDrE=";
   };
diff --git a/pkgs/by-name/mi/mimalloc/package.nix b/pkgs/by-name/mi/mimalloc/package.nix
index b0de189bcc97..2373f779c51e 100644
--- a/pkgs/by-name/mi/mimalloc/package.nix
+++ b/pkgs/by-name/mi/mimalloc/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "mimalloc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-RjFMLInulyynrmyAg6Km/u9HGfcYeerkou0gQwCdhsA=";
   };
 
diff --git a/pkgs/by-name/mi/mimic/package.nix b/pkgs/by-name/mi/mimic/package.nix
index 70a9b0e33a83..0b11b60bcdcb 100644
--- a/pkgs/by-name/mi/mimic/package.nix
+++ b/pkgs/by-name/mi/mimic/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MycroftAI";
     repo = "mimic1";
-    rev = version;
+    tag = version;
     sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id";
   };
 
diff --git a/pkgs/by-name/mi/minder/package.nix b/pkgs/by-name/mi/minder/package.nix
index 33966794be80..d9a3224e5c7e 100644
--- a/pkgs/by-name/mi/minder/package.nix
+++ b/pkgs/by-name/mi/minder/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phase1geo";
     repo = "minder";
-    rev = version;
+    tag = version;
     sha256 = "sha256-LZm2TLUugW/lSHp+y3Sz9IacQCEFQloVnZ9MoBjqHvI=";
   };
 
diff --git a/pkgs/by-name/mi/mindustry/package.nix b/pkgs/by-name/mi/mindustry/package.nix
index 50c781bc3321..b3cb78086496 100644
--- a/pkgs/by-name/mi/mindustry/package.nix
+++ b/pkgs/by-name/mi/mindustry/package.nix
@@ -49,13 +49,13 @@ let
   Mindustry = fetchFromGitHub {
     owner = "Anuken";
     repo = "Mindustry";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pJAJjb8rgDL5q2hfuXH2Cyb1Szu4GixeXoLMdnIAlno=";
   };
   Arc = fetchFromGitHub {
     owner = "Anuken";
     repo = "Arc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L+5fshI1oo1lVdTMTBuPzqtEeR2dq1NORP84rZ83rT0=";
   };
   soloud = fetchFromGitHub {
diff --git a/pkgs/by-name/mi/minecraft-server-hibernation/package.nix b/pkgs/by-name/mi/minecraft-server-hibernation/package.nix
index e5279d2e3bf2..8773cb0942c9 100644
--- a/pkgs/by-name/mi/minecraft-server-hibernation/package.nix
+++ b/pkgs/by-name/mi/minecraft-server-hibernation/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gekware";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-b6LeqjIraIasHBpaVgy8esl4NV8rdBrfO7ewgeIocS8=";
   };
 
diff --git a/pkgs/by-name/mi/minesweep-rs/package.nix b/pkgs/by-name/mi/minesweep-rs/package.nix
index fb87f88b8ae9..3f6af7858dd6 100644
--- a/pkgs/by-name/mi/minesweep-rs/package.nix
+++ b/pkgs/by-name/mi/minesweep-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cpcloud";
     repo = "minesweep-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FzMCqsPBcbblItRzfnY43glY4We9jk0eBxjG0SZnau8=";
   };
 
diff --git a/pkgs/by-name/mi/minetest-mapserver/package.nix b/pkgs/by-name/mi/minetest-mapserver/package.nix
index 9641223a8460..85333336b17a 100644
--- a/pkgs/by-name/mi/minetest-mapserver/package.nix
+++ b/pkgs/by-name/mi/minetest-mapserver/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "minetest-mapserver";
     repo = "mapserver";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wo3/7axVkEcnqkOG29KE136EeMt/FW63q68UlpIA3z8=";
   };
 
diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix
index 44973a67f9d7..c55837a7e3af 100644
--- a/pkgs/by-name/mi/mini-calc/package.nix
+++ b/pkgs/by-name/mi/mini-calc/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vanilla-extracts";
     repo = "calc";
-    rev = version;
+    tag = version;
     hash = "sha256-iLKW0ibsHZyAMYvux+CrOeJZCVMPE1HtWi0VBg96hr0=";
   };
 
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/mi/miniaudio/package.nix b/pkgs/by-name/mi/miniaudio/package.nix
index 5f591c1cecba..b7575ab9a45c 100644
--- a/pkgs/by-name/mi/miniaudio/package.nix
+++ b/pkgs/by-name/mi/miniaudio/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mackron";
     repo = "miniaudio";
-    rev = version;
+    tag = version;
     hash = "sha256-o/7sfBcrhyXEakccOAogQqm8dO4Szj1QSpaIHg6OSt4=";
   };
 
diff --git a/pkgs/by-name/mi/minica/package.nix b/pkgs/by-name/mi/minica/package.nix
index 594725a773cd..e486f2cfee18 100644
--- a/pkgs/by-name/mi/minica/package.nix
+++ b/pkgs/by-name/mi/minica/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jsha";
     repo = "minica";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YUeP3xBoZzonJYfEAOWZYCTFwOxFWySW7ezvpMLNZ1I=";
   };
 
diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix
index 1742f171ecba..0fee53f83980 100644
--- a/pkgs/by-name/mi/minify/package.nix
+++ b/pkgs/by-name/mi/minify/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tdewolff";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sN3gGxUOWNFBB+iz6i+a0SP8my+IdbMXAVd/bWzzKms=";
   };
 
diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
index 3184c339168e..5240555e4826 100644
--- a/pkgs/by-name/mi/minijinja/package.nix
+++ b/pkgs/by-name/mi/minijinja/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mitsuhiko";
     repo = "minijinja";
-    rev = version;
+    tag = version;
     hash = "sha256-WbWMssIQ8ETaVaJ9fEkUxHmnylH4hdO14XMwyB0BtFY=";
   };
 
diff --git a/pkgs/by-name/mi/minimacy/package.nix b/pkgs/by-name/mi/minimacy/package.nix
index a05df86a88be..68fce8ff2386 100644
--- a/pkgs/by-name/mi/minimacy/package.nix
+++ b/pkgs/by-name/mi/minimacy/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ambermind";
     repo = "minimacy";
-    rev = version;
+    tag = version;
     hash = "sha256-uA+4dnhOnv7qRE7nqew8a14DGaQblsMY2uBZ+iyLtFU=";
   };
 
diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix
index 8808db4374f7..d82ef8199b3d 100644
--- a/pkgs/by-name/mi/minimap2/package.nix
+++ b/pkgs/by-name/mi/minimap2/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "minimap2";
     owner = "lh3";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cBl2BKgPCP/xHZW6fTH51cY9/lV/1HVLsN7a1R1Blv4=";
   };
 
diff --git a/pkgs/by-name/mi/mininet/package.nix b/pkgs/by-name/mi/mininet/package.nix
index 8980443d16b0..f0b91f00366b 100644
--- a/pkgs/by-name/mi/mininet/package.nix
+++ b/pkgs/by-name/mi/mininet/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mininet";
     repo = "mininet";
-    rev = version;
+    tag = version;
     hash = "sha256-Z7Vbfu0EJ4+rCpckXrt3hgxeB9N2nnyPIXgPBnpV4uw=";
   };
 
diff --git a/pkgs/by-name/mi/minio-certgen/package.nix b/pkgs/by-name/mi/minio-certgen/package.nix
index 3ab53dbac9ad..4835693c1f1c 100644
--- a/pkgs/by-name/mi/minio-certgen/package.nix
+++ b/pkgs/by-name/mi/minio-certgen/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "minio";
     repo = "certgen";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bYZfQeqPqroMkqJOqHri3l7xscEK9ml/oNLVPBVSDKk=";
   };
 
diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix
index 82c3baa2e8f3..d88889537301 100644
--- a/pkgs/by-name/mi/minio-warp/package.nix
+++ b/pkgs/by-name/mi/minio-warp/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "minio";
     repo = "warp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zRRvY/PpLSY8cx3vqcAGfVK7FJKzFnxtghhIwrlUh+Y=";
   };
 
diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index d85fd90783b0..50908207ec05 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "miniserve";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U=";
   };
 
diff --git a/pkgs/by-name/mi/minisign/package.nix b/pkgs/by-name/mi/minisign/package.nix
index ebecb13ca6be..5467fc4097a2 100644
--- a/pkgs/by-name/mi/minisign/package.nix
+++ b/pkgs/by-name/mi/minisign/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "minisign";
     owner = "jedisct1";
-    rev = version;
+    tag = version;
     sha256 = "sha256-qhAzhht9p4bsa2ntJwhcNurm8QgYYiKi3dA3ifpT8aw=";
   };
 
diff --git a/pkgs/by-name/mi/minivmac/package.nix b/pkgs/by-name/mi/minivmac/package.nix
index a143585f5280..33c72844e3e1 100644
--- a/pkgs/by-name/mi/minivmac/package.nix
+++ b/pkgs/by-name/mi/minivmac/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "erichelgeson";
     repo = "minivmac";
-    rev = version;
+    tag = version;
     hash = "sha256-iiEE0ioXh3keKUPfAB+YcE1iggGLpxT9N8LSVFDhttE=";
   };
 
diff --git a/pkgs/by-name/mi/minixml/package.nix b/pkgs/by-name/mi/minixml/package.nix
index d978973e7e93..74343c7c96e8 100644
--- a/pkgs/by-name/mi/minixml/package.nix
+++ b/pkgs/by-name/mi/minixml/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = "mxml";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-l7GUA+vlSECi/72eU3Y9COpGtLTRh3vYcHUi+uRkCn8=";
   };
 
diff --git a/pkgs/by-name/mi/miniz/package.nix b/pkgs/by-name/mi/miniz/package.nix
index c47b49755916..e6977be769bb 100644
--- a/pkgs/by-name/mi/miniz/package.nix
+++ b/pkgs/by-name/mi/miniz/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "richgel999";
     repo = "miniz";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-3J0bkr2Yk+MJXilUqOCHsWzuykySv5B1nepmucvA4hg=";
   };
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/mi/minizign/package.nix b/pkgs/by-name/mi/minizign/package.nix
index ea85e75a5329..4ca327800caa 100644
--- a/pkgs/by-name/mi/minizign/package.nix
+++ b/pkgs/by-name/mi/minizign/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = "zig-minisign";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Su66UohRc9C4INIp+7NHiW28sUq5YBfrI0EoEbGojG0=";
   };
 
diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix
index e585035af33f..4ee57cee8bf1 100644
--- a/pkgs/by-name/mi/minizip-ng/package.nix
+++ b/pkgs/by-name/mi/minizip-ng/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zlib-ng";
     repo = "minizip-ng";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-NFl2R+o1SBXNAt2TOMMsbIh+IHJu78p56caT4h2TDeU=";
   };
 
diff --git a/pkgs/by-name/mi/mint-l-theme/package.nix b/pkgs/by-name/mi/mint-l-theme/package.nix
index 7ce18e06f8f5..8b7f73bbffb8 100644
--- a/pkgs/by-name/mi/mint-l-theme/package.nix
+++ b/pkgs/by-name/mi/mint-l-theme/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-l-theme";
-    rev = version;
+    tag = version;
     hash = "sha256-umY14seqUjNugN6+wzMDIGbCiis/InseDwVR85PqrGs=";
   };
 
diff --git a/pkgs/by-name/mi/mint-themes/package.nix b/pkgs/by-name/mi/mint-themes/package.nix
index c25ba30e6afc..cb7411018188 100644
--- a/pkgs/by-name/mi/mint-themes/package.nix
+++ b/pkgs/by-name/mi/mint-themes/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-themes";
-    rev = version;
+    tag = version;
     hash = "sha256-QCf0hF1qtTiYo9F/M3UiCrGj6EPSrrSWZaLXqH0UNWs=";
   };
 
diff --git a/pkgs/by-name/mi/mint-x-icons/package.nix b/pkgs/by-name/mi/mint-x-icons/package.nix
index 14e9500030d8..fb46e934005b 100644
--- a/pkgs/by-name/mi/mint-x-icons/package.nix
+++ b/pkgs/by-name/mi/mint-x-icons/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-x-icons";
-    rev = version;
+    tag = version;
     hash = "sha256-9oXMMLVjirzRVJ0Pmd/1LjeeNUgYMKaGeih3eQA7k5U=";
   };
 
diff --git a/pkgs/by-name/mi/mint-y-icons/package.nix b/pkgs/by-name/mi/mint-y-icons/package.nix
index 74734a4da865..f42b54a49393 100644
--- a/pkgs/by-name/mi/mint-y-icons/package.nix
+++ b/pkgs/by-name/mi/mint-y-icons/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-y-icons";
-    rev = version;
+    tag = version;
     hash = "sha256-xGPihqXUraJy9lDCSVjQlNxrhETEcjBTYhyFsZGJRGo=";
   };
 
diff --git a/pkgs/by-name/mi/mint/package.nix b/pkgs/by-name/mi/mint/package.nix
index 17b994f0b53e..ba54c513918c 100644
--- a/pkgs/by-name/mi/mint/package.nix
+++ b/pkgs/by-name/mi/mint/package.nix
@@ -13,7 +13,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
-    rev = version;
+    tag = version;
     hash = "sha256-cPx0/BrD2w7LlH5xO9hKlHndNmVm8jpN7cti5/eZ1m4=";
   };
 
diff --git a/pkgs/by-name/mi/mirakurun/package.nix b/pkgs/by-name/mi/mirakurun/package.nix
index 0ae8bc87856c..5a0ddc47cd4e 100644
--- a/pkgs/by-name/mi/mirakurun/package.nix
+++ b/pkgs/by-name/mi/mirakurun/package.nix
@@ -19,7 +19,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Chinachu";
     repo = "Mirakurun";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Qg+wET5H9t3Mv2Hv0iT/C85/SEaQ+BHSBL3JjMQW5+Q=";
   };
 
diff --git a/pkgs/by-name/mi/mirrorbits/package.nix b/pkgs/by-name/mi/mirrorbits/package.nix
index a5d8bc041b7f..77588a2764c0 100644
--- a/pkgs/by-name/mi/mirrorbits/package.nix
+++ b/pkgs/by-name/mi/mirrorbits/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "etix";
     repo = "mirrorbits";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ta3+Y3P74cvx09Z4rB5ObgBZtfF4grVgyeZ57yFPlGM=";
   };
 
diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index 29355753f408..f6e201ba8cdd 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-n7A6LGjcVz6LWz8fkkG5XS2WZf3FFkbidnt/S5jxy5g=";
   };
 
diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix
index 4949b4ea5e38..3d5f875bec6c 100644
--- a/pkgs/by-name/mi/mission-center/package.nix
+++ b/pkgs/by-name/mi/mission-center/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "mission-center-devs";
     repo = "mission-center";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PvHIvWyhGovlLaeHk2WMp3yRz4VxvvINzX1oqkFgVuQ=";
   };
 
diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix
index 6fe2fe4d4be5..648ad8b41c23 100644
--- a/pkgs/by-name/mi/misskey/package.nix
+++ b/pkgs/by-name/mi/misskey/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "misskey-dev";
     repo = "misskey";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-uei5Ojx39kCbS8DCjHZ5PoEAsqJ5vC6SsFqIEIJ16n8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mi/mix2nix/package.nix b/pkgs/by-name/mi/mix2nix/package.nix
index a1e25f4e0a20..d8af1d7f4f77 100644
--- a/pkgs/by-name/mi/mix2nix/package.nix
+++ b/pkgs/by-name/mi/mix2nix/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ydlr";
     repo = "mix2nix";
-    rev = version;
+    tag = version;
     hash = "sha256-hD4lpP8GPkNXuMMDOOTEmy+rOwOSCxQwR0Mjq8i4oDM=";
   };
 
diff --git a/pkgs/by-name/mk/mkcert/package.nix b/pkgs/by-name/mk/mkcert/package.nix
index b918cb4da0fd..96b3ddb92fe8 100644
--- a/pkgs/by-name/mk/mkcert/package.nix
+++ b/pkgs/by-name/mk/mkcert/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FiloSottile";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FMAXjRL+kJ/hwGmaWBy8ecON+JCMgRytfpryeLWsSVc=";
   };
 
diff --git a/pkgs/by-name/mk/mkjson/generated.nix b/pkgs/by-name/mk/mkjson/generated.nix
index 1fd4090b1d0f..5e8d3a51a813 100644
--- a/pkgs/by-name/mk/mkjson/generated.nix
+++ b/pkgs/by-name/mk/mkjson/generated.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mfussenegger";
     repo = "mkjson";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-+NDLFtsWWxHv/6XC9hJOAHPU6YED5oHqS/j5BPwNsqA=";
   };
 
diff --git a/pkgs/by-name/mk/mkp224o/package.nix b/pkgs/by-name/mk/mkp224o/package.nix
index b6d12752d9ad..f5fbc437d77f 100644
--- a/pkgs/by-name/mk/mkp224o/package.nix
+++ b/pkgs/by-name/mk/mkp224o/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cathugger";
     repo = "mkp224o";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OL3xhoxIS1OqfVp0QboENFdNH/e1Aq1R/MFFM9LNFbQ=";
   };
 
diff --git a/pkgs/by-name/mk/mktorrent/package.nix b/pkgs/by-name/mk/mktorrent/package.nix
index 4edbb1acab46..0208ff05fa36 100644
--- a/pkgs/by-name/mk/mktorrent/package.nix
+++ b/pkgs/by-name/mk/mktorrent/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pobrn";
     repo = "mktorrent";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr";
   };
 
diff --git a/pkgs/by-name/ml/mle/package.nix b/pkgs/by-name/ml/mle/package.nix
index c11fc690e55b..35363520cd85 100644
--- a/pkgs/by-name/ml/mle/package.nix
+++ b/pkgs/by-name/ml/mle/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "adsr";
     repo = "mle";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0rkk7mh6w5y1lrbdv7wmxdgl5cqzpzw0p26adazkqlfdyb6wbj9k";
   };
 
diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix
index 2d82d7ff2204..eeddfd90bbd4 100644
--- a/pkgs/by-name/ml/mlkit/package.nix
+++ b/pkgs/by-name/ml/mlkit/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "melsman";
     repo = "mlkit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0nAQHBcQgGdcWd4SFhDon7I0zi5U+YRTdGvG78tri6A=";
   };
 
diff --git a/pkgs/by-name/ml/mlvwm/package.nix b/pkgs/by-name/ml/mlvwm/package.nix
index 3ca10ed65d88..7ba2ff1c9634 100644
--- a/pkgs/by-name/ml/mlvwm/package.nix
+++ b/pkgs/by-name/ml/mlvwm/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "morgant";
     repo = "mlvwm";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ElKmi+ANuB3LPwZTMcr5HEMESjDwENbYnNIGdRP24d0=";
   };
 
diff --git a/pkgs/by-name/mm/mmake/package.nix b/pkgs/by-name/mm/mmake/package.nix
index c882a4d027dd..5d2ea4a1f643 100644
--- a/pkgs/by-name/mm/mmake/package.nix
+++ b/pkgs/by-name/mm/mmake/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tj";
     repo = "mmake";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JPsVfLIl06PJ8Nsfu7ogwrttB1G93HTKbZFqUTSV9O8=";
   };
 
diff --git a/pkgs/by-name/mm/mmdoc/package.nix b/pkgs/by-name/mm/mmdoc/package.nix
index ca10843f3095..13fc0e8b2751 100644
--- a/pkgs/by-name/mm/mmdoc/package.nix
+++ b/pkgs/by-name/mm/mmdoc/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ryantm";
     repo = "mmdoc";
-    rev = version;
+    tag = version;
     hash = "sha256-NS8i5xvCwq0pSdfxnaxnpuwmDAkfH6Tkc4N2F6aGvWY=";
   };
 
diff --git a/pkgs/by-name/mm/mmex/package.nix b/pkgs/by-name/mm/mmex/package.nix
index 449ea009b429..cb9cc934bb2c 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/mmsd-tng/package.nix b/pkgs/by-name/mm/mmsd-tng/package.nix
index ae58cd813cff..e133915e8e09 100644
--- a/pkgs/by-name/mm/mmsd-tng/package.nix
+++ b/pkgs/by-name/mm/mmsd-tng/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "kop316";
     repo = "mmsd";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-kXl+T5A8Qw0PmJ47sned8dzTIYUmaWc8w6X6BLEdLIg=";
   };
 
diff --git a/pkgs/by-name/mm/mmtc/package.nix b/pkgs/by-name/mm/mmtc/package.nix
index b7fbabd2f3f8..de30dc494058 100644
--- a/pkgs/by-name/mm/mmtc/package.nix
+++ b/pkgs/by-name/mm/mmtc/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "figsoda";
     repo = "mmtc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4=";
   };
 
diff --git a/pkgs/by-name/mm/mmutils/package.nix b/pkgs/by-name/mm/mmutils/package.nix
index 7b410dc72e17..9a5816f372f4 100644
--- a/pkgs/by-name/mm/mmutils/package.nix
+++ b/pkgs/by-name/mm/mmutils/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pockata";
     repo = "mmutils";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "08wlb278m5lr218c87yqashk7farzny51ybl5h6j60i7pbpm01ml";
   };
 
diff --git a/pkgs/by-name/mm/mmv-go/package.nix b/pkgs/by-name/mm/mmv-go/package.nix
index fdc05fdbd68c..3dd179c3b734 100644
--- a/pkgs/by-name/mm/mmv-go/package.nix
+++ b/pkgs/by-name/mm/mmv-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "itchyny";
     repo = "mmv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DNLiW0QX7WrBslwVCbvydLnE6JAcfcRALYqwsK/J5x0=";
   };
 
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/mn/mnemonicode/package.nix b/pkgs/by-name/mn/mnemonicode/package.nix
index bf8859933505..7315e0f114ee 100644
--- a/pkgs/by-name/mn/mnemonicode/package.nix
+++ b/pkgs/by-name/mn/mnemonicode/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "singpolyma";
     repo = "mnemonicode";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-bGipPvLj6ig+lMLsl/Yve8PmuA93ETvhNKoMPh0JMBM=";
   };
   installPhase = ''
diff --git a/pkgs/by-name/mo/mo/package.nix b/pkgs/by-name/mo/mo/package.nix
index beeb1f994bbd..c584c577d527 100644
--- a/pkgs/by-name/mo/mo/package.nix
+++ b/pkgs/by-name/mo/mo/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tests-always-included";
     repo = "mo";
-    rev = version;
+    tag = version;
     hash = "sha256-CFAvTpziKzSkdomvCf8PPXYbYcJxjB4EValz2RdD2b0=";
   };
 
diff --git a/pkgs/by-name/mo/moar/package.nix b/pkgs/by-name/mo/moar/package.nix
index 2a79dcb2678b..a4bfe369ea33 100644
--- a/pkgs/by-name/mo/moar/package.nix
+++ b/pkgs/by-name/mo/moar/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "walles";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-28rD8NYuvfNoBtegGXBuoa5qb3f1eYilkmE4ykIeHTU=";
   };
 
diff --git a/pkgs/by-name/mo/mob/package.nix b/pkgs/by-name/mo/mob/package.nix
index cef344cd13dd..d6c9d92ddd6e 100644
--- a/pkgs/by-name/mo/mob/package.nix
+++ b/pkgs/by-name/mo/mob/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "remotemobprogramming";
     repo = "mob";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OTKlasXswrZPfhdHD6tJt8z/e+BbgWa9LrKYhMbG/N4=";
   };
 
diff --git a/pkgs/by-name/mo/mockgen/package.nix b/pkgs/by-name/mo/mockgen/package.nix
index 403f29e54f9c..29fda7ef568e 100644
--- a/pkgs/by-name/mo/mockgen/package.nix
+++ b/pkgs/by-name/mo/mockgen/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "uber-go";
     repo = "mock";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1UlaM3IvKlplBW1pg5l+IXwirlierjDKqKsVwFt7EAw=";
   };
 
diff --git a/pkgs/by-name/mo/mod/package.nix b/pkgs/by-name/mo/mod/package.nix
index 3e631c81e2b9..20b65c64c0df 100644
--- a/pkgs/by-name/mo/mod/package.nix
+++ b/pkgs/by-name/mo/mod/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "marwan-at-work";
     repo = "mod";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-P0FE0Sl4IXH6DAETnlBwQ2CR0X0AP9Z0noW99By7mxU=";
   };
 
diff --git a/pkgs/by-name/mo/modern-cpp-kafka/package.nix b/pkgs/by-name/mo/modern-cpp-kafka/package.nix
index 6f1b37ed6452..b2dd3d425962 100644
--- a/pkgs/by-name/mo/modern-cpp-kafka/package.nix
+++ b/pkgs/by-name/mo/modern-cpp-kafka/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "modern-cpp-kafka";
     owner = "morganstanley";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7hkwM1YbveQpDRqwMZ3MXM88LTwlAT7uB8NL0t409To=";
   };
 
diff --git a/pkgs/by-name/mo/modprobed-db/package.nix b/pkgs/by-name/mo/modprobed-db/package.nix
index 12a799ff276b..266b0cdc7078 100644
--- a/pkgs/by-name/mo/modprobed-db/package.nix
+++ b/pkgs/by-name/mo/modprobed-db/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = "modprobed-db";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rMkPBRg0QluMmSCAWSvET7rS/A2aUL6H31KKoZ6NTEs=";
   };
 
diff --git a/pkgs/by-name/mo/mods/package.nix b/pkgs/by-name/mo/mods/package.nix
index cbc5d2e42032..7c9ed5415baa 100644
--- a/pkgs/by-name/mo/mods/package.nix
+++ b/pkgs/by-name/mo/mods/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "mods";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wzLYkcgUWPzghJEhYRh7HH19Rqov1RJAxdgp3AGnOTY=";
   };
 
diff --git a/pkgs/by-name/mo/modsecurity-crs/package.nix b/pkgs/by-name/mo/modsecurity-crs/package.nix
index f95bb592e459..a9f4db9b4771 100644
--- a/pkgs/by-name/mo/modsecurity-crs/package.nix
+++ b/pkgs/by-name/mo/modsecurity-crs/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "coreruleset";
     repo = "coreruleset";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WDJW4K85YdHrw9cys3LrnZUoTxc0WhiuCW6CiC1cAbk=";
   };
 
diff --git a/pkgs/by-name/mo/modsecurity_standalone/package.nix b/pkgs/by-name/mo/modsecurity_standalone/package.nix
index ffcefb8beb7b..c92467d31a31 100644
--- a/pkgs/by-name/mo/modsecurity_standalone/package.nix
+++ b/pkgs/by-name/mo/modsecurity_standalone/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "owasp-modsecurity";
     repo = "modsecurity";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hJ8wYeC83dl85bkUXGZKHpHzw9QRgtusj1/+Coxsx0k=";
   };
 
diff --git a/pkgs/by-name/mo/mojave-gtk-theme/package.nix b/pkgs/by-name/mo/mojave-gtk-theme/package.nix
index 8cf39693599f..0f9d246b8a84 100644
--- a/pkgs/by-name/mo/mojave-gtk-theme/package.nix
+++ b/pkgs/by-name/mo/mojave-gtk-theme/package.nix
@@ -28,7 +28,7 @@ let
   main_src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-uL4lO6aWiDfOQkhpTnr/iVx1fI7n/fx7WYr5jDWPfYM=";
   };
 
diff --git a/pkgs/by-name/mo/mokutil/package.nix b/pkgs/by-name/mo/mokutil/package.nix
index 3d4c8d3bd066..e6012443e00c 100644
--- a/pkgs/by-name/mo/mokutil/package.nix
+++ b/pkgs/by-name/mo/mokutil/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lcp";
     repo = "mokutil";
-    rev = version;
+    tag = version;
     sha256 = "sha256-DO3S1O0AKoI8gssnUyBTRj5lDNs6hhisc/5dTIqmbzM=";
   };
 
diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix
index 125753726091..c9fdae4cc44a 100644
--- a/pkgs/by-name/mo/mold/package.nix
+++ b/pkgs/by-name/mo/mold/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rui314";
     repo = "mold";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZGO3oT8NOOkAYTyoMUKxH3TFP4mw2z0BGdGSF2TbKaE=";
   };
 
diff --git a/pkgs/by-name/mo/mole/package.nix b/pkgs/by-name/mo/mole/package.nix
index 0665e0951c1b..335a11d377d9 100644
--- a/pkgs/by-name/mo/mole/package.nix
+++ b/pkgs/by-name/mo/mole/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "davrodpin";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JwLiuw00g2h5uqNmaqAbal0KCY6LwF2fcL2MrB1HBIc=";
   };
 
diff --git a/pkgs/by-name/mo/molot-lite/package.nix b/pkgs/by-name/mo/molot-lite/package.nix
index 5c6e4d94592e..6da1350183b7 100644
--- a/pkgs/by-name/mo/molot-lite/package.nix
+++ b/pkgs/by-name/mo/molot-lite/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "magnetophon";
     repo = "molot-lite";
-    rev = version;
+    tag = version;
     sha256 = "sha256-0tmobsdCNon6udbkbQw7+EYQKBg2oaXlHIgNEf9U3XE=";
   };
 
diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix
index 133b80438ca6..61bb9e4b3ad0 100644
--- a/pkgs/by-name/mo/mommy/package.nix
+++ b/pkgs/by-name/mo/mommy/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FWDekker";
     repo = "mommy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZxGHoBRWeGdUelykDdR51HigB85IrvNyswWjCTaOLvg=";
   };
 
diff --git a/pkgs/by-name/mo/mongoaudit/package.nix b/pkgs/by-name/mo/mongoaudit/package.nix
index 931e6f5d1ea7..c7779de52890 100644
--- a/pkgs/by-name/mo/mongoaudit/package.nix
+++ b/pkgs/by-name/mo/mongoaudit/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "stampery";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "17k4vw5d3kr961axl49ywid4cf3n7zxvm885c4lv15w7s2al1425";
   };
 
diff --git a/pkgs/by-name/mo/mongodb-tools/package.nix b/pkgs/by-name/mo/mongodb-tools/package.nix
index f45fbaf55695..24a653529399 100644
--- a/pkgs/by-name/mo/mongodb-tools/package.nix
+++ b/pkgs/by-name/mo/mongodb-tools/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-tools";
-    rev = version;
+    tag = version;
     sha256 = "sha256-9DUfPD6wrv65PLVtxAF21BZ/joWFVFk+cItt9m/1Nx8=";
   };
 
diff --git a/pkgs/by-name/mo/monitoring-plugins/package.nix b/pkgs/by-name/mo/monitoring-plugins/package.nix
index 95abd51614f7..5251f7811247 100644
--- a/pkgs/by-name/mo/monitoring-plugins/package.nix
+++ b/pkgs/by-name/mo/monitoring-plugins/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "monitoring-plugins";
     repo = "monitoring-plugins";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T37t0shhC+8k7CN/hIOxsskuuCi0LwQui8xyRTC+pjQ=";
   };
 
diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix
index 2b13dd852402..9835b2749603 100644
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "zehkira";
     repo = "monophony";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fC+XXOGBpG5pIQW1tCNtQaptBCyLM+YGgsZLjWrMoDA=";
   };
 
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/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix
index 37dc19b74b25..128b11637c4d 100644
--- a/pkgs/by-name/mo/moosefs/package.nix
+++ b/pkgs/by-name/mo/moosefs/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moosefs";
     repo = "moosefs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vCwRM6UIcT71e6u5QZzcTW6LK/VNlVG/19XxsHnn2a8=";
   };
 
diff --git a/pkgs/by-name/mo/mop/package.nix b/pkgs/by-name/mo/mop/package.nix
index 245abeac0f5d..512eb88d3811 100644
--- a/pkgs/by-name/mo/mop/package.nix
+++ b/pkgs/by-name/mo/mop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mop-tracker";
     repo = "mop";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oe8RG8E7xcp3ZqdDXYvpOVF3AfeSBFMherHD1YYFE/M=";
   };
 
diff --git a/pkgs/by-name/mo/mopac/package.nix b/pkgs/by-name/mo/mopac/package.nix
index 0de32cae6421..7f2f3f10fbad 100644
--- a/pkgs/by-name/mo/mopac/package.nix
+++ b/pkgs/by-name/mo/mopac/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openmopac";
     repo = "mopac";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-guMPXz7nQWxnmY4f+CGIAf3MBiV00GxSEdsZQ2fAjh4=";
   };
 
diff --git a/pkgs/by-name/mo/moproxy/package.nix b/pkgs/by-name/mo/moproxy/package.nix
index 32a35d159f7d..9c3dad25aa6c 100644
--- a/pkgs/by-name/mo/moproxy/package.nix
+++ b/pkgs/by-name/mo/moproxy/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sorz";
     repo = "moproxy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Rqno+cg44IWBJbKWUP6BnxzwCjuNhFo9nBF6u2jlyA4=";
   };
 
diff --git a/pkgs/by-name/mo/moq/package.nix b/pkgs/by-name/mo/moq/package.nix
index dcd5dfcd5266..b06f12372e50 100644
--- a/pkgs/by-name/mo/moq/package.nix
+++ b/pkgs/by-name/mo/moq/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "matryer";
     repo = "moq";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Yk0lGu6wHF5OBFx/yZPJr3h3DVMvyBV8pi5eSxl7hpw=";
   };
 
diff --git a/pkgs/by-name/mo/morph/package.nix b/pkgs/by-name/mo/morph/package.nix
index 4e3d9b410c73..998af1afcea2 100644
--- a/pkgs/by-name/mo/morph/package.nix
+++ b/pkgs/by-name/mo/morph/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dbcdk";
     repo = "morph";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IqWtVklzSq334cGgLx/13l329g391oDW50MZWyO6l08=";
   };
 
diff --git a/pkgs/by-name/mo/morsel/package.nix b/pkgs/by-name/mo/morsel/package.nix
index b6dabc4b4029..533be1a972c9 100644
--- a/pkgs/by-name/mo/morsel/package.nix
+++ b/pkgs/by-name/mo/morsel/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SamLee514";
     repo = "morsel";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bb+88GIyd92kHJAs25mJ9vmq0Ha2q0fdHnpTXhX2BFE=";
   };
 
diff --git a/pkgs/by-name/mo/mosquitto/package.nix b/pkgs/by-name/mo/mosquitto/package.nix
index 4a1c2f6a3f17..a09e37913ae4 100644
--- a/pkgs/by-name/mo/mosquitto/package.nix
+++ b/pkgs/by-name/mo/mosquitto/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "mosquitto";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E47NqiaMk67pNgf151DMhQ4DMyLvfzrECEQtk3jASPU=";
   };
 
diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix
index d39b685ac140..69e9c0cd1ea4 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-/a9chdeijaGKJ3nDDYYZLdS9JrZiAjC8QFQ6bjdLWT8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mo/mousai/package.nix b/pkgs/by-name/mo/mousai/package.nix
index 3a45a524d8e9..a5909a2b3079 100644
--- a/pkgs/by-name/mo/mousai/package.nix
+++ b/pkgs/by-name/mo/mousai/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SeaDve";
     repo = "Mousai";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lib2rPUTKudzbZQIGZxxxzvWNlbLkLdWtb9h7+C05QE=";
   };
 
diff --git a/pkgs/by-name/mo/mouse-actions/package.nix b/pkgs/by-name/mo/mouse-actions/package.nix
index 0af970b8bc82..bacca3545dd2 100644
--- a/pkgs/by-name/mo/mouse-actions/package.nix
+++ b/pkgs/by-name/mo/mouse-actions/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jersou";
     repo = "mouse-actions";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg=";
   };
 
diff --git a/pkgs/by-name/mo/mozc/package.nix b/pkgs/by-name/mo/mozc/package.nix
index c3a13ad557a1..25dfd42722e5 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/mo/mozjpeg/package.nix b/pkgs/by-name/mo/mozjpeg/package.nix
index 8a73827a2953..40f87ecaa510 100644
--- a/pkgs/by-name/mo/mozjpeg/package.nix
+++ b/pkgs/by-name/mo/mozjpeg/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "mozjpeg";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-k8qWtU4j3ipIHvY60ae7kdNnPvWnUa0qgacqlSIJijo=";
   };
 
diff --git a/pkgs/by-name/mp/mp3blaster/package.nix b/pkgs/by-name/mp/mp3blaster/package.nix
index 0809970ade88..3b0fda311c0d 100644
--- a/pkgs/by-name/mp/mp3blaster/package.nix
+++ b/pkgs/by-name/mp/mp3blaster/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stragulus";
     repo = "mp3blaster";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs";
   };
 
diff --git a/pkgs/by-name/mp/mp3cat/package.nix b/pkgs/by-name/mp/mp3cat/package.nix
index 3ea25a67912e..4f579d29be05 100644
--- a/pkgs/by-name/mp/mp3cat/package.nix
+++ b/pkgs/by-name/mp/mp3cat/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tomclegg";
     repo = "mp3cat";
-    rev = version;
+    tag = version;
     sha256 = "0n6hjg2wgd06m561zc3ib5w2m3pwpf74njv2b2w4sqqh5md2ymfr";
   };
 
diff --git a/pkgs/by-name/mp/mp3fs/package.nix b/pkgs/by-name/mp/mp3fs/package.nix
index 0e9ee3fd0bac..ee8a4ab770b1 100644
--- a/pkgs/by-name/mp/mp3fs/package.nix
+++ b/pkgs/by-name/mp/mp3fs/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "khenriks";
     repo = "mp3fs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dF+DfkNKvYOucS6KjYR1MMGxayM+1HVS8mbmaavmgKM=";
   };
 
diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix
index 589e27d4f32b..fc8bb5c25994 100644
--- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix
+++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = "mpd-discord-rpc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RuXH0RaR0VVN7tja0pcc8QH826/JzH4tyVVCbrK7ldI=";
   };
 
diff --git a/pkgs/by-name/mp/mpd-mpris/package.nix b/pkgs/by-name/mp/mpd-mpris/package.nix
index 8d7096eed503..e6e21231f2b1 100644
--- a/pkgs/by-name/mp/mpd-mpris/package.nix
+++ b/pkgs/by-name/mp/mpd-mpris/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "natsukagami";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QxPkGWpCWiyEbChH9SHeD+SiV8k0c/G7MG/azksP3xU=";
   };
 
diff --git a/pkgs/by-name/mp/mpd-notification/package.nix b/pkgs/by-name/mp/mpd-notification/package.nix
index f488d46f4e5b..8ccf733013e2 100644
--- a/pkgs/by-name/mp/mpd-notification/package.nix
+++ b/pkgs/by-name/mp/mpd-notification/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eworm-de";
     repo = "mpd-notification";
-    rev = version;
+    tag = version;
     hash = "sha256-8iBG1IdbERB2gOALvVBNJ3/hhiou3D/azSRkRD+u9O8=";
   };
 
diff --git a/pkgs/by-name/mp/mpdas/package.nix b/pkgs/by-name/mp/mpdas/package.nix
index c1e9c88bdb5d..36539464f4f2 100644
--- a/pkgs/by-name/mp/mpdas/package.nix
+++ b/pkgs/by-name/mp/mpdas/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hrkfdn";
     repo = "mpdas";
-    rev = version;
+    tag = version;
     sha256 = "0fcqc4w6iwbi1n3cllcgj0k61zffhqkbr8668myxap21m35x8y1r";
   };
 
diff --git a/pkgs/by-name/mp/mpdris2/package.nix b/pkgs/by-name/mp/mpdris2/package.nix
index c9f6578efbca..a03df316446d 100644
--- a/pkgs/by-name/mp/mpdris2/package.nix
+++ b/pkgs/by-name/mp/mpdris2/package.nix
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "eonpatapon";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-1Y6K3z8afUXeKhZzeiaEF3yqU0Ef7qdAj9vAkRlD2p8=";
   };
 
diff --git a/pkgs/by-name/mp/mpifileutils/package.nix b/pkgs/by-name/mp/mpifileutils/package.nix
index 6011e6d26d3b..9698d705891c 100644
--- a/pkgs/by-name/mp/mpifileutils/package.nix
+++ b/pkgs/by-name/mp/mpifileutils/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hpc";
     repo = "mpifileutils";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WnjStOLWP/VsZyl2wPqR1Q+YqlJQRCQ4R50uOyqkWuM=";
   };
 
diff --git a/pkgs/by-name/mp/mpris-notifier/package.nix b/pkgs/by-name/mp/mpris-notifier/package.nix
index 6e52b2ecaa37..2d799895b608 100644
--- a/pkgs/by-name/mp/mpris-notifier/package.nix
+++ b/pkgs/by-name/mp/mpris-notifier/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "l1na-forever";
     repo = "mpris-notifier";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SD37JFbfg05GemtRNQKvXkXPAyszItSW9wClzudrTS8=";
   };
 
diff --git a/pkgs/by-name/mp/mpris-scrobbler/package.nix b/pkgs/by-name/mp/mpris-scrobbler/package.nix
index 766c27d2d940..ebc8c78fb984 100644
--- a/pkgs/by-name/mp/mpris-scrobbler/package.nix
+++ b/pkgs/by-name/mp/mpris-scrobbler/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mariusor";
     repo = "mpris-scrobbler";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qjd/8Ro4wERvp8RDxyZiqWqVKwA0CX1LaoZAquw9asA=";
   };
 
diff --git a/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix b/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
index 1c46eae6d6e0..bc833bab82b1 100644
--- a/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
+++ b/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iwalton3";
     repo = "default-shader-pack";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BM2GvmUoWQUUMH464YIIqu5A1t1B+otbJxAGFbySuq8=";
   };
 
diff --git a/pkgs/by-name/mp/mpv-subs-popout/package.nix b/pkgs/by-name/mp/mpv-subs-popout/package.nix
index 9f1d5d11fdea..2805d69844cc 100644
--- a/pkgs/by-name/mp/mpv-subs-popout/package.nix
+++ b/pkgs/by-name/mp/mpv-subs-popout/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sdaqo";
     repo = "mpv-subs-popout";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Z8IWiYKitkbEFdjca5G6P0I6j4Fg2fIHco6fD90UoBw=";
   };
 
diff --git a/pkgs/by-name/mp/mpvpaper/package.nix b/pkgs/by-name/mp/mpvpaper/package.nix
index 91d6d33634bd..d13bc2652590 100644
--- a/pkgs/by-name/mp/mpvpaper/package.nix
+++ b/pkgs/by-name/mp/mpvpaper/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GhostNaN";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-uBitJM2Z5RFH4nfgdJ6ZbqkcMumu+K+3f6S49G7nEx8=";
   };
 
diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix
index 0d8e05f9b4b0..2ac675d81868 100644
--- a/pkgs/by-name/mq/mqtt-explorer/package.nix
+++ b/pkgs/by-name/mq/mqtt-explorer/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thomasnordquist";
     repo = "MQTT-Explorer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oFS4RnuWQoicPemZbPBAp8yQjRbhAyo/jiaw8V0MBAo=";
   };
 
diff --git a/pkgs/by-name/mr/mrbayes/package.nix b/pkgs/by-name/mr/mrbayes/package.nix
index b8c899d0bd3e..7a24a4d7d980 100644
--- a/pkgs/by-name/mr/mrbayes/package.nix
+++ b/pkgs/by-name/mr/mrbayes/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NBISweden";
     repo = "MrBayes";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pkkxZ6YHRn/I1SJpT9A+EK4S5hWGmFdcDBJS0zh5mLA=";
   };
 
diff --git a/pkgs/by-name/mr/mruby/package.nix b/pkgs/by-name/mr/mruby/package.nix
index c0d78848697a..d73f3dd69bdc 100644
--- a/pkgs/by-name/mr/mruby/package.nix
+++ b/pkgs/by-name/mr/mruby/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mruby";
     repo = "mruby";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-rCoEC1ioX6bOocPoPi+Lsn4PM8gY0DjKja1/MJvJ1n8=";
   };
 
diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
index a73e70468cd7..f9171466ba2d 100644
--- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
+++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
@@ -19,7 +19,7 @@ buildDotnetModule (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "KirillOsenkov";
     repo = "MSBuildStructuredLog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-09+Jo5nSNOFX7jTzMhetHHjTJdxlEZH4JWzv84stUDE=";
   };
 
diff --git a/pkgs/by-name/ms/mscompress/package.nix b/pkgs/by-name/ms/mscompress/package.nix
index c6974027cafb..a4ef1e44dc61 100644
--- a/pkgs/by-name/ms/mscompress/package.nix
+++ b/pkgs/by-name/ms/mscompress/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "stapelberg";
     repo = "mscompress";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Urq8CzVfO9tdEUrEya+bUzoNjZQ2TO7OB+h2MTAGwEI=";
   };
 
diff --git a/pkgs/by-name/ms/msfpc/package.nix b/pkgs/by-name/ms/msfpc/package.nix
index 5f4b614ba4c0..4995b92805fe 100644
--- a/pkgs/by-name/ms/msfpc/package.nix
+++ b/pkgs/by-name/ms/msfpc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "g0tmi1k";
     repo = "msfpc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "UIdE0oSaNu16pf+M96x8AnNju88hdzokv86wm8uBYDQ=";
   };
 
diff --git a/pkgs/by-name/ms/msgpack-tools/package.nix b/pkgs/by-name/ms/msgpack-tools/package.nix
index e62af58ae1c1..943503f2d374 100644
--- a/pkgs/by-name/ms/msgpack-tools/package.nix
+++ b/pkgs/by-name/ms/msgpack-tools/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ludocode";
     repo = "msgpack-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5";
   };
 
diff --git a/pkgs/by-name/ms/msgpuck/package.nix b/pkgs/by-name/ms/msgpuck/package.nix
index 41fdca7052de..dc9f466818e9 100644
--- a/pkgs/by-name/ms/msgpuck/package.nix
+++ b/pkgs/by-name/ms/msgpuck/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rtsisyk";
     repo = "msgpuck";
-    rev = version;
+    tag = version;
     sha256 = "0cjq86kncn3lv65vig9cqkqqv2p296ymcjjbviw0j1s85cfflps0";
   };
 
diff --git a/pkgs/by-name/ms/mstore/package.nix b/pkgs/by-name/ms/mstore/package.nix
index 725a0a5d3cac..8157ebcfe458 100644
--- a/pkgs/by-name/ms/mstore/package.nix
+++ b/pkgs/by-name/ms/mstore/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grimme-lab";
     repo = "mstore";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zfrxdrZ1Um52qTRNGJoqZNQuHhK3xM/mKfk0aBLrcjw=";
   };
 
diff --git a/pkgs/by-name/ms/mstpd/package.nix b/pkgs/by-name/ms/mstpd/package.nix
index 1dd6c8600653..63cd911d7c0d 100644
--- a/pkgs/by-name/ms/mstpd/package.nix
+++ b/pkgs/by-name/ms/mstpd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mstpd";
     repo = "mstpd";
-    rev = version;
+    tag = version;
     sha256 = "1xkfydxljdnj49p5r3mirk4k146428b6imfc9bkfps9yjn64mkgb";
   };
 
diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix
index 70077d7783c9..bbd75f9c3dc9 100644
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jaqx0r";
     repo = "mtail";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B/to05/qORplhNyz0s7t/WgpmOJ6UZoKnmJfqaf6Htc=";
   };
 
diff --git a/pkgs/by-name/mt/mtm/package.nix b/pkgs/by-name/mt/mtm/package.nix
index 52ccbde12e84..36b1337463ab 100644
--- a/pkgs/by-name/mt/mtm/package.nix
+++ b/pkgs/by-name/mt/mtm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "deadpixi";
     repo = "mtm";
-    rev = version;
+    tag = version;
     sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv";
   };
 
diff --git a/pkgs/by-name/mt/mtr-exporter/package.nix b/pkgs/by-name/mt/mtr-exporter/package.nix
index 3bc1d67f2f5a..1a63d0c0e43f 100644
--- a/pkgs/by-name/mt/mtr-exporter/package.nix
+++ b/pkgs/by-name/mt/mtr-exporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mgumz";
     repo = "mtr-exporter";
-    rev = version;
+    tag = version;
     hash = "sha256-+myQg27TGclU+SfU8oO+DvXYqc/8sWE2zRK6fL2DhwM=";
   };
 
diff --git a/pkgs/by-name/mt/mtxclient/package.nix b/pkgs/by-name/mt/mtxclient/package.nix
index 2d47a07b2645..e4bb29372084 100644
--- a/pkgs/by-name/mt/mtxclient/package.nix
+++ b/pkgs/by-name/mt/mtxclient/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nheko-Reborn";
     repo = "mtxclient";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-luWcbYCv5OM3aidxiO7glqD+VYnCZMElZYaPKbtvMYI=";
   };
 
diff --git a/pkgs/by-name/mu/mu/package.nix b/pkgs/by-name/mu/mu/package.nix
index 7a3f2266d5ac..7c2f484947a8 100644
--- a/pkgs/by-name/mu/mu/package.nix
+++ b/pkgs/by-name/mu/mu/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "djcb";
     repo = "mu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o6K1xHv6dvzv1oRRiAiSXAqTaC0GcPDQ+ymh5kmH98k=";
   };
 
diff --git a/pkgs/by-name/mu/mucommander/package.nix b/pkgs/by-name/mu/mucommander/package.nix
index 5116b5e27641..6797ac71ddaa 100644
--- a/pkgs/by-name/mu/mucommander/package.nix
+++ b/pkgs/by-name/mu/mucommander/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mucommander";
     repo = "mucommander";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-J1paBXlAGe2eKMg4wvaXTzMIiSMFIJ1XIAaKrfOwQLc=";
   };
 
diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix
index ad69ddb22310..379f7099fd51 100644
--- a/pkgs/by-name/mu/muffet/package.nix
+++ b/pkgs/by-name/mu/muffet/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "raviqqe";
     repo = "muffet";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vpckg0zx8RNR7dAKjdlSHyevn7kDslrysah8jCLSaBw=";
   };
 
diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix
index e781647b9ad7..48471be7e47e 100644
--- a/pkgs/by-name/mu/muffin/package.nix
+++ b/pkgs/by-name/mu/muffin/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-cGC1yGft3uEqefm2DvZrMaROoZKYd6LNY0IJ+58f6vs=";
   };
 
diff --git a/pkgs/by-name/mu/multicharge/package.nix b/pkgs/by-name/mu/multicharge/package.nix
index bd06e5bdc605..c26b038e51d2 100644
--- a/pkgs/by-name/mu/multicharge/package.nix
+++ b/pkgs/by-name/mu/multicharge/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grimme-lab";
     repo = "multicharge";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8qwM3dpvFoL2WrMWNf14zYtRap0ijdfZ95XaTlkHhqQ=";
   };
 
diff --git a/pkgs/by-name/mu/multilockscreen/package.nix b/pkgs/by-name/mu/multilockscreen/package.nix
index ba3f74931018..b7f58ab09791 100644
--- a/pkgs/by-name/mu/multilockscreen/package.nix
+++ b/pkgs/by-name/mu/multilockscreen/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeffmhubbard";
     repo = "multilockscreen";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1bfpbazvhaz9x356nsghz0czysh9b75g79cd9s35v0x0rrzdr9qj";
   };
 
diff --git a/pkgs/by-name/mu/multimarkdown/package.nix b/pkgs/by-name/mu/multimarkdown/package.nix
index 20b53464d92c..31a2cdbce21b 100644
--- a/pkgs/by-name/mu/multimarkdown/package.nix
+++ b/pkgs/by-name/mu/multimarkdown/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fletcher";
     repo = "MultiMarkdown-6";
-    rev = version;
+    tag = version;
     hash = "sha256-emJbY0wucoc/GdjlILoeqjwuwuPpTjXTqZN0gUKOyLg=";
   };
 
diff --git a/pkgs/by-name/mu/multimon-ng/package.nix b/pkgs/by-name/mu/multimon-ng/package.nix
index 9f8dcc8dfb65..fee8e00734da 100644
--- a/pkgs/by-name/mu/multimon-ng/package.nix
+++ b/pkgs/by-name/mu/multimon-ng/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EliasOenal";
     repo = "multimon-ng";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/2NHUlAojDamNq/EVs8hoBYVikPLAFFFu/2syG4Xo4U=";
   };
 
diff --git a/pkgs/by-name/mu/multiplex/package.nix b/pkgs/by-name/mu/multiplex/package.nix
index 391f6396a6fb..e0f2154f460b 100644
--- a/pkgs/by-name/mu/multiplex/package.nix
+++ b/pkgs/by-name/mu/multiplex/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pojntfx";
     repo = "multiplex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+KvFBzoIYmSbuazstJae8lC0xdPtXLhFWawlc+iGGoU=";
   };
 
diff --git a/pkgs/by-name/mu/multirun/package.nix b/pkgs/by-name/mu/multirun/package.nix
index 1ecc3c8f9e9e..42b768212890 100644
--- a/pkgs/by-name/mu/multirun/package.nix
+++ b/pkgs/by-name/mu/multirun/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nicolas-van";
     repo = "multirun";
-    rev = version;
+    tag = version;
     hash = "sha256-I95nxZD65tHiok4MzsGG7gyaxPHbqQLuRWdHUPNhLu8=";
   };
 
diff --git a/pkgs/by-name/mu/multitail/package.nix b/pkgs/by-name/mu/multitail/package.nix
index 6338b0c7be54..f678e1d0dd31 100644
--- a/pkgs/by-name/mu/multitail/package.nix
+++ b/pkgs/by-name/mu/multitail/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "folkertvanheusden";
     repo = "multitail";
-    rev = version;
+    tag = version;
     hash = "sha256-c9NlQLgHngNBbADZ6/legWFaKHJAQR/LZIfh8bJoc4Y=";
   };
 
diff --git a/pkgs/by-name/mu/multus-cni/package.nix b/pkgs/by-name/mu/multus-cni/package.nix
index 6db149fca3f7..40fea0e585ab 100644
--- a/pkgs/by-name/mu/multus-cni/package.nix
+++ b/pkgs/by-name/mu/multus-cni/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "k8snetworkplumbingwg";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Q6ACXOv1E3Ouki4ksdlUZFbWcDgo9xbCiTfEiVG5l18=";
   };
 
diff --git a/pkgs/by-name/mu/munin/package.nix b/pkgs/by-name/mu/munin/package.nix
index 637d95af89f7..25d7f668eb9b 100644
--- a/pkgs/by-name/mu/munin/package.nix
+++ b/pkgs/by-name/mu/munin/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "munin-monitoring";
     repo = "munin";
-    rev = version;
+    tag = version;
     sha256 = "sha256-9PfIzUObm3Nu2k2TFjbQ3cqIDkPz07ZUczEcfm3bpDc=";
   };
 
diff --git a/pkgs/by-name/mu/muparser/package.nix b/pkgs/by-name/mu/muparser/package.nix
index 1d2ff0b6f8b4..b74cd15726a9 100644
--- a/pkgs/by-name/mu/muparser/package.nix
+++ b/pkgs/by-name/mu/muparser/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "beltoforion";
     repo = "muparser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CE3xgJr2RNsNMrj8Cf6xd/pD9M1OlHEclTW6xZV5X30=";
   };
 
diff --git a/pkgs/by-name/mu/muparserx/package.nix b/pkgs/by-name/mu/muparserx/package.nix
index 4c1071eb2c68..d69d5c5ec8b9 100644
--- a/pkgs/by-name/mu/muparserx/package.nix
+++ b/pkgs/by-name/mu/muparserx/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "beltoforion";
     repo = "muparserx";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rekPXmncNdVX6LvPQP1M2Pzs3pyiCCcLPLnPFiyWJ4s=";
   };
 
diff --git a/pkgs/by-name/mu/murex/package.nix b/pkgs/by-name/mu/murex/package.nix
index 9dc5478f7504..3750096d9a55 100644
--- a/pkgs/by-name/mu/murex/package.nix
+++ b/pkgs/by-name/mu/murex/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lmorg";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-czo2JCUwzENPuBBTaO4RYo7WRvepacaKElAj9DznFY0=";
   };
 
diff --git a/pkgs/by-name/mu/muscle/package.nix b/pkgs/by-name/mu/muscle/package.nix
index ef63da97cf76..b32818314ab2 100644
--- a/pkgs/by-name/mu/muscle/package.nix
+++ b/pkgs/by-name/mu/muscle/package.nix
@@ -11,7 +11,7 @@ gccStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rcedgar";
     repo = "muscle";
-    rev = version;
+    tag = version;
     hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk=";
   };
 
diff --git a/pkgs/by-name/mu/musikcube/package.nix b/pkgs/by-name/mu/musikcube/package.nix
index 8c59e9833985..d984ea7695fa 100644
--- a/pkgs/by-name/mu/musikcube/package.nix
+++ b/pkgs/by-name/mu/musikcube/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "clangen";
     repo = "musikcube";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha512-ibpSrzbn2yGNgWnjAh4sG9ZRFImxjE2sq6tu9k0w1QAAr/OWSTwtaIuK71ClT6yt4HKyRk1KSaXa+/IzOHI6Kg==";
   };
 
diff --git a/pkgs/by-name/mu/musl-fts/package.nix b/pkgs/by-name/mu/musl-fts/package.nix
index 2e27e29a6af5..fb0ac7b2569d 100644
--- a/pkgs/by-name/mu/musl-fts/package.nix
+++ b/pkgs/by-name/mu/musl-fts/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "musl-fts";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "Azw5qrz6OKDcpYydE6jXzVxSM5A8oYWAztrHr+O/DOE=";
   };
 
diff --git a/pkgs/by-name/mu/musl-obstack/package.nix b/pkgs/by-name/mu/musl-obstack/package.nix
index edac988c36db..08bd66ce5ada 100644
--- a/pkgs/by-name/mu/musl-obstack/package.nix
+++ b/pkgs/by-name/mu/musl-obstack/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "musl-obstack";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oydS7FubUniMHAUWfg84OH9+CZ0JCrTXy7jzwOyJzC8=";
   };
 
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/mu/mustache-hpp/package.nix b/pkgs/by-name/mu/mustache-hpp/package.nix
index 69e533a2c7d9..02203212d480 100644
--- a/pkgs/by-name/mu/mustache-hpp/package.nix
+++ b/pkgs/by-name/mu/mustache-hpp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kainjow";
     repo = "Mustache";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb";
   };
 
diff --git a/pkgs/by-name/mu/mustache-spec/package.nix b/pkgs/by-name/mu/mustache-spec/package.nix
index ab83abc0e2ff..2267f1168b9c 100644
--- a/pkgs/by-name/mu/mustache-spec/package.nix
+++ b/pkgs/by-name/mu/mustache-spec/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mustache";
     repo = "mustache";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "03xrfyjzm5ss6zkdlpl9ypwzcglspcdcnr3f94vj1rjfqm2rxcjw";
   };
 
diff --git a/pkgs/by-name/mu/mutagen-compose/package.nix b/pkgs/by-name/mu/mutagen-compose/package.nix
index 5d412f3d3c09..d33d933ac40e 100644
--- a/pkgs/by-name/mu/mutagen-compose/package.nix
+++ b/pkgs/by-name/mu/mutagen-compose/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mutagen-io";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MK/icz/d7wymUm0m3aq4bBR1ZmxFngPVp+iPC9ufluU=";
   };
 
diff --git a/pkgs/by-name/mu/mutagen/package.nix b/pkgs/by-name/mu/mutagen/package.nix
index 93d581bdf0f8..5ebe6b02c64c 100644
--- a/pkgs/by-name/mu/mutagen/package.nix
+++ b/pkgs/by-name/mu/mutagen/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mutagen-io";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/UigWQMk+VDMGna/ixctU8MR7VNPpOTOGNUtuYx8DS0=";
   };
 
diff --git a/pkgs/by-name/mu/mutt-wizard/package.nix b/pkgs/by-name/mu/mutt-wizard/package.nix
index cf655f0dd1d0..a62e5d8b02ae 100644
--- a/pkgs/by-name/mu/mutt-wizard/package.nix
+++ b/pkgs/by-name/mu/mutt-wizard/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LukeSmithxyz";
     repo = "mutt-wizard";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1/+awwoAqD8Xm3hULcbpeTaLOHVuYRA4PPr3cq5Gy20=";
   };
 
diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix
index 7e347bafcab7..2e5b314416f6 100644
--- a/pkgs/by-name/mv/mvnd/package.nix
+++ b/pkgs/by-name/mv/mvnd/package.nix
@@ -28,7 +28,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "maven-mvnd";
-    rev = version;
+    tag = version;
     sha256 = "sha256-c1jD7m4cOdPWQEoaUMcNap2zvvX7H9VaWQv8JSgAnRU=";
   };
 
diff --git a/pkgs/by-name/mx/mxt-app/package.nix b/pkgs/by-name/mx/mxt-app/package.nix
index 2ad09e7bd659..144214a2e925 100644
--- a/pkgs/by-name/mx/mxt-app/package.nix
+++ b/pkgs/by-name/mx/mxt-app/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "atmel-maxtouch";
     repo = "mxt-app";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mcFkXUC7Qtajg5IPy5PAqlyvY44HDM8JL+pkkBYC0JA=";
   };
 
diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix
index f947e2c1f7ad..913219c77926 100644
--- a/pkgs/by-name/my/mycelium/package.nix
+++ b/pkgs/by-name/my/mycelium/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "threefoldtech";
     repo = "mycelium";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PbEoM+AnZTuo9xtwcDcTH9FZAzPzfBhX41+zVVTdgRo=";
   };
 
diff --git a/pkgs/by-name/my/mycorrhiza/package.nix b/pkgs/by-name/my/mycorrhiza/package.nix
index 9ffd22c450e6..43e861e26ba2 100644
--- a/pkgs/by-name/my/mycorrhiza/package.nix
+++ b/pkgs/by-name/my/mycorrhiza/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bouncepaw";
     repo = "mycorrhiza";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Cgf2YtAatfKWxhe4xAqNRB4ktsGs3ONi5XqbjcZwzTw=";
   };
 
diff --git a/pkgs/by-name/my/mysqltuner/package.nix b/pkgs/by-name/my/mysqltuner/package.nix
index 0b67c9066dff..e8caa9f1fb8a 100644
--- a/pkgs/by-name/my/mysqltuner/package.nix
+++ b/pkgs/by-name/my/mysqltuner/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "major";
     repo = "MySQLTuner-perl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JIO/auY8E6at9OCIqgKbBz9OhOeZMtQvUoUYPMEVtCg=";
   };
 
diff --git a/pkgs/by-name/my/myxer/package.nix b/pkgs/by-name/my/myxer/package.nix
index d1212b43900e..80a87079446d 100644
--- a/pkgs/by-name/my/myxer/package.nix
+++ b/pkgs/by-name/my/myxer/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Aurailus";
     repo = "myxer";
-    rev = version;
+    tag = version;
     hash = "sha256-c5SHjnhWLp0jMdmDlupMTA0hWphub5DFY1vOI6NW8E0=";
   };
 
diff --git a/pkgs/by-name/n2/n2n/package.nix b/pkgs/by-name/n2/n2n/package.nix
index 55a7bda111b7..f538e7254a1f 100644
--- a/pkgs/by-name/n2/n2n/package.nix
+++ b/pkgs/by-name/n2/n2n/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ntop";
     repo = "n2n";
-    rev = version;
+    tag = version;
     hash = "sha256-OXmcc6r+fTHs/tDNF3akSsynB/bVRKB6Fl5oYxmu+E0=";
   };
 
diff --git a/pkgs/by-name/na/naev/package.nix b/pkgs/by-name/na/naev/package.nix
index e94414ba8bc2..3e1620c84e02 100644
--- a/pkgs/by-name/na/naev/package.nix
+++ b/pkgs/by-name/na/naev/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "naev";
     repo = "naev";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vdPkACgLGSTb9E/HZR5KoXn/fro0iHV7hX9kJim1j/M=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/na/nahid-fonts/package.nix b/pkgs/by-name/na/nahid-fonts/package.nix
index b36b78d752e1..c7bfd8e710b3 100644
--- a/pkgs/by-name/na/nahid-fonts/package.nix
+++ b/pkgs/by-name/na/nahid-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "nahid-font";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-r8/W0/pJV6OX954spIITvW7M6lIbZRpbsvEHErnXglg=";
   };
 
diff --git a/pkgs/by-name/na/nali/package.nix b/pkgs/by-name/na/nali/package.nix
index d21bb3d1a19c..7e46b0bfcae0 100644
--- a/pkgs/by-name/na/nali/package.nix
+++ b/pkgs/by-name/na/nali/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zu1k";
     repo = "nali";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5AI8TAKYFqjgLVKob9imrf7yVmXmAPq/zHh1bDfC5r0=";
   };
 
diff --git a/pkgs/by-name/na/namaka/package.nix b/pkgs/by-name/na/namaka/package.nix
index 4fc7b64d756d..60dd64c83343 100644
--- a/pkgs/by-name/na/namaka/package.nix
+++ b/pkgs/by-name/na/namaka/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "namaka";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1ka+5B90UAt7D5kkT9dOExGLJjtLM8dqLeBdFRoeuWg=";
   };
 
diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index 8b03013e862e..05a04b8c8609 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ToAZacID91HxzsPRBKk+b8d9RHYmeDHjT0fQxOjXgRo=";
   };
 
diff --git a/pkgs/by-name/na/nanodbc/package.nix b/pkgs/by-name/na/nanodbc/package.nix
index 18691cb6fe35..53989c7cc504 100644
--- a/pkgs/by-name/na/nanodbc/package.nix
+++ b/pkgs/by-name/na/nanodbc/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nanodbc";
     repo = "nanodbc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dVUOwA7LfLqcQq2nc6OAha0krmgTy5RUHupBVrNdo4g=";
   };
 
diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix
index a67679dffd47..ee35276a1fbd 100644
--- a/pkgs/by-name/na/nanomq/package.nix
+++ b/pkgs/by-name/na/nanomq/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "emqx";
     repo = "nanomq";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-aB1gEzo2dX8NY+e0Dq4ELgkUpL/NtvvuY/l539BPIng=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/na/nanomsg/package.nix b/pkgs/by-name/na/nanomsg/package.nix
index f1487c0c0955..7e6c3ff724b9 100644
--- a/pkgs/by-name/na/nanomsg/package.nix
+++ b/pkgs/by-name/na/nanomsg/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nanomsg";
     repo = "nanomsg";
-    rev = version;
+    tag = version;
     sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64";
   };
 
diff --git a/pkgs/by-name/na/nanovna-qt/package.nix b/pkgs/by-name/na/nanovna-qt/package.nix
index 370e3d06fd5c..7c59884c2da1 100644
--- a/pkgs/by-name/na/nanovna-qt/package.nix
+++ b/pkgs/by-name/na/nanovna-qt/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nanovna-v2";
     repo = "NanoVNA-QT";
-    rev = version;
+    tag = version;
     hash = "sha256-0nRpjLglCog9e4bSkaNSwjrwmLwut3Ykr3AaYZCaMEs=";
   };
 
diff --git a/pkgs/by-name/na/nap/package.nix b/pkgs/by-name/na/nap/package.nix
index 68d344d3a33f..60ec0c194c0b 100644
--- a/pkgs/by-name/na/nap/package.nix
+++ b/pkgs/by-name/na/nap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maaslalani";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0b3sz8zp1nwcjl02b3lli5yjc7vfay1ig6fs8bgxwz22imfx076p";
   };
 
diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix
index 591aafe787e6..d9c11c14d213 100644
--- a/pkgs/by-name/na/naps2/package.nix
+++ b/pkgs/by-name/na/naps2/package.nix
@@ -18,7 +18,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "cyanfish";
     repo = "naps2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/qSfxGHcCSoNp516LFYWgEL4csf8EKgtSffBt1C02uE=";
   };
 
diff --git a/pkgs/by-name/na/nar-serve/package.nix b/pkgs/by-name/na/nar-serve/package.nix
index 84e91c2ae2bf..007def13270b 100644
--- a/pkgs/by-name/na/nar-serve/package.nix
+++ b/pkgs/by-name/na/nar-serve/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "nar-serve";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8QuMS00EutmqzAIPxyJEPxM8EHiWlSKs6E2Htoh3Kes=";
   };
 
diff --git a/pkgs/by-name/na/narrowlink/package.nix b/pkgs/by-name/na/narrowlink/package.nix
index 66168b2e7cd8..e936f667a667 100644
--- a/pkgs/by-name/na/narrowlink/package.nix
+++ b/pkgs/by-name/na/narrowlink/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "narrowlink";
     repo = "narrowlink";
-    rev = version;
+    tag = version;
     hash = "sha256-O66eihqSxwvrUfJj+VMrs7Vfndz2LPKQEnH7BDljvUg=";
   };
 
diff --git a/pkgs/by-name/na/nasc/package.nix b/pkgs/by-name/na/nasc/package.nix
index 57afe669e12d..b3c2bc742027 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 = pname;
-    rev = version;
+    tag = version;
     sha256 = "02b9a59a9fzsb6nn3ycwwbcbv04qfzm6x7csq2addpzx5wak6dd8";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/na/natls/package.nix b/pkgs/by-name/na/natls/package.nix
index eb0165a542ee..388f86d4a164 100644
--- a/pkgs/by-name/na/natls/package.nix
+++ b/pkgs/by-name/na/natls/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "willdoescode";
     repo = "nat";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4x92r6V9AvEO88gFofPTUt+mS7ZhmptDn/8O4pizSRg=";
   };
 
diff --git a/pkgs/by-name/na/nats-kafka/package.nix b/pkgs/by-name/na/nats-kafka/package.nix
index df63a9af602c..00cc20b76e07 100644
--- a/pkgs/by-name/na/nats-kafka/package.nix
+++ b/pkgs/by-name/na/nats-kafka/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RboNlKpD+4mOx6iL6JpguR90y6Ux1x0twFcazIPj0w0=";
   };
 
diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix
index 0531e6a0a795..4b6d49e64883 100644
--- a/pkgs/by-name/na/nats-server/package.nix
+++ b/pkgs/by-name/na/nats-server/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9t5DOLZU2VcEBggirf+aLzwzsDBB+uGGXlBkIKP3HkE=";
   };
 
diff --git a/pkgs/by-name/na/nats-streaming-server/package.nix b/pkgs/by-name/na/nats-streaming-server/package.nix
index 7431132ae47a..b6a9d873fee1 100644
--- a/pkgs/by-name/na/nats-streaming-server/package.nix
+++ b/pkgs/by-name/na/nats-streaming-server/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.25.6";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "nats-io";
     repo = pname;
     sha256 = "sha256-i5fNxeJQXiyy+9NOGT1X68u9Pztxvnnba64rxIgjbZc=";
diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix
index bcba1d8a6ad0..aae7ff554f39 100644
--- a/pkgs/by-name/na/navidrome/package.nix
+++ b/pkgs/by-name/na/navidrome/package.nix
@@ -23,7 +23,7 @@ buildGo123Module rec {
   src = fetchFromGitHub {
     owner = "navidrome";
     repo = "navidrome";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BkgHUX2kQ7OMnb9vOIwsQ9eNcqCzekz2IVMtG0IMUaA=";
   };
 
diff --git a/pkgs/by-name/na/navilu-font/package.nix b/pkgs/by-name/na/navilu-font/package.nix
index 4d9ba79067e9..331ffbc1f3be 100644
--- a/pkgs/by-name/na/navilu-font/package.nix
+++ b/pkgs/by-name/na/navilu-font/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aravindavk";
     repo = "Navilu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1vm6n04siaa0zf6jzp5s2gzgr2qxs3vdnmcmg4dcy07py2kd2fla";
   };
 
diff --git a/pkgs/by-name/na/nawk/package.nix b/pkgs/by-name/na/nawk/package.nix
index 28a72480722f..85977177c01b 100644
--- a/pkgs/by-name/na/nawk/package.nix
+++ b/pkgs/by-name/na/nawk/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "onetrueawk";
     repo = "awk";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-zRGMqMPkP801nZE/pG/NwsiOvv6dTQBcPtfTJCh1eiQ=";
   };
 
diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix
index 6b5455b2e2ba..67bca0b17c63 100644
--- a/pkgs/by-name/nb/nb/package.nix
+++ b/pkgs/by-name/nb/nb/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xwmx";
     repo = "nb";
-    rev = version;
+    tag = version;
     hash = "sha256-RX3DEjk+/tivTyv0+j3lZAKYgca4Zq9zQ+P1a/RXj2I=";
   };
 
diff --git a/pkgs/by-name/nb/nbfc-linux/package.nix b/pkgs/by-name/nb/nbfc-linux/package.nix
index 2ae265b615db..ab78f5403726 100644
--- a/pkgs/by-name/nb/nbfc-linux/package.nix
+++ b/pkgs/by-name/nb/nbfc-linux/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nbfc-linux";
     repo = "nbfc-linux";
-    rev = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-1tLW/xEh01y8BjVbgIa95DkYWf7CDVSo/lI/1U28Xs8=";
   };
 
diff --git a/pkgs/by-name/nb/nbstripout/package.nix b/pkgs/by-name/nb/nbstripout/package.nix
index 4978722e6382..ce3ff05efcd5 100644
--- a/pkgs/by-name/nb/nbstripout/package.nix
+++ b/pkgs/by-name/nb/nbstripout/package.nix
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
   testAssets = fetchFromGitHub {
     owner = "kynan";
     repo = "nbstripout";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-OSJLrWkYQIhcdyofS3Bo39ppsU6K3A4546UKB8Q1GGg=";
   };
 
diff --git a/pkgs/by-name/nb/nbxplorer/package.nix b/pkgs/by-name/nb/nbxplorer/package.nix
index fc6ed897fdd1..72f41cdd5629 100644
--- a/pkgs/by-name/nb/nbxplorer/package.nix
+++ b/pkgs/by-name/nb/nbxplorer/package.nix
@@ -12,7 +12,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "dgarage";
     repo = "NBXplorer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-T7pKIj7e4ZOX0JRawLc53eqjMrAV2CV8m6BRjukJ+t4=";
   };
 
diff --git a/pkgs/by-name/nc/ncdns/package.nix b/pkgs/by-name/nc/ncdns/package.nix
index a603b9674f02..3e637fdb3f9f 100644
--- a/pkgs/by-name/nc/ncdns/package.nix
+++ b/pkgs/by-name/nc/ncdns/package.nix
@@ -21,7 +21,7 @@ let
     src = fetchFromGitHub {
       owner = "namecoin";
       repo = "x509-compressed";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-BmVtClZ3TsUbQrhwREXa42pUOlkBA4a2HVBzl1sdBIo=";
     };
 
diff --git a/pkgs/by-name/nc/ncgopher/package.nix b/pkgs/by-name/nc/ncgopher/package.nix
index 50deded81024..cfdfb5e4b40d 100644
--- a/pkgs/by-name/nc/ncgopher/package.nix
+++ b/pkgs/by-name/nc/ncgopher/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jansc";
     repo = "ncgopher";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE=";
   };
 
diff --git a/pkgs/by-name/nc/ncnn/package.nix b/pkgs/by-name/nc/ncnn/package.nix
index ed6f8616bafc..b4f88b043f25 100644
--- a/pkgs/by-name/nc/ncnn/package.nix
+++ b/pkgs/by-name/nc/ncnn/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Tencent";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-XmIuXR/uxJbXaB0G+tS9I47Pke20qj8jI1vqnDDgrpE=";
   };
 
diff --git a/pkgs/by-name/nc/nco/package.nix b/pkgs/by-name/nc/nco/package.nix
index 3e5470effd86..dc86709c0f1a 100644
--- a/pkgs/by-name/nc/nco/package.nix
+++ b/pkgs/by-name/nc/nco/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nco";
     repo = "nco";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-p7GUUgMlZFnJ5kA3x4QpcVmQUQNsjMr2Q8Mrzf6k54Q=";
   };
 
diff --git a/pkgs/by-name/nc/ncompress/package.nix b/pkgs/by-name/nc/ncompress/package.nix
index 4baac00754ee..9f8d9210c45e 100644
--- a/pkgs/by-name/nc/ncompress/package.nix
+++ b/pkgs/by-name/nc/ncompress/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vapier";
     repo = "ncompress";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Yhs3C5/kR7Ve56E84usYJprxIMAIwXVahLi1N9TIfj0=";
   };
 
diff --git a/pkgs/by-name/nc/ncrack/package.nix b/pkgs/by-name/nc/ncrack/package.nix
index 2df00ec4c894..018db4de1678 100644
--- a/pkgs/by-name/nc/ncrack/package.nix
+++ b/pkgs/by-name/nc/ncrack/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nmap";
     repo = "ncrack";
-    rev = version;
+    tag = version;
     sha256 = "1gnv5xdd7n04glcpy7q1mkb6f8gdhdrhlrh8z6k4g2pjdhxlz26g";
   };
 
diff --git a/pkgs/by-name/nd/ndppd/package.nix b/pkgs/by-name/nd/ndppd/package.nix
index bb0fda862e98..90ed753148e9 100644
--- a/pkgs/by-name/nd/ndppd/package.nix
+++ b/pkgs/by-name/nd/ndppd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DanielAdolfsson";
     repo = "ndppd";
-    rev = version;
+    tag = version;
     sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0";
   };
 
diff --git a/pkgs/by-name/nd/ndstool/package.nix b/pkgs/by-name/nd/ndstool/package.nix
index 5c3fcf4eaeb3..42362723c1e9 100644
--- a/pkgs/by-name/nd/ndstool/package.nix
+++ b/pkgs/by-name/nd/ndstool/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "devkitPro";
     repo = "ndstool";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-121xEmbt1WBR1wi4RLw9/iLHqkpyXImXKiCNnLCYnJs=";
   };
 
diff --git a/pkgs/by-name/nd/ndstrim/package.nix b/pkgs/by-name/nd/ndstrim/package.nix
index 130f7f3dbc44..14086eeea62b 100644
--- a/pkgs/by-name/nd/ndstrim/package.nix
+++ b/pkgs/by-name/nd/ndstrim/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Nemris";
     repo = "ndstrim";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KgtejBbFg6+klc8OpCs1CIb+7uVPCtP0/EM671vxauk=";
   };
 
diff --git a/pkgs/by-name/ne/ne/package.nix b/pkgs/by-name/ne/ne/package.nix
index b3290e7184e2..34e8044dff4b 100644
--- a/pkgs/by-name/ne/ne/package.nix
+++ b/pkgs/by-name/ne/ne/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vigna";
     repo = "ne";
-    rev = version;
+    tag = version;
     sha256 = "sha256-n8PERQD9G4jmW4avQjbFofrSapyRoSbQ2k1LzVt0i1o=";
   };
 
diff --git a/pkgs/by-name/ne/near-cli/package.nix b/pkgs/by-name/ne/near-cli/package.nix
index dfce986e94ed..2d1d00531174 100644
--- a/pkgs/by-name/ne/near-cli/package.nix
+++ b/pkgs/by-name/ne/near-cli/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "near";
     repo = "near-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-C+viNYk+6BA11cdi5GqARU3QTTONTR2B2VEZf/SeeSQ=";
   };
 
diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix
index 97773ec7a34c..3be23143ab69 100644
--- a/pkgs/by-name/ne/neatvnc/package.nix
+++ b/pkgs/by-name/ne/neatvnc/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "any1";
     repo = "neatvnc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D9dwD5i9mScc5vn0mUxe7+0cxMI65F7LyivXn9J0aic=";
   };
 
diff --git a/pkgs/by-name/ne/needle/package.nix b/pkgs/by-name/ne/needle/package.nix
index 3d771cd693e5..f75a700c52cb 100644
--- a/pkgs/by-name/ne/needle/package.nix
+++ b/pkgs/by-name/ne/needle/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uber";
     repo = "needle";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vQlUcfIj+LHZ3R+XwSr9bBIjcZUWkW2k/wI6HF+sDPo=";
   };
 
diff --git a/pkgs/by-name/ne/neil/package.nix b/pkgs/by-name/ne/neil/package.nix
index 8aa5c7b85fea..5c276000db02 100644
--- a/pkgs/by-name/ne/neil/package.nix
+++ b/pkgs/by-name/ne/neil/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "babashka";
     repo = "neil";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ulqVrFsuYvRKxASHI6AqnHkKKdmDVgtivsRIscivcXw=";
   };
 
diff --git a/pkgs/by-name/ne/nemo-emblems/package.nix b/pkgs/by-name/ne/nemo-emblems/package.nix
index faa0215419b1..22decbba2aa6 100644
--- a/pkgs/by-name/ne/nemo-emblems/package.nix
+++ b/pkgs/by-name/ne/nemo-emblems/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
-    rev = version;
+    tag = version;
     hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
   };
 
diff --git a/pkgs/by-name/ne/nemo-fileroller/package.nix b/pkgs/by-name/ne/nemo-fileroller/package.nix
index ae668730829e..d19065a370b3 100644
--- a/pkgs/by-name/ne/nemo-fileroller/package.nix
+++ b/pkgs/by-name/ne/nemo-fileroller/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
-    rev = version;
+    tag = version;
     hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
   };
 
diff --git a/pkgs/by-name/ne/nemo-python/package.nix b/pkgs/by-name/ne/nemo-python/package.nix
index a80cf5e60294..3e0f40ee9b9b 100644
--- a/pkgs/by-name/ne/nemo-python/package.nix
+++ b/pkgs/by-name/ne/nemo-python/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
-    rev = version;
+    tag = version;
     hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
   };
 
diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix
index 5faaf68ef2b9..0da0ba8296ba 100644
--- a/pkgs/by-name/ne/nemo/package.nix
+++ b/pkgs/by-name/ne/nemo/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-9JfCBC5YjfQadF7KzPgZ1yPkiSjmuEO1tfMU2BmJES8=";
   };
 
diff --git a/pkgs/by-name/ne/neo-cowsay/package.nix b/pkgs/by-name/ne/neo-cowsay/package.nix
index 8f3f556c877c..a1e2e48a0d10 100644
--- a/pkgs/by-name/ne/neo-cowsay/package.nix
+++ b/pkgs/by-name/ne/neo-cowsay/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Code-Hex";
     repo = "Neo-cowsay";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DmIjqBTIzwkQ8aJ6xCgIwjDtczlTH5AKbPKFUGx3qQ8=";
   };
 
diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix
index b521d70158c0..76d72702a930 100644
--- a/pkgs/by-name/ne/neocmakelsp/package.nix
+++ b/pkgs/by-name/ne/neocmakelsp/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Decodetalkers";
     repo = "neocmakelsp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iVetPUg/eX8o2BB1y9dlijbhZUyDNMHaLrqcqTbvpQk=";
   };
 
diff --git a/pkgs/by-name/ne/neosay/package.nix b/pkgs/by-name/ne/neosay/package.nix
index 293de7c9b0dc..f5b78afccd5d 100644
--- a/pkgs/by-name/ne/neosay/package.nix
+++ b/pkgs/by-name/ne/neosay/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "donuts-are-good";
     repo = "neosay";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2tFjvAobDpBh1h0ejdtqxDsC+AqyneN+xNssOJNfEbk=";
   };
 
diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix
index 40e41361ab67..85c21a479983 100644
--- a/pkgs/by-name/ne/neothesia/package.nix
+++ b/pkgs/by-name/ne/neothesia/package.nix
@@ -17,7 +17,7 @@ let
   src = fetchFromGitHub {
     owner = "PolyMeilex";
     repo = "Neothesia";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bQ2546q+oachvuNKMJHjQzF6uv06LG+f7eFQPoAn6mw=";
   };
 in
diff --git a/pkgs/by-name/ne/neovim-gtk/package.nix b/pkgs/by-name/ne/neovim-gtk/package.nix
index 44ec67d0fb25..8ea22032630c 100644
--- a/pkgs/by-name/ne/neovim-gtk/package.nix
+++ b/pkgs/by-name/ne/neovim-gtk/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Lyude";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I=";
   };
 
diff --git a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
index b4a888905608..c913928e6e84 100644
--- a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "equalsraf";
     repo = "neovim-qt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-r77tg3xVemHW/zDNA6dYerFjFaYDDeHsD68WhMfI70Q=";
   };
 
diff --git a/pkgs/by-name/ne/neovim-remote/package.nix b/pkgs/by-name/ne/neovim-remote/package.nix
index 566f323ce2c6..edc2097d8e6a 100644
--- a/pkgs/by-name/ne/neovim-remote/package.nix
+++ b/pkgs/by-name/ne/neovim-remote/package.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mhinz";
     repo = "neovim-remote";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uO5KezbUQGj3rNpuw2SJOzcP86DZqX7DJFz3BxEnf1E=";
   };
 
diff --git a/pkgs/by-name/ne/nerdctl/package.nix b/pkgs/by-name/ne/nerdctl/package.nix
index 9e69d6761fb1..f844c5b8086d 100644
--- a/pkgs/by-name/ne/nerdctl/package.nix
+++ b/pkgs/by-name/ne/nerdctl/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containerd";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GHFs8QvLcXu+DZ851TCLI7EVc9wMS5fRC4TYBXzyv3Q=";
   };
 
diff --git a/pkgs/by-name/ne/nerdfix/package.nix b/pkgs/by-name/ne/nerdfix/package.nix
index e9839908d630..51c0e636b585 100644
--- a/pkgs/by-name/ne/nerdfix/package.nix
+++ b/pkgs/by-name/ne/nerdfix/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "loichyan";
     repo = "nerdfix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Mp8QFzMQXJEFIzkrmiW/wxMy/+WC4VqbPtWzE92z9Gc=";
   };
 
diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix
index 76c5f37fb143..885eed565455 100644
--- a/pkgs/by-name/ne/nest-cli/package.nix
+++ b/pkgs/by-name/ne/nest-cli/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "nestjs";
     repo = "nest-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-dko+hOC3oZToNS+EOqmm+z7DLHfqqKDeQsH2sYxburU=";
   };
 
diff --git a/pkgs/by-name/ne/nestopia-ue/package.nix b/pkgs/by-name/ne/nestopia-ue/package.nix
index d976ec8649be..b275bf95b678 100644
--- a/pkgs/by-name/ne/nestopia-ue/package.nix
+++ b/pkgs/by-name/ne/nestopia-ue/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "0ldsk00l";
     repo = "nestopia";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-6r6o/2GDp1Rcp+OWaQVgIQGC6NAxtmx4lxDWWpwv8aQ=";
   };
 
diff --git a/pkgs/by-name/ne/net-cpp/package.nix b/pkgs/by-name/ne/net-cpp/package.nix
index fedb695fc245..0fb0c55c45ce 100644
--- a/pkgs/by-name/ne/net-cpp/package.nix
+++ b/pkgs/by-name/ne/net-cpp/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/net-cpp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-MSqdP3kGI9hDdxFv2a0yd5ZkFkf1lMurB+KDIZLR9jg=";
   };
 
diff --git a/pkgs/by-name/ne/netassert/package.nix b/pkgs/by-name/ne/netassert/package.nix
index a03870c42450..bd7150c7e97c 100644
--- a/pkgs/by-name/ne/netassert/package.nix
+++ b/pkgs/by-name/ne/netassert/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "controlplaneio";
     repo = "netassert";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mRKjo0AfnM+XTl7sQoGDyQoquXpD3xPJ6i3/3Dj2rhE=";
   };
   vendorHash = "sha256-9mvSfAd1m95eRwljGG68+tjiFObgt1EuakjwFfn9Obo=";
diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix
index 7734682aed95..37b1a2b13b92 100644
--- a/pkgs/by-name/ne/netavark/package.nix
+++ b/pkgs/by-name/ne/netavark/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "netavark";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kAJOfZ4Q1EQ+JV1izXoLe/Z/qgxbzz3WbczM4fVhxfU=";
   };
 
diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index 0670d3333e6b..5c57e07728c1 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "dashboard";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PY/jK96FK6Y0++Ie4Yg/7GrGoLtLcgCSzXIkqySxe2M=";
   };
 
diff --git a/pkgs/by-name/ne/netbox2netshot/package.nix b/pkgs/by-name/ne/netbox2netshot/package.nix
index 96d1bbb78e00..d6d1339aeeb3 100644
--- a/pkgs/by-name/ne/netbox2netshot/package.nix
+++ b/pkgs/by-name/ne/netbox2netshot/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "scaleway";
     repo = "netbox2netshot";
-    rev = version;
+    tag = version;
     hash = "sha256-4Leg7MaLSos2RjmxB6yVzxGju6OzNrChXdw5htppuZU=";
   };
 
diff --git a/pkgs/by-name/ne/netcdfcxx4/package.nix b/pkgs/by-name/ne/netcdfcxx4/package.nix
index b96c8f89f6ed..9655b69ccce5 100644
--- a/pkgs/by-name/ne/netcdfcxx4/package.nix
+++ b/pkgs/by-name/ne/netcdfcxx4/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Unidata";
     repo = "netcdf-cxx4";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY=";
   };
 
diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix
index 5d2d1f5d17b2..7637483a0495 100644
--- a/pkgs/by-name/ne/netclient/package.nix
+++ b/pkgs/by-name/ne/netclient/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gravitl";
     repo = "netclient";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/drujpz0oeAZmV24Fxy3N6aqa5z72WiVxkjccbc6xmE=";
   };
 
diff --git a/pkgs/by-name/ne/netcoredbg/package.nix b/pkgs/by-name/ne/netcoredbg/package.nix
index f2dc49a18410..e8c0e1d4aaa6 100644
--- a/pkgs/by-name/ne/netcoredbg/package.nix
+++ b/pkgs/by-name/ne/netcoredbg/package.nix
@@ -30,7 +30,7 @@ let
   src = fetchFromGitHub {
     owner = "Samsung";
     repo = pname;
-    rev = version;
+    tag = version;
     inherit hash;
   };
 
diff --git a/pkgs/by-name/ne/nethogs/package.nix b/pkgs/by-name/ne/nethogs/package.nix
index 5ad1bfd5c999..c0cace043d92 100644
--- a/pkgs/by-name/ne/nethogs/package.nix
+++ b/pkgs/by-name/ne/nethogs/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "raboof";
     repo = "nethogs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+yVMyGSBIBWYjA9jaGWvrcsNPbJ6S4ax9H1BhWHYUUU=";
   };
 
diff --git a/pkgs/by-name/ne/nethoscope/package.nix b/pkgs/by-name/ne/nethoscope/package.nix
index a7bc672c2338..3d874634336a 100644
--- a/pkgs/by-name/ne/nethoscope/package.nix
+++ b/pkgs/by-name/ne/nethoscope/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vvilhonen";
     repo = "nethoscope";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v7GO+d4b0N3heN10+WSUJEpcShKmx4BPR1FyZoELWzc=";
   };
 
diff --git a/pkgs/by-name/ne/netmask/package.nix b/pkgs/by-name/ne/netmask/package.nix
index 9397e44d9fd7..b2a3b298ea61 100644
--- a/pkgs/by-name/ne/netmask/package.nix
+++ b/pkgs/by-name/ne/netmask/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tlby";
     repo = "netmask";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1269bmdvl534wr0bamd7cqbnr76pnb14yn8ly4qsfg29kh7hrds6";
   };
 
diff --git a/pkgs/by-name/ne/netop/package.nix b/pkgs/by-name/ne/netop/package.nix
index 623d95c21be9..ee3a99212c08 100644
--- a/pkgs/by-name/ne/netop/package.nix
+++ b/pkgs/by-name/ne/netop/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ZingerLittleBee";
     repo = "netop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Rnp2VNAi8BNbKqkGFoYUb4C5db5BS1P1cqpWlroTmdQ=";
   };
 
diff --git a/pkgs/by-name/ne/netplan/package.nix b/pkgs/by-name/ne/netplan/package.nix
index 6668eeff00f5..cb435467a070 100644
--- a/pkgs/by-name/ne/netplan/package.nix
+++ b/pkgs/by-name/ne/netplan/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "netplan";
-    rev = version;
+    tag = version;
     hash = "sha256-wQ4gd9+9YU92WGRMjSiF/zLCGxhaSl8s22pH1jr+Mm0=";
   };
 
diff --git a/pkgs/by-name/ne/netproc/package.nix b/pkgs/by-name/ne/netproc/package.nix
index eb49dcb019f5..0c90f99ec06e 100644
--- a/pkgs/by-name/ne/netproc/package.nix
+++ b/pkgs/by-name/ne/netproc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "berghetti";
     repo = "netproc";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-OQWlFwCga33rTseLeO8rAd+pkLHbSNf3YI5OSwrdIyk=";
   };
 
diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix
index 8489627e329c..d788de976a45 100644
--- a/pkgs/by-name/ne/netsniff-ng/package.nix
+++ b/pkgs/by-name/ne/netsniff-ng/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "netsniff-ng";
     owner = "netsniff-ng";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P1xZqhZ/HJV3fAvh4xhhApZ0+FLDFqvYrZlbvb+FV7I=";
   };
 
diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
index 2f726ee47d65..28edc20a4487 100644
--- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix
+++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nm-l2tp";
     repo = "network-manager-l2tp";
-    rev = version;
+    tag = version;
     hash = "sha256-AmbDWBCUG9fvqA6iJopYtbitdRwv2faWvIeKN90p234=";
   };
 
diff --git a/pkgs/by-name/ne/networkmanager_dmenu/package.nix b/pkgs/by-name/ne/networkmanager_dmenu/package.nix
index 7e39c745d1c9..4d5b9e4a582c 100644
--- a/pkgs/by-name/ne/networkmanager_dmenu/package.nix
+++ b/pkgs/by-name/ne/networkmanager_dmenu/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "networkmanager-dmenu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Iy8Bi6aXtNXFfuQmRhLo50cs7pMx1l+OIv019Dqj6ow=";
   };
 
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 d6b7098654bc..f84e5462ef32 100644
--- a/pkgs/by-name/ne/neuron/package.nix
+++ b/pkgs/by-name/ne/neuron/package.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "neuronsimulator";
     repo = "nrn";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-xASBpsF8rIzrb5G+4Qi6rvWC2wqL7nAGlSeMsBAI6WM=";
   };
diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix
index 8a54783f91f6..066a321c45b8 100644
--- a/pkgs/by-name/ne/neverest/package.nix
+++ b/pkgs/by-name/ne/neverest/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pimalaya";
     repo = "neverest";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE=";
   };
 
diff --git a/pkgs/by-name/ne/new-session-manager/package.nix b/pkgs/by-name/ne/new-session-manager/package.nix
index 343c84db10d0..baa8bae542b1 100644
--- a/pkgs/by-name/ne/new-session-manager/package.nix
+++ b/pkgs/by-name/ne/new-session-manager/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxaudio";
     repo = "new-session-manager";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5G2GlBuKjC/r1SMm78JKia7bMA97YcvUR5l6zBucemw=";
   };
 
diff --git a/pkgs/by-name/ne/newcomputermodern/package.nix b/pkgs/by-name/ne/newcomputermodern/package.nix
index c35f9989e50e..ac96b0dd307c 100644
--- a/pkgs/by-name/ne/newcomputermodern/package.nix
+++ b/pkgs/by-name/ne/newcomputermodern/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://git.gnu.org.ua/newcm.git";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-AMzEytBn9PbyYFNJ2CMPg8ejsL3eFhY+eZHXShaLG9E=";
   };
 
diff --git a/pkgs/by-name/ne/nextdns/package.nix b/pkgs/by-name/ne/nextdns/package.nix
index ee938b7c24f9..2167a01b91d7 100644
--- a/pkgs/by-name/ne/nextdns/package.nix
+++ b/pkgs/by-name/ne/nextdns/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nextdns";
     repo = "nextdns";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CvFzDfDij4AYuytlPNrY2L0mov8MionUd06kf7aZQAo=";
   };
 
diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix
index ca14a95e5dce..d9a2400c261a 100644
--- a/pkgs/by-name/ne/nexttrace/package.nix
+++ b/pkgs/by-name/ne/nexttrace/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nxtrace";
     repo = "NTrace-core";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-32QFgmvXQ+8ix1N9I6pJaIJGWOT67/FG0VVEhftwQQw=";
   };
   vendorHash = "sha256-WRH9doQavcdH1sd2fS8QoFSmlirBMZgSzB/sj1q6cUQ=";
diff --git a/pkgs/by-name/nf/nfft/package.nix b/pkgs/by-name/nf/nfft/package.nix
index 3d3bdb47eec6..fce1cc1664d0 100644
--- a/pkgs/by-name/nf/nfft/package.nix
+++ b/pkgs/by-name/nf/nfft/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "NFFT";
     repo = "nfft";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-HR8ME9PVC+RAv1GIgV2vK6eLU8Wk28+rSzbutThBv3w=";
   };
 
diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix
index 2da3eb5e7b6a..714d6e1f7668 100644
--- a/pkgs/by-name/nf/nfpm/package.nix
+++ b/pkgs/by-name/nf/nfpm/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-63vhxsoGK8YNs0wobFyViOHO9K3hSHgWJU/wbvUxJFw=";
   };
 
diff --git a/pkgs/by-name/nf/nfstrace/package.nix b/pkgs/by-name/nf/nfstrace/package.nix
index 11edace296ef..f7b366abe4f2 100644
--- a/pkgs/by-name/nf/nfstrace/package.nix
+++ b/pkgs/by-name/nf/nfstrace/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "epam";
     repo = "nfstrace";
-    rev = version;
+    tag = version;
     sha256 = "1djsyn7i3xp969rnmsdaf5vwjiik9wylxxrc5nm7by00i76c1vsg";
   };
 
diff --git a/pkgs/by-name/ng/nginx-config-formatter/package.nix b/pkgs/by-name/ng/nginx-config-formatter/package.nix
index f475464bd5f4..b7a2cf55dcb7 100644
--- a/pkgs/by-name/ng/nginx-config-formatter/package.nix
+++ b/pkgs/by-name/ng/nginx-config-formatter/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "slomkowski";
     repo = "nginx-config-formatter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-nYaBdVsq7aLE9P1bQlJlQkrk/cq7C1hxM5XtCGyEzC0=";
   };
 
diff --git a/pkgs/by-name/ng/nginx-sso/package.nix b/pkgs/by-name/ng/nginx-sso/package.nix
index c2d4a9473a20..79af4783b29c 100644
--- a/pkgs/by-name/ng/nginx-sso/package.nix
+++ b/pkgs/by-name/ng/nginx-sso/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Luzifer";
     repo = "nginx-sso";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fNMCskS8uXAykl2Zu4ZZqtIS2F5w7HV7C8hyPaWnav4=";
   };
 
diff --git a/pkgs/by-name/ng/ngrid/package.nix b/pkgs/by-name/ng/ngrid/package.nix
index 193080ad3914..5dfc6f6530e6 100644
--- a/pkgs/by-name/ng/ngrid/package.nix
+++ b/pkgs/by-name/ng/ngrid/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "twosigma";
     repo = "ngrid";
-    rev = version;
+    tag = version;
     hash = "sha256-69icp0m+bAHBsQFIDGd8NjfMsMYsB1sUfzuP/OBl5jc=";
   };
 
diff --git a/pkgs/by-name/ng/ngrrram/package.nix b/pkgs/by-name/ng/ngrrram/package.nix
index 606de9acdaec..36ff7a0b31ef 100644
--- a/pkgs/by-name/ng/ngrrram/package.nix
+++ b/pkgs/by-name/ng/ngrrram/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wintermute-cell";
     repo = "ngrrram";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-65cbNsGQZSpxKV0lq/Z7TK7CODPTqayOiPStukFbo44=";
   };
 
diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix
index 005c5937388b..3998af984a73 100644
--- a/pkgs/by-name/nh/nheko/package.nix
+++ b/pkgs/by-name/nh/nheko/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nheko-Reborn";
     repo = "nheko";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hQb+K8ogNj/s6ZO2kgS/sZZ35y4CwMeS3lVeMYNucYQ=";
   };
 
diff --git a/pkgs/by-name/nh/nhentai/package.nix b/pkgs/by-name/nh/nhentai/package.nix
index 29a9498b2548..e4fa5e4c74a9 100644
--- a/pkgs/by-name/nh/nhentai/package.nix
+++ b/pkgs/by-name/nh/nhentai/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "RicterZ";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-SjWIctAyczjYGP4buXQBA/RcrdikMSuSBtfhORNmXMc=";
   };
 
diff --git a/pkgs/by-name/ni/niff/package.nix b/pkgs/by-name/ni/niff/package.nix
index 768d8b4047b7..81251c22bd76 100644
--- a/pkgs/by-name/ni/niff/package.nix
+++ b/pkgs/by-name/ni/niff/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "FRidh";
     repo = "niff";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ziv5r57jzg2qg61izvkkyq1bz4p5nb6652dzwykfj3l2r3db4bi";
   };
 
diff --git a/pkgs/by-name/ni/nifticlib/package.nix b/pkgs/by-name/ni/nifticlib/package.nix
index 9ace77562c62..64849c8314ee 100644
--- a/pkgs/by-name/ni/nifticlib/package.nix
+++ b/pkgs/by-name/ni/nifticlib/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NIFTI-Imaging";
     repo = "nifti_clib";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0hamm6nvbjdjjd5md4jahzvn5559frigxaiybnjkh59ckxwb1hy4";
   };
 
diff --git a/pkgs/by-name/ni/niftyseg/package.nix b/pkgs/by-name/ni/niftyseg/package.nix
index 1c7d59328a45..e351ead5aad4 100644
--- a/pkgs/by-name/ni/niftyseg/package.nix
+++ b/pkgs/by-name/ni/niftyseg/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KCL-BMEIS";
     repo = "NiftySeg";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FDthq1ild9XOw3E3O7Lpfn6hBF1Frhv1NxfEA8500n8=";
   };
 
diff --git a/pkgs/by-name/ni/nika-fonts/package.nix b/pkgs/by-name/ni/nika-fonts/package.nix
index 165145ff295a..7c267b146a55 100644
--- a/pkgs/by-name/ni/nika-fonts/package.nix
+++ b/pkgs/by-name/ni/nika-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "font-store";
     repo = "NikaFont";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jDemm8IyjhoCOg4Bfsp0tzUR7m+JaswL5d7Kug+asJk=";
   };
 
diff --git a/pkgs/by-name/ni/nikto/package.nix b/pkgs/by-name/ni/nikto/package.nix
index f82cf130f2b1..fc12c9dcb89d 100644
--- a/pkgs/by-name/ni/nikto/package.nix
+++ b/pkgs/by-name/ni/nikto/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sullo";
     repo = "nikto";
-    rev = version;
+    tag = version;
     sha256 = "sha256-lWiDbWc2BWAUgyaIm0tvZytja02WogYRoc7na4sHiNM=";
   };
 
diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix
index 2847bac37ecc..4410018c72de 100644
--- a/pkgs/by-name/ni/nil/package.nix
+++ b/pkgs/by-name/ni/nil/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "oxalica";
     repo = "nil";
-    rev = version;
+    tag = version;
     hash = "sha256-DqsN/VkYVr4M0PVRQKXPPOTaind5miYZURIYqM4MxYM=";
   };
 
diff --git a/pkgs/by-name/ni/nilfs-utils/package.nix b/pkgs/by-name/ni/nilfs-utils/package.nix
index 067b2f6a305a..ea316b0c1e46 100644
--- a/pkgs/by-name/ni/nilfs-utils/package.nix
+++ b/pkgs/by-name/ni/nilfs-utils/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nilfs-dev";
     repo = "nilfs-utils";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qvs0PBkMYzGfIQ/Z2Wz0aHe2Y2Ia6fA4pMSk5Jhejf4=";
   };
 
diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix
index 0f49bc7494ba..3c5a01deeaa0 100644
--- a/pkgs/by-name/ni/nimlangserver/package.nix
+++ b/pkgs/by-name/ni/nimlangserver/package.nix
@@ -15,7 +15,7 @@ buildNimPackage (
     src = fetchFromGitHub {
       owner = "nim-lang";
       repo = "langserver";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-CbdlDcEkX/pPXEbIsSM6S9INeBCwgjx7NxonjUJAHrk=";
     };
 
diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix
index b73abeae592f..9790d6530fdb 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/ninvaders/package.nix b/pkgs/by-name/ni/ninvaders/package.nix
index 06618b34f55e..b2e2021df255 100644
--- a/pkgs/by-name/ni/ninvaders/package.nix
+++ b/pkgs/by-name/ni/ninvaders/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sf-refugees";
     repo = "ninvaders";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1wmwws1zsap4bfc2439p25vnja0hnsf57k293rdxw626gly06whi";
   };
 
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/nix-bash-completions/package.nix b/pkgs/by-name/ni/nix-bash-completions/package.nix
index 71ea4e111dfc..e55631acded9 100644
--- a/pkgs/by-name/ni/nix-bash-completions/package.nix
+++ b/pkgs/by-name/ni/nix-bash-completions/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hedning";
     repo = "nix-bash-completions";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1n5zs6xcnv4bv1hdaypmz7fv4j7dsr4a0ifah99iyj4p5j85i1bc";
   };
 
diff --git a/pkgs/by-name/ni/nix-build-uncached/package.nix b/pkgs/by-name/ni/nix-build-uncached/package.nix
index 5bf09afad6e3..dd8c1331cde0 100644
--- a/pkgs/by-name/ni/nix-build-uncached/package.nix
+++ b/pkgs/by-name/ni/nix-build-uncached/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-build-uncached";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-n9Koi01Te77bpYbRX46UThyD2FhCu9OGHd/6xDQLqjQ=";
   };
 
diff --git a/pkgs/by-name/ni/nix-bundle/package.nix b/pkgs/by-name/ni/nix-bundle/package.nix
index ecffd54eb676..da5c1e83a479 100644
--- a/pkgs/by-name/ni/nix-bundle/package.nix
+++ b/pkgs/by-name/ni/nix-bundle/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matthewbauer";
     repo = "nix-bundle";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0js8spwjvw6kjxz1i072scd035fhiyazixvn84ibdnw8dx087gjv";
   };
 
diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix
index ff56c097c29a..840d1b5e9147 100644
--- a/pkgs/by-name/ni/nix-direnv/package.nix
+++ b/pkgs/by-name/ni/nix-direnv/package.nix
@@ -16,7 +16,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-direnv";
-    rev = version;
+    tag = version;
     hash = "sha256-oNqhPqgQT92yxbKmcgX4F3e2yTUPyXYG7b2xQm3TvQw=";
   };
 
diff --git a/pkgs/by-name/ni/nix-doc/package.nix b/pkgs/by-name/ni/nix-doc/package.nix
index 121bef315ea2..5d0156e1ff1e 100644
--- a/pkgs/by-name/ni/nix-doc/package.nix
+++ b/pkgs/by-name/ni/nix-doc/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.6.5";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "lf-";
     repo = "nix-doc";
     sha256 = "sha256-9cuNzq+CBA2jz0LkZb7lh/WISIlKklfovGBAbSo1Mgk=";
diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix
index 0f996a78bf6b..53a6217c2a21 100644
--- a/pkgs/by-name/ni/nix-init/package.nix
+++ b/pkgs/by-name/ni/nix-init/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-init";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0RLEPVtYnwYH+pMnpO0/Evbp7x9d0RMobOVAqwgMJz4=";
   };
 
diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix
index b7b517f1976b..b8733db7c089 100644
--- a/pkgs/by-name/ni/nix-ld/package.nix
+++ b/pkgs/by-name/ni/nix-ld/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mic92";
     repo = "nix-ld";
-    rev = version;
+    tag = version;
     hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=";
   };
 
diff --git a/pkgs/by-name/ni/nix-melt/package.nix b/pkgs/by-name/ni/nix-melt/package.nix
index 667e2076cf58..a5354f665198 100644
--- a/pkgs/by-name/ni/nix-melt/package.nix
+++ b/pkgs/by-name/ni/nix-melt/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-melt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jx7g9GOFAjOlJyNsGOUTLh2qWII9u0prOoBEvNPmdj8=";
   };
 
diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix
index bb0c86e7cba6..4a84fa12db67 100644
--- a/pkgs/by-name/ni/nix-plugins/package.nix
+++ b/pkgs/by-name/ni/nix-plugins/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shlevy";
     repo = "nix-plugins";
-    rev = version;
+    tag = version;
     hash = "sha256-C4VqKHi6nVAHuXVhqvTRRyn0Bb619ez4LzgUWPH1cbM=";
   };
 
diff --git a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
index 230fb10f5cc2..247891fdeb49 100644
--- a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
+++ b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cdepillabout";
     repo = "nix-query-tree-viewer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Lc9hfjybnRrkd7PZMa2ojxOM04bP4GJyagkZUX2nVwY=";
   };
 
diff --git a/pkgs/by-name/ni/nix-search/package.nix b/pkgs/by-name/ni/nix-search/package.nix
index 9e8342414b5b..b70e0477965c 100644
--- a/pkgs/by-name/ni/nix-search/package.nix
+++ b/pkgs/by-name/ni/nix-search/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "diamondburned";
     repo = "nix-search";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dOdcXKfSwi0THOjtgP3O/46SWoUY+T7LL9nGwOXXJfw=";
   };
 
diff --git a/pkgs/by-name/ni/nix-snapshotter/package.nix b/pkgs/by-name/ni/nix-snapshotter/package.nix
index e6bee45d0b3b..4d77c3e82070 100644
--- a/pkgs/by-name/ni/nix-snapshotter/package.nix
+++ b/pkgs/by-name/ni/nix-snapshotter/package.nix
@@ -11,7 +11,7 @@ let
   src = fetchFromGitHub {
     owner = "pdtpartners";
     repo = "nix-snapshotter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TCZdXCmnqCPsd3PjLv/LDSKJhTspLliL0DE+c/XP9BY=";
   };
 
diff --git a/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix b/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix
index b44227c1600c..867bca399fb4 100644
--- a/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix
+++ b/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "nix-store-gcs-proxy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ljJrBNSGPZ9cV/+XcMNfMLT5le7tvtf/O42Tfou5BCA=";
   };
 
diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
index 6a92ed47aba7..57d8d1f30dd2 100644
--- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
+++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "nix-store-veritysetup-generator";
-    rev = version;
+    tag = version;
     hash = "sha256-kQ+mFBnvxmEH2+z1sDaehGInEsBpfZu8LMAseGjZ3/I=";
   };
 
diff --git a/pkgs/by-name/ni/nix-top/package.nix b/pkgs/by-name/ni/nix-top/package.nix
index fa69693781e0..541554998fbb 100644
--- a/pkgs/by-name/ni/nix-top/package.nix
+++ b/pkgs/by-name/ni/nix-top/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jerith666";
     repo = "nix-top";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-w/TKzbZmMt4CX2KnLwPvR1ydp5NNlp9nNx78jJvhp54=";
   };
 
diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix
index 961ea4afe735..1743f1146d06 100644
--- a/pkgs/by-name/ni/nix-weather/package.nix
+++ b/pkgs/by-name/ni/nix-weather/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cafkafk";
     repo = "nix-weather";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-15FUA4fszbAVXop3IyOHfxroyTt9/SkWZsSTUh9RtwY=";
   };
 
diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix
index bda305c30d35..f1a58fdde6b3 100644
--- a/pkgs/by-name/ni/nix-your-shell/package.nix
+++ b/pkgs/by-name/ni/nix-your-shell/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MercuryTechnologies";
     repo = "nix-your-shell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c=";
   };
 
diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix
index 8e895030339f..873712657571 100644
--- a/pkgs/by-name/ni/nixdoc/package.nix
+++ b/pkgs/by-name/ni/nixdoc/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixdoc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7UOjmW8Ef4mEvj7SINaKWh2ZuyNMVEXB82mtuZTQiPA=";
   };
 
diff --git a/pkgs/by-name/ni/nixel/package.nix b/pkgs/by-name/ni/nixel/package.nix
index 0d3eeed4b1ad..94233a06fe46 100644
--- a/pkgs/by-name/ni/nixel/package.nix
+++ b/pkgs/by-name/ni/nixel/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kamadorueda";
     repo = "nixel";
-    rev = version;
+    tag = version;
     sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A=";
   };
 
diff --git a/pkgs/by-name/ni/nixops-dns/package.nix b/pkgs/by-name/ni/nixops-dns/package.nix
index 1a3cb7797c4b..dbb49d25289f 100644
--- a/pkgs/by-name/ni/nixops-dns/package.nix
+++ b/pkgs/by-name/ni/nixops-dns/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "nixops-dns";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d3vVm6YeQTOAE5HFSKI01L9ZqfbQKrdoLsMwHP5HulE=";
   };
 
diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix
index 4a80fd1b9c9c..238e7febba9b 100644
--- a/pkgs/by-name/ni/nixos-anywhere/package.nix
+++ b/pkgs/by-name/ni/nixos-anywhere/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixos-anywhere";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-7kHxBQuzb7gcHzVmLGljJ4kF6BDDSYVCIxYFDmYPnAo=";
   };
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
index 91b9c2588009..38ed270581bd 100644
--- a/pkgs/by-name/ni/nixos-facter/package.nix
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "nixos-facter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QD9b3r91ukGbAg+ZWj9cdBsXb6pl3wlVgEY3zF+tDQI=";
   };
 
diff --git a/pkgs/by-name/ni/nixos-generators/package.nix b/pkgs/by-name/ni/nixos-generators/package.nix
index eef7650ffb92..2681af477c38 100644
--- a/pkgs/by-name/ni/nixos-generators/package.nix
+++ b/pkgs/by-name/ni/nixos-generators/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixos-generators";
-    rev = version;
+    tag = version;
     sha256 = "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=";
   };
   strictDeps = true;
diff --git a/pkgs/by-name/ni/nixos-shell/package.nix b/pkgs/by-name/ni/nixos-shell/package.nix
index b41ee3f47055..2c76463fcb3e 100644
--- a/pkgs/by-name/ni/nixos-shell/package.nix
+++ b/pkgs/by-name/ni/nixos-shell/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixos-shell";
-    rev = version;
+    tag = version;
     sha256 = "sha256-plRKXQqww7easx0wgGKAkOJH1TW/PeeB20dq9XUN8J4=";
   };
 
diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix
index a003f5eb65e5..b1c2db34530b 100644
--- a/pkgs/by-name/ni/nixpacks/package.nix
+++ b/pkgs/by-name/ni/nixpacks/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "nixpacks";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-G3PIQfwddATVNhe/cEZBSFESX3grFqjUQjq40DB5mH4=";
   };
 
diff --git a/pkgs/by-name/ni/nixpkgs-fmt/package.nix b/pkgs/by-name/ni/nixpkgs-fmt/package.nix
index d6de2cb7b1bf..a429dca0ef3d 100644
--- a/pkgs/by-name/ni/nixpkgs-fmt/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-fmt/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixpkgs-fmt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6Ut4/ix915EoaPCewoG3KhKBA+OaggpDqnx2nvKxEpQ=";
   };
 
diff --git a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
index 9aafd778ad9d..e0067343b7a3 100644
--- a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixpkgs-lint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o1VWM46lEJ9m49s/ekZWf8DkCeeWm4J3PQtt8tVXHbg=";
   };
 
diff --git a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
index 10fa7221513a..befe9c107482 100644
--- a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
+++ b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nixseparatedebuginfod";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sVQ6UgQvSTEIxXPxISeTI9tqAdJlxQpLxq1h4I31r6k=";
   };
 
diff --git a/pkgs/by-name/ni/nixtract/package.nix b/pkgs/by-name/ni/nixtract/package.nix
index 13139e54b6db..2dab74597e22 100644
--- a/pkgs/by-name/ni/nixtract/package.nix
+++ b/pkgs/by-name/ni/nixtract/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "nixtract";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-36ciPNSlB1LU+UXP8MLakrBRRqbyiVFN8Jp/JbCe1OY=";
   };
 
diff --git a/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix b/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix
index 23498cb57ad8..20d4b37b5064 100644
--- a/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix
+++ b/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pboettch";
     repo = "json-schema-validator";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Ybr5dNmjBBPTYPvgorJ6t2+zvAjxYQISWXJmgUVHBVE=";
   };
 
diff --git a/pkgs/by-name/nm/nm-file-secret-agent/package.nix b/pkgs/by-name/nm/nm-file-secret-agent/package.nix
index ac4993ad9af1..da6ac55caa2f 100644
--- a/pkgs/by-name/nm/nm-file-secret-agent/package.nix
+++ b/pkgs/by-name/nm/nm-file-secret-agent/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lilioid";
     repo = "nm-file-secret-agent";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xQWgNxrbpHOfnKXa57cV1F3JmtJcvQsqUfgwfWg5Ni4=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/nm/nmap-formatter/package.nix b/pkgs/by-name/nm/nmap-formatter/package.nix
index 60299fdb366a..9d7fce52cb85 100644
--- a/pkgs/by-name/nm/nmap-formatter/package.nix
+++ b/pkgs/by-name/nm/nmap-formatter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vdjagilev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jpgAcnDDVVboZEMkLIE9ei0oT91Y9yp8KUJkH6LQSY4=";
   };
 
diff --git a/pkgs/by-name/nm/nmapsi4/package.nix b/pkgs/by-name/nm/nmapsi4/package.nix
index 37287dcef021..1a3b77fef29e 100644
--- a/pkgs/by-name/nm/nmapsi4/package.nix
+++ b/pkgs/by-name/nm/nmapsi4/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nmapsi4";
     repo = "nmapsi4";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY=";
   };
 
diff --git a/pkgs/by-name/nm/nmrpflash/package.nix b/pkgs/by-name/nm/nmrpflash/package.nix
index 1dd0aea6359a..bb162907f6b0 100644
--- a/pkgs/by-name/nm/nmrpflash/package.nix
+++ b/pkgs/by-name/nm/nmrpflash/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jclehner";
     repo = "nmrpflash";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5oj+sIrVNAbLmmKHiBSDSVdJFrobK41UfWBmU0WRG3c=";
   };
 
diff --git a/pkgs/by-name/nm/nms/package.nix b/pkgs/by-name/nm/nms/package.nix
index f7ddc9cfb86c..8282e36ee450 100644
--- a/pkgs/by-name/nm/nms/package.nix
+++ b/pkgs/by-name/nm/nms/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bartobri";
     repo = "no-more-secrets";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QVCEpplsZCSQ+Fq1LBtCuPBvnzgLsmLcSrxR+e4nA5I=";
   };
 
diff --git a/pkgs/by-name/nn/nng/package.nix b/pkgs/by-name/nn/nng/package.nix
index 18ee8629de75..d61f6a6b100b 100644
--- a/pkgs/by-name/nn/nng/package.nix
+++ b/pkgs/by-name/nn/nng/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nanomsg";
     repo = "nng";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BBYfJ2j2IQkbluR3HQjEh1zFWPgOVX6kfyI0jG741Y4=";
   };
 
diff --git a/pkgs/by-name/nn/nnpdf/package.nix b/pkgs/by-name/nn/nnpdf/package.nix
index 80caef6f3ae1..0ba2473d7eb2 100644
--- a/pkgs/by-name/nn/nnpdf/package.nix
+++ b/pkgs/by-name/nn/nnpdf/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NNPDF";
     repo = "nnpdf";
-    rev = version;
+    tag = version;
     hash = "sha256-PyhkHlOlzKfDxUX91NkeZWjdEzFR4PW0Yh5Yz6ZA27g=";
   };
 
diff --git a/pkgs/by-name/no/noaa-apt/package.nix b/pkgs/by-name/no/noaa-apt/package.nix
index 3329748531eb..49859f976f9b 100644
--- a/pkgs/by-name/no/noaa-apt/package.nix
+++ b/pkgs/by-name/no/noaa-apt/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "martinber";
     repo = "noaa-apt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wmjglF2+BFmlTfvqt90nbCxuldN8AEFXj7y9tgTvA2Y=";
   };
 
diff --git a/pkgs/by-name/no/node-glob/package.nix b/pkgs/by-name/no/node-glob/package.nix
index fb26994e1aff..3770981435d0 100644
--- a/pkgs/by-name/no/node-glob/package.nix
+++ b/pkgs/by-name/no/node-glob/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "isaacs";
     repo = "node-glob";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oLlNhQOnu/hlKjNWa5vjqslz1EarZJOpUEXUB+vGQvc=";
   };
 
diff --git a/pkgs/by-name/no/node-manta/package.nix b/pkgs/by-name/no/node-manta/package.nix
index a096217d73de..b27a05d478de 100644
--- a/pkgs/by-name/no/node-manta/package.nix
+++ b/pkgs/by-name/no/node-manta/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "TritonDataCenter";
     repo = "node-manta";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Uj3fNzeERiO++sW2uyAbtfN/1Ed6uRVBBvCecncq/QY=";
   };
 
diff --git a/pkgs/by-name/no/node-problem-detector/package.nix b/pkgs/by-name/no/node-problem-detector/package.nix
index 16e23d8310d6..39bcfac2ab7c 100644
--- a/pkgs/by-name/no/node-problem-detector/package.nix
+++ b/pkgs/by-name/no/node-problem-detector/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Aw6TDyWczqWgUOCV7f4JSAI4eVcjWgwe2V5qSrx4TBI=";
   };
 
diff --git a/pkgs/by-name/no/nodemon/package.nix b/pkgs/by-name/no/nodemon/package.nix
index fa1317e6f841..c73a3f29ed13 100644
--- a/pkgs/by-name/no/nodemon/package.nix
+++ b/pkgs/by-name/no/nodemon/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "remy";
     repo = "nodemon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D0trs/Il7ekXXuLIsp8b9VPxQW1qqTc7DduGymv6jyU=";
   };
 
diff --git a/pkgs/by-name/no/nodenv/package.nix b/pkgs/by-name/no/nodenv/package.nix
index 89c6a6a89aa2..24d5d09d3ccf 100644
--- a/pkgs/by-name/no/nodenv/package.nix
+++ b/pkgs/by-name/no/nodenv/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nodenv";
     repo = "nodenv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PGeZKL7qsffMAZIsCLB244Fuu48GyWw5Rh67ePu6h38=";
   };
 
diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix
index 5082cbe0d6d5..2de2ee0b8907 100644
--- a/pkgs/by-name/no/nofi/package.nix
+++ b/pkgs/by-name/no/nofi/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ellsclytn";
     repo = "nofi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hQYIcyNCxb8qVpseNsmjyPxlwbMxDpXeZ+H1vpv62rQ=";
   };
 
diff --git a/pkgs/by-name/no/noise-repellent/package.nix b/pkgs/by-name/no/noise-repellent/package.nix
index bee759acfefd..a898528dfa20 100644
--- a/pkgs/by-name/no/noise-repellent/package.nix
+++ b/pkgs/by-name/no/noise-repellent/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lucianodato";
     repo = "noise-repellent";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-d8csYC3z3vXdmN/G6mAK+H8ia0vOCsoUpoA3W8/OADc=";
   };
 
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/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix
index 91ce841ac804..81f2d9d24eed 100644
--- a/pkgs/by-name/no/nomacs/package.nix
+++ b/pkgs/by-name/no/nomacs/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nomacs";
     repo = "nomacs";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = false; # We'll use our own
     inherit (finalAttrs) hash;
   };
diff --git a/pkgs/by-name/no/nomad-autoscaler/package.nix b/pkgs/by-name/no/nomad-autoscaler/package.nix
index e83fef2c859c..ea52ffd59647 100644
--- a/pkgs/by-name/no/nomad-autoscaler/package.nix
+++ b/pkgs/by-name/no/nomad-autoscaler/package.nix
@@ -29,7 +29,7 @@ let
     src = fetchFromGitHub {
       owner = "hashicorp";
       repo = "nomad-autoscaler";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-fK5GsszNhz/WP0zVk2lOfU/gwYijdQa5qhNYO33RhXc=";
     };
 
diff --git a/pkgs/by-name/no/nomad-driver-containerd/package.nix b/pkgs/by-name/no/nomad-driver-containerd/package.nix
index 6f56e85b83f9..04a7781414fa 100644
--- a/pkgs/by-name/no/nomad-driver-containerd/package.nix
+++ b/pkgs/by-name/no/nomad-driver-containerd/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Roblox";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-11K1ACk2hhEi+sAlI932eKpyy82Md7j1edRWH2JJ8sI=";
   };
 
diff --git a/pkgs/by-name/no/nomad-driver-podman/package.nix b/pkgs/by-name/no/nomad-driver-podman/package.nix
index dd848e09826b..89d24a3ca640 100644
--- a/pkgs/by-name/no/nomad-driver-podman/package.nix
+++ b/pkgs/by-name/no/nomad-driver-podman/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QvIc0RNQX9do6pTyGbJTTR7jANp50DVlHsl/8teiCnY=";
   };
 
diff --git a/pkgs/by-name/no/nomad-pack/package.nix b/pkgs/by-name/no/nomad-pack/package.nix
index 0e5e0c6154dc..ea9feda185cb 100644
--- a/pkgs/by-name/no/nomad-pack/package.nix
+++ b/pkgs/by-name/no/nomad-pack/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "nomad-pack";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dw6sueC1qibJYc6sbZX8HJlEf9R6O8dlE1aobw70UHw=";
   };
 
diff --git a/pkgs/by-name/no/nominatim/package.nix b/pkgs/by-name/no/nominatim/package.nix
index afaf7d93b08e..fed819ee3218 100644
--- a/pkgs/by-name/no/nominatim/package.nix
+++ b/pkgs/by-name/no/nominatim/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "Nominatim";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-GPMDbvTPl9SLpZi5gyRAPQ84NSTIRoSfGJeqWs1e9Oo=";
   };
diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix
index 0c2ab9a42274..df17a21908cb 100644
--- a/pkgs/by-name/no/nomino/package.nix
+++ b/pkgs/by-name/no/nomino/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yaa110";
     repo = "nomino";
-    rev = version;
+    tag = version;
     hash = "sha256-pSk1v4AyXETBJ8UupLJy8cNEqKRwkqJnqfzoHU0SdmE=";
   };
 
diff --git a/pkgs/by-name/no/nordzy-cursor-theme/package.nix b/pkgs/by-name/no/nordzy-cursor-theme/package.nix
index fbbe8ceeb29c..eeb0ea4929ed 100644
--- a/pkgs/by-name/no/nordzy-cursor-theme/package.nix
+++ b/pkgs/by-name/no/nordzy-cursor-theme/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "guillaumeboehm";
     repo = "Nordzy-cursors";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pPcdlMa3H5RtbqIxvgxDkP4tw76H2UQujXbrINc3MxE=";
   };
 
diff --git a/pkgs/by-name/no/nordzy-icon-theme/package.nix b/pkgs/by-name/no/nordzy-icon-theme/package.nix
index 8014d85dfcb7..46115ec8c0f4 100644
--- a/pkgs/by-name/no/nordzy-icon-theme/package.nix
+++ b/pkgs/by-name/no/nordzy-icon-theme/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alvatip";
     repo = "Nordzy-icon";
-    rev = version;
+    tag = version;
     sha256 = "sha256-r/WYGcHRAFX7TennestobjcJhwu3GE8aQXxnaeokQM0=";
   };
 
diff --git a/pkgs/by-name/no/norouter/package.nix b/pkgs/by-name/no/norouter/package.nix
index 6cd63474af38..356c186fb652 100644
--- a/pkgs/by-name/no/norouter/package.nix
+++ b/pkgs/by-name/no/norouter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "norouter";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-EY/Yfyaz2DeQKHJ4awpQDbrVkse9crIZlLzfviPy3Tk=";
   };
 
diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix
index 95ea63774953..8971a176adda 100644
--- a/pkgs/by-name/no/noseyparker/package.nix
+++ b/pkgs/by-name/no/noseyparker/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "noseyparker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-n+lX49BwipIPQ2ZeQT+DFO2ILHHAU2VsOnhASOGX5RE=";
   };
 
diff --git a/pkgs/by-name/no/nosqli/package.nix b/pkgs/by-name/no/nosqli/package.nix
index 7930a9626b5c..d995d59bc34f 100644
--- a/pkgs/by-name/no/nosqli/package.nix
+++ b/pkgs/by-name/no/nosqli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Charlie-belmer";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CgD9b5eHDK/8QhQmrqT09Jf9snn9WItNMtTNbJFT2sI=";
   };
 
diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix
index 485cced95575..bfd38da404e7 100644
--- a/pkgs/by-name/no/nostr-rs-relay/package.nix
+++ b/pkgs/by-name/no/nostr-rs-relay/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "scsibug";
     repo = "nostr-rs-relay";
-    rev = version;
+    tag = version;
     hash = "sha256-MS5jgUh9aLAFr4Nnf3Wid+ki0PTfsyob3r16/EXYZ7E=";
   };
 
diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix
index 6c32f8c19c94..abcb1ed76e46 100644
--- a/pkgs/by-name/no/nostui/package.nix
+++ b/pkgs/by-name/no/nostui/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "akiomik";
     repo = "nostui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RCD11KdzM66Mkydc51r6fG+q8bmKl5eZma58YoARwPo=";
   };
 
diff --git a/pkgs/by-name/no/notation/package.nix b/pkgs/by-name/no/notation/package.nix
index cbc5eaa21dc0..9f4b4842e48d 100644
--- a/pkgs/by-name/no/notation/package.nix
+++ b/pkgs/by-name/no/notation/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "notaryproject";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KxxksliL2ZxbvwbLKB81Lhpvjab9nm4o3QBT2CVFwDw=";
   };
 
diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix
index b13ed4f005cb..58e9b2c1482b 100644
--- a/pkgs/by-name/no/notcurses/package.nix
+++ b/pkgs/by-name/no/notcurses/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dankamongmen";
     repo = "notcurses";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-i3UNd1y88aOGBp2r9itBFd9w+UJQhleJQHZOiK0d26w=";
   };
 
diff --git a/pkgs/by-name/no/notejot/package.nix b/pkgs/by-name/no/notejot/package.nix
index 9214af6c8fa2..e8818bca2891 100644
--- a/pkgs/by-name/no/notejot/package.nix
+++ b/pkgs/by-name/no/notejot/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-p5F0OITgfZyvHwndI5r5BE524+nft7A2XfR3BJZFamU=";
   };
 
diff --git a/pkgs/by-name/no/notes-up/package.nix b/pkgs/by-name/no/notes-up/package.nix
index 7e9fe5f5bf88..0ef658c8c5f4 100644
--- a/pkgs/by-name/no/notes-up/package.nix
+++ b/pkgs/by-name/no/notes-up/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Philip-Scott";
     repo = "Notes-up";
-    rev = version;
+    tag = version;
     sha256 = "sha256-t9BCtdWd2JLrKTcmri1Lgl5RLBYD2xWCtMxoVXz0XPk=";
   };
 
diff --git a/pkgs/by-name/no/noteshrink/package.nix b/pkgs/by-name/no/noteshrink/package.nix
index 7bb3a83df099..e73b29aea08b 100644
--- a/pkgs/by-name/no/noteshrink/package.nix
+++ b/pkgs/by-name/no/noteshrink/package.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mzucker";
     repo = "noteshrink";
-    rev = version;
+    tag = version;
     sha256 = "0xhrvg3d8ffnbbizsrfppcd2y98znvkgxjdmvbvin458m2rwccka";
   };
 
diff --git a/pkgs/by-name/no/notify-client/package.nix b/pkgs/by-name/no/notify-client/package.nix
index 8e0a22416530..bd2bc769e81a 100644
--- a/pkgs/by-name/no/notify-client/package.nix
+++ b/pkgs/by-name/no/notify-client/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ranfdev";
     repo = "notify";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0p/XIGaawreGHbMRoHNmUEIxgwEgigtrubeJpndHsug=";
   };
 
diff --git a/pkgs/by-name/no/notify/package.nix b/pkgs/by-name/no/notify/package.nix
index d2a5ae5280ed..2884f39f5b21 100644
--- a/pkgs/by-name/no/notify/package.nix
+++ b/pkgs/by-name/no/notify/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QXioBUCMZ4ANkF2WOXiKUlExVq4abkaVFBd3efAGXMs=";
   };
 
diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix
index ed09967977b0..da4ee6a9c717 100644
--- a/pkgs/by-name/no/notion/package.nix
+++ b/pkgs/by-name/no/notion/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "raboof";
     repo = "notion";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-u5KoTI+OcnQu9m8/Lmsmzr8lEk9tulSE7RRFhj1oXJM=";
   };
 
diff --git a/pkgs/by-name/no/notmuch-addrlookup/package.nix b/pkgs/by-name/no/notmuch-addrlookup/package.nix
index d2f60b6ae64a..c279c82d47ed 100644
--- a/pkgs/by-name/no/notmuch-addrlookup/package.nix
+++ b/pkgs/by-name/no/notmuch-addrlookup/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "aperezdc";
     repo = "notmuch-addrlookup-c";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Z59MAptJw95azdK0auOuUyxBrX4PtXwnRNPkhjgI6Ro=";
   };
 
diff --git a/pkgs/by-name/no/notmuch-bower/package.nix b/pkgs/by-name/no/notmuch-bower/package.nix
index 1bb1c050171d..2ed00cbc7f7d 100644
--- a/pkgs/by-name/no/notmuch-bower/package.nix
+++ b/pkgs/by-name/no/notmuch-bower/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wangp";
     repo = "bower";
-    rev = version;
+    tag = version;
     sha256 = "sha256-CqA9JU/ujqIn/NvtbPtSWxKDYCv4oDdLCgbf2jj9Av4=";
   };
 
diff --git a/pkgs/by-name/no/notmuch-mailmover/package.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix
index ba4aadcc34d9..1477e9fc816f 100644
--- a/pkgs/by-name/no/notmuch-mailmover/package.nix
+++ b/pkgs/by-name/no/notmuch-mailmover/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "michaeladler";
     repo = "notmuch-mailmover";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v70R6CgN4RzG6L8LUg3ZvW895+G4eU8HZ0TI+jRxZ10=";
   };
 
diff --git a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix
index 39862609e894..6e21178096a9 100644
--- a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix
+++ b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "noto-emoji";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v1vLXs8peNF6S7iBLViAWQSW042lwIDqAjB270pRPF0=";
   };
 
diff --git a/pkgs/by-name/no/nova/package.nix b/pkgs/by-name/no/nova/package.nix
index 06cade043435..3643b7d61c78 100644
--- a/pkgs/by-name/no/nova/package.nix
+++ b/pkgs/by-name/no/nova/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7GAA5Kc5ximdf71Bd8Q5o2pXixLOobXykKxfI31j/4A=";
   };
 
diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix
index 96db76a40206..0bd50066aaeb 100644
--- a/pkgs/by-name/no/novelwriter/package.nix
+++ b/pkgs/by-name/no/novelwriter/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "vkbo";
     repo = "novelWriter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-262YMVqxSZv8G82amdRnHiW/5gnxkYyFSQDiS5gOdBE=";
   };
 
diff --git a/pkgs/by-name/no/novnc/package.nix b/pkgs/by-name/no/novnc/package.nix
index 455aba44f34c..0df4a7b62da1 100644
--- a/pkgs/by-name/no/novnc/package.nix
+++ b/pkgs/by-name/no/novnc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "novnc";
     repo = "noVNC";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VYG0p70ZvRzK9IeA+5J95FqF+zWgj/8EcxnVOk+YL9o=";
   };
 
diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix
index 3c9db899f070..5fa426cc5277 100644
--- a/pkgs/by-name/no/novops/package.nix
+++ b/pkgs/by-name/no/novops/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PierreBeucher";
     repo = "novops";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bpv8Ybrsb2CAV8Qxj69F2E/mekYsOuAiZWuDNHDtxw0=";
   };
 
diff --git a/pkgs/by-name/np/npkill/package.nix b/pkgs/by-name/np/npkill/package.nix
index 517da4bc26c8..7ed1bb930ddc 100644
--- a/pkgs/by-name/np/npkill/package.nix
+++ b/pkgs/by-name/np/npkill/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "voidcosmos";
     repo = "npkill";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0pouc+5kl5bjaNYz81OD5FZppYXKdyMBRvEq/DedEV4=";
   };
 
diff --git a/pkgs/by-name/np/npm-check/package.nix b/pkgs/by-name/np/npm-check/package.nix
index 2c4387a9dcd1..d461b4c4df25 100644
--- a/pkgs/by-name/np/npm-check/package.nix
+++ b/pkgs/by-name/np/npm-check/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "dylang";
     repo = "npm-check";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-F7bMvGqOxJzoaw25VR6D90UNwT8HxZ4PZhhQEvQFDn4=";
   };
 
diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix
index e9aae5f92a84..6fc12b1ff289 100644
--- a/pkgs/by-name/np/npm-lockfile-fix/package.nix
+++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jeslie0";
     repo = "npm-lockfile-fix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P93OowrVkkOfX5XKsRsg0c4dZLVn2ZOonJazPmHdD7g=";
   };
 
diff --git a/pkgs/by-name/nq/nq/package.nix b/pkgs/by-name/nq/nq/package.nix
index 28e2b1eefc7f..ec5ad294b9bd 100644
--- a/pkgs/by-name/nq/nq/package.nix
+++ b/pkgs/by-name/nq/nq/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "nq";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gdVBSE2a4rq46o0uO9ICww6zicVgn6ykf4CeJ/MmiF4=";
   };
 
diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix
index 5ee3a195490d..a28e34a60b8c 100644
--- a/pkgs/by-name/nr/nrr/package.nix
+++ b/pkgs/by-name/nr/nrr/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ryanccn";
     repo = "nrr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qh4YEfdfO6WofdrFHVDvkNocloK2LuWelfZPilxiKPk=";
   };
 
diff --git a/pkgs/by-name/nr/nrsc5/package.nix b/pkgs/by-name/nr/nrsc5/package.nix
index d15f1ca7c413..399ff8fc35b2 100644
--- a/pkgs/by-name/nr/nrsc5/package.nix
+++ b/pkgs/by-name/nr/nrsc5/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "theori-io";
     repo = "nrsc5";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09zzh3h1zzf2lwrbz3i7rif2hw36d9ska8irvxaa9lz6xc1y68pg";
   };
 
diff --git a/pkgs/by-name/ns/ns-usbloader/package.nix b/pkgs/by-name/ns/ns-usbloader/package.nix
index e06dd6f3b5d9..e2e33f9dc76d 100644
--- a/pkgs/by-name/ns/ns-usbloader/package.nix
+++ b/pkgs/by-name/ns/ns-usbloader/package.nix
@@ -26,7 +26,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "developersu";
     repo = "ns-usbloader";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gSf5SCIhcUEYGsYssXVGjUweVU+guxOI+lzD3ANr96w=";
   };
 
diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix
index c699118ca75e..8841efcc5476 100644
--- a/pkgs/by-name/ns/nsc/package.nix
+++ b/pkgs/by-name/ns/nsc/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-F/9yAF1vXG4eWMmS6l/qWqlEV8YkS7nihHN2vK3JFbE=";
   };
 
diff --git a/pkgs/by-name/ns/nsh/package.nix b/pkgs/by-name/ns/nsh/package.nix
index 1d378ac5b774..fe6f3210022b 100644
--- a/pkgs/by-name/ns/nsh/package.nix
+++ b/pkgs/by-name/ns/nsh/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nuta";
     repo = "nsh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1479wv8h5l2b0cwp27vpybq50nyvszhjxmn76n2bz3fchr0lrcbp";
   };
 
diff --git a/pkgs/by-name/ns/nsnake/package.nix b/pkgs/by-name/ns/nsnake/package.nix
index 78ff27090da4..1fbf90a65b8d 100644
--- a/pkgs/by-name/ns/nsnake/package.nix
+++ b/pkgs/by-name/ns/nsnake/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexdantas";
     repo = "nSnake";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MixwIhyymruruV8G8PjmR9EoZBpaDVBCKBccSFL0lS8=";
   };
 
diff --git a/pkgs/by-name/ns/nsncd/package.nix b/pkgs/by-name/ns/nsncd/package.nix
index a39f21e3d9ec..8bc9fea06132 100644
--- a/pkgs/by-name/ns/nsncd/package.nix
+++ b/pkgs/by-name/ns/nsncd/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "twosigma";
     repo = "nsncd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0cFCX5pKvYv6yr4+X5kXGz8clNi/LYndFtHaxSmHN+I=";
   };
 
diff --git a/pkgs/by-name/ns/nsq/package.nix b/pkgs/by-name/ns/nsq/package.nix
index f8290cf52916..ef4d63bb74d4 100644
--- a/pkgs/by-name/ns/nsq/package.nix
+++ b/pkgs/by-name/ns/nsq/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nsqio";
     repo = "nsq";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qoAp8yAc4lJmlnHHcZskRzkleZ3Q5Gu3Lhk9u1jMR4g=";
   };
 
diff --git a/pkgs/by-name/ns/nssmdns/package.nix b/pkgs/by-name/ns/nssmdns/package.nix
index f58f47b00b61..0790c52a8825 100644
--- a/pkgs/by-name/ns/nssmdns/package.nix
+++ b/pkgs/by-name/ns/nssmdns/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "avahi";
     repo = "nss-mdns";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iRaf9/gu9VkGi1VbGpxvC5q+0M8ivezCz/oAKEg5V1M=";
   };
 
diff --git a/pkgs/by-name/ns/nsync/package.nix b/pkgs/by-name/ns/nsync/package.nix
index 316775124b44..15cb0de61bf9 100644
--- a/pkgs/by-name/ns/nsync/package.nix
+++ b/pkgs/by-name/ns/nsync/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "nsync";
-    rev = version;
+    tag = version;
     hash = "sha256-RAwrS8Vz5fZwZRvF4OQfn8Ls11S8OIV2TmJpNrBE4MI=";
   };
 
diff --git a/pkgs/by-name/nt/ntfy/package.nix b/pkgs/by-name/nt/ntfy/package.nix
index 2cfbace33ecf..b19e63628048 100644
--- a/pkgs/by-name/nt/ntfy/package.nix
+++ b/pkgs/by-name/nt/ntfy/package.nix
@@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dschep";
     repo = "ntfy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
   };
 
diff --git a/pkgs/by-name/nt/ntfy/webpush.nix b/pkgs/by-name/nt/ntfy/webpush.nix
index 242a45052405..1cec412e2f6a 100644
--- a/pkgs/by-name/nt/ntfy/webpush.nix
+++ b/pkgs/by-name/nt/ntfy/webpush.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dschep";
     repo = "ntfy-webpush";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1dxlvq3glf8yjkn1hdk89rx1s4fi9ygg46yn866a9v7a5a83zx2n";
   };
 
diff --git a/pkgs/by-name/nt/ntirpc/package.nix b/pkgs/by-name/nt/ntirpc/package.nix
index f88180473f2f..f47f4849830c 100644
--- a/pkgs/by-name/nt/ntirpc/package.nix
+++ b/pkgs/by-name/nt/ntirpc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nfs-ganesha";
     repo = "ntirpc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-e4eF09xwX2Qf/y9YfOGy7p6yhDFnKGI5cnrQy3o8c98=";
   };
 
diff --git a/pkgs/by-name/nt/ntk/package.nix b/pkgs/by-name/nt/ntk/package.nix
index da570f2672ad..0f5c616bfa26 100644
--- a/pkgs/by-name/nt/ntk/package.nix
+++ b/pkgs/by-name/nt/ntk/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxaudio";
     repo = "ntk";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-NyEdg6e+9CI9V+TIgdpPyH1ei+Vq8pUxD3wPzWY5fEU=";
   };
 
diff --git a/pkgs/by-name/nt/ntpstat/package.nix b/pkgs/by-name/nt/ntpstat/package.nix
index 7293cf6925fa..da075b4486f7 100644
--- a/pkgs/by-name/nt/ntpstat/package.nix
+++ b/pkgs/by-name/nt/ntpstat/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mlichvar";
     repo = "ntpstat";
-    rev = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-dw6Pi+aB7uK65H0HL7q1vYnM5Dp0D+kG+ZIaiv8VH5I=";
   };
 
diff --git a/pkgs/by-name/nt/ntttcp/package.nix b/pkgs/by-name/nt/ntttcp/package.nix
index 4ff7ddcb2825..e79cbf287530 100644
--- a/pkgs/by-name/nt/ntttcp/package.nix
+++ b/pkgs/by-name/nt/ntttcp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "ntttcp-for-linux";
-    rev = version;
+    tag = version;
     sha256 = "sha256-6O7qSrR6EFr7k9lHQHGs/scZxJJ5DBNDxlSL5hzlRf4=";
   };
 
diff --git a/pkgs/by-name/nu/nudoku/package.nix b/pkgs/by-name/nu/nudoku/package.nix
index ca038ba13fd0..e997d330cb15 100644
--- a/pkgs/by-name/nu/nudoku/package.nix
+++ b/pkgs/by-name/nu/nudoku/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jubalh";
     repo = "nudoku";
-    rev = version;
+    tag = version;
     hash = "sha256-aOtP23kNd15DdV6on7o80QnEf0CiUBubHfFE8M1mhg0=";
   };
 
diff --git a/pkgs/by-name/nu/nullidentdmod/package.nix b/pkgs/by-name/nu/nullidentdmod/package.nix
index fb7782df00ee..948d704d142f 100644
--- a/pkgs/by-name/nu/nullidentdmod/package.nix
+++ b/pkgs/by-name/nu/nullidentdmod/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ranthrall";
     repo = "nullidentdmod";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ahwm5pyidc6m07rh5ls2lc25kafrj233nnbcybprgl7bqdq1b0k";
   };
 
diff --git a/pkgs/by-name/nu/nulloy/package.nix b/pkgs/by-name/nu/nulloy/package.nix
index 9355fcc1d24d..010905e00fb9 100644
--- a/pkgs/by-name/nu/nulloy/package.nix
+++ b/pkgs/by-name/nu/nulloy/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nulloy";
     repo = "nulloy";
-    rev = version;
+    tag = version;
     hash = "sha256-vFg789vBV7ks+4YiWWl3u0/kQjzpAiX8dMfXU0hynDM=";
   };
 
diff --git a/pkgs/by-name/nu/numactl/package.nix b/pkgs/by-name/nu/numactl/package.nix
index 331551d4b826..2d95ce67054b 100644
--- a/pkgs/by-name/nu/numactl/package.nix
+++ b/pkgs/by-name/nu/numactl/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numactl";
     repo = "numactl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ry29RUNa0Hv5gIhy2RTVT94mHhgfdIwb5aqjBycxxj0=";
   };
 
diff --git a/pkgs/by-name/nu/numatop/package.nix b/pkgs/by-name/nu/numatop/package.nix
index 16f5401f8838..b059482f0029 100644
--- a/pkgs/by-name/nu/numatop/package.nix
+++ b/pkgs/by-name/nu/numatop/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "numatop";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GJvTwqgx34ZW10eIJj/xiKe3ZkAfs7GlJImz8jrnjfI=";
   };
 
diff --git a/pkgs/by-name/nu/numix-cursor-theme/package.nix b/pkgs/by-name/nu/numix-cursor-theme/package.nix
index d7a41cc49c54..3032ff52c874 100644
--- a/pkgs/by-name/nu/numix-cursor-theme/package.nix
+++ b/pkgs/by-name/nu/numix-cursor-theme/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-cursor-theme";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1q3w5i0h3ly6i7s9pqjdrb14kp89i78s0havri7lhiqyxizjvcvh";
   };
 
diff --git a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
index 0ad1667395f3..96397623bc2c 100644
--- a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
+++ b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-icon-theme-circle";
-    rev = version;
+    tag = version;
     sha256 = "sha256-+gb4nyVNF6bjYCEiRq/L3wO4ZoUG4lt5l0vxye8inrQ=";
   };
 
diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix
index 5b04cac61faf..ba74d21799e5 100644
--- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix
+++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-icon-theme-square";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ivYuY9qcJsMqIpYSVPeu067fYWE6iFGYamU9riQBF4A=";
   };
 
diff --git a/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix b/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
index 4b7d6b0c7d62..9d896f58820b 100644
--- a/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
+++ b/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ferdi265";
     repo = "numix-solarized-gtk-theme";
-    rev = version;
+    tag = version;
     sha256 = "sha256-r5xCe8Ew+/SuCUaZ0yjlumORTy/y1VwbQQjQ6uEyGsY=";
   };
 
diff --git a/pkgs/by-name/nu/numworks-epsilon/package.nix b/pkgs/by-name/nu/numworks-epsilon/package.nix
index 337322bfb039..18d120ae7fe8 100644
--- a/pkgs/by-name/nu/numworks-epsilon/package.nix
+++ b/pkgs/by-name/nu/numworks-epsilon/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numworks";
     repo = "epsilon";
-    rev = version;
+    tag = version;
     hash = "sha256-w9ddcULE1MrGnYcXA0qOg1elQv/eBhcXqhMSjWT3Bkk=";
   };
 
diff --git a/pkgs/by-name/nu/nuraft/package.nix b/pkgs/by-name/nu/nuraft/package.nix
index 1176313a2805..748722d31910 100644
--- a/pkgs/by-name/nu/nuraft/package.nix
+++ b/pkgs/by-name/nu/nuraft/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eBay";
     repo = "NuRaft";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-puO8E7tSLqB0oq/NlzEZqQgIZKm7ZUb4HhR0XuI9dco=";
   };
 
diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix
index 0946695d21ad..7fb37fe1800e 100644
--- a/pkgs/by-name/nu/nurl/package.nix
+++ b/pkgs/by-name/nu/nurl/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nurl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rVqF+16esE27G7GS55RT91tD4x/GAzfVlIR0AgSknz0=";
   };
 
diff --git a/pkgs/by-name/nu/nuv/package.nix b/pkgs/by-name/nu/nuv/package.nix
index 0cd295b98b9c..126a07199311 100644
--- a/pkgs/by-name/nu/nuv/package.nix
+++ b/pkgs/by-name/nu/nuv/package.nix
@@ -25,7 +25,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "nuvolaris";
     repo = "nuv";
-    rev = version;
+    tag = version;
     hash = "sha256-MdnBvlA4S2Mi/bcbE+O02x+wvlIrsK1Zc0dySz4FB/w=";
   };
 
diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix
index aedeb2b39599..a9f4324f1a2e 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kHzwFnN/DbpOe1sYDJkrRMxXE1bMiyuCPsbPGq07M9g=";
   };
 
diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
index aa4f28e72e83..d1e154e66592 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "nvidia";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IH2OjaLbcKSGG44aggolAOuJkjk+GaXnnTbrXfZ0lVo=";
 
   };
diff --git a/pkgs/by-name/nv/nvidia-modprobe/package.nix b/pkgs/by-name/nv/nvidia-modprobe/package.nix
index 594e92923936..9816cc91c59f 100644
--- a/pkgs/by-name/nv/nvidia-modprobe/package.nix
+++ b/pkgs/by-name/nv/nvidia-modprobe/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nvidia-modprobe";
-    rev = version;
+    tag = version;
     hash = "sha256-6/1g66Mr0Ru4V3JMTRXet1aiNa0wrTIGw84QPrCO85c=";
   };
 
diff --git a/pkgs/by-name/nv/nvimpager/package.nix b/pkgs/by-name/nv/nvimpager/package.nix
index 9a4b8908b2d0..2a4b4928d60f 100644
--- a/pkgs/by-name/nv/nvimpager/package.nix
+++ b/pkgs/by-name/nv/nvimpager/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lucc";
     repo = "nvimpager";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Au9rRZMZfU4qHi/ng6JO8FnMpySKDbKzr75SBPY3QiA=";
   };
 
diff --git a/pkgs/by-name/nv/nvme-cli/package.nix b/pkgs/by-name/nv/nvme-cli/package.nix
index 39f2da237ed5..45c50f7a3de8 100644
--- a/pkgs/by-name/nv/nvme-cli/package.nix
+++ b/pkgs/by-name/nv/nvme-cli/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-nvme";
     repo = "nvme-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LkFYkfHeBKC/0kr33DKu7oXxXrtfu1YcpuwzRRWsHpc=";
   };
 
diff --git a/pkgs/by-name/nv/nvmetcfg/package.nix b/pkgs/by-name/nv/nvmetcfg/package.nix
index 3de6a040a0fc..85ebb8aa9f49 100644
--- a/pkgs/by-name/nv/nvmetcfg/package.nix
+++ b/pkgs/by-name/nv/nvmetcfg/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vifino";
     repo = "nvmetcfg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LoQTcHM6czzQ5ZwXcklFXf/7WlRsoJTF61UhQ56aleQ=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-bar/package.nix b/pkgs/by-name/nw/nwg-bar/package.nix
index 17ef7dea548b..c71f1b0c1aae 100644
--- a/pkgs/by-name/nw/nwg-bar/package.nix
+++ b/pkgs/by-name/nw/nwg-bar/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5N+WKZ+fuHQ0lVLd95/KkNAwzg/C4ImZ4DnSuKNGunk=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-dock/package.nix b/pkgs/by-name/nw/nwg-dock/package.nix
index c3cc4c19ea72..42ee4ab2f1e9 100644
--- a/pkgs/by-name/nw/nwg-dock/package.nix
+++ b/pkgs/by-name/nw/nwg-dock/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Ymk4lpX8RAxWot7U+cFtu1eJd6VHP+JS1I2vF0V1T70=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix
index f8be91ed1719..566c31f1d2ae 100644
--- a/pkgs/by-name/nw/nwg-drawer/package.nix
+++ b/pkgs/by-name/nw/nwg-drawer/package.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-drawer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uctM2fi3lfSrvKSinkjAXD3bLyJOVC0DTyDoAKXgB54=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-launchers/package.nix b/pkgs/by-name/nw/nwg-launchers/package.nix
index 2c79d969f26a..4e7b731e2281 100644
--- a/pkgs/by-name/nw/nwg-launchers/package.nix
+++ b/pkgs/by-name/nw/nwg-launchers/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-launchers";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+waoJHU/QrVH7o9qfwdvFTFJzTGLcV9CeYPn3XHEAkM=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-look/package.nix b/pkgs/by-name/nw/nwg-look/package.nix
index ad5a42a26d99..6fb94f1f697c 100644
--- a/pkgs/by-name/nw/nwg-look/package.nix
+++ b/pkgs/by-name/nw/nwg-look/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-look";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oP+qcOu03ZKQRdvPKCRVL187QP3gAg2dyvRO94N7+GE=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-menu/package.nix b/pkgs/by-name/nw/nwg-menu/package.nix
index 1499989b0451..0b438a1fa3b8 100644
--- a/pkgs/by-name/nw/nwg-menu/package.nix
+++ b/pkgs/by-name/nw/nwg-menu/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-menu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pWdLSoTeRgr5FPdBWMTVdsnijuwu8fLuNkyIRZ+JEe8=";
   };
 
diff --git a/pkgs/by-name/nw/nwipe/package.nix b/pkgs/by-name/nw/nwipe/package.nix
index b610921a5471..14f4ce0d62ef 100644
--- a/pkgs/by-name/nw/nwipe/package.nix
+++ b/pkgs/by-name/nw/nwipe/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martijnvanbrummelen";
     repo = "nwipe";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-idSIdq7DKhSwuR1xe9JEws0jIh1juCaz2eSeKvd85D4=";
   };
 
diff --git a/pkgs/by-name/nx/nx-libs/package.nix b/pkgs/by-name/nx/nx-libs/package.nix
index 616ab0ee164c..372dfb9b7ccb 100644
--- a/pkgs/by-name/nx/nx-libs/package.nix
+++ b/pkgs/by-name/nx/nx-libs/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ArcticaProject";
     repo = "nx-libs";
-    rev = version;
+    tag = version;
     sha256 = "sha256-qVOdD85sBMxKYx1cSLAGKeODsKKAm9UPBmYzPBbBOzQ=";
   };
 
diff --git a/pkgs/by-name/ny/nyancat/package.nix b/pkgs/by-name/ny/nyancat/package.nix
index e69cf3e6870a..890d1f8904ad 100644
--- a/pkgs/by-name/ny/nyancat/package.nix
+++ b/pkgs/by-name/ny/nyancat/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "klange";
     repo = "nyancat";
-    rev = version;
+    tag = version;
     sha256 = "1mg8nm5xzcq1xr8cvx24ym2vmafkw53rijllwcdm9miiz0p5ky9k";
   };
 
diff --git a/pkgs/by-name/oa/oak/package.nix b/pkgs/by-name/oa/oak/package.nix
index 3584fccfc394..65375d44a733 100644
--- a/pkgs/by-name/oa/oak/package.nix
+++ b/pkgs/by-name/oa/oak/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "thesephist";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DK5n8xK57CQiukyBt9+CFK1j8+nphP//T2jTXq64VH8=";
   };
 
diff --git a/pkgs/by-name/oa/oathkeeper/package.nix b/pkgs/by-name/oa/oathkeeper/package.nix
index 7801017c0df9..a4866a74fe58 100644
--- a/pkgs/by-name/oa/oathkeeper/package.nix
+++ b/pkgs/by-name/oa/oathkeeper/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "ory";
     repo = "oathkeeper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-R7xKhKF7mhS/vmSpOj+QDL0OBBWnh42X2Kr3TDQxVIo=";
   };
 
diff --git a/pkgs/by-name/oa/oatpp/package.nix b/pkgs/by-name/oa/oatpp/package.nix
index 92c52aa4a992..9be810131688 100644
--- a/pkgs/by-name/oa/oatpp/package.nix
+++ b/pkgs/by-name/oa/oatpp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oatpp";
     repo = "oatpp";
-    rev = version;
+    tag = version;
     sha256 = "sha256-pTQ0DD4naE9m+6FfCVGg/i3WpNbtaR+38yyqjqN0uH0=";
   };
 
diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix
index fa3492eaaf2f..3056c1f6b07e 100644
--- a/pkgs/by-name/oa/oauth2-proxy/package.nix
+++ b/pkgs/by-name/oa/oauth2-proxy/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
     repo = pname;
     owner = "oauth2-proxy";
     sha256 = "sha256-RT0uoNRFFZ3BNSwukGZ0P70jtDYAwUI1m+pzFyHnNjU=";
-    rev = "v${version}";
+    tag = "v${version}";
   };
 
   patches = [
diff --git a/pkgs/by-name/oa/oauth2c/package.nix b/pkgs/by-name/oa/oauth2c/package.nix
index cb75d2fc9060..9deee8604e19 100644
--- a/pkgs/by-name/oa/oauth2c/package.nix
+++ b/pkgs/by-name/oa/oauth2c/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudentity";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-axCzPCYPn6T8AGqE92Yf/aVJ78Wl004Ts4YebSWYa6U=";
   };
 
diff --git a/pkgs/by-name/oa/oauth2l/package.nix b/pkgs/by-name/oa/oauth2l/package.nix
index 692707d7c788..bc2cba792890 100644
--- a/pkgs/by-name/oa/oauth2l/package.nix
+++ b/pkgs/by-name/oa/oauth2l/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "oauth2l";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jD8VFyAq6qcQhgvMmJj3D1xWGUvq3tMISbztLf1a72I=";
   };
 
diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix
index 2777931a8361..ac1d40c7c1a0 100644
--- a/pkgs/by-name/ob/obs-cmd/package.nix
+++ b/pkgs/by-name/ob/obs-cmd/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "grigio";
     repo = "obs-cmd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-plNLVBSTen11q945qtDBJaNTWKGICbuWokyvRzhu0Wg=";
   };
 
diff --git a/pkgs/by-name/ob/obsidian-export/package.nix b/pkgs/by-name/ob/obsidian-export/package.nix
index 180a46361cb6..46ffc2d12887 100644
--- a/pkgs/by-name/ob/obsidian-export/package.nix
+++ b/pkgs/by-name/ob/obsidian-export/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zoni";
     repo = "obsidian-export";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FcySNccDVeftX5BKVwYXdufsCmG8YuFBQrbSqibbVV8=";
   };
 
diff --git a/pkgs/by-name/oc/ocaml-top/package.nix b/pkgs/by-name/oc/ocaml-top/package.nix
index dd9bed5dd17b..09ffa6621725 100644
--- a/pkgs/by-name/oc/ocaml-top/package.nix
+++ b/pkgs/by-name/oc/ocaml-top/package.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocaml-top";
-    rev = version;
+    tag = version;
     hash = "sha256-xmPGGB/zUpfeAxUIhR1PhfoESAJq7sTpqHuf++EH3Lw=";
   };
 
diff --git a/pkgs/by-name/oc/ocf-resource-agents/package.nix b/pkgs/by-name/oc/ocf-resource-agents/package.nix
index b16cfd631d14..faf8db25b9ca 100644
--- a/pkgs/by-name/oc/ocf-resource-agents/package.nix
+++ b/pkgs/by-name/oc/ocf-resource-agents/package.nix
@@ -30,7 +30,7 @@ let
     src = fetchFromGitHub {
       owner = "ClusterLabs";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "0haryi3yrszdfpqnkfnppxj1yiy6ipah6m80snvayc7v0ss0wnir";
     };
 
diff --git a/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix b/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
index 7814da4e5965..a3c2f5d70e1c 100644
--- a/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
+++ b/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "oci-seccomp-bpf-hook";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1LRwbKOLNBkY/TMTLlWq2lkFzCabXqwdaMRT9HNr6HE=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/oc/ocl-icd/package.nix b/pkgs/by-name/oc/ocl-icd/package.nix
index ba360ae32f75..6c5c0c000e2b 100644
--- a/pkgs/by-name/oc/ocl-icd/package.nix
+++ b/pkgs/by-name/oc/ocl-icd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OCL-dev";
     repo = "ocl-icd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-nx9Zz5DpS29g1HRIwPAQi6i+d7Blxd53WQ7Sb1a3FHg=";
   };
 
diff --git a/pkgs/by-name/oc/oclgrind/package.nix b/pkgs/by-name/oc/oclgrind/package.nix
index 4e21f36a6652..af73f223f712 100644
--- a/pkgs/by-name/oc/oclgrind/package.nix
+++ b/pkgs/by-name/oc/oclgrind/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jrprice";
     repo = "oclgrind";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DGCF7X2rPV1w9guxg2bMylRirXQgez24sG7Unlct3ow=";
   };
 
diff --git a/pkgs/by-name/oc/ocm/package.nix b/pkgs/by-name/oc/ocm/package.nix
index f9b2fa28dbad..e39090cb014f 100644
--- a/pkgs/by-name/oc/ocm/package.nix
+++ b/pkgs/by-name/oc/ocm/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openshift-online";
     repo = "ocm-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0JCmKuSVuSOinJiLDT4dOKNON6PnICum6Smnf3syJfM=";
   };
 
diff --git a/pkgs/by-name/oc/ocproxy/package.nix b/pkgs/by-name/oc/ocproxy/package.nix
index 55f69c702696..4a803552fd65 100644
--- a/pkgs/by-name/oc/ocproxy/package.nix
+++ b/pkgs/by-name/oc/ocproxy/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cernekee";
     repo = "ocproxy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "03323nnhb4y9nzwva04mq7xg03dvdrgp689g89f69jqc261skcqx";
   };
 
diff --git a/pkgs/by-name/oc/ocrodjvu/package.nix b/pkgs/by-name/oc/ocrodjvu/package.nix
index e42ceb81f101..9db146fcf811 100644
--- a/pkgs/by-name/oc/ocrodjvu/package.nix
+++ b/pkgs/by-name/oc/ocrodjvu/package.nix
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "FriedrichFroebel";
     repo = "ocrodjvu";
-    rev = version;
+    tag = version;
     hash = "sha256-EiMCrRFUAJbu9QLgKpFIKqigCZ77lpTDD6AvZuMbyhA=";
   };
 
diff --git a/pkgs/by-name/oc/ocsigen-i18n/package.nix b/pkgs/by-name/oc/ocsigen-i18n/package.nix
index 9ef1f8b35d54..646bf48741c8 100644
--- a/pkgs/by-name/oc/ocsigen-i18n/package.nix
+++ b/pkgs/by-name/oc/ocsigen-i18n/package.nix
@@ -13,7 +13,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "besport";
     repo = "ocsigen-i18n";
-    rev = version;
+    tag = version;
     hash = "sha256-NIl1YUTws8Ff4nrqdhU7oS/TN0lxVQgrtyEZtpS1ojM=";
   };
 
diff --git a/pkgs/by-name/oc/octomap/package.nix b/pkgs/by-name/oc/octomap/package.nix
index 433fbf92555e..a0be60333f7f 100644
--- a/pkgs/by-name/oc/octomap/package.nix
+++ b/pkgs/by-name/oc/octomap/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OctoMap";
     repo = "octomap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QxQHxxFciR6cvB/b8i0mr1hqGxOXhXmB4zgdsD977Mw=";
   };
 
diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix
index 3a75f033f772..e836c192dd8f 100644
--- a/pkgs/by-name/oc/octoprint/package.nix
+++ b/pkgs/by-name/oc/octoprint/package.nix
@@ -79,7 +79,7 @@ let
           src = fetchFromGitHub {
             owner = "OctoPrint";
             repo = "OctoPrint-FileCheck";
-            rev = version;
+            tag = version;
             sha256 = "sha256-Y7yvImnYahmrf5GC4c8Ki8IsOZ8r9I4uk8mYBhEQZ28=";
           };
           doCheck = false;
@@ -95,7 +95,7 @@ let
           src = fetchFromGitHub {
             owner = "OctoPrint";
             repo = "OctoPrint-FirmwareCheck";
-            rev = version;
+            tag = version;
             hash = "sha256-wqbD82bhJDrDawJ+X9kZkoA6eqGxqJc1Z5dA0EUwgEI=";
           };
           doCheck = false;
@@ -111,7 +111,7 @@ let
           src = fetchFromGitHub {
             owner = "OctoPrint";
             repo = "OctoPrint-PiSupport";
-            rev = version;
+            tag = version;
             hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew=";
           };
 
@@ -132,7 +132,7 @@ let
           src = fetchFromGitHub {
             owner = "OctoPrint";
             repo = "OctoPrint";
-            rev = version;
+            tag = version;
             hash = "sha256-BToW1/AcQ01OK7RWZrkstX2M4+uKuL/wFB6HGkVUflk=";
           };
 
diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix
index c5b076bd2428..8f027ceec5fd 100644
--- a/pkgs/by-name/oc/octoprint/plugins.nix
+++ b/pkgs/by-name/oc/octoprint/plugins.nix
@@ -32,7 +32,7 @@ in
     src = fetchFromGitHub {
       owner = "ntoff";
       repo = "Octoprint-M84MotOff";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "1w6h4hia286lbz2gy33rslq02iypx067yqn413xcipb07ivhvdq7";
     };
 
@@ -71,7 +71,7 @@ in
     src = fetchFromGitHub {
       owner = "jneilliii";
       repo = "OctoPrint-BedLevelVisualizer";
-      rev = version;
+      tag = version;
       sha256 = "sha256-6JcYvYgEmphp5zz4xZi4G0yTo4FCIR6Yh+MXYK7H7+w=";
     };
 
@@ -90,7 +90,7 @@ in
     src = fetchFromGitHub {
       owner = "OllisGit";
       repo = "OctoPrint-CostEstimation";
-      rev = version;
+      tag = version;
       sha256 = "sha256-04OPa/RpM8WehUmOp195ocsAjAvKdVY7iD5ybzQO7Dg=";
     };
 
@@ -109,7 +109,7 @@ in
     src = fetchFromGitHub {
       owner = "OctoPrint";
       repo = "OctoPrint-CuraEngineLegacy";
-      rev = version;
+      tag = version;
       sha256 = "sha256-54siSmzgPlnCRpkpZhXU9theNQ3hqL3j+Ip4Ie2w2vA=";
     };
 
@@ -128,7 +128,7 @@ in
     src = fetchFromGitHub {
       owner = "OctoPrint";
       repo = "OctoPrint-DisplayProgress";
-      rev = version;
+      tag = version;
       sha256 = "080prvfwggl4vkzyi369vxh1n8231hrl8a44f399laqah3dn5qw4";
     };
 
@@ -147,7 +147,7 @@ in
     src = fetchFromGitHub {
       owner = "OllisGit";
       repo = "OctoPrint-DisplayLayerProgress";
-      rev = version;
+      tag = version;
       sha256 = "sha256-hhHc2SPixZCPJzCP8enMMWNYaYbNZAU0lNSx1B0d++4=";
     };
 
@@ -185,7 +185,7 @@ in
     src = fetchFromGitHub {
       owner = "OctoPrint";
       repo = "OctoPrint-FirmwareUpdater";
-      rev = version;
+      tag = version;
       sha256 = "sha256-CUNjM/IJJS/lqccZ2B0mDOzv3k8AgmDreA/X9wNJ7iY=";
     };
 
@@ -206,7 +206,7 @@ in
     src = fetchFromGitHub {
       owner = "BillyBlaze";
       repo = "OctoPrint-FullScreen";
-      rev = version;
+      tag = version;
       sha256 = "sha256-Z8twpj+gqgbiWWxNd9I9qflEAln5Obpb3cn34KwSc5A=";
     };
 
@@ -225,7 +225,7 @@ in
     src = fetchFromGitHub {
       owner = "ieatacid";
       repo = "OctoPrint-GcodeEditor";
-      rev = version;
+      tag = version;
       sha256 = "sha256-1Sk2ri3DKW8q8VJ/scFjpRsz65Pwt8OEURP1k70aydE=";
     };
 
@@ -244,7 +244,7 @@ in
     src = fetchFromGitHub {
       owner = "costas-basdekis";
       repo = "MarlinGcodeDocumentation";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-3ay6iCxZk8QkFM/2Y14VTpPoxr6NXq14BFSHofn3q7I=";
     };
 
@@ -263,7 +263,7 @@ in
     src = fetchFromGitHub {
       owner = "OctoPrint";
       repo = "OctoPrint-MQTT";
-      rev = version;
+      tag = version;
       sha256 = "sha256-K8DydzmsDzWn5GXpxPGvAHDFpgk/mbyVBflCgOoB94U=";
     };
 
@@ -284,7 +284,7 @@ in
     src = fetchFromGitHub {
       owner = "synman";
       repo = "OctoPrint-MqttChamberTemperature";
-      rev = version;
+      tag = version;
       sha256 = "sha256-CvNpi8HcBBUfCs3X8yflbhe0YCU0kW3u2ADSro/qnuI=";
     };
 
@@ -305,7 +305,7 @@ in
     src = fetchFromGitHub {
       owner = "imrahil";
       repo = "OctoPrint-NavbarTemp";
-      rev = version;
+      tag = version;
       sha256 = "sha256-ZPpTx+AadRffUb53sZbMUbCZa7xYGQW/5si7UB8mnVI=";
     };
 
@@ -324,7 +324,7 @@ in
     src = fetchFromGitHub {
       owner = "TheSpaghettiDetective";
       repo = "OctoPrint-Obico";
-      rev = version;
+      tag = version;
       sha256 = "sha256-cAUXe/lRTqYuWnrRiNDuDjcayL5yV9/PtTd9oeSC8KA=";
     };
 
@@ -350,7 +350,7 @@ in
     src = fetchFromGitHub {
       owner = "gdombiak";
       repo = "OctoPrint-OctoPod";
-      rev = version;
+      tag = version;
       sha256 = "sha256-9QKC1MsYO3XihOTAijJUv5i20iMSQHOHPfLiYPV5y8s=";
     };
 
@@ -371,7 +371,7 @@ in
     src = fetchFromGitHub {
       owner = "eyal0";
       repo = "OctoPrint-PrintTimeGenius";
-      rev = version;
+      tag = version;
       sha256 = "sha256-hqm8RShCNpsVbrVXquat5VXqcVc7q5tn5+7Ipqmaw4U=";
     };
 
@@ -401,7 +401,7 @@ in
     src = fetchFromGitHub {
       owner = "jneilliii";
       repo = "OctoPrint-PrusaSlicerThumbnails";
-      rev = version;
+      tag = version;
       sha256 = "sha256-5TUx64i3VIUXtpIf4mo3hP//kXE+LuuLaZEJYgv4hVs=";
     };
 
@@ -422,7 +422,7 @@ in
     src = fetchFromGitHub {
       owner = "kantlivelong";
       repo = "OctoPrint-PSUControl";
-      rev = version;
+      tag = version;
       sha256 = "sha256-S+lPm85+ZEO/3BXYsrxE4FU29EGWzWrSw3y1DLdByrM=";
     };
 
@@ -450,7 +450,7 @@ in
     src = fetchFromGitHub {
       owner = "Renaud11232";
       repo = "OctoPrint-Resource-Monitor";
-      rev = version;
+      tag = version;
       sha256 = "sha256-w1PBxO+Qf7cSSNocu7BiulZE7kesSa+LGV3uJlmd0ao=";
     };
 
@@ -471,7 +471,7 @@ in
     src = fetchFromGitHub {
       owner = "Sebclem";
       repo = "OctoPrint-SimpleEmergencyStop";
-      rev = version;
+      tag = version;
       sha256 = "sha256-MbP3cKa9FPElQ/M8ykYh9kVXl8hNvmGiCHDvjgWvm9k=";
     };
 
@@ -509,7 +509,7 @@ in
     src = fetchFromGitHub {
       owner = "fabianonline";
       repo = "OctoPrint-Telegram";
-      rev = version;
+      tag = version;
       sha256 = "sha256-SckJCbPNCflgGYLHFiXy0juCtpvo8YS1BQsFpc1f5rg=";
     };
 
@@ -530,7 +530,7 @@ in
     src = fetchFromGitHub {
       owner = "Birkbjo";
       repo = "Octoprint-Themeify";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-om9IUSmxU8y0x8DrodW1EU/pilAN3+PbtYck6KfROEg=";
     };
 
@@ -549,7 +549,7 @@ in
     src = fetchFromGitHub {
       owner = "jneilliii";
       repo = "OctoPrint-TimelapsePurger";
-      rev = version;
+      tag = version;
       sha256 = "sha256-XS4m4KByScGTPfVE4kuRLw829gNE2CdM0RyhRqGGxyw=";
     };
 
@@ -568,7 +568,7 @@ in
     src = fetchFromGitHub {
       owner = "MoonshineSG";
       repo = "OctoPrint-TitleStatus";
-      rev = version;
+      tag = version;
       sha256 = "10nxjrixg0i6n6x8ghc1ndshm25c97bvkcis5j9kmlkkzs36i2c6";
     };
 
@@ -587,7 +587,7 @@ in
     src = fetchFromGitHub {
       owner = "BillyBlaze";
       repo = "OctoPrint-TouchUI";
-      rev = version;
+      tag = version;
       sha256 = "sha256-PNDCjY7FhfnwK7Nd86el9ZQ00G4uMANH2Sk080iMYXw=";
     };
 
@@ -606,7 +606,7 @@ in
     src = fetchFromGitHub {
       owner = "AliceGrey";
       repo = "OctoprintKlipperPlugin";
-      rev = version;
+      tag = version;
       sha256 = "sha256-6r5jJDSR0DxlDQ/XWmQgYUgeL1otNNBnwurX7bbcThg=";
     };
 
@@ -625,7 +625,7 @@ in
     src = fetchFromGitHub {
       owner = "FormerLurker";
       repo = "Octolapse";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-QP6PkKWKUv4uIaYdqTAsZmK7DVes94Q9K/DrBYrWxzY=";
     };
 
@@ -672,7 +672,7 @@ in
     src = fetchFromGitHub {
       owner = "StefanCohen";
       repo = "OctoPrint-Dashboard";
-      rev = version;
+      tag = version;
       sha256 = "sha256-hLHT3Uze/6PlOCEICVZ2ieFTyXgcqCvgHOlIIEquujg=";
     };
 
diff --git a/pkgs/by-name/oc/octopus-caller/package.nix b/pkgs/by-name/oc/octopus-caller/package.nix
index 87fae180408f..d1ab920c971b 100644
--- a/pkgs/by-name/oc/octopus-caller/package.nix
+++ b/pkgs/by-name/oc/octopus-caller/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "luntergroup";
     repo = "octopus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FAogksVxUlzMlC0BqRu22Vchj6VX+8yNlHRLyb3g1sE=";
   };
 
diff --git a/pkgs/by-name/oc/octosql/package.nix b/pkgs/by-name/oc/octosql/package.nix
index 51be01c38baf..58013f6293f6 100644
--- a/pkgs/by-name/oc/octosql/package.nix
+++ b/pkgs/by-name/oc/octosql/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cube2222";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kzbIts5d2KmFfaAnOdpIXI1fiqBYXe5t981g4Uyk/cc=";
   };
 
diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix
index 332329aac083..7c848e10e8f7 100644
--- a/pkgs/by-name/oc/oculante/package.nix
+++ b/pkgs/by-name/oc/oculante/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "woelper";
     repo = "oculante";
-    rev = version;
+    tag = version;
     hash = "sha256-3kDrsD24/TNcA7NkwwCHN4ez1bC5MP7g28H3jaO/M7E=";
   };
 
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/od/odo/package.nix b/pkgs/by-name/od/odo/package.nix
index 2ebfc08a7669..947383659434 100644
--- a/pkgs/by-name/od/odo/package.nix
+++ b/pkgs/by-name/od/odo/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "odo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zEN8yfjW3JHf6OzPQC6Rg2/hJ+3d9d2nYhz60BdSK9s=";
   };
 
diff --git a/pkgs/by-name/od/odoo15/package.nix b/pkgs/by-name/od/odoo15/package.nix
index c149bf1ee2bb..793f44c94761 100644
--- a/pkgs/by-name/od/odoo15/package.nix
+++ b/pkgs/by-name/od/odoo15/package.nix
@@ -20,7 +20,7 @@ let
         src = fetchFromGitHub {
           owner = "py-pdf";
           repo = "pypdf";
-          rev = version;
+          tag = version;
           fetchSubmodules = true;
           hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4=";
         };
diff --git a/pkgs/by-name/od/odp-dpdk/package.nix b/pkgs/by-name/od/odp-dpdk/package.nix
index 0c8ef1005e6f..546eda3fcc0e 100644
--- a/pkgs/by-name/od/odp-dpdk/package.nix
+++ b/pkgs/by-name/od/odp-dpdk/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenDataPlane";
     repo = "odp-dpdk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9stWGupRSQwUXOdPEQ9Rhkim22p5BBA5Z+2JCYS7Za0=";
   };
 
diff --git a/pkgs/by-name/od/odpic/package.nix b/pkgs/by-name/od/odpic/package.nix
index e4d51a46932c..a41bcde16a7c 100644
--- a/pkgs/by-name/od/odpic/package.nix
+++ b/pkgs/by-name/od/odpic/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "odpi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CvsQ/w5r0d/l0m6wkgZtVBkX66Hcrz4U3b8qpHM0Dm8=";
   };
 
diff --git a/pkgs/by-name/od/odyssey/package.nix b/pkgs/by-name/od/odyssey/package.nix
index 39766cf81224..e7165dc4c43c 100644
--- a/pkgs/by-name/od/odyssey/package.nix
+++ b/pkgs/by-name/od/odyssey/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yandex";
     repo = "odyssey";
-    rev = version;
+    tag = version;
     sha256 = "sha256-1ALTKRjpKmmFcAuhmgpcbJBkNuUlTyau8xWDRHh7gf0=";
   };
 
diff --git a/pkgs/by-name/of/offensive-azure/package.nix b/pkgs/by-name/of/offensive-azure/package.nix
index 0243bab6a458..69b2f7744520 100644
--- a/pkgs/by-name/of/offensive-azure/package.nix
+++ b/pkgs/by-name/of/offensive-azure/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "blacklanternsecurity";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5JHix+/uGGhXM89VLimI81g4evci5ZUtNV1c1xopjuI=";
   };
 
diff --git a/pkgs/by-name/of/office-code-pro/package.nix b/pkgs/by-name/of/office-code-pro/package.nix
index 4413664ead8f..baa0ba49a04e 100644
--- a/pkgs/by-name/of/office-code-pro/package.nix
+++ b/pkgs/by-name/of/office-code-pro/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nathco";
     repo = "Office-Code-Pro";
-    rev = version;
+    tag = version;
     hash = "sha256-qzKTXYswkithZUJT0a3IifCq4RJFeKciZAPhYr2U1X4=";
   };
 
diff --git a/pkgs/by-name/of/offlineimap/package.nix b/pkgs/by-name/of/offlineimap/package.nix
index 97cc447cedb4..64378169c390 100644
--- a/pkgs/by-name/of/offlineimap/package.nix
+++ b/pkgs/by-name/of/offlineimap/package.nix
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "OfflineIMAP";
     repo = "offlineimap3";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XLxKqO5OCXsFu8S3lMp2Ke5hp6uer9npZ3ujmL6Kb3g=";
   };
 
diff --git a/pkgs/by-name/oh/oh-my-git/package.nix b/pkgs/by-name/oh/oh-my-git/package.nix
index b7f08cffd885..b7fdfb774699 100644
--- a/pkgs/by-name/oh/oh-my-git/package.nix
+++ b/pkgs/by-name/oh/oh-my-git/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "git-learning-game";
     repo = "oh-my-git";
-    rev = version;
+    tag = version;
     sha256 = "sha256-XqxliMVU55D5JSt7Yo5btvZnnTlagSukyhXv6Akgklo=";
   };
 
diff --git a/pkgs/by-name/oh/oh/package.nix b/pkgs/by-name/oh/oh/package.nix
index 0277d0194405..d617a2c44064 100644
--- a/pkgs/by-name/oh/oh/package.nix
+++ b/pkgs/by-name/oh/oh/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "michaelmacinnis";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ryIh6MRIOVZPm2USpJC69Z/upIXGUHgcd17eZBA9Edc=";
   };
 
diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix
index 5f2eeb6492b2..14da79406dc8 100644
--- a/pkgs/by-name/oi/oidc-agent/package.nix
+++ b/pkgs/by-name/oi/oidc-agent/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "indigo-dc";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Vj/YoZpbiV8psU70i3SIKJM/qPQYuy96ogEhT8cG7RU=";
   };
 
diff --git a/pkgs/by-name/oi/oil-buku/package.nix b/pkgs/by-name/oi/oil-buku/package.nix
index 58ad6883843a..c18a082ba397 100644
--- a/pkgs/by-name/oi/oil-buku/package.nix
+++ b/pkgs/by-name/oi/oil-buku/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AndreiUlmeyda";
     repo = "oil";
-    rev = version;
+    tag = version;
     sha256 = "12g0fd7h11hh94b2pyg3pqwbf8bc7gcnrnm1qqbf18s6z02b6ixr";
   };
 
diff --git a/pkgs/by-name/oi/oink/package.nix b/pkgs/by-name/oi/oink/package.nix
index aac1061ba60e..fca7afae70fb 100644
--- a/pkgs/by-name/oi/oink/package.nix
+++ b/pkgs/by-name/oi/oink/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rlado";
     repo = "oink";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MBNEMIrpJdXzMjmNwmKXTIzPNNGalElhIxmMU4y6zXo=";
   };
 
diff --git a/pkgs/by-name/ok/okolors/package.nix b/pkgs/by-name/ok/okolors/package.nix
index 38af371921c0..02a4794e75f6 100644
--- a/pkgs/by-name/ok/okolors/package.nix
+++ b/pkgs/by-name/ok/okolors/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Ivordir";
     repo = "Okolors";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-U7rLynXZGHCeZjaXoXx2IRDgUFv7zOKfb4BPgDROzBc=";
   };
 
diff --git a/pkgs/by-name/ok/okta-aws-cli/package.nix b/pkgs/by-name/ok/okta-aws-cli/package.nix
index 10a9d4ea348c..f3b7ec3d5767 100644
--- a/pkgs/by-name/ok/okta-aws-cli/package.nix
+++ b/pkgs/by-name/ok/okta-aws-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "okta";
     repo = "okta-aws-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4S7pXPdHUgMNg+3bCsalEH9m9Hl15mX9IEl2eBqIWqA=";
   };
 
diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix
index 487b28c0d990..6726e5d529c4 100644
--- a/pkgs/by-name/ok/okteto/package.nix
+++ b/pkgs/by-name/ok/okteto/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
-    rev = version;
+    tag = version;
     hash = "sha256-vi2ow95a3btiR4yINunEa56SUGWlbgNdMdS/T747a+U=";
   };
 
diff --git a/pkgs/by-name/ol/olsrd/package.nix b/pkgs/by-name/ol/olsrd/package.nix
index e0b709dbf816..420f992fcca5 100644
--- a/pkgs/by-name/ol/olsrd/package.nix
+++ b/pkgs/by-name/ol/olsrd/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OLSR";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xk355dm5pfjil1j4m724vkdnc178lv6hi6s1g0xgpd59avbx90j";
   };
 
diff --git a/pkgs/by-name/om/omekasy/package.nix b/pkgs/by-name/om/omekasy/package.nix
index 313366cca936..8ff9c5d57f22 100644
--- a/pkgs/by-name/om/omekasy/package.nix
+++ b/pkgs/by-name/om/omekasy/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ikanago";
     repo = "omekasy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wI+xN6pyNoP4xknjHHDydHq275Gb1nyp7YtqmABlTBA=";
   };
 
diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix
index de52df25d619..65906e822225 100644
--- a/pkgs/by-name/om/omnictl/package.nix
+++ b/pkgs/by-name/om/omnictl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "omni";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/hv6YNaBfECFlf1xJCiSeWg+/PqmIa+Rtip6kFuHPCM=";
   };
 
diff --git a/pkgs/by-name/om/omping/package.nix b/pkgs/by-name/om/omping/package.nix
index 4e39e8294d83..214d97cdf48c 100644
--- a/pkgs/by-name/om/omping/package.nix
+++ b/pkgs/by-name/om/omping/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "omping";
-    rev = version;
+    tag = version;
     sha256 = "1f0vsbnhxp7bbgdnfqshryx3nhz2sqdnxdj068s0nmzsh53ckbf7";
   };
 
diff --git a/pkgs/by-name/on/one-click-backup/package.nix b/pkgs/by-name/on/one-click-backup/package.nix
index 26ae411f0fed..186423ca80bc 100644
--- a/pkgs/by-name/on/one-click-backup/package.nix
+++ b/pkgs/by-name/on/one-click-backup/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "dev-nis";
     repo = "nis-one-click-backup-qt";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-F+gA+Z4gZoNJYdy28uIjqiJcwcNsyUzl6BXsiIZO0gE=";
   };
 
diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix
index d03bc1e07943..f76931c620df 100644
--- a/pkgs/by-name/on/onedrivegui/package.nix
+++ b/pkgs/by-name/on/onedrivegui/package.nix
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bpozdena";
     repo = "OneDriveGUI";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pcY1JOi74pePvkIMRuHv5mlE4F68NzuBLJTCtgjUFRw=";
   };
 
diff --git a/pkgs/by-name/on/onedriver/package.nix b/pkgs/by-name/on/onedriver/package.nix
index 76c5ae58f0c3..1e9a2e6eb223 100644
--- a/pkgs/by-name/on/onedriver/package.nix
+++ b/pkgs/by-name/on/onedriver/package.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "jstaf";
     repo = "onedriver";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mA5otgqXQAw2UYUOJaC1zyJuzEu2OS/pxmjJnWsVdxs=";
   };
 in
diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix
index 6da20b868e16..0e71e2e1ffc6 100644
--- a/pkgs/by-name/on/onefetch/package.nix
+++ b/pkgs/by-name/on/onefetch/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "o2sh";
     repo = "onefetch";
-    rev = version;
+    tag = version;
     hash = "sha256-lQxv2gwZOGtxJrXjxvjBnbl225ppSs3cVNCfePFeqEE=";
   };
 
diff --git a/pkgs/by-name/on/oneshot/package.nix b/pkgs/by-name/on/oneshot/package.nix
index f7b57d070b72..6ab40b06b56a 100644
--- a/pkgs/by-name/on/oneshot/package.nix
+++ b/pkgs/by-name/on/oneshot/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "forestnode-io";
     repo = "oneshot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eEVjdFHZyk2bSVqrMJIsgZvvLoDOira8zTzX9oDNtHM=";
   };
 
diff --git a/pkgs/by-name/on/onetun/package.nix b/pkgs/by-name/on/onetun/package.nix
index 000163a2fdb6..1b78875b26dc 100644
--- a/pkgs/by-name/on/onetun/package.nix
+++ b/pkgs/by-name/on/onetun/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aramperes";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bggBBl2YQUncfOYIDsPgrHPwznCJQOlIOY3bbiZz7Rw=";
   };
 
diff --git a/pkgs/by-name/on/onmetal-image/package.nix b/pkgs/by-name/on/onmetal-image/package.nix
index 1ab6200b5370..7a12f949058c 100644
--- a/pkgs/by-name/on/onmetal-image/package.nix
+++ b/pkgs/by-name/on/onmetal-image/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "onmetal";
     repo = "onmetal-image";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KvOBvAIE9V2bj5prdcc8G5ifHsvybHBCYWrI4fWtdvE=";
   };
 
diff --git a/pkgs/by-name/on/onscripter-en/package.nix b/pkgs/by-name/on/onscripter-en/package.nix
index e333459d8ff9..50b2b325ac3d 100644
--- a/pkgs/by-name/on/onscripter-en/package.nix
+++ b/pkgs/by-name/on/onscripter-en/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "onscripter-en";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Lc5ZlH2C4ER02NmQ6icfiqpzVQdVUnOmdywGjjjSYSg=";
   };
 
diff --git a/pkgs/by-name/oo/oo7/package.nix b/pkgs/by-name/oo/oo7/package.nix
index a8423aafa988..c635c09aed5a 100644
--- a/pkgs/by-name/oo/oo7/package.nix
+++ b/pkgs/by-name/oo/oo7/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bilelmoussaoui";
     repo = "oo7";
-    rev = version;
+    tag = version;
     hash = "sha256-P20hxwTT/O4o+Z1LnXJJkeEHv1IILfj4/pPMNde55mY=";
   };
 
diff --git a/pkgs/by-name/oo/oonf-olsrd2/package.nix b/pkgs/by-name/oo/oonf-olsrd2/package.nix
index 8f64185dd51b..f8e389c3ec9d 100644
--- a/pkgs/by-name/oo/oonf-olsrd2/package.nix
+++ b/pkgs/by-name/oo/oonf-olsrd2/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OLSR";
     repo = "OONF";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7EH2K7gaBGD95WFlG6RRhKEWJm91Xv2GOHYQjZWuzl0=";
   };
 
diff --git a/pkgs/by-name/oo/ooniprobe-cli/package.nix b/pkgs/by-name/oo/ooniprobe-cli/package.nix
index 9c14e54425d8..2232ddf7e6cf 100644
--- a/pkgs/by-name/oo/ooniprobe-cli/package.nix
+++ b/pkgs/by-name/oo/ooniprobe-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ooni";
     repo = "probe-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jg09yIX3jHMp0PwSwy2RMwYhZm0haJFTmpwcyTc5I0A=";
   };
 
diff --git a/pkgs/by-name/op/opaline/package.nix b/pkgs/by-name/op/opaline/package.nix
index f65c5cd3634d..b1fca8f9e25d 100644
--- a/pkgs/by-name/op/opaline/package.nix
+++ b/pkgs/by-name/op/opaline/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jaapb";
     repo = "opaline";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6htaiFIcRMUYWn0U7zTNfCyDaTgDEvPch2q57qzvND4=";
   };
 
diff --git a/pkgs/by-name/op/opam-publish/package.nix b/pkgs/by-name/op/opam-publish/package.nix
index 994b7ecad4a1..3ac56dbcdcfa 100644
--- a/pkgs/by-name/op/opam-publish/package.nix
+++ b/pkgs/by-name/op/opam-publish/package.nix
@@ -24,7 +24,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-opam";
     repo = "opam-publish";
-    rev = version;
+    tag = version;
     hash = "sha256-HjMba80c4vOEm9p7r0cfFBf3y0XoFf986XjTDCPzn38=";
   };
 
diff --git a/pkgs/by-name/op/opam2json/package.nix b/pkgs/by-name/op/opam2json/package.nix
index 072042494793..5f70a796520c 100644
--- a/pkgs/by-name/op/opam2json/package.nix
+++ b/pkgs/by-name/op/opam2json/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "opam2json";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM=";
   };
 
diff --git a/pkgs/by-name/op/opcr-policy/package.nix b/pkgs/by-name/op/opcr-policy/package.nix
index 7a9d9eb298aa..22c7f15aa054 100644
--- a/pkgs/by-name/op/opcr-policy/package.nix
+++ b/pkgs/by-name/op/opcr-policy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "opcr-io";
     repo = "policy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vTUlC/LQTQEpzd1AXgcJJBZXmbSuX8JACbM60KVuT9E=";
   };
   vendorHash = "sha256-3KBHK9CKn9h45eq0wAwLivm3Lj3COGYn/zGltonLP9k=";
diff --git a/pkgs/by-name/op/opcua-commander/package.nix b/pkgs/by-name/op/opcua-commander/package.nix
index ac137b7fe184..e6ecdd748523 100644
--- a/pkgs/by-name/op/opcua-commander/package.nix
+++ b/pkgs/by-name/op/opcua-commander/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "node-opcua";
     repo = "opcua-commander";
-    rev = version;
+    tag = version;
     hash = "sha256-7KYwIdrhlvGR9RHZBfMFOcBa+opwx7Q/crCdvwZD6Y8=";
   };
 
diff --git a/pkgs/by-name/op/open-dyslexic/package.nix b/pkgs/by-name/op/open-dyslexic/package.nix
index 9df85f40a824..16fcb086062e 100644
--- a/pkgs/by-name/op/open-dyslexic/package.nix
+++ b/pkgs/by-name/op/open-dyslexic/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "antijingoist";
     repo = "opendyslexic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-a8hh8NGt5djj9EC7ChO3SnnjuYMOryzbHWTK4gC/vIw=";
   };
 
diff --git a/pkgs/by-name/op/open-fprintd/package.nix b/pkgs/by-name/op/open-fprintd/package.nix
index 1bdb2f2cade4..6720462f6e03 100644
--- a/pkgs/by-name/op/open-fprintd/package.nix
+++ b/pkgs/by-name/op/open-fprintd/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "uunicorn";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU=";
   };
 
diff --git a/pkgs/by-name/op/open-in-mpv/package.nix b/pkgs/by-name/op/open-in-mpv/package.nix
index 175f65d615e6..5e4c16deed89 100644
--- a/pkgs/by-name/op/open-in-mpv/package.nix
+++ b/pkgs/by-name/op/open-in-mpv/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Baldomo";
     repo = "open-in-mpv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mr1c2L5D1v+4VoPA4i5q7/RCdWLLZ1UfTGayiG5Nm6M=";
   };
 
diff --git a/pkgs/by-name/op/open-isns/package.nix b/pkgs/by-name/op/open-isns/package.nix
index 8488668da2b2..4ee7f33bde6d 100644
--- a/pkgs/by-name/op/open-isns/package.nix
+++ b/pkgs/by-name/op/open-isns/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "open-iscsi";
     repo = "open-isns";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-buqQMsoxRCbWiBDq0XAg93J7bjbdxeIernV8sDVxCAA=";
   };
 
diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 517bb13383e7..c40b392dce9b 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9pLySzYfLyRcbhKz+zusBFHNVnhtGyqlsrNr1AzDQx0=";
   };
 
diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix
index 7ae098af1898..098227a38607 100644
--- a/pkgs/by-name/op/open-scq30/package.nix
+++ b/pkgs/by-name/op/open-scq30/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Oppzippy";
     repo = "OpenSCQ30";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DL2hYm1j27K0nnBvE3iGnguqm0m1k56bkuG+6+u4u4c=";
   };
 
diff --git a/pkgs/by-name/op/open-stage-control/package.nix b/pkgs/by-name/op/open-stage-control/package.nix
index 7df60380a38f..1e85817b1a88 100644
--- a/pkgs/by-name/op/open-stage-control/package.nix
+++ b/pkgs/by-name/op/open-stage-control/package.nix
@@ -18,7 +18,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jean-emmanuel";
     repo = "open-stage-control";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hBQyz6VAtiC1XOADZml1MwGKtmdyiJNlRAmHRjt6QsA=";
   };
 
diff --git a/pkgs/by-name/op/openapi-changes/package.nix b/pkgs/by-name/op/openapi-changes/package.nix
index ad81688f85dd..5c4a9c9c0fb0 100644
--- a/pkgs/by-name/op/openapi-changes/package.nix
+++ b/pkgs/by-name/op/openapi-changes/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pb33f";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Z+jFfsreJYLdvxfFjmTr8SKHOV22iNDFKYUdi9/8QRI=";
   };
 
diff --git a/pkgs/by-name/op/openapi-tui/package.nix b/pkgs/by-name/op/openapi-tui/package.nix
index c660c55daafd..3d146b95a186 100644
--- a/pkgs/by-name/op/openapi-tui/package.nix
+++ b/pkgs/by-name/op/openapi-tui/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zaghaghi";
     repo = "openapi-tui";
-    rev = version;
+    tag = version;
     hash = "sha256-rC0lfWZpiiAAShyVDqr1gKTeWmWC+gVp4UmL96Y81mE=";
   };
 
diff --git a/pkgs/by-name/op/openbgpd/package.nix b/pkgs/by-name/op/openbgpd/package.nix
index a6decdcf8ff6..57eff21cf0a4 100644
--- a/pkgs/by-name/op/openbgpd/package.nix
+++ b/pkgs/by-name/op/openbgpd/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openbgpd-portable";
     repo = "openbgpd-portable";
-    rev = version;
+    tag = version;
     sha256 = "sha256-TKs6tt/SCWes6kYAGIrSShZgOLf7xKh26xG3Zk7wCCw=";
   };
 
diff --git a/pkgs/by-name/op/openboardview/package.nix b/pkgs/by-name/op/openboardview/package.nix
index c68764ee1f6a..cac2e5b52f6b 100644
--- a/pkgs/by-name/op/openboardview/package.nix
+++ b/pkgs/by-name/op/openboardview/package.nix
@@ -24,7 +24,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/opencbm/package.nix b/pkgs/by-name/op/opencbm/package.nix
index 88fc9aa8a15b..9f1a1d15d440 100644
--- a/pkgs/by-name/op/opencbm/package.nix
+++ b/pkgs/by-name/op/opencbm/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenCBM";
     repo = "OpenCBM";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5lj5F79Gbhrvi9dxKGobdyDyBLGcptAtxx9SANhLrKw=";
   };
 
diff --git a/pkgs/by-name/op/opencl-clhpp/package.nix b/pkgs/by-name/op/opencl-clhpp/package.nix
index 241c80190e18..d9dbcd047b11 100644
--- a/pkgs/by-name/op/opencl-clhpp/package.nix
+++ b/pkgs/by-name/op/opencl-clhpp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-CLHPP";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bIm4tGqwWX0IPKH3BwLgkf0T7YFrkN6vemYvdPrqUpw=";
   };
 
diff --git a/pkgs/by-name/op/opencollada/package.nix b/pkgs/by-name/op/opencollada/package.nix
index 58d743702fee..b30c14dcc2c0 100644
--- a/pkgs/by-name/op/opencollada/package.nix
+++ b/pkgs/by-name/op/opencollada/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCOLLADA";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w";
   };
 
diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix
index df42e0e4eef1..8b614272063c 100644
--- a/pkgs/by-name/op/opencommit/package.nix
+++ b/pkgs/by-name/op/opencommit/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "di-sukharev";
     repo = "opencommit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vmVOrNwUsgB3iBvO8QhpJfI2OO0Kb9ZthcAXVaQ2cBM=";
   };
 
diff --git a/pkgs/by-name/op/opencryptoki/package.nix b/pkgs/by-name/op/opencryptoki/package.nix
index 45e90cc1a346..51857c5ff15c 100644
--- a/pkgs/by-name/op/opencryptoki/package.nix
+++ b/pkgs/by-name/op/opencryptoki/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opencryptoki";
     repo = "opencryptoki";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5FcvwGTzsL0lYrSYGlbSY89s6OKzg+2TRlwHlJjdzXo=";
   };
 
diff --git a/pkgs/by-name/op/opendune/package.nix b/pkgs/by-name/op/opendune/package.nix
index 38727c388ebb..f8da063095bb 100644
--- a/pkgs/by-name/op/opendune/package.nix
+++ b/pkgs/by-name/op/opendune/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenDUNE";
     repo = "OpenDUNE";
-    rev = version;
+    tag = version;
     sha256 = "15rvrnszdy3db8s0dmb696l4isb3x2cpj7wcl4j09pdi59pc8p37";
   };
 
diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix
index 52648b3ae2d8..aea25cb6b83a 100644
--- a/pkgs/by-name/op/openfga-cli/package.nix
+++ b/pkgs/by-name/op/openfga-cli/package.nix
@@ -16,7 +16,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-p68dlo6U8cgwHzY6lkukSglNOAWtjAFwX163bpXCIl0=";
   };
 
diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 69c7e761b0f3..917896b747cd 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -16,7 +16,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "openfga";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Hg6mtePtaZ2Yg3ohDVEDFsZKcBDY24K2lb+avZHfqD8=";
   };
 
diff --git a/pkgs/by-name/op/openhmd/package.nix b/pkgs/by-name/op/openhmd/package.nix
index f2d8b845d7c2..d9f065314bab 100644
--- a/pkgs/by-name/op/openhmd/package.nix
+++ b/pkgs/by-name/op/openhmd/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenHMD";
     repo = "OpenHMD";
-    rev = version;
+    tag = version;
     sha256 = "1hkpdl4zgycag5k8njvqpx01apxmm8m8pvhlsxgxpqiqy9a38ccg";
   };
 
diff --git a/pkgs/by-name/op/openiscsi/package.nix b/pkgs/by-name/op/openiscsi/package.nix
index bf5dede122aa..ac88d4406d3f 100644
--- a/pkgs/by-name/op/openiscsi/package.nix
+++ b/pkgs/by-name/op/openiscsi/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "open-iscsi";
     repo = "open-iscsi";
-    rev = version;
+    tag = version;
     hash = "sha256-Xs2EiNSkRtAQPoagCAKl07VndYKDspGLchxMvsfvTi0=";
   };
 
diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix
index 8462ce052540..e042201e1cae 100644
--- a/pkgs/by-name/op/openjpeg/package.nix
+++ b/pkgs/by-name/op/openjpeg/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uclouvain";
     repo = "openjpeg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw=";
   };
 
diff --git a/pkgs/by-name/op/openjph/package.nix b/pkgs/by-name/op/openjph/package.nix
index 9067323c5bb6..19d73870776e 100644
--- a/pkgs/by-name/op/openjph/package.nix
+++ b/pkgs/by-name/op/openjph/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "aous72";
     repo = "openjph";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-pmFoaQC1WLqtxMkkC7myzkNk0zgQ90CzPFg+F1Y0a/k=";
   };
 
diff --git a/pkgs/by-name/op/openlibm/package.nix b/pkgs/by-name/op/openlibm/package.nix
index be0cb6996efc..5d3bd73b283b 100644
--- a/pkgs/by-name/op/openlibm/package.nix
+++ b/pkgs/by-name/op/openlibm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JuliaLang";
     repo = "openlibm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HFSRrTdIhbbSyeU/FSo5e2ZI5tff2ZDEFgYcI412ATU=";
   };
 
diff --git a/pkgs/by-name/op/openlierox/package.nix b/pkgs/by-name/op/openlierox/package.nix
index f1fa65c403de..accc6f1be66e 100644
--- a/pkgs/by-name/op/openlierox/package.nix
+++ b/pkgs/by-name/op/openlierox/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "albertz";
     repo = "openlierox";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-4ofjroEHlfrQitc7M+YTNWut0LGgntgQoOeBWU8nscY=";
   };
 
diff --git a/pkgs/by-name/op/openmm/package.nix b/pkgs/by-name/op/openmm/package.nix
index 0ffc4da34d1f..c0f817c337f5 100644
--- a/pkgs/by-name/op/openmm/package.nix
+++ b/pkgs/by-name/op/openmm/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openmm";
     repo = "openmm";
-    rev = version;
+    tag = version;
     hash = "sha256-p0zjr8ONqGK4Vbnhljt16DeyeZ0bR1kE+YdiIlw/1L0=";
   };
 
diff --git a/pkgs/by-name/op/openmolcas/package.nix b/pkgs/by-name/op/openmolcas/package.nix
index 35d244cec9a0..736116deb25b 100644
--- a/pkgs/by-name/op/openmolcas/package.nix
+++ b/pkgs/by-name/op/openmolcas/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "Molcas";
     repo = "OpenMolcas";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LXxr/xqBHG7a0rOBrb8IMZ4IjZak3NsBw40Qf+z1fic=";
   };
 
diff --git a/pkgs/by-name/op/openorienteering-mapper/package.nix b/pkgs/by-name/op/openorienteering-mapper/package.nix
index e13124d94dac..7bfe0cb4d679 100644
--- a/pkgs/by-name/op/openorienteering-mapper/package.nix
+++ b/pkgs/by-name/op/openorienteering-mapper/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenOrienteering";
     repo = "mapper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BQbryRV5diBkOtva9sYuLD8yo3IwFqrkz3qC+C6eEfE=";
   };
 
diff --git a/pkgs/by-name/op/openresolv/package.nix b/pkgs/by-name/op/openresolv/package.nix
index f1bbd9640491..c9eba46b09e4 100644
--- a/pkgs/by-name/op/openresolv/package.nix
+++ b/pkgs/by-name/op/openresolv/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NetworkConfiguration";
     repo = "openresolv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rpfzAIzuiO+QTFhN+tHND+OQOyX/GUPvLLX3CSSwqA4=";
   };
 
diff --git a/pkgs/by-name/op/openrussian-cli/package.nix b/pkgs/by-name/op/openrussian-cli/package.nix
index 64c15b8092b7..32372e890509 100644
--- a/pkgs/by-name/op/openrussian-cli/package.nix
+++ b/pkgs/by-name/op/openrussian-cli/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rhaberkorn";
     repo = "openrussian-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-lu13Dd3D4P/7Yol1ixt86BHk86y8DMsbFzfi244+KuY=";
   };
 
diff --git a/pkgs/by-name/op/opensaml-cpp/package.nix b/pkgs/by-name/op/opensaml-cpp/package.nix
index 9eac6e3074da..09a73fe6f1f3 100644
--- a/pkgs/by-name/op/opensaml-cpp/package.nix
+++ b/pkgs/by-name/op/opensaml-cpp/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.shibboleth.net/git/cpp-opensaml.git";
-    rev = version;
+    tag = version;
     sha256 = "0ms3sqmwqkrqb92d7jy2hqwnz5yd7cbrz73n321jik0jilrwl5w8";
   };
 
diff --git a/pkgs/by-name/op/openscap/package.nix b/pkgs/by-name/op/openscap/package.nix
index 92df65d4a402..2c33ccb12b81 100644
--- a/pkgs/by-name/op/openscap/package.nix
+++ b/pkgs/by-name/op/openscap/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenSCAP";
     repo = "openscap";
-    rev = version;
+    tag = version;
     hash = "sha256-omPGm3VSLmwEIzInIORLfJf7wreRyxbDOXTRl05mAz0=";
   };
 
diff --git a/pkgs/by-name/op/openseachest/package.nix b/pkgs/by-name/op/openseachest/package.nix
index 94b42f0f2bfe..fd673c9dcf5f 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-1vfWX6uTQcM6K6wu9Ygu2xZV4nXm6VnwNHmQ2ceh62s=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/op/opensearch-cli/package.nix b/pkgs/by-name/op/opensearch-cli/package.nix
index 7a5c5d40cb7a..5fc5e0c09b85 100644
--- a/pkgs/by-name/op/opensearch-cli/package.nix
+++ b/pkgs/by-name/op/opensearch-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "opensearch-cli";
     owner = "opensearch-project";
-    rev = version;
+    tag = version;
     hash = "sha256-Ah64a9hpc2tnIXiwxg/slE6fUTAoHv9koNmlUHrVj/s=";
   };
 
diff --git a/pkgs/by-name/op/opensm/package.nix b/pkgs/by-name/op/opensm/package.nix
index 8da103bce1d0..a495387d8ce8 100644
--- a/pkgs/by-name/op/opensm/package.nix
+++ b/pkgs/by-name/op/opensm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-rdma";
     repo = "opensm";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/bqo5r9pVt7vg29xaRRO/9k21AMlmoe2327Ot5gVIwc=";
   };
 
diff --git a/pkgs/by-name/op/opensmt/package.nix b/pkgs/by-name/op/opensmt/package.nix
index f0cf8e61d24e..5206f64ad42e 100644
--- a/pkgs/by-name/op/opensmt/package.nix
+++ b/pkgs/by-name/op/opensmt/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "usi-verification-and-security";
     repo = "opensmt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zhNNnwc41B4sNq50kPub29EYhqV+FoDKRD/CLHnVyZw=";
   };
 
diff --git a/pkgs/by-name/op/opensoundmeter/package.nix b/pkgs/by-name/op/opensoundmeter/package.nix
index 8adcbdf70fbe..4981ced6cb87 100644
--- a/pkgs/by-name/op/opensoundmeter/package.nix
+++ b/pkgs/by-name/op/opensoundmeter/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psmokotnin";
     repo = "osm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-X/edRuYtZsvbs7Bl/JpJJPIGeQDEDH+FTQCX1Zy1osE=";
   };
 
diff --git a/pkgs/by-name/op/openspecfun/package.nix b/pkgs/by-name/op/openspecfun/package.nix
index 122fe6cd2e4a..7ccd70aff346 100644
--- a/pkgs/by-name/op/openspecfun/package.nix
+++ b/pkgs/by-name/op/openspecfun/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JuliaLang";
     repo = "openspecfun";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fx9z6bbU2V4x6Pr7/vmlSxkWxZ6qTYuPxnfqKLv08CA=";
   };
 
diff --git a/pkgs/by-name/op/opensupaplex/package.nix b/pkgs/by-name/op/opensupaplex/package.nix
index 66a2079282ce..93a54facc458 100644
--- a/pkgs/by-name/op/opensupaplex/package.nix
+++ b/pkgs/by-name/op/opensupaplex/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sergiou87";
     repo = "open-supaplex";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hP8dJlLXE5J/oxPhRkrrBl1Y5e9MYbJKi8OApFM3+GU=";
   };
 
diff --git a/pkgs/by-name/op/opentracing-cpp/package.nix b/pkgs/by-name/op/opentracing-cpp/package.nix
index 8f125e2bcbf4..c18df77b1a25 100644
--- a/pkgs/by-name/op/opentracing-cpp/package.nix
+++ b/pkgs/by-name/op/opentracing-cpp/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opentracing";
     repo = "opentracing-cpp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09wdwbz8gbjgyqi764cyb6aw72wng6hwk44xpl432gl7whrrysvi";
   };
 
diff --git a/pkgs/by-name/op/opentyrian/package.nix b/pkgs/by-name/op/opentyrian/package.nix
index d410694241e6..ae12217ab481 100644
--- a/pkgs/by-name/op/opentyrian/package.nix
+++ b/pkgs/by-name/op/opentyrian/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opentyrian";
     repo = "opentyrian";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fVcc8v1c9uU72X6afEo4VoMo6YuDECQSwDQ/TQjgwUY=";
   };
 
diff --git a/pkgs/by-name/op/openvi/package.nix b/pkgs/by-name/op/openvi/package.nix
index db796fed81cc..62d154d421ff 100644
--- a/pkgs/by-name/op/openvi/package.nix
+++ b/pkgs/by-name/op/openvi/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "johnsonjh";
     repo = "OpenVi";
-    rev = version;
+    tag = version;
     hash = "sha256-RqmulYHQFZmTHQAYgZmB8tAG6mSquNODmssfKB8YqDU=";
   };
 
diff --git a/pkgs/by-name/op/openzone-cursors/package.nix b/pkgs/by-name/op/openzone-cursors/package.nix
index 988b2115d4aa..278a5f9c519d 100644
--- a/pkgs/by-name/op/openzone-cursors/package.nix
+++ b/pkgs/by-name/op/openzone-cursors/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ducakar";
     repo = "openzone-cursors";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "02c536mc17ccsrzgma366k3wlm02ivklvr30fafxl981zgghlii4";
   };
 
diff --git a/pkgs/by-name/op/oppai-ng/package.nix b/pkgs/by-name/op/oppai-ng/package.nix
index ef4f850f7869..825d67a6cb35 100644
--- a/pkgs/by-name/op/oppai-ng/package.nix
+++ b/pkgs/by-name/op/oppai-ng/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Francesco149";
     repo = "oppai-ng";
-    rev = version;
+    tag = version;
     sha256 = "sha256-L9eraLOWm1tMImS8bLB9T4Md4VdTSxqI9Bt4r8eqxqs=";
   };
 
diff --git a/pkgs/by-name/op/ops/package.nix b/pkgs/by-name/op/ops/package.nix
index ae0ffffecc65..aec448db2d4a 100644
--- a/pkgs/by-name/op/ops/package.nix
+++ b/pkgs/by-name/op/ops/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nanovms";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-ac+17hywzyK7ChCP/nhwTP1WEIZ89+BKX9/YmsPpfg8=";
   };
 
diff --git a/pkgs/by-name/op/opustags/package.nix b/pkgs/by-name/op/opustags/package.nix
index 3f999d9513c8..67d2e5a45803 100644
--- a/pkgs/by-name/op/opustags/package.nix
+++ b/pkgs/by-name/op/opustags/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fmang";
     repo = "opustags";
-    rev = version;
+    tag = version;
     sha256 = "sha256-0lo+4VMYXGwXUuRxU1xZRxzlUQ4o4n/CDHXDM27FK44=";
   };
 
diff --git a/pkgs/by-name/oq/oq/package.nix b/pkgs/by-name/oq/oq/package.nix
index a44e86fd5d28..ec53d5c09762 100644
--- a/pkgs/by-name/oq/oq/package.nix
+++ b/pkgs/by-name/oq/oq/package.nix
@@ -15,7 +15,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "Blacksmoke16";
     repo = "oq";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-W0iGE1yVOphooiab689AFT3rhGGdXqEFyYIhrx11RTE=";
   };
 
diff --git a/pkgs/by-name/oq/oqs-provider/package.nix b/pkgs/by-name/oq/oqs-provider/package.nix
index 09fd6c0444b3..09b2cb89d659 100644
--- a/pkgs/by-name/oq/oqs-provider/package.nix
+++ b/pkgs/by-name/oq/oqs-provider/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "open-quantum-safe";
     repo = "oqs-provider";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-P3UEiWYchHVQ5s3JXHOzaDaN09K62pMYjnrW/gS5x/I=";
   };
 
diff --git a/pkgs/by-name/or/oranchelo-icon-theme/package.nix b/pkgs/by-name/or/oranchelo-icon-theme/package.nix
index fd23ec698945..fa86e14575d4 100644
--- a/pkgs/by-name/or/oranchelo-icon-theme/package.nix
+++ b/pkgs/by-name/or/oranchelo-icon-theme/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OrancheloTeam";
     repo = "oranchelo-icon-theme";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-IDsZj/X9rFSdDpa3bL6IPEPCRe5GustPteDxSbfz+SA=";
   };
 
diff --git a/pkgs/by-name/or/oranda/package.nix b/pkgs/by-name/or/oranda/package.nix
index 5cf56cc1bf9c..0aac13b872ef 100644
--- a/pkgs/by-name/or/oranda/package.nix
+++ b/pkgs/by-name/or/oranda/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "axodotdev";
     repo = "oranda";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FVd8NQVtzlZsDY40ZMJDdaX+6Q5jUxZHUq2v+kDFVOk=";
   };
 
diff --git a/pkgs/by-name/or/oras/package.nix b/pkgs/by-name/or/oras/package.nix
index 52f862548d8a..beb03526fbf5 100644
--- a/pkgs/by-name/or/oras/package.nix
+++ b/pkgs/by-name/or/oras/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "oras-project";
     repo = "oras";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iSmoD2HhzVrWQBaZ7HaIjcPmybl4JTVeVVfbn29i91Q=";
   };
 
diff --git a/pkgs/by-name/or/orcania/package.nix b/pkgs/by-name/or/orcania/package.nix
index c30a72ee16df..b828b156af9a 100644
--- a/pkgs/by-name/or/orcania/package.nix
+++ b/pkgs/by-name/or/orcania/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "babelouest";
     repo = "orcania";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Cz3IE5UrfoWjMxQ/+iR1bLsYxf5DVN+7aJqLBcPjduA=";
   };
 
diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix
index 3fc331e66434..3373babecd83 100644
--- a/pkgs/by-name/or/orchard/package.nix
+++ b/pkgs/by-name/or/orchard/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-XUZq9+hO1L+VjipR5cNeA7IJXP4mg/fxnV64pcyJWU8=";
     # 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/or/orchis-theme/package.nix b/pkgs/by-name/or/orchis-theme/package.nix
index fcb63679336b..1ad90375ce6f 100644
--- a/pkgs/by-name/or/orchis-theme/package.nix
+++ b/pkgs/by-name/or/orchis-theme/package.nix
@@ -43,7 +43,7 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks
     src = fetchFromGitHub {
       repo = "Orchis-theme";
       owner = "vinceliuice";
-      rev = version;
+      tag = version;
       hash = "sha256-K8FiS1AiFMhVaz2Jbr0pudQJGqpwBkQ/4NZdZACtM9Q=";
     };
 
diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix
index e6cb2d85ddfb..34cf38bda85f 100644
--- a/pkgs/by-name/or/ord/package.nix
+++ b/pkgs/by-name/or/ord/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ordinals";
     repo = "ord";
-    rev = version;
+    tag = version;
     hash = "sha256-95da/aoBhrQ/GaM4fojFufs6+OI2KLF6SGsSw6qtYUc=";
   };
 
diff --git a/pkgs/by-name/or/org-stats/package.nix b/pkgs/by-name/or/org-stats/package.nix
index 297c76095bfa..35fbe670af0b 100644
--- a/pkgs/by-name/or/org-stats/package.nix
+++ b/pkgs/by-name/or/org-stats/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "org-stats";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QTjJ+4Qu5u+5ZCoIAQBxqdhjNI2CXUB8r2Zx8xfIiGw=";
   };
 
diff --git a/pkgs/by-name/or/orjail/package.nix b/pkgs/by-name/or/orjail/package.nix
index 52e189b131d4..f311470c5056 100644
--- a/pkgs/by-name/or/orjail/package.nix
+++ b/pkgs/by-name/or/orjail/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "orjail";
     repo = "orjail";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "06bwqb3l7syy4c1d8xynxwakmdxvm3qfm8r834nidsknvpdckd9z";
   };
 
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 510b0c67dcae..a4cb1b9c3a2e 100644
--- a/pkgs/by-name/or/orogene/package.nix
+++ b/pkgs/by-name/or/orogene/package.nix
@@ -15,7 +15,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/osc-cli/package.nix b/pkgs/by-name/os/osc-cli/package.nix
index 3a024b86657c..db58d665a719 100644
--- a/pkgs/by-name/os/osc-cli/package.nix
+++ b/pkgs/by-name/os/osc-cli/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "outscale";
     repo = "osc-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7WXy+1NHwFvYmyi5xGfWpq/mbVGJ3WkgP5WQd5pvcC0=";
   };
 
diff --git a/pkgs/by-name/os/oscar/package.nix b/pkgs/by-name/os/oscar/package.nix
index 566a14cce6bb..d0185eacfa86 100644
--- a/pkgs/by-name/os/oscar/package.nix
+++ b/pkgs/by-name/os/oscar/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "CrimsonNape";
     repo = "OSCAR-code";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1rHgajjs+Vt9lcqkqKy92pWQLjvAHE10fPUTy8hurw4=";
   };
 
diff --git a/pkgs/by-name/os/oscclip/package.nix b/pkgs/by-name/os/oscclip/package.nix
index 349079d35329..f96ab4aeef47 100644
--- a/pkgs/by-name/os/oscclip/package.nix
+++ b/pkgs/by-name/os/oscclip/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rumpelsepp";
     repo = "oscclip";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WQvZn+SWamEqEXPutIZVDZTIczybtHUG9QsN8XxUeg8=";
   };
 
diff --git a/pkgs/by-name/os/osdlyrics/package.nix b/pkgs/by-name/os/osdlyrics/package.nix
index d470003be751..72cfc2aa7377 100644
--- a/pkgs/by-name/os/osdlyrics/package.nix
+++ b/pkgs/by-name/os/osdlyrics/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osdlyrics";
     repo = "osdlyrics";
-    rev = version;
+    tag = version;
     hash = "sha256-4jEF1LdMwaLNF6zvzAuGW8Iu4dzhrFLutX69LwSjTAI=";
   };
 
diff --git a/pkgs/by-name/os/osgqt/package.nix b/pkgs/by-name/os/osgqt/package.nix
index 12e88648edd8..e90b97ee7184 100644
--- a/pkgs/by-name/os/osgqt/package.nix
+++ b/pkgs/by-name/os/osgqt/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "openscenegraph";
     repo = "osgQt";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-iUeIqRDlcAHdKXWAi4WhEaOCxa7ZivQw0K5E7ccEKnM=";
   };
 
diff --git a/pkgs/by-name/os/oshka/package.nix b/pkgs/by-name/os/oshka/package.nix
index 4727b3ab1e1e..99d5cb68e438 100644
--- a/pkgs/by-name/os/oshka/package.nix
+++ b/pkgs/by-name/os/oshka/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fpWhqFK5h/U7DCC/SyhAlMyCMhjZHRLMlwakvlhOd3w=";
   };
 
diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix
index d4fbb130bea9..a45df6ba7493 100644
--- a/pkgs/by-name/os/osm2pgsql/package.nix
+++ b/pkgs/by-name/os/osm2pgsql/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "osm2pgsql-dev";
     repo = "osm2pgsql";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-+EFvYloLm/cDOflqj6ZIgjFoljKhYBVIKxD8L9j2Hj4=";
   };
 
diff --git a/pkgs/by-name/os/osm2xmap/package.nix b/pkgs/by-name/os/osm2xmap/package.nix
index 292b4884711a..278cb4c49de5 100644
--- a/pkgs/by-name/os/osm2xmap/package.nix
+++ b/pkgs/by-name/os/osm2xmap/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "1d3f18wzk240yp0q8i2vskhcfj5ar61s4hw83vgps0wr2aglph3w";
     repo = "osm2xmap";
     owner = "sembruk";
-    rev = "v${version}";
+    tag = "v${version}";
   };
 
   makeFlags = [
diff --git a/pkgs/by-name/os/osmid/package.nix b/pkgs/by-name/os/osmid/package.nix
index 57257882b810..9982dd6139af 100644
--- a/pkgs/by-name/os/osmid/package.nix
+++ b/pkgs/by-name/os/osmid/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "llloret";
     repo = "osmid";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1s1wsrp6g6wb0y61xzxvaj59mwycrgy52r4h456086zkz10ls6hw";
   };
 
diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix
index 74aff521c2e0..074a982aba04 100644
--- a/pkgs/by-name/os/osmo-bsc/package.nix
+++ b/pkgs/by-name/os/osmo-bsc/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-bsc";
-    rev = version;
+    tag = version;
     hash = "sha256-wQtGyqqaEW+mM6Eg85N+i3ZiKC/Z6wxYk2Wwvz7qOFw=";
   };
 
diff --git a/pkgs/by-name/os/osmo-bts/package.nix b/pkgs/by-name/os/osmo-bts/package.nix
index 9605c11a9bb5..5d0ddc4f6645 100644
--- a/pkgs/by-name/os/osmo-bts/package.nix
+++ b/pkgs/by-name/os/osmo-bts/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-bts";
-    rev = version;
+    tag = version;
     hash = "sha256-SvlkIvdyrXlaSJl+LbHovhIlnxsxpufJCy1wVCZbjWM=";
   };
 
diff --git a/pkgs/by-name/os/osmo-ggsn/package.nix b/pkgs/by-name/os/osmo-ggsn/package.nix
index 0c77a8b75f10..39c1bbec27bc 100644
--- a/pkgs/by-name/os/osmo-ggsn/package.nix
+++ b/pkgs/by-name/os/osmo-ggsn/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-ggsn";
-    rev = version;
+    tag = version;
     hash = "sha256-qsBjoLyMlRgUjhX1tyI/MoHGmww1XUT3OMH4dVZzLU4=";
   };
 
diff --git a/pkgs/by-name/os/osmo-hlr/package.nix b/pkgs/by-name/os/osmo-hlr/package.nix
index b60842c69724..74b206efbf56 100644
--- a/pkgs/by-name/os/osmo-hlr/package.nix
+++ b/pkgs/by-name/os/osmo-hlr/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-hlr";
-    rev = version;
+    tag = version;
     hash = "sha256-yi4sgcX8WOWz7qw/jGvVCtIYe867uBzLps8gdG6ziOA=";
   };
 
diff --git a/pkgs/by-name/os/osmo-hnbgw/package.nix b/pkgs/by-name/os/osmo-hnbgw/package.nix
index 2713c05d0a06..86d15d58f158 100644
--- a/pkgs/by-name/os/osmo-hnbgw/package.nix
+++ b/pkgs/by-name/os/osmo-hnbgw/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-hnbgw";
-    rev = version;
+    tag = version;
     hash = "sha256-OWCAiU4mK57e5gm6QOovwmoFAaCG1d8ZYpkP4isIqvI=";
   };
 
diff --git a/pkgs/by-name/os/osmo-hnodeb/package.nix b/pkgs/by-name/os/osmo-hnodeb/package.nix
index 751077fb85b4..27b4c84a4480 100644
--- a/pkgs/by-name/os/osmo-hnodeb/package.nix
+++ b/pkgs/by-name/os/osmo-hnodeb/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-hnodeb";
-    rev = version;
+    tag = version;
     hash = "sha256-Izivyw2HqRmrM68ehGqlIkJeuZ986d1WQ0yr6NWWTdA=";
   };
 
diff --git a/pkgs/by-name/os/osmo-iuh/package.nix b/pkgs/by-name/os/osmo-iuh/package.nix
index 367d294feb09..322f0e2f4b16 100644
--- a/pkgs/by-name/os/osmo-iuh/package.nix
+++ b/pkgs/by-name/os/osmo-iuh/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-iuh";
-    rev = version;
+    tag = version;
     hash = "sha256-3ADn0GSoXPXL1gD79JjD2hXNBN/v8aaEKgf5qFNGEJs=";
   };
 
diff --git a/pkgs/by-name/os/osmo-mgw/package.nix b/pkgs/by-name/os/osmo-mgw/package.nix
index a25754a68783..7aba2e708b50 100644
--- a/pkgs/by-name/os/osmo-mgw/package.nix
+++ b/pkgs/by-name/os/osmo-mgw/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-mgw";
-    rev = version;
+    tag = version;
     hash = "sha256-Y/98K81US6McNu+JEJtMluJTvsv0DHJiyjMPJz8/35o=";
   };
 
diff --git a/pkgs/by-name/os/osmo-msc/package.nix b/pkgs/by-name/os/osmo-msc/package.nix
index b4d65a85d73e..d4245c27b676 100644
--- a/pkgs/by-name/os/osmo-msc/package.nix
+++ b/pkgs/by-name/os/osmo-msc/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-msc";
-    rev = version;
+    tag = version;
     hash = "sha256-iS/N0+KhgMUFoJus/R/iFOLuvqCiceNtcuq3nbOvBts=";
   };
 
diff --git a/pkgs/by-name/os/osmo-pcu/package.nix b/pkgs/by-name/os/osmo-pcu/package.nix
index 20068b05ef3f..ee8c118646e0 100644
--- a/pkgs/by-name/os/osmo-pcu/package.nix
+++ b/pkgs/by-name/os/osmo-pcu/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-pcu";
-    rev = version;
+    tag = version;
     hash = "sha256-UCgnBE+Sm9MTLteo/B5Ha9I64mfKxbO61B8QA4qJdLE=";
   };
 
diff --git a/pkgs/by-name/os/osmo-sgsn/package.nix b/pkgs/by-name/os/osmo-sgsn/package.nix
index 96f9d7a03c10..a25505158dd0 100644
--- a/pkgs/by-name/os/osmo-sgsn/package.nix
+++ b/pkgs/by-name/os/osmo-sgsn/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-sgsn";
-    rev = version;
+    tag = version;
     hash = "sha256-ht8ejeD2whV0Ww5G3coUntLrIp2S0gZBRS6kF7w9KZY=";
   };
 
diff --git a/pkgs/by-name/os/osmo-sip-connector/package.nix b/pkgs/by-name/os/osmo-sip-connector/package.nix
index a02714a2ef7d..bd4c6b9b3ecb 100644
--- a/pkgs/by-name/os/osmo-sip-connector/package.nix
+++ b/pkgs/by-name/os/osmo-sip-connector/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-sip-connector";
-    rev = version;
+    tag = version;
     hash = "sha256-NmjaN28NnAIpMwUHCUS+7LJBwvCp48kyhmHRf6cU5WE=";
   };
 
diff --git a/pkgs/by-name/os/osmtogeojson/package.nix b/pkgs/by-name/os/osmtogeojson/package.nix
index 34a80a73b80b..a237a37bccdb 100644
--- a/pkgs/by-name/os/osmtogeojson/package.nix
+++ b/pkgs/by-name/os/osmtogeojson/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "tyrasd";
     repo = "osmtogeojson";
-    rev = version;
+    tag = version;
     hash = "sha256-T6d/KQQGoXHgV0iNhOms8d9zfjYMfnBNwPLShrEkHG4=";
   };
 
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/osslsigncode/package.nix b/pkgs/by-name/os/osslsigncode/package.nix
index 1193f2b0e02b..56f12fc2c2d7 100644
--- a/pkgs/by-name/os/osslsigncode/package.nix
+++ b/pkgs/by-name/os/osslsigncode/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mtrojnar";
     repo = "osslsigncode";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ENMFhIVQhPL4FDW9Ne2YGR3sXjvW55NN1bErfr/kDZg=";
   };
 
diff --git a/pkgs/by-name/os/osv-detector/package.nix b/pkgs/by-name/os/osv-detector/package.nix
index 470197738dcb..30ea124b9c46 100644
--- a/pkgs/by-name/os/osv-detector/package.nix
+++ b/pkgs/by-name/os/osv-detector/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "G-Rath";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vIkLrKyDeMfRe/0EPhlKlHAO6XB0/OFY5mTUHeZbcg8=";
   };
 
diff --git a/pkgs/by-name/os/osxsnarf/package.nix b/pkgs/by-name/os/osxsnarf/package.nix
index aa4f22baa43e..a6a2e3409949 100644
--- a/pkgs/by-name/os/osxsnarf/package.nix
+++ b/pkgs/by-name/os/osxsnarf/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eraserhd";
     repo = "osxsnarf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1vpg39mpc5avnv1j0yfx0x2ncvv38slmm83zv6nmm7alfwfjr2ss";
   };
 
diff --git a/pkgs/by-name/ot/otadump/package.nix b/pkgs/by-name/ot/otadump/package.nix
index e1d5dcdbab23..97f945665db6 100644
--- a/pkgs/by-name/ot/otadump/package.nix
+++ b/pkgs/by-name/ot/otadump/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "crazystylus";
     repo = "otadump";
-    rev = version;
+    tag = version;
     hash = "sha256-4zPVcTU+0otV4EPQi80uSRkpRo9XzI0V3Kr17ugXX2U=";
   };
 
diff --git a/pkgs/by-name/ot/otel-cli/package.nix b/pkgs/by-name/ot/otel-cli/package.nix
index a3550e94225b..f790501b0bdb 100644
--- a/pkgs/by-name/ot/otel-cli/package.nix
+++ b/pkgs/by-name/ot/otel-cli/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "equinix-labs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JYi9CbP4mUhX0zNjhi6QlBzLKcj2zdPwlyBSIYKp6vk=";
   };
 
diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
index 16dc72a29d76..8e6ca5b15396 100644
--- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix
+++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CtrlSpice";
     repo = "otel-desktop-viewer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kMgcco4X7X9WoCCH8iZz5qGr/1dWPSeQOpruTSUnonI=";
   };
 
diff --git a/pkgs/by-name/ot/otf2bdf/package.nix b/pkgs/by-name/ot/otf2bdf/package.nix
index 110d81383845..65c715b157ed 100644
--- a/pkgs/by-name/ot/otf2bdf/package.nix
+++ b/pkgs/by-name/ot/otf2bdf/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jirutka";
     repo = "otf2bdf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HK9ZrnwKhhYcBvSl+3RwFD7m/WSaPkGKX6utXnk5k+A=";
   };
 
diff --git a/pkgs/by-name/ot/otfcc/package.nix b/pkgs/by-name/ot/otfcc/package.nix
index 820df7dac464..b93132312d5b 100644
--- a/pkgs/by-name/ot/otfcc/package.nix
+++ b/pkgs/by-name/ot/otfcc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "caryll";
     repo = "otfcc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1nrkzpqklfpqsccji4ans40rj88l80cv7dpxwx4g577xrvk13a0f";
   };
 
diff --git a/pkgs/by-name/ot/otpauth/package.nix b/pkgs/by-name/ot/otpauth/package.nix
index c129eb31ee5a..f11f4aa82ec0 100644
--- a/pkgs/by-name/ot/otpauth/package.nix
+++ b/pkgs/by-name/ot/otpauth/package.nix
@@ -11,7 +11,7 @@ buildGo124Module rec {
   src = fetchFromGitHub {
     owner = "dim13";
     repo = "otpauth";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gxFhuFOSiyE7FLWqTZzKPZzXerwK2PWy7Z0zshAJ4Yg=";
   };
 
diff --git a/pkgs/by-name/ot/otree/package.nix b/pkgs/by-name/ot/otree/package.nix
index dfe72757daa4..a7d052b4a2a5 100644
--- a/pkgs/by-name/ot/otree/package.nix
+++ b/pkgs/by-name/ot/otree/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fioncat";
     repo = "otree";
-    rev = version;
+    tag = version;
     hash = "sha256-WvoiTu6erNI5Cb9PSoHgL6+coIGWLe46pJVXBZHOLTE=";
   };
 
diff --git a/pkgs/by-name/ot/ots/package.nix b/pkgs/by-name/ot/ots/package.nix
index c88430e76097..10b9ce0c6273 100644
--- a/pkgs/by-name/ot/ots/package.nix
+++ b/pkgs/by-name/ot/ots/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sniptt-official";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GOCuH9yiVs3N3sHCCoSGaQkaaJs4NY/klNBRWjZGLE4=";
   };
 
diff --git a/pkgs/by-name/ot/ott/package.nix b/pkgs/by-name/ot/ott/package.nix
index a67c9fd0874e..bceadf1bcc7f 100644
--- a/pkgs/by-name/ot/ott/package.nix
+++ b/pkgs/by-name/ot/ott/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ott-lang";
     repo = "ott";
-    rev = version;
+    tag = version;
     hash = "sha256-S6EMQgEBrtXB9hTM7x6irZPsI9c9JHeuCk/9pcpQMNg=";
   };
 
diff --git a/pkgs/by-name/ot/otus-lisp/package.nix b/pkgs/by-name/ot/otus-lisp/package.nix
index 1de3f09f8f05..45dddf8cf671 100644
--- a/pkgs/by-name/ot/otus-lisp/package.nix
+++ b/pkgs/by-name/ot/otus-lisp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "yuriy-chumak";
     repo = "ol";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-5ixpTTXwJbLM2mJ/nwzjz0aKG/QGVLPScY8EaG7swGU=";
   };
 
diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix
index 86267edd9f50..5961a9e2b5c2 100644
--- a/pkgs/by-name/ou/ouch/package.nix
+++ b/pkgs/by-name/ou/ouch/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ouch-org";
     repo = "ouch";
-    rev = version;
+    tag = version;
     hash = "sha256-WO1fetu39fcLGcrbzFh+toHpnyxWuDVHtmjuH203hzQ=";
   };
 
diff --git a/pkgs/by-name/ou/oui/package.nix b/pkgs/by-name/ou/oui/package.nix
index 584de64b926e..59ec262a1605 100644
--- a/pkgs/by-name/ou/oui/package.nix
+++ b/pkgs/by-name/ou/oui/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "thatmattlove";
     repo = "oui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RLm8V2fLFvOwjnnq16ZmhwVdtgXPaehan7JTX3Xz30w=";
   };
 
diff --git a/pkgs/by-name/ou/outils/package.nix b/pkgs/by-name/ou/outils/package.nix
index 416bfc9abac9..bdf672c1717c 100644
--- a/pkgs/by-name/ou/outils/package.nix
+++ b/pkgs/by-name/ou/outils/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "outils";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FokJytwQsbGsryBzyglpb1Hg3wti/CPQTOfIGIz9ThA=";
   };
 
diff --git a/pkgs/by-name/ov/oven-media-engine/package.nix b/pkgs/by-name/ov/oven-media-engine/package.nix
index 9afc107d91fa..026a9be6e9e4 100644
--- a/pkgs/by-name/ov/oven-media-engine/package.nix
+++ b/pkgs/by-name/ov/oven-media-engine/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AirenSoft";
     repo = "OvenMediaEngine";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fYvP1mk32lrnYxWdpI1WqEUxAfHsQH3Ng0JLC/GbjrY=";
   };
 
diff --git a/pkgs/by-name/ov/overmind/package.nix b/pkgs/by-name/ov/overmind/package.nix
index 54bbc8153267..525131278a26 100644
--- a/pkgs/by-name/ov/overmind/package.nix
+++ b/pkgs/by-name/ov/overmind/package.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DarthSim";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wX29nFmzmbxbaXtwIWZNvueXFv9SKIOqexkc5pEITpw=";
   };
 
diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix
index 7b76d5fd1630..613b5563457d 100644
--- a/pkgs/by-name/ov/overskride/package.nix
+++ b/pkgs/by-name/ov/overskride/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     inherit owner;
     repo = name;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SqaPhub/HwZz7uBg/kevH8LvPDVLgRd/Rvi03ivNrRc=";
   };
 
diff --git a/pkgs/by-name/ov/oversteer/package.nix b/pkgs/by-name/ov/oversteer/package.nix
index f172c3196292..a89a031e3c4c 100644
--- a/pkgs/by-name/ov/oversteer/package.nix
+++ b/pkgs/by-name/ov/oversteer/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "berarma";
     repo = "oversteer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-X58U7lFH53nCaXnE7uXgV7aea6qntNfH5TIt68xSefY=";
   };
 
diff --git a/pkgs/by-name/ov/ovh-ttyrec/package.nix b/pkgs/by-name/ov/ovh-ttyrec/package.nix
index a639a90898eb..b23a771c104f 100644
--- a/pkgs/by-name/ov/ovh-ttyrec/package.nix
+++ b/pkgs/by-name/ov/ovh-ttyrec/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ovh";
     repo = "ovh-ttyrec";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VTF9WLwAIWWn+W0sLQaoFBFro+pSXKwcTO6q6MW6JD8=";
   };
 
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/ow/owl-lisp/package.nix b/pkgs/by-name/ow/owl-lisp/package.nix
index babd94dc0b3d..41832e0fdf40 100644
--- a/pkgs/by-name/ow/owl-lisp/package.nix
+++ b/pkgs/by-name/ow/owl-lisp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "owl-lisp";
     repo = "owl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo=";
   };
 
diff --git a/pkgs/by-name/ow/owncast/package.nix b/pkgs/by-name/ow/owncast/package.nix
index 66a2c11e9210..ee8c99f28cba 100644
--- a/pkgs/by-name/ow/owncast/package.nix
+++ b/pkgs/by-name/ow/owncast/package.nix
@@ -18,7 +18,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "owncast";
     repo = "owncast";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MdquhDdbOdP1shnKHBlzQrSDe41fp0qnMzgaqL89jTk=";
   };
   vendorHash = "sha256-ERilQZ8vnhGW1IEcLA4CcmozDooHKbnmASMw87tjYD4=";
diff --git a/pkgs/by-name/ow/owntracks-recorder/package.nix b/pkgs/by-name/ow/owntracks-recorder/package.nix
index ae5133cb46df..95dae27ad7c7 100644
--- a/pkgs/by-name/ow/owntracks-recorder/package.nix
+++ b/pkgs/by-name/ow/owntracks-recorder/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "owntracks";
     repo = "recorder";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-E4hdsUAg8NHjmUrlr8cskezib4qMv+wF32cThe2/kBc=";
   };
 
diff --git a/pkgs/by-name/ox/oxefmsynth/package.nix b/pkgs/by-name/ox/oxefmsynth/package.nix
index 54d4ff87250c..ce12f85ce6b7 100644
--- a/pkgs/by-name/ox/oxefmsynth/package.nix
+++ b/pkgs/by-name/ox/oxefmsynth/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oxesoft";
     repo = "oxefmsynth";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1rk71ls33a38wx8i22plsi7d89cqqxrfxknq5i4f9igsw1ipm4gn";
   };
 
diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix
index fc18cc37c64a..f6642cfc1a64 100644
--- a/pkgs/by-name/ox/oxide-rs/package.nix
+++ b/pkgs/by-name/ox/oxide-rs/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "oxidecomputer";
     repo = "oxide.rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NtTXpXDYazcXilQNW455UDkqMCFzFPvTUkbEBQsWIDo=";
     # leaveDotGit is necessary because `build.rs` expects git information which
     # is used to write a `built.rs` file which is read by the CLI application
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/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix
index 16fb274d0130..11b41f7390bc 100644
--- a/pkgs/by-name/p2/p2pool/package.nix
+++ b/pkgs/by-name/p2/p2pool/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+wkcTkHhGNanCznL5d9yUezi9wLIchxt6TPPpEUqgN8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/p9/p910nd/package.nix b/pkgs/by-name/p9/p910nd/package.nix
index f4a329b17624..3d10bef1e20d 100644
--- a/pkgs/by-name/p9/p910nd/package.nix
+++ b/pkgs/by-name/p9/p910nd/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kenyapcomau";
     repo = "p910nd";
-    rev = version;
+    tag = version;
     hash = "sha256-MM4o7d3L3XIRYWJ/KPM2OltlVfVA/BgMuyhJMm/BS3c=";
   };
 
diff --git a/pkgs/by-name/pa/pachyderm/package.nix b/pkgs/by-name/pa/pachyderm/package.nix
index bb9fe0ac5c56..04a7e699d245 100644
--- a/pkgs/by-name/pa/pachyderm/package.nix
+++ b/pkgs/by-name/pa/pachyderm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pachyderm";
     repo = "pachyderm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-S3om62ibp/hbpoY6seJ7RaRQeAzDNsThqfGDFC0SEQM=";
   };
 
diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix
index 9324880d9555..309184213134 100644
--- a/pkgs/by-name/pa/pack/package.nix
+++ b/pkgs/by-name/pa/pack/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = "pack";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0=";
   };
 
diff --git a/pkgs/by-name/pa/packer/package.nix b/pkgs/by-name/pa/packer/package.nix
index 9bb7f19c98bf..12ecb8a9229f 100644
--- a/pkgs/by-name/pa/packer/package.nix
+++ b/pkgs/by-name/pa/packer/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "packer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-19eaQs2f4zM3lXuQrWoS2S/tXWe3HdxXesjtVG67LFE=";
   };
 
diff --git a/pkgs/by-name/pa/packet-sd/package.nix b/pkgs/by-name/pa/packet-sd/package.nix
index 053aceffa748..b9c4e36556a1 100644
--- a/pkgs/by-name/pa/packet-sd/package.nix
+++ b/pkgs/by-name/pa/packet-sd/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "packethost";
     repo = "prometheus-packet-sd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2k8AsmyhQNNZCzpVt6JdgvI8IFb5pRi4ic6Yn2NqHMM=";
   };
 
diff --git a/pkgs/by-name/pa/packr/package.nix b/pkgs/by-name/pa/packr/package.nix
index 1a2ea2b74a9e..133091b4c619 100644
--- a/pkgs/by-name/pa/packr/package.nix
+++ b/pkgs/by-name/pa/packr/package.nix
@@ -15,7 +15,7 @@ let
       fetchFromGitHub {
         owner = "gobuffalo";
         repo = "packr";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ=";
       }
       + "/v2";
@@ -48,7 +48,7 @@ let
     src = fetchFromGitHub {
       owner = "gobuffalo";
       repo = "packr";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ=";
     };
 
diff --git a/pkgs/by-name/pa/paco/package.nix b/pkgs/by-name/pa/paco/package.nix
index 1aee35c2e486..cf2b2b748622 100644
--- a/pkgs/by-name/pa/paco/package.nix
+++ b/pkgs/by-name/pa/paco/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pacolang";
     repo = "paco";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sCU7cjmsUTrhf/7Lm3wBPKwk80SAhCfc4lrCBggspw8=";
   };
 
diff --git a/pkgs/by-name/pa/pacparser/package.nix b/pkgs/by-name/pa/pacparser/package.nix
index b3230107a1ac..d44b081a5457 100644
--- a/pkgs/by-name/pa/pacparser/package.nix
+++ b/pkgs/by-name/pa/pacparser/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "manugarg";
     repo = "pacparser";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-X842+xPjM404aQJTc2JwqU4vq8kgyKhpnqVu70pNLks=";
   };
 
diff --git a/pkgs/by-name/pa/pacproxy/package.nix b/pkgs/by-name/pa/pacproxy/package.nix
index 5bb1937f7aeb..b922999a4e97 100644
--- a/pkgs/by-name/pa/pacproxy/package.nix
+++ b/pkgs/by-name/pa/pacproxy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "williambailey";
     repo = "pacproxy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oDSptPihrDIiTCgcP4t2J3vJBNGMViyPAAmBv4ynLNU=";
   };
 
diff --git a/pkgs/by-name/pa/page/package.nix b/pkgs/by-name/pa/page/package.nix
index 2ec2c312dd54..c0537d74e306 100644
--- a/pkgs/by-name/pa/page/package.nix
+++ b/pkgs/by-name/pa/page/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "I60R";
     repo = "page";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uNdtgx9/9+KOfQvHiKNrT8NFWtR2tfJuI2bMwywBC/4=";
   };
 
diff --git a/pkgs/by-name/pa/pagmo2/package.nix b/pkgs/by-name/pa/pagmo2/package.nix
index 1948ad97b4df..b1cefef514e6 100644
--- a/pkgs/by-name/pa/pagmo2/package.nix
+++ b/pkgs/by-name/pa/pagmo2/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "esa";
     repo = "pagmo2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ido3e0hQLDEPT0AmsfAVTPlGbWe5QBkxgRO6Fg1wp/c=";
   };
 
diff --git a/pkgs/by-name/pa/pairdrop/package.nix b/pkgs/by-name/pa/pairdrop/package.nix
index d4b2aa08b70c..423cf7006547 100644
--- a/pkgs/by-name/pa/pairdrop/package.nix
+++ b/pkgs/by-name/pa/pairdrop/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "schlagmichdoch";
     repo = "PairDrop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LvrBIdBjb4M2LidEJVCdK2uYydsJY+Cr5eXdfbS46dk=";
   };
 
diff --git a/pkgs/by-name/pa/paleta/package.nix b/pkgs/by-name/pa/paleta/package.nix
index 072acba9cb02..de259dbb3594 100644
--- a/pkgs/by-name/pa/paleta/package.nix
+++ b/pkgs/by-name/pa/paleta/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nate-xyz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-c+X49bMywstRg7cSAbbpG/vd8OUB7RhdQVRumTIBDDk=";
   };
 
diff --git a/pkgs/by-name/pa/pam-reattach/package.nix b/pkgs/by-name/pa/pam-reattach/package.nix
index 636757cec5ba..e9325da1698d 100644
--- a/pkgs/by-name/pa/pam-reattach/package.nix
+++ b/pkgs/by-name/pa/pam-reattach/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fabianishere";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1k77kxqszdwgrb50w7algj22pb4fy5b9649cjb08zq9fqrzxcbz7";
   };
 
diff --git a/pkgs/by-name/pa/pam_gnupg/package.nix b/pkgs/by-name/pa/pam_gnupg/package.nix
index ff5546320ec2..82c01c1c194c 100644
--- a/pkgs/by-name/pa/pam_gnupg/package.nix
+++ b/pkgs/by-name/pa/pam_gnupg/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cruegge";
     repo = "pam-gnupg";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6I9a841qohA42lhOgZf/hharnjkthuB8lRptPDxUgMI=";
   };
 
diff --git a/pkgs/by-name/pa/pam_mysql/package.nix b/pkgs/by-name/pa/pam_mysql/package.nix
index d562b24c1200..17fc09ad5277 100644
--- a/pkgs/by-name/pa/pam_mysql/package.nix
+++ b/pkgs/by-name/pa/pam_mysql/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NigelCunningham";
     repo = "pam-MySQL";
-    rev = version;
+    tag = version;
     sha256 = "07acf0hbhkd0kg49gnj4nb5ilnv3v4xx3dsggvzvjg8gi3cjmsap";
   };
 
diff --git a/pkgs/by-name/pa/pam_rssh/package.nix b/pkgs/by-name/pa/pam_rssh/package.nix
index a3168a587419..b29e15f82b92 100644
--- a/pkgs/by-name/pa/pam_rssh/package.nix
+++ b/pkgs/by-name/pa/pam_rssh/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "z4yx";
     repo = "pam_rssh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sXTSICVYSmwr12kRWuhVcag8kY6VAFdCqbe6LtYs4hU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pa/pamixer/package.nix b/pkgs/by-name/pa/pamixer/package.nix
index cab4a6e0d8af..06b70f9ab5ab 100644
--- a/pkgs/by-name/pa/pamixer/package.nix
+++ b/pkgs/by-name/pa/pamixer/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cdemoulins";
     repo = "pamixer";
-    rev = version;
+    tag = version;
     hash = "sha256-LbRhsW2MiTYWSH6X9Pz9XdJdH9Na0QCO8CFmlzZmDjQ=";
   };
 
diff --git a/pkgs/by-name/pa/pandoc-katex/package.nix b/pkgs/by-name/pa/pandoc-katex/package.nix
index a3f5b682795b..ecc6f6df41fa 100644
--- a/pkgs/by-name/pa/pandoc-katex/package.nix
+++ b/pkgs/by-name/pa/pandoc-katex/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "xu-cheng";
     repo = "pandoc-katex";
-    rev = version;
+    tag = version;
     hash = "sha256-2a3WJTNIMqWnTlHB+2U/6ifuoecbOlTP6e7YjD/UvPM=";
   };
 
diff --git a/pkgs/by-name/pa/pandoc-lua-filters/package.nix b/pkgs/by-name/pa/pandoc-lua-filters/package.nix
index d44b5e94bd2e..409e6a6044fc 100644
--- a/pkgs/by-name/pa/pandoc-lua-filters/package.nix
+++ b/pkgs/by-name/pa/pandoc-lua-filters/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pandoc";
     repo = "lua-filters";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Y962kdwg2bS3ZoPfsktv4Fy34HUTRhIIuSxPi5ODwWg=";
   };
 
diff --git a/pkgs/by-name/pa/panicparse/package.nix b/pkgs/by-name/pa/panicparse/package.nix
index f0ab5e64e45e..8da76b86668e 100644
--- a/pkgs/by-name/pa/panicparse/package.nix
+++ b/pkgs/by-name/pa/panicparse/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maruel";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-EBNOHI04v47sXAWrjHsU4pixP4TPOuHy8S3YmlkiLN4=";
   };
 
diff --git a/pkgs/by-name/pa/pantheon-tweaks/package.nix b/pkgs/by-name/pa/pantheon-tweaks/package.nix
index a25da6a1f4af..8f44cf7e4194 100644
--- a/pkgs/by-name/pa/pantheon-tweaks/package.nix
+++ b/pkgs/by-name/pa/pantheon-tweaks/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pantheon-tweaks";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-5RsNVUQ8FJmtdI7Z2le+qt9b13zHlQxiyTaUY15wSkw=";
   };
 
diff --git a/pkgs/by-name/pa/papeer/package.nix b/pkgs/by-name/pa/papeer/package.nix
index c447075c5137..eb0013ff6307 100644
--- a/pkgs/by-name/pa/papeer/package.nix
+++ b/pkgs/by-name/pa/papeer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lapwat";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dkOLlWeG6ixbqLJU/1x2R1meKpcXb63C8EXH5FlD38k=";
   };
 
diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix
index c1a59f48b72d..2380eb412dcd 100644
--- a/pkgs/by-name/pa/paper-age/package.nix
+++ b/pkgs/by-name/pa/paper-age/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "matiaskorhonen";
     repo = "paper-age";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xoxrNNlpDFXuQwltZ52SkGe0z6+B4h1Jy4XRtvQDiAg=";
   };
 
diff --git a/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix b/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix
index 5fe69a944eab..d197912ecc59 100644
--- a/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix
+++ b/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "entropia";
     repo = "paperless-asn-qr-codes";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/xCU6xDrmhkua4Iw/BCzhOuqO5GT/0rTJ+Y59wuMz6E=";
   };
 
diff --git a/pkgs/by-name/pa/papirus-folders/package.nix b/pkgs/by-name/pa/papirus-folders/package.nix
index 11c08f69406a..900d171f9206 100644
--- a/pkgs/by-name/pa/papirus-folders/package.nix
+++ b/pkgs/by-name/pa/papirus-folders/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "papirus-folders";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BY1hnAGz31Deffy/EGKy/nuPKmpAA0u8FzPYgr1Plfs=";
   };
 
diff --git a/pkgs/by-name/pa/papirus-nord/package.nix b/pkgs/by-name/pa/papirus-nord/package.nix
index 326c9eb2ca3e..32dcad573f2e 100644
--- a/pkgs/by-name/pa/papirus-nord/package.nix
+++ b/pkgs/by-name/pa/papirus-nord/package.nix
@@ -42,7 +42,7 @@ lib.checkListOfEnum "${pname}: accent colors" validAccents [ accent ]
     src = fetchFromGitHub {
       owner = "adapta-projects";
       repo = "papirus-nord";
-      rev = version;
+      tag = version;
       sha256 = "sha256-KwwTDGJQ4zN9XH/pKFQDQ+EgyuSCFhN2PQAI35G+3YM=";
     };
 
diff --git a/pkgs/by-name/pa/paps/package.nix b/pkgs/by-name/pa/paps/package.nix
index f99da48d4fb2..283c2dc42b43 100644
--- a/pkgs/by-name/pa/paps/package.nix
+++ b/pkgs/by-name/pa/paps/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dov";
     repo = "paps";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "129wpm2ayxs6qfh2761d4x9c034ivb2bcmmcnl56qs4448qb9495";
   };
 
diff --git a/pkgs/by-name/pa/par2cmdline-turbo/package.nix b/pkgs/by-name/pa/par2cmdline-turbo/package.nix
index 202e87e2c7de..c0fb838d39de 100644
--- a/pkgs/by-name/pa/par2cmdline-turbo/package.nix
+++ b/pkgs/by-name/pa/par2cmdline-turbo/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "animetosho";
     repo = "par2cmdline-turbo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GFMFqHiKoQByD8ZYgGm36ehfMP4CvC2F+u2Va20RSNI=";
   };
 
diff --git a/pkgs/by-name/pa/par2cmdline/package.nix b/pkgs/by-name/pa/par2cmdline/package.nix
index 6f69f0e48eed..e1d5c153bc1c 100644
--- a/pkgs/by-name/pa/par2cmdline/package.nix
+++ b/pkgs/by-name/pa/par2cmdline/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Parchive";
     repo = "par2cmdline";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "11mx8q29cr0sryd11awab7y4mhqgbamb1ss77rffjj6in8pb4hdk";
   };
 
diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix
index 27bef6cd7045..f4d4ac20b2df 100644
--- a/pkgs/by-name/pa/parallel-disk-usage/package.nix
+++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "KSXGitHub";
     repo = "parallel-disk-usage";
-    rev = version;
+    tag = version;
     hash = "sha256-0SK7v5xKMPuukyYKaGk13PE3WygHginjnyoatkA5xFQ=";
   };
 
diff --git a/pkgs/by-name/pa/paralus-cli/package.nix b/pkgs/by-name/pa/paralus-cli/package.nix
index 24961d715afa..0b99a3bc843b 100644
--- a/pkgs/by-name/pa/paralus-cli/package.nix
+++ b/pkgs/by-name/pa/paralus-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "cli";
     owner = "paralus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cVrT8wU9MJgc/hzMVe1b0lzm7f+0Prv9w1IjMOAh69E=";
   };
 
diff --git a/pkgs/by-name/pa/parastoo-fonts/package.nix b/pkgs/by-name/pa/parastoo-fonts/package.nix
index 0d3c24cd1c6c..0b64a3354a14 100644
--- a/pkgs/by-name/pa/parastoo-fonts/package.nix
+++ b/pkgs/by-name/pa/parastoo-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "parastoo-font";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E94B9R2h227D49dscCBsprmb7w0GrQ+2tWOWRf8FH30=";
   };
 
diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index 25728d4e32a3..b26c2594139b 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
-    rev = version;
+    tag = version;
     hash = "sha256-ovyfHqLCf5U3UR1HfoA+UQhqLZ6IaILcpqptPRQsb60=";
   };
 
diff --git a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix
index 161ca4cd6107..c78a336400e8 100644
--- a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix
+++ b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "justinbarclay";
     repo = "parinfer-rust-emacs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JYKFfbfpkvBRxYUDw2d6DD1mO27OKzdquSOhBk0lXr0=";
   };
 
diff --git a/pkgs/by-name/pa/parlatype/package.nix b/pkgs/by-name/pa/parlatype/package.nix
index 56080d475222..d462631c2fcd 100644
--- a/pkgs/by-name/pa/parlatype/package.nix
+++ b/pkgs/by-name/pa/parlatype/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gkarsay";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1wi9f23zgvsa98xcxgghm53jlafnr3pan1zl4gkn0yd8b2d6avhk";
   };
 
diff --git a/pkgs/by-name/pa/parlay/package.nix b/pkgs/by-name/pa/parlay/package.nix
index 5f5be4bcef49..aaf03a2346c2 100644
--- a/pkgs/by-name/pa/parlay/package.nix
+++ b/pkgs/by-name/pa/parlay/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "snyk";
     repo = "parlay";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-i7g0l+Q4VpBINK/HgIsl3wuxT2YoSqK08AJRxeVEzyo=";
   };
 
diff --git a/pkgs/by-name/pa/parsedmarc/package.nix b/pkgs/by-name/pa/parsedmarc/package.nix
index f6b38bf7d3c3..db2f76aa5b4e 100644
--- a/pkgs/by-name/pa/parsedmarc/package.nix
+++ b/pkgs/by-name/pa/parsedmarc/package.nix
@@ -14,7 +14,7 @@ let
         src = fetchFromGitHub {
           owner = "microsoftgraph";
           repo = "msgraph-sdk-python-core";
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-eRRlG3GJX3WeKTNJVWgNTTHY56qiUGOlxtvEZ2xObLA=";
         };
 
diff --git a/pkgs/by-name/pa/partclone/package.nix b/pkgs/by-name/pa/partclone/package.nix
index c01867172d95..2f05f4a549d0 100644
--- a/pkgs/by-name/pa/partclone/package.nix
+++ b/pkgs/by-name/pa/partclone/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Thomas-Tsai";
     repo = "partclone";
-    rev = version;
+    tag = version;
     sha256 = "sha256-TZkWDs0KC2Kb7l5QFiHITJqWyq+ryj5mnhNY1wxcUyE=";
   };
 
diff --git a/pkgs/by-name/pa/particl-core/package.nix b/pkgs/by-name/pa/particl-core/package.nix
index 51204fd92634..dcdc9ddfe5f7 100644
--- a/pkgs/by-name/pa/particl-core/package.nix
+++ b/pkgs/by-name/pa/particl-core/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "particl";
     repo = "particl-core";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RxkLt+7u+r5jNwEWiArTUpZ8ykYwWtvIDFXTSKhGN/w=";
   };
 
diff --git a/pkgs/by-name/pa/paru/package.nix b/pkgs/by-name/pa/paru/package.nix
index 52278491e4ed..50c2e883e7e8 100644
--- a/pkgs/by-name/pa/paru/package.nix
+++ b/pkgs/by-name/pa/paru/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Morganamilo";
     repo = "paru";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VFIeDsIuPbWGf+vio5i8qGUBB+spP/7SwYwmQkMjtL8=";
   };
 
diff --git a/pkgs/by-name/pa/passage/package.nix b/pkgs/by-name/pa/passage/package.nix
index 9971511b5701..2ef6f92eb554 100644
--- a/pkgs/by-name/pa/passage/package.nix
+++ b/pkgs/by-name/pa/passage/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FiloSottile";
     repo = "passage";
-    rev = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-tGHJFzDc2K117r5EMFdKsfw/+EpdZ0qzaExt+RGI4qo=";
   };
 
diff --git a/pkgs/by-name/pa/passdetective/package.nix b/pkgs/by-name/pa/passdetective/package.nix
index 842de021361f..8523201456e1 100644
--- a/pkgs/by-name/pa/passdetective/package.nix
+++ b/pkgs/by-name/pa/passdetective/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aydinnyunus";
     repo = "PassDetective";
-    rev = version;
+    tag = version;
     hash = "sha256-ln+nKESCYNQwTB6njNQBNUGmF+NXqgzmM1sb/d6ZBcU=";
   };
 
diff --git a/pkgs/by-name/pa/passerine/package.nix b/pkgs/by-name/pa/passerine/package.nix
index f9b14596e41e..50c8056b2046 100644
--- a/pkgs/by-name/pa/passerine/package.nix
+++ b/pkgs/by-name/pa/passerine/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vrtbl";
     repo = "passerine";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TrbcULIJ9+DgQ4QsLYD5okxHoIusGJDw1PqJQwq1zu0=";
   };
 
diff --git a/pkgs/by-name/pa/passff-host/package.nix b/pkgs/by-name/pa/passff-host/package.nix
index 39260da44250..13707767fd57 100644
--- a/pkgs/by-name/pa/passff-host/package.nix
+++ b/pkgs/by-name/pa/passff-host/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "passff";
     repo = "passff-host";
-    rev = version;
+    tag = version;
     sha256 = "sha256-P5h0B5ilwp3OVyDHIOQ23Zv4eLjN4jFkdZF293FQnNE=";
   };
 
diff --git a/pkgs/by-name/pa/passphrase2pgp/package.nix b/pkgs/by-name/pa/passphrase2pgp/package.nix
index 001eae79cbbf..6cffc4011016 100644
--- a/pkgs/by-name/pa/passphrase2pgp/package.nix
+++ b/pkgs/by-name/pa/passphrase2pgp/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "skeeto";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-it1XYzLiteL0oq4SZp5E3s6oSkFKi3ZY0Lt+P0gmNag=";
   };
 
diff --git a/pkgs/by-name/pa/pastebinit/package.nix b/pkgs/by-name/pa/pastebinit/package.nix
index d798f11ece56..6d6caebbca2f 100644
--- a/pkgs/by-name/pa/pastebinit/package.nix
+++ b/pkgs/by-name/pa/pastebinit/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-vuAWkHlQM6QTWarThpSbY0qrxzej0GvLU0jT2JOS/qc=";
   };
 
diff --git a/pkgs/by-name/pa/pasystray/package.nix b/pkgs/by-name/pa/pasystray/package.nix
index b81ace79d922..4464e4ea264f 100644
--- a/pkgs/by-name/pa/pasystray/package.nix
+++ b/pkgs/by-name/pa/pasystray/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "christophgysin";
     repo = "pasystray";
-    rev = version;
+    tag = version;
     sha256 = "sha256-QaTQ8yUviJaFEQaQm2vYAUngqHliKe8TDYqfWt1Nx/0=";
   };
 
diff --git a/pkgs/by-name/pa/pat/package.nix b/pkgs/by-name/pa/pat/package.nix
index 0352ef2c6cd9..c367214df21f 100644
--- a/pkgs/by-name/pa/pat/package.nix
+++ b/pkgs/by-name/pa/pat/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "la5nta";
     repo = "pat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JlqYdsAXs3pS5i59tiel+gxQsTrn5mUs0qLzjHxGZU0=";
   };
 
diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix
index 714c3140070a..05c1ecd95db4 100644
--- a/pkgs/by-name/pa/patch2pr/package.nix
+++ b/pkgs/by-name/pa/patch2pr/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bluekeyes";
     repo = "patch2pr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RQg7Fo8Z0P+z6Fv6YTv/IpEErP6ncxylvBaeargTrIQ=";
   };
 
diff --git a/pkgs/by-name/pa/patchage/package.nix b/pkgs/by-name/pa/patchage/package.nix
index b8f1fccf5a76..b309b68e997b 100644
--- a/pkgs/by-name/pa/patchage/package.nix
+++ b/pkgs/by-name/pa/patchage/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "drobilla";
     repo = "patchage";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LzN6RyF/VT4LUVeR0904BnLuNMFZjFTDu9oDIKYG2Yo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pa/pathvector/package.nix b/pkgs/by-name/pa/pathvector/package.nix
index 3f08e6f9f5e2..d71c3bf49cf6 100644
--- a/pkgs/by-name/pa/pathvector/package.nix
+++ b/pkgs/by-name/pa/pathvector/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "natesales";
     repo = "pathvector";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TqGasguEAcA5ET2E/uFjgIl7IHI2v9m5EaXpIMG3T8c=";
   };
 
diff --git a/pkgs/by-name/pa/patsh/package.nix b/pkgs/by-name/pa/patsh/package.nix
index 3e850dece1b7..77d88aaf1901 100644
--- a/pkgs/by-name/pa/patsh/package.nix
+++ b/pkgs/by-name/pa/patsh/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "patsh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-d2Br4RAlKO7Bpse8sFbIDCIYd2fYvby0ar9oIbQS2jc=";
   };
 
diff --git a/pkgs/by-name/pa/payme/package.nix b/pkgs/by-name/pa/payme/package.nix
index 70df0c753a3c..80d4580292e6 100644
--- a/pkgs/by-name/pa/payme/package.nix
+++ b/pkgs/by-name/pa/payme/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jovandeginste";
     repo = "payme";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jkJGR6i68kNzA60T5ZOu2u+fPvZht4ssEtr8aYocGUk=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/pa/pazi/package.nix b/pkgs/by-name/pa/pazi/package.nix
index 560f1e7c7a10..4505bf92b6ee 100644
--- a/pkgs/by-name/pa/pazi/package.nix
+++ b/pkgs/by-name/pa/pazi/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "euank";
     repo = "pazi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PDgk6VQ/J9vkFJ0N+BH9LqHOXRYM+a+WhRz8QeLZGiM=";
   };
 
diff --git a/pkgs/by-name/pb/pbgopy/package.nix b/pkgs/by-name/pb/pbgopy/package.nix
index a58cce6be115..ebd070740060 100644
--- a/pkgs/by-name/pb/pbgopy/package.nix
+++ b/pkgs/by-name/pb/pbgopy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nakabonne";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-P/MFDFMsqSTVErTM9izJJSMIbiOcbQ9Ya10/w6NRcYw=";
   };
 
diff --git a/pkgs/by-name/pb/pbpctrl/package.nix b/pkgs/by-name/pb/pbpctrl/package.nix
index 715ba55bde98..bc50487df7f3 100644
--- a/pkgs/by-name/pb/pbpctrl/package.nix
+++ b/pkgs/by-name/pb/pbpctrl/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "qzed";
     repo = "pbpctrl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-u5I3Hs00JDPRBwThYTEmNiZj/zPVfHyyrt4E68d13do=";
   };
 
diff --git a/pkgs/by-name/pb/pbzx/package.nix b/pkgs/by-name/pb/pbzx/package.nix
index 4f96d27de10c..46923483da16 100644
--- a/pkgs/by-name/pb/pbzx/package.nix
+++ b/pkgs/by-name/pb/pbzx/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NiklasRosenstein";
     repo = "pbzx";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90";
   };
   patches = [ ./stdin.patch ];
diff --git a/pkgs/by-name/pc/pcapc/package.nix b/pkgs/by-name/pc/pcapc/package.nix
index 0e7d8121d9cd..9bc032d49717 100644
--- a/pkgs/by-name/pc/pcapc/package.nix
+++ b/pkgs/by-name/pc/pcapc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "post-factum";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oDg9OSvi9aQsZ2SQm02NKAcppE0w5SGZaI13gdp7gv4=";
   };
 
diff --git a/pkgs/by-name/pc/pcaudiolib/package.nix b/pkgs/by-name/pc/pcaudiolib/package.nix
index 32f31d8fbfc0..3ba07f34725a 100644
--- a/pkgs/by-name/pc/pcaudiolib/package.nix
+++ b/pkgs/by-name/pc/pcaudiolib/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "espeak-ng";
     repo = "pcaudiolib";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-bBiGvAySEwAv6Qj2iSawb9oZfMCGBDCDIP8AYdbtQQc=";
   };
 
diff --git a/pkgs/by-name/pc/pcb2gcode/package.nix b/pkgs/by-name/pc/pcb2gcode/package.nix
index 3d0cc9ef7069..447ce68d5436 100644
--- a/pkgs/by-name/pc/pcb2gcode/package.nix
+++ b/pkgs/by-name/pc/pcb2gcode/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pcb2gcode";
     repo = "pcb2gcode";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-c5YabBqZn6ilIkF3lifTsYyLZMsZN21jDj1hNu0PRAc=";
   };
 
diff --git a/pkgs/by-name/pc/pcm/package.nix b/pkgs/by-name/pc/pcm/package.nix
index 1e2f7cd370ce..bfa2aa03946a 100644
--- a/pkgs/by-name/pc/pcm/package.nix
+++ b/pkgs/by-name/pc/pcm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opcm";
     repo = "pcm";
-    rev = version;
+    tag = version;
     hash = "sha256-U6V3LX+JlVL9MRFBP3xpYwPQ6Y7pnJ4F/7dpKG3Eyuw=";
   };
 
diff --git a/pkgs/by-name/pc/pcmanx-gtk2/package.nix b/pkgs/by-name/pc/pcmanx-gtk2/package.nix
index 9e2bea957a66..377e0c0785ef 100644
--- a/pkgs/by-name/pc/pcmanx-gtk2/package.nix
+++ b/pkgs/by-name/pc/pcmanx-gtk2/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pcman-bbs";
     repo = "pcmanx";
-    rev = version;
+    tag = version;
     sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc";
   };
 
diff --git a/pkgs/by-name/pc/pcmsolver/package.nix b/pkgs/by-name/pc/pcmsolver/package.nix
index daca5a3ce17c..46cd978557ea 100644
--- a/pkgs/by-name/pc/pcmsolver/package.nix
+++ b/pkgs/by-name/pc/pcmsolver/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PCMSolver";
     repo = "pcmsolver";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0jrxr8z21hjy7ik999hna9rdqy221kbkl3qkb06xw7g80rc9x9yr";
   };
 
diff --git a/pkgs/by-name/pc/pcp/package.nix b/pkgs/by-name/pc/pcp/package.nix
index a8d6e1c58ba9..5c7fa209d410 100644
--- a/pkgs/by-name/pc/pcp/package.nix
+++ b/pkgs/by-name/pc/pcp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dennis-tra";
     repo = "pcp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-aZO8VuOiYhOPctFKZ6a2psJB0lKHlPc+NLy2RWDU4JI=";
   };
 
diff --git a/pkgs/by-name/pc/pcstat/package.nix b/pkgs/by-name/pc/pcstat/package.nix
index 2b9b2ddb5c2a..c27fe1e87eee 100644
--- a/pkgs/by-name/pc/pcstat/package.nix
+++ b/pkgs/by-name/pc/pcstat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tobert";
     repo = "pcstat";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-e8fQZEfsS5dATPgshJktfKVTdZ9CvN1CttYipMjpGNM=";
   };
 
diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix
index 0b2674f43518..755a17c259bc 100644
--- a/pkgs/by-name/pd/pdal/package.nix
+++ b/pkgs/by-name/pd/pdal/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "PDAL";
     repo = "PDAL";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-52v7oDmvq820mJ91XAZI1rQEwssWcHagcd2QNVV6zPA=";
   };
 
diff --git a/pkgs/by-name/pd/pdf2djvu/package.nix b/pkgs/by-name/pd/pdf2djvu/package.nix
index e92663ad2239..a6365c202ae9 100644
--- a/pkgs/by-name/pd/pdf2djvu/package.nix
+++ b/pkgs/by-name/pd/pdf2djvu/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jwilk";
     repo = "pdf2djvu";
-    rev = version;
+    tag = version;
     sha256 = "sha256-j4mYdmLZ56qTA1KbWBjBvyTyLaeuIITKYsALRIO7lj0=";
   };
 
diff --git a/pkgs/by-name/pd/pdf2svg/package.nix b/pkgs/by-name/pd/pdf2svg/package.nix
index 86040410708c..3e34b505db10 100644
--- a/pkgs/by-name/pd/pdf2svg/package.nix
+++ b/pkgs/by-name/pd/pdf2svg/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "db9052";
     repo = "pdf2svg";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zME0U+PyENnoLyjo9W2i2MRM00wNmHkYcR2LMEtTbBY=";
   };
 
diff --git a/pkgs/by-name/pd/pdfannots/package.nix b/pkgs/by-name/pd/pdfannots/package.nix
index 4cd56f2217c6..de8195145fd5 100644
--- a/pkgs/by-name/pd/pdfannots/package.nix
+++ b/pkgs/by-name/pd/pdfannots/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "0xabu";
     repo = "pdfannots";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-C0Ss6kZvPx0hHnpBKquEolxeuTfjshhSBSIDXcCKtM8=";
   };
 
diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix
index 438d0a12e976..c43cc44a4f0c 100644
--- a/pkgs/by-name/pd/pdfcpu/package.nix
+++ b/pkgs/by-name/pd/pdfcpu/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PJTEaWU/erqVJakvxfB0aYRsi/tcGxYYZjCdEvThmzM=";
     # 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/pdfdiff/package.nix b/pkgs/by-name/pd/pdfdiff/package.nix
index a24d180f6493..0f86c6607269 100644
--- a/pkgs/by-name/pd/pdfdiff/package.nix
+++ b/pkgs/by-name/pd/pdfdiff/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cascremers";
     repo = "pdfdiff";
-    rev = version;
+    tag = version;
     hash = "sha256-NPki/PFm0b71Ksak1mimR4w6J2a0jBCbQDTMQR4uZFI=";
   };
 
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/pd/pdftag/package.nix b/pkgs/by-name/pd/pdftag/package.nix
index f42ea7b7465c..f89cc1716c09 100644
--- a/pkgs/by-name/pd/pdftag/package.nix
+++ b/pkgs/by-name/pd/pdftag/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arrufat";
     repo = "pdftag";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1paj8hs27akzsivn01a30fl3zx5gfn1h89wxg2m72fd806hk0hql";
   };
 
diff --git a/pkgs/by-name/pd/pdftk/package.nix b/pkgs/by-name/pd/pdftk/package.nix
index 025652d69b87..d10d94912977 100644
--- a/pkgs/by-name/pd/pdftk/package.nix
+++ b/pkgs/by-name/pd/pdftk/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "pdftk-java";
     repo = "pdftk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ciKotTHSEcITfQYKFZ6sY2LZnXGChBJy0+eno8B3YHY=";
   };
 
diff --git a/pkgs/by-name/pd/pdftoipe/package.nix b/pkgs/by-name/pd/pdftoipe/package.nix
index 70e3fc58f3d9..a13c9e2b9fbf 100644
--- a/pkgs/by-name/pd/pdftoipe/package.nix
+++ b/pkgs/by-name/pd/pdftoipe/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "otfried";
     repo = "ipe-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k=";
   };
 
diff --git a/pkgs/by-name/pd/pdpmake/package.nix b/pkgs/by-name/pd/pdpmake/package.nix
index 59f7ecc23e48..a2e338b37f11 100644
--- a/pkgs/by-name/pd/pdpmake/package.nix
+++ b/pkgs/by-name/pd/pdpmake/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rmyorston";
     repo = "pdpmake";
-    rev = version;
+    tag = version;
     hash = "sha256-6lLYtBKZTmi+fBkCyDysJS1O37/Z6ir9hU3pX4X1VHQ=";
   };
 
diff --git a/pkgs/by-name/pe/pe-parse/package.nix b/pkgs/by-name/pe/pe-parse/package.nix
index e259b51aa564..e95e23cab1bf 100644
--- a/pkgs/by-name/pe/pe-parse/package.nix
+++ b/pkgs/by-name/pe/pe-parse/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "pe-parse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XegSZWRoQg6NEWuTSFI1RMvN3GbpLDrZrloPU2XdK2M=";
   };
 
diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix
index d22a18e43e0d..70c237ce4821 100644
--- a/pkgs/by-name/pe/peazip/package.nix
+++ b/pkgs/by-name/pe/peazip/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "peazip";
     repo = "peazip";
-    rev = version;
+    tag = version;
     hash = "sha256-rEddDg2sS/4+HK3UqPEWudWnwjMPNjA2+v4CKtFtZYM=";
   };
   sourceRoot = "${src.name}/peazip-sources";
diff --git a/pkgs/by-name/pe/pebble/package.nix b/pkgs/by-name/pe/pebble/package.nix
index 3c507c4daee7..a9959e370cdd 100644
--- a/pkgs/by-name/pe/pebble/package.nix
+++ b/pkgs/by-name/pe/pebble/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "letsencrypt";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YPU/bl7h6rOWg+5ut0Thn2UupeKpJ7u4KXc2svIeZEM=";
   };
 
diff --git a/pkgs/by-name/pe/peco/package.nix b/pkgs/by-name/pe/peco/package.nix
index 0c794fb719ae..f3779c5625a0 100644
--- a/pkgs/by-name/pe/peco/package.nix
+++ b/pkgs/by-name/pe/peco/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "peco";
     repo = "peco";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OVUfeNpnmuJsgD//JTn6n9n4oOBxep69LhIpHX+ru2w=";
   };
 
diff --git a/pkgs/by-name/pe/peek/package.nix b/pkgs/by-name/pe/peek/package.nix
index 54921269b88e..1ff831693f3b 100644
--- a/pkgs/by-name/pe/peek/package.nix
+++ b/pkgs/by-name/pe/peek/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phw";
     repo = "peek";
-    rev = version;
+    tag = version;
     sha256 = "1xwlfizga6hvjqq127py8vabaphsny928ar7mwqj9cyqfl6fx41x";
   };
 
diff --git a/pkgs/by-name/pe/peep/package.nix b/pkgs/by-name/pe/peep/package.nix
index d09c3c892c29..d625afcd23df 100644
--- a/pkgs/by-name/pe/peep/package.nix
+++ b/pkgs/by-name/pe/peep/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ryochack";
     repo = "peep";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6Y7ZI0kIPE7uMMOkXgm75JMEec090xZPBJFJr9DaswA=";
   };
 
diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix
index 904dad57b84f..9bf67f4aff66 100644
--- a/pkgs/by-name/pe/peergos/package.nix
+++ b/pkgs/by-name/pe/peergos/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Peergos";
     repo = "web-ui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TSvhp/9nneXGADiDPgGvA78emVcQG0UzHsFfVS9k7mo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pe/pegtl/package.nix b/pkgs/by-name/pe/pegtl/package.nix
index 28052ee7513b..3dac95db7a78 100644
--- a/pkgs/by-name/pe/pegtl/package.nix
+++ b/pkgs/by-name/pe/pegtl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "taocpp";
     repo = "PEGTL";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-nPWSO2wPl/qenUQgvQDQu7Oy1dKa/PnNFSclmkaoM8A=";
   };
 
diff --git a/pkgs/by-name/pe/perceptualdiff/package.nix b/pkgs/by-name/pe/perceptualdiff/package.nix
index 0f2154629c3d..24a6f582b51f 100644
--- a/pkgs/by-name/pe/perceptualdiff/package.nix
+++ b/pkgs/by-name/pe/perceptualdiff/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "myint";
     repo = "perceptualdiff";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "176n518xv0pczf1yyz9r5a8zw5r6sh5ym596kmvw30qznp8n4a8j";
   };
 
diff --git a/pkgs/by-name/pe/percollate/package.nix b/pkgs/by-name/pe/percollate/package.nix
index 174e4de6d5ee..304f92083fd9 100644
--- a/pkgs/by-name/pe/percollate/package.nix
+++ b/pkgs/by-name/pe/percollate/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "danburzo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JpdSEockALXtuuMMi5mgD5AXcayojyK0qMMWF+XFfZE=";
   };
 
diff --git a/pkgs/by-name/pe/perfect-hash/package.nix b/pkgs/by-name/pe/perfect-hash/package.nix
index b9466c770104..96d387cbfcd7 100644
--- a/pkgs/by-name/pe/perfect-hash/package.nix
+++ b/pkgs/by-name/pe/perfect-hash/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ilanschnell";
     repo = "perfect-hash";
-    rev = version;
+    tag = version;
     sha256 = "0gkc3n613hl0q4jknrh2nm1n96j97p36q9jjgarb9d8yii9q7792";
   };
 
diff --git a/pkgs/by-name/pe/perl-debug-adapter/package.nix b/pkgs/by-name/pe/perl-debug-adapter/package.nix
index 7ad7d2a006e6..5682db303c3d 100644
--- a/pkgs/by-name/pe/perl-debug-adapter/package.nix
+++ b/pkgs/by-name/pe/perl-debug-adapter/package.nix
@@ -23,7 +23,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Nihilus118";
     repo = "perl-debug-adapter";
-    rev = version;
+    tag = version;
     hash = "sha256-IXXKhk4rzsWSPA0RT0L3CZuKlgTWtweZ4dQtruTigRs=";
   };
 
diff --git a/pkgs/by-name/pe/perlnavigator/package.nix b/pkgs/by-name/pe/perlnavigator/package.nix
index 34f216ad4daa..b5a9d4c4a59e 100644
--- a/pkgs/by-name/pe/perlnavigator/package.nix
+++ b/pkgs/by-name/pe/perlnavigator/package.nix
@@ -9,7 +9,7 @@ let
   src = fetchFromGitHub {
     owner = "bscan";
     repo = "PerlNavigator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CNsgFf+W7YQwAR++GwfTka4Cy8woRu02BQIJRmRAxK4=";
   };
   browser-ext = buildNpmPackage {
diff --git a/pkgs/by-name/pe/persistent-cache-cpp/package.nix b/pkgs/by-name/pe/persistent-cache-cpp/package.nix
index e1d7bb70efa4..36aa640396c9 100644
--- a/pkgs/by-name/pe/persistent-cache-cpp/package.nix
+++ b/pkgs/by-name/pe/persistent-cache-cpp/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/persistent-cache-cpp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-bOABrRSy5Mzeaqoc5ujcGXyBAaCJLv/488M7fkr0npE=";
   };
 
diff --git a/pkgs/by-name/pe/peru/package.nix b/pkgs/by-name/pe/peru/package.nix
index 41e31401f4df..445e1d3eaa6d 100644
--- a/pkgs/by-name/pe/peru/package.nix
+++ b/pkgs/by-name/pe/peru/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "buildinspace";
     repo = "peru";
-    rev = version;
+    tag = version;
     sha256 = "FCyR14jcFjI6epoFPNVyFZ4k1URZ1NraX1+ajVcCQ2A=";
   };
 
diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix
index a06b35650757..4f825c5a2180 100644
--- a/pkgs/by-name/pe/pest-ide-tools/package.nix
+++ b/pkgs/by-name/pe/pest-ide-tools/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pest-parser";
     repo = "pest-ide-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ=";
   };
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/pe/pet/package.nix b/pkgs/by-name/pe/pet/package.nix
index f702dda7b191..35693c77055f 100644
--- a/pkgs/by-name/pe/pet/package.nix
+++ b/pkgs/by-name/pe/pet/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knqyf263";
     repo = "pet";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-B0ilobUlp6UUXu6+lVqIHkbFnxVu33eXZFf+F7ODoQU=";
   };
 
diff --git a/pkgs/by-name/pf/pfetch-rs/package.nix b/pkgs/by-name/pf/pfetch-rs/package.nix
index 33ffa99ff901..6a349fe6cad4 100644
--- a/pkgs/by-name/pf/pfetch-rs/package.nix
+++ b/pkgs/by-name/pf/pfetch-rs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Gobidev";
     repo = "pfetch-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Kgoo8piv4pNqzw9zQSEj7POSK6l+0KMvaNbvMp+bpF8=";
   };
 
diff --git a/pkgs/by-name/pf/pfsshell/package.nix b/pkgs/by-name/pf/pfsshell/package.nix
index 5ebe0684e3c8..07fb3200b860 100644
--- a/pkgs/by-name/pf/pfsshell/package.nix
+++ b/pkgs/by-name/pf/pfsshell/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uyjulian";
     repo = "pfsshell";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0cr91al3knsbfim75rzl7rxdsglcc144x0nizn7q4jx5cad3zbn8";
   };
 
diff --git a/pkgs/by-name/pg/pg_checksums/package.nix b/pkgs/by-name/pg/pg_checksums/package.nix
index a52513a5f805..620b441a694b 100644
--- a/pkgs/by-name/pg/pg_checksums/package.nix
+++ b/pkgs/by-name/pg/pg_checksums/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "credativ";
     repo = "pg_checksums";
-    rev = version;
+    tag = version;
     sha256 = "sha256-joGaCoRMGpEqq7pnT4Qd7XySjZ5wlZPW27WfOv1UFF4=";
   };
 
diff --git a/pkgs/by-name/pg/pg_featureserv/package.nix b/pkgs/by-name/pg/pg_featureserv/package.nix
index 6774bfda4e21..74d1fff4bd53 100644
--- a/pkgs/by-name/pg/pg_featureserv/package.nix
+++ b/pkgs/by-name/pg/pg_featureserv/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CrunchyData";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GsloUZFgrOrJc23vKv+8iSeyIEKblaukPSCpZGRtSL4=";
   };
 
diff --git a/pkgs/by-name/pg/pg_flame/package.nix b/pkgs/by-name/pg/pg_flame/package.nix
index 35f860063d1a..3dc6ef82d0d4 100644
--- a/pkgs/by-name/pg/pg_flame/package.nix
+++ b/pkgs/by-name/pg/pg_flame/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mgartner";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-glvIv9GHIbp6IZUvZo9fyvkJ6QR03nMlrAOpZ3HfA6g=";
   };
 
diff --git a/pkgs/by-name/pg/pg_tileserv/package.nix b/pkgs/by-name/pg/pg_tileserv/package.nix
index 96d5f6eb5caa..cca9ace03f35 100644
--- a/pkgs/by-name/pg/pg_tileserv/package.nix
+++ b/pkgs/by-name/pg/pg_tileserv/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CrunchyData";
     repo = "pg_tileserv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xTIx39eLmHBUlaUjQy9KGpi5X4AU93DzX+Ofg5PMLWE=";
   };
 
diff --git a/pkgs/by-name/pg/pgagroal/package.nix b/pkgs/by-name/pg/pgagroal/package.nix
index 4ec8d31a2e98..9a43e364322c 100644
--- a/pkgs/by-name/pg/pgagroal/package.nix
+++ b/pkgs/by-name/pg/pgagroal/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "agroal";
     repo = "pgagroal";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-bgJvGJ35RdFopW88o+H1DLpG70anP197y6xrpRRrxUA=";
   };
 
diff --git a/pkgs/by-name/pg/pgcat/package.nix b/pkgs/by-name/pg/pgcat/package.nix
index 159acd4ca1e7..64ae410bdbe1 100644
--- a/pkgs/by-name/pg/pgcat/package.nix
+++ b/pkgs/by-name/pg/pgcat/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "postgresml";
     repo = "pgcat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DHXUhAAOmPSt4aVp93I1y69of+MEboXJBZH50mzQTm8=";
   };
 
diff --git a/pkgs/by-name/pg/pgcenter/package.nix b/pkgs/by-name/pg/pgcenter/package.nix
index 41025c33af03..7db70ce64ce9 100644
--- a/pkgs/by-name/pg/pgcenter/package.nix
+++ b/pkgs/by-name/pg/pgcenter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lesovsky";
     repo = "pgcenter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xaY01T12/5Peww9scRgfc5yHj7QA8BEwOK5l6OedziY=";
   };
 
diff --git a/pkgs/by-name/pg/pget/package.nix b/pkgs/by-name/pg/pget/package.nix
index 3a7ac72df18d..14109644ed19 100644
--- a/pkgs/by-name/pg/pget/package.nix
+++ b/pkgs/by-name/pg/pget/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Code-Hex";
     repo = "pget";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SDe9QH1iSRfMBSCfYiOJPXUbDvxH5cCCWvQq9uTWT9Y=";
   };
 
diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix
index 0f3547ed42c7..1670a2b016e6 100644
--- a/pkgs/by-name/pg/pgformatter/package.nix
+++ b/pkgs/by-name/pg/pgformatter/package.nix
@@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "darold";
     repo = "pgFormatter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4KtrsckO9Q9H0yIM0877YvWaDW02CQVAQiOKD919e9w=";
   };
 
diff --git a/pkgs/by-name/pg/pgmetrics/package.nix b/pkgs/by-name/pg/pgmetrics/package.nix
index d2ff1864fbff..6b96a34df88f 100644
--- a/pkgs/by-name/pg/pgmetrics/package.nix
+++ b/pkgs/by-name/pg/pgmetrics/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rapidloop";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-SaJc09RRm8MR8OiBIznCRHLhpflQ4Gi8tlXQvYd/j9A=";
   };
 
diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix
index e8c129cbcd52..c3ff7039e383 100644
--- a/pkgs/by-name/pg/pgmoneta/package.nix
+++ b/pkgs/by-name/pg/pgmoneta/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pgmoneta";
     repo = "pgmoneta";
-    rev = version;
+    tag = version;
     hash = "sha256-kPQ0GCRYrxoAz4Y2uGHsvn8KxiAE2Fc6FMOJyZaWTjI=";
   };
 
diff --git a/pkgs/by-name/pg/pgo-client/package.nix b/pkgs/by-name/pg/pgo-client/package.nix
index cce769dee966..e0b2cfc51531 100644
--- a/pkgs/by-name/pg/pgo-client/package.nix
+++ b/pkgs/by-name/pg/pgo-client/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CrunchyData";
     repo = "postgres-operator";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZwKfbmKPvhxLpCGH+IlfoQjnw8go4N6mfseY2LWCktA=";
   };
 
diff --git a/pkgs/by-name/pg/pgpdump/package.nix b/pkgs/by-name/pg/pgpdump/package.nix
index 77eaec1928cc..5fc33e1fabab 100644
--- a/pkgs/by-name/pg/pgpdump/package.nix
+++ b/pkgs/by-name/pg/pgpdump/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kazu-yamamoto";
     repo = "pgpdump";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JKedgHCTDnvLyLR3nGl4XFAaxXDU1TgHrxPMlRFwtBo=";
   };
 
diff --git a/pkgs/by-name/pg/pgsrip/package.nix b/pkgs/by-name/pg/pgsrip/package.nix
index 6f85b5878b2d..9761da747ab1 100644
--- a/pkgs/by-name/pg/pgsrip/package.nix
+++ b/pkgs/by-name/pg/pgsrip/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ratoaq2";
     repo = "pgsrip";
-    rev = version;
+    tag = version;
     hash = "sha256-H9gZXge+m/bCq25Fv91oFZ8Cq2SRNrKhOaDrLZkjazg=";
   };
 
diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix
index dc7414f1949f..b65d15629a5f 100644
--- a/pkgs/by-name/pg/pgtop/package.nix
+++ b/pkgs/by-name/pg/pgtop/package.nix
@@ -13,7 +13,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "cosimo";
     repo = "pgtop";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1awyl6ddfihm7dfr5y2z15r1si5cyipnlyyj3m1l19pk98s4x66l";
   };
 
diff --git a/pkgs/by-name/pg/pgweb/package.nix b/pkgs/by-name/pg/pgweb/package.nix
index 7b59121c4f54..c774d931639a 100644
--- a/pkgs/by-name/pg/pgweb/package.nix
+++ b/pkgs/by-name/pg/pgweb/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sosedoff";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gZK8+H3dBMzSVyE96E7byihKMR4+1YlVFZJtCTGUZwI=";
   };
 
diff --git a/pkgs/by-name/ph/phash/package.nix b/pkgs/by-name/ph/phash/package.nix
index 3ad3419282a0..780c9f35dfef 100644
--- a/pkgs/by-name/ph/phash/package.nix
+++ b/pkgs/by-name/ph/phash/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "clearscene";
     repo = "pHash";
-    rev = version;
+    tag = version;
     sha256 = "sha256-frISiZ89ei7XfI5F2nJJehfQZsk0Mlb4n91q/AiZ2vA=";
   };
 
diff --git a/pkgs/by-name/ph/phd2/package.nix b/pkgs/by-name/ph/phd2/package.nix
index 96bf38706186..1294520f6d1c 100644
--- a/pkgs/by-name/ph/phd2/package.nix
+++ b/pkgs/by-name/ph/phd2/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenPHDGuiding";
     repo = "phd2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GnT/tyk975caqESBSu4mdX5IWGi5O+RljLSd+CwoGWo=";
   };
 
diff --git a/pkgs/by-name/ph/phockup/package.nix b/pkgs/by-name/ph/phockup/package.nix
index c749974ced48..599e14ff4424 100644
--- a/pkgs/by-name/ph/phockup/package.nix
+++ b/pkgs/by-name/ph/phockup/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ivandokov";
     repo = "phockup";
-    rev = version;
+    tag = version;
     sha256 = "sha256-44UjxTbC2XK+NThvesROdd7aGP7zr7g7bQiQZv2TvvM=";
   };
 
diff --git a/pkgs/by-name/ph/photocollage/package.nix b/pkgs/by-name/ph/photocollage/package.nix
index 03894fb27b0a..91cb6f2f9f4e 100644
--- a/pkgs/by-name/ph/photocollage/package.nix
+++ b/pkgs/by-name/ph/photocollage/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "adrienverge";
     repo = "PhotoCollage";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jDb2mFsok8TNi9+A/FAieqo7YbAUsmrFRBGwdGv71Xg=";
   };
 
diff --git a/pkgs/by-name/ph/photon/package.nix b/pkgs/by-name/ph/photon/package.nix
index 8be4fbe6b242..bea5013fd789 100644
--- a/pkgs/by-name/ph/photon/package.nix
+++ b/pkgs/by-name/ph/photon/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "s0md3v";
     repo = "Photon";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "02z1xj72bq35dilr4b6njry4kixz6j2a3ag02nla98q0fvgmgnvy";
   };
 
diff --git a/pkgs/by-name/ph/photoprism/package.nix b/pkgs/by-name/ph/photoprism/package.nix
index 158aa87830e7..d6f64533fc52 100644
--- a/pkgs/by-name/ph/photoprism/package.nix
+++ b/pkgs/by-name/ph/photoprism/package.nix
@@ -23,7 +23,7 @@ let
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-tJA1Q8kcX4UYDCV+rmHyd5gfEU8WkoaqNfx1/0Iy3l8=";
   };
 
diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix
index f1bfef2201b5..f6fc04bc8ec8 100644
--- a/pkgs/by-name/ph/phpactor/package.nix
+++ b/pkgs/by-name/ph/phpactor/package.nix
@@ -13,7 +13,7 @@ php.buildComposerProject2 (finalAttrs: {
   src = fetchFromGitHub {
     owner = "phpactor";
     repo = "phpactor";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-K3phBiu2D3DbOm7mApqqSNnVCsfYRQtN/o3bCVubN9I=";
   };
 
diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix
index 01c005fb9ced..c6b139a11616 100644
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
-    rev = version;
+    tag = version;
     sha256 = "sha256-85XgRml1D6J4HkxiUk0zLlC+q0ylmN68hL0z73HG/Lk=";
   };
 
diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix
index 4d955ec9fa12..d3845fe5cbc7 100644
--- a/pkgs/by-name/ph/phraze/package.nix
+++ b/pkgs/by-name/ph/phraze/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sts10";
     repo = "phraze";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4RdPN2l0tQbxgTVxwdl0APYD8h9DrF9f5MIQkcozt48=";
   };
 
diff --git a/pkgs/by-name/ph/physlock/package.nix b/pkgs/by-name/ph/physlock/package.nix
index 20cdf5c41d40..3868f47ca888 100644
--- a/pkgs/by-name/ph/physlock/package.nix
+++ b/pkgs/by-name/ph/physlock/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "muennich";
     repo = "physlock";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1mz4xxjip5ldiw9jgfq9zvqb6w10bcjfx6939w1appqg8f521a7s";
   };
 
diff --git a/pkgs/by-name/pi/piano-rs/package.nix b/pkgs/by-name/pi/piano-rs/package.nix
index bedc763202d2..7d4f22314772 100644
--- a/pkgs/by-name/pi/piano-rs/package.nix
+++ b/pkgs/by-name/pi/piano-rs/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ritiek";
     repo = "piano-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qZeH9xXQPIOJ87mvLahnJB3DuEgLX0EAXPvECgxNlq0=";
   };
 
diff --git a/pkgs/by-name/pi/pianotrans/package.nix b/pkgs/by-name/pi/pianotrans/package.nix
index 3d73cbf97e6c..86b0ae68141d 100644
--- a/pkgs/by-name/pi/pianotrans/package.nix
+++ b/pkgs/by-name/pi/pianotrans/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "azuwis";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gRbyUQmPtGvx5QKAyrmeJl0stp7hwLBWwjSbJajihdE=";
   };
 
diff --git a/pkgs/by-name/pi/pick/package.nix b/pkgs/by-name/pi/pick/package.nix
index 307cf5f58509..a26778da4c63 100644
--- a/pkgs/by-name/pi/pick/package.nix
+++ b/pkgs/by-name/pi/pick/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mptre";
     repo = "pick";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "8cgt5KpLfnLwhucn4DQYC/7ot1u24ahJxWG+/1SL584=";
   };
 
diff --git a/pkgs/by-name/pi/picocom/package.nix b/pkgs/by-name/pi/picocom/package.nix
index 4a549e27921c..f8e21f5d72de 100644
--- a/pkgs/by-name/pi/picocom/package.nix
+++ b/pkgs/by-name/pi/picocom/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "wsakernel";
     repo = "picocom";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-cQoEfi75iltjeAm26NvXgfrL7d1Hm+1veQ4dVe0S1q8=";
   };
 
diff --git a/pkgs/by-name/pi/picocrypt-cli/package.nix b/pkgs/by-name/pi/picocrypt-cli/package.nix
index a115a2997043..e2fa1f62e255 100644
--- a/pkgs/by-name/pi/picocrypt-cli/package.nix
+++ b/pkgs/by-name/pi/picocrypt-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Picocrypt";
     repo = "CLI";
-    rev = version;
+    tag = version;
     hash = "sha256-a9fRbI3yv+K44/TIMqZMgZXRKN/Rh2AJyeTDhJynr4M=";
   };
 
diff --git a/pkgs/by-name/pi/pid1/package.nix b/pkgs/by-name/pi/pid1/package.nix
index 58880b79418b..2b07d1df8116 100644
--- a/pkgs/by-name/pi/pid1/package.nix
+++ b/pkgs/by-name/pi/pid1/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fpco";
     repo = "pid1-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2dnQj3AQxedyq1YvHKt+lVXNEtuB5sMRSCqX9YeifzI=";
   };
 
diff --git a/pkgs/by-name/pi/pigeon/package.nix b/pkgs/by-name/pi/pigeon/package.nix
index 6492341b8d8b..dd7d18a97e57 100644
--- a/pkgs/by-name/pi/pigeon/package.nix
+++ b/pkgs/by-name/pi/pigeon/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mna";
     repo = "pigeon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0Cp/OnFvVZj9UZgl3F5MCzemBaHI4smGWU46VQnhLOg=";
   };
 
diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix
index b4bf6065bd9c..9c71eeda5549 100644
--- a/pkgs/by-name/pi/pik/package.nix
+++ b/pkgs/by-name/pi/pik/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jacek-kurlit";
     repo = "pik";
-    rev = version;
+    tag = version;
     hash = "sha256-G4GTrS3zUQVLsdc/19qPl4GWZZe4U8jV+UOkX36fMWU=";
   };
 
diff --git a/pkgs/by-name/pi/piknik/package.nix b/pkgs/by-name/pi/piknik/package.nix
index 16d25c09f0f9..c4817a603c5a 100644
--- a/pkgs/by-name/pi/piknik/package.nix
+++ b/pkgs/by-name/pi/piknik/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = "piknik";
-    rev = version;
+    tag = version;
     hash = "sha256-Kdqh3sQuO0iT0RW2hU+nrmBltxCFiqOSL00cbDHZJjc=";
   };
 
diff --git a/pkgs/by-name/pi/pinchflat/package.nix b/pkgs/by-name/pi/pinchflat/package.nix
index 05f7b1070657..27e8a5ac2b99 100644
--- a/pkgs/by-name/pi/pinchflat/package.nix
+++ b/pkgs/by-name/pi/pinchflat/package.nix
@@ -17,7 +17,7 @@ beamPackages.mixRelease rec {
   src = fetchFromGitHub {
     owner = "kieraneglin";
     repo = "pinchflat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XHYCYC3SEVyheBV6diE2pn1AJARml+aNNUjJw2tVKTk=";
   };
 
diff --git a/pkgs/by-name/pi/pinentry-bemenu/package.nix b/pkgs/by-name/pi/pinentry-bemenu/package.nix
index 6cacc5f5fb1f..f1b986cf3875 100644
--- a/pkgs/by-name/pi/pinentry-bemenu/package.nix
+++ b/pkgs/by-name/pi/pinentry-bemenu/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "t-8ch";
     repo = "pinentry-bemenu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kiGUCcQIS58XjE4r0yiK4hJ85Sg5wrtBqeSYcgUKAmo=";
   };
 
diff --git a/pkgs/by-name/pi/pinentry-rofi/package.nix b/pkgs/by-name/pi/pinentry-rofi/package.nix
index 4e7290f5dfd5..44fe2b366f0f 100644
--- a/pkgs/by-name/pi/pinentry-rofi/package.nix
+++ b/pkgs/by-name/pi/pinentry-rofi/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "plattfot";
     repo = "pinentry-rofi";
-    rev = version;
+    tag = version;
     sha256 = "sha256-GHpVO8FRphVW0+In7TtB39ewwVLU1EHOeVL05pnZdFQ=";
   };
 
diff --git a/pkgs/by-name/pi/pinfo/package.nix b/pkgs/by-name/pi/pinfo/package.nix
index f7e46ae381f8..480205895571 100644
--- a/pkgs/by-name/pi/pinfo/package.nix
+++ b/pkgs/by-name/pi/pinfo/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baszoetekouw";
     repo = "pinfo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy";
   };
 
diff --git a/pkgs/by-name/pi/pingme/package.nix b/pkgs/by-name/pi/pingme/package.nix
index c59f8e973c32..e485819fd8de 100644
--- a/pkgs/by-name/pi/pingme/package.nix
+++ b/pkgs/by-name/pi/pingme/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kha7iq";
     repo = "pingme";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-i+EZ3HfuxHSuZDe0+nfZVvoNZN5XcdQFwfgOg4OLBOs=";
   };
 
diff --git a/pkgs/by-name/pi/pingtunnel/package.nix b/pkgs/by-name/pi/pingtunnel/package.nix
index 4f142c97a764..68dc9d7fabec 100644
--- a/pkgs/by-name/pi/pingtunnel/package.nix
+++ b/pkgs/by-name/pi/pingtunnel/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "esrrhs";
     repo = "pingtunnel";
-    rev = version;
+    tag = version;
     hash = "sha256-qkIeE6gNBUUd5/IhcKhDmXZbzeSTR0r6qCAK/Nz7Kew=";
   };
 
diff --git a/pkgs/by-name/pi/pinit/package.nix b/pkgs/by-name/pi/pinit/package.nix
index b4d467c58810..e3cee920f562 100644
--- a/pkgs/by-name/pi/pinit/package.nix
+++ b/pkgs/by-name/pi/pinit/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ryonakano";
     repo = "pinit";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-unvlMytZdjVbrWlwkpw90NZoFw9A6Ga0bB2XqFEPuVE=";
   };
 
diff --git a/pkgs/by-name/pi/pinniped/package.nix b/pkgs/by-name/pi/pinniped/package.nix
index 4e2fda5214cd..2212c72ffdf2 100644
--- a/pkgs/by-name/pi/pinniped/package.nix
+++ b/pkgs/by-name/pi/pinniped/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "pinniped";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vnmH8zhjecghaNe7/oguCOs9OXmtBRGdZeH4n24oXsg=";
   };
 
diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix
index e3704ef9ea77..87bc710550a5 100644
--- a/pkgs/by-name/pi/pinta/package.nix
+++ b/pkgs/by-name/pi/pinta/package.nix
@@ -35,7 +35,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "PintaProject";
     repo = "Pinta";
-    rev = version;
+    tag = version;
     hash = "sha256-/GMYF7G469oX5W1zjv5A9a6tcLX+4g6Sf9cDqxSjgWg=";
   };
 
diff --git a/pkgs/by-name/pi/pioasm/package.nix b/pkgs/by-name/pi/pioasm/package.nix
index df372b098d48..cbbd7bc93d27 100644
--- a/pkgs/by-name/pi/pioasm/package.nix
+++ b/pkgs/by-name/pi/pioasm/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "pico-sdk";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-epO7yw6/21/ess3vMCkXvXEqAn6/4613zmH/hbaBbUw=";
   };
   sourceRoot = "${finalAttrs.src.name}/tools/pioasm";
diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix
index 8d7889e772e4..ec324de26c48 100644
--- a/pkgs/by-name/pi/pioneer/package.nix
+++ b/pkgs/by-name/pi/pioneer/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pioneerspacesim";
     repo = "pioneer";
-    rev = version;
+    tag = version;
     hash = "sha256-mPTMmCgttFEhMyhGbRFBsIqI6oU0yBQJp+m7NbeeUHA=";
   };
 
diff --git a/pkgs/by-name/pi/pipectl/package.nix b/pkgs/by-name/pi/pipectl/package.nix
index 8c3587b052c5..95f3689e9502 100644
--- a/pkgs/by-name/pi/pipectl/package.nix
+++ b/pkgs/by-name/pi/pipectl/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ferdi265";
     repo = "pipectl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pNBw1ukNaqu40qPXnORUGApYpJ/0EAO9Tq5zAbDe33I=";
   };
 
diff --git a/pkgs/by-name/pi/piper/package.nix b/pkgs/by-name/pi/piper/package.nix
index 083ebff2d2a3..725c49e11e1c 100644
--- a/pkgs/by-name/pi/piper/package.nix
+++ b/pkgs/by-name/pi/piper/package.nix
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "libratbag";
     repo = "piper";
-    rev = version;
+    tag = version;
     hash = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4=";
   };
 
diff --git a/pkgs/by-name/pi/pipes-rs/package.nix b/pkgs/by-name/pi/pipes-rs/package.nix
index 9f1dee272b65..1f59861a6f88 100644
--- a/pkgs/by-name/pi/pipes-rs/package.nix
+++ b/pkgs/by-name/pi/pipes-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lhvy";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-NrBmkA7sV1RhfG9KEqQNMR5s0l2u66b7KK0toDjQIps=";
   };
 
diff --git a/pkgs/by-name/pi/pipes/package.nix b/pkgs/by-name/pi/pipes/package.nix
index a2a8b951081d..b344b7b33f0d 100644
--- a/pkgs/by-name/pi/pipes/package.nix
+++ b/pkgs/by-name/pi/pipes/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pipeseroni";
     repo = "pipes.sh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-856OWlnNiGB20571TJg7Ayzcz4r6NqdW5DMDiim09mc=";
   };
 
diff --git a/pkgs/by-name/pi/pipet/package.nix b/pkgs/by-name/pi/pipet/package.nix
index 0fe776b6837a..d5700304e9f9 100644
--- a/pkgs/by-name/pi/pipet/package.nix
+++ b/pkgs/by-name/pi/pipet/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bjesus";
     repo = "pipet";
-    rev = version;
+    tag = version;
     hash = "sha256-pu+2sHdLz9TvYHBwvGTtFr/oAD+CreOR8io82YQANxc=";
   };
 
diff --git a/pkgs/by-name/pi/pipr/package.nix b/pkgs/by-name/pi/pipr/package.nix
index c7dd6096514f..62ce40fed153 100644
--- a/pkgs/by-name/pi/pipr/package.nix
+++ b/pkgs/by-name/pi/pipr/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ElKowar";
     repo = "pipr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8=";
   };
 
diff --git a/pkgs/by-name/pi/pistol/package.nix b/pkgs/by-name/pi/pistol/package.nix
index b38a4a34e6e8..8ee11f1af65c 100644
--- a/pkgs/by-name/pi/pistol/package.nix
+++ b/pkgs/by-name/pi/pistol/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "doronbehar";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/w2BenBIzhD0KHtELlFy7YGv0lykHrjrROZeW75gHis=";
   };
 
diff --git a/pkgs/by-name/pi/pius/package.nix b/pkgs/by-name/pi/pius/package.nix
index 946d4590b6fc..4ce40d799b0f 100644
--- a/pkgs/by-name/pi/pius/package.nix
+++ b/pkgs/by-name/pi/pius/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "jaymzh";
     repo = "pius";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0l87dx7n6iwy8alxnhvval8h1kl4da6a59hsilbi65c6bpj4dh3y";
   };
 
diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix
index 227ff18f4b64..92c898a6807a 100644
--- a/pkgs/by-name/pi/piv-agent/package.nix
+++ b/pkgs/by-name/pi/piv-agent/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "smlx";
     repo = "piv-agent";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bfJIrWDFQIg0n1RDadARPHhQwE6i7mAMxE5GPYo4WU8=";
   };
 
diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix
index 761b3a6b56e8..643dff7cb4a6 100644
--- a/pkgs/by-name/pi/pix/package.nix
+++ b/pkgs/by-name/pi/pix/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-c/+NQHvscW/XE49Twmg1Rk1IfsjReCtRQWffobZtgTs=";
   };
 
diff --git a/pkgs/by-name/pi/pixd/package.nix b/pkgs/by-name/pi/pixd/package.nix
index 57487c9f5efe..d3df54540c90 100644
--- a/pkgs/by-name/pi/pixd/package.nix
+++ b/pkgs/by-name/pi/pixd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FireyFly";
     repo = "pixd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1vmkbs39mg5vwmkzfcrxqm6p8zr9sj4qdwng9icmyf5k34c34xdg";
   };
 
diff --git a/pkgs/by-name/pi/pixiewps/package.nix b/pkgs/by-name/pi/pixiewps/package.nix
index d3ea7e824612..067ea3c52084 100644
--- a/pkgs/by-name/pi/pixiewps/package.nix
+++ b/pkgs/by-name/pi/pixiewps/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wiire-a";
     repo = "pixiewps";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cJ20Gp6YaSdgUXK/ckK5Yv0rGbGXuFMP5zKZG0c4oOY=";
   };
 
diff --git a/pkgs/by-name/pi/pixz/package.nix b/pkgs/by-name/pi/pixz/package.nix
index 50c4bd695442..a48891e5ab4c 100644
--- a/pkgs/by-name/pi/pixz/package.nix
+++ b/pkgs/by-name/pi/pixz/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vasi";
     repo = "pixz";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "163axxs22w7pghr786hda22mnlpvmi50hzhfr9axwyyjl9n41qs2";
   };
   preConfigure = ''
diff --git a/pkgs/by-name/pi/pizarra/package.nix b/pkgs/by-name/pi/pizarra/package.nix
index 5cb6f80b00a8..f02c21083625 100644
--- a/pkgs/by-name/pi/pizarra/package.nix
+++ b/pkgs/by-name/pi/pizarra/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "categulario";
     repo = "pizarra-gtk";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw=";
   };
diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix
index 3ddc577400bb..22927fb98e3e 100644
--- a/pkgs/by-name/pk/pkarr/package.nix
+++ b/pkgs/by-name/pk/pkarr/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pubky";
     repo = "pkarr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zJe/hCdGVqs2TTwxnceGVXt0ZFRheSRYzjSRHytYXks=";
   };
 
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/pk/pkg/package.nix b/pkgs/by-name/pk/pkg/package.nix
index 8a3739410c4c..9ccdb4011db5 100644
--- a/pkgs/by-name/pk/pkg/package.nix
+++ b/pkgs/by-name/pk/pkg/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "freebsd";
     repo = "pkg";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-NTjAhqCUN2bN4ilijoeHHIkl58XXP5nSj/yLUL0N2fw=";
   };
 
diff --git a/pkgs/by-name/pk/pkgdiff/package.nix b/pkgs/by-name/pk/pkgdiff/package.nix
index a867c83f5eb1..1f256fb064b2 100644
--- a/pkgs/by-name/pk/pkgdiff/package.nix
+++ b/pkgs/by-name/pk/pkgdiff/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lvc";
     repo = "pkgdiff";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/xhORi/ZHC4B2z6UYPOvDzfgov1DcozRjX0K1WYrqXM=";
   };
 
diff --git a/pkgs/by-name/pk/pkger/package.nix b/pkgs/by-name/pk/pkger/package.nix
index 5dbad7a889ca..70d082e32697 100644
--- a/pkgs/by-name/pk/pkger/package.nix
+++ b/pkgs/by-name/pk/pkger/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "markbates";
     repo = "pkger";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nBuOC+uVw+hYSssgTkPRJZEBkufhQgU5D6jsZZre7Is=";
   };
 
diff --git a/pkgs/by-name/pk/pkgtop/package.nix b/pkgs/by-name/pk/pkgtop/package.nix
index c730478d8410..3fd91577ea55 100644
--- a/pkgs/by-name/pk/pkgtop/package.nix
+++ b/pkgs/by-name/pk/pkgtop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "pkgtop";
-    rev = version;
+    tag = version;
     hash = "sha256-NY8nx4BKAUq1nGBlzRzm2OH1k01TV6qs2IcoErhuxTc=";
   };
 
diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix
index e877da17cc2d..b4bb700734e8 100644
--- a/pkgs/by-name/pl/planify/package.nix
+++ b/pkgs/by-name/pl/planify/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
-    rev = version;
+    tag = version;
     hash = "sha256-YgNM+fzss1+Q6Fv9mhedhCorWFnerx5oC3iISEhs6z8=";
   };
 
diff --git a/pkgs/by-name/pl/plano-theme/package.nix b/pkgs/by-name/pl/plano-theme/package.nix
index 7bec5cabaeef..9a17583359f0 100644
--- a/pkgs/by-name/pl/plano-theme/package.nix
+++ b/pkgs/by-name/pl/plano-theme/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "plano-theme";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-slGr2nsdKng6zaVDeXWFAWKIxZbcnOLU6RH6wM0293E=";
   };
 
diff --git a/pkgs/by-name/pl/plasma-hud/package.nix b/pkgs/by-name/pl/plasma-hud/package.nix
index 078bda093c5b..924f26461642 100644
--- a/pkgs/by-name/pl/plasma-hud/package.nix
+++ b/pkgs/by-name/pl/plasma-hud/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Zren";
     repo = "plasma-hud";
-    rev = version;
+    tag = version;
     hash = "sha256-1AQtgVlrmzBkim1kVZzTAwJHq0OH3YAPr6o5aUpgdKc=";
   };
 
diff --git a/pkgs/by-name/pl/platform-folders/package.nix b/pkgs/by-name/pl/platform-folders/package.nix
index 5fa41c391595..ccd61bd1a6ea 100644
--- a/pkgs/by-name/pl/platform-folders/package.nix
+++ b/pkgs/by-name/pl/platform-folders/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sago007";
     repo = "PlatformFolders";
-    rev = version;
+    tag = version;
     hash = "sha256-ruhAP9kjwm6pIFJ5a6oy6VE5W39bWQO3qSrT5IUtiwA=";
   };
 
diff --git a/pkgs/by-name/pl/platinum-searcher/package.nix b/pkgs/by-name/pl/platinum-searcher/package.nix
index 76568d9482e0..3c2bab45f985 100644
--- a/pkgs/by-name/pl/platinum-searcher/package.nix
+++ b/pkgs/by-name/pl/platinum-searcher/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "monochromegane";
     repo = "the_platinum_searcher";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FNHlALFwMbajaHWOehdSFeQmvZSuCZLdqGqLZ7DF+pI=";
   };
 
diff --git a/pkgs/by-name/pl/playerctl/package.nix b/pkgs/by-name/pl/playerctl/package.nix
index e4a4b10d1e6d..5e853aaabf15 100644
--- a/pkgs/by-name/pl/playerctl/package.nix
+++ b/pkgs/by-name/pl/playerctl/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "playerctl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OiGKUnsKX0ihDRceZoNkcZcEAnz17h2j2QUOSVcxQEY=";
   };
 
diff --git a/pkgs/by-name/pl/please/package.nix b/pkgs/by-name/pl/please/package.nix
index d991fee33649..f4486e749d5a 100644
--- a/pkgs/by-name/pl/please/package.nix
+++ b/pkgs/by-name/pl/please/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "edneville";
     repo = "please";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bQ91uCDA2HKuiBmHZ9QP4V6tM6c7hRvECqXzfC6EEnI=";
   };
 
diff --git a/pkgs/by-name/pl/plfit/package.nix b/pkgs/by-name/pl/plfit/package.nix
index e9b61b9270ef..c6492d3ce66a 100644
--- a/pkgs/by-name/pl/plfit/package.nix
+++ b/pkgs/by-name/pl/plfit/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ntamas";
     repo = "plfit";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-0JrPAq/4yzr7XbxvcnFj8CKmMyZT05PkSdGprNdAsJA=";
   };
 
diff --git a/pkgs/by-name/pl/plink-ng/package.nix b/pkgs/by-name/pl/plink-ng/package.nix
index 74b04c56ecce..5e2d34501c95 100644
--- a/pkgs/by-name/pl/plink-ng/package.nix
+++ b/pkgs/by-name/pl/plink-ng/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chrchang";
     repo = "plink-ng";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq";
   };
 
diff --git a/pkgs/by-name/pl/plocate/package.nix b/pkgs/by-name/pl/plocate/package.nix
index 5a38cd82123f..7e6cb078d64c 100644
--- a/pkgs/by-name/pl/plocate/package.nix
+++ b/pkgs/by-name/pl/plocate/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.sesse.net/plocate";
-    rev = version;
+    tag = version;
     sha256 = "sha256-TWQ2mVzosB6sGNUXI2D9GGqgaRZcmiL9GSGrrusck5Q=";
   };
 
diff --git a/pkgs/by-name/pl/plog/package.nix b/pkgs/by-name/pl/plog/package.nix
index 7152799ef7c7..2703e57db0e4 100644
--- a/pkgs/by-name/pl/plog/package.nix
+++ b/pkgs/by-name/pl/plog/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SergiusTheBest";
     repo = "plog";
-    rev = version;
+    tag = version;
     hash = "sha256-NZphrg9OB1FTY2ifu76AXeCyGwW2a2BkxMGjZPf4uM8=";
   };
 
diff --git a/pkgs/by-name/pl/plotinus/package.nix b/pkgs/by-name/pl/plotinus/package.nix
index 4d66711a3220..ee2e2a32a99c 100644
--- a/pkgs/by-name/pl/plotinus/package.nix
+++ b/pkgs/by-name/pl/plotinus/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "p-e-w";
     repo = "plotinus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "19k6f6ivg4ab57m62g6fkg85q9sv049snmzq1fyqnqijggwshxfz";
   };
 
diff --git a/pkgs/by-name/pl/plowshare/package.nix b/pkgs/by-name/pl/plowshare/package.nix
index 50ccefde02a2..b829a9b14106 100644
--- a/pkgs/by-name/pl/plowshare/package.nix
+++ b/pkgs/by-name/pl/plowshare/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mcrapet";
     repo = "plowshare";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1p8s60dlzaldp006yj710s371aan915asyjhd99188vrj4jj1x79";
   };
 
diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix
index 1c838f2456db..4a4ac6c574c1 100644
--- a/pkgs/by-name/pl/plumber/package.nix
+++ b/pkgs/by-name/pl/plumber/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "streamdal";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0pyeCTkmS7gG51Xm4Gc62p+I5DRUA2F9tPHaZjO+/WE=";
   };
 
diff --git a/pkgs/by-name/pl/plumed/package.nix b/pkgs/by-name/pl/plumed/package.nix
index c2d64c559678..0c9ac0492e22 100644
--- a/pkgs/by-name/pl/plumed/package.nix
+++ b/pkgs/by-name/pl/plumed/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "plumed";
     repo = "plumed2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KN412t64tp3QUQkhpLU3sAYDosQ3hw9HqpT1fzt5fwA=";
   };
 
diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index 31782dafb32e..fa6594246d66 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/gq6BdlNG9vUazVt7Ucvv2679BytUEZrx6u8znnsxG4=";
   };
 
diff --git a/pkgs/by-name/pl/plymouth/package.nix b/pkgs/by-name/pl/plymouth/package.nix
index 27251284df3f..4d8c27a57127 100644
--- a/pkgs/by-name/pl/plymouth/package.nix
+++ b/pkgs/by-name/pl/plymouth/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "plymouth";
     repo = "plymouth";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-9JmZCm8bjteJTQrMSJeL4x2CAI6RpKowFUDSCcMS4MM=";
   };
 
diff --git a/pkgs/by-name/pm/pm2/package.nix b/pkgs/by-name/pm/pm2/package.nix
index 6884ea8d91eb..4f6a49e96cce 100644
--- a/pkgs/by-name/pm/pm2/package.nix
+++ b/pkgs/by-name/pm/pm2/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Unitech";
     repo = "pm2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8Fsh7rld7rtT55qVgj3/XbujNpZx0BfzTRcLjdPLFSA=";
   };
 
diff --git a/pkgs/by-name/pn/pn/package.nix b/pkgs/by-name/pn/pn/package.nix
index 91adda540acf..c3bae27abfb2 100644
--- a/pkgs/by-name/pn/pn/package.nix
+++ b/pkgs/by-name/pn/pn/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Orange-OpenSource";
     repo = "pn";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vRF9MPcw/hCreHVLD6QB7g1r0wQiZv1xrfzIHj1Yf9M=";
   };
 
diff --git a/pkgs/by-name/pn/pngoptimizer/package.nix b/pkgs/by-name/pn/pngoptimizer/package.nix
index d87379370d6a..3fd61ef3f7ac 100644
--- a/pkgs/by-name/pn/pngoptimizer/package.nix
+++ b/pkgs/by-name/pn/pngoptimizer/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hadrien-psydk";
     repo = "pngoptimizer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1hbgf91vzx46grslfdx86smdvm6gs6lq9hpa3bax9xfbsknxi0i7";
   };
 
diff --git a/pkgs/by-name/pn/pngquant/package.nix b/pkgs/by-name/pn/pngquant/package.nix
index 2c70fa3032e4..8f2b0032cb81 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/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix
index 06204e425d25..fdaea285a33e 100644
--- a/pkgs/by-name/pn/pnmixer/package.nix
+++ b/pkgs/by-name/pn/pnmixer/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nicklan";
     repo = "pnmixer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148";
   };
 
diff --git a/pkgs/by-name/pn/pnpm-shell-completion/package.nix b/pkgs/by-name/pn/pnpm-shell-completion/package.nix
index 305abd2a1bfd..427c439f3902 100644
--- a/pkgs/by-name/pn/pnpm-shell-completion/package.nix
+++ b/pkgs/by-name/pn/pnpm-shell-completion/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "g-plane";
     repo = "pnpm-shell-completion";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bc2ZVHQF+lSAmhy/fvdiVfg9uzPPcXYrtiNChjkjHtA=";
   };
 
diff --git a/pkgs/by-name/po/pocket-casts/package.nix b/pkgs/by-name/po/pocket-casts/package.nix
index 7ff8546875e5..ae20efa34407 100644
--- a/pkgs/by-name/po/pocket-casts/package.nix
+++ b/pkgs/by-name/po/pocket-casts/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "felicianotech";
     repo = "pocket-casts-desktop-app";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5xn2uAjqIyWKQAruHLyho72HCYpbxyWlcTQ3LXXZy6M=";
   };
 
diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index 812e0270b5ff..66f72e64e667 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PDHRMCICzvb7InHSvYRvlYDaB6hkESJyL7iiz+lO6+I=";
   };
 
diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix
index 15a4d6bb0c62..a02d77de868b 100644
--- a/pkgs/by-name/po/podman-tui/package.nix
+++ b/pkgs/by-name/po/podman-tui/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-tui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dtXJRoOb/FhGuCaRB43/8y2DM3ZgpYVts1ATzsVsUFE=";
   };
 
diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index 48565b2d64cd..eea23a833882 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -79,7 +79,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RirMBb45KeBLdBJrRa86WxI4FiXdBar+RnVQ2ezEEYc=";
   };
 
diff --git a/pkgs/by-name/po/poetry2conda/package.nix b/pkgs/by-name/po/poetry2conda/package.nix
index ee2c500ad28d..1e405c552744 100644
--- a/pkgs/by-name/po/poetry2conda/package.nix
+++ b/pkgs/by-name/po/poetry2conda/package.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dojeda";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UqNoEGgStvqtxhYwExk7wO4SvATaM2kGaFbB5ViJa7U=";
   };
 
diff --git a/pkgs/by-name/po/pokeget-rs/package.nix b/pkgs/by-name/po/pokeget-rs/package.nix
index 21d894a17250..8eac2a5e143b 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-0dss+ZJ1hhQGpWySWhyF+T1T+G3BlnKfSosgCJa8MPE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/po/pokemonsay/package.nix b/pkgs/by-name/po/pokemonsay/package.nix
index 01abfe0bfcc8..9e85166710c6 100644
--- a/pkgs/by-name/po/pokemonsay/package.nix
+++ b/pkgs/by-name/po/pokemonsay/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "HRKings";
     repo = "pokemonsay-newgenerations";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IDTAZmOzkUg0kLUM0oWuVbi8EwE4sEpLWrNAtq/he+g=";
   };
 
diff --git a/pkgs/by-name/po/polkit/package.nix b/pkgs/by-name/po/polkit/package.nix
index 1ecf173e5608..5bc610eb1b94 100644
--- a/pkgs/by-name/po/polkit/package.nix
+++ b/pkgs/by-name/po/polkit/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "polkit-org";
     repo = "polkit";
-    rev = version;
+    tag = version;
     hash = "sha256-ZSqgW//q5DFIsmY17U93mJcK/CHSCHphKTHsTxp40q8=";
   };
 
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index 8e90ffa43897..b4e9f4e51aa7 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 a2d535413c53..02fc5c1b0539 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/pomerium-cli/package.nix b/pkgs/by-name/po/pomerium-cli/package.nix
index 6fbf07776211..1e57bd72823a 100644
--- a/pkgs/by-name/po/pomerium-cli/package.nix
+++ b/pkgs/by-name/po/pomerium-cli/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CcXreKZ83+WDucV3sr62bwKzSs+S9R3e+z0JD0rR8jw=";
   };
 
diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix
index b19b8c130e3d..c55930d07da0 100644
--- a/pkgs/by-name/po/pomerium/package.nix
+++ b/pkgs/by-name/po/pomerium/package.nix
@@ -23,7 +23,7 @@ buildGo123Module rec {
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "pomerium";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Uj/mVklFRaoDNQjCFS5NW/AhSU+7V1XxPiZBAUuly7s=";
   };
 
diff --git a/pkgs/by-name/po/pommed_light/package.nix b/pkgs/by-name/po/pommed_light/package.nix
index 0def37b1b7c4..da9ef2630186 100644
--- a/pkgs/by-name/po/pommed_light/package.nix
+++ b/pkgs/by-name/po/pommed_light/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bytbox";
     repo = "pommed-light";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "18fvdwwhcl6s4bpf2f2i389s71c8k4g0yb81am9rdddqmzaw27iy";
   };
 
diff --git a/pkgs/by-name/po/pomsky/package.nix b/pkgs/by-name/po/pomsky/package.nix
index 73dbffd89916..57aacdddbcff 100644
--- a/pkgs/by-name/po/pomsky/package.nix
+++ b/pkgs/by-name/po/pomsky/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pomsky-lang";
     repo = "pomsky";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BoA59P0jzV08hlFO7NPB9E+fdpYB9G50dNggFkexc/c=";
   };
 
diff --git a/pkgs/by-name/po/ponymix/package.nix b/pkgs/by-name/po/ponymix/package.nix
index c3072757a57e..ce7dfacbbb78 100644
--- a/pkgs/by-name/po/ponymix/package.nix
+++ b/pkgs/by-name/po/ponymix/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "falconindy";
     repo = "ponymix";
-    rev = version;
+    tag = version;
     sha256 = "08yp7fprmzm6px5yx2rvzri0l60bra5h59l26pn0k071a37ks1rb";
   };
 
diff --git a/pkgs/by-name/po/poop/package.nix b/pkgs/by-name/po/poop/package.nix
index 3edae8fb889b..62b82bc735d1 100644
--- a/pkgs/by-name/po/poop/package.nix
+++ b/pkgs/by-name/po/poop/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrewrk";
     repo = "poop";
-    rev = version;
+    tag = version;
     hash = "sha256-zrqR/TTELhsBIX42PysFsHPRs8Lx/zHcmi+VMDw1SdQ=";
   };
 
diff --git a/pkgs/by-name/po/pop-icon-theme/package.nix b/pkgs/by-name/po/pop-icon-theme/package.nix
index fd0a63376b7b..9928cda44518 100644
--- a/pkgs/by-name/po/pop-icon-theme/package.nix
+++ b/pkgs/by-name/po/pop-icon-theme/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "icon-theme";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-V8xBZj6T4Ly/GHV0CVLZ1a4UZbmCkhYRe05qUfJk7Wg=";
   };
 
diff --git a/pkgs/by-name/po/pop-launcher/package.nix b/pkgs/by-name/po/pop-launcher/package.nix
index 873bdfe7aceb..cbf5aea435d7 100644
--- a/pkgs/by-name/po/pop-launcher/package.nix
+++ b/pkgs/by-name/po/pop-launcher/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "launcher";
-    rev = version;
+    tag = version;
     hash = "sha256-CLpquNgdtnGMlMpGLv72WZmizalvYPfMWlE/qLprVrs=";
   };
 
diff --git a/pkgs/by-name/po/pop/package.nix b/pkgs/by-name/po/pop/package.nix
index d320feb46e82..7f346b57287a 100644
--- a/pkgs/by-name/po/pop/package.nix
+++ b/pkgs/by-name/po/pop/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "pop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZGJkpa1EIw3tt1Ww2HFFoYsnnmnSAiv86XEB5TPf4/k=";
   };
 
diff --git a/pkgs/by-name/po/popeye/package.nix b/pkgs/by-name/po/popeye/package.nix
index 01d4bbaa3125..4e18a9cfddb0 100644
--- a/pkgs/by-name/po/popeye/package.nix
+++ b/pkgs/by-name/po/popeye/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   version = "0.22.1";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "derailed";
     repo = "popeye";
     sha256 = "sha256-CbVYQIE7kjUah+SDEjs5Qz+n4+f3HriQNxYPqDcdr/I=";
diff --git a/pkgs/by-name/po/popl/package.nix b/pkgs/by-name/po/popl/package.nix
index 023b283b670d..edc50cad62bd 100644
--- a/pkgs/by-name/po/popl/package.nix
+++ b/pkgs/by-name/po/popl/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "badaix";
     repo = "popl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AkqFRPK0tVdalL+iyMou0LIUkPkFnYYdSqwEbFbgzqI=";
   };
 
diff --git a/pkgs/by-name/po/poppins/package.nix b/pkgs/by-name/po/poppins/package.nix
index 32ee21503798..a197014f0dc3 100644
--- a/pkgs/by-name/po/poppins/package.nix
+++ b/pkgs/by-name/po/poppins/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "itfoundry";
     repo = "poppins";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7+RQHYxNFqOw2EeS2hgrbK/VbUAiPorUtkyRb5MFh5w=";
   };
 
diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix
index a7d5a90624db..33562008b150 100644
--- a/pkgs/by-name/po/popsicle/package.nix
+++ b/pkgs/by-name/po/popsicle/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "popsicle";
-    rev = version;
+    tag = version;
     hash = "sha256-sWQNav7odvX+peDglLHd7Jrmvhm5ddFBLBla0WK7wcE=";
   };
 
diff --git a/pkgs/by-name/po/poptop/package.nix b/pkgs/by-name/po/poptop/package.nix
index 8796c2b16272..05377d611dff 100644
--- a/pkgs/by-name/po/poptop/package.nix
+++ b/pkgs/by-name/po/poptop/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "bakks";
     repo = "poptop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CwJpkGNTDmtXfJx6GGz2XRU0fMeKl7I3fXm4BJ9MAQ4=";
   };
 
diff --git a/pkgs/by-name/po/popura/package.nix b/pkgs/by-name/po/popura/package.nix
index b28cee329d49..bfd9165218c1 100644
--- a/pkgs/by-name/po/popura/package.nix
+++ b/pkgs/by-name/po/popura/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "${pname}-network";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iCu6/vD4vgn7aGdwK+OB8ib/QwUwoFuxDUs7vqbTZQc=";
   };
 
diff --git a/pkgs/by-name/po/porsmo/package.nix b/pkgs/by-name/po/porsmo/package.nix
index 21dba217b326..e4c0c9d6d744 100644
--- a/pkgs/by-name/po/porsmo/package.nix
+++ b/pkgs/by-name/po/porsmo/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ColorCookie-dev";
     repo = "porsmo";
-    rev = version;
+    tag = version;
     hash = "sha256-bYPUSrGJKoNLFkIiGuXraYoaYn/HKSP8IiH3gtyWfmw=";
   };
 
diff --git a/pkgs/by-name/po/portal/package.nix b/pkgs/by-name/po/portal/package.nix
index c64c8050c531..717b093f0361 100644
--- a/pkgs/by-name/po/portal/package.nix
+++ b/pkgs/by-name/po/portal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SpatiumPortae";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hGB82a2WirUL1Tph6EuoITOQGYA0Lo4zOeKPC46B5Qk=";
   };
 
diff --git a/pkgs/by-name/po/portfolio-filemanager/package.nix b/pkgs/by-name/po/portfolio-filemanager/package.nix
index dcba59036fd6..a6c81d60db76 100644
--- a/pkgs/by-name/po/portfolio-filemanager/package.nix
+++ b/pkgs/by-name/po/portfolio-filemanager/package.nix
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tchx84";
     repo = "Portfolio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v86pQbj5+SqdzsW0Ko5TW/12NsFVNSPyX6g0e+MdzHE=";
   };
 
diff --git a/pkgs/by-name/po/portmod/package.nix b/pkgs/by-name/po/portmod/package.nix
index 32156ade1c36..83011f1cdabb 100644
--- a/pkgs/by-name/po/portmod/package.nix
+++ b/pkgs/by-name/po/portmod/package.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitLab {
     owner = "portmod";
     repo = "Portmod";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d5XNfjDgtBkNkUMhShYTjKtMbwVa2tLXdvYi6sXQmIA=";
   };
 
diff --git a/pkgs/by-name/po/portunus/package.nix b/pkgs/by-name/po/portunus/package.nix
index 96408db6f66d..966d93a72dd7 100644
--- a/pkgs/by-name/po/portunus/package.nix
+++ b/pkgs/by-name/po/portunus/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "majewsky";
     repo = "portunus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+pMMIutj+OWKZmOYH5NuA4a7aS5CD+33vAEC9bJmyfM=";
   };
 
diff --git a/pkgs/by-name/po/postiats-utilities/package.nix b/pkgs/by-name/po/postiats-utilities/package.nix
index 8e00897e79cd..a5ddac057470 100644
--- a/pkgs/by-name/po/postiats-utilities/package.nix
+++ b/pkgs/by-name/po/postiats-utilities/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Hibou57";
     repo = "PostiATS-Utilities";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QeBbv5lwqL2ARjB+RGyBHeuibaxugffBLhC9lYs+5tE=";
   };
 
diff --git a/pkgs/by-name/po/postsrsd/package.nix b/pkgs/by-name/po/postsrsd/package.nix
index f100d56d94cf..0a51077a95a8 100644
--- a/pkgs/by-name/po/postsrsd/package.nix
+++ b/pkgs/by-name/po/postsrsd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "roehling";
     repo = "postsrsd";
-    rev = version;
+    tag = version;
     sha256 = "sha256-aSI9TR1wSyMA0SKkbavk+IugRfW4ZEgpzrNiXn0F5ak=";
   };
 
diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix
index 780120135f6f..a3f2a9791498 100644
--- a/pkgs/by-name/po/pouf/package.nix
+++ b/pkgs/by-name/po/pouf/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mothsart";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-tW86b9a7u1jyfmHjwjs+5DaUujRZH+VhGQsj0CBj0yk=";
   };
 
diff --git a/pkgs/by-name/po/power-profiles-daemon/package.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix
index 8759b2d76b14..1733f5dca807 100644
--- a/pkgs/by-name/po/power-profiles-daemon/package.nix
+++ b/pkgs/by-name/po/power-profiles-daemon/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "upower";
     repo = "power-profiles-daemon";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-iQUhA46BEln8pyIBxM/MY7An8BzfiFjxZdR/tUIj4S4=";
   };
 
diff --git a/pkgs/by-name/po/powercap/package.nix b/pkgs/by-name/po/powercap/package.nix
index e38ea1713f39..85611e40a8a6 100644
--- a/pkgs/by-name/po/powercap/package.nix
+++ b/pkgs/by-name/po/powercap/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "powercap";
     repo = "powercap";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-l+IpFqBnCYUU825++sUPySD/Ku0TEIX2kt+S0Wml6iA=";
   };
 
diff --git a/pkgs/by-name/po/powerdns-admin/package.nix b/pkgs/by-name/po/powerdns-admin/package.nix
index 31f7c15777f4..3b7a7980bb49 100644
--- a/pkgs/by-name/po/powerdns-admin/package.nix
+++ b/pkgs/by-name/po/powerdns-admin/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "PowerDNS-Admin";
     repo = "PowerDNS-Admin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q9mt8wjSNFb452Xsg+qhNOWa03KJkYVGAeCWVSzZCyk=";
   };
 
diff --git a/pkgs/by-name/po/powerjoular/package.nix b/pkgs/by-name/po/powerjoular/package.nix
index 9cb31c00c8f8..cf35f396c323 100644
--- a/pkgs/by-name/po/powerjoular/package.nix
+++ b/pkgs/by-name/po/powerjoular/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "joular";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-fJYcJKbZ6PoTJSfEDEKPOy+CDwDRsaeAn/2BW5r4p7k=";
   };
 
diff --git a/pkgs/by-name/po/powerline-go/package.nix b/pkgs/by-name/po/powerline-go/package.nix
index 852a49f4981e..5ef59667ec60 100644
--- a/pkgs/by-name/po/powerline-go/package.nix
+++ b/pkgs/by-name/po/powerline-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "justjanne";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DLw/6jnJo0IAh0/Y21mfCLP4GgTFlUGvuwyWJwhzYFU=";
   };
 
diff --git a/pkgs/by-name/pp/pps-tools/package.nix b/pkgs/by-name/pp/pps-tools/package.nix
index 5da54a0f02ac..303887928b59 100644
--- a/pkgs/by-name/pp/pps-tools/package.nix
+++ b/pkgs/by-name/pp/pps-tools/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "redlab-i";
     repo = "pps-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eLLFHrCgOQzOtVxlAsZ5X91KK+vZiKMGL7zbQFiIZtI=";
   };
 
diff --git a/pkgs/by-name/pq/pqiv/package.nix b/pkgs/by-name/pq/pqiv/package.nix
index ef4da7d1d6d7..cb76f3a5906e 100644
--- a/pkgs/by-name/pq/pqiv/package.nix
+++ b/pkgs/by-name/pq/pqiv/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "phillipberndt";
     repo = "pqiv";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-wpM8eG2/sEfwYLfh6s3AL+z73IzeXxwGm/scWRRKLPo=";
   };
 
diff --git a/pkgs/by-name/pq/pql/package.nix b/pkgs/by-name/pq/pql/package.nix
index df0424707dc9..bc2218fba24b 100644
--- a/pkgs/by-name/pq/pql/package.nix
+++ b/pkgs/by-name/pq/pql/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "runreveal";
     repo = "pql";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/112LQfIkya/9hzq3nxtpdSarHIshPw4mezNcKm4xyI=";
   };
 
diff --git a/pkgs/by-name/pq/pqrs/package.nix b/pkgs/by-name/pq/pqrs/package.nix
index 24f68672f396..9b3617334734 100644
--- a/pkgs/by-name/pq/pqrs/package.nix
+++ b/pkgs/by-name/pq/pqrs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "manojkarthick";
     repo = "pqrs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0oSSoGZga0OGAKUNsLmKkUl8N1l0pVi4KIqrKJbeVVU=";
   };
 
diff --git a/pkgs/by-name/pr/prboom-plus/package.nix b/pkgs/by-name/pr/prboom-plus/package.nix
index 9367745fc611..6b2eb8433b3c 100644
--- a/pkgs/by-name/pr/prboom-plus/package.nix
+++ b/pkgs/by-name/pr/prboom-plus/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "prboom-plus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-moU/bZ2mS1QfKPP6HaAwWP1nRNZ4Ue5DFl9zBBrJiHw=";
   };
 
diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index c79c90475fe7..d7b4b15eb363 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "precice";
     repo = "precice";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KpmcQj8cv5V5OXCMhe2KLTsqUzKWtTeQyP+zg+Y+yd0=";
   };
 
diff --git a/pkgs/by-name/pr/preserves-nim/package.nix b/pkgs/by-name/pr/preserves-nim/package.nix
index dd1f4f0319a6..8ea5d448158e 100644
--- a/pkgs/by-name/pr/preserves-nim/package.nix
+++ b/pkgs/by-name/pr/preserves-nim/package.nix
@@ -9,7 +9,7 @@ buildNimSbom (finalAttrs: {
     domain = "git.syndicate-lang.org";
     owner = "ehmry";
     repo = "preserves-nim";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-A1v72ToSLEEUZTNcPl82t8OKvr5heQCWVWYEJh362Eo=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index 33a182458c93..76565c24b289 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -27,7 +27,7 @@ let
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-y3BsNmLh9M5NgDPURCjCGWYci40hYcQtDVqsu2HqPRU=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/downstream.nix b/pkgs/by-name/pr/pretalx/plugins/downstream.nix
index dd1465777ac2..ac9a16eab63a 100644
--- a/pkgs/by-name/pr/pretalx/plugins/downstream.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/downstream.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-downstream";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Q9519jNKQUeNCHg3ivjYyQm1ePMxp/bhtcJAselQiiM=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix
index c240be878ad1..ad659a6143dd 100644
--- a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-media-ccc-de";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-U+26hit4xXUzN8JT3WL+iGohqomX1ENb+ihM9IT1XWQ=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/pages.nix b/pkgs/by-name/pr/pretalx/plugins/pages.nix
index 76395ed666d2..215777694fa1 100644
--- a/pkgs/by-name/pr/pretalx/plugins/pages.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/pages.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-pages";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9ZJSW6kdxpwHd25CuGTE4MMXylXaZKL3eAEKKdYiuXs=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix
index 993bfd6def88..79ebd21165e4 100644
--- a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-public-voting";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ei6GgPPEXv9WVhh+4U+WDFCMsT4bND9O85cPLpPWMhQ=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/venueless.nix b/pkgs/by-name/pr/pretalx/plugins/venueless.nix
index 7c138f07f651..c704ea0def08 100644
--- a/pkgs/by-name/pr/pretalx/plugins/venueless.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/venueless.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-venueless";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1YWkyTaImnlGXZWrborvJrx8zc1FOZD/ugOik7S+fC8=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix
index a6037ca3e8fa..2748a818cea7 100644
--- a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-vimeo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MwAKmPQif2wLy03II1t87lIdIf2th4BteaAo5pACjLE=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/youtube.nix b/pkgs/by-name/pr/pretalx/plugins/youtube.nix
index b2b89acbd6a9..4ee2f7bfeccf 100644
--- a/pkgs/by-name/pr/pretalx/plugins/youtube.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/youtube.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-youtube";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5vQPFW0qABKQjFUvjMrtmIGEpMzLLbAOBA4GFqqBNw0=";
   };
 
diff --git a/pkgs/by-name/pr/pretix-banktool/package.nix b/pkgs/by-name/pr/pretix-banktool/package.nix
index fc91c12e97a7..46d42962444b 100644
--- a/pkgs/by-name/pr/pretix-banktool/package.nix
+++ b/pkgs/by-name/pr/pretix-banktool/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-banktool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-x6P+WqrOak5/gmMEmBkHrx6kPsbSOAXbKRbndFG3IJU=";
   };
 
diff --git a/pkgs/by-name/pr/pretix/plugins/dbvat/package.nix b/pkgs/by-name/pr/pretix/plugins/dbvat/package.nix
index 740449daf025..4191f2675774 100644
--- a/pkgs/by-name/pr/pretix/plugins/dbvat/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/dbvat/package.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-dbvat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yAKqB0G2WyGqGogAxv8fI34gO6Wl/50sY/5rvWYH4Ho=";
   };
 
diff --git a/pkgs/by-name/pr/pretix/plugins/pages/package.nix b/pkgs/by-name/pr/pretix/plugins/pages/package.nix
index 3e7b5eb314e7..b137bb6453e3 100644
--- a/pkgs/by-name/pr/pretix/plugins/pages/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/pages/package.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-pages";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZM38zHlFB5013PvoJwm7YC5/wHg2GZWmrhvreXuqNc8=";
   };
 
diff --git a/pkgs/by-name/pr/pretix/plugins/passbook/package.nix b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix
index ad8f6ac642c6..99e087ac6743 100644
--- a/pkgs/by-name/pr/pretix/plugins/passbook/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-passbook";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xN37nM2AQVxFg+TOZ3cEvEV4F115U9m6YVX12al4SIw=";
   };
 
diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
index bda526e184b4..be573dc567ad 100644
--- a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-zugferd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VtmlgxqV34e3Yu9uTYwJAZoZQ/TQoEJgjHcpqUsxxq8=";
   };
 
diff --git a/pkgs/by-name/pr/prettier-d-slim/package.nix b/pkgs/by-name/pr/prettier-d-slim/package.nix
index 6278fee6b513..7dca656a1fd2 100644
--- a/pkgs/by-name/pr/prettier-d-slim/package.nix
+++ b/pkgs/by-name/pr/prettier-d-slim/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mikew";
     repo = "prettier_d_slim";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-M+qlFKtIro3geVsVaYu6dIfOrJIlUQY98LSBikKNV/I=";
   };
 
diff --git a/pkgs/by-name/pr/prettyping/package.nix b/pkgs/by-name/pr/prettyping/package.nix
index 178d7756bfc5..7e43f998c72f 100644
--- a/pkgs/by-name/pr/prettyping/package.nix
+++ b/pkgs/by-name/pr/prettyping/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "denilsonsa";
     repo = "prettyping";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "05vfaq9y52z40245j47yjk1xaiwrazv15sgjq64w91dfyahjffxf";
   };
 
diff --git a/pkgs/by-name/pr/prevo-tools/package.nix b/pkgs/by-name/pr/prevo-tools/package.nix
index 5f8b9502d957..998c2fc8927c 100644
--- a/pkgs/by-name/pr/prevo-tools/package.nix
+++ b/pkgs/by-name/pr/prevo-tools/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bpeel";
     repo = "prevodb";
-    rev = version;
+    tag = version;
     hash = "sha256-TfgsZidwXewwqGkb31Qv0SrX8wQdPaK7JQA3nB5h2bs=";
   };
 
diff --git a/pkgs/by-name/pr/prime-server/package.nix b/pkgs/by-name/pr/prime-server/package.nix
index 41bd6671019f..3c8783cfa6e3 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/principia/package.nix b/pkgs/by-name/pr/principia/package.nix
index 6ed8e890eca9..71925491d3aa 100644
--- a/pkgs/by-name/pr/principia/package.nix
+++ b/pkgs/by-name/pr/principia/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Bithack";
     repo = "principia";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-cXtc1E4iJf3//UyzZzhky/NV7zk4959xSwGLHdCeyk0=";
   };
 
diff --git a/pkgs/by-name/pr/prisma-engines/package.nix b/pkgs/by-name/pr/prisma-engines/package.nix
index d7156eaa6ba9..d65038b16f66 100644
--- a/pkgs/by-name/pr/prisma-engines/package.nix
+++ b/pkgs/by-name/pr/prisma-engines/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
-    rev = version;
+    tag = version;
     hash = "sha256-gQLDskabTaNk19BJi9Kv4TiEfVck2QZ7xdhopt5KH6M=";
   };
 
diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix
index 5240f890a1a7..b50013d8c0b8 100644
--- a/pkgs/by-name/pr/prisma/package.nix
+++ b/pkgs/by-name/pr/prisma/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Buu+E0xxjcrPOyEHkQTp7IVS9kymmR1PTegeOXxb2PA=";
   };
 
diff --git a/pkgs/by-name/pr/pritunl-client/package.nix b/pkgs/by-name/pr/pritunl-client/package.nix
index 37ea802f59e2..d171b02b3f39 100644
--- a/pkgs/by-name/pr/pritunl-client/package.nix
+++ b/pkgs/by-name/pr/pritunl-client/package.nix
@@ -23,7 +23,7 @@ let
   src = fetchFromGitHub {
     owner = "pritunl";
     repo = "pritunl-client-electron";
-    rev = version;
+    tag = version;
     sha256 = "sha256-bxCGZ2Jm2rPKRH6Uj0JmQ3MQ3zRd6kXjOVeAOHBl1lA=";
   };
 
diff --git a/pkgs/by-name/pr/pritunl-ssh/package.nix b/pkgs/by-name/pr/pritunl-ssh/package.nix
index 31c41e894a0b..20779a364ef6 100644
--- a/pkgs/by-name/pr/pritunl-ssh/package.nix
+++ b/pkgs/by-name/pr/pritunl-ssh/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pritunl";
     repo = "pritunl-zero-client";
-    rev = version;
+    tag = version;
     sha256 = "sha256-kccc8ZDh3S/Ko/MaBd5u0UxMNIbg5dhvRuecJuE3D6c=";
   };
 
diff --git a/pkgs/by-name/pr/procdump/package.nix b/pkgs/by-name/pr/procdump/package.nix
index a547f7f69f35..a619528d9971 100644
--- a/pkgs/by-name/pr/procdump/package.nix
+++ b/pkgs/by-name/pr/procdump/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "ProcDump-for-Linux";
-    rev = version;
+    tag = version;
     sha256 = "sha256-gVswAezHl7E2cBTJEQhPFXhHkzhWVHSpPF8m0s8+ekc=";
   };
 
diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix
index e88658dcb0bb..7c6127697ac1 100644
--- a/pkgs/by-name/pr/process-compose/package.nix
+++ b/pkgs/by-name/pr/process-compose/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "F1bonacc1";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E7ovd/dNSMxVld7CS4ZjxZxUVDXLuoQR7W4ZZ1cPMP0=";
     # 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/process-cpp/package.nix b/pkgs/by-name/pr/process-cpp/package.nix
index eb9638e74ab1..d004f1ff5191 100644
--- a/pkgs/by-name/pr/process-cpp/package.nix
+++ b/pkgs/by-name/pr/process-cpp/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.com";
     owner = "ubports";
     repo = "development/core/lib-cpp/process-cpp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-UCNmD5Ea2wnEwG9gkt88TaX0vfS4SCaIOPRMeNFx80Y=";
   };
 
diff --git a/pkgs/by-name/pr/prodigal/package.nix b/pkgs/by-name/pr/prodigal/package.nix
index 616ce2f6c5f8..ec052ab082e6 100644
--- a/pkgs/by-name/pr/prodigal/package.nix
+++ b/pkgs/by-name/pr/prodigal/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "Prodigal";
     owner = "hyattpd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1fs1hqk83qjbjhrvhw6ni75zakx5ki1ayy3v6wwkn3xvahc9hi5s";
   };
 
diff --git a/pkgs/by-name/pr/profetch/package.nix b/pkgs/by-name/pr/profetch/package.nix
index 3c7c259f9eb8..25084d46270b 100644
--- a/pkgs/by-name/pr/profetch/package.nix
+++ b/pkgs/by-name/pr/profetch/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RustemB";
     repo = "profetch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JsjpPUXMN0jytRS4yzSjrseqHiEQ+YinklG+tIIy+Zo=";
   };
 
diff --git a/pkgs/by-name/pr/profile-cleaner/package.nix b/pkgs/by-name/pr/profile-cleaner/package.nix
index 48b0916e9ac2..bad70ab31653 100644
--- a/pkgs/by-name/pr/profile-cleaner/package.nix
+++ b/pkgs/by-name/pr/profile-cleaner/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = "profile-cleaner";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-10e1S+li7SXKJX2lETSdx84GavWqQYQqyLoBIVToTBI=";
   };
 
diff --git a/pkgs/by-name/pr/profile-sync-daemon/package.nix b/pkgs/by-name/pr/profile-sync-daemon/package.nix
index 100848d523ab..8f06a0ff7165 100644
--- a/pkgs/by-name/pr/profile-sync-daemon/package.nix
+++ b/pkgs/by-name/pr/profile-sync-daemon/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = "profile-sync-daemon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Wb9YLxuu9i9s/Y6trz5NZDU9WRywe3138cp5Q2gWbxM=";
   };
 
diff --git a/pkgs/by-name/pr/programmer-calculator/package.nix b/pkgs/by-name/pr/programmer-calculator/package.nix
index 75c4b15b7c12..2d574b970004 100644
--- a/pkgs/by-name/pr/programmer-calculator/package.nix
+++ b/pkgs/by-name/pr/programmer-calculator/package.nix
@@ -12,7 +12,7 @@ gccStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alt-romes";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9mv8Jac6j3fKWLLCu1Bd/T5dbegUB8rRgsj9MaQhFDw=";
   };
 
diff --git a/pkgs/by-name/pr/progress/package.nix b/pkgs/by-name/pr/progress/package.nix
index ec6d2916fdd6..0962b5093b34 100644
--- a/pkgs/by-name/pr/progress/package.nix
+++ b/pkgs/by-name/pr/progress/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Xfennec";
     repo = "progress";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-riewkageSZIlwDNMjYep9Pb2q1GJ+WMXazokJGbb4bE=";
   };
 
diff --git a/pkgs/by-name/pr/proj-datumgrid/package.nix b/pkgs/by-name/pr/proj-datumgrid/package.nix
index a1c7121f017c..28741013d80f 100644
--- a/pkgs/by-name/pr/proj-datumgrid/package.nix
+++ b/pkgs/by-name/pr/proj-datumgrid/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "proj-datumgrid";
-    rev = version;
+    tag = version;
     sha256 = "132wp77fszx33wann0fjkmi1isxvsb0v9iw0gd9sxapa9h6hf3am";
   };
 
diff --git a/pkgs/by-name/pr/projectable/package.nix b/pkgs/by-name/pr/projectable/package.nix
index 5b27b6ffe9ce..929c93dfd882 100644
--- a/pkgs/by-name/pr/projectable/package.nix
+++ b/pkgs/by-name/pr/projectable/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dzfrias";
     repo = "projectable";
-    rev = version;
+    tag = version;
     hash = "sha256-GM/dPmLnv1/Qj6QhBxPu5kO/SDnbY7Ntupf1FGkmrUY=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
index 2390d74441c3..fdb473882023 100644
--- a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "elasticsearch_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v6Fi5O/87jhFI1h6qWyWb61X+dTjcqS3Fi9/MPQSr8Y=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
index 46069bd5468e..92a88dba7728 100644
--- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
@@ -9,7 +9,7 @@ let
   src = fetchFromGitHub {
     owner = "tynany";
     repo = "frr_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-J847Y2ZxD0JLEv7hYS5EsNBA6052PXO6VVoavFrWVUU=";
   };
 in
diff --git a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix
index db41ced6fd45..ff9b94c17f7e 100644
--- a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "scross01";
     repo = "prometheus-klipper-exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OlNUBdCizMOSb7WEtu00LaHYSXLSPlISVJD/0rHujnY=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix b/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix
index 94ee81b1b357..1bdf39a483e5 100644
--- a/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "utkuozdemir";
     repo = "nvidia_gpu_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nBNQqnXomQpEgspC9kmI574Onhkcg7UCXIf7O7XiiH0=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-pushgateway/package.nix b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
index 5d71ec9da6f5..dc884c766c37 100644
--- a/pkgs/by-name/pr/prometheus-pushgateway/package.nix
+++ b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "pushgateway";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VIqk5GxI5qFnsjeq6FL1UUd7lX3VLLhTcPlo4j8oL/c=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-restic-exporter/package.nix b/pkgs/by-name/pr/prometheus-restic-exporter/package.nix
index 4950727a3e3f..2379c3190b75 100644
--- a/pkgs/by-name/pr/prometheus-restic-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-restic-exporter/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ngosang";
     repo = "restic-exporter";
-    rev = version;
+    tag = version;
     hash = "sha256-b3TbBZqNJEAveNVf+6OGHU2G3UUyuSEjzFMPJVuxlBE=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix
index 9073641c66e1..b1c01547cacb 100644
--- a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "boynux";
     repo = "squid-exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-low1nIL7FbIYfIP7KWPskAQ50Hh+d7JI+ryYoR+mP10=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix b/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
index bcb3fa0e65e8..51b6469bdb1d 100644
--- a/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   version = "2.0.0";
 
   src = fetchFromGitHub {
-    rev = version;
+    tag = version;
     owner = "ipstatic";
     repo = "surfboard_exporter";
     sha256 = "11qms26648nwlwslnaflinxcr5rnp55s908rm1qpnbz0jnxf5ipw";
diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix
index 3dda7203bd4e..8cec8fe7e81d 100644
--- a/pkgs/by-name/pr/promptfoo/package.nix
+++ b/pkgs/by-name/pr/promptfoo/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "promptfoo";
     repo = "promptfoo";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-sMBgjxPzG3SJ7RS4oTtOq7hJ1MYaKW3/6FF8Pn5l89c=";
   };
 
diff --git a/pkgs/by-name/pr/promql-cli/package.nix b/pkgs/by-name/pr/promql-cli/package.nix
index b92927a19f64..ac5618d4b424 100644
--- a/pkgs/by-name/pr/promql-cli/package.nix
+++ b/pkgs/by-name/pr/promql-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nalbury";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EV63fdG+GF+kVLH2TxHPhRcUU5xBvkW5bhHC1lEoj84=";
   };
 
diff --git a/pkgs/by-name/pr/promscale/package.nix b/pkgs/by-name/pr/promscale/package.nix
index 9c350a7f8866..c30011321c73 100644
--- a/pkgs/by-name/pr/promscale/package.nix
+++ b/pkgs/by-name/pr/promscale/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "timescale";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-JizUI9XRzOEHF1kAblYQRYB11z9KWX7od3lPiRN+JNI=";
   };
 
diff --git a/pkgs/by-name/pr/proot/package.nix b/pkgs/by-name/pr/proot/package.nix
index b3fb0a36629d..d044685047e3 100644
--- a/pkgs/by-name/pr/proot/package.nix
+++ b/pkgs/by-name/pr/proot/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "proot";
     owner = "proot-me";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Z9Y7ccWp5KEVuo9xfHcgo58XqYVdFo7ck1jH7cnT2KA=";
   };
 
diff --git a/pkgs/by-name/pr/properties-cpp/package.nix b/pkgs/by-name/pr/properties-cpp/package.nix
index 887c1e2eeec9..adae3bb8fad9 100644
--- a/pkgs/by-name/pr/properties-cpp/package.nix
+++ b/pkgs/by-name/pr/properties-cpp/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/properties-cpp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-C/BDEuKNMQHOjATO5aWBptjIlgfv6ykzjFAsHb6uP3Q=";
   };
 
diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix
index 4ef2318e150d..c174f954956b 100644
--- a/pkgs/by-name/pr/protege/package.nix
+++ b/pkgs/by-name/pr/protege/package.nix
@@ -16,7 +16,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "protegeproject";
     repo = "protege";
-    rev = version;
+    tag = version;
     hash = "sha256-Q3MHa7nCeF31n7JPltcemFBc/sJwGA9Ev0ymjQhY/U0=";
   };
 
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/proto-contrib/package.nix b/pkgs/by-name/pr/proto-contrib/package.nix
index 0581335fe17f..4d7e22836245 100644
--- a/pkgs/by-name/pr/proto-contrib/package.nix
+++ b/pkgs/by-name/pr/proto-contrib/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "emicklei";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk";
   };
 
diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix
index c073a3a72c00..f5ba3a77604d 100644
--- a/pkgs/by-name/pr/proto/package.nix
+++ b/pkgs/by-name/pr/proto/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = "proto";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cyRChMYYkqsTto91jZLxSrAbuYEeDcm3iXjLc23UqBI=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-doc/package.nix b/pkgs/by-name/pr/protoc-gen-doc/package.nix
index 0b9d1bc03165..dd9abfc4a5dc 100644
--- a/pkgs/by-name/pr/protoc-gen-doc/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-doc/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pseudomuto";
     repo = "protoc-gen-doc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-19CN62AwqQGq5Gb5kQqVYhs+LKsJ9K2L0VAakwzPD5Y=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
index f7eed9ab1c33..2e9d994b5692 100644
--- a/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ent";
     repo = "contrib";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8BQXjoVTasCReAc3XWBgeoYmL9zLj+uvf9TRKBYaAr4=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix b/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
index 0c39bb857a4f..cccb1b3a142d 100644
--- a/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "planetscale";
     repo = "vtprotobuf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ji6elc0hN49A4Ov/ckd8chPR4/8ZX11THzVz9HJGui4=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix
index a119d4ee6fcc..d255f86de90e 100644
--- a/pkgs/by-name/pr/protoc-gen-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6Wx1XoHZS1RM0hpgVE85U7huVS4IK+AroTE2zpZR4VI=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-js/package.nix b/pkgs/by-name/pr/protoc-gen-js/package.nix
index a3754ce78e46..c5535c812579 100644
--- a/pkgs/by-name/pr/protoc-gen-js/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-js/package.nix
@@ -14,7 +14,7 @@ buildBazelPackage rec {
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf-javascript";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-swift/package.nix b/pkgs/by-name/pr/protoc-gen-swift/package.nix
index c0635e0868c2..f2f5c876ad08 100644
--- a/pkgs/by-name/pr/protoc-gen-swift/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-swift/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "apple";
     repo = "swift-protobuf";
-    rev = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-UPYwu8SiBUHofqHdUT6uxdeY2WUXYqbkLj+h4chSCa4=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-twirp/package.nix b/pkgs/by-name/pr/protoc-gen-twirp/package.nix
index a1072f957800..02412fb40486 100644
--- a/pkgs/by-name/pr/protoc-gen-twirp/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-twirp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "twitchtv";
     repo = "twirp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-p3gHVHGBHakOOQnJAuMK7vZumNXN15mOABuEHUG0wNs=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-validate/package.nix b/pkgs/by-name/pr/protoc-gen-validate/package.nix
index ef920b6351ce..d25a1a10ddc4 100644
--- a/pkgs/by-name/pr/protoc-gen-validate/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-validate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "protoc-gen-validate";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kGnfR8o12bvjJH+grAwlYezF6UzWt7lgjGslq+07p3k=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-go-inject-tag/package.nix b/pkgs/by-name/pr/protoc-go-inject-tag/package.nix
index 5d6d1cc8330d..f19777431c8b 100644
--- a/pkgs/by-name/pr/protoc-go-inject-tag/package.nix
+++ b/pkgs/by-name/pr/protoc-go-inject-tag/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "favadi";
     repo = "protoc-go-inject-tag";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8mpkwv80PMfOPiammg596hW7xdrcum9Hl/v5O1DPWgY=";
   };
 
diff --git a/pkgs/by-name/pr/protolint/package.nix b/pkgs/by-name/pr/protolint/package.nix
index 8dac80a2bb93..ffdab28cd32f 100644
--- a/pkgs/by-name/pr/protolint/package.nix
+++ b/pkgs/by-name/pr/protolint/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yoheimuta";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3/eoVrt/Ic2LLLbexXG3ng/uR60JbmKheSxa2PiMnvg=";
   };
 
diff --git a/pkgs/by-name/pr/protolock/package.nix b/pkgs/by-name/pr/protolock/package.nix
index 663219e3e719..7c5c04a7c949 100644
--- a/pkgs/by-name/pr/protolock/package.nix
+++ b/pkgs/by-name/pr/protolock/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nilslice";
     repo = "protolock";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+7kU4nCBwCA6mnjFrejPrIILYUSfYpq13d+0MmNZoBg=";
   };
 
diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix
index 7321597a5dc9..e0104ca80c0e 100644
--- a/pkgs/by-name/pr/proton-caller/package.nix
+++ b/pkgs/by-name/pr/proton-caller/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "caverym";
     repo = "proton-caller";
-    rev = version;
+    tag = version;
     sha256 = "sha256-srzahBMihkEP9/+7oRij5POHkCcH6QBh4kGz42Pz0nM=";
   };
 
diff --git a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
index c9a25a988dcd..ae7360d3a256 100644
--- a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
+++ b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-vpn-local-agent";
-    rev = version;
+    tag = version;
     hash = "sha256-9dyyLZZEOB2080KxN0ffdkRhyvEY8xKE/7b2mA7JL+o=";
   };
 
diff --git a/pkgs/by-name/pr/protonmail-bridge/package.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix
index 4e3a5558a601..59d764aa55d6 100644
--- a/pkgs/by-name/pr/protonmail-bridge/package.nix
+++ b/pkgs/by-name/pr/protonmail-bridge/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ProtonMail";
     repo = "proton-bridge";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Jx6yzn3QNOVz/VM8dqmTm4Upzz46aNo9d6lvhjLwdL4=";
   };
 
diff --git a/pkgs/by-name/pr/prototool/package.nix b/pkgs/by-name/pr/prototool/package.nix
index 211c86bd7c07..990f8217c123 100644
--- a/pkgs/by-name/pr/prototool/package.nix
+++ b/pkgs/by-name/pr/prototool/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "uber";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T6SjjyHC4j5du2P4Emcfq/ZFbuCpMPPJFJTHb/FNMAo=";
   };
 
diff --git a/pkgs/by-name/pr/prox/package.nix b/pkgs/by-name/pr/prox/package.nix
index adc0751adb2d..043cbad24c7f 100644
--- a/pkgs/by-name/pr/prox/package.nix
+++ b/pkgs/by-name/pr/prox/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fgrosse";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KSHTlcAmnuU8F17N0LBS0s5b/k6Of0OEHVd3v50bH3g=";
   };
 
diff --git a/pkgs/by-name/pr/proximity-sort/package.nix b/pkgs/by-name/pr/proximity-sort/package.nix
index 38c24ff597e3..a65e1baf9bec 100644
--- a/pkgs/by-name/pr/proximity-sort/package.nix
+++ b/pkgs/by-name/pr/proximity-sort/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = "proximity-sort";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MRLQvspv6kjirljhAkk1KT+hPA4hdjA1b7RL9eEyglQ=";
   };
 
diff --git a/pkgs/by-name/pr/proxmove/package.nix b/pkgs/by-name/pr/proxmove/package.nix
index 8007f2a77874..c97a24468bdf 100644
--- a/pkgs/by-name/pr/proxmove/package.nix
+++ b/pkgs/by-name/pr/proxmove/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ossobv";
     repo = "proxmove";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8xzsmQsogoMrdpf8+mVZRWPGQt9BO0dBT0aKt7ygUe4=";
   };
 
diff --git a/pkgs/by-name/pr/proxychains-ng/package.nix b/pkgs/by-name/pr/proxychains-ng/package.nix
index 6644ecdf4103..b5a7fbe1d405 100644
--- a/pkgs/by-name/pr/proxychains-ng/package.nix
+++ b/pkgs/by-name/pr/proxychains-ng/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rofl0r";
     repo = "proxychains-ng";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cHRWPQm6aXsror0z+S2Ddm7w14c1OvEruDublWsvnXs=";
   };
 
diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix
index ca7ce16a8adc..3c7ce2728fea 100644
--- a/pkgs/by-name/pr/proxysql/package.nix
+++ b/pkgs/by-name/pr/proxysql/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sysown";
     repo = "proxysql";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Ouz1SSc35gQaJcVQO95azkxNgLxuY712ELAwM5buEtY=";
   };
 
diff --git a/pkgs/by-name/pr/prqlc/package.nix b/pkgs/by-name/pr/prqlc/package.nix
index ba09becf04be..1675667c5f1b 100644
--- a/pkgs/by-name/pr/prqlc/package.nix
+++ b/pkgs/by-name/pr/prqlc/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "prql";
     repo = "prql";
-    rev = version;
+    tag = version;
     hash = "sha256-lJkZXiwZUr/qACb9X52EGR0FBOicuPMmyA1105G7gZU=";
   };
 
diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix
index 4715f0cf80ca..e3a8a2e06e9c 100644
--- a/pkgs/by-name/pr/prr/package.nix
+++ b/pkgs/by-name/pr/prr/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "danobi";
     repo = "prr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-siQZ3rDKv2lnn1bmisRsexWwfvmMhK+z4GZGPsrfPgc=";
   };
 
diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix
index 6e6089f50321..3bbb7561ec80 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-wLM+txjngY5gh/+yiaSKrenG6oIzF2dPgMumIGyCsXU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ps/ps2eps/package.nix b/pkgs/by-name/ps/ps2eps/package.nix
index a5132909375a..02bdb69566cc 100644
--- a/pkgs/by-name/ps/ps2eps/package.nix
+++ b/pkgs/by-name/ps/ps2eps/package.nix
@@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "roland-bless";
     repo = "ps2eps";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SPLwsGKLVhANoqSQ/GJ938cYjbjMbUOXkNn9so3aJTA=";
   };
   patches = [
diff --git a/pkgs/by-name/ps/ps_mem/package.nix b/pkgs/by-name/ps/ps_mem/package.nix
index 2b8365f04077..460c0e91fd82 100644
--- a/pkgs/by-name/ps/ps_mem/package.nix
+++ b/pkgs/by-name/ps/ps_mem/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pixelb";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jCfPtPSky/QFk9Xo/tq3W7609Pie1yLC4iS4dqjCa+E=";
   };
 
diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix
index ffbd140a6627..ab228be978df 100644
--- a/pkgs/by-name/ps/pscale/package.nix
+++ b/pkgs/by-name/ps/pscale/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "planetscale";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-aWml3iTcci1V8RkiCrvv+E7zmW5JJCDzDNv2RaDhjAg=";
   };
 
diff --git a/pkgs/by-name/ps/pscircle/package.nix b/pkgs/by-name/ps/pscircle/package.nix
index 29e7ec26bd39..a9ac7983e41c 100644
--- a/pkgs/by-name/ps/pscircle/package.nix
+++ b/pkgs/by-name/ps/pscircle/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "mildlyparallel";
     repo = "pscircle";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bqbQBNscNfoqXprhoFUnUQO88YQs9xDhD4d3KHamtG0=";
   };
 
diff --git a/pkgs/by-name/ps/psi-notify/package.nix b/pkgs/by-name/ps/psi-notify/package.nix
index 42ce2fb267be..d53ff170728a 100644
--- a/pkgs/by-name/ps/psi-notify/package.nix
+++ b/pkgs/by-name/ps/psi-notify/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cdown";
     repo = "psi-notify";
-    rev = version;
+    tag = version;
     sha256 = "sha256-GhGiSI5r0Ki6+MYNa5jCDyYZEW5R9LDNZ/S8K+6L0jo=";
   };
 
diff --git a/pkgs/by-name/ps/psitop/package.nix b/pkgs/by-name/ps/psitop/package.nix
index 573c6e970c9f..e27c58b2527b 100644
--- a/pkgs/by-name/ps/psitop/package.nix
+++ b/pkgs/by-name/ps/psitop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jamespwilliams";
     repo = "psitop";
-    rev = version;
+    tag = version;
     hash = "sha256-TD+NTlfmBtz+m2w2FnTcUIJQakpvVBCK/MAHfCrOue4=";
   };
 
diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index 63f57bd75ac8..21599566f02e 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "psi-4ward";
     repo = "psitransfer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA=";
   };
   app = buildNpmPackage {
diff --git a/pkgs/by-name/ps/psmisc/package.nix b/pkgs/by-name/ps/psmisc/package.nix
index d96dfa9456b7..ed73d1b20ad7 100644
--- a/pkgs/by-name/ps/psmisc/package.nix
+++ b/pkgs/by-name/ps/psmisc/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-49YpdIh0DxLHfxos4sw1HUkV0XQBqmm4M9b0T4eN2xI=";
   };
 
diff --git a/pkgs/by-name/ps/pspg/package.nix b/pkgs/by-name/ps/pspg/package.nix
index fb2addc0c646..4b395f8b5ca7 100644
--- a/pkgs/by-name/ps/pspg/package.nix
+++ b/pkgs/by-name/ps/pspg/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "pspg";
-    rev = version;
+    tag = version;
     sha256 = "sha256-8Wi8fMEBc1A0foEzwO5Dq6c3yC0pJ9hbzCjjMp+Lapg=";
   };
 
diff --git a/pkgs/by-name/ps/psql2csv/package.nix b/pkgs/by-name/ps/psql2csv/package.nix
index aaef5311a9ce..f46e575ea485 100644
--- a/pkgs/by-name/ps/psql2csv/package.nix
+++ b/pkgs/by-name/ps/psql2csv/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fphilipe";
     repo = "psql2csv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XIdZ2+Jlw2JLn4KXD9h3+xXymu4FhibAfp5uGGkVwLQ=";
   };
 
diff --git a/pkgs/by-name/ps/pssh/package.nix b/pkgs/by-name/ps/pssh/package.nix
index 7b01d058ed16..6feb3528f171 100644
--- a/pkgs/by-name/ps/pssh/package.nix
+++ b/pkgs/by-name/ps/pssh/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lilydjwg";
     repo = "pssh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B1dIa6hNeq4iE8GKVhTp3Gzq7vp+v5Yyzj8uF8X71yg=";
   };
 
diff --git a/pkgs/by-name/ps/psstop/package.nix b/pkgs/by-name/ps/psstop/package.nix
index 67968128d828..1d8d0c784b71 100644
--- a/pkgs/by-name/ps/psstop/package.nix
+++ b/pkgs/by-name/ps/psstop/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "clearlinux";
     repo = "psstop";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h";
   };
 
diff --git a/pkgs/by-name/ps/psw/package.nix b/pkgs/by-name/ps/psw/package.nix
index b288a3e3b2f3..930566b02917 100644
--- a/pkgs/by-name/ps/psw/package.nix
+++ b/pkgs/by-name/ps/psw/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Wulfsta";
     repo = "psw";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Rf6vpVgenTzb42/aGqItuxUodl61eNyUPlry7rgLPbI=";
   };
 
diff --git a/pkgs/by-name/pt/ptags/package.nix b/pkgs/by-name/pt/ptags/package.nix
index 00ed0da95640..14f019688004 100644
--- a/pkgs/by-name/pt/ptags/package.nix
+++ b/pkgs/by-name/pt/ptags/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dalance";
     repo = "ptags";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bxp38zWufqS6PZqhw8X5HR5zMRcwH58MuZaJmDRuiys=";
   };
 
diff --git a/pkgs/by-name/pt/ptex/package.nix b/pkgs/by-name/pt/ptex/package.nix
index 4887e0ab4f67..2f3ff8fa5bea 100644
--- a/pkgs/by-name/pt/ptex/package.nix
+++ b/pkgs/by-name/pt/ptex/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wdas";
     repo = "ptex";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PR1ld9rXmL6BK4llznAsD5PNvi3anFMz2i9NDsG95DQ=";
   };
 
diff --git a/pkgs/by-name/pt/ptouch-driver/package.nix b/pkgs/by-name/pt/ptouch-driver/package.nix
index 95c04d04d462..bc5bd05c35c4 100644
--- a/pkgs/by-name/pt/ptouch-driver/package.nix
+++ b/pkgs/by-name/pt/ptouch-driver/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "philpem";
     repo = "printer-driver-ptouch";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3ZotSHn7lERp53hAzx47Ct/k565rEoensCcltwX/Xls=";
   };
 
diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix
index 366a186d99ed..83e6f9210d04 100644
--- a/pkgs/by-name/pt/ptyxis/package.nix
+++ b/pkgs/by-name/pt/ptyxis/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "chergert";
     repo = "ptyxis";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ZZwrqX7GkqMVtLhyzJvThzqmxg/PRwBxSshSv/Z7uKo=";
   };
 
diff --git a/pkgs/by-name/pu/pufferpanel/package.nix b/pkgs/by-name/pu/pufferpanel/package.nix
index 590e622c3cc4..387e6c595d75 100644
--- a/pkgs/by-name/pu/pufferpanel/package.nix
+++ b/pkgs/by-name/pu/pufferpanel/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "PufferPanel";
     repo = "PufferPanel";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+ZZUoqCiSbrkaeYrm9X8SuX0INsGFegQNwa3WjBvgHQ=";
   };
 
diff --git a/pkgs/by-name/pu/puffin/package.nix b/pkgs/by-name/pu/puffin/package.nix
index ac3959e111c4..59cfea3a6add 100644
--- a/pkgs/by-name/pu/puffin/package.nix
+++ b/pkgs/by-name/pu/puffin/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "siddhantac";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5lglIiVOsxnMbeR/E3O5TaMtoR5DJACWjStE4d7hDao=";
   };
 
diff --git a/pkgs/by-name/pu/pulsarctl/package.nix b/pkgs/by-name/pu/pulsarctl/package.nix
index 0113ddca9b40..0f5f742ba00b 100644
--- a/pkgs/by-name/pu/pulsarctl/package.nix
+++ b/pkgs/by-name/pu/pulsarctl/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "streamnative";
     repo = "pulsarctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/4JSSYd18hEHUOiay3y74VHBY3ql6aqAK4aWDJaqwCU=";
   };
 
diff --git a/pkgs/by-name/pu/pulseaudio-ctl/package.nix b/pkgs/by-name/pu/pulseaudio-ctl/package.nix
index da9c2d5757da..fa192d6b1c6c 100644
--- a/pkgs/by-name/pu/pulseaudio-ctl/package.nix
+++ b/pkgs/by-name/pu/pulseaudio-ctl/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZB1jrr31PF7+vNB+Xo5CATJmYbuDAPwewpDxCVnAowY=";
   };
 
diff --git a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
index ceec2b35af4c..106e1170d289 100644
--- a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
+++ b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "neutrinolabs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GT0kBfq6KvuiX30B9JzCiUxgSm9E6IhdJuQKKKprDCE=";
   };
 
diff --git a/pkgs/by-name/pu/pulsemixer/package.nix b/pkgs/by-name/pu/pulsemixer/package.nix
index 7a54c6a17483..b7e5dae8dbf0 100644
--- a/pkgs/by-name/pu/pulsemixer/package.nix
+++ b/pkgs/by-name/pu/pulsemixer/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GeorgeFilipkin";
     repo = "pulsemixer";
-    rev = version;
+    tag = version;
     sha256 = "1jagx9zmz5pfsld8y2rj2kqg6ww9f6vqiawfy3vhqc49x3xx92p4";
   };
 
diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix
index 08dd1f41862b..3956e7cc1c7d 100644
--- a/pkgs/by-name/pu/pulumi-esc/package.nix
+++ b/pkgs/by-name/pu/pulumi-esc/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "esc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hQYA8j0fmVdlRuUfZy4NT5oYYot2lHrTqFCPe255F2k=";
   };
 
diff --git a/pkgs/by-name/pu/pulumictl/package.nix b/pkgs/by-name/pu/pulumictl/package.nix
index 110b623787bf..a2e2e916766e 100644
--- a/pkgs/by-name/pu/pulumictl/package.nix
+++ b/pkgs/by-name/pu/pulumictl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "pulumictl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rFVxfWeESWmqH0BhKY6BO5AxSPXVW8tOPGyUXB5Kc/E=";
   };
 
diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix
index 10656bfdcee3..743e73456d6d 100644
--- a/pkgs/by-name/pu/pupdate/package.nix
+++ b/pkgs/by-name/pu/pupdate/package.nix
@@ -16,7 +16,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "mattpannella";
     repo = "pupdate";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-kdxqG1Vw6jRT/YyRLi60APpayYyLG73KqAFga8N9G2A=";
   };
 
diff --git a/pkgs/by-name/pu/puppeteer-cli/package.nix b/pkgs/by-name/pu/puppeteer-cli/package.nix
index 03b71b728ab5..1b7c32e1e1a3 100644
--- a/pkgs/by-name/pu/puppeteer-cli/package.nix
+++ b/pkgs/by-name/pu/puppeteer-cli/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "JarvusInnovations";
     repo = "puppeteer-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0xrb8r4qc9ds7wmfd30nslnkqylxqfwr4gqf7b30v651sjyds29x";
   };
 
diff --git a/pkgs/by-name/pu/pure-prompt/package.nix b/pkgs/by-name/pu/pure-prompt/package.nix
index 036dd69c7fc3..6f2fee650944 100644
--- a/pkgs/by-name/pu/pure-prompt/package.nix
+++ b/pkgs/by-name/pu/pure-prompt/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sindresorhus";
     repo = "pure";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k=";
   };
 
diff --git a/pkgs/by-name/pu/pushup/package.nix b/pkgs/by-name/pu/pushup/package.nix
index 6432fa558cc3..ce9f4159951f 100644
--- a/pkgs/by-name/pu/pushup/package.nix
+++ b/pkgs/by-name/pu/pushup/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adhocteam";
     repo = "pushup";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9ENXeVON2/Bt8oXnyVw+Vl0bPVPP7iFSyhxwc091ZIs=";
   };
 
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/pw/pw-viz/package.nix b/pkgs/by-name/pw/pw-viz/package.nix
index 0d193713e6e8..40a591428e85 100644
--- a/pkgs/by-name/pw/pw-viz/package.nix
+++ b/pkgs/by-name/pw/pw-viz/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ax9d";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fB7PnWWahCMKhGREg6neLmOZjh2OWLu61Vpmfsl03wA=";
   };
 
diff --git a/pkgs/by-name/pw/pw-volume/package.nix b/pkgs/by-name/pw/pw-volume/package.nix
index deb28d104371..dd464fa94055 100644
--- a/pkgs/by-name/pw/pw-volume/package.nix
+++ b/pkgs/by-name/pw/pw-volume/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "smasher164";
     repo = "pw-volume";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-r/6AAZKZgPYUGic/Dag7OT5RtH+RKgEkJVWxsO5VGZ0=";
   };
 
diff --git a/pkgs/by-name/pw/pw3270/package.nix b/pkgs/by-name/pw/pw3270/package.nix
index 2c4f1a342676..7e89a6123d0c 100644
--- a/pkgs/by-name/pw/pw3270/package.nix
+++ b/pkgs/by-name/pw/pw3270/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PerryWerneck";
     repo = "pw3270";
-    rev = version;
+    tag = version;
     hash = "sha256-Nk/OUqrWngKgb1D1Wi8q5ygKtvuRKUPhPQaLvWi1Z4g=";
   };
 
diff --git a/pkgs/by-name/pw/pwalarmctl/package.nix b/pkgs/by-name/pw/pwalarmctl/package.nix
index 4c6c03e3e6e6..1e841f7bb1a8 100644
--- a/pkgs/by-name/pw/pwalarmctl/package.nix
+++ b/pkgs/by-name/pw/pwalarmctl/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "amyipdev";
     repo = "pwalarmd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xoC1PtDQjkvoWb9x8A43ITo6xyYOv9hxH2pxiZBBvKI=";
   };
 
diff --git a/pkgs/by-name/pw/pwalarmd/package.nix b/pkgs/by-name/pw/pwalarmd/package.nix
index 07c6354d4a1a..10ec5178f061 100644
--- a/pkgs/by-name/pw/pwalarmd/package.nix
+++ b/pkgs/by-name/pw/pwalarmd/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "amyipdev";
     repo = "pwalarmd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xoC1PtDQjkvoWb9x8A43ITo6xyYOv9hxH2pxiZBBvKI=";
   };
 
diff --git a/pkgs/by-name/pw/pwgen-secure/package.nix b/pkgs/by-name/pw/pwgen-secure/package.nix
index a9827117a994..a6d0a2228794 100644
--- a/pkgs/by-name/pw/pwgen-secure/package.nix
+++ b/pkgs/by-name/pw/pwgen-secure/package.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mjmunger";
     repo = "pwgen_secure";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "15md5606hzy1xfhj2lxmc0nvynyrcs4vxa5jdi34kfm31rdklj28";
   };
 
diff --git a/pkgs/by-name/pw/pwgen/package.nix b/pkgs/by-name/pw/pwgen/package.nix
index 05585886da8b..e666d512d410 100644
--- a/pkgs/by-name/pw/pwgen/package.nix
+++ b/pkgs/by-name/pw/pwgen/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tytso";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1j6c6m9fcy24jn8mk989x49yk765xb26lpr8yhpiaqk206wlss2z";
   };
 
diff --git a/pkgs/by-name/pw/pwru/package.nix b/pkgs/by-name/pw/pwru/package.nix
index 42b8745f50e8..128dd2d9784c 100644
--- a/pkgs/by-name/pw/pwru/package.nix
+++ b/pkgs/by-name/pw/pwru/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "pwru";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3lIKbzwPX6okJT9CeErX5/innUK3VqnnbWPpvlSN+6U=";
   };
 
diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix
index 0ef4f94a3df1..ec62d1e47782 100644
--- a/pkgs/by-name/pw/pwsafe/package.nix
+++ b/pkgs/by-name/pw/pwsafe/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-GmM7AXnTjw6kme2mZqmKrirsorosSygJ38H5fnIqTZ4=";
   };
 
diff --git a/pkgs/by-name/px/pxder/package.nix b/pkgs/by-name/px/pxder/package.nix
index e01b261ae781..1d1917985898 100644
--- a/pkgs/by-name/px/pxder/package.nix
+++ b/pkgs/by-name/px/pxder/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Tsuk1ko";
     repo = "pxder";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+WZbs10+id+nohTZzLjEofb6k8PMGd73YhY3FUTXx5Q=";
   };
 
diff --git a/pkgs/by-name/py/py3c/package.nix b/pkgs/by-name/py/py3c/package.nix
index 8f42639a737c..c8f767183b31 100644
--- a/pkgs/by-name/py/py3c/package.nix
+++ b/pkgs/by-name/py/py3c/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "encukou";
     repo = "py3c";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-v8+0J56sZVbGdBlOotObUa10/zFMTvfXdMYRsKhyZaY=";
   };
 
diff --git a/pkgs/by-name/py/pyCA/package.nix b/pkgs/by-name/py/pyCA/package.nix
index 3af887e0c051..32e2dd4d926f 100644
--- a/pkgs/by-name/py/pyCA/package.nix
+++ b/pkgs/by-name/py/pyCA/package.nix
@@ -23,7 +23,7 @@ let
     src = fetchFromGitHub {
       owner = "opencast";
       repo = "pyCA";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-cTkWkOmgxJZlddqaSYKva2wih4Mvsdrd7LD4NggxKQk=";
     };
 
@@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "opencast";
     repo = "pyCA";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cTkWkOmgxJZlddqaSYKva2wih4Mvsdrd7LD4NggxKQk=";
   };
 
diff --git a/pkgs/by-name/py/pychess/package.nix b/pkgs/by-name/py/pychess/package.nix
index fdf109bb150a..2a2c647d1bf0 100644
--- a/pkgs/by-name/py/pychess/package.nix
+++ b/pkgs/by-name/py/pychess/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pychess";
     repo = "pychess";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-hxc+vYvCeiM0+oOu1peI9qkZg5PeIsDMCiydJQAuzOk=";
   };
 
diff --git a/pkgs/by-name/py/pylint-exit/package.nix b/pkgs/by-name/py/pylint-exit/package.nix
index 9095d4456e9d..592207a45a98 100644
--- a/pkgs/by-name/py/pylint-exit/package.nix
+++ b/pkgs/by-name/py/pylint-exit/package.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jongracecox";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0hwfny48g394visa3xd15425fsw596r3lhkfhswpjrdk2mnk3cny";
   };
 
diff --git a/pkgs/by-name/py/pymol/package.nix b/pkgs/by-name/py/pymol/package.nix
index 27cedfb1e044..0ea0b775d9e3 100644
--- a/pkgs/by-name/py/pymol/package.nix
+++ b/pkgs/by-name/py/pymol/package.nix
@@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "schrodinger";
     repo = "pymol-open-source";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2C9kUpNfK9g7ehmk83iUVqqz4gn4wKO3lW5rSduFP6U=";
   };
 
diff --git a/pkgs/by-name/py/pyrseas/package.nix b/pkgs/by-name/py/pyrseas/package.nix
index b408f480b572..1c10a781dbb2 100644
--- a/pkgs/by-name/py/pyrseas/package.nix
+++ b/pkgs/by-name/py/pyrseas/package.nix
@@ -12,7 +12,7 @@ let
     src = fetchFromGitHub {
       owner = "perseas";
       repo = "pgdbconn";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z";
     };
 
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "perseas";
     repo = "Pyrseas";
-    rev = version;
+    tag = version;
     sha256 = "sha256-+MxnxvbLMxK1Ak+qKpKe3GHbzzC+XHO0eR7rl4ON9H4=";
   };
 
diff --git a/pkgs/by-name/py/pysentation/package.nix b/pkgs/by-name/py/pysentation/package.nix
index 508d0486562d..771e6cdae84d 100644
--- a/pkgs/by-name/py/pysentation/package.nix
+++ b/pkgs/by-name/py/pysentation/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mimseyedi";
     repo = "pysentation";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TwHDXWgGWuQVgatBDc1iympnb6dy4xYThLR5MouEZHA=";
   };
 
diff --git a/pkgs/by-name/py/pystring/package.nix b/pkgs/by-name/py/pystring/package.nix
index 3e885d78d1c6..d6865e0de04d 100644
--- a/pkgs/by-name/py/pystring/package.nix
+++ b/pkgs/by-name/py/pystring/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "imageworks";
     repo = "pystring";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1w31pjiyshqgk6zd6m3ab3xfgb0ribi77r6fwrry2aw8w1adjknf";
   };
 
diff --git a/pkgs/by-name/py/python-launcher/package.nix b/pkgs/by-name/py/python-launcher/package.nix
index 7d2bef8b0279..8cc91e132374 100644
--- a/pkgs/by-name/py/python-launcher/package.nix
+++ b/pkgs/by-name/py/python-launcher/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "brettcannon";
     repo = "python-launcher";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wRKTBvLLo0Vvvh1GtF9hOnUHNpOeX950y1U+8JYBGoE=";
   };
 
diff --git a/pkgs/by-name/py/pytrainer/package.nix b/pkgs/by-name/py/pytrainer/package.nix
index aa075f4f8604..b0c3946a472e 100644
--- a/pkgs/by-name/py/pytrainer/package.nix
+++ b/pkgs/by-name/py/pytrainer/package.nix
@@ -36,7 +36,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pytrainer";
     repo = "pytrainer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0=";
   };
 
diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix
index b2041d5e7682..ac020d8a79bb 100644
--- a/pkgs/by-name/py/pyxel/package.nix
+++ b/pkgs/by-name/py/pyxel/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kitao";
     repo = "pyxel";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6S+fl6J1JN785HxG8i0oYlwoTsqa3Gm1DpCd4swUPZ8=";
   };
 
diff --git a/pkgs/by-name/pz/pzip/package.nix b/pkgs/by-name/pz/pzip/package.nix
index 36a95dd991df..639a95775559 100644
--- a/pkgs/by-name/pz/pzip/package.nix
+++ b/pkgs/by-name/pz/pzip/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ybirader";
     repo = "pzip";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bb2TSSyA7TwgoV53M/7WkNcTq8F0EjCA7ObHfnGL9l0=";
   };
 
diff --git a/pkgs/by-name/q-/q-text-as-data/package.nix b/pkgs/by-name/q-/q-text-as-data/package.nix
index aff72741d874..a6dd89e0fe83 100644
--- a/pkgs/by-name/q-/q-text-as-data/package.nix
+++ b/pkgs/by-name/q-/q-text-as-data/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "harelba";
     repo = "q";
-    rev = version;
+    tag = version;
     sha256 = "18cwyfjgxxavclyd08bmb943c8bvzp1gnqp4klkq5xlgqwivr4sv";
   };
 
diff --git a/pkgs/by-name/qa/qadwaitadecorations/package.nix b/pkgs/by-name/qa/qadwaitadecorations/package.nix
index dfeb8bde1207..e2a0b696fd9b 100644
--- a/pkgs/by-name/qa/qadwaitadecorations/package.nix
+++ b/pkgs/by-name/qa/qadwaitadecorations/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = "QAdwaitaDecorations";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ZU3cwFwQECh4Z6YcTzD2WooZmJ2nSUABYft3dfakSuY=";
   };
 
diff --git a/pkgs/by-name/qa/qastools/package.nix b/pkgs/by-name/qa/qastools/package.nix
index b94318db64e2..8f4a29dff621 100644
--- a/pkgs/by-name/qa/qastools/package.nix
+++ b/pkgs/by-name/qa/qastools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "sebholt";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mJjhM1y50f44kvxMidM7uqlkkXx1sbJC21vIMEDenoU=";
   };
 
diff --git a/pkgs/by-name/qb/qbec/package.nix b/pkgs/by-name/qb/qbec/package.nix
index 7989ebe551d2..b9d0daeeee90 100644
--- a/pkgs/by-name/qb/qbec/package.nix
+++ b/pkgs/by-name/qb/qbec/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "splunk";
     repo = "qbec";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zi8UPDJxa6SJslVTi6uOxph/au42LPRSCZ/oohXPYFs=";
   };
 
diff --git a/pkgs/by-name/qc/qc/package.nix b/pkgs/by-name/qc/qc/package.nix
index 31121dc707bb..e8ff6fa5d804 100644
--- a/pkgs/by-name/qc/qc/package.nix
+++ b/pkgs/by-name/qc/qc/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "qownnotes";
     repo = "qc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D45uJk1Hb7k2qOLIbRdo0gQlPovUwcQ3rnYqhouhow0=";
   };
 
diff --git a/pkgs/by-name/qd/qdirstat/package.nix b/pkgs/by-name/qd/qdirstat/package.nix
index 04e6ae824f22..133cc863ea80 100644
--- a/pkgs/by-name/qd/qdirstat/package.nix
+++ b/pkgs/by-name/qd/qdirstat/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shundhammer";
     repo = "qdirstat";
-    rev = version;
+    tag = version;
     hash = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU=";
   };
 
diff --git a/pkgs/by-name/qg/qgrep/package.nix b/pkgs/by-name/qg/qgrep/package.nix
index dbcd06c4ce67..289ca109c426 100644
--- a/pkgs/by-name/qg/qgrep/package.nix
+++ b/pkgs/by-name/qg/qgrep/package.nix
@@ -13,7 +13,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 cdc03f547e39..5ccfebae57de 100644
--- a/pkgs/by-name/qg/qgroundcontrol/package.nix
+++ b/pkgs/by-name/qg/qgroundcontrol/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mavlink";
     repo = "qgroundcontrol";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+BsI79p0XJ1nCjEtaCVgHbD+jseVGLQZOll79xZ5THo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/qh/qhull/package.nix b/pkgs/by-name/qh/qhull/package.nix
index 84777ff28cdc..e72af3259534 100644
--- a/pkgs/by-name/qh/qhull/package.nix
+++ b/pkgs/by-name/qh/qhull/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "qhull";
     repo = "qhull";
-    rev = version;
+    tag = version;
     sha256 = "sha256-djUO3qzY8ch29AuhY3Bn1ajxWZ4/W70icWVrxWRAxRc=";
   };
 
diff --git a/pkgs/by-name/qm/qm-dsp/package.nix b/pkgs/by-name/qm/qm-dsp/package.nix
index f30c433e13d5..90f960cdaa5c 100644
--- a/pkgs/by-name/qm/qm-dsp/package.nix
+++ b/pkgs/by-name/qm/qm-dsp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "c4dm";
     repo = "qm-dsp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1vkb1xr2hjcaw88gig7rknlwsx01lm0w94d2z0rk5vz9ih4fslvv";
   };
 
diff --git a/pkgs/by-name/qm/qmk_hid/package.nix b/pkgs/by-name/qm/qmk_hid/package.nix
index 2b2e525cc93e..e87398129aca 100644
--- a/pkgs/by-name/qm/qmk_hid/package.nix
+++ b/pkgs/by-name/qm/qmk_hid/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "FrameworkComputer";
     repo = "qmk_hid";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wJi7FQrvMbdTwvbbjBnzmxupMbEuM8TeZ0JIK5ulQKI=";
   };
 
diff --git a/pkgs/by-name/qm/qmqtt/package.nix b/pkgs/by-name/qm/qmqtt/package.nix
index 45789db4a2bf..bc3f8a1e487d 100644
--- a/pkgs/by-name/qm/qmqtt/package.nix
+++ b/pkgs/by-name/qm/qmqtt/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emqx";
     repo = "qmqtt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JLGwEF5e/IKzPzCQBzB710REGWbc/MW+r5AHmyYUkUI=";
   };
 
diff --git a/pkgs/by-name/qo/qogir-icon-theme/package.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix
index 26b7c6e39bdc..1bd43348ebf1 100644
--- a/pkgs/by-name/qo/qogir-icon-theme/package.nix
+++ b/pkgs/by-name/qo/qogir-icon-theme/package.nix
@@ -28,7 +28,7 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] color
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      rev = version;
+      tag = version;
       hash = "sha256-Eh4TWoFfArFmpM/9tkrf2sChQ0zzOZJE9pElchu8DCM=";
     };
 
diff --git a/pkgs/by-name/qo/qogir-theme/package.nix b/pkgs/by-name/qo/qogir-theme/package.nix
index 622c7cdf85ae..4195078a0b4a 100644
--- a/pkgs/by-name/qo/qogir-theme/package.nix
+++ b/pkgs/by-name/qo/qogir-theme/package.nix
@@ -37,7 +37,7 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "a
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      rev = version;
+      tag = version;
       sha256 = "Q9DWBzaLZjwXsYRa/oDIrccypO3TCbSRXTkbXWRmm70=";
     };
 
diff --git a/pkgs/by-name/qp/qperf/package.nix b/pkgs/by-name/qp/qperf/package.nix
index 4ec27077d532..357c1db89123 100644
--- a/pkgs/by-name/qp/qperf/package.nix
+++ b/pkgs/by-name/qp/qperf/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-rdma";
     repo = "qperf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-x9l8xqwMDHlXRZpWt3XiqN5xyCTV5rk8jp/ClRPPECI=";
   };
 
diff --git a/pkgs/by-name/qr/qrrs/package.nix b/pkgs/by-name/qr/qrrs/package.nix
index 462cce869a48..ffa7adbff06a 100644
--- a/pkgs/by-name/qr/qrrs/package.nix
+++ b/pkgs/by-name/qr/qrrs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lenivaya";
     repo = "qrrs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L8sqvLbh85b8Ds9EvXNkyGVXm8BF3ejFd8ZH7QoxJdU=";
   };
 
diff --git a/pkgs/by-name/qr/qrscan/package.nix b/pkgs/by-name/qr/qrscan/package.nix
index 9a96f7f3e52c..9ba22b703fd6 100644
--- a/pkgs/by-name/qr/qrscan/package.nix
+++ b/pkgs/by-name/qr/qrscan/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sayanarijit";
     repo = "qrscan";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nAUZUE7NppsCAV8UyR8+OkikT4nJtnamsSVeyNz21EQ=";
   };
 
diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix
index d7a5e09767ae..5cca864f4489 100644
--- a/pkgs/by-name/qr/qrtool/package.nix
+++ b/pkgs/by-name/qr/qrtool/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sorairolake";
     repo = "qrtool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-f/2AaNnojtZMhJod6ukLwEq+Bsu6O2oTD9OWGL8IS80=";
   };
 
diff --git a/pkgs/by-name/qs/qsreplace/package.nix b/pkgs/by-name/qs/qsreplace/package.nix
index bc0e71483ed7..3d141b7fcd76 100644
--- a/pkgs/by-name/qs/qsreplace/package.nix
+++ b/pkgs/by-name/qs/qsreplace/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "qsreplace";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j9bqO2gp4RUxZHGBCIxI5nA3nD1dG4nCpJ1i4TM/fbo=";
   };
 
diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix
index c187b7a412af..16a0d4e9c950 100644
--- a/pkgs/by-name/qs/qsv/package.nix
+++ b/pkgs/by-name/qs/qsv/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "dathere";
     repo = "qsv";
-    rev = version;
+    tag = version;
     hash = "sha256-LE3iQCZb3FKSsrb8/E5awjh26wGv9FlXw63+rNyzIIk=";
   };
 
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/qu/quark-goldleaf/package.nix b/pkgs/by-name/qu/quark-goldleaf/package.nix
index 7395bff0c8f8..ab2085355958 100644
--- a/pkgs/by-name/qu/quark-goldleaf/package.nix
+++ b/pkgs/by-name/qu/quark-goldleaf/package.nix
@@ -21,7 +21,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "XorTroll";
     repo = "Goldleaf";
-    rev = version;
+    tag = version;
     hash = "sha256-gagIQGOiygJ0Onm0SrkbFWaovqWX2WJNx7LpSRheCLM=";
   };
 
diff --git a/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix b/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
index d0897ffe2715..06dfac1f2682 100644
--- a/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
+++ b/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "QubesOS";
     repo = "qubes-core-vchan-xen";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256:02l1vs5c2jfw22gxvl2fb66m0d99n8ya1i7rphsb5cxsljvxary0";
   };
 
diff --git a/pkgs/by-name/qu/qucsator-rf/package.nix b/pkgs/by-name/qu/qucsator-rf/package.nix
index 2549a5694f84..da9c40744270 100644
--- a/pkgs/by-name/qu/qucsator-rf/package.nix
+++ b/pkgs/by-name/qu/qucsator-rf/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ra3xdh";
     repo = "qucsator_rf";
-    rev = version;
+    tag = version;
     hash = "sha256-Q1hpCt3SeXRzUFX4jPUu8ZsPTx2W28LQ3YwlYtOZhqg=";
   };
 
diff --git a/pkgs/by-name/qu/quich/package.nix b/pkgs/by-name/qu/quich/package.nix
index 37f058376349..c6a6dc811015 100644
--- a/pkgs/by-name/qu/quich/package.nix
+++ b/pkgs/by-name/qu/quich/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Usbac";
     repo = "quich";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4gsSjLZ7Z4ErNqe86Fy5IrzLMfvDyY18sE0yBnj9bvM=";
   };
 
diff --git a/pkgs/by-name/qu/quick-lint-js/package.nix b/pkgs/by-name/qu/quick-lint-js/package.nix
index b413e9d7e2ba..79993151cae2 100644
--- a/pkgs/by-name/qu/quick-lint-js/package.nix
+++ b/pkgs/by-name/qu/quick-lint-js/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "quick-lint";
     repo = "quick-lint-js";
-    rev = version;
+    tag = version;
     hash = "sha256-L2LCRm1Fsg+xRdPc8YmgxDnuXJo92nxs862ewzObZ3I=";
   };
 
diff --git a/pkgs/by-name/qu/quickder/package.nix b/pkgs/by-name/qu/quickder/package.nix
index 981fa635a30b..7858000edc42 100644
--- a/pkgs/by-name/qu/quickder/package.nix
+++ b/pkgs/by-name/qu/quickder/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "quick-der";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk=";
   };
 
diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix
index 52b0ad3eb7da..510c597ab66b 100644
--- a/pkgs/by-name/qu/quickemu/package.nix
+++ b/pkgs/by-name/qu/quickemu/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "quickemu-project";
     repo = "quickemu";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-sCoCcN6950pH33bRZsLoLc1oSs5Qfpj9Bbywn/uA6Bc=";
   };
 
diff --git a/pkgs/by-name/qu/quickfix/package.nix b/pkgs/by-name/qu/quickfix/package.nix
index bd4612c8eec1..0a05cc2fc578 100644
--- a/pkgs/by-name/qu/quickfix/package.nix
+++ b/pkgs/by-name/qu/quickfix/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "quickfix";
     repo = "quickfix";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1fgpwgvyw992mbiawgza34427aakn5zrik3sjld0i924a9d17qwg";
   };
 
diff --git a/pkgs/by-name/qu/quickgui/package.nix b/pkgs/by-name/qu/quickgui/package.nix
index 2080dc8be4e5..12fa6e78b3d0 100644
--- a/pkgs/by-name/qu/quickgui/package.nix
+++ b/pkgs/by-name/qu/quickgui/package.nix
@@ -12,7 +12,7 @@ flutter.buildFlutterApplication rec {
   src = fetchFromGitHub {
     owner = "quickemu-project";
     repo = "quickgui";
-    rev = version;
+    tag = version;
     hash = "sha256-M2Qy66RqsjXg7ZpHwaXCN8qXRIsisnIyaENx3KqmUfQ=";
   };
 
diff --git a/pkgs/by-name/qu/quickmem/package.nix b/pkgs/by-name/qu/quickmem/package.nix
index 54ada1f9aff3..74feba73f021 100644
--- a/pkgs/by-name/qu/quickmem/package.nix
+++ b/pkgs/by-name/qu/quickmem/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "Quick-MEM";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc=";
   };
 
diff --git a/pkgs/by-name/qu/quicktemplate/package.nix b/pkgs/by-name/qu/quicktemplate/package.nix
index 6f6afe08d811..2fc43edec49a 100644
--- a/pkgs/by-name/qu/quicktemplate/package.nix
+++ b/pkgs/by-name/qu/quicktemplate/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "valyala";
     repo = "quicktemplate";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "cra3LZ3Yq0KNQErQ2q0bVSy7rOLKdSkIryIgQsNRBHw=";
   };
 
diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix
index 1b7d1aeb4f52..75489bf2ebe9 100644
--- a/pkgs/by-name/qu/quill-log/package.nix
+++ b/pkgs/by-name/qu/quill-log/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "odygrd";
     repo = "quill";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WkJOB06yH3B3L2aqglh1jc38e1fDbxaqFEEh1AvBUcw=";
   };
 
diff --git a/pkgs/by-name/qu/quill-qr/package.nix b/pkgs/by-name/qu/quill-qr/package.nix
index ec31feb4b013..48d47a4f73e0 100644
--- a/pkgs/by-name/qu/quill-qr/package.nix
+++ b/pkgs/by-name/qu/quill-qr/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IvanMalison";
     repo = "quill-qr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1kdsq6csmxfvs2wy31bc9r92l5pkmzlzkyqrangvrf4pbk3sk0r6";
   };
 
diff --git a/pkgs/by-name/qu/quorum/package.nix b/pkgs/by-name/qu/quorum/package.nix
index 5d7d48744084..1ee7dc92b077 100644
--- a/pkgs/by-name/qu/quorum/package.nix
+++ b/pkgs/by-name/qu/quorum/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Consensys";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pW8I4ivcKo6dsa8rQVKU6nUZuKxaki/7cMDKwEsSzNw=";
   };
 
diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix
index 2620a8d0057d..91488f0a76c8 100644
--- a/pkgs/by-name/r0/r0vm/package.nix
+++ b/pkgs/by-name/r0/r0vm/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "risc0";
     repo = "risc0";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jtROtI5/4W2pNvn1ZYR/wQAZmECTr7YxuZGu2Ns9paw=";
   };
 
diff --git a/pkgs/by-name/r1/r128gain/package.nix b/pkgs/by-name/r1/r128gain/package.nix
index 63b7d312d5bd..f2a164b4cd0c 100644
--- a/pkgs/by-name/r1/r128gain/package.nix
+++ b/pkgs/by-name/r1/r128gain/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "r128gain";
-    rev = version;
+    tag = version;
     sha256 = "sha256-JyKacDqjIKTNl2GjbJPkgbakF8HR4Jd4czAtOaemDH8=";
   };
 
diff --git a/pkgs/by-name/r2/r2mod_cli/package.nix b/pkgs/by-name/r2/r2mod_cli/package.nix
index bc8090c09349..06de7ff490b6 100644
--- a/pkgs/by-name/r2/r2mod_cli/package.nix
+++ b/pkgs/by-name/r2/r2mod_cli/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Foldex";
     repo = "r2mod_cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Y9ZffztxfGYiUSphqwhe3rTbnJ/vmGGi1pLml+1tLP8=";
   };
 
diff --git a/pkgs/by-name/r5/r53-ddns/package.nix b/pkgs/by-name/r5/r53-ddns/package.nix
index 548f5c062886..b2e9e373c54c 100644
--- a/pkgs/by-name/r5/r53-ddns/package.nix
+++ b/pkgs/by-name/r5/r53-ddns/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fleaz";
     repo = "r53-ddns";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KJAPhSGaC3upWLfo2eeSD3Vit9Blmbol7s8y3f849N4=";
   };
 
diff --git a/pkgs/by-name/ra/ra-multiplex/package.nix b/pkgs/by-name/ra/ra-multiplex/package.nix
index 65dfc7fe37a4..b96031d0ce89 100644
--- a/pkgs/by-name/ra/ra-multiplex/package.nix
+++ b/pkgs/by-name/ra/ra-multiplex/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pr2502";
     repo = "ra-multiplex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aBrn9g+MGXLAsOmHqw1Tt6NPFGJTyYv/L9UI/vQU4i8=";
   };
 
diff --git a/pkgs/by-name/ra/rabtap/package.nix b/pkgs/by-name/ra/rabtap/package.nix
index 91b312e2bedc..e108575f2ae3 100644
--- a/pkgs/by-name/ra/rabtap/package.nix
+++ b/pkgs/by-name/ra/rabtap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jandelgado";
     repo = "rabtap";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OUpDk6nfVbz/KP7vZeZV2JfbCzh/KcuxG015/uxYuEI=";
   };
 
diff --git a/pkgs/by-name/ra/radeontop/package.nix b/pkgs/by-name/ra/radeontop/package.nix
index 2f766860a520..03981f76d316 100644
--- a/pkgs/by-name/ra/radeontop/package.nix
+++ b/pkgs/by-name/ra/radeontop/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "0kwqddidr45s1blp0h8r8h1dd1p50l516yb6mb4s6zsc827xzgg3";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "radeontop";
     owner = "clbr";
   };
diff --git a/pkgs/by-name/ra/radio-cli/package.nix b/pkgs/by-name/ra/radio-cli/package.nix
index 8b976f7eae84..d16fdd635d8a 100644
--- a/pkgs/by-name/ra/radio-cli/package.nix
+++ b/pkgs/by-name/ra/radio-cli/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "margual56";
     repo = "radio-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-De/3tkvHf8dp04A0hug+aCbiXUc+XUYeHWYOiJ/bac0=";
   };
 
diff --git a/pkgs/by-name/ra/radioboat/package.nix b/pkgs/by-name/ra/radioboat/package.nix
index f874642fe91f..bf2b6d584092 100644
--- a/pkgs/by-name/ra/radioboat/package.nix
+++ b/pkgs/by-name/ra/radioboat/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slashformotion";
     repo = "radioboat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4k+WK2Cxu1yBWgvEW9LMD2RGfiY7XDAe0qqph82zvlI=";
   };
 
diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix
index a746eba72a87..2c5d1ef8da5d 100644
--- a/pkgs/by-name/ra/raffi/package.nix
+++ b/pkgs/by-name/ra/raffi/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "raffi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-97gZZp2taX800Izhya4mYzS4PtCNCBbRnrn6cm1w8zY=";
   };
 
diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix
index 1de79c3d1b7f..eabbbdf14280 100644
--- a/pkgs/by-name/ra/rage/package.nix
+++ b/pkgs/by-name/ra/rage/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "str4d";
     repo = "rage";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aZs1iqfpsiMuhxXNqRatpKD99eDBCsWHk4OPpnnaB70=";
   };
 
diff --git a/pkgs/by-name/ra/ragnarwm/package.nix b/pkgs/by-name/ra/ragnarwm/package.nix
index d177c112bdce..45fc198c7a59 100644
--- a/pkgs/by-name/ra/ragnarwm/package.nix
+++ b/pkgs/by-name/ra/ragnarwm/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cococry";
     repo = "Ragnar";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-OZhIwrKEhTfkw9K8nZIwGZzxXBObseWS92Y+85HmdNs=";
   };
 
diff --git a/pkgs/by-name/ra/raider/package.nix b/pkgs/by-name/ra/raider/package.nix
index 9283c6b443ae..82b42644079b 100644
--- a/pkgs/by-name/ra/raider/package.nix
+++ b/pkgs/by-name/ra/raider/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ADBeveridge";
     repo = "raider";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fOv4Y5kBbZazFNkPrLS3D7LMLLvT/kIYmsCezsl/fxQ=";
   };
 
diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix
index 1fd672670492..98b98c6feb79 100644
--- a/pkgs/by-name/ra/railway/package.nix
+++ b/pkgs/by-name/ra/railway/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o3AWcUKeOBiNsDSDV0XFzQ0rWpj7el4qX6iQKnqMPgg=";
   };
 
diff --git a/pkgs/by-name/ra/rain/package.nix b/pkgs/by-name/ra/rain/package.nix
index eb1a8ec4d010..a984b5c7abd0 100644
--- a/pkgs/by-name/ra/rain/package.nix
+++ b/pkgs/by-name/ra/rain/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws-cloudformation";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0FjJXOmLHM0At0TJdcsYTafgDbw+C37BH11ft+UjEl0=";
   };
 
diff --git a/pkgs/by-name/ra/rakkess/package.nix b/pkgs/by-name/ra/rakkess/package.nix
index a1a349637ab8..9be89b1255ce 100644
--- a/pkgs/by-name/ra/rakkess/package.nix
+++ b/pkgs/by-name/ra/rakkess/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "corneliusweig";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-igovWWk8GfNmOS/NbZWfv9kox6QLNIbM09jdvA/lL3A=";
   };
   vendorHash = "sha256-lVxJ4wFBhHc8JVpkmqphLYPE9Z8Cr6o+aAHvC1naqyE=";
diff --git a/pkgs/by-name/ra/ramfetch/package.nix b/pkgs/by-name/ra/ramfetch/package.nix
index d8d1de5c6678..c35fc126277d 100644
--- a/pkgs/by-name/ra/ramfetch/package.nix
+++ b/pkgs/by-name/ra/ramfetch/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://codeberg.org/jahway603/ramfetch.git";
-    rev = version;
+    tag = version;
     hash = "sha256-sUreZ6zm+a1N77OZszjnpS4mmo5wL1dhNGVldJCGoag=";
   };
 
diff --git a/pkgs/by-name/ra/ran/package.nix b/pkgs/by-name/ra/ran/package.nix
index c6216308ebea..258c93ed98d2 100644
--- a/pkgs/by-name/ra/ran/package.nix
+++ b/pkgs/by-name/ra/ran/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "m3ng9i";
     repo = "ran";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iMvUvzr/jaTNdgHQFuoJNJnnkx2XHIUUlrPWyTlreEw=";
   };
 
diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix
index de7210b003b3..d186689e61f2 100644
--- a/pkgs/by-name/ra/rancher/package.nix
+++ b/pkgs/by-name/ra/rancher/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XpNs5D1hO+Vp+Qjoz//U7L9tAE6AwOrh08FE2G7Byv4=";
   };
 
diff --git a/pkgs/by-name/ra/range-v3/package.nix b/pkgs/by-name/ra/range-v3/package.nix
index 1b5d5caa8e7a..70ab1350f385 100644
--- a/pkgs/by-name/ra/range-v3/package.nix
+++ b/pkgs/by-name/ra/range-v3/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ericniebler";
     repo = "range-v3";
-    rev = version;
+    tag = version;
     hash = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU=";
   };
 
diff --git a/pkgs/by-name/ra/rapidyaml/package.nix b/pkgs/by-name/ra/rapidyaml/package.nix
index c7ae5e3f024b..315423fda18a 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-5Z1UV8JSgaO4X8+fTEgxD7bzD1igOgiLQMn10c3rCLs=";
   };
 
diff --git a/pkgs/by-name/ra/rar2fs/package.nix b/pkgs/by-name/ra/rar2fs/package.nix
index 4ee0edc640a4..34fc8a5a8dc9 100644
--- a/pkgs/by-name/ra/rar2fs/package.nix
+++ b/pkgs/by-name/ra/rar2fs/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hasse69";
     repo = "rar2fs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-iYlmNtaJZrnsNNNlaoV1Vu6PHrHIr/glhgs3784JCm4=";
   };
 
diff --git a/pkgs/by-name/ra/rar2hashcat/package.nix b/pkgs/by-name/ra/rar2hashcat/package.nix
index fe0d5733e920..ae0dfe3cbcef 100644
--- a/pkgs/by-name/ra/rar2hashcat/package.nix
+++ b/pkgs/by-name/ra/rar2hashcat/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hashstation";
     repo = "rar2hashcat";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-GVh4Gyjn84xAwO7wKXYe2DPnpb8gnxGIMH5Szce+XpY=";
   };
 
diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix
index 671550c39555..a33a59a88550 100644
--- a/pkgs/by-name/ra/rare-regex/package.nix
+++ b/pkgs/by-name/ra/rare-regex/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zix99";
     repo = "rare";
-    rev = version;
+    tag = version;
     hash = "sha256-Sc8Ek1JfagqEDZ1Ci2UdqDkKZbQ6klH+uICML/ifO0Q=";
   };
 
diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix
index dc54feb8c222..76b1e670abd7 100644
--- a/pkgs/by-name/ra/rasm/package.nix
+++ b/pkgs/by-name/ra/rasm/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EdouardBERGE";
     repo = "rasm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gH1YGN8uM4K8JpkV2r7PilAcgv8leswaN+IOgMM0m74=";
   };
 
diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix
index 09e8b91d7568..94359301eb7b 100644
--- a/pkgs/by-name/ra/ratman/package.nix
+++ b/pkgs/by-name/ra/ratman/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "irdest";
     repo = "irdest";
-    rev = "${version}";
+    tag = version;
     sha256 = "sha256-OuKUZSvIUekhbe1LoEFBL8+sU2KLXBsp1JCEEuxkUlk=";
   };
 
diff --git a/pkgs/by-name/ra/ratools/package.nix b/pkgs/by-name/ra/ratools/package.nix
index 9bfb9b38bba6..0bcaaf397156 100644
--- a/pkgs/by-name/ra/ratools/package.nix
+++ b/pkgs/by-name/ra/ratools/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "danrl";
     repo = "ratools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "07m45bn9lzgbfihmxic23wqp73nxg5ihrvkigr450jq6gzvgwawq";
   };
 
diff --git a/pkgs/by-name/ra/ratslap/package.nix b/pkgs/by-name/ra/ratslap/package.nix
index 748063896d36..6d5c9ea453a6 100644
--- a/pkgs/by-name/ra/ratslap/package.nix
+++ b/pkgs/by-name/ra/ratslap/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "krayon";
     repo = "ratslap";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-PO/79tTiO4TBtojrEtkSf5W6zuG+Ml2iJGAtYHDwHEY=";
     leaveDotGit = true;
   };
diff --git a/pkgs/by-name/ra/rauc/package.nix b/pkgs/by-name/ra/rauc/package.nix
index 26448f01cef5..67360791496b 100644
--- a/pkgs/by-name/ra/rauc/package.nix
+++ b/pkgs/by-name/ra/rauc/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rauc";
     repo = "rauc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Vq1dudB8OQveclAIVgiB8jbtp4o2Ga5v61Y6JUjOpbs=";
   };
 
diff --git a/pkgs/by-name/ra/raxml/package.nix b/pkgs/by-name/ra/raxml/package.nix
index 74090f0d1fad..e8bb5f32af33 100644
--- a/pkgs/by-name/ra/raxml/package.nix
+++ b/pkgs/by-name/ra/raxml/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stamatak";
     repo = "standard-RAxML";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-w+Eqi0GhVira1H6ZnMNeZGBMzDjiGT7JSFpQEVXONyk=";
   };
 
diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
index b60d1a9d2f63..7c83bf2fd62d 100644
--- a/pkgs/by-name/ra/raylib/package.nix
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -42,7 +42,7 @@ lib.checkListOfEnum "${pname}: platform"
       src = fetchFromGitHub {
         owner = "raysan5";
         repo = "raylib";
-        rev = finalAttrs.version;
+        tag = finalAttrs.version;
         hash = "sha256-J99i4z4JF7d6mJNuJIB0rHNDhXJ5AEkG0eBvvuBLHrY=";
       };
 
diff --git a/pkgs/by-name/ra/razer-cli/package.nix b/pkgs/by-name/ra/razer-cli/package.nix
index 37bf5eedb65c..414fe21bfe88 100644
--- a/pkgs/by-name/ra/razer-cli/package.nix
+++ b/pkgs/by-name/ra/razer-cli/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lolei";
     repo = "razer-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-p/RcBpkvtqYQ3Ekt0pLvKyi1Vv93oHDd7hqSTu/5CSw=";
   };
 
diff --git a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
index 137be74c7a0d..ffe91dc4b441 100644
--- a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
+++ b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RobertBeckebans";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bjjeTdbQDWTibSrIWhCnr6F0Ef17efLgWGQAAwezjUw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/rc/rcon/package.nix b/pkgs/by-name/rc/rcon/package.nix
index 48fd4373a3f8..9951884ce993 100644
--- a/pkgs/by-name/rc/rcon/package.nix
+++ b/pkgs/by-name/rc/rcon/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "n0la";
     repo = "rcon";
-    rev = version;
+    tag = version;
     sha256 = "sha256-bHm6JeWmpg42VZQXikHl+BMx9zimRLBQWemTqOxyLhw=";
   };
 
diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix
index f6d630ae31af..c47780fd4287 100644
--- a/pkgs/by-name/rc/rcp/package.nix
+++ b/pkgs/by-name/rc/rcp/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wykurz";
     repo = "rcp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gFkrUqG3GXPAg9Zqv7Wr3axQ30axYGXw8bo+P1kmSJM=";
   };
 
diff --git a/pkgs/by-name/rd/rdap/package.nix b/pkgs/by-name/rd/rdap/package.nix
index a5fefe708662..2d440a0d723b 100644
--- a/pkgs/by-name/rd/rdap/package.nix
+++ b/pkgs/by-name/rd/rdap/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openrdap";
     repo = "rdap";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FiaUyhiwKXZ3xnFPmdxb8bpbm5eRRFNDL3duOGDnc/A=";
   };
 
diff --git a/pkgs/by-name/re/re-flex/package.nix b/pkgs/by-name/re/re-flex/package.nix
index c976c63c2f0b..92e7e93010f1 100644
--- a/pkgs/by-name/re/re-flex/package.nix
+++ b/pkgs/by-name/re/re-flex/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Genivia";
     repo = "RE-flex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oLpgY8m0hwLrTVkUwxVW7O7vr4Hl7Bn+uIQwFEVSfvc=";
   };
 
diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix
index 278d63702ed2..862bb53ae9d0 100644
--- a/pkgs/by-name/re/re2/package.nix
+++ b/pkgs/by-name/re/re2/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "google";
     repo = "re2";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=";
   };
 
diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix
index 02859a9bc813..8e40aaf15bba 100644
--- a/pkgs/by-name/re/re2c/package.nix
+++ b/pkgs/by-name/re/re2c/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skvadrik";
     repo = "re2c";
-    rev = version;
+    tag = version;
     sha256 = "sha256-hp9kwsoSRdel1z1+VWREPQdigI1rQ5GrM5/Z6wpnmE0=";
   };
 
diff --git a/pkgs/by-name/re/react-static/package.nix b/pkgs/by-name/re/react-static/package.nix
index bf10eeb9494f..d2d655a76242 100644
--- a/pkgs/by-name/re/react-static/package.nix
+++ b/pkgs/by-name/re/react-static/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "react-static";
     repo = "react-static";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dlYmD0vgEqWxYf7E0VYstZMAuNDGvQP7xDgHo/wmlUs=";
   };
 
diff --git a/pkgs/by-name/re/readability-cli/package.nix b/pkgs/by-name/re/readability-cli/package.nix
index 993e9af5faf0..24b28714a34f 100644
--- a/pkgs/by-name/re/readability-cli/package.nix
+++ b/pkgs/by-name/re/readability-cli/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitLab {
     owner = "gardenappl";
     repo = "readability-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pvAp3ZJ8/FPhrSMC8B4U1m5zuBNRP/HcsXkrW6QYgSQ=";
   };
 
diff --git a/pkgs/by-name/re/readstat/package.nix b/pkgs/by-name/re/readstat/package.nix
index 627788996e82..e0f8b31cdf9b 100644
--- a/pkgs/by-name/re/readstat/package.nix
+++ b/pkgs/by-name/re/readstat/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WizardMac";
     repo = "ReadStat";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4lRJgZPB2gfaQ9fQKvDDpGhy1eDNT/nT1QmeZlCmCis=";
   };
 
diff --git a/pkgs/by-name/re/realcugan-ncnn-vulkan/package.nix b/pkgs/by-name/re/realcugan-ncnn-vulkan/package.nix
index 34a5583cfa5d..eaa7d2e679c7 100644
--- a/pkgs/by-name/re/realcugan-ncnn-vulkan/package.nix
+++ b/pkgs/by-name/re/realcugan-ncnn-vulkan/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nihui";
     repo = "realcugan-ncnn-vulkan";
-    rev = version;
+    tag = version;
     hash = "sha256-P3Y1B8m1+mpFinacwnvBE2vU150jj6Q12IS6QYNRZ6A=";
   };
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix b/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
index 6e0cd13ee84e..382edf122767 100644
--- a/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
+++ b/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xinntao";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-F+NfkAbk8UtAKzsF42ppPF2UGjK/M6iFfBsRRBbCmcI=";
   };
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix
index b32356df4cb7..2e01287767d2 100644
--- a/pkgs/by-name/re/realm/package.nix
+++ b/pkgs/by-name/re/realm/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zhboner";
     repo = "realm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vkLGfSDRYqvoqyVM/CWGJjpvXXPisEZxUSjLZGjNzno=";
   };
 
diff --git a/pkgs/by-name/re/reason-shell/package.nix b/pkgs/by-name/re/reason-shell/package.nix
index 9a3dc6692732..e859f1939c53 100644
--- a/pkgs/by-name/re/reason-shell/package.nix
+++ b/pkgs/by-name/re/reason-shell/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jaywonchung";
     repo = "reason";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oytRquZJgb1sfpZil1bSGwIIvm+5N4mkVmIMzWyzDco=";
   };
 
diff --git a/pkgs/by-name/re/reaverwps-t6x/package.nix b/pkgs/by-name/re/reaverwps-t6x/package.nix
index 880d33b773d4..c7a92436eadd 100644
--- a/pkgs/by-name/re/reaverwps-t6x/package.nix
+++ b/pkgs/by-name/re/reaverwps-t6x/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "t6x";
     repo = "reaver-wps-fork-t6x";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7g4ZRkyu0TIOUw68dSPP4RyIRyeq1GgUMYFVSQB8/1I=";
   };
 
diff --git a/pkgs/by-name/re/recapp/package.nix b/pkgs/by-name/re/recapp/package.nix
index 0852d24fba54..063a4b58241d 100644
--- a/pkgs/by-name/re/recapp/package.nix
+++ b/pkgs/by-name/re/recapp/package.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "amikha1lov";
     repo = "RecApp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "08bpfcqgw0lj6j7y5b2i18kffawlzp6pfk4wdpmk29vwmgk9s9yc";
   };
 
diff --git a/pkgs/by-name/re/reco/package.nix b/pkgs/by-name/re/reco/package.nix
index 27742087dc43..aa386f0a085d 100644
--- a/pkgs/by-name/re/reco/package.nix
+++ b/pkgs/by-name/re/reco/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ryonakano";
     repo = "reco";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-uZAcZJLQH0MTI4NSJnZvzYPBFVXGBqAhsjVLAVP/ZwI=";
   };
 
diff --git a/pkgs/by-name/re/redhat-official-fonts/package.nix b/pkgs/by-name/re/redhat-official-fonts/package.nix
index 5460860d712c..a8ad51461a6f 100644
--- a/pkgs/by-name/re/redhat-official-fonts/package.nix
+++ b/pkgs/by-name/re/redhat-official-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RedHatOfficial";
     repo = "RedHatFont";
-    rev = version;
+    tag = version;
     hash = "sha256-r43KtMIedNitb5Arg8fTGB3hrRZoA8oUHVEL24k4LeQ=";
   };
 
diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix
index cbda55fa8b01..857c22a68f51 100644
--- a/pkgs/by-name/re/redict/package.nix
+++ b/pkgs/by-name/re/redict/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "redict";
     repo = "redict";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-MY4OWoYQ4a5efqcUTN6lNL/kd1VrJ/OBqKw27cQ5WC8=";
   };
 
diff --git a/pkgs/by-name/re/redir/package.nix b/pkgs/by-name/re/redir/package.nix
index f69650db085e..0fae1d41e116 100644
--- a/pkgs/by-name/re/redir/package.nix
+++ b/pkgs/by-name/re/redir/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "redir";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "13n401i3q0xwpfgr21y47kgihi057wbh59xlsna8b8zpm973qny1";
   };
 
diff --git a/pkgs/by-name/re/redis-plus-plus/package.nix b/pkgs/by-name/re/redis-plus-plus/package.nix
index 40cd5a4224e1..cc5d1f21a18b 100644
--- a/pkgs/by-name/re/redis-plus-plus/package.nix
+++ b/pkgs/by-name/re/redis-plus-plus/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sewenew";
     repo = "redis-plus-plus";
-    rev = version;
+    tag = version;
     sha256 = "sha256-GN+GrV53+JPEbVefH0EXzS1PyGEdQGFcPEctdWOI5uk=";
   };
 
diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix
index 2c2f4bd345b6..0b6ccf0701e9 100644
--- a/pkgs/by-name/re/redisinsight/package.nix
+++ b/pkgs/by-name/re/redisinsight/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "RedisInsight";
     repo = "RedisInsight";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ek0Fp8v6j+mZPK2cEuFNrBgInXdYIKBBUg0UD1I51Sg=";
   };
 
diff --git a/pkgs/by-name/re/redka/package.nix b/pkgs/by-name/re/redka/package.nix
index 339353d9470f..ca9743af403e 100644
--- a/pkgs/by-name/re/redka/package.nix
+++ b/pkgs/by-name/re/redka/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nalgeon";
     repo = "redka";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CCTPhcarLFs2wyhu7OqifunVSil2QU61JViY3uTjVg8=";
   };
 
diff --git a/pkgs/by-name/re/redo-c/package.nix b/pkgs/by-name/re/redo-c/package.nix
index 4ec7c4de6195..033cd15d4841 100644
--- a/pkgs/by-name/re/redo-c/package.nix
+++ b/pkgs/by-name/re/redo-c/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "redo-c";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oZcaBgESIaD7/SUBE7luh7axucKTEzXPVkQAQs2NCXE=";
   };
 
diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index 0bb772f90eaf..7fcac9d5688f 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -11,7 +11,7 @@ let
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7ufF1OXFtT+OZY6UiDDiaohe4witVPEaO9zZaM6wldA=";
   };
 in
diff --git a/pkgs/by-name/re/reflex/package.nix b/pkgs/by-name/re/reflex/package.nix
index 36c9487c6516..e11445dce5a5 100644
--- a/pkgs/by-name/re/reflex/package.nix
+++ b/pkgs/by-name/re/reflex/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cespare";
     repo = "reflex";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/2qVm2xpSFVspA16rkiIw/qckxzXQp/1EGOl0f9KljY=";
   };
 
diff --git a/pkgs/by-name/re/refmt/package.nix b/pkgs/by-name/re/refmt/package.nix
index 74ae4397f4f5..bae52c4b5c91 100644
--- a/pkgs/by-name/re/refmt/package.nix
+++ b/pkgs/by-name/re/refmt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rjeczalik";
     repo = "refmt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HiAWSR2S+3OcIgwdQ0ltW37lcG+OHkDRDUF07rfNcJY=";
   };
 
diff --git a/pkgs/by-name/re/reg/package.nix b/pkgs/by-name/re/reg/package.nix
index 9669e621aab0..84cd27e73b9d 100644
--- a/pkgs/by-name/re/reg/package.nix
+++ b/pkgs/by-name/re/reg/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "genuinetools";
     repo = "reg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tfBetjoJkr84XLEEcfdRTtc0UZ4m/uRH1Fpr91lQn8o=";
   };
 
diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix
index e29b786008b2..99e95230a2f0 100644
--- a/pkgs/by-name/re/regal/package.nix
+++ b/pkgs/by-name/re/regal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "StyraInc";
     repo = "regal";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fO/hZw5aoDshemK0vmlwUJiSqGQ2peF5egT40029aAg=";
   };
 
diff --git a/pkgs/by-name/re/regex2json/package.nix b/pkgs/by-name/re/regex2json/package.nix
index c9f56908963e..263d6ccf576f 100644
--- a/pkgs/by-name/re/regex2json/package.nix
+++ b/pkgs/by-name/re/regex2json/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "tozd";
     repo = "regex2json";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WoxrwAH2ocDuwRj52QHPN3sOMXIF3ygzKeb83BKZqKo=";
   };
 
diff --git a/pkgs/by-name/re/regexploit/package.nix b/pkgs/by-name/re/regexploit/package.nix
index 0ed524edd4fa..53f4d355d901 100644
--- a/pkgs/by-name/re/regexploit/package.nix
+++ b/pkgs/by-name/re/regexploit/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "doyensec";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0z3fghsyw0ll36in7ihc0qi3gy7mqi6cw1mi8m8c8xb1nlwpfr0y";
   };
 
diff --git a/pkgs/by-name/re/regextester/package.nix b/pkgs/by-name/re/regextester/package.nix
index 8ca42ead79a6..6b4f9ef72480 100644
--- a/pkgs/by-name/re/regextester/package.nix
+++ b/pkgs/by-name/re/regextester/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "artemanufrij";
     repo = "regextester";
-    rev = version;
+    tag = version;
     hash = "sha256-5+gU8DeB99w2h/4vMal2eHkR0305dmRYiY6fsLZzlnc=";
   };
 
diff --git a/pkgs/by-name/re/regols/package.nix b/pkgs/by-name/re/regols/package.nix
index 847162030ed3..5a903eb87182 100644
--- a/pkgs/by-name/re/regols/package.nix
+++ b/pkgs/by-name/re/regols/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kitagry";
     repo = "regols";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1L9ehqTMN9KHlvE7FBccVAXA7f3NNsLXJaTkOChT8Xo=";
   };
 
diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix
index 8f6d56e3a3fa..f3246bbb3e8b 100644
--- a/pkgs/by-name/re/rehex/package.nix
+++ b/pkgs/by-name/re/rehex/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "solemnwarning";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-RlYpg3aon1d25n8K/bbHGVLn5/iOOUSlvjT8U0fp9hA=";
   };
 
diff --git a/pkgs/by-name/re/relic/package.nix b/pkgs/by-name/re/relic/package.nix
index 2231b6441e87..2ccfc2803e1b 100644
--- a/pkgs/by-name/re/relic/package.nix
+++ b/pkgs/by-name/re/relic/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sassoftware";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dXvKbuAJCL+H0Gh0ZF1VvtY+7cgjq7gs8zwtenI3JuI=";
   };
 
diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix
index c5b323466b81..282dcaa45ca6 100644
--- a/pkgs/by-name/re/remind/package.nix
+++ b/pkgs/by-name/re/remind/package.nix
@@ -22,7 +22,7 @@ tcl.mkTclDerivation rec {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
-    rev = version;
+    tag = version;
     hash = "sha256-dMnsMV4DRxXWgev9LCb4wwdnx7A++giCsW7c2cMde9Q=";
   };
 
diff --git a/pkgs/by-name/re/remote-touchpad/package.nix b/pkgs/by-name/re/remote-touchpad/package.nix
index 72c81bd39393..2442ef43eb53 100644
--- a/pkgs/by-name/re/remote-touchpad/package.nix
+++ b/pkgs/by-name/re/remote-touchpad/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "unrud";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UZjbU9Ti5+IjcxIf+LDWlcqxb4kMIwa8zHmZDdZbnw8=";
   };
 
diff --git a/pkgs/by-name/re/rename/package.nix b/pkgs/by-name/re/rename/package.nix
index a14365c764e7..fc8d386bab22 100644
--- a/pkgs/by-name/re/rename/package.nix
+++ b/pkgs/by-name/re/rename/package.nix
@@ -11,7 +11,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "pstray";
     repo = "rename";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "SK6wS3IxjCftuDiiZU27TFnn9GVd137zmzvGH88cNLI=";
   };
   meta = with lib; {
diff --git a/pkgs/by-name/re/renderizer/package.nix b/pkgs/by-name/re/renderizer/package.nix
index 1b3f49fa5d68..70ba5c814e72 100644
--- a/pkgs/by-name/re/renderizer/package.nix
+++ b/pkgs/by-name/re/renderizer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gomatic";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jl98LuEsGN40L9IfybJhLnbzoYP/XpwFVQnjrlmDL9A=";
   };
 
diff --git a/pkgs/by-name/re/rep/package.nix b/pkgs/by-name/re/rep/package.nix
index 3af0896b304f..c3913d1d5195 100644
--- a/pkgs/by-name/re/rep/package.nix
+++ b/pkgs/by-name/re/rep/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eraserhd";
     repo = "rep";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "pqmISVm3rYGxRuwKieVpRwXE8ufWnBHEA6h2hrob51s=";
   };
 
diff --git a/pkgs/by-name/re/repgrep/package.nix b/pkgs/by-name/re/repgrep/package.nix
index 0850105f181c..97d508f04510 100644
--- a/pkgs/by-name/re/repgrep/package.nix
+++ b/pkgs/by-name/re/repgrep/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "acheronfail";
     repo = "repgrep";
-    rev = version;
+    tag = version;
     hash = "sha256-Hg6N5ruf6MTf2/jSmDgaNFWnnaSb8ZCQ6hivYAeadfc=";
   };
 
diff --git a/pkgs/by-name/re/replacement/package.nix b/pkgs/by-name/re/replacement/package.nix
index 0c72e617ff64..c9741935b56a 100644
--- a/pkgs/by-name/re/replacement/package.nix
+++ b/pkgs/by-name/re/replacement/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "siriobalmelli";
     repo = "replacement";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0j4lvn3rx1kqvxcsd8nhc2lgk48jyyl7qffhlkvakhy60f9lymj3";
   };
 
diff --git a/pkgs/by-name/re/repro-get/package.nix b/pkgs/by-name/re/repro-get/package.nix
index e3f94b5374ee..5a0477f9063f 100644
--- a/pkgs/by-name/re/repro-get/package.nix
+++ b/pkgs/by-name/re/repro-get/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "reproducible-containers";
     repo = "repro-get";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qLu9SZuHCkKAOhzrBPEEev1iD5mcIBvrbXspHtifsq4=";
   };
 
diff --git a/pkgs/by-name/re/reproc/package.nix b/pkgs/by-name/re/reproc/package.nix
index d00a691ff636..a8d0d8ccfd06 100644
--- a/pkgs/by-name/re/reproc/package.nix
+++ b/pkgs/by-name/re/reproc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DaanDeMeyer";
     repo = "reproc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LWzBeKhE7cSiZsK8xWzoTdrOcPiU/zEkmi40WiFytic=";
   };
 
diff --git a/pkgs/by-name/re/reredirect/package.nix b/pkgs/by-name/re/reredirect/package.nix
index afe82bddc0a2..c3245002d27f 100644
--- a/pkgs/by-name/re/reredirect/package.nix
+++ b/pkgs/by-name/re/reredirect/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jerome-pouiller";
     repo = "reredirect";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-RHRamDo7afnJ4DlOVAqM8lQAC60YESGSMKa8Io2vcX0=";
   };
 
diff --git a/pkgs/by-name/re/rescrobbled/package.nix b/pkgs/by-name/re/rescrobbled/package.nix
index 59914fbb785c..760d7f3e1768 100644
--- a/pkgs/by-name/re/rescrobbled/package.nix
+++ b/pkgs/by-name/re/rescrobbled/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "InputUsername";
     repo = "rescrobbled";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1E+SeKjHCah+IFn2QLAyyv7jgEcZ1gtkh8iHgiVBuz4=";
   };
 
diff --git a/pkgs/by-name/re/resgate/package.nix b/pkgs/by-name/re/resgate/package.nix
index 160c7b42d8c6..7d5e95c5efdc 100644
--- a/pkgs/by-name/re/resgate/package.nix
+++ b/pkgs/by-name/re/resgate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "resgateio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HQgBWH6dqfmAfKMezUjPbwXif8bqAClns589la2lBVA=";
   };
 
diff --git a/pkgs/by-name/re/restic-browser/package.nix b/pkgs/by-name/re/restic-browser/package.nix
index 0333ab8f71b3..4bca9c39d9e7 100644
--- a/pkgs/by-name/re/restic-browser/package.nix
+++ b/pkgs/by-name/re/restic-browser/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "emuell";
     repo = "restic-browser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-magf19hA5PVAZafRcQXFaAD50qGofztpiluVc2aCeOk=";
   };
 
diff --git a/pkgs/by-name/re/restls/package.nix b/pkgs/by-name/re/restls/package.nix
index ab12a55c7004..f53262b27c6b 100644
--- a/pkgs/by-name/re/restls/package.nix
+++ b/pkgs/by-name/re/restls/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "3andne";
     repo = "restls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nlQdBwxHVbpOmb9Wq+ap2i4KI1zJYT3SEqvedDbVH8Q=";
   };
 
diff --git a/pkgs/by-name/re/restman/package.nix b/pkgs/by-name/re/restman/package.nix
index e36aa81cf31c..699c80cf4215 100644
--- a/pkgs/by-name/re/restman/package.nix
+++ b/pkgs/by-name/re/restman/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "restman";
     owner = "jackMort";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KN3iahDdPSHPnGEacsmaVMRNI3mV9qrH3HyJOTtB2hA=";
   };
 
diff --git a/pkgs/by-name/re/restream/package.nix b/pkgs/by-name/re/restream/package.nix
index 80587208efc2..f88582e32167 100644
--- a/pkgs/by-name/re/restream/package.nix
+++ b/pkgs/by-name/re/restream/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rien";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AXHKOfdIM3LsHF6u3M/lMhhcuPZADoEal7de3zlx7L4=";
   };
 
diff --git a/pkgs/by-name/re/resumed/package.nix b/pkgs/by-name/re/resumed/package.nix
index bc1d5ade1ed9..c10e08d8f027 100644
--- a/pkgs/by-name/re/resumed/package.nix
+++ b/pkgs/by-name/re/resumed/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "rbardini";
     repo = "resumed";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kDv6kOVY8IfztmLeby2NgB5q0DtP1ajMselvr1EDQJ8=";
   };
 
diff --git a/pkgs/by-name/re/resvg/package.nix b/pkgs/by-name/re/resvg/package.nix
index b41cbefbecc8..e0efa948b5fc 100644
--- a/pkgs/by-name/re/resvg/package.nix
+++ b/pkgs/by-name/re/resvg/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "RazrFalcon";
     repo = "resvg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XjWkzTdsnQZfBjf61dgGt/a7973ZljJG1rnCk0iGk6Y=";
   };
 
diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix
index 92825492acc3..0a1bbf6dce33 100644
--- a/pkgs/by-name/re/retroarch-bare/package.nix
+++ b/pkgs/by-name/re/retroarch-bare/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     owner = "libretro";
     repo = "RetroArch";
     hash = "sha256-ER90i0BlHC8SXfz6DzoIPCP1G8n4NNyJcRE88YY0gXk=";
-    rev = "v${version}";
+    tag = "v${version}";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix b/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix
index e72bde6a8e91..1b936ae4e415 100644
--- a/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix
+++ b/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "retroarch-joypad-autoconfig";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TdNyQOMLBgwpeYDE8qrRrIMUYcagiBJ02rSVU4Ycn1o=";
   };
 
diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix
index f0744008502c..7844e57cf346 100644
--- a/pkgs/by-name/re/retrospy/package.nix
+++ b/pkgs/by-name/re/retrospy/package.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "retrospy";
     repo = "RetroSpy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QoZcKFVjd0qYQ+Ds4Y/JKBPiL+z83wxm0ktuETX5ZPU=";
   };
 
diff --git a/pkgs/by-name/re/reveal-md/package.nix b/pkgs/by-name/re/reveal-md/package.nix
index 1489e1fe9b70..350f466d1f03 100644
--- a/pkgs/by-name/re/reveal-md/package.nix
+++ b/pkgs/by-name/re/reveal-md/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "webpro";
     repo = "reveal-md";
-    rev = version;
+    tag = version;
     hash = "sha256-5lYC4v+Jvm1OdWrkU/cn1I1jd0B1C+AvACCiGUBv+h0=";
   };
 
diff --git a/pkgs/by-name/re/reviewdog/package.nix b/pkgs/by-name/re/reviewdog/package.nix
index 099ee1949cb1..3c58b041bafd 100644
--- a/pkgs/by-name/re/reviewdog/package.nix
+++ b/pkgs/by-name/re/reviewdog/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B0gu6vhbnhMx2CNQzQlIIwsycBup6bnmAk/1C6F/AWE=";
   };
 
diff --git a/pkgs/by-name/re/revive/package.nix b/pkgs/by-name/re/revive/package.nix
index ae8df4a81188..7e8b5aabf37c 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 = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lu5zbZXTaLJ5m2sVOG1Y7I/bbJ7kwqbfL1ebwPJ+C0o=";
     # 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/re/rewrk/package.nix b/pkgs/by-name/re/rewrk/package.nix
index 5e87c9104bea..a59e1c4d849d 100644
--- a/pkgs/by-name/re/rewrk/package.nix
+++ b/pkgs/by-name/re/rewrk/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lnx-search";
     repo = "rewrk";
-    rev = version;
+    tag = version;
     hash = "sha256-Bqr5kmIIx+12hW4jpINcv0GBJBbMAkd4di/hZSXlT18=";
   };
 
diff --git a/pkgs/by-name/rf/rfc/package.nix b/pkgs/by-name/rf/rfc/package.nix
index 815dbc08d4d3..da71094653cc 100644
--- a/pkgs/by-name/rf/rfc/package.nix
+++ b/pkgs/by-name/rf/rfc/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bfontaine";
     repo = "rfc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bCqgLkbZGQFcxhLwekVw+rUGinXTc7QJHlVRGtNf6Jc=";
   };
 
diff --git a/pkgs/by-name/rg/rgbds/package.nix b/pkgs/by-name/rg/rgbds/package.nix
index b46ac38954f1..8165827af3eb 100644
--- a/pkgs/by-name/rg/rgbds/package.nix
+++ b/pkgs/by-name/rg/rgbds/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gbdev";
     repo = "rgbds";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Rv2ylZavLy+G4XFLBdNGjk78hSb8cDoX9lW1l2TRmtk=";
   };
   nativeBuildInputs = [
diff --git a/pkgs/by-name/rh/rhack/package.nix b/pkgs/by-name/rh/rhack/package.nix
index 10b5c2753f9b..7151ae205ce1 100644
--- a/pkgs/by-name/rh/rhack/package.nix
+++ b/pkgs/by-name/rh/rhack/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nakabonne";
     repo = "rhack";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "088ynf65szaa86pxwwasn3wwi00z5pn7i8w9gh5dyn983z4d8237";
   };
 
diff --git a/pkgs/by-name/rh/rhai-doc/package.nix b/pkgs/by-name/rh/rhai-doc/package.nix
index aa8793f859ee..44544714ed32 100644
--- a/pkgs/by-name/rh/rhai-doc/package.nix
+++ b/pkgs/by-name/rh/rhai-doc/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rhaiscript";
     repo = "rhai-doc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GZq5C8Q95OHKftEkps4Y6X6sAc4pzSfSq3ELUW/kPWI=";
   };
 
diff --git a/pkgs/by-name/rh/rhash/package.nix b/pkgs/by-name/rh/rhash/package.nix
index 9daddbfce993..9f058ee5f825 100644
--- a/pkgs/by-name/rh/rhash/package.nix
+++ b/pkgs/by-name/rh/rhash/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rhash";
     repo = "RHash";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3CW41ULdXoID4cOgrcG2j85tgIJ/sz5hU7A83qpuxf4=";
   };
 
diff --git a/pkgs/by-name/rh/rhoas/package.nix b/pkgs/by-name/rh/rhoas/package.nix
index 304f15e412f1..9ac00d9eccb4 100644
--- a/pkgs/by-name/rh/rhoas/package.nix
+++ b/pkgs/by-name/rh/rhoas/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "app-services-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9fydRgp2u1LWf0lEDMi1OxxFURd14oKCBDKACqrgWII=";
   };
 
diff --git a/pkgs/by-name/rh/rhodium-libre/package.nix b/pkgs/by-name/rh/rhodium-libre/package.nix
index ea6c6d893507..184b5d9ce678 100644
--- a/pkgs/by-name/rh/rhodium-libre/package.nix
+++ b/pkgs/by-name/rh/rhodium-libre/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DunwichType";
     repo = "RhodiumLibre";
-    rev = version;
+    tag = version;
     hash = "sha256-YCQvUdjEAj4G71WCRCM0+NwiqRqwt1Ggeg9jb/oWEsY=";
   };
 
diff --git a/pkgs/by-name/rh/rhvoice/package.nix b/pkgs/by-name/rh/rhvoice/package.nix
index 50aade08446c..c96dfd2467cb 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-bkKEEtKF9ULEJ0sAGgWlxpIq4SbFLBSGbmThvvOLO5w=";
   };
diff --git a/pkgs/by-name/ri/richgo/package.nix b/pkgs/by-name/ri/richgo/package.nix
index 04e4a6b689b7..ada43084b7e4 100644
--- a/pkgs/by-name/ri/richgo/package.nix
+++ b/pkgs/by-name/ri/richgo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kyoh86";
     repo = "richgo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pOB1exuwGwSxStodKhLLwh1xBvLjopUn0k+sEARdA9g=";
   };
 
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/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix
index 944baa2255ca..4c27b88d2b89 100644
--- a/pkgs/by-name/ri/riff/package.nix
+++ b/pkgs/by-name/ri/riff/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "riff";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ThHkEvu+lWojHmEgcrwdZDPROfxznB7vv78msyZf90A=";
   };
 
diff --git a/pkgs/by-name/ri/riko4/package.nix b/pkgs/by-name/ri/riko4/package.nix
index 047c28aef0ad..c029d8d1c0c5 100644
--- a/pkgs/by-name/ri/riko4/package.nix
+++ b/pkgs/by-name/ri/riko4/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "incinirate";
     repo = "Riko4";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "008i9991sn616dji96jfwq6gszrspbx4x7cynxb1cjw66phyy5zp";
   };
 
diff --git a/pkgs/by-name/ri/rime-cli/package.nix b/pkgs/by-name/ri/rime-cli/package.nix
index 40c08fa5e66f..501bce616f81 100644
--- a/pkgs/by-name/ri/rime-cli/package.nix
+++ b/pkgs/by-name/ri/rime-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "puddinging";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CI0Jva7oA/zUGatv+wCdByqbTBNQRw+4clr8IDKX6HQ=";
   };
 
diff --git a/pkgs/by-name/ri/rime-ls/package.nix b/pkgs/by-name/ri/rime-ls/package.nix
index c65b9b63e245..0deb1e929959 100644
--- a/pkgs/by-name/ri/rime-ls/package.nix
+++ b/pkgs/by-name/ri/rime-ls/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wlh320";
     repo = "rime-ls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bVpFE25Maady0oyrwWf2l7FCW/VHN6mJsnEefmStxIU=";
   };
 
diff --git a/pkgs/by-name/ri/rinetd/package.nix b/pkgs/by-name/ri/rinetd/package.nix
index 8e90ce6628b8..0fc3068a56ac 100644
--- a/pkgs/by-name/ri/rinetd/package.nix
+++ b/pkgs/by-name/ri/rinetd/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "samhocevar";
     repo = "rinetd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W8PLGd3RwmBTh1kw3k8+ZfP6AzRhZORCkxZzQ9ZbPN4=";
   };
 
diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index 2a8edcb85d0a..864a848a0cd6 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "raphamorim";
     repo = "rio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NAg8Hm90CxRt3rthFas8IyAjc1oj/PSRjjG/5R68CD8=";
   };
 
diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix
index d7da56c59c7c..53cbee33780c 100644
--- a/pkgs/by-name/ri/rip2/package.nix
+++ b/pkgs/by-name/ri/rip2/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MilesCranmer";
     repo = "rip2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bwIvjpZgX95Vg14sU6JmYuWNHP38ZBM98ii/Rze+lqA=";
   };
 
diff --git a/pkgs/by-name/ri/ripdrag/package.nix b/pkgs/by-name/ri/ripdrag/package.nix
index 88634d3fb09a..97ce3eb23075 100644
--- a/pkgs/by-name/ri/ripdrag/package.nix
+++ b/pkgs/by-name/ri/ripdrag/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nik012003";
     repo = "ripdrag";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aK/1f56sHspohbYO0z2Hf1NDJsN8Dbf1NoL/QadbVSY=";
   };
 
diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index 4e4bd6f102cb..e87b804f97a6 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
-    rev = version;
+    tag = version;
     hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
   };
 
diff --git a/pkgs/by-name/ri/ripsecrets/package.nix b/pkgs/by-name/ri/ripsecrets/package.nix
index f9c77fe673de..c3060d3c80f9 100644
--- a/pkgs/by-name/ri/ripsecrets/package.nix
+++ b/pkgs/by-name/ri/ripsecrets/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sirwart";
     repo = "ripsecrets";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lmahS/0W5075vdPfj4QnX7ZvrxHi986/92PRrplFblg=";
   };
 
diff --git a/pkgs/by-name/ri/ripser/package.nix b/pkgs/by-name/ri/ripser/package.nix
index 204f8a0f0244..74dcdd51681e 100644
--- a/pkgs/by-name/ri/ripser/package.nix
+++ b/pkgs/by-name/ri/ripser/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Ripser";
     repo = "ripser";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BxmkPQ/nl5cF+xwQMTjXnLgkLgdmT/39y7Kzl2wDfpE=";
   };
 
diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix
index a92406128c93..f3c12a754f50 100644
--- a/pkgs/by-name/ri/ripunzip/package.nix
+++ b/pkgs/by-name/ri/ripunzip/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "ripunzip";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Y4p3CFE8MyEQJ/af0g2/EL4kto/VZABvD5OS0rRuo8g=";
   };
 
diff --git a/pkgs/by-name/ri/risor/package.nix b/pkgs/by-name/ri/risor/package.nix
index 050d80621860..81d12b94fdae 100644
--- a/pkgs/by-name/ri/risor/package.nix
+++ b/pkgs/by-name/ri/risor/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "risor-io";
     repo = "risor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QtYqepNH+c0WDGKTLtMz/VUz0oDOgCbwe4D9I4wal5s=";
   };
 
diff --git a/pkgs/by-name/ri/river-bsp-layout/package.nix b/pkgs/by-name/ri/river-bsp-layout/package.nix
index 88772a7075bc..90f213dd43db 100644
--- a/pkgs/by-name/ri/river-bsp-layout/package.nix
+++ b/pkgs/by-name/ri/river-bsp-layout/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "areif-dev";
     repo = "river-bsp-layout";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/R9v3NGsSG4JJtdk0sJX7ahRolRmJMwMP48JRmLffXc=";
   };
 
diff --git a/pkgs/by-name/ri/river-filtile/package.nix b/pkgs/by-name/ri/river-filtile/package.nix
index daffc075e6e8..de024ac2863d 100644
--- a/pkgs/by-name/ri/river-filtile/package.nix
+++ b/pkgs/by-name/ri/river-filtile/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pkulak";
     repo = "filtile";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wBU4CX6KGnTvrBsXvFAlRrvDqvHHbAlVkDqTCJx90G8=";
   };
 
diff --git a/pkgs/by-name/ri/river-luatile/package.nix b/pkgs/by-name/ri/river-luatile/package.nix
index 41b382c58203..2ec609ef818c 100644
--- a/pkgs/by-name/ri/river-luatile/package.nix
+++ b/pkgs/by-name/ri/river-luatile/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MaxVerevkin";
     repo = "river-luatile";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8/qHoNFoGH1nSdTwBkaQk+yyvJtrXADTA39gUAMeSv8=";
   };
 
diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix
index 0994d8527043..70dc141f04a7 100644
--- a/pkgs/by-name/rk/rke/package.nix
+++ b/pkgs/by-name/rk/rke/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rancher";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mTSeUFmkXI9yZ1yeBXzudf2BmLtdmoiTlB/wtn++NAo=";
   };
 
diff --git a/pkgs/by-name/rk/rkrlv2/package.nix b/pkgs/by-name/rk/rkrlv2/package.nix
index adb25975d7cc..4f8733aecf86 100644
--- a/pkgs/by-name/rk/rkrlv2/package.nix
+++ b/pkgs/by-name/rk/rkrlv2/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ssj71";
     repo = "rkrlv2";
-    rev = version;
+    tag = version;
     sha256 = "WjpPNUEYw4aGrh57J+7kkxKFXgCJWNaWAmueFbNUJJo=";
   };
 
diff --git a/pkgs/by-name/rk/rkvm/package.nix b/pkgs/by-name/rk/rkvm/package.nix
index 1619646431a8..597f7bfd03f2 100644
--- a/pkgs/by-name/rk/rkvm/package.nix
+++ b/pkgs/by-name/rk/rkvm/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "htrefil";
     repo = "rkvm";
-    rev = version;
+    tag = version;
     hash = "sha256-pGCoNmGOeV7ND4kcRjlJZbEMnmKQhlCtyjMoWIwVZrM=";
   };
 
diff --git a/pkgs/by-name/rl/rl_json/package.nix b/pkgs/by-name/rl/rl_json/package.nix
index c9c000718135..58493c3ae2e5 100644
--- a/pkgs/by-name/rl/rl_json/package.nix
+++ b/pkgs/by-name/rl/rl_json/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "RubyLane";
     repo = "rl_json";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-FkOsdOHPE75bSkKw3cdaech6jAv0f/RJ9tgRVzPSAdA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/rl/rlaunch/package.nix b/pkgs/by-name/rl/rlaunch/package.nix
index 77c3c80cb2cf..77c47f1de29a 100644
--- a/pkgs/by-name/rl/rlaunch/package.nix
+++ b/pkgs/by-name/rl/rlaunch/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PonasKovas";
     repo = "rlaunch";
-    rev = version;
+    tag = version;
     hash = "sha256-PyCR/ob947W+6T56y1se74aNy1avJDb2ELyv2aGf1og=";
   };
 
diff --git a/pkgs/by-name/rl/rlci/package.nix b/pkgs/by-name/rl/rlci/package.nix
index ea2378ba6c68..61d1d58e06fe 100644
--- a/pkgs/by-name/rl/rlci/package.nix
+++ b/pkgs/by-name/rl/rlci/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orsinium-labs";
     repo = "rlci";
-    rev = version;
+    tag = version;
     hash = "sha256-+Hd1Ymm2LKnHUKoUlfN6D6pwebxgwJQHgqwMHXXtP6Y=";
   };
 
diff --git a/pkgs/by-name/rl/rlottie/package.nix b/pkgs/by-name/rl/rlottie/package.nix
index 6b4c19bbbddd..e68b1502963b 100644
--- a/pkgs/by-name/rl/rlottie/package.nix
+++ b/pkgs/by-name/rl/rlottie/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Samsung";
     repo = "rlottie";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3";
   };
 
diff --git a/pkgs/by-name/rl/rlwrap/package.nix b/pkgs/by-name/rl/rlwrap/package.nix
index 5d465fac3472..503d24a3dcd5 100644
--- a/pkgs/by-name/rl/rlwrap/package.nix
+++ b/pkgs/by-name/rl/rlwrap/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hanslub42";
     repo = "rlwrap";
-    rev = version;
+    tag = version;
     sha256 = "sha256-yKJXfdxfaCsmPtI0KmTzfFKY+evUuytomVrLsSCYDGo=";
   };
 
diff --git a/pkgs/by-name/rm/rm-improved/package.nix b/pkgs/by-name/rm/rm-improved/package.nix
index ea353c78a134..952fed89de95 100644
--- a/pkgs/by-name/rm/rm-improved/package.nix
+++ b/pkgs/by-name/rm/rm-improved/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nivekuil";
     repo = "rip";
-    rev = version;
+    tag = version;
     hash = "sha256-jbXmGPrb9PhmCSUFVcCqg8HjntS2mrYeNuaMsU+zIFI=";
   };
 
diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix
index 44036731dd4c..12d6a7e76536 100644
--- a/pkgs/by-name/rm/rmapi/package.nix
+++ b/pkgs/by-name/rm/rmapi/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ddvk";
     repo = "rmapi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pVmG9XD3AcHDRo1A25QSnPStKPsgku3lWhN47xdYrwE=";
   };
 
diff --git a/pkgs/by-name/rm/rmenu/package.nix b/pkgs/by-name/rm/rmenu/package.nix
index cd3d3fb2a700..e1b49a152a6a 100644
--- a/pkgs/by-name/rm/rmenu/package.nix
+++ b/pkgs/by-name/rm/rmenu/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   version = "1.2.2";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "imgurbot12";
     repo = "rmenu";
     hash = "sha256-khauloUGVuekR+Lran1DLnsxwY8sIf5PsEKY7sNy1K4=";
diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index 30a1709b67a5..196ee25c526b 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ddvk";
     repo = "rmfakecloud";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZsYq1+Bb6SyMGdbiy5UzanDiUiFOt4uhttiPKC0ESis=";
   };
 
diff --git a/pkgs/by-name/rm/rmount/package.nix b/pkgs/by-name/rm/rmount/package.nix
index 30d2d86942e1..b92ed0c572d5 100644
--- a/pkgs/by-name/rm/rmount/package.nix
+++ b/pkgs/by-name/rm/rmount/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "1.1.0";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "Luis-Hebendanz";
     repo = "rmount";
     sha256 = "0j1ayncw1nnmgna7vyx44vwinh4ah1b0l5y8agc7i4s8clbvy3h0";
diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix
index f124d38c0dc7..b4d166354ec8 100644
--- a/pkgs/by-name/rm/rmpc/package.nix
+++ b/pkgs/by-name/rm/rmpc/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mierak";
     repo = "rmpc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RfYaWoVGdeE5y/hkRH+gZgnc0Hrp9V+Pttvjcu3Q14g=";
   };
 
diff --git a/pkgs/by-name/rm/rmtrash/package.nix b/pkgs/by-name/rm/rmtrash/package.nix
index 5daa74add128..a0b96a60fe65 100644
--- a/pkgs/by-name/rm/rmtrash/package.nix
+++ b/pkgs/by-name/rm/rmtrash/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PhrozenByte";
     repo = "rmtrash";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vCtIM6jAYfrAOopiTcb4M5GNtucVnK0XEEKbMq1Cbc4=";
   };
 
diff --git a/pkgs/by-name/rm/rmw/package.nix b/pkgs/by-name/rm/rmw/package.nix
index f405ef621d92..4a4ab2195275 100644
--- a/pkgs/by-name/rm/rmw/package.nix
+++ b/pkgs/by-name/rm/rmw/package.nix
@@ -15,7 +15,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/rn/rnd-name/package.nix b/pkgs/by-name/rn/rnd-name/package.nix
index 9b10a3ca766e..bc2f5eb45cef 100644
--- a/pkgs/by-name/rn/rnd-name/package.nix
+++ b/pkgs/by-name/rn/rnd-name/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "mrhenry";
     repo = "rnd-name";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o3A7VDH6rpJmCBu8ZPfPllMm1rAN1tNrz2eUyd2Tjjs=";
   };
 
diff --git a/pkgs/by-name/rn/rng-tools/package.nix b/pkgs/by-name/rn/rng-tools/package.nix
index 32127d5a258a..ee269754e927 100644
--- a/pkgs/by-name/rn/rng-tools/package.nix
+++ b/pkgs/by-name/rn/rng-tools/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nhorman";
     repo = "rng-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wqJvLvxmNG2nb5P525w25Y8byUUJi24QIHNJomCKeG8=";
   };
 
diff --git a/pkgs/by-name/rn/rnr/package.nix b/pkgs/by-name/rn/rnr/package.nix
index fef4a0960a48..68a6ef57a372 100644
--- a/pkgs/by-name/rn/rnr/package.nix
+++ b/pkgs/by-name/rn/rnr/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ismaelgv";
     repo = "rnr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-uuM8zh0wFSsySedXmdm8WGGR4HmUc5TCZ6socdztrZI=";
   };
 
diff --git a/pkgs/by-name/ro/robotfindskitten/package.nix b/pkgs/by-name/ro/robotfindskitten/package.nix
index d1a5520c2d50..8e6051a86109 100644
--- a/pkgs/by-name/ro/robotfindskitten/package.nix
+++ b/pkgs/by-name/ro/robotfindskitten/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "robotfindskitten";
     repo = "robotfindskitten";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-z6//Yfp3BtJAtUdY05m1eKVrTdH19MvK7LZOwX5S1CM=";
   };
 
diff --git a/pkgs/by-name/ro/robustirc-bridge/package.nix b/pkgs/by-name/ro/robustirc-bridge/package.nix
index 32907b1894af..15aed6d2f3bb 100644
--- a/pkgs/by-name/ro/robustirc-bridge/package.nix
+++ b/pkgs/by-name/ro/robustirc-bridge/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "robustirc";
     repo = "bridge";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8SNy3xqVahBuEXCrG21zIggXeahbzJtqtFMxfp+r48g=";
   };
 
diff --git a/pkgs/by-name/ro/roc-toolkit/package.nix b/pkgs/by-name/ro/roc-toolkit/package.nix
index db097741eaff..346792cdc75f 100644
--- a/pkgs/by-name/ro/roc-toolkit/package.nix
+++ b/pkgs/by-name/ro/roc-toolkit/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "roc-streaming";
     repo = "roc-toolkit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-53irDq803dTg0YqtC1SOXmYNGypSMAEK+9HJ65pR5PA=";
   };
 
diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix
index faec0ef7014e..a3694f79b3af 100644
--- a/pkgs/by-name/ro/rockcraft/package.nix
+++ b/pkgs/by-name/ro/rockcraft/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "rockcraft";
-    rev = version;
+    tag = version;
     hash = "sha256-cgNKMxQrD9/OfmY5YEnpbNDstDdXqc/wdfCb4HvsgNM=";
   };
 
diff --git a/pkgs/by-name/ro/rofi-calc/package.nix b/pkgs/by-name/ro/rofi-calc/package.nix
index 69641e3753a2..059eeb501c9b 100644
--- a/pkgs/by-name/ro/rofi-calc/package.nix
+++ b/pkgs/by-name/ro/rofi-calc/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "rofi-calc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YDij0j/AOl69FlsGfolzv8lI+iQfDmJrXo2duTIoMRA=";
   };
 
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/ro/rofi-mpd/package.nix b/pkgs/by-name/ro/rofi-mpd/package.nix
index 2756758e349d..ad84a661bb1c 100644
--- a/pkgs/by-name/ro/rofi-mpd/package.nix
+++ b/pkgs/by-name/ro/rofi-mpd/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = "Rofi_MPD";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0jabyn6gqh8ychn2a06xws3avz0lqdnx3qvqkavfd2xr6sp2q7lg";
   };
 
diff --git a/pkgs/by-name/ro/rofi-power-menu/package.nix b/pkgs/by-name/ro/rofi-power-menu/package.nix
index 6746cfdbf4ca..5a9880df2ca8 100644
--- a/pkgs/by-name/ro/rofi-power-menu/package.nix
+++ b/pkgs/by-name/ro/rofi-power-menu/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jluttine";
     repo = "rofi-power-menu";
-    rev = version;
+    tag = version;
     sha256 = "sha256-VPCfmCTr6ADNT7MW4jiqLI/lvTjlAu1QrCAugiD0toU=";
   };
 
diff --git a/pkgs/by-name/ro/rofi-systemd/package.nix b/pkgs/by-name/ro/rofi-systemd/package.nix
index aa3bb741fabf..05cff88d6c2e 100644
--- a/pkgs/by-name/ro/rofi-systemd/package.nix
+++ b/pkgs/by-name/ro/rofi-systemd/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IvanMalison";
     repo = "rofi-systemd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0lgffb6rk1kf91j4j303lzpx8w2g9zy2gk99p8g8pk62a30c5asm";
   };
 
diff --git a/pkgs/by-name/ro/rofi-vpn/package.nix b/pkgs/by-name/ro/rofi-vpn/package.nix
index 28f3dd6ae167..561bce6e65ed 100644
--- a/pkgs/by-name/ro/rofi-vpn/package.nix
+++ b/pkgs/by-name/ro/rofi-vpn/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "DamienCassou";
     repo = "rofi-vpn";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "04jcfb2jy8yyrk4mg68krwh3zb5qcyj1aq1bwk96fhybrq9k2hhp";
   };
 
diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix
index 20181d00888f..0d0ce1b1c4f8 100644
--- a/pkgs/by-name/ro/rojo/package.nix
+++ b/pkgs/by-name/ro/rojo/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rojo-rbx";
     repo = "rojo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5jiqR3gn3X+klcYr1zTEB9omxWwHKQNLKCVXhry1jjY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ro/roogle/package.nix b/pkgs/by-name/ro/roogle/package.nix
index 1a06c59c55c7..02a4bdc677ce 100644
--- a/pkgs/by-name/ro/roogle/package.nix
+++ b/pkgs/by-name/ro/roogle/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hkmatsumoto";
     repo = "roogle";
-    rev = version;
+    tag = version;
     sha256 = "sha256-oeQwRcDn4X/CL+O4APmGv9T19c9oD5tCBRz4K41K1Zg=";
   };
 
diff --git a/pkgs/by-name/ro/roon-tui/package.nix b/pkgs/by-name/ro/roon-tui/package.nix
index 94b696e2f24d..451c721e124f 100644
--- a/pkgs/by-name/ro/roon-tui/package.nix
+++ b/pkgs/by-name/ro/roon-tui/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "TheAppgineer";
     repo = "roon-tui";
-    rev = version;
+    tag = version;
     hash = "sha256-ocPSqj9/xJ2metetn6OY+IEFWysbstPmh2N5Jd8NDPM=";
   };
 
diff --git a/pkgs/by-name/ro/rootlesskit/package.nix b/pkgs/by-name/ro/rootlesskit/package.nix
index 6b2c3e63d8e4..05c1beae1c42 100644
--- a/pkgs/by-name/ro/rootlesskit/package.nix
+++ b/pkgs/by-name/ro/rootlesskit/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rootless-containers";
     repo = "rootlesskit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9jQNFjxMLjGa9m2gxmoauzLHqhljltEO/ZNsBjWjgtw=";
   };
 
diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix
index 6ec021b53ee6..7f72b8aae97d 100644
--- a/pkgs/by-name/ro/rosa/package.nix
+++ b/pkgs/by-name/ro/rosa/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openshift";
     repo = "rosa";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bImuMrrXssKEh4VvSMy4iuK61GJ+Pltt6Ksir1Bx1as=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/ro/roslyn/package.nix b/pkgs/by-name/ro/roslyn/package.nix
index 4404f1ef0618..5b8076ed57c6 100644
--- a/pkgs/by-name/ro/roslyn/package.nix
+++ b/pkgs/by-name/ro/roslyn/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI=";
   };
 
diff --git a/pkgs/by-name/ro/rospo/package.nix b/pkgs/by-name/ro/rospo/package.nix
index 5658c5854d74..3361ae60c580 100644
--- a/pkgs/by-name/ro/rospo/package.nix
+++ b/pkgs/by-name/ro/rospo/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ferama";
     repo = "rospo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-H6hZbOnX+1P1Ob5fCROQtV+64NiFD9mO3kiaQY63OBM=";
   };
 
diff --git a/pkgs/by-name/ro/roswell/package.nix b/pkgs/by-name/ro/roswell/package.nix
index f8f7ec658b09..86e8bcb7a887 100644
--- a/pkgs/by-name/ro/roswell/package.nix
+++ b/pkgs/by-name/ro/roswell/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "roswell";
     repo = "roswell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2aYA1AzRPXaM82Sh+dMiQJcOAD0rzwV09VyLy0oS6as=";
   };
 
diff --git a/pkgs/by-name/ro/rotate-backups/package.nix b/pkgs/by-name/ro/rotate-backups/package.nix
index 70708d123880..ef8a29656c68 100644
--- a/pkgs/by-name/ro/rotate-backups/package.nix
+++ b/pkgs/by-name/ro/rotate-backups/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-rotate-backups";
-    rev = version;
+    tag = version;
     sha256 = "0r4dyd7hj403rksgp3vh1azp9n4af75r3wq3x39wxcqizpms3vkx";
   };
 
diff --git a/pkgs/by-name/ro/round/package.nix b/pkgs/by-name/ro/round/package.nix
index dc55727a2b09..b620906ace0e 100644
--- a/pkgs/by-name/ro/round/package.nix
+++ b/pkgs/by-name/ro/round/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mingrammer";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vP2q0inU5zNJ/eiAqEzwHSqril8hTtpbpNBiAkeWeSU=";
   };
 
diff --git a/pkgs/by-name/ro/roundup/package.nix b/pkgs/by-name/ro/roundup/package.nix
index 743b224c07fa..975767cd4292 100644
--- a/pkgs/by-name/ro/roundup/package.nix
+++ b/pkgs/by-name/ro/roundup/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bmizerany";
     repo = "roundup";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0nxaqmbv8mdvq9wcaqxk6k5mr31i68jzxf1wxa6pp7xp4prwdc9z";
   };
 
diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix
index 434491ae88be..407620f97c77 100644
--- a/pkgs/by-name/ro/routedns/package.nix
+++ b/pkgs/by-name/ro/routedns/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "folbricht";
     repo = "routedns";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9H/l6EAbrNwD2DnweBqjmcoaJEnTH9BdGn2x/ZC3us4=";
   };
 
diff --git a/pkgs/by-name/ro/router/package.nix b/pkgs/by-name/ro/router/package.nix
index 91e27409ea46..503e775d577a 100644
--- a/pkgs/by-name/ro/router/package.nix
+++ b/pkgs/by-name/ro/router/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "apollographql";
     repo = "router";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4l9nTbtF8hy2x1fdRhmMKcYxTD6wWKXIfihLTWdtm7U=";
   };
 
diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix
index c9e5437b32d2..b83f63169f85 100644
--- a/pkgs/by-name/ro/routinator/package.nix
+++ b/pkgs/by-name/ro/routinator/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-itD9d+EqEdJ2bTJEpHxJCFFS8Mpc7AFQ1JgkNQxncV0=";
   };
 
diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix
index 4ba97ffc5a7d..575d6bbcd19c 100644
--- a/pkgs/by-name/ro/roxterm/package.nix
+++ b/pkgs/by-name/ro/roxterm/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "realh";
     repo = "roxterm";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-IvbAL96tILXgeutoSKhNkxxfLb+d2xgKUuvyGobOTUs=";
   };
 
diff --git a/pkgs/by-name/rp/rpPPPoE/package.nix b/pkgs/by-name/rp/rpPPPoE/package.nix
index 940ada94fac8..29d638562de1 100644
--- a/pkgs/by-name/rp/rpPPPoE/package.nix
+++ b/pkgs/by-name/rp/rpPPPoE/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dfskoll";
     repo = "rp-pppoe";
-    rev = version;
+    tag = version;
     hash = "sha256-2y26FVxVn8sU9/E2yJeJmbhAeOB0Go7EUPMU9H58H6U=";
   };
 
diff --git a/pkgs/by-name/rp/rpcsvc-proto/package.nix b/pkgs/by-name/rp/rpcsvc-proto/package.nix
index 6a4823bd5df2..c779aacb2cb1 100644
--- a/pkgs/by-name/rp/rpcsvc-proto/package.nix
+++ b/pkgs/by-name/rp/rpcsvc-proto/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thkukuk";
     repo = "rpcsvc-proto";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DEXzSSmjMeMsr1PoU/ljaY+6b4COUU2Z8MJkGImsgzk=";
   };
 
diff --git a/pkgs/by-name/rp/rpg-cli/package.nix b/pkgs/by-name/rp/rpg-cli/package.nix
index 782720a3df5b..6113fe3fc6b1 100644
--- a/pkgs/by-name/rp/rpg-cli/package.nix
+++ b/pkgs/by-name/rp/rpg-cli/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "facundoolano";
     repo = "rpg-cli";
-    rev = version;
+    tag = version;
     sha256 = "sha256-xNkM8qN9vg/WGRR/96aCQRVjIbSdSs2845l6oE6+tzg=";
   };
 
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/rp/rpm-sequoia/package.nix b/pkgs/by-name/rp/rpm-sequoia/package.nix
index 17b863a4678f..57af3f6ffae0 100644
--- a/pkgs/by-name/rp/rpm-sequoia/package.nix
+++ b/pkgs/by-name/rp/rpm-sequoia/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "rpm-sequoia";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AZCsboUv4muKOw5El2Hw5O1cvAgD3JhBppacrQCJT2k=";
   };
 
diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix
index c6245e9c1d42..68f521dcc3c4 100644
--- a/pkgs/by-name/rq/rq/package.nix
+++ b/pkgs/by-name/rq/rq/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dflemstr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI=";
   };
 
diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix
index f5205818e20a..cd7291c2da7f 100644
--- a/pkgs/by-name/rq/rqbit/package.nix
+++ b/pkgs/by-name/rq/rqbit/package.nix
@@ -17,7 +17,7 @@ let
   src = fetchFromGitHub {
     owner = "ikatson";
     repo = "rqbit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Meztr/UxLgnbd3YwkSW0vy+D2N4mFg2v+T4nBnYiQBI=";
   };
 
diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix
index 590547f8a84a..f8a92c6352e9 100644
--- a/pkgs/by-name/rq/rqlite/package.nix
+++ b/pkgs/by-name/rq/rqlite/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rqlite";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mMsQJETeDyENMkCOmKb6TxDp9lYHSQIjaJtbsYzTJMs=";
   };
 
diff --git a/pkgs/by-name/rr/rrdtool/package.nix b/pkgs/by-name/rr/rrdtool/package.nix
index 1a66700b17d9..9cff1e30cb53 100644
--- a/pkgs/by-name/rr/rrdtool/package.nix
+++ b/pkgs/by-name/rr/rrdtool/package.nix
@@ -23,7 +23,7 @@ perl.pkgs.toPerlModule (
     src = fetchFromGitHub {
       owner = "oetiker";
       repo = "rrdtool-1.x";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-CPbSu1mosNlfj2nqiNVH14a5C5njkfvJM8ix3X3aP8E=";
     };
 
diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix
index b94c02c955e2..366609631719 100644
--- a/pkgs/by-name/rs/rs-tftpd/package.nix
+++ b/pkgs/by-name/rs/rs-tftpd/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "altugbakan";
     repo = "rs-tftpd";
-    rev = version;
+    tag = version;
     hash = "sha256-qazPEzLMIlnqKTayurZgNJ8TLLdB4qNO88tKMoh6VVI=";
   };
 
diff --git a/pkgs/by-name/rs/rsbep/package.nix b/pkgs/by-name/rs/rsbep/package.nix
index 0327871f807e..2f951992860c 100644
--- a/pkgs/by-name/rs/rsbep/package.nix
+++ b/pkgs/by-name/rs/rsbep/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ttsiodras";
     repo = "rsbep-backup";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0is4jgil3wdqbvx9h66xcyzbqy84ndyydnnay2g9k81a4mcz4dns";
   };
 
diff --git a/pkgs/by-name/rs/rsclock/package.nix b/pkgs/by-name/rs/rsclock/package.nix
index 2df0891f8a14..d7f97d45c650 100644
--- a/pkgs/by-name/rs/rsclock/package.nix
+++ b/pkgs/by-name/rs/rsclock/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "valebes";
     repo = "rsClock";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-l5750zP90KnB+OIg1WOikQ6OgQZK4iwVvGBN3jegjGc=";
   };
 
diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix
index be16f7d71467..862ce2bd9bda 100644
--- a/pkgs/by-name/rs/rsgain/package.nix
+++ b/pkgs/by-name/rs/rsgain/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "complexlogic";
     repo = "rsgain";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dqvaPLVpNnbN2W0TOphS7QU6MDh5pxFJoUDGvkat164=";
   };
 
diff --git a/pkgs/by-name/rs/rshijack/package.nix b/pkgs/by-name/rs/rshijack/package.nix
index 25e3d04a6af0..1fcda56c7a28 100644
--- a/pkgs/by-name/rs/rshijack/package.nix
+++ b/pkgs/by-name/rs/rshijack/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "rshijack";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vTbjb0tm6jCP9+QWG5R83v31W6RUgSEv96iR37QdnFo=";
   };
 
diff --git a/pkgs/by-name/rs/rslint/package.nix b/pkgs/by-name/rs/rslint/package.nix
index becec39bd9b8..d944ee8f81a8 100644
--- a/pkgs/by-name/rs/rslint/package.nix
+++ b/pkgs/by-name/rs/rslint/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rslint";
     repo = "rslint";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3DEwi+bhqwP8aMpZYl07GZbe7IecraB3m54lZ5LViVc=";
   };
 
diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix
index 84704aa15f79..2dd384b228fc 100644
--- a/pkgs/by-name/rs/rspamd/package.nix
+++ b/pkgs/by-name/rs/rspamd/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rspamd";
     repo = "rspamd";
-    rev = version;
+    tag = version;
     hash = "sha256-vG52R8jYJlCgQqhA8zbZLMES1UxfxknAVOt87nhcflM=";
   };
 
diff --git a/pkgs/by-name/rs/rss-bridge/package.nix b/pkgs/by-name/rs/rss-bridge/package.nix
index c622a937a19d..4e9b5d71b996 100644
--- a/pkgs/by-name/rs/rss-bridge/package.nix
+++ b/pkgs/by-name/rs/rss-bridge/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RSS-Bridge";
     repo = "rss-bridge";
-    rev = version;
+    tag = version;
     sha256 = "sha256-b8mBojtNbQ9QSsFT2PTwyHJIOhoOpTxd6c2ldMy/g5g=";
   };
 
diff --git a/pkgs/by-name/rt/rtg-tools/package.nix b/pkgs/by-name/rt/rtg-tools/package.nix
index 3fe57e0e80ae..99408909df94 100644
--- a/pkgs/by-name/rt/rtg-tools/package.nix
+++ b/pkgs/by-name/rt/rtg-tools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RealTimeGenomics";
     repo = "rtg-tools";
-    rev = version;
+    tag = version;
     hash = "sha256-fMrrjrgaGxBVxn6qMq2g0oFv6qtfhZcQlkvv1E9Os6Y=";
   };
 
diff --git a/pkgs/by-name/rt/rtl_433/package.nix b/pkgs/by-name/rt/rtl_433/package.nix
index 6ef7599712ce..99451e9f32cd 100644
--- a/pkgs/by-name/rt/rtl_433/package.nix
+++ b/pkgs/by-name/rt/rtl_433/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "merbanan";
     repo = "rtl_433";
-    rev = version;
+    tag = version;
     hash = "sha256-S0jtcgbpS2NOezZJ0uq1pVj0nsa82F0NRmQD9glILz4=";
   };
 
diff --git a/pkgs/by-name/rt/rtlcss/package.nix b/pkgs/by-name/rt/rtlcss/package.nix
index 8e39dc0c959d..1574bb50bdb0 100644
--- a/pkgs/by-name/rt/rtlcss/package.nix
+++ b/pkgs/by-name/rt/rtlcss/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "MohammadYounes";
     repo = "rtlcss";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KdAf7jzt8o/YEzT/bLCXj546HX0oC90kr44u3p3qv/k=";
   };
 
diff --git a/pkgs/by-name/rt/rtrlib/package.nix b/pkgs/by-name/rt/rtrlib/package.nix
index 33f36a05685d..85297770860c 100644
--- a/pkgs/by-name/rt/rtrlib/package.nix
+++ b/pkgs/by-name/rt/rtrlib/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "rtrlib";
     owner = "rtrlib";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ISb4ojcDvXY/88GbFMrA5V5+SGE6CmE5D+pokDTwotQ=";
   };
 
diff --git a/pkgs/by-name/rt/rtss/package.nix b/pkgs/by-name/rt/rtss/package.nix
index 1e4c1546083c..248dcb61a48e 100644
--- a/pkgs/by-name/rt/rtss/package.nix
+++ b/pkgs/by-name/rt/rtss/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Freaky";
     repo = "rtss";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WeeZsB42/4SlIaWwKvOqWiPNV5p0QOToynI8ozVVxJM=";
   };
 
diff --git a/pkgs/by-name/rt/rttr/package.nix b/pkgs/by-name/rt/rttr/package.nix
index cc8d057d8651..010a7230ce9c 100644
--- a/pkgs/by-name/rt/rttr/package.nix
+++ b/pkgs/by-name/rt/rttr/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "${pname}org";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1yxad8sj40wi75hny8w6imrsx8wjasjmsipnlq559n4b6kl84ijp";
   };
 
diff --git a/pkgs/by-name/rt/rtz/package.nix b/pkgs/by-name/rt/rtz/package.nix
index 51ed10eababb..a4b6ef5d4da6 100644
--- a/pkgs/by-name/rt/rtz/package.nix
+++ b/pkgs/by-name/rt/rtz/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "twitchax";
     repo = "rtz";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-V7N9NFIc/WWxLaahkjdS47Qj8sc3HRdKSkrBqi1ngA8=";
   };
 
diff --git a/pkgs/by-name/ru/ruapu/package.nix b/pkgs/by-name/ru/ruapu/package.nix
index 4b688ce9fd63..b95d29e0fa2a 100644
--- a/pkgs/by-name/ru/ruapu/package.nix
+++ b/pkgs/by-name/ru/ruapu/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nihui";
     repo = "ruapu";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-gP2O0KtzArNCU3Sqc7STitO6WkS1536Z4VkA5U1uZuc=";
   };
 
diff --git a/pkgs/by-name/ru/rubyripper/package.nix b/pkgs/by-name/ru/rubyripper/package.nix
index 453f171ae901..0258834f9e6a 100644
--- a/pkgs/by-name/ru/rubyripper/package.nix
+++ b/pkgs/by-name/ru/rubyripper/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bleskodev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1qfwv8bgc9pyfh3d40bvyr9n7sjc2na61481693wwww640lm0f9f";
   };
 
diff --git a/pkgs/by-name/ru/rucksack/package.nix b/pkgs/by-name/ru/rucksack/package.nix
index c6d84a6f2961..9130ddbd77a9 100644
--- a/pkgs/by-name/ru/rucksack/package.nix
+++ b/pkgs/by-name/ru/rucksack/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrewrk";
     repo = "rucksack";
-    rev = version;
+    tag = version;
     sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv";
   };
 
diff --git a/pkgs/by-name/ru/rucola/package.nix b/pkgs/by-name/ru/rucola/package.nix
index 974be5e86620..502471668306 100644
--- a/pkgs/by-name/ru/rucola/package.nix
+++ b/pkgs/by-name/ru/rucola/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Linus-Mussmaecher";
     repo = "rucola";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vBY6tkzLgZuSU5AqH3uzDwjPl/ayWY0S8uRvlgE/Wmw=";
   };
 
diff --git a/pkgs/by-name/ru/run/package.nix b/pkgs/by-name/ru/run/package.nix
index 759f97102aca..79673bb18435 100644
--- a/pkgs/by-name/ru/run/package.nix
+++ b/pkgs/by-name/ru/run/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TekWizely";
     repo = "run";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-an5AuRJJEM18IssdLLZC/zzPpsVCCtawRQXK/AfzMN0=";
   };
 
diff --git a/pkgs/by-name/ru/runc/package.nix b/pkgs/by-name/ru/runc/package.nix
index fa8da1fb252c..f430578f7762 100644
--- a/pkgs/by-name/ru/runc/package.nix
+++ b/pkgs/by-name/ru/runc/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "runc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-y8TcMyNRkVfmNkumhohBoyiU6GM8/yLXT/CTFPmXlU4=";
   };
 
diff --git a/pkgs/by-name/ru/rund/package.nix b/pkgs/by-name/ru/rund/package.nix
index 7a9590fce685..6e0089e794c9 100644
--- a/pkgs/by-name/ru/rund/package.nix
+++ b/pkgs/by-name/ru/rund/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dragon-lang";
     repo = "rund";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "10x6f1nn294r5qnpacrpcbp348dndz5fv4nz6ih55c61ckpkvgcf";
   };
 
diff --git a/pkgs/by-name/ru/runelite/package.nix b/pkgs/by-name/ru/runelite/package.nix
index 158cc94fb9ce..f0fd25768078 100644
--- a/pkgs/by-name/ru/runelite/package.nix
+++ b/pkgs/by-name/ru/runelite/package.nix
@@ -18,7 +18,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "runelite";
     repo = "launcher";
-    rev = version;
+    tag = version;
     hash = "sha256-ckeZ/7rACyZ5j+zzC5hv1NaXTi9q/KvOzMPTDd1crHQ=";
   };
 
diff --git a/pkgs/by-name/ru/runitor/package.nix b/pkgs/by-name/ru/runitor/package.nix
index b5e157aca970..90c990d0f886 100644
--- a/pkgs/by-name/ru/runitor/package.nix
+++ b/pkgs/by-name/ru/runitor/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bdd";
     repo = "runitor";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9sg+ku3Qh/X/EZ2VCrvIc0pq5iyn4O8RZrO4KpkciAI=";
   };
 
diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix
index 0b19d315d816..a5e299032888 100644
--- a/pkgs/by-name/ru/runme/package.nix
+++ b/pkgs/by-name/ru/runme/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "runmedev";
     repo = "runme";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pMYhII+1gMZnabsGi7y82ZDvmxjDJWqhhvWegbQfTC0=";
   };
 
diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix
index 729193992cae..8788570f1437 100644
--- a/pkgs/by-name/ru/runpodctl/package.nix
+++ b/pkgs/by-name/ru/runpodctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "runpod";
     repo = "runpodctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QU2gujECzT5mPkZi6siMO7IZRXNZHS0TchYxnG4Snj8=";
   };
 
diff --git a/pkgs/by-name/ru/runzip/package.nix b/pkgs/by-name/ru/runzip/package.nix
index fecd659c7563..f9af109ec0e4 100644
--- a/pkgs/by-name/ru/runzip/package.nix
+++ b/pkgs/by-name/ru/runzip/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vlm";
     repo = "zip-fix-filename-encoding";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0l5zbb5hswxczigvyal877j0aiq3fc01j3gv88bvy7ikyvw3lc07";
   };
 
diff --git a/pkgs/by-name/ru/ruplacer/package.nix b/pkgs/by-name/ru/ruplacer/package.nix
index 2bade1d3b9ee..be956a1ec5a7 100644
--- a/pkgs/by-name/ru/ruplacer/package.nix
+++ b/pkgs/by-name/ru/ruplacer/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "TankerHQ";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Zvbb9pQpxbJZi0qcDU6f2jEgavl9cA7gIYU7NRXZ9fc=";
   };
 
diff --git a/pkgs/by-name/ru/rush-parallel/package.nix b/pkgs/by-name/ru/rush-parallel/package.nix
index 96292cbd65b1..fb25f86635b5 100644
--- a/pkgs/by-name/ru/rush-parallel/package.nix
+++ b/pkgs/by-name/ru/rush-parallel/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shenwei356";
     repo = "rush";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IV49d4Xu5QqpgqKH4y+yaOHDhhFQ2s4PuyeWHMawZTQ=";
   };
 
diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
index 4271b93eb79b..a99b7103ddb5 100644
--- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
-    rev = version;
+    tag = version;
     hash = "sha256-GLefofvDqIcyZ/S8rcF6cuKoSPJOVkm7TSK23MGT3Kk=";
   };
 
diff --git a/pkgs/by-name/ru/rust-parallel/package.nix b/pkgs/by-name/ru/rust-parallel/package.nix
index 76ca93565f68..6b5dea4b336d 100644
--- a/pkgs/by-name/ru/rust-parallel/package.nix
+++ b/pkgs/by-name/ru/rust-parallel/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aaronriekenberg";
     repo = "rust-parallel";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4f/JE8KWYDdLwx+bCSSbz0Cpfy/g3WIaRzqCvUix4t0=";
   };
 
diff --git a/pkgs/by-name/ru/rust-script/package.nix b/pkgs/by-name/ru/rust-script/package.nix
index aecd1ac4f873..43f4bcbe9255 100644
--- a/pkgs/by-name/ru/rust-script/package.nix
+++ b/pkgs/by-name/ru/rust-script/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fornwall";
     repo = "rust-script";
-    rev = version;
+    tag = version;
     sha256 = "sha256-uKmQgrbsFIY0XwrO16Urz3L76Gm2SxHW/CpHeCIUinM=";
   };
 
diff --git a/pkgs/by-name/ru/rust-synapse-compress-state/package.nix b/pkgs/by-name/ru/rust-synapse-compress-state/package.nix
index 1503d2522772..fadcafec3ffe 100644
--- a/pkgs/by-name/ru/rust-synapse-compress-state/package.nix
+++ b/pkgs/by-name/ru/rust-synapse-compress-state/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "rust-synapse-compress-state";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nNQ/d4FFAvI+UY+XeqExyhngq+k+j5Pkz94ch27aoVM=";
   };
 
diff --git a/pkgs/by-name/ru/rust-traverse/package.nix b/pkgs/by-name/ru/rust-traverse/package.nix
index a5d80ba81433..855781b002cc 100644
--- a/pkgs/by-name/ru/rust-traverse/package.nix
+++ b/pkgs/by-name/ru/rust-traverse/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dmcg310";
     repo = "Rust-Traverse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OcCWmBNDo4AA5Pk5TQqb8hen9LlHaY09Wrm4BkrU7qA=";
   };
 
diff --git a/pkgs/by-name/ru/rustc-demangle/package.nix b/pkgs/by-name/ru/rustc-demangle/package.nix
index edb6be2d7321..1def0d5588b4 100644
--- a/pkgs/by-name/ru/rustc-demangle/package.nix
+++ b/pkgs/by-name/ru/rustc-demangle/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alexcrichton";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-elxclyuLmr3N66s+pR4/6OU98k1oXI2wKVJtzWPY8FI=";
   };
 
diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 643945b4e574..383718e9f5f8 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -37,7 +37,7 @@ let
     src = fetchFromGitHub {
       owner = "fzyzcjy";
       repo = "flutter_rust_bridge";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-SbwqWapJbt6+RoqRKi+wkSH1D+Wz7JmnVbfcfKkjt8Q=";
     };
 
diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix
index 9f15d8a80ba0..030e50831537 100644
--- a/pkgs/by-name/ru/rustdesk-server/package.nix
+++ b/pkgs/by-name/ru/rustdesk-server/package.nix
@@ -19,7 +19,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/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix
index 96cbda420d44..fcb175727ab9 100644
--- a/pkgs/by-name/ru/rusti-cal/package.nix
+++ b/pkgs/by-name/ru/rusti-cal/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "arthurhenrique";
     repo = "rusti-cal";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pdsP2nuJh30BzqIyxSQXak/rceA4hI9jBYy1dDVEIvI=";
   };
 
diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix
index 5c3f1549df0c..565aa495baed 100644
--- a/pkgs/by-name/ru/rustlings/package.nix
+++ b/pkgs/by-name/ru/rustlings/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rustlings";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VdIIcpyoCuid3MECVc9aKeIOUlxGlxcG7znqbqo9pjc=";
   };
 
diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix
index a87e24b16802..c282540bf12f 100644
--- a/pkgs/by-name/ru/rustmission/package.nix
+++ b/pkgs/by-name/ru/rustmission/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "intuis";
     repo = "rustmission";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vQ6MBbzmOBgD1kcF62NmQys737QEN9isvFN7L7mP8mk=";
   };
 
diff --git a/pkgs/by-name/ru/rustypaste-cli/package.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix
index a19879a1d41c..d841bf35d959 100644
--- a/pkgs/by-name/ru/rustypaste-cli/package.nix
+++ b/pkgs/by-name/ru/rustypaste-cli/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "rustypaste-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ziIY/dz/2nwv0S6gUbVsrTXTNkGLh9MRNXnhhVOnCvA=";
   };
 
diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix
index 9548360b2f22..13e23fd806e8 100644
--- a/pkgs/by-name/ru/rustypaste/package.nix
+++ b/pkgs/by-name/ru/rustypaste/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "rustypaste";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Jfi2Q6551g58dfOqtHtWxkbxwYV71f7MIuLB8RbaR94=";
   };
 
diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix
index b0b5bbf2b2e9..5d16735e98a2 100644
--- a/pkgs/by-name/ru/rustywind/package.nix
+++ b/pkgs/by-name/ru/rustywind/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "avencera";
     repo = "rustywind";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3cLpyY2Ec3XUDUoq4QLyDx8Nr85TOevBkfoReguVGII=";
   };
 
diff --git a/pkgs/by-name/rv/rvvm/package.nix b/pkgs/by-name/rv/rvvm/package.nix
index 2625cd3f5e5a..c5584b9cf22b 100644
--- a/pkgs/by-name/rv/rvvm/package.nix
+++ b/pkgs/by-name/rv/rvvm/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LekKit";
     repo = "RVVM";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5nSlKyWDAx0EeKFzzwP5+99XuJz9BHXEF1WNkRMLa9U=";
   };
 
diff --git a/pkgs/by-name/rv/rvz/package.nix b/pkgs/by-name/rv/rvz/package.nix
index dc66ff233df4..9da4bf8393be 100644
--- a/pkgs/by-name/rv/rvz/package.nix
+++ b/pkgs/by-name/rv/rvz/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bodgit";
     repo = "rvz";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OxU+Pm9OfFuwmmc2+b7eLhN8JR3SB8cjvh9lPS0qJ5Y=";
   };
 
diff --git a/pkgs/by-name/rw/rwc/package.nix b/pkgs/by-name/rw/rwc/package.nix
index caf6b4401fa5..55d6effa5e62 100644
--- a/pkgs/by-name/rw/rwc/package.nix
+++ b/pkgs/by-name/rw/rwc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "rwc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rB20XKprd8jPwvXYdjIEr3/8ygPGCDAgLKbHfw0EgPk=";
   };
 
diff --git a/pkgs/by-name/rw/rwedid/package.nix b/pkgs/by-name/rw/rwedid/package.nix
index bc7dc2c04846..8cafed081ee5 100644
--- a/pkgs/by-name/rw/rwedid/package.nix
+++ b/pkgs/by-name/rw/rwedid/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "ral";
     repo = "rwedid";
-    rev = version;
+    tag = version;
     hash = "sha256-lbZD/QLCgkD5OQZdn6oCjry9edMcJ+q9qGF7IbY36U4=";
   };
 
diff --git a/pkgs/by-name/rw/rwpspread/package.nix b/pkgs/by-name/rw/rwpspread/package.nix
index 7973c1344761..2f0dd3c06bc4 100644
--- a/pkgs/by-name/rw/rwpspread/package.nix
+++ b/pkgs/by-name/rw/rwpspread/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "0xk1f0";
     repo = "rwpspread";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1i1675OiyleCXcc/uN95kyY7m5ht/rS3UKY7EmuSsrk=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/rx/rx/package.nix b/pkgs/by-name/rx/rx/package.nix
index 5a6ee0cbf2c9..d91c39c2527d 100644
--- a/pkgs/by-name/rx/rx/package.nix
+++ b/pkgs/by-name/rx/rx/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cloudhead";
     repo = "rx";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM=";
   };
 
diff --git a/pkgs/by-name/ry/ryokucha/package.nix b/pkgs/by-name/ry/ryokucha/package.nix
index 35ab71b0111b..389612c25c9f 100644
--- a/pkgs/by-name/ry/ryokucha/package.nix
+++ b/pkgs/by-name/ry/ryokucha/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ryonakano";
     repo = "ryokucha";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-bmN8ZiFjUXtWMrZz7BJtO/9TMjcc4d3x8EpFvhvsewY=";
   };
 
diff --git a/pkgs/by-name/ry/ryzenadj/package.nix b/pkgs/by-name/ry/ryzenadj/package.nix
index 3f6a9206a24a..c95d1c221f05 100644
--- a/pkgs/by-name/ry/ryzenadj/package.nix
+++ b/pkgs/by-name/ry/ryzenadj/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FlyGoat";
     repo = "RyzenAdj";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VuIrA5UrRqwUta/mrYd+6F4gh/Z65+zzoTXUlRA8wzA=";
   };
 
diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix
index 4c4a56d5558a..96a567acd198 100644
--- a/pkgs/by-name/s2/s2n-tls/package.nix
+++ b/pkgs/by-name/s2/s2n-tls/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "s2n-tls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3eh4+y3XyO2sUfPhkOeF5fKgakFz9f4zLceYqklEYBw=";
   };
 
diff --git a/pkgs/by-name/s2/s2png/package.nix b/pkgs/by-name/s2/s2png/package.nix
index e3b5c6cad0ef..c299b09eab9e 100644
--- a/pkgs/by-name/s2/s2png/package.nix
+++ b/pkgs/by-name/s2/s2png/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dbohdan";
     repo = "s2png";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6";
   };
 
diff --git a/pkgs/by-name/s3/s3backer/package.nix b/pkgs/by-name/s3/s3backer/package.nix
index 51945c40b108..fe15160848a4 100644
--- a/pkgs/by-name/s3/s3backer/package.nix
+++ b/pkgs/by-name/s3/s3backer/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "sha256-BttU5wdnifhsFPdNX3yb/l12biskzED72v0Qfxi7FWU=";
-    rev = version;
+    tag = version;
     repo = "s3backer";
     owner = "archiecobbs";
   };
diff --git a/pkgs/by-name/s3/s3scanner/package.nix b/pkgs/by-name/s3/s3scanner/package.nix
index 96ab22cdfd80..b6c071f8bd8e 100644
--- a/pkgs/by-name/s3/s3scanner/package.nix
+++ b/pkgs/by-name/s3/s3scanner/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sa7mon";
     repo = "s3scanner";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RS/+m/snJIm8OxCgvh/Bn1u9ghvRgS8tYvy1v1DV02I=";
   };
 
diff --git a/pkgs/by-name/s5/s5/package.nix b/pkgs/by-name/s5/s5/package.nix
index 0a5debe0e087..70115685f561 100644
--- a/pkgs/by-name/s5/s5/package.nix
+++ b/pkgs/by-name/s5/s5/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mvisonneau";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QQMnzDRWdW0awwNx2vqtzrOW9Ua7EmJ9YFznQoK33J0=";
   };
 
diff --git a/pkgs/by-name/s5/s5cmd/package.nix b/pkgs/by-name/s5/s5cmd/package.nix
index c89e914ab8b5..f7edfe294408 100644
--- a/pkgs/by-name/s5/s5cmd/package.nix
+++ b/pkgs/by-name/s5/s5cmd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "peak";
     repo = "s5cmd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+wSVJkXmu+1BzvO1o31jhKZLXeG7y+YkABIZZ1TlK/g=";
   };
 
diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix
index 5de0077b4a7b..17ad2446cfe7 100644
--- a/pkgs/by-name/sa/sabnzbd/package.nix
+++ b/pkgs/by-name/sa/sabnzbd/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sabnzbd";
     repo = "sabnzbd";
-    rev = version;
+    tag = version;
     hash = "sha256-7CR2hn+mXd6eKoFjrapZuB+Fpfi1UWzTQK5DnP2303k=";
   };
 
diff --git a/pkgs/by-name/sa/sacd/package.nix b/pkgs/by-name/sa/sacd/package.nix
index 65d04693b08e..d0fc57ce816e 100644
--- a/pkgs/by-name/sa/sacd/package.nix
+++ b/pkgs/by-name/sa/sacd/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Sound-Linux-More";
     repo = "sacd";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "03s7jr75pzqj1xd41rkgbszlgf9zx6vzhd0nizc05wyf0fxq5xif";
   };
 
diff --git a/pkgs/by-name/sa/safe/package.nix b/pkgs/by-name/sa/safe/package.nix
index 70bade379cd7..2eba6d268e23 100644
--- a/pkgs/by-name/sa/safe/package.nix
+++ b/pkgs/by-name/sa/safe/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "starkandwayne";
     repo = "safe";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sg0RyZ5HpYu7M11bNy17Sjxm7C3pkQX3I17edbALuvU=";
   };
 
diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix
index 31756bdf7d66..d28facc92d60 100644
--- a/pkgs/by-name/sa/safecloset/package.nix
+++ b/pkgs/by-name/sa/safecloset/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "safecloset";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-buIceYP/dZMDw3tyrzj1bY6+sIIPaVJIVj1L//jZnws=";
   };
 
diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
index 5cab886dbc58..21be0a82d0ae 100644
--- a/pkgs/by-name/sa/sage/sage-src.nix
+++ b/pkgs/by-name/sa/sage/sage-src.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
-    rev = version;
+    tag = version;
     hash = "sha256-ZDYFq2lJXjnADFdX6y7sskaF0rkT5EIcdN8/bs00TlQ=";
   };
 
diff --git a/pkgs/by-name/sa/sage/threejs-sage.nix b/pkgs/by-name/sa/sage/threejs-sage.nix
index bc7230f333ab..986303e00fd8 100644
--- a/pkgs/by-name/sa/sage/threejs-sage.nix
+++ b/pkgs/by-name/sa/sage/threejs-sage.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "threejs-sage";
-    rev = version;
+    tag = version;
     sha256 = "sha256-xPAPt36Fon3hYQq6SOmGkIyUzAII2LMl10nqYG4UPI0=";
   };
 
diff --git a/pkgs/by-name/sa/sagetex/package.nix b/pkgs/by-name/sa/sagetex/package.nix
index ed31393e365e..79a2d83c420d 100644
--- a/pkgs/by-name/sa/sagetex/package.nix
+++ b/pkgs/by-name/sa/sagetex/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sagetex";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OfhbXHbGI+DaDHqZCOGiSHJPHjGuT7ZqSEjKweloW38=";
   };
 
diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix
index e7bfd4246292..64149cad704b 100644
--- a/pkgs/by-name/sa/sagoin/package.nix
+++ b/pkgs/by-name/sa/sagoin/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "figsoda";
     repo = "sagoin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zXYjR9ZFNX2guUSeMN/G77oBIlW3AowFWA4gwID2jQs=";
   };
 
diff --git a/pkgs/by-name/sa/sahel-fonts/package.nix b/pkgs/by-name/sa/sahel-fonts/package.nix
index 30d09d2fa36f..b2fce908b2e5 100644
--- a/pkgs/by-name/sa/sahel-fonts/package.nix
+++ b/pkgs/by-name/sa/sahel-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "sahel-font";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-U4tIICXZFK9pk7zdzRwBPIPYFUlYXPSebnItUJUgGJY=";
   };
 
diff --git a/pkgs/by-name/sa/sailsd/package.nix b/pkgs/by-name/sa/sailsd/package.nix
index 62e2da16fe4c..822011a4275d 100644
--- a/pkgs/by-name/sa/sailsd/package.nix
+++ b/pkgs/by-name/sa/sailsd/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sails-simulator";
     repo = "sailsd";
-    rev = version;
+    tag = version;
     sha256 = "1s4nlffp683binbdxwwzbsci61kbjylbcr1jf44sv1h1r5d5js05";
   };
 
diff --git a/pkgs/by-name/sa/saldl/package.nix b/pkgs/by-name/sa/saldl/package.nix
index 530cba04b078..da519bf29b8d 100644
--- a/pkgs/by-name/sa/saldl/package.nix
+++ b/pkgs/by-name/sa/saldl/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PAX2MUyBWWU8kGkaeoCJteidgszh7ipwDJbrLXzVsn0=";
   };
 
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/sa/sameboy/package.nix b/pkgs/by-name/sa/sameboy/package.nix
index a2eb80b3c075..9e9d4368fc2d 100644
--- a/pkgs/by-name/sa/sameboy/package.nix
+++ b/pkgs/by-name/sa/sameboy/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LIJI32";
     repo = "SameBoy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KUvhmORI3hIJFMCW8U2BZYnIwzg7h+GZZA4+U0IPS9E=";
   };
 
diff --git a/pkgs/by-name/sa/samim-fonts/package.nix b/pkgs/by-name/sa/samim-fonts/package.nix
index b5df4039595f..63310a7a0f39 100644
--- a/pkgs/by-name/sa/samim-fonts/package.nix
+++ b/pkgs/by-name/sa/samim-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "samim-font";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DVBMsNOVAVwzlZ3cDus/3CSsC05bLZalQ2KeueEvwXs=";
   };
 
diff --git a/pkgs/by-name/sa/sampler/package.nix b/pkgs/by-name/sa/sampler/package.nix
index ec2e35728b1c..11c0f7317072 100644
--- a/pkgs/by-name/sa/sampler/package.nix
+++ b/pkgs/by-name/sa/sampler/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sqshq";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-H7QllAqPp35wHeJ405YSfPX3S4lH0/hdQ8Ja2OGLVtE=";
   };
 
diff --git a/pkgs/by-name/sa/samplicator/package.nix b/pkgs/by-name/sa/samplicator/package.nix
index 92d0c1cd362a..89ec80beb2cb 100644
--- a/pkgs/by-name/sa/samplicator/package.nix
+++ b/pkgs/by-name/sa/samplicator/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sleinen";
     repo = "samplicator";
-    rev = version;
+    tag = version;
     sha256 = "0fv5vldmwd6qrdv2wkk946dk9rn9nrv3c84ldvvqqn1spxfzgirm";
   };
 
diff --git a/pkgs/by-name/sa/samurai/package.nix b/pkgs/by-name/sa/samurai/package.nix
index 7f0e9f3c18c7..4f37087db20e 100644
--- a/pkgs/by-name/sa/samurai/package.nix
+++ b/pkgs/by-name/sa/samurai/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaelforney";
     repo = "samurai";
-    rev = version;
+    tag = version;
     hash = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI=";
   };
 
diff --git a/pkgs/by-name/sa/sane-airscan/package.nix b/pkgs/by-name/sa/sane-airscan/package.nix
index 69738bf67f6b..dc506680a86a 100644
--- a/pkgs/by-name/sa/sane-airscan/package.nix
+++ b/pkgs/by-name/sa/sane-airscan/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexpevzner";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-qZ7j76cwJQxGXbgIkV2bYt7puG0lSEw/d6d3fw19TCk=";
   };
 
diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix
index 71d96226cf07..007a6dacff8c 100644
--- a/pkgs/by-name/sa/sanjuuni/package.nix
+++ b/pkgs/by-name/sa/sanjuuni/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MCJack123";
     repo = "sanjuuni";
-    rev = version;
+    tag = version;
     hash = "sha256-wJRPD4OWOTPiyDr9dYseRA7BI942HPfHONVJGTc/+wU=";
   };
 
diff --git a/pkgs/by-name/sa/sanoid/package.nix b/pkgs/by-name/sa/sanoid/package.nix
index 29c602ef3b39..b80423c1770f 100644
--- a/pkgs/by-name/sa/sanoid/package.nix
+++ b/pkgs/by-name/sa/sanoid/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jimsalterjrs";
     repo = "sanoid";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qfRGZ10fhLL4tJL97VHrdOkO/4OVpa087AsL9t8LMmk=";
   };
 
diff --git a/pkgs/by-name/sa/sassc/package.nix b/pkgs/by-name/sa/sassc/package.nix
index c719bf0efd9a..9b3d9d18c654 100644
--- a/pkgs/by-name/sa/sassc/package.nix
+++ b/pkgs/by-name/sa/sassc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sass";
     repo = "sassc";
-    rev = version;
+    tag = version;
     sha256 = "sha256-jcs3+orRqKt9C3c2FTdeaj4H2rBP74lW3HF8CHSm7lQ=";
   };
 
diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix
index 3610ca575654..899604a9ea7c 100644
--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gabm";
     repo = "Satty";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-81WX9GAZ0mPai1/4FrqDGDu6k4OVYrKSJSC/FkPkZmE=";
   };
 
diff --git a/pkgs/by-name/sa/savepagenow/package.nix b/pkgs/by-name/sa/savepagenow/package.nix
index 3e1dfc256bc9..8f7d33f2730c 100644
--- a/pkgs/by-name/sa/savepagenow/package.nix
+++ b/pkgs/by-name/sa/savepagenow/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pastpages";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1lz6rc47cds9rb35jdf8n13gr61wdkh5jqzx4skikm1yrqkwjyhm";
   };
 
diff --git a/pkgs/by-name/sb/sblast/package.nix b/pkgs/by-name/sb/sblast/package.nix
index fa0aa0178359..efabf8fbe156 100644
--- a/pkgs/by-name/sb/sblast/package.nix
+++ b/pkgs/by-name/sb/sblast/package.nix
@@ -16,7 +16,7 @@ let
     src = fetchFromGitHub {
       owner = "ugjka";
       repo = "sblast";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-ICSnLfzBoaax3YKa4LiTBQ4zxgDxttxcN4YVLApFH24=";
     };
 
diff --git a/pkgs/by-name/sb/sbs/package.nix b/pkgs/by-name/sb/sbs/package.nix
index 5e2b33cb6a78..8ce3a42a5dc9 100644
--- a/pkgs/by-name/sb/sbs/package.nix
+++ b/pkgs/by-name/sb/sbs/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "onur-ozkan";
     repo = "sbs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Zgu9W/3LwHF/fyaPlxmV/2LdxilO1tU0JY/esLnJVGY=";
   };
 
diff --git a/pkgs/by-name/sc/sc-im/package.nix b/pkgs/by-name/sc/sc-im/package.nix
index 43bd526db987..6b1932e07db6 100644
--- a/pkgs/by-name/sc/sc-im/package.nix
+++ b/pkgs/by-name/sc/sc-im/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andmarti1424";
     repo = "sc-im";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-nNOifSYbmJjuw6c8TerIQRlhCwbs7GnzD2J7O3vs0gI=";
   };
 
diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix
index 1cf763df8793..d70418df708d 100644
--- a/pkgs/by-name/sc/scaleway-cli/package.nix
+++ b/pkgs/by-name/sc/scaleway-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "scaleway";
     repo = "scaleway-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3yte4gNl8uBSHfDp11HH+l3trN+d5YcEYajpruyOrKc=";
   };
 
diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix
index 8300ad167c36..dc6377d7e55e 100644
--- a/pkgs/by-name/sc/scalingo/package.nix
+++ b/pkgs/by-name/sc/scalingo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "cli";
-    rev = version;
+    tag = version;
     hash = "sha256-SJFQFOd9m+38TsclIs4FxAl9kejgcUG895qjy4iXKdk=";
   };
 
diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix
index 4eaef65d6cb9..3a12188e2b79 100644
--- a/pkgs/by-name/sc/scalr-cli/package.nix
+++ b/pkgs/by-name/sc/scalr-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Scalr";
     repo = "scalr-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mDcirYhqpfeS2Wt9MnYPmTn/QZa85vlrN2uUkA1+7A4=";
   };
 
diff --git a/pkgs/by-name/sc/scanmem/package.nix b/pkgs/by-name/sc/scanmem/package.nix
index 42f665e2093a..2c1d36c35764 100644
--- a/pkgs/by-name/sc/scanmem/package.nix
+++ b/pkgs/by-name/sc/scanmem/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scanmem";
     repo = "scanmem";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9";
   };
 
diff --git a/pkgs/by-name/sc/scanservjs/package.nix b/pkgs/by-name/sc/scanservjs/package.nix
index 5b80e075398d..231125cda374 100644
--- a/pkgs/by-name/sc/scanservjs/package.nix
+++ b/pkgs/by-name/sc/scanservjs/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "sbs20";
     repo = "scanservjs";
-    # rev = "v${version}";
+    # tag = "v${version}";
     # 2.27.1 doesn't have a tag
     rev = "b15adc6f97fb152fd9819371bb1a9b8118baf55b";
     hash = "sha256-ne9fEF/eurWPXzmJQzBn5jiy+JgxMWiCXsOdmu2fj6E=";
diff --git a/pkgs/by-name/sc/scaphandre/package.nix b/pkgs/by-name/sc/scaphandre/package.nix
index 083c1494d914..5863422d2f69 100644
--- a/pkgs/by-name/sc/scaphandre/package.nix
+++ b/pkgs/by-name/sc/scaphandre/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hubblo-org";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-I+cECdpLoIj4yuWXfirwHlcn0Hkm9NxPqo/EqFiBObw=";
   };
 
diff --git a/pkgs/by-name/sc/scc/package.nix b/pkgs/by-name/sc/scc/package.nix
index 2dedc510192b..90252d2034fa 100644
--- a/pkgs/by-name/sc/scc/package.nix
+++ b/pkgs/by-name/sc/scc/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "boyter";
     repo = "scc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ec3k6NL3zTYvcJo0bR/BqdTu5br4vRZpgrBR6Kj5YxY=";
   };
 
diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix
index f5e89c173587..60e15d128da7 100644
--- a/pkgs/by-name/sc/sccache/package.nix
+++ b/pkgs/by-name/sc/sccache/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "sccache";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VEDMeRFQKNPS3V6/DhMWxHR7YWsCzAXTzp0lO+COl08=";
   };
 
diff --git a/pkgs/by-name/sc/sccmhunter/package.nix b/pkgs/by-name/sc/sccmhunter/package.nix
index b47540c07f19..15f7df41b87d 100644
--- a/pkgs/by-name/sc/sccmhunter/package.nix
+++ b/pkgs/by-name/sc/sccmhunter/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "garrettfoster13";
     repo = "sccmhunter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Db+kBLy2ejIKKjCskAE4arppk/sq9qQ3w1nCQmeLYhs=";
   };
 
diff --git a/pkgs/by-name/sc/scenebuilder/package.nix b/pkgs/by-name/sc/scenebuilder/package.nix
index 3dd1354f8c9f..4e3adf818c22 100644
--- a/pkgs/by-name/sc/scenebuilder/package.nix
+++ b/pkgs/by-name/sc/scenebuilder/package.nix
@@ -22,7 +22,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "gluonhq";
     repo = "scenebuilder";
-    rev = version;
+    tag = version;
     hash = "sha256-YEcW1yQK6RKDqSstsrpdOqMt972ZagenGDxcJ/gP+SA=";
   };
 
diff --git a/pkgs/by-name/sc/scenic-view/package.nix b/pkgs/by-name/sc/scenic-view/package.nix
index 1f0b215fcf93..67854ac65d3c 100644
--- a/pkgs/by-name/sc/scenic-view/package.nix
+++ b/pkgs/by-name/sc/scenic-view/package.nix
@@ -22,7 +22,7 @@ let
   src = fetchFromGitHub {
     owner = "JonathanGiles";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1idfh9hxqs4fchr6gvhblhvjqk4mpl4rnpi84vn1l3yb700z7dwy";
   };
 
diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix
index 7705bd0d0746..e1a2f8df41b9 100644
--- a/pkgs/by-name/sc/schemamap/package.nix
+++ b/pkgs/by-name/sc/schemamap/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "schemamap";
     repo = "schemamap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YR7Ucd8/Z1hOUNokmfSVP2ZxDL7qLb6SZ86/S7V/GKk=";
   };
 
diff --git a/pkgs/by-name/sc/scheme-bytestructures/package.nix b/pkgs/by-name/sc/scheme-bytestructures/package.nix
index a1d670b79fb2..7cda0a4a58aa 100644
--- a/pkgs/by-name/sc/scheme-bytestructures/package.nix
+++ b/pkgs/by-name/sc/scheme-bytestructures/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TaylanUB";
     repo = "scheme-bytestructures";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7FK1dXD1Qz6fFYjNUtHMaDGaezHLVaDvdgOboNNw0Lc=";
   };
 
diff --git a/pkgs/by-name/sc/scid/package.nix b/pkgs/by-name/sc/scid/package.nix
index ed1d0049b5d3..8883b1e8bec6 100644
--- a/pkgs/by-name/sc/scid/package.nix
+++ b/pkgs/by-name/sc/scid/package.nix
@@ -16,7 +16,7 @@ tcl.mkTclDerivation rec {
   src = fetchFromGitHub {
     owner = "benini";
     repo = "scid";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5WGZm7EwhZAMKJKxj/OOIFOJIgPBcc6/Bh4xVAlia4Y=";
   };
 
diff --git a/pkgs/by-name/sc/scion-bootstrapper/package.nix b/pkgs/by-name/sc/scion-bootstrapper/package.nix
index 20e4817ac574..d6efa5fcc825 100644
--- a/pkgs/by-name/sc/scion-bootstrapper/package.nix
+++ b/pkgs/by-name/sc/scion-bootstrapper/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "netsec-ethz";
     repo = "bootstrapper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-X4lNgd6klIw0NW9NVG+d1JK+WNfOclbu43GYucelB7o=";
   };
 
diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix
index e06936b59c1c..672b865986d6 100644
--- a/pkgs/by-name/sc/scion/package.nix
+++ b/pkgs/by-name/sc/scion/package.nix
@@ -16,7 +16,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "scionproto";
     repo = "scion";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JemqSr1XBwW1hLuWQrApY/hqLj/VpW3xSJedVIoFSiY=";
   };
 
diff --git a/pkgs/by-name/sc/scip-go/package.nix b/pkgs/by-name/sc/scip-go/package.nix
index 4b6403ba52b9..f7529b350e96 100644
--- a/pkgs/by-name/sc/scip-go/package.nix
+++ b/pkgs/by-name/sc/scip-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/3+vTz/W1mmI2zlVQLW4wPd66zK7HpFb8VaLFuUPRhk=";
   };
 
diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix
index 1ddfc127de6d..81df3c59e3e8 100644
--- a/pkgs/by-name/sc/scip/package.nix
+++ b/pkgs/by-name/sc/scip/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UXa5lMFenynHRIvA4MOXkjMVd705LBWs372s3MFAc+8=";
   };
 
diff --git a/pkgs/by-name/sc/scmpuff/package.nix b/pkgs/by-name/sc/scmpuff/package.nix
index dabc7226af31..bff3301e65fc 100644
--- a/pkgs/by-name/sc/scmpuff/package.nix
+++ b/pkgs/by-name/sc/scmpuff/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mroth";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+L0W+M8sZdUSCWj9Ftft1gkRRfWMHdxon2xNnotx8Xs=";
   };
 
diff --git a/pkgs/by-name/sc/scons/package.nix b/pkgs/by-name/sc/scons/package.nix
index 3f5c39877a11..2ffa3360dc69 100644
--- a/pkgs/by-name/sc/scons/package.nix
+++ b/pkgs/by-name/sc/scons/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Scons";
     repo = "scons";
-    rev = version;
+    tag = version;
     hash = "sha256-7VzGuz9CAUF6MRCEpj5z1FkZD19/Ic+YBukYQocvkr0=";
   };
 
diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix
index 073b1ad207d5..d2be14497bfb 100644
--- a/pkgs/by-name/sc/scooter/package.nix
+++ b/pkgs/by-name/sc/scooter/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "thomasschafer";
     repo = "scooter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wu9SNcd1+JqTkhUghOiRlGP/za/9Md/lgGrwNA2lCJE=";
   };
 
diff --git a/pkgs/by-name/sc/scope-lite/package.nix b/pkgs/by-name/sc/scope-lite/package.nix
index 130c5704ecab..171bd26e8dc4 100644
--- a/pkgs/by-name/sc/scope-lite/package.nix
+++ b/pkgs/by-name/sc/scope-lite/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "martinmoene";
     repo = "scope-lite";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/Vu3blgyEOQRFqhQjuT/6ukV0iWA0TdPrLnt2Z/gd6E=";
   };
 
diff --git a/pkgs/by-name/sc/scout/package.nix b/pkgs/by-name/sc/scout/package.nix
index e0935322b274..117fcc727cd8 100644
--- a/pkgs/by-name/sc/scout/package.nix
+++ b/pkgs/by-name/sc/scout/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9SimePyBUXXfT4+ZtciQMaoyXpyKi9D3LTwud8QMJ6w=";
   };
 
diff --git a/pkgs/by-name/sc/scream/package.nix b/pkgs/by-name/sc/scream/package.nix
index acb863fe0fa3..e845696e4e63 100644
--- a/pkgs/by-name/sc/scream/package.nix
+++ b/pkgs/by-name/sc/scream/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "duncanthrax";
     repo = "scream";
-    rev = version;
+    tag = version;
     sha256 = "sha256-lP5mdNhZjkEVjgQUEsisPy+KXUqsE6xj6dFWcgD+VGM=";
   };
 
diff --git a/pkgs/by-name/sc/screego/package.nix b/pkgs/by-name/sc/screego/package.nix
index 3eaff20baebe..e9d2260cf774 100644
--- a/pkgs/by-name/sc/screego/package.nix
+++ b/pkgs/by-name/sc/screego/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "screego";
     repo = "server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wFLoReqzLx6PEW/u9oz7VIYKtJkmwGTneeB6Ysgse7Q=";
   };
 
diff --git a/pkgs/by-name/sc/screen-message/package.nix b/pkgs/by-name/sc/screen-message/package.nix
index 2d5eb30aecae..6d392ce2cb00 100644
--- a/pkgs/by-name/sc/screen-message/package.nix
+++ b/pkgs/by-name/sc/screen-message/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nomeata";
     repo = "screen-message";
-    rev = version;
+    tag = version;
     hash = "sha256-fwKle+aXZuiNo5ksrigj7BGLv2fUILN2GluHHZ6co6s=";
   };
 
diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix
index 141eca8d82c7..2cdd2627c632 100644
--- a/pkgs/by-name/sc/screen-pipe/package.nix
+++ b/pkgs/by-name/sc/screen-pipe/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "louis030195";
     repo = "screen-pipe";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rWKRCqWFuPO84C52mMrrS4euD6XdJU8kqZsAz28+vWE=";
   };
 
diff --git a/pkgs/by-name/sc/screenfetch/package.nix b/pkgs/by-name/sc/screenfetch/package.nix
index 12185ee31bd1..a15470295bce 100644
--- a/pkgs/by-name/sc/screenfetch/package.nix
+++ b/pkgs/by-name/sc/screenfetch/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KittyKatt";
     repo = "screenFetch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UNZMCLXhH4wDV0/fGWsB+KAi6aJVuPs6zpWXIQAqnjo=";
   };
 
diff --git a/pkgs/by-name/sc/screenkey/package.nix b/pkgs/by-name/sc/screenkey/package.nix
index 5a7a5698c161..193ddd66aba0 100644
--- a/pkgs/by-name/sc/screenkey/package.nix
+++ b/pkgs/by-name/sc/screenkey/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kWktKzRyWHGd1lmdKhPwrJoSzAIN2E5TKyg30uhM4Ug=";
   };
 
diff --git a/pkgs/by-name/sc/script-directory/package.nix b/pkgs/by-name/sc/script-directory/package.nix
index 5d9bbca76acc..780262ae24d5 100644
--- a/pkgs/by-name/sc/script-directory/package.nix
+++ b/pkgs/by-name/sc/script-directory/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ianthehenry";
     repo = "sd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-X5RWCJQUqDnG2umcCk5KS6HQinTJVapBHp6szEmbc4U=";
   };
 
diff --git a/pkgs/by-name/sc/scripthaus/package.nix b/pkgs/by-name/sc/scripthaus/package.nix
index fd70bab54a16..b8929e32f925 100644
--- a/pkgs/by-name/sc/scripthaus/package.nix
+++ b/pkgs/by-name/sc/scripthaus/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "scripthaus-dev";
     repo = "scripthaus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZWOSLkqjauONa+fKkagpUgWB4k+l1mzEEiC0RAMUmo0=";
   };
 
diff --git a/pkgs/by-name/sc/scriptisto/package.nix b/pkgs/by-name/sc/scriptisto/package.nix
index f594153fd2d8..e7d3a21a95ce 100644
--- a/pkgs/by-name/sc/scriptisto/package.nix
+++ b/pkgs/by-name/sc/scriptisto/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "igor-petruk";
     repo = "scriptisto";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iaDdOFmi4kfcJSjXOcGAFG9i1SdB+K5Qz4+NDaVQALY=";
   };
 
diff --git a/pkgs/by-name/sc/scrot/package.nix b/pkgs/by-name/sc/scrot/package.nix
index 236899adab11..6e84d1fdbd71 100644
--- a/pkgs/by-name/sc/scrot/package.nix
+++ b/pkgs/by-name/sc/scrot/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "resurrecting-open-source-projects";
     repo = "scrot";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ExZH+bjpEvdbSYM8OhV+cyn4j+0YrHp5/b+HsHKAHCA=";
   };
 
diff --git a/pkgs/by-name/sc/scrub/package.nix b/pkgs/by-name/sc/scrub/package.nix
index b65e9bfb65b4..e65b97e2cdf8 100644
--- a/pkgs/by-name/sc/scrub/package.nix
+++ b/pkgs/by-name/sc/scrub/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chaos";
     repo = "scrub";
-    rev = version;
+    tag = version;
     sha256 = "0ndcri2ddzqlsxvy1b607ajyd4dxpiagzx331yyi7hf3ijph129f";
   };
 
diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix
index 3a7274f7af72..39649fe62a01 100644
--- a/pkgs/by-name/sc/scryer-prolog/package.nix
+++ b/pkgs/by-name/sc/scryer-prolog/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mthom";
     repo = "scryer-prolog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU=";
   };
 
diff --git a/pkgs/by-name/sc/scudcloud/package.nix b/pkgs/by-name/sc/scudcloud/package.nix
index 36764bdb7ab4..c2ca382ac77b 100644
--- a/pkgs/by-name/sc/scudcloud/package.nix
+++ b/pkgs/by-name/sc/scudcloud/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "raelgc";
     repo = "scudcloud";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ffdy74igll74fwpmnn3brvcxbk4iianqscdzz18sx1pfqpw16cl";
   };
 
diff --git a/pkgs/by-name/sd/SDL2_sound/package.nix b/pkgs/by-name/sd/SDL2_sound/package.nix
index 9ec2ec4e3cff..f10a16e5ab16 100644
--- a/pkgs/by-name/sd/SDL2_sound/package.nix
+++ b/pkgs/by-name/sd/SDL2_sound/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "icculus";
     repo = "SDL_sound";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N2znqy58tMHgYa07vEsSedWLRhoJzDoINcsUu0UYLnA=";
   };
 
diff --git a/pkgs/by-name/sd/sd-local/package.nix b/pkgs/by-name/sd/sd-local/package.nix
index 374efe41885a..4a55c9586900 100644
--- a/pkgs/by-name/sd/sd-local/package.nix
+++ b/pkgs/by-name/sd/sd-local/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "screwdriver-cd";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CBEdE15lAMMawTsfc45ptHsC2AbqFP6v4/nnktytwvc=";
   };
 
diff --git a/pkgs/by-name/sd/sd/package.nix b/pkgs/by-name/sd/sd/package.nix
index 7549115f1ad0..495727101165 100644
--- a/pkgs/by-name/sd/sd/package.nix
+++ b/pkgs/by-name/sd/sd/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chmln";
     repo = "sd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hC4VKEgrAVuqOX7b24XhtrxrnJW5kmlX4E6QbY9H8OA=";
   };
 
diff --git a/pkgs/by-name/sd/sdate/package.nix b/pkgs/by-name/sd/sdate/package.nix
index dea6aa1ed3ee..6f16f0d47052 100644
--- a/pkgs/by-name/sd/sdate/package.nix
+++ b/pkgs/by-name/sd/sdate/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ChristophBerg";
     repo = "sdate";
-    rev = version;
+    tag = version;
     hash = "sha256-jkwe+bSBa0p1Xzfetsdpw0RYw/gSRxnY2jBOzC5HtJ8=";
   };
 
diff --git a/pkgs/by-name/sd/sdcv/package.nix b/pkgs/by-name/sd/sdcv/package.nix
index e1773891ed8d..83d1bd4d141e 100644
--- a/pkgs/by-name/sd/sdcv/package.nix
+++ b/pkgs/by-name/sd/sdcv/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Dushistov";
     repo = "sdcv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-EyvljVXhOsdxIYOGTzD+T16nvW7/RNx3DuQ2OdhjXJ4=";
   };
 
diff --git a/pkgs/by-name/sd/sdlpop/package.nix b/pkgs/by-name/sd/sdlpop/package.nix
index 42a29210c93e..62ca550d8b40 100644
--- a/pkgs/by-name/sd/sdlpop/package.nix
+++ b/pkgs/by-name/sd/sdlpop/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NagyD";
     repo = "SDLPoP";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UI7NfOC/+druRYL5g2AhIjTPEq4ta1qEThcxgyrFjHY=";
   };
 
diff --git a/pkgs/by-name/se/seabird/package.nix b/pkgs/by-name/se/seabird/package.nix
index 5c9ff436fe6c..0e07c9e0c885 100644
--- a/pkgs/by-name/se/seabird/package.nix
+++ b/pkgs/by-name/se/seabird/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "getseabird";
     repo = "seabird";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-y+QIBqU3kAxedhWLnu07m9HQOCgHfOvVscIxxWtUcZo=";
   };
 
diff --git a/pkgs/by-name/se/seafile-shared/package.nix b/pkgs/by-name/se/seafile-shared/package.nix
index 4e9f5c40d3f3..14fbca3dfb1b 100644
--- a/pkgs/by-name/se/seafile-shared/package.nix
+++ b/pkgs/by-name/se/seafile-shared/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-IpRCgPxYy1El4EEvVEfzAlbxP/osQUb7pCP3/BhkecU=";
   };
 
diff --git a/pkgs/by-name/se/seasocks/package.nix b/pkgs/by-name/se/seasocks/package.nix
index 34bb25e5704e..e7d022790241 100644
--- a/pkgs/by-name/se/seasocks/package.nix
+++ b/pkgs/by-name/se/seasocks/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mattgodbolt";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-R1McxZm2qsUoggFGfL587g+8eQf7si56xVkR8B8nehQ=";
   };
 
diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix
index e86774137597..0785befdeba0 100644
--- a/pkgs/by-name/se/seaweedfs/package.nix
+++ b/pkgs/by-name/se/seaweedfs/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "seaweedfs";
     repo = "seaweedfs";
-    rev = version;
+    tag = version;
     hash = "sha256-vW/+zvpx5UIAUwsPyad2Ib+wI3gtBbh23k03yCiGnH0=";
   };
 
diff --git a/pkgs/by-name/se/sec/package.nix b/pkgs/by-name/se/sec/package.nix
index 96c9192eacf6..edf96e58f029 100644
--- a/pkgs/by-name/se/sec/package.nix
+++ b/pkgs/by-name/se/sec/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simple-evcorr";
     repo = "sec";
-    rev = version;
+    tag = version;
     sha256 = "sha256-iK2v/qCWw4jdSEpx6cwSB98n5iFmbCyJH0lIpUG8pAU=";
   };
 
diff --git a/pkgs/by-name/se/see-cat/package.nix b/pkgs/by-name/se/see-cat/package.nix
index c9310bd5bb08..866b234c87d2 100644
--- a/pkgs/by-name/se/see-cat/package.nix
+++ b/pkgs/by-name/se/see-cat/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "guilhermeprokisch";
     repo = "see";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VCUrPCaG2fKp9vpFLzNLcfCBu2NiwdY2+bo1pd7anZY=";
   };
 
diff --git a/pkgs/by-name/se/seilfahrt/package.nix b/pkgs/by-name/se/seilfahrt/package.nix
index 380498612a8a..7cd3eb2e8630 100644
--- a/pkgs/by-name/se/seilfahrt/package.nix
+++ b/pkgs/by-name/se/seilfahrt/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Nerdbergev";
     repo = "seilfahrt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pn3EsYPhggViL067nk6UhmIULGsf8IYm/dXSDudiZRA=";
   };
 
diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix
index 31bf523f7900..b8dfc14305b2 100644
--- a/pkgs/by-name/se/selene/package.nix
+++ b/pkgs/by-name/se/selene/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kampfkarren";
     repo = "selene";
-    rev = version;
+    tag = version;
     sha256 = "sha256-QE9kXGQWg0pHtSI1bTppn5IE+53KoxqFED1VvwkumEI=";
   };
 
diff --git a/pkgs/by-name/se/sem/package.nix b/pkgs/by-name/se/sem/package.nix
index 0e75dfacea5b..d418ecc58bc3 100644
--- a/pkgs/by-name/se/sem/package.nix
+++ b/pkgs/by-name/se/sem/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "semaphoreci";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-w/QxN8ntfyoHKVLRIawN0SoUI2oTQg8gNzVUiXR7Klc=";
   };
 
diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix
index 17d014b2c562..20bcac1d5e0d 100644
--- a/pkgs/by-name/se/semantic-release/package.nix
+++ b/pkgs/by-name/se/semantic-release/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "semantic-release";
     repo = "semantic-release";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DoOnrgS6g4Qie1v7AVyaJgseG/z7rZX8FwXyvokOy0Y=";
   };
 
diff --git a/pkgs/by-name/se/semver-tool/package.nix b/pkgs/by-name/se/semver-tool/package.nix
index c86bd8f8736c..f7517a549482 100644
--- a/pkgs/by-name/se/semver-tool/package.nix
+++ b/pkgs/by-name/se/semver-tool/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fsaintjacques";
     repo = "semver-tool";
-    rev = version;
+    tag = version;
     sha256 = "sha256-BnHuiCxE0VjzMWFTEMunQ9mkebQKIKbbMxZVfBUO57Y=";
   };
 
diff --git a/pkgs/by-name/se/semver/package.nix b/pkgs/by-name/se/semver/package.nix
index a73fea385575..03bbeb1b6e1a 100644
--- a/pkgs/by-name/se/semver/package.nix
+++ b/pkgs/by-name/se/semver/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "catouc";
     repo = "semver-go";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0v3j7rw917wnmp4lyjscqzk4qf4azfiz70ynbq3wl4gwp1m783vv";
   };
 
diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index bc68f58f9745..de952bbf80d4 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "sendme";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OmP2FLvBupeJeGhMMBgcTpMSgQZ5JWzXBVeFZt7EU4Q=";
   };
 
diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index fdafea5a5403..4d2dbe0fa782 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-native";
-    rev = version;
+    tag = version;
     hash = "sha256-X5QA27y/7bJoGC1qDNhvbh5Cqm4StiZ9jkdsed+oVL4=";
   };
 
diff --git a/pkgs/by-name/se/senv/package.nix b/pkgs/by-name/se/senv/package.nix
index d7fd3e766918..fbcb94abeefb 100644
--- a/pkgs/by-name/se/senv/package.nix
+++ b/pkgs/by-name/se/senv/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SpectralOps";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TjlIX8FPNiPDQo41pIt04cki/orc+v30pV3o2bQQhAQ=";
   };
 
diff --git a/pkgs/by-name/se/seqkit/package.nix b/pkgs/by-name/se/seqkit/package.nix
index b7b8c5330085..6f0c555bd2fb 100644
--- a/pkgs/by-name/se/seqkit/package.nix
+++ b/pkgs/by-name/se/seqkit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shenwei356";
     repo = "seqkit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-W272ymy56aHRSOmi/0nCaU+AeaC0U/RyxzHOKR9meo4=";
   };
 
diff --git a/pkgs/by-name/se/seqtk/package.nix b/pkgs/by-name/se/seqtk/package.nix
index 5e223163500b..141d76689c1e 100644
--- a/pkgs/by-name/se/seqtk/package.nix
+++ b/pkgs/by-name/se/seqtk/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lh3";
     repo = "seqtk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W6IUn7R9tlnWrKe/qOHJL+43AL4EZB7zj7M5u9l83WE=";
   };
 
diff --git a/pkgs/by-name/se/sequeler/package.nix b/pkgs/by-name/se/sequeler/package.nix
index 8c17dbe2cda3..91286a9e9c49 100644
--- a/pkgs/by-name/se/sequeler/package.nix
+++ b/pkgs/by-name/se/sequeler/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Alecaddd";
     repo = "sequeler";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MsHHTYERe0v+u3KnVtx+jmJTKORJTJ7bNfJMZHV9Ly4=";
   };
 
diff --git a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
index ef90f7aa17df..0dde2dc2104e 100644
--- a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
+++ b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-chameleon-gnupg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-K9aeWrqJGPx2RymCXWNdNUTXXtO4NNm6Rd3jz+YxEi0=";
   };
 
diff --git a/pkgs/by-name/se/sequoia-sqv/package.nix b/pkgs/by-name/se/sequoia-sqv/package.nix
index 85a94c70ded2..dd979c9bd2e2 100644
--- a/pkgs/by-name/se/sequoia-sqv/package.nix
+++ b/pkgs/by-name/se/sequoia-sqv/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-sqv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xkvCEHVyRf1tQ/oo6Hg4Nri2WxdmH0fZFX24CPwJpZQ=";
   };
 
diff --git a/pkgs/by-name/se/sequoia-wot/package.nix b/pkgs/by-name/se/sequoia-wot/package.nix
index b9aaf9dc9a92..119a174397c3 100644
--- a/pkgs/by-name/se/sequoia-wot/package.nix
+++ b/pkgs/by-name/se/sequoia-wot/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-wot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Xbj1XLZQxyEYf/+R5e6EJMmL0C5ohfwZMZPVK5PwmUU=";
   };
 
diff --git a/pkgs/by-name/se/ser2net/package.nix b/pkgs/by-name/se/ser2net/package.nix
index 5f407c8689ff..ac6476a50845 100644
--- a/pkgs/by-name/se/ser2net/package.nix
+++ b/pkgs/by-name/se/ser2net/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cminyard";
     repo = "ser2net";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-acj9D23J5FvcCasBq5GrPgtsStJrzanTpbKINuy/sqI=";
   };
 
diff --git a/pkgs/by-name/se/serfdom/package.nix b/pkgs/by-name/se/serfdom/package.nix
index 274e79664648..2ce220a8db2c 100644
--- a/pkgs/by-name/se/serfdom/package.nix
+++ b/pkgs/by-name/se/serfdom/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "serf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8kMQu3UYGihlYW7rdh1IkvRR/FgFK/N+iay0y6qOOWE=";
   };
 
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/se/serialdv/package.nix b/pkgs/by-name/se/serialdv/package.nix
index 56f954feedb4..ccd9c3ee7dcb 100644
--- a/pkgs/by-name/se/serialdv/package.nix
+++ b/pkgs/by-name/se/serialdv/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "serialdv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-uswddoIpTXqsvjM2/ygdud9jZHTemLn9Dlv9FBXXKow=";
   };
 
diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 2b14244649ad..e2b388b8936a 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Uf7HYcN/lJc2TSl2dZQcOKyEeLHMb2RTQwSzXWZnBkw=";
   };
 
diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix
index 24cc7ae109c5..2f37a4a96a09 100644
--- a/pkgs/by-name/se/serpl/package.nix
+++ b/pkgs/by-name/se/serpl/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "yassinebridi";
     repo = "serpl";
-    rev = version;
+    tag = version;
     hash = "sha256-koD5aFqL+XVxc5Iq3reTYIHiPm0z7hAQ4K59IfbY4Hg=";
   };
 
diff --git a/pkgs/by-name/se/serve-d/package.nix b/pkgs/by-name/se/serve-d/package.nix
index b8ef204152b2..6fe68764785c 100644
--- a/pkgs/by-name/se/serve-d/package.nix
+++ b/pkgs/by-name/se/serve-d/package.nix
@@ -12,7 +12,7 @@ buildDubPackage rec {
   src = fetchFromGitHub {
     owner = "Pure-D";
     repo = "serve-d";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-h4zsW8phGcI4z0uMCIovM9cJ6hKdk8rLb/Jp4X4dkpk=";
   };
 
diff --git a/pkgs/by-name/se/serverless/package.nix b/pkgs/by-name/se/serverless/package.nix
index 315a027bc730..9dd1d7241ed7 100644
--- a/pkgs/by-name/se/serverless/package.nix
+++ b/pkgs/by-name/se/serverless/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "serverless";
     repo = "serverless";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DplJRJOdIpZfIvpyPo9VcaXCHVPWB8FwhOH4vISUh3Q=";
   };
 
diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix
index 2eaa1c09b4d7..89c4b03b6007 100644
--- a/pkgs/by-name/se/sesh/package.nix
+++ b/pkgs/by-name/se/sesh/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "joshmedeski";
     repo = "sesh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YFvUYacuvyzNXwY+y9kI4tPlrlojDuZpR7VaTGdVqb8=";
   };
 
diff --git a/pkgs/by-name/se/setbfree/package.nix b/pkgs/by-name/se/setbfree/package.nix
index 7fcde202ab9f..4b21ae51c757 100644
--- a/pkgs/by-name/se/setbfree/package.nix
+++ b/pkgs/by-name/se/setbfree/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pantherb";
     repo = "setBfree";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jtiyJntaFnAVeC1Rvkzi3wNodyJpEQKgnOAP7++36wo=";
   };
 
diff --git a/pkgs/by-name/se/setroot/package.nix b/pkgs/by-name/se/setroot/package.nix
index 7bb722ffdb15..aa7b1ffb8247 100644
--- a/pkgs/by-name/se/setroot/package.nix
+++ b/pkgs/by-name/se/setroot/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ttzhou";
     repo = "setroot";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0w95828v0splk7bj5kfacp4pq6wxpyamvyjmahyvn5hc3ycq21mq";
   };
 
diff --git a/pkgs/by-name/se/setup-envtest/package.nix b/pkgs/by-name/se/setup-envtest/package.nix
index 32b38df934b5..db23fb85bd7e 100644
--- a/pkgs/by-name/se/setup-envtest/package.nix
+++ b/pkgs/by-name/se/setup-envtest/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
     fetchFromGitHub {
       owner = "kubernetes-sigs";
       repo = "controller-runtime";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-9AqZMiA+OIJD+inmeUc/lq57kV7L85jk1I4ywiSKirg=";
     }
     + "/tools/setup-envtest";
diff --git a/pkgs/by-name/se/seturgent/package.nix b/pkgs/by-name/se/seturgent/package.nix
index 1b3dbbc647bc..2997e906dc2c 100644
--- a/pkgs/by-name/se/seturgent/package.nix
+++ b/pkgs/by-name/se/seturgent/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.codemadness.org/seturgent";
-    rev = version;
+    tag = version;
     sha256 = "sha256-XW7ms0BVCf1/fuL3PJ970t6sHkmMY1iLYXfS9R60JX0=";
   };
 
diff --git a/pkgs/by-name/sf/sfizz/package.nix b/pkgs/by-name/sf/sfizz/package.nix
index 39b35f4e664d..9378dd079404 100644
--- a/pkgs/by-name/sf/sfizz/package.nix
+++ b/pkgs/by-name/sf/sfizz/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sfztools";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sf/sfm/package.nix b/pkgs/by-name/sf/sfm/package.nix
index 37d16a8244fa..7897a5dd7c14 100644
--- a/pkgs/by-name/sf/sfm/package.nix
+++ b/pkgs/by-name/sf/sfm/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "afify";
     repo = "sfm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VwPux6n+azpR4qDkzZJia95pJJOaFDBBoz6/VwlC0zw=";
   };
 
diff --git a/pkgs/by-name/sf/sfsexp/package.nix b/pkgs/by-name/sf/sfsexp/package.nix
index c7e9cde3ad1e..a6889e8e8c1b 100644
--- a/pkgs/by-name/sf/sfsexp/package.nix
+++ b/pkgs/by-name/sf/sfsexp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mjsottile";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-uAk/8Emf23J0D3D5+eUEpWLY2fIvdQ7a80eGe9i1WQ8=";
   };
 
diff --git a/pkgs/by-name/sf/sftpman/package.nix b/pkgs/by-name/sf/sftpman/package.nix
index c0274be1de79..e8e27e1f913e 100644
--- a/pkgs/by-name/sf/sftpman/package.nix
+++ b/pkgs/by-name/sf/sftpman/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "spantaleev";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-YxqN4+u0nYUWehbyRhjddIo2sythH3E0fiPSyrUlWhM=";
   };
 
diff --git a/pkgs/by-name/sf/sfwbar/package.nix b/pkgs/by-name/sf/sfwbar/package.nix
index f862473a27ec..88873c405383 100644
--- a/pkgs/by-name/sf/sfwbar/package.nix
+++ b/pkgs/by-name/sf/sfwbar/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "LBCrion";
     repo = "sfwbar";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jMEbw3Xla2cod/oKFQ4bD3sTHi7DZ0deG0H0Yt0Y7ck=";
   };
 
diff --git a/pkgs/by-name/sf/sfz/package.nix b/pkgs/by-name/sf/sfz/package.nix
index 7b2eeb057510..d7f3d793c763 100644
--- a/pkgs/by-name/sf/sfz/package.nix
+++ b/pkgs/by-name/sf/sfz/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "weihanglo";
     repo = "sfz";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mKH1vgk+3tZEnjJRkfa0dDR383VN1VLNd3HEzC7f8YI=";
   };
 
diff --git a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
index bbb193b325eb..195f9632b160 100644
--- a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
+++ b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "azure-dcap-client";
-    rev = version;
+    tag = version;
     hash = "sha256-zTDaICsSPXctgFRCZBiZwXV9dLk2pFL9kp5a8FkiTZA=";
   };
 
diff --git a/pkgs/by-name/sh/shab/package.nix b/pkgs/by-name/sh/shab/package.nix
index ee4fca701e4b..c26c7171874d 100644
--- a/pkgs/by-name/sh/shab/package.nix
+++ b/pkgs/by-name/sh/shab/package.nix
@@ -16,7 +16,7 @@ let
     src = fetchFromGitHub {
       owner = "zimbatm";
       repo = "shab";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-UW4tRZSir7KG7KXg0sOCd8kkIydEwZ6kdwxCeo0Ojgo=";
     };
 
diff --git a/pkgs/by-name/sh/shabnam-fonts/package.nix b/pkgs/by-name/sh/shabnam-fonts/package.nix
index 8676e7310ffa..e6e0705a70ee 100644
--- a/pkgs/by-name/sh/shabnam-fonts/package.nix
+++ b/pkgs/by-name/sh/shabnam-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "shabnam-font";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-H03GTKRVPiwU4edkr4x5upW4JCy6320Lo+cKK9FRMQs=";
   };
 
diff --git a/pkgs/by-name/sh/shadered/package.nix b/pkgs/by-name/sh/shadered/package.nix
index ff9d322b9854..c8f3acaa7726 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 = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     sha256 = "0drf8wwx0gcmi22jq2yyjy7ppxynfq172wqakchscm313j248fjr";
   };
diff --git a/pkgs/by-name/sh/shades-of-gray-theme/package.nix b/pkgs/by-name/sh/shades-of-gray-theme/package.nix
index 692dd3c43044..89480702dd1c 100644
--- a/pkgs/by-name/sh/shades-of-gray-theme/package.nix
+++ b/pkgs/by-name/sh/shades-of-gray-theme/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WernerFP";
     repo = "shades-of-gray-theme";
-    rev = version;
+    tag = version;
     sha256 = "13ydym0i3032g5dyrnl5wxpvxv57b43q7iaq5achpmaixgn58gs8";
   };
 
diff --git a/pkgs/by-name/sh/shadow-tls/package.nix b/pkgs/by-name/sh/shadow-tls/package.nix
index 06fad8e56f56..7cc124200550 100644
--- a/pkgs/by-name/sh/shadow-tls/package.nix
+++ b/pkgs/by-name/sh/shadow-tls/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ihciah";
     repo = "shadow-tls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T+GPIrcME6Wq5sdfIt4t426/3ew5sUQMykYeZ6zw1ko=";
   };
 
diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index b515addb0730..5aaa47105a47 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shadow-maint";
     repo = "shadow";
-    rev = version;
+    tag = version;
     hash = "sha256-IoHAr35ziujHTukMbA5QN15YbnpwBT7pUYcqRr+rdog=";
   };
 
diff --git a/pkgs/by-name/sh/shadowfox/package.nix b/pkgs/by-name/sh/shadowfox/package.nix
index 3fb2b145bff5..a7699f95e8ba 100644
--- a/pkgs/by-name/sh/shadowfox/package.nix
+++ b/pkgs/by-name/sh/shadowfox/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SrKomodo";
     repo = "shadowfox-updater";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6";
   };
 
diff --git a/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix b/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
index b1192385c714..1d145953c011 100644
--- a/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
+++ b/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shadowsocks";
     repo = "v2ray-plugin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iwfjINY/NQP9poAcCHz0ETxu0Nz58AmD7i1NbF8hBCs=";
   };
 
diff --git a/pkgs/by-name/sh/shaq/package.nix b/pkgs/by-name/sh/shaq/package.nix
index ff7abe883a6b..be108bd7c7fe 100644
--- a/pkgs/by-name/sh/shaq/package.nix
+++ b/pkgs/by-name/sh/shaq/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "woodruffw";
     repo = "shaq";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RF606Aeskqbx94H5ivd+RJ+Hk0iYsds/PUY8TZqirs4=";
   };
 
diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix
index 961c6ca606bc..9b034303aa8c 100644
--- a/pkgs/by-name/sh/share-preview/package.nix
+++ b/pkgs/by-name/sh/share-preview/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rafaelmardojai";
     repo = "share-preview";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E=";
   };
 
diff --git a/pkgs/by-name/sh/sharing/package.nix b/pkgs/by-name/sh/sharing/package.nix
index 45462eac5beb..0aff8c9cc428 100644
--- a/pkgs/by-name/sh/sharing/package.nix
+++ b/pkgs/by-name/sh/sharing/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "parvardegr";
     repo = "sharing";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-y5tAbyRGxr6lagU/+pLBN0VIpk3+SzKyXOehQk6NW+M=";
   };
 
diff --git a/pkgs/by-name/sh/shavee/package.nix b/pkgs/by-name/sh/shavee/package.nix
index d914497ce3c2..d7a8be012637 100644
--- a/pkgs/by-name/sh/shavee/package.nix
+++ b/pkgs/by-name/sh/shavee/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ashuio";
     repo = "shavee";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-41wJ3QBZdmCl7v/6JetXhzH2zF7tsKYMKZY1cKhByX8=";
   };
 
diff --git a/pkgs/by-name/sh/shell2http/package.nix b/pkgs/by-name/sh/shell2http/package.nix
index 0a60684c2abb..252deea4a3e0 100644
--- a/pkgs/by-name/sh/shell2http/package.nix
+++ b/pkgs/by-name/sh/shell2http/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "msoap";
     repo = "shell2http";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CU7ENLx5C1qCO1f9m0fl/AmUzmtmj6IjMlx9WNqAnS0=";
   };
 
diff --git a/pkgs/by-name/sh/shellharden/package.nix b/pkgs/by-name/sh/shellharden/package.nix
index 8939e121efc2..c04e682e3c2f 100644
--- a/pkgs/by-name/sh/shellharden/package.nix
+++ b/pkgs/by-name/sh/shellharden/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "anordal";
     repo = "shellharden";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-aBX3RXfDhlXVMV8aPO0pu3527nDoYrUDUbH6crWO/W8=";
   };
 
diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
index 1131ec60fa85..282bb0596bab 100644
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ByKj9rnRGS3B+BEqeo7QJvjSxVXytOXydmZMx7lK8Xc=";
   };
 
diff --git a/pkgs/by-name/sh/shellspec/package.nix b/pkgs/by-name/sh/shellspec/package.nix
index 8fff36ca0ac6..877d7a8a1bbc 100644
--- a/pkgs/by-name/sh/shellspec/package.nix
+++ b/pkgs/by-name/sh/shellspec/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shellspec";
     repo = "shellspec";
-    rev = version;
+    tag = version;
     sha256 = "1ib5qp29f2fmivwnv6hq35qhvdxz42xgjlkvy0i3qn758riyqf46";
   };
 
diff --git a/pkgs/by-name/sh/shellz/package.nix b/pkgs/by-name/sh/shellz/package.nix
index b1a263c3fddc..f3dfe6f9e41d 100644
--- a/pkgs/by-name/sh/shellz/package.nix
+++ b/pkgs/by-name/sh/shellz/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sUYDopSxaUPyrHev8XXobRoX6uxbdf5goJ75KYEPFNY=";
   };
 
diff --git a/pkgs/by-name/sh/shepherd/package.nix b/pkgs/by-name/sh/shepherd/package.nix
index 6f6313ea0035..6d1aebe708ae 100644
--- a/pkgs/by-name/sh/shepherd/package.nix
+++ b/pkgs/by-name/sh/shepherd/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NerdWalletOSS";
     repo = "shepherd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LY8Vde4YpGuKnQ5UnSOpsQDY7AOyZRziUrfZb5dRiX4=";
   };
 
diff --git a/pkgs/by-name/sh/shfm/package.nix b/pkgs/by-name/sh/shfm/package.nix
index d70fd20be328..68bad3cfa32e 100644
--- a/pkgs/by-name/sh/shfm/package.nix
+++ b/pkgs/by-name/sh/shfm/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "shfm";
-    rev = version;
+    tag = version;
     hash = "sha256-ilVrUFfyzOZgjbBTqlHA9hLaTHw1xHFo1Y/tjXygNEs=";
   };
 
diff --git a/pkgs/by-name/sh/shfmt/package.nix b/pkgs/by-name/sh/shfmt/package.nix
index 177b053edcd4..ad1616e6ba52 100644
--- a/pkgs/by-name/sh/shfmt/package.nix
+++ b/pkgs/by-name/sh/shfmt/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "sh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PFUjJOVW7bCFOxi5/6D4dOu96T8jj1L5clMVLC/W1Fk=";
   };
 
diff --git a/pkgs/by-name/sh/shibboleth-sp/package.nix b/pkgs/by-name/sh/shibboleth-sp/package.nix
index 4a300718c737..7e6212d582af 100644
--- a/pkgs/by-name/sh/shibboleth-sp/package.nix
+++ b/pkgs/by-name/sh/shibboleth-sp/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.shibboleth.net/git/cpp-sp.git";
-    rev = version;
+    tag = version;
     sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr";
   };
 
diff --git a/pkgs/by-name/sh/shikane/package.nix b/pkgs/by-name/sh/shikane/package.nix
index 73a21535fc21..ef1cae2a2b20 100644
--- a/pkgs/by-name/sh/shikane/package.nix
+++ b/pkgs/by-name/sh/shikane/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "w0lff";
     repo = "shikane";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Chc1+JUHXzuLl26NuBGVxSiXiaE4Ns1FXb0dBs6STVk=";
   };
 
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/shine/package.nix b/pkgs/by-name/sh/shine/package.nix
index c9107390d575..3e8aa3b45fc9 100644
--- a/pkgs/by-name/sh/shine/package.nix
+++ b/pkgs/by-name/sh/shine/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "toots";
     repo = "shine";
-    rev = version;
+    tag = version;
     sha256 = "06nwylqqji0i1isdprm2m5qsdj4qiywcgnp69c5b55pnw43f07qg";
   };
 
diff --git a/pkgs/by-name/sh/shiori/package.nix b/pkgs/by-name/sh/shiori/package.nix
index 606db18f04c3..0a319292f1a5 100644
--- a/pkgs/by-name/sh/shiori/package.nix
+++ b/pkgs/by-name/sh/shiori/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-shiori";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-T4EFwvejLgNkcykPjSHU8WXJwqSqYPFaAD+9JX+uiJU=";
   };
 
diff --git a/pkgs/by-name/sh/shisho/package.nix b/pkgs/by-name/sh/shisho/package.nix
index 2eb91be11f17..d6103d721074 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/shmig/package.nix b/pkgs/by-name/sh/shmig/package.nix
index 3f57bed763cf..4f0922e6944e 100644
--- a/pkgs/by-name/sh/shmig/package.nix
+++ b/pkgs/by-name/sh/shmig/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mbucc";
     repo = "shmig";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "15ry1d51d6dlzzzhck2x57wrq48vs4n9pp20bv2sz6nk92fva5l5";
   };
 
diff --git a/pkgs/by-name/sh/shocco/package.nix b/pkgs/by-name/sh/shocco/package.nix
index 63ce139be600..58ab982ac984 100644
--- a/pkgs/by-name/sh/shocco/package.nix
+++ b/pkgs/by-name/sh/shocco/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rtomayko";
     repo = "shocco";
-    rev = version;
+    tag = version;
     sha256 = "1nkwcw9fqf4vyrwidqi6by7nrmainkjqkirkz3yxmzk6kzwr38mi";
   };
 
diff --git a/pkgs/by-name/sh/shod/package.nix b/pkgs/by-name/sh/shod/package.nix
index 8686767a3a8c..9f7db7692bd7 100644
--- a/pkgs/by-name/sh/shod/package.nix
+++ b/pkgs/by-name/sh/shod/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phillbush";
     repo = "shod";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0bKp1BTIdYVBDVdeGnTVo76UtBxa4UbXLZihdjHS/og=";
   };
 
diff --git a/pkgs/by-name/sh/shopify-themekit/package.nix b/pkgs/by-name/sh/shopify-themekit/package.nix
index cbe076825c21..875d0cb9083b 100644
--- a/pkgs/by-name/sh/shopify-themekit/package.nix
+++ b/pkgs/by-name/sh/shopify-themekit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "themekit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-A/t6yQW2xRFZYuYRyNN/0v4zdivch3tiv65a7TdHm2c=";
   };
 
diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix
index 40bbd4ff88de..7bc23c495b93 100644
--- a/pkgs/by-name/sh/shotgun/package.nix
+++ b/pkgs/by-name/sh/shotgun/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "neXromancers";
     repo = "shotgun";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sBstFz7cYfwVQpDZeC3wPjzbKU5zQzmnhiWNqiCda1k=";
   };
 
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/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix
index eb4eda0b2ee8..a011dd514e27 100644
--- a/pkgs/by-name/sh/shpool/package.nix
+++ b/pkgs/by-name/sh/shpool/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shell-pool";
     repo = "shpool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pSSMC4pUtB38c6UNOj+Ma/Y1jcSfm33QV1B4tA/MyKY=";
   };
 
diff --git a/pkgs/by-name/sh/shunit2/package.nix b/pkgs/by-name/sh/shunit2/package.nix
index 577ca5a6a79f..9203fe93001d 100644
--- a/pkgs/by-name/sh/shunit2/package.nix
+++ b/pkgs/by-name/sh/shunit2/package.nix
@@ -17,7 +17,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kward";
     repo = "shunit2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IZHkgkVqzeh+eEKCDJ87sqNhSA+DU6kBCNDdQaUEeiM=";
   };
 
diff --git a/pkgs/by-name/sh/shutter/package.nix b/pkgs/by-name/sh/shutter/package.nix
index 3ba076eeccea..1e7ff8813491 100644
--- a/pkgs/by-name/sh/shutter/package.nix
+++ b/pkgs/by-name/sh/shutter/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shutter-project";
     repo = "shutter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-o95skSr6rszh0wsHQTpu1GjqCDmde7aygIP+i4XQW9A=";
   };
 
diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix
index ee93342f2d93..bca80c079420 100644
--- a/pkgs/by-name/si/sic-image-cli/package.nix
+++ b/pkgs/by-name/si/sic-image-cli/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "foresterre";
     repo = "sic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PFbHHO3m4mnV5s8DVev/iao9sC3FYht0whTHYzO25Yo=";
   };
 
diff --git a/pkgs/by-name/si/sidekick/package.nix b/pkgs/by-name/si/sidekick/package.nix
index 3ff0b4340c44..c663f3ca8100 100644
--- a/pkgs/by-name/si/sidekick/package.nix
+++ b/pkgs/by-name/si/sidekick/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MightyMoud";
     repo = "sidekick";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Y/dQRix/cxV3NGqTGtRP6Bcprj0jzzOpudgm9a1UMLc=";
   };
 
diff --git a/pkgs/by-name/si/sieve-connect/package.nix b/pkgs/by-name/si/sieve-connect/package.nix
index 8a576bd7be3f..27842893954e 100644
--- a/pkgs/by-name/si/sieve-connect/package.nix
+++ b/pkgs/by-name/si/sieve-connect/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "philpennock";
     repo = "sieve-connect";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ghvfa5ifa68b6imh85bkmy00r93c5f9hs6d039axb73gmma580p";
   };
 
diff --git a/pkgs/by-name/si/sift/package.nix b/pkgs/by-name/si/sift/package.nix
index 0fe1069b7020..7a717f30676d 100644
--- a/pkgs/by-name/si/sift/package.nix
+++ b/pkgs/by-name/si/sift/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "svent";
     repo = "sift";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IZ4Hwg5NzdSXtrIDNxtkzquuiHQOmLV1HSx8gpwE/i0=";
   };
 
diff --git a/pkgs/by-name/si/sig/package.nix b/pkgs/by-name/si/sig/package.nix
index 9033c282cdc4..50d0887fb43c 100644
--- a/pkgs/by-name/si/sig/package.nix
+++ b/pkgs/by-name/si/sig/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ynqa";
     repo = "sig";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-685VBQ64B+IbSSyqtVXtOgs4wY85WZ/OceHL++v5ip4=";
   };
 
diff --git a/pkgs/by-name/si/siglo/package.nix b/pkgs/by-name/si/siglo/package.nix
index 147a784d1dcd..fc33c8060543 100644
--- a/pkgs/by-name/si/siglo/package.nix
+++ b/pkgs/by-name/si/siglo/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "theironrobin";
     repo = "siglo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4jKsRpzuyHH31LXndC3Ua4TYcI0G0v9qqe0cbvLuCDA=";
   };
 
diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 5ef262012d3c..6c3b012649b4 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
-    rev = version;
+    tag = version;
     hash = "sha256-PdbZxDmaM1kdc5IHkWf8RcJcT5cmfRAvUl76VYnqFXc=";
   };
 
diff --git a/pkgs/by-name/si/signaldctl/package.nix b/pkgs/by-name/si/signaldctl/package.nix
index 59e1984f4d71..e75a23eabde7 100644
--- a/pkgs/by-name/si/signaldctl/package.nix
+++ b/pkgs/by-name/si/signaldctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "signald";
     repo = "signald-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lMJyr4BPZ8V2f//CUkr7CVQ6o8nRyeLBHMDEyLcHSgQ=";
   };
 
diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix
index cd6af5de63de..baa38af7114f 100644
--- a/pkgs/by-name/si/signaturepdf/package.nix
+++ b/pkgs/by-name/si/signaturepdf/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "24eme";
     repo = "signaturepdf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8R1eowMpdb4oj3j+gMJ2RsWVzHvNiXPwFaLHR0jqFJo=";
   };
 
diff --git a/pkgs/by-name/si/signify/package.nix b/pkgs/by-name/si/signify/package.nix
index 33b188a92261..3aeb7d3f503b 100644
--- a/pkgs/by-name/si/signify/package.nix
+++ b/pkgs/by-name/si/signify/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aperezdc";
     repo = "signify";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-y2A+Szt451CmaWOc2Y2vBSwSgziJsSnTjNClbdyxG2U=";
   };
 
diff --git a/pkgs/by-name/si/sigslot/package.nix b/pkgs/by-name/si/sigslot/package.nix
index 244d56e91cc0..077d2ce025f7 100644
--- a/pkgs/by-name/si/sigslot/package.nix
+++ b/pkgs/by-name/si/sigslot/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "palacaze";
     repo = "sigslot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MKtVZLHp8UfXW8KJ3QjPMhxnt46xV+pA9NMqAX0iqiA=";
   };
 
diff --git a/pkgs/by-name/si/sigtop/package.nix b/pkgs/by-name/si/sigtop/package.nix
index 6fbfe532c363..e8097a281f12 100644
--- a/pkgs/by-name/si/sigtop/package.nix
+++ b/pkgs/by-name/si/sigtop/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tbvdm";
     repo = "sigtop";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wZdQq5u44AcZs2CWRQ92wih5WBzZFywt78+slVBYseg=";
   };
 
diff --git a/pkgs/by-name/si/siketyan-ghr/package.nix b/pkgs/by-name/si/siketyan-ghr/package.nix
index 7293bbf2f33a..b8ee4ec4c272 100644
--- a/pkgs/by-name/si/siketyan-ghr/package.nix
+++ b/pkgs/by-name/si/siketyan-ghr/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "siketyan";
     repo = "ghr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L9+rcdt+MGZSCOJyCE4t/TT6Fjtxvfr9LBJYyRrx208=";
   };
 
diff --git a/pkgs/by-name/si/sil-q/package.nix b/pkgs/by-name/si/sil-q/package.nix
index b8ab1befd925..170feb32dcf2 100644
--- a/pkgs/by-name/si/sil-q/package.nix
+++ b/pkgs/by-name/si/sil-q/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sil-quirk";
     repo = "sil-q";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-v/sWhPWF9cCKD8N0RHpwzChMM1t9G2yrMDmi1cZxdOs=";
   };
 
diff --git a/pkgs/by-name/si/silicon/package.nix b/pkgs/by-name/si/silicon/package.nix
index 9fbf5ac29326..6864bb2b2603 100644
--- a/pkgs/by-name/si/silicon/package.nix
+++ b/pkgs/by-name/si/silicon/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Aloxaf";
     repo = "silicon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lwwbjSXW5uonJNZTAqTK14Ib4QDOD4puxY2CsiJk4/Q=";
   };
 
diff --git a/pkgs/by-name/si/silver-searcher/package.nix b/pkgs/by-name/si/silver-searcher/package.nix
index 2c225bdd585f..e38773b41756 100644
--- a/pkgs/by-name/si/silver-searcher/package.nix
+++ b/pkgs/by-name/si/silver-searcher/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ggreer";
     repo = "the_silver_searcher";
-    rev = version;
+    tag = version;
     sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p";
   };
 
diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix
index 894a02de384e..80b7a01cd583 100644
--- a/pkgs/by-name/si/simde/package.nix
+++ b/pkgs/by-name/si/simde/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simd-everywhere";
     repo = "simde";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-igjDHCpKXy6EbA9Mf6peL4OTVRPYTV0Y2jbgYQuWMT4=";
   };
 
diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix
index 574fd70bc2d0..9d0c0cf9bed0 100644
--- a/pkgs/by-name/si/simdjson/package.nix
+++ b/pkgs/by-name/si/simdjson/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simdjson";
     repo = "simdjson";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/FfaM5BTWKrt2m70+VcUXz//RiZuzxnUOaHOjPJWsGw=";
   };
 
diff --git a/pkgs/by-name/si/simg2img/package.nix b/pkgs/by-name/si/simg2img/package.nix
index 2e4ee18646d7..0f7b2be9a55f 100644
--- a/pkgs/by-name/si/simg2img/package.nix
+++ b/pkgs/by-name/si/simg2img/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "anestisb";
     repo = "android-simg2img";
-    rev = version;
+    tag = version;
     hash = "sha256-sNHdSbms35YnENASFEG+VMLJGkV/JAlQUVMquDrePDc=";
   };
 
diff --git a/pkgs/by-name/si/simh/package.nix b/pkgs/by-name/si/simh/package.nix
index 28d03352d3d6..cad498a45c59 100644
--- a/pkgs/by-name/si/simh/package.nix
+++ b/pkgs/by-name/si/simh/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simh";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-65+YfOWpVXPeT64TZcSaWJY+ODQ0q/pwF9jb8xGdpIs=";
   };
 
diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix
index d13c5485db55..0a65dbe288c3 100644
--- a/pkgs/by-name/si/simple-http-server/package.nix
+++ b/pkgs/by-name/si/simple-http-server/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "TheWaWaR";
     repo = "simple-http-server";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WaUBMGZaIjce83mskEtH9PLYDDlBL1MNoY8lz4++684=";
   };
 
diff --git a/pkgs/by-name/si/simple-mtpfs/package.nix b/pkgs/by-name/si/simple-mtpfs/package.nix
index 567bef907b18..de7082e3e46f 100644
--- a/pkgs/by-name/si/simple-mtpfs/package.nix
+++ b/pkgs/by-name/si/simple-mtpfs/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phatina";
     repo = "simple-mtpfs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vAqi2owa4LJK7y7S7TwkPAqDxzyHrZZBTu0MBwMT0gI=";
   };
 
diff --git a/pkgs/by-name/si/simpleTpmPk11/package.nix b/pkgs/by-name/si/simpleTpmPk11/package.nix
index e963955a255f..e678d88c2390 100644
--- a/pkgs/by-name/si/simpleTpmPk11/package.nix
+++ b/pkgs/by-name/si/simpleTpmPk11/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ThomasHabets";
     repo = "simple-tpm-pk11";
-    rev = version;
+    tag = version;
     sha256 = "0vpbaklr4r1a2am0pqcm6m41ph22mkcrq33y8ab5h8qkhkvhd6a6";
   };
 
diff --git a/pkgs/by-name/si/simplehttp2server/package.nix b/pkgs/by-name/si/simplehttp2server/package.nix
index 190257b16e92..a1fd5b4628ba 100644
--- a/pkgs/by-name/si/simplehttp2server/package.nix
+++ b/pkgs/by-name/si/simplehttp2server/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleChromeLabs";
     repo = "simplehttp2server";
-    rev = version;
+    tag = version;
     sha256 = "113mcfvy1m91wask5039mhr0187nlw325ac32785yl4bb4igi8aw";
   };
 
diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix
index 3a674ae1a181..f1ef689425a2 100644
--- a/pkgs/by-name/si/simplotask/package.nix
+++ b/pkgs/by-name/si/simplotask/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "spot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pSYYYUzChK/GNAdCybd4KMNXwkTZo/0w6CtsYOvbKj8=";
   };
 
diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index a4a065084d27..b239999179e1 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/RTpdbDFCDk1sq7lBIXQ3ElgYqflDumffZy1DVP0zOY=";
   };
 
diff --git a/pkgs/by-name/si/sink-rotate/package.nix b/pkgs/by-name/si/sink-rotate/package.nix
index 02d8f7e26cf0..5d96255ecae9 100644
--- a/pkgs/by-name/si/sink-rotate/package.nix
+++ b/pkgs/by-name/si/sink-rotate/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "mightyiam";
     repo = "sink-rotate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZHbisG9pdctkwfD1S3kxMZhBqPw0Ni5Q9qQG4RssnSw=";
   };
 
diff --git a/pkgs/by-name/si/sipexer/package.nix b/pkgs/by-name/si/sipexer/package.nix
index ca194801d204..8a6946deae69 100644
--- a/pkgs/by-name/si/sipexer/package.nix
+++ b/pkgs/by-name/si/sipexer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "miconda";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7L29nyFOc/5XAHpzGsFSngxMTwwIDkmwhIKIjHYGszc=";
   };
 
diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix
index 76ebeae80949..f819704d4549 100644
--- a/pkgs/by-name/si/sirikali/package.nix
+++ b/pkgs/by-name/si/sirikali/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mhogomchungu";
     repo = "sirikali";
-    rev = version;
+    tag = version;
     hash = "sha256-YGMmDatTKjhORTisX9kTVrpIWo6j0YkxZsDLJXga6ho=";
   };
 
diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix
index df4a5a6af8a8..5497632be36e 100644
--- a/pkgs/by-name/si/sirius/package.nix
+++ b/pkgs/by-name/si/sirius/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "electronic-structure";
     repo = "SIRIUS";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A3WiEzo2ianxdF9HMZN9cT0lFosToGEHh0o6uBSAYqU=";
   };
 
diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix
index 886fe060694d..63ae023dd089 100644
--- a/pkgs/by-name/si/sitespeed-io/package.nix
+++ b/pkgs/by-name/si/sitespeed-io/package.nix
@@ -31,7 +31,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "sitespeedio";
     repo = "sitespeed.io";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yC/TlAJa71hbPYYuqPV+k3syGuo/VhnNjXmmxh47ySQ=";
   };
 
diff --git a/pkgs/by-name/sj/sjasmplus/package.nix b/pkgs/by-name/sj/sjasmplus/package.nix
index 51ef3793cc03..2217c3393be8 100644
--- a/pkgs/by-name/sj/sjasmplus/package.nix
+++ b/pkgs/by-name/sj/sjasmplus/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "z00m128";
     repo = "sjasmplus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+FvNYfJ5I91RfuJTiOPhj5KW8HoOq8OgnnpFEgefSGc=";
   };
 
diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix
index b8e77c385d51..0cac856b24fd 100644
--- a/pkgs/by-name/sk/skaffold/package.nix
+++ b/pkgs/by-name/sk/skaffold/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = "skaffold";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iw9SYoepa2QjKnSaqFkIxuU5dcsLcR7S13kPh5S2Jyw=";
   };
 
diff --git a/pkgs/by-name/sk/skate/package.nix b/pkgs/by-name/sk/skate/package.nix
index 77fe2116c9a3..9de13dd224c4 100644
--- a/pkgs/by-name/sk/skate/package.nix
+++ b/pkgs/by-name/sk/skate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "skate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ihzcto41ltV5LQjLP9AF5XGl5b6QDbgZ/q4BMzfrDC8=";
   };
 
diff --git a/pkgs/by-name/sk/skeditor/package.nix b/pkgs/by-name/sk/skeditor/package.nix
index bdf4d2eee2e3..40f15ec753aa 100644
--- a/pkgs/by-name/sk/skeditor/package.nix
+++ b/pkgs/by-name/sk/skeditor/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "skeditorteam";
     repo = "skeditor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-e8mQTkTvR8RfC27VsONqf9UtkM/H8GebxrYVUdJw7PE=";
   };
 
diff --git a/pkgs/by-name/sk/skeema/package.nix b/pkgs/by-name/sk/skeema/package.nix
index a431b12abb36..355712ead3d9 100644
--- a/pkgs/by-name/sk/skeema/package.nix
+++ b/pkgs/by-name/sk/skeema/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "skeema";
     repo = "skeema";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3sxUy/TkacuRN8UDGgrvkdUQi//6VufoYoVFN1+X3BM=";
   };
 
diff --git a/pkgs/by-name/sk/skeu/package.nix b/pkgs/by-name/sk/skeu/package.nix
index 4bcf5bca826a..50cef529aa50 100644
--- a/pkgs/by-name/sk/skeu/package.nix
+++ b/pkgs/by-name/sk/skeu/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "skeu";
-    rev = version;
+    tag = version;
     sha256 = "0lbl09p0h493ya978fh7cib68qlmxfxahmbj0mpa3b65ynxda645";
   };
 
diff --git a/pkgs/by-name/sk/skia-aseprite/package.nix b/pkgs/by-name/sk/skia-aseprite/package.nix
index 446556a126b8..8983f3f1e9e9 100644
--- a/pkgs/by-name/sk/skia-aseprite/package.nix
+++ b/pkgs/by-name/sk/skia-aseprite/package.nix
@@ -31,7 +31,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "aseprite";
     repo = "skia";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-IlZbalmHl549uDUfPG8hlzub8TLWhG0EsV6HVAPdsl0=";
   };
 
diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix
index abb2a27d74eb..c7388cd0b78f 100644
--- a/pkgs/by-name/sk/skopeo/package.nix
+++ b/pkgs/by-name/sk/skopeo/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   version = "1.18.0";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "containers";
     repo = "skopeo";
     hash = "sha256-Ws01dYx2Jq/zB8rWiWSnV4ZgcxyBWHWvE3DfG7gvFOc=";
diff --git a/pkgs/by-name/sl/sl/package.nix b/pkgs/by-name/sl/sl/package.nix
index a4b14dab2db3..5d90256d5d75 100644
--- a/pkgs/by-name/sl/sl/package.nix
+++ b/pkgs/by-name/sl/sl/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eyJhb";
     repo = "sl";
-    rev = version;
+    tag = version;
     sha256 = "11a1rdgb8wagikhxgm81g80g5qsl59mv4qgsval3isykqh8729bj";
   };
 
diff --git a/pkgs/by-name/sl/slack-cli/package.nix b/pkgs/by-name/sl/slack-cli/package.nix
index 49e1543e1a25..7af4a7310501 100644
--- a/pkgs/by-name/sl/slack-cli/package.nix
+++ b/pkgs/by-name/sl/slack-cli/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rockymadden";
     repo = "slack-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "022yr3cpfg0v7cxi62zzk08vp0l3w851qpfh6amyfgjiynnfyddl";
   };
 
diff --git a/pkgs/by-name/sl/slack-term/package.nix b/pkgs/by-name/sl/slack-term/package.nix
index 8d2e09808bea..f8ef87082f9b 100644
--- a/pkgs/by-name/sl/slack-term/package.nix
+++ b/pkgs/by-name/sl/slack-term/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "erroneousboat";
     repo = "slack-term";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/sl/sleek/package.nix b/pkgs/by-name/sl/sleek/package.nix
index afe3db6eaf27..4e3855c077ab 100644
--- a/pkgs/by-name/sl/sleek/package.nix
+++ b/pkgs/by-name/sl/sleek/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nrempel";
     repo = "sleek";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VQ0LmKhFsC12qoXCFHxtV5E+J7eRvZMVH0j+5r8pDk8=";
   };
 
diff --git a/pkgs/by-name/sl/slic3r/package.nix b/pkgs/by-name/sl/slic3r/package.nix
index 1790d103d986..19f29c5b2fa4 100644
--- a/pkgs/by-name/sl/slic3r/package.nix
+++ b/pkgs/by-name/sl/slic3r/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexrj";
     repo = "Slic3r";
-    rev = version;
+    tag = version;
     sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0=";
   };
 
diff --git a/pkgs/by-name/sl/slides/package.nix b/pkgs/by-name/sl/slides/package.nix
index 59076db89ef2..5f0911f7bb7c 100644
--- a/pkgs/by-name/sl/slides/package.nix
+++ b/pkgs/by-name/sl/slides/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maaslalani";
     repo = "slides";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-K8VsqaNUPxh3/Yddy6DFiOyjRuZ6r6bU456Pm31A1og=";
   };
 
diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix
index 083938fb1756..48959fc8624d 100644
--- a/pkgs/by-name/sl/slimevr/package.nix
+++ b/pkgs/by-name/sl/slimevr/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SlimeVR";
     repo = "SlimeVR-Server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XQDbP+LO/brpl7viSxuV3H4ALN0yIkj9lwr5eS1txNs=";
     # solarxr
     fetchSubmodules = true;
diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix
index fe6e18c54940..02550181117e 100644
--- a/pkgs/by-name/sl/slimserver/package.nix
+++ b/pkgs/by-name/sl/slimserver/package.nix
@@ -38,7 +38,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "LMS-Community";
     repo = "slimserver";
-    rev = version;
+    tag = version;
     hash = "sha256-rwaHlNM5KGqvk8SAdinvCGT5+UUAU8I2jiN5Ine/eds=";
   };
 
diff --git a/pkgs/by-name/sl/slingshot/package.nix b/pkgs/by-name/sl/slingshot/package.nix
index 4d3b886bedc4..f04087fb7098 100644
--- a/pkgs/by-name/sl/slingshot/package.nix
+++ b/pkgs/by-name/sl/slingshot/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "caio-ishikawa";
     repo = "slingshot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XI6uf54sEJ0htfY43aF8/X1/OF9m6peHUGDS+2nK3xA=";
   };
 
diff --git a/pkgs/by-name/sl/slippy/package.nix b/pkgs/by-name/sl/slippy/package.nix
index 70e757d7c1a1..c59d28daacd4 100644
--- a/pkgs/by-name/sl/slippy/package.nix
+++ b/pkgs/by-name/sl/slippy/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "axodotdev";
     repo = "slippy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7Uvo5+saxwTMQjfDliyOYC6j6LbpMf/FiONfX38xepI=";
   };
 
diff --git a/pkgs/by-name/sl/slirp4netns/package.nix b/pkgs/by-name/sl/slirp4netns/package.nix
index 91849a956cca..55048712752d 100644
--- a/pkgs/by-name/sl/slirp4netns/package.nix
+++ b/pkgs/by-name/sl/slirp4netns/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rootless-containers";
     repo = "slirp4netns";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1OiomraQ4wfrBPihGrf9sq8hPJUB45gvf7Y5j7iN8/E=";
   };
 
diff --git a/pkgs/by-name/sl/slop/package.nix b/pkgs/by-name/sl/slop/package.nix
index 7bf6fc1f0779..868e5f4d540b 100644
--- a/pkgs/by-name/sl/slop/package.nix
+++ b/pkgs/by-name/sl/slop/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "slop";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U=";
   };
 
diff --git a/pkgs/by-name/sl/sloth/package.nix b/pkgs/by-name/sl/sloth/package.nix
index 83c9dba28207..b49909c8d94e 100644
--- a/pkgs/by-name/sl/sloth/package.nix
+++ b/pkgs/by-name/sl/sloth/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slok";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qyDKM5Y8wRvqFE9rqnPePBvi/1UwR4vDRQRVTxPc6Ug=";
   };
 
diff --git a/pkgs/by-name/sl/slowhttptest/package.nix b/pkgs/by-name/sl/slowhttptest/package.nix
index 3eadcc232a03..b7498a37ff51 100644
--- a/pkgs/by-name/sl/slowhttptest/package.nix
+++ b/pkgs/by-name/sl/slowhttptest/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shekyan";
     repo = "slowhttptest";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rIvd3LykVAbDXtFWZ1EQ+QKeALzqwK6pq7In0BsCOFo=";
   };
 
diff --git a/pkgs/by-name/sl/slsa-verifier/package.nix b/pkgs/by-name/sl/slsa-verifier/package.nix
index 2c35c1f0ba67..17d83e09c3b3 100644
--- a/pkgs/by-name/sl/slsa-verifier/package.nix
+++ b/pkgs/by-name/sl/slsa-verifier/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slsa-framework";
     repo = "slsa-verifier";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wOK0S0XJ0LbFSr8Z/KEnKolq0u/SyBNDiugOAD0OmgY=";
   };
 
diff --git a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
index 0dc9c42d4b8c..9a8f4f4f389d 100644
--- a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
+++ b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stanford-rc";
     repo = "slurm-spank-stunnel";
-    rev = version;
+    tag = version;
     sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj";
   };
 
diff --git a/pkgs/by-name/sl/slurm-spank-x11/package.nix b/pkgs/by-name/sl/slurm-spank-x11/package.nix
index bd3ff6f9ae82..f89c0edf308b 100644
--- a/pkgs/by-name/sl/slurm-spank-x11/package.nix
+++ b/pkgs/by-name/sl/slurm-spank-x11/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hautreux";
     repo = "slurm-spank-x11";
-    rev = version;
+    tag = version;
     sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry";
   };
 
diff --git a/pkgs/by-name/sm/smag/package.nix b/pkgs/by-name/sm/smag/package.nix
index fc0b1198de61..63be365b14aa 100644
--- a/pkgs/by-name/sm/smag/package.nix
+++ b/pkgs/by-name/sm/smag/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aantn";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Vyd35wYDNI4T7DdqihwpmJOAZGxjnCeWS609o3L+gHM=";
   };
 
diff --git a/pkgs/by-name/sm/smarty3-i18n/package.nix b/pkgs/by-name/sm/smarty3-i18n/package.nix
index cd7e2ac511c8..8fd6b64de3ad 100644
--- a/pkgs/by-name/sm/smarty3-i18n/package.nix
+++ b/pkgs/by-name/sm/smarty3-i18n/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kikimosha";
     repo = "smarty3-i18n";
-    rev = version;
+    tag = version;
     sha256 = "0rjxq4wka73ayna3hb5dxc5pgc8bw8p5fy507yc6cv2pl4h4nji2";
   };
 
diff --git a/pkgs/by-name/sm/smarty3/package.nix b/pkgs/by-name/sm/smarty3/package.nix
index 1e0b41001e6c..ce1bd043bce1 100644
--- a/pkgs/by-name/sm/smarty3/package.nix
+++ b/pkgs/by-name/sm/smarty3/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smarty-php";
     repo = "smarty";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QGhccIJ7BZTWGF+n8rmB1RCVyJKID95NW6Yb2VvqqGQ=";
   };
 
diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix
index 89b42204c16f..14f9c527a051 100644
--- a/pkgs/by-name/sm/smassh/package.nix
+++ b/pkgs/by-name/sm/smassh/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kraanzu";
     repo = "smassh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P0fZHSsaKIwJspEBxM5MEK3Z4kemXJWlIOQI9cmvlF4=";
   };
 
diff --git a/pkgs/by-name/sm/smatch/package.nix b/pkgs/by-name/sm/smatch/package.nix
index b373f462a365..6741eddc02a7 100644
--- a/pkgs/by-name/sm/smatch/package.nix
+++ b/pkgs/by-name/sm/smatch/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "error27";
     repo = "smatch";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME=";
   };
 
diff --git a/pkgs/by-name/sm/smcroute/package.nix b/pkgs/by-name/sm/smcroute/package.nix
index 8b1dd8420ca1..5c5d7640314c 100644
--- a/pkgs/by-name/sm/smcroute/package.nix
+++ b/pkgs/by-name/sm/smcroute/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "smcroute";
-    rev = version;
+    tag = version;
     sha256 = "sha256-b1FsaDw5wAZkOwc6Y7TsMwyfxIRQ2rNUTK+knEzOn7w=";
   };
 
diff --git a/pkgs/by-name/sm/smenu/package.nix b/pkgs/by-name/sm/smenu/package.nix
index 8a76da58bd4b..e8029ce596f9 100644
--- a/pkgs/by-name/sm/smenu/package.nix
+++ b/pkgs/by-name/sm/smenu/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "p-gen";
     repo = "smenu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pAbtTqDIdDWReeaRK7UHXh/PS5f44/PRWaICluH02ec=";
   };
 
diff --git a/pkgs/by-name/sm/smimesign/package.nix b/pkgs/by-name/sm/smimesign/package.nix
index 59c468ccc111..02296c1d38a6 100644
--- a/pkgs/by-name/sm/smimesign/package.nix
+++ b/pkgs/by-name/sm/smimesign/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "github";
     repo = "smimesign";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W9Hj/+snx+X6l95Gt9d8DiLnBPV9npKydc/zMN9G0vQ=";
   };
 
diff --git a/pkgs/by-name/sm/smlfmt/package.nix b/pkgs/by-name/sm/smlfmt/package.nix
index 6eed84bd0bb5..9f8810bf0fcc 100644
--- a/pkgs/by-name/sm/smlfmt/package.nix
+++ b/pkgs/by-name/sm/smlfmt/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shwestrick";
     repo = "smlfmt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qwhYOZrck028NliPDnqFZel3IxopQzouhHq6R7DkfPE=";
   };
 
diff --git a/pkgs/by-name/sm/smlfut/package.nix b/pkgs/by-name/sm/smlfut/package.nix
index 21938595b301..78b87874b063 100644
--- a/pkgs/by-name/sm/smlfut/package.nix
+++ b/pkgs/by-name/sm/smlfut/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "diku-dk";
     repo = "smlfut";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0Bqgoyp43Y961BMghJFBUx+1lcM2HHlPDjPyLHquWiE=";
   };
 
diff --git a/pkgs/by-name/sm/smlpkg/package.nix b/pkgs/by-name/sm/smlpkg/package.nix
index 6a77c6878e7b..4b865daff55d 100644
--- a/pkgs/by-name/sm/smlpkg/package.nix
+++ b/pkgs/by-name/sm/smlpkg/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "diku-dk";
     repo = "smlpkg";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xmbdnfc34ia0a78dhkfv5jyadxndinhw8c47l1mjd4l7n8vqnph";
   };
 
diff --git a/pkgs/by-name/sm/smooth/package.nix b/pkgs/by-name/sm/smooth/package.nix
index 4fdeb5a47b24..fe792ce20c7c 100644
--- a/pkgs/by-name/sm/smooth/package.nix
+++ b/pkgs/by-name/sm/smooth/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "enzo1982";
     repo = "smooth";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-J2Do1iAbE1GBC8co/4nxOzeGJQiPRc+21fgMDpzKX+A=";
   };
 
diff --git a/pkgs/by-name/sm/smu/package.nix b/pkgs/by-name/sm/smu/package.nix
index dbbd80702aa0..629bbd80ed3c 100644
--- a/pkgs/by-name/sm/smu/package.nix
+++ b/pkgs/by-name/sm/smu/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gottox";
     repo = "smu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1jm7lhnzjx4q7gcwlkvsbffcy0zppywyh50d71ami6dnq182vvcc";
   };
 
diff --git a/pkgs/by-name/sm/smug/package.nix b/pkgs/by-name/sm/smug/package.nix
index c7745d1a5cee..560d19405168 100644
--- a/pkgs/by-name/sm/smug/package.nix
+++ b/pkgs/by-name/sm/smug/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ivaaaan";
     repo = "smug";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9So81tZwQa3rQYgVO+KjOlTVIzlm/e2K5C/qULZeA7U=";
   };
 
diff --git a/pkgs/by-name/sn/sn-pro/package.nix b/pkgs/by-name/sn/sn-pro/package.nix
index 51bbee772936..6e296c5eb7d9 100644
--- a/pkgs/by-name/sn/sn-pro/package.nix
+++ b/pkgs/by-name/sn/sn-pro/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "supernotes";
     repo = "sn-pro";
-    rev = version;
+    tag = version;
     hash = "sha256-bagirVJtpGZOB3rULKemniGj1BkN9SQYpFhTm4ZX/is=";
   };
 
diff --git a/pkgs/by-name/sn/snabb/package.nix b/pkgs/by-name/sn/snabb/package.nix
index 2adae8cc4dd8..160d412c1453 100644
--- a/pkgs/by-name/sn/snabb/package.nix
+++ b/pkgs/by-name/sn/snabb/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "snabbco";
     repo = "snabb";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-2ULkzNeyEkXFdd8BUEcY5wZswh8Z4s4ONqSQbeWK2Qs=";
   };
 
diff --git a/pkgs/by-name/sn/snapper/package.nix b/pkgs/by-name/sn/snapper/package.nix
index 11ab0eb18e76..a201c60771d7 100644
--- a/pkgs/by-name/sn/snapper/package.nix
+++ b/pkgs/by-name/sn/snapper/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "snapper";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yVjsbWa7t+md0xdy5eFST+pkPbXhgfyJcTt+aNkQpsQ=";
   };
 
diff --git a/pkgs/by-name/sn/snappy/package.nix b/pkgs/by-name/sn/snappy/package.nix
index cb6c6e559b89..cf51a2c3f7f1 100644
--- a/pkgs/by-name/sn/snappy/package.nix
+++ b/pkgs/by-name/sn/snappy/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "snappy";
-    rev = version;
+    tag = version;
     hash = "sha256-IzKzrMDjh+Weor+OrKdX62cAKYTdDXgldxCgNE2/8vk=";
   };
 
diff --git a/pkgs/by-name/sn/snapraid/package.nix b/pkgs/by-name/sn/snapraid/package.nix
index dc9e35aca1ff..8f0cf4c59ac5 100644
--- a/pkgs/by-name/sn/snapraid/package.nix
+++ b/pkgs/by-name/sn/snapraid/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amadvance";
     repo = "snapraid";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7guTRH9AZCsQYyWLpws19/sEe9GVFop21GYPzXCK6Fg=";
   };
 
diff --git a/pkgs/by-name/sn/snapweb/package.nix b/pkgs/by-name/sn/snapweb/package.nix
index e3b1673a9180..b3e4f3d82559 100644
--- a/pkgs/by-name/sn/snapweb/package.nix
+++ b/pkgs/by-name/sn/snapweb/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "badaix";
     repo = "snapweb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rrJmuTFk2dC+GqYmBZ+hu5hx1iknAgSWjr22S7bfmEE=";
   };
 
diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix
index 38efbbf4ec75..948c4214b699 100644
--- a/pkgs/by-name/sn/snazy/package.nix
+++ b/pkgs/by-name/sn/snazy/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Vc3L93S7WQAcqsLIhiCrTGmmc+1q26zRpOWXyUNFNVc=";
   };
 
diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix
index 970f4a48ee26..84d2febd66a9 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/sn/sngrep/package.nix b/pkgs/by-name/sn/sngrep/package.nix
index 44639ea1d8e5..895c2188a639 100644
--- a/pkgs/by-name/sn/sngrep/package.nix
+++ b/pkgs/by-name/sn/sngrep/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "irontec";
     repo = "sngrep";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-nvuT//FWJAa6DzmjBsBW9s2p1M+6Zs4cVmpK4dVemnE=";
   };
 
diff --git a/pkgs/by-name/sn/sniffglue/package.nix b/pkgs/by-name/sn/sniffglue/package.nix
index 459d2fb5f576..b84e7c70bff5 100644
--- a/pkgs/by-name/sn/sniffglue/package.nix
+++ b/pkgs/by-name/sn/sniffglue/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "sniffglue";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Pp/SJJQFpEU/4GKZQB8BjRGS4hqB850QbSb5WoG6Wh4=";
   };
 
diff --git a/pkgs/by-name/sn/snippetpixie/package.nix b/pkgs/by-name/sn/snippetpixie/package.nix
index 1e0382ff5f61..83b77c416544 100644
--- a/pkgs/by-name/sn/snippetpixie/package.nix
+++ b/pkgs/by-name/sn/snippetpixie/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bytepixie";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0gs3d9hdywg4vcfbp4qfcagfjqalfgw9xpvywg4pw1cm3rzbdqmz";
   };
 
diff --git a/pkgs/by-name/sn/sniproxy/package.nix b/pkgs/by-name/sn/sniproxy/package.nix
index 9714d6de36d1..24f810eed53c 100644
--- a/pkgs/by-name/sn/sniproxy/package.nix
+++ b/pkgs/by-name/sn/sniproxy/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dlundquist";
     repo = "sniproxy";
-    rev = version;
+    tag = version;
     sha256 = "sha256-htM9CrzaGnn1dnsWQ+0V6N65Og7rsFob3BlSc4UGfFU=";
   };
 
diff --git a/pkgs/by-name/sn/snips-sh/package.nix b/pkgs/by-name/sn/snips-sh/package.nix
index 2c0650c0a0e0..adeefd4aadc1 100644
--- a/pkgs/by-name/sn/snips-sh/package.nix
+++ b/pkgs/by-name/sn/snips-sh/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "robherley";
     repo = "snips.sh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IjGXGY75k9VeeHek0V8SrIElmiQ+Q2P5gEDIp7pmQd8=";
   };
 
diff --git a/pkgs/by-name/sn/snooze/package.nix b/pkgs/by-name/sn/snooze/package.nix
index d57f48e36a0e..b6ed3616711b 100644
--- a/pkgs/by-name/sn/snooze/package.nix
+++ b/pkgs/by-name/sn/snooze/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "snooze";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-K77axli/mapUr3yxpmUfFq4iWwgRmEVUlP6+/0Iezwo=";
   };
   makeFlags = [
diff --git a/pkgs/by-name/sn/snore/package.nix b/pkgs/by-name/sn/snore/package.nix
index 5ad31a29ee35..7311f17fcfbe 100644
--- a/pkgs/by-name/sn/snore/package.nix
+++ b/pkgs/by-name/sn/snore/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "clamiax";
     repo = "snore";
-    rev = version;
+    tag = version;
     hash = "sha256-bKPGSePzp4XEZFY0QQr37fm3R1v3hLD6FeySFd7zNJc=";
   };
 
diff --git a/pkgs/by-name/sn/snowcat/package.nix b/pkgs/by-name/sn/snowcat/package.nix
index aa4899dda997..44c6eca4fb63 100644
--- a/pkgs/by-name/sn/snowcat/package.nix
+++ b/pkgs/by-name/sn/snowcat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-EulQYGOMIh952e4Xp13hT/HMW3qP1QXYtt5PEej1VTY=";
   };
   vendorHash = "sha256-D6ipwGMxT0B3uYUzg6Oo2TYnsOVBY0mYO5lC7vtVPc0=";
diff --git a/pkgs/by-name/so/social-engineer-toolkit/package.nix b/pkgs/by-name/so/social-engineer-toolkit/package.nix
index 696ed2d71fb2..1948578a432b 100644
--- a/pkgs/by-name/so/social-engineer-toolkit/package.nix
+++ b/pkgs/by-name/so/social-engineer-toolkit/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "trustedsec";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "ePbmUvnzLO0Wfuhym3bNSPV1x8rcCPqKMeWSRcbJGAo=";
   };
 
diff --git a/pkgs/by-name/so/sockperf/package.nix b/pkgs/by-name/so/sockperf/package.nix
index 7a1415d2e1f3..b684f65b3319 100644
--- a/pkgs/by-name/so/sockperf/package.nix
+++ b/pkgs/by-name/so/sockperf/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mellanox";
     repo = "sockperf";
-    rev = version;
+    tag = version;
     sha256 = "sha256-VvxL/bcn69uL7CBpDu4qwbKZwlC4N/kNeRX4k3UzxPI=";
   };
 
diff --git a/pkgs/by-name/so/soco-cli/package.nix b/pkgs/by-name/so/soco-cli/package.nix
index 437d2cd92b53..e4a5c9b5e05e 100644
--- a/pkgs/by-name/so/soco-cli/package.nix
+++ b/pkgs/by-name/so/soco-cli/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "avantrec";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WxBwHjh5tCXclQXqrHrpvZdcQU93RObteAfZyyVvKf0=";
   };
 
diff --git a/pkgs/by-name/so/sof-tools/package.nix b/pkgs/by-name/so/sof-tools/package.nix
index a48693df45c2..3c08cb3abf2c 100644
--- a/pkgs/by-name/so/sof-tools/package.nix
+++ b/pkgs/by-name/so/sof-tools/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thesofproject";
     repo = "sof";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VmP0z3q1P8LqQ+ELZGkI7lEXGiMYdAPvS8Lbwv6dUyk=";
   };
 
diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix
index 5f24aed06052..909b045b9a9c 100644
--- a/pkgs/by-name/so/soft-serve/package.nix
+++ b/pkgs/by-name/so/soft-serve/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "soft-serve";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CFUcpQ0tFpK1yKNLBwhRP6ncr44Ql3s30BNWYUiXH/w=";
   };
 
diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix
index 8e589e257a6a..077880e1228a 100644
--- a/pkgs/by-name/so/solvespace/package.nix
+++ b/pkgs/by-name/so/solvespace/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "solvespace";
     repo = "solvespace";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sSDht8pBrOG1YpsWfC/CLTTWh2cI5pn2PXGH900Z0yA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/so/somafm-cli/package.nix b/pkgs/by-name/so/somafm-cli/package.nix
index 7a9042b6836b..a3efbffefae5 100644
--- a/pkgs/by-name/so/somafm-cli/package.nix
+++ b/pkgs/by-name/so/somafm-cli/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rockymadden";
     repo = "somafm-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1h5p9qsczgfr450sklh2vkllcpzb7nicbs8ciyvkavh3d7hds0yy";
   };
 
diff --git a/pkgs/by-name/so/somatic-sniper/package.nix b/pkgs/by-name/so/somatic-sniper/package.nix
index e979fcee2cb7..8fa006d46d55 100644
--- a/pkgs/by-name/so/somatic-sniper/package.nix
+++ b/pkgs/by-name/so/somatic-sniper/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "genome";
     repo = "somatic-sniper";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0lk7p9sp6mp50f6w1nppqhr40fcwy1asw06ivw8w8jvvnwaqf987";
   };
 
diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix
index d3205fbccf88..81eb6d1ae577 100644
--- a/pkgs/by-name/so/sonarlint-ls/package.nix
+++ b/pkgs/by-name/so/sonarlint-ls/package.nix
@@ -21,7 +21,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "SonarSource";
     repo = "sonarlint-language-server";
-    rev = version;
+    tag = version;
     hash = "sha256-/SpooLAJutBJ/FakSUyXMtPLy3TaPxCU8KEMnnzgdBs=";
   };
 
diff --git a/pkgs/by-name/so/sonata/package.nix b/pkgs/by-name/so/sonata/package.nix
index 2311c8d3ba13..b20cc0388c29 100644
--- a/pkgs/by-name/so/sonata/package.nix
+++ b/pkgs/by-name/so/sonata/package.nix
@@ -29,7 +29,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "multani";
     repo = "sonata";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x";
   };
 
diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix
index aaff4caac201..b235a4bf64b6 100644
--- a/pkgs/by-name/so/songrec/package.nix
+++ b/pkgs/by-name/so/songrec/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "marin-m";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-pTonrxlYvfuLRKMXW0Lao4KCoNFlMzE9rH+hwpa60JY=";
   };
 
diff --git a/pkgs/by-name/so/sonivox/package.nix b/pkgs/by-name/so/sonivox/package.nix
index 717f8eefa752..62fbba276eac 100644
--- a/pkgs/by-name/so/sonivox/package.nix
+++ b/pkgs/by-name/so/sonivox/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pedrolcl";
     repo = "sonivox";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-k+EhhLFp+ehptjDS8ZHvo5tfFxmSCA2lFTjkWFLi+cs=";
   };
 
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/so/sooperlooper/package.nix b/pkgs/by-name/so/sooperlooper/package.nix
index 2dd184be7ecf..5da1c393f061 100644
--- a/pkgs/by-name/so/sooperlooper/package.nix
+++ b/pkgs/by-name/so/sooperlooper/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "essej";
     repo = "sooperlooper";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Lrsz/UDCgoac63FJ3CaPVaYwvBtzkGQQRLhUi6lUusE=";
   };
 
diff --git a/pkgs/by-name/so/sophus/package.nix b/pkgs/by-name/so/sophus/package.nix
index 69e59195e7ac..5acb8802daf5 100644
--- a/pkgs/by-name/so/sophus/package.nix
+++ b/pkgs/by-name/so/sophus/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "strasdat";
     repo = "Sophus";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-k5t3kSUrH6B1f60dtqq3Ai4R4D2h+Ld+6Cpljl/AN0w=";
   };
 
diff --git a/pkgs/by-name/so/sord/package.nix b/pkgs/by-name/so/sord/package.nix
index bec23bbd710c..9cbdf03cc496 100644
--- a/pkgs/by-name/so/sord/package.nix
+++ b/pkgs/by-name/so/sord/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "drobilla";
     repo = "sord";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cFobmmO2RHJdfCgTyGigzsdLpj7YF6U3r71i267Azks=";
   };
 
diff --git a/pkgs/by-name/so/souffle/package.nix b/pkgs/by-name/so/souffle/package.nix
index d0f8a16c7342..45f7992bef68 100644
--- a/pkgs/by-name/so/souffle/package.nix
+++ b/pkgs/by-name/so/souffle/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "souffle-lang";
     repo = "souffle";
-    rev = version;
+    tag = version;
     sha256 = "sha256-U3/1iNOLFzuXiBsVDAc5AXnK4F982Uifp18jjFNUv2o=";
   };
 
diff --git a/pkgs/by-name/so/soundtouch/package.nix b/pkgs/by-name/so/soundtouch/package.nix
index 12540494e975..d3deff2f69eb 100644
--- a/pkgs/by-name/so/soundtouch/package.nix
+++ b/pkgs/by-name/so/soundtouch/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "soundtouch";
     repo = "soundtouch";
-    rev = version;
+    tag = version;
     hash = "sha256-imeeTj+3gXxoGTuC/13+BAplwcnQ0wRJdSVt7MPlBxc=";
   };
 
diff --git a/pkgs/by-name/so/sov/package.nix b/pkgs/by-name/so/sov/package.nix
index e7a27e8372a3..b07f80088b23 100644
--- a/pkgs/by-name/so/sov/package.nix
+++ b/pkgs/by-name/so/sov/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "milgra";
     repo = "sov";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-JgLah21ye3G9jE3UTZu8r+nanwBDIQXmqv9iP1C+aUw=";
   };
 
diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix
index cd8a5bae52ca..27d47b26dff4 100644
--- a/pkgs/by-name/so/sozu/package.nix
+++ b/pkgs/by-name/so/sozu/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sozu-proxy";
     repo = "sozu";
-    rev = version;
+    tag = version;
     hash = "sha256-Cda53lhKPxm2w8guoKuQjdjhZNWJinzR1PHc5S57y2w=";
   };
 
diff --git a/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix
index 12455e9dc40e..d42c2c8ae813 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix
@@ -36,7 +36,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "space-wizards";
     repo = "SS14.Launcher";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Gajs8zINWBJ3BvAPKYan0bCRbEVscz56pyE9WOLiOqU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix
index da44ad45380c..e437f2e09605 100644
--- a/pkgs/by-name/sp/spaceFM/package.nix
+++ b/pkgs/by-name/sp/spaceFM/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IgnorantGuru";
     repo = "spacefm";
-    rev = version;
+    tag = version;
     sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
   };
 
diff --git a/pkgs/by-name/sp/spacebar/package.nix b/pkgs/by-name/sp/spacebar/package.nix
index 535b8d5876d8..d4d63d1d399a 100644
--- a/pkgs/by-name/sp/spacebar/package.nix
+++ b/pkgs/by-name/sp/spacebar/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cmacrae";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM=";
   };
 
diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix
index 5be2be78aa8b..9e16fba31f6a 100644
--- a/pkgs/by-name/sp/spacectl/package.nix
+++ b/pkgs/by-name/sp/spacectl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "spacelift-io";
     repo = "spacectl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3s64o4rmkbvT9rOdqYZN1No08Lh1S4oNlIal+otfhWU=";
   };
 
diff --git a/pkgs/by-name/sp/spacer/package.nix b/pkgs/by-name/sp/spacer/package.nix
index c195e03b3f6e..7d3fe8abca3a 100644
--- a/pkgs/by-name/sp/spacer/package.nix
+++ b/pkgs/by-name/sp/spacer/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "samwho";
     repo = "spacer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N6HNPuEYcbuqpHv8Qr43iRtRdtyBo4TP7YccIcbpIpc=";
   };
 
diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix
index e6c64c1c4484..f342e4c205e9 100644
--- a/pkgs/by-name/sp/spaceship-prompt/package.nix
+++ b/pkgs/by-name/sp/spaceship-prompt/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "denysdovhan";
     repo = "spaceship-prompt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-a7z/z++dmwMqIrutOc74ljz/Tu/wuEuQaN2XRBMtOvw=";
   };
 
diff --git a/pkgs/by-name/sp/spacevim/package.nix b/pkgs/by-name/sp/spacevim/package.nix
index 104e30e50d1c..e2a6da8fdc7b 100644
--- a/pkgs/by-name/sp/spacevim/package.nix
+++ b/pkgs/by-name/sp/spacevim/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SpaceVim";
     repo = "SpaceVim";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qiNadhQJjU9RY14X8+pd4Ul+NLoNqbxuh3Kenw1dHDc=";
   };
 
diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix
index 657976b3d2cb..d41c1e142d28 100644
--- a/pkgs/by-name/sp/spade/package.nix
+++ b/pkgs/by-name/sp/spade/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "spade-lang";
     repo = "spade";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eWeEbwIm+PC0XHmvV3xZqUIcA01arnalbGFtPTUP9tg=";
     # only needed for vatch, which contains test data
     fetchSubmodules = true;
diff --git a/pkgs/by-name/sp/span-lite/package.nix b/pkgs/by-name/sp/span-lite/package.nix
index 50940924f3ab..ae70110ce175 100644
--- a/pkgs/by-name/sp/span-lite/package.nix
+++ b/pkgs/by-name/sp/span-lite/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martinmoene";
     repo = "span-lite";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BYRSdGzIvrOjPXxeabMj4tPFmQ0wfq7y+zJf6BD/bTw=";
   };
 
diff --git a/pkgs/by-name/sp/sparkleshare/package.nix b/pkgs/by-name/sp/sparkleshare/package.nix
index 62606d12dc97..7180d7dd4c96 100644
--- a/pkgs/by-name/sp/sparkleshare/package.nix
+++ b/pkgs/by-name/sp/sparkleshare/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hbons";
     repo = "SparkleShare";
-    rev = version;
+    tag = version;
     sha256 = "1a9csflmj96iyr1l0mdm3ziv1bljfcjnzm9xb2y4qqk7ha2p6fbq";
   };
 
diff --git a/pkgs/by-name/sp/spatial-shell/package.nix b/pkgs/by-name/sp/spatial-shell/package.nix
index 1147698930ec..879714ef0ce5 100644
--- a/pkgs/by-name/sp/spatial-shell/package.nix
+++ b/pkgs/by-name/sp/spatial-shell/package.nix
@@ -12,7 +12,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "lthms";
     repo = "spatial-shell";
-    rev = version;
+    tag = version;
     hash = "sha256-OeNBP/jea1ABh/WpvCP7We+L20WoTfLZH71raH7bKPI=";
   };
 
diff --git a/pkgs/by-name/sp/spdk/package.nix b/pkgs/by-name/sp/spdk/package.nix
index 7a3e57071253..eae53a785d5d 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/spdx-license-list-data/package.nix b/pkgs/by-name/sp/spdx-license-list-data/package.nix
index c75633ed90bf..810bde2389cd 100644
--- a/pkgs/by-name/sp/spdx-license-list-data/package.nix
+++ b/pkgs/by-name/sp/spdx-license-list-data/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spdx";
     repo = "license-list-data";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Zz171OlSa8bzxQUinyO/FF4QjBc4wKp0EUEXwzJewEU=";
   };
 
diff --git a/pkgs/by-name/sp/spectra/package.nix b/pkgs/by-name/sp/spectra/package.nix
index 9db8b068fb3f..cc6489dd40c3 100644
--- a/pkgs/by-name/sp/spectra/package.nix
+++ b/pkgs/by-name/sp/spectra/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yixuan";
     repo = "spectra";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ut6nEOpzIoFy+IUWQy9x2pJ4+sA0d/Dt8WaNq5AFCFg=";
   };
 
diff --git a/pkgs/by-name/sp/spfft/package.nix b/pkgs/by-name/sp/spfft/package.nix
index a1b0279b080b..870fd317b079 100644
--- a/pkgs/by-name/sp/spfft/package.nix
+++ b/pkgs/by-name/sp/spfft/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eth-cscs";
     repo = "SpFFT";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Qc/omdRv7dW9NJUOczMZJKhc+Z/sXeIxv3SbpegAGdU=";
   };
 
diff --git a/pkgs/by-name/sp/spice-up/package.nix b/pkgs/by-name/sp/spice-up/package.nix
index 48b1bce684c3..4c4218b83ad1 100644
--- a/pkgs/by-name/sp/spice-up/package.nix
+++ b/pkgs/by-name/sp/spice-up/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Philip-Scott";
     repo = "Spice-up";
-    rev = version;
+    tag = version;
     sha256 = "sha256-FI6YMbqZfaU19k8pS2eoNCnX8O8F99SHHOxMwHC5fTc=";
   };
 
diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix
index 24ba6b58db2c..782b04ff1b13 100644
--- a/pkgs/by-name/sp/spicetify-cli/package.nix
+++ b/pkgs/by-name/sp/spicetify-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rdyHVHKVgl9fOviFYQuXY8Ko+/XwpKlKDfriQAgkusE=";
   };
 
diff --git a/pkgs/by-name/sp/spicy-parser-generator/package.nix b/pkgs/by-name/sp/spicy-parser-generator/package.nix
index 41a2d44929e1..6a2d0f195229 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-MLwBklSNLqx3LgNSFvo5p/MPyt/IlYGwvTbN1PJlims=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sp/spicy/package.nix b/pkgs/by-name/sp/spicy/package.nix
index 76db75020481..e44bea0355fd 100644
--- a/pkgs/by-name/sp/spicy/package.nix
+++ b/pkgs/by-name/sp/spicy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trhodeos";
     repo = "spicy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TodMm4UbnLB+LiyfPVXT7bcVLbyBFbGoOYQSsz3IMfM=";
   };
 
diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix
index d4563bebf85f..5bf80fb8f1d0 100644
--- a/pkgs/by-name/sp/spire/package.nix
+++ b/pkgs/by-name/sp/spire/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "spiffe";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hNa1e6h4IhD2SfhZZ5xkwQ7e7X5x3Gk4v33nw2t+cvk=";
   };
 
diff --git a/pkgs/by-name/sp/spla/package.nix b/pkgs/by-name/sp/spla/package.nix
index ee203b200913..a987797a1507 100644
--- a/pkgs/by-name/sp/spla/package.nix
+++ b/pkgs/by-name/sp/spla/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eth-cscs";
     repo = "spla";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fNH1IOKV1Re8G7GH9Xfn3itR80eonTbEGKQRRD16/2k=";
   };
 
diff --git a/pkgs/by-name/sp/spoof/package.nix b/pkgs/by-name/sp/spoof/package.nix
index a9af358d968b..f832acc961ee 100644
--- a/pkgs/by-name/sp/spoof/package.nix
+++ b/pkgs/by-name/sp/spoof/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "feross";
     repo = "spoof";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oysURKLQ/rbGAvsy3K0OmDRHUqRKa8S8l5ihBjNqYXc=";
   };
 
diff --git a/pkgs/by-name/sp/spoofdpi/package.nix b/pkgs/by-name/sp/spoofdpi/package.nix
index 1b7d67f8cd36..f80e0b85d584 100644
--- a/pkgs/by-name/sp/spoofdpi/package.nix
+++ b/pkgs/by-name/sp/spoofdpi/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xvzc";
     repo = "SpoofDPI";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m4fhFhZLuWT1diDlDTmTsNrckKTjhEZbhciv44FZcro=";
   };
 
diff --git a/pkgs/by-name/sp/spotify-tray/package.nix b/pkgs/by-name/sp/spotify-tray/package.nix
index 60c1d1eb8d10..5a0924f20689 100644
--- a/pkgs/by-name/sp/spotify-tray/package.nix
+++ b/pkgs/by-name/sp/spotify-tray/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tsmetana";
     repo = "spotify-tray";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-E86rA8cBjy/bI7sZHlT40o7i23PcONXT5GTHEfcaDf0=";
   };
 
diff --git a/pkgs/by-name/sp/spral/package.nix b/pkgs/by-name/sp/spral/package.nix
index e8376d81e716..f5f0f94cd9e7 100644
--- a/pkgs/by-name/sp/spral/package.nix
+++ b/pkgs/by-name/sp/spral/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ralna";
     repo = "spral";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tuhJClSjah/ud6PVr6biOq5KdKtspJ7hpWZ350yzz+U=";
   };
 
diff --git a/pkgs/by-name/sp/spruce/package.nix b/pkgs/by-name/sp/spruce/package.nix
index 7e84b075cfae..cb4fdd7a666f 100644
--- a/pkgs/by-name/sp/spruce/package.nix
+++ b/pkgs/by-name/sp/spruce/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "geofffranks";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wLxPHaCU0fciSIdK26dV4XOnJsp5EKKEXzgspWC1GvA=";
   };
 
diff --git a/pkgs/by-name/sp/sptk/package.nix b/pkgs/by-name/sp/sptk/package.nix
index 79a0c8a4c501..0b7b2acaf8b3 100644
--- a/pkgs/by-name/sp/sptk/package.nix
+++ b/pkgs/by-name/sp/sptk/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sp-nitech";
     repo = "SPTK";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lIyOcN2AR3ilUZ9stpicjbwlredbwgGPwmMICxZEijU=";
   };
 
diff --git a/pkgs/by-name/sp/sptlrx/package.nix b/pkgs/by-name/sp/sptlrx/package.nix
index 4c20e7a6d59a..535bae927b8e 100644
--- a/pkgs/by-name/sp/sptlrx/package.nix
+++ b/pkgs/by-name/sp/sptlrx/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "raitonoberu";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-b8ALhEjolH0RH+I9HVQeOagPBi2isLNUxqKdj5u2O9s=";
   };
 
diff --git a/pkgs/by-name/sp/spyre/package.nix b/pkgs/by-name/sp/spyre/package.nix
index c9296162f014..bcef0ab1f2f0 100644
--- a/pkgs/by-name/sp/spyre/package.nix
+++ b/pkgs/by-name/sp/spyre/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "spyre-project";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wlGZTMCJE6Ki5/6R6J9EJP06/S125BNNd/jNPYGwKNw=";
   };
 
diff --git a/pkgs/by-name/sq/sq/package.nix b/pkgs/by-name/sq/sq/package.nix
index 6b18c426d126..c3fca2762594 100644
--- a/pkgs/by-name/sq/sq/package.nix
+++ b/pkgs/by-name/sq/sq/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "neilotoole";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-y7+UfwTbL0KTQgz4JX/q6QQqL0n8SO1qgKTrK9AFhO4=";
   };
 
diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix
index 9125450950b3..9078007970dd 100644
--- a/pkgs/by-name/sq/sql-formatter/package.nix
+++ b/pkgs/by-name/sq/sql-formatter/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sql-formatter-org";
     repo = "sql-formatter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-13S7Qagra+RxWOct7wsvK1C0QftWtLZRB58YVWw9gGU=";
   };
 
diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix
index 1624d07f80aa..0726f9d62504 100644
--- a/pkgs/by-name/sq/sql-studio/package.nix
+++ b/pkgs/by-name/sq/sql-studio/package.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "frectonz";
     repo = "sql-studio";
-    rev = version;
+    tag = version;
     hash = "sha256-ZWGV4DYf+85LIGVDc8hcWSEJsM6UisuCB2Wd2kiw/sk=";
   };
 
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/sq/sqlcipher/package.nix b/pkgs/by-name/sq/sqlcipher/package.nix
index c102af52448b..c8925deeb415 100644
--- a/pkgs/by-name/sq/sqlcipher/package.nix
+++ b/pkgs/by-name/sq/sqlcipher/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sqlcipher";
     repo = "sqlcipher";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VcD3NwVrC75kLOJiIgrnzVpkBPhjxTmEFyKg/87wHGc=";
   };
 
diff --git a/pkgs/by-name/sq/sqlcmd/package.nix b/pkgs/by-name/sq/sqlcmd/package.nix
index bb27d50a6870..479b773b8e1c 100644
--- a/pkgs/by-name/sq/sqlcmd/package.nix
+++ b/pkgs/by-name/sq/sqlcmd/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "go-sqlcmd";
     owner = "microsoft";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LHNH/Jybtv+P/mRby3/nn8XjDHYWDTtgefb8z35J2VM=";
   };
 
diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix
index bfcda6373cb3..46f0824f8ab1 100644
--- a/pkgs/by-name/sq/sqldef/package.nix
+++ b/pkgs/by-name/sq/sqldef/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sqldef";
     repo = "sqldef";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vwkvKOM8/57lzT6toLqaux3yJD6zYi+J5Ae1qhxnhEw=";
   };
 
diff --git a/pkgs/by-name/sq/sqlitecpp/package.nix b/pkgs/by-name/sq/sqlitecpp/package.nix
index e1dcac1598de..f6f8f5a33494 100644
--- a/pkgs/by-name/sq/sqlitecpp/package.nix
+++ b/pkgs/by-name/sq/sqlitecpp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "SRombauts";
     repo = "sqlitecpp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-rsVFk4FsonrwpBd3TonkxilwWeOBocH8AyeB+71OBdI=";
   };
 
diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix
index 9972a052e431..b105af2c91f0 100644
--- a/pkgs/by-name/sq/sqlitestudio/package.nix
+++ b/pkgs/by-name/sq/sqlitestudio/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pawelsalawa";
     repo = "sqlitestudio";
-    rev = version;
+    tag = version;
     hash = "sha256-nGu1MYI3uaQ/3rc5LlixF6YEUU+pUsB6rn/yjFDGYf0=";
   };
 
diff --git a/pkgs/by-name/sq/sqls/package.nix b/pkgs/by-name/sq/sqls/package.nix
index 473beadb4be0..114a07f295d8 100644
--- a/pkgs/by-name/sq/sqls/package.nix
+++ b/pkgs/by-name/sq/sqls/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sqls-server";
     repo = "sqls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-b3zLyj2n+eKOPBRooS68GfM0bsiTVXDblYKyBYKiYug=";
   };
 
diff --git a/pkgs/by-name/sq/squashfsTools/package.nix b/pkgs/by-name/sq/squashfsTools/package.nix
index 8629b8f53943..bedbac1470fc 100644
--- a/pkgs/by-name/sq/squashfsTools/package.nix
+++ b/pkgs/by-name/sq/squashfsTools/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "plougher";
     repo = "squashfs-tools";
-    rev = version;
+    tag = version;
     hash = "sha256-C/awQpp1Q/0adx3YVNTq6ruEAzcjL5G7SkOCgpvAA50=";
   };
 
diff --git a/pkgs/by-name/sq/squashfuse/package.nix b/pkgs/by-name/sq/squashfuse/package.nix
index 172979803507..9c877676c57a 100644
--- a/pkgs/by-name/sq/squashfuse/package.nix
+++ b/pkgs/by-name/sq/squashfuse/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vasi";
     repo = "squashfuse";
-    rev = version;
+    tag = version;
     sha256 = "sha256-d2mc6bIlprnVV5yCN7WxrE91ZMTSaJtpR0UVEROoYJQ=";
   };
 
diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix
index d3fabde12927..f2cabc0e572e 100644
--- a/pkgs/by-name/sq/squirreldisk/package.nix
+++ b/pkgs/by-name/sq/squirreldisk/package.nix
@@ -23,7 +23,7 @@ let
   src = fetchFromGitHub {
     owner = "adileo";
     repo = "squirreldisk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-As2nvc68knjeLPuX0QLBoybj8vuvkpS5Vr+7U7E5CjA=";
   };
   frontend-build = buildNpmPackage {
diff --git a/pkgs/by-name/sr/srain/package.nix b/pkgs/by-name/sr/srain/package.nix
index 96eaf54390ec..6a091c84a51c 100644
--- a/pkgs/by-name/sr/srain/package.nix
+++ b/pkgs/by-name/sr/srain/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SrainApp";
     repo = "srain";
-    rev = version;
+    tag = version;
     hash = "sha256-c5dy5dD5Eb/MVNCpLqIGNuafsrmgLjEfRfSxKVxu5wY=";
   };
 
diff --git a/pkgs/by-name/sr/srandrd/package.nix b/pkgs/by-name/sr/srandrd/package.nix
index 28f2136486af..4fb359fc9b98 100644
--- a/pkgs/by-name/sr/srandrd/package.nix
+++ b/pkgs/by-name/sr/srandrd/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jceb";
     repo = "srandrd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Wf+tVqDaNAiH6UHN8fFv2wM+LEch6wKlZOkqWEqLLkw=";
   };
 
diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix
index 3057f97ad5ae..1678198e4f60 100644
--- a/pkgs/by-name/sr/src-cli/package.nix
+++ b/pkgs/by-name/sr/src-cli/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "src-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-vxoki4kQL3B0v3AhqZGzw3U5BF73Jg5pX92EldTYiWg=";
   };
 
diff --git a/pkgs/by-name/sr/sregex/package.nix b/pkgs/by-name/sr/sregex/package.nix
index 8472743e5336..ed9a4a9f9e40 100644
--- a/pkgs/by-name/sr/sregex/package.nix
+++ b/pkgs/by-name/sr/sregex/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openresty";
     repo = "sregex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HZ9O/3BQHHrTVLLlU0o1fLHxyRSesBhreT3IdGHnNsg=";
   };
 
diff --git a/pkgs/by-name/sr/srisum/package.nix b/pkgs/by-name/sr/srisum/package.nix
index 085d7f7011fe..3da213557a75 100644
--- a/pkgs/by-name/sr/srisum/package.nix
+++ b/pkgs/by-name/sr/srisum/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zkat";
     repo = "srisum-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Nw3uTGOcz1ivAm9X+PnOdNA937wuK3vtJQ0iJHlHVdw=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/sr/srt/package.nix b/pkgs/by-name/sr/srt/package.nix
index 6dfb61849ad6..35f2f60b75a9 100644
--- a/pkgs/by-name/sr/srt/package.nix
+++ b/pkgs/by-name/sr/srt/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Haivision";
     repo = "srt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-NLy9GuP4OT/kKAIIDXSHtsmaBzXRuFohFM/aM+46cao=";
   };
 
diff --git a/pkgs/by-name/sr/srtp/package.nix b/pkgs/by-name/sr/srtp/package.nix
index 6d3262407817..42dac8854635 100644
--- a/pkgs/by-name/sr/srtp/package.nix
+++ b/pkgs/by-name/sr/srtp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cisco";
     repo = "libsrtp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vWL5bksKT5NUoNkIRiJ2FeGODQthD8SgXjCaA7SeTe4=";
   };
 
diff --git a/pkgs/by-name/sr/srtrelay/package.nix b/pkgs/by-name/sr/srtrelay/package.nix
index 975a38408c37..361db913c246 100644
--- a/pkgs/by-name/sr/srtrelay/package.nix
+++ b/pkgs/by-name/sr/srtrelay/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "voc";
     repo = "srtrelay";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-llBPlfvW9Bvm9nL8w4BTOgccsQNAAb3omRBXBISNBcc=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-agents/package.nix b/pkgs/by-name/ss/ssh-agents/package.nix
index 7c15a763f42f..ede80771ba0b 100644
--- a/pkgs/by-name/ss/ssh-agents/package.nix
+++ b/pkgs/by-name/ss/ssh-agents/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kalbasit";
     repo = "ssh-agents";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1l09zy87033v7hd17lhkxikwikqz5nj9x6c2w80rqpad4lp9ihwz";
   };
 
diff --git a/pkgs/by-name/ss/ssh-chat/package.nix b/pkgs/by-name/ss/ssh-chat/package.nix
index a6592121aae9..3858fee0e7fe 100644
--- a/pkgs/by-name/ss/ssh-chat/package.nix
+++ b/pkgs/by-name/ss/ssh-chat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shazow";
     repo = "ssh-chat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LgrqIuM/tLC0JqDai2TLu6G/edZ5Q7WFXjX5bzc0Bcc=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-key-confirmer/package.nix b/pkgs/by-name/ss/ssh-key-confirmer/package.nix
index 7a9add923ca0..7643761536bb 100644
--- a/pkgs/by-name/ss/ssh-key-confirmer/package.nix
+++ b/pkgs/by-name/ss/ssh-key-confirmer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "benjojo";
     repo = "ssh-key-confirmer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CXDjm8PMdCTwHnZWa0fYKel7Rmxq0XBWkfLmoVuSkKM=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-to-age/package.nix b/pkgs/by-name/ss/ssh-to-age/package.nix
index db0e49155c7d..8029d4151a5e 100644
--- a/pkgs/by-name/ss/ssh-to-age/package.nix
+++ b/pkgs/by-name/ss/ssh-to-age/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "ssh-to-age";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Y+GC8Zkznjr0pTvYED+uE1v6zIg+tq44F++ZrBytS1E=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-to-pgp/package.nix b/pkgs/by-name/ss/ssh-to-pgp/package.nix
index 2d7d8f3db54e..a4a84ccfa9a3 100644
--- a/pkgs/by-name/ss/ssh-to-pgp/package.nix
+++ b/pkgs/by-name/ss/ssh-to-pgp/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "ssh-to-pgp";
-    rev = version;
+    tag = version;
     sha256 = "sha256-h1/KWkbHpROkMRJ3pMN42/9+thlfY8BtWoOvqt7rxII=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-tpm-agent/package.nix b/pkgs/by-name/ss/ssh-tpm-agent/package.nix
index ca13fe9d84ba..9bc267d75248 100644
--- a/pkgs/by-name/ss/ssh-tpm-agent/package.nix
+++ b/pkgs/by-name/ss/ssh-tpm-agent/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Foxboron";
     repo = "ssh-tpm-agent";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yK7G+wZIn+kJazKOFOs8EYlRWZkCQuT0qZfmdqbcOnM=";
   };
 
diff --git a/pkgs/by-name/ss/sshchecker/package.nix b/pkgs/by-name/ss/sshchecker/package.nix
index 9aef78f68877..5c2e55a166cd 100644
--- a/pkgs/by-name/ss/sshchecker/package.nix
+++ b/pkgs/by-name/ss/sshchecker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lazytools";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QMc64ynPLHQGsmDOsoChgmqmpRDyMYmmSAPwAEFBK40=";
   };
 
diff --git a/pkgs/by-name/ss/sshed/package.nix b/pkgs/by-name/ss/sshed/package.nix
index 3927b72ce3d2..4bf5a500233c 100644
--- a/pkgs/by-name/ss/sshed/package.nix
+++ b/pkgs/by-name/ss/sshed/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trntv";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-y8IQzOGs78T44jLcNNjPlfopyptX3Mhv2LdawqS1T+U=";
   };
 
diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix
index 5006d7e7901f..fa9851ef1b0d 100644
--- a/pkgs/by-name/ss/sshesame/package.nix
+++ b/pkgs/by-name/ss/sshesame/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jaksi";
     repo = "sshesame";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-h0qvi90gbWm4LCL3FeipW8BKkbuUt0xGMTjaaeYadnE=";
   };
 
diff --git a/pkgs/by-name/ss/sshlatex/package.nix b/pkgs/by-name/ss/sshlatex/package.nix
index 2b5da221ea76..da19f566a1ab 100644
--- a/pkgs/by-name/ss/sshlatex/package.nix
+++ b/pkgs/by-name/ss/sshlatex/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iblech";
     repo = "sshlatex";
-    rev = version;
+    tag = version;
     sha256 = "0kaah8is74zba9373xccmsxmnnn6kh0isr4qpg21x3qhdzhlxl7q";
   };
 
diff --git a/pkgs/by-name/ss/sshping/package.nix b/pkgs/by-name/ss/sshping/package.nix
index 0a9eb06350bc..34a62f73e693 100644
--- a/pkgs/by-name/ss/sshping/package.nix
+++ b/pkgs/by-name/ss/sshping/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spook";
     repo = "sshping";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0p1fvpgrsy44yvj44xp9k9nf6z1fh0sqcjvy75pcb9f5icgms815";
   };
 
diff --git a/pkgs/by-name/ss/sshportal/package.nix b/pkgs/by-name/ss/sshportal/package.nix
index 850a7739eb66..a38c18ed6578 100644
--- a/pkgs/by-name/ss/sshportal/package.nix
+++ b/pkgs/by-name/ss/sshportal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "moul";
     repo = "sshportal";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-XJ8Hgc8YoJaH2gYOvoYhcpY4qgasgyr4M+ecKJ/RXTs=";
   };
 
diff --git a/pkgs/by-name/ss/sshs/package.nix b/pkgs/by-name/ss/sshs/package.nix
index 3d1dff4682fb..970c57afaa77 100644
--- a/pkgs/by-name/ss/sshs/package.nix
+++ b/pkgs/by-name/ss/sshs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "quantumsheep";
     repo = "sshs";
-    rev = version;
+    tag = version;
     hash = "sha256-8tIIpGEQBXfLQ/Bok4KrpDGwoYhIQz/ylg6fUc6mBdc=";
   };
 
diff --git a/pkgs/by-name/ss/sslh/package.nix b/pkgs/by-name/ss/sslh/package.nix
index 83a377e1be2a..db165481f3b5 100644
--- a/pkgs/by-name/ss/sslh/package.nix
+++ b/pkgs/by-name/ss/sslh/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yrutschle";
     repo = "sslh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-46lnQ+u+TfHrI2Yz5jd/Tl82K8mmqFY2Cqu6ktLiveA=";
   };
 
diff --git a/pkgs/by-name/ss/sslsplit/package.nix b/pkgs/by-name/ss/sslsplit/package.nix
index 3f1a8fd9e8b7..1c4eff1c5bf5 100644
--- a/pkgs/by-name/ss/sslsplit/package.nix
+++ b/pkgs/by-name/ss/sslsplit/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "droe";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1p43z9ln5rbc76v0j1k3r4nhvfw71hq8jzsallb54z9hvwfvqp3l";
   };
 
diff --git a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
index 4168b8b1d828..ad4af117b1d3 100644
--- a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
+++ b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "session-manager-plugin";
-    rev = version;
+    tag = version;
     hash = "sha256-4DPwFKt5pNNl4AczgIhZA7CuBHx7q41jMZKenDFYmwg=";
   };
 
diff --git a/pkgs/by-name/ss/ssmsh/package.nix b/pkgs/by-name/ss/ssmsh/package.nix
index e613ec7c0b7a..0a06144f5a2d 100644
--- a/pkgs/by-name/ss/ssmsh/package.nix
+++ b/pkgs/by-name/ss/ssmsh/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bwhaley";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UmfwDukRVyfX+DmUfRi+KepqFrPtDNImKd22/dI7ytk=";
   };
 
diff --git a/pkgs/by-name/ss/ssocr/package.nix b/pkgs/by-name/ss/ssocr/package.nix
index 6179b456225c..26c36b7d57b7 100644
--- a/pkgs/by-name/ss/ssocr/package.nix
+++ b/pkgs/by-name/ss/ssocr/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "auerswal";
     repo = "ssocr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yQPjs4kGvp6C7kFcWQ3EzoFhwEAhm2nC7yXu9RbU4os=";
   };
 
diff --git a/pkgs/by-name/ss/sss-cli/package.nix b/pkgs/by-name/ss/sss-cli/package.nix
index 5fb3fdc43c2c..214036933f8a 100644
--- a/pkgs/by-name/ss/sss-cli/package.nix
+++ b/pkgs/by-name/ss/sss-cli/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dsprenkels";
     repo = "sss-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9Wht+t48SsWpj1z2yY6P7G+h9StmuqfMdODtyPffhak=";
   };
 
diff --git a/pkgs/by-name/ss/sssnake/package.nix b/pkgs/by-name/ss/sssnake/package.nix
index 9c6a24a43aa6..930d8d8de2a3 100644
--- a/pkgs/by-name/ss/sssnake/package.nix
+++ b/pkgs/by-name/ss/sssnake/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "angeljumbo";
     repo = "sssnake";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zkErOV6Az0kJdwyXzMCnVW1997zpAB79TBvf/41Igic=";
   };
   postPatch = ''
diff --git a/pkgs/by-name/st/stackblur-go/package.nix b/pkgs/by-name/st/stackblur-go/package.nix
index eb97f4d51304..26fc1daa9b2c 100644
--- a/pkgs/by-name/st/stackblur-go/package.nix
+++ b/pkgs/by-name/st/stackblur-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "esimov";
     repo = "stackblur-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-y1Fov81mholhz+bLRYl+G7jhzcsFS5TUjQ3SUntD8E0=";
   };
 
diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index cd678c8f98a9..ad073eeea1c0 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EPjQrPt6m7yOFgYqHOaWAZN7CjlsOgl2jsEuRB8+1fE=";
   };
 
diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix
index 18176e51d051..cefd98a3c151 100644
--- a/pkgs/by-name/st/stackql/package.nix
+++ b/pkgs/by-name/st/stackql/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stackql";
     repo = "stackql";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FLr4xGE9x9O0+BcjBiqDoNdw5LAqtqYYkqZ8wWjhgHA=";
   };
 
diff --git a/pkgs/by-name/st/stacs/package.nix b/pkgs/by-name/st/stacs/package.nix
index 7cc6c87151c0..ce2ff2cb2699 100644
--- a/pkgs/by-name/st/stacs/package.nix
+++ b/pkgs/by-name/st/stacs/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "stacscan";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "00ZYdpJktqUXdzPcouHyZcOQyFm7jdFNVuDqsufOviE=";
   };
 
diff --git a/pkgs/by-name/st/stagit/package.nix b/pkgs/by-name/st/stagit/package.nix
index 03a038da51bb..b5fe1ff2688e 100644
--- a/pkgs/by-name/st/stagit/package.nix
+++ b/pkgs/by-name/st/stagit/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.codemadness.org/stagit";
-    rev = version;
+    tag = version;
     sha256 = "sha256-mVYR8THGGfaTsx3aaSbQBxExRo87K47SD+PU5cZ8z58=";
   };
 
diff --git a/pkgs/by-name/st/stalonetray/package.nix b/pkgs/by-name/st/stalonetray/package.nix
index f86096c4ba9b..b9356d3458c0 100644
--- a/pkgs/by-name/st/stalonetray/package.nix
+++ b/pkgs/by-name/st/stalonetray/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kolbusa";
     repo = "stalonetray";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/55oP6xA1LeLawOBkhh9acaDcObO4L4ojcy7e3vwnBw=";
   };
 
diff --git a/pkgs/by-name/st/stanc/package.nix b/pkgs/by-name/st/stanc/package.nix
index 8ac7add6d2ae..21b6817577f7 100644
--- a/pkgs/by-name/st/stanc/package.nix
+++ b/pkgs/by-name/st/stanc/package.nix
@@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = "stanc3";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IrpHV00Fn3Nxail4Xgv/8ezclKpyVuQa1F34kF07wwA=";
   };
 
diff --git a/pkgs/by-name/st/star/package.nix b/pkgs/by-name/st/star/package.nix
index 7b2d3405afd5..2dca2f5b8bcd 100644
--- a/pkgs/by-name/st/star/package.nix
+++ b/pkgs/by-name/st/star/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "STAR";
     owner = "alexdobin";
-    rev = version;
+    tag = version;
     sha256 = "sha256-58Y4lzqXwBhRlXcionUg2IhAg5znNUuyr/FsuNZd+5Q=";
   };
 
diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix
index a69598c32c5f..540cef55f73c 100644
--- a/pkgs/by-name/st/starboard/package.nix
+++ b/pkgs/by-name/st/starboard/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GZ+KOnQV/eXPt1QGaqWj4JAlPNhNKpVn7rlC7W4zfDo=";
     # 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/starcharts/package.nix b/pkgs/by-name/st/starcharts/package.nix
index 48e051049aad..474ba0bec2b6 100644
--- a/pkgs/by-name/st/starcharts/package.nix
+++ b/pkgs/by-name/st/starcharts/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "starcharts";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RLGKf5+HqJlZUhA5C3cwDumIhlbXcOr5iitI+7GZPBc=";
   };
 
diff --git a/pkgs/by-name/st/starfetch/package.nix b/pkgs/by-name/st/starfetch/package.nix
index 34694aa95136..1b335a2d2b3e 100644
--- a/pkgs/by-name/st/starfetch/package.nix
+++ b/pkgs/by-name/st/starfetch/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Haruno19";
     repo = "starfetch";
-    rev = version;
+    tag = version;
     sha256 = "sha256-I2M/FlLRkGtD2+GcK1l5+vFsb5tCb4T3UJTPxRx68Ww=";
   };
 
diff --git a/pkgs/by-name/st/stargate-libcds/package.nix b/pkgs/by-name/st/stargate-libcds/package.nix
index 362abbd11d16..419a775c17fd 100644
--- a/pkgs/by-name/st/stargate-libcds/package.nix
+++ b/pkgs/by-name/st/stargate-libcds/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stargateaudio";
     repo = "libcds";
-    rev = version;
+    tag = version;
     sha256 = "sha256-THThEzS8gGdwn3h0EBttaX5ljZH9Ma2Rcg143+GIdU8=";
   };
 
diff --git a/pkgs/by-name/st/static-server/package.nix b/pkgs/by-name/st/static-server/package.nix
index 57527d9e3c2c..048f502ea93a 100644
--- a/pkgs/by-name/st/static-server/package.nix
+++ b/pkgs/by-name/st/static-server/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "eliben";
     repo = "static-server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AZcNh/kF6IdAceA7qe+nhRlwU4yGh19av/S1Zt7iKIs=";
   };
 
diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index f31a7d1ccbec..9887474cdd27 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "static-web-server";
     repo = "static-web-server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-labHPDsPRyF/cxHFoOJ5n+tBFn1KF2QdB/hZnDGWf1Q=";
   };
 
diff --git a/pkgs/by-name/st/statik/package.nix b/pkgs/by-name/st/statik/package.nix
index 8c965a73220d..fe93b905fcf7 100644
--- a/pkgs/by-name/st/statik/package.nix
+++ b/pkgs/by-name/st/statik/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rakyll";
     repo = "statik";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "ahsNiac/3I2+PUqc90E73Brb99M68ewh9nWXoupfE3g=";
   };
 
diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix
index a78f423e9d58..010d7f380a07 100644
--- a/pkgs/by-name/st/statix/package.nix
+++ b/pkgs/by-name/st/statix/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nerdypepper";
     repo = "statix";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bMs3XMiGP6sXCqdjna4xoV6CANOIWuISSzCaL5LYY4c=";
   };
 
diff --git a/pkgs/by-name/st/stayrtr/package.nix b/pkgs/by-name/st/stayrtr/package.nix
index dc90fb2b358c..a94a1fef997b 100644
--- a/pkgs/by-name/st/stayrtr/package.nix
+++ b/pkgs/by-name/st/stayrtr/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bgp";
     repo = "stayrtr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QdPp+AHOVn/L4lArhwUNNu3OP2ALEFzs/hVnfSxaEbg=";
   };
   vendorHash = "sha256-m1CHpmTUQVkBjkjg2bjl9llU1Le1GLRKKLGT4h7MbnE=";
diff --git a/pkgs/by-name/st/stc-cli/package.nix b/pkgs/by-name/st/stc-cli/package.nix
index 6fcef93d0d74..a02d0dc07ed4 100644
--- a/pkgs/by-name/st/stc-cli/package.nix
+++ b/pkgs/by-name/st/stc-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tenox7";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-ftlq7vrnTb4N2bqwiF9gtRj7hZlo6PTUMb/bk2hn/cU=";
   };
 
diff --git a/pkgs/by-name/st/stdman/package.nix b/pkgs/by-name/st/stdman/package.nix
index 56b1bcd5a7b2..fdfb6d0caaf9 100644
--- a/pkgs/by-name/st/stdman/package.nix
+++ b/pkgs/by-name/st/stdman/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeaye";
     repo = "stdman";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/yJqKwJHonnBkP6/yQQJT3yPyYO6/nFAf4XFrgl3L0A=";
   };
 
diff --git a/pkgs/by-name/st/stdoutisatty/package.nix b/pkgs/by-name/st/stdoutisatty/package.nix
index f99476c57a9f..3b9e5ff57324 100644
--- a/pkgs/by-name/st/stdoutisatty/package.nix
+++ b/pkgs/by-name/st/stdoutisatty/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lilydjwg";
     repo = "stdoutisatty";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-NyVn9cxx0rY1ridNDTqe0pzcVhdLVaPCKT4hoQkQzRs=";
   };
 
diff --git a/pkgs/by-name/st/stduuid/package.nix b/pkgs/by-name/st/stduuid/package.nix
index a0a2ce6d9fae..7a09e5a4d5bc 100644
--- a/pkgs/by-name/st/stduuid/package.nix
+++ b/pkgs/by-name/st/stduuid/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "mariusbancila";
     repo = "stduuid";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MhpKv+gH3QxiaQMx5ImiQjDGrbKUFaaoBLj5Voh78vg=";
   };
 
diff --git a/pkgs/by-name/st/steam-acf/package.nix b/pkgs/by-name/st/steam-acf/package.nix
index 787c67fbdef1..54b4e81fcd56 100644
--- a/pkgs/by-name/st/steam-acf/package.nix
+++ b/pkgs/by-name/st/steam-acf/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chisui";
     repo = "acf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "16q3md7cvdz37pqm1sda81rkjf249xbsrlpdl639r06p7f4nqlc2";
   };
 
diff --git a/pkgs/by-name/st/steam-tui/package.nix b/pkgs/by-name/st/steam-tui/package.nix
index 822b234fe549..2546d63706d3 100644
--- a/pkgs/by-name/st/steam-tui/package.nix
+++ b/pkgs/by-name/st/steam-tui/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dmadisetti";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-3vBIpPIsh+7PjTuNNqp7e/pdciOYnzuGkjb/Eks6QJw=";
   };
 
diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index 2147b331caf7..a3406e8fefd8 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dyc3";
     repo = "steamguard-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o4hJ8+FsFLKJwifLP3pGbn35SOsTTnQosO4IejitUeI=";
   };
 
diff --git a/pkgs/by-name/st/steghide/package.nix b/pkgs/by-name/st/steghide/package.nix
index b230015d241e..49070e78b934 100644
--- a/pkgs/by-name/st/steghide/package.nix
+++ b/pkgs/by-name/st/steghide/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "steghide";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-uUXEipIUfu9AbG7Ekz+25JkWSEGzqA7sJHZqezLzUto=";
   };
 
diff --git a/pkgs/by-name/st/stegseek/package.nix b/pkgs/by-name/st/stegseek/package.nix
index 1418d2001100..0566a871ee70 100644
--- a/pkgs/by-name/st/stegseek/package.nix
+++ b/pkgs/by-name/st/stegseek/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RickdeJager";
     repo = "stegseek";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-B5oJffYOYfsH0YRq/Bq0ciIlCsCONyScFBjP7a1lIzo=";
   };
 
diff --git a/pkgs/by-name/st/stella/package.nix b/pkgs/by-name/st/stella/package.nix
index 9e0a77bef1eb..3634af710d8d 100644
--- a/pkgs/by-name/st/stella/package.nix
+++ b/pkgs/by-name/st/stella/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-AbZBBg4P0qnB+mZpiG8/kHixBfkKQptyLrF4lwgRr/Y=";
   };
 
diff --git a/pkgs/by-name/st/stellarsolver/package.nix b/pkgs/by-name/st/stellarsolver/package.nix
index 0417d3cbd2f0..231bdd4b46bd 100644
--- a/pkgs/by-name/st/stellarsolver/package.nix
+++ b/pkgs/by-name/st/stellarsolver/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rlancaste";
     repo = "stellarsolver";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-6WDiHaBhi9POtXynGU/eTeuqZSK81JJeuZv4SxOeVoE=";
   };
 
diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix
index 99a253961d19..a6c92a9bd32f 100644
--- a/pkgs/by-name/st/step-kms-plugin/package.nix
+++ b/pkgs/by-name/st/step-kms-plugin/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "smallstep";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6+5xZGzLsXu+283aOCeRmzxvjsk5PXTpbszVYuSSuGA=";
   };
 
diff --git a/pkgs/by-name/st/stern/package.nix b/pkgs/by-name/st/stern/package.nix
index 361905275897..44b8b7076224 100644
--- a/pkgs/by-name/st/stern/package.nix
+++ b/pkgs/by-name/st/stern/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stern";
     repo = "stern";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1yueWGyVM9pDnKjdCq6MHZdOzYessPTKs9xq1ganDf0=";
   };
 
diff --git a/pkgs/by-name/st/stgit/package.nix b/pkgs/by-name/st/stgit/package.nix
index 39046668c0c8..e04ca6db91c0 100644
--- a/pkgs/by-name/st/stgit/package.nix
+++ b/pkgs/by-name/st/stgit/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "stacked-git";
     repo = "stgit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YrJf4uNICPmXpuJvf0QRDHpODw39Q+40SLZuoIwZ5qA=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/st/sticky-notes/package.nix b/pkgs/by-name/st/sticky-notes/package.nix
index 76c32999eae7..1b140419c213 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-keSxUTil4/QO8Wn4p6LB7oERxXHKD83qIRPZ93ZygWE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix
index 8fc848008d0a..775fcac7b70e 100644
--- a/pkgs/by-name/st/sticky/package.nix
+++ b/pkgs/by-name/st/sticky/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Mj14S4M7NMQE17SN8uED4UIJN6nwTo3E+D3j0tGKXc4=";
   };
 
diff --git a/pkgs/by-name/st/stig/package.nix b/pkgs/by-name/st/stig/package.nix
index 1f82c837e928..3a57d76cf738 100644
--- a/pkgs/by-name/st/stig/package.nix
+++ b/pkgs/by-name/st/stig/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rndusr";
     repo = "stig";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lSFI4/DxWl17KFgLXZ7c5nW/e5IUGN7s8Gm6wTM5ZWg=";
   };
 
diff --git a/pkgs/by-name/st/stilo-themes/package.nix b/pkgs/by-name/st/stilo-themes/package.nix
index e3dde8a7de62..289595c97e0d 100644
--- a/pkgs/by-name/st/stilo-themes/package.nix
+++ b/pkgs/by-name/st/stilo-themes/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "stilo-themes";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YKEDXrOAn7pGWb0VcOx7cKHnuX120yPzqtUVnzyLrDQ=";
   };
 
diff --git a/pkgs/by-name/st/stl-to-obj/package.nix b/pkgs/by-name/st/stl-to-obj/package.nix
index 47f584d30297..9cc761a5eb92 100644
--- a/pkgs/by-name/st/stl-to-obj/package.nix
+++ b/pkgs/by-name/st/stl-to-obj/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Neizvestnyj";
     repo = "stl-to-obj";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-+R7rNpMxKFC7sLYQXZX3Ikb5MqNd57r1M8gma73kCcg=";
   };
 
diff --git a/pkgs/by-name/st/stlink/package.nix b/pkgs/by-name/st/stlink/package.nix
index b88b06393fed..7feefe528b27 100644
--- a/pkgs/by-name/st/stlink/package.nix
+++ b/pkgs/by-name/st/stlink/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stlink-org";
     repo = "stlink";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hlFI2xpZ4ldMcxZbg/T5/4JuFFdO9THLcU0DQKSFqrw=";
   };
 
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/st/stone-phaser/package.nix b/pkgs/by-name/st/stone-phaser/package.nix
index 74f2fdfc9441..8199cd12ea51 100644
--- a/pkgs/by-name/st/stone-phaser/package.nix
+++ b/pkgs/by-name/st/stone-phaser/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jpcima";
     repo = "stone-phaser";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "180b32z8h9zi8p0q55r1dzxfckamnngm52zjypjjvvy7qdj3mfcd";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/st/stopmotion/package.nix b/pkgs/by-name/st/stopmotion/package.nix
index a285c847a6fb..361ca192c8e7 100644
--- a/pkgs/by-name/st/stopmotion/package.nix
+++ b/pkgs/by-name/st/stopmotion/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://invent.kde.org/multimedia/stopmotion";
-    rev = version;
+    tag = version;
     hash = "sha256-wqrB0mo7sI9ntWF9QlYmGiRiIoLkMzD+mQ6BzhbAKX8=";
   };
 
diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix
index 402147fc0122..6e7b88404b32 100644
--- a/pkgs/by-name/st/storj-uplink/package.nix
+++ b/pkgs/by-name/st/storj-uplink/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "storj";
     repo = "storj";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-r0N9TpSlKkGy/hlVxKB+fMXFvQQOXC5L4Ryd5fP+Ud0=";
   };
 
diff --git a/pkgs/by-name/st/strace-analyzer/package.nix b/pkgs/by-name/st/strace-analyzer/package.nix
index 6b558aed0b7f..d27a74602bd7 100644
--- a/pkgs/by-name/st/strace-analyzer/package.nix
+++ b/pkgs/by-name/st/strace-analyzer/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wookietreiber";
     repo = "strace-analyzer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KbdQeZoWFz4D5txu/411J0HNnIAs3t5IvO30/34vBek=";
   };
 
diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix
index 4400537bf7f1..84f20fc9d5ce 100644
--- a/pkgs/by-name/st/streamdeck-ui/package.nix
+++ b/pkgs/by-name/st/streamdeck-ui/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     repo = "streamdeck-linux-gui";
     owner = "streamdeck-linux-gui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KpsW3EycYRYU5YOg7NNGv5eeZbS9MAikj0Ke2ybPzAU=";
   };
 
diff --git a/pkgs/by-name/st/streamrip/package.nix b/pkgs/by-name/st/streamrip/package.nix
index 4b84727083bd..9e3419307c72 100644
--- a/pkgs/by-name/st/streamrip/package.nix
+++ b/pkgs/by-name/st/streamrip/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nathom";
     repo = "streamrip";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Klrkz0U36EIGO2sNxTnKPACvvqu1sslLFFrQRjFdxiE=";
   };
 
diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index 71bb01cb86e2..87477e780b56 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stripe";
     repo = "stripe-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WlLrWMDOwpSoHUixkJbCoewt/4UgnTbwIMBD5p5SI3c=";
   };
   vendorHash = "sha256-dWLrJ866R+yPEYs4vc8SRADZXC1xCO7sDosHbU1G63o=";
diff --git a/pkgs/by-name/st/strongswan/package.nix b/pkgs/by-name/st/strongswan/package.nix
index c014a2080be4..1ad402ac86b6 100644
--- a/pkgs/by-name/st/strongswan/package.nix
+++ b/pkgs/by-name/st/strongswan/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "strongswan";
     repo = "strongswan";
-    rev = version;
+    tag = version;
     hash = "sha256-qFM7ErfqiDlUsZdGXJQVW3nJoh+I6tEdKRwzrKteRVY=";
   };
 
diff --git a/pkgs/by-name/st/structorizer/package.nix b/pkgs/by-name/st/structorizer/package.nix
index 9b8db6ac84a7..d78b94b6b3c0 100644
--- a/pkgs/by-name/st/structorizer/package.nix
+++ b/pkgs/by-name/st/structorizer/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fesch";
     repo = "Structorizer.Desktop";
-    rev = version;
+    tag = version;
     hash = "sha256-hRcs0fey+6YCXcWXNTWuAnaRfmRNL2Cpn+dry8wYRSg=";
   };
 
diff --git a/pkgs/by-name/st/sttr/package.nix b/pkgs/by-name/st/sttr/package.nix
index 1d7558fa43ea..0d23fe7da2c4 100644
--- a/pkgs/by-name/st/sttr/package.nix
+++ b/pkgs/by-name/st/sttr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "abhimanyu003";
     repo = "sttr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FVjdlheKt3WoFQnb9qrYQATSkJmuXCVrigBbnKUHUR0=";
   };
 
diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix
index 5ddc4dda2e30..8423230425c7 100644
--- a/pkgs/by-name/st/stu/package.nix
+++ b/pkgs/by-name/st/stu/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "stu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ks9QN9hVejgmQKJ5tZJx67IqgC37QKH3MEBwLYr/TZI=";
   };
 
diff --git a/pkgs/by-name/st/stuffbin/package.nix b/pkgs/by-name/st/stuffbin/package.nix
index a5b629bf3da1..7b3542dc9283 100644
--- a/pkgs/by-name/st/stuffbin/package.nix
+++ b/pkgs/by-name/st/stuffbin/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knadh";
     repo = "stuffbin";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dOlc/G2IiuMAN0LqiZtbpXLSYaOpe5cl1+cs3YhaAbg=";
   };
 
diff --git a/pkgs/by-name/st/stxxl/package.nix b/pkgs/by-name/st/stxxl/package.nix
index d045a889a016..0f825db83941 100644
--- a/pkgs/by-name/st/stxxl/package.nix
+++ b/pkgs/by-name/st/stxxl/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stxxl";
     repo = "stxxl";
-    rev = version;
+    tag = version;
     sha256 = "sha256-U6DQ5mI83pyTmq5/ga5rI8v0h2/iEnNl8mxhIOpbF1I=";
   };
 
diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix
index 88ed83192f1e..70cd821bb57b 100644
--- a/pkgs/by-name/st/stylua/package.nix
+++ b/pkgs/by-name/st/stylua/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "johnnymorganz";
     repo = "stylua";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sZrymo1RRfDLz8fPa7FnbutSpOCFoyQPoFVjA6BH5qQ=";
   };
 
diff --git a/pkgs/by-name/st/styx/package.nix b/pkgs/by-name/st/styx/package.nix
index bc9825efdbab..0bd133ea2eec 100644
--- a/pkgs/by-name/st/styx/package.nix
+++ b/pkgs/by-name/st/styx/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "styx-static";
     repo = "styx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-f6iA/nHpKnm3BALoQq8SzdcSzJLCFSferEf69SpgD2Y=";
   };
 
diff --git a/pkgs/by-name/su/su-exec/package.nix b/pkgs/by-name/su/su-exec/package.nix
index c65562b5c248..164f173d7bee 100644
--- a/pkgs/by-name/su/su-exec/package.nix
+++ b/pkgs/by-name/su/su-exec/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ncopa";
     repo = "su-exec";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eymE9r9Rm/u4El5wXHbkAh7ma5goWV0EdJIhsq+leIs=";
   };
 
diff --git a/pkgs/by-name/su/sub-batch/package.nix b/pkgs/by-name/su/sub-batch/package.nix
index 44662023adca..6dbc068d8fdf 100644
--- a/pkgs/by-name/su/sub-batch/package.nix
+++ b/pkgs/by-name/su/sub-batch/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kl";
     repo = "sub-batch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4=";
   };
 
diff --git a/pkgs/by-name/su/subberthehut/package.nix b/pkgs/by-name/su/subberthehut/package.nix
index 3dd753b78761..2e20561f78bb 100644
--- a/pkgs/by-name/su/subberthehut/package.nix
+++ b/pkgs/by-name/su/subberthehut/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mus65";
     repo = "subberthehut";
-    rev = version;
+    tag = version;
     sha256 = "19prdqbk19h0wak318g2jn1mnfm7l7f83a633bh0rhskysmqrsj1";
   };
 
diff --git a/pkgs/by-name/su/subjs/package.nix b/pkgs/by-name/su/subjs/package.nix
index 9bc455593bba..26b9e377cfdc 100644
--- a/pkgs/by-name/su/subjs/package.nix
+++ b/pkgs/by-name/su/subjs/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lc";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-csxFn3YUnuYjZ5/4jIi7DfuujB/gFjHogLaV4XK5kQU=";
   };
 
diff --git a/pkgs/by-name/su/subtitlr/package.nix b/pkgs/by-name/su/subtitlr/package.nix
index ffcb31ed21ae..38799057f121 100644
--- a/pkgs/by-name/su/subtitlr/package.nix
+++ b/pkgs/by-name/su/subtitlr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yoanbernabeu";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-PbeQzNkFj4eSg/zhk8bXij36DvJ9+g22kF5TqdX5O04=";
   };
 
diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix
index 53969233d425..0a8a204e9c24 100644
--- a/pkgs/by-name/su/subxt/package.nix
+++ b/pkgs/by-name/su/subxt/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "subxt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zg2MraqKLbyhaxTi02rE4MsMuPw4diIseYNUQEoqnVA=";
   };
 
diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index 2706ef823421..f7ed0c5dc44f 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "trifectatechfoundation";
     repo = "sudo-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-apvMcn/1dV9uujyoHikiOxregwWtAFPvrZvYjd3XQwM=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/su/suitesparse-graphblas/package.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix
index c4a89eeb4733..e9236835f8ba 100644
--- a/pkgs/by-name/su/suitesparse-graphblas/package.nix
+++ b/pkgs/by-name/su/suitesparse-graphblas/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DrTimothyAldenDavis";
     repo = "GraphBLAS";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5FrVVLKZ9WDa+a3Tq9WrhMfhvbVLGMKtKZH0h9h/3tk=";
   };
 
diff --git a/pkgs/by-name/su/summon/package.nix b/pkgs/by-name/su/summon/package.nix
index 4c57b68d08c3..eedb7e6221c6 100644
--- a/pkgs/by-name/su/summon/package.nix
+++ b/pkgs/by-name/su/summon/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cyberark";
     repo = "summon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nAjaZh0bnGBZh2wK78M4gg8BGsM6kBQ8MNvfPI7TIOg=";
   };
 
diff --git a/pkgs/by-name/su/sunwait/package.nix b/pkgs/by-name/su/sunwait/package.nix
index 770e67b9f73c..ca48f8bf5ff3 100644
--- a/pkgs/by-name/su/sunwait/package.nix
+++ b/pkgs/by-name/su/sunwait/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "risacher";
     repo = "sunwait";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-v2cNjecJ4SstOsvDe/Lu0oOyBd8I8LMHZIH+f9ZC7Fc=";
   };
 
diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index 8e358adbd446..f82d2bd5744d 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-350b+79Jmrk8wsVQdE3gRAP3JZbgAtL1Cw46sOCyaok=";
   };
 
diff --git a/pkgs/by-name/su/supercronic/package.nix b/pkgs/by-name/su/supercronic/package.nix
index 49ac6669c58a..9af7efe98e71 100644
--- a/pkgs/by-name/su/supercronic/package.nix
+++ b/pkgs/by-name/su/supercronic/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aptible";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tvDjjG8ym1wdQzQSO7T5BkbYbqD1M+EnPSPumbFKRhE=";
   };
 
diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix
index 6fcd56c2104a..fb64ee1812a4 100644
--- a/pkgs/by-name/su/supersonic/package.nix
+++ b/pkgs/by-name/su/supersonic/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dweymouth";
     repo = "supersonic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ua2INyKPncXDOwzmKrgnRCb7q8CFEApEaYuBbQeau98=";
   };
 
diff --git a/pkgs/by-name/su/supertag/package.nix b/pkgs/by-name/su/supertag/package.nix
index 50ef178d470e..42241a2029dc 100644
--- a/pkgs/by-name/su/supertag/package.nix
+++ b/pkgs/by-name/su/supertag/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "amoffat";
     repo = "supertag";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0jzm7pn38hlr96n0z8gqfsfdbw48y0nnbsgjdq7hpgwmcgvgqdam";
   };
 
diff --git a/pkgs/by-name/su/surface-control/package.nix b/pkgs/by-name/su/surface-control/package.nix
index 865faac1f0dd..6e2e347bab97 100644
--- a/pkgs/by-name/su/surface-control/package.nix
+++ b/pkgs/by-name/su/surface-control/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "linux-surface";
     repo = "surface-control";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QgkUxT5Ae0agvalZl1ie+1LwxgaTzMrKpQY3KkpWwG4=";
   };
 
diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix
index 8cffcf7dd82d..f42fd1003201 100644
--- a/pkgs/by-name/su/surfer/package.nix
+++ b/pkgs/by-name/su/surfer/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "surfer-project";
     repo = "surfer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mvHyljAEVi1FMkEbKsPmCNx2Cg0/Ydw3ZQCZsowEKGc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/su/surge-cli/package.nix b/pkgs/by-name/su/surge-cli/package.nix
index 0431c69f04d7..5fff3186501a 100644
--- a/pkgs/by-name/su/surge-cli/package.nix
+++ b/pkgs/by-name/su/surge-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "sintaxi";
     repo = "surge";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EpYww/YCQhPFmnOJ1zbigI2qyUrKN2TxKHEju/0Si3M=";
   };
 
diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix
index 175366a2c8fe..9ef409c072fa 100644
--- a/pkgs/by-name/su/surrealist/package.nix
+++ b/pkgs/by-name/su/surrealist/package.nix
@@ -39,7 +39,7 @@ let
             src = fetchFromGitHub {
               owner = "evanw";
               repo = "esbuild";
-              rev = "v${version}";
+              tag = "v${version}";
               hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";
             };
             vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/by-name/su/suscan/package.nix b/pkgs/by-name/su/suscan/package.nix
index 0c052705cc26..f0d0e147512b 100644
--- a/pkgs/by-name/su/suscan/package.nix
+++ b/pkgs/by-name/su/suscan/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BatchDrake";
     repo = "suscan";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-h1ogtYjkqiHb1/NAJfJ0HQIvGnZM2K/PSP5nqLXUf9M=";
   };
 
diff --git a/pkgs/by-name/su/sutils/package.nix b/pkgs/by-name/su/sutils/package.nix
index 1ea0e1c22b16..e893f4ec7461 100644
--- a/pkgs/by-name/su/sutils/package.nix
+++ b/pkgs/by-name/su/sutils/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "sutils";
-    rev = version;
+    tag = version;
     sha256 = "0i2g6a6xdaq3w613dhq7mnsz4ymwqn6kvkyan5kgy49mzq97va6j";
   };
 
diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix
index 65e51db70263..f924680f4328 100644
--- a/pkgs/by-name/sv/sv-lang/package.nix
+++ b/pkgs/by-name/sv/sv-lang/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MikePopoloski";
     repo = "slang";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-msSc6jw2xbEZfOwtqwFEDIKcwf5SDKp+j15lVbNO98g=";
   };
 
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/sv/svg2pdf/package.nix b/pkgs/by-name/sv/svg2pdf/package.nix
index dde8c61fb1a0..213e2f86e7a6 100644
--- a/pkgs/by-name/sv/svg2pdf/package.nix
+++ b/pkgs/by-name/sv/svg2pdf/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "typst";
     repo = "svg2pdf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A3lUX2q5D1Z5Q3sZOl2uvaOLTuLRdtJyR9tmfPkE7TI=";
   };
 
diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix
index 7c3435fc1d6e..0447ed058d7a 100644
--- a/pkgs/by-name/sv/svix-server/package.nix
+++ b/pkgs/by-name/sv/svix-server/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "svix";
     repo = "svix-webhooks";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ft08skfLASgfZo3lrlN+nuF2FK78kEm2geRVg8cO5hM=";
   };
 
diff --git a/pkgs/by-name/sv/svls/package.nix b/pkgs/by-name/sv/svls/package.nix
index fa9bbdf1dfa5..362f97a91aa7 100644
--- a/pkgs/by-name/sv/svls/package.nix
+++ b/pkgs/by-name/sv/svls/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dalance";
     repo = "svls";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DuwH0qie8SctvOGntljOdTRMGKrNFPycdaFG3QZxihA=";
   };
 
diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix
index 722579b17237..549b1d71613b 100644
--- a/pkgs/by-name/sv/svtplay-dl/package.nix
+++ b/pkgs/by-name/sv/svtplay-dl/package.nix
@@ -33,7 +33,7 @@ buildPythonApplication {
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
-    rev = version;
+    tag = version;
     hash = "sha256-pSTYrDgHmx4V+Y9iGRj3fCHiyoBP9FUf/XIRJyoUvMY=";
   };
 
diff --git a/pkgs/by-name/sv/svu/package.nix b/pkgs/by-name/sv/svu/package.nix
index 82eddfa960d7..3a3dbe2777c3 100644
--- a/pkgs/by-name/sv/svu/package.nix
+++ b/pkgs/by-name/sv/svu/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jnUVl34luj6kUyx27+zWFxKZMD+R1uzu78oJV7ziSag=";
   };
 
diff --git a/pkgs/by-name/sw/swagger-cli/package.nix b/pkgs/by-name/sw/swagger-cli/package.nix
index f78dd09b46a4..2aab80288358 100644
--- a/pkgs/by-name/sw/swagger-cli/package.nix
+++ b/pkgs/by-name/sw/swagger-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "APIDevTools";
     repo = "swagger-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WgzfSd57vRwa1HrSgNxD0F5ckczBkOaVmrEZ9tMAcRA=";
   };
 
diff --git a/pkgs/by-name/sw/sway-launcher-desktop/package.nix b/pkgs/by-name/sw/sway-launcher-desktop/package.nix
index 93cc778fc4e9..2e0f5637d0ad 100644
--- a/pkgs/by-name/sw/sway-launcher-desktop/package.nix
+++ b/pkgs/by-name/sw/sway-launcher-desktop/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Biont";
     repo = "sway-launcher-desktop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lv1MLPJsJJjm6RLzZXWEz1JO/4EXTQ8wj225Di+98G4=";
   };
 
diff --git a/pkgs/by-name/sw/sway-new-workspace/package.nix b/pkgs/by-name/sw/sway-new-workspace/package.nix
index b998818dd39d..42861e7e384e 100644
--- a/pkgs/by-name/sw/sway-new-workspace/package.nix
+++ b/pkgs/by-name/sw/sway-new-workspace/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nzig";
     repo = "sway-new-workspace";
-    rev = version;
+    tag = version;
     hash = "sha256-CoSfpsaGqNNR5jdAQys3nQxshI0NXXr8MacUnSTKFNo=";
   };
 
diff --git a/pkgs/by-name/sw/sway-overfocus/package.nix b/pkgs/by-name/sw/sway-overfocus/package.nix
index 9789e8f7afb2..6341e4a9c115 100644
--- a/pkgs/by-name/sw/sway-overfocus/package.nix
+++ b/pkgs/by-name/sw/sway-overfocus/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "korreman";
     repo = "sway-overfocus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-trpjKA0TV8InSfViIXKnMDeZeFXZfavpiU7/R3JDQkQ=";
   };
 
diff --git a/pkgs/by-name/sw/sway-scratch/package.nix b/pkgs/by-name/sw/sway-scratch/package.nix
index 4a6b914ecfca..5a35154b8e9e 100644
--- a/pkgs/by-name/sw/sway-scratch/package.nix
+++ b/pkgs/by-name/sw/sway-scratch/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aokellermann";
     repo = "sway-scratch";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1N/33XtkEWamgQYNDyZgSSaaGD+2HtbseEpQgrAz3CU=";
   };
 
diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix
index 279e711c923b..b0aed7b420d6 100644
--- a/pkgs/by-name/sw/sway-unwrapped/package.nix
+++ b/pkgs/by-name/sw/sway-unwrapped/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "sway";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-uBtQk8uhW/i8lSbv6zwsRyiiImFBw1YCQHVWQ8jot5w=";
   };
 
diff --git a/pkgs/by-name/sw/swayest-workstyle/package.nix b/pkgs/by-name/sw/swayest-workstyle/package.nix
index 0d933df7259e..5ab2099c110c 100644
--- a/pkgs/by-name/sw/swayest-workstyle/package.nix
+++ b/pkgs/by-name/sw/swayest-workstyle/package.nix
@@ -10,7 +10,7 @@ let
   src = fetchFromGitHub {
     owner = "Lyr-7D1h";
     repo = "swayest_workstyle";
-    rev = version;
+    tag = version;
     hash = "sha256-0IFEVk6LQagwbm/QZG+dzYFfNhb7ieMxaCbFdeoZWwc=";
   };
 in
diff --git a/pkgs/by-name/sw/swayidle/package.nix b/pkgs/by-name/sw/swayidle/package.nix
index 9023cb5af80e..5208a91fb029 100644
--- a/pkgs/by-name/sw/swayidle/package.nix
+++ b/pkgs/by-name/sw/swayidle/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "swayidle";
-    rev = version;
+    tag = version;
     hash = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg=";
   };
 
diff --git a/pkgs/by-name/sw/swaykbdd/package.nix b/pkgs/by-name/sw/swaykbdd/package.nix
index 07d73adb07cd..7549c67eddc5 100644
--- a/pkgs/by-name/sw/swaykbdd/package.nix
+++ b/pkgs/by-name/sw/swaykbdd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "artemsen";
     repo = "swaykbdd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FtXmn5Lf0PhL99xGl/SHWNaE6vAMOF2Ok4xVJT2Bf/s=";
   };
 
diff --git a/pkgs/by-name/sw/swaylock-effects/package.nix b/pkgs/by-name/sw/swaylock-effects/package.nix
index 42c59876ecb1..414d6cda1b5d 100644
--- a/pkgs/by-name/sw/swaylock-effects/package.nix
+++ b/pkgs/by-name/sw/swaylock-effects/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jirutka";
     repo = "swaylock-effects";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cuFM+cbUmGfI1EZu7zOsQUj4rA4Uc4nUXcvIfttf9zE=";
   };
 
diff --git a/pkgs/by-name/sw/swaynag-battery/package.nix b/pkgs/by-name/sw/swaynag-battery/package.nix
index b9223980ecef..3ac3df47bf24 100644
--- a/pkgs/by-name/sw/swaynag-battery/package.nix
+++ b/pkgs/by-name/sw/swaynag-battery/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "m00qek";
     repo = "swaynag-battery";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7f9+4Fzw5B5ATuud4MJC3iyuNRTx6kwJ7/KsusGtQM8=";
   };
 
diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix
index 74f631876189..00ec7d9031f7 100644
--- a/pkgs/by-name/sw/swaynotificationcenter/package.nix
+++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "ErikReider";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SR3FfEit50y4XSCLh3raUoigRNXpxh0mk4qLhQ/FozM=";
   };
 
diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix
index e4c63e331eea..bb5700bc89e6 100644
--- a/pkgs/by-name/sw/swayosd/package.nix
+++ b/pkgs/by-name/sw/swayosd/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ErikReider";
     repo = "SwayOSD";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-V3V18BoBRJU8mtvwWXvdYPbKBDIHdu5LzVSkDkGJjFU=";
   };
 
diff --git a/pkgs/by-name/sw/swh_lv2/package.nix b/pkgs/by-name/sw/swh_lv2/package.nix
index 6e74700ef624..5351fa9127e4 100644
--- a/pkgs/by-name/sw/swh_lv2/package.nix
+++ b/pkgs/by-name/sw/swh_lv2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swh";
     repo = "lv2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-v6aJUWDbBZEmz0v6+cSCi/KhOYNUeK/MJLUSgzi39ng=";
   };
 
diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix
index da95f8af7998..a7860c03f617 100644
--- a/pkgs/by-name/sw/swiftformat/package.nix
+++ b/pkgs/by-name/sw/swiftformat/package.nix
@@ -17,7 +17,7 @@ swift.stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nicklockwood";
     repo = "SwiftFormat";
-    rev = version;
+    tag = version;
     sha256 = "sha256-AZAQSwmGNHN6ykh9ufeQLC1dEXvTt32X24MPTDh6bI8=";
   };
 
diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix
index bf8d01099dab..7ef039d314c0 100644
--- a/pkgs/by-name/sw/swim/package.nix
+++ b/pkgs/by-name/sw/swim/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "spade-lang";
     repo = "swim";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0H45kOIwFMdp+eIQJNutLUC/jEpWKsPfEZXDUOUa12g=";
   };
 
diff --git a/pkgs/by-name/sx/sx-go/package.nix b/pkgs/by-name/sx/sx-go/package.nix
index 18679532f617..9c57d430d24b 100644
--- a/pkgs/by-name/sx/sx-go/package.nix
+++ b/pkgs/by-name/sx/sx-go/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "v-byte-cpu";
     repo = "sx";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HTIzA1QOVn3V/hGUu7wLIYUNYmcJ/FXi2yr6BGRizZA=";
   };
 
diff --git a/pkgs/by-name/sx/sx/package.nix b/pkgs/by-name/sx/sx/package.nix
index 5bbb60e52aba..a397f8a93469 100644
--- a/pkgs/by-name/sx/sx/package.nix
+++ b/pkgs/by-name/sx/sx/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "earnestly";
     repo = "sx";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-hKoz7Kuus8Yp7D0F05wCOQs6BvV0NkRM9uUXTntLJxQ=";
   };
 
diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix
index f2093f835c13..60dcc1e24978 100644
--- a/pkgs/by-name/sx/sxhkd/package.nix
+++ b/pkgs/by-name/sx/sxhkd/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "sxhkd";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-OelMqenk0tiWMLraekS/ggGf6IsXP7Sz7bv75NvnNvI=";
   };
 
diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix
index 4d70b1ee494e..3d2c93eacf8f 100644
--- a/pkgs/by-name/sy/symbolicator/package.nix
+++ b/pkgs/by-name/sy/symbolicator/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "symbolicator";
-    rev = version;
+    tag = version;
     hash = "sha256-/8Jo/M51ulrQFzXKkcFXTYfh9a3w6C5oW6A/bDFcRp0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sy/symengine/package.nix b/pkgs/by-name/sy/symengine/package.nix
index 4764d76e69ae..05725691a897 100644
--- a/pkgs/by-name/sy/symengine/package.nix
+++ b/pkgs/by-name/sy/symengine/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "symengine";
     repo = "symengine";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WriVcYt3fkObR2U4J6a4KGGc2HgyyFyFpdrwxBD+AHA=";
   };
 
diff --git a/pkgs/by-name/sy/symlinks/package.nix b/pkgs/by-name/sy/symlinks/package.nix
index c5709e86c110..65ec4e186c92 100644
--- a/pkgs/by-name/sy/symlinks/package.nix
+++ b/pkgs/by-name/sy/symlinks/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brandt";
     repo = "symlinks";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "EMWd7T/k4v1uvXe2QxhyPoQKUpKIUANE9AOwX461FgU=";
   };
 
diff --git a/pkgs/by-name/sy/sympa/package.nix b/pkgs/by-name/sy/sympa/package.nix
index ff0767ca46b8..1d6fb703303d 100644
--- a/pkgs/by-name/sy/sympa/package.nix
+++ b/pkgs/by-name/sy/sympa/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sympa-community";
     repo = "sympa";
-    rev = version;
+    tag = version;
     sha256 = "sha256-XvLTO2Wau34zMoi+5d16JnWd/K96w2py9xC5oLlRfRM=";
   };
 
diff --git a/pkgs/by-name/sy/syn2mas/package.nix b/pkgs/by-name/sy/syn2mas/package.nix
index 7fb4efaecba9..d69c08e58927 100644
--- a/pkgs/by-name/sy/syn2mas/package.nix
+++ b/pkgs/by-name/sy/syn2mas/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-s6LVCISmbG3ubY/67DcUUE/pnTJSE0v9n8INmLMQNcw=";
   };
 
diff --git a/pkgs/by-name/sy/synapse-admin/package.nix b/pkgs/by-name/sy/synapse-admin/package.nix
index cee42efa4fbc..4c2e5bfce656 100644
--- a/pkgs/by-name/sy/synapse-admin/package.nix
+++ b/pkgs/by-name/sy/synapse-admin/package.nix
@@ -13,7 +13,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "Awesome-Technologies";
     repo = "synapse-admin";
-    rev = version;
+    tag = version;
     sha256 = "sha256-3MC5PCEwYfZzJy9AW9nHTpvU49Lk6wbYC4Rcv9J9MEg=";
   };
 
diff --git a/pkgs/by-name/sy/syncall/package.nix b/pkgs/by-name/sy/syncall/package.nix
index 9cfcd9599b05..86dfcda299f0 100644
--- a/pkgs/by-name/sy/syncall/package.nix
+++ b/pkgs/by-name/sy/syncall/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bergercookie";
     repo = "syncall";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-f9WVZ1gpVG0wvIqoAkeaYBE4QsGXSqrYS4KyHy6S+0Q=";
   };
 
diff --git a/pkgs/by-name/sy/synchrony/package.nix b/pkgs/by-name/sy/synchrony/package.nix
index fdc86661cbfb..c4744c84237a 100644
--- a/pkgs/by-name/sy/synchrony/package.nix
+++ b/pkgs/by-name/sy/synchrony/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "relative";
     repo = "synchrony";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-nJ6H1SZAQCG6U3BPEPmm+BGQa8Af+Vb1E+Lv8lIqDBE=";
   };
 
diff --git a/pkgs/by-name/sy/syncthing-tray/package.nix b/pkgs/by-name/sy/syncthing-tray/package.nix
index 0f429fd36c24..1404d77d3e43 100644
--- a/pkgs/by-name/sy/syncthing-tray/package.nix
+++ b/pkgs/by-name/sy/syncthing-tray/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alex2108";
     repo = "syncthing-tray";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g/seDpNdoJ1tc5CTh2EuXoeo8XNpa9CaR+s7bW2cySA=";
   };
 
diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix
index 0765c78a7335..c4546f5685c8 100644
--- a/pkgs/by-name/sy/syncyomi/package.nix
+++ b/pkgs/by-name/sy/syncyomi/package.nix
@@ -52,7 +52,7 @@ buildGoModule rec {
               src = fetchFromGitHub {
                 owner = "evanw";
                 repo = "esbuild";
-                rev = "v${version}";
+                tag = "v${version}";
                 hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU=";
               };
               vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix
index c3a0ffb93ab2..fdb7a46b3906 100644
--- a/pkgs/by-name/sy/syndicate_utils/package.nix
+++ b/pkgs/by-name/sy/syndicate_utils/package.nix
@@ -16,7 +16,7 @@ buildNimSbom (finalAttrs: {
     domain = "git.syndicate-lang.org";
     owner = "ehmry";
     repo = "syndicate_utils";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-X8sb/2mkhVp0jJpTk9uYSDhAVui4jHl355amRCnkNhA=";
   };
 
diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix
index 3d5cee8a5931..20faaa9ccedf 100644
--- a/pkgs/by-name/sy/synfigstudio/package.nix
+++ b/pkgs/by-name/sy/synfigstudio/package.nix
@@ -33,7 +33,7 @@ let
   src = fetchFromGitHub {
     owner = "synfig";
     repo = "synfig";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D+FUEyzJ74l0USq3V9HIRAfgyJfRP372aEKDqF8+hsQ=";
   };
 
diff --git a/pkgs/by-name/sy/syntax/package.nix b/pkgs/by-name/sy/syntax/package.nix
index 8dffc4b6ed9e..5c971233693b 100644
--- a/pkgs/by-name/sy/syntax/package.nix
+++ b/pkgs/by-name/sy/syntax/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "DmitrySoshnikov";
     repo = "syntax";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5ZbelnZQvJ9k4GbWR+lDEgxXGLt4VsXput9nBV8nUdc=";
   };
 
diff --git a/pkgs/by-name/sy/sysbench/package.nix b/pkgs/by-name/sy/sysbench/package.nix
index 873932a81805..a45dd72331cc 100644
--- a/pkgs/by-name/sy/sysbench/package.nix
+++ b/pkgs/by-name/sy/sysbench/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "akopytov";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1sanvl2a52ff4shj62nw395zzgdgywplqvwip74ky8q7s6qjf5qy";
   };
 
diff --git a/pkgs/by-name/sy/system76-firmware/package.nix b/pkgs/by-name/sy/system76-firmware/package.nix
index fe4efbae8ff4..88b57068880c 100644
--- a/pkgs/by-name/sy/system76-firmware/package.nix
+++ b/pkgs/by-name/sy/system76-firmware/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-firmware";
-    rev = version;
+    tag = version;
     sha256 = "sha256-6c2OTHCTIYl/ezkWjmyb60FAdasOrV9hjd0inDc44wI=";
   };
 
diff --git a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
index 69574c66581f..63a3e97d5e94 100644
--- a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
+++ b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "keyboard-configurator";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rnKWzct2k/ObjBnf90uwMar7fjZAUvQ2RPPZVZQsWEA=";
   };
 
diff --git a/pkgs/by-name/sy/system76-scheduler/package.nix b/pkgs/by-name/sy/system76-scheduler/package.nix
index f45d3836b7fd..599e3b765f4e 100644
--- a/pkgs/by-name/sy/system76-scheduler/package.nix
+++ b/pkgs/by-name/sy/system76-scheduler/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-scheduler";
-    rev = version;
+    tag = version;
     hash = "sha256-5GiHmu++YRCewDHm/qxKmQwDIAZwlW5Eya/fDriVSdA=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/sy/systembus-notify/package.nix b/pkgs/by-name/sy/systembus-notify/package.nix
index ce599973c572..1111071ea896 100644
--- a/pkgs/by-name/sy/systembus-notify/package.nix
+++ b/pkgs/by-name/sy/systembus-notify/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = "systembus-notify";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WzuBw7LXW54CCMgFE9BSJ2skxaz4IA2BcBny63Ihtt0=";
   };
 
diff --git a/pkgs/by-name/sy/systemc/package.nix b/pkgs/by-name/sy/systemc/package.nix
index 5e78ee093f12..28c265351752 100644
--- a/pkgs/by-name/sy/systemc/package.nix
+++ b/pkgs/by-name/sy/systemc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "accellera-official";
     repo = "systemc";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ReYRKx7H9rxVhvY9gAdxrMu5nlsK2FcVIzfgvZroD/E=";
   };
 
diff --git a/pkgs/by-name/sy/systemfd/package.nix b/pkgs/by-name/sy/systemfd/package.nix
index a96eaaf35b87..e1f0477b6062 100644
--- a/pkgs/by-name/sy/systemfd/package.nix
+++ b/pkgs/by-name/sy/systemfd/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     repo = "systemfd";
     owner = "mitsuhiko";
-    rev = version;
+    tag = version;
     sha256 = "sha256-OUsQBHymoiLClRS45KE4zsyOh/Df8psP0t8aIkKNZsM=";
   };
 
diff --git a/pkgs/by-name/sy/systeroid/package.nix b/pkgs/by-name/sy/systeroid/package.nix
index 7dea30db2189..e20b6220be54 100644
--- a/pkgs/by-name/sy/systeroid/package.nix
+++ b/pkgs/by-name/sy/systeroid/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "systeroid";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-nyQFNPmPcguPGeArd+w1Jexj4/J53PXAeGDvoRSsh/k=";
   };
 
diff --git a/pkgs/by-name/sy/sysz/package.nix b/pkgs/by-name/sy/sysz/package.nix
index 29efc02e4894..f238442e1070 100644
--- a/pkgs/by-name/sy/sysz/package.nix
+++ b/pkgs/by-name/sy/sysz/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "joehillen";
     repo = "sysz";
-    rev = version;
+    tag = version;
     sha256 = "sha256-X9vj6ILPUKFo/i50JNehM2GSDWfxTdroWGYJv765Cm4=";
   };
 
diff --git a/pkgs/by-name/sz/szyszka/package.nix b/pkgs/by-name/sz/szyszka/package.nix
index 97cb882bff2c..b1e560760a86 100644
--- a/pkgs/by-name/sz/szyszka/package.nix
+++ b/pkgs/by-name/sz/szyszka/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "qarmin";
     repo = "szyszka";
-    rev = version;
+    tag = version;
     hash = "sha256-LkXGKDFKaY+mg53ZEO4h2br/4eRle/QbSQJTVEMpAoY=";
   };
 
diff --git a/pkgs/by-name/t-/t-rex/package.nix b/pkgs/by-name/t-/t-rex/package.nix
index 3001f15a4a94..8b04e19557a9 100644
--- a/pkgs/by-name/t-/t-rex/package.nix
+++ b/pkgs/by-name/t-/t-rex/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "t-rex-tileserver";
     repo = "t-rex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oZZrR86/acoyMX3vC1JGrpc8G+DEuplqfEAnaP+TBGU=";
   };
 
diff --git a/pkgs/by-name/ta/ta-lib/package.nix b/pkgs/by-name/ta/ta-lib/package.nix
index 094b0004973f..7cadbf47cfed 100644
--- a/pkgs/by-name/ta/ta-lib/package.nix
+++ b/pkgs/by-name/ta/ta-lib/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rafa-dot-el";
     repo = "talib";
-    rev = version;
+    tag = version;
     sha256 = "sha256-bIzN8f9ZiOLaVzGAXcZUHUh/v9z1U+zY+MnyjJr1lSw=";
   };
 
diff --git a/pkgs/by-name/ta/tab/package.nix b/pkgs/by-name/ta/tab/package.nix
index 9bd7719ae29c..1a7c102fd7bc 100644
--- a/pkgs/by-name/ta/tab/package.nix
+++ b/pkgs/by-name/ta/tab/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ivan-tkatchev";
     repo = "tab";
-    rev = version;
+    tag = version;
     hash = "sha256-UOXfnpzYMKDdp8EeBo2HsVPGn61hkCqHe8olX9KAgOU=";
   };
 
diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix
index ea60b3371476..7bd1d7b921d4 100644
--- a/pkgs/by-name/ta/tabiew/package.nix
+++ b/pkgs/by-name/ta/tabiew/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shshemi";
     repo = "tabiew";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mBGEw3WyjEmDPo9L+CPOtMiVA+2ndQ2pjo7bUBZZO8o=";
   };
 
diff --git a/pkgs/by-name/ta/tabula-java/package.nix b/pkgs/by-name/ta/tabula-java/package.nix
index c0ec2ee26bee..937204ea5fc0 100644
--- a/pkgs/by-name/ta/tabula-java/package.nix
+++ b/pkgs/by-name/ta/tabula-java/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "tabulapdf";
     repo = "tabula-java";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lg8/diyGhfkUU0w7PEOlxb1WNpJZVDDllxMMsTIU/Cw=";
   };
 
diff --git a/pkgs/by-name/ta/tagger/package.nix b/pkgs/by-name/ta/tagger/package.nix
index d093812a5ce7..ba309b0fd3fe 100644
--- a/pkgs/by-name/ta/tagger/package.nix
+++ b/pkgs/by-name/ta/tagger/package.nix
@@ -21,7 +21,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "nlogozzo";
     repo = "NickvisionTagger";
-    rev = version;
+    tag = version;
     hash = "sha256-4OfByQYhLXmeFWxzhqt8d7pLUyuMLhDM20E2YcA9Q3s=";
   };
 
diff --git a/pkgs/by-name/ta/tagparser/package.nix b/pkgs/by-name/ta/tagparser/package.nix
index 5bd6c959a538..f4deee81dacc 100644
--- a/pkgs/by-name/ta/tagparser/package.nix
+++ b/pkgs/by-name/ta/tagparser/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "tagparser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Xu6pvqyBWew3xD0nD5k7QKUOEpDchF1FiuSN7oHfYME=";
   };
 
diff --git a/pkgs/by-name/ta/tagref/package.nix b/pkgs/by-name/ta/tagref/package.nix
index 4ece754dc809..14acb95eb1f3 100644
--- a/pkgs/by-name/ta/tagref/package.nix
+++ b/pkgs/by-name/ta/tagref/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "stepchowfun";
     repo = "tagref";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ANQxW5Qznu2JbiazFElB1sxpX4BwPgk6SVGgYpJ6DUw=";
   };
 
diff --git a/pkgs/by-name/ta/tagutil/package.nix b/pkgs/by-name/ta/tagutil/package.nix
index de5b89cad116..eb7fd4ac6877 100644
--- a/pkgs/by-name/ta/tagutil/package.nix
+++ b/pkgs/by-name/ta/tagutil/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kaworu";
     repo = "tagutil";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oY1aGl5CKVtpOfh8Wskio/huWYMiPuxWPqxlooTutcw=";
   };
 
diff --git a/pkgs/by-name/ta/tailer/package.nix b/pkgs/by-name/ta/tailer/package.nix
index d9899b7d2cac..45755cd3094c 100644
--- a/pkgs/by-name/ta/tailer/package.nix
+++ b/pkgs/by-name/ta/tailer/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hionay";
     repo = "tailer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gPezz2ksqdCffgdAHwU2NMTar2glp5YGfA5C+tMYPtE=";
   };
 
diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 40d1d302c0dd..727314b63324 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -38,7 +38,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/8MJE1Io0MRSUXiFirYDn6FH2qkWQHE7Fl3nJLjieDw=";
   };
 
diff --git a/pkgs/by-name/ta/tailscalesd/package.nix b/pkgs/by-name/ta/tailscalesd/package.nix
index 718b05df48d9..e1cc38f504e9 100644
--- a/pkgs/by-name/ta/tailscalesd/package.nix
+++ b/pkgs/by-name/ta/tailscalesd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cfunkhouser";
     repo = "tailscalesd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OcvLVsPtAIaGTxk5SKNme0+i0PsDc8uY/sDcM/L5yqU=";
   };
 
diff --git a/pkgs/by-name/ta/talentedhack/package.nix b/pkgs/by-name/ta/talentedhack/package.nix
index 648d5e3b4864..76b558ea754b 100644
--- a/pkgs/by-name/ta/talentedhack/package.nix
+++ b/pkgs/by-name/ta/talentedhack/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeremysalwen";
     repo = "talentedhack";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx";
   };
 
diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index ee0744f777c9..c7b7089d3acf 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -26,7 +26,7 @@ let
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
-            rev = "v${version}";
+            tag = "v${version}";
             hash = "sha256-GiQTB/P+7uVGZfUaeM7S/5lGvfHlTl/cFt7XbNfE0qw=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/by-name/ta/tambura/package.nix b/pkgs/by-name/ta/tambura/package.nix
index 5c7fb003ba3d..e3458d3e0a5d 100644
--- a/pkgs/by-name/ta/tambura/package.nix
+++ b/pkgs/by-name/ta/tambura/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "olilarkin";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y";
   };
 
diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix
index d840bc808327..e369107b0d68 100644
--- a/pkgs/by-name/ta/tandoor-recipes/common.nix
+++ b/pkgs/by-name/ta/tandoor-recipes/common.nix
@@ -5,7 +5,7 @@ rec {
   src = fetchFromGitHub {
     owner = "TandoorRecipes";
     repo = "recipes";
-    rev = version;
+    tag = version;
     hash = "sha256-CNlst4bpvRSOPABg85k9xltbrZhs5MQLfJr+t7l7hhI=";
   };
 
diff --git a/pkgs/by-name/ta/tango/package.nix b/pkgs/by-name/ta/tango/package.nix
index 3fb877a9a9a7..fe5545920fde 100644
--- a/pkgs/by-name/ta/tango/package.nix
+++ b/pkgs/by-name/ta/tango/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "masakichi";
     repo = "tango";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-e/M2iRm/UwfnRVnMo1PmQTkz4IGTxnsCXNSSUkhsiHk=";
   };
 
diff --git a/pkgs/by-name/ta/tangram/package.nix b/pkgs/by-name/ta/tangram/package.nix
index 60dfcae1a73f..a0972cbb3154 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/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix
index 2256bdffd70c..a367840e24e4 100644
--- a/pkgs/by-name/ta/tanka/package.nix
+++ b/pkgs/by-name/ta/tanka/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MaWO9I2+xHA+55tUSQ91yJ7suubnWP4V7JxZTruN1A0=";
   };
 
diff --git a/pkgs/by-name/ta/taoup/package.nix b/pkgs/by-name/ta/taoup/package.nix
index 3243c6a8ca76..6a45bc6ce8f1 100644
--- a/pkgs/by-name/ta/taoup/package.nix
+++ b/pkgs/by-name/ta/taoup/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "globalcitizen";
     repo = "taoup";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9J46fKyeSZW71r67R8y9KVPeCH8fn27hOk/XpusqGmk=";
   };
 
diff --git a/pkgs/by-name/ta/taproot-assets/package.nix b/pkgs/by-name/ta/taproot-assets/package.nix
index 2ab0bf31e5e5..2a46c27f3edf 100644
--- a/pkgs/by-name/ta/taproot-assets/package.nix
+++ b/pkgs/by-name/ta/taproot-assets/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "taproot-assets";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-R6x8M69HM7mC0XG5cAH5SwTzeoSicNwZx0ExAKwcI80=";
   };
 
diff --git a/pkgs/by-name/ta/tar2ext4/package.nix b/pkgs/by-name/ta/tar2ext4/package.nix
index c33f25412231..3e677937c00a 100644
--- a/pkgs/by-name/ta/tar2ext4/package.nix
+++ b/pkgs/by-name/ta/tar2ext4/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "hcsshim";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-20+y7wFV3HxkrS1qHNq2neIc826HU5AXzuqqS7Ll2gg=";
   };
 
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/target-isns/package.nix b/pkgs/by-name/ta/target-isns/package.nix
index acdffceb3a98..6f0faed2a2bb 100644
--- a/pkgs/by-name/ta/target-isns/package.nix
+++ b/pkgs/by-name/ta/target-isns/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "open-iscsi";
     repo = "target-isns";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1b6jjalvvkkjyjbg1pcgk8vmvc6xzzksyjnh2pfi45bbpya4zxim";
   };
 
diff --git a/pkgs/by-name/ta/tarsnapper/package.nix b/pkgs/by-name/ta/tarsnapper/package.nix
index b1afa06f6008..d4d694ff444f 100644
--- a/pkgs/by-name/ta/tarsnapper/package.nix
+++ b/pkgs/by-name/ta/tarsnapper/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "miracle2k";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-5i9eum9hbh6VFhvEIDq5Uapy6JtIbf9jZHhRYZVoC1w=";
   };
 
diff --git a/pkgs/by-name/ta/tarssh/package.nix b/pkgs/by-name/ta/tarssh/package.nix
index 031a2a214b37..5f12425c288b 100644
--- a/pkgs/by-name/ta/tarssh/package.nix
+++ b/pkgs/by-name/ta/tarssh/package.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.7.0";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "Freaky";
     repo = pname;
     sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk=";
diff --git a/pkgs/by-name/ta/taskopen/package.nix b/pkgs/by-name/ta/taskopen/package.nix
index 8507256139e9..2e37d91696eb 100644
--- a/pkgs/by-name/ta/taskopen/package.nix
+++ b/pkgs/by-name/ta/taskopen/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ValiValpas";
     repo = "taskopen";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/xf7Ph2KKiZ5lgLKk95nCgw/z9wIBmuWf3QGaNebgHg=";
   };
 
diff --git a/pkgs/by-name/ta/tasktimer/package.nix b/pkgs/by-name/ta/tasktimer/package.nix
index de2cdc50fe71..a0ff1cb32a1c 100644
--- a/pkgs/by-name/ta/tasktimer/package.nix
+++ b/pkgs/by-name/ta/tasktimer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CAqOsxmJxDgQRMx8cN23TajHd6BNiCFraFvhf5kKnzc=";
   };
 
diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix
index cfdc047d0dfd..633574f5c4d8 100644
--- a/pkgs/by-name/ta/taskwarrior-tui/package.nix
+++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kdheepak";
     repo = "taskwarrior-tui";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8PFGlsm9B6qHRrY7YIPwknmGS+Peg5MWd0kMT173wIQ=";
   };
 
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/ta/tau-hydrogen/package.nix b/pkgs/by-name/ta/tau-hydrogen/package.nix
index 745d7638e5ba..b10d47eaec3b 100644
--- a/pkgs/by-name/ta/tau-hydrogen/package.nix
+++ b/pkgs/by-name/ta/tau-hydrogen/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tau-OS";
     repo = "tau-hydrogen";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-nnQ0lkHtkOjJhF4NSMqjt0deddYjMnHHlANlHoZS2wY=";
   };
 
diff --git a/pkgs/by-name/ta/taxi/package.nix b/pkgs/by-name/ta/taxi/package.nix
index 4eb5e061f089..34e9e5d2eac5 100644
--- a/pkgs/by-name/ta/taxi/package.nix
+++ b/pkgs/by-name/ta/taxi/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Alecaddd";
     repo = "taxi";
-    rev = version;
+    tag = version;
     sha256 = "1a4a14b2d5vqbk56drzbbldp0nngfqhwycpyv8d3svi2nchkvpqa";
   };
 
diff --git a/pkgs/by-name/tb/tbox/package.nix b/pkgs/by-name/tb/tbox/package.nix
index 54ee57c0b5a0..9c2ede531ba7 100644
--- a/pkgs/by-name/tb/tbox/package.nix
+++ b/pkgs/by-name/tb/tbox/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tboox";
     repo = "tbox";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cwpZ7F8WzT/46HrckHe0Aug2mxirCkNA68aCxg/FcsE=";
   };
 
diff --git a/pkgs/by-name/tc/tcat/package.nix b/pkgs/by-name/tc/tcat/package.nix
index 25c826e70326..3fe4be042abd 100644
--- a/pkgs/by-name/tc/tcat/package.nix
+++ b/pkgs/by-name/tc/tcat/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rsc";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1szzfz5xsx9l8gjikfncgp86hydzpvsi0y5zvikd621xkp7g7l21";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/tc/tcpcrypt/package.nix b/pkgs/by-name/tc/tcpcrypt/package.nix
index bf9552a1ee45..984954d2f73b 100644
--- a/pkgs/by-name/tc/tcpcrypt/package.nix
+++ b/pkgs/by-name/tc/tcpcrypt/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "tcpcrypt";
     owner = "scslab";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0a015rlyvagz714pgwr85f8gjq1fkc0il7d7l39qcgxrsp15b96w";
   };
 
diff --git a/pkgs/by-name/tc/tcpkali/package.nix b/pkgs/by-name/tc/tcpkali/package.nix
index 3641c698ac48..156f97115e08 100644
--- a/pkgs/by-name/tc/tcpkali/package.nix
+++ b/pkgs/by-name/tc/tcpkali/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "machinezone";
     repo = "tcpkali";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09ky3cccaphcqc6nhfs00pps99lasmzc2pf5vk0gi8hlqbbhilxf";
   };
   postPatch = ''
diff --git a/pkgs/by-name/td/tdl/package.nix b/pkgs/by-name/td/tdl/package.nix
index a2b11b68a982..62b1e1089a0c 100644
--- a/pkgs/by-name/td/tdl/package.nix
+++ b/pkgs/by-name/td/tdl/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "iyear";
     repo = "tdl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PVd9aYo4ALgzovNOfAUQkAaAbWNLeqF+UEPlL9iGhAs=";
   };
 
diff --git a/pkgs/by-name/td/tdrop/package.nix b/pkgs/by-name/td/tdrop/package.nix
index 017f72e44fac..bb640e3c0877 100644
--- a/pkgs/by-name/td/tdrop/package.nix
+++ b/pkgs/by-name/td/tdrop/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "noctuid";
     repo = "tdrop";
-    rev = version;
+    tag = version;
     sha256 = "sha256-fHvGXaZL7MMvTnkap341B79PDDo2lOVPPcOH4AX/zXo=";
   };
 
diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix
index 27eb4d3fd6a7..7f361c5e67ed 100644
--- a/pkgs/by-name/te/tealdeer/package.nix
+++ b/pkgs/by-name/te/tealdeer/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dbrgn";
     repo = "tealdeer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GZN7WE12f3MEoBfswag0O04UOCmZeYwt5CbYwddmwHs=";
   };
 
diff --git a/pkgs/by-name/te/teapot/package.nix b/pkgs/by-name/te/teapot/package.nix
index 34c24962354d..29f535d2fd85 100644
--- a/pkgs/by-name/te/teapot/package.nix
+++ b/pkgs/by-name/te/teapot/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     name = "${pname}-${version}";
     owner = "museoa";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-38XFjRzOGasr030f+mRYT+ptlabpnVJfa+1s7ZAjS+k=";
   };
 
diff --git a/pkgs/by-name/te/tebreak/package.nix b/pkgs/by-name/te/tebreak/package.nix
index 47587b1a8c22..bb903c798d1f 100644
--- a/pkgs/by-name/te/tebreak/package.nix
+++ b/pkgs/by-name/te/tebreak/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "adamewing";
     repo = "tebreak";
-    rev = version;
+    tag = version;
     sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz";
   };
 
diff --git a/pkgs/by-name/te/techmino/ccloader.nix b/pkgs/by-name/te/techmino/ccloader.nix
index ff312555d791..0af1c23f0c11 100644
--- a/pkgs/by-name/te/techmino/ccloader.nix
+++ b/pkgs/by-name/te/techmino/ccloader.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "26F-Studio";
     repo = "cold_clear_ai_love2d_wrapper";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-sguV+Dw+etZH43tXZYL46NAdsI/qvyvGWCPUiTEjhy4=";
   };
diff --git a/pkgs/by-name/te/teehee/package.nix b/pkgs/by-name/te/teehee/package.nix
index a7d5b4780076..2a3f23e2d15d 100644
--- a/pkgs/by-name/te/teehee/package.nix
+++ b/pkgs/by-name/te/teehee/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Gskartwii";
     repo = "teehee";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI=";
   };
 
diff --git a/pkgs/by-name/te/teensy-loader-cli/package.nix b/pkgs/by-name/te/teensy-loader-cli/package.nix
index ab668e7527d6..e30a1bc42358 100644
--- a/pkgs/by-name/te/teensy-loader-cli/package.nix
+++ b/pkgs/by-name/te/teensy-loader-cli/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "PaulStoffregen";
     repo = "teensy_loader_cli";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-NYqCNWO/nHEuNc9eOzsUqJEHJtZ3XaNz1VYNbeuqEk8=";
   };
 
diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix
index fb976e3e531f..eb4e0a6d12c4 100644
--- a/pkgs/by-name/te/teip/package.nix
+++ b/pkgs/by-name/te/teip/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "greymd";
     repo = "teip";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Lr4nlAM2mEKwF3HXso/6FQEKoQK43xxLMgOU7j7orYg=";
   };
 
diff --git a/pkgs/by-name/te/tektoncd-cli/package.nix b/pkgs/by-name/te/tektoncd-cli/package.nix
index e3b3cbe537a3..923b1fd7331a 100644
--- a/pkgs/by-name/te/tektoncd-cli/package.nix
+++ b/pkgs/by-name/te/tektoncd-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tektoncd";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LcYd8v6+at/GqlEV2Qkj5g+WNiTBfnQuhDtpP7lmnuk=";
   };
 
diff --git a/pkgs/by-name/te/tela-icon-theme/package.nix b/pkgs/by-name/te/tela-icon-theme/package.nix
index c202c013adec..e7e16d172220 100644
--- a/pkgs/by-name/te/tela-icon-theme/package.nix
+++ b/pkgs/by-name/te/tela-icon-theme/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "tela-icon-theme";
-    rev = version;
+    tag = version;
     hash = "sha256-ufjKFlKJnmNwD2m1w+7JSBQij6ltxXWCpUEvVxECS98=";
   };
 
diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix
index 5b456eaa482e..e39e390be2f0 100644
--- a/pkgs/by-name/te/telegraf/package.nix
+++ b/pkgs/by-name/te/telegraf/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "telegraf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q+v4cKqBLGxsvR5e8OS6Ix/0JZ+0I/cf0M6P27ym9Go=";
   };
 
diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix
index e5aea69a6f1a..aac8e705d352 100644
--- a/pkgs/by-name/te/telepresence2/package.nix
+++ b/pkgs/by-name/te/telepresence2/package.nix
@@ -13,7 +13,7 @@ let
     src = fetchFromGitHub {
       owner = "datawire";
       repo = "go-fuseftp";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-bkaC+EOqFPQA4fDkVhO6EqgGhOJy31yGwVbbPoRd+70=";
     };
 
@@ -36,7 +36,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "telepresenceio";
     repo = "telepresence";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Bae77Kzc2cWxIb1yYKXctffuiC3ICPfi0qYP6fgaqvQ=";
   };
 
diff --git a/pkgs/by-name/te/telescope/package.nix b/pkgs/by-name/te/telescope/package.nix
index 5b1e417f0c5b..a428ac9d492d 100644
--- a/pkgs/by-name/te/telescope/package.nix
+++ b/pkgs/by-name/te/telescope/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "omar-polo";
     repo = "telescope";
-    rev = version;
+    tag = version;
     hash = "sha256-MVZ/pvDAETacQiEMEXM0gYM20LXqNiHtMfFGqS1vipY=";
   };
 
diff --git a/pkgs/by-name/te/teller/package.nix b/pkgs/by-name/te/teller/package.nix
index 1fcdbcd46ff7..5f275da061d5 100644
--- a/pkgs/by-name/te/teller/package.nix
+++ b/pkgs/by-name/te/teller/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "tellerops";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CI74nMMTIPwjJfy7ASR19V6EbYZ62NoAOxlP3Xt2BuI=";
   };
 
diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix
index ca3d1bd37a0e..59f730ad6908 100644
--- a/pkgs/by-name/te/templ/package.nix
+++ b/pkgs/by-name/te/templ/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "a-h";
     repo = "templ";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-c3x7v5PeMJFADRfImMyEasvlC9WSjqHQxNDg1sgPBfQ=";
   };
 
diff --git a/pkgs/by-name/te/tempo/package.nix b/pkgs/by-name/te/tempo/package.nix
index 730472af229a..e3712aea5eb5 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-JBbECknhqYKzFlxAOVinuUCf/2xuUdh2ryK9c35YZ9o=";
   };
diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix
index 585e01627596..3a5845ba0f17 100644
--- a/pkgs/by-name/te/temporal-cli/package.nix
+++ b/pkgs/by-name/te/temporal-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9O+INXJhNwgwwvC0751ifdHmxbD0qI5A3LdDb4Krk/o=";
   };
 
diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix
index cf788adb5a66..aadf51f34673 100644
--- a/pkgs/by-name/te/temporal/package.nix
+++ b/pkgs/by-name/te/temporal/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "temporal";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3x94Cccy5CHAKb2eHdMThAC+ONQjuYZ4UyQ8YwrWvgU=";
   };
 
diff --git a/pkgs/by-name/te/temporalite/package.nix b/pkgs/by-name/te/temporalite/package.nix
index 578f81790a26..0c70966c6489 100644
--- a/pkgs/by-name/te/temporalite/package.nix
+++ b/pkgs/by-name/te/temporalite/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-IEB9AFEt8U2zXYfbChfL/UH1rNSLPnfS396/cPE8UdE=";
   };
 
diff --git a/pkgs/by-name/te/tendermint/package.nix b/pkgs/by-name/te/tendermint/package.nix
index 919df2219340..f6f525c45055 100644
--- a/pkgs/by-name/te/tendermint/package.nix
+++ b/pkgs/by-name/te/tendermint/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tendermint";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3tggW+M3vZChDT1g77W5M3hchEN6pTSVvkrZda6ZTCY=";
   };
 
diff --git a/pkgs/by-name/te/tenki/package.nix b/pkgs/by-name/te/tenki/package.nix
index 275422880048..134064e669b7 100644
--- a/pkgs/by-name/te/tenki/package.nix
+++ b/pkgs/by-name/te/tenki/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ckaznable";
     repo = "tenki";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jd7D0iC3+s3w6uG0WqlvL9F4xQL+cQzsUvAIOc7ORgw=";
   };
 
diff --git a/pkgs/by-name/te/tensorflow-lite/package.nix b/pkgs/by-name/te/tensorflow-lite/package.nix
index 2c2556f7d4eb..c5352b2b81f6 100644
--- a/pkgs/by-name/te/tensorflow-lite/package.nix
+++ b/pkgs/by-name/te/tensorflow-lite/package.nix
@@ -38,7 +38,7 @@ buildBazelPackage rec {
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "tensorflow";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Rq5pAVmxlWBVnph20fkAwbfy+iuBNlfFy14poDPd5h0=";
   };
 
diff --git a/pkgs/by-name/te/termbg/package.nix b/pkgs/by-name/te/termbg/package.nix
index c0a45c888e57..43f97cb8d14d 100644
--- a/pkgs/by-name/te/termbg/package.nix
+++ b/pkgs/by-name/te/termbg/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dalance";
     repo = "termbg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KLWfdA7TArJqYoxIXQavaTNw/lmWQN9aeltxssIUEvk=";
   };
 
diff --git a/pkgs/by-name/te/termbook/package.nix b/pkgs/by-name/te/termbook/package.nix
index d6b450f6b7de..53a20d4d45fd 100644
--- a/pkgs/by-name/te/termbook/package.nix
+++ b/pkgs/by-name/te/termbook/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "termbook";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "Bo3DI0cMXIfP7ZVr8MAW/Tmv+4mEJBIQyLvRfVBDG8c=";
   };
 
diff --git a/pkgs/by-name/te/termcolor/package.nix b/pkgs/by-name/te/termcolor/package.nix
index 6741ffdb4470..340c71245d36 100644
--- a/pkgs/by-name/te/termcolor/package.nix
+++ b/pkgs/by-name/te/termcolor/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ikalnytskyi";
     repo = "termcolor";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-2RXQ8sn2VNhQ2WZfwCCeQuM6x6C+sLA6ulAaFtaDMZw=";
   };
 
diff --git a/pkgs/by-name/te/terminal-colors/package.nix b/pkgs/by-name/te/terminal-colors/package.nix
index 7dd498833053..833f81350b91 100644
--- a/pkgs/by-name/te/terminal-colors/package.nix
+++ b/pkgs/by-name/te/terminal-colors/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eikenb";
     repo = "terminal-colors";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KRoP/Reo5nDKJYG9zVTVpoYL7soAGMNk46vDoaLfnv4=";
   };
 
diff --git a/pkgs/by-name/te/terminal-parrot/package.nix b/pkgs/by-name/te/terminal-parrot/package.nix
index f3e7cec81db3..2215ee3a9cf2 100644
--- a/pkgs/by-name/te/terminal-parrot/package.nix
+++ b/pkgs/by-name/te/terminal-parrot/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jmhobbs";
     repo = "terminal-parrot";
-    rev = version;
+    tag = version;
     hash = "sha256-LI67DDcK3M084r9JPx8NcBWthaiBOCEL4lQJhuUJSok=";
   };
 
diff --git a/pkgs/by-name/te/terminal-stocks/package.nix b/pkgs/by-name/te/terminal-stocks/package.nix
index 02aa044f47e3..dbdb65500f8a 100644
--- a/pkgs/by-name/te/terminal-stocks/package.nix
+++ b/pkgs/by-name/te/terminal-stocks/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "shweshi";
     repo = "terminal-stocks";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6eDBcQfo6M+Z31ILLM4BbiOxoTD6t4LQJxawoJFEzhg=";
   };
 
diff --git a/pkgs/by-name/te/termshark/package.nix b/pkgs/by-name/te/termshark/package.nix
index 4e8439fa0329..2ae99082227b 100644
--- a/pkgs/by-name/te/termshark/package.nix
+++ b/pkgs/by-name/te/termshark/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gcla";
     repo = "termshark";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qq7BDGprRkWKRMJiVnqPeTwtHd3tea9dPE8RIPL2YVI=";
   };
 
diff --git a/pkgs/by-name/te/termsvg/package.nix b/pkgs/by-name/te/termsvg/package.nix
index 9726eeb44474..fc190548d94e 100644
--- a/pkgs/by-name/te/termsvg/package.nix
+++ b/pkgs/by-name/te/termsvg/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mrmarble";
     repo = "termsvg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q6xjsoxQTIQwPYkBTGwLfTt1VQ8GJPdsiP5dvTyEBIw=";
   };
 
diff --git a/pkgs/by-name/te/termtekst/package.nix b/pkgs/by-name/te/termtekst/package.nix
index 09b13dd74459..2ae738471a6b 100644
--- a/pkgs/by-name/te/termtekst/package.nix
+++ b/pkgs/by-name/te/termtekst/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "zevv";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1gm7j5d49a60wm7px82b76f610i8pl8ccz4r6qsz90z4mp3lyw9b";
   };
 
diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix
index 137551166f52..aa356825d28c 100644
--- a/pkgs/by-name/te/termusic/package.nix
+++ b/pkgs/by-name/te/termusic/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tramhao";
     repo = "termusic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Yd23Jk2BFuLtxgF8vgat0wTGq6ahHHBd/HjGI9BY9z4=";
   };
 
diff --git a/pkgs/by-name/te/terracognita/package.nix b/pkgs/by-name/te/terracognita/package.nix
index f5afcc70ef02..fcf0ffb92756 100644
--- a/pkgs/by-name/te/terracognita/package.nix
+++ b/pkgs/by-name/te/terracognita/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cycloidio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pPY8y+pQdk9/F7dnUBz/y4lvcR1k/EClywcZATArZVA=";
   };
 
diff --git a/pkgs/by-name/te/terraform-backend-git/package.nix b/pkgs/by-name/te/terraform-backend-git/package.nix
index 0df99f3ddce7..75a4c74f4dc0 100644
--- a/pkgs/by-name/te/terraform-backend-git/package.nix
+++ b/pkgs/by-name/te/terraform-backend-git/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "plumber-cd";
     repo = "terraform-backend-git";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mZbGMv5b9wK/gWqQB75sDJIVURrS6t/L7WBhTonaatQ=";
   };
 
diff --git a/pkgs/by-name/te/terraform-docs/package.nix b/pkgs/by-name/te/terraform-docs/package.nix
index bbeb074c625d..31465213f5c0 100644
--- a/pkgs/by-name/te/terraform-docs/package.nix
+++ b/pkgs/by-name/te/terraform-docs/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "terraform-docs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DiKoYAe7vcNy35ormKHYZcZrGK/MEb6VmcHWPgrbmUg=";
   };
 
diff --git a/pkgs/by-name/te/terraform-inventory/package.nix b/pkgs/by-name/te/terraform-inventory/package.nix
index aeec2b66e1f5..249e51854906 100644
--- a/pkgs/by-name/te/terraform-inventory/package.nix
+++ b/pkgs/by-name/te/terraform-inventory/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adammck";
     repo = "terraform-inventory";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gkSDxcBoYmCBzkO8y1WKcRtZdfl8w5qVix0zbyb4Myo=";
   };
 
diff --git a/pkgs/by-name/te/terraform-ls/package.nix b/pkgs/by-name/te/terraform-ls/package.nix
index 9449895a8cb8..490a130ad87f 100644
--- a/pkgs/by-name/te/terraform-ls/package.nix
+++ b/pkgs/by-name/te/terraform-ls/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-20spDPVJC48r6Qy6KS8Yp6lUE22DuoOM17WPS3+KN9E=";
   };
 
diff --git a/pkgs/by-name/te/terraform-lsp/package.nix b/pkgs/by-name/te/terraform-lsp/package.nix
index 385aca330aaa..b8d84c57fe34 100644
--- a/pkgs/by-name/te/terraform-lsp/package.nix
+++ b/pkgs/by-name/te/terraform-lsp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "juliosueiras";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "111350jbq0dp0qhk48j12hrlisd1fwzqpcv357igrbqf6ki7r78q";
   };
 
diff --git a/pkgs/by-name/te/terraformer/package.nix b/pkgs/by-name/te/terraformer/package.nix
index cf7f10285783..d9c0c8c4e412 100644
--- a/pkgs/by-name/te/terraformer/package.nix
+++ b/pkgs/by-name/te/terraformer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-xbZm0FOa/W6/qXMnJHuGgJhgu2NWtKrMoP0Ttd+hhdw=";
   };
 
diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix
index 03d92bc3af40..fbd1ea9a6486 100644
--- a/pkgs/by-name/te/terramate/package.nix
+++ b/pkgs/by-name/te/terramate/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "terramate-io";
     repo = "terramate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9Bv4FlQzUX/mnSlv1qZqVER/JS0gr3HHmPV+axHKgJw=";
   };
 
diff --git a/pkgs/by-name/te/terranix/package.nix b/pkgs/by-name/te/terranix/package.nix
index 65f1d715154c..bb041fd00417 100644
--- a/pkgs/by-name/te/terranix/package.nix
+++ b/pkgs/by-name/te/terranix/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mrVanDalo";
     repo = "terranix";
-    rev = version;
+    tag = version;
     sha256 = "sha256-1Pu2j5xsBTuoyga08ZVf+rKp3FOMmJh/0fXen/idOrA=";
   };
 
diff --git a/pkgs/by-name/te/terser/package.nix b/pkgs/by-name/te/terser/package.nix
index 39e23a691bbd..4a4dea1d8239 100644
--- a/pkgs/by-name/te/terser/package.nix
+++ b/pkgs/by-name/te/terser/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "terser";
     repo = "terser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iVl5L5qxpXkBfiW8OqsMr4iZ0UQiN4TSAYXz9d29bnA=";
   };
 
diff --git a/pkgs/by-name/te/tesh/package.nix b/pkgs/by-name/te/tesh/package.nix
index 0e1ff3a788e3..a57585d44aaa 100644
--- a/pkgs/by-name/te/tesh/package.nix
+++ b/pkgs/by-name/te/tesh/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OceanSprint";
     repo = "tesh";
-    rev = version;
+    tag = version;
     hash = "sha256-GIwg7Cv7tkLu81dmKT65c34eeVnRR5MIYfNwTE7j2Vs=";
   };
 
diff --git a/pkgs/by-name/te/test-drive/package.nix b/pkgs/by-name/te/test-drive/package.nix
index 0d38269587a4..afa9b1167ceb 100644
--- a/pkgs/by-name/te/test-drive/package.nix
+++ b/pkgs/by-name/te/test-drive/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fortran-lang";
     repo = "test-drive";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xRx8ErIN9xjxZt/nEsdIQkIGFRltuELdlI8lXA+M030=";
   };
 
diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix
index f428dbba2df9..e95540622e20 100644
--- a/pkgs/by-name/te/testkube/package.nix
+++ b/pkgs/by-name/te/testkube/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubeshop";
     repo = "testkube";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Coi/aPEZb1VoMCOtzl2AcURomo4uS76AZDS449B4EcU=";
   };
 
diff --git a/pkgs/by-name/te/testssl/package.nix b/pkgs/by-name/te/testssl/package.nix
index b2eae1e9b66f..c4df0fe9504e 100644
--- a/pkgs/by-name/te/testssl/package.nix
+++ b/pkgs/by-name/te/testssl/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "drwetter";
     repo = "testssl.sh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MZNQ7oOJD/vjOwDiPOZr3k+Mn0XXVdkP7cC/0mnWLic=";
   };
 
diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix
index 4fe472b6affc..23c68ed5e427 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 = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-ke1T5nOrDoJilpfshAIAFWw/640Gm5OaxZ+ZakCevTs=";
   };
diff --git a/pkgs/by-name/te/tewi-font/package.nix b/pkgs/by-name/te/tewi-font/package.nix
index 61b72b3249ef..12c33326cf14 100644
--- a/pkgs/by-name/te/tewi-font/package.nix
+++ b/pkgs/by-name/te/tewi-font/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lucy";
     repo = "tewi-font";
-    rev = version;
+    tag = version;
     sha256 = "1axv9bv10xlcmgfyjh3z5kn5fkg3m6n1kskcs5hvlmyb6m1zk91j";
   };
 
diff --git a/pkgs/by-name/te/texstudio/package.nix b/pkgs/by-name/te/texstudio/package.nix
index 8c87594998a0..52a9e364196f 100644
--- a/pkgs/by-name/te/texstudio/package.nix
+++ b/pkgs/by-name/te/texstudio/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "texstudio-org";
     repo = "texstudio";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-PvxzG4VPhCmwc/Kh5g85fV/Mc7ih08pt/zUNBgldZiI=";
   };
 
diff --git a/pkgs/by-name/te/text-engine/package.nix b/pkgs/by-name/te/text-engine/package.nix
index 434cdbb78326..913cb9d0d498 100644
--- a/pkgs/by-name/te/text-engine/package.nix
+++ b/pkgs/by-name/te/text-engine/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mjakeman";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YSG4Vk3hrmtaJkK1WAlQcdgiDdgC4Un0t6UdaoIcUes=";
   };
 
diff --git a/pkgs/by-name/te/textual-paint/package.nix b/pkgs/by-name/te/textual-paint/package.nix
index a512c4e173b7..355498a5779b 100644
--- a/pkgs/by-name/te/textual-paint/package.nix
+++ b/pkgs/by-name/te/textual-paint/package.nix
@@ -35,7 +35,7 @@ let
         src = fetchFromGitHub {
           owner = "Textualize";
           repo = "textual";
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-ag+sJFprYW3IpH+BiMR5eSRUFMBeVuOnF6GTTuXGBHw=";
         };
       };
@@ -51,7 +51,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "1j01";
     repo = "textual-paint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ubBWK4aoa9+wyUED7CmWwjknWsWauR/mkurDgkKDiY8=";
   };
 
diff --git a/pkgs/by-name/te/texture-synthesis/package.nix b/pkgs/by-name/te/texture-synthesis/package.nix
index d850db20cad8..8da69f3742b0 100644
--- a/pkgs/by-name/te/texture-synthesis/package.nix
+++ b/pkgs/by-name/te/texture-synthesis/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "embarkstudios";
     repo = "texture-synthesis";
-    rev = version;
+    tag = version;
     hash = "sha256-BJa6T+qlbn7uABKIEhFhwLrw5sG/9al4L/2sbllfPFg=";
   };
 
diff --git a/pkgs/by-name/te/tezos-rust-libs/package.nix b/pkgs/by-name/te/tezos-rust-libs/package.nix
index 03e10ca9ed6b..85eca39fd8d1 100644
--- a/pkgs/by-name/te/tezos-rust-libs/package.nix
+++ b/pkgs/by-name/te/tezos-rust-libs/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "tezos";
     repo = "tezos-rust-libs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SuCqDZDXmWdGI/GN+3nYcUk66jnW5FQQaeTB76/rvaw=";
   };
 
diff --git a/pkgs/by-name/tf/tf-summarize/package.nix b/pkgs/by-name/tf/tf-summarize/package.nix
index 29da31f6e66b..46c1638c2c95 100644
--- a/pkgs/by-name/tf/tf-summarize/package.nix
+++ b/pkgs/by-name/tf/tf-summarize/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dineshba";
     repo = "tf-summarize";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yjketL/7+gsWIvltqotouSNgTCBOqVrHqiblXoCsWgI=";
   };
 
diff --git a/pkgs/by-name/tf/tf2pulumi/package.nix b/pkgs/by-name/tf/tf2pulumi/package.nix
index 37b1ac9bfe2e..934f06dacd60 100644
--- a/pkgs/by-name/tf/tf2pulumi/package.nix
+++ b/pkgs/by-name/tf/tf2pulumi/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "tf2pulumi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-i6nK1AEnQY47ro6tNDBExdcb9WvltY/21FVrVaiSTvo=";
   };
 
diff --git a/pkgs/by-name/tf/tfautomv/package.nix b/pkgs/by-name/tf/tfautomv/package.nix
index 97eb4ba2054a..3ae4cf1f0b10 100644
--- a/pkgs/by-name/tf/tfautomv/package.nix
+++ b/pkgs/by-name/tf/tfautomv/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "busser";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qUeIbHJqxGkt2esMm4w6fM52ZE16jWnxugVXxqBh1Qc=";
   };
 
diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix
index b4558be4d273..d254ce0b17ef 100644
--- a/pkgs/by-name/tf/tfswitch/package.nix
+++ b/pkgs/by-name/tf/tfswitch/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "terraform-switcher";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5Zyu0SLF+xjemFKInzRKCcDZs72gwAJN7bacO+5StMg=";
   };
 
diff --git a/pkgs/by-name/tf/tfupdate/package.nix b/pkgs/by-name/tf/tfupdate/package.nix
index 098510b344fe..c0f9f23bb43b 100644
--- a/pkgs/by-name/tf/tfupdate/package.nix
+++ b/pkgs/by-name/tf/tfupdate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "minamijoyo";
     repo = "tfupdate";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-iWiY1IuNZCqHpnAoib0SkWwAg1Mnuqr2QjKI3KZGYs0=";
   };
 
diff --git a/pkgs/by-name/tg/tgswitch/package.nix b/pkgs/by-name/tg/tgswitch/package.nix
index bfa533b26815..5ba677a70766 100644
--- a/pkgs/by-name/tg/tgswitch/package.nix
+++ b/pkgs/by-name/tg/tgswitch/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "tgswitch";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Q3Cef3B7hfVHLvW8Rx6IdH9g/3luDhpUMZ8TXVpb8gQ=";
   };
 
diff --git a/pkgs/by-name/tg/tgt/package.nix b/pkgs/by-name/tg/tgt/package.nix
index 525a882ed0c0..9b1c8e1f51af 100644
--- a/pkgs/by-name/tg/tgt/package.nix
+++ b/pkgs/by-name/tg/tgt/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fujita";
     repo = "tgt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-e7rI8/WQl1L78l2Nk9ajomRucPwsSqZ7fLSHSw11jeY=";
   };
 
diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix
index f65c0428f7c5..072937f79c38 100644
--- a/pkgs/by-name/th/thc-hydra/package.nix
+++ b/pkgs/by-name/th/thc-hydra/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vanhauser-thc";
     repo = "thc-hydra";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gdMxdFrBGVHA1ZBNFW89PBXwACnXTGJ/e/Z5+xVV5F0=";
   };
 
diff --git a/pkgs/by-name/th/thc-ipv6/package.nix b/pkgs/by-name/th/thc-ipv6/package.nix
index c28e42efb764..d94fbcd9a744 100644
--- a/pkgs/by-name/th/thc-ipv6/package.nix
+++ b/pkgs/by-name/th/thc-ipv6/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vanhauser-thc";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "07kwika1zdq62s5p5z94xznm77dxjxdg8k0hrg7wygz50151nzmx";
   };
 
diff --git a/pkgs/by-name/th/the-legend-of-edgar/package.nix b/pkgs/by-name/th/the-legend-of-edgar/package.nix
index 8504e66e4eb7..8cf790412318 100644
--- a/pkgs/by-name/th/the-legend-of-edgar/package.nix
+++ b/pkgs/by-name/th/the-legend-of-edgar/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "riksweeney";
     repo = "edgar";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-hhzDNnoQCwHOwknABTz4a9AQ7MkU9vayi2tZvJtK1PQ=";
   };
 
diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix
index 537e992cf725..9a6746d2e16c 100644
--- a/pkgs/by-name/th/theforceengine/package.nix
+++ b/pkgs/by-name/th/theforceengine/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "luciusDXL";
     repo = "TheForceEngine";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m/VNlcuvpJkcfTpL97gCUTQtdAWqimVrhU0qLj0Erck=";
   };
 
diff --git a/pkgs/by-name/th/theft/package.nix b/pkgs/by-name/th/theft/package.nix
index 97c56847006a..f32ef0f84ecc 100644
--- a/pkgs/by-name/th/theft/package.nix
+++ b/pkgs/by-name/th/theft/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "silentbicycle";
     repo = "theft";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd";
   };
 
diff --git a/pkgs/by-name/th/theme-sh/package.nix b/pkgs/by-name/th/theme-sh/package.nix
index 653bf7b148a6..ba996142cc43 100644
--- a/pkgs/by-name/th/theme-sh/package.nix
+++ b/pkgs/by-name/th/theme-sh/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lemnos";
     repo = "theme.sh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zDw8WGBzO4/HRCgN7yoUxT49ibTz+QkRa5WpBQbl1nI=";
   };
 
diff --git a/pkgs/by-name/th/theme-vertex/package.nix b/pkgs/by-name/th/theme-vertex/package.nix
index 7ff73b4cbe8c..cd5052e898cb 100644
--- a/pkgs/by-name/th/theme-vertex/package.nix
+++ b/pkgs/by-name/th/theme-vertex/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "horst3180";
     repo = "vertex-theme";
-    rev = version;
+    tag = version;
     sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98";
   };
 
diff --git a/pkgs/by-name/th/themechanger/package.nix b/pkgs/by-name/th/themechanger/package.nix
index 8d1f483c3f82..b726e4e0906d 100644
--- a/pkgs/by-name/th/themechanger/package.nix
+++ b/pkgs/by-name/th/themechanger/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ALEX11BR";
     repo = "ThemeChanger";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+uTofigS1F/nBNs/OyJ+RSz10DNnqgvNjWpkTXAvARM=";
   };
 
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/th/thermald/package.nix b/pkgs/by-name/th/thermald/package.nix
index fbf1e7fdf9aa..b4ef34a9154a 100644
--- a/pkgs/by-name/th/thermald/package.nix
+++ b/pkgs/by-name/th/thermald/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "thermal_daemon";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ydv6wZ3r2QxVji9bSx0sgpaOQNtgN+Y4rPZ44XtxNh8=";
   };
 
diff --git a/pkgs/by-name/th/thicket/package.nix b/pkgs/by-name/th/thicket/package.nix
index bef6bc28c2b5..8ffcb422aac3 100644
--- a/pkgs/by-name/th/thicket/package.nix
+++ b/pkgs/by-name/th/thicket/package.nix
@@ -11,7 +11,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "taylorthurlow";
     repo = "thicket";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sF+fNKEZEfjpW3buh6kFUpL1P0yO9g4SrTb0rhx1uNc=";
   };
 
diff --git a/pkgs/by-name/th/thin-provisioning-tools/package.nix b/pkgs/by-name/th/thin-provisioning-tools/package.nix
index 216e37afb3b7..8090f8aec03a 100644
--- a/pkgs/by-name/th/thin-provisioning-tools/package.nix
+++ b/pkgs/by-name/th/thin-provisioning-tools/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jthornber";
     repo = "thin-provisioning-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gpUiLUdg+EpVkJzDg43gI5oXhy611QwndwZZVVgg4Lg=";
   };
 
diff --git a/pkgs/by-name/th/thinkfan/package.nix b/pkgs/by-name/th/thinkfan/package.nix
index 6d7360a69f30..0fe4f18c4439 100644
--- a/pkgs/by-name/th/thinkfan/package.nix
+++ b/pkgs/by-name/th/thinkfan/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vmatare";
     repo = "thinkfan";
-    rev = version;
+    tag = version;
     sha256 = "sha256-aREZv+t4QhtfLKOMrneLiRxgnu0fzB8UV8dvr1dnhx4=";
   };
 
diff --git a/pkgs/by-name/th/thokr/package.nix b/pkgs/by-name/th/thokr/package.nix
index 928f68416573..6c4f2a82a5f8 100644
--- a/pkgs/by-name/th/thokr/package.nix
+++ b/pkgs/by-name/th/thokr/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "thatvegandev";
     repo = "thokr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0aryfx9qlnjdq3iq2d823c82fhkafvibmbz58g48b8ah5x5fv3ir";
   };
 
diff --git a/pkgs/by-name/th/thrift-ls/package.nix b/pkgs/by-name/th/thrift-ls/package.nix
index 3b97e030594d..505237eef8e7 100644
--- a/pkgs/by-name/th/thrift-ls/package.nix
+++ b/pkgs/by-name/th/thrift-ls/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "joyme123";
     repo = "thrift-ls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BkkXvmJ1XmDamU2Mt0BjbSnNVwlBxphW1FvE4x32ja0=";
   };
 
diff --git a/pkgs/by-name/th/throttled/package.nix b/pkgs/by-name/th/throttled/package.nix
index 61bb31de5862..2487f87d0b5f 100644
--- a/pkgs/by-name/th/throttled/package.nix
+++ b/pkgs/by-name/th/throttled/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "erpalma";
     repo = "throttled";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+3ktDkr5hvOfHcch4+mjgJqcuw24UgWTkJqTyDQumyk=";
   };
 
diff --git a/pkgs/by-name/th/thud/package.nix b/pkgs/by-name/th/thud/package.nix
index 2ceea89f1f2c..74d7ad589ad5 100644
--- a/pkgs/by-name/th/thud/package.nix
+++ b/pkgs/by-name/th/thud/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "donovanglover";
     repo = "thud";
-    rev = version;
+    tag = version;
     hash = "sha256-BmrJaZ1IKXjx4/QkBDZyXvTTaalfEOKsBp9ZCW8px7I=";
   };
 
diff --git a/pkgs/by-name/th/thumbs/package.nix b/pkgs/by-name/th/thumbs/package.nix
index 4062e6517a04..f9c5990e8b75 100644
--- a/pkgs/by-name/th/thumbs/package.nix
+++ b/pkgs/by-name/th/thumbs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fcsonline";
     repo = "tmux-thumbs";
-    rev = version;
+    tag = version;
     sha256 = "sha256-XMz1ZOTz2q1Dt4QdxG83re9PIsgvxTTkytESkgKxhGM=";
   };
 
diff --git a/pkgs/by-name/th/thunderbolt/package.nix b/pkgs/by-name/th/thunderbolt/package.nix
index 9ed40b0d4741..6decf0a54010 100644
--- a/pkgs/by-name/th/thunderbolt/package.nix
+++ b/pkgs/by-name/th/thunderbolt/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "01org";
     repo = "thunderbolt-software-user-space";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x";
   };
 
diff --git a/pkgs/by-name/ti/tidb/package.nix b/pkgs/by-name/ti/tidb/package.nix
index caa55285b65a..524231ff83b5 100644
--- a/pkgs/by-name/ti/tidb/package.nix
+++ b/pkgs/by-name/ti/tidb/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pingcap";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lJrW61FARZO1ll7Ln9mgCTZxGhcMlBaL6AeAVGgExIA=";
   };
 
diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
index 09a9dcd7dbfc..380bb1984cb1 100644
--- a/pkgs/by-name/ti/tidy-viewer/package.nix
+++ b/pkgs/by-name/ti/tidy-viewer/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alexhallam";
     repo = "tv";
-    rev = version;
+    tag = version;
     sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4=";
   };
 
diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix
index 617d901ed547..bbe79cd74dc6 100644
--- a/pkgs/by-name/ti/tigervnc/package.nix
+++ b/pkgs/by-name/ti/tigervnc/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TigerVNC";
     repo = "tigervnc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TgVV/4MRsQHYKpDf9L5eHMLVpdwvNy1KPDIe7xMlQ9o=";
   };
 
diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix
index ca15cf16221e..aac76df5d03f 100644
--- a/pkgs/by-name/ti/tiledb/package.nix
+++ b/pkgs/by-name/ti/tiledb/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB";
-    rev = version;
+    tag = version;
     hash = "sha256-uLiXhigYz3v7NgY38twot3sBHxZS5QCrOiPfME4wWzE=";
   };
 
diff --git a/pkgs/by-name/ti/tilix/package.nix b/pkgs/by-name/ti/tilix/package.nix
index 4ede51c57fcd..3865c4089ee0 100644
--- a/pkgs/by-name/ti/tilix/package.nix
+++ b/pkgs/by-name/ti/tilix/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gnunn1";
     repo = "tilix";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-KP0ojwyZ5FaYKW0nK9mGGAiz1h+gTbfjCUDCgN2LAO8=";
   };
 
diff --git a/pkgs/by-name/ti/tilt/package.nix b/pkgs/by-name/ti/tilt/package.nix
index 77ffc410c05c..e62769362141 100644
--- a/pkgs/by-name/ti/tilt/package.nix
+++ b/pkgs/by-name/ti/tilt/package.nix
@@ -14,7 +14,7 @@ let
     src = fetchFromGitHub {
       owner = "tilt-dev";
       repo = "tilt";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-3LFsTaz47QAIDGId/Tl3G7xP5b9gc25X+ZeMaVhXf8w=";
     };
   };
diff --git a/pkgs/by-name/ti/time-ghc-modules/package.nix b/pkgs/by-name/ti/time-ghc-modules/package.nix
index e4dbe40b46cd..d580252d1f71 100644
--- a/pkgs/by-name/ti/time-ghc-modules/package.nix
+++ b/pkgs/by-name/ti/time-ghc-modules/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "codedownio";
     repo = "time-ghc-modules";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/PhJAhP3KCWFyeSk8e5JV0cpBueH/eVDwQTMZSnnZCo=";
   };
 
diff --git a/pkgs/by-name/ti/timelapse-deflicker/package.nix b/pkgs/by-name/ti/timelapse-deflicker/package.nix
index 091ad288ddc2..45b6057d8021 100644
--- a/pkgs/by-name/ti/timelapse-deflicker/package.nix
+++ b/pkgs/by-name/ti/timelapse-deflicker/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cyberang3l";
     repo = "timelapse-deflicker";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0bbfnrdycrpyz7rqrql5ib9qszny7z5xpqp65c1mxqd2876gv960";
   };
 
diff --git a/pkgs/by-name/ti/timemachine/package.nix b/pkgs/by-name/ti/timemachine/package.nix
index c1781aed8171..923ddd316341 100644
--- a/pkgs/by-name/ti/timemachine/package.nix
+++ b/pkgs/by-name/ti/timemachine/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swh";
     repo = "timemachine";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "16fgyw6jnscx9279dczv72092dddghwlp53rkfw469kcgvjhwx0z";
   };
 
diff --git a/pkgs/by-name/ti/timer/package.nix b/pkgs/by-name/ti/timer/package.nix
index c19a23e153ad..03d578472b70 100644
--- a/pkgs/by-name/ti/timer/package.nix
+++ b/pkgs/by-name/ti/timer/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "timer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Y4goNURzWl3DGeR14jEB87IJSNhSRqoF+/7zjGQ+19E=";
   };
 
diff --git a/pkgs/by-name/ti/timescaledb-tune/package.nix b/pkgs/by-name/ti/timescaledb-tune/package.nix
index 1c17f31484df..2412d4caeaf2 100644
--- a/pkgs/by-name/ti/timescaledb-tune/package.nix
+++ b/pkgs/by-name/ti/timescaledb-tune/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "timescale";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-SW+JCH+oxAHAmgPO7XmSVFFug7NOvslblMViG+oooAo=";
   };
 
diff --git a/pkgs/by-name/ti/timew-sync-client/package.nix b/pkgs/by-name/ti/timew-sync-client/package.nix
index 7ad8a4c9c418..19e663a94595 100644
--- a/pkgs/by-name/ti/timew-sync-client/package.nix
+++ b/pkgs/by-name/ti/timew-sync-client/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "timewarrior-synchronize";
     repo = "timew-sync-client";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8Bw+BI7EiW9UcHo6gaDthX4VH4kAlycm4EvAJEEAOWc=";
   };
 
diff --git a/pkgs/by-name/ti/timew-sync-server/package.nix b/pkgs/by-name/ti/timew-sync-server/package.nix
index 54bd274b4c97..683aca335601 100644
--- a/pkgs/by-name/ti/timew-sync-server/package.nix
+++ b/pkgs/by-name/ti/timew-sync-server/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "timewarrior-synchronize";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3THRP+hydvq/dnxzUOFGeuu8//qL7pFN0RHJVxzgibI=";
   };
 
diff --git a/pkgs/by-name/ti/timewall/package.nix b/pkgs/by-name/ti/timewall/package.nix
index 6e735cd46c6f..5e6a7d154c5b 100644
--- a/pkgs/by-name/ti/timewall/package.nix
+++ b/pkgs/by-name/ti/timewall/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bcyran";
     repo = "timewall";
-    rev = version;
+    tag = version;
     hash = "sha256-ohJDaN29FG/WqkcvpbukWS37RiX2pXdkKMzNh+3NqAU=";
   };
 
diff --git a/pkgs/by-name/ti/timewarrior/package.nix b/pkgs/by-name/ti/timewarrior/package.nix
index 054a32860248..33525933e27a 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-sc4AfdXLuA9evoGU6Z97+Hq7zj9nx093+nPALRkhziQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ti/tini/package.nix b/pkgs/by-name/ti/tini/package.nix
index 0779a1ac627c..6154499f4cac 100644
--- a/pkgs/by-name/ti/tini/package.nix
+++ b/pkgs/by-name/ti/tini/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "krallin";
     repo = "tini";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4";
   };
 
diff --git a/pkgs/by-name/ti/tintin/package.nix b/pkgs/by-name/ti/tintin/package.nix
index 8e5f13f43d8c..d512055cf5f0 100644
--- a/pkgs/by-name/ti/tintin/package.nix
+++ b/pkgs/by-name/ti/tintin/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scandum";
     repo = "tintin";
-    rev = version;
+    tag = version;
     hash = "sha256-8+tYI9+yAIEqByr6kDEEs2hqtIVKwC9bgWssXq24dbg=";
   };
 
diff --git a/pkgs/by-name/ti/tiny-dfr/package.nix b/pkgs/by-name/ti/tiny-dfr/package.nix
index 0f217d0f7492..d691c8499953 100644
--- a/pkgs/by-name/ti/tiny-dfr/package.nix
+++ b/pkgs/by-name/ti/tiny-dfr/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "WhatAmISupposedToPutHere";
     repo = "tiny-dfr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5u5jyoDEt7aMs8/8QrhrUrUzFJJCNayqbN2WrMhUCV4=";
   };
 
diff --git a/pkgs/by-name/ti/tinycbor/package.nix b/pkgs/by-name/ti/tinycbor/package.nix
index 597e6f01f56d..c8a7d2fd46f3 100644
--- a/pkgs/by-name/ti/tinycbor/package.nix
+++ b/pkgs/by-name/ti/tinycbor/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "tinycbor";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JgkZAvZ63jjTdFRnyk+AeIWcGsg36UtPPFbhFjky9e8=";
   };
 
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 e32871b6a40d..82affa3937ba 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/ti/tinymembench/package.nix b/pkgs/by-name/ti/tinymembench/package.nix
index 0dc6f5a7fd10..06240da5a38f 100644
--- a/pkgs/by-name/ti/tinymembench/package.nix
+++ b/pkgs/by-name/ti/tinymembench/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ssvb";
     repo = "tinymembench";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N6jHRLqVSNe+Mk3WNfIEBGtVC7Y6/sERVaeAD68LQJc=";
   };
 
diff --git a/pkgs/by-name/ti/tinyobjloader/package.nix b/pkgs/by-name/ti/tinyobjloader/package.nix
index a48259172c45..5caaf155d443 100644
--- a/pkgs/by-name/ti/tinyobjloader/package.nix
+++ b/pkgs/by-name/ti/tinyobjloader/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tinyobjloader";
     repo = "tinyobjloader";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BNffbicnLTGK2GQ2/bB328LFU9fqHxrpAVj2hJaekWc=";
   };
 
diff --git a/pkgs/by-name/ti/tinyproxy/package.nix b/pkgs/by-name/ti/tinyproxy/package.nix
index 01c1382afd86..f7ef3ed76963 100644
--- a/pkgs/by-name/ti/tinyproxy/package.nix
+++ b/pkgs/by-name/ti/tinyproxy/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     hash = "sha256-bpr/O723FmW2gb+85aJrwW5/U7R2HwbePTx15i3rpsE=";
-    rev = version;
+    tag = version;
     repo = "tinyproxy";
     owner = "tinyproxy";
   };
diff --git a/pkgs/by-name/ti/tinyxml-2/package.nix b/pkgs/by-name/ti/tinyxml-2/package.nix
index 9b56e8f64d0b..fc557e07266c 100644
--- a/pkgs/by-name/ti/tinyxml-2/package.nix
+++ b/pkgs/by-name/ti/tinyxml-2/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "leethomason";
     repo = "tinyxml2";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-rYVQSvxA0nxlZFHwGcOWkxcXZWEvTxR9P+d8E7CSm6U=";
   };
 
diff --git a/pkgs/by-name/ti/tiv/package.nix b/pkgs/by-name/ti/tiv/package.nix
index b2347948d2e8..287ee3c96010 100644
--- a/pkgs/by-name/ti/tiv/package.nix
+++ b/pkgs/by-name/ti/tiv/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stefanhaustein";
     repo = "TerminalImageViewer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mCgybL4af19zqECN1pBV+WnxMq2ZtlK5GDTQO3u9CK0=";
   };
 
diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
index 2ada4ad71cb6..c8582f2ecd5c 100644
--- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix
+++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tillitis";
     repo = "tkey-ssh-agent";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Uf3VJJfZn4UYX1q79JdaOfrore+L/Mic3whzpP32JV0=";
   };
 
diff --git a/pkgs/by-name/tl/tl-expected/package.nix b/pkgs/by-name/tl/tl-expected/package.nix
index 1beac87e9267..92de52058d1c 100644
--- a/pkgs/by-name/tl/tl-expected/package.nix
+++ b/pkgs/by-name/tl/tl-expected/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TartanLlama";
     repo = "expected";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AuRU8VI5l7Th9fJ5jIc/6mPm0Vqbbt6rY8QCCNDOU50=";
   };
 
diff --git a/pkgs/by-name/tl/tllist/package.nix b/pkgs/by-name/tl/tllist/package.nix
index 33b89b6f186c..e7bfa0172c08 100644
--- a/pkgs/by-name/tl/tllist/package.nix
+++ b/pkgs/by-name/tl/tllist/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "tllist";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-4WW0jGavdFO3LX9wtMPzz3Z1APCPgUQOktpmwAM0SQw=";
   };
 
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/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix
index a1ff5926d464..0ade60f89747 100644
--- a/pkgs/by-name/tl/tlrc/package.nix
+++ b/pkgs/by-name/tl/tlrc/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tldr-pages";
     repo = "tlrc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LXuURq+MSSkd8+VzhltX2VqKsU3PWcQLMQTqqS5oLMg=";
   };
 
diff --git a/pkgs/by-name/tl/tlwg/package.nix b/pkgs/by-name/tl/tlwg/package.nix
index d0e7e6c77655..1243bbb3865f 100644
--- a/pkgs/by-name/tl/tlwg/package.nix
+++ b/pkgs/by-name/tl/tlwg/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tlwg";
     repo = "fonts-tlwg";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "hWiH5KJnYTdcrm+Kzn9HUQry8ry3SKzjA6/0536kCLQ=";
   };
 
diff --git a/pkgs/by-name/tm/tmatrix/package.nix b/pkgs/by-name/tm/tmatrix/package.nix
index 478f7222fbae..7267eb41f5d8 100644
--- a/pkgs/by-name/tm/tmatrix/package.nix
+++ b/pkgs/by-name/tm/tmatrix/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "M4444";
     repo = "TMatrix";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-G3dg0SWfBjCA66TTxkVAcVrFNJOWE9+GJXYKzCUX34w=";
   };
 
diff --git a/pkgs/by-name/tm/tml/package.nix b/pkgs/by-name/tm/tml/package.nix
index af5d73a40524..05c28517f3ee 100644
--- a/pkgs/by-name/tm/tml/package.nix
+++ b/pkgs/by-name/tm/tml/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = "tml";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QMXEKjOKYQlzXc2ds8OAAL5xUxayGb6mxxyeHsCkfwo=";
   };
 
diff --git a/pkgs/by-name/tm/tmpmail/package.nix b/pkgs/by-name/tm/tmpmail/package.nix
index a7fe5fe237da..3ac1f40f6713 100644
--- a/pkgs/by-name/tm/tmpmail/package.nix
+++ b/pkgs/by-name/tm/tmpmail/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sdushantha";
     repo = "tmpmail";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-s4c1M4YHK/CNpH7nPt7rRqlkLUZrpBXvAVS/qxCai9c=";
   };
 
diff --git a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
index 53fdc8e1be0f..39136f64c5f8 100644
--- a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
+++ b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thewtex";
     repo = "tmux-mem-cpu-load";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8QUcEbgk3DSsWt9TRHHtDhQ7a1hkK8RZEX+0d3h/c0w=";
   };
 
diff --git a/pkgs/by-name/tm/tmux-xpanes/package.nix b/pkgs/by-name/tm/tmux-xpanes/package.nix
index 562e00167e15..eec8787145bc 100644
--- a/pkgs/by-name/tm/tmux-xpanes/package.nix
+++ b/pkgs/by-name/tm/tmux-xpanes/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "greymd";
     repo = "tmux-xpanes";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PF2K2A49c5djQqSO7ZLFyBwPZaJRK58qZTFpY7n+Z0w=";
   };
 
diff --git a/pkgs/by-name/tm/tmux/package.nix b/pkgs/by-name/tm/tmux/package.nix
index 983a27538ad6..b09ad3878e84 100644
--- a/pkgs/by-name/tm/tmux/package.nix
+++ b/pkgs/by-name/tm/tmux/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tmux";
     repo = "tmux";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Z9XHpyh4Y6iBI4+SfFBCGA8huFJpRFZy9nEB7+WQVJE=";
   };
 
diff --git a/pkgs/by-name/tm/tmuxifier/package.nix b/pkgs/by-name/tm/tmuxifier/package.nix
index a92d54c7e92b..3ee6e9193a49 100644
--- a/pkgs/by-name/tm/tmuxifier/package.nix
+++ b/pkgs/by-name/tm/tmuxifier/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jimeh";
     repo = "tmuxifier";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7TvJnvtZEo5h45PcSy3tJN09UblswV0mQbTaKjgLyqw=";
   };
 
diff --git a/pkgs/by-name/tn/tncattach/package.nix b/pkgs/by-name/tn/tncattach/package.nix
index bc46515c44d0..46efc459d184 100644
--- a/pkgs/by-name/tn/tncattach/package.nix
+++ b/pkgs/by-name/tn/tncattach/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "tncattach";
-    rev = version;
+    tag = version;
     sha256 = "0n7ad4gqvpgabw2i67s51lfz386wmv0cvnhxq9ygxpsqmx9aynxk";
   };
 
diff --git a/pkgs/by-name/tn/tnef/package.nix b/pkgs/by-name/tn/tnef/package.nix
index 699887888bb9..1b827c9ccdf6 100644
--- a/pkgs/by-name/tn/tnef/package.nix
+++ b/pkgs/by-name/tn/tnef/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "verdammelt";
     repo = "tnef";
-    rev = version;
+    tag = version;
     sha256 = "104g48mcm00bgiyzas2vf86331w7bnw7h3bc11ib4lp7rz6zqfck";
   };
 
diff --git a/pkgs/by-name/to/to-html/package.nix b/pkgs/by-name/to/to-html/package.nix
index f4b57320848a..8bbb7a102e09 100644
--- a/pkgs/by-name/to/to-html/package.nix
+++ b/pkgs/by-name/to/to-html/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Aloso";
     repo = "to-html";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eNFt9/yK4oHOspNM8PMTewhx8APaHzmgNdrWqrUuQSU=";
   };
 
diff --git a/pkgs/by-name/to/toast/package.nix b/pkgs/by-name/to/toast/package.nix
index ea88fde7dcaf..7d2d80824996 100644
--- a/pkgs/by-name/to/toast/package.nix
+++ b/pkgs/by-name/to/toast/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "stepchowfun";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vp70jv4F0VKd/OZHVRDcIJlKLwK9w+cV28lh0C7ESqg=";
   };
 
diff --git a/pkgs/by-name/to/tocpdf/package.nix b/pkgs/by-name/to/tocpdf/package.nix
index b2136973fc8d..524188525581 100644
--- a/pkgs/by-name/to/tocpdf/package.nix
+++ b/pkgs/by-name/to/tocpdf/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kszenes";
     repo = "tocPDF";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RaNMhEgJ2pSL9BvK1d2Z8AsUPhARaRtEiCnt/2E2uNs=";
   };
 
diff --git a/pkgs/by-name/to/todo/package.nix b/pkgs/by-name/to/todo/package.nix
index 34d97ea887d7..4c4d89583e8f 100644
--- a/pkgs/by-name/to/todo/package.nix
+++ b/pkgs/by-name/to/todo/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sioodmy";
     repo = "todo";
-    rev = version;
+    tag = version;
     sha256 = "oyRdXvVnCfdFM8lI1eCDHHYNWcJc0Qg0TKxQXUqNo40=";
   };
 
diff --git a/pkgs/by-name/to/todofi-sh/package.nix b/pkgs/by-name/to/todofi-sh/package.nix
index b00b94bfcd08..3117108ad15d 100644
--- a/pkgs/by-name/to/todofi-sh/package.nix
+++ b/pkgs/by-name/to/todofi-sh/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hugokernel";
     repo = "todofi.sh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1gmy5inlghycsxiwnyyjyv81jn2fmfk3s9x78kcgyf7khzb5kwvj";
   };
 
diff --git a/pkgs/by-name/to/todoist/package.nix b/pkgs/by-name/to/todoist/package.nix
index e65deb19f956..fc28de727a04 100644
--- a/pkgs/by-name/to/todoist/package.nix
+++ b/pkgs/by-name/to/todoist/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sachaos";
     repo = "todoist";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+UECYUozca7PKKiTrmPAobSF0y6xnWYCGaChk9bwANg=";
   };
 
diff --git a/pkgs/by-name/to/tofi/package.nix b/pkgs/by-name/to/tofi/package.nix
index 8bfb589dcf08..f3fbbda46543 100644
--- a/pkgs/by-name/to/tofi/package.nix
+++ b/pkgs/by-name/to/tofi/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "philj56";
     repo = "tofi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lokp6Zmdt7WuAyuRnHBkKD4ydbNiQY7pEVY97Z62U90=";
   };
 
diff --git a/pkgs/by-name/to/toml-f/package.nix b/pkgs/by-name/to/toml-f/package.nix
index 28de929377f0..20f80983bcb8 100644
--- a/pkgs/by-name/to/toml-f/package.nix
+++ b/pkgs/by-name/to/toml-f/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "toml-f";
     repo = "toml-f";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+cac4rUNpd2w3yBdH1XoCKdJ9IgOHZioZg8AhzGY0FE=";
   };
 
diff --git a/pkgs/by-name/to/ton/package.nix b/pkgs/by-name/to/ton/package.nix
index 4423a274ddff..438bedac6cfb 100644
--- a/pkgs/by-name/to/ton/package.nix
+++ b/pkgs/by-name/to/ton/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ton-blockchain";
     repo = "ton";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Eab5tXP5gv9v/hu/Eh2WC/SeJ/bG1u6FKbREKB/ry9c=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/to/toolbox/package.nix b/pkgs/by-name/to/toolbox/package.nix
index cb2b136ab9c0..4842e766a919 100644
--- a/pkgs/by-name/to/toolbox/package.nix
+++ b/pkgs/by-name/to/toolbox/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-9HiWgEtaMypLOwXJ6Xg3grLSZOQ4NInZtcvLPV51YO8=";
   };
 
diff --git a/pkgs/by-name/to/topfew-rs/package.nix b/pkgs/by-name/to/topfew-rs/package.nix
index 0caaee2629ea..d5bb18146be5 100644
--- a/pkgs/by-name/to/topfew-rs/package.nix
+++ b/pkgs/by-name/to/topfew-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "djc";
     repo = "topfew-rs";
-    rev = version;
+    tag = version;
     hash = "sha256-VlSLPcKw3LYGnmKk5YOkcGIizw1tqtKF2BykY+1MtvY=";
   };
 
diff --git a/pkgs/by-name/to/topfew/package.nix b/pkgs/by-name/to/topfew/package.nix
index a4853fda5d23..d92152fbeefc 100644
--- a/pkgs/by-name/to/topfew/package.nix
+++ b/pkgs/by-name/to/topfew/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "timbray";
     repo = "topfew";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P3K3IhgYkrxmEG2l7EQDVWQ+P7fOjUMUFrlAnY+8NmI=";
   };
 
diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix
index 4274c97bfae7..019c900360bd 100644
--- a/pkgs/by-name/to/topicctl/package.nix
+++ b/pkgs/by-name/to/topicctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "segmentio";
     repo = "topicctl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sYt/t16OVJiWFVqSdLNog/mj1gj/TeY0r7z/gMZspls=";
   };
 
diff --git a/pkgs/by-name/to/topydo/package.nix b/pkgs/by-name/to/topydo/package.nix
index f0a888787dd1..fd6e08e59269 100644
--- a/pkgs/by-name/to/topydo/package.nix
+++ b/pkgs/by-name/to/topydo/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "topydo";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1lpfdai0pf90ffrzgmmkadbd86rb7250i3mglpkc82aj6prjm6yb";
   };
 
diff --git a/pkgs/by-name/to/torctl/package.nix b/pkgs/by-name/to/torctl/package.nix
index d184953e8560..8269142b79b5 100644
--- a/pkgs/by-name/to/torctl/package.nix
+++ b/pkgs/by-name/to/torctl/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BlackArch";
     repo = "torctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rTJR+9pbK/sWMqdHyIqJgASgCGtGtpUPoHmYZJ7COFQ=";
   };
 
diff --git a/pkgs/by-name/to/torrent7z/package.nix b/pkgs/by-name/to/torrent7z/package.nix
index 054b48e630a9..71ccdffdec94 100644
--- a/pkgs/by-name/to/torrent7z/package.nix
+++ b/pkgs/by-name/to/torrent7z/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BubblesInTheTub";
     repo = "torrent7z";
-    rev = version;
+    tag = version;
     sha256 = "Y2tr0+z9uij4Ifi6FfWRN24BwcDXUZKVLkLtKUiVjU4=";
   };
 
diff --git a/pkgs/by-name/to/torrential/package.nix b/pkgs/by-name/to/torrential/package.nix
index 913e1b5c34e8..3a23baa582c6 100644
--- a/pkgs/by-name/to/torrential/package.nix
+++ b/pkgs/by-name/to/torrential/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "davidmhewitt";
     repo = "torrential";
-    rev = version;
+    tag = version;
     sha256 = "sha256-uHc/VNtbhetmGyuhynZH1TvxJscVX17eWO6dzX6Ft3A=";
   };
 
diff --git a/pkgs/by-name/to/torrentstream/package.nix b/pkgs/by-name/to/torrentstream/package.nix
index 8d9a9044eeb7..5335c6092edb 100644
--- a/pkgs/by-name/to/torrentstream/package.nix
+++ b/pkgs/by-name/to/torrentstream/package.nix
@@ -12,7 +12,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "trueromanus";
     repo = "TorrentStream";
-    rev = version;
+    tag = version;
     hash = "sha256-3lmQWx00Ulp0ZyQBEhFT+djHBi84foMlWGJEp/UOGek=";
   };
 
diff --git a/pkgs/by-name/to/toss/package.nix b/pkgs/by-name/to/toss/package.nix
index a1f877837c71..3a1dd9049447 100644
--- a/pkgs/by-name/to/toss/package.nix
+++ b/pkgs/by-name/to/toss/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zerotier";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "05ql0d8wbdhnmh3dw8ch5bi6clfb9h8v21lq2a74iy02slya2y0r";
   };
   preInstall = "export DESTDIR=$out/bin";
diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix
index aebc2e3f1028..06342efedecd 100644
--- a/pkgs/by-name/to/touchegg/package.nix
+++ b/pkgs/by-name/to/touchegg/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JoseExposito";
     repo = "touchegg";
-    rev = version;
+    tag = version;
     sha256 = "sha256-he6ERl6ZNWuD5StUqQWsUjeJ35nD0b8KddIAvntqlOI=";
   };
 
diff --git a/pkgs/by-name/to/tox-node/package.nix b/pkgs/by-name/to/tox-node/package.nix
index 906daf467030..60884b9ac34e 100644
--- a/pkgs/by-name/to/tox-node/package.nix
+++ b/pkgs/by-name/to/tox-node/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tox-rs";
     repo = "tox";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3ZRpri3WxwHjMq88TxRJAaTXMui8N1uLek+q8g5PGD4=";
   };
 
diff --git a/pkgs/by-name/to/toxic/package.nix b/pkgs/by-name/to/toxic/package.nix
index 8c2c228b53c4..c1c28cc4f040 100644
--- a/pkgs/by-name/to/toxic/package.nix
+++ b/pkgs/by-name/to/toxic/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TokTok";
     repo = "toxic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qwMkqPTONtG+LnH6a/Debp+n39dJpbUMoy1nIukYjKo=";
   };
 
diff --git a/pkgs/by-name/to/toxiproxy/package.nix b/pkgs/by-name/to/toxiproxy/package.nix
index b4ea12ad2178..fd63d047bc38 100644
--- a/pkgs/by-name/to/toxiproxy/package.nix
+++ b/pkgs/by-name/to/toxiproxy/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "toxiproxy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CqJr3h2n+fzN6Ves38H7fYXd5vlpDVfF3kg4Tr8ThPc=";
   };
 
diff --git a/pkgs/by-name/tp/tp-auto-kbbl/package.nix b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
index d5d2915627ec..b3f1ba57be86 100644
--- a/pkgs/by-name/tp/tp-auto-kbbl/package.nix
+++ b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "saibotd";
     repo = "tp-auto-kbbl";
-    rev = version;
+    tag = version;
     hash = "sha256-fhBCsOjaQH2tRsBjMGiDmZSIkAgEVxxywVp8/0uAaTU=";
   };
 
diff --git a/pkgs/by-name/tp/tpacpi-bat/package.nix b/pkgs/by-name/tp/tpacpi-bat/package.nix
index 8a5f8d32e534..afc8d4df2322 100644
--- a/pkgs/by-name/tp/tpacpi-bat/package.nix
+++ b/pkgs/by-name/tp/tpacpi-bat/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "teleshoes";
     repo = "tpacpi-bat";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9XnvVNdgB5VeI3juZfc8N5weEyULXuqu1IDChZfQqFk=";
   };
 
diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix
index 338ab7df26f8..a61c2e85b317 100644
--- a/pkgs/by-name/tp/tparse/package.nix
+++ b/pkgs/by-name/tp/tparse/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "mfridman";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yU4hP+EJ+Ci3Ms0dAoSuqZFT9RRwqmN1V0x5cV+87z0=";
   };
 
diff --git a/pkgs/by-name/tp/tpi/package.nix b/pkgs/by-name/tp/tpi/package.nix
index 0e2135103417..baeb0ddec2e5 100644
--- a/pkgs/by-name/tp/tpi/package.nix
+++ b/pkgs/by-name/tp/tpi/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "turing-machines";
     repo = "tpi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-se5+8Zf+RKtvfkmDDxKiUVp5J+bQ9j9RFedDK/pxCgA=";
   };
 
diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix
index 2c567f0254a1..a907fb2d2945 100644
--- a/pkgs/by-name/tp/tplay/package.nix
+++ b/pkgs/by-name/tp/tplay/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "maxcurzi";
     repo = "tplay";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SRn7kg5FdSimKMFowKNUIan+MrojtNO0apeehIRTzfw=";
   };
 
diff --git a/pkgs/by-name/tp/tpm2-abrmd/package.nix b/pkgs/by-name/tp/tpm2-abrmd/package.nix
index 28e9069d983c..729e72856940 100644
--- a/pkgs/by-name/tp/tpm2-abrmd/package.nix
+++ b/pkgs/by-name/tp/tpm2-abrmd/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = "tpm2-abrmd";
-    rev = version;
+    tag = version;
     sha256 = "sha256-l0ncCMsStaeFACRU3Bt6F1zyiOTGY6wOHewA4AD58Ww=";
   };
 
diff --git a/pkgs/by-name/tp/tpm2-openssl/package.nix b/pkgs/by-name/tp/tpm2-openssl/package.nix
index a3a36bf24a3e..db220200a3d1 100644
--- a/pkgs/by-name/tp/tpm2-openssl/package.nix
+++ b/pkgs/by-name/tp/tpm2-openssl/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = "tpm2-openssl";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-CCTR7qBqI/y+jLBEEcgRanYOBNUYM/sH/hCqOLGA4QM=";
   };
 
diff --git a/pkgs/by-name/tp/tpm2-totp/package.nix b/pkgs/by-name/tp/tpm2-totp/package.nix
index 4bfea9d11936..1f35badcc8e5 100644
--- a/pkgs/by-name/tp/tpm2-totp/package.nix
+++ b/pkgs/by-name/tp/tpm2-totp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = "tpm2-totp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aeWhI2GQcWa0xAqlmHfcbCMg78UqcD6eanLlEVNVnRM=";
   };
 
diff --git a/pkgs/by-name/tp/tpsecore/package.nix b/pkgs/by-name/tp/tpsecore/package.nix
index b4501a90f222..ea463048fb9f 100644
--- a/pkgs/by-name/tp/tpsecore/package.nix
+++ b/pkgs/by-name/tp/tpsecore/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitLab {
     owner = "UniQMG";
     repo = "tpsecore";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+OynnLMBEiYwdFzxGzgkcBN6xrHoH1Q6O5i+OW7RBLo=";
   };
 
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/trackballs/package.nix b/pkgs/by-name/tr/trackballs/package.nix
index 1b21058149a1..3ce688e60fdd 100644
--- a/pkgs/by-name/tr/trackballs/package.nix
+++ b/pkgs/by-name/tr/trackballs/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trackballs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8=";
   };
 
diff --git a/pkgs/by-name/tr/trackma/package.nix b/pkgs/by-name/tr/trackma/package.nix
index 69f91e5af2eb..f5fdfe55102f 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 = "qlkFQSJFjxkGd5WkNGfyAo64ys8VJLep/ZOL6icXQ4c=";
     fetchSubmodules = true; # for anime-relations submodule
   };
diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix
index 5916ac4cca4f..f4088ca7e0a6 100644
--- a/pkgs/by-name/tr/tracy/package.nix
+++ b/pkgs/by-name/tr/tracy/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wolfpld";
     repo = "tracy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HofqYJT1srDJ6Y1f18h7xtAbI/Gvvz0t9f0wBNnOZK8=";
   };
 
diff --git a/pkgs/by-name/tr/traefik-certs-dumper/package.nix b/pkgs/by-name/tr/traefik-certs-dumper/package.nix
index 521e56259ddb..098af6aa576f 100644
--- a/pkgs/by-name/tr/traefik-certs-dumper/package.nix
+++ b/pkgs/by-name/tr/traefik-certs-dumper/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ldez";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zXbtabh5ZziELZHzvYisXETPUmhHAVo6sMuF4O3crBY=";
   };
 
diff --git a/pkgs/by-name/tr/traitor/package.nix b/pkgs/by-name/tr/traitor/package.nix
index df86de2717dd..823e20b4366e 100644
--- a/pkgs/by-name/tr/traitor/package.nix
+++ b/pkgs/by-name/tr/traitor/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LQfKdjZaTm5z8DUt6He/RJHbOUCUwP3CV3Fyt5rJIfU=";
   };
 
diff --git a/pkgs/by-name/tr/trak/package.nix b/pkgs/by-name/tr/trak/package.nix
index 27340965ce88..fd8d82c65865 100644
--- a/pkgs/by-name/tr/trak/package.nix
+++ b/pkgs/by-name/tr/trak/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lcfd";
     repo = "trak";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YJMX7pNRWdNPyWNZ1HfpdYsKSStRWLcianLz6nScMa8=";
   };
 
diff --git a/pkgs/by-name/tr/tran/package.nix b/pkgs/by-name/tr/tran/package.nix
index f4a36a4110b1..2e682dd85f6c 100644
--- a/pkgs/by-name/tr/tran/package.nix
+++ b/pkgs/by-name/tr/tran/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "abdfnx";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qp4g1ZLRIIz0CZ/Zey354g0j9ePE4pGb82IivLezU7s=";
   };
 
diff --git a/pkgs/by-name/tr/transcrypt/package.nix b/pkgs/by-name/tr/transcrypt/package.nix
index 2a1e10b1822a..c5905f2c9b6c 100644
--- a/pkgs/by-name/tr/transcrypt/package.nix
+++ b/pkgs/by-name/tr/transcrypt/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elasticdog";
     repo = "transcrypt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-s95EnEmcdd5mFAKvtZ88aXxkrRLSZUP0VBrCy5PR4fo=";
   };
 
diff --git a/pkgs/by-name/tr/transfer-sh/package.nix b/pkgs/by-name/tr/transfer-sh/package.nix
index 360621b97433..1f8808922597 100644
--- a/pkgs/by-name/tr/transfer-sh/package.nix
+++ b/pkgs/by-name/tr/transfer-sh/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dutchcoders";
     repo = "transfer.sh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-V8E6RwzxKB6KeGPer5074e7y6XHn3ZD24PQMwTxw5lQ=";
   };
 
diff --git a/pkgs/by-name/tr/transifex-cli/package.nix b/pkgs/by-name/tr/transifex-cli/package.nix
index 0a46be3e71b3..2b24c01ee2d2 100644
--- a/pkgs/by-name/tr/transifex-cli/package.nix
+++ b/pkgs/by-name/tr/transifex-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "transifex";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jzAt/SalItGG0KI3GZb4/pT4T7oHwCji2bjNR1BTJXI=";
   };
 
diff --git a/pkgs/by-name/tr/translate-shell/package.nix b/pkgs/by-name/tr/translate-shell/package.nix
index 132ce92697eb..bcd809810f0b 100644
--- a/pkgs/by-name/tr/translate-shell/package.nix
+++ b/pkgs/by-name/tr/translate-shell/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "soimort";
     repo = "translate-shell";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ILXE8cSrivYqMruE+xtNIInLdwdRfMX5dneY9Nn12Uk=";
   };
 
diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix
index 96530f98f980..a490eaa699ad 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/trash-cli/package.nix b/pkgs/by-name/tr/trash-cli/package.nix
index c0aa05da5e6c..f195ed9f428f 100644
--- a/pkgs/by-name/tr/trash-cli/package.nix
+++ b/pkgs/by-name/tr/trash-cli/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "andreafrancia";
     repo = "trash-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-ltuMnxtG4jTTSZd6ZHWl8wI0oQMMFqW0HAPetZMfGtc=";
   };
 
diff --git a/pkgs/by-name/tr/trayscale/package.nix b/pkgs/by-name/tr/trayscale/package.nix
index fc3844d274c1..e998ffc38942 100644
--- a/pkgs/by-name/tr/trayscale/package.nix
+++ b/pkgs/by-name/tr/trayscale/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DeedleFake";
     repo = "trayscale";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ct52IcRm44aDibiZfA1YySC7/jocHC4rB418DQvrp1s=";
   };
 
diff --git a/pkgs/by-name/tr/trdl-client/package.nix b/pkgs/by-name/tr/trdl-client/package.nix
index b0ba4f81af4e..e1a62b4f6196 100644
--- a/pkgs/by-name/tr/trdl-client/package.nix
+++ b/pkgs/by-name/tr/trdl-client/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "werf";
     repo = "trdl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-f7gyGGClMk/5+FCivuLasiIG/Ty17yeJ8qQ/GVEbC14=";
   };
 
diff --git a/pkgs/by-name/tr/tre-command/package.nix b/pkgs/by-name/tr/tre-command/package.nix
index f7e239e2acd9..98d1c47e51a1 100644
--- a/pkgs/by-name/tr/tre-command/package.nix
+++ b/pkgs/by-name/tr/tre-command/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dduan";
     repo = "tre";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JlkONhXMWLzxAf3SYoLkSvXw4bFYBnsCyyj0TUsezwg=";
   };
 
diff --git a/pkgs/by-name/tr/tree-from-tags/package.nix b/pkgs/by-name/tr/tree-from-tags/package.nix
index eb571a41ddf4..bc9488016625 100644
--- a/pkgs/by-name/tr/tree-from-tags/package.nix
+++ b/pkgs/by-name/tr/tree-from-tags/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "dbrock";
     repo = "bongo";
-    rev = version;
+    tag = version;
     hash = "sha256-G+6rRJLNBECxGc8WuaesXhrYqvEDy2Chpw4lWxO8X9s=";
   };
 
diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix
index ae557127722e..732dee38175e 100644
--- a/pkgs/by-name/tr/treedome/package.nix
+++ b/pkgs/by-name/tr/treedome/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchgit {
     url = "https://codeberg.org/solver-orgz/treedome";
-    rev = version;
+    tag = version;
     hash = "sha256-fJnrM9I11JKqzrprXa51mJiz9oO5hDp6u69FqJs5l8o=";
     fetchLFS = true;
   };
diff --git a/pkgs/by-name/tr/treefmt/package.nix b/pkgs/by-name/tr/treefmt/package.nix
index 8a2713a5fc47..78fd7935ec11 100644
--- a/pkgs/by-name/tr/treefmt/package.nix
+++ b/pkgs/by-name/tr/treefmt/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "treefmt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-097qAvJnMpxvhXNEjk54TXQHIODXP8lpitbN0ekWN+U=";
   };
 
diff --git a/pkgs/by-name/tr/tremc/package.nix b/pkgs/by-name/tr/tremc/package.nix
index adfdebdee737..5dca40c7154e 100644
--- a/pkgs/by-name/tr/tremc/package.nix
+++ b/pkgs/by-name/tr/tremc/package.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tremc";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-219rntmetmj1JFG+4NyYMFTWmrHKJL7fnLoMIvnTP4Y=";
   };
 
diff --git a/pkgs/by-name/tr/trexio/package.nix b/pkgs/by-name/tr/trexio/package.nix
index ecfa125c8579..8a1c1d40a7bd 100644
--- a/pkgs/by-name/tr/trexio/package.nix
+++ b/pkgs/by-name/tr/trexio/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TREX-CoE";
     repo = "trexio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KP8tpwBr/ymjcXmCssdn+Xti0UKgazJSGTgVpvE+CiM=";
   };
 
diff --git a/pkgs/by-name/tr/trf/package.nix b/pkgs/by-name/tr/trf/package.nix
index 3bd1f19bbec6..a7d0f1ebd6db 100644
--- a/pkgs/by-name/tr/trf/package.nix
+++ b/pkgs/by-name/tr/trf/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Benson-Genomics-Lab";
     repo = "trf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-73LypVqBdlRdDCblf9JNZQmS5Za8xpId4ha5GjTJHDo=";
   };
 
diff --git a/pkgs/by-name/tr/triforce-lv2/package.nix b/pkgs/by-name/tr/triforce-lv2/package.nix
index a41fa390eea6..7933b60dded4 100644
--- a/pkgs/by-name/tr/triforce-lv2/package.nix
+++ b/pkgs/by-name/tr/triforce-lv2/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chadmed";
     repo = "triforce";
-    rev = version;
+    tag = version;
     hash = "sha256-Y9ufUADhpT3NPj/OfhQ7xJoBqoOkPkVFA0TvUwCubrU=";
   };
 
diff --git a/pkgs/by-name/tr/trillian/package.nix b/pkgs/by-name/tr/trillian/package.nix
index 0f65953ea0e0..7e9c5f79edc6 100644
--- a/pkgs/by-name/tr/trillian/package.nix
+++ b/pkgs/by-name/tr/trillian/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TOJqBfYVubwgDF/9i6lwmCLj6x0utzz0O7QJ5SqshCA=";
   };
 
diff --git a/pkgs/by-name/tr/trimal/package.nix b/pkgs/by-name/tr/trimal/package.nix
index 110227ca764e..8888c7663d78 100644
--- a/pkgs/by-name/tr/trimal/package.nix
+++ b/pkgs/by-name/tr/trimal/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "trimal";
     owner = "scapella";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6GXirih7nY0eD2XS8aplLcYf53EeLuae+ewdUgBiKQQ=";
   };
 
diff --git a/pkgs/by-name/tr/trippy/package.nix b/pkgs/by-name/tr/trippy/package.nix
index 5d928123fc4b..301b2c893d30 100644
--- a/pkgs/by-name/tr/trippy/package.nix
+++ b/pkgs/by-name/tr/trippy/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fujiapple852";
     repo = "trippy";
-    rev = version;
+    tag = version;
     hash = "sha256-LRO2blzzSaYjQVmXpN2aF3qPhfzCrbyc9R7C11UVyV8=";
   };
 
diff --git a/pkgs/by-name/tr/triton/package.nix b/pkgs/by-name/tr/triton/package.nix
index 3d3a383bfda0..4cabeeec6182 100644
--- a/pkgs/by-name/tr/triton/package.nix
+++ b/pkgs/by-name/tr/triton/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "TritonDataCenter";
     repo = "node-triton";
-    rev = version;
+    tag = version;
     hash = "sha256-udS5CnaaeaY+owOrbC3R2jrNBpuTBKOkHrIS2AlHWAE=";
   };
 
diff --git a/pkgs/by-name/tr/trlib/package.nix b/pkgs/by-name/tr/trlib/package.nix
index a3770293dd02..e6a1beeea9d0 100644
--- a/pkgs/by-name/tr/trlib/package.nix
+++ b/pkgs/by-name/tr/trlib/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "felixlen";
     repo = "trlib";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-pD2MGsIQgMO4798Gp9oLprKhmV0lcjgtUHh1rvEjSIY=";
   };
 
diff --git a/pkgs/by-name/tr/trompeloeil/package.nix b/pkgs/by-name/tr/trompeloeil/package.nix
index 09098810b63e..625f31f6904d 100644
--- a/pkgs/by-name/tr/trompeloeil/package.nix
+++ b/pkgs/by-name/tr/trompeloeil/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rollbear";
     repo = "trompeloeil";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-AyTBHsPYaruq0jadifVqOs80YZ5xwajHdHgMINl3i1Q=";
   };
 
diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix
index 47959e4eddbf..26c329a9c51c 100644
--- a/pkgs/by-name/tr/trunk-ng/package.nix
+++ b/pkgs/by-name/tr/trunk-ng/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ctron";
     repo = "trunk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SnE0z9Wa4gtX/ts0vG9pYnnxumILHTSV9/tVYkCHFck=";
   };
 
diff --git a/pkgs/by-name/tr/trunk-recorder/package.nix b/pkgs/by-name/tr/trunk-recorder/package.nix
index f7846b0ac194..39ead399cc5d 100644
--- a/pkgs/by-name/tr/trunk-recorder/package.nix
+++ b/pkgs/by-name/tr/trunk-recorder/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "robotastic";
     repo = "trunk-recorder";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d2iBCSLR3kr6rnLXO3MeGVdi6+8pqXZqW/yhxAvA1cY=";
   };
 
diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix
index df7650f46460..46da103d5e21 100644
--- a/pkgs/by-name/tr/trunk/package.nix
+++ b/pkgs/by-name/tr/trunk/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "trunk-rs";
     repo = "trunk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GFRNbrfI0sJ/GuvT924/gxmzbnf0s0QNf+Mpv1+5rbc=";
   };
 
diff --git a/pkgs/by-name/tr/try/package.nix b/pkgs/by-name/tr/try/package.nix
index 7211abbc775f..2127456b59e2 100644
--- a/pkgs/by-name/tr/try/package.nix
+++ b/pkgs/by-name/tr/try/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "binpash";
     repo = "try";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2EDRVwW4XzQhd7rAM2rDuR94Fkaq4pH5RTooFEBBh5g=";
   };
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ts/ts-warp/package.nix b/pkgs/by-name/ts/ts-warp/package.nix
index 653b0856ac80..b727727f0856 100644
--- a/pkgs/by-name/ts/ts-warp/package.nix
+++ b/pkgs/by-name/ts/ts-warp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mezantrop";
     repo = "ts-warp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-bFF/xVI6K2pDMQazJ3E/lAMfrAMbb0cCVUgbfoFxd4Y=";
   };
 
diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix
index aab0192fe498..c8686c5eaace 100644
--- a/pkgs/by-name/ts/ts_query_ls/package.nix
+++ b/pkgs/by-name/ts/ts_query_ls/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "ribru17";
     repo = "ts_query_ls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3dUmHux+kXuIGao8vX0ZzVZO6fnPegQ4yqzmt2mMmOg=";
   };
 
diff --git a/pkgs/by-name/ts/tsduck/package.nix b/pkgs/by-name/ts/tsduck/package.nix
index b58896719134..f28d212fc4e4 100644
--- a/pkgs/by-name/ts/tsduck/package.nix
+++ b/pkgs/by-name/ts/tsduck/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tsduck";
     repo = "tsduck";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-268TKCh3naebbw+sOQ6d4N/zl7UEVtc3l3flFAYHDU4=";
   };
 
diff --git a/pkgs/by-name/ts/tslib/package.nix b/pkgs/by-name/ts/tslib/package.nix
index 4ab8ddda9b62..48e0549dc5a2 100644
--- a/pkgs/by-name/ts/tslib/package.nix
+++ b/pkgs/by-name/ts/tslib/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libts";
     repo = "tslib";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = finalAttrs.hash;
   };
 
diff --git a/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix b/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
index 8e92d249f6f4..a957370f507f 100644
--- a/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
+++ b/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "feediron";
     repo = "ttrss_plugin-feediron";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KU4XQJNK7Ua7rZaXA32lv16RlloCysAb54E5kEY847A=";
   };
 
diff --git a/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
index 18e14aae380d..b615c650c176 100644
--- a/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
+++ b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "levito";
     repo = "tt-rss-feedly-theme";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3mD1aY7gjdvucRzY7sLmZ1RsHtraAg1RGE/3uDp6/o4=";
   };
 
diff --git a/pkgs/by-name/tt/tt/package.nix b/pkgs/by-name/tt/tt/package.nix
index 480b9f245c05..cf7a07a85748 100644
--- a/pkgs/by-name/tt/tt/package.nix
+++ b/pkgs/by-name/tt/tt/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lemnos";
     repo = "tt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vKh19xYBeNqvVFilvA7NeQ34RM5VnwDs+Hu/pe3J0y4=";
   };
 
diff --git a/pkgs/by-name/tt/tt2020/package.nix b/pkgs/by-name/tt/tt2020/package.nix
index 94872dd6b8ec..706affdaec73 100644
--- a/pkgs/by-name/tt/tt2020/package.nix
+++ b/pkgs/by-name/tt/tt2020/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ctrlcctrlv";
     repo = "TT2020";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eAJzaookHcQ/7QNq/HUKA/O2liyKynJNdo6QuZ1Bv6k=";
   };
 
diff --git a/pkgs/by-name/tt/ttags/package.nix b/pkgs/by-name/tt/ttags/package.nix
index 879f8b4fecf9..8f06dbfb8612 100644
--- a/pkgs/by-name/tt/ttags/package.nix
+++ b/pkgs/by-name/tt/ttags/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "npezza93";
     repo = "ttags";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-z0IxGdveMtCXmCKD4jp/BEA6mtTl4CitIrVhM6BtHzA=";
   };
 
diff --git a/pkgs/by-name/tt/ttchat/package.nix b/pkgs/by-name/tt/ttchat/package.nix
index 893abb63c4f0..8d9b55be8db7 100644
--- a/pkgs/by-name/tt/ttchat/package.nix
+++ b/pkgs/by-name/tt/ttchat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "atye";
     repo = "ttchat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ezlqji/j6nyCzc1jrfB1MZR4ugKAa5D5CL6wfuP6PsY=";
   };
 
diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix
index 4d577365b809..1ea36553d4dd 100644
--- a/pkgs/by-name/tt/ttdl/package.nix
+++ b/pkgs/by-name/tt/ttdl/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "VladimirMarkelov";
     repo = "ttdl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cCz2wxYvYAoI+Hmyll+Fn56NUCuWlIiJycmYvGyhkR4=";
   };
 
diff --git a/pkgs/by-name/tt/tty-share/package.nix b/pkgs/by-name/tt/tty-share/package.nix
index 1847050236b1..af28a5eb3f5b 100644
--- a/pkgs/by-name/tt/tty-share/package.nix
+++ b/pkgs/by-name/tt/tty-share/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "elisescu";
     repo = "tty-share";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+Bh39WtzReOmHcvpGbNfEdBqw7ZL9Vhxu5d337CMc/M=";
   };
 
diff --git a/pkgs/by-name/tt/tty-solitaire/package.nix b/pkgs/by-name/tt/tty-solitaire/package.nix
index b4018375295d..6479619a6ca8 100644
--- a/pkgs/by-name/tt/tty-solitaire/package.nix
+++ b/pkgs/by-name/tt/tty-solitaire/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mpereira";
     repo = "tty-solitaire";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zMLNWJieHxHALFQoSkdAxGbUBGuZnznLX86lI3P21F0=";
   };
 
diff --git a/pkgs/by-name/tt/ttygif/package.nix b/pkgs/by-name/tt/ttygif/package.nix
index e2446e2a687b..5da47fc9a114 100644
--- a/pkgs/by-name/tt/ttygif/package.nix
+++ b/pkgs/by-name/tt/ttygif/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "icholy";
     repo = "ttygif";
-    rev = version;
+    tag = version;
     sha256 = "sha256-GsMeVR2wNivQguZ6B/0v39Td9VGHg+m3RtAG9DYkNmU=";
   };
 
diff --git a/pkgs/by-name/tt/ttylog/package.nix b/pkgs/by-name/tt/ttylog/package.nix
index d98e3a27acc7..8aaae29aa327 100644
--- a/pkgs/by-name/tt/ttylog/package.nix
+++ b/pkgs/by-name/tt/ttylog/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rocasa";
     repo = "ttylog";
-    rev = version;
+    tag = version;
     sha256 = "0c746bpjpa77vsr88fxk8h1803p5np1di1mpjf4jy5bv5x3zwm07";
   };
 
diff --git a/pkgs/by-name/tt/ttyper/package.nix b/pkgs/by-name/tt/ttyper/package.nix
index 17c4096da056..4c32aff3d289 100644
--- a/pkgs/by-name/tt/ttyper/package.nix
+++ b/pkgs/by-name/tt/ttyper/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "max-niederman";
     repo = "ttyper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g4OD4Mc3KHN9rrzM+9JvN2xTnSojGQy6yptdGj3zgW4=";
   };
 
diff --git a/pkgs/by-name/tt/ttyplot/package.nix b/pkgs/by-name/tt/ttyplot/package.nix
index 2b3fad58f44b..04cea2d4aa73 100644
--- a/pkgs/by-name/tt/ttyplot/package.nix
+++ b/pkgs/by-name/tt/ttyplot/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tenox7";
     repo = "ttyplot";
-    rev = version;
+    tag = version;
     hash = "sha256-XPWfSL1395TBkUmAO5kB9TdAZHL011o6t/2s01W/kk8=";
   };
 
diff --git a/pkgs/by-name/tu/tuba/package.nix b/pkgs/by-name/tu/tuba/package.nix
index 93ff59a89383..ad35d3dc9962 100644
--- a/pkgs/by-name/tu/tuba/package.nix
+++ b/pkgs/by-name/tu/tuba/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "Tuba";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SQrk6zsn3zZQTIruqVfjzs5cNyT2pAvM8XNI8SmyFM0=";
   };
 
diff --git a/pkgs/by-name/tu/tuc/package.nix b/pkgs/by-name/tu/tuc/package.nix
index d07b518c253a..238a67dbea41 100644
--- a/pkgs/by-name/tu/tuc/package.nix
+++ b/pkgs/by-name/tu/tuc/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "riquito";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+QkkwQfp818bKVo1yUkWKLMqbdzRJ+oHpjxB+UFDRsU=";
   };
 
diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix
index 283259994be1..049a893f049b 100644
--- a/pkgs/by-name/tu/tuckr/package.nix
+++ b/pkgs/by-name/tu/tuckr/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "RaphGL";
     repo = "Tuckr";
-    rev = version;
+    tag = version;
     hash = "sha256-0ZPBJ2MNeoGCvYW6HswVZ5SyjZpdR21lp9ebceIhsfw=";
   };
 
diff --git a/pkgs/by-name/tu/tuhi/package.nix b/pkgs/by-name/tu/tuhi/package.nix
index fa0fb7097139..e3fac77f3f5c 100644
--- a/pkgs/by-name/tu/tuhi/package.nix
+++ b/pkgs/by-name/tu/tuhi/package.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tuhiproject";
     repo = "tuhi";
-    rev = version;
+    tag = version;
     sha256 = "sha256-NwyG2KhOrAKRewgmU23OMO0+A9SjkQZsDL4SGnLVCvo=";
   };
 
diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index cf11de57e07f..466dc23d7e9d 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AmmarAbouZor";
     repo = "tui-journal";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XbOKC+utKt53iFzNbm861tMGsNMZ2GQc+/J0Dm/SYS8=";
   };
 
diff --git a/pkgs/by-name/tu/tuir/package.nix b/pkgs/by-name/tu/tuir/package.nix
index e193ea2d9ecf..8de2528e6c06 100644
--- a/pkgs/by-name/tu/tuir/package.nix
+++ b/pkgs/by-name/tu/tuir/package.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "Chocimier";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VYBtD3Ex6+iIRNvX6jF0b0iPvno41/58xCRydiyssvk=";
   };
 
diff --git a/pkgs/by-name/tu/tuntox/package.nix b/pkgs/by-name/tu/tuntox/package.nix
index 374e4a30b703..ae6a5b159470 100644
--- a/pkgs/by-name/tu/tuntox/package.nix
+++ b/pkgs/by-name/tu/tuntox/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gjedeer";
     repo = "tuntox";
-    rev = version;
+    tag = version;
     sha256 = "sha256-c/0OxUH8iw8nRuVg4Fszf6Z/JiEV+m0B2ofzy81uFu8=";
   };
 
diff --git a/pkgs/by-name/tu/tunwg/package.nix b/pkgs/by-name/tu/tunwg/package.nix
index 3616c023fea8..a6aa8222752b 100644
--- a/pkgs/by-name/tu/tunwg/package.nix
+++ b/pkgs/by-name/tu/tunwg/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ntnj";
     repo = "tunwg";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+vgl7saHp1Co35nkxQ+IhqYr6GdGd0JIFEFrezQd5Yo=";
   };
 
diff --git a/pkgs/by-name/tu/tup/package.nix b/pkgs/by-name/tu/tup/package.nix
index 4bccae8ee432..ce6bc9ad0968 100644
--- a/pkgs/by-name/tu/tup/package.nix
+++ b/pkgs/by-name/tu/tup/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gittup";
     repo = "tup";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-biVR932wHiUG56mvXoKWFzrzpkclbW9RWM4vY1+OMZ0=";
   };
 
diff --git a/pkgs/by-name/tu/tuptime/package.nix b/pkgs/by-name/tu/tuptime/package.nix
index 02b01ff4a455..1bc6533baa93 100644
--- a/pkgs/by-name/tu/tuptime/package.nix
+++ b/pkgs/by-name/tu/tuptime/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rfmoz";
     repo = "tuptime";
-    rev = version;
+    tag = version;
     sha256 = "sha256-pYGtgv9hPBG/URD2nOWg6qJYYLtlqLW+t5mCLpzKlEc=";
   };
 
diff --git a/pkgs/by-name/tu/turbocase/package.nix b/pkgs/by-name/tu/turbocase/package.nix
index cfc46e3c5a27..a65d57586fe9 100644
--- a/pkgs/by-name/tu/turbocase/package.nix
+++ b/pkgs/by-name/tu/turbocase/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
     domain = "codeberg.org";
     owner = "MartijnBraam";
     repo = "TurboCase";
-    rev = version;
+    tag = version;
     hash = "sha256-mwWN7XYKr/BD9r935oElqoQN87kdrrWjkmhURkAkjj4=";
   };
 
diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix
index 3a582fd21167..e4cd64b410da 100644
--- a/pkgs/by-name/tu/turnon/package.nix
+++ b/pkgs/by-name/tu/turnon/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "swsnr";
     repo = "turnon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eKJRyQMZOa/QRUW0VQ0EkXbJSMcYHfCC9wTs0YEB1yo=";
   };
 
diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix
index 1e13fe0a3505..0aa96ed224ce 100644
--- a/pkgs/by-name/tu/turso-cli/package.nix
+++ b/pkgs/by-name/tu/turso-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-94av3EW96qApCYWpo08QjrxoneuqGrE98aE7YXQEaT4=";
   };
 
diff --git a/pkgs/by-name/tu/turtle-build/package.nix b/pkgs/by-name/tu/turtle-build/package.nix
index ad33d92191ae..f8343c211e42 100644
--- a/pkgs/by-name/tu/turtle-build/package.nix
+++ b/pkgs/by-name/tu/turtle-build/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "raviqqe";
     repo = "turtle-build";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PDpiLPMyBZzj2nBy76cSC4ab/kyaoZC/Gd2HSaRVHUM=";
   };
 
diff --git a/pkgs/by-name/tu/tusc-sh/package.nix b/pkgs/by-name/tu/tusc-sh/package.nix
index 08fe5eb9a895..3aa527f243d9 100644
--- a/pkgs/by-name/tu/tusc-sh/package.nix
+++ b/pkgs/by-name/tu/tusc-sh/package.nix
@@ -16,7 +16,7 @@ let
     src = fetchFromGitHub {
       owner = "adhocore";
       repo = "tusc.sh";
-      rev = finalAttrs.version;
+      tag = finalAttrs.version;
       hash = "sha256-EKlcE+rsVh5lUd8dQzAwXDjiUvrrud5yWfF6JWSZQFE=";
     };
 
diff --git a/pkgs/by-name/tu/tut/package.nix b/pkgs/by-name/tu/tut/package.nix
index 4e2cc64c3dac..50a9d00bbd58 100644
--- a/pkgs/by-name/tu/tut/package.nix
+++ b/pkgs/by-name/tu/tut/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "RasmusLindroth";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-AtwwLRZx9O8IWPFgFI/ZK0tbeshEmaKpTQxA1PepnWM=";
   };
 
diff --git a/pkgs/by-name/tu/tuxmux/package.nix b/pkgs/by-name/tu/tuxmux/package.nix
index 2609f4b9dbc6..4f11cb9dac6f 100644
--- a/pkgs/by-name/tu/tuxmux/package.nix
+++ b/pkgs/by-name/tu/tuxmux/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "edeneast";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WcHsFKpYexBEg382837NqGgNMTKzVUG3XIER9aa1zK8=";
   };
 
diff --git a/pkgs/by-name/tv/tv/package.nix b/pkgs/by-name/tv/tv/package.nix
index f345d8474f24..9b5f9629c1e4 100644
--- a/pkgs/by-name/tv/tv/package.nix
+++ b/pkgs/by-name/tv/tv/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "uzimaru0000";
     repo = "tv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qODv45smZ6jHCJBaa6EEvFLG+7g+FWrRf6BiHRFLzqM=";
   };
 
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/tw/twa/package.nix b/pkgs/by-name/tw/twa/package.nix
index 02e9dea8eeaf..53d0ed7028f1 100644
--- a/pkgs/by-name/tw/twa/package.nix
+++ b/pkgs/by-name/tw/twa/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "twa";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B+UwH7oCtediLzurjYuLp56IxiKNAqyoW5QkwXX72MA=";
   };
 
diff --git a/pkgs/by-name/tw/tweego/package.nix b/pkgs/by-name/tw/tweego/package.nix
index f0e77b801d9d..c23a151d0929 100644
--- a/pkgs/by-name/tw/tweego/package.nix
+++ b/pkgs/by-name/tw/tweego/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tmedwards";
     repo = "tweego";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LE85mSByTz7uFjs0XtrpfD7OARoMPE56FpjFw+FlGYw=";
   };
 
diff --git a/pkgs/by-name/tw/twitch-cli/package.nix b/pkgs/by-name/tw/twitch-cli/package.nix
index 64b0ee6fd247..ee95b256e3e1 100644
--- a/pkgs/by-name/tw/twitch-cli/package.nix
+++ b/pkgs/by-name/tw/twitch-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "twitchdev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kRyJl2SxppVGCO/6wrsb8cO+wpBT1nBsyI/JsPRYzMc=";
   };
 
diff --git a/pkgs/by-name/tw/twitch-hls-client/package.nix b/pkgs/by-name/tw/twitch-hls-client/package.nix
index 190a8e94b5b7..db549be38306 100644
--- a/pkgs/by-name/tw/twitch-hls-client/package.nix
+++ b/pkgs/by-name/tw/twitch-hls-client/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "2bc4";
     repo = "twitch-hls-client";
-    rev = version;
+    tag = version;
     hash = "sha256-H446qXFwRGippLMZemkW8sVhTV3YGpKmAvD8QBamAlo=";
   };
 
diff --git a/pkgs/by-name/tw/twitter-color-emoji/package.nix b/pkgs/by-name/tw/twitter-color-emoji/package.nix
index 5ddcb8a7d613..120291c11bef 100644
--- a/pkgs/by-name/tw/twitter-color-emoji/package.nix
+++ b/pkgs/by-name/tw/twitter-color-emoji/package.nix
@@ -22,7 +22,7 @@ let
     name = "twemoji";
     owner = "jdecked";
     repo = "twemoji";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo=";
   };
 
diff --git a/pkgs/by-name/tx/txtw/package.nix b/pkgs/by-name/tx/txtw/package.nix
index 0268c7b708fb..f432ae8050a6 100644
--- a/pkgs/by-name/tx/txtw/package.nix
+++ b/pkgs/by-name/tx/txtw/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "txtw";
-    rev = version;
+    tag = version;
     sha256 = "17yjdgdd080fsf5r1wzgk6vvzwsa15gcwc9z64v7x588jm1ryy3k";
   };
 
diff --git a/pkgs/by-name/ty/tydra/package.nix b/pkgs/by-name/ty/tydra/package.nix
index e9baf788587e..f65258f756e8 100644
--- a/pkgs/by-name/ty/tydra/package.nix
+++ b/pkgs/by-name/ty/tydra/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Mange";
     repo = "tydra";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bH/W54b7UHdkbgLXAd+l5I6UAKjWDMW+I5mfwT4yEEY=";
   };
 
diff --git a/pkgs/by-name/ty/tygo/package.nix b/pkgs/by-name/ty/tygo/package.nix
index 533737f67456..9f7c6a3438de 100644
--- a/pkgs/by-name/ty/tygo/package.nix
+++ b/pkgs/by-name/ty/tygo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gzuidhof";
     repo = "tygo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W2PgBcbkreP61QtAuOZ+VHUUZ4Mhe++1SK1p4Tg4Ack=";
   };
 
diff --git a/pkgs/by-name/ty/tym/package.nix b/pkgs/by-name/ty/tym/package.nix
index a63dff1c6e73..cbd5b7671e5b 100644
--- a/pkgs/by-name/ty/tym/package.nix
+++ b/pkgs/by-name/ty/tym/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "endaaman";
     repo = "tym";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ySriCBmwDiDmAkIIByaZgmK0nUyYiVb0VAV5bi38JGw=";
   };
 
diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript/package.nix
index e95c9e79d893..97d290b0ac90 100644
--- a/pkgs/by-name/ty/typescript/package.nix
+++ b/pkgs/by-name/ty/typescript/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "TypeScript";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fOA5IblxUd+C9ST3oI8IUmTTRL3exC63MPqW5hoWN0M=";
   };
 
diff --git a/pkgs/by-name/ty/typeshare/package.nix b/pkgs/by-name/ty/typeshare/package.nix
index e6cea0420f30..9d24f21bda7d 100644
--- a/pkgs/by-name/ty/typeshare/package.nix
+++ b/pkgs/by-name/ty/typeshare/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "1password";
     repo = "typeshare";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZoCl/dWGtoHUtNsNhHQvMjyUnoVdkGBuiBkWPwaQeIQ=";
   };
 
diff --git a/pkgs/by-name/ty/typical/package.nix b/pkgs/by-name/ty/typical/package.nix
index 7b3e508af9de..548c0e6ffaaf 100644
--- a/pkgs/by-name/ty/typical/package.nix
+++ b/pkgs/by-name/ty/typical/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "stepchowfun";
     repo = "typical";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-y7PWTzD9+rkC4wZYhecmDTa3AoWl4Tgh7QXbSK4Qq5Q=";
   };
 
diff --git a/pkgs/by-name/ty/typioca/package.nix b/pkgs/by-name/ty/typioca/package.nix
index dfc9d61398bb..4156cb649525 100644
--- a/pkgs/by-name/ty/typioca/package.nix
+++ b/pkgs/by-name/ty/typioca/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bloznelis";
     repo = "typioca";
-    rev = version;
+    tag = version;
     hash = "sha256-fViYwewzhJUJjMupCYk1UsnnPAhByYZqYkuKD6MJNnE=";
   };
 
diff --git a/pkgs/by-name/ty/typstfmt/package.nix b/pkgs/by-name/ty/typstfmt/package.nix
index 4109ef87488b..cf74fddc8016 100644
--- a/pkgs/by-name/ty/typstfmt/package.nix
+++ b/pkgs/by-name/ty/typstfmt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "astrale-sharp";
     repo = "typstfmt";
-    rev = version;
+    tag = version;
     hash = "sha256-JsNaHeFYr92VdruE87dLj2kPGc9M+ww7AGiGO4Gbbr0=";
   };
 
diff --git a/pkgs/by-name/tz/tz/package.nix b/pkgs/by-name/tz/tz/package.nix
index 7c8caa485dd0..bb29712076aa 100644
--- a/pkgs/by-name/tz/tz/package.nix
+++ b/pkgs/by-name/tz/tz/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "oz";
     repo = "tz";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OpftKCEoAltvQw0bB3SyFeXUDiGjVHNDrrKsdRH6zl4=";
   };
 
diff --git a/pkgs/by-name/u2/u2ps/package.nix b/pkgs/by-name/u2/u2ps/package.nix
index 6c3089dbf74f..46de4db26452 100644
--- a/pkgs/by-name/u2/u2ps/package.nix
+++ b/pkgs/by-name/u2/u2ps/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "arsv";
     repo = "u2ps";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-sa0CL47PwYVDykxzF8KeWhz7HXAX6jZ0AcfecD+aFyg=";
   };
 
diff --git a/pkgs/by-name/ua/uacme/package.nix b/pkgs/by-name/ua/uacme/package.nix
index 1769fc8ba77e..1daaaf11a091 100644
--- a/pkgs/by-name/ua/uacme/package.nix
+++ b/pkgs/by-name/ua/uacme/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ndilieto";
     repo = "uacme";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-he0k4o/5JGFDxLrHBO6PNtRgKUzIkGby96cSz0ymuRs=";
   };
 
diff --git a/pkgs/by-name/ua/uair/package.nix b/pkgs/by-name/ua/uair/package.nix
index 05038009ec4e..3799ba2d0d90 100644
--- a/pkgs/by-name/ua/uair/package.nix
+++ b/pkgs/by-name/ua/uair/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "metent";
     repo = "uair";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VytbtTQch8O5hCg3L3ANNOfFOyiQY1V7DvGMEKr1R04=";
   };
 
diff --git a/pkgs/by-name/ua/uarmsolver/package.nix b/pkgs/by-name/ua/uarmsolver/package.nix
index 6c53ae93e32b..be2374de3a8e 100644
--- a/pkgs/by-name/ua/uarmsolver/package.nix
+++ b/pkgs/by-name/ua/uarmsolver/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "firefly-cpp";
     repo = "uARMSolver";
-    rev = version;
+    tag = version;
     sha256 = "sha256-IMlh6Y5iVouMZatR1uxw0gUNZBdh2qm56s+GEjcr1+M=";
   };
 
diff --git a/pkgs/by-name/ub/ubertooth/package.nix b/pkgs/by-name/ub/ubertooth/package.nix
index ea8cd38a1d16..cc18603a7d16 100644
--- a/pkgs/by-name/ub/ubertooth/package.nix
+++ b/pkgs/by-name/ub/ubertooth/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "ubertooth";
-    rev = version;
+    tag = version;
     sha256 = "11r5ag2l5xn4pr7ycicm30w9c3ldn9yiqj1sqnjc79csxl2vrcfw";
   };
 
diff --git a/pkgs/by-name/ub/ubi_reader/package.nix b/pkgs/by-name/ub/ubi_reader/package.nix
index 20c3782e9062..629b734776db 100644
--- a/pkgs/by-name/ub/ubi_reader/package.nix
+++ b/pkgs/by-name/ub/ubi_reader/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "onekey-sec";
     repo = "ubi_reader";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-04HwzkonPzzWfX8VE//fMoVv5ggAS+61zx2W8VEUIy4=";
   };
 
diff --git a/pkgs/by-name/uc/uchess/package.nix b/pkgs/by-name/uc/uchess/package.nix
index 232262a17a20..9c92243b285c 100644
--- a/pkgs/by-name/uc/uchess/package.nix
+++ b/pkgs/by-name/uc/uchess/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tmountain";
     repo = "uchess";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1njl3f41gshdpj431zkvpv2b7zmh4m2m5q6xsijb0c0058dk46mz";
   };
 
diff --git a/pkgs/by-name/uc/ucode/package.nix b/pkgs/by-name/uc/ucode/package.nix
index 8395bff407fc..92dc37ae8b55 100644
--- a/pkgs/by-name/uc/ucode/package.nix
+++ b/pkgs/by-name/uc/ucode/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jow-";
     repo = "ucode";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dJjlwuQLS73D6W/bmhWLPPaT7himQyO1RvD+MXVxBMw=";
   };
 
diff --git a/pkgs/by-name/uc/ucx/package.nix b/pkgs/by-name/uc/ucx/package.nix
index d024c119edcf..80bafdf84943 100644
--- a/pkgs/by-name/uc/ucx/package.nix
+++ b/pkgs/by-name/uc/ucx/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openucx";
     repo = "ucx";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ve9/h8DntyEClZA0P/iIg8WAuWOwYD7yzfKeN779eIo=";
   };
 
diff --git a/pkgs/by-name/ud/uddup/package.nix b/pkgs/by-name/ud/uddup/package.nix
index 00045852ee98..af5ecbeb9b73 100644
--- a/pkgs/by-name/ud/uddup/package.nix
+++ b/pkgs/by-name/ud/uddup/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rotemreiss";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1f5dm3772hiik9irnyvbs7wygcafbwi7czw3b47cwhb90b8fi5hg";
   };
 
diff --git a/pkgs/by-name/ud/udevil/package.nix b/pkgs/by-name/ud/udevil/package.nix
index d30a5b8c767c..38e015c76979 100644
--- a/pkgs/by-name/ud/udevil/package.nix
+++ b/pkgs/by-name/ud/udevil/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IgnorantGuru";
     repo = "udevil";
-    rev = version;
+    tag = version;
     sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad";
   };
 
diff --git a/pkgs/by-name/ud/udict/package.nix b/pkgs/by-name/ud/udict/package.nix
index 881c7b8cb9ba..db0e260daa5c 100644
--- a/pkgs/by-name/ud/udict/package.nix
+++ b/pkgs/by-name/ud/udict/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lsmb";
     repo = "udict";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vcyzMw2tWil4MULEkf25S6kXzqMG6JXIx6GibxxspkY=";
   };
 
diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix
index 1031709ff3e8..347b25b6dd24 100644
--- a/pkgs/by-name/ud/udiskie/package.nix
+++ b/pkgs/by-name/ud/udiskie/package.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "coldfix";
     repo = "udiskie";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ndoTVeF6iTe4+aqFDRaLUEaBavgCWHzULXeG3Kj3ptY=";
   };
 
diff --git a/pkgs/by-name/ud/udp2raw/package.nix b/pkgs/by-name/ud/udp2raw/package.nix
index 28f7b6bc10c6..7ff6dbbdf35f 100644
--- a/pkgs/by-name/ud/udp2raw/package.nix
+++ b/pkgs/by-name/ud/udp2raw/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wangyu-";
     repo = "udp2raw";
-    rev = version;
+    tag = version;
     hash = "sha256-mchSaqw6sOJ7+dydCM8juP7QMOVUrPL4MFA79Rvyjdo=";
   };
 
diff --git a/pkgs/by-name/ud/udpreplay/package.nix b/pkgs/by-name/ud/udpreplay/package.nix
index 3367597e688c..135d5e552a29 100644
--- a/pkgs/by-name/ud/udpreplay/package.nix
+++ b/pkgs/by-name/ud/udpreplay/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rigtorp";
     repo = "udpreplay";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kF9a3pjQbFKf25NKyK7uSq0AAO6JK7QeChLhm9Z3wEA=";
   };
 
diff --git a/pkgs/by-name/ud/udpt/package.nix b/pkgs/by-name/ud/udpt/package.nix
index e3532dd212ec..2fef8d121d15 100644
--- a/pkgs/by-name/ud/udpt/package.nix
+++ b/pkgs/by-name/ud/udpt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "naim94a";
     repo = "udpt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dWZRl5OiuEmCx7+Id0/feCohH5k/HA47nbPUEo8BBwQ=";
   };
 
diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix
index 6d44c5905b93..f6e596e95c65 100644
--- a/pkgs/by-name/ue/ueberzugpp/package.nix
+++ b/pkgs/by-name/ue/ueberzugpp/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jstkdng";
     repo = "ueberzugpp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qo9Rwnx6Oh8DRcCBUMS3JVdNyx1iZSB2Z1qfptUoPFQ=";
   };
 
diff --git a/pkgs/by-name/ue/uefi-firmware-parser/package.nix b/pkgs/by-name/ue/uefi-firmware-parser/package.nix
index 3f8e4cfc193d..01f5290c75b9 100644
--- a/pkgs/by-name/ue/uefi-firmware-parser/package.nix
+++ b/pkgs/by-name/ue/uefi-firmware-parser/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "theopolis";
     repo = "uefi-firmware-parser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Yiw9idmvSpx4CcVrXHznR8vK/xl7DTL+L7k4Nvql2B8=";
   };
 
diff --git a/pkgs/by-name/ue/uefi-run/package.nix b/pkgs/by-name/ue/uefi-run/package.nix
index 0c8f84054e45..00760dcdb4b9 100644
--- a/pkgs/by-name/ue/uefi-run/package.nix
+++ b/pkgs/by-name/ue/uefi-run/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Richard-W";
     repo = "uefi-run";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tR547osqw18dCMHJLqJ8AQBelbv8yCl7rAqslu+vnDQ=";
   };
 
diff --git a/pkgs/by-name/ue/uesave/package.nix b/pkgs/by-name/ue/uesave/package.nix
index f090eea2065f..8e2838e654ff 100644
--- a/pkgs/by-name/ue/uesave/package.nix
+++ b/pkgs/by-name/ue/uesave/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "trumank";
     repo = "uesave-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9gOOSLejVfR1KJMhcNuKDkuTOvPC6sNG8xQOZlt8NxI=";
   };
 
diff --git a/pkgs/by-name/uf/ufiformat/package.nix b/pkgs/by-name/uf/ufiformat/package.nix
index c830b3ac9dfb..60b1eeef9bfa 100644
--- a/pkgs/by-name/uf/ufiformat/package.nix
+++ b/pkgs/by-name/uf/ufiformat/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tedigh";
     repo = "ufiformat";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "heFETZj9migz2s9kvmw0ZQ1ieNpU4V4Lwfp91ek2cS4=";
   };
 
diff --git a/pkgs/by-name/uf/uftpd/package.nix b/pkgs/by-name/uf/uftpd/package.nix
index fd1aa0aad2a7..c4323f633464 100644
--- a/pkgs/by-name/uf/uftpd/package.nix
+++ b/pkgs/by-name/uf/uftpd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "uftpd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+y1eRPUgYf5laRFIDD1XOEfonPP8QMJNCSkmHlXIjdY=";
   };
 
diff --git a/pkgs/by-name/uf/uftrace/package.nix b/pkgs/by-name/uf/uftrace/package.nix
index 9dd614f7b422..6263f34b8e0e 100644
--- a/pkgs/by-name/uf/uftrace/package.nix
+++ b/pkgs/by-name/uf/uftrace/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "namhyung";
     repo = "uftrace";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xx/eABF1q5uZYDGWUQc1YO6qCqR7J2mCHHQTBsHxMVw=";
   };
 
diff --git a/pkgs/by-name/ug/uget-integrator/package.nix b/pkgs/by-name/ug/uget-integrator/package.nix
index cda04712302f..c26bca581ff4 100644
--- a/pkgs/by-name/ug/uget-integrator/package.nix
+++ b/pkgs/by-name/ug/uget-integrator/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ugetdm";
     repo = "uget-integrator";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0bfqwbpprxp5sy49p2hqcjdfj7zamnp2hhcnnyccffkn7pghx8pp";
   };
 
diff --git a/pkgs/by-name/ug/uglify-js/package.nix b/pkgs/by-name/ug/uglify-js/package.nix
index b664a63046ba..d2bc7d7ecd93 100644
--- a/pkgs/by-name/ug/uglify-js/package.nix
+++ b/pkgs/by-name/ug/uglify-js/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mishoo";
     repo = "UglifyJS";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sMLQSB1+ux/ya/J22KGojlAxWhtPQdk22KdHy43zdyg=";
   };
 
diff --git a/pkgs/by-name/ug/ugm/package.nix b/pkgs/by-name/ug/ugm/package.nix
index db5fe787f319..d544c5435e42 100644
--- a/pkgs/by-name/ug/ugm/package.nix
+++ b/pkgs/by-name/ug/ugm/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ariasmn";
     repo = "ugm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FTgu5bzhX+B71dj4wHcgwbtrde5fzF98zMV1lRO++AE=";
   };
 
diff --git a/pkgs/by-name/ug/ugtrain/package.nix b/pkgs/by-name/ug/ugtrain/package.nix
index c355dfbb30f1..731c708cec79 100644
--- a/pkgs/by-name/ug/ugtrain/package.nix
+++ b/pkgs/by-name/ug/ugtrain/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ugtrain";
     repo = "ugtrain";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0pw9lm8y83mda7x39874ax2147818h1wcibi83pd2x4rp1hjbkkn";
   };
 
diff --git a/pkgs/by-name/uh/uhttpmock_1_0/package.nix b/pkgs/by-name/uh/uhttpmock_1_0/package.nix
index cab0f0b466f5..2308f3b9c4d5 100644
--- a/pkgs/by-name/uh/uhttpmock_1_0/package.nix
+++ b/pkgs/by-name/uh/uhttpmock_1_0/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "pwithnall";
     repo = "uhttpmock";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-itJhiPpAF5dwLrVF2vuNznABqTwEjVj6W8mbv1aEmE4=";
   };
 
diff --git a/pkgs/by-name/uh/uhubctl/package.nix b/pkgs/by-name/uh/uhubctl/package.nix
index bd4ce7a1be24..d1baa5585f8c 100644
--- a/pkgs/by-name/uh/uhubctl/package.nix
+++ b/pkgs/by-name/uh/uhubctl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mvp";
     repo = "uhubctl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mpeDePHLsa4sGe2+8X9KQ8AYn7wtybDnaZzxnf4oETQ=";
   };
 
diff --git a/pkgs/by-name/ui/uivonim/package.nix b/pkgs/by-name/ui/uivonim/package.nix
index e0ab2a1f8d18..5e0ebfd2e746 100644
--- a/pkgs/by-name/ui/uivonim/package.nix
+++ b/pkgs/by-name/ui/uivonim/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "smolck";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TcsKjRwiCTRQLxolRuJ7nRTGxFC0V2Q8LQC5p9iXaaY=";
   };
 
diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix
index e8a4a8c9bd23..c719c6e3a7f8 100644
--- a/pkgs/by-name/ul/ulid/package.nix
+++ b/pkgs/by-name/ul/ulid/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "oklog";
     repo = "ulid";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/oQPgcO1xKbHXutxz0WPfIduShPrfH1l+7/mj8jLst8=";
   };
 
diff --git a/pkgs/by-name/ul/ultralist/package.nix b/pkgs/by-name/ul/ultralist/package.nix
index c95ca2ec1db6..bbb41112ea28 100644
--- a/pkgs/by-name/ul/ultralist/package.nix
+++ b/pkgs/by-name/ul/ultralist/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ultralist";
     repo = "ultralist";
-    rev = version;
+    tag = version;
     sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY=";
   };
 
diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix
index e6006ebb4df6..e7484fa03802 100644
--- a/pkgs/by-name/ul/ultrastardx/package.nix
+++ b/pkgs/by-name/ul/ultrastardx/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "UltraStar-Deluxe";
     repo = "USDX";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tMYw+nkyEEK7AqG9AvMchCGzzKWlfut4poXc1WK6vkA=";
   };
 
diff --git a/pkgs/by-name/um/umoci/package.nix b/pkgs/by-name/um/umoci/package.nix
index 8f74acd0dd70..f49b01f9a3c1 100644
--- a/pkgs/by-name/um/umoci/package.nix
+++ b/pkgs/by-name/um/umoci/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "umoci";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0in8kyi4jprvbm3zsl3risbjj8b0ma62yl3rq8rcvcgypx0mn7d4";
   };
 
diff --git a/pkgs/by-name/um/umoria/package.nix b/pkgs/by-name/um/umoria/package.nix
index 9e56a85f1d42..fc29a5e5a431 100644
--- a/pkgs/by-name/um/umoria/package.nix
+++ b/pkgs/by-name/um/umoria/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dungeons-of-moria";
     repo = "umoria";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1j4QkE33UcTzM06qAjk1/PyK5uNA7E/kyDe3bZcFKUM=";
   };
 
diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index 3ae60b57ea0e..bb6a8dd6a7a2 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-IL8jfG0qTDjp80E8bniNYUiH77PTtL4QIwMCEkqdwSE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/um/umurmur/package.nix b/pkgs/by-name/um/umurmur/package.nix
index 0c4ee7e9bbba..d5c7ad30fd46 100644
--- a/pkgs/by-name/um/umurmur/package.nix
+++ b/pkgs/by-name/um/umurmur/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "umurmur";
     repo = "umurmur";
-    rev = version;
+    tag = version;
     sha256 = "sha256-q5k1Lv+/Kz602QFcdb/FoWWaH9peAQIf7u1NTCWKTBM=";
   };
 
diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix
index 0a80554a9180..a5cbdb056930 100644
--- a/pkgs/by-name/un/unbook/package.nix
+++ b/pkgs/by-name/un/unbook/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ludios";
     repo = "unbook";
-    rev = version;
+    tag = version;
     hash = "sha256-whWWh/jQ4RkGA3T1VCmt6zhpQQCzh2jASYg69IlfEeo=";
   };
 
diff --git a/pkgs/by-name/un/unclutter-xfixes/package.nix b/pkgs/by-name/un/unclutter-xfixes/package.nix
index 4c04befe01c1..8eade082f2f0 100644
--- a/pkgs/by-name/un/unclutter-xfixes/package.nix
+++ b/pkgs/by-name/un/unclutter-xfixes/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Airblader";
     repo = "unclutter-xfixes";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-suKmaoJq0PBHZc7NzBQ60JGwJkAtWmvzPtTHWOPJEdc=";
   };
 
diff --git a/pkgs/by-name/un/undervolt/package.nix b/pkgs/by-name/un/undervolt/package.nix
index 57a7cb882855..7ea797665778 100644
--- a/pkgs/by-name/un/undervolt/package.nix
+++ b/pkgs/by-name/un/undervolt/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "georgewhewell";
     repo = "undervolt";
-    rev = version;
+    tag = version;
     hash = "sha256-G+CK/lnZXkQdyNZPqY9P3owVJsd22H3K8wSpjHFG0ow=";
   };
 
diff --git a/pkgs/by-name/un/unfurl/package.nix b/pkgs/by-name/un/unfurl/package.nix
index ccca02140d70..5d4ba58d5c36 100644
--- a/pkgs/by-name/un/unfurl/package.nix
+++ b/pkgs/by-name/un/unfurl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "unfurl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7aLe5d8ku5llfJ2xh8fT56vqj12/CJ1ez3Vte2PF8KQ=";
   };
 
diff --git a/pkgs/by-name/un/ungit/package.nix b/pkgs/by-name/un/ungit/package.nix
index c5eedfb02c73..05e0b49501b7 100644
--- a/pkgs/by-name/un/ungit/package.nix
+++ b/pkgs/by-name/un/ungit/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "FredrikNoren";
     repo = "ungit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zLc+qzbbaQs6Y3NJFHupxyZ0QfuM/VW97dFESR+5dVQ=";
   };
 
diff --git a/pkgs/by-name/un/unhide/package.nix b/pkgs/by-name/un/unhide/package.nix
index e6dd2c8ec8aa..ee39dce68efb 100644
--- a/pkgs/by-name/un/unhide/package.nix
+++ b/pkgs/by-name/un/unhide/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "YJesus";
     repo = "Unhide";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v4otbDhKKRLywH6aP+mbMR0olHbW+jk4TXTBY+iaxdo=";
   };
 
diff --git a/pkgs/by-name/un/unibilium/package.nix b/pkgs/by-name/un/unibilium/package.nix
index 2932306e1a85..65b8309646fe 100644
--- a/pkgs/by-name/un/unibilium/package.nix
+++ b/pkgs/by-name/un/unibilium/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "neovim";
     repo = "unibilium";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6bFZtR8TUZJembRBj6wUUCyurUdsn3vDGnCzCti/ESc=";
   };
 
diff --git a/pkgs/by-name/un/unicode-paracode/package.nix b/pkgs/by-name/un/unicode-paracode/package.nix
index f2d6e7cb8d29..b2decb9f433d 100644
--- a/pkgs/by-name/un/unicode-paracode/package.nix
+++ b/pkgs/by-name/un/unicode-paracode/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "garabik";
     repo = "unicode";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FHAlZ5HID/FE9+YR7Dmc3Uh7E16QKORoD8g9jgTeQdY=";
   };
 
diff --git a/pkgs/by-name/un/unifiedpush-common-proxies/package.nix b/pkgs/by-name/un/unifiedpush-common-proxies/package.nix
index 14952cad6566..ad8320182643 100644
--- a/pkgs/by-name/un/unifiedpush-common-proxies/package.nix
+++ b/pkgs/by-name/un/unifiedpush-common-proxies/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "unifiedpush";
     repo = "common-proxies";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pMzKK18FZCqJ86nqXfOT7tKCqIw6P0ioxRUi72aef0A=";
   };
 
diff --git a/pkgs/by-name/un/unimap/package.nix b/pkgs/by-name/un/unimap/package.nix
index 04a4d50f8cbb..386d4b2c4f56 100644
--- a/pkgs/by-name/un/unimap/package.nix
+++ b/pkgs/by-name/un/unimap/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Edu4rdSHL";
     repo = "unimap";
-    rev = version;
+    tag = version;
     hash = "sha256-7UbzE5VXycjo7KNpPe2oqwyZDT4Vk8rQZ6HXT1q9Cw4=";
   };
 
diff --git a/pkgs/by-name/un/unison-fsmonitor/package.nix b/pkgs/by-name/un/unison-fsmonitor/package.nix
index 13afed3aaff4..3b22e80e9abb 100644
--- a/pkgs/by-name/un/unison-fsmonitor/package.nix
+++ b/pkgs/by-name/un/unison-fsmonitor/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "autozimu";
     repo = "unison-fsmonitor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1W05b9s0Pg2LzNu0mFo/JKpPw0QORqZkXhbbSuCZIUo=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/un/unit/package.nix b/pkgs/by-name/un/unit/package.nix
index 7c9ddfee455c..bead43e26ece 100644
--- a/pkgs/by-name/un/unit/package.nix
+++ b/pkgs/by-name/un/unit/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nginx";
     repo = "unit";
-    rev = version;
+    tag = version;
     sha256 = "sha256-tu1JqGWtfTznTDmZqEEVF3FmiDEXvaAdgQPsvLHCWy8=";
   };
 
diff --git a/pkgs/by-name/un/unittest-cpp/package.nix b/pkgs/by-name/un/unittest-cpp/package.nix
index 58f859ae43ea..b7bda2c145e0 100644
--- a/pkgs/by-name/un/unittest-cpp/package.nix
+++ b/pkgs/by-name/un/unittest-cpp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "unittest-cpp";
     repo = "unittest-cpp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i";
   };
 
diff --git a/pkgs/by-name/un/unnethack/package.nix b/pkgs/by-name/un/unnethack/package.nix
index ec6637926b84..f16fc645ac3b 100644
--- a/pkgs/by-name/un/unnethack/package.nix
+++ b/pkgs/by-name/un/unnethack/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     name = "UnNetHack";
     owner = "UnNetHack";
     repo = "UnNetHack";
-    rev = version;
+    tag = version;
     sha256 = "1rg0mqyplgn3dfh3wz09a600qxk7aidqw4d84kyiincljvhyb7ps";
   };
 
diff --git a/pkgs/by-name/un/unoconv/package.nix b/pkgs/by-name/un/unoconv/package.nix
index 0291fc19c1dd..3429a5dc2021 100644
--- a/pkgs/by-name/un/unoconv/package.nix
+++ b/pkgs/by-name/un/unoconv/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "unoconv";
     repo = "unoconv";
-    rev = version;
+    tag = version;
     sha256 = "1akx64686in8j8arl6vsgp2n3bv770q48pfv283c6fz6wf9p8fvr";
   };
 
diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix
index d4d38fca860e..d565ba2a2c5e 100644
--- a/pkgs/by-name/un/unpoller/package.nix
+++ b/pkgs/by-name/un/unpoller/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "unpoller";
     repo = "unpoller";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-x3Uboa6bs59LafEF9/aYmudo9JIh3KIMNdLJRimcmxY=";
   };
 
diff --git a/pkgs/by-name/un/unshield/package.nix b/pkgs/by-name/un/unshield/package.nix
index e3f2ff9be845..912ecbd23703 100644
--- a/pkgs/by-name/un/unshield/package.nix
+++ b/pkgs/by-name/un/unshield/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "twogood";
     repo = "unshield";
-    rev = version;
+    tag = version;
     sha256 = "1p2inn93svm83kr5p0j1al0rx47f1zykmagxsblgy04gi942iza3";
   };
 
diff --git a/pkgs/by-name/un/unsilence/package.nix b/pkgs/by-name/un/unsilence/package.nix
index a746adf6bd92..7f56c2a2b99e 100644
--- a/pkgs/by-name/un/unsilence/package.nix
+++ b/pkgs/by-name/un/unsilence/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lagmoellertim";
     repo = "unsilence";
-    rev = version;
+    tag = version;
     hash = "sha256-M4Ek1JZwtr7vIg14aTa8h4otIZnPQfKNH4pZE4GpiBQ=";
   };
 
diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix
index 96a5a15584d8..01b0280014f2 100644
--- a/pkgs/by-name/un/unstructured-api/package.nix
+++ b/pkgs/by-name/un/unstructured-api/package.nix
@@ -163,7 +163,7 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-api";
-    rev = version;
+    tag = version;
     hash = "sha256-mvcARpewqC25x3ZdpM8QB7SjbqGoBL/rtxi90KdKdO8=";
   };
 
diff --git a/pkgs/by-name/un/unused/package.nix b/pkgs/by-name/un/unused/package.nix
index 71790d0f6b99..05bedd47e9c7 100644
--- a/pkgs/by-name/un/unused/package.nix
+++ b/pkgs/by-name/un/unused/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "unused-code";
     repo = "unused";
-    rev = version;
+    tag = version;
     sha256 = "sha256-+1M8dUfjjrT4llS0C6WYDyNxJ9QZ5s9v+W185TbgwMw=";
   };
 
diff --git a/pkgs/by-name/un/unvanquished/package.nix b/pkgs/by-name/un/unvanquished/package.nix
index ef32e161cd3f..c183a38b905c 100644
--- a/pkgs/by-name/un/unvanquished/package.nix
+++ b/pkgs/by-name/un/unvanquished/package.nix
@@ -39,7 +39,7 @@ let
   src = fetchFromGitHub {
     owner = "Unvanquished";
     repo = "Unvanquished";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-4ONge+GnrpV/FHKuA66o7uK7jIygBYizZl8JAUr8x/0=";
   };
diff --git a/pkgs/by-name/un/unyaffs/package.nix b/pkgs/by-name/un/unyaffs/package.nix
index b5f8e0269ab8..a4bfe461d0dd 100644
--- a/pkgs/by-name/un/unyaffs/package.nix
+++ b/pkgs/by-name/un/unyaffs/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "whataday";
     repo = "unyaffs";
-    rev = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-FcuPaxq74gVJ6UlOhFPSMtuwUAJVV/sAxAQojhmVXCs=";
   };
 
diff --git a/pkgs/by-name/un/unzoo/package.nix b/pkgs/by-name/un/unzoo/package.nix
index dcb2fe0bbe43..7e6afeb2b733 100644
--- a/pkgs/by-name/un/unzoo/package.nix
+++ b/pkgs/by-name/un/unzoo/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "unzoo";
-    rev = version;
+    tag = version;
     hash = "sha256-oPq1I7EsvHaJ7anHbm/KWrYrxJkM79rLhgRfSAdoLtk=";
   };
 
diff --git a/pkgs/by-name/up/up/package.nix b/pkgs/by-name/up/up/package.nix
index a25f1406e436..8c9633ef035a 100644
--- a/pkgs/by-name/up/up/package.nix
+++ b/pkgs/by-name/up/up/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "akavel";
     repo = "up";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d6FCJ9G9ytHhWQ5lXEtlmzclt3odS9e+Y1ry6EiIDsk=";
   };
 
diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix
index 66ef766b6532..f4681b242fe6 100644
--- a/pkgs/by-name/up/updatecli/package.nix
+++ b/pkgs/by-name/up/updatecli/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "updatecli";
     repo = "updatecli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-znl0yUqnN9eQHY18wPfcYiUnsGw349tLSkZNa/Wz2KA=";
   };
 
diff --git a/pkgs/by-name/up/uplosi/package.nix b/pkgs/by-name/up/uplosi/package.nix
index 14da37539a1f..f2253c569856 100644
--- a/pkgs/by-name/up/uplosi/package.nix
+++ b/pkgs/by-name/up/uplosi/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "edgelesssys";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5I916T70sH4UAq5EGRjR7lnRBbPqMJIxaXwUCJQ4DcM=";
   };
 
diff --git a/pkgs/by-name/up/ups/package.nix b/pkgs/by-name/up/ups/package.nix
index f563ea93a170..75575092faa3 100644
--- a/pkgs/by-name/up/ups/package.nix
+++ b/pkgs/by-name/up/ups/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rameshvarun";
     repo = "ups";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7AuZ1gyp8tAWHM0Ry54tKucPJ3enaGDtvrM1J8uBIT8=";
   };
 
diff --git a/pkgs/by-name/up/upterm/package.nix b/pkgs/by-name/up/upterm/package.nix
index 3c9b76021c17..06f339564086 100644
--- a/pkgs/by-name/up/upterm/package.nix
+++ b/pkgs/by-name/up/upterm/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "owenthereal";
     repo = "upterm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-koZRKxp6Q52jvpmQqQAGvPHoiiU2LaEuNeRY/rru+XM=";
   };
 
diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix
index 1c0b8a6737df..de2e7f2f59ab 100644
--- a/pkgs/by-name/up/uptime-kuma/package.nix
+++ b/pkgs/by-name/up/uptime-kuma/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "louislam";
     repo = "uptime-kuma";
-    rev = version;
+    tag = version;
     hash = "sha256-+bhKnyZnGd+tNlsxvP96I9LXOca8FmOPhIFHp7ijmyA=";
   };
 
diff --git a/pkgs/by-name/up/uptimed/package.nix b/pkgs/by-name/up/uptimed/package.nix
index adfdb5b0e334..a3245e516642 100644
--- a/pkgs/by-name/up/uptimed/package.nix
+++ b/pkgs/by-name/up/uptimed/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "sha256-gP6Syzu54/co4L+UCPikUhXDpxpfAB4jO/5ZF/9RdN0=";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "uptimed";
     owner = "rpodgorny";
   };
diff --git a/pkgs/by-name/uq/uqm/3dovideo.nix b/pkgs/by-name/uq/uqm/3dovideo.nix
index 78b42ae2c1df..049d435b1b5f 100644
--- a/pkgs/by-name/uq/uqm/3dovideo.nix
+++ b/pkgs/by-name/uq/uqm/3dovideo.nix
@@ -35,7 +35,7 @@ let
       src = fetchFromGitHub {
         owner = "aszlig";
         repo = "uqm3donix";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-rK30u2PBysiSGSA9829F1Nom/wtoVN6rGTBneRKeWEw=";
       };
 
diff --git a/pkgs/by-name/ur/urban-cli/package.nix b/pkgs/by-name/ur/urban-cli/package.nix
index fb05c8e7686e..0cc4b650d3d9 100644
--- a/pkgs/by-name/ur/urban-cli/package.nix
+++ b/pkgs/by-name/ur/urban-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tfkhdyt";
     repo = "urban-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-URTEhtOiwb3IDyjRUtUmVTaeDXw4Beg0woWdGxeq098=";
   };
 
diff --git a/pkgs/by-name/ur/urdfdom-headers/package.nix b/pkgs/by-name/ur/urdfdom-headers/package.nix
index e1d0ed250c2d..41a2d95af471 100644
--- a/pkgs/by-name/ur/urdfdom-headers/package.nix
+++ b/pkgs/by-name/ur/urdfdom-headers/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ros";
     repo = "urdfdom_headers";
-    rev = version;
+    tag = version;
     hash = "sha256-FQSnYuTc40MOxyFsMPfoCIonP+4AUQxdq74eoQ9tOoo=";
   };
 
diff --git a/pkgs/by-name/ur/urdfdom/package.nix b/pkgs/by-name/ur/urdfdom/package.nix
index ec65438b542e..8fa16647f915 100644
--- a/pkgs/by-name/ur/urdfdom/package.nix
+++ b/pkgs/by-name/ur/urdfdom/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ros";
     repo = "urdfdom";
-    rev = version;
+    tag = version;
     hash = "sha256-t1ff5aRHE7LuQdCXuooWPDUgPWjyYyQmQUB1RJmte1w=";
   };
 
diff --git a/pkgs/by-name/ur/uri/package.nix b/pkgs/by-name/ur/uri/package.nix
index 5b788d8d424a..970dedbbc249 100644
--- a/pkgs/by-name/ur/uri/package.nix
+++ b/pkgs/by-name/ur/uri/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cpp-netlib";
     repo = "uri";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd";
   };
 
diff --git a/pkgs/by-name/ur/urlencode/package.nix b/pkgs/by-name/ur/urlencode/package.nix
index f79bc0598cf8..b8ac18fa4d8e 100644
--- a/pkgs/by-name/ur/urlencode/package.nix
+++ b/pkgs/by-name/ur/urlencode/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dead10ck";
     repo = "urlencode";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LvLUbtMPVbYZMUb9vWhTscYfZPtEM5GrZme3azvVlPE=";
   };
 
diff --git a/pkgs/by-name/ur/urlhunter/package.nix b/pkgs/by-name/ur/urlhunter/package.nix
index 9347fa3dfabd..b48e36f36019 100644
--- a/pkgs/by-name/ur/urlhunter/package.nix
+++ b/pkgs/by-name/ur/urlhunter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "utkusen";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QRQLN8NFIIvlK+sHNj0MMs7tlBODMKHdWJFh/LwnysI=";
   };
 
diff --git a/pkgs/by-name/ur/urlwatch/package.nix b/pkgs/by-name/ur/urlwatch/package.nix
index b484e07e2e5d..6ab281cbae37 100644
--- a/pkgs/by-name/ur/urlwatch/package.nix
+++ b/pkgs/by-name/ur/urlwatch/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "thp";
     repo = "urlwatch";
-    rev = version;
+    tag = version;
     hash = "sha256-X1UR9JrQuujOIUg87W0YqfXsM3A5nttWjjJMIe3hgk8=";
   };
 
diff --git a/pkgs/by-name/ur/urn/package.nix b/pkgs/by-name/ur/urn/package.nix
index 9f1ee36f59a6..c01a638720ef 100644
--- a/pkgs/by-name/ur/urn/package.nix
+++ b/pkgs/by-name/ur/urn/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
   src = fetchFromGitLab {
     owner = "urn";
     repo = "urn";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0nclr3d8ap0y5cg36i7g4ggdqci6m5q27y9f26b57km8p266kcpy";
   };
 
diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix
index 9a8c5edb764a..2336c596b0ed 100644
--- a/pkgs/by-name/us/usage/package.nix
+++ b/pkgs/by-name/us/usage/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "usage";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-No/BDBW/NRnF81UOuAMrAs4cXEdzEAxnmkn67mReUcM=";
   };
 
diff --git a/pkgs/by-name/us/usbview/package.nix b/pkgs/by-name/us/usbview/package.nix
index 2fa506a18b82..451c5be5f85f 100644
--- a/pkgs/by-name/us/usbview/package.nix
+++ b/pkgs/by-name/us/usbview/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gregkh";
     repo = "usbview";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-h+sB83BYsrB2VxwtatPWNiM0WdTCMY289nh+/0o8GOw=";
   };
 
diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix
index 5ba51b7a63f3..10abdb723c4b 100644
--- a/pkgs/by-name/us/userborn/package.nix
+++ b/pkgs/by-name/us/userborn/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "userborn";
-    rev = version;
+    tag = version;
     hash = "sha256-Zh2u7we/MAIM7varuJA4AmEWeSMuA/C+0NSIUJN7zTs=";
   };
 
diff --git a/pkgs/by-name/us/userhosts/package.nix b/pkgs/by-name/us/userhosts/package.nix
index bf6c1b58f8db..b3b041f91095 100644
--- a/pkgs/by-name/us/userhosts/package.nix
+++ b/pkgs/by-name/us/userhosts/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "figiel";
     repo = "hosts";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9uF0fYl4Zz/Ia2UKx7CBi8ZU8jfWoBfy2QSgTSwXo5A";
   };
 
diff --git a/pkgs/by-name/us/usrsctp/package.nix b/pkgs/by-name/us/usrsctp/package.nix
index 9d5e72f1f2c6..588c61e45a64 100644
--- a/pkgs/by-name/us/usrsctp/package.nix
+++ b/pkgs/by-name/us/usrsctp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sctplab";
     repo = "usrsctp";
-    rev = version;
+    tag = version;
     sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9";
   };
 
diff --git a/pkgs/by-name/us/ustreamer/package.nix b/pkgs/by-name/us/ustreamer/package.nix
index d6a3c866dfdf..faa67923a8a2 100644
--- a/pkgs/by-name/us/ustreamer/package.nix
+++ b/pkgs/by-name/us/ustreamer/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pikvm";
     repo = "ustreamer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SvvIY52FMO6Y4B6TOfk7dLtci4OayPX6+d8voKenKbQ=";
   };
 
diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix
index 4ab4fe494edc..f6dcd9d26f33 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/utf8proc/package.nix b/pkgs/by-name/ut/utf8proc/package.nix
index a75d5555be92..2e85d52014b8 100644
--- a/pkgs/by-name/ut/utf8proc/package.nix
+++ b/pkgs/by-name/ut/utf8proc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JuliaStrings";
     repo = "utf8proc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wmtMo6eBK/xxxkIeJfh5Yb293po9cKK+7WjqNPoxM9g=";
   };
 
diff --git a/pkgs/by-name/ut/uthash/package.nix b/pkgs/by-name/ut/uthash/package.nix
index d0487a764472..ed9c67889155 100644
--- a/pkgs/by-name/ut/uthash/package.nix
+++ b/pkgs/by-name/ut/uthash/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troydhanson";
     repo = "uthash";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-F0M5ENT3bMn3dD16Oaq9mBFYOWzVliVWupAIrLc2nkQ=";
   };
 
diff --git a/pkgs/by-name/ut/uthenticode/package.nix b/pkgs/by-name/ut/uthenticode/package.nix
index 85e1e65086b8..a8b362c05a41 100644
--- a/pkgs/by-name/ut/uthenticode/package.nix
+++ b/pkgs/by-name/ut/uthenticode/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "uthenticode";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NGVOGXMRlgpSRw56jr63rJc/5/qCmPjtAFa0D21ogd4=";
   };
 
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/uw/uwufetch/package.nix b/pkgs/by-name/uw/uwufetch/package.nix
index 811c2378013f..0fe2354c8f36 100644
--- a/pkgs/by-name/uw/uwufetch/package.nix
+++ b/pkgs/by-name/uw/uwufetch/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TheDarkBug";
     repo = "uwufetch";
-    rev = version;
+    tag = version;
     hash = "sha256-cA8sajh+puswyKikr0Jp9ei+EpVkH+vhEp+pTerkUqA=";
   };
 
diff --git a/pkgs/by-name/uw/uwuify/package.nix b/pkgs/by-name/uw/uwuify/package.nix
index e539ca7cb556..d6792ae94ea1 100644
--- a/pkgs/by-name/uw/uwuify/package.nix
+++ b/pkgs/by-name/uw/uwuify/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Daniel-Liu-c0deb0t";
     repo = "uwu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MzXObbxccwEG7egmQMCdhUukGqZS+NgbYwZjTaqME7I=";
   };
 
diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index 2989d934eb78..0d2865bdae4c 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -13,7 +13,7 @@ let
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
-      rev = version;
+      tag = version;
       hash = "sha256-oxL9XgaTdMISdCQ37gAz4LtgV1bk09GirTtVbSOm8Z4=";
     };
     vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix
index ba2b1bdd1538..5ca2dfa42314 100644
--- a/pkgs/by-name/v2/v2ray/package.nix
+++ b/pkgs/by-name/v2/v2ray/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "v2fly";
     repo = "v2ray-core";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HCXfyWpwjryFcmk/7uUByqeJzdhJgb1zv1LDREc0k10=";
   };
 
diff --git a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
index 564460b104bc..747eebc129dd 100644
--- a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
+++ b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "intel-hybrid-driver";
-    rev = version;
+    tag = version;
     sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8=";
   };
 
diff --git a/pkgs/by-name/va/vala-language-server/package.nix b/pkgs/by-name/va/vala-language-server/package.nix
index 87d67a44acf4..1b13cedb9b04 100644
--- a/pkgs/by-name/va/vala-language-server/package.nix
+++ b/pkgs/by-name/va/vala-language-server/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vala-lang";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-Vl5DjKBdpk03aPD+0xGoTwD9Slg1rREorqZGX5o10cY=";
   };
 
diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix
index 33bf556a4031..9d4f3c703f72 100644
--- a/pkgs/by-name/va/vale/package.nix
+++ b/pkgs/by-name/va/vale/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "errata-ai";
     repo = "vale";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UPbeml7W90ICmbDjvNIy+DmolAAYF6Tci4R/kZa5cr8=";
   };
 
diff --git a/pkgs/by-name/va/vale/styles.nix b/pkgs/by-name/va/vale/styles.nix
index c910014fbca0..904a9db89c92 100644
--- a/pkgs/by-name/va/vale/styles.nix
+++ b/pkgs/by-name/va/vale/styles.nix
@@ -49,7 +49,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "alex";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-p0CQg6ZLusSKr57SugwlnoDEoPNVY3UIM8rHHxOL2l0=";
     };
     meta = {
@@ -65,7 +65,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "Google";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-ldwK9tMA04H/jTd3dQeRX/sZOwZcyPb+I56cDg0vZDg=";
     };
     meta = {
@@ -81,7 +81,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "Joblint";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-zRz5ThOg5RLTZj3dYPe0PDvOF5DjO31lduSpi2Us87U=";
     };
     meta = {
@@ -97,7 +97,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "Microsoft";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-4j05bIGAVEy6untUqtrUxdLKlhyOcJsbcsow8OxRp1A=";
     };
     meta = {
@@ -113,7 +113,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "proselint";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-ryKJDX1JrvDWVKLC5qQGctweDf74yuwEXxl/IqumM4s=";
     };
     meta = {
@@ -129,7 +129,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "readability";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-5Y9v8QsZjC2w3/pGIcL5nBdhpogyJznO5IFa0s8VOOI=";
     };
     meta = {
@@ -145,7 +145,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "write-good";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-W/eHlXklAVlAnY8nLPi/SIKsg8UUnH8UkH99BDo5yKk=";
     };
     meta = {
diff --git a/pkgs/by-name/va/valijson/package.nix b/pkgs/by-name/va/valijson/package.nix
index a558e5c410f6..c56a6f5a771c 100644
--- a/pkgs/by-name/va/valijson/package.nix
+++ b/pkgs/by-name/va/valijson/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tristanpenman";
     repo = "valijson";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nIXcS8PMKoo8D616uUZ+GdIbkGb3VGSlCvg7QqZtz20=";
   };
 
diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index bca8fa9c5302..9fbd3f406544 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "valkey-io";
     repo = "valkey";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-05EuPjVokzfJxhrnvFHD7prwt5y7gPxemeDIkLML7lw=";
   };
 
diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix
index 04f0fe27fb39..b82d16630a83 100644
--- a/pkgs/by-name/va/vals/package.nix
+++ b/pkgs/by-name/va/vals/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   version = "0.40.1";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "helmfile";
     repo = pname;
     sha256 = "sha256-1mN8JbFgzHjzuuSoagDo9f4zFrrZc2iNk8AoSrBsyBs=";
diff --git a/pkgs/by-name/va/valum/package.nix b/pkgs/by-name/va/valum/package.nix
index e2dec1824b57..55f2137bce29 100644
--- a/pkgs/by-name/va/valum/package.nix
+++ b/pkgs/by-name/va/valum/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "valum-framework";
     repo = "valum";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-baAv83YiX8HdBm/t++ktB7pmTVlt4aWZ5xnsAs/NrTI=";
   };
 
diff --git a/pkgs/by-name/va/valuta/package.nix b/pkgs/by-name/va/valuta/package.nix
index 05a2a0ff7ba8..27ad06506813 100644
--- a/pkgs/by-name/va/valuta/package.nix
+++ b/pkgs/by-name/va/valuta/package.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ideveCore";
     repo = "Valuta";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g2x+pqs7dXdTMSxzSU5TeQtE+Q+tdQ93xaMtUVEE5/U=";
   };
 
diff --git a/pkgs/by-name/va/vapoursynth-mvtools/package.nix b/pkgs/by-name/va/vapoursynth-mvtools/package.nix
index 41ae1a11ccee..866986d347f5 100644
--- a/pkgs/by-name/va/vapoursynth-mvtools/package.nix
+++ b/pkgs/by-name/va/vapoursynth-mvtools/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dubhater";
     repo = "vapoursynth-mvtools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bEifU1PPNOBr6o9D6DGIzTaG4xjygBxkQYnZxd/4SwQ=";
   };
 
diff --git a/pkgs/by-name/va/vault-medusa/package.nix b/pkgs/by-name/va/vault-medusa/package.nix
index 9697eb60bcfa..bd0af91df79e 100644
--- a/pkgs/by-name/va/vault-medusa/package.nix
+++ b/pkgs/by-name/va/vault-medusa/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jonasvinther";
     repo = "medusa";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pMCkJMY5KFkNsmv/LFYZrDmrq2G7fw1fl9HEYGAKuIM=";
   };
 
diff --git a/pkgs/by-name/va/vault-ssh-plus/package.nix b/pkgs/by-name/va/vault-ssh-plus/package.nix
index 56d8a92197f4..a7390cf5038f 100644
--- a/pkgs/by-name/va/vault-ssh-plus/package.nix
+++ b/pkgs/by-name/va/vault-ssh-plus/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "isometry";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-l2Gr4AxikPWbSGeZqmkZa1wTRXNZ0l6fTSAcjl+6P8s=";
   };
 
diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix
index 6c816272dade..7d2e7a9c9b6f 100644
--- a/pkgs/by-name/va/vault-tasks/package.nix
+++ b/pkgs/by-name/va/vault-tasks/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "louis-thevenet";
     repo = "vault-tasks";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IjpmvoibxDwbdq4SyPXWxhsUTzaRKH1qUXwskCWOqm4=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/va/vault-unseal/package.nix b/pkgs/by-name/va/vault-unseal/package.nix
index 0e0d940267db..b3fdb299af8d 100644
--- a/pkgs/by-name/va/vault-unseal/package.nix
+++ b/pkgs/by-name/va/vault-unseal/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "lrstanley";
     repo = "vault-unseal";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+9o2+6PwRZjCaJnr2sriTk74cWZXURMndusakd4Vd8g=";
   };
 
diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix
index 52fd0905aa97..581024ac766f 100644
--- a/pkgs/by-name/va/vault/package.nix
+++ b/pkgs/by-name/va/vault/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZpfUQJdwt7byRUs8sJRdVQABLYGqZVFPfaXwCdK2rR4=";
   };
 
diff --git a/pkgs/by-name/va/vazir-code-font/package.nix b/pkgs/by-name/va/vazir-code-font/package.nix
index 5b81c36426b3..439ae33e01a3 100644
--- a/pkgs/by-name/va/vazir-code-font/package.nix
+++ b/pkgs/by-name/va/vazir-code-font/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "vazir-code-font";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iBojse3eHr4ucZtPfpkN+mmO6sEExY8WcAallyPgMsI=";
   };
 
diff --git a/pkgs/by-name/va/vazir-fonts/package.nix b/pkgs/by-name/va/vazir-fonts/package.nix
index 3aa6170f57b1..d16e47feac9e 100644
--- a/pkgs/by-name/va/vazir-fonts/package.nix
+++ b/pkgs/by-name/va/vazir-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "vazir-font";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-C1UtfrRFzz0uv/hj8e7huXe4sNd5h7ozVhirWEAyXGg=";
   };
 
diff --git a/pkgs/by-name/vc/vcftools/package.nix b/pkgs/by-name/vc/vcftools/package.nix
index 41924c9db0e6..2f3389b83fb7 100644
--- a/pkgs/by-name/vc/vcftools/package.nix
+++ b/pkgs/by-name/vc/vcftools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "vcftools";
     owner = "vcftools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx";
   };
 
diff --git a/pkgs/by-name/vc/vcg/package.nix b/pkgs/by-name/vc/vcg/package.nix
index 7fe6f3832f86..bab90a189080 100644
--- a/pkgs/by-name/vc/vcg/package.nix
+++ b/pkgs/by-name/vc/vcg/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cnr-isti-vclab";
     repo = "vcglib";
-    rev = version;
+    tag = version;
     sha256 = "sha256-U3pu1k2pCH+G4CtacaDQ9SgkFX5A9/O/qrdpgWvB1+U=";
   };
 
diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix
index 0cdd12ae13d9..830267d3691c 100644
--- a/pkgs/by-name/vc/vcpkg-tool/package.nix
+++ b/pkgs/by-name/vc/vcpkg-tool/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg-tool";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-tu6mN9y2lYsf71LUmRPMdZHE6VIWODOOQFs8+v0KIt8=";
   };
 
diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix
index ee751ff49052..60e4db4e336c 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-HmaP1WKl8s5eKAC32nTALFd4gbqKnzWnJn6L0/fFmqk=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/vc/vcs_query/package.nix b/pkgs/by-name/vc/vcs_query/package.nix
index 0449f3eac05e..9267dabb5edc 100644
--- a/pkgs/by-name/vc/vcs_query/package.nix
+++ b/pkgs/by-name/vc/vcs_query/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mageta";
     repo = "vcs_query";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "05va0na9yxkpqhm9v0x3k58148qcf2bbcv5bnmj7vn9r7fwyjrlx";
   };
 
diff --git a/pkgs/by-name/vd/vde2/package.nix b/pkgs/by-name/vd/vde2/package.nix
index 695940bee37e..431ccb0d1b25 100644
--- a/pkgs/by-name/vd/vde2/package.nix
+++ b/pkgs/by-name/vd/vde2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "virtualsquare";
     repo = "vde-2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Yf6QB7j5lYld2XtqhYspK4037lTtimoFc7nCavCP+mU=";
   };
 
diff --git a/pkgs/by-name/vd/vdhcoapp/filepicker.nix b/pkgs/by-name/vd/vdhcoapp/filepicker.nix
index cd2f34dc114a..f255f1ec315f 100644
--- a/pkgs/by-name/vd/vdhcoapp/filepicker.nix
+++ b/pkgs/by-name/vd/vdhcoapp/filepicker.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "paulrouget";
     repo = "static-filepicker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7sRzf3SA9RSBf4O36olXgka8c6Bufdb0qsuTofVe55s=";
   };
 
diff --git a/pkgs/by-name/vd/vdhcoapp/package.nix b/pkgs/by-name/vd/vdhcoapp/package.nix
index d4cad21ba302..fc521327f195 100644
--- a/pkgs/by-name/vd/vdhcoapp/package.nix
+++ b/pkgs/by-name/vd/vdhcoapp/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "aclap-dev";
     repo = "vdhcoapp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8xeZvqpRq71aShVogiwlVD3gQoPGseNOmz5E3KbsZxU=";
   };
 
diff --git a/pkgs/by-name/vd/vdo/package.nix b/pkgs/by-name/vd/vdo/package.nix
index 64860aa4202d..c37c107127fe 100644
--- a/pkgs/by-name/vd/vdo/package.nix
+++ b/pkgs/by-name/vd/vdo/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dm-vdo";
     repo = "vdo";
-    rev = version;
+    tag = version;
     hash = "sha256-6oX3ngsBPhE6XsMfliWw5Qzu3UosnsIFIAFRCqckU7U=";
   };
 
diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 6e1e29e8e1d7..1847a707b2ef 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "vectordotdev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ixBB0rMHeeEAGbazRAXiWMZOOf4nFC8iY0qZ4fmARWk=";
   };
 
diff --git a/pkgs/by-name/ve/vegeta/package.nix b/pkgs/by-name/ve/vegeta/package.nix
index 950ddd96b297..5e22af8a64cd 100644
--- a/pkgs/by-name/ve/vegeta/package.nix
+++ b/pkgs/by-name/ve/vegeta/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tsenart";
     repo = "vegeta";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nTtQ/BB5rU+0k4dPRCmukCRNI0iFTjHIJiSTN0cNR+Q=";
   };
 
diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix
index f4ddd73c10a7..a40a56c60561 100644
--- a/pkgs/by-name/ve/velero/package.nix
+++ b/pkgs/by-name/ve/velero/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "velero";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WClNupUW1Nd5Xnx58KYDRLz1/2kNCOR4AoAsUv78yPE=";
   };
 
diff --git a/pkgs/by-name/ve/vendir/package.nix b/pkgs/by-name/ve/vendir/package.nix
index 5ee4df9747da..d089147f8ae7 100644
--- a/pkgs/by-name/ve/vendir/package.nix
+++ b/pkgs/by-name/ve/vendir/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "carvel-vendir";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VIP1NkSZMoTZfvl6xAAbs0sL9rBc6FDaZHgOmRViStY=";
   };
 
diff --git a/pkgs/by-name/ve/venta/package.nix b/pkgs/by-name/ve/venta/package.nix
index 1dfe7ed911e2..2270ff5e36cc 100644
--- a/pkgs/by-name/ve/venta/package.nix
+++ b/pkgs/by-name/ve/venta/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "venta";
-    rev = version;
+    tag = version;
     sha256 = "14ckkvyarq1xmf48fh47by5h3jnkmksj2n4y6zvx3aw7pfg2jc51";
   };
 
diff --git a/pkgs/by-name/ve/vep/package.nix b/pkgs/by-name/ve/vep/package.nix
index 576b4c9b35fb..e6db1edb522a 100644
--- a/pkgs/by-name/ve/vep/package.nix
+++ b/pkgs/by-name/ve/vep/package.nix
@@ -53,7 +53,7 @@ let
       inherit version;
       owner = "Ensembl";
       repo = "ensembl-xs";
-      rev = version;
+      tag = version;
       sha256 = "1qqnski532f4bz32wxbqd9w1sz40rjh81ipp9p02k3rlaf1gp1fa";
     };
     # PREFIX is important
diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix
index 77e3185e5818..ec803312ee81 100644
--- a/pkgs/by-name/ve/verapdf/package.nix
+++ b/pkgs/by-name/ve/verapdf/package.nix
@@ -17,7 +17,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "veraPDF";
     repo = "veraPDF-apps";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2g16PJdbC4OgFzLonfZgE7LRw2dKGjLCb2AYvrr8lxA=";
   };
 
diff --git a/pkgs/by-name/ve/vercel-pkg/package.nix b/pkgs/by-name/ve/vercel-pkg/package.nix
index ab8f4fbb0498..0a6de3622d64 100644
--- a/pkgs/by-name/ve/vercel-pkg/package.nix
+++ b/pkgs/by-name/ve/vercel-pkg/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vercel";
     repo = "pkg";
-    rev = version;
+    tag = version;
     hash = "sha256-h3rHR3JE9hVcd3oiE7VL2daYXGTQo7NcOHGC6pmE/xs=";
   };
 
diff --git a/pkgs/by-name/ve/verco/package.nix b/pkgs/by-name/ve/verco/package.nix
index 79f387a35a34..6e7f9f0c2454 100644
--- a/pkgs/by-name/ve/verco/package.nix
+++ b/pkgs/by-name/ve/verco/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vamolessa";
     repo = "verco";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-M3Utrt350I67kqzEH130tgBIiI7rY8ODCSxgMohWWWM=";
   };
 
diff --git a/pkgs/by-name/ve/verifpal/package.nix b/pkgs/by-name/ve/verifpal/package.nix
index 95fa4763a0f9..7319a510b743 100644
--- a/pkgs/by-name/ve/verifpal/package.nix
+++ b/pkgs/by-name/ve/verifpal/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "symbolicsoft";
     repo = "verifpal";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kBeQ7U97Ezj85A/FbNnE1dXR7VJzx0EUrDbzwOgKl8E=";
   };
 
diff --git a/pkgs/by-name/ve/verilator/package.nix b/pkgs/by-name/ve/verilator/package.nix
index fde5e2828a81..96d5c4e78157 100644
--- a/pkgs/by-name/ve/verilator/package.nix
+++ b/pkgs/by-name/ve/verilator/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "verilator";
     repo = "verilator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1o9Qf6avdiRgIYUgBS/S0W2GLSi/HdO9Xgs78oW6VJE=";
   };
 
diff --git a/pkgs/by-name/ve/vermin/package.nix b/pkgs/by-name/ve/vermin/package.nix
index 3fe5c63dc1e8..43cacbf9b8a1 100644
--- a/pkgs/by-name/ve/vermin/package.nix
+++ b/pkgs/by-name/ve/vermin/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "netromdk";
     repo = "vermin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lgxYQ8oNfa0+8BUf3nRv0fcNLP+UATjz733ms3pM6gQ=";
   };
 
diff --git a/pkgs/by-name/ve/versus/package.nix b/pkgs/by-name/ve/versus/package.nix
index 668178b438db..0aeb595b9656 100644
--- a/pkgs/by-name/ve/versus/package.nix
+++ b/pkgs/by-name/ve/versus/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "INFURA";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jX2HRdrLwDjnrUofRzmsSFLMbiPh0a1DPv1tzl+StUg=";
   };
 
diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix
index 8c3340b508a9..cf74fae438b1 100644
--- a/pkgs/by-name/ve/veryl/package.nix
+++ b/pkgs/by-name/ve/veryl/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "veryl-lang";
     repo = "veryl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PeRz44agIKDPsgUhjPgm1Pn1oJb7Epyw0oj3xPCkj4k=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/vf/vfkit/package.nix b/pkgs/by-name/vf/vfkit/package.nix
index 66deaf161197..ef7889370c73 100644
--- a/pkgs/by-name/vf/vfkit/package.nix
+++ b/pkgs/by-name/vf/vfkit/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "crc-org";
     repo = "vfkit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+ds9GIa3q2ck4D3sjUHz7e9w00XgD6/jq4L8QkBpCJg=";
   };
 
diff --git a/pkgs/by-name/vg/vgrep/package.nix b/pkgs/by-name/vg/vgrep/package.nix
index e24a35769773..d55653b910bb 100644
--- a/pkgs/by-name/vg/vgrep/package.nix
+++ b/pkgs/by-name/vg/vgrep/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vrothberg";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OQjuNRuzFluZLssM+q+WpoRncdJMj6Sl/A+mUZA7UpI=";
   };
 
diff --git a/pkgs/by-name/vh/vhdl-ls/package.nix b/pkgs/by-name/vh/vhdl-ls/package.nix
index 6c427cf3ad7c..85dd20b87178 100644
--- a/pkgs/by-name/vh/vhdl-ls/package.nix
+++ b/pkgs/by-name/vh/vhdl-ls/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "VHDL-LS";
     repo = "rust_hdl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MzlsZoV09QeerpbE/Nmu5tMIvgscu84fk2bYlWn7bjg=";
   };
 
diff --git a/pkgs/by-name/vh/vhs/package.nix b/pkgs/by-name/vh/vhs/package.nix
index 14729aa532b6..82a33e913618 100644
--- a/pkgs/by-name/vh/vhs/package.nix
+++ b/pkgs/by-name/vh/vhs/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ceY4zLd+4EwXpwunKiWnaAB25qutSK1b1SyIriAbAI0=";
   };
 
diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix
index de37893373a3..0c05f023114b 100644
--- a/pkgs/by-name/vi/viddy/package.nix
+++ b/pkgs/by-name/vi/viddy/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sachaos";
     repo = "viddy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZdDe0ymPkj0ZGiPLo1Y0qMDk2SsUcPsSStay+Tuf4p0=";
   };
 
diff --git a/pkgs/by-name/vi/vidmerger/package.nix b/pkgs/by-name/vi/vidmerger/package.nix
index 28f5fdff031a..fe744ffcea15 100644
--- a/pkgs/by-name/vi/vidmerger/package.nix
+++ b/pkgs/by-name/vi/vidmerger/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "TGotwig";
     repo = "vidmerger";
-    rev = version;
+    tag = version;
     hash = "sha256-E3Y1UaYXl6NdCMM7IepqFzWNuHaMGLCN5BvQ/lxjFoc=";
   };
 
diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix
index af64d403dcb6..87ae34b7fd1b 100644
--- a/pkgs/by-name/vi/vieb/package.nix
+++ b/pkgs/by-name/vi/vieb/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Jelmerro";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-5LbVSwU+G3mu5MWxmnscoqfQw3ZA9xFXNJGYx3L+aUQ=";
   };
 
diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix
index 1096639899de..e1e5b46fcb27 100644
--- a/pkgs/by-name/vi/vikunja/package.nix
+++ b/pkgs/by-name/vi/vikunja/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "go-vikunja";
     repo = "vikunja";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yUUZ6gPI2Bte36HzfUE6z8B/I1NlwWDSJA2pwkuzd34=";
   };
 
diff --git a/pkgs/by-name/vi/vim-startuptime/package.nix b/pkgs/by-name/vi/vim-startuptime/package.nix
index e3b58b92316d..29151237f55d 100644
--- a/pkgs/by-name/vi/vim-startuptime/package.nix
+++ b/pkgs/by-name/vi/vim-startuptime/package.nix
@@ -18,7 +18,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "rhysd";
     repo = "vim-startuptime";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d6AXTWTUawkBCXCvMs3C937qoRUZmy0qCFdSLcWh0BE=";
   };
 
diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix
index b57e51867316..b62924732b30 100644
--- a/pkgs/by-name/vi/vimcats/package.nix
+++ b/pkgs/by-name/vi/vimcats/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mrcjkb";
     repo = "vimcats";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QV/eIy6yd6Lnmo8XV+E37/oCZCC3jlPu31emH0MgiO4=";
   };
 
diff --git a/pkgs/by-name/vi/vimer/package.nix b/pkgs/by-name/vi/vimer/package.nix
index e131eb0e044f..cb375bd863d4 100644
--- a/pkgs/by-name/vi/vimer/package.nix
+++ b/pkgs/by-name/vi/vimer/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "susam";
     repo = "vimer";
-    rev = version;
+    tag = version;
     sha256 = "01qhr3i7wasbaxvms39c81infpry2vk0nzh7r5m5b9p713p0phsi";
   };
 
diff --git a/pkgs/by-name/vi/vimiv-qt/package.nix b/pkgs/by-name/vi/vimiv-qt/package.nix
index f11716993ce5..30b9eac6cb9c 100644
--- a/pkgs/by-name/vi/vimiv-qt/package.nix
+++ b/pkgs/by-name/vi/vimiv-qt/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "karlch";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-28sk5qDVmrgXYX2wm5G8zv564vG6GwxNp+gjrFHCRfU=";
   };
 
diff --git a/pkgs/by-name/vi/vimix-gtk-themes/package.nix b/pkgs/by-name/vi/vimix-gtk-themes/package.nix
index 30da5f31cb41..021918f7f3b1 100644
--- a/pkgs/by-name/vi/vimix-gtk-themes/package.nix
+++ b/pkgs/by-name/vi/vimix-gtk-themes/package.nix
@@ -50,7 +50,7 @@ lib.checkListOfEnum "${pname}: theme variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      rev = version;
+      tag = version;
       sha256 = "RbAdoix+UWKiLB+04YiPa0UwzO1fFLy56IG1MipmE+E=";
     };
 
diff --git a/pkgs/by-name/vi/vimix-icon-theme/package.nix b/pkgs/by-name/vi/vimix-icon-theme/package.nix
index eefc7aed915a..aa7f312379ed 100644
--- a/pkgs/by-name/vi/vimix-icon-theme/package.nix
+++ b/pkgs/by-name/vi/vimix-icon-theme/package.nix
@@ -34,7 +34,7 @@ lib.checkListOfEnum "${pname}: color variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      rev = version;
+      tag = version;
       hash = "sha256-HNwEqp6G9nZDIJo9b6FD4d5NSXUx523enENM0NVwviA=";
     };
 
diff --git a/pkgs/by-name/vi/vimpc/package.nix b/pkgs/by-name/vi/vimpc/package.nix
index 3a546b764f97..d87b97362d4d 100644
--- a/pkgs/by-name/vi/vimpc/package.nix
+++ b/pkgs/by-name/vi/vimpc/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "boysetsfrog";
     repo = "vimpc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0lswzkap2nm7v5h7ppb6a64cb35rajysd09nb204rxgrkij4m6nx";
   };
 
diff --git a/pkgs/by-name/vi/virter/package.nix b/pkgs/by-name/vi/virter/package.nix
index 36875efeb9b7..3d12bb93819b 100644
--- a/pkgs/by-name/vi/virter/package.nix
+++ b/pkgs/by-name/vi/virter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "LINBIT";
     repo = "virter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zEdG1n+tsDzyMTHBCikZaMalEhqdQiQvcsbElrbd1H4=";
   };
 
diff --git a/pkgs/by-name/vi/virtiofsd/package.nix b/pkgs/by-name/vi/virtiofsd/package.nix
index 6bd26991cab7..be2dd77f765b 100644
--- a/pkgs/by-name/vi/virtiofsd/package.nix
+++ b/pkgs/by-name/vi/virtiofsd/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "virtio-fs";
     repo = "virtiofsd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QT0GfE0AOrNuL7ppiKNs6IKbCtdkfAnAT3PCGujMIUQ=";
   };
 
diff --git a/pkgs/by-name/vi/vis/package.nix b/pkgs/by-name/vi/vis/package.nix
index edf173026d90..c67505d8507d 100644
--- a/pkgs/by-name/vi/vis/package.nix
+++ b/pkgs/by-name/vi/vis/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   version = "0.9";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SYM3zlzhp3NdyOjtXc+pOiWY4/WA/Ax+qAWe18ggq3g=";
     repo = "vis";
     owner = "martanne";
diff --git a/pkgs/by-name/vi/vitess/package.nix b/pkgs/by-name/vi/vitess/package.nix
index b7366739f6f7..cb904b625261 100644
--- a/pkgs/by-name/vi/vitess/package.nix
+++ b/pkgs/by-name/vi/vitess/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vitessio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZSxshQF84DjMQsurYhcMObPzzfT63oj8c5Pt9f9N+5Q=";
   };
 
diff --git a/pkgs/by-name/vi/vitetris/package.nix b/pkgs/by-name/vi/vitetris/package.nix
index ce96940699e0..1fb31a574b54 100644
--- a/pkgs/by-name/vi/vitetris/package.nix
+++ b/pkgs/by-name/vi/vitetris/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vicgeralds";
     repo = "vitetris";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Rbfa2hD67RGmInfWwYD4SthL8lm5bGSBi3oudV5hAao=";
   };
 
diff --git a/pkgs/by-name/vi/viu/package.nix b/pkgs/by-name/vi/viu/package.nix
index 91ceb2116473..0b30fb141ceb 100644
--- a/pkgs/by-name/vi/viu/package.nix
+++ b/pkgs/by-name/vi/viu/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "atanunq";
     repo = "viu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sx8BH01vTFsAEnMKTcVZTDMHiVi230BVVGRexoBNxeo=";
   };
 
diff --git a/pkgs/by-name/vi/vivictpp/package.nix b/pkgs/by-name/vi/vivictpp/package.nix
index 97bba1a68e7a..49cead31712c 100644
--- a/pkgs/by-name/vi/vivictpp/package.nix
+++ b/pkgs/by-name/vi/vivictpp/package.nix
@@ -25,7 +25,7 @@ let
     src = fetchFromGitHub {
       owner = "vivictorg";
       repo = "vivictpp";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-ScuCOmcK714YXEHncizwj6EWdiNIJA1xRMn5gfmg4K4=";
     };
 
diff --git a/pkgs/by-name/vi/vivid/package.nix b/pkgs/by-name/vi/vivid/package.nix
index 2dfd013f1f0c..d974e21d2eb1 100644
--- a/pkgs/by-name/vi/vivid/package.nix
+++ b/pkgs/by-name/vi/vivid/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "vivid";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mxBBfezaMM2dfiXK/s+Htr+i5GJP1xVSXzkmYxEuwNs=";
   };
 
diff --git a/pkgs/by-name/vk/vk-bootstrap/package.nix b/pkgs/by-name/vk/vk-bootstrap/package.nix
index 15ba18a3f10c..5085aea3101a 100644
--- a/pkgs/by-name/vk/vk-bootstrap/package.nix
+++ b/pkgs/by-name/vk/vk-bootstrap/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "charles-lunarg";
     repo = "vk-bootstrap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-X3ANqfplrCF1R494+H5/plcwMH7rbW6zpLA4MZrYaoE=";
   };
 
diff --git a/pkgs/by-name/vk/vkbasalt-cli/package.nix b/pkgs/by-name/vk/vkbasalt-cli/package.nix
index 3c66ba9c0781..4c3fb4a9d94f 100644
--- a/pkgs/by-name/vk/vkbasalt-cli/package.nix
+++ b/pkgs/by-name/vk/vkbasalt-cli/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "TheEvilSkeleton";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4MFqndnvwAsqyer9kMNuCZFP/Xdl7W//AyCe7n83328=";
   };
 
diff --git a/pkgs/by-name/vk/vkdevicechooser/package.nix b/pkgs/by-name/vk/vkdevicechooser/package.nix
index 2af58ec88424..8bfa9031dbec 100644
--- a/pkgs/by-name/vk/vkdevicechooser/package.nix
+++ b/pkgs/by-name/vk/vkdevicechooser/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jiriks74";
     repo = "vkdevicechooser";
-    rev = version;
+    tag = version;
     hash = "sha256-j4hefarOQ3q0sKkB2g/dO2/4bSYzt4oxmCna0nMAjFk=";
   };
 
diff --git a/pkgs/by-name/vk/vkdisplayinfo/package.nix b/pkgs/by-name/vk/vkdisplayinfo/package.nix
index 85047758ca29..ced39952198a 100644
--- a/pkgs/by-name/vk/vkdisplayinfo/package.nix
+++ b/pkgs/by-name/vk/vkdisplayinfo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ChristophHaag";
     repo = "vkdisplayinfo";
-    rev = version;
+    tag = version;
     hash = "sha256-n6U7T5aOYTpgWE2WGPBPHtQKzitf9PxAoXJNWyz4rYw=";
   };
 
diff --git a/pkgs/by-name/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix
index 62c1101460f9..041ec6a26179 100644
--- a/pkgs/by-name/vk/vkmark/package.nix
+++ b/pkgs/by-name/vk/vkmark/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vkmark";
     repo = "vkmark";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-Rjpjqe7htwlhDdwELm74MvSzHzXLhRD/P8IES7nz/VY=";
   };
 
diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix
index 2b3cdbaf80a0..d3b6367cfdc6 100644
--- a/pkgs/by-name/vl/vlang/package.nix
+++ b/pkgs/by-name/vl/vlang/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "vlang";
     repo = "v";
-    rev = version;
+    tag = version;
     hash = "sha256-V4f14TcuKW8unzlo6i/tE6MzSb3HAll478OU2LxiTPQ=";
   };
 
diff --git a/pkgs/by-name/vm/vmtouch/package.nix b/pkgs/by-name/vm/vmtouch/package.nix
index a49750e59ffd..9d2daccfae4d 100644
--- a/pkgs/by-name/vm/vmtouch/package.nix
+++ b/pkgs/by-name/vm/vmtouch/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hoytech";
     repo = "vmtouch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "08da6apzfkfjwasn4dxrlfxqfx7arl28apdzac5nvm0fhvws0dxk";
   };
 
diff --git a/pkgs/by-name/vn/vnstat/package.nix b/pkgs/by-name/vn/vnstat/package.nix
index af2d11682c0c..181530446924 100644
--- a/pkgs/by-name/vn/vnstat/package.nix
+++ b/pkgs/by-name/vn/vnstat/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vergoh";
     repo = "vnstat";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Xd3s4Wrtfwis0dxRijeWhfloHcXPUNAj0P91uWi1C3M=";
   };
 
diff --git a/pkgs/by-name/vo/vo-amrwbenc/package.nix b/pkgs/by-name/vo/vo-amrwbenc/package.nix
index 4fcf5c2b1fe3..a61d875eab4f 100644
--- a/pkgs/by-name/vo/vo-amrwbenc/package.nix
+++ b/pkgs/by-name/vo/vo-amrwbenc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mstorsjo";
     repo = "vo-amrwbenc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oHhoJAI47VqBGk9cO3G5oqnHpWxA2jnJs103MwcYj+w=";
   };
 
diff --git a/pkgs/by-name/vo/vocal/package.nix b/pkgs/by-name/vo/vocal/package.nix
index dd43e0263909..82c01fef585f 100644
--- a/pkgs/by-name/vo/vocal/package.nix
+++ b/pkgs/by-name/vo/vocal/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "needle-and-thread";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1c4n89rdl9r13kmmh2qymmy9sa6shjwai7df48k2kfn0pnzq5mad";
   };
 
diff --git a/pkgs/by-name/vo/volctl/package.nix b/pkgs/by-name/vo/volctl/package.nix
index 9be2580032c4..633088b4d52b 100644
--- a/pkgs/by-name/vo/volctl/package.nix
+++ b/pkgs/by-name/vo/volctl/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "buzz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jzS97KV17wKeBI6deKE4rEj5lvqC38fq1JGundHn2So=";
   };
 
diff --git a/pkgs/by-name/vo/volumeicon/package.nix b/pkgs/by-name/vo/volumeicon/package.nix
index c8925b4ce9a4..033d29a4de0a 100644
--- a/pkgs/by-name/vo/volumeicon/package.nix
+++ b/pkgs/by-name/vo/volumeicon/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Maato";
     repo = "volumeicon";
-    rev = version;
+    tag = version;
     hash = "sha256-zYKC7rOoLf08rV4B43TrGNBcXfSBFxWZCe9bQD9JzaA";
   };
 
diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix
index d69af5c172a9..df02754e1ab9 100644
--- a/pkgs/by-name/vp/vpp/package.nix
+++ b/pkgs/by-name/vp/vpp/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FDio";
     repo = "vpp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GcmblIAu/BDbqZRycmnBsHkvzJe07qB2lSfDnO7ZYtg=";
   };
 
diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix
index 63e42bb73b67..bd84a3d8e9ba 100644
--- a/pkgs/by-name/vs/vscode-js-debug/package.nix
+++ b/pkgs/by-name/vs/vscode-js-debug/package.nix
@@ -22,7 +22,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vscode-js-debug";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MZY6gthj3q2ptAvV28hVvIYgBsW4dpsznasZmK1wVOU=";
   };
 
diff --git a/pkgs/by-name/vs/vscode-langservers-extracted/package.nix b/pkgs/by-name/vs/vscode-langservers-extracted/package.nix
index 228cf96966a4..484961f5d972 100644
--- a/pkgs/by-name/vs/vscode-langservers-extracted/package.nix
+++ b/pkgs/by-name/vs/vscode-langservers-extracted/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
     (fetchFromGitHub {
       owner = "hrsh7th";
       repo = "vscode-langservers-extracted";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-3m9+HZY24xdlLcFKY/5DfvftqprwLJk0vve2ZO1aEWk=";
     })
     vscodium.src
diff --git a/pkgs/by-name/vs/vscode-runner/package.nix b/pkgs/by-name/vs/vscode-runner/package.nix
index 24a3a23826f2..e97308465186 100644
--- a/pkgs/by-name/vs/vscode-runner/package.nix
+++ b/pkgs/by-name/vs/vscode-runner/package.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "Merrit";
     repo = "vscode-runner";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mDhwydAFlDcpbpmh+I2zjjuC+/5hmygFkpHSZGEpuLs=";
   };
 in
diff --git a/pkgs/by-name/vs/vsh/package.nix b/pkgs/by-name/vs/vsh/package.nix
index a5fce89e1c4c..716b421a2743 100644
--- a/pkgs/by-name/vs/vsh/package.nix
+++ b/pkgs/by-name/vs/vsh/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fishi0x01";
     repo = "vsh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "083rqca4gx9lmzkc9rl453zqmspbpn0h2vajkrjjcwk96km7064f";
   };
 
diff --git a/pkgs/by-name/vt/vtable-dumper/package.nix b/pkgs/by-name/vt/vtable-dumper/package.nix
index ba63b8d51be2..31bb78515adb 100644
--- a/pkgs/by-name/vt/vtable-dumper/package.nix
+++ b/pkgs/by-name/vt/vtable-dumper/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lvc";
     repo = "vtable-dumper";
-    rev = version;
+    tag = version;
     sha256 = "0sl7lnjr2l4c2f7qaazvpwpzsp4gckkvccfam88wcq9f7j9xxbyp";
   };
 
diff --git a/pkgs/by-name/vt/vtracer/package.nix b/pkgs/by-name/vt/vtracer/package.nix
index 254b5b851104..a5a7662dcfb7 100644
--- a/pkgs/by-name/vt/vtracer/package.nix
+++ b/pkgs/by-name/vt/vtracer/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "visioncortex";
     repo = "vtracer";
-    rev = version;
+    tag = version;
     hash = "sha256-n5AUc4C0eUfeVe3zTo0ZC/KWMS1/uW/+3Uoz8Q2qQI0=";
   };
 
diff --git a/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix b/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
index 3b36912bc5f7..a9f58c410327 100644
--- a/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
+++ b/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martinus";
     repo = "robin-hood-hashing";
-    rev = version; # pin
+    tag = version; # pin
     sha256 = "sha256-J4u9Q6cXF0SLHbomP42AAn5LSKBYeVgTooOhqxOIpuM=";
   };
 
diff --git a/pkgs/by-name/vu/vultr-cli/package.nix b/pkgs/by-name/vu/vultr-cli/package.nix
index a69bce393302..22ca97cc56be 100644
--- a/pkgs/by-name/vu/vultr-cli/package.nix
+++ b/pkgs/by-name/vu/vultr-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vultr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uk0tG66u0gQgEzpiFAeMC0qPrd+Pk6nbrXuuyOtVLe4=";
   };
 
diff --git a/pkgs/by-name/vu/vultr/package.nix b/pkgs/by-name/vu/vultr/package.nix
index 705382d7dea9..19163d850d9e 100644
--- a/pkgs/by-name/vu/vultr/package.nix
+++ b/pkgs/by-name/vu/vultr/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "JamesClonk";
     repo = "vultr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kyB6gUbc32NsSDqDy1zVT4HXn0pWxHdBOEBOSaI0Xro=";
   };
 
diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix
index 94d1fcb6d377..7265e538b3ad 100644
--- a/pkgs/by-name/vv/vvvvvv/package.nix
+++ b/pkgs/by-name/vv/vvvvvv/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TerryCavanagh";
     repo = "VVVVVV";
-    rev = version;
+    tag = version;
     hash = "sha256-SYXuA7RJ0x4d1Lyvmk/R2nofEt5k7OJ91X6w3sGQOhg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 3722c6a5ceba..55b3b66b69d5 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tats";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-upb5lWqhC1jRegzTncIz5e21v4Pw912FyVn217HucFs=";
   };
 
diff --git a/pkgs/by-name/w_/w_scan2/package.nix b/pkgs/by-name/w_/w_scan2/package.nix
index 0554e20d92b3..bbf63a8197b4 100644
--- a/pkgs/by-name/w_/w_scan2/package.nix
+++ b/pkgs/by-name/w_/w_scan2/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stefantalpalaru";
     repo = "w_scan2";
-    rev = version;
+    tag = version;
     hash = "sha256-8yFK2BnlrRBnQhsuy3Dh+oBH8Ainr6mLdRTqOSqY2FA=";
   };
 
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/wad/package.nix b/pkgs/by-name/wa/wad/package.nix
index c1e21ab8261a..1baa09f4e1ef 100644
--- a/pkgs/by-name/wa/wad/package.nix
+++ b/pkgs/by-name/wa/wad/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CERN-CERT";
     repo = "WAD";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/mlmOzFkyKpmK/uk4813Wk0cf/+ynX3Qxafnd1mGR5k=";
   };
 
diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix
index 7b531ed4fd84..1d583445e770 100644
--- a/pkgs/by-name/wa/wait4x/package.nix
+++ b/pkgs/by-name/wa/wait4x/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "wait4x";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UVs8tCOgPU/IwM3Z3/ehFnAbHTSOHGAO9VpcB/NItGM=";
   };
 
diff --git a/pkgs/by-name/wa/wakeonlan/package.nix b/pkgs/by-name/wa/wakeonlan/package.nix
index 28efca282e44..c8cfcc7c0ae1 100644
--- a/pkgs/by-name/wa/wakeonlan/package.nix
+++ b/pkgs/by-name/wa/wakeonlan/package.nix
@@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "jpoliv";
     repo = "wakeonlan";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zCOpp5iNrWwh2knBGWhiEyG9IPAnFRwH5jJLEVLBISM=";
   };
 
diff --git a/pkgs/by-name/wa/wal-g/package.nix b/pkgs/by-name/wa/wal-g/package.nix
index 94798ae0ba75..107a8ecb437b 100644
--- a/pkgs/by-name/wa/wal-g/package.nix
+++ b/pkgs/by-name/wa/wal-g/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wal-g";
     repo = "wal-g";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wVr0L2ZXMuEo6tc2ajNzPinVQ8ZVzNOSoaHZ4oFsA+U=";
   };
 
diff --git a/pkgs/by-name/wa/wal-listener/package.nix b/pkgs/by-name/wa/wal-listener/package.nix
index 8768d6eccab2..c8043cd20d61 100644
--- a/pkgs/by-name/wa/wal-listener/package.nix
+++ b/pkgs/by-name/wa/wal-listener/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ihippik";
     repo = "wal-listener";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OqjCFIdU4wCiPGIMrlp+nGVr0XTNHTE8zB8/toZtM44=";
   };
 
diff --git a/pkgs/by-name/wa/walk/package.nix b/pkgs/by-name/wa/walk/package.nix
index 60a429de0fe1..7622dcc94c79 100644
--- a/pkgs/by-name/wa/walk/package.nix
+++ b/pkgs/by-name/wa/walk/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "antonmedv";
     repo = "walk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yvycd+Ob/C2MRR7k7Ip9xySnsXUg/znMr6+ocIN4WKU=";
   };
 
diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix
index c8f596c4e730..aeb865c32ada 100644
--- a/pkgs/by-name/wa/walker/package.nix
+++ b/pkgs/by-name/wa/walker/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "abenz1267";
     repo = "walker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XOOYalJ+6V/O/fhC5gEDk2m1yZ2e5DofRRIi8ETHgoQ=";
   };
 
diff --git a/pkgs/by-name/wa/wallust/package.nix b/pkgs/by-name/wa/wallust/package.nix
index 422ea2141da4..462bc7fd9502 100644
--- a/pkgs/by-name/wa/wallust/package.nix
+++ b/pkgs/by-name/wa/wallust/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     domain = "codeberg.org";
     owner = "explosion-mental";
     repo = "wallust";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-n3FXPlm8nructXh+Wc7BgJvxas6OFHEPbTe2QWjEpsg=";
   };
 
diff --git a/pkgs/by-name/wa/wallutils/package.nix b/pkgs/by-name/wa/wallutils/package.nix
index 5bfe3bee7fd7..ba68ab31843a 100644
--- a/pkgs/by-name/wa/wallutils/package.nix
+++ b/pkgs/by-name/wa/wallutils/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "wallutils";
-    rev = version;
+    tag = version;
     hash = "sha256-kayzaNOV2xTjbMeGUJ1jMLGxcVZzYkMLr6qWlAupPKM=";
   };
 
diff --git a/pkgs/by-name/wa/wander/package.nix b/pkgs/by-name/wa/wander/package.nix
index db55f3ce2c27..93cec295f6d8 100644
--- a/pkgs/by-name/wa/wander/package.nix
+++ b/pkgs/by-name/wa/wander/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "robinovitch61";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1+bKdIAWdg/+5FBDbtvjDV0xpZ5jot3y6F+KuLO9WVk=";
   };
 
diff --git a/pkgs/by-name/wa/wannier90/package.nix b/pkgs/by-name/wa/wannier90/package.nix
index 631fcd276de4..284508e3716b 100644
--- a/pkgs/by-name/wa/wannier90/package.nix
+++ b/pkgs/by-name/wa/wannier90/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wannier-developers";
     repo = "wannier90";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+Mq7lM6WuwAnK/2FlDz9gNRIg2sRazQRezb3BfD0veY=";
   };
 
diff --git a/pkgs/by-name/wa/waon/package.nix b/pkgs/by-name/wa/waon/package.nix
index 96a67bb1302a..6fe8b89735ee 100644
--- a/pkgs/by-name/wa/waon/package.nix
+++ b/pkgs/by-name/wa/waon/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kichiki";
     repo = "waon";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xmq8d2rj58xbp4rnyav95y1vnz3r9s9db7xxfa2rd0ilq0ps4y7";
   };
 
diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix
index d70166275e6b..a0b20ed06075 100644
--- a/pkgs/by-name/wa/wapm/package.nix
+++ b/pkgs/by-name/wa/wapm/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wasmerio";
     repo = "wapm-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T7YEe8xg5iwI/npisW0m+6FLi+eaAQVgYNe6TvMlhAs=";
   };
 
diff --git a/pkgs/by-name/wa/wargus/package.nix b/pkgs/by-name/wa/wargus/package.nix
index 7618dff32643..335399cf4014 100644
--- a/pkgs/by-name/wa/wargus/package.nix
+++ b/pkgs/by-name/wa/wargus/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wargus";
     repo = "wargus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yJeMFxCD0ikwVPQApf+IBuMQ6eOjn1fVKNmqh6r760c=";
   };
 
diff --git a/pkgs/by-name/wa/wargus/stratagus.nix b/pkgs/by-name/wa/wargus/stratagus.nix
index 69baa283fa04..df0b82176937 100644
--- a/pkgs/by-name/wa/wargus/stratagus.nix
+++ b/pkgs/by-name/wa/wargus/stratagus.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wargus";
     repo = "stratagus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-q8AvIWr/bOzI0wV0D2emxIXYEKDYmFxbtwr2BS+xYfA=";
   };
 
diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index 2b34aed01ea9..13e6213c8c23 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bepass-org";
     repo = "warp-plus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gDn4zicSD+Hz3GsL6pzGpUaiHcw+8KHDaOJGCML6LOA=";
   };
 
diff --git a/pkgs/by-name/wa/warpd/package.nix b/pkgs/by-name/wa/warpd/package.nix
index 3c1fb984c2d4..e548b153521a 100644
--- a/pkgs/by-name/wa/warpd/package.nix
+++ b/pkgs/by-name/wa/warpd/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rvaiya";
     repo = "warpd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5B3Ec+R1vF2iI0ennYcsRlnFXJkSns0jVbyAWJA4lTU=";
     leaveDotGit = true;
   };
diff --git a/pkgs/by-name/wa/warpinator/package.nix b/pkgs/by-name/wa/warpinator/package.nix
index 790470389940..0350039cb33c 100644
--- a/pkgs/by-name/wa/warpinator/package.nix
+++ b/pkgs/by-name/wa/warpinator/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-aqqKCYlCAL/6srbyYRoVQlIFKpTmwYZsdfLibRyAUXg=";
   };
 
diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index f76ee2bb3183..e6c3b9d2dbe7 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-lVrZCjLhSCyD3aEr6IyRZejqwdiT89w0/ppmQE8Thto=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wa/wasm3/package.nix b/pkgs/by-name/wa/wasm3/package.nix
index 0f820505e78a..12e2caf582d1 100644
--- a/pkgs/by-name/wa/wasm3/package.nix
+++ b/pkgs/by-name/wa/wasm3/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wasm3";
     repo = "wasm3";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "07zzmk776j8ydyxhrnnjiscbhhmz182a62r6aix6kfk5kq2cwia2";
   };
 
diff --git a/pkgs/by-name/wa/wasmer-pack/package.nix b/pkgs/by-name/wa/wasmer-pack/package.nix
index 0536ed30e8f2..0e79aabdc884 100644
--- a/pkgs/by-name/wa/wasmer-pack/package.nix
+++ b/pkgs/by-name/wa/wasmer-pack/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wasmerio";
     repo = "wasmer-pack";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+wqgYkdkuhPFkJBdQLnUKAGmUfGBU9mBfMRNBFmiT4E=";
   };
 
diff --git a/pkgs/by-name/wa/wasmserve/package.nix b/pkgs/by-name/wa/wasmserve/package.nix
index fbdbd76a8fd6..2eace8f2beba 100644
--- a/pkgs/by-name/wa/wasmserve/package.nix
+++ b/pkgs/by-name/wa/wasmserve/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hajimehoshi";
     repo = "wasmserve";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sj2PPCuvh2RkQq5rAPQZdr96a8FG7RL5RCzWBDt2TeI=";
   };
 
diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix
index 3b8e300d2696..a4da69f0bf97 100644
--- a/pkgs/by-name/wa/wastebin/package.nix
+++ b/pkgs/by-name/wa/wastebin/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "matze";
     repo = "wastebin";
-    rev = version;
+    tag = version;
     hash = "sha256-DuIT4jIxk+L7c+rWIzrNjNEs2Lv5mYqLeCAaBMsBCBg=";
   };
 
diff --git a/pkgs/by-name/wa/wasynth/package.nix b/pkgs/by-name/wa/wasynth/package.nix
index 7f3f132cceb4..34afb33c7cab 100644
--- a/pkgs/by-name/wa/wasynth/package.nix
+++ b/pkgs/by-name/wa/wasynth/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Rerumu";
     repo = "Wasynth";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hbY+epUtYSQrvnAbCELsVcqd3UoXGn24FkzWfrM0K14=";
   };
 
diff --git a/pkgs/by-name/wa/watchdogd/package.nix b/pkgs/by-name/wa/watchdogd/package.nix
index a725a78f7278..3de9c0514e1a 100644
--- a/pkgs/by-name/wa/watchdogd/package.nix
+++ b/pkgs/by-name/wa/watchdogd/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "watchdogd";
-    rev = version;
+    tag = version;
     hash = "sha256-JNJj0CJGJXuIRpob2RXYqDRrU4Cn20PRxOjQ6TFsVYQ=";
   };
 
diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix
index 4942c18cfd96..cc6a35deca58 100644
--- a/pkgs/by-name/wa/watchlog/package.nix
+++ b/pkgs/by-name/wa/watchlog/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "kevincox";
     repo = "watchlog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RQggLV4ROV9j5FxiJ2pRh/jlTFhgKUiBO/Gh/jLJ3tg=";
   };
 
diff --git a/pkgs/by-name/wa/watershot/package.nix b/pkgs/by-name/wa/watershot/package.nix
index 51854c095e6e..0a12a4b40ab0 100644
--- a/pkgs/by-name/wa/watershot/package.nix
+++ b/pkgs/by-name/wa/watershot/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Kirottu";
     repo = "watershot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-l9CPSB8TCw901ugl5FLVZDkp2rLha0yXMewK7LxXIiE=";
   };
 
diff --git a/pkgs/by-name/wa/watson/package.nix b/pkgs/by-name/wa/watson/package.nix
index 38ee0e27b87c..4d961ac0e14f 100644
--- a/pkgs/by-name/wa/watson/package.nix
+++ b/pkgs/by-name/wa/watson/package.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "Watson";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/AASYeMkt18KPJljAjNPRYOpg/T5xuM10LJq4LrFD0g=";
   };
 
diff --git a/pkgs/by-name/wa/wavemon/package.nix b/pkgs/by-name/wa/wavemon/package.nix
index d5da2ca88f7f..ebb94de09353 100644
--- a/pkgs/by-name/wa/wavemon/package.nix
+++ b/pkgs/by-name/wa/wavemon/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uoaerg";
     repo = "wavemon";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OnELXlnzXamQflCAWuc4fxwvqHZtl+nrlTpkKK4IGKw=";
   };
 
diff --git a/pkgs/by-name/wa/wavpack/package.nix b/pkgs/by-name/wa/wavpack/package.nix
index 3dbe41e1d949..78023bd01e0b 100644
--- a/pkgs/by-name/wa/wavpack/package.nix
+++ b/pkgs/by-name/wa/wavpack/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dbry";
     repo = "WavPack";
-    rev = version;
+    tag = version;
     hash = "sha256-V9jRIuDpZYIBohJRouGr2TI32BZMXSNVfavqPl56YO0=";
   };
 
diff --git a/pkgs/by-name/wa/way-displays/package.nix b/pkgs/by-name/wa/way-displays/package.nix
index 471ed140dcb5..c76962077fff 100644
--- a/pkgs/by-name/wa/way-displays/package.nix
+++ b/pkgs/by-name/wa/way-displays/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alex-courtis";
     repo = "way-displays";
-    rev = version;
+    tag = version;
     sha256 = "sha256-auZhA29l3eBz5OALLP5MDqoT8DxLLyOpjMAbNf4pYwg=";
   };
 
diff --git a/pkgs/by-name/wa/wayback-machine-archiver/package.nix b/pkgs/by-name/wa/wayback-machine-archiver/package.nix
index cf7e7da82f90..98df6ae39ab5 100644
--- a/pkgs/by-name/wa/wayback-machine-archiver/package.nix
+++ b/pkgs/by-name/wa/wayback-machine-archiver/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "agude";
     repo = "wayback-machine-archiver";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0dnnqx507gpj8wsx6f2ivfmha969ydayiqsvxh23p9qcixw9257x";
   };
 
diff --git a/pkgs/by-name/wa/wayback/package.nix b/pkgs/by-name/wa/wayback/package.nix
index 3750a15b05b2..d0a7eb1dddb3 100644
--- a/pkgs/by-name/wa/wayback/package.nix
+++ b/pkgs/by-name/wa/wayback/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wabarc";
     repo = "wayback";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GnirEgJHgZVzxkFFVDU9795kgvMTitnH+xWd7ooNf7Y=";
   };
 
diff --git a/pkgs/by-name/wa/waybox/package.nix b/pkgs/by-name/wa/waybox/package.nix
index d31d642a33ea..a4bbf0bed294 100644
--- a/pkgs/by-name/wa/waybox/package.nix
+++ b/pkgs/by-name/wa/waybox/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "wizbright";
     repo = "waybox";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-hAXS9laDfigWR2pfNmdPiOeez3NpTIuKHnpeQyYa9IQ=";
   };
 
diff --git a/pkgs/by-name/wa/wayfarer/package.nix b/pkgs/by-name/wa/wayfarer/package.nix
index d9d03e709e6d..18cc6ce11841 100644
--- a/pkgs/by-name/wa/wayfarer/package.nix
+++ b/pkgs/by-name/wa/wayfarer/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "stronnag";
     repo = "wayfarer";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Vuiy2SjpK2T1ekbwa/KyIFa1V4BJsnJRIj4b+Yx0VEw=";
   };
 
diff --git a/pkgs/by-name/wa/wayland-logout/package.nix b/pkgs/by-name/wa/wayland-logout/package.nix
index cf2aa12973db..15f61a62ceaf 100644
--- a/pkgs/by-name/wa/wayland-logout/package.nix
+++ b/pkgs/by-name/wa/wayland-logout/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "soreau";
     repo = "wayland-logout";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VSAw6go4v937HWazXfMz8OdHgOnUtrlDXkslsV4eDIg=";
   };
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix
index da3dc53ed1ae..31c0d231d74d 100644
--- a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix
+++ b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rafaelrc7";
     repo = "wayland-pipewire-idle-inhibit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8oVTexYGQWyaAVJedrp4kIQ7VjBR47l65eByZr7oghg=";
   };
 
diff --git a/pkgs/by-name/wa/waylyrics/package.nix b/pkgs/by-name/wa/waylyrics/package.nix
index 5cb339592e66..0b256ec86697 100644
--- a/pkgs/by-name/wa/waylyrics/package.nix
+++ b/pkgs/by-name/wa/waylyrics/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "waylyrics";
     repo = "waylyrics";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NDdZH33tkY+TgDLkT7r+M9uHCeE9/NRQgVZhJ7EuxEc=";
   };
 
diff --git a/pkgs/by-name/wa/waynergy/package.nix b/pkgs/by-name/wa/waynergy/package.nix
index bbb3cf9bc11d..792a42c93b1f 100644
--- a/pkgs/by-name/wa/waynergy/package.nix
+++ b/pkgs/by-name/wa/waynergy/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "r-c-f";
     repo = "waynergy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cwpW6O+KJNDvSrHeSM1Ci7S0kNw6a8KCdGAIhowPEIw=";
   };
 
diff --git a/pkgs/by-name/wa/wayshot/package.nix b/pkgs/by-name/wa/wayshot/package.nix
index e5dfd7921806..ab751b7e7244 100644
--- a/pkgs/by-name/wa/wayshot/package.nix
+++ b/pkgs/by-name/wa/wayshot/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "waycrate";
     repo = "wayshot";
-    rev = version;
+    tag = version;
     hash = "sha256-nUpIN4WTePtFZTmKAjv0tgj4VTdZeXjoQX6am9+M3ig=";
   };
 
diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix
index 746cf31bacbc..87651a5ef863 100644
--- a/pkgs/by-name/wa/wayvnc/package.nix
+++ b/pkgs/by-name/wa/wayvnc/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "any1";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LINzkC18gitj1a8Giqlt/6LyydOdV+8YXRJmuxT/Nq8=";
   };
 
diff --git a/pkgs/by-name/wa/wazero/package.nix b/pkgs/by-name/wa/wazero/package.nix
index e2ebdf957d1e..b1dcbeb90b76 100644
--- a/pkgs/by-name/wa/wazero/package.nix
+++ b/pkgs/by-name/wa/wazero/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tetratelabs";
     repo = "wazero";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yxnHLc0PFxh8NRBgK2hvhKaxRM1w3IZ9TnfJM0+uadg=";
   };
 
diff --git a/pkgs/by-name/wb/wb32-dfu-updater/package.nix b/pkgs/by-name/wb/wb32-dfu-updater/package.nix
index 91c9f24b9dbb..68c611154ecb 100644
--- a/pkgs/by-name/wb/wb32-dfu-updater/package.nix
+++ b/pkgs/by-name/wb/wb32-dfu-updater/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "WestberryTech";
     repo = "wb32-dfu-updater";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-DKsDVO00JFhR9hIZksFVJLRwC6PF9LCRpf++QywFO2w=";
   };
 
diff --git a/pkgs/by-name/wb/wbg/package.nix b/pkgs/by-name/wb/wbg/package.nix
index 47f8ac7844d4..6f8440691d11 100644
--- a/pkgs/by-name/wb/wbg/package.nix
+++ b/pkgs/by-name/wb/wbg/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "wbg";
-    rev = version;
+    tag = version;
     hash = "sha256-zd5OWC0r/75IaeKy5xjV+pQefRy48IcFTxx93iy0a0Q=";
   };
 
diff --git a/pkgs/by-name/wc/wcpg/package.nix b/pkgs/by-name/wc/wcpg/package.nix
index 1a6b3d0616a9..52358840acb2 100644
--- a/pkgs/by-name/wc/wcpg/package.nix
+++ b/pkgs/by-name/wc/wcpg/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fixif";
     repo = "wcpg";
-    rev = version;
+    tag = version;
     sha256 = "sha256-uA/ENjf4urEO+lqebkp/k54199o2434FYgPSmYCG4UA=";
   };
 
diff --git a/pkgs/by-name/wd/wdisplays/package.nix b/pkgs/by-name/wd/wdisplays/package.nix
index 0f74c294abfa..094f76b278e5 100644
--- a/pkgs/by-name/wd/wdisplays/package.nix
+++ b/pkgs/by-name/wd/wdisplays/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "artizirk";
     repo = "wdisplays";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-dtvP930ChiDRT60xq6xBDU6k+zHnkrAkxkKz2FxlzRs=";
   };
 
diff --git a/pkgs/by-name/we/weave-gitops/package.nix b/pkgs/by-name/we/weave-gitops/package.nix
index b70aa20dba6a..718733f6300a 100644
--- a/pkgs/by-name/we/weave-gitops/package.nix
+++ b/pkgs/by-name/we/weave-gitops/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Gm4DIQK8T+dTwB5swdrD+SjGgy/wFQ/fJYdSqNDSy9c=";
   };
 
diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix
index 80e838b23272..e62083a01a69 100644
--- a/pkgs/by-name/we/weaver/package.nix
+++ b/pkgs/by-name/we/weaver/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "weaver";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kfBWI+1f39oSSKYflXfXnBTc96OZch7o5HWfOgOfuxs=";
   };
 
diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix
index ef0e55faacb4..b8560d79f4d7 100644
--- a/pkgs/by-name/we/weaviate/package.nix
+++ b/pkgs/by-name/we/weaviate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Akg0iY5M3X6ztKxhNEkhi03VnbNpNW7/Vcbv2KB6X54=";
   };
 
diff --git a/pkgs/by-name/we/web-ext/package.nix b/pkgs/by-name/we/web-ext/package.nix
index 401aff4d5867..1d77c0a9a244 100644
--- a/pkgs/by-name/we/web-ext/package.nix
+++ b/pkgs/by-name/we/web-ext/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "web-ext";
-    rev = version;
+    tag = version;
     hash = "sha256-RT/K/fYMys1RAvnusAMuHtfZ7gndYf3FPuHBYCklBpw=";
   };
 
diff --git a/pkgs/by-name/we/webcat/package.nix b/pkgs/by-name/we/webcat/package.nix
index b9af14457226..6d6a1a41e494 100644
--- a/pkgs/by-name/we/webcat/package.nix
+++ b/pkgs/by-name/we/webcat/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rumpelsepp";
     repo = "webcat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JyZHH8JgS3uoNVicx1wj0SAzlrXyTrpwIBZuok6buRw=";
   };
 
diff --git a/pkgs/by-name/we/webdis/package.nix b/pkgs/by-name/we/webdis/package.nix
index 48a696c4180d..4299f783e187 100644
--- a/pkgs/by-name/we/webdis/package.nix
+++ b/pkgs/by-name/we/webdis/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nicolasff";
     repo = "webdis";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-eFUI3RDDrEI1bV+SfTVsIO6yjswK7tzgNsNepoo7DQ4=";
   };
 
diff --git a/pkgs/by-name/we/webfontkitgenerator/package.nix b/pkgs/by-name/we/webfontkitgenerator/package.nix
index 9359c11fdcda..8d2496c033f9 100644
--- a/pkgs/by-name/we/webfontkitgenerator/package.nix
+++ b/pkgs/by-name/we/webfontkitgenerator/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rafaelmardojai";
     repo = "webfont-kit-generator";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ZfyF1Didce88/HaLeMNTw0nGzj3EZnC7V9OzsN21L40=";
   };
 
diff --git a/pkgs/by-name/we/webhook/package.nix b/pkgs/by-name/we/webhook/package.nix
index d9ed2bb27b02..10dec0382080 100644
--- a/pkgs/by-name/we/webhook/package.nix
+++ b/pkgs/by-name/we/webhook/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adnanh";
     repo = "webhook";
-    rev = version;
+    tag = version;
     sha256 = "sha256-3Ew72ADGTlvp6w37nYbCng7HHCZ0a7kVf3DNRNyCkZU=";
   };
 
diff --git a/pkgs/by-name/we/webmesh/package.nix b/pkgs/by-name/we/webmesh/package.nix
index 053669528c11..bbbd6135b6a4 100644
--- a/pkgs/by-name/we/webmesh/package.nix
+++ b/pkgs/by-name/we/webmesh/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "webmeshproj";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Inh7j01/xBJgGYmX1tGBRNYjn1N4AO2sywBwZ8yXlsY=";
   };
 
diff --git a/pkgs/by-name/we/webp-pixbuf-loader/package.nix b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
index 9448088c08c6..3957edfb0467 100644
--- a/pkgs/by-name/we/webp-pixbuf-loader/package.nix
+++ b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aruiz";
     repo = "webp-pixbuf-loader";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2GDH5+YCwb2mPdMfEscmWDOzdGnWRcppE+4rcDCZog4=";
   };
 
diff --git a/pkgs/by-name/we/websocketd/package.nix b/pkgs/by-name/we/websocketd/package.nix
index 78e5db1f1ed9..682f4c0b9d31 100644
--- a/pkgs/by-name/we/websocketd/package.nix
+++ b/pkgs/by-name/we/websocketd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "joewalnes";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cp4iBSQ6Cd0+NPZ2i79Mulg1z17u//OCm3yoArbZEHs=";
   };
 
diff --git a/pkgs/by-name/we/websocketpp/package.nix b/pkgs/by-name/we/websocketpp/package.nix
index 6b933480b0ba..493a06792cd0 100644
--- a/pkgs/by-name/we/websocketpp/package.nix
+++ b/pkgs/by-name/we/websocketpp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zaphoyd";
     repo = "websocketpp";
-    rev = version;
+    tag = version;
     sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=";
   };
 
diff --git a/pkgs/by-name/we/weggli/package.nix b/pkgs/by-name/we/weggli/package.nix
index 2f12a878274e..43e31894cdd3 100644
--- a/pkgs/by-name/we/weggli/package.nix
+++ b/pkgs/by-name/we/weggli/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "weggli-rs";
     repo = "weggli";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6XSedsTUjcZzFXaNitsXlUBpxC6TYVMCB+AfH3x7c5E=";
   };
 
diff --git a/pkgs/by-name/we/wego/package.nix b/pkgs/by-name/we/wego/package.nix
index 107ff1421bc7..30cffa02a910 100644
--- a/pkgs/by-name/we/wego/package.nix
+++ b/pkgs/by-name/we/wego/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "schachmat";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-YGUll0Wi/oulNMXSrSFeAVe+aGpyFeyXRZTW4ngC3Zk=";
   };
 
diff --git a/pkgs/by-name/we/weidu/package.nix b/pkgs/by-name/we/weidu/package.nix
index 984eb273f24f..9a845ddfcc2a 100644
--- a/pkgs/by-name/we/weidu/package.nix
+++ b/pkgs/by-name/we/weidu/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WeiDUorg";
     repo = "weidu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+vkKTzFZdAzY2dL+mZ4A0PDxhTKGgs9bfArz7S6b4m4=";
   };
 
diff --git a/pkgs/by-name/we/wesher/package.nix b/pkgs/by-name/we/wesher/package.nix
index 0d25f819d5b6..e04c11090745 100644
--- a/pkgs/by-name/we/wesher/package.nix
+++ b/pkgs/by-name/we/wesher/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "costela";
     repo = "wesher";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-EIajvcBhS5G9dJzRgXhnD1QKOAhmzngdyCU4L7itT8U=";
   };
 
diff --git a/pkgs/by-name/wf/wf-recorder/package.nix b/pkgs/by-name/wf/wf-recorder/package.nix
index 4389f5caa463..66ee460826f5 100644
--- a/pkgs/by-name/wf/wf-recorder/package.nix
+++ b/pkgs/by-name/wf/wf-recorder/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ammen99";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7/fQOkfAw5v3irD5blJOdq88j0VBrPVQQufdt9wsACk=";
   };
 
diff --git a/pkgs/by-name/wf/wfa2-lib/package.nix b/pkgs/by-name/wf/wfa2-lib/package.nix
index eae3514a8d5d..3dbc7ad2492a 100644
--- a/pkgs/by-name/wf/wfa2-lib/package.nix
+++ b/pkgs/by-name/wf/wfa2-lib/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smarco";
     repo = "WFA2-lib";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vTeSvhSt3PQ/BID6uM1CuXkQipgG7VViDexvAwV4nW8=";
   };
 
diff --git a/pkgs/by-name/wg/wg-access-server/package.nix b/pkgs/by-name/wg/wg-access-server/package.nix
index b77bc0acab69..753dc5e4ed92 100644
--- a/pkgs/by-name/wg/wg-access-server/package.nix
+++ b/pkgs/by-name/wg/wg-access-server/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "freifunkMUC";
     repo = "wg-access-server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AhFqEmHrx9MCdjnB/YA3qU7KsaMyLO+vo53VWUrcL8I=";
   };
 
diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix
index 07f3a999ee6c..d23df6d24159 100644
--- a/pkgs/by-name/wg/wget2/package.nix
+++ b/pkgs/by-name/wg/wget2/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "gnuwget";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+xw1nQMBs0m9RlunyrAYaSDPnLY1yRX8zt8hKOMXQT8=";
   };
 
diff --git a/pkgs/by-name/wg/wgo/package.nix b/pkgs/by-name/wg/wgo/package.nix
index 491a74627125..60ad9c445c4c 100644
--- a/pkgs/by-name/wg/wgo/package.nix
+++ b/pkgs/by-name/wg/wgo/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "bokwoon95";
     repo = "wgo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iTUZTeruP21pfd/28fdIhhS5GiSn6DC9Oe2w6VTaxFE=";
   };
 
diff --git a/pkgs/by-name/wh/whatfiles/package.nix b/pkgs/by-name/wh/whatfiles/package.nix
index 2c6a81d505ea..d975b579e1d6 100644
--- a/pkgs/by-name/wh/whatfiles/package.nix
+++ b/pkgs/by-name/wh/whatfiles/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spieglt";
     repo = "whatfiles";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5Ju9g7/B9uxLkQzV/MN3vBkjve4EAMseO6K4HTAoS/o=";
   };
 
diff --git a/pkgs/by-name/wh/whipper/package.nix b/pkgs/by-name/wh/whipper/package.nix
index 1d9019d97773..a052eb0eac7f 100644
--- a/pkgs/by-name/wh/whipper/package.nix
+++ b/pkgs/by-name/wh/whipper/package.nix
@@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "whipper-team";
     repo = "whipper";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5";
   };
 
diff --git a/pkgs/by-name/wh/whisper/package.nix b/pkgs/by-name/wh/whisper/package.nix
index 08aa9ffc4c0b..61e2a0c0dde3 100644
--- a/pkgs/by-name/wh/whisper/package.nix
+++ b/pkgs/by-name/wh/whisper/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "refresh-bio";
     repo = "whisper";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0wpx1w1mar2d6zq2v14vy6nn896ds1n3zshxhhrrj5d528504iyw";
   };
 
diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix
index 0ce94c4affe3..237390e15edb 100644
--- a/pkgs/by-name/wh/whistle/package.nix
+++ b/pkgs/by-name/wh/whistle/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "avwo";
     repo = "whistle";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yCFehRcMB5hxBRB2GjI/uTE+mA5Wfr5MeVrdj5xbJlA=";
   };
 
diff --git a/pkgs/by-name/wh/whitebophir/package.nix b/pkgs/by-name/wh/whitebophir/package.nix
index 5457e64f5267..3d1e038d4322 100644
--- a/pkgs/by-name/wh/whitebophir/package.nix
+++ b/pkgs/by-name/wh/whitebophir/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "lovasoa";
     repo = "whitebophir";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4T7s9WrpyHVPcw0QY0C0sczDJYKzA4bAAfEv8q2pOy4=";
   };
 
diff --git a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
index 0fdb72fd553e..f6f446705a63 100644
--- a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
+++ b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
@@ -99,7 +99,7 @@ lib.checkListOfEnum "${pname}: window control buttons variants" [ "normal" "alt"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      rev = version;
+      tag = version;
       hash = "sha256-XSghDBpxAjdQMB9tyV2NIM6j/AzmzsnybGGDYi7u3BQ=";
     };
 
diff --git a/pkgs/by-name/wh/whoami/package.nix b/pkgs/by-name/wh/whoami/package.nix
index 61cb8708fdcf..b1077b621ad0 100644
--- a/pkgs/by-name/wh/whoami/package.nix
+++ b/pkgs/by-name/wh/whoami/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "traefik";
     repo = "whoami";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3jzLdCmmts/7S1Oxig9Dg3kRGh/H5l5UD7ztev0yvXY=";
   };
 
diff --git a/pkgs/by-name/wh/whois/package.nix b/pkgs/by-name/wh/whois/package.nix
index 7b12b26ecf9e..84af6e674729 100644
--- a/pkgs/by-name/wh/whois/package.nix
+++ b/pkgs/by-name/wh/whois/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-c/Mx2HXAj6mHH8rElG7+F94sSrVSL1N9HZBvaMWUjlw=";
   };
 
diff --git a/pkgs/by-name/wh/whsniff/package.nix b/pkgs/by-name/wh/whsniff/package.nix
index f73fa552477b..3a12d8396dcd 100644
--- a/pkgs/by-name/wh/whsniff/package.nix
+++ b/pkgs/by-name/wh/whsniff/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "homewsn";
     repo = "whsniff";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "000l5vk9c0332m35lndk8892ivdr445lgg25hmq1lajn24cash5w";
   };
 
diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix
index 917c1f2d4370..ae5932d0e3a3 100644
--- a/pkgs/by-name/wi/widelands/package.nix
+++ b/pkgs/by-name/wi/widelands/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "widelands";
     repo = "widelands";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/MEeb0KnefK812w5y238Icd4gW85d/pvZ08xnlVXDdk=";
   };
 
diff --git a/pkgs/by-name/wi/wifi-password/package.nix b/pkgs/by-name/wi/wifi-password/package.nix
index 83c9d7937139..e42a43ab1552 100644
--- a/pkgs/by-name/wi/wifi-password/package.nix
+++ b/pkgs/by-name/wi/wifi-password/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rauchg";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0sfvb40h7rz9jzp4l9iji3jg80paklqsbmnk5h7ipsv2xbsplp64";
   };
 
diff --git a/pkgs/by-name/wi/wifish/package.nix b/pkgs/by-name/wi/wifish/package.nix
index 4477e565f5ab..f5b5c1e48b5d 100644
--- a/pkgs/by-name/wi/wifish/package.nix
+++ b/pkgs/by-name/wi/wifish/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bougyman";
     repo = "wifish";
-    rev = version;
+    tag = version;
     sha256 = "sha256-eTErN6CfKDey/wV+9o9cBVaG5FzCRBiA9UicrMz3KBc=";
   };
 
diff --git a/pkgs/by-name/wi/wifite2/package.nix b/pkgs/by-name/wi/wifite2/package.nix
index 9fc4fd21db47..17f5218d4862 100644
--- a/pkgs/by-name/wi/wifite2/package.nix
+++ b/pkgs/by-name/wi/wifite2/package.nix
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kimocoder";
     repo = "wifite2";
-    rev = version;
+    tag = version;
     hash = "sha256-G2AKKZUDS2UQm95TEhGJIucyMRcm7oL0d3J8uduEQhw=";
   };
 
diff --git a/pkgs/by-name/wi/wiggle/package.nix b/pkgs/by-name/wi/wiggle/package.nix
index f1c97794c714..1fd610a7a26b 100644
--- a/pkgs/by-name/wi/wiggle/package.nix
+++ b/pkgs/by-name/wi/wiggle/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "neilbrown";
     repo = "wiggle";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf";
   };
 
diff --git a/pkgs/by-name/wi/wiiload/package.nix b/pkgs/by-name/wi/wiiload/package.nix
index 54ca0efb8d18..af8b24f5cfeb 100644
--- a/pkgs/by-name/wi/wiiload/package.nix
+++ b/pkgs/by-name/wi/wiiload/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "devkitPro";
     repo = "wiiload";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pZdZzCAPfAVucuiV/q/ROY3cz/wxQWep6dCTGNn2fSo=";
   };
 
diff --git a/pkgs/by-name/wi/wike/package.nix b/pkgs/by-name/wi/wike/package.nix
index 90cfb897ffbf..1ec5d7682962 100644
--- a/pkgs/by-name/wi/wike/package.nix
+++ b/pkgs/by-name/wi/wike/package.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "hugolabe";
     repo = "Wike";
-    rev = version;
+    tag = version;
     hash = "sha256-Unw+r8NlfaSn/UCtdnkCCsC6xM33Qy6hQdUg/4bIG+I=";
   };
 
diff --git a/pkgs/by-name/wi/wimboot/package.nix b/pkgs/by-name/wi/wimboot/package.nix
index 1dc0a55cbdfb..24028bf706fc 100644
--- a/pkgs/by-name/wi/wimboot/package.nix
+++ b/pkgs/by-name/wi/wimboot/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "wimboot";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JqdOgcwOXIJDl8O7k/pHdd4MNC/rJ0fWTowtEVpJyx8=";
   };
 
diff --git a/pkgs/by-name/wi/win2xcur/package.nix b/pkgs/by-name/wi/win2xcur/package.nix
index f93b064d00e6..8572e5e6af19 100644
--- a/pkgs/by-name/wi/win2xcur/package.nix
+++ b/pkgs/by-name/wi/win2xcur/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "quantum5";
     repo = "win2xcur";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OjLj+QYg8YOJzDq3Y6/uyEXlNWbPm8VA/b1yP9jT6Jo=";
   };
 
diff --git a/pkgs/by-name/wi/windmill/package.nix b/pkgs/by-name/wi/windmill/package.nix
index 3f0a39efe5d1..cbc6f2ee2ac7 100644
--- a/pkgs/by-name/wi/windmill/package.nix
+++ b/pkgs/by-name/wi/windmill/package.nix
@@ -49,7 +49,7 @@ let
   src = fetchFromGitHub {
     owner = "windmill-labs";
     repo = "windmill";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9BtItmqyW4NbG4istssAYn4CWlfYAv33CE1enL+5LtE=";
   };
 in
diff --git a/pkgs/by-name/wi/windowchef/package.nix b/pkgs/by-name/wi/windowchef/package.nix
index e74e4c063751..73f53bd02077 100644
--- a/pkgs/by-name/wi/windowchef/package.nix
+++ b/pkgs/by-name/wi/windowchef/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tudurom";
     repo = "windowchef";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1m4vly7w2f28lrj26rhh3x9xsp3d97m5cxj91fafgh5rds4ygyhp";
   };
 
diff --git a/pkgs/by-name/wi/windows10-icons/package.nix b/pkgs/by-name/wi/windows10-icons/package.nix
index 7cdda913ff2f..38b121e4fa84 100644
--- a/pkgs/by-name/wi/windows10-icons/package.nix
+++ b/pkgs/by-name/wi/windows10-icons/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "B00merang-Artwork";
     repo = "Windows-10";
-    rev = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-Yz6a7FcgPfzz4w8cKp8oq7/usIBUUZV7qhVmDewmzrI=";
   };
 
diff --git a/pkgs/by-name/wi/wineasio/package.nix b/pkgs/by-name/wi/wineasio/package.nix
index 9152b850216c..871b8e32e287 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 = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d5BGJAkaM5XZXyqm6K/UzFE4sD6QVHHGnLi1bcHxiaM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wi/wire/package.nix b/pkgs/by-name/wi/wire/package.nix
index de9274ebed35..d38715b02312 100644
--- a/pkgs/by-name/wi/wire/package.nix
+++ b/pkgs/by-name/wi/wire/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "wire";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bV/bb577JzGF37HmvRprxr+GWcLLiFRisURwtGDbqko=";
   };
 
diff --git a/pkgs/by-name/wi/wiredtiger/package.nix b/pkgs/by-name/wi/wiredtiger/package.nix
index 0d5b4e3203ee..8cf4f9a73de7 100644
--- a/pkgs/by-name/wi/wiredtiger/package.nix
+++ b/pkgs/by-name/wi/wiredtiger/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "wiredtiger";
     owner = "wiredtiger";
-    rev = version;
+    tag = version;
     sha256 = "04j2zw8b9jym43r682rh4kpdippxx7iw3ry16nxlbybzar9kgk83";
   };
 
diff --git a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix
index f1b9e3336996..4c9fa3bc3848 100644
--- a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix
+++ b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "axllent";
     repo = "wireguard-vanity-keygen";
-    rev = version;
+    tag = version;
     hash = "sha256-LibNWnjm52iPwrPKAA5v3krADvHcewKuLe9k5HhJgzg=";
   };
 
diff --git a/pkgs/by-name/wi/wireproxy/package.nix b/pkgs/by-name/wi/wireproxy/package.nix
index e145dadf5f17..6d1e5997f610 100644
--- a/pkgs/by-name/wi/wireproxy/package.nix
+++ b/pkgs/by-name/wi/wireproxy/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pufferffish";
     repo = "wireproxy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-F8WatQsXgq3ex2uAy8eoS2DkG7uClNwZ74eG/mJN83o=";
   };
 
diff --git a/pkgs/by-name/wi/wiringpi/package.nix b/pkgs/by-name/wi/wiringpi/package.nix
index 57d72b67bcbf..78a2b44c2291 100644
--- a/pkgs/by-name/wi/wiringpi/package.nix
+++ b/pkgs/by-name/wi/wiringpi/package.nix
@@ -11,7 +11,7 @@ let
   srcAll = fetchFromGitHub {
     owner = "WiringPi";
     repo = "WiringPi";
-    rev = version;
+    tag = version;
     sha256 = "sha256-OWR+yo+SnYaMd8J+ku9ettZi+rDHcHlGZCoucCiRkCI=";
   };
   mkSubProject =
diff --git a/pkgs/by-name/wi/wiseunpacker/package.nix b/pkgs/by-name/wi/wiseunpacker/package.nix
index f5c9690a757f..9b3d9d12b581 100644
--- a/pkgs/by-name/wi/wiseunpacker/package.nix
+++ b/pkgs/by-name/wi/wiseunpacker/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "mnadareski";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-APbfo2D/p733AwNNByu5MvC9LA8WW4mAzq6t2w/YNrs=";
   };
 
diff --git a/pkgs/by-name/wi/wishbone-tool/package.nix b/pkgs/by-name/wi/wishbone-tool/package.nix
index 053021fe29f9..d51224cbf329 100644
--- a/pkgs/by-name/wi/wishbone-tool/package.nix
+++ b/pkgs/by-name/wi/wishbone-tool/package.nix
@@ -10,7 +10,7 @@ let
   src = fetchFromGitHub {
     owner = "litex-hub";
     repo = "wishbone-utils";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Gl0bxHJ8Y0ytYJxToYAR2tVkD4YNMihk+zRpieSvMGE=";
   };
 in
diff --git a/pkgs/by-name/wi/wishlist/package.nix b/pkgs/by-name/wi/wishlist/package.nix
index cbb5a316614f..4a7828e753fa 100644
--- a/pkgs/by-name/wi/wishlist/package.nix
+++ b/pkgs/by-name/wi/wishlist/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "wishlist";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-53fojA+gdvpSVNjx6QncH16F8/x+lpY5SkNs7obW2XQ=";
   };
 
diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix
index 43f88744ce42..87a78cfa6740 100644
--- a/pkgs/by-name/wi/wit-bindgen/package.nix
+++ b/pkgs/by-name/wi/wit-bindgen/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wit-bindgen";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ePrtWOCta9UtoEtSJ1NZb6iJricfsc2YtRF8hi///3c=";
   };
 
diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix
index 7bcf5d3369f3..b36065fcb75b 100644
--- a/pkgs/by-name/wi/witness/package.nix
+++ b/pkgs/by-name/wi/witness/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "in-toto";
     repo = "witness";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ylCUy44sX1KPfQqEldixmLcXkk+Uwca4q1gZRgxHdeg=";
   };
   vendorHash = "sha256-CR95CsGthdjq/dtxmIjmZlQeyKimumCP9mWr6tNrBJI=";
diff --git a/pkgs/by-name/wl/wl-clip-persist/package.nix b/pkgs/by-name/wl/wl-clip-persist/package.nix
index cd7704ef7f3f..fdc18b2d29f9 100644
--- a/pkgs/by-name/wl/wl-clip-persist/package.nix
+++ b/pkgs/by-name/wl/wl-clip-persist/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Linus789";
     repo = "wl-clip-persist";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dFhHsBazBHVWgPxoRDNwh8Yctt4w64E0RyFaHEC4mvk=";
   };
 
diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
index 2fc26e2c3836..cf8eaf4fa75a 100644
--- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix
+++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "wl-clipboard-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jGTWcVR6atkEeEUunystJ4B6I3GzYiCOMs0MC6pvPfI=";
   };
 
diff --git a/pkgs/by-name/wl/wl-clipboard-x11/package.nix b/pkgs/by-name/wl/wl-clipboard-x11/package.nix
index d37426b1949a..c0be284fd1a1 100644
--- a/pkgs/by-name/wl/wl-clipboard-x11/package.nix
+++ b/pkgs/by-name/wl/wl-clipboard-x11/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brunelli";
     repo = "wl-clipboard-x11";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-i+oF1Mu72O5WPTWzqsvo4l2CERWWp4Jq/U0DffPZ8vg=";
   };
 
diff --git a/pkgs/by-name/wl/wl-clipboard/package.nix b/pkgs/by-name/wl/wl-clipboard/package.nix
index 45e310684489..e651dd10a544 100644
--- a/pkgs/by-name/wl/wl-clipboard/package.nix
+++ b/pkgs/by-name/wl/wl-clipboard/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bugaevc";
     repo = "wl-clipboard";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BYRXqVpGt9FrEBYQpi2kHPSZyeMk9o1SXkxjjcduhiY=";
   };
 
diff --git a/pkgs/by-name/wl/wl-color-picker/package.nix b/pkgs/by-name/wl/wl-color-picker/package.nix
index 3f128e6bdd67..85042ef50734 100644
--- a/pkgs/by-name/wl/wl-color-picker/package.nix
+++ b/pkgs/by-name/wl/wl-color-picker/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jgmdev";
     repo = "wl-color-picker";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lvhpXy4Sd1boYNGhbPoZTJlBhlW5obltDOrEzB1Gq0A=";
   };
 
diff --git a/pkgs/by-name/wl/wl-gammarelay-rs/package.nix b/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
index a9cea8534b54..4392e1775d0f 100644
--- a/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
+++ b/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MaxVerevkin";
     repo = "wl-gammarelay-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zmtC4xNNAK/TiB5TU6qsY5y0Z3roaEnTwHMZPjq6SbE=";
   };
 
diff --git a/pkgs/by-name/wl/wl-mirror/package.nix b/pkgs/by-name/wl/wl-mirror/package.nix
index 2f6f15f5badb..d131fa69d218 100644
--- a/pkgs/by-name/wl/wl-mirror/package.nix
+++ b/pkgs/by-name/wl/wl-mirror/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ferdi265";
     repo = "wl-mirror";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E8mbCMfmN3key1W3m8YbH1wKa56yESiXujACfKFS/+s=";
   };
 
diff --git a/pkgs/by-name/wl/wldash/package.nix b/pkgs/by-name/wl/wldash/package.nix
index 287f9da37e37..bd9134222039 100644
--- a/pkgs/by-name/wl/wldash/package.nix
+++ b/pkgs/by-name/wl/wldash/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "kennylevinsen";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZzsBD3KKTT+JGiFCpdumPyVAE2gEJvzCq+nRnK3RdxI=";
   };
 
diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix
index f29345c0afca..e9f12a85a26d 100644
--- a/pkgs/by-name/wl/wleave/package.nix
+++ b/pkgs/by-name/wl/wleave/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AMNatty";
     repo = "wleave";
-    rev = version;
+    tag = version;
     hash = "sha256-xl0JOepQDvYdeTv0LFYzp8QdufKXkayJcHklLBjupeA=";
   };
 
diff --git a/pkgs/by-name/wl/wljoywake/package.nix b/pkgs/by-name/wl/wljoywake/package.nix
index 00899a219751..1751bfd4bcfb 100644
--- a/pkgs/by-name/wl/wljoywake/package.nix
+++ b/pkgs/by-name/wl/wljoywake/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     repo = "wljoywake";
     owner = "nowrep";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zSYNfsFjswaSXZPlIDMDC87NK/6AKtArHBeWCWDDR3E=";
   };
 
diff --git a/pkgs/by-name/wl/wlogout/package.nix b/pkgs/by-name/wl/wlogout/package.nix
index 6a50af56cd81..7f876305bcd5 100644
--- a/pkgs/by-name/wl/wlogout/package.nix
+++ b/pkgs/by-name/wl/wlogout/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ArtsyMacaw";
     repo = "wlogout";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-/tYZy56ku68ziSOhy6Dex9RGy+blkU6CN2ze76y7718=";
   };
 
diff --git a/pkgs/by-name/wl/wlr-which-key/package.nix b/pkgs/by-name/wl/wlr-which-key/package.nix
index fa49d11db5e0..3bd34c745a38 100644
--- a/pkgs/by-name/wl/wlr-which-key/package.nix
+++ b/pkgs/by-name/wl/wlr-which-key/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MaxVerevkin";
     repo = "wlr-which-key";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BEf1qpy0bVPi5nmu3UUiv8k0bJvE5VFB5Zqb5lS0+t4=";
   };
 
diff --git a/pkgs/by-name/wl/wlx-overlay-s/package.nix b/pkgs/by-name/wl/wlx-overlay-s/package.nix
index 5010e6bce075..7ec5bfeacbc2 100644
--- a/pkgs/by-name/wl/wlx-overlay-s/package.nix
+++ b/pkgs/by-name/wl/wlx-overlay-s/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "galister";
     repo = "wlx-overlay-s";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m2YVXF9bEjovZOWa+X1CYHAUaAsUI4dBMG2ni3jP9L4=";
   };
 
diff --git a/pkgs/by-name/wm/wmic-bin/package.nix b/pkgs/by-name/wm/wmic-bin/package.nix
index e557ffd76764..b744850553c7 100644
--- a/pkgs/by-name/wm/wmic-bin/package.nix
+++ b/pkgs/by-name/wm/wmic-bin/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "R-Vision";
     repo = "wmi-client";
-    rev = version;
+    tag = version;
     sha256 = "1w1mdbiwz37wzry1q38h8dyjaa6iggmsb9wcyhhlawwm1vj50w48";
   };
 
diff --git a/pkgs/by-name/wm/wmutils-core/package.nix b/pkgs/by-name/wm/wmutils-core/package.nix
index 5f35c29dbb42..7ee5477c907a 100644
--- a/pkgs/by-name/wm/wmutils-core/package.nix
+++ b/pkgs/by-name/wm/wmutils-core/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wmutils";
     repo = "core";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OKAvJovGu9rMxEe5g4kdL7Foj41kl3zUYIJa04jf0dI=";
   };
 
diff --git a/pkgs/by-name/wm/wmutils-opt/package.nix b/pkgs/by-name/wm/wmutils-opt/package.nix
index 00142588d2e7..27d9fa6d9632 100644
--- a/pkgs/by-name/wm/wmutils-opt/package.nix
+++ b/pkgs/by-name/wm/wmutils-opt/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wmutils";
     repo = "opt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0gd05qsir1lnzfrbnfh08qwsryz7arwj20f886nqh41m87yqaljz";
   };
 
diff --git a/pkgs/by-name/wo/wob/package.nix b/pkgs/by-name/wo/wob/package.nix
index 1fc1b26282b4..c90e7edb6078 100644
--- a/pkgs/by-name/wo/wob/package.nix
+++ b/pkgs/by-name/wo/wob/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "francma";
     repo = "wob";
-    rev = version;
+    tag = version;
     sha256 = "sha256-9LFAEo17w861ldMJU+t1oLAKoM6gJc4Em4tSwQDXbKU=";
   };
 
diff --git a/pkgs/by-name/wo/woeusb-ng/package.nix b/pkgs/by-name/wo/woeusb-ng/package.nix
index 408440e0f8be..ff94077ab583 100644
--- a/pkgs/by-name/wo/woeusb-ng/package.nix
+++ b/pkgs/by-name/wo/woeusb-ng/package.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "WoeUSB";
     repo = "WoeUSB-ng";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2opSiXbbk0zDRt6WqMh97iAt6/KhwNDopOas+OZn6TU=";
   };
 
diff --git a/pkgs/by-name/wo/woeusb/package.nix b/pkgs/by-name/wo/woeusb/package.nix
index 8382ad157ec9..2554ea9f252e 100644
--- a/pkgs/by-name/wo/woeusb/package.nix
+++ b/pkgs/by-name/wo/woeusb/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WoeUSB";
     repo = "WoeUSB";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HB1E7rP/U58dyL3j6YnhF5AOGAcHqmA/ZZ5JNBDibco=";
   };
 
diff --git a/pkgs/by-name/wo/woff2/package.nix b/pkgs/by-name/wo/woff2/package.nix
index ef5a9a5e006c..f0b1267e7c14 100644
--- a/pkgs/by-name/wo/woff2/package.nix
+++ b/pkgs/by-name/wo/woff2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "woff2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "13l4g536h0pr84ww4wxs2za439s0xp1va55g6l478rfbb1spp44y";
   };
 
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/wo/wolfebin/package.nix b/pkgs/by-name/wo/wolfebin/package.nix
index e44f30213899..2090ec8d5d42 100644
--- a/pkgs/by-name/wo/wolfebin/package.nix
+++ b/pkgs/by-name/wo/wolfebin/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thejoshwolfe";
     repo = "wolfebin";
-    rev = version;
+    tag = version;
     sha256 = "sha256-tsI71/UdLaGZ3O2lNTd1c8S5OS2imquLovh0n0ez8Ts=";
   };
 
diff --git a/pkgs/by-name/wo/wordgrinder/package.nix b/pkgs/by-name/wo/wordgrinder/package.nix
index 9f7d84c9bb37..69e1c17ff738 100644
--- a/pkgs/by-name/wo/wordgrinder/package.nix
+++ b/pkgs/by-name/wo/wordgrinder/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "wordgrinder";
     owner = "davidgiven";
-    rev = version;
+    tag = version;
     sha256 = "124d1bnn2aqs6ik8pdazzni6a0583prz9lfdjrbwyb97ipqga9pm";
   };
 
diff --git a/pkgs/by-name/wo/workshop-runner/package.nix b/pkgs/by-name/wo/workshop-runner/package.nix
index ed44154c1f0f..8be4b3b2ce0b 100644
--- a/pkgs/by-name/wo/workshop-runner/package.nix
+++ b/pkgs/by-name/wo/workshop-runner/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mainmatter";
     repo = "rust-workshop-runner";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PfQPRbOPK1Y/j8Xtg78oDzBFUx8eiM3ZwRul/ao0SgI=";
   };
 
diff --git a/pkgs/by-name/wo/wormhole-william/package.nix b/pkgs/by-name/wo/wormhole-william/package.nix
index aedb6c88177a..d2e7f545c6fe 100644
--- a/pkgs/by-name/wo/wormhole-william/package.nix
+++ b/pkgs/by-name/wo/wormhole-william/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "psanford";
     repo = "wormhole-william";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KGJfz3nd03vcdrIsX8UUfdw96XwyU9PRzwK8O4/I8JQ=";
   };
 
diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix
index 5e7ad8d457bf..cccb00450e11 100644
--- a/pkgs/by-name/wp/wpaperd/package.nix
+++ b/pkgs/by-name/wp/wpaperd/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "danyspin97";
     repo = "wpaperd";
-    rev = version;
+    tag = version;
     hash = "sha256-L3xoEhVjbJoPsGgie95SIxpRDCV5ZZcrfL01TPAffZc=";
   };
 
diff --git a/pkgs/by-name/wp/wpgtk/package.nix b/pkgs/by-name/wp/wpgtk/package.nix
index 4cf918c52012..c7d34509b572 100644
--- a/pkgs/by-name/wp/wpgtk/package.nix
+++ b/pkgs/by-name/wp/wpgtk/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "deviantfero";
     repo = "wpgtk";
-    rev = version;
+    tag = version;
     sha256 = "sha256-NlJG9d078TW1jcnVrpBORIIwDUGIAGWZoDbXp9/qRr4=";
   };
 
diff --git a/pkgs/by-name/wp/wprecon/package.nix b/pkgs/by-name/wp/wprecon/package.nix
index c6aedc564b4c..93cf7286934a 100644
--- a/pkgs/by-name/wp/wprecon/package.nix
+++ b/pkgs/by-name/wp/wprecon/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "blackbinn";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-23zJD3Nnkeko+J2FjPq5RA5dIjORMXvwt3wtAYiVlQs=";
   };
 
diff --git a/pkgs/by-name/wr/wrap/package.nix b/pkgs/by-name/wr/wrap/package.nix
index 946c41e15dda..9dc2dc4d74aa 100644
--- a/pkgs/by-name/wr/wrap/package.nix
+++ b/pkgs/by-name/wr/wrap/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Wraparound";
     repo = "wrap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-58wsH/e3X72S7tJUObazyvvkI8+B7DLPTBmQO9A+jmk=";
   };
 
diff --git a/pkgs/by-name/wr/write-good/package.nix b/pkgs/by-name/wr/write-good/package.nix
index c682e732de98..5507d3b145ad 100644
--- a/pkgs/by-name/wr/write-good/package.nix
+++ b/pkgs/by-name/wr/write-good/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "btford";
     repo = "write-good";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cq3cj2BwoQMKqo3iU2l+PR/2bJIFMSTRsDGQJ06GWXk=";
   };
 
diff --git a/pkgs/by-name/wr/writefreely/package.nix b/pkgs/by-name/wr/writefreely/package.nix
index f952481f828d..5aadd11c32dd 100644
--- a/pkgs/by-name/wr/writefreely/package.nix
+++ b/pkgs/by-name/wr/writefreely/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "writefreely";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Qr31XSbAckLElD81yxD+K7tngWECQ+wyuESC+biAbyw=";
   };
 
diff --git a/pkgs/by-name/wr/wrk/package.nix b/pkgs/by-name/wr/wrk/package.nix
index 46b3433bf845..c047e0bcd2bc 100644
--- a/pkgs/by-name/wr/wrk/package.nix
+++ b/pkgs/by-name/wr/wrk/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wg";
     repo = "wrk";
-    rev = version;
+    tag = version;
     sha256 = "sha256-nCfA444p7krXOB3qRtDKWxWj9tsrDZsGf03ThtE1dXM=";
   };
 
diff --git a/pkgs/by-name/ws/wsdd/package.nix b/pkgs/by-name/ws/wsdd/package.nix
index 1c69a0ef8fb8..a5402b171384 100644
--- a/pkgs/by-name/ws/wsdd/package.nix
+++ b/pkgs/by-name/ws/wsdd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "christgau";
     repo = "wsdd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T8/XlQpx4CtNy8LuLwOQBG9muFe9pp5583tDaCT4ReI=";
   };
 
diff --git a/pkgs/by-name/ws/wsl-open/package.nix b/pkgs/by-name/ws/wsl-open/package.nix
index bf92ea0b3058..1f029f89a238 100644
--- a/pkgs/by-name/ws/wsl-open/package.nix
+++ b/pkgs/by-name/ws/wsl-open/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "4U6U57";
     repo = "wsl-open";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-amqkDXdgIqGjRZMkltwco0UAI++G0RY/MxLXwtlxogE=";
   };
 
diff --git a/pkgs/by-name/ws/wsl-vpnkit/package.nix b/pkgs/by-name/ws/wsl-vpnkit/package.nix
index 22d4b341d496..4d59c7874941 100644
--- a/pkgs/by-name/ws/wsl-vpnkit/package.nix
+++ b/pkgs/by-name/ws/wsl-vpnkit/package.nix
@@ -30,7 +30,7 @@ resholve.mkDerivation {
   src = fetchFromGitHub {
     owner = "sakai135";
     repo = "wsl-vpnkit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Igbr3L2W32s4uBepllSz07bkbI3qwAKMZkBrXLqGrGA=";
   };
 
diff --git a/pkgs/by-name/ws/wslu/package.nix b/pkgs/by-name/ws/wslu/package.nix
index 43fb9cbbfafc..938261b1dff5 100644
--- a/pkgs/by-name/ws/wslu/package.nix
+++ b/pkgs/by-name/ws/wslu/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wslutilities";
     repo = "wslu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ssiwYkQg2rOirC/ZZVq2bJm4Ggc364uRkoS2y365Eb0=";
   };
 
diff --git a/pkgs/by-name/ws/wsysmon/package.nix b/pkgs/by-name/ws/wsysmon/package.nix
index 76ffb4ab5964..cf9ccb0cbde2 100644
--- a/pkgs/by-name/ws/wsysmon/package.nix
+++ b/pkgs/by-name/ws/wsysmon/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "slyfabi";
     repo = "wsysmon";
-    rev = version;
+    tag = version;
     hash = "sha256-5kfZT+hm064qXoAzi0RdmUqXi8VaXamlbm+FJOrGh3A=";
   };
 
diff --git a/pkgs/by-name/wt/wtfutil/package.nix b/pkgs/by-name/wt/wtfutil/package.nix
index d4f638264b13..4c9b31b54301 100644
--- a/pkgs/by-name/wt/wtfutil/package.nix
+++ b/pkgs/by-name/wt/wtfutil/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wtfutil";
     repo = "wtf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DFrA4bx+wSOxmt1CVA1oNiYVmcWeW6wpfR5F1tnhyDY=";
   };
 
diff --git a/pkgs/by-name/wt/wthrr/package.nix b/pkgs/by-name/wt/wthrr/package.nix
index be0b4608788e..1ec688dbd15e 100644
--- a/pkgs/by-name/wt/wthrr/package.nix
+++ b/pkgs/by-name/wt/wthrr/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ttytm";
     repo = "wthrr-the-weathercrab";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8o84FFdcEPRtbsxWCc97tTGGownxlhpIM71GiBRT6uM=";
   };
 
diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix
index b5bc96f793eb..044f5fe567ce 100644
--- a/pkgs/by-name/wt/wttrbar/package.nix
+++ b/pkgs/by-name/wt/wttrbar/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bjesus";
     repo = "wttrbar";
-    rev = version;
+    tag = version;
     hash = "sha256-+M0s6v9ULf+D2pPOE8KlHoyV+jBMbPsAXpYxGjms5DY=";
   };
 
diff --git a/pkgs/by-name/wt/wtwitch/package.nix b/pkgs/by-name/wt/wtwitch/package.nix
index cf9d19877857..6a68d682be5a 100644
--- a/pkgs/by-name/wt/wtwitch/package.nix
+++ b/pkgs/by-name/wt/wtwitch/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "krathalan";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-2YLBuxGwGkav3zB2qMqM6yRXf7ZLqgULoJV4s5p+hSw=";
   };
 
diff --git a/pkgs/by-name/wt/wtype/package.nix b/pkgs/by-name/wt/wtype/package.nix
index e1ebaf728d3a..9a26e6dd85c2 100644
--- a/pkgs/by-name/wt/wtype/package.nix
+++ b/pkgs/by-name/wt/wtype/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "atx";
     repo = "wtype";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TfpzAi0mkXugQn70MISyNFOXIJpDwvgh3enGv0Xq8S4=";
   };
 
diff --git a/pkgs/by-name/wu/wush/package.nix b/pkgs/by-name/wu/wush/package.nix
index 884c0e590143..84be56594ea1 100644
--- a/pkgs/by-name/wu/wush/package.nix
+++ b/pkgs/by-name/wu/wush/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "coder";
     repo = "wush";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-K83peIfr1+OHuuq6gdgco0RhfF1tAAewb4pxNT6vV+w=";
   };
 
diff --git a/pkgs/by-name/wu/wuzz/package.nix b/pkgs/by-name/wu/wuzz/package.nix
index d67236051250..2c6a5c1f7a61 100644
--- a/pkgs/by-name/wu/wuzz/package.nix
+++ b/pkgs/by-name/wu/wuzz/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-H0soiKOytchfcFx17az0pGoFbA+hhXLxGJVdaARvnDc=";
   };
 
diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix
index 5b40cd47a5c9..a013d30be047 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/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix
index a1e2ca6b7a5d..cf43e38063f3 100644
--- a/pkgs/by-name/wx/wxGTK32/package.nix
+++ b/pkgs/by-name/wx/wxGTK32/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wxWidgets";
     repo = "wxWidgets";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7dc7NGiKSonFFaWp3UxLYqDc1Cc6no1Eba0QmtzX5mM=";
   };
 
diff --git a/pkgs/by-name/wx/wxhexeditor/package.nix b/pkgs/by-name/wx/wxhexeditor/package.nix
index e581b8c50ba8..82775b18e5cc 100644
--- a/pkgs/by-name/wx/wxhexeditor/package.nix
+++ b/pkgs/by-name/wx/wxhexeditor/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "wxHexEditor";
     owner = "EUA";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EmdWYifwewk40s1TARYoUzx/qhyMmgmUC9tr5KKCtiM=";
   };
 
diff --git a/pkgs/by-name/wx/wxmacmolplt/package.nix b/pkgs/by-name/wx/wxmacmolplt/package.nix
index 6252ff7d5f24..286fa1aba7c3 100644
--- a/pkgs/by-name/wx/wxmacmolplt/package.nix
+++ b/pkgs/by-name/wx/wxmacmolplt/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brettbode";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gFGstyq9bMmBaIS4QE6N3EIC9GxRvyJYUr8DUvwRQBc=";
   };
 
diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix
index 94595ff510e8..2178d54c728e 100644
--- a/pkgs/by-name/wx/wxsqlite3/package.nix
+++ b/pkgs/by-name/wx/wxsqlite3/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "utelle";
     repo = "wxsqlite3";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aDEVT3R948P+N1fFC9Q7LNf8FpPuxlKs+dQurewtaFA=";
   };
 
diff --git a/pkgs/by-name/wx/wxsqliteplus/package.nix b/pkgs/by-name/wx/wxsqliteplus/package.nix
index 8a64e7fec2b8..1dc6538c0c05 100644
--- a/pkgs/by-name/wx/wxsqliteplus/package.nix
+++ b/pkgs/by-name/wx/wxsqliteplus/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "guanlisheng";
     repo = "wxsqliteplus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gyH1Wlmg9xQy7xm7rhKZa7BFTFFN4JQHp3CHmzMkVOg=";
   };
 
diff --git a/pkgs/by-name/x-/x-create-mouse-void/package.nix b/pkgs/by-name/x-/x-create-mouse-void/package.nix
index 4be1a0460634..af57dc5ada8b 100644
--- a/pkgs/by-name/x-/x-create-mouse-void/package.nix
+++ b/pkgs/by-name/x-/x-create-mouse-void/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cas--";
     repo = "XCreateMouseVoid";
-    rev = version;
+    tag = version;
     sha256 = "151pv4gmzz9g6nd1xw94hmawlb5z8rgs1jb3x1zpvn3znd7f355c";
   };
 
diff --git a/pkgs/by-name/x1/x11docker/package.nix b/pkgs/by-name/x1/x11docker/package.nix
index 56bedfc7e5e6..011121ad8e0f 100644
--- a/pkgs/by-name/x1/x11docker/package.nix
+++ b/pkgs/by-name/x1/x11docker/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mviereck";
     repo = "x11docker";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DehAWrEvoE/zWbfjQmF5Z7HTaQL5WMA/279Ee1Xm47g=";
   };
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/x1/x11vnc/package.nix b/pkgs/by-name/x1/x11vnc/package.nix
index 5331f43e37d9..f06500b8e415 100644
--- a/pkgs/by-name/x1/x11vnc/package.nix
+++ b/pkgs/by-name/x1/x11vnc/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LibVNC";
     repo = "x11vnc";
-    rev = version;
+    tag = version;
     sha256 = "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1";
   };
 
diff --git a/pkgs/by-name/x4/x4/package.nix b/pkgs/by-name/x4/x4/package.nix
index 26815dd7a0c7..d50846487cf0 100644
--- a/pkgs/by-name/x4/x4/package.nix
+++ b/pkgs/by-name/x4/x4/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pwnwriter";
     repo = "x4";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IF+8lu56fzYM79p7MiNpVLFIs2GKPlzw5pNXD/hT6BM=";
   };
 
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/x4/x42-gmsynth/package.nix b/pkgs/by-name/x4/x42-gmsynth/package.nix
index 4c8dec54e04a..d075b679ac9f 100644
--- a/pkgs/by-name/x4/x42-gmsynth/package.nix
+++ b/pkgs/by-name/x4/x42-gmsynth/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "x42";
     repo = "gmsynth.lv2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Fu/wCQY5fTvAWo18hhiQC9LZAUwi3WJfhgWLI0rgmKs=";
   };
 
diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix
index 7b47143d9661..e05505036624 100644
--- a/pkgs/by-name/xa/xapp/package.nix
+++ b/pkgs/by-name/xa/xapp/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-vd3uAihOF4dgZ49VVhRjG+Cx7sjMvHI/0oRLvIs2ZaM=";
   };
 
diff --git a/pkgs/by-name/xa/xarchiver/package.nix b/pkgs/by-name/xa/xarchiver/package.nix
index a2cf7b39fa38..36800e2a178f 100644
--- a/pkgs/by-name/xa/xarchiver/package.nix
+++ b/pkgs/by-name/xa/xarchiver/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ib";
     repo = "xarchiver";
-    rev = version;
+    tag = version;
     hash = "sha256-pLNAgyYqujk+xvHZjq98kzTG47G4C2JvSTDoS7UTNeo=";
   };
 
diff --git a/pkgs/by-name/xa/xautoclick/package.nix b/pkgs/by-name/xa/xautoclick/package.nix
index fb1861842d17..9f1189e824af 100644
--- a/pkgs/by-name/xa/xautoclick/package.nix
+++ b/pkgs/by-name/xa/xautoclick/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "qarkai";
     repo = "xautoclick";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "GN3zI5LQnVmRC0KWffzUTHKrxcqnstiL55hopwTTwpE=";
   };
 
diff --git a/pkgs/by-name/xb/xbanish/package.nix b/pkgs/by-name/xb/xbanish/package.nix
index 0e6536592b4c..02357353e0f8 100644
--- a/pkgs/by-name/xb/xbanish/package.nix
+++ b/pkgs/by-name/xb/xbanish/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jcs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jwCoJ2shFGuJHhmXmlw/paFpMl5ARD6e5zDnDZHlsoo=";
   };
 
diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix
index 052e1338eb6d..23be1f416162 100644
--- a/pkgs/by-name/xb/xbps/package.nix
+++ b/pkgs/by-name/xb/xbps/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "xbps";
-    rev = version;
+    tag = version;
     hash = "sha256-3+LzFLDZ1zfRPBETMlpEn66zsfHRHQLlgeZPdMtmA14=";
   };
 
diff --git a/pkgs/by-name/xc/xcaddy/package.nix b/pkgs/by-name/xc/xcaddy/package.nix
index fc21390fcd48..9a7a0ed3d048 100644
--- a/pkgs/by-name/xc/xcaddy/package.nix
+++ b/pkgs/by-name/xc/xcaddy/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caddyserver";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vpaweUU++3ZHj7KT5WNUCw3X93sQBTgjKlB8rJwrHlM=";
   };
 
diff --git a/pkgs/by-name/xc/xcalib/package.nix b/pkgs/by-name/xc/xcalib/package.nix
index a1c789fef49a..22972ae3df45 100644
--- a/pkgs/by-name/xc/xcalib/package.nix
+++ b/pkgs/by-name/xc/xcalib/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenICC";
     repo = "xcalib";
-    rev = version;
+    tag = version;
     sha256 = "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr";
   };
 
diff --git a/pkgs/by-name/xc/xcat/package.nix b/pkgs/by-name/xc/xcat/package.nix
index fcca8ee73cdd..9666a444de0d 100644
--- a/pkgs/by-name/xc/xcat/package.nix
+++ b/pkgs/by-name/xc/xcat/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "orf";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "01r5998gdvqjdrahpk0ci27lx9yghbddlanqcspr3qp5y5930i0s";
   };
 
diff --git a/pkgs/by-name/xc/xcb-imdkit/package.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix
index 538b84c1c4bf..8375b8348f93 100644
--- a/pkgs/by-name/xc/xcb-imdkit/package.nix
+++ b/pkgs/by-name/xc/xcb-imdkit/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "xcb-imdkit";
-    rev = version;
+    tag = version;
     hash = "sha256-QfuetGPY6u4OhFiE5/CoVEpdODWnd1PHWBtM3ymsZ98=";
   };
 
diff --git a/pkgs/by-name/xc/xcfun/package.nix b/pkgs/by-name/xc/xcfun/package.nix
index 1241bbc6f64e..bb839c638ef0 100644
--- a/pkgs/by-name/xc/xcfun/package.nix
+++ b/pkgs/by-name/xc/xcfun/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dftlibs";
     repo = "xcfun";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1bj70cnhbh6ziy02x988wwl7cbwaq17ld7qwhswqkgnnx8rpgxid";
   };
 
diff --git a/pkgs/by-name/xc/xchm/package.nix b/pkgs/by-name/xc/xchm/package.nix
index 3472dbfa0d57..ca5badba00f0 100644
--- a/pkgs/by-name/xc/xchm/package.nix
+++ b/pkgs/by-name/xc/xchm/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rzvncj";
     repo = "xCHM";
-    rev = version;
+    tag = version;
     sha256 = "sha256-UMn8ds4nheuYSu0PesxdGoyxyn5AcKq9WByeRUxxx3k=";
   };
 
diff --git a/pkgs/by-name/xc/xclip/package.nix b/pkgs/by-name/xc/xclip/package.nix
index 5b3383dae99c..9fff1976eee7 100644
--- a/pkgs/by-name/xc/xclip/package.nix
+++ b/pkgs/by-name/xc/xclip/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "astrand";
     repo = "xclip";
-    rev = version;
+    tag = version;
     sha256 = "0q0hmvcjlv8arhh1pzhja2wglyj6n7z209jnpnzd281kqqv4czcs";
   };
 
diff --git a/pkgs/by-name/xc/xcodes/package.nix b/pkgs/by-name/xc/xcodes/package.nix
index bd5a56ce145d..73510e0112f7 100644
--- a/pkgs/by-name/xc/xcodes/package.nix
+++ b/pkgs/by-name/xc/xcodes/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "XcodesOrg";
     repo = "xcodes";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-TwPfASRU98rifyA/mINFfoY0MbbwmAh8JneVpJa38CA=";
   };
 
diff --git a/pkgs/by-name/xc/xcolor/package.nix b/pkgs/by-name/xc/xcolor/package.nix
index b85df70ff98a..8b75f4821f13 100644
--- a/pkgs/by-name/xc/xcolor/package.nix
+++ b/pkgs/by-name/xc/xcolor/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Soft";
     repo = "xcolor";
-    rev = version;
+    tag = version;
     sha256 = "sha256-NfmoBZek4hsga6RflE5EKkWarhCFIcTwEXhg2fpkxNE=";
   };
 
diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix
index 2165afeda87d..ee7fd5e76cc7 100644
--- a/pkgs/by-name/xc/xcp/package.nix
+++ b/pkgs/by-name/xc/xcp/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tarka";
     repo = "xcp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tAECD3gNx6RDzEJhGt2nrykxHfh4S1qJKt9yNdZpuGs=";
   };
 
diff --git a/pkgs/by-name/xc/xcur2png/package.nix b/pkgs/by-name/xc/xcur2png/package.nix
index 60bfb9b72e38..22057453fc6d 100644
--- a/pkgs/by-name/xc/xcur2png/package.nix
+++ b/pkgs/by-name/xc/xcur2png/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eworm-de";
     repo = "xcur2png";
-    rev = version;
+    tag = version;
     sha256 = "0858wn2p14bxpv9lvaz2bz1rk6zk0g8zgxf8iy595m8fqv4q2fya";
   };
 
diff --git a/pkgs/by-name/xd/xd/package.nix b/pkgs/by-name/xd/xd/package.nix
index eb4c92925411..61d5b1cad2a0 100644
--- a/pkgs/by-name/xd/xd/package.nix
+++ b/pkgs/by-name/xd/xd/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "majestrate";
     repo = "XD";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-k8Mm0tC7wiBmHFdCX38Rz7ccEFkdeArzGJVHTLQ7iWY=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
index 2cc28e37711d..4db64c762ac1 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "flatpak";
     repo = "xdg-desktop-portal-gtk";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-aeSm6Wd0EMaZb7tYpnKT/QBt9l/fVyQLgvn5aBqQOAc=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix
index 0fe1a24e1f09..92c99c113f9d 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Decodetalkers";
     repo = "xdg-desktop-portal-shana";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9uie6VFyi7sO8DbthUTgpEc68MvvLA+bUwyV/DSpKkE=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
index 0151ea6ed1cb..5de32b747857 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emersion";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GIIDeZMIGUiZV0IUhcclRVThE5LKaqVc5VwnNT8beNU=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
index 36d80571c5ea..f22e6565c4df 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xdg-desktop-portal-xapp";
-    rev = version;
+    tag = version;
     hash = "sha256-9v0faB5HhUUPXOWDDyTUPaPwzMjhqdiAyuv9kM4mm2Q=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-launch/package.nix b/pkgs/by-name/xd/xdg-launch/package.nix
index 7944270548af..f551503b8c93 100644
--- a/pkgs/by-name/xd/xdg-launch/package.nix
+++ b/pkgs/by-name/xd/xdg-launch/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bbidulock";
     repo = "xdg-launch";
-    rev = version;
+    tag = version;
     sha256 = "sha256-S/0Wn1T5MSOPN6QXkzfmygHL6XTAnnMJr5Z3fBzsHEw=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-ninja/package.nix b/pkgs/by-name/xd/xdg-ninja/package.nix
index 0de1ec79c389..d74943d86d2f 100644
--- a/pkgs/by-name/xd/xdg-ninja/package.nix
+++ b/pkgs/by-name/xd/xdg-ninja/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "b3nj5m1n";
     repo = "xdg-ninja";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ASJIFQ/BpZMQGRtw8kPhtMCbXC1eb/X8TWQz+CAnaSM=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-utils-cxx/package.nix b/pkgs/by-name/xd/xdg-utils-cxx/package.nix
index d5c9e7c9aff8..05f5efdecfd4 100644
--- a/pkgs/by-name/xd/xdg-utils-cxx/package.nix
+++ b/pkgs/by-name/xd/xdg-utils-cxx/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "azubieta";
     repo = "xdg-utils-cxx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hEN0xqZUNfMOIrw3q+x4kEFhYoqmyn7W3f2w8AGw2wI=";
   };
 
diff --git a/pkgs/by-name/xd/xdgmenumaker/package.nix b/pkgs/by-name/xd/xdgmenumaker/package.nix
index d52029b89ee3..4f7c7909174f 100644
--- a/pkgs/by-name/xd/xdgmenumaker/package.nix
+++ b/pkgs/by-name/xd/xdgmenumaker/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gapan";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "rh1rRgbw8uqii4oN3XXNNKsWam1d8TY0qGceHERlG1k=";
   };
 
diff --git a/pkgs/by-name/xd/xdo/package.nix b/pkgs/by-name/xd/xdo/package.nix
index dfb804c030e4..c1be4711152c 100644
--- a/pkgs/by-name/xd/xdo/package.nix
+++ b/pkgs/by-name/xd/xdo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "xdo";
-    rev = version;
+    tag = version;
     sha256 = "1h3jrygcjjbavdbkpx2hscsf0yf97gk487lzjdlvymd7dxdv9hy9";
   };
 
diff --git a/pkgs/by-name/xd/xdotool/package.nix b/pkgs/by-name/xd/xdotool/package.nix
index 96dc805e0c02..c04b58cffe49 100644
--- a/pkgs/by-name/xd/xdotool/package.nix
+++ b/pkgs/by-name/xd/xdotool/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jordansissel";
     repo = "xdotool";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-XFiaiHHtUSNFw+xhUR29+2RUHOa+Eyj1HHfjCUjwd9k=";
   };
 
diff --git a/pkgs/by-name/xd/xdp-tools/package.nix b/pkgs/by-name/xd/xdp-tools/package.nix
index 7b6a0fd9606a..839931616093 100644
--- a/pkgs/by-name/xd/xdp-tools/package.nix
+++ b/pkgs/by-name/xd/xdp-tools/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xdp-project";
     repo = "xdp-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NJawacCrmTuRXsOiAOMD8RaljPnuPFISoWEgiDcInw8=";
   };
 
diff --git a/pkgs/by-name/xe/xe-guest-utilities/package.nix b/pkgs/by-name/xe/xe-guest-utilities/package.nix
index 4d63c8660ac3..71ebf0a365d8 100644
--- a/pkgs/by-name/xe/xe-guest-utilities/package.nix
+++ b/pkgs/by-name/xe/xe-guest-utilities/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xenserver";
     repo = "xe-guest-utilities";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LpZx+Km2qRywYK/eFLP3aCDku6K6HC4+MzEODH+8Gvs=";
   };
 
diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix
index 6809ecac4198..8b990e55b13e 100644
--- a/pkgs/by-name/xe/xed-editor/package.nix
+++ b/pkgs/by-name/xe/xed-editor/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xed";
-    rev = version;
+    tag = version;
     hash = "sha256-LSAOo6lPm6CQdTNxfAIthul9I9VnWpbEo1vOnKN7SNU=";
   };
 
diff --git a/pkgs/by-name/xe/xed/package.nix b/pkgs/by-name/xe/xed/package.nix
index 1bb99548bb5e..7631b6ef40d1 100644
--- a/pkgs/by-name/xe/xed/package.nix
+++ b/pkgs/by-name/xe/xed/package.nix
@@ -15,7 +15,7 @@ let
     src = fetchFromGitHub {
       owner = "intelxed";
       repo = "mbuild";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-nVHHiaPbf+b+RntjUGjLLGS53e6c+seXIBx7AcTtiWU=";
     };
   };
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intelxed";
     repo = "xed";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LF4iJ1/Z3OifCiir/kU3ufZqtiRLeaJeAwuBqP2BCF4=";
   };
 
diff --git a/pkgs/by-name/xe/xenomapper/package.nix b/pkgs/by-name/xe/xenomapper/package.nix
index 212b5c7ef9dd..b2cc6176acb0 100644
--- a/pkgs/by-name/xe/xenomapper/package.nix
+++ b/pkgs/by-name/xe/xenomapper/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "genomematt";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0mnmfzlq5mhih6z8dq5bkx95vb8whjycz9mdlqwbmlqjb3gb3zhr";
   };
 
diff --git a/pkgs/by-name/xe/xephem/package.nix b/pkgs/by-name/xe/xephem/package.nix
index edaec00e8670..33a73eeca0a5 100644
--- a/pkgs/by-name/xe/xephem/package.nix
+++ b/pkgs/by-name/xe/xephem/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "XEphem";
     repo = "XEphem";
-    rev = version;
+    tag = version;
     hash = "sha256-TuzXrWoJOAHg31DrJObPcHBXgtqR/KWKFRsqddPzL4c=";
   };
 
diff --git a/pkgs/by-name/xe/xeus-zmq/package.nix b/pkgs/by-name/xe/xeus-zmq/package.nix
index ae4374163458..bf425a3005bb 100644
--- a/pkgs/by-name/xe/xeus-zmq/package.nix
+++ b/pkgs/by-name/xe/xeus-zmq/package.nix
@@ -19,7 +19,7 @@ clangStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jupyter-xeus";
     repo = "xeus-zmq";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-CrFb0LDb6akCfFnwMSa4H3D3A8KJx9Kiejw6VeV3IDs=";
   };
 
diff --git a/pkgs/by-name/xf/xf86_input_cmt/package.nix b/pkgs/by-name/xf/xf86_input_cmt/package.nix
index 80c8f895aa3d..8be5ec148898 100644
--- a/pkgs/by-name/xf/xf86_input_cmt/package.nix
+++ b/pkgs/by-name/xf/xf86_input_cmt/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hugegreenbug";
     repo = "xf86-input-cmt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1cnwf518nc0ybc1r3rsgc1gcql1k3785khffv0i4v3akrm9wdw98";
   };
 
diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix
index 6489f3d4fdcf..7c8096a0b4c5 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-k1k6K11cWpG6PtzTt99q/rrkN3FyxCVEzfPI9fCTAjM=";
   };
diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix
index a91cba99b26e..01ff30aedf7c 100644
--- a/pkgs/by-name/xh/xh/package.nix
+++ b/pkgs/by-name/xh/xh/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ducaale";
     repo = "xh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5Eq/rJ917zjlTnuxdIWhBNr8LA/ag+fyECYYX5k2S7I=";
   };
 
diff --git a/pkgs/by-name/xi/xiccd/package.nix b/pkgs/by-name/xi/xiccd/package.nix
index 30fa495d71a0..47bc4336754c 100644
--- a/pkgs/by-name/xi/xiccd/package.nix
+++ b/pkgs/by-name/xi/xiccd/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agalakhov";
     repo = "xiccd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "159fyz5535lcabi5bzmxgmjdgxlqcjaiqgzr00mi3ax0i5fdldwn";
   };
 
diff --git a/pkgs/by-name/xi/xilinx-bootgen/package.nix b/pkgs/by-name/xi/xilinx-bootgen/package.nix
index 57abaf0e36d6..4004b1764680 100644
--- a/pkgs/by-name/xi/xilinx-bootgen/package.nix
+++ b/pkgs/by-name/xi/xilinx-bootgen/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xilinx";
     repo = "bootgen";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-t165nTG4IkI3WrcS3ZryINmAOVzfctxg5zY3oqmNtLw=";
   };
 
diff --git a/pkgs/by-name/xi/xinput_calibrator/package.nix b/pkgs/by-name/xi/xinput_calibrator/package.nix
index e54ab099c874..2fbd1a16b6d2 100644
--- a/pkgs/by-name/xi/xinput_calibrator/package.nix
+++ b/pkgs/by-name/xi/xinput_calibrator/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tias";
     repo = "xinput_calibrator";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "5ZkNw+CKNUcPt1PY5PLzB/OT2wcf5n3UcaQlmMcwRVE=";
   };
 
diff --git a/pkgs/by-name/xi/xiphos/package.nix b/pkgs/by-name/xi/xiphos/package.nix
index b990de90fee8..e39afacab389 100644
--- a/pkgs/by-name/xi/xiphos/package.nix
+++ b/pkgs/by-name/xi/xiphos/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "crosswire";
     repo = "xiphos";
-    rev = version;
+    tag = version;
     hash = "sha256-H5Q+azE2t3fgu77C9DxrkeUCJ7iJz3Cc91Ln4dqLvD8=";
   };
 
diff --git a/pkgs/by-name/xi/xits-math/package.nix b/pkgs/by-name/xi/xits-math/package.nix
index d997fad5d11f..83dad5068e9c 100644
--- a/pkgs/by-name/xi/xits-math/package.nix
+++ b/pkgs/by-name/xi/xits-math/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alif-type";
     repo = "xits";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1x3r505dylz9rz8dj98h5n9d0zixyxmvvhnjnms9qxdrz9bxy9g1";
   };
 
diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix
index 7d9433cc4221..f96751c17605 100644
--- a/pkgs/by-name/xi/xiu/package.nix
+++ b/pkgs/by-name/xi/xiu/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "harlanc";
     repo = "xiu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EjyvCwqcPkOe69YnDiAExtBNPhsqqGa95ao+bn6wcyA=";
   };
 
diff --git a/pkgs/by-name/xj/xjadeo/package.nix b/pkgs/by-name/xj/xjadeo/package.nix
index 6ba651e7244a..2842021129fc 100644
--- a/pkgs/by-name/xj/xjadeo/package.nix
+++ b/pkgs/by-name/xj/xjadeo/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "x42";
     repo = "xjadeo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GTg0W3D0BRSxsmeVsB4On3MfwncScEGFJGVJK7wflCM=";
   };
 
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/xk/xkb-switch/package.nix b/pkgs/by-name/xk/xkb-switch/package.nix
index 8ecfe8d4ef5f..3466119a2da0 100644
--- a/pkgs/by-name/xk/xkb-switch/package.nix
+++ b/pkgs/by-name/xk/xkb-switch/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ierton";
     repo = "xkb-switch";
-    rev = version;
+    tag = version;
     sha256 = "sha256-DZAIL6+D+Hgs+fkJwRaQb9BHrEjAkxiqhOZyrR+Mpuk=";
   };
 
diff --git a/pkgs/by-name/xk/xkblayout-state/package.nix b/pkgs/by-name/xk/xkblayout-state/package.nix
index 85798f902184..5e821e52480b 100644
--- a/pkgs/by-name/xk/xkblayout-state/package.nix
+++ b/pkgs/by-name/xk/xkblayout-state/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nonpop";
     repo = "xkblayout-state";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-diorqwDEBdzcBteKvhRisQaY3bx5seaOaWSaPwBkWDo=";
   };
 
diff --git a/pkgs/by-name/xk/xkbmon/package.nix b/pkgs/by-name/xk/xkbmon/package.nix
index a6cef8a63a07..a1a66eedf1ce 100644
--- a/pkgs/by-name/xk/xkbmon/package.nix
+++ b/pkgs/by-name/xk/xkbmon/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xkbmon";
     repo = "xkbmon";
-    rev = version;
+    tag = version;
     sha256 = "sha256-EWW6L6NojzXodDOET01LMcQT8/1JIMpOD++MCiM3j1Y=";
   };
 
diff --git a/pkgs/by-name/xl/xl2tpd/package.nix b/pkgs/by-name/xl/xl2tpd/package.nix
index 9921812ed5cc..2126393b11fa 100644
--- a/pkgs/by-name/xl/xl2tpd/package.nix
+++ b/pkgs/by-name/xl/xl2tpd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xelerance";
     repo = "xl2tpd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Uc3PeTf/ow9p8noPcMLdT6S5dks9igDU6CC9koy+ff4=";
   };
 
diff --git a/pkgs/by-name/xl/xlayoutdisplay/package.nix b/pkgs/by-name/xl/xlayoutdisplay/package.nix
index 03d32d6ee66a..3795b6e024a8 100644
--- a/pkgs/by-name/xl/xlayoutdisplay/package.nix
+++ b/pkgs/by-name/xl/xlayoutdisplay/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alex-courtis";
     repo = "xlayoutdisplay";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A37jFhVTW/3QNEf776Oi3ViRK+ebOPRTsEQqdmNhA7E=";
   };
 
diff --git a/pkgs/by-name/xl/xlibinput-calibrator/package.nix b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
index 2fc3a5640d01..310fc9b255a0 100644
--- a/pkgs/by-name/xl/xlibinput-calibrator/package.nix
+++ b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kreijack";
     repo = "xlibinput_calibrator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MvlamN8WSER0zN9Ru3Kr2MFARD9s7PYKkRtyD8s6ZPI=";
   };
 
diff --git a/pkgs/by-name/xm/xmenu/package.nix b/pkgs/by-name/xm/xmenu/package.nix
index 23569e6a12c7..24041d0fc4a8 100644
--- a/pkgs/by-name/xm/xmenu/package.nix
+++ b/pkgs/by-name/xm/xmenu/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phillbush";
     repo = "xmenu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Gg4hSBBVBOB/wlY44C5bJOuOnLoA/tPvcNZamXae/WE=";
   };
 
diff --git a/pkgs/by-name/xm/xml-security-c/package.nix b/pkgs/by-name/xm/xml-security-c/package.nix
index e198848d0fa2..d73df6742b34 100644
--- a/pkgs/by-name/xm/xml-security-c/package.nix
+++ b/pkgs/by-name/xm/xml-security-c/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://git.shibboleth.net/git/cpp-xml-security";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-D60JtD4p9ERh6sowvwBHtE9XWVm3D8saooagDvA6ZtQ=";
   };
 
diff --git a/pkgs/by-name/xm/xml-tooling-c/package.nix b/pkgs/by-name/xm/xml-tooling-c/package.nix
index 118b087dba8a..427ff86e8024 100644
--- a/pkgs/by-name/xm/xml-tooling-c/package.nix
+++ b/pkgs/by-name/xm/xml-tooling-c/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.shibboleth.net/git/cpp-xmltooling.git";
-    rev = version;
+    tag = version;
     hash = "sha256-czmBu7ThDwq+x7FahgZDMHqid8jeUNnTuKMI/Fj4IIw=";
   };
 
diff --git a/pkgs/by-name/xm/xmldiff/package.nix b/pkgs/by-name/xm/xmldiff/package.nix
index 20c03ad733e4..c615ef91dc1a 100644
--- a/pkgs/by-name/xm/xmldiff/package.nix
+++ b/pkgs/by-name/xm/xmldiff/package.nix
@@ -9,7 +9,7 @@ let
   src = fetchFromGitHub {
     owner = "Shoobx";
     repo = "xmldiff";
-    rev = version;
+    tag = version;
     hash = "sha256-qn8gGultTSNKPUro6Ap4xJGcbpxV+lKgZFpKvyPdhtc=";
   };
 in
diff --git a/pkgs/by-name/xm/xmloscopy/package.nix b/pkgs/by-name/xm/xmloscopy/package.nix
index b547ede58132..fd29bfba9cc0 100644
--- a/pkgs/by-name/xm/xmloscopy/package.nix
+++ b/pkgs/by-name/xm/xmloscopy/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grahamc";
     repo = "xmloscopy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "06y5bckrmnq7b5ny2hfvlmdws910jw3xbw5nzy3bcpqsccqnjxrc";
   };
 
diff --git a/pkgs/by-name/xm/xmlroff/package.nix b/pkgs/by-name/xm/xmlroff/package.nix
index bfa6a4578ffc..be5f4ca298c8 100644
--- a/pkgs/by-name/xm/xmlroff/package.nix
+++ b/pkgs/by-name/xm/xmlroff/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xmlroff";
     repo = "xmlroff";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0dgp72094lx9i9gvg21pp8ak7bg39707rdf6wz011p9s6n6lrq5g";
   };
 
diff --git a/pkgs/by-name/xm/xmltoman/package.nix b/pkgs/by-name/xm/xmltoman/package.nix
index 6a3f7cbcb38a..a17f1c2c6a0e 100644
--- a/pkgs/by-name/xm/xmltoman/package.nix
+++ b/pkgs/by-name/xm/xmltoman/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "atsb";
     repo = "xmltoman";
-    rev = version;
+    tag = version;
     hash = "sha256-EmFdGIeBEcTY0Pqp7BJded9WB/DaXWcMNWh6aTsZlLg=";
   };
 
diff --git a/pkgs/by-name/xm/xmoto/package.nix b/pkgs/by-name/xm/xmoto/package.nix
index a25518bc2507..026c3ebda8ca 100644
--- a/pkgs/by-name/xm/xmoto/package.nix
+++ b/pkgs/by-name/xm/xmoto/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DNljUd7FSH0fTgQx8LMqItZ54aLZtwMUPzqR8Z820SM=";
   };
 
diff --git a/pkgs/by-name/xm/xmousepasteblock/package.nix b/pkgs/by-name/xm/xmousepasteblock/package.nix
index ba74ded883e0..d21302d52172 100644
--- a/pkgs/by-name/xm/xmousepasteblock/package.nix
+++ b/pkgs/by-name/xm/xmousepasteblock/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "milaq";
     repo = "XMousePasteBlock";
     hash = "sha256-uHlHGVnIro6X4kRp79ibtqMmiv2XQT+zgbQagUxdB0c=";
-    rev = version;
+    tag = version;
   };
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/xm/xmpp-bridge/package.nix b/pkgs/by-name/xm/xmpp-bridge/package.nix
index 68f13d58c0b3..00eb7fa1c486 100644
--- a/pkgs/by-name/xm/xmpp-bridge/package.nix
+++ b/pkgs/by-name/xm/xmpp-bridge/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "majewsky";
     repo = "xmpp-bridge";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JXhVi2AiV/PmWPfoQJl/N92GAZQ9UxReAiCkiDxgdFY=";
   };
 
diff --git a/pkgs/by-name/xm/xmppc/package.nix b/pkgs/by-name/xm/xmppc/package.nix
index f7d7d3d12d3e..a6e0a54ec428 100644
--- a/pkgs/by-name/xm/xmppc/package.nix
+++ b/pkgs/by-name/xm/xmppc/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "Anoxinon_e.V.";
     repo = "xmppc";
-    rev = version;
+    tag = version;
     sha256 = "07cy3j4g7vycagdiva3dqb59361lw7s5f2yydpczmyih29v7hkm8";
   };
 
diff --git a/pkgs/by-name/xm/xmrig-mo/package.nix b/pkgs/by-name/xm/xmrig-mo/package.nix
index 6db6bf7349c0..012b9390f3e1 100644
--- a/pkgs/by-name/xm/xmrig-mo/package.nix
+++ b/pkgs/by-name/xm/xmrig-mo/package.nix
@@ -11,7 +11,7 @@ xmrig.overrideAttrs (oldAttrs: rec {
   src = fetchFromGitHub {
     owner = "MoneroOcean";
     repo = "xmrig";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pJ4NTdpWCt7C98k1EqGoiU0Lup25Frdm1kFJuwTfXgY=";
   };
 
diff --git a/pkgs/by-name/xm/xmrig-proxy/package.nix b/pkgs/by-name/xm/xmrig-proxy/package.nix
index 3bbc7ee70883..5a5286368f07 100644
--- a/pkgs/by-name/xm/xmrig-proxy/package.nix
+++ b/pkgs/by-name/xm/xmrig-proxy/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig-proxy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qRn/FiYvogGFUIUj3CojtfO6fXRZghH+bgRP+ysI6mc=";
   };
 
diff --git a/pkgs/by-name/xm/xmrig/package.nix b/pkgs/by-name/xm/xmrig/package.nix
index bd8895534285..ed8b53a26228 100644
--- a/pkgs/by-name/xm/xmrig/package.nix
+++ b/pkgs/by-name/xm/xmrig/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/1pSGbKBfin7xqoILacKp2//65NNiBXZxzhO39FOOjY=";
   };
 
diff --git a/pkgs/by-name/xn/xnotify/package.nix b/pkgs/by-name/xn/xnotify/package.nix
index 969a76eacd7b..ac2905ed6261 100644
--- a/pkgs/by-name/xn/xnotify/package.nix
+++ b/pkgs/by-name/xn/xnotify/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phillbush";
     repo = "xnotify";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RfnmiAEFTPqQZursyVPDIZ6J3KBouvaaxyhTc1liqBc=";
   };
 
diff --git a/pkgs/by-name/xo/xob/package.nix b/pkgs/by-name/xo/xob/package.nix
index 001bd80ec3ea..e82bf9c26dca 100644
--- a/pkgs/by-name/xo/xob/package.nix
+++ b/pkgs/by-name/xo/xob/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "florentc";
     repo = "xob";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1x4aafiyd9k4y8cmvn7rgfif3g5s5hhlbj5nz71qsyqg21nn7hrw";
   };
 
diff --git a/pkgs/by-name/xo/xorex/package.nix b/pkgs/by-name/xo/xorex/package.nix
index e28cc7227fe4..148518795fc2 100644
--- a/pkgs/by-name/xo/xorex/package.nix
+++ b/pkgs/by-name/xo/xorex/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Neo23x0";
     repo = "xorex";
-    rev = version;
+    tag = version;
     sha256 = "rBsOSXWnHRhpLmq20XBuGx8gGBM8ouMyOISkbzUcvE4=";
   };
 
diff --git a/pkgs/by-name/xo/xosview/package.nix b/pkgs/by-name/xo/xosview/package.nix
index 4c165f639c51..b8d45790dd62 100644
--- a/pkgs/by-name/xo/xosview/package.nix
+++ b/pkgs/by-name/xo/xosview/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hills";
     repo = "xosview";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-9Pr7voJiCH7oBziMFRHCWxoyuGdndcdRD2POjiNT7yw=";
   };
 
diff --git a/pkgs/by-name/xp/xpano/package.nix b/pkgs/by-name/xp/xpano/package.nix
index da0ef84d8a93..88ea61c37c11 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 = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-f2qoBpZ5lPBocPas8KMsY5bSYL20gO+ZHLz2R66qSig=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/xp/xpar/package.nix b/pkgs/by-name/xp/xpar/package.nix
index 0409a1351b70..944963d160f9 100644
--- a/pkgs/by-name/xp/xpar/package.nix
+++ b/pkgs/by-name/xp/xpar/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kspalaiologos";
     repo = "xpar";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-DMUDWQqYSQjGxYOpcfwNaaM21avcZ1w3IqEhuOaabrw=";
   };
 
diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix
index 7ea709aadb76..1676301981cb 100644
--- a/pkgs/by-name/xp/xplr/package.nix
+++ b/pkgs/by-name/xp/xplr/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sayanarijit";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0c2QJUEQwKEzzDBDP5XdX7xe1rivazsoZtepB4Dxp/c=";
   };
 
diff --git a/pkgs/by-name/xp/xplugd/package.nix b/pkgs/by-name/xp/xplugd/package.nix
index e536c9b8e3b6..dedfb6b29a7f 100644
--- a/pkgs/by-name/xp/xplugd/package.nix
+++ b/pkgs/by-name/xp/xplugd/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "xplugd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "11vjr69prrs4ir9c267zwq4g9liipzrqi0kmw1zg95dbn7r7zmql";
   };
 
diff --git a/pkgs/by-name/xp/xprintidle/package.nix b/pkgs/by-name/xp/xprintidle/package.nix
index 7ded44bf7a21..bab02e2e7b51 100644
--- a/pkgs/by-name/xp/xprintidle/package.nix
+++ b/pkgs/by-name/xp/xprintidle/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "g0hl1n";
     repo = "xprintidle";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-MawkT4RconRDDCNnaWMxU18lK34ywcebbiHlYeZn/lc=";
   };
 
diff --git a/pkgs/by-name/xp/xprompt/package.nix b/pkgs/by-name/xp/xprompt/package.nix
index bc10c7b44b66..9aa15652d476 100644
--- a/pkgs/by-name/xp/xprompt/package.nix
+++ b/pkgs/by-name/xp/xprompt/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phillbush";
     repo = "xprompt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pOayKngUlrMY3bFsP4Fi+VsOLKCUQU3tdkZ+0OY1SCo=";
   };
 
diff --git a/pkgs/by-name/xq/xq-xml/package.nix b/pkgs/by-name/xq/xq-xml/package.nix
index 94571f41c3f8..6f490b8a1cc8 100644
--- a/pkgs/by-name/xq/xq-xml/package.nix
+++ b/pkgs/by-name/xq/xq-xml/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sibprogrammer";
     repo = "xq";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KLpf4db3D+SQzbitc9ROO+k/VHggWpwZmwwhV3QVNiE=";
   };
 
diff --git a/pkgs/by-name/xr/xrandr-invert-colors/package.nix b/pkgs/by-name/xr/xrandr-invert-colors/package.nix
index ecc75ba4c2b4..7a79e5c4fc7e 100644
--- a/pkgs/by-name/xr/xrandr-invert-colors/package.nix
+++ b/pkgs/by-name/xr/xrandr-invert-colors/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zoltanp";
     repo = "xrandr-invert-colors";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MIbHNJFDQsvjPUbperTKKbHY5GSgItvRyV5OsfpzYT4=";
   };
 
diff --git a/pkgs/by-name/xr/xray/package.nix b/pkgs/by-name/xr/xray/package.nix
index f59b6c858e1e..f30c3f8e0d3c 100644
--- a/pkgs/by-name/xr/xray/package.nix
+++ b/pkgs/by-name/xr/xray/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "XTLS";
     repo = "Xray-core";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1KJ6YUYpOHp9AFSDmbPWqcyRdf/4XNQtuT9oiNcKRnU=";
   };
 
diff --git a/pkgs/by-name/xr/xrdp/package.nix b/pkgs/by-name/xr/xrdp/package.nix
index 69e8592aa7dd..8ed2b4b6d386 100644
--- a/pkgs/by-name/xr/xrdp/package.nix
+++ b/pkgs/by-name/xr/xrdp/package.nix
@@ -34,7 +34,7 @@ let
     src = fetchFromGitHub {
       owner = "neutrinolabs";
       repo = "xorgxrdp";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-xwkGY9dD747kyTvoXrYAIoiFBzQe5ngskUYQhDawnbU=";
     };
 
@@ -83,7 +83,7 @@ let
       src = fetchFromGitHub {
         owner = "neutrinolabs";
         repo = "xrdp";
-        rev = "v${version}";
+        tag = "v${version}";
         fetchSubmodules = true;
         hash = "sha256-lqifQJ/JX+0304arVctsEBEDFPhEPn2OWLyjAQW1who=";
       };
diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix
index d39cdd541b85..4a06c6de4419 100644
--- a/pkgs/by-name/xr/xreader/package.nix
+++ b/pkgs/by-name/xr/xreader/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-qBnnxygkAn1wF3gtqR0At1e1e+sx1/2MoSWqmshW5Qg=";
   };
 
diff --git a/pkgs/by-name/xr/xrectsel/package.nix b/pkgs/by-name/xr/xrectsel/package.nix
index 4673d4a8017d..67d4ce516832 100644
--- a/pkgs/by-name/xr/xrectsel/package.nix
+++ b/pkgs/by-name/xr/xrectsel/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ropery";
     repo = "xrectsel";
-    rev = version;
+    tag = version;
     sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l";
   };
 
diff --git a/pkgs/by-name/xs/xschem/package.nix b/pkgs/by-name/xs/xschem/package.nix
index 0cd6d92c16c7..5fe788a0a391 100644
--- a/pkgs/by-name/xs/xschem/package.nix
+++ b/pkgs/by-name/xs/xschem/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "StefanSchippers";
     repo = "xschem";
-    rev = version;
+    tag = version;
     hash = "sha256-+ygwHkQOXmkoNgcuofwuaZcpYTAV6sOmvO4xeE+8DXE=";
   };
 
diff --git a/pkgs/by-name/xs/xsecurelock/package.nix b/pkgs/by-name/xs/xsecurelock/package.nix
index 28dc1c642ef5..e9d9ef2f5d1e 100644
--- a/pkgs/by-name/xs/xsecurelock/package.nix
+++ b/pkgs/by-name/xs/xsecurelock/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "xsecurelock";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OPasi5zmvmcWnVCj/dU2KprzNmar51zDElD23750yk4=";
   };
 
diff --git a/pkgs/by-name/xs/xsel/package.nix b/pkgs/by-name/xs/xsel/package.nix
index d929ae669155..94f36234e699 100644
--- a/pkgs/by-name/xs/xsel/package.nix
+++ b/pkgs/by-name/xs/xsel/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kfish";
     repo = "xsel";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-F2w/Ad8IWxJNH90/0a9+1M8bLfn1M3m4TH3PNpQmEFI=";
   };
 
diff --git a/pkgs/by-name/xs/xsettingsd/package.nix b/pkgs/by-name/xs/xsettingsd/package.nix
index ac54cd7f77c7..5815a87217f2 100644
--- a/pkgs/by-name/xs/xsettingsd/package.nix
+++ b/pkgs/by-name/xs/xsettingsd/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "derat";
     repo = "xsettingsd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CIYshZqJICuL8adKHIN4R6nudaqWOCK2UPrGhsKf9pE=";
   };
 
diff --git a/pkgs/by-name/xs/xsimd/package.nix b/pkgs/by-name/xs/xsimd/package.nix
index a96de8723816..b5df45942bab 100644
--- a/pkgs/by-name/xs/xsimd/package.nix
+++ b/pkgs/by-name/xs/xsimd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xtensor-stack";
     repo = "xsimd";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE=";
   };
   patches =
diff --git a/pkgs/by-name/xs/xsos/package.nix b/pkgs/by-name/xs/xsos/package.nix
index 9583dadd9e8a..20a024d64861 100644
--- a/pkgs/by-name/xs/xsos/package.nix
+++ b/pkgs/by-name/xs/xsos/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ryran";
     repo = "xsos";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VEOY422/+4veMlN9HOtPB/THDiFLNnRfbUJpKjc/cqE=";
   };
 
diff --git a/pkgs/by-name/xs/xssproxy/package.nix b/pkgs/by-name/xs/xssproxy/package.nix
index 4ee27f971413..b27ff216be82 100644
--- a/pkgs/by-name/xs/xssproxy/package.nix
+++ b/pkgs/by-name/xs/xssproxy/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vincentbernat";
     repo = "xssproxy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OPzFI1ifbV/DJo0hC2xybHKaWTprictN0muKtuq1JaY=";
   };
 
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/xs/xsuspender/package.nix b/pkgs/by-name/xs/xsuspender/package.nix
index 2d4c230ee712..c66c4862bf6c 100644
--- a/pkgs/by-name/xs/xsuspender/package.nix
+++ b/pkgs/by-name/xs/xsuspender/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kernc";
     repo = "xsuspender";
-    rev = version;
+    tag = version;
     sha256 = "1c6ab1s9bbkjbmcfv2mny273r66dlz7sgxsmzfwi0fm2vcb2lwim";
   };
 
diff --git a/pkgs/by-name/xt/xtensor/package.nix b/pkgs/by-name/xt/xtensor/package.nix
index 6a83fd42353a..6872565d5408 100644
--- a/pkgs/by-name/xt/xtensor/package.nix
+++ b/pkgs/by-name/xt/xtensor/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xtensor-stack";
     repo = "xtensor";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-hVfdtYcJ6mzqj0AUu6QF9aVKQGYKd45RngY6UN3yOH4=";
   };
 
diff --git a/pkgs/by-name/xt/xteve/package.nix b/pkgs/by-name/xt/xteve/package.nix
index 39c60136d205..8e514452b3bb 100644
--- a/pkgs/by-name/xt/xteve/package.nix
+++ b/pkgs/by-name/xt/xteve/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xteve-project";
     repo = "xTeVe";
-    rev = version;
+    tag = version;
     hash = "sha256-hD4GudSkGZO41nR/CgcMg/SqKjpAO1yJDkfwa8AUges=";
   };
 
diff --git a/pkgs/by-name/xt/xtitle/package.nix b/pkgs/by-name/xt/xtitle/package.nix
index ec4e3867ad9a..06e57ff32eac 100644
--- a/pkgs/by-name/xt/xtitle/package.nix
+++ b/pkgs/by-name/xt/xtitle/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "xtitle";
-    rev = version;
+    tag = version;
     hash = "sha256-SVfM2vCCacgchXj0c0sPk3VR6DUI4R0ofFnxJSY4oDg=";
   };
 
diff --git a/pkgs/by-name/xt/xtl/package.nix b/pkgs/by-name/xt/xtl/package.nix
index 2ca5932ac793..8bdae88e4f72 100644
--- a/pkgs/by-name/xt/xtl/package.nix
+++ b/pkgs/by-name/xt/xtl/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xtensor-stack";
     repo = "xtl";
-    rev = version;
+    tag = version;
     hash = "sha256-f8qYh8ibC/ToHsUv3OF1ujzt3fUe7kW9cNpGyLqsgqw=";
   };
 
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/xu/xunit-viewer/package.nix b/pkgs/by-name/xu/xunit-viewer/package.nix
index 4e3ccd52d7ba..b78f99acb112 100644
--- a/pkgs/by-name/xu/xunit-viewer/package.nix
+++ b/pkgs/by-name/xu/xunit-viewer/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "lukejpreston";
     repo = "xunit-viewer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-n9k1Z/wofExG6k/BxtkU8M+Lo3XdCgCh8VFj9jcwL1Q=";
   };
 
diff --git a/pkgs/by-name/xv/xv/package.nix b/pkgs/by-name/xv/xv/package.nix
index ad9b264e893e..09d16d9fa805 100644
--- a/pkgs/by-name/xv/xv/package.nix
+++ b/pkgs/by-name/xv/xv/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jasper-software";
     repo = "xv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-abmMrAxgccECsOi0eIy9/y0haPkUgbOl9wCgISLy5Rs=";
   };
 
diff --git a/pkgs/by-name/xv/xva-img/package.nix b/pkgs/by-name/xv/xva-img/package.nix
index 64b3c36e9212..69e23d8831c0 100644
--- a/pkgs/by-name/xv/xva-img/package.nix
+++ b/pkgs/by-name/xv/xva-img/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eriklax";
     repo = "xva-img";
-    rev = version;
+    tag = version;
     sha256 = "sha256-QHCKGsHSMT2P64No1IUCjenm1XZMSgEvsJGJOyHFZS8=";
   };
 
diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix
index cf8a368573b9..1528b082f962 100644
--- a/pkgs/by-name/xv/xviewer/package.nix
+++ b/pkgs/by-name/xv/xviewer/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Wn1a/tGNIJNGbgDKoMMMo/oCXrqCXDM1nTUgCZt0O/U=";
   };
 
diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix
index f59e1d1b3e6e..423d38199dac 100644
--- a/pkgs/by-name/xw/xwallpaper/package.nix
+++ b/pkgs/by-name/xw/xwallpaper/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stoeckmann";
     repo = "xwallpaper";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8VRQFH00yXplvhCqBuMGrwvOB7bJhfe50Ii6h8kvDMM=";
   };
 
diff --git a/pkgs/by-name/xx/xxHash/package.nix b/pkgs/by-name/xx/xxHash/package.nix
index 684af9642b1b..b8449e5c477a 100644
--- a/pkgs/by-name/xx/xxHash/package.nix
+++ b/pkgs/by-name/xx/xxHash/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Cyan4973";
     repo = "xxHash";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-h6kohM+NxvQ89R9NEXZcYBG2wPOuB4mcyPfofKrx9wQ=";
   };
 
diff --git a/pkgs/by-name/ya/yad/package.nix b/pkgs/by-name/ya/yad/package.nix
index 7b1bf736bcd0..369eb4298d8c 100644
--- a/pkgs/by-name/ya/yad/package.nix
+++ b/pkgs/by-name/ya/yad/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "v1cont";
     repo = "yad";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Y7bp20fkNdSgBcSV1kPEpWEP7ASwZcScVRaPauwI72M=";
   };
 
diff --git a/pkgs/by-name/ya/yadm/package.nix b/pkgs/by-name/ya/yadm/package.nix
index b7bd0d18da74..0b452c34ac08 100644
--- a/pkgs/by-name/ya/yadm/package.nix
+++ b/pkgs/by-name/ya/yadm/package.nix
@@ -37,7 +37,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TheLocehiliosan";
     repo = "yadm";
-    rev = version;
+    tag = version;
     hash = "sha256-VQhfRtg9wtquJGjhB8fFQqHIJ5GViMfNQQep13ZH5SE=";
   };
 
diff --git a/pkgs/by-name/ya/yaegi/package.nix b/pkgs/by-name/ya/yaegi/package.nix
index 50426b5d7946..eff739c8c706 100644
--- a/pkgs/by-name/ya/yaegi/package.nix
+++ b/pkgs/by-name/ya/yaegi/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "traefik";
     repo = "yaegi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jpLx2z65KeCPC4AQgFmUUphmmiT4EeHwrYn3/rD4Rzg=";
   };
 
diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
index 0d8ebe02570f..651f2ed38bfc 100644
--- a/pkgs/by-name/ya/yafc-ce/package.nix
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -17,7 +17,7 @@ buildDotnetModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "shpaass";
     repo = "yafc-ce";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-jWJOJ00VXBaHogm3xUsV9Shvv9islRA+Z4fkln5VuWM=";
   };
 
diff --git a/pkgs/by-name/ya/yaft/package.nix b/pkgs/by-name/ya/yaft/package.nix
index ceab3d6d8610..77c594d3bdb5 100644
--- a/pkgs/by-name/ya/yaft/package.nix
+++ b/pkgs/by-name/ya/yaft/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uobikiemukot";
     repo = "yaft";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0l1ig8wm545kpn4l7186rymny83jkahnjim290wsl7hsszfq1ckd";
   };
 
diff --git a/pkgs/by-name/ya/yai/package.nix b/pkgs/by-name/ya/yai/package.nix
index cad6fe75f8be..28f0b2574efd 100644
--- a/pkgs/by-name/ya/yai/package.nix
+++ b/pkgs/by-name/ya/yai/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ekkinox";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-MoblXLfptlIYJbXQTpbc8GBo2a3Zgxdvwra8IUEGiZs==";
   };
 
diff --git a/pkgs/by-name/ya/yajsv/package.nix b/pkgs/by-name/ya/yajsv/package.nix
index 6d08a5d87f26..a26263014cf4 100644
--- a/pkgs/by-name/ya/yajsv/package.nix
+++ b/pkgs/by-name/ya/yajsv/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "neilpa";
     repo = "yajsv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dp7PBN8yR+gPPUWA+ug11dUN7slU6CJAojuxt5eNTxA=";
   };
 
diff --git a/pkgs/by-name/ya/yallback/package.nix b/pkgs/by-name/ya/yallback/package.nix
index b1b221fce7ec..0e7c9ad5725e 100644
--- a/pkgs/by-name/ya/yallback/package.nix
+++ b/pkgs/by-name/ya/yallback/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "abathur";
     repo = "yallback";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-t+fdnDJMFiFqN23dSY3TnsZsIDcravtwdNKJ5MiZosE=";
   };
 
diff --git a/pkgs/by-name/ya/yambar-hyprland-wses/package.nix b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
index 2b1c8ce049f0..50e9a707022d 100644
--- a/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
+++ b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = "yambar-hyprland-wses";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-furHj1AAFgNiNHP9RBsVrIvrDckSKU8FXilzH9TQ99c=";
   };
 
diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix
index c331e20a8d64..ed09bc969d7e 100644
--- a/pkgs/by-name/ya/yambar/package.nix
+++ b/pkgs/by-name/ya/yambar/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "yambar";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-QCwwMpBYuMWYqxE2ugPFpG/QtZDW7VsSBYs5EqKYejA=";
   };
 
diff --git a/pkgs/by-name/ya/yaml-filter/package.nix b/pkgs/by-name/ya/yaml-filter/package.nix
index 1f7f19b9ddef..3386fde15d4b 100644
--- a/pkgs/by-name/ya/yaml-filter/package.nix
+++ b/pkgs/by-name/ya/yaml-filter/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenSCAP";
     repo = "yaml-filter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HDHjOapMFjuDcWW5+opKD2tllbwz4YBw/EI4W7Wf/6g=";
   };
 
diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix
index 5004a4b6f130..4f3d95b2a492 100644
--- a/pkgs/by-name/ya/yaml-language-server/package.nix
+++ b/pkgs/by-name/ya/yaml-language-server/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "yaml-language-server";
-    rev = version;
+    tag = version;
     hash = "sha256-Y3Q/y9UIiy7US8Jl4vxT0Pfw8h3hiXK+Cu9TEQHyAaA=";
   };
 
diff --git a/pkgs/by-name/ya/yaml2json/package.nix b/pkgs/by-name/ya/yaml2json/package.nix
index 1e843d0da18a..2c43d25a9c62 100644
--- a/pkgs/by-name/ya/yaml2json/package.nix
+++ b/pkgs/by-name/ya/yaml2json/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bronze1man";
     repo = "yaml2json";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mIjtR1VsSeUhEgeSKDG0qT0kj+NCqVwn31m300cMDeU=";
   };
 
diff --git a/pkgs/by-name/ya/yams/package.nix b/pkgs/by-name/ya/yams/package.nix
index 713d8a96b762..ac1a02a8f093 100644
--- a/pkgs/by-name/ya/yams/package.nix
+++ b/pkgs/by-name/ya/yams/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Berulacks";
     repo = "yams";
-    rev = version;
+    tag = version;
     sha256 = "1zkhcys9i0s6jkaz24an690rvnkv1r84jxpaa84sf46abi59ijh8";
   };
 
diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix
index fa83fc56171a..21d3f0c7ce44 100644
--- a/pkgs/by-name/ya/yandex-music/package.nix
+++ b/pkgs/by-name/ya/yandex-music/package.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cucumber-sp";
     repo = "yandex-music-linux";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oEbbQRqvnK521N3Kerv18h1frVLbioFeHfb/FCkHC6Y=";
   };
 
diff --git a/pkgs/by-name/ya/yanic/package.nix b/pkgs/by-name/ya/yanic/package.nix
index 5ac0ff685481..2a85ea1332e8 100644
--- a/pkgs/by-name/ya/yanic/package.nix
+++ b/pkgs/by-name/ya/yanic/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FreifunkBremen";
     repo = "yanic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-z2vr1QmRCo8y4hopWP14xSV7lsWKkCzK9OehlVLFdIg=";
   };
 
diff --git a/pkgs/by-name/ya/yank/package.nix b/pkgs/by-name/ya/yank/package.nix
index 8cdc1dc8aeb7..d2ac34c6edb5 100644
--- a/pkgs/by-name/ya/yank/package.nix
+++ b/pkgs/by-name/ya/yank/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mptre";
     repo = "yank";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sZiZki2Zl0Tfmls5KrLGxT94Bdf9TA9EwoaLoFOX9B4=";
   };
 
diff --git a/pkgs/by-name/ya/yarGen/package.nix b/pkgs/by-name/ya/yarGen/package.nix
index 0c3bb3b5eeff..76e03064a48e 100644
--- a/pkgs/by-name/ya/yarGen/package.nix
+++ b/pkgs/by-name/ya/yarGen/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Neo23x0";
     repo = "yarGen";
-    rev = version;
+    tag = version;
     sha256 = "6PJNAeeLAyUlZcIi0g57sO1Ex6atn7JhbK9kDbNrZ6A=";
   };
 
diff --git a/pkgs/by-name/ya/yarn-bash-completion/package.nix b/pkgs/by-name/ya/yarn-bash-completion/package.nix
index 748db1f186f0..ca4cb94c7148 100644
--- a/pkgs/by-name/ya/yarn-bash-completion/package.nix
+++ b/pkgs/by-name/ya/yarn-bash-completion/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dsifford";
     repo = "yarn-completion";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0xflbrbwskjqv3knvc8jqygpvfxh5ak66q7w22d1ng8gwrfqzcng";
   };
 
diff --git a/pkgs/by-name/ya/yarp/package.nix b/pkgs/by-name/ya/yarp/package.nix
index f14e40f931fa..0ecd5f94ab60 100644
--- a/pkgs/by-name/ya/yarp/package.nix
+++ b/pkgs/by-name/ya/yarp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "robotology";
     repo = "yarp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a";
   };
 
diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix
index e8f39fb3cc1a..dedb32c96ebb 100644
--- a/pkgs/by-name/ya/yarr/package.nix
+++ b/pkgs/by-name/ya/yarr/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nkanaev";
     repo = "yarr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZMQ+IX8dZuxyxQhD/eWAe4bGGCVcaCeVgF+Wqs79G+k=";
   };
 
diff --git a/pkgs/by-name/ya/yaru-remix-theme/package.nix b/pkgs/by-name/ya/yaru-remix-theme/package.nix
index 281ada4dac35..56d46f55cea0 100644
--- a/pkgs/by-name/ya/yaru-remix-theme/package.nix
+++ b/pkgs/by-name/ya/yaru-remix-theme/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Muqtxdir";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0xilhw5gbxsyy80ixxgj0nw6w782lz9dsinhi24026li1xny804c";
   };
 
diff --git a/pkgs/by-name/ya/yaru-theme/package.nix b/pkgs/by-name/ya/yaru-theme/package.nix
index bac296204983..0b094230f880 100644
--- a/pkgs/by-name/ya/yaru-theme/package.nix
+++ b/pkgs/by-name/ya/yaru-theme/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ubuntu";
     repo = "yaru";
-    rev = version;
+    tag = version;
     hash = "sha256-axaUQ2E0FpWI66yWpQS+zsk7ee5ysllgUbqCZePzcD8=";
   };
 
diff --git a/pkgs/by-name/ya/yas/package.nix b/pkgs/by-name/ya/yas/package.nix
index e394d342a502..154c233fc517 100644
--- a/pkgs/by-name/ya/yas/package.nix
+++ b/pkgs/by-name/ya/yas/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "niXman";
     repo = "yas";
-    rev = version;
+    tag = version;
     hash = "sha256-2+CpftWOEnntYBCc1IoR5eySbmhrMVunpUTZRdQ5I+A=";
   };
 
diff --git a/pkgs/by-name/ya/yascreen/package.nix b/pkgs/by-name/ya/yascreen/package.nix
index 5a83c9b8884c..221b6da502b9 100644
--- a/pkgs/by-name/ya/yascreen/package.nix
+++ b/pkgs/by-name/ya/yascreen/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bbonev";
     repo = "yascreen";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-z7j2yceiUyJNdyoVXAPiINln2/MUMqVJh+VwQnmzO2A=";
   };
 
diff --git a/pkgs/by-name/ya/yash/package.nix b/pkgs/by-name/ya/yash/package.nix
index a9904fc053f8..1b5cbc9dd485 100644
--- a/pkgs/by-name/ya/yash/package.nix
+++ b/pkgs/by-name/ya/yash/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "magicant";
     repo = "yash";
-    rev = version;
+    tag = version;
     hash = "sha256-024/Nj4i5fxXMAqVEjlcrSf62a9CZv3W+imAAEdR+xo=";
   };
 
diff --git a/pkgs/by-name/yd/yder/package.nix b/pkgs/by-name/yd/yder/package.nix
index 3afa7ef07ae8..7481e39998d0 100644
--- a/pkgs/by-name/yd/yder/package.nix
+++ b/pkgs/by-name/yd/yder/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "babelouest";
     repo = "yder";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BaCF1r5mOYxj0zKc11uoKI9gVKuxWd8GaneGcV+qIFg=";
   };
 
diff --git a/pkgs/by-name/yd/ydict/package.nix b/pkgs/by-name/yd/ydict/package.nix
index 9ceb25b0d99b..c05ea13a7bf4 100644
--- a/pkgs/by-name/yd/ydict/package.nix
+++ b/pkgs/by-name/yd/ydict/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TimothyYe";
     repo = "ydict";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FcrkfWE1m5OveK4YPgVmUbL/jkh2NEs9bfeCHm2H9P8=";
   };
 
diff --git a/pkgs/by-name/ye/yeahconsole/package.nix b/pkgs/by-name/ye/yeahconsole/package.nix
index f0e665b8e125..dfda5a5ab2a0 100644
--- a/pkgs/by-name/ye/yeahconsole/package.nix
+++ b/pkgs/by-name/ye/yeahconsole/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jceb";
     repo = "yeahconsole";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ea6erNF9hEhDHlWLctu1SHFVoXXXsPeWUbvCBSZwn4s=";
   };
 
diff --git a/pkgs/by-name/ye/yeetgif/package.nix b/pkgs/by-name/ye/yeetgif/package.nix
index 42395ceaa54d..d6d7e83899b7 100644
--- a/pkgs/by-name/ye/yeetgif/package.nix
+++ b/pkgs/by-name/ye/yeetgif/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sgreben";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Z05GhtEPj3PLXpjF1wK8+pNUY3oDjbwZWQsYlTX14Rc=";
   };
 
diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix
index c7e2b7c5ee8b..94c9bc77c814 100644
--- a/pkgs/by-name/yg/yggdrasil/package.nix
+++ b/pkgs/by-name/yg/yggdrasil/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yggdrasil-network";
     repo = "yggdrasil-go";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NlNQnYmK//p35pj2MInD6RVsajM/bGDhOuzOZZYoWRw=";
   };
 
diff --git a/pkgs/by-name/yg/yggstack/package.nix b/pkgs/by-name/yg/yggstack/package.nix
index 8a1ed1ccd5fd..37c8cc54bd71 100644
--- a/pkgs/by-name/yg/yggstack/package.nix
+++ b/pkgs/by-name/yg/yggstack/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yggdrasil-network";
     repo = "yggstack";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-S3yk2v2RPGFeGDJ8Lmjr7VM2kIswIREfPpDLXM/P1YU=";
   };
 
diff --git a/pkgs/by-name/yj/yj/package.nix b/pkgs/by-name/yj/yj/package.nix
index bb6f8372c312..19fe4f4e75fe 100644
--- a/pkgs/by-name/yj/yj/package.nix
+++ b/pkgs/by-name/yj/yj/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sclevine";
     repo = "yj";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lsn5lxtix5W7po6nzvGcHmifbyhrtHgvaKYT7RPPCOg=";
   };
 
diff --git a/pkgs/by-name/yl/yle-dl/package.nix b/pkgs/by-name/yl/yle-dl/package.nix
index 0094b450cff9..266276024bfa 100644
--- a/pkgs/by-name/yl/yle-dl/package.nix
+++ b/pkgs/by-name/yl/yle-dl/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "aajanki";
     repo = "yle-dl";
-    rev = version;
+    tag = version;
     hash = "sha256-X5fkcJgTVGASoVvvshGWUFNzB1V4KMSKgwoxzP62mxc=";
   };
 
diff --git a/pkgs/by-name/ym/ympd/package.nix b/pkgs/by-name/ym/ympd/package.nix
index 89bb628e8c2f..c4c2cee74c46 100644
--- a/pkgs/by-name/ym/ympd/package.nix
+++ b/pkgs/by-name/ym/ympd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "notandy";
     repo = "ympd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq";
   };
 
diff --git a/pkgs/by-name/ym/ymuse/package.nix b/pkgs/by-name/ym/ymuse/package.nix
index 1795f9f42791..3c0c4e2fe087 100644
--- a/pkgs/by-name/ym/ymuse/package.nix
+++ b/pkgs/by-name/ym/ymuse/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yktoo";
     repo = "ymuse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WbIeqOAhdqxU8EvHEsG7ASwy5xZG1domZKT5ccOggHg=";
   };
 
diff --git a/pkgs/by-name/yo/yo/package.nix b/pkgs/by-name/yo/yo/package.nix
index e1472e0ee300..fe17a6799d62 100644
--- a/pkgs/by-name/yo/yo/package.nix
+++ b/pkgs/by-name/yo/yo/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "yeoman";
     repo = "yo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-twV5vmQ5loR8j9guf0w5DG4sU4BQYz22GjqjsUkqE4U=";
   };
 
diff --git a/pkgs/by-name/yo/yoink/package.nix b/pkgs/by-name/yo/yoink/package.nix
index 8a816e104506..b642dac04bb6 100644
--- a/pkgs/by-name/yo/yoink/package.nix
+++ b/pkgs/by-name/yo/yoink/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "MrMarble";
     repo = "yoink";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9ftlAECywF4khH279h2qcSvKRDQX2I7GDQ7EYcEybL0=";
   };
 
diff --git a/pkgs/by-name/yo/yor/package.nix b/pkgs/by-name/yo/yor/package.nix
index 4c6e20ec6116..26cff1e8b079 100644
--- a/pkgs/by-name/yo/yor/package.nix
+++ b/pkgs/by-name/yo/yor/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-IoQe1/D3Sl1y76dXH0CuwU6/LBC6n6or9vsysHhDeeg=";
   };
 
diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix
index f74822341f51..1339ce24f048 100644
--- a/pkgs/by-name/yo/yoshimi/package.nix
+++ b/pkgs/by-name/yo/yoshimi/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Yoshimi";
     repo = "yoshimi";
-    rev = version;
+    tag = version;
     hash = "sha256-i6kzVtg2ukob0QBr/hbxblm+eTkPIKbnGLpFdUl/zGQ=";
   };
 
diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix
index 66aa0c0940cd..37dd3bed69f2 100644
--- a/pkgs/by-name/yo/youki/package.nix
+++ b/pkgs/by-name/yo/youki/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "youki";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SFU7v5pefQkh751Ato4xkPqiEc/3++9hpwyNJjXwqMA=";
   };
 
diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix
index ba6e639b5732..34c612501d82 100644
--- a/pkgs/by-name/yq/yq-go/package.nix
+++ b/pkgs/by-name/yq/yq-go/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mikefarah";
     repo = "yq";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AsTDbeRMb6QJE89Z0NGooyTY3xZpWFoWkT7dofsu0DI=";
   };
 
diff --git a/pkgs/by-name/yt/yt-dlg/package.nix b/pkgs/by-name/yt/yt-dlg/package.nix
index a5ba63307be0..0cf2d80c48b1 100644
--- a/pkgs/by-name/yt/yt-dlg/package.nix
+++ b/pkgs/by-name/yt/yt-dlg/package.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "oleksis";
     repo = "youtube-dl-gui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W1ZlArmM+Ro5MF/rB88me/PD79dJA4v188mPbMd8Kow=";
   };
 
diff --git a/pkgs/by-name/yt/ytarchive/package.nix b/pkgs/by-name/yt/ytarchive/package.nix
index 283f4258df18..7aaaa0156b18 100644
--- a/pkgs/by-name/yt/ytarchive/package.nix
+++ b/pkgs/by-name/yt/ytarchive/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Kethsar";
     repo = "ytarchive";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Y1frd7iJJuNFvLL/C1Y+RrqYC/1LF7P3J9rkPAThp9c=";
   };
 
diff --git a/pkgs/by-name/yt/ytcast/package.nix b/pkgs/by-name/yt/ytcast/package.nix
index 9a1caccc1f22..c998e8a3cc18 100644
--- a/pkgs/by-name/yt/ytcast/package.nix
+++ b/pkgs/by-name/yt/ytcast/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MarcoLucidi01";
     repo = "ytcast";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-iy9+MgXwP4ALz4NHJyn2ghC5boR53H3ioB2+7tcJunE=";
   };
 
diff --git a/pkgs/by-name/yt/ytcc/package.nix b/pkgs/by-name/yt/ytcc/package.nix
index 4fb2f6db9399..3f80705e3880 100644
--- a/pkgs/by-name/yt/ytcc/package.nix
+++ b/pkgs/by-name/yt/ytcc/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "woefe";
     repo = "ytcc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pC2uoog+nev/Xa6UbXX4vX00VQQLHtZzbVkxrxO/Pg8=";
   };
 
diff --git a/pkgs/by-name/yt/ytfzf/package.nix b/pkgs/by-name/yt/ytfzf/package.nix
index 333dad2174de..ba3563c89cc1 100644
--- a/pkgs/by-name/yt/ytfzf/package.nix
+++ b/pkgs/by-name/yt/ytfzf/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pystardust";
     repo = "ytfzf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rwCVOdu9UfTArISt8ITQtLU4Gj2EZd07bcFKvxXQ7Bc=";
   };
 
diff --git a/pkgs/by-name/yt/ytt/package.nix b/pkgs/by-name/yt/ytt/package.nix
index d3897c818a88..37b551b6a4c4 100644
--- a/pkgs/by-name/yt/ytt/package.nix
+++ b/pkgs/by-name/yt/ytt/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "ytt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vFD0CKEVbaOiETSsDQeBJV1flekvS893wPYc6iHxxRE=";
   };
 
diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix
index 53ca6814919d..20977ccc2711 100644
--- a/pkgs/by-name/yt/ytui-music/package.nix
+++ b/pkgs/by-name/yt/ytui-music/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sudipghimire533";
     repo = "ytui-music";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-f/23PVk4bpUCvcQ25iNI/UVXqiPBzPKWq6OohVF41p8=";
   };
 
diff --git a/pkgs/by-name/yu/yubihsm-connector/package.nix b/pkgs/by-name/yu/yubihsm-connector/package.nix
index 0b0299fdcc8f..cc5da8e631ce 100644
--- a/pkgs/by-name/yu/yubihsm-connector/package.nix
+++ b/pkgs/by-name/yu/yubihsm-connector/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubihsm-connector";
-    rev = version;
+    tag = version;
     hash = "sha256-hiCh/TG1epSmJtaptfVzcPklDTaBh0biKqfM01YoWo0=";
   };
 
diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix
index 58358991c087..11db0b7bdb20 100644
--- a/pkgs/by-name/yu/yubihsm-shell/package.nix
+++ b/pkgs/by-name/yu/yubihsm-shell/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubihsm-shell";
-    rev = version;
+    tag = version;
     hash = "sha256-0IsdIhuKpzfArVB4xBaxCPqtk0fKWb6RuGImUj1E4Zs=";
   };
 
diff --git a/pkgs/by-name/yu/yubikey-agent/package.nix b/pkgs/by-name/yu/yubikey-agent/package.nix
index 98a97dab94bf..02fd44622d02 100644
--- a/pkgs/by-name/yu/yubikey-agent/package.nix
+++ b/pkgs/by-name/yu/yubikey-agent/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FiloSottile";
     repo = "yubikey-agent";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Knk1ipBOzjmjrS2OFUMuxi1TkyDcSYlVKezDWT//ERY=";
   };
 
diff --git a/pkgs/by-name/yu/yubikey-manager/package.nix b/pkgs/by-name/yu/yubikey-manager/package.nix
index 6f3192774a1d..45140165e77d 100644
--- a/pkgs/by-name/yu/yubikey-manager/package.nix
+++ b/pkgs/by-name/yu/yubikey-manager/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubikey-manager";
-    rev = version;
+    tag = version;
     hash = "sha256-qEEAByg6Smn1Wk8U4VA6MIJDLWBtM+S+qTDIcgPUGA0=";
   };
 
diff --git a/pkgs/by-name/yu/yubikey-touch-detector/package.nix b/pkgs/by-name/yu/yubikey-touch-detector/package.nix
index 8b6576eb3b72..4e6891804a21 100644
--- a/pkgs/by-name/yu/yubikey-touch-detector/package.nix
+++ b/pkgs/by-name/yu/yubikey-touch-detector/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maximbaz";
     repo = "yubikey-touch-detector";
-    rev = version;
+    tag = version;
     hash = "sha256-eNRwDGTNxBtDepQvf2TXCH/5fb4kRYBn80tzvI4fzME=";
   };
   vendorHash = "sha256-x8Fmhsk6MtgAtLxgH/V3KusM0BXAOaSU+2HULR5boJQ=";
diff --git a/pkgs/by-name/yu/yubioath-flutter/package.nix b/pkgs/by-name/yu/yubioath-flutter/package.nix
index e22005d905ce..70dc2d332aab 100644
--- a/pkgs/by-name/yu/yubioath-flutter/package.nix
+++ b/pkgs/by-name/yu/yubioath-flutter/package.nix
@@ -19,7 +19,7 @@ flutter324.buildFlutterApplication rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubioath-flutter";
-    rev = version;
+    tag = version;
     hash = "sha256-MpY6yJvGBaFiEwuGEme2Uvyi5INCYhZJHyaRpC9pCuk=";
   };
 
diff --git a/pkgs/by-name/yu/yunfaavatar/package.nix b/pkgs/by-name/yu/yunfaavatar/package.nix
index c3456673e1ef..2441cf4571ae 100644
--- a/pkgs/by-name/yu/yunfaavatar/package.nix
+++ b/pkgs/by-name/yu/yunfaavatar/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yunfachi";
     repo = "yunfaAvatar";
-    rev = version;
+    tag = version;
     hash = "sha256-hCpbe+gW9hkiVOKq7a55n5s3bMpyCNGWiY3D2b4VYxg=";
   };
 
diff --git a/pkgs/by-name/yy/yyjson/package.nix b/pkgs/by-name/yy/yyjson/package.nix
index 6799d3adf5fe..97ff290cbe76 100644
--- a/pkgs/by-name/yy/yyjson/package.nix
+++ b/pkgs/by-name/yy/yyjson/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ibireme";
     repo = "yyjson";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-mp9Oz08qTyhj3P6F1d81SX96vamUY/JWpD2DTYR+v04=";
   };
 
diff --git a/pkgs/by-name/z-/z-lua/package.nix b/pkgs/by-name/z-/z-lua/package.nix
index 4c6c11303872..9b4a6867ffe3 100644
--- a/pkgs/by-name/z-/z-lua/package.nix
+++ b/pkgs/by-name/z-/z-lua/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skywind3000";
     repo = "z.lua";
-    rev = version;
+    tag = version;
     sha256 = "sha256-8ANFHI2lnf81TF3Nrrg+fW0Z3TXYkQR8913GXF304kA=";
   };
 
diff --git a/pkgs/by-name/za/zam-plugins/package.nix b/pkgs/by-name/za/zam-plugins/package.nix
index 4dde2a42bf9e..a9373322dc4a 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-wT1BXQrcD+TI+trqx0ZVUmVLZMTDQgJI3dAvN54wy6Y=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix
index cd665e81cbc0..3657293e3769 100644
--- a/pkgs/by-name/za/zap-chip/package.nix
+++ b/pkgs/by-name/za/zap-chip/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "project-chip";
     repo = "zap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oYw1CxeCr4dUpw7hhXjtB+QwTfBI7rG9jgfxWKZYsSc=";
   };
 
diff --git a/pkgs/by-name/za/zarchive/package.nix b/pkgs/by-name/za/zarchive/package.nix
index 2efece44cadb..a3a705415ad4 100644
--- a/pkgs/by-name/za/zarchive/package.nix
+++ b/pkgs/by-name/za/zarchive/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Exzap";
     repo = "ZArchive";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hX637O/mVLTzmG0a9swJu9w+3o26VHo+K/9RhMuf1lI=";
   };
 
diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix
index 328b64a53e99..6231f5d3167f 100644
--- a/pkgs/by-name/za/zarf/package.nix
+++ b/pkgs/by-name/za/zarf/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "defenseunicorns";
     repo = "zarf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rY9xWqJ+2Yfs6VRHTF89LmuEruAavDI7MgBm4UFEuBs=";
   };
 
diff --git a/pkgs/by-name/za/zasm/package.nix b/pkgs/by-name/za/zasm/package.nix
index 0eaf0992e6f6..9d2102a71536 100644
--- a/pkgs/by-name/za/zasm/package.nix
+++ b/pkgs/by-name/za/zasm/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "megatokio";
     repo = "zasm";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Zbno8kmzss1H2FjwzHB4U7UXxa6oDfsPV80MVVFfM68=";
     postFetch = ''
       # remove folder containing files with weird names (causes the hash to turn out differently under macOS vs. Linux)
diff --git a/pkgs/by-name/zc/zcfan/package.nix b/pkgs/by-name/zc/zcfan/package.nix
index d661199e9a8f..dba45b966822 100644
--- a/pkgs/by-name/zc/zcfan/package.nix
+++ b/pkgs/by-name/zc/zcfan/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cdown";
     repo = "zcfan";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-/q9jDqjG4g211CTb4ahagpxux2BsZWTEyoAY8kRRTB8=";
   };
 
diff --git a/pkgs/by-name/zc/zchunk/package.nix b/pkgs/by-name/zc/zchunk/package.nix
index 6f1c049e29be..b00c528a33f4 100644
--- a/pkgs/by-name/zc/zchunk/package.nix
+++ b/pkgs/by-name/zc/zchunk/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zchunk";
     repo = "zchunk";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-X8qywx55TUVEOfYJMV5ARwyUdMjmN4hTmJQ6Upq5zyI=";
   };
 
diff --git a/pkgs/by-name/ze/zed/package.nix b/pkgs/by-name/ze/zed/package.nix
index 3f49bdec0d5b..2a0243f68b7a 100644
--- a/pkgs/by-name/ze/zed/package.nix
+++ b/pkgs/by-name/ze/zed/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "brimdata";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-NCoeTeOkxkCsj/nRBhMJeEshFuwozOXNJvgp8vyCQDk=";
   };
 
diff --git a/pkgs/by-name/ze/zenith/package.nix b/pkgs/by-name/ze/zenith/package.nix
index a0d8928478b0..dc6d48175e3a 100644
--- a/pkgs/by-name/ze/zenith/package.nix
+++ b/pkgs/by-name/ze/zenith/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bvaisvil";
     repo = "zenith";
-    rev = version;
+    tag = version;
     hash = "sha256-y+/s0TDVAFGio5uCzHjf+kHFZB0G8dDgTt2xaqSSz1c=";
   };
 
diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix
index ac38986f3bdb..348ff64a9623 100644
--- a/pkgs/by-name/ze/zenoh/package.nix
+++ b/pkgs/by-name/ze/zenoh/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh";
-    rev = version;
+    tag = version;
     hash = "sha256-iwimXL1jcBLwaek9tmvGuow56+LMCyA5qkvHsn72m+c=";
   };
 
diff --git a/pkgs/by-name/ze/zerobin/package.nix b/pkgs/by-name/ze/zerobin/package.nix
index 5a826ccec891..3d32a8218f4e 100644
--- a/pkgs/by-name/ze/zerobin/package.nix
+++ b/pkgs/by-name/ze/zerobin/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Tygs";
     repo = "0bin";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1dfy3h823ylz4w2vv3mrmnmiyvf6rvyvsp4j3llr074w9id0zy16";
   };
 
diff --git a/pkgs/by-name/ze/zeroc-ice/package.nix b/pkgs/by-name/ze/zeroc-ice/package.nix
index 2bcd6e85f399..a8337a8b8065 100644
--- a/pkgs/by-name/ze/zeroc-ice/package.nix
+++ b/pkgs/by-name/ze/zeroc-ice/package.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitHub {
       owner = "zeroc-ice";
       repo = "mcpp";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "1psryc2ql1cp91xd3f8jz84mdaqvwzkdq2pr96nwn03ds4cd88wh";
     };
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeroc-ice";
     repo = "ice";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-l3cKsR8HSdtFGw1S12xueQOu/U9ABlOxQQtbHBj2izs=";
   };
 
diff --git a/pkgs/by-name/ze/zeronet-conservancy/package.nix b/pkgs/by-name/ze/zeronet-conservancy/package.nix
index 8f62e053f78f..c5b7e94635e0 100644
--- a/pkgs/by-name/ze/zeronet-conservancy/package.nix
+++ b/pkgs/by-name/ze/zeronet-conservancy/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "zeronet-conservancy";
     repo = "zeronet-conservancy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZQYdK0B0z0cXTx7ujFngW3wSa/j8sEuwHB+BC5Xqq8o=";
   };
 
diff --git a/pkgs/by-name/ze/zeronet/package.nix b/pkgs/by-name/ze/zeronet/package.nix
index e74133b76358..7b7cab114f92 100644
--- a/pkgs/by-name/ze/zeronet/package.nix
+++ b/pkgs/by-name/ze/zeronet/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "HelloZeroNet";
     repo = "ZeroNet";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "04prgicm0yjh2klcxdgwx1mvlsxxi2bdkzfcvysvixbgq20wjvdk";
   };
 
diff --git a/pkgs/by-name/ze/zeronsd/package.nix b/pkgs/by-name/ze/zeronsd/package.nix
index 0c1cc9f88052..33fe6af03652 100644
--- a/pkgs/by-name/ze/zeronsd/package.nix
+++ b/pkgs/by-name/ze/zeronsd/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zerotier";
     repo = "zeronsd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TL0bgzQgge6j1SpZCdxv/s4pBMSg4/3U5QisjkVE6BE=";
   };
 
diff --git a/pkgs/by-name/ze/zet/package.nix b/pkgs/by-name/ze/zet/package.nix
index 747659a22ca4..61a4b6f0ab05 100644
--- a/pkgs/by-name/ze/zet/package.nix
+++ b/pkgs/by-name/ze/zet/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yarrow";
     repo = "zet";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IjM+jSb+kdML0zZGuz9+9wrFzQCujn/bg9/vaTzMtUs=";
   };
 
diff --git a/pkgs/by-name/zf/zfind/package.nix b/pkgs/by-name/zf/zfind/package.nix
index f0017eb84c8c..fe5ab3f6e4e1 100644
--- a/pkgs/by-name/zf/zfind/package.nix
+++ b/pkgs/by-name/zf/zfind/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "laktak";
     repo = "zfind";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bbeS2x9HzrsOE5h1y07LoEBm9dinMCHX9GJftj5Md9s=";
   };
 
diff --git a/pkgs/by-name/zf/zfp/package.nix b/pkgs/by-name/zf/zfp/package.nix
index 01919156fc80..6e0493324ad6 100644
--- a/pkgs/by-name/zf/zfp/package.nix
+++ b/pkgs/by-name/zf/zfp/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "LLNL";
     repo = "zfp";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-iZxA4lIviZQgaeHj6tEQzEFSKocfgpUyf4WvUykb9qk=";
   };
 
diff --git a/pkgs/by-name/zf/zfs-prune-snapshots/package.nix b/pkgs/by-name/zf/zfs-prune-snapshots/package.nix
index a272cb93cdb8..9503c322b590 100644
--- a/pkgs/by-name/zf/zfs-prune-snapshots/package.nix
+++ b/pkgs/by-name/zf/zfs-prune-snapshots/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bahamas10";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gCf/ZIeIh84WQNs5wZO1/l3zpnl2sNxsFO7cOa92JUM=";
   };
 
diff --git a/pkgs/by-name/zf/zfsnap/package.nix b/pkgs/by-name/zf/zfsnap/package.nix
index 0b7fd9b2048b..3ae6461f73cc 100644
--- a/pkgs/by-name/zf/zfsnap/package.nix
+++ b/pkgs/by-name/zf/zfsnap/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zfsnap";
     repo = "zfsnap";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0670a5sghvqx32c9gfsird15mg9nqcvwxsrfcjrwc0sj7br9bd2g";
   };
 
diff --git a/pkgs/by-name/zf/zfstools/package.nix b/pkgs/by-name/zf/zfstools/package.nix
index c11aafa65998..babd05eccf51 100644
--- a/pkgs/by-name/zf/zfstools/package.nix
+++ b/pkgs/by-name/zf/zfstools/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "zfstools";
     owner = "bdrewery";
   };
diff --git a/pkgs/by-name/zf/zfxtop/package.nix b/pkgs/by-name/zf/zfxtop/package.nix
index 82a3453ffc0c..9856a09310ac 100644
--- a/pkgs/by-name/zf/zfxtop/package.nix
+++ b/pkgs/by-name/zf/zfxtop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ssleert";
     repo = "zfxtop";
-    rev = version;
+    tag = version;
     hash = "sha256-7qeTC9CIx4K2fLRM/pYrSU1NHv9TFMsl7TT0W5Uph60=";
   };
 
diff --git a/pkgs/by-name/zi/zigbee2mqtt_1/package.nix b/pkgs/by-name/zi/zigbee2mqtt_1/package.nix
index 91485153133b..5ad9d50018ef 100644
--- a/pkgs/by-name/zi/zigbee2mqtt_1/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt_1/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
-    rev = version;
+    tag = version;
     hash = "sha256-/7mZrf3FyIliCzsy6yzVRJYMy4bViphYi81UY43iO98=";
   };
 
diff --git a/pkgs/by-name/zi/zimfw/package.nix b/pkgs/by-name/zi/zimfw/package.nix
index 09f57daac283..1184349c9cff 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/zi/zitadel-tools/package.nix b/pkgs/by-name/zi/zitadel-tools/package.nix
index bf8f21fccd32..e47827d06696 100644
--- a/pkgs/by-name/zi/zitadel-tools/package.nix
+++ b/pkgs/by-name/zi/zitadel-tools/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zitadel";
     repo = "zitadel-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wtCBRsP0b7qPOQfYgvmgDT0t2zZHocokO5J8yLZcsgQ=";
   };
 
diff --git a/pkgs/by-name/zi/zitadel/package.nix b/pkgs/by-name/zi/zitadel/package.nix
index 78eab2712375..9dcb3eab1251 100644
--- a/pkgs/by-name/zi/zitadel/package.nix
+++ b/pkgs/by-name/zi/zitadel/package.nix
@@ -20,7 +20,7 @@ let
   zitadelRepo = fetchFromGitHub {
     owner = "zitadel";
     repo = "zitadel";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-izYsf2Cc0jG8Wf82K6HsTVP+kAhmoEJVU7OJXhSzXLo=";
   };
   goModulesHash = "sha256-mE0vhW1nW16SzqIu0C3q8qCXabJO7fZgkp7GeLWCwog=";
diff --git a/pkgs/by-name/zi/zix/package.nix b/pkgs/by-name/zi/zix/package.nix
index 30df1154459d..751a9dbc72dc 100644
--- a/pkgs/by-name/zi/zix/package.nix
+++ b/pkgs/by-name/zi/zix/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "drobilla";
     repo = "zix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nMm3Mdqc4ncCae8SoyGxZYURzmXLNcp1GjsSExfB6x4=";
   };
 
diff --git a/pkgs/by-name/zk/zk/package.nix b/pkgs/by-name/zk/zk/package.nix
index fe1116ccf1ef..950020704aaa 100644
--- a/pkgs/by-name/zk/zk/package.nix
+++ b/pkgs/by-name/zk/zk/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zk-org";
     repo = "zk";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-aFpn3luIp5tMp9jpBxVCmU+IU9eJg3/5UZFIklauFjI=";
   };
 
diff --git a/pkgs/by-name/zk/zktree/package.nix b/pkgs/by-name/zk/zktree/package.nix
index 36f7b50f0a36..65fcf58ad4ad 100644
--- a/pkgs/by-name/zk/zktree/package.nix
+++ b/pkgs/by-name/zk/zktree/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alirezameskin";
     repo = "zktree";
-    rev = version;
+    tag = version;
     sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9";
   };
 
diff --git a/pkgs/by-name/zl/zlib-ng/package.nix b/pkgs/by-name/zl/zlib-ng/package.nix
index 86c6ccd48e8a..d7e04daddb68 100644
--- a/pkgs/by-name/zl/zlib-ng/package.nix
+++ b/pkgs/by-name/zl/zlib-ng/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zlib-ng";
     repo = "zlib-ng";
-    rev = version;
+    tag = version;
     hash = "sha256-Khmrhp5qy4vvoQe4WgoogpjWrgcUB/q8zZeqIydthYg=";
   };
 
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/zm/zmap/package.nix b/pkgs/by-name/zm/zmap/package.nix
index 5ef06600ff92..46db513be0ca 100644
--- a/pkgs/by-name/zm/zmap/package.nix
+++ b/pkgs/by-name/zm/zmap/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zmap";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dHJ3H3jc0/cVfJ7NVoJG+WF9+rowbgYF1Ph5/exxRkE=";
   };
 
diff --git a/pkgs/by-name/zm/zmqpp/package.nix b/pkgs/by-name/zm/zmqpp/package.nix
index 02a46f02e982..4a088d5a3804 100644
--- a/pkgs/by-name/zm/zmqpp/package.nix
+++ b/pkgs/by-name/zm/zmqpp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "zmqpp";
-    rev = version;
+    tag = version;
     sha256 = "08v34q3sd8g1b95k73n7jwryb0xzwca8ib9dz8ngczqf26j8k72i";
   };
 
diff --git a/pkgs/by-name/zm/zmusic/package.nix b/pkgs/by-name/zm/zmusic/package.nix
index e68cb3db7368..8eb1727a857c 100644
--- a/pkgs/by-name/zm/zmusic/package.nix
+++ b/pkgs/by-name/zm/zmusic/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ZDoom";
     repo = "ZMusic";
-    rev = version;
+    tag = version;
     hash = "sha256-rEE3MZLwqnvn5MqbSTCErbsGRjKMK8cC3wTJxtf8WaU=";
   };
 
diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix
index 155c6a492eec..d45d97fd09f6 100644
--- a/pkgs/by-name/zo/zola/package.nix
+++ b/pkgs/by-name/zo/zola/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "getzola";
     repo = "zola";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pk7xlNgYybKHm7Zn6cbO1CMUOAKVtX1uxq+6vl48FZk=";
   };
 
diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix
index 82135e9ddd2b..bda350a2dbc4 100644
--- a/pkgs/by-name/zo/zon2nix/package.nix
+++ b/pkgs/by-name/zo/zon2nix/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "zon2nix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pS0D+wdebtpNaGpDee9aBwEKTDvNU56VXer9uzULXcM=";
   };
 
diff --git a/pkgs/by-name/zo/zoneminder/package.nix b/pkgs/by-name/zo/zoneminder/package.nix
index f58c5e7de804..dd31ad156833 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;
   };
diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index 8e5a49a9d48d..f5441b8d3b29 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fcorbelli";
     repo = "zpaqfranz";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-brTlBvJ6MQY7kPbdUuNrSuYZUtwhkNfu+SDoNJqyZ9o=";
   };
 
diff --git a/pkgs/by-name/zp/zplug/package.nix b/pkgs/by-name/zp/zplug/package.nix
index dd10a62ae28a..e3a009f7ca21 100644
--- a/pkgs/by-name/zp/zplug/package.nix
+++ b/pkgs/by-name/zp/zplug/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zplug";
     repo = "zplug";
-    rev = version;
+    tag = version;
     sha256 = "0hci1pbs3k5icwfyfw5pzcgigbh9vavprxxvakg1xm19n8zb61b3";
   };
 
diff --git a/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix b/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
index 6b6754d2dd34..4c860483c964 100644
--- a/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
+++ b/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "zpool-auto-expand-partitions";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N1znZbJULEeNR4ABSrUtHHkmz08N+CZqX6Ni7jFzc4c=";
   };
 
diff --git a/pkgs/by-name/zp/zps/package.nix b/pkgs/by-name/zp/zps/package.nix
index 9408d844e349..2b0a12fbb7c4 100644
--- a/pkgs/by-name/zp/zps/package.nix
+++ b/pkgs/by-name/zp/zps/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "zps";
-    rev = version;
+    tag = version;
     hash = "sha256-t+y+m9cwngVlX5o7FQTI4FMj10bN0euH51DmAnOAvPc=";
   };
 
diff --git a/pkgs/by-name/zr/zram-generator/package.nix b/pkgs/by-name/zr/zram-generator/package.nix
index b433aa08ab63..abffde3cf432 100644
--- a/pkgs/by-name/zr/zram-generator/package.nix
+++ b/pkgs/by-name/zr/zram-generator/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "zram-generator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aGBvvjGKZ5biruwmJ0ITakqPhTWs9hspRIE9QirqstA=";
   };
 
diff --git a/pkgs/by-name/zr/zrepl/package.nix b/pkgs/by-name/zr/zrepl/package.nix
index 7748db7cf484..1742593027d4 100644
--- a/pkgs/by-name/zr/zrepl/package.nix
+++ b/pkgs/by-name/zr/zrepl/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zrepl";
     repo = "zrepl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sFSWcJ0aBMay+ngUqnr0PKBMOfCcKHgBjff6KRpPZrg=";
   };
 
diff --git a/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix b/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
index 7211f4448283..5fbeb9933a8b 100644
--- a/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
+++ b/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fogti";
     repo = "zs-apc-spdu-ctl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "TMV9ETWBVeXq6tZ2e0CrvHBXoyKfOLCQurjBdf/iw/M=";
   };
 
diff --git a/pkgs/by-name/zs/zs/package.nix b/pkgs/by-name/zs/zs/package.nix
index 9f6a293f0381..41339e7876f7 100644
--- a/pkgs/by-name/zs/zs/package.nix
+++ b/pkgs/by-name/zs/zs/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
     domain = "git.mills.io";
     owner = "prologic";
     repo = "zs";
-    rev = version;
+    tag = version;
     hash = "sha256-V8+p19kvVh64yCreNVp4RVdkJkjrq8Q5VbjaJWekZHY=";
   };
 
diff --git a/pkgs/by-name/zs/zscroll/package.nix b/pkgs/by-name/zs/zscroll/package.nix
index f52784ea8676..a4512155f0d5 100644
--- a/pkgs/by-name/zs/zscroll/package.nix
+++ b/pkgs/by-name/zs/zscroll/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "noctuid";
     repo = "zscroll";
-    rev = version;
+    tag = version;
     sha256 = "sha256-gEluWzCbztO4N1wdFab+2xH7l9w5HqZVzp2LrdjHSRM=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-autocomplete/package.nix b/pkgs/by-name/zs/zsh-autocomplete/package.nix
index 4d14345098b8..74202fd1f38f 100644
--- a/pkgs/by-name/zs/zsh-autocomplete/package.nix
+++ b/pkgs/by-name/zs/zsh-autocomplete/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "marlonrichert";
     repo = "zsh-autocomplete";
-    rev = version;
+    tag = version;
     sha256 = "sha256-eb5a5WMQi8arZRZDt4aX1IV+ik6Iee3OxNMCiMnjIx4=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-autosuggestions/package.nix b/pkgs/by-name/zs/zsh-autosuggestions/package.nix
index bb5a9c977c2e..b91001caae15 100644
--- a/pkgs/by-name/zs/zsh-autosuggestions/package.nix
+++ b/pkgs/by-name/zs/zsh-autosuggestions/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-autosuggestions";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vpTyYq9ZgfgdDsWzjxVAE7FZH4MALMNZIFyEOBLm5Qo=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-completions/package.nix b/pkgs/by-name/zs/zsh-completions/package.nix
index d44b15c62701..8da1c873e36a 100644
--- a/pkgs/by-name/zs/zsh-completions/package.nix
+++ b/pkgs/by-name/zs/zsh-completions/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-completions";
-    rev = version;
+    tag = version;
     sha256 = "sha256-GFHlZjIHUWwyeVoCpszgn4AmLPSSE8UVNfRmisnhkpg=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-f-sy-h/package.nix b/pkgs/by-name/zs/zsh-f-sy-h/package.nix
index be92c8e667d8..87289f13a916 100644
--- a/pkgs/by-name/zs/zsh-f-sy-h/package.nix
+++ b/pkgs/by-name/zs/zsh-f-sy-h/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "z-shell";
     repo = "F-Sy-H";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0bcsc4kgda577fs3bnvymmxdz3z5mf19pn8ngfqsklabnf79f5nf";
   };
 
diff --git a/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix b/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
index 7daf234f0102..c32305785c31 100644
--- a/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
+++ b/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zdharma-continuum";
     repo = "fast-syntax-highlighting";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0h7f27gz586xxw7cc0wyiv3bx0x3qih2wwh05ad85bh2h834ar8d";
   };
 
diff --git a/pkgs/by-name/zs/zsh-fzf-tab/package.nix b/pkgs/by-name/zs/zsh-fzf-tab/package.nix
index 3369278cc64a..fa9174d9c9a2 100644
--- a/pkgs/by-name/zs/zsh-fzf-tab/package.nix
+++ b/pkgs/by-name/zs/zsh-fzf-tab/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Aloxaf";
     repo = "fzf-tab";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q26XVS/LcyZPRqDNwKKA9exgBByE0muyuNb0Bbar2lY=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-history-substring-search/package.nix b/pkgs/by-name/zs/zsh-history-substring-search/package.nix
index e291025f6ee1..bae266667295 100644
--- a/pkgs/by-name/zs/zsh-history-substring-search/package.nix
+++ b/pkgs/by-name/zs/zsh-history-substring-search/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-history-substring-search";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0vjw4s0h4sams1a1jg9jx92d6hd2swq4z908nbmmm2qnz212y88r";
   };
 
diff --git a/pkgs/by-name/zs/zsh-navigation-tools/package.nix b/pkgs/by-name/zs/zsh-navigation-tools/package.nix
index e208c65891d2..bd41ab1442f8 100644
--- a/pkgs/by-name/zs/zsh-navigation-tools/package.nix
+++ b/pkgs/by-name/zs/zsh-navigation-tools/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psprint";
     repo = "zsh-navigation-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0c4kb19aprb868xnlyq8h1nd2d32r0zkrqblsrzvg7m9gx8vqps8";
   };
 
diff --git a/pkgs/by-name/zs/zsh-nix-shell/package.nix b/pkgs/by-name/zs/zsh-nix-shell/package.nix
index 243c35949fd0..610872be84c0 100644
--- a/pkgs/by-name/zs/zsh-nix-shell/package.nix
+++ b/pkgs/by-name/zs/zsh-nix-shell/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chisui";
     repo = "zsh-nix-shell";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix b/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
index dba2adb6c37d..306bba4d9d43 100644
--- a/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
+++ b/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-syntax-highlighting";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-iJdWopZwHpSyYl5/FQXEW7gl/SrKaYDEtTH9cGP7iPo=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-system-clipboard/package.nix b/pkgs/by-name/zs/zsh-system-clipboard/package.nix
index ae389956037e..555d616aeac7 100644
--- a/pkgs/by-name/zs/zsh-system-clipboard/package.nix
+++ b/pkgs/by-name/zs/zsh-system-clipboard/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kutsan";
     repo = "zsh-system-clipboard";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VWTEJGudlQlNwLOUfpo0fvh0MyA2DqV+aieNPx/WzSI=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-vi-mode/package.nix b/pkgs/by-name/zs/zsh-vi-mode/package.nix
index c24d7d6f1697..bab472431917 100644
--- a/pkgs/by-name/zs/zsh-vi-mode/package.nix
+++ b/pkgs/by-name/zs/zsh-vi-mode/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeffreytse";
     repo = "zsh-vi-mode";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xbchXJTFWeABTwq6h4KWLh+EvydDrDzcY9AQVK65RS8=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-wd/package.nix b/pkgs/by-name/zs/zsh-wd/package.nix
index 4ec34b4e7aa8..2ca4856a9d84 100644
--- a/pkgs/by-name/zs/zsh-wd/package.nix
+++ b/pkgs/by-name/zs/zsh-wd/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mfaerevaag";
     repo = "wd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-u1VrsSF+JqsvWOZfj5mSOknLra6Bxl9tR7fybyP476Y=";
   };
 
diff --git a/pkgs/by-name/zs/zsync2/package.nix b/pkgs/by-name/zs/zsync2/package.nix
index 70a204eafab6..f6a488c7ff29 100644
--- a/pkgs/by-name/zs/zsync2/package.nix
+++ b/pkgs/by-name/zs/zsync2/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AppImageCommunity";
     repo = "zsync2";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-OCeMEXQmbc34MZ1NyOfAASdrUyeSQqqfvWqAszJN4x0=";
   };
 
diff --git a/pkgs/by-name/zu/zug/package.nix b/pkgs/by-name/zu/zug/package.nix
index 5b66fadc505b..4befc1d78b7f 100644
--- a/pkgs/by-name/zu/zug/package.nix
+++ b/pkgs/by-name/zu/zug/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arximboldi";
     repo = "zug";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7xTMDhPIx1I1PiYNanGUsK8pdrWuemMWM7BW+NQs2BQ=";
   };
   patches = [
diff --git a/pkgs/by-name/zu/zuki-themes/package.nix b/pkgs/by-name/zu/zuki-themes/package.nix
index 82e359b41053..eb5f40eb5ac6 100644
--- a/pkgs/by-name/zu/zuki-themes/package.nix
+++ b/pkgs/by-name/zu/zuki-themes/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "zuki-themes";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1q026wa8xgyb6f5k7pqpm5zav30dbnm3b8w59as3sh8rhfgpbf80";
   };
 
diff --git a/pkgs/by-name/zu/zuo/package.nix b/pkgs/by-name/zu/zuo/package.nix
index 00b4ece29cd2..8be6a51e1ab3 100644
--- a/pkgs/by-name/zu/zuo/package.nix
+++ b/pkgs/by-name/zu/zuo/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "racket";
     repo = "zuo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-F7ba/4VVVhNDK/wqk+kgJKYxETS2pR9ZiDh0O0aOWn0=";
   };
 
diff --git a/pkgs/by-name/zw/zwave-js-server/package.nix b/pkgs/by-name/zw/zwave-js-server/package.nix
index 8b67e2814ddf..81e7bdf6e33d 100644
--- a/pkgs/by-name/zw/zwave-js-server/package.nix
+++ b/pkgs/by-name/zw/zwave-js-server/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-server";
-    rev = version;
+    tag = version;
     hash = "sha256-vY/afOza0ewOqlhbp6uMf/mw9nvQLN0lEFmHekxpJVA=";
   };
 
diff --git a/pkgs/by-name/zx/zx/package.nix b/pkgs/by-name/zx/zx/package.nix
index a0dd9812b37e..28e4592498f5 100644
--- a/pkgs/by-name/zx/zx/package.nix
+++ b/pkgs/by-name/zx/zx/package.nix
@@ -20,7 +20,7 @@ let
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
-            rev = "v${version}";
+            tag = "v${version}";
             hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
@@ -35,7 +35,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "zx";
-    rev = version;
+    tag = version;
     hash = "sha256-jajkHUz+3ujKXbcsfN7y3pwHqAofTgdQHEC29srzs1M=";
   };
 
diff --git a/pkgs/by-name/zx/zxcvbn-c/package.nix b/pkgs/by-name/zx/zxcvbn-c/package.nix
index 3fc9d2ae5090..8129fac50b2c 100644
--- a/pkgs/by-name/zx/zxcvbn-c/package.nix
+++ b/pkgs/by-name/zx/zxcvbn-c/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tsyrogit";
     repo = "zxcvbn-c";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-RKqbv0iGkjS7Y7KikqglZ+AK1oiw4G1mB2Zg87tOlbI=";
   };
 
diff --git a/pkgs/by-name/zx/zxfer/package.nix b/pkgs/by-name/zx/zxfer/package.nix
index d44eb8947779..2c6951125849 100644
--- a/pkgs/by-name/zx/zxfer/package.nix
+++ b/pkgs/by-name/zx/zxfer/package.nix
@@ -21,7 +21,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "allanjude";
     repo = "zxfer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-11SQJcD3GqPYBIgaycyKkc62/diVKPuuj2Or97j+NZY=";
   };
 
diff --git a/pkgs/by-name/zy/zydis/package.nix b/pkgs/by-name/zy/zydis/package.nix
index f02b1e6b1713..9d6ec11f9793 100644
--- a/pkgs/by-name/zy/zydis/package.nix
+++ b/pkgs/by-name/zy/zydis/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zyantific";
     repo = "zydis";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6J4pTUm3xQXwlQNBldjXVWRcse+auSFJtxGWaPRVzLg=";
   };
 
diff --git a/pkgs/by-name/zy/zydis/zycore.nix b/pkgs/by-name/zy/zydis/zycore.nix
index b55e4ec46f2e..db55b6e3234a 100644
--- a/pkgs/by-name/zy/zydis/zycore.nix
+++ b/pkgs/by-name/zy/zydis/zycore.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zyantific";
     repo = "zycore-c";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/RQl43gx3CO0OxH1syz4l3E4+/m46ql+HKVyuC1x4sA=";
   };
 
diff --git a/pkgs/by-name/zz/zziplib/package.nix b/pkgs/by-name/zz/zziplib/package.nix
index d37001c0f5ca..4218a679719f 100644
--- a/pkgs/by-name/zz/zziplib/package.nix
+++ b/pkgs/by-name/zz/zziplib/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gdraheim";
     repo = "zziplib";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8QxQrxqYO4LtB8prMqgz5a0QqvSKL7KzTkgi+VdHp6A=";
   };
 
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
index d46325f6a81c..68a052370bca 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eosrei";
     repo = "emojione-color-font";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1781kxfbhnvylypbkwxc3mx6hi0gcjisfjr9cf0jdz4d1zkf09b3";
   };
 
diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix
index 52974e657f9d..c3dafcc2b1f5 100644
--- a/pkgs/data/fonts/iosevka/comfy.nix
+++ b/pkgs/data/fonts/iosevka/comfy.nix
@@ -29,7 +29,7 @@ let
   src = fetchFromGitHub {
     owner = "protesilaos";
     repo = "iosevka-comfy";
-    rev = version;
+    tag = version;
     sha256 = "sha256-z9OlxeD88HuPJF88CsAy3vd1SFpJF1qh5c/0AIeMA7o=";
   };
   privateBuildPlan = src.outPath + "/private-build-plans.toml";
diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix
index 2e1e0e68cae3..57dbfec4989f 100644
--- a/pkgs/data/fonts/liberation-fonts/default.nix
+++ b/pkgs/data/fonts/liberation-fonts/default.nix
@@ -27,7 +27,7 @@ let
 
       src = fetchFromGitHub {
         owner = "liberationfonts";
-        rev = version;
+        tag = version;
         inherit repo sha256;
       };
 
diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix
index 5c9e54611545..ac2c9cbbd6e2 100644
--- a/pkgs/data/fonts/openmoji/default.nix
+++ b/pkgs/data/fonts/openmoji/default.nix
@@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hfg-gmuend";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-k37MsBbRUZ4vIEPAgVMiCK8gz377DWwAfjjjOassNMY=";
   };
 
diff --git a/pkgs/data/icons/beauty-line-icon-theme/default.nix b/pkgs/data/icons/beauty-line-icon-theme/default.nix
index d1bea8dfd6bd..d1d7a953df90 100644
--- a/pkgs/data/icons/beauty-line-icon-theme/default.nix
+++ b/pkgs/data/icons/beauty-line-icon-theme/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gvolpe";
     repo = pname;
-    rev = version;
+    tag = version;
     sparseCheckout = [
       "BeautyLine-V3"
     ];
diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix
index ac7e8c2ce677..02fe6aad1e3b 100644
--- a/pkgs/data/icons/bibata-cursors/translucent.nix
+++ b/pkgs/data/icons/bibata-cursors/translucent.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Silicasandwhich";
     repo = "Bibata_Cursor_Translucent";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-RroynJfdFpu+Wl9iw9NrAc9wNZsSxWI+heJXUTwEe7s=";
   };
 
diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix
index ad9d166a5a6b..0fcae0a8838a 100644
--- a/pkgs/data/icons/flat-remix-icon-theme/default.nix
+++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = "flat-remix";
-    rev = version;
+    tag = version;
     sha256 = "sha256-3TkBRgoT2AW0Sb0CrXdxh53/jYARAMFC/TIj/r/zruo=";
   };
 
diff --git a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix b/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
index ad03691639da..13f45ed4c73d 100644
--- a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
+++ b/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jmattheis";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1fks2rrrb62ybzn8gqan5swcgksrb579vk37bx4xpwkc552dz2z2";
   };
 
diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix
index 22f5ddd734d4..55155cccd349 100644
--- a/pkgs/data/icons/kora-icon-theme/default.nix
+++ b/pkgs/data/icons/kora-icon-theme/default.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bikass";
     repo = "kora";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5bGiePD0PwTvVEdVDzr6hIVtLwwF2mPa8ywLH1u8hLk=";
   };
 
diff --git a/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/pkgs/data/icons/la-capitaine-icon-theme/default.nix
index 6b215636bffb..e5a6d7ddf1c9 100644
--- a/pkgs/data/icons/la-capitaine-icon-theme/default.nix
+++ b/pkgs/data/icons/la-capitaine-icon-theme/default.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "keeferrourke";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0id2dddx6rl71472l47vafx968wnklmq6b980br68w82kcvqczzs";
   };
 
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index b14400ed0d61..81c80b87b9f8 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-LON73XRVZQxbEMJ32qKXU/TYf6Q8nWU9wms7eT/DHa8=";
   };
 
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 8aa000b133fe..e448967bb6d1 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-E2SpGAMsFfB64axDzUgVOZZwHDyPVbZjEvY4fJzRyUQ=";
   };
 
diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix
index e9226c205d0a..1ef85c6f0d32 100644
--- a/pkgs/data/icons/tela-circle-icon-theme/default.nix
+++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix
@@ -44,7 +44,7 @@ lib.checkListOfEnum "${pname}: color variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      rev = version;
+      tag = version;
       hash = "sha256-5Kqf6QNM+/JGGp2H3Vcl69Vh1iZYPq3HJxhvSH6k+eQ=";
     };
 
diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix
index 44858afeb9e3..36c8589e935c 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/data/icons/zafiro-icons/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zayronxio";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU=";
   };
 
diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix
index 704d49af1cb0..210c00422f68 100644
--- a/pkgs/data/themes/adwaita-qt/default.nix
+++ b/pkgs/data/themes/adwaita-qt/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-K/+SL52C+M2OC4NL+mhBnm/9BwH0KNNTGIDmPwuUwkM=";
   };
 
diff --git a/pkgs/data/themes/gtk-theme-framework/default.nix b/pkgs/data/themes/gtk-theme-framework/default.nix
index 1ae655fe8c37..60d769b0ba36 100644
--- a/pkgs/data/themes/gtk-theme-framework/default.nix
+++ b/pkgs/data/themes/gtk-theme-framework/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jaxwilko";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1z5s5rsgiypanf2z0avaisbflnvwrc8aiy5qskrsvbbaja63jy3s";
   };
 
diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix
index 4eab64997811..353fadb100ee 100644
--- a/pkgs/data/themes/kde2/default.nix
+++ b/pkgs/data/themes/kde2/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "repos-holder";
     repo = "kdecoration2-kde2";
-    rev = version;
+    tag = version;
     sha256 = "y2q1j36EURJc7k1huqhEH1Z82PnVSKlfx20bpQWY28c=";
   };
 
diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
index 21b27a63cd69..a248d104ee4b 100644
--- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
+++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matinlotfali";
     repo = "KDE-Rounded-Corners";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iJNEwDsGOOqWQgG3iwrZt9mpbKWHOw7zkEORURcAGLQ=";
   };
 
diff --git a/pkgs/data/themes/lightly-qt/default.nix b/pkgs/data/themes/lightly-qt/default.nix
index 6b6729c9cbb7..49d5b79b68f9 100644
--- a/pkgs/data/themes/lightly-qt/default.nix
+++ b/pkgs/data/themes/lightly-qt/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Luwx";
     repo = "Lightly";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0qkjzgjplgwczhk6959iah4ilvazpprv7yb809jy75kkp1jw8mwk";
   };
 
diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index dd2aaeed7d35..412de4308203 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -34,7 +34,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KDE";
     repo = "qtcurve";
-    rev = version;
+    tag = version;
     sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo=";
   };
 
diff --git a/pkgs/data/themes/sddm-sugar-dark/default.nix b/pkgs/data/themes/sddm-sugar-dark/default.nix
index 0f10a916cf95..b28b363487ac 100644
--- a/pkgs/data/themes/sddm-sugar-dark/default.nix
+++ b/pkgs/data/themes/sddm-sugar-dark/default.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = pkgs.fetchFromGitHub {
     owner = "MarianArlt";
     repo = "sddm-sugar-dark";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-C3qB9hFUeuT5+Dos2zFj5SyQegnghpoFV9wHvE9VoD8=";
   };
 
diff --git a/pkgs/data/themes/whitesur-kde/default.nix b/pkgs/data/themes/whitesur-kde/default.nix
index 3c42179c86a0..2af900edf0a6 100644
--- a/pkgs/data/themes/whitesur-kde/default.nix
+++ b/pkgs/data/themes/whitesur-kde/default.nix
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "whitesur-kde";
-    rev = version;
+    tag = version;
     hash = "sha256-052mKpf8e5pSecMzaWB3McOZ/uAqp/XGJjcVWnlKPLE=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
index a45e219bc59b..db9637336dcc 100644
--- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-p3tEUIM7rxYUVLl7ZaEm20IZWRMNi12AIj9mQe6iB5I=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
index 9d269f40ba0e..524ec4ea36bb 100644
--- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-DUpYb1xNmWpBcKo9kajeVm/+z4yj2OBE+qOyEkCHbUI=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
index 50db4ec7095b..f32eb0ac0aa3 100644
--- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-WeubXsshN4tUlIwEHTxHXv1L2dvJ2DZ6qtSPyiVtc98=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix
index b0b6deea9f9f..63106dd0c123 100644
--- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-aMxEESZ/noGtEDpQZz1asR0M+wnAfQT1FXLaQB6B0Zs=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix
index 11482fe170d2..75a846cc3633 100644
--- a/pkgs/desktops/deepin/apps/deepin-music/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-tj0XICmp7sM2m6aSf/DgxS7JXO3Wy/83sZIPGV17gFo=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix
index 480320dfa886..12bcc8ead58e 100644
--- a/pkgs/desktops/deepin/apps/deepin-picker/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-picker/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-TeUhDEldte5PJJe1l0q4wUTnnaXY052YP1JAhpLz/sA=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix
index 44faf032a4b7..928f22a50376 100644
--- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-G5UZ8lBrUo5G3jMae70p/zi9kOVqHWMNCedOy45L1PA=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
index 2692f445c08e..75bdc3e1ba37 100644
--- a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-7lyHPE/x7rmwh7FtCPkuA8JgYpy90jRXhUWoaeZpVag=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
index 540d9d5f1fd7..ea96bf758f84 100644
--- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-A4LFi0KcqChjgYrO90paMBAivv02TsRjYQ26I0k71x0=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
index ab53a9709fb8..81780ea5c4ef 100644
--- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-UOF0/RBceuRX6AtI1p5qqHhbRDAhA7i0+seOrkAFFgI=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
index ffd4df4eae88..cba3dfcb04a1 100644
--- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-T5tjjbNYUaiG9a5zMoKN6I0ec/WLftF2xwUPczlNwB8=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
index 33dffba91c95..958b34c01b6b 100644
--- a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
+++ b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-PtbEsFQl6M5Ouadxy9CTVh1Bmmect83NODO4Ks+ckKU=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
index 7dfc41fe8f0d..fb11933ebb0b 100644
--- a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-uNeRAsPbgC7IHHBIlczPXhnwZI65Le70D9MsbH+6Fwk=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
index 6405a95cd55d..9d0383fc9699 100644
--- a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-gtk-theme";
-    rev = version;
+    tag = version;
     hash = "sha256-2B2BtbPeg3cEbnEIgdGFzy8MjCMWlbP/Sq4jzG5cjmc=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
index 8c44914e7bb5..213d8443d9be 100644
--- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Vt2rYZthGelXVUp8/L57ZlDsVEjjZhCv+kSGeU6nC2s=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
index 79e2f15716b1..227ec4b2cdca 100644
--- a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-BvG/ygZfM6sDuDSzAqwCzDXGT/bbA6Srlpg3br117OU=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
index c472244adf2a..b2a38b427b6d 100644
--- a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-o5rg1l8N6Ch+BdBLp+HMbVBBvrTdRtn8NSgH/9AnB2Q=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
index a46ead0f6e7c..aeb09816f080 100644
--- a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
+++ b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dde-api-proxy";
-    rev = version;
+    tag = version;
     hash = "sha256-kWodNftOPLIiQNPHAIC9p3VHFAis8FAI7vLJTqahAtU=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-app-services/default.nix b/pkgs/desktops/deepin/core/dde-app-services/default.nix
index 711e3e9f9301..b4d1eaa31092 100644
--- a/pkgs/desktops/deepin/core/dde-app-services/default.nix
+++ b/pkgs/desktops/deepin/core/dde-app-services/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-/lHiSUOTD8nC0WDLAHAFzm1YC0WjSS5W5JNC0cjeVEo=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix
index ca391f0379c2..c2bd3afdb820 100644
--- a/pkgs/desktops/deepin/core/dde-appearance/default.nix
+++ b/pkgs/desktops/deepin/core/dde-appearance/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-M39EugV0uGCIaXK4isTQpHd6Rh2Vl6sg3Jp8JIEFEE4=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix
index cf1ae2d6dec3..5286513590cf 100644
--- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-KUwX7oilV562WDxkBhTQhwz2lgcQIYwkmRRglWj0zh8=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix
index 9dbbf0a966e6..f562c923f8d1 100644
--- a/pkgs/desktops/deepin/core/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-bZxNOBtLjop0eYxpMeoomaWYvPcMyDfQfgGPK9m+ARo=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
index 03fd59596732..d69bdead3abe 100644
--- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix
+++ b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-VSwip3WgpOYvqGw7/A8bqsYrVSACrVgoIp/pjXSAKcU=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix
index 6600df5b7964..4761a0c09a0f 100644
--- a/pkgs/desktops/deepin/core/dde-control-center/default.nix
+++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-9v2UtLjQQ3OX69UxMknLlrQhorahDI4Z4EEHItBs7G0=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
index a0d91cbfd262..bbda1e89d024 100644
--- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-laM6PgNdUNbsqbzKFGWk7DPuAWR+XHo0eXKG0CDuc9c=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
index 66fe532c9f0c..4635f2c49c09 100644
--- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix
+++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-6s6M0cL8gjq1B5tuIRGPi8D69p4T8hPJv5QvBIvsO1w=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
index 63b625fe90aa..16bbc0477a92 100644
--- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix
+++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-2arO1WSILY5TVPBvdyhttssddwhMYIBcCGq/pW/DnB0=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix
index 9d5272df7266..554be75f37a8 100644
--- a/pkgs/desktops/deepin/core/dde-network-core/default.nix
+++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-bS/PkutP5BQtqZ6MzeImFyGKoztoTswXhXaEftEv0FI=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
index cf83ed735088..c80e3d7d6a12 100644
--- a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-r2WVyy1lqcBJIQnRsPWlBFWQtSeZkq98J1S4dkipCys=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
index 9d4e8a227878..85515479f11a 100644
--- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-v0+Bz6J77Kgf4YV1iDhCqhmcNn493GFq1IEQbXBAVUU=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
index 1f1d9907ec16..0718457edc9d 100644
--- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-3twtJ1KT7TqpyLopHqPY2Lo8oZsH9liir0SJUV/k3OU=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix
index a146f0c6747a..c44979de24b7 100644
--- a/pkgs/desktops/deepin/core/dde-session/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-WiWG4f+vMgAYDBp/porjiV9a6ZqqdmxdXAqX1ISdlfU=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix
index 62663f6756e9..6d2f7d368f78 100644
--- a/pkgs/desktops/deepin/core/dde-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-shell/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dde-shell";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Gko1fFut5zWH/L6X5hEe5OZBjRIbKWIrrjjhh2wrsCg=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
index 6c3b7febf80b..2eb4a31a61c6 100644
--- a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
+++ b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dde-tray-loader";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-LzRjOl3kHArpxwerh7XOisYIJ+t+r/zWUbvYh6k6zKw=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix
index a8a14938a661..ef27cbc9bc98 100644
--- a/pkgs/desktops/deepin/core/dde-widgets/default.nix
+++ b/pkgs/desktops/deepin/core/dde-widgets/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-aeWQdWi1mMche7AJhAvchRXu89hiZ+CM/RR9HvvbXTw=";
   };
 
diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
index 49e1ec49d769..788cb12b3c8f 100644
--- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix
+++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-EjPPjdxa+iL/nXhuccoM3NiLmGXh7Un2aGz8O3sP6xE=";
   };
 
diff --git a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
index b3deff9bf44f..48296ae1fe66 100644
--- a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
+++ b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-gTzyQHFPyn2+A+o+4VYySDBCZftfG2WnTXuqzeF+QhA=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
index 30c9bf457642..f8d6e9fd036a 100644
--- a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
+++ b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-SyoahSdGPkWitDek4RD5M2hTR78GFpuijryteKVAx6k=";
   };
 
diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix
index 512db885951d..c123a2eaf5a2 100644
--- a/pkgs/desktops/deepin/go-package/dde-api/default.nix
+++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-VpZwVNXxdi8ODwxbksQpT0nnUuLOTJ9h0JYucEKdGYM=";
   };
 
diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
index 44120eae4e5c..09a73c805057 100644
--- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
@@ -40,7 +40,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-3BzFFlcNwNWNcysD3qRYfdyGaX7gW2XJZ4HzdGiK7jU=";
   };
 
diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
index 34577db77ed8..90de34316865 100644
--- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
+++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Zp80Yz0qkFAwpQJPgs/gcfCG2DMtvpKdVKRlqOTmaCk=";
   };
 
diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
index b1ad7c0c4c9e..4202a8b60bc4 100644
--- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
+++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-kBrkcB0IWGUV4ZrkFzwdPglRgDcnVvYDFhTXS20pKOk=";
   };
 
diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix
index 89f1602a1c7a..2c907ac2341f 100644
--- a/pkgs/desktops/deepin/go-package/startdde/default.nix
+++ b/pkgs/desktops/deepin/go-package/startdde/default.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-RSfdlLT2v3fM4P8E0mIyZZ8A1MWVIS0N0MDczqq7Y64=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
index bcfcef845b6e..7c6a7756eac3 100644
--- a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-B9SrApvjTIW2g9VayrmCsWXS9Gkg55Voi1kPP+KYp3s=";
   };
 
diff --git a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
index 5d904914218d..70afbc5d420e 100644
--- a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
+++ b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-ymJSTAccwRumXrh4VjwarKYgaqadMBrtXM1rjWNfe8o=";
   };
 
diff --git a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
index 839b02633af9..a81614936feb 100644
--- a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
+++ b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-8Im3CueC8sYA5mwRU/Z7z8HA4mPQvVSqcTD813QCYxo=";
   };
 
diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix
index d485fbb23f3b..445a9329df83 100644
--- a/pkgs/desktops/deepin/library/disomaster/default.nix
+++ b/pkgs/desktops/deepin/library/disomaster/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-wN8mhddqqzYXkT6rRWsHVCWzaG2uRcF2iiFHlZx2LfY=";
   };
 
diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix
index b30d4be40f74..a27e02ff0fa5 100644
--- a/pkgs/desktops/deepin/library/docparser/default.nix
+++ b/pkgs/desktops/deepin/library/docparser/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-shZXhs9ncgm6rECvCWrLi26RO1WAc1gRowoYmeKesfk=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix
index 97ac2fb5843f..3f99d65e47e9 100644
--- a/pkgs/desktops/deepin/library/dtk6core/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6core/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6core";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-51TvPQy0b/8kkBs0e3q1B53mEAKHpAYPBla4h1k616c=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
index 9092cafdac51..d88efbdd89ba 100644
--- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6declarative";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-i6gkVWs6CQC6i6H6lfrWNYT76fFBc8ECZ1ePvXQ7j8E=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix
index 4204ad9f2356..18e00f7b1957 100644
--- a/pkgs/desktops/deepin/library/dtk6gui/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6gui";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Ybi68lTSUJpAipx92JF7wj6y+GTYDodJKRCVFhfnBvQ=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6log/default.nix b/pkgs/desktops/deepin/library/dtk6log/default.nix
index ac47ad7a2be9..5ad1ec4b0859 100644
--- a/pkgs/desktops/deepin/library/dtk6log/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6log/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6log";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-R+jxlS8/FXUxnnzIDIePU2NwwNQU624n++E3q3oElco=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
index a3048cbd2b22..5b8ec229a8de 100644
--- a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-b/iI2OKQQoFj3vWatfGdDP9z+SEsK5XBra9KqjlGzqs=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix
index b1400c9cf9c8..5d9b8ee125c7 100644
--- a/pkgs/desktops/deepin/library/dtk6widget/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6widget";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-aDuLybIEzF8ATzH6vkN2SS/yn1eAc2WooNZxeQyH2QM=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix
index b7f7523abb9f..8be035ac33d2 100644
--- a/pkgs/desktops/deepin/library/dtkcommon/default.nix
+++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-e+8kG9bB6iby2RgD8jn75GyefLRHNnjD+n04hXbi5ec=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix
index 980292bbf200..eb0630a30f3c 100644
--- a/pkgs/desktops/deepin/library/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/library/dtkcore/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-APuBVgewr701wzfTRwaQIg/ERFIhabEs5Jd6+GvD04k=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
index 189fdc13b075..86a06e35ff1d 100644
--- a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
+++ b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-MOiNpuvYwJi9rNKx6TuUuWnlGhmZrRbL48EFapy442M=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix
index 449a9d4156a1..d8072a1d3bbf 100644
--- a/pkgs/desktops/deepin/library/dtkgui/default.nix
+++ b/pkgs/desktops/deepin/library/dtkgui/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-F3tuLV1hWoUZle0O66MQ+Ew9LRnP6N++HaqS88xBLRY=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtklog/default.nix b/pkgs/desktops/deepin/library/dtklog/default.nix
index 043999f614a9..3f4105f6c9e4 100644
--- a/pkgs/desktops/deepin/library/dtklog/default.nix
+++ b/pkgs/desktops/deepin/library/dtklog/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtklog";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-8c3KL6pjAFPC4jRpOpPEbEDRBMWnDptwBSbEtcQcf5E=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix
index 56100bedbdb3..24e4105ca792 100644
--- a/pkgs/desktops/deepin/library/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-FAF66FsmUX0dhFlbT5wAUWkxY0TOU6dcKNwlY10Qou0=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix
index 32a385d9cef8..e46decd43181 100644
--- a/pkgs/desktops/deepin/library/dwayland/default.nix
+++ b/pkgs/desktops/deepin/library/dwayland/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-XZvL3lauVW5D3r3kybpS3SiitvwEScqgYe2h9c1DuCs=";
   };
 
diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix
index af90a645f25f..ac43f60011e5 100644
--- a/pkgs/desktops/deepin/library/gio-qt/default.nix
+++ b/pkgs/desktops/deepin/library/gio-qt/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-qDkkLqGsrw+otUy3/iZJJZ2RtpNYPGc/wktdVpw2weg=";
   };
 
diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix
index ccf8f6a4817d..3a788799975f 100644
--- a/pkgs/desktops/deepin/library/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/library/qt5integration/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-WRMeH66X21Z6TBKPEabnWqzC95+OR9M5azxvAp6K7T4=";
   };
 
diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
index fbf3879cf37b..731605d4e745 100644
--- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
+++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-jbt+ym6TQX3tecFCSlz8Z2ZnqOa69zYgaB5ohQM3lQg=";
   };
 
diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix
index 1383ef81e07e..4df38555d607 100644
--- a/pkgs/desktops/deepin/library/qt6integration/default.nix
+++ b/pkgs/desktops/deepin/library/qt6integration/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-J0HKtxnQCizHFf2VR9srS/CxWqAkczia7kDWxvGzKsw=";
   };
 
diff --git a/pkgs/desktops/deepin/library/qt6mpris/default.nix b/pkgs/desktops/deepin/library/qt6mpris/default.nix
index 71a17256d6c1..61ac0e94f9fe 100644
--- a/pkgs/desktops/deepin/library/qt6mpris/default.nix
+++ b/pkgs/desktops/deepin/library/qt6mpris/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "deepin-community";
     repo = "qt6mpris";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-PCdA9q/txaL2Fbr2/4+Z7L4zxWeULl3bq8MVH3i1g3g=";
   };
 
diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
index 2befb9219bd3..4750e6c8c696 100644
--- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
+++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Ih3VlEv2hl8y/Cc5uI8gQFgIVvcCaHUhHAudNOSqfs4=";
   };
 
diff --git a/pkgs/desktops/deepin/library/treeland-protocols/default.nix b/pkgs/desktops/deepin/library/treeland-protocols/default.nix
index f1b8016bb978..00e9b9db7e3a 100644
--- a/pkgs/desktops/deepin/library/treeland-protocols/default.nix
+++ b/pkgs/desktops/deepin/library/treeland-protocols/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-SS4jnfr/9Ec3qpnHS4EjQViekBRMix5oz7b9qhNZpfY=";
   };
 
diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
index cdfbe3011c64..26b5dc3bdbae 100644
--- a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
+++ b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4=";
   };
 
diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix
index 5b298b8765ea..4d89edee87df 100644
--- a/pkgs/desktops/deepin/library/util-dfm/default.nix
+++ b/pkgs/desktops/deepin/library/util-dfm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-ngDjjdwuYqvyhaUcMNV5PRmGKC3lmY/nJQGOQgRMIQE=";
   };
 
diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
index 197928a86407..02358253c19d 100644
--- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-JOC8nQ/YgUpY93FcniO2uypAfsL/SNU+KfTrthoZfQo=";
   };
 
diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
index 2b13bd66ab0c..3dcd9c96cffd 100644
--- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
+++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-l2D+j+u5Q6G45KTM7eg1QNEakEPtEJ0tzlDlQO5/08I=";
   };
 
diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
index 441003d522b3..340a5a39198f 100644
--- a/pkgs/desktops/deepin/tools/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-anything";
-    rev = version;
+    tag = version;
     hash = "sha256-OYPsUXMjuU6gG+EzyYl640+2/59n8D5V906CVGwn6Bo=";
   };
 
diff --git a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix
index 7f2db77f4567..808fd46b5a50 100644
--- a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix
+++ b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-V6X0E80352Vb6zwaBTRfZZnXEVCmBRbO2bca9A9OL6c=";
   };
 
diff --git a/pkgs/desktops/expidus/calculator/default.nix b/pkgs/desktops/expidus/calculator/default.nix
index 528d77648b5f..5e17376ec160 100644
--- a/pkgs/desktops/expidus/calculator/default.nix
+++ b/pkgs/desktops/expidus/calculator/default.nix
@@ -10,7 +10,7 @@ flutter.buildFlutterApplication rec {
   src = fetchFromGitHub {
     owner = "ExpidusOS";
     repo = "calculator";
-    rev = version;
+    tag = version;
     hash = "sha256-O3LHp10Fo3PW3zoN7mFSQEKh+AAaR+IqkRtc6nQrIZE=";
   };
 
diff --git a/pkgs/desktops/expidus/file-manager/default.nix b/pkgs/desktops/expidus/file-manager/default.nix
index b32b84d10999..43e637057e6e 100644
--- a/pkgs/desktops/expidus/file-manager/default.nix
+++ b/pkgs/desktops/expidus/file-manager/default.nix
@@ -10,7 +10,7 @@ flutter.buildFlutterApplication rec {
   src = fetchFromGitHub {
     owner = "ExpidusOS";
     repo = "file-manager";
-    rev = version;
+    tag = version;
     hash = "sha256-R6eszy4Dz8tAPRTwZzRiZWIgVMiGv5zlhFB/HcD6gqg=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
index 2107936087ad..8c2d88a2f248 100644
--- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
+++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "EasyScreenCast";
     repo = "EasyScreenCast";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-CK9ta+2Kf7IFKb+uQhI1AtdNkJZpBgIL7JDM3JqsV4c=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix
index 8fc92494caad..0ac7fb0a5b3c 100644
--- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix
+++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "arcmenu";
     repo = "ArcMenu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XlDkdNINTnUAqr2bxL0u2tHWfiggqT1oOryED7sG/vs=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index 8babf752da08..1743847240db 100644
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GSConnect";
     repo = "gnome-shell-extension-gsconnect";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bpy4G+f3NJ2iVsycPluV+98at0G2wlp7t5cPEMGM90s=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
index d55f097134fa..fcb8a08ddff5 100644
--- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ikalnytskyi";
     repo = "gnome-shell-extension-icon-hider";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
index c46a1b7447c4..4d28ee8a29f4 100644
--- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
+++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "muffinmad";
     repo = "pidgin-im-gnome-shell-extension";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1jyg8r0s1v83sgg6y0jbsj2v37mglh8rvd8vi27fxnjq9xmg8kpc";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/systemd-manager/default.nix b/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
index c6d983de6e40..e745aa6781ff 100644
--- a/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
+++ b/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hardpixel";
     repo = "systemd-manager";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-V4vYv1nAjFjvkSYdOpcpt8h9L+g0ch4V2VZRVSbtSKE=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
index 32b920fce9c0..413dc44e85e0 100644
--- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cinatic";
     repo = "taskwhisperer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UVBLFXsbOPRXC4P5laZ82Rs08yXnNnzJ+pp5fbx6Zqc=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix
index b216a6ae451f..84084baa61a2 100644
--- a/pkgs/desktops/gnome/extensions/topicons-plus/default.nix
+++ b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phocean";
     repo = "TopIcons-plus";
-    rev = version;
+    tag = version;
     sha256 = "1p3jlvs4zgnrvy8am7myivv4rnnshjp49kg87rd22qqyvcz51ykr";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix
index 41d93826f0d7..2cf050d991d3 100644
--- a/pkgs/desktops/gnome/extensions/unite/default.nix
+++ b/pkgs/desktops/gnome/extensions/unite/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hardpixel";
     repo = "unite-shell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ceo0HQupiihD6GW6/PUbjuArOXtPtAmUPxmNi7DS8E0=";
   };
 
diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
index 2e9e3078c6cd..26008ddf1dac 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-system-settings";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-8X5a2zJ0y8bSSnbqDvRoYm/2VPAWcfZZuiH+5p8eXi4=";
   };
 
diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix
index b26d37d54a89..a134e335834f 100644
--- a/pkgs/desktops/lomiri/applications/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Godl/SQ0+NkI6kwH85SXHPQ5GRlih3xvCyeYxwiqH/s=";
   };
 
diff --git a/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/pkgs/desktops/lomiri/data/lomiri-session/default.nix
index fdc7b90ad875..8be5afada02d 100644
--- a/pkgs/desktops/lomiri/data/lomiri-session/default.nix
+++ b/pkgs/desktops/lomiri/data/lomiri-session/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-session";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-XduE3tPUjw/wIjFCACasxtN33KO4bDLWrpl7pZcYaAA=";
   };
 
diff --git a/pkgs/desktops/lomiri/data/lomiri-sounds/default.nix b/pkgs/desktops/lomiri/data/lomiri-sounds/default.nix
index e940bb1c03e6..230b08ae0f5f 100644
--- a/pkgs/desktops/lomiri/data/lomiri-sounds/default.nix
+++ b/pkgs/desktops/lomiri/data/lomiri-sounds/default.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-sounds";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-j4OUwE1z++rLsg5y2YvZktFQfOys3QjoE8Ravd1JFVA=";
   };
 
diff --git a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
index b45868c2808b..ecc1b0188e6d 100644
--- a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
+++ b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-wallpapers";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-n8+vY+MPVqW6s5kSo4aEtGZv1AsjB3nNEywbmcNWfhI=";
   };
 
diff --git a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
index 91be03cd1df8..c2eb5c080fe1 100644
--- a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
+++ b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/suru-icon-theme";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-rbhfcjca0vMBa0tJWGpXMRGGygZH1hmdQv/nLJWPS7s=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/deviceinfo/default.nix b/pkgs/desktops/lomiri/development/deviceinfo/default.nix
index 0ceae216c9dd..3a87147ff514 100644
--- a/pkgs/desktops/lomiri/development/deviceinfo/default.nix
+++ b/pkgs/desktops/lomiri/development/deviceinfo/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/deviceinfo";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-wTl+GgNiWzJxGLdU2iMH94UhQ40gjAPTVErouQIGXOA=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/geonames/default.nix b/pkgs/desktops/lomiri/development/geonames/default.nix
index d2fff65bf5f8..178263920ac7 100644
--- a/pkgs/desktops/lomiri/development/geonames/default.nix
+++ b/pkgs/desktops/lomiri/development/geonames/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/geonames";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-AhRnUoku17kVY0UciHQXFDa6eCH6HQ4ZGIOobCaGTKQ=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/gmenuharness/default.nix b/pkgs/desktops/lomiri/development/gmenuharness/default.nix
index e9b4cca04120..121be1cc8f1b 100644
--- a/pkgs/desktops/lomiri/development/gmenuharness/default.nix
+++ b/pkgs/desktops/lomiri/development/gmenuharness/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/gmenuharness";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-MswB8cQvz3JvcJL2zj7szUOBzKRjxzJO7/x+87m7E7c=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/libusermetrics/default.nix b/pkgs/desktops/lomiri/development/libusermetrics/default.nix
index 7305db4cb593..89afd3d3b92c 100644
--- a/pkgs/desktops/lomiri/development/libusermetrics/default.nix
+++ b/pkgs/desktops/lomiri/development/libusermetrics/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/libusermetrics";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-V4vxNyHMs2YYBILkpco79FN9xnooULgB+z2Kf3V0790=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix
index dacb1ceedac2..ae3f1cfc63cb 100644
--- a/pkgs/desktops/lomiri/development/trust-store/default.nix
+++ b/pkgs/desktops/lomiri/development/trust-store/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/trust-store";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-tVwqBu4py8kdydyKECZfLvcLijpZSQszeo8ytTDagy0=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/u1db-qt/default.nix b/pkgs/desktops/lomiri/development/u1db-qt/default.nix
index 9e8d6b20f295..7780ea886c21 100644
--- a/pkgs/desktops/lomiri/development/u1db-qt/default.nix
+++ b/pkgs/desktops/lomiri/development/u1db-qt/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/u1db-qt";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-KmAEgnWHY0cDKJqRhZpY0fzVjNlEU67e559XEbAPpJI=";
   };
 
diff --git a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
index 8493e89f8f15..51e6d2f842c6 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-action-api";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-JDcUq7qEp6Z8TjdNspIz4FE/euH+ytGWa4rSxy4voiU=";
   };
 
diff --git a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
index 0ce25119ef6a..0c20e176bab9 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-settings-components";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-H7G3dzzitdyahB/MwgtfRBpo+qMOhmQSzN4EGYculks=";
   };
 
diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
index 800163372b0a..7313836a5079 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-ui-extras";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-SF/UF84K9kNtLHO9FDuIFdQId0NfbmRiRZiPrOKvE9o=";
   };
 
diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
index ca2dece93391..0da8bf964479 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-ui-toolkit";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-j2Fowwj+ArdfJacqBSWksPk+wXRoTpL/Jrgme2tUSC8=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix
index 0636f116e452..d1a29b452312 100644
--- a/pkgs/desktops/lomiri/services/biometryd/default.nix
+++ b/pkgs/desktops/lomiri/services/biometryd/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/biometryd";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-derU7pKdNf6pwhskaW7gCLcU9ixBG3U0EI/qtANmmTs=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/hfd-service/default.nix b/pkgs/desktops/lomiri/services/hfd-service/default.nix
index 9df11be34d6d..edba2866043e 100644
--- a/pkgs/desktops/lomiri/services/hfd-service/default.nix
+++ b/pkgs/desktops/lomiri/services/hfd-service/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/hfd-service";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-PvZPdisqpKl9OSuQXIJW1y6EJ5moesJiEAQjpQjzyWQ=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
index 753dc120f3cf..b12e58dd8a2a 100644
--- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-content-hub";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-eA5oCoAZB7fWyWm0Sy6wXh0EW+h76bdfJ2dotr7gUC0=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index 4bd5ad3c4342..b950b08081aa 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-download-manager";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-LhhO/zZ4wNiRd235NB2b08SQcCZt1awN/flcsLs2m8U=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix b/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
index f4f793cf577e..eef978ba81b3 100644
--- a/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/history-service";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-pcTYuumywTarW+ZciwwvmmBQQH6aq4+FdVjV62VzSZU=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
index f94b6f971f8b..51c3a223241b 100644
--- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-url-dispatcher";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-kde/HzhBHxTeyc2TCUJwpG7IfC8doDd/jNMF8KLM7KU=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index 1467119fb204..3eb5cc8d2121 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/mediascanner2";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-e1vDPnIIfevXj9ODEEKJ2y4TiU0H+08aTf2vU+emdQk=";
   };
 
diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix
index 98ed2a4fadeb..3705178a9dca 100644
--- a/pkgs/desktops/lumina/lumina-calculator/default.nix
+++ b/pkgs/desktops/lumina/lumina-calculator/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lumina-desktop";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1238d1m0mjkwkdpgq165a4ql9aql0aji5f41rzdzny6m7ws9nm2y";
   };
 
diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix
index 04117d7f4cce..08747e269c9a 100644
--- a/pkgs/desktops/lumina/lumina-pdf/default.nix
+++ b/pkgs/desktops/lumina/lumina-pdf/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lumina-desktop";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "08caj4nashp79fbvj94rabn0iaa1hymifqmb782x03nb2vkn38r6";
   };
 
diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix
index 280885b07cae..e3959c43e2b8 100644
--- a/pkgs/desktops/lumina/lumina/default.nix
+++ b/pkgs/desktops/lumina/lumina/default.nix
@@ -24,7 +24,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lumina-desktop";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1llr65gilcf0k88f9mbwzlalqwdnjy4nv2jq7w154z0xmd6iarfq";
   };
 
diff --git a/pkgs/desktops/lxde/core/lxsession/default.nix b/pkgs/desktops/lxde/core/lxsession/default.nix
index ab6b77429d9a..b34ff16e9233 100644
--- a/pkgs/desktops/lxde/core/lxsession/default.nix
+++ b/pkgs/desktops/lxde/core/lxsession/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxsession";
-    rev = version;
+    tag = version;
     sha256 = "17sqsx57ymrimm5jfmcyrp7b0nzi41bcvpxsqckmwbhl19g6c17d";
   };
 
diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index 84e1b76ad428..db96183feb19 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxtask";
-    rev = version;
+    tag = version;
     hash = "sha256-BI50jV/17jGX91rcmg98+gkoy35oNpdSSaVDLyagbIc=";
   };
 
diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
index 3db308a08c7c..b72f9eac38bd 100644
--- a/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/compton-conf/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-GNS0GdkQOEFQHCeXFVNDdT35KCRhfwmkL78tpY71mz0=";
   };
 
diff --git a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
index 3c71e8d3268d..16fa35d95e4f 100644
--- a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-OF12t08hOuDsl80n4lXO3AFCf29f01eDpoRcbXmI4+I=";
   };
 
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 734818687e4d..997a0a583099 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "libfm-qt";
-    rev = version;
+    tag = version;
     hash =
       {
         "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 2e884006e2a7..130d0daa8d98 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-90t7jukm2vNfkgZ3326UDMXNzwJ+FIVEF3kNZ2SgNN8=";
   };
 
diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index 89ae2a931865..d0e1f3999077 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash =
       {
         "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix
index 2030d5579e32..d96bebb89249 100644
--- a/pkgs/desktops/lxqt/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/libsysstat/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-CwQz0vaBhMe32xBoSgFkxSwx3tnIHutp9Vs32FvTNVU=";
   };
 
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index 9beecc88fe05..171f74c88fbb 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Y9lBXEROC4LIl1M7js0TvJBBNyO06qCWpHxvQjcYPhc=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index 08103ae0f946..1cfd1a85ee21 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-BjtU63SD6y4LnjAr8QGMqo/aYkcQ0Y+vg3lAOf97ZY8=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index 12fca14d95bf..500f703c82bd 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-7RyPUv/M8mMoRO+SopFuru+bY9ZwnKz2BkiLz1cW/wg=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index 144c819a177e..583ce83f54af 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-archiver";
-    rev = version;
+    tag = version;
     hash = "sha256-a3NdU1OZI+BqtvpUhqhwylf5upFJxeg8B+1cPTAdDr4=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index 15c2a73c9f0f..a0b50426806e 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash =
       {
         "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index 6977648d4e06..d49d54396401 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Vzf+Olaxl6tn3ETEQseFIPstjo+pfdzZUgyVFqk6p3c=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index 4e2cb1a8c705..7a5d19fd8179 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-jQdr3epezQtBoyC2hyMBceiqarruZLasSMYa2gDraCI=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
index ccb89df6fd59..7547f99cc588 100644
--- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Q9VPPGPyMueoFrTTdAMlIR+VnWVXu0J2uXhaOlJPTAs=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index df05f4664e66..d166b97076b1 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-L2eXab1V2t7+h51wEh0p2Uzdc3ImR4euoiXVVJ8BguA=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index e496260b7fe4..19a450ae9b24 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-oFN4FpTBxOcXtykkkrJvaoxhvwEJKBp+eusrrSBIXIU=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index d352e4bdb268..e6c485c8f6ed 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-WS+rPiPB/BBmg4yNkpZ2cFJG/1awdjCN0ziWtcESRP4=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index 5a632594dde5..ed6bae074625 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-wj9i09F9If5JZO6W358XcZ/rawt9Oj3QwDvLLRvS2Bc=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index f24d1d62f02e..a5156bdb08e3 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-S60m8ixz6HnTZe0MTyvU0pXWWOS88KeXfDcQJ/I1Keo=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index 7efceeb7dad8..4c1e08b47d1e 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash =
       {
         "1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc=";
diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index dd3cb3190bc6..12fb23d9cdfc 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-AJLm6bjlM6cq9PNrM8eyvX4xN6lUxVSzgJs4+p/11ug=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index e01b14f30888..273cffb3c473 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-t3odaG9znMohROutoEquJ7JYsvPQPjPxOik+WD8WGSA=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index 0db1cefbafb8..5b7384544f91 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-ohB0LsEnDDe3wygRgvP5mFQ2hu1c9xv2RilSdqOQBxA=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
index 0b90cbfd4a8f..b8d62086caa1 100644
--- a/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-TUBcYQ7mWGVZKHNi4zQh8/ogSuMr20xIAoR+IGYQE0w=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
index 430cde7762c5..86742600e1f3 100644
--- a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-wayland-session";
-    rev = version;
+    tag = version;
     hash = "sha256-UMlV8LqUXM2+3ZSLj30FFgC+ZVPmt2W8uE2RrZKqCJE=";
   };
 
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
index 7ab69bbdd973..59b6d78270f6 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "obconf-qt";
-    rev = version;
+    tag = version;
     hash = "sha256-C7s312DeLiustPBBY4OdjYvN7X6noktLA8LuhlOaVRo=";
   };
 
diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index 0244300f3ed2..fdb813f6d15a 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-V3VYwDlTRd7q7EJhC4zHcX56AbUYJdfumqXaKlkLEfg=";
   };
 
diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 4b23fb6e37d5..962843047785 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-3LdoJLlGoUsv0MdbxIOZrzLaPnZ2hI6m+bLp4GNonng=";
   };
 
diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index e958658f3c9c..41547c820f49 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pvanek";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-wHhaRtNiNCk5dtO2dVjRFDVicmYtrnCb2twx6h1m834=";
   };
 
diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index ea9da54dfb64..0e7d247a0e1a 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-FJw1J4c8oLBo7adl1uhCuS+o/ZhJAOyLmbjUgtdt0ss=";
   };
 
diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
index 823a3b09cc9e..be0d5142b183 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/qterminal/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Nluw0waf+lqpbajsPv+HYhPD3y7XmgifSu2r7I/J4RI=";
   };
 
diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index ac06cab1d053..d4f9808421b9 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash =
       {
         "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
index 8971a3aa1fe0..b8ca6c9c9a04 100644
--- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix
+++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-I8HV7QwyyRssWB6AjC1GswjlXoYwPJHowE74zgqghX4=";
   };
 
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index ac14483f1cea..e3167c019701 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-V5ulRkckeSX2EsYmhmA9phVssDtix31M5oZXkOgF660=";
   };
 
diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 1f31a200f7a7..d20a6f478ce7 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-uII6elLoREc/AO6NSe9QsT+jYARd2hgKSa84NCDza10=";
   };
 
diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix
index a3b32f0ede77..46a332ad4c7c 100644
--- a/pkgs/desktops/mate/mate-tweak/default.nix
+++ b/pkgs/desktops/mate/mate-tweak/default.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ubuntu-mate";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "emeNgCzMhHMeLOyUkXe+8OzQMEWuwNdD4xkGXIFgbh4=";
   };
 
diff --git a/pkgs/desktops/mate/mate-wayland-session/default.nix b/pkgs/desktops/mate/mate-wayland-session/default.nix
index 1900c0b7107e..7aab723647ea 100644
--- a/pkgs/desktops/mate/mate-wayland-session/default.nix
+++ b/pkgs/desktops/mate/mate-wayland-session/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "mate-wayland-session";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sUAq2BylsvjYn8Lt+nm4yIfVhzIEefxKZYnhJnuxjs0=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index e6dc305588b3..5469fbb5a474 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-jVMXSy83z4zaG1YtCPRGvj1yl6wa5MJYtNp4XIsIY1k=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index af8c515326b7..9d2b29f5c350 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "calculator";
-    rev = version;
+    tag = version;
     sha256 = "sha256-QEs83hSv9Kupj2p/OTnuPZsC8tdm+IqgpeObBVrPRas=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index fba7602500e8..e031e4ae7acc 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "calendar";
-    rev = version;
+    tag = version;
     sha256 = "sha256-gBQfrRSaw3TKcsSAQh/hcTpBoEQstGdLbppoZ1/Z1q8=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index 9409b5a25c99..ec386e7eda1c 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "camera";
-    rev = version;
+    tag = version;
     sha256 = "sha256-PSUav16aU9TFX9Zb0TkqLxgn+yed86Qft0rQvbjbXtA=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 513121a336b0..008d84863627 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "code";
-    rev = version;
+    tag = version;
     sha256 = "sha256-KoRpGBYen1eOdMBHOTBMopC+mPMOkD+iYWV3JA21mKc=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
index 199e1c82e46d..5fbbc305189c 100644
--- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "dock";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-bixNYpPdWU2FndiCPX7SxNTz2MEttRuj35NaWn3GJrI=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index 10ef5782fb74..7aea0c7af3cd 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "feedback";
-    rev = version;
+    tag = version;
     sha256 = "sha256-D0x0jKYEB6Bo8ETgVCjgdOItc+VJYlrr8N9lI/Z3eXU=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index e1a1b58721b5..ea7c31f8cfa5 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "files";
-    rev = version;
+    tag = version;
     hash = "sha256-GJ+OYe2DJ9VIMkwobQJxD1bGoV8k6ALkx9RpT3Cazis=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix b/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix
index 4ada52722230..acaae3e4dd89 100644
--- a/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "iconbrowser";
-    rev = version;
+    tag = version;
     sha256 = "sha256-T0VCpk3pdq+2gr/UblLu8mRX7TKJrAtyyFk4i+tAVfI=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index a0a9b1a719fb..ffece5b59a01 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "music";
-    rev = version;
+    tag = version;
     sha256 = "sha256-pqOAeHTFWSoJqXE9UCUkVIy5T7EoYsieJ4PMU1oX9ko=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index bfda13868f2f..2010b04db53b 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "photos";
-    rev = version;
+    tag = version;
     sha256 = "sha256-+aqBeGRisngbH/EALROTr0IZvyrWIlQvFFEgJNfv95Y=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
index 536362efa0a1..43906d32fe77 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "screenshot";
-    rev = version;
+    tag = version;
     hash = "sha256-qhXTOdxMpiCPJR0Gp65itr6Em9e6OzMn3m/OyS7YfcA=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
index 41d5244aeeff..27b496dab209 100644
--- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "tasks";
-    rev = version;
+    tag = version;
     hash = "sha256-xOMS4Zwfl7TLHvm8Zn6wQ4ZoMg+Yuci+cTpUVG+liss=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 5497a0a77e9f..35eaba6fdf9e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "terminal";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2Z56U6nbqwlbrSMzTYv7cSI7LT7pvDhW0w4f3wxv6ZA=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index 87cbcff8b851..12632f96d9b2 100644
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "videos";
-    rev = version;
+    tag = version;
     hash = "sha256-3TpPgMd4dABhvnnmHHQCHDvuSdC5rWxGvaXPg20/Mrs=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix
index dbcf1d2ea454..a48e8bf08689 100644
--- a/pkgs/desktops/pantheon/apps/sideload/default.nix
+++ b/pkgs/desktops/pantheon/apps/sideload/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-2tYdcHx77XN2iu2PKXAKwOtb4TOFt3Igv17w2zIxqT4=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index 2583f609718c..d5d78803e261 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-NMi+QyIunUIzg9IlzeUCz2eQrQlF28lufFc51XOQljU=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index 4456b1480530..41e7b81fb2a4 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-jdSdzOHu1u/8N/eN6D9MjR/9K7n+rfmuBpyRSweb6lA=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index 16b54deeefb5..7ea9b4831948 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-NefWnkI7K6I1JY3UG9wUbB/yF3R8tUdPb4tAafiTR3o=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index a9503c4fbb3f..bf53e96c7541 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-VOL0F0obuXVz0G5hMI/hpUf2T3H8XUw64wu4MxRi57g=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index 6fb63063f4ff..3fcee01f38f1 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-uSEixgakYmh+rheDVF9kYs43C+vjfzuz1SNfwV3+RIU=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index f6d67728297a..d5d85fa7282d 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-/jfUftlNL+B4570ajropS7/2fqro380kZzpPwm+A9fA=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 5837552a2d47..51b5a534e3a2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-332y3D3T90G6bDVacRm3a1p4mLK3vsW8sBvre5lW/mk=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index ee7c56c606d3..ed15cb6fe8b1 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-mTTcavuxnRSBiifFpga14xPReHguvp9wIUS71Djorjk=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index 5e3622f1ed24..7514df938106 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-53rpnp1RWdPofY00XWKiz8WDPC7RNMaGQFHBDzjsIt4=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index d2d6136bf8d2..ae039117aa74 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-E4UAhrs+YQ47VEHMFY8PbSFvBqhqrTf4aPezeqEjdLo=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index 3d7b419d0f09..52bd4817bf33 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-S6EJGF9jRiCzH0f7WNrbLtAX23fjD/Hzd8YLEzkXesw=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 7c9078ad9b6b..1557236ed3f2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-GKZouuWdWl1JDCmzPImeW/hStyFQA6NOAFFmAhiiFe8=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index a3ad381e12cb..de6919b2ed64 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-1znz8B4CGQGDiJC4Mt61XAh9wWAV8J0+K3AIpFcffXQ=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index 3007862edd71..7291af698729 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-k6dSiiBqqbhH7rmhpBu83LX8at/qJ4gkrg4Xc+VbkIE=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index 94503b403df3..1ee8d11d5ea4 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-BWlQrM13gI6FXoqfOKoeqtE1+HVBUB09NDatGraTYtY=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index 45ca8bcc48f5..9dd960a20684 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-GLeQxdrrjz4MurN8Ia5Q68y6gHuyxiMVNneft1AXKvs=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
index bb96b4a8add9..3db1a9dcac71 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-Ct+1n/GmrS9xi8QIJDWKfwNL1kvNz3o+0tsxLZtwjmI=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 02eaeae906d9..2cc28b483082 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-iRxxXAUuSJzhX6uj1YeEzMUihWmrVZ6BFfayfteg/c8=";
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index 408046979745..4afb92c6e6da 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "stylesheet";
-    rev = version;
+    tag = version;
     sha256 = "sha256-l7E5o7JNqfJZzKpyvsjIVd2i9fwLh4Qn8oJ/S5RlFQ8=";
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 7a3ba9f0020f..34db7917173b 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "icons";
-    rev = version;
+    tag = version;
     sha256 = "sha256-WltMfWMcfUqpnfuGa6NzfxSeTais0MLsiu82ybaOcvs=";
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
index 9aa511fc35b6..dcefc479fff1 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "fonts";
-    rev = version;
+    tag = version;
     sha256 = "sha256-YiE7yaH0ZrF1/Cp+3bcJYm2cExQjFcat6JLMJPjhops=";
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
index d9e01a191b8e..16b71ef893ec 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "sound-theme";
-    rev = version;
+    tag = version;
     sha256 = "sha256-fR6gtKx9J6o2R1vQZ5yx4kEX3Ak+q8I6hRVMZzyB2E8=";
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
index 0579a6048cae..72197356ffe9 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "wallpapers";
-    rev = version;
+    tag = version;
     sha256 = "sha256-qbqYr+3Vqwi1UBD0fRW6lI2rj5Iy51taZRGxDTpKfpg=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index 8a180593edb0..2786f3242e51 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "default-settings";
-    rev = version;
+    tag = version;
     sha256 = "sha256-V8jzebnMD41U0ycu66xIZmssoqrKVS+4L70mqc3GEzg=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index c76592c322c6..7f8d0b8c4274 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "greeter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-T/tI8WRVbTLdolDYa98M2Vm26p0xhGiai74lXAlpQ8k=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index d2749bfa5471..5ae2fc99619d 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "onboarding";
-    rev = version;
+    tag = version;
     sha256 = "sha256-e8eYBGQ+qTXsp+E3l0g5UI1nYD75z0ibTtzm0WbqlU4=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
index 66bd35ff6401..2e85e55cad2a 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "print";
-    rev = version;
+    tag = version;
     sha256 = "sha256-l2IUu9Mj22lZ5yajPcsGrJcJDakNu4srCV0Qea5ybPA=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 5cdf1966ea76..6d357fa49af2 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "session-settings";
-    rev = version;
+    tag = version;
     sha256 = "sha256-4B7lUjHEa4LdKrmsFCB3iFIsdVd/rgwmtQUAgAj3rXs=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index 045d0d5944e4..bbca848ef54d 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "shortcut-overlay";
-    rev = version;
+    tag = version;
     sha256 = "sha256-RWFzs4rw/KC0MXkNfA178FejMbuIBh5FVox1RxmxCJA=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 12b8ca683b28..d8b00958e024 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-C0Vct2xuGHd/G5x0Faif0DfpyNyCLJDxki+O9697c2s=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
index 8c7a2d63047b..54f49f1fe026 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-HECK+IEUAKJ4F1TotTHF84j4BYS6EZdAtLBoM401+mw=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 023e42f1c492..4436c7e0a98c 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "applications-menu";
-    rev = version;
+    tag = version;
     sha256 = "sha256-bwQI41Znm75GFoXxSbWkY9daAJTMvUo+UHyyPmvzOUA=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 5b20d161f7b5..d2761957b1b0 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-N0ehiK8sYAZ/3Lu2u7dut7ZflroFptALFCxjbI0++BA=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index dc8d244b1c6a..7cbac340b930 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-iR80pF3KUe0WboFm2/f1ZK9/wER2LfmRBd92e8jGTHs=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index 53992f8c7b36..90fb6946a43d 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-vPQ+Bt7ggeT3Zzsvbie8Wpu3D2WMEIh8GDOI3frnedM=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index 10d0da9acb9c..f5ebb26b68b0 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-B3loX1yAUQktqNztikUCOHM1DgIu48fMFFol1N4BN7A=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index 209cb7f22027..ac76d6d91e19 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-77+JGJ0/Y9UJwOuKfJAqjNnmZfBy/YiEwCybx6yoVwM=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index 5181cb1797be..8c7794cc41e3 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-fuC9ldDjKuy1kBeFOAIZ/Onhl2o45Xj+YjSrfYz1xvw=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index 28b0333882b9..bc0692e05bff 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-AeeL/OcQ7V3HT3IWhTQHx/dcCSqL/0s/fShPq96V3xE=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix
index 13c589fcfe3a..bbfb7a35f646 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "quick-settings";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-77NkzdE0Z655qeh718L4Mil6FkMxTNaEqh7DLHoldQ4=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index f45aedfdd55a..1bcc2485d288 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-oWgq8rgdK81QsN/LhVUk6YgKYG4pFjVfu00t974n+i8=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index d656aea8ac18..fec223771e8e 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-3UNtqfDqgclRE8Pe9N8rOt6i2FG6lKNfJAv5Q2OYXUU=";
   };
 
diff --git a/pkgs/desktops/pantheon/libraries/granite/7/default.nix b/pkgs/desktops/pantheon/libraries/granite/7/default.nix
index 7e64ff2f1810..ab0f01a668e1 100644
--- a/pkgs/desktops/pantheon/libraries/granite/7/default.nix
+++ b/pkgs/desktops/pantheon/libraries/granite/7/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-bv2rOq16xg9lCWfcLzAFN4LjBTJBxPhXvEJzutkdYzs=";
   };
 
diff --git a/pkgs/desktops/pantheon/libraries/granite/default.nix b/pkgs/desktops/pantheon/libraries/granite/default.nix
index ffbbca7b44c4..6a0cdcf9b165 100644
--- a/pkgs/desktops/pantheon/libraries/granite/default.nix
+++ b/pkgs/desktops/pantheon/libraries/granite/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-WM0Wo9giVP5pkMFaPCHsMfnAP6xD71zg6QLCYV6lmkY=";
   };
 
diff --git a/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix b/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix
index e3977713aa1e..7aa86dcebdd1 100644
--- a/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix
+++ b/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "pantheon-wayland";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-UKGgz3G960dPmcDaFwLjDy55x+mDPdQQv2Ejs7BujLg=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix
index d5fbc6563619..ad4de8241720 100644
--- a/pkgs/desktops/pantheon/services/contractor/default.nix
+++ b/pkgs/desktops/pantheon/services/contractor/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1sqww7zlzl086pjww3d21ah1g78lfrc9aagrqhmsnnbji9gwb8ab";
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix
index 5945fa4c798e..00f598901d17 100644
--- a/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "bluetooth-daemon";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-XRskwLtQKlG96fpIxNZKWG7kn3HR0ngjAUwyn7fnxdY=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index 797c57dee9d9..66ba40972d47 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "capnet-assist";
-    rev = version;
+    tag = version;
     sha256 = "sha256-u+JYJ5J5Cx27MrVlhh6AXAtpKGw7Kf1+MyJEEHqgod0=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
index c6bf79d93f53..250d4eca1bfa 100644
--- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "notifications";
-    rev = version;
+    tag = version;
     sha256 = "sha256-40STrDpMx1WFaTriJNrvkkbzAM0DeBaPdc8o8URItQI=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 5e93b90feb9d..7ea815520491 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "settings-daemon";
-    rev = version;
+    tag = version;
     sha256 = "sha256-mLchzYp2HB4QEJS/Jz9o7ZSKUJtbUUUbFCTHwHZYCEE=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index 9dd3e6d7217d..be05a4bb8f34 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-DvE0/bR4mVfqCw/c/1h75M8DfCiNPZ2h6Jl6ySk1qxs=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
index 4b7d3ca4e1cf..4be8e8376b5f 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-qqeB8SLuES/KoK7ycQ2J1YBA07HITovdnO8kSsrVcfs=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
index cf34497148c5..273f86e5dcd5 100644
--- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
+++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "portals";
-    rev = version;
+    tag = version;
     sha256 = "sha256-pf7xQwsBRjjyOMUPe7fJp1vOhhBmuXJ6Uf4YosxbHtw=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
index 56e684794817..89b489c58352 100644
--- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Bismuth-Forge";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-c13OFEw6E/I8j/mqeLnuc9Chi6pc3+AgwAMPpCzh974=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
index 7f85fa9f0fc7..d3b50518e8e5 100644
--- a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "qunxyz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/Nz0kSDGok7GjqSQtjH/8q/u6blVTFPO6kfjEyt/jEo=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
index 6703944b01ff..2962aee49812 100644
--- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "domschrei";
     repo = "krunner-symbols";
-    rev = version;
+    tag = version;
     sha256 = "sha256-YsoZdPTWpk3/YERwerrVEcaf2IfGVJwpq32onhP8Exo=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
index 676ea18d2e9f..7d6daf03c324 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "d86leader";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1mnwh489i6l8z9s5a1zl7zybkw76pp9fdmmis41mym7r4wz4iznm";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
index 0d62bdf32869..0491994e2e1c 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "esjeon";
     repo = "krohnkite";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HZCD5884pHuHey+d+HRx/F/Sp1b6ZUy7MdqqZ08H0lU=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
index 698af1cadd00..f4e045a22394 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tcorreabr";
     repo = "parachute";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "QIWb1zIGfkS+Bef7LK+JA6XpwGUW+79XZY47j75nlCE=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
index 384635ad9423..c06433367003 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kwin-scripts";
     repo = "kwin-tiling";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "095slpvipy0zcmbn0l7mdnl9g74jaafkr2gqi09b0by5fkvnbh37";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
index cb8189b994ea..45316e1bbe24 100644
--- a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Luwx";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "k1fEZbhzluNlAmj5s/O9X20aCVQxlWQm/Iw/euX7cmI=";
   };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
index 3f0d0e559318..9ba5478f430d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xuzhen";
     repo = "xfce4-dockbarx-plugin";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZxaWORqA8LiM4CzakxClg5C6AsyHrzCGydgboCrC45g=";
   };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix
index a1812ca7dffe..9607c8dcf87e 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "denesb";
     repo = "xfce4-i3-workspaces-plugin";
-    rev = version;
+    tag = version;
     sha256 = "sha256-CKpofupoJhe5IORJgij6gOGotB+dGkUDtTUdon8/JdE=";
   };
 
diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
index 8a379d6c8f3a..6aadd71aa347 100644
--- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Jeinzi";
     repo = "thunar-dropbox";
-    rev = version;
+    tag = version;
     sha256 = "sha256-q7tw/1JgEn9SyjH1KBZl0tintWJjd3ctUs4JUuCWULs=";
   };
 
diff --git a/pkgs/development/ada-modules/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix
index 9d233cee4bd4..9526a301d492 100644
--- a/pkgs/development/ada-modules/gnatcoll/bindings.nix
+++ b/pkgs/development/ada-modules/gnatcoll/bindings.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AdaCore";
     repo = "gnatcoll-bindings";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0ayc7zvv8w90v0xzhrjk2x88zrsk62xxcm27ya9crlp6affn5idk";
   };
 
diff --git a/pkgs/development/ada-modules/gnatcoll/core.nix b/pkgs/development/ada-modules/gnatcoll/core.nix
index 6cd55e28c0bb..3ba78fd4228f 100644
--- a/pkgs/development/ada-modules/gnatcoll/core.nix
+++ b/pkgs/development/ada-modules/gnatcoll/core.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AdaCore";
     repo = "gnatcoll-core";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1srnh7vhs46c2zy4hcy4pg0a0prghfzlpv7c82k0jan384yz1g6g";
   };
 
diff --git a/pkgs/development/ada-modules/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix
index ad2c90c44438..e4dc3f98059b 100644
--- a/pkgs/development/ada-modules/gnatcoll/db.nix
+++ b/pkgs/development/ada-modules/gnatcoll/db.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AdaCore";
     repo = "gnatcoll-db";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0q35ii0aa4hh59v768l5cilg1b30a4ckcvlbfy0lkcbp3rcfnbz3";
   };
 
diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix
index c9377237be8c..694aeff89ffc 100644
--- a/pkgs/development/ada-modules/gnatprove/default.nix
+++ b/pkgs/development/ada-modules/gnatprove/default.nix
@@ -24,7 +24,7 @@ let
         src = fetchFromGitHub {
           owner = "AdaCore";
           repo = "gpr";
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-Tp+N9VLKjVWs1VRPYE0mQY3rl4E5iGb8xDoNatEYBg4=";
         };
       });
diff --git a/pkgs/development/ada-modules/gprbuild/boot.nix b/pkgs/development/ada-modules/gprbuild/boot.nix
index 8b7ad156d8a2..d7da05e398d2 100644
--- a/pkgs/development/ada-modules/gprbuild/boot.nix
+++ b/pkgs/development/ada-modules/gprbuild/boot.nix
@@ -14,7 +14,7 @@ let
     name = "gprconfig-kb-${version}-src";
     owner = "AdaCore";
     repo = "gprconfig_kb";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09x1njq0i0z7fbwg0mg39r5ghy7369avbqvdycfj67lpmw17gb1r";
   };
 in
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     name = "gprbuild-${version}";
     owner = "AdaCore";
     repo = "gprbuild";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1mqsmc0q5bzg8223ls18kbvaz6mhzjz7ik8d3sqhhn24c0j6wjaw";
   };
 
diff --git a/pkgs/development/ada-modules/xmlada/default.nix b/pkgs/development/ada-modules/xmlada/default.nix
index 987fef8c8fe7..1cec4d36d59a 100644
--- a/pkgs/development/ada-modules/xmlada/default.nix
+++ b/pkgs/development/ada-modules/xmlada/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     name = "xmlada-${version}-src";
     owner = "AdaCore";
     repo = "xmlada";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UMJiXSHMS8+X5gyV1nmC29gF71BFnz7LNPQnwUMD3Yg=";
   };
 
diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix
index 77891bd51268..eeeed4375d2c 100644
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "elixir-lsp";
     repo = "elixir-ls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-y1QT+wRFc+++OVFJwEheqcDIwaKHlyjbhEjhLJ2rYaI=";
   };
 in
diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix
index c9b2deaeea42..e7c463589f1d 100644
--- a/pkgs/development/beam-modules/elvis-erlang/default.nix
+++ b/pkgs/development/beam-modules/elvis-erlang/default.nix
@@ -20,7 +20,7 @@ rebar3Relx rec {
   src = fetchFromGitHub {
     inherit owner repo;
     sha256 = "13QM6UbH+1PxzhY/ufi5PEP2pKqSl5+g6tMvKmOUMb0=";
-    rev = version;
+    tag = version;
   };
   beamDeps = builtins.attrValues (
     import ./rebar-deps.nix {
diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix
index 548cb2ee4d06..0e3484892b9d 100644
--- a/pkgs/development/beam-modules/erlang-ls/default.nix
+++ b/pkgs/development/beam-modules/erlang-ls/default.nix
@@ -49,7 +49,7 @@ rebar3Relx {
   src = fetchFromGitHub {
     inherit owner repo;
     hash = "sha256-MSDBU+blsAdeixaHMMXmeMJ+9Yrzn3HekE8KbIc/Guo=";
-    rev = version;
+    tag = version;
   };
 
   # remove when fixed upstream https://github.com/erlang-ls/erlang_ls/pull/1576
diff --git a/pkgs/development/beam-modules/erlfmt/default.nix b/pkgs/development/beam-modules/erlfmt/default.nix
index 405aec021fc3..20dba9f61531 100644
--- a/pkgs/development/beam-modules/erlfmt/default.nix
+++ b/pkgs/development/beam-modules/erlfmt/default.nix
@@ -12,7 +12,7 @@ rebar3Relx rec {
     owner = "WhatsApp";
     repo = "erlfmt";
     sha256 = "sha256-O7+7dMgmnNd9hHuRcJqMAI0gmONz5EO3qSlUC3tufh0=";
-    rev = "v${version}";
+    tag = "v${version}";
   };
   meta = with lib; {
     homepage = "https://github.com/WhatsApp/erlfmt";
diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index e5ec87da1e16..5d9a4ae56005 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "${pname}";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2tam+3vYLC216Q78GIUI3fGnE5FJ/lECJAUQMSxz46w=";
   };
 in
diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index 74de36b9269e..b45ffc1c1df1 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -23,7 +23,7 @@ let
       src = fetchFromGitHub {
         owner = "hexpm";
         repo = "hex";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = "sha256-pEfd2BqkVwZVbnka98MafJ/NRn94BHh+wM0i2Q5duTo=";
       };
 
diff --git a/pkgs/development/beam-modules/rebar3-nix/default.nix b/pkgs/development/beam-modules/rebar3-nix/default.nix
index f4c195159873..799731a07cd1 100644
--- a/pkgs/development/beam-modules/rebar3-nix/default.nix
+++ b/pkgs/development/beam-modules/rebar3-nix/default.nix
@@ -9,7 +9,7 @@ buildRebar3 rec {
   src = fetchFromGitHub {
     owner = "erlang-nix";
     repo = name;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "10ijc06qvv5hqv0qy3w7mbv9pshdb8bvy0f3phr1vd5hksbk731y";
   };
 
diff --git a/pkgs/development/compilers/alan/default.nix b/pkgs/development/compilers/alan/default.nix
index 3a3fcfef81f2..df1dc369ed7f 100644
--- a/pkgs/development/compilers/alan/default.nix
+++ b/pkgs/development/compilers/alan/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alan-if";
     repo = "alan";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0zfg1frmb4yl39hk8h733bmlwk4rkikzfhvv7j34cxpdpsp7spzl";
   };
 
diff --git a/pkgs/development/compilers/armips/default.nix b/pkgs/development/compilers/armips/default.nix
index c8386845b35a..3c3cbe7ed715 100644
--- a/pkgs/development/compilers/armips/default.nix
+++ b/pkgs/development/compilers/armips/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Kingcom";
     repo = "armips";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA=";
   };
 
diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix
index 2adb096e2099..8e78ca2669dd 100644
--- a/pkgs/development/compilers/chicken/4/egg2nix.nix
+++ b/pkgs/development/compilers/chicken/4/egg2nix.nix
@@ -15,7 +15,7 @@ eggDerivation rec {
   src = fetchFromGitHub {
     owner = "the-kenny";
     repo = "egg2nix";
-    rev = version;
+    tag = version;
     sha256 = "sha256-5ov2SWVyTUQ6NHnZNPRywd9e7oIxHlVWv4uWbsNaj/s=";
   };
 
diff --git a/pkgs/development/compilers/codon/default.nix b/pkgs/development/compilers/codon/default.nix
index 491f38f2606a..c4f779ec60cb 100644
--- a/pkgs/development/compilers/codon/default.nix
+++ b/pkgs/development/compilers/codon/default.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "exaloop";
     repo = "codon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-s2GqiFcekXRts8BU5CSmTrkFZ9xLqq4A5MybhB1o1Gg=";
   };
 
diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix
index 6094f07057a0..15515a834382 100644
--- a/pkgs/development/compilers/corretto/11.nix
+++ b/pkgs/development/compilers/corretto/11.nix
@@ -30,7 +30,7 @@ let
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-11";
-      rev = version;
+      tag = version;
       hash = "sha256-ewGGj4BHmwoPdULeT3PSI0Fo9T3cFbTO7cZXhzuKISY=";
     };
   };
diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix
index ec1c7d759798..1c25be045d28 100644
--- a/pkgs/development/compilers/corretto/17.nix
+++ b/pkgs/development/compilers/corretto/17.nix
@@ -25,7 +25,7 @@ let
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-17";
-      rev = version;
+      tag = version;
       hash = "sha256-2jMre5aI02uDFjSgToTyVNriyb4EuZ01lKsNi822o5Q=";
     };
   };
diff --git a/pkgs/development/compilers/corretto/21.nix b/pkgs/development/compilers/corretto/21.nix
index 731eecca1fb3..421b89c25b2e 100644
--- a/pkgs/development/compilers/corretto/21.nix
+++ b/pkgs/development/compilers/corretto/21.nix
@@ -25,7 +25,7 @@ let
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-21";
-      rev = version;
+      tag = version;
       hash = "sha256-Df2Pq2aPrTxD4FeqG12apE/USfQULmMGsDsgXrmCINc=";
     };
   };
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index f87a4a0ab37d..3c72df0a6fff 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -104,7 +104,7 @@ let
       src = fetchFromGitHub {
         owner = "crystal-lang";
         repo = "crystal";
-        rev = version;
+        tag = version;
         inherit sha256;
       };
 
diff --git a/pkgs/development/compilers/elm/packages/elm-review/default.nix b/pkgs/development/compilers/elm/packages/elm-review/default.nix
index 1143e960a161..d47a413ebdd3 100644
--- a/pkgs/development/compilers/elm/packages/elm-review/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-review/default.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jfmengels";
     repo = "node-elm-review";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HQ7ilGfw/sMXMQVoJQAj31LbyJfdCfbrZ22gTh1vbD8=";
   };
 
diff --git a/pkgs/development/compilers/elm/packages/elm-test/default.nix b/pkgs/development/compilers/elm/packages/elm-test/default.nix
index ac96b39ed866..15248f1d7ba8 100644
--- a/pkgs/development/compilers/elm/packages/elm-test/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-test/default.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "rtfeldman";
     repo = "node-test-runner";
-    rev = version;
+    tag = version;
     hash = "sha256-y9ejNZHtgRtZCKE1myH+LwZMOaPdG9for0zCH7xGSR4=";
   };
 
diff --git a/pkgs/development/compilers/elm/packages/node/default.nix b/pkgs/development/compilers/elm/packages/node/default.nix
index 6e0f9c4055c4..2d9939c3dcbf 100644
--- a/pkgs/development/compilers/elm/packages/node/default.nix
+++ b/pkgs/development/compilers/elm/packages/node/default.nix
@@ -23,7 +23,7 @@ let
             src = pkgs.fetchFromGitHub {
               owner = "evanw";
               repo = "esbuild";
-              rev = "v${version}";
+              tag = "v${version}";
               hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
             };
             vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix b/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix
index 45d9079105fa..69babe55e91f 100644
--- a/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix
+++ b/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix
@@ -17,7 +17,7 @@ let
             src = pkgs.fetchFromGitHub {
               owner = "evanw";
               repo = "esbuild";
-              rev = "v${version}";
+              tag = "v${version}";
               hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";
             };
             vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 54386a3ca24e..48996b63a84b 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     owner = "emscripten-core";
     repo = "emscripten";
     hash = "sha256-QlC2k2rhF3/Pz+knnrlBDV8AfHHBSlGr7b9Ae6TNsxY=";
-    rev = version;
+    tag = version;
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index dd055799863f..1727eb60907f 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -72,7 +72,7 @@ let
         src = fetchFromGitHub {
           owner = "flutter";
           repo = "flutter";
-          rev = version;
+          tag = version;
           hash = flutterHash;
         };
       };
diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index 0dd7a1819fa9..4b8f0b0a9112 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "FStarLang";
     repo = "FStar";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yaA6WpP2XIQhjK7kpXBdBFUgKZyvtThd6JmSchUCfbI=";
   };
 
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 4756acfb425f..abef7a1cb471 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -72,7 +72,7 @@ let
       src = fetchFromGitHub {
         owner = "HaxeFoundation";
         repo = "haxe";
-        rev = version;
+        tag = version;
         fetchSubmodules = true;
         inherit hash;
       };
diff --git a/pkgs/development/compilers/idris2/idris2.nix b/pkgs/development/compilers/idris2/idris2.nix
index 6f39eea61868..fbbac4c06dcf 100644
--- a/pkgs/development/compilers/idris2/idris2.nix
+++ b/pkgs/development/compilers/idris2/idris2.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "idris-lang";
     repo = "Idris2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
   };
 
diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix
index 67f3f931025f..fd81b2cf9d09 100644
--- a/pkgs/development/compilers/koka/default.nix
+++ b/pkgs/development/compilers/koka/default.nix
@@ -36,7 +36,7 @@ let
   src = fetchFromGitHub {
     owner = "koka-lang";
     repo = "koka";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BNkMtYf5maWtKEZzob+218ke1SIkrP7/nboQ2sZKkxI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix
index 620e4716dd5b..9d824e2d1b50 100644
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/pkgs/development/compilers/mkcl/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jcbeaudoin";
     repo = "mkcl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0i2bfkda20lfypis6i4m7srfz6miyf66d8knp693d6sms73m2l26";
   };
 
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index 17df7fa6f050..51620be97110 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenShadingLanguage";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E/LUTtT0ZU0SBuwtJPA0FznvOuc2a3aJn2/n3ru5l0s=";
   };
 
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index c35a325ba01a..b7c1df3ef819 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "polyml";
     repo = "polyml";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755";
   };
 
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 99b6889eb4d6..416911fbcaba 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "polyml";
     repo = "polyml";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA=";
   };
 
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index a78cd863dabd..6340a5f5d3fd 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (rec {
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-cCZo/lOvSvF19SGQ9BU2J3EBKHF9PgRBhuUVBkggF9I=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix
index f56b4d0f5b19..283ceceea63d 100644
--- a/pkgs/development/compilers/ponyc/pony-corral.nix
+++ b/pkgs/development/compilers/ponyc/pony-corral.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "corral";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-arcMtCSbXFLBT2ygdj44UKMdGStlgHyiBgt5xZpPRhs=";
   };
 
diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix
index 95143226b041..7eb7c75a5948 100644
--- a/pkgs/development/compilers/rust/cargo-auditable.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable.nix
@@ -15,7 +15,7 @@ let
     src = fetchFromGitHub {
       owner = "rust-secure-code";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8=";
     };
 
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index cbbb42b62cfc..612a5f3319a7 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "shaderc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Cwp7WbaKWw/wL9m70wfYu47xoUGQW+QGeoYhbyyzstQ=";
   };
 
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
index e90eb300ffdc..741430eef237 100644
--- a/pkgs/development/compilers/x11basic/default.nix
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kollokollo";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2";
   };
 
diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
index 82ff16fe5ed4..e96674c9150f 100644
--- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix
+++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
@@ -17,7 +17,7 @@ let
   src = fetchFromGitHub {
     owner = "chipsalliance";
     repo = "yosys-f4pga-plugins";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XIn5wFw8i2njDN0Arua5BdZ0u1q6a/aJAs48YICehsc=";
   };
 
diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index eb08623f2013..6e6d4cad160f 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ziglang";
     repo = "zig";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     inherit hash;
   };
 
diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix
index 133e5b02fda6..e1c19a039974 100644
--- a/pkgs/development/embedded/arduino/arduino-core/default.nix
+++ b/pkgs/development/embedded/arduino/arduino-core/default.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arduino";
     repo = "Arduino";
-    rev = version;
+    tag = version;
     sha256 = "sha256-I+PvfGc5F8H/NJOGRa18z7dKyKcO8I8Cg7Tj5yxkYAQ=";
   };
 
diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix
index 85e011d22dc1..0fdf4ad1166e 100644
--- a/pkgs/development/embedded/fpga/apio/default.nix
+++ b/pkgs/development/embedded/fpga/apio/default.nix
@@ -24,7 +24,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "FPGAwars";
     repo = "apio";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VU4tOszGkw20DWW2SerFsnjFiSkrSwqBcwosGnHJfU8=";
   };
 
diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix
index 7babd86443a3..42bab28b3935 100644
--- a/pkgs/development/embedded/fpga/ecpdap/default.nix
+++ b/pkgs/development/embedded/fpga/ecpdap/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "adamgreig";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pgQqDRdewBSCm1/9/r8E9DBzwSKAaons3e6OLNv5gHM=";
   };
 
diff --git a/pkgs/development/embedded/fpga/fujprog/default.nix b/pkgs/development/embedded/fpga/fujprog/default.nix
index fea0900ab2af..78074e36bd36 100644
--- a/pkgs/development/embedded/fpga/fujprog/default.nix
+++ b/pkgs/development/embedded/fpga/fujprog/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kost";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5";
   };
 
diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix
index 76ff17c0b6fe..68e0959dec59 100644
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Koromix";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MKhh0ooDZI1Ks8vVuPRiHhpOqStetGaAhE2ulvBstxA=";
   };
 
diff --git a/pkgs/development/emilua-plugins/bech32/default.nix b/pkgs/development/emilua-plugins/bech32/default.nix
index dee2e9973768..9d27e05b74e3 100644
--- a/pkgs/development/emilua-plugins/bech32/default.nix
+++ b/pkgs/development/emilua-plugins/bech32/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "bech32";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DJUdwnX9jHKpVYRkP/UFYNefphbqCoUIjXLTNQ5umis=";
   };
 
diff --git a/pkgs/development/emilua-plugins/botan/default.nix b/pkgs/development/emilua-plugins/botan/default.nix
index 806ed5d8526d..1b7f361ef277 100644
--- a/pkgs/development/emilua-plugins/botan/default.nix
+++ b/pkgs/development/emilua-plugins/botan/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "botan";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-b5yOkjXKnJBQWSKCqiHJcznH1QOmTVgBbS5IwP3VTXA=";
   };
 
diff --git a/pkgs/development/emilua-plugins/qt5/default.nix b/pkgs/development/emilua-plugins/qt5/default.nix
index a8667331ad00..c24ddab607b4 100644
--- a/pkgs/development/emilua-plugins/qt5/default.nix
+++ b/pkgs/development/emilua-plugins/qt5/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "qt5";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9w9E0RWwW3scbmOOXdOXj22LR65a6XBHDkC8eimAfUs=";
   };
 
diff --git a/pkgs/development/emilua-plugins/qt6/default.nix b/pkgs/development/emilua-plugins/qt6/default.nix
index 1a482ef91053..2d8008a3a849 100644
--- a/pkgs/development/emilua-plugins/qt6/default.nix
+++ b/pkgs/development/emilua-plugins/qt6/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "qt6";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/GIEMkJnF/nubbTya9SDm3Zb8dvdbPQCMrgKtRtIrMs=";
   };
 
diff --git a/pkgs/development/emilua-plugins/secp256k1/default.nix b/pkgs/development/emilua-plugins/secp256k1/default.nix
index 64dd6ad939ea..4e58e7690323 100644
--- a/pkgs/development/emilua-plugins/secp256k1/default.nix
+++ b/pkgs/development/emilua-plugins/secp256k1/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "secp256k1";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-u3o6kE1HykxH2KbrJmNTDz9IbT+e26Vxze5RzvfCfVA=";
   };
 
diff --git a/pkgs/development/emilua-plugins/tdlib/default.nix b/pkgs/development/emilua-plugins/tdlib/default.nix
index 611c1cd33b16..bbd60aaedb28 100644
--- a/pkgs/development/emilua-plugins/tdlib/default.nix
+++ b/pkgs/development/emilua-plugins/tdlib/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "tdlib";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dqbSECQLM664l2QrkEAfT65/NBI0ghj286dt7eaxcks=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/emilua-plugins/this-thread/default.nix b/pkgs/development/emilua-plugins/this-thread/default.nix
index cb3e328c464a..6b7e46a37f6d 100644
--- a/pkgs/development/emilua-plugins/this-thread/default.nix
+++ b/pkgs/development/emilua-plugins/this-thread/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "this-thread";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3f2nB6KwNka0P7jnvMZF2+ExuTmICj2NswmRWB+YDKo=";
   };
 
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 40ba605fe792..1f37baeba7bb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -3090,7 +3090,7 @@ self: super:
       src = pkgs.fetchFromGitHub {
         owner = "PostgREST";
         repo = "postgrest";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-peXM5/K034Phcy5vNhc5AT3/9oGXohVogFN9gRsSosY=";
       };
     })
diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix
index f1170c103237..6dee57e7ddf9 100644
--- a/pkgs/development/idris-modules/sdl2.nix
+++ b/pkgs/development/idris-modules/sdl2.nix
@@ -27,7 +27,7 @@ build-idris-package rec {
   src = fetchFromGitHub {
     owner = "steshaw";
     repo = "idris-sdl2";
-    rev = version;
+    tag = version;
     sha256 = "1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a";
   };
 
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 3f6fbe627898..b9a26112c7f2 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acl2-devel";
     repo = "acl2-devel";
-    rev = version;
+    tag = version;
     sha256 = "12cv5ms1j3vfrq066km020nwxb6x2dzh12g8nz6xxyxysn44wzzi";
   };
 
diff --git a/pkgs/development/interpreters/clojure/obb.nix b/pkgs/development/interpreters/clojure/obb.nix
index e367bcd72df9..a24e4cfe4f5b 100644
--- a/pkgs/development/interpreters/clojure/obb.nix
+++ b/pkgs/development/interpreters/clojure/obb.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "babashka";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1Gxh4IMtytQCuPS+BWOc5AgjEBxa43ebYfDsxLSPeY0=";
   };
 
diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index 79c291f08e02..e60852c16c39 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/pkgs/development/interpreters/evcxr/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "evcxr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6gSJJ3ptqpYydjg+xf5Pz3iTk0D+bkC6N79OeiKxPHY=";
   };
 
diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix
index f7570e745d3d..b892ad686b99 100644
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "gdl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-IrCLL8MQp0SkWj7sbfZlma5FrnMbgdl4E/1nPGy0Y60=";
   };
 
diff --git a/pkgs/development/interpreters/janet/jpm.nix b/pkgs/development/interpreters/janet/jpm.nix
index 2982822bb508..4382e3d9b80e 100644
--- a/pkgs/development/interpreters/janet/jpm.nix
+++ b/pkgs/development/interpreters/janet/jpm.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "janet-lang";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lPB4jew6RkJlDp8xOQ4YA9MkgLBImaBHcvv4WF/sLRc=";
   };
 
diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
index 2120ac516a3f..19e415855d8e 100644
--- a/pkgs/development/interpreters/love/0.10.nix
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "love2d";
     repo = "love";
-    rev = version;
+    tag = version;
     sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym";
   };
 
diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix
index 785db5e9939c..e5da81ef084a 100644
--- a/pkgs/development/interpreters/love/11.nix
+++ b/pkgs/development/interpreters/love/11.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "love2d";
     repo = "love";
-    rev = version;
+    tag = version;
     sha256 = "sha256-wZktNh4UB3QH2wAIIlnYUlNoXbjEDwUmPnT4vesZNm0=";
   };
 
diff --git a/pkgs/development/interpreters/luajit/openresty.nix b/pkgs/development/interpreters/luajit/openresty.nix
index 5a1397ec3da1..04779db52e26 100644
--- a/pkgs/development/interpreters/luajit/openresty.nix
+++ b/pkgs/development/interpreters/luajit/openresty.nix
@@ -11,7 +11,7 @@ callPackage ./default.nix rec {
   src = fetchFromGitHub {
     owner = "openresty";
     repo = "luajit2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kMHE4iQtm2CujK9TVut1jNhY2QxYP514jfBsxOCyd4s=";
   };
 
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 1a9c554dc5a8..ec3561064341 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -99,7 +99,7 @@ let
   src = fetchFromGitHub {
     owner = "ActiveState";
     repo = "cpython";
-    rev = "v${version}";
+    tag = "v${version}";
     inherit hash;
   };
 
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 145f515a3c1d..346f358cd323 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rakudo";
     repo = "rakudo";
-    rev = version;
+    tag = version;
     hash = "sha256-NrbeB6/VnxlUt6glIvetK1o9huWaeVD6WLdpi4bb2FU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index 9000fab8bb72..1d057f11b913 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moarvm";
     repo = "moarvm";
-    rev = version;
+    tag = version;
     hash = "sha256-Xvkn1edzOeXBiBn2QSwk0eKfSG1JvfSkVrCAmyYtlmI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index b1d06179fc23..4a4e68fb9eda 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "raku";
     repo = "nqp";
-    rev = version;
+    tag = version;
     hash = "sha256-45L3fEL8jIk9bkKpuhrsLM014zNW1P7Kf6qVXxJjWws=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 9201f0e9c947..15cb6c5b524d 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IQeYmqCXhzWsuufrLKeBI2sw86dXbn7c5DbmcoJTWvo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix
index 823e816e03fd..ac50f5abb76c 100644
--- a/pkgs/development/libraries/abseil-cpp/202103.nix
+++ b/pkgs/development/libraries/abseil-cpp/202103.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "abseil";
     repo = "abseil-cpp";
-    rev = version;
+    tag = version;
     sha256 = "sha256-fcxPhuI2eL/fnd6nT11p8DpUNwGNaXZmd03yOiZcOT0=";
   };
 
diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix
index 60a74c353f3e..ae57c0ddf56e 100644
--- a/pkgs/development/libraries/agda/agda-categories/default.nix
+++ b/pkgs/development/libraries/agda/agda-categories/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agda";
     repo = "agda-categories";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GQuQxzYSQxAIVSJ1vf0blRC0juoxAqD1AHW66H/6NSk=";
   };
 
diff --git a/pkgs/development/libraries/agda/agdarsec/default.nix b/pkgs/development/libraries/agda/agdarsec/default.nix
index 257172ad3178..6320dbc5e7ba 100644
--- a/pkgs/development/libraries/agda/agdarsec/default.nix
+++ b/pkgs/development/libraries/agda/agdarsec/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gallais";
     repo = "agdarsec";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "02fqkycvicw6m2xsz8p01aq8n3gj2d2gyx8sgj15l46f8434fy0x";
   };
 
diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix
index 8d33b36c55ed..b20c3d41700c 100644
--- a/pkgs/development/libraries/agda/cubical/default.nix
+++ b/pkgs/development/libraries/agda/cubical/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "agda";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oLpKRWfQqb6CIscC2XM0ia9HJ8edJFHoPeql3kfvyrA=";
   };
 
diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
index 40ec014ca129..88c6a0a34003 100644
--- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
+++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     repo = "functional-linear-algebra";
     owner = "ryanorendorff";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3nme/eH4pY6bD0DkhL4Dj/Vp/WnZqkQtZTNk+n1oAyY=";
   };
 
diff --git a/pkgs/development/libraries/agda/generic/default.nix b/pkgs/development/libraries/agda/generic/default.nix
index 4f2a787dc667..6f2aa2a1b275 100644
--- a/pkgs/development/libraries/agda/generic/default.nix
+++ b/pkgs/development/libraries/agda/generic/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "effectfully";
     repo = "Generic";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "05igsd2gaj6h9bkqwp8llhvn4qvc5gmi03x4fnz096ba8m6x8s3n";
   };
 
diff --git a/pkgs/development/libraries/agda/generics/default.nix b/pkgs/development/libraries/agda/generics/default.nix
index 71219e334612..b7d1bfa72a12 100644
--- a/pkgs/development/libraries/agda/generics/default.nix
+++ b/pkgs/development/libraries/agda/generics/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flupe";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-B1eT6F0Dp2zto50ulf+K/KYMlMp8Pgc/tO9qkcqn+O8=";
   };
 
diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix
index 55505f0edf42..34b8788e3800 100644
--- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix
@@ -11,7 +11,7 @@ mkDerivation (rec {
   src = fetchFromGitHub {
     owner = "cedille";
     repo = "ial";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0dlis6v6nzbscf713cmwlx8h9n2gxghci8y21qak3hp18gkxdp0g";
   };
 
diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix
index f05158d56a1c..719883b5714d 100644
--- a/pkgs/development/libraries/agda/standard-library/default.nix
+++ b/pkgs/development/libraries/agda/standard-library/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     repo = "agda-stdlib";
     owner = "agda";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/Fy5EOSbVNXt6Jq0yKSnlNPW4SYfn+eCTAYFnMZrbR0=";
   };
 
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 091edf349412..c7d2466a70cf 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alembic";
     repo = "alembic";
-    rev = version;
+    tag = version;
     hash = "sha256-R69UYyvLnMwv1JzEQ6S6elvR83Rmvc8acBJwSV/+hCk=";
   };
 
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index b8c0b72062ac..716046b1e51f 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "liballeg";
     repo = "allegro5";
-    rev = version;
+    tag = version;
     sha256 = "sha256-agE3K+6VhhG/LO52fiesCsOq1fNYVRhdW7aKdPCbTOo=";
   };
 
diff --git a/pkgs/development/libraries/applet-window-buttons/default.nix b/pkgs/development/libraries/applet-window-buttons/default.nix
index ed67ddd197af..6bf873562dbc 100644
--- a/pkgs/development/libraries/applet-window-buttons/default.nix
+++ b/pkgs/development/libraries/applet-window-buttons/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psifidotos";
     repo = "applet-window-buttons";
-    rev = version;
+    tag = version;
     hash = "sha256-Qww/22bEmjuq+R3o0UDcS6U+34qjaeSEy+g681/hcfE=";
   };
 
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
index e289cc2c3f9f..9824a7c76eb4 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thestk";
     repo = "rtaudio";
-    rev = version;
+    tag = version;
     sha256 = "0xvahlfj3ysgsjsp53q81hayzw7f99n1g214gh7dwdr52kv2l987";
   };
 
diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index a3bf187dd9c2..78636fbdddbf 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "lv2";
     repo = "suil";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rP8tq+zmHrAZeuNttakPPfraFXNvnwqbhtt+LtTNV/k=";
   };
 
diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix
index ef2a51754de2..751d645a15d5 100644
--- a/pkgs/development/libraries/aws-c-io/default.nix
+++ b/pkgs/development/libraries/aws-c-io/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/pG/+MHAu/TYTtY/RQrr1U1ev2FZ1p/O8kIRUDDOcvQ=";
   };
 
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 47ef7a371a72..f9c8634cc03e 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sdk-cpp";
-    rev = version;
+    tag = version;
     hash = "sha256-K0UFs7vOeZeQIs3G5L4FfEWXDGTXT9ssr/vQwa1l2lw=";
   };
 
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index 63be83763eb2..416be32fdd00 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bulletphysics";
     repo = "bullet3";
-    rev = version;
+    tag = version;
     sha256 = "sha256-AGP05GoxLjHqlnW63/KkZe+TjO3IKcgBi+Qb/osQuCM=";
   };
 
diff --git a/pkgs/development/libraries/capstone/4.nix b/pkgs/development/libraries/capstone/4.nix
index d16356dc274d..f7dd2da8320d 100644
--- a/pkgs/development/libraries/capstone/4.nix
+++ b/pkgs/development/libraries/capstone/4.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "capstone-engine";
     repo = "capstone";
-    rev = version;
+    tag = version;
     sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g=";
   };
 
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index df84133c6e5c..25697a52f9b8 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "capstone-engine";
     repo = "capstone";
-    rev = version;
+    tag = version;
     hash = "sha256-ovIvsxVq+/q5UUMzP4WpxzaE0898uayNc1g2Coignnc=";
   };
 
diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix
index 01d35a85d873..5898decaf498 100644
--- a/pkgs/development/libraries/catch2/3.nix
+++ b/pkgs/development/libraries/catch2/3.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2gK+CUpml6AaHcwNoq0tHLr2NwqtMPx+jP80/LLFFr4=";
   };
 
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 087ad0923f26..20c79fe5d1be 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-XnT2ziES94Y4uzWmaxSw7nWegJFQjAqFUG8PkwK5nLU=";
   };
 
diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/development/libraries/cctag/default.nix
index 557f88090405..4a516929d8c9 100644
--- a/pkgs/development/libraries/cctag/default.nix
+++ b/pkgs/development/libraries/cctag/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alicevision";
     repo = "CCTag";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-foB+e7BCuUucyhN8FsI6BIT3/fsNLTjY6QmjkMWZu6A=";
   };
 
diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix
index 2786ea7b1dca..81d19f5beaa1 100644
--- a/pkgs/development/libraries/cctz/default.nix
+++ b/pkgs/development/libraries/cctz/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "cctz";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-F4h8nT1karymV16FFHC0ldSbdOOx5AMstqi4Bc5m3UQ=";
   };
 
diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix
index 2422540de7ff..af07ad14fd8a 100644
--- a/pkgs/development/libraries/ctranslate2/default.nix
+++ b/pkgs/development/libraries/ctranslate2/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenNMT";
     repo = "CTranslate2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2Znrt+TiQf/9YI1HYAikDfqbekAghOvxKoC05S18scQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index 187a9c8470ab..31f34a9666f1 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CxxTest";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17";
   };
 
diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
index 077c52be3735..c47f70a213c9 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "dbus-sharp-glib";
 
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm";
   };
 
diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix
index 538a14597b10..9eaa5f1b3c27 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/default.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "dbus-sharp-glib";
 
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8";
   };
 
diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
index e949ebb05fe5..a782085a0f28 100644
--- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "dbus-sharp";
 
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562";
   };
 
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index 31bb564d3a5a..fe61ae8fcb53 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "dbus-sharp";
 
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7";
   };
 
diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix
index 7b85ec1a18d6..faff6f855ee2 100644
--- a/pkgs/development/libraries/discord-rpc/default.nix
+++ b/pkgs/development/libraries/discord-rpc/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "discordapp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "04cxhqdv5r92lrpnhxf8702a8iackdf3sfk1050z7pijbijiql2a";
   };
 
diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix
index daf0116b06e2..57b7f6a8f691 100644
--- a/pkgs/development/libraries/draco/default.nix
+++ b/pkgs/development/libraries/draco/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "google";
     repo = "draco";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-p0Mn4kGeBBKL7Hoz4IBgb6Go6MdkgE7WZgxAnt1tE/0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/draco/tinygltf.nix b/pkgs/development/libraries/draco/tinygltf.nix
index bce14b2d65d0..ab95b557ee73 100644
--- a/pkgs/development/libraries/draco/tinygltf.nix
+++ b/pkgs/development/libraries/draco/tinygltf.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "syoyo";
     repo = "tinygltf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uQlv+mUWnqUJIXnPf2pVuRg1akcXAfqyBIzPPmm4Np4=";
   };
 
diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix
index ace060f54d07..063e787b9411 100644
--- a/pkgs/development/libraries/embree/default.nix
+++ b/pkgs/development/libraries/embree/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "embree";
     repo = "embree";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bHVokEfnTW2cJqx3Zz2x1hIH07WamPAVFY9tiv6nHd0=";
   };
 
diff --git a/pkgs/development/libraries/flatbuffers/23.nix b/pkgs/development/libraries/flatbuffers/23.nix
index 4e30c3dd37b6..64f0689e69e8 100644
--- a/pkgs/development/libraries/flatbuffers/23.nix
+++ b/pkgs/development/libraries/flatbuffers/23.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "flatbuffers";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE=";
   };
 
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
index f2430aa47b2d..6bf3d4b33d3c 100644
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "flatbuffers";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LApjF14eoqcT11Jp9SaJQbtvK8iIelTY4GJKqjVCpCM=";
   };
 
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index e4d6aaf99037..c04705dd1751 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -32,7 +32,7 @@ let
       src = fetchFromGitHub {
         owner = "fmtlib";
         repo = "fmt";
-        rev = version;
+        tag = version;
         inherit hash;
       };
 
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index b00ba47bbe29..9689d7a130e5 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fplll";
     repo = "fplll";
-    rev = version;
+    tag = version;
     sha256 = "sha256-WvjXaCnUMioSmLlWmLV673mhRjnF+8DU9MqgUmBgaFQ=";
   };
 
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index 08c6b5a3a810..6e2844649e88 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenKinect";
     repo = "libfreenect";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PpJGFWrlQ5sK7TJxQNoPujw1MxWRjphvblwOqnF+mSg=";
   };
 
diff --git a/pkgs/development/libraries/gamenetworkingsockets/default.nix b/pkgs/development/libraries/gamenetworkingsockets/default.nix
index 247d5d76b4a4..957cfe39be9f 100644
--- a/pkgs/development/libraries/gamenetworkingsockets/default.nix
+++ b/pkgs/development/libraries/gamenetworkingsockets/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "12741wmpvy7mcvqqmjg4a7ph75rwliwgclhk4imjijqf2qkvsphd";
   };
 
diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix
index 87505e71a2ff..89ffc74c3686 100644
--- a/pkgs/development/libraries/gensio/default.nix
+++ b/pkgs/development/libraries/gensio/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cminyard";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DlveXTkdNu6Pb/0sL9K5HaOJ9HEhv2gwk5Kka9nI7U0=";
   };
 
diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index e9ff8223501a..46583fd25e07 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maxmind";
     repo = "geoip-api-c";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv";
   };
 
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index f5db48e14988..37204ea70515 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "steveire";
     repo = "grantlee";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY=";
   };
 
diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index 982023d53f3d..b5bf3890a274 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "steveire";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY=";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index c80c40b1d3f4..60c00834df94 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "gstreamer";
     repo = "gst-plugins-rs";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-G6JdZXBNiZfbu6EBTOsJ4Id+BvPhIToZmHHi7zuapnE=";
     # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
     postFetch = ''
diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index 8981e4df3981..451ed44e8234 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mono";
     repo = "gtk-sharp";
-    rev = version;
+    tag = version;
     sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg";
   };
 
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 0644c6b6e984..842e25ff2014 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hunspell";
     repo = "hunspell";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-x2FXxnVIqsf5/UEQcvchAndXBv/3mW8Z55djQAFgNA8=";
   };
 
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 63c24cabe9bb..7ff61c9c9214 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -61,7 +61,7 @@ let
       src = fetchFromGitHub {
         owner = "sbosio";
         repo = "rla-es";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = "sha256-oGnxOGHzDogzUMZESydIxRTbq9Dmd03flwHx16AK1yk=";
       };
       meta = with lib; {
@@ -903,7 +903,7 @@ rec {
     src = fetchFromGitHub {
       owner = "OpenTaal";
       repo = "opentaal-hunspell";
-      rev = version;
+      tag = version;
       sha256 = "0jma8mmrncyzd77kxliyngs4z6z4769g3nh0a7xn2pd4s5y2xdpy";
     };
 
@@ -1194,7 +1194,7 @@ rec {
     src = fetchFromGitHub {
       owner = "spellcheck-ko";
       repo = "hunspell-dict-ko";
-      rev = version;
+      tag = version;
       hash = "sha256-eHuNppqB536wHXftzDghpB3cM9CNFKW1z8f0SNkEiD8=";
     };
 
diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix
index 440790d97ec9..99d8d2d8b208 100644
--- a/pkgs/development/libraries/iksemel/default.nix
+++ b/pkgs/development/libraries/iksemel/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "timothytylee";
     repo = "iksemel-1.4";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh";
   };
 
diff --git a/pkgs/development/libraries/kcolorpicker/default.nix b/pkgs/development/libraries/kcolorpicker/default.nix
index a9ce1f68272d..83b52c249d13 100644
--- a/pkgs/development/libraries/kcolorpicker/default.nix
+++ b/pkgs/development/libraries/kcolorpicker/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ksnip";
     repo = "kColorPicker";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FG/A4pDNuhGPOeJNZlsnX3paEy4ibJVWKxn8rVUGpN8=";
   };
 
diff --git a/pkgs/development/libraries/kddockwidgets/default.nix b/pkgs/development/libraries/kddockwidgets/default.nix
index d9aa3433644d..88ebf0dc73e5 100644
--- a/pkgs/development/libraries/kddockwidgets/default.nix
+++ b/pkgs/development/libraries/kddockwidgets/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KDAB";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VDLHED/QKxccZ18WEPV7GPdr3v7VaizDa5sZq7ei5+g=";
   };
 
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index 258326091b97..258b47edad2d 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "engla";
     repo = "keybinder";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-elL6DZtzCwAtoyGZYP0jAma6tHPks2KAtrziWtBENGU=";
   };
 
diff --git a/pkgs/development/libraries/kimageannotator/default.nix b/pkgs/development/libraries/kimageannotator/default.nix
index ea46ff3f1155..ed7f51cdd36c 100644
--- a/pkgs/development/libraries/kimageannotator/default.nix
+++ b/pkgs/development/libraries/kimageannotator/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ksnip";
     repo = "kImageAnnotator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LFou8gTF/XDBLNQbA4uurYJHQl7yOTKe2OGklUsmPrg=";
   };
 
diff --git a/pkgs/development/libraries/kompute/default.nix b/pkgs/development/libraries/kompute/default.nix
index 6bed23f4eb94..c859101e8951 100644
--- a/pkgs/development/libraries/kompute/default.nix
+++ b/pkgs/development/libraries/kompute/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KomputeProject";
     repo = "kompute";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cf9Ef85R+VKao286+WHLgBWUqgwvuRocgeCzVJOGbdc=";
   };
 
diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix
index 1ccac4b6fa75..45ce18ac4702 100644
--- a/pkgs/development/libraries/l-smash/default.nix
+++ b/pkgs/development/libraries/l-smash/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "l-smash";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0rcq9727im6kd8da8b7kzzbzxdldvmh5nsljj9pvr4m3lj484b02";
   };
 
diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix
index 42d7be0c068c..7c17b7d02e2b 100644
--- a/pkgs/development/libraries/libadwaita/default.nix
+++ b/pkgs/development/libraries/libadwaita/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "libadwaita";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-7AI8Eb6o/Gysli9CprwsgAzz1cGmNU79Qm7OzlsaTFw=";
   };
 
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 25d52e369e47..e1ea19aae24a 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xiph";
     repo = "libao";
-    rev = version;
+    tag = version;
     sha256 = "0svgk4sc9kdhcsfyvbvgm5vpbg3sfr6z5rliflrw49v3x2i4vxq5";
   };
 
diff --git a/pkgs/development/libraries/libarchive-qt/default.nix b/pkgs/development/libraries/libarchive-qt/default.nix
index 1ed4e92e5b9b..e4080c0bd837 100644
--- a/pkgs/development/libraries/libarchive-qt/default.nix
+++ b/pkgs/development/libraries/libarchive-qt/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "marcusbritanicus";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-31a6DsxObSJWyLfT6mVtyjloT26IwFHpH53iuyC2mco=";
   };
 
diff --git a/pkgs/development/libraries/libbtbb/default.nix b/pkgs/development/libraries/libbtbb/default.nix
index 02175448c703..ac04757a3ce6 100644
--- a/pkgs/development/libraries/libbtbb/default.nix
+++ b/pkgs/development/libraries/libbtbb/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d";
   };
 
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 54b362b4ed34..0ca9127d04d6 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "communi";
     repo = "libcommuni";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9eYJpmjW1J48RD6wVJOHmsAgTbauNeeCrXe076ufq1I=";
   };
 
diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix
index 142d768acd68..c64ec6738385 100644
--- a/pkgs/development/libraries/libepoxy/default.nix
+++ b/pkgs/development/libraries/libepoxy/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     fetchFromGitHub {
       owner = "anholt";
       repo = pname;
-      rev = version;
+      tag = version;
       sha256 = "sha256-gZiyPOW2PeTMILcPiUTqPUGRNlMM5mI1z9563v4SgEs=";
     };
 
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index ce75d6c0fe83..120d95710c7d 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "analogdevicesinc";
     repo = "libiio";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-c5HsxCdp1cv5BGTQ/8dc8J893zk9ntbfAudLpqoQ1ow=";
   };
 
diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix
index 04510dc5bca0..7c3f98e21776 100644
--- a/pkgs/development/libraries/libint/default.nix
+++ b/pkgs/development/libraries/libint/default.nix
@@ -150,7 +150,7 @@ let
     src = fetchFromGitHub {
       owner = "evaleev";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-y+Mo8J/UWDrkkNEDAoostb/k6jrhYYeU0u9Incrd2cE=";
     };
 
diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix
index 3062a91186cc..bcc15601d20f 100644
--- a/pkgs/development/libraries/liblqr-1/default.nix
+++ b/pkgs/development/libraries/liblqr-1/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "carlobaldassi";
     repo = "liblqr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "10mrl5k3l2hxjhz4w93n50xwywp6y890rw2vsjcgai8627x5f1df";
   };
 
diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix
index c255ee432d0e..97642dbec6cb 100644
--- a/pkgs/development/libraries/libpulsar/default.nix
+++ b/pkgs/development/libraries/libpulsar/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "pulsar-client-cpp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hY6ivTKWgl/2KLeP6MMAdWcM/LJ5b7zoNVRlg6nx6Sc=";
   };
 
diff --git a/pkgs/development/libraries/libqofono/default.nix b/pkgs/development/libraries/libqofono/default.nix
index 4b67650d3541..731bc7374765 100644
--- a/pkgs/development/libraries/libqofono/default.nix
+++ b/pkgs/development/libraries/libqofono/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sailfishos";
     repo = "libqofono";
-    rev = version;
+    tag = version;
     hash = "sha256-fI7RS0V8wrsJ2AZAyjVgHmG+c13DXdo6xTjIlGbOHI8=";
   };
 
diff --git a/pkgs/development/libraries/libqtdbusmock/default.nix b/pkgs/development/libraries/libqtdbusmock/default.nix
index c5fcb384530f..31a3f47b32fa 100644
--- a/pkgs/development/libraries/libqtdbusmock/default.nix
+++ b/pkgs/development/libraries/libqtdbusmock/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/libqtdbusmock";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-hVw2HnIHlA7vvt0Sr6F2qVhvBZ33aCeqb9vgbu3rgBo=";
   };
 
diff --git a/pkgs/development/libraries/libqtdbustest/default.nix b/pkgs/development/libraries/libqtdbustest/default.nix
index 756fa756c396..394a620964f1 100644
--- a/pkgs/development/libraries/libqtdbustest/default.nix
+++ b/pkgs/development/libraries/libqtdbustest/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/libqtdbustest";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-yqqyKxsbqiVTrkas79YoPMi28dKFNntiE7+dx1v+Qh4=";
   };
 
diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix
index 7964b19391bb..c512ec6747ae 100644
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "quotient-im";
     repo = "libQuotient";
-    rev = version;
+    tag = version;
     hash = "sha256-R9ms3sYGdHaYKUMnZyBjw5KCik05k93vlvXMRtAXh5Y=";
   };
 
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 0a53591d6908..8d3da752c464 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "re";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OWVDuKlF7YLipDURC46s14WOLWWagUqWg20sH0kSIA4=";
   };
 
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 9639193ffb58..5a3f27516f0e 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IntelRealSense";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Stx337mGcpMCg9DlZmvX4LPQmCSzLRFcUQPxaD/Y0Ds=";
   };
 
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 0c91b3e13d8b..3315899d3eca 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-MOOX/O0UaoeMaQPW9PvvE0izVp+6IoE5VbtTx0RvMkI=";
   };
 
diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index 6dab2ea2c6f0..0e294dd19706 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrewrk";
     repo = "libsoundio";
-    rev = version;
+    tag = version;
     sha256 = "12l4rvaypv87vigdrmjz48d4d6sq4gfxf5asvnc4adyabxb73i4x";
   };
 
diff --git a/pkgs/development/libraries/libuiohook/default.nix b/pkgs/development/libraries/libuiohook/default.nix
index e39c2addfac4..9097c2e16e6e 100644
--- a/pkgs/development/libraries/libuiohook/default.nix
+++ b/pkgs/development/libraries/libuiohook/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kwhat";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1qlz55fp4i9dd8sdwmy1m8i4i1jy1s09cpmlxzrgf7v34w72ncm7";
   };
 
diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix
index 904848cf78fb..7ed6385ae8d9 100644
--- a/pkgs/development/libraries/libusb-compat/0.1.nix
+++ b/pkgs/development/libraries/libusb-compat/0.1.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libusb";
     repo = "libusb-compat-0.1";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pAPERYSxoc47gwpPUoMkrbK8TOXyx03939vlFN0hHRg=";
   };
 
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index a02047b552c9..7bb4193497cc 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libusb";
     repo = "libusb";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OtzYxWwiba0jRK9X+4deWWDDTeZWlysEt0qMyGUarDo=";
   };
 
diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix
index 05680090878a..a189bdfcfb9d 100644
--- a/pkgs/development/libraries/libva/1.nix
+++ b/pkgs/development/libraries/libva/1.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "libva";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ur59cqdZqXIY2dDUSie9XsxyRomVBxIW2IVKAgWYC38=";
   };
 
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 9fd523a70610..9c1a9cace939 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "libva";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-0eOYxyMt2M2lkhoWOhoUQgP/1LYY3QQqSF5TdRUuCbs=";
   };
 
diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix
index 1be8fd098fce..d258594d08be 100644
--- a/pkgs/development/libraries/libva/utils.nix
+++ b/pkgs/development/libraries/libva/utils.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "libva-utils";
-    rev = version;
+    tag = version;
     sha256 = "sha256-CmhdhNNRO2j8lH7awp9YiKWMvV17GTBsXdrNY06jT2w=";
   };
 
diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix
index 019749eac91a..62f4696ee6b2 100644
--- a/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/pkgs/development/libraries/liquid-dsp/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jgaeddert";
     repo = "liquid-dsp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8=";
   };
 
diff --git a/pkgs/development/libraries/luksmeta/default.nix b/pkgs/development/libraries/luksmeta/default.nix
index 0968c5374a8f..aec23b942bb2 100644
--- a/pkgs/development/libraries/luksmeta/default.nix
+++ b/pkgs/development/libraries/luksmeta/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "latchset";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "10nslwk7m1qwskd12c204ipa3cbad0q6fn0v084z2f7q6xxbkd2d";
   };
 
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index 60708ed7a4a2..b84eec2a6d8a 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MailCore";
     repo = "mailcore2";
-    rev = version;
+    tag = version;
     sha256 = "0a69q11z194fdfwyazjyyylx57sqs9j4lz7jwh5qcws8syqgb23z";
   };
 
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 5ac9522155f1..3cb96e60fbd8 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mapnik";
     repo = "mapnik";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pReoyMdu8RYrberKcwGw0DKmkxVRJezZYcPAM/UAn6o=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 75355eb4c4c9..44239d8d5160 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -47,7 +47,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/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix
index 885dd5e5137d..ebfacb7fd8b8 100644
--- a/pkgs/development/libraries/mypaint-brushes/1.0.nix
+++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mypaint";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j";
   };
 
diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix
index a8ca5edacc7e..ea15524f8578 100644
--- a/pkgs/development/libraries/mypaint-brushes/default.nix
+++ b/pkgs/development/libraries/mypaint-brushes/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mypaint";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9";
   };
 
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index aacafb1e674f..63e7988c239e 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Unidata";
     repo = "netcdf-fortran";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-nC93NcA4VJbrqaLwyhjP10j/t6rQSYcAzKBxclpZVe0=";
   };
 
diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix
index c354ed018946..992e42d0a685 100644
--- a/pkgs/development/libraries/nghttp3/default.nix
+++ b/pkgs/development/libraries/nghttp3/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SWc7qTQjk03I24nYjzUnOj58ZuV3cbX0G5y4zXwiU4w=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index 2351230a0a7a..14bca8663315 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ize2i2kx9spAWOq3joTZGiAd01cwmBmFXF6jBtyjPWc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix
index accb78d9c411..c4796f8dc374 100644
--- a/pkgs/development/libraries/ngtcp2/gnutls.nix
+++ b/pkgs/development/libraries/ngtcp2/gnutls.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = "ngtcp2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m9kJrEDYfxPSreH14M/h/f+7vgk6Ho6pmvVdJ1S8acc=";
   };
 
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 1e1f5f01c382..7c57b93c7914 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stevengj";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o=";
   };
 
diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index f2e7309b09ed..90a64e90690b 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nuspell";
     repo = "nuspell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-U/lHSxpKsBnamf4ikE2aIjEPSU5fxjtuSmhZR0jxMAI=";
   };
 
diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
index 89eee7dbf8d5..fbaf3732120f 100644
--- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
+++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elFarto";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KeOg9VvPTqIo0qB+dcU915yTztvFxo1jJcHHpsmMmfk=";
   };
 
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 9ec54c3828da..b8274ff4441f 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -57,7 +57,7 @@ let
       src = fetchFromGitHub {
         owner = "OGRECave";
         repo = "ogre";
-        rev = "v${version}";
+        tag = "v${version}";
         inherit hash;
       };
 
diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix
index b6ddc5ebbf63..31828c17defc 100644
--- a/pkgs/development/libraries/ois/default.nix
+++ b/pkgs/development/libraries/ois/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wgois";
     repo = "OIS";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ir6p+Tzf8L5VOW/rsG4yelsth7INbhABO2T7pfMHcFo=";
   };
 
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index 9972d316a941..c9daca95a39d 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kcat";
     repo = "openal-soft";
-    rev = version;
+    tag = version;
     sha256 = "sha256-jwY1NzNJdWIvVv7TvJyg4cIGFLWGZhL3BkMI1NbOEG0=";
   };
 
diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix
index 4ac41482037f..b1d5bcf65331 100644
--- a/pkgs/development/libraries/opencolorio/1.x.nix
+++ b/pkgs/development/libraries/opencolorio/1.x.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "imageworks";
     repo = "OpenColorIO";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb";
   };
 
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 5b5a45b6c372..2f179268b423 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenColorIO";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+P7T8UZuQEVmsMykSWtUxg0vC7Sr4fQJpovCU5sKtsA=";
   };
 
diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index c52dac8dab25..308fc70041d9 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openexr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mVUxxYe6teiJ18PQ9703/kjBpJ9+a7vcDme+NwtQQQM=";
   };
 
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 84dc7fb990e7..5c15c6860020 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openexr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xdC+T79ZQBx/XhuIXtP93Roj0N9lF+E65ReEKQ4kIsg=";
   };
 
diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix
index adb25d2ab3ae..4d205eb499a8 100644
--- a/pkgs/development/libraries/openimageio/default.nix
+++ b/pkgs/development/libraries/openimageio/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenImageIO";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hUCwlzQW5mJH5HYPbLWOcupc36nxM12CV0sakZhiGzo=";
   };
 
diff --git a/pkgs/development/libraries/openvdb/11.nix b/pkgs/development/libraries/openvdb/11.nix
index a65bb286ae2e..ea491b88fc3d 100644
--- a/pkgs/development/libraries/openvdb/11.nix
+++ b/pkgs/development/libraries/openvdb/11.nix
@@ -10,7 +10,7 @@ openvdb.overrideAttrs (old: rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openvdb";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ=";
   };
   meta = old.meta // {
diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
index ff662ed440d7..4b61f111f42f 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/pkgs/development/libraries/openvdb/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openvdb";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-S2uvzDCrTxAmvUMJr5PChcYTqhIHvRZbOfQLtUvzypI=";
   };
 
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix
index c53c31e32c1e..73dbc6ce6731 100644
--- a/pkgs/development/libraries/pangolin/default.nix
+++ b/pkgs/development/libraries/pangolin/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stevenlovegrove";
     repo = "Pangolin";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-B5YuNcJZHjR3dlVs66rySi68j29O3iMtlQvCjTUZBeY=";
   };
 
diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix
index fd298709181e..e528b589e46e 100644
--- a/pkgs/development/libraries/pc-ble-driver/default.nix
+++ b/pkgs/development/libraries/pc-ble-driver/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NordicSemiconductor";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-srH7Gdiy9Lsv68fst/9jhifx03R2e+4kMia6pU/oCZg=";
   };
 
diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix
index 7ed7f08a8337..3520a749dedf 100644
--- a/pkgs/development/libraries/pdfhummus/default.nix
+++ b/pkgs/development/libraries/pdfhummus/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "galkahana";
     repo = "PDF-Writer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sCa/yu+DVggN7Sha7dP9FXzZUJ2tGLYEFrq87dD4tsE=";
   };
 
diff --git a/pkgs/development/libraries/phonetisaurus/default.nix b/pkgs/development/libraries/phonetisaurus/default.nix
index 91a2f3801153..881d93017f46 100644
--- a/pkgs/development/libraries/phonetisaurus/default.nix
+++ b/pkgs/development/libraries/phonetisaurus/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AdolfVonKleist";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1b18s5zz0l0fhqh9n9jnmgjz2hzprwzf6hx5a12zibmmam3qyriv";
   };
 
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 06c44206853a..07408c6641ba 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "pipewire";
     repo = "pipewire";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-TnGn6EVjjpEybslLEvBb66uqOiLg5ngpNV9LYO6TfvA=";
   };
 
diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix
index a1d202232544..4042dc65facd 100644
--- a/pkgs/development/libraries/podofo/0.10.x.nix
+++ b/pkgs/development/libraries/podofo/0.10.x.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "podofo";
     repo = "podofo";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ZY+kyimLzAeEgvDaflXM7MbyzsGgivOnG1aBD9/ozbk=";
   };
 
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix
index 9afbb6018aeb..cb6ee80ef4e9 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/pkgs/development/libraries/portmidi/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-uqBeh9vBP6+V+FN4lfeGxePQcpZMDYUuAo/d9a5rQxU=";
   };
 
diff --git a/pkgs/development/libraries/proj/7.nix b/pkgs/development/libraries/proj/7.nix
index 19f205df4b72..e67377aa3cfe 100644
--- a/pkgs/development/libraries/proj/7.nix
+++ b/pkgs/development/libraries/proj/7.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
-    rev = version;
+    tag = version;
     sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
   };
 
diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 42da509dce8b..cf1b9fd8f1ed 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-sY3AIvsQnV2zi38nJs/U6zTsIgIv4/CaZaxinCg5nEs=";
   };
 
diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix
index 340a87666c14..627acae91079 100644
--- a/pkgs/development/libraries/prometheus-client-c/default.nix
+++ b/pkgs/development/libraries/prometheus-client-c/default.nix
@@ -21,7 +21,7 @@ let
       src = fetchFromGitHub {
         owner = "digitalocean";
         repo = "prometheus-client-c";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = "0g69s24xwrv5974acshrhnp6i8rpby8c6bhz15m3d8kpgjw3cm8f";
       };
 
diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix
index 566c1e05f6ca..58a3c762c45b 100644
--- a/pkgs/development/libraries/pyotherside/default.nix
+++ b/pkgs/development/libraries/pyotherside/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thp";
     repo = "pyotherside";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2OYVULNW9EzssqodiVtL2EmhTSbefXpLkub3zFvNwNo=";
   };
 
diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix
index 92818b35571b..db8cbb06853f 100644
--- a/pkgs/development/libraries/qcoro/default.nix
+++ b/pkgs/development/libraries/qcoro/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "danvratil";
     repo = "qcoro";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-teRuWtNR8r/MHZhqphazr7Jmn43qsHGv9eXOGrhSND0=";
   };
 
diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
index 98bea95922e4..0e4f789b9ed7 100644
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = "QGnomePlatform";
-    rev = version;
+    tag = version;
     sha256 = "sha256-DaIBtWmce+58OOhqFG5802c3EprBAtDXhjiSPIImoOM=";
   };
 
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index 4edb927e2213..076d43f5f503 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flavio";
     repo = "qjson";
-    rev = version;
+    tag = version;
     sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs";
   };
 
diff --git a/pkgs/development/libraries/qmenumodel/default.nix b/pkgs/development/libraries/qmenumodel/default.nix
index 16e23abcc34a..fed362435046 100644
--- a/pkgs/development/libraries/qmenumodel/default.nix
+++ b/pkgs/development/libraries/qmenumodel/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "qmenumodel";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-zbKAfq9R5fD2IqVYOAhy903QX1TDom9m6Ib2qpkFMak=";
   };
 
diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix
index 5f6cf45351f2..810249f35e17 100644
--- a/pkgs/development/libraries/qmlbox2d/default.nix
+++ b/pkgs/development/libraries/qmlbox2d/default.nix
@@ -18,7 +18,7 @@ let
     src = fetchFromGitHub {
       owner = "erincatto";
       repo = "box2d";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs=";
     };
     sourceRoot = "${src.name}/Box2D";
diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index 2ba063f56ea7..54e3bf0ba020 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ayoy";
     repo = "qoauth";
-    rev = "v${version}";
+    tag = "v${version}";
     name = "qoauth-${version}.tar.gz";
     sha256 = "1b2jdqs526ac635yb2whm049spcsk7almnnr6r5b4yqhq922anw3";
   };
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index 401316c38016..269941e6ad9e 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -38,7 +38,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
     src = fetchFromGitHub {
       owner = "qt";
       repo = "qtpositioning";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-L/P+yAQItm3taPpCNoOOm7PNdOFZiIwJJYflk6JDWvU=";
     };
   };
@@ -49,7 +49,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
     src = fetchFromGitHub {
       owner = "qt";
       repo = "qtwebkit";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
     };
     version = "5.212.0-alpha4";
diff --git a/pkgs/development/libraries/qtdbusextended/default.nix b/pkgs/development/libraries/qtdbusextended/default.nix
index c1cc09b29bc1..bad71c85328d 100644
--- a/pkgs/development/libraries/qtdbusextended/default.nix
+++ b/pkgs/development/libraries/qtdbusextended/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nemomobile";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-tUp7OhNBXwomR2tO4UOaR0vJQ3GTirMk/hRl1cMk61o=";
   };
 
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 5ad105a64bac..d7574e438338 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "frankosterfeld";
     repo = "qtkeychain";
-    rev = version;
+    tag = version;
     sha256 = "sha256-/gdozAJbjaaCcttQED2PixaFNRDZOXbBIoV9QLexNUg=";
   };
 
diff --git a/pkgs/development/libraries/qtmpris/default.nix b/pkgs/development/libraries/qtmpris/default.nix
index 6bc94edeb30e..a51804ff3530 100644
--- a/pkgs/development/libraries/qtmpris/default.nix
+++ b/pkgs/development/libraries/qtmpris/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sailfishos";
     repo = "qtmpris";
-    rev = version;
+    tag = version;
     hash = "sha256-kuM8hUdsa7N+eLDbwYw3ay+PWxg35zcTBOvGow1NlzI=";
   };
 
diff --git a/pkgs/development/libraries/qtspell/default.nix b/pkgs/development/libraries/qtspell/default.nix
index fafa13d11457..47a3ff92d1bc 100644
--- a/pkgs/development/libraries/qtspell/default.nix
+++ b/pkgs/development/libraries/qtspell/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "manisandro";
     repo = "qtspell";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-yaR3eCUbK2KTpvzO2G5sr+NEJ2mDnzJzzzwlU780zqU=";
   };
 
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index e82952780c4d..8b2175d60862 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stachenov";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-AOamvy2UgN8n7EZ8EidWkVzRICzEXMmvZsB18UwxIVo=";
   };
 
diff --git a/pkgs/development/libraries/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix
index eaa7fb392e2c..67e4cfa729e1 100644
--- a/pkgs/development/libraries/qwlroots/default.nix
+++ b/pkgs/development/libraries/qwlroots/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vioken";
     repo = "qwlroots";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-ZyG0JGUlz/ubtwN5wYtC8qeYsPur+0kTkD7iIjHX7KU=";
   };
 
diff --git a/pkgs/development/libraries/qxlsx/default.nix b/pkgs/development/libraries/qxlsx/default.nix
index a9280ae76f47..65fa2e07d243 100644
--- a/pkgs/development/libraries/qxlsx/default.nix
+++ b/pkgs/development/libraries/qxlsx/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "QtExcel";
     repo = "QXlsx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-twOlAiLE0v7+9nWo/Gd+oiKT1umL3UnG1Xa0zDG7u7s=";
   };
 
diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix
index 3fe969629394..ab074ec0713d 100644
--- a/pkgs/development/libraries/qxmpp/default.nix
+++ b/pkgs/development/libraries/qxmpp/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "qxmpp-project";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-M3F4tNIO3RvDxk/lce8/J6kmQtnsGLILQ15uEzgyfds=";
   };
 
diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix
index 75e72e16fbc1..b96457840ad2 100644
--- a/pkgs/development/libraries/randomx/default.nix
+++ b/pkgs/development/libraries/randomx/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tevador";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dfImzwbEfJQcaPZCoWypHiI6dishVRdqS/r+n3tfjvM=";
   };
 
diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix
index 98cf154ec1e6..3c26a60210a0 100644
--- a/pkgs/development/libraries/rnnoise-plugin/default.nix
+++ b/pkgs/development/libraries/rnnoise-plugin/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "werman";
     repo = "noise-suppression-for-voice";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sfwHd5Fl2DIoGuPDjELrPp5KpApZJKzQikCJmCzhtY8=";
   };
 
diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
index e30e14e4b031..dd2a3a1414ba 100644
--- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
+++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-zDn5cgMBJYM27mfQHujxhIf4ZTljFxvFrKl7pNa4K9E=";
   };
 
diff --git a/pkgs/development/libraries/science/chemistry/molequeue/default.nix b/pkgs/development/libraries/science/chemistry/molequeue/default.nix
index 4ac575e75238..9c2b918ccc34 100644
--- a/pkgs/development/libraries/science/chemistry/molequeue/default.nix
+++ b/pkgs/development/libraries/science/chemistry/molequeue/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-+NoY8YVseFyBbxc3ttFWiQuHQyy1GN8zvV1jGFjmvLg=";
   };
 
diff --git a/pkgs/development/libraries/science/chemistry/tblite/default.nix b/pkgs/development/libraries/science/chemistry/tblite/default.nix
index 860a9f55d42f..c2ea6e5f7768 100644
--- a/pkgs/development/libraries/science/chemistry/tblite/default.nix
+++ b/pkgs/development/libraries/science/chemistry/tblite/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tblite";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KV2fxB+SF4LilN/87YCvxUt4wsY4YyIV4tqnn+3/0oI=";
   };
 
diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix
index 8bd4297fb95b..b13015088bc2 100644
--- a/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "clMathLibraries";
     repo = "clBLAS";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs";
   };
 
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 9a07f5355219..ca2d13959c18 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -176,7 +176,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenMathLib";
     repo = "OpenBLAS";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-n/3FGmZxnNiOEKYHSIuqX2LJS1BzYPCwLWT9DSwEoPI=";
   };
 
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index adb5b196a34b..3a3f9a90a10b 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -32,7 +32,7 @@ effectiveStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DrTimothyAldenDavis";
     repo = "SuiteSparse";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Anen1YtXsSPhk8DpA4JtADIz9m8oXFl9umlkb4iImf8=";
   };
 
diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix
index bb9a91be24d9..2acb15eb9a0f 100644
--- a/pkgs/development/libraries/soci/default.nix
+++ b/pkgs/development/libraries/soci/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SOCI";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-NE0ApbX8HG2VAQ9cg9+kX3kJQ4PR1XvWL9BlT8NphmE=";
   };
 
diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index d70bd95bef04..f19439c72d63 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/pkgs/development/libraries/sofia-sip/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "freeswitch";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY=";
   };
 
diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix
index 74ffba0e6256..20c69b6adebe 100644
--- a/pkgs/development/libraries/spglib/default.nix
+++ b/pkgs/development/libraries/spglib/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spglib";
     repo = "spglib";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rmQYFFfpyUhT9pfQZk1fN5tZWTg40wwtszhPhiZpXs4=";
   };
 
diff --git a/pkgs/development/libraries/structuresynth/default.nix b/pkgs/development/libraries/structuresynth/default.nix
index 362aaa7e25c9..fe513f19400f 100644
--- a/pkgs/development/libraries/structuresynth/default.nix
+++ b/pkgs/development/libraries/structuresynth/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "alemuntoni";
     repo = "structuresynth";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-uFz4WPwA586B/5p+DUJ/W8KzbHLBhLIwP6mySZJ1vPY=";
   };
 
diff --git a/pkgs/development/libraries/tbb/2020_3.nix b/pkgs/development/libraries/tbb/2020_3.nix
index 0399aa4c165f..0a68be2b5f70 100644
--- a/pkgs/development/libraries/tbb/2020_3.nix
+++ b/pkgs/development/libraries/tbb/2020_3.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneTBB";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";
   };
 
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 05e18da04560..02492ad5b50b 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneTBB";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zGZHMtAUVzBKFbCshpepm3ce3tW6wQ+F30kYYXAQ/TE=";
   };
 
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index b8b68919c807..f1a75b049d1a 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-BP28utEUI9g1VNv3lCXuiKrDtEImFQxxZfIjLiE3Wr8=";
   };
 
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 38d0d8ff4f7f..f9e674915b7a 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -47,7 +47,7 @@
     src = fetchFromGitHub {
       owner = "mariadb-corporation";
       repo = "mariadb-connector-odbc";
-      rev = version;
+      tag = version;
       hash = "sha256-l+HlS7/A0shwsEXYKDhi+QCmwHaMTeKrtcvo9yYpYws=";
       # this driver only seems to build correctly when built against the mariadb-connect-c subrepo
       # (see https://github.com/NixOS/nixpkgs/issues/73258)
diff --git a/pkgs/development/libraries/unqlite/default.nix b/pkgs/development/libraries/unqlite/default.nix
index 4d93dec6f352..ad4a88bb0b6c 100644
--- a/pkgs/development/libraries/unqlite/default.nix
+++ b/pkgs/development/libraries/unqlite/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "symisc";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WLsyGEt7Xe6ZrOGMO7+3TU2sBgDTSmfD1WzD70pcDjo=";
   };
 
diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix
index c894dc31de22..31cf8282036c 100644
--- a/pkgs/development/libraries/vc/0.7.nix
+++ b/pkgs/development/libraries/vc/0.7.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "VcDevel";
     repo = "Vc";
-    rev = version;
+    tag = version;
     sha256 = "190s4r2n3jsivl4j2m288j3rqmgjj6gl308hi9mzwyhcfn17q8br";
   };
 
diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index 8ff1ccd81d53..9e4925babb79 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "VcDevel";
     repo = "Vc";
-    rev = version;
+    tag = version;
     sha256 = "sha256-A2qUzjXv50unFcoZp2nRVinkph+CoHyiU7AgOphDphM=";
   };
 
diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix
index fbb0d0dad266..542c195f76bf 100644
--- a/pkgs/development/libraries/waylandpp/default.nix
+++ b/pkgs/development/libraries/waylandpp/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NilsBrause";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg=";
   };
 
diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix
index 17e2c2eadcb7..e49e900c258e 100644
--- a/pkgs/development/libraries/waylib/default.nix
+++ b/pkgs/development/libraries/waylib/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vioken";
     repo = "waylib";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-djFwUe/+5CNEnOTKL5OAC8zVQqsT8BSqQEWjkbEt7xQ=";
   };
 
diff --git a/pkgs/development/libraries/webkit2-sharp/default.nix b/pkgs/development/libraries/webkit2-sharp/default.nix
index 78b89397b76d..f2f8c58bfaa5 100644
--- a/pkgs/development/libraries/webkit2-sharp/default.nix
+++ b/pkgs/development/libraries/webkit2-sharp/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hbons";
     repo = "webkit2-sharp";
-    rev = version;
+    tag = version;
     sha256 = "sha256:0a7vx81zvzn2wq4q2mqrxvlps1mqk28lm1gpfndqryxm4iiw28vc";
   };
 
diff --git a/pkgs/development/libraries/wiiuse/default.nix b/pkgs/development/libraries/wiiuse/default.nix
index 606dd201f324..34e59bc4ff1f 100644
--- a/pkgs/development/libraries/wiiuse/default.nix
+++ b/pkgs/development/libraries/wiiuse/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wiiuse";
     repo = "wiiuse";
-    rev = version;
+    tag = version;
     sha256 = "sha256-l2CS//7rx5J3kI32yTSp0BDtP0T5+riLowtnxnfAotc=";
   };
 
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index a42a60d002a3..1d74d2c317da 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -49,7 +49,7 @@ let
         domain = "gitlab.freedesktop.org";
         owner = "wlroots";
         repo = "wlroots";
-        rev = finalAttrs.version;
+        tag = finalAttrs.version;
         inherit hash;
       };
 
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index 57e7b8fb80a4..6f44ad33973c 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -31,7 +31,7 @@ let
       src = fetchFromGitHub {
         owner = "emweb";
         repo = "wt";
-        rev = version;
+        tag = version;
         inherit sha256;
       };
 
diff --git a/pkgs/development/libraries/yaml-cpp/default.nix b/pkgs/development/libraries/yaml-cpp/default.nix
index 75941866b604..b8360da44343 100644
--- a/pkgs/development/libraries/yaml-cpp/default.nix
+++ b/pkgs/development/libraries/yaml-cpp/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jbeder";
     repo = "yaml-cpp";
-    rev = version;
+    tag = version;
     hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI=";
   };
 
diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix
index 646188c4c694..e94be184d934 100644
--- a/pkgs/development/libraries/yubico-pam/default.nix
+++ b/pkgs/development/libraries/yubico-pam/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0hb773zlf11xz4bwmsqv2mq5d4aq2g0crdr5cp9xwc4ivi5gd4kg";
   };
 
diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix
index 8badae678e11..407c12650c28 100644
--- a/pkgs/development/libraries/zint/default.nix
+++ b/pkgs/development/libraries/zint/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zint";
     repo = "zint";
-    rev = version;
+    tag = version;
     hash = "sha256-/ILq/7A8Lffe2NuiABiV3KeYXapuL1SO55Qk3wXfC/8=";
   };
 
diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index 9acb067effaf..9e5f7daf367c 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -161,7 +161,7 @@ let
         src = pkgs.fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-5hNB5XxbTER4HX3dn4umUGnw6UeiTQkczmggFz4uWoE=";
         };
         systems = [
diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix
index 94df290fec08..71d6deb6cb93 100644
--- a/pkgs/development/misc/msp430/mspdebug.nix
+++ b/pkgs/development/misc/msp430/mspdebug.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dlbeer";
     repo = "mspdebug";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c";
   };
 
diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix
index 577a6ed1bb90..4f2dd79601d4 100644
--- a/pkgs/development/misc/resholve/deps.nix
+++ b/pkgs/development/misc/resholve/deps.nix
@@ -26,7 +26,7 @@ rec {
     src = fetchFromGitHub {
       owner = "bw2";
       repo = "ConfigArgParse";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz";
     };
 
diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix
index 670010c83562..eebc1207c2d6 100644
--- a/pkgs/development/misc/resholve/source.nix
+++ b/pkgs/development/misc/resholve/source.nix
@@ -8,7 +8,7 @@ rec {
   rSrc = fetchFromGitHub {
     owner = "abathur";
     repo = "resholve";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SzJbA0wLeSwvXnAE4bTNqh0tnpFPkn6N1hp7sZGAkB4=";
   };
 }
diff --git a/pkgs/development/mobile/fdroidcl/default.nix b/pkgs/development/mobile/fdroidcl/default.nix
index 60bccaef812a..b4aad9f14cc1 100644
--- a/pkgs/development/mobile/fdroidcl/default.nix
+++ b/pkgs/development/mobile/fdroidcl/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "fdroidcl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tqhs3b/DHfnGOm9qcM56NSzt1GJflJfbemkp7+nXbug=";
   };
 
diff --git a/pkgs/development/ocaml-modules/afl-persistent/default.nix b/pkgs/development/ocaml-modules/afl-persistent/default.nix
index e1b1c375b332..44f960ab3aac 100644
--- a/pkgs/development/ocaml-modules/afl-persistent/default.nix
+++ b/pkgs/development/ocaml-modules/afl-persistent/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stedolan";
     repo = "ocaml-${pname}";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i";
   };
 
diff --git a/pkgs/development/ocaml-modules/algaeff/default.nix b/pkgs/development/ocaml-modules/algaeff/default.nix
index 0e867f8a0838..18cba82616be 100644
--- a/pkgs/development/ocaml-modules/algaeff/default.nix
+++ b/pkgs/development/ocaml-modules/algaeff/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "RedPRL";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-VRZfULbXKRcExU1bnEu/X1KPX+L+dzcRYZVD985rQT4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/alsa/default.nix b/pkgs/development/ocaml-modules/alsa/default.nix
index 15b60d288221..a0d0c64c458c 100644
--- a/pkgs/development/ocaml-modules/alsa/default.nix
+++ b/pkgs/development/ocaml-modules/alsa/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-alsa";
-    rev = version;
+    tag = version;
     sha256 = "1qy22g73qc311rmv41w005rdlj5mfnn4yj1dx1jhqzr31zixl8hj";
   };
 
diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index 423267fb2b1b..4f27cea36f02 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-EPqDK+7RU2vHEHvuoTXb8V2FkdXQ6tGu0ghbNPS3gZ4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ao/default.nix b/pkgs/development/ocaml-modules/ao/default.nix
index 06d96fddeb82..7e2a60cc97eb 100644
--- a/pkgs/development/ocaml-modules/ao/default.nix
+++ b/pkgs/development/ocaml-modules/ao/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ao";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HhJdb4i9B4gz3emgDCDT4riQuAsY4uP/47biu7EZ+sk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix
index 308803b75ced..ae70ee419d2d 100644
--- a/pkgs/development/ocaml-modules/apron/default.nix
+++ b/pkgs/development/ocaml-modules/apron/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "antoinemine";
     repo = "apron";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gHLCurydxX1pS66DTAWUJGl9Yqu9RWRjkZh6lXzM7YY=";
   };
 
diff --git a/pkgs/development/ocaml-modules/asai/default.nix b/pkgs/development/ocaml-modules/asai/default.nix
index 2a5a59895b6e..2e17570fc24a 100644
--- a/pkgs/development/ocaml-modules/asai/default.nix
+++ b/pkgs/development/ocaml-modules/asai/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "RedPRL";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-IpRLX7umpmlNt2uV2MB+YvjAvNk0+gl5plbBExVvcdM=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index 067e2bc16adb..43e82c3a040e 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -51,7 +51,7 @@ else
     src = fetchFromGitHub {
       owner = "BinaryAnalysisPlatform";
       repo = "bap";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "1c30zxn0zyi0wypvjmik3fd6n6a8xjcb102qfnccn1af052bvsrd";
     };
 
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index 3b2da021c212..a645fd797b20 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-batteries-team";
     repo = "batteries-included";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+PGfExdvp3WyX1s8dLTBYp1SoUOBkzrxyqMUuaW6Bto=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/pkgs/development/ocaml-modules/bigarray-compat/default.nix
index 476e9a3b33b0..3f91d4ff4359 100644
--- a/pkgs/development/ocaml-modules/bigarray-compat/default.nix
+++ b/pkgs/development/ocaml-modules/bigarray-compat/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mirage";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-2JVopggK2JuXWEPu8qn12F1jQIJ9OV89XY1rHtUqLkI=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bigstring/default.nix b/pkgs/development/ocaml-modules/bigstring/default.nix
index 4023d5db5c4f..eab8c13a726a 100644
--- a/pkgs/development/ocaml-modules/bigstring/default.nix
+++ b/pkgs/development/ocaml-modules/bigstring/default.nix
@@ -20,7 +20,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-bigstring";
-    rev = version;
+    tag = version;
     sha256 = "0bkxwdcswy80f6rmx5wjza92xzq4rdqsb4a9fm8aav8bdqx021n8";
   };
 
diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix
index f32bee87255d..4b30fb05ce89 100644
--- a/pkgs/development/ocaml-modules/bigstringaf/default.nix
+++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bindlib/default.nix b/pkgs/development/ocaml-modules/bindlib/default.nix
index 49121cb39746..cdffa3907374 100644
--- a/pkgs/development/ocaml-modules/bindlib/default.nix
+++ b/pkgs/development/ocaml-modules/bindlib/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rlepigre";
     repo = "ocaml-${pname}";
-    rev = version;
+    tag = version;
     hash = "sha256-058yMbz9ExvgNG/kY9tPk70XSeVRSSKVg4n4F4fmPu4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix
index 0f5cc4f4c942..f8303bf31a86 100644
--- a/pkgs/development/ocaml-modules/biocaml/default.nix
+++ b/pkgs/development/ocaml-modules/biocaml/default.nix
@@ -26,7 +26,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "biocaml";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "01yw12yixs45ya1scpb9jy2f7dw1mbj7741xib2xpq3kkc1hc21s";
   };
 
diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
index a2ecd17f418e..cfe9b46f6e89 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "aantron";
     repo = "bisect_ppx";
-    rev = version;
+    tag = version;
     hash = "sha256-3qXobZLPivFDtls/3WNqDuAgWgO+tslJV47kjQPoi6o=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index 12f1232b71a5..a880a290bd00 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "xguerin";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eO7/S9PoMybZPnQQ+q9qbqKpYO4Foc9OjW4uiwwNds8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bjack/default.nix b/pkgs/development/ocaml-modules/bjack/default.nix
index 1ee6783162b7..942a3c2ea47c 100644
--- a/pkgs/development/ocaml-modules/bjack/default.nix
+++ b/pkgs/development/ocaml-modules/bjack/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-bjack";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jIxxqBVWphWYyLh+24rTxk4WWfPPdGCvNdevFJEKw70=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bwd/default.nix b/pkgs/development/ocaml-modules/bwd/default.nix
index c6179b4f31e3..603db6a9bbde 100644
--- a/pkgs/development/ocaml-modules/bwd/default.nix
+++ b/pkgs/development/ocaml-modules/bwd/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "RedPRL";
     repo = "ocaml-bwd";
-    rev = version;
+    tag = version;
     hash = "sha256-rzn0U/D6kPNsH5hBTElc3d1jfKbgKbjA2JHicpaJtu4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix
index 769386333fba..577cc43ab1ab 100644
--- a/pkgs/development/ocaml-modules/calendar/default.nix
+++ b/pkgs/development/ocaml-modules/calendar/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-community";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+VQzi6pEMqzV1ZR84Yjdu4jsJEWtx+7bd6PQGX7TiEs=";
   };
 
diff --git a/pkgs/development/ocaml-modules/camlp-streams/default.nix b/pkgs/development/ocaml-modules/camlp-streams/default.nix
index cabccf89e7fc..33f7de863e05 100644
--- a/pkgs/development/ocaml-modules/camlp-streams/default.nix
+++ b/pkgs/development/ocaml-modules/camlp-streams/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kHuFBqu0mjFv53sOtmFZcX2reo5ToaOpItP7P53bfGQ=";
   };
 
diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix
index 3bd8856bf1ce..dae1f13cef0b 100644
--- a/pkgs/development/ocaml-modules/camlpdf/default.nix
+++ b/pkgs/development/ocaml-modules/camlpdf/default.nix
@@ -17,7 +17,7 @@ else
     src = fetchFromGitHub {
       owner = "johnwhitington";
       repo = "camlpdf";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-+SFuFqlrP0nwm199y0QFWYvlwD+Cbh0PHA5bmXIWdNk=";
     };
 
diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index 3bb9677e7442..d5616b7e45d0 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -20,7 +20,7 @@ let
           src = fetchFromGitHub {
             owner = "yoriyuki";
             repo = "camomile";
-            rev = version;
+            tag = version;
             sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
           };
 
@@ -42,7 +42,7 @@ let
       src = fetchFromGitHub {
         owner = "ocaml-community";
         repo = "camomile";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-HklX+VPD0Ta3Knv++dBT2rhsDSlDRH90k4Cj1YtWIa8=";
       };
 
diff --git a/pkgs/development/ocaml-modules/capnp/default.nix b/pkgs/development/ocaml-modules/capnp/default.nix
index e81c1252edc3..2db57b5aa610 100644
--- a/pkgs/development/ocaml-modules/capnp/default.nix
+++ b/pkgs/development/ocaml-modules/capnp/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "capnproto";
     repo = "capnp-ocaml";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-G4B1llsHnGcuGIarDB248QMaRBvS47IEQB5B93wY7nA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix
index 07a16e32fbb3..7442cf241533 100644
--- a/pkgs/development/ocaml-modules/cfstream/default.nix
+++ b/pkgs/development/ocaml-modules/cfstream/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "biocaml";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ=";
   };
 
diff --git a/pkgs/development/ocaml-modules/chacha/default.nix b/pkgs/development/ocaml-modules/chacha/default.nix
index f5d6c4c1008b..daa43eeb967f 100644
--- a/pkgs/development/ocaml-modules/chacha/default.nix
+++ b/pkgs/development/ocaml-modules/chacha/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "abeaumont";
     repo = "ocaml-chacha";
-    rev = version;
+    tag = version;
     hash = "sha256-PmeiFloU0k3SqOK1VjaliiCEzDzrzyMSasgnO5fJS1k=";
   };
 
diff --git a/pkgs/development/ocaml-modules/clap/default.nix b/pkgs/development/ocaml-modules/clap/default.nix
index 8ea75a2c7c70..1e7141ff2721 100644
--- a/pkgs/development/ocaml-modules/clap/default.nix
+++ b/pkgs/development/ocaml-modules/clap/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rbardou";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-IEol27AVYs55ntvNprBxOk3/EsBKAdPkF3Td3w9qOJg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/pkgs/development/ocaml-modules/class_group_vdf/default.nix
index e36c34634919..60eb84d8114d 100644
--- a/pkgs/development/ocaml-modules/class_group_vdf/default.nix
+++ b/pkgs/development/ocaml-modules/class_group_vdf/default.nix
@@ -21,7 +21,7 @@ buildDunePackage (
     src = fetchFromGitLab {
       owner = "nomadic-labs/cryptography";
       repo = "ocaml-chia-vdf";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-KvpnX2DTUyfKARNWHC2lLBGH2Ou2GfRKjw05lu4jbBs=";
     };
 
diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
index 804cea216a4b..cb5f1175c23a 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -22,7 +22,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-containers";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PMtyJOuw+9u6rF5EGif/66ZSbkTu1Msgke9JVpDWC1c=";
   };
 
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index 66823ce21fa1..debcde8ba363 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -18,7 +18,7 @@ else
     src = fetchFromGitHub {
       owner = "johnwhitington";
       repo = "cpdf-source";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-DvTY5EQcvnL76RlQTcVqBiycqbCdGQCXzarSMH2P/pg=";
     };
 
diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix
index a93826b34496..a62f082a61a1 100644
--- a/pkgs/development/ocaml-modules/cpu/default.nix
+++ b/pkgs/development/ocaml-modules/cpu/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "UnixJunkie";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1vir6gh1bhvxgj2fcn69c38yhw3jgk7dyikmw789m5ld2csnyjiv";
   };
 
diff --git a/pkgs/development/ocaml-modules/crowbar/default.nix b/pkgs/development/ocaml-modules/crowbar/default.nix
index 045df90d775d..237825d5d8d3 100644
--- a/pkgs/development/ocaml-modules/crowbar/default.nix
+++ b/pkgs/development/ocaml-modules/crowbar/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "stedolan";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0jjwiOZ9Ut+dv5Iw4xNvf396WTehT1VClxY9VHicw4U=";
   };
 
diff --git a/pkgs/development/ocaml-modules/cry/default.nix b/pkgs/development/ocaml-modules/cry/default.nix
index dfa64d096cea..01cd931d73f0 100644
--- a/pkgs/development/ocaml-modules/cry/default.nix
+++ b/pkgs/development/ocaml-modules/cry/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-cry";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ea6f2xTVmYekPmzAKasA9mNG4Voxw2MCkfZ9LB9gwbo=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix
index 2db0438c7659..1a0a33d122c0 100644
--- a/pkgs/development/ocaml-modules/ctypes/default.nix
+++ b/pkgs/development/ocaml-modules/ctypes/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocamllabs";
     repo = "ocaml-ctypes";
-    rev = version;
+    tag = version;
     hash = "sha256-fZfTsOMppHiI7BVvgICVt/9ofGFAfYjXzHSDA7L4vZk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix
index 40cb979e50ad..afc21f541416 100644
--- a/pkgs/development/ocaml-modules/cudf/default.nix
+++ b/pkgs/development/ocaml-modules/cudf/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "irill";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E4KXKnso/Q3ZwcYpKPgvswNR9qd/lafKljPMxfStedM=";
   };
 
diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix
index dea0a2f0d985..5beb234fb64d 100644
--- a/pkgs/development/ocaml-modules/curses/default.nix
+++ b/pkgs/development/ocaml-modules/curses/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mbacarella";
     repo = "curses";
-    rev = version;
+    tag = version;
     hash = "sha256-tjBOv7RARDzBShToNLL9LEaU/Syo95MfwZunFsyN4/Q=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dates_calc/default.nix b/pkgs/development/ocaml-modules/dates_calc/default.nix
index 4cfeeb34956f..c95241c7db08 100644
--- a/pkgs/development/ocaml-modules/dates_calc/default.nix
+++ b/pkgs/development/ocaml-modules/dates_calc/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "catalalang";
     repo = "dates-calc";
-    rev = version;
+    tag = version;
     sha256 = "sha256-B4li8vIK6AnPXJ1QSJ8rtr+JOcy4+h5sc1SH97U+Vgw=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dbf/default.nix b/pkgs/development/ocaml-modules/dbf/default.nix
index e02b13291ecd..c499ddb70088 100644
--- a/pkgs/development/ocaml-modules/dbf/default.nix
+++ b/pkgs/development/ocaml-modules/dbf/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "pveber";
     repo = "dbf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-096GodM3J/4dsVdylG+6xz/p6ogUkhDGdFjiPwl/jLQ=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dedukti/default.nix b/pkgs/development/ocaml-modules/dedukti/default.nix
index 9c5ef6de01de..ee058e1427db 100644
--- a/pkgs/development/ocaml-modules/dedukti/default.nix
+++ b/pkgs/development/ocaml-modules/dedukti/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "Deducteam";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SFxbgq2znO+OCEFzuekVquvtOEuCQanseKy+iZAeWbc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/directories/default.nix b/pkgs/development/ocaml-modules/directories/default.nix
index e90a1ce19222..1f3f0fa7e182 100644
--- a/pkgs/development/ocaml-modules/directories/default.nix
+++ b/pkgs/development/ocaml-modules/directories/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocamlpro";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-31CGhmmfOORJ1ewgp+IU+p1+f2kfX/W+lxK7EGU62vc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dispatch/default.nix b/pkgs/development/ocaml-modules/dispatch/default.nix
index b5546a406c3d..aea6b2752e2d 100644
--- a/pkgs/development/ocaml-modules/dispatch/default.nix
+++ b/pkgs/development/ocaml-modules/dispatch/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = "ocaml-dispatch";
-    rev = version;
+    tag = version;
     sha256 = "12r39ylbxc297cbwjadhd1ghxnwwcdzfjk68r97wim8hcgzxyxv4";
   };
 
diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix
index c5c9323de4e0..116ca673918e 100644
--- a/pkgs/development/ocaml-modules/dolog/default.nix
+++ b/pkgs/development/ocaml-modules/dolog/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "UnixJunkie";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g68260mcb4G4wX8y4T0MTaXsYnM9wn2d0V1VCdSFZjY=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dssi/default.nix b/pkgs/development/ocaml-modules/dssi/default.nix
index 58427339a480..1e404ea6a8cb 100644
--- a/pkgs/development/ocaml-modules/dssi/default.nix
+++ b/pkgs/development/ocaml-modules/dssi/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-dssi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1frbmx1aznwp60r6bkx1whqyr6mkflvd9ysmjg7s7b80mh0s4ix6";
   };
 
diff --git a/pkgs/development/ocaml-modules/dtools/default.nix b/pkgs/development/ocaml-modules/dtools/default.nix
index 9b94bf1a7ac8..a608b5968b0d 100644
--- a/pkgs/development/ocaml-modules/dtools/default.nix
+++ b/pkgs/development/ocaml-modules/dtools/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-dtools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MIZM/IlPWPa/r/f8EXkhU8gZctOZeAIGZgxoGMF2IkE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix
index fa41fe11f7c7..5a2ed4b10bfa 100644
--- a/pkgs/development/ocaml-modules/dum/default.nix
+++ b/pkgs/development/ocaml-modules/dum/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mjambon";
     repo = "dum";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0yrxl97szjc0s2ghngs346x3y0xszx2chidgzxk93frjjpsr1mlr";
   };
 
diff --git a/pkgs/development/ocaml-modules/duppy/default.nix b/pkgs/development/ocaml-modules/duppy/default.nix
index 5164c9455645..e35493728b7e 100644
--- a/pkgs/development/ocaml-modules/duppy/default.nix
+++ b/pkgs/development/ocaml-modules/duppy/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-duppy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hWR7utYMxMjz8Cw0j6cgoHlUj4Jc7Q4vJHD5kGHN4Rc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix
index 9437809938c5..291b6581d878 100644
--- a/pkgs/development/ocaml-modules/dypgen/default.nix
+++ b/pkgs/development/ocaml-modules/dypgen/default.nix
@@ -15,7 +15,7 @@ let
         src = fetchFromGitHub {
           owner = "grain-lang";
           repo = "dypgen";
-          rev = version;
+          tag = version;
           hash = "sha256-fKuO/e5YbA2B7XcghWl9pXxwvKw9YlhnmZDZcuKe3cs=";
         };
       }
diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix
index 7154c0554055..a9d2e52fdf57 100644
--- a/pkgs/development/ocaml-modules/earley/default.nix
+++ b/pkgs/development/ocaml-modules/earley/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rlepigre";
     repo = "ocaml-earley";
-    rev = version;
+    tag = version;
     sha256 = "1vi58zdxchpw6ai0bz9h2ggcmg8kv57yk6qbx82lh47s5wb3mz5y";
   };
 
diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix
index 4d07d9a35d91..4afaf80f6a0e 100644
--- a/pkgs/development/ocaml-modules/earlybird/default.nix
+++ b/pkgs/development/ocaml-modules/earlybird/default.nix
@@ -27,7 +27,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "hackwaly";
     repo = "ocamlearlybird";
-    rev = version;
+    tag = version;
     hash = "sha256-TzRJ+0I3VEx4Lvj3lhN9POzlXRgmTTdD5Bg1AX0pf3c=";
   };
 
diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix
index 3dbe6315d5cd..5d2178ecc465 100644
--- a/pkgs/development/ocaml-modules/eigen/default.nix
+++ b/pkgs/development/ocaml-modules/eigen/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "owlbarn";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1zaw03as14hyvfpyj6bjrfbcxp2ljdbqcqqgm53kms244mig425f";
   };
 
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 0e6e19250d1b..61bdaddfed82 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -23,7 +23,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "eliom";
-    rev = version;
+    tag = version;
     hash = "sha256-ALuoyO6axNQEeBteBVIFwdoSrbLxxcaSTObAcLPGIvo=";
   };
 
diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix
index 17bc6e628c5d..b1ec0d38ce2b 100644
--- a/pkgs/development/ocaml-modules/expat/default.nix
+++ b/pkgs/development/ocaml-modules/expat/default.nix
@@ -19,7 +19,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02")
     src = fetchFromGitHub {
       owner = "whitequark";
       repo = "ocaml-expat";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-eDA6MUcztaI+fpunWBdanNnPo9Y5gvbj/ViVcxYYEBg=";
     };
 
diff --git a/pkgs/development/ocaml-modules/faad/default.nix b/pkgs/development/ocaml-modules/faad/default.nix
index 1a45794059ee..cd3b49c08091 100644
--- a/pkgs/development/ocaml-modules/faad/default.nix
+++ b/pkgs/development/ocaml-modules/faad/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-faad";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3ayKZhgJAgsoOqn0InSrM5f3TImRHOQMtWETICo4t3o=";
   };
 
diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix
index c7507ee38f7c..18f28c3e7b25 100644
--- a/pkgs/development/ocaml-modules/faraday/default.nix
+++ b/pkgs/development/ocaml-modules/faraday/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-wR4kDocR1t3OLRuudXH8IccYde552O6Gvo5BHNxRbAI=";
   };
 
diff --git a/pkgs/development/ocaml-modules/fdkaac/default.nix b/pkgs/development/ocaml-modules/fdkaac/default.nix
index ccabbfcc2a5d..d6667542ace3 100644
--- a/pkgs/development/ocaml-modules/fdkaac/default.nix
+++ b/pkgs/development/ocaml-modules/fdkaac/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-fdkaac";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cTPPQKBq0EFo35eK7TXlszbodHYIg1g7v+yQ/rG7Y9I=";
   };
 
diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix
index 16283af681ea..d04b151d5e5e 100644
--- a/pkgs/development/ocaml-modules/flac/default.nix
+++ b/pkgs/development/ocaml-modules/flac/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-flac";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-68zunpRIX4lrRsKJhDF3Sre6Rp3g+ntP19ObFqG57jE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/frei0r/default.nix b/pkgs/development/ocaml-modules/frei0r/default.nix
index e4aba92bf4c6..fc96ac88ef47 100644
--- a/pkgs/development/ocaml-modules/frei0r/default.nix
+++ b/pkgs/development/ocaml-modules/frei0r/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-frei0r";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eh/ymZO/3a1z6uvZdnXgma/7AU2NBVs2lddA+R/kuQA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix
index 857555a5363f..9581ce08cc6c 100644
--- a/pkgs/development/ocaml-modules/frontc/default.nix
+++ b/pkgs/development/ocaml-modules/frontc/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "FrontC";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1mi1vh4qgscnb470qwidccaqd068j1bqlz6pf6wddk21paliwnqb";
   };
 
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index 3cce4f30823c..df104e8bcb61 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "astrada";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qlQEE8l/H22bb1VcK9YehR+9L5XepMu8JY7OLw1OIXg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gd/default.nix b/pkgs/development/ocaml-modules/gd/default.nix
index 28c123450864..72b211b545cd 100644
--- a/pkgs/development/ocaml-modules/gd/default.nix
+++ b/pkgs/development/ocaml-modules/gd/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-gd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-78cqxVEappTybRLk7Y6vW1POvZKFIxtGNVcmkKq9GEE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix
index c46efbbf766b..d03224c3e096 100644
--- a/pkgs/development/ocaml-modules/gen/default.nix
+++ b/pkgs/development/ocaml-modules/gen/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "gen";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZytPPGhmt/uANaSgkgsUBOwyQ9ka5H4J+5CnJpEdrNk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gen_js_api/default.nix b/pkgs/development/ocaml-modules/gen_js_api/default.nix
index feabcb80f65e..45c3581ea52a 100644
--- a/pkgs/development/ocaml-modules/gen_js_api/default.nix
+++ b/pkgs/development/ocaml-modules/gen_js_api/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "LexiFi";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZDlVJLw9xKFTz1NR5sGiw3WnEmMyNQy69Vt9zkw0fPA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/get-activity/lib.nix b/pkgs/development/ocaml-modules/get-activity/lib.nix
index 352b75d27f4f..a4c8ef662a06 100644
--- a/pkgs/development/ocaml-modules/get-activity/lib.nix
+++ b/pkgs/development/ocaml-modules/get-activity/lib.nix
@@ -20,7 +20,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "tarides";
     repo = "get-activity";
-    rev = version;
+    tag = version;
     hash = "sha256-QU/LPIxcem5nFvSxcNApOuBu6UHqLHIXVSOJ2UT0eKA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/getopt/default.nix b/pkgs/development/ocaml-modules/getopt/default.nix
index 9de42e3d8bae..9c6953ff4d2f 100644
--- a/pkgs/development/ocaml-modules/getopt/default.nix
+++ b/pkgs/development/ocaml-modules/getopt/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "scemama";
     repo = "ocaml-getopt";
-    rev = version;
+    tag = version;
     hash = "sha256-oYDm945LgjIW+8x7UrO4FlbHywnu8480aiEVvnjBxc8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/github/default.nix b/pkgs/development/ocaml-modules/github/default.nix
index e104f98b743d..2c414c657945 100644
--- a/pkgs/development/ocaml-modules/github/default.nix
+++ b/pkgs/development/ocaml-modules/github/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mirage";
     repo = "ocaml-github";
-    rev = version;
+    tag = version;
     sha256 = "sha256-psUIiIvjVV2NTlBtHnBisWreaKKnsqIjKT2+mLnfsxg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gitlab/default.nix b/pkgs/development/ocaml-modules/gitlab/default.nix
index 08b500bba423..9753e9da3d40 100644
--- a/pkgs/development/ocaml-modules/gitlab/default.nix
+++ b/pkgs/development/ocaml-modules/gitlab/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "tmcgilchrist";
     repo = "ocaml-gitlab";
-    rev = version;
+    tag = version;
     hash = "sha256-7pUpH1SoP4eW8ild5j+Tcy+aTXq0+eSkhKUOXJ6Z30k=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gnuplot/default.nix b/pkgs/development/ocaml-modules/gnuplot/default.nix
index 181366c22626..8dc93e94e723 100644
--- a/pkgs/development/ocaml-modules/gnuplot/default.nix
+++ b/pkgs/development/ocaml-modules/gnuplot/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-${pname}";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "02pzi3lb57ysrdsba743s3vmnapjbxgq8ynlzpxbbs6cn1jj6ch9";
   };
 
diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
index 08ae3343d062..6c36b80bf9df 100644
--- a/pkgs/development/ocaml-modules/graphql_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
@@ -20,7 +20,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "reasonml-community";
     repo = "graphql-ppx";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+WJhA2ixZHiSZBoX14dnQKk7JfVAIME4JooNSnhRp44=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix
index 5ab096a5a99c..f04ed82004de 100644
--- a/pkgs/development/ocaml-modules/gsl/default.nix
+++ b/pkgs/development/ocaml-modules/gsl/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mmottl";
     repo = "gsl-ocaml";
-    rev = version;
+    tag = version;
     hash = "sha256-h1jO2RheBBzxiBgig2yEPk4YyBaZxStt5f+KNZqHdBo=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix
index cbe55294443d..3ba28b93255d 100644
--- a/pkgs/development/ocaml-modules/gstreamer/default.nix
+++ b/pkgs/development/ocaml-modules/gstreamer/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-gstreamer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0y8xi1q0ld4hrk96bn6jfh9slyjrxmnlhm662ynacp3yzalp8jji";
   };
 
diff --git a/pkgs/development/ocaml-modules/hack_parallel/default.nix b/pkgs/development/ocaml-modules/hack_parallel/default.nix
index f7fb5ace45bc..366bc1376477 100644
--- a/pkgs/development/ocaml-modules/hack_parallel/default.nix
+++ b/pkgs/development/ocaml-modules/hack_parallel/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rvantonder";
     repo = "hack_parallel";
-    rev = version;
+    tag = version;
     sha256 = "0qjlkw35r4q2cm0n2x0i73zvx1xgrp6axaia2nm8zxpm49mid629";
   };
 
diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix
index d65243e2cb71..a9e61938fde0 100644
--- a/pkgs/development/ocaml-modules/hidapi/default.nix
+++ b/pkgs/development/ocaml-modules/hidapi/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "vbmithr";
     repo = "ocaml-hidapi";
-    rev = version;
+    tag = version;
     hash = "sha256-upygm5G46C65lxaiI6kBOzLrWxzW9qWb6efN/t58SRg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix
index ec39fd662995..a0ff819413e3 100644
--- a/pkgs/development/ocaml-modules/httpaf/default.nix
+++ b/pkgs/development/ocaml-modules/httpaf/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0zk78af3qyvf6w66mg8sxygr6ndayzqw5s3zfxibvn121xwni26z";
   };
 
diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix
index 900f60e7c774..fafc010050ad 100644
--- a/pkgs/development/ocaml-modules/inotify/default.nix
+++ b/pkgs/development/ocaml-modules/inotify/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "whitequark";
     repo = "ocaml-inotify";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Vg9uVIx6/OMS1WoJIHwZbSt5ZyFy+Xgw5167FJWGslg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix
index 104438eeab50..402db9761371 100644
--- a/pkgs/development/ocaml-modules/integers/default.nix
+++ b/pkgs/development/ocaml-modules/integers/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocamllabs";
     repo = "ocaml-integers";
-    rev = version;
+    tag = version;
     sha256 = "sha256-zuUgP1jOiVT0q6GisGpkqx7nybWbARgnAcU8NYqvCzA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix
index 1ab3dbb25407..a97a0601e1e4 100644
--- a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix
+++ b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "o1-labs";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-lg5cX9/LQlVmR42XcI17b6KaatnFO2L9A9ZXfID8mTY=";
   };
 
diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix
index 39dbd8e07fd6..9f41c7cd5a61 100644
--- a/pkgs/development/ocaml-modules/iso8601/default.nix
+++ b/pkgs/development/ocaml-modules/iso8601/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sagotch";
     repo = "ISO8601.ml";
-    rev = version;
+    tag = version;
     sha256 = "sha256-QWjZ+2AjvXnnRVenbyCG/hSjfW53bHiftQUtWpK/7I8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
index 67435557a36d..3ac1ea0f13e3 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
@@ -23,7 +23,7 @@ buildDunePackage (
     src = fetchFromGitHub {
       owner = "janestreet";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = hash;
     };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
index 1a7e8c8f6f60..8af3c332b6fe 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
@@ -26,7 +26,7 @@ buildDunePackage (
     src = fetchFromGitHub {
       owner = "janestreet";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = hash;
     };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
index 73812e186bd8..ad2c0e9545a3 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
@@ -26,7 +26,7 @@ buildDunePackage (
     src = fetchFromGitHub {
       owner = "janestreet";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = hash;
     };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix
index a08ff1e3b9b6..2c11fc0f34cc 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix
@@ -26,7 +26,7 @@ buildDunePackage (
     src = fetchFromGitHub {
       owner = "janestreet";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = hash;
     };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix
index f366d6d1db8a..10a886a4f11f 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix
@@ -25,7 +25,7 @@ buildDunePackage (
     src = fetchFromGitHub {
       owner = "janestreet";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = hash;
     };
 
diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index 43a6424f7c04..1150ffdfef20 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -20,7 +20,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
     src = fetchFromGitHub {
       owner = "javalib-team";
       repo = "javalib";
-      rev = version;
+      tag = version;
       hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s=";
     };
 
diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix
index 41c6e667bea4..5e3fc5f4a24e 100644
--- a/pkgs/development/ocaml-modules/jingoo/default.nix
+++ b/pkgs/development/ocaml-modules/jingoo/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "tategakibunko";
     repo = "jingoo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qIw69OE7wYyZYKnIc9QrmF8MzY5Fg5pBFyIpexmaYxA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/pkgs/development/ocaml-modules/json-data-encoding/default.nix
index 3c21d451d81b..da5bb7d38194 100644
--- a/pkgs/development/ocaml-modules/json-data-encoding/default.nix
+++ b/pkgs/development/ocaml-modules/json-data-encoding/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "data-encoding";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KoA4xX4tNyi6bX5kso/Wof1LA7431EXJ34eD5X4jnd8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix
index 6c73b06213ac..450fa52b5a77 100644
--- a/pkgs/development/ocaml-modules/jwto/default.nix
+++ b/pkgs/development/ocaml-modules/jwto/default.nix
@@ -23,7 +23,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "sporto";
     repo = "jwto";
-    rev = version;
+    tag = version;
     hash = "sha256-TOWwNyrOqboCm8Y4mM6GgtmxGO3NmyDdAX7m8CifA7Y=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix
index 3736fc84a8d4..b83a7552bf72 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -20,7 +20,7 @@ else
     src = fetchFromGitHub {
       owner = "garrigue";
       repo = "lablgl";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-GiQKHMn5zHyvDrA2ve12X5YTm3/RZp8tukIqifgVaW4=";
     };
 
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index 7f0bd839cd2a..5c894183186e 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -24,7 +24,7 @@ let
         src = fetchFromGitHub {
           owner = "garrigue";
           repo = "lablgtk";
-          rev = version;
+          tag = version;
           sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po=";
         };
         env = { };
diff --git a/pkgs/development/ocaml-modules/ladspa/default.nix b/pkgs/development/ocaml-modules/ladspa/default.nix
index 7ff7a0311356..3be6dd031c68 100644
--- a/pkgs/development/ocaml-modules/ladspa/default.nix
+++ b/pkgs/development/ocaml-modules/ladspa/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ladspa";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1y83infjaz9apzyvaaqw331zqdysmn3bpidfab061v3bczv4jzbz";
   };
 
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
index 10a916a5f17f..29f7324b38b8 100644
--- a/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -34,7 +34,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-community";
     repo = pname;
-    rev = version;
+    tag = version;
     inherit (params) sha256;
   };
 
diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix
index ea4b3512c16d..3d6f4a874624 100644
--- a/pkgs/development/ocaml-modules/lambdasoup/default.nix
+++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "aantron";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-+d1JPU7OyQgt8pDTlwZraqPHH+OBQD1ycsELKpHT95Y=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lame/default.nix b/pkgs/development/ocaml-modules/lame/default.nix
index 338d6a4bb913..c32d35fc70fd 100644
--- a/pkgs/development/ocaml-modules/lame/default.nix
+++ b/pkgs/development/ocaml-modules/lame/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lame";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/ZzoGFQQrBf17TaBPSFDQ1yHaQnva56YLmscOacrKBI=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lastfm/default.nix b/pkgs/development/ocaml-modules/lastfm/default.nix
index 12b2777b79fa..b636d232b1e5 100644
--- a/pkgs/development/ocaml-modules/lastfm/default.nix
+++ b/pkgs/development/ocaml-modules/lastfm/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lastfm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1te9B2+sUmkT/i2K5ueswWAWpvJf9rXob0zR4CMOJlg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lem/default.nix b/pkgs/development/ocaml-modules/lem/default.nix
index 8a2ac28d8289..63fcdc60cea8 100644
--- a/pkgs/development/ocaml-modules/lem/default.nix
+++ b/pkgs/development/ocaml-modules/lem/default.nix
@@ -21,7 +21,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
     src = fetchFromGitHub {
       owner = "rems-project";
       repo = "lem";
-      rev = version;
+      tag = version;
       hash = "sha256-ZV2OiFonMlNzqtsumMQ8jzY9/ATaZxiNHZ7JzOfGluY=";
     };
 
diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/pkgs/development/ocaml-modules/lens/default.nix
index 0499e640e240..be69440c684c 100644
--- a/pkgs/development/ocaml-modules/lens/default.nix
+++ b/pkgs/development/ocaml-modules/lens/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "pdonadeo";
     repo = "ocaml-lens";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1k23n7pa945fk6nbaq6nlkag5kg97wsw045ghz4gqp8b9i2im3vn";
   };
 
diff --git a/pkgs/development/ocaml-modules/lilv/default.nix b/pkgs/development/ocaml-modules/lilv/default.nix
index 3ff0782ca288..cc266b0619fa 100644
--- a/pkgs/development/ocaml-modules/lilv/default.nix
+++ b/pkgs/development/ocaml-modules/lilv/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lilv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "080ja8c4sxprk5qnldpfzxriag57m9603vny3b4bnwh5xm1id08c";
   };
 
diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix
index 05596866b070..8400e075610c 100644
--- a/pkgs/development/ocaml-modules/linenoise/default.nix
+++ b/pkgs/development/ocaml-modules/linenoise/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "fxfactorial";
     repo = "ocaml-${pname}";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yWBWMbk1anXaF4hIakTOcRZFCYmxI0xG3bHFFOAyEDA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/linksem/default.nix b/pkgs/development/ocaml-modules/linksem/default.nix
index ccefd91c06cf..2d4e3d373e0a 100644
--- a/pkgs/development/ocaml-modules/linksem/default.nix
+++ b/pkgs/development/ocaml-modules/linksem/default.nix
@@ -18,7 +18,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
     src = fetchFromGitHub {
       owner = "rems-project";
       repo = "linksem";
-      rev = version;
+      tag = version;
       hash = "sha256-7/YfDK3TruKCckMzAPLRrwBkHRJcX1S+AzXHWRxkZPA=";
     };
 
diff --git a/pkgs/development/ocaml-modules/lo/default.nix b/pkgs/development/ocaml-modules/lo/default.nix
index dd2dc8d49328..165e5a81d98d 100644
--- a/pkgs/development/ocaml-modules/lo/default.nix
+++ b/pkgs/development/ocaml-modules/lo/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0mi8h6f6syxjkxz493l5c3l270pvxx33pz0k3v5465wqjsnppar2";
   };
 
diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix
index 1ea40e57d002..26a346966e43 100644
--- a/pkgs/development/ocaml-modules/lua-ml/default.nix
+++ b/pkgs/development/ocaml-modules/lua-ml/default.nix
@@ -20,7 +20,7 @@ else
     src = fetchFromGitHub {
       owner = "lindig";
       repo = pname;
-      rev = version;
+      tag = version;
       sha256 = "sha256-xkjsjKD89W7Y5XK8kfL/ZErYKS14z0u0QCARN0DbTC8=";
     };
 
diff --git a/pkgs/development/ocaml-modules/lwt-canceler/default.nix b/pkgs/development/ocaml-modules/lwt-canceler/default.nix
index e49e5de90d01..688114d9eda6 100644
--- a/pkgs/development/ocaml-modules/lwt-canceler/default.nix
+++ b/pkgs/development/ocaml-modules/lwt-canceler/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "lwt-canceler";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xbb7012hp901b755kxmfgg293rz34rkhwzg2z9i6sakwd7i0h9p";
   };
   useDune2 = true;
diff --git a/pkgs/development/ocaml-modules/lwt-watcher/default.nix b/pkgs/development/ocaml-modules/lwt-watcher/default.nix
index 02bfc43abc5b..2ed44537e032 100644
--- a/pkgs/development/ocaml-modules/lwt-watcher/default.nix
+++ b/pkgs/development/ocaml-modules/lwt-watcher/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-35Z73bSzEEgTabNH2cD9lRdDczsyIMZR2ktyKx4aN9k=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 20e3e146d68d..decc5bce2e78 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "lwt";
-    rev = version;
+    tag = version;
     hash = "sha256-oPYLFugMTI3a+hmnwgUcoMgn5l88NP1Roq0agLhH/vI=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix
index 4bcd3524e849..8ffa997a7b8e 100644
--- a/pkgs/development/ocaml-modules/lwt_log/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_log/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "aantron";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-ODTD3KceEnrEzD01CeuNg4BNKOtKZEpYaDIB+RIte1U=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mad/default.nix b/pkgs/development/ocaml-modules/mad/default.nix
index 401e75f7ea89..b02f3e64b482 100644
--- a/pkgs/development/ocaml-modules/mad/default.nix
+++ b/pkgs/development/ocaml-modules/mad/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-mad";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rSFzWyUYTrGL7GvVsY5qKdCXqY/XJQkuBerexG838jc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/magic-trace/default.nix b/pkgs/development/ocaml-modules/magic-trace/default.nix
index 1cca903398f6..699e69f3541b 100644
--- a/pkgs/development/ocaml-modules/magic-trace/default.nix
+++ b/pkgs/development/ocaml-modules/magic-trace/default.nix
@@ -25,7 +25,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "janestreet";
     repo = "magic-trace";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cAoaAXZOeWNQh6emm17a9oCis8s4jJxPQMI/NfiUa7g=";
   };
 
diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix
index 85a9afd80a22..fe35940dad46 100644
--- a/pkgs/development/ocaml-modules/markup/default.nix
+++ b/pkgs/development/ocaml-modules/markup/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "aantron";
     repo = "markup.ml";
-    rev = version;
+    tag = version;
     sha256 = "sha256-tsXz39qFSyL6vPYKG7P73zSEiraaFuOySL1n0uFij6k=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix
index ecbac7c2da27..8c1e6ec28c00 100644
--- a/pkgs/development/ocaml-modules/mccs/default.nix
+++ b/pkgs/development/ocaml-modules/mccs/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "AltGr";
     repo = "ocaml-mccs";
-    rev = version;
+    tag = version;
     hash = "sha256-xvcqPXyzVGXXFYRVdFPaCfieFEguWffWVB04ImEuPvQ=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mem_usage/default.nix b/pkgs/development/ocaml-modules/mem_usage/default.nix
index 613edfe0377f..71b47aa9f743 100644
--- a/pkgs/development/ocaml-modules/mem_usage/default.nix
+++ b/pkgs/development/ocaml-modules/mem_usage/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-mem_usage";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5tQNsqbiU9oJvKHUjeTo/ST4A0Axc95gdJISLaa9VRM=";
   };
 
diff --git a/pkgs/development/ocaml-modules/memprof-limits/default.nix b/pkgs/development/ocaml-modules/memprof-limits/default.nix
index 32ffbd5f82cf..1f4934f3ac53 100644
--- a/pkgs/development/ocaml-modules/memprof-limits/default.nix
+++ b/pkgs/development/ocaml-modules/memprof-limits/default.nix
@@ -15,7 +15,7 @@ else
     src = fetchFromGitLab {
       owner = "gadmm";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-Pmuln5TihPoPZuehZlqPfERif6lf7O+0454kW9y3aKc=";
     };
 
diff --git a/pkgs/development/ocaml-modules/memtrace/default.nix b/pkgs/development/ocaml-modules/memtrace/default.nix
index 47520e2e61b7..01b9140716fa 100644
--- a/pkgs/development/ocaml-modules/memtrace/default.nix
+++ b/pkgs/development/ocaml-modules/memtrace/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "janestreet";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dWkTrN8ZgNUz7BW7Aut8mfx8o4n8f6UZaDv/7rbbwNs=";
   };
 
diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix
index bbfb4e1e8f7e..f09f5189c683 100644
--- a/pkgs/development/ocaml-modules/metadata/default.nix
+++ b/pkgs/development/ocaml-modules/metadata/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-metadata";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-SQ8fNl62fvoCgbIt0axQyE3Eqwl8EOtYiz3xN96al+g=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mew/default.nix b/pkgs/development/ocaml-modules/mew/default.nix
index 479aae5283f0..1064bca3813e 100644
--- a/pkgs/development/ocaml-modules/mew/default.nix
+++ b/pkgs/development/ocaml-modules/mew/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "kandu";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0417xsghj92v3xa5q4dk4nzf2r4mylrx2fd18i7cg3nzja65nia2";
   };
 
diff --git a/pkgs/development/ocaml-modules/mew_vi/default.nix b/pkgs/development/ocaml-modules/mew_vi/default.nix
index f5ae24e1c5df..7795787a0bbe 100644
--- a/pkgs/development/ocaml-modules/mew_vi/default.nix
+++ b/pkgs/development/ocaml-modules/mew_vi/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "kandu";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0lihbf822k5zasl60w5mhwmdkljlq49c9saayrws7g4qc1j353r8";
   };
 
diff --git a/pkgs/development/ocaml-modules/minisat/default.nix b/pkgs/development/ocaml-modules/minisat/default.nix
index 0148f37c1fca..142ba7dee832 100644
--- a/pkgs/development/ocaml-modules/minisat/default.nix
+++ b/pkgs/development/ocaml-modules/minisat/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-minisat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dH0Ndlyo/DTZ6Ao1S478aBuxoZFSkRBi5HblkTWCPas=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix
index 20398177d135..ccf57a5ba8f2 100644
--- a/pkgs/development/ocaml-modules/mldoc/default.nix
+++ b/pkgs/development/ocaml-modules/mldoc/default.nix
@@ -39,7 +39,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "logseq";
     repo = "mldoc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7uuNUFMSQEgakTKfpYixp43gnfpQSW++snBzgr0Ni0Y=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix
index ee578464641f..80f0e33077ed 100644
--- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix
+++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nberth";
     repo = "mlgmpidl";
-    rev = version;
+    tag = version;
     hash = "sha256-ZmSDKZiHko8MCeIuZL53HjupfwO6PAm8QOCc9O3xJOk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mlx/default.nix b/pkgs/development/ocaml-modules/mlx/default.nix
index 830938e70330..dad8f40a336b 100644
--- a/pkgs/development/ocaml-modules/mlx/default.nix
+++ b/pkgs/development/ocaml-modules/mlx/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-mlx";
     repo = "mlx";
-    rev = version;
+    tag = version;
     hash = "sha256-3hPtyBKD2dp4UJBykOudW6KR2KXPnBuDnuJ1UNLpAp0=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mm/default.nix b/pkgs/development/ocaml-modules/mm/default.nix
index f7e3eb323371..44f8460aa0c6 100644
--- a/pkgs/development/ocaml-modules/mm/default.nix
+++ b/pkgs/development/ocaml-modules/mm/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-mm";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ME6Naza7OvZ/63zEjrPeKq5JwMoMfV2fpkCuZdtCZ/c=";
   };
 
diff --git a/pkgs/development/ocaml-modules/morbig/default.nix b/pkgs/development/ocaml-modules/morbig/default.nix
index 76150f19cf18..7f62f76f4c2e 100644
--- a/pkgs/development/ocaml-modules/morbig/default.nix
+++ b/pkgs/development/ocaml-modules/morbig/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "colis-anr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fOBaJHHP/Imi9UDLflI52OdKDcmMxpl+NH3pfofmv/o=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix
index d9fa6326e93f..802efe6d1fc7 100644
--- a/pkgs/development/ocaml-modules/mparser/default.nix
+++ b/pkgs/development/ocaml-modules/mparser/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "murmour";
     repo = "mparser";
-    rev = version;
+    tag = version;
     sha256 = "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx";
   };
 
diff --git a/pkgs/development/ocaml-modules/msat/default.nix b/pkgs/development/ocaml-modules/msat/default.nix
index 43d9d0e77694..ea000010702b 100644
--- a/pkgs/development/ocaml-modules/msat/default.nix
+++ b/pkgs/development/ocaml-modules/msat/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "Gbury";
     repo = "mSAT";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ER7ZUejW+Zy3l2HIoFDYbR8iaKMvLZWaeWrOAAYXjG4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/msgpck/default.nix b/pkgs/development/ocaml-modules/msgpck/default.nix
index bfee304681bb..8ee13df63d74 100644
--- a/pkgs/development/ocaml-modules/msgpck/default.nix
+++ b/pkgs/development/ocaml-modules/msgpck/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "vbmithr";
     repo = "ocaml-msgpck";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-gBHIiicmk/5KBkKzRKyV0ymEH8dGCZG8vfE0mtpcDCM=";
   };
 
diff --git a/pkgs/development/ocaml-modules/multipart-form-data/default.nix b/pkgs/development/ocaml-modules/multipart-form-data/default.nix
index fc5e9a0bbf6d..954e71c7c673 100644
--- a/pkgs/development/ocaml-modules/multipart-form-data/default.nix
+++ b/pkgs/development/ocaml-modules/multipart-form-data/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "cryptosense";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-3MYJDvVbPIv/JDiB9nKcLRFC5Qa0afyEfz7hk8MWRII=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mustache/default.nix b/pkgs/development/ocaml-modules/mustache/default.nix
index cefb4d3c1b77..c9dc58299f6d 100644
--- a/pkgs/development/ocaml-modules/mustache/default.nix
+++ b/pkgs/development/ocaml-modules/mustache/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rgrinberg";
     repo = "ocaml-mustache";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "19v8rk8d8lkfm2rmhdawfgadji6wa267ir5dprh4w9l1sfj8a1py";
   };
 
diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix
index 624a97507495..b6d3acf4150b 100644
--- a/pkgs/development/ocaml-modules/npy/default.nix
+++ b/pkgs/development/ocaml-modules/npy/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "LaurentMazare";
     repo = "${pname}-ocaml";
-    rev = version;
+    tag = version;
     hash = "sha256:1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1";
   };
 
diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix
index 98dae8b475ba..1605810ef85b 100644
--- a/pkgs/development/ocaml-modules/num/default.nix
+++ b/pkgs/development/ocaml-modules/num/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (
     src = fetchFromGitHub {
       owner = "ocaml";
       repo = "num";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0";
     };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
index 1c69c85ab4e2..ca6ae71302c2 100644
--- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
@@ -28,7 +28,7 @@ else
     src = fetchFromGitHub {
       owner = "mirage";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256:1mbyjzwcs64n7i3xkkyaxgl3r46drbl0gkqf3fqgm2kh3q03638l";
     };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 20737655bd21..84321ecacf32 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -23,7 +23,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02")
     src = fetchFromGitLab {
       owner = "libvirt";
       repo = "libvirt-ocaml";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k";
     };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
index 6e16fd2f2556..35c27cd50860 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
@@ -18,7 +18,7 @@ else
     src = fetchFromGitHub {
       owner = "ocaml-ppx";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq";
     };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
index fa28353f1082..197cb4e7bc36 100644
--- a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "zepalmer";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1ynv3yhdqmkhkgnz6c5kv6ryjcc934sdvw9rhh8rjg2dlzlffgbw";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix
index a48d73b341af..9227b2344496 100644
--- a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = author;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0hw4gl7irarcywibdjqxmrga8f7yj52wgy7sc7n0wyy74jzxb8np";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix
index 0de49d843861..1505441683a5 100644
--- a/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "issuu";
     repo = "ocaml-protoc-plugin";
-    rev = version;
+    tag = version;
     hash = "sha256-ZHeOi3y2X11MmkRuthmYFSjPLoGlGTO1pnRfk/XmgPU=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix
index a2e0bca7092f..039682d19f86 100644
--- a/pkgs/development/ocaml-modules/ocaml-r/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "pveber";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jPyVMxjeh9+xu0dD1gelAxcOhxouKczyvzVoKZ5oSrs=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
index b24ef9e28682..273a6d670046 100644
--- a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
@@ -14,7 +14,7 @@ buildOasisPackage rec {
   src = fetchFromGitHub {
     owner = "tcsprojects";
     repo = "ocaml-sat-solvers";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1hxr16cyl1p1k1cik848mqrysq95wxmlykpm93a99pn55mp28938";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index 599591cc76c0..31655810309f 100644
--- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "astrada";
     repo = "ocamlfuse";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D/Gn+02Kq4mqEpNZrYYw/NXSJce2joGhl3wUZDhVDYo=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocamline/default.nix b/pkgs/development/ocaml-modules/ocamline/default.nix
index eb77721bf0a6..5a340e815bdb 100644
--- a/pkgs/development/ocaml-modules/ocamline/default.nix
+++ b/pkgs/development/ocaml-modules/ocamline/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "chrisnevers";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "Sljm/Bfr2Eo0d75tmJRuWUkkfHUYQ0g27+FzXBePnVg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
index 263caad54863..2b6666c31e4f 100644
--- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
+++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
@@ -18,7 +18,7 @@ else
     src = fetchFromGitHub {
       owner = "OCamlPro";
       repo = "ocp-ocamlres";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
     };
 
diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix
index 2d7ea6e26359..73e9c795507f 100644
--- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocplib-endian";
-    rev = version;
+    tag = version;
     sha256 = "sha256-THTlhOfXAPaqTt1qBkht+D67bw6M175QLvXoUMgjks4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
index cb070c0a34b4..5ff8c0413662 100644
--- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fLTht+TlyJIsIAsRLmmkFKsnbSeW3BgyAyURFdnGfko=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix b/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix
index ae41c0549029..45d80849080c 100644
--- a/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256:0qgasd89ayamgl2rfyxsipznmwa3pjllkyq9qg0g1f41h8ixpsfh";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index 37a63948a355..9027c47e3f6b 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsigen-start";
-    rev = version;
+    tag = version;
     hash = "sha256-i2nj/m1Ihb/bprtHvZh47/oK0v+aFNVH+A2CB4rrrPk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
index 737646b16a2b..475b94a0824d 100644
--- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-1kw2HANajHDdMmjuYNB79ZDqy2Ml02nc5s+cJzIoxQ8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocsipersist/lib.nix b/pkgs/development/ocaml-modules/ocsipersist/lib.nix
index e21c1979cc23..ec60a49f33c0 100644
--- a/pkgs/development/ocaml-modules/ocsipersist/lib.nix
+++ b/pkgs/development/ocaml-modules/ocsipersist/lib.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsipersist";
-    rev = version;
+    tag = version;
     sha256 = "sha256:1d6kdcfjvrz0dl764mnyxc477aa57rvmzkg154qc915w2y1nbz9a";
   };
 
diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix
index fadb54519abf..654eca23d066 100644
--- a/pkgs/development/ocaml-modules/octavius/default.nix
+++ b/pkgs/development/ocaml-modules/octavius/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-doc";
     repo = "octavius";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/S6WpIo1c5J9uM3xgtAM/elhnsl0XimnIFsKy3ootbA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix
index c952882e7d0e..164523cafb1e 100644
--- a/pkgs/development/ocaml-modules/odate/default.nix
+++ b/pkgs/development/ocaml-modules/odate/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "hhugo";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-C11HpftrYOCVyWT31wrqo8FVZuP7mRUkRv5IDeAZ+To=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ogg/default.nix b/pkgs/development/ocaml-modules/ogg/default.nix
index b815923bb911..29349752a4b1 100644
--- a/pkgs/development/ocaml-modules/ogg/default.nix
+++ b/pkgs/development/ocaml-modules/ogg/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ogg";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-S6rJw90c//a9d63weCLuOBoQwNqbpTb+lRytvHUOZuc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix
index eaf87e5684f8..ee698c29f78c 100644
--- a/pkgs/development/ocaml-modules/opam-file-format/default.nix
+++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-Ka9pMYB99kM+5X7wf9F13gUrjouZucGevvkSY0TaXGg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/opus/default.nix b/pkgs/development/ocaml-modules/opus/default.nix
index 693426fb2356..6afb769c92bf 100644
--- a/pkgs/development/ocaml-modules/opus/default.nix
+++ b/pkgs/development/ocaml-modules/opus/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-opus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ghfqw/J1oLbTJpYJaiB5M79jaA6DACvyxBVE+NjnPkg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/oseq/default.nix b/pkgs/development/ocaml-modules/oseq/default.nix
index 7d462b10c6a2..31f0a67097d0 100644
--- a/pkgs/development/ocaml-modules/oseq/default.nix
+++ b/pkgs/development/ocaml-modules/oseq/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fyr/OKlvvHBfovtdubSW4rd4OwQbMLKWXghyU3uBy/k=";
   };
 
diff --git a/pkgs/development/ocaml-modules/otfed/default.nix b/pkgs/development/ocaml-modules/otfed/default.nix
index b33036380e17..9e75583bb7f6 100644
--- a/pkgs/development/ocaml-modules/otfed/default.nix
+++ b/pkgs/development/ocaml-modules/otfed/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "gfngfn";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-6QCom9nrz0B5vCmuBzqsM0zCs8tBLJC6peig+vCgMVA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix
index 8990a3611eca..ae0b554ab54a 100644
--- a/pkgs/development/ocaml-modules/otoml/default.nix
+++ b/pkgs/development/ocaml-modules/otoml/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "dmbaturin";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-e9Bqd6KHorglLMzvsjakyYt/CLZR3yI/yZPl/rnbkDE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix
index 1b0605a6269d..3fac3643e3f1 100644
--- a/pkgs/development/ocaml-modules/parany/default.nix
+++ b/pkgs/development/ocaml-modules/parany/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "UnixJunkie";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QR3Rq30iKhft+9tVCgJLOq9bwJe7bcay/kMTXjjCLjE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix
index 7babaab8b725..663d933cae11 100644
--- a/pkgs/development/ocaml-modules/parmap/default.nix
+++ b/pkgs/development/ocaml-modules/parmap/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rdicosmo";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-tBu7TGtDOe5FbxLZuz6nl+65aN9FHIngq/O4dJWzr3Q=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix
index 454939a9d114..9925b7d71454 100644
--- a/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/pkgs/development/ocaml-modules/pgocaml/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "darioteixeira";
     repo = "pgocaml";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Mz3zVgXas1UivH/BVARx5kWClgr9v9YcGarwaD961tU=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pgsolver/default.nix b/pkgs/development/ocaml-modules/pgsolver/default.nix
index ddfde095c7d9..2d24310299f4 100644
--- a/pkgs/development/ocaml-modules/pgsolver/default.nix
+++ b/pkgs/development/ocaml-modules/pgsolver/default.nix
@@ -14,7 +14,7 @@ buildOasisPackage rec {
   src = fetchFromGitHub {
     owner = "tcsprojects";
     repo = "pgsolver";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "16skrn8qql9djpray25xv66rjgfl20js5wqnxyq1763nmyizyj8a";
   };
 
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index 74f01c35ce94..8d14f966d392 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alavrik";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6Luq49sbo+AqLSq57mc6fLhrRx0K6G5LCUIzkGPfqYo=";
   };
 
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index 1c45d67324d6..0d9dc4dc5a9b 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -23,7 +23,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "alavrik";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-qE+yybTn+kzbY0h8udhZYO+GwQPI/J/6p3LMmF12cFU=";
     };
 
diff --git a/pkgs/development/ocaml-modules/portaudio/default.nix b/pkgs/development/ocaml-modules/portaudio/default.nix
index 208796727925..0a2f3600d943 100644
--- a/pkgs/development/ocaml-modules/portaudio/default.nix
+++ b/pkgs/development/ocaml-modules/portaudio/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-portaudio";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rMSE+ta7ughjjCnz4oho1D3VGaAsUlLtxizvxZT0/cQ=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix
index a542bf2e2ec1..5f653199e737 100644
--- a/pkgs/development/ocaml-modules/pprint/default.nix
+++ b/pkgs/development/ocaml-modules/pprint/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "fpottier";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-avf71vAgCL1MU8O7Q3FNN3wEdCDtbNZP0ipETnn8AqA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_bap/default.nix b/pkgs/development/ocaml-modules/ppx_bap/default.nix
index 7414253eef2e..f819c7421f19 100644
--- a/pkgs/development/ocaml-modules/ppx_bap/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_bap/default.nix
@@ -24,7 +24,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1c6rcdp8bicdiwqc2mb59cl9l2vxlp3y8hmnr9x924fq7acly248";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
index 75bdee5783a8..900b7e5733be 100644
--- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
@@ -27,7 +27,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.2")
     src = fetchFromGitHub {
       owner = "fdopen";
       repo = "ppx_cstubs";
-      rev = version;
+      tag = version;
       hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs=";
     };
 
diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
index e1208fe330e3..39f6b9ee2fad 100644
--- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "diml";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
index d289734a9a1c..329d36450f03 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
@@ -20,7 +20,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "hammerlab";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/22KLQnxu3e2ZSca6ZLxTJDfv/rsmgCUkJnZC0RwRi8";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index a509985cdec2..95f9a3c527d4 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -37,7 +37,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = "ppx_deriving_yojson";
-    rev = "v${version}";
+    tag = "v${version}";
     inherit (param) sha256;
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_monad/default.nix b/pkgs/development/ocaml-modules/ppx_monad/default.nix
index cb45f5233790..8207bce79d00 100644
--- a/pkgs/development/ocaml-modules/ppx_monad/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_monad/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "niols";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cbguAddSlUxBK7pmT7vNmtJW9TrVZZjdSJRMT3lqxOA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_show/default.nix b/pkgs/development/ocaml-modules/ppx_show/default.nix
index 8874f2f4253a..a916af5ce01b 100644
--- a/pkgs/development/ocaml-modules/ppx_show/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_show/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "thierry-martinez";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YwWAdOtb0zg2hqNkGRiigz/Pci8Jy/QD+WyUEohEsns=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
index 3a887bdd5aeb..11f6996b139d 100644
--- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
index 11bbb63b59ca..fec5c3f421af 100644
--- a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "janestreet";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lSOUSMVgsRiArEhFTKpAj2yFBPbtaIc/SxdPA+24xXs=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
index 22fe2ef279f2..431751e43310 100644
--- a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "janestreet";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XGgpcAEemBNEagblBjpK+BiL0OUsU2JPqOq+heHbqVk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix
index d3e7673a5c27..953e1daad0bb 100644
--- a/pkgs/development/ocaml-modules/printbox/default.nix
+++ b/pkgs/development/ocaml-modules/printbox/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PQbr2sjASoWz0OHAMV6buAJERpnUJxVpLAigIVnADIc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/process/default.nix b/pkgs/development/ocaml-modules/process/default.nix
index ad1c2d96b6c0..0e23ddd1a4f7 100644
--- a/pkgs/development/ocaml-modules/process/default.nix
+++ b/pkgs/development/ocaml-modules/process/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dsheets";
     repo = "ocaml-process";
-    rev = version;
+    tag = version;
     sha256 = "0m1ldah5r9gcq09d9jh8lhvr77910dygx5m309k1jm60ah9mdcab";
   };
 
diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
index 74798bc3d6fe..a8bfd999b442 100644
--- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
+++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ACoquereau";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pulseaudio/default.nix b/pkgs/development/ocaml-modules/pulseaudio/default.nix
index 3afa4d4fee7f..ea7b1b7f104d 100644
--- a/pkgs/development/ocaml-modules/pulseaudio/default.nix
+++ b/pkgs/development/ocaml-modules/pulseaudio/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-pulseaudio";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-eG2HS5g3ycDftRDyXGBwPJE7VRnLXNUgcEgNfVm//ds=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pure-splitmix/default.nix b/pkgs/development/ocaml-modules/pure-splitmix/default.nix
index 8b929da7331c..a0b2a4a4da1c 100644
--- a/pkgs/development/ocaml-modules/pure-splitmix/default.nix
+++ b/pkgs/development/ocaml-modules/pure-splitmix/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "Lysxia";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "RUnsAB4hMV87ItCyGhc47bHGY1iOwVv9kco2HxnzqbU=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix
index 2d63152d9f6b..f1fc1fa9f3c2 100644
--- a/pkgs/development/ocaml-modules/pyml/default.nix
+++ b/pkgs/development/ocaml-modules/pyml/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "thierry-martinez";
     repo = "pyml";
-    rev = version;
+    tag = version;
     sha256 = "sha256-0Yy5T/S3Npwt0XJmEsdXGg5AXYi9vV9UG9nMSzz/CEc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix
index b266f47ffcfa..6906cf5b201c 100644
--- a/pkgs/development/ocaml-modules/qcheck/core.nix
+++ b/pkgs/development/ocaml-modules/qcheck/core.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "qcheck";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iuFlmSeUhumeWhqHlaNqDjReRf8c4e76hhT27DK3+/g=";
   };
 
diff --git a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
index c659e1343386..5df598b77328 100644
--- a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
+++ b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-multicore";
     repo = "multicoretests";
-    rev = version;
+    tag = version;
     hash = "sha256-taaH+hBOdiCK2HT+5OfX892/f1ozlLdd/AteapYWK9Y=";
   };
 
diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix
index de1bbca4ef08..6362002182d4 100644
--- a/pkgs/development/ocaml-modules/qtest/default.nix
+++ b/pkgs/development/ocaml-modules/qtest/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "vincent-hugot";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VLY8+Nu6md0szW4RVxTFwlSQ9kyrgUqf7wQEA6GW8BE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix
index 8d01acc1afb9..f36843e630f1 100644
--- a/pkgs/development/ocaml-modules/reactivedata/default.nix
+++ b/pkgs/development/ocaml-modules/reactivedata/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "reactiveData";
-    rev = version;
+    tag = version;
     sha256 = "sha256-MO9WMe1k2QcC5RynE6uZHohmu3QlpTHvAkvQNgu3P90=";
   };
 
diff --git a/pkgs/development/ocaml-modules/repr/default.nix b/pkgs/development/ocaml-modules/repr/default.nix
index ba9a0fc85729..19e8c883fd63 100644
--- a/pkgs/development/ocaml-modules/repr/default.nix
+++ b/pkgs/development/ocaml-modules/repr/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mirage";
     repo = "repr";
-    rev = version;
+    tag = version;
     hash = "sha256-SM55m5NIaQ2UKAtznNFSt3LN4QA7As0DyTxVeQjOTjI=";
   };
 
diff --git a/pkgs/development/ocaml-modules/resource-pooling/default.nix b/pkgs/development/ocaml-modules/resource-pooling/default.nix
index d98e8e8c47e9..9ae330436b39 100644
--- a/pkgs/development/ocaml-modules/resource-pooling/default.nix
+++ b/pkgs/development/ocaml-modules/resource-pooling/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-GNYPxjMTo7y40y7aQdseuFyeVF/hSCZKXfEaH/WIO9w=";
   };
 
diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix
index 5018a282e59e..f7c2d6298e77 100644
--- a/pkgs/development/ocaml-modules/resto/default.nix
+++ b/pkgs/development/ocaml-modules/resto/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "resto";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VdkYUy7Fi53ku6F/1FV55/VcyF/tDZKN4NTMabDd/T4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/rfc7748/default.nix b/pkgs/development/ocaml-modules/rfc7748/default.nix
index 8adf46c3b384..5d76b5e5f816 100644
--- a/pkgs/development/ocaml-modules/rfc7748/default.nix
+++ b/pkgs/development/ocaml-modules/rfc7748/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "burgerdev";
     repo = "ocaml-rfc7748";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mgZooyfxrKBVQFn01B8PULmFUW9Zq5HJfgHCSJSkJo4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ringo/default.nix b/pkgs/development/ocaml-modules/ringo/default.nix
index 4120d82cb295..796982c251e4 100644
--- a/pkgs/development/ocaml-modules/ringo/default.nix
+++ b/pkgs/development/ocaml-modules/ringo/default.nix
@@ -10,7 +10,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "ringo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8dThhY7TIjd0lLdCt6kxr0yhgVGDyN6ZMSx0Skfbcwk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix
index 363c8edf71ee..66cee03b2677 100644
--- a/pkgs/development/ocaml-modules/safepass/default.nix
+++ b/pkgs/development/ocaml-modules/safepass/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "darioteixeira";
     repo = "ocaml-safepass";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1cwslwdb1774lfmhcclj9kymvidbcpjx1vp16jnjirqdqgl4zs5q";
   };
 
diff --git a/pkgs/development/ocaml-modules/samplerate/default.nix b/pkgs/development/ocaml-modules/samplerate/default.nix
index 51f80d727f1a..643c2a3c3b5a 100644
--- a/pkgs/development/ocaml-modules/samplerate/default.nix
+++ b/pkgs/development/ocaml-modules/samplerate/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-samplerate";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0h0i9v9p9n2givv3wys8qrfi1i7vp8kq7lnkf14s7d3m4r8x4wrp";
   };
 
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index 57cf08744cb3..b467a5ca213b 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -26,7 +26,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
     src = fetchFromGitHub {
       owner = "javalib-team";
       repo = pname;
-      rev = version;
+      tag = version;
       hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw=";
     };
 
diff --git a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
index 5a57a79889e1..be88d871e7d2 100644
--- a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
+++ b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "ocaml-secp256k1-internal";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-amVtp94cE1NxClWJgcJvRmilnQlC7z44mORUaxvPn00=";
   };
 
diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix
index d27d260a3723..0a4d05fd5133 100644
--- a/pkgs/development/ocaml-modules/secp256k1/default.nix
+++ b/pkgs/development/ocaml-modules/secp256k1/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "dakk";
     repo = "secp256k1-ml";
-    rev = version;
+    tag = version;
     hash = "sha256-22+dZb3MC1W5Qvsz3+IHV1/XiGCRmJHTH+6IW2QX2hU=";
   };
 
diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix
index 6d4797ecf4ac..f6f6ee69531c 100644
--- a/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -51,7 +51,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-community";
     repo = "sedlex";
-    rev = "v${version}";
+    tag = "v${version}";
     inherit (param) sha256;
   };
 
diff --git a/pkgs/development/ocaml-modules/simple-diff/default.nix b/pkgs/development/ocaml-modules/simple-diff/default.nix
index 0a578f28b2b1..793322541f17 100644
--- a/pkgs/development/ocaml-modules/simple-diff/default.nix
+++ b/pkgs/development/ocaml-modules/simple-diff/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gjaldon";
     repo = "simple_diff";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OaKECUBCCt9KfdRJf3HcXTUJVxKKdYtnzOHpMPOllrk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/slug/default.nix b/pkgs/development/ocaml-modules/slug/default.nix
index 55657d32c454..987dec7525b2 100644
--- a/pkgs/development/ocaml-modules/slug/default.nix
+++ b/pkgs/development/ocaml-modules/slug/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "thangngoc89";
     repo = "ocaml-slug";
-    rev = version;
+    tag = version;
     sha256 = "sha256-pIk/0asSyibXbwmBSBuLwl2SS9aw6dNDDvwO+1VJGf8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix
index 7ca2e65935ad..cd2f53833d27 100644
--- a/pkgs/development/ocaml-modules/sodium/default.nix
+++ b/pkgs/development/ocaml-modules/sodium/default.nix
@@ -20,7 +20,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "dsheets";
       repo = "ocaml-sodium";
-      rev = version;
+      tag = version;
       sha256 = "124gpi1jhac46x05gp5viykyrafnlp03v1cmkl13c6pgcs8w04pv";
     };
 
diff --git a/pkgs/development/ocaml-modules/soundtouch/default.nix b/pkgs/development/ocaml-modules/soundtouch/default.nix
index db7cb1de1060..e457c2503899 100644
--- a/pkgs/development/ocaml-modules/soundtouch/default.nix
+++ b/pkgs/development/ocaml-modules/soundtouch/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-soundtouch";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-81Mhk4PZx4jGrVIevzMslvVbKzipzDzHWnbtOjeZCI8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/speex/default.nix b/pkgs/development/ocaml-modules/speex/default.nix
index e0e8da318dd9..501acecb0808 100644
--- a/pkgs/development/ocaml-modules/speex/default.nix
+++ b/pkgs/development/ocaml-modules/speex/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-speex";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0p4ip37kihlz9qy604llak2kzd00g45ix1yiihnrri2nm01scfab";
   };
 
diff --git a/pkgs/development/ocaml-modules/spelll/default.nix b/pkgs/development/ocaml-modules/spelll/default.nix
index ec59977d333e..f7ff64ba1141 100644
--- a/pkgs/development/ocaml-modules/spelll/default.nix
+++ b/pkgs/development/ocaml-modules/spelll/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nI8fdArYynR70PUJIgyogGBCe4gFhfVzuRdZzFGKqOc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/srt/default.nix b/pkgs/development/ocaml-modules/srt/default.nix
index 6cbcf20b1727..f95ab010a8f3 100644
--- a/pkgs/development/ocaml-modules/srt/default.nix
+++ b/pkgs/development/ocaml-modules/srt/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-srt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FVgOEBPYZz7SQ5c6mLAssDwY1NuXsV3ghP7OyLRd9Kw=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index fea4be04f8a3..3015bb6f521f 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ssl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gi80iwlKaI4TdAVnCyPG03qRWFa19DHdTrA0KMFBAc4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/swhid_core/default.nix b/pkgs/development/ocaml-modules/swhid_core/default.nix
index bc9998be2dc2..d0ef4f658a8a 100644
--- a/pkgs/development/ocaml-modules/swhid_core/default.nix
+++ b/pkgs/development/ocaml-modules/swhid_core/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "swhid_core";
-    rev = version;
+    tag = version;
     hash = "sha256-uLnVbptCvmBeNbOjGjyAWAKgzkKLDTYVFY6SNH2zf0A=";
   };
 
diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix
index 293e508c283f..6cd603be6ff1 100644
--- a/pkgs/development/ocaml-modules/syslog/default.nix
+++ b/pkgs/development/ocaml-modules/syslog/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "geneanet";
     repo = "ocaml-syslog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WybNZBPhv4fhjzzb95E+6ZHcZUnfROLlNF3PMBGO9ys=";
   };
 
diff --git a/pkgs/development/ocaml-modules/taglib/default.nix b/pkgs/development/ocaml-modules/taglib/default.nix
index ca0a47a356b0..a957f2093998 100644
--- a/pkgs/development/ocaml-modules/taglib/default.nix
+++ b/pkgs/development/ocaml-modules/taglib/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-taglib";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-tAvzVr0PW1o0kKFxdi/ks4obqnyBm8YfiiFupXZkUho=";
   };
 
diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix
index 58c19e399cc4..53b0a2ae0627 100644
--- a/pkgs/development/ocaml-modules/tcslib/default.nix
+++ b/pkgs/development/ocaml-modules/tcslib/default.nix
@@ -15,7 +15,7 @@ buildOasisPackage rec {
   src = fetchFromGitHub {
     owner = "tcsprojects";
     repo = "tcslib";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "05g6m82blsccq8wx8knxv6a5fzww7hi624jx91f9h87nk2fsplhi";
   };
 
diff --git a/pkgs/development/ocaml-modules/tdigest/default.nix b/pkgs/development/ocaml-modules/tdigest/default.nix
index 5ea7ed0f7ee0..37988eaf7a7b 100644
--- a/pkgs/development/ocaml-modules/tdigest/default.nix
+++ b/pkgs/development/ocaml-modules/tdigest/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "SGrondin";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-Z2rOaiNGvVDbRwf5XfoNIcenQdrE3fxHnfzyi6Ki2Ic=";
   };
 
diff --git a/pkgs/development/ocaml-modules/terml/default.nix b/pkgs/development/ocaml-modules/terml/default.nix
index b70371e623fc..83235387edb3 100644
--- a/pkgs/development/ocaml-modules/terml/default.nix
+++ b/pkgs/development/ocaml-modules/terml/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "wllfaria";
     repo = "terml";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-2ifMfUaYYsCFOACgXgJ5IuoSEicHyIqumLpun2ZqcDc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/theora/default.nix b/pkgs/development/ocaml-modules/theora/default.nix
index e0aa39107f8b..42dca090c2e4 100644
--- a/pkgs/development/ocaml-modules/theora/default.nix
+++ b/pkgs/development/ocaml-modules/theora/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-theora";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2FXB5BOBRQhnpEmdlYBdZZXuXW9K+1cu7akJQDuDAMc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/timed/default.nix b/pkgs/development/ocaml-modules/timed/default.nix
index d68f85ca9fb1..f1386b8460c6 100644
--- a/pkgs/development/ocaml-modules/timed/default.nix
+++ b/pkgs/development/ocaml-modules/timed/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rlepigre";
     repo = "ocaml-${pname}";
-    rev = version;
+    tag = version;
     sha256 = "sha256-wUoI9j/j0IGYW2NfJHmyR2XEYfYejyoYLWnKsuWdFas=";
   };
 
diff --git a/pkgs/development/ocaml-modules/tiny_httpd/default.nix b/pkgs/development/ocaml-modules/tiny_httpd/default.nix
index 4ea3551aae83..197f20660d9a 100644
--- a/pkgs/development/ocaml-modules/tiny_httpd/default.nix
+++ b/pkgs/development/ocaml-modules/tiny_httpd/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9L4WCduQNj5Jd/u3SozuXiGTkgojwfGIP5KgQmnWgQw=";
   };
 
diff --git a/pkgs/development/ocaml-modules/toml/default.nix b/pkgs/development/ocaml-modules/toml/default.nix
index 2f7f9b547e06..1008afb001ef 100644
--- a/pkgs/development/ocaml-modules/toml/default.nix
+++ b/pkgs/development/ocaml-modules/toml/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-toml";
     repo = "to.ml";
-    rev = version;
+    tag = version;
     hash = "sha256-uk14Py7lEEDJhFsRRtStXqKlJLtx0o8eS9DEIes4SHw=";
   };
 
diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix
index 6ac2867ac1a7..1454d38d9a6f 100644
--- a/pkgs/development/ocaml-modules/torch/default.nix
+++ b/pkgs/development/ocaml-modules/torch/default.nix
@@ -27,7 +27,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "LaurentMazare";
     repo = "ocaml-${pname}";
-    rev = version;
+    tag = version;
     hash = "sha256-z/9NUBjeFWE63Z/e8OyzDiy8hrn6qzjaiBH8G9MPeos=";
   };
 
diff --git a/pkgs/development/ocaml-modules/trie/default.nix b/pkgs/development/ocaml-modules/trie/default.nix
index f0101bb73139..2a5a842939c8 100644
--- a/pkgs/development/ocaml-modules/trie/default.nix
+++ b/pkgs/development/ocaml-modules/trie/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "kandu";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0s7p9swjqjsqddylmgid6cv263ggq7pmb734z4k84yfcrgb6kg4g";
   };
 
diff --git a/pkgs/development/ocaml-modules/tsdl-image/default.nix b/pkgs/development/ocaml-modules/tsdl-image/default.nix
index 8ee97c9aa4dd..bcc27850382d 100644
--- a/pkgs/development/ocaml-modules/tsdl-image/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl-image/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "sanette";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-mgTFwkuFJVwJmHrzHSdNh8v4ehZIcWemK+eLqjglw5o=";
   };
 
diff --git a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix
index fbe0f16ff0c9..9e1357eb8c8e 100644
--- a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "sanette";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-szuGmLzgGyQExCQwpopVNswtZZdhP29Q1+uNQJZb43Q=";
   };
 
diff --git a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix
index 17b5e2006b0c..c2e978e04916 100644
--- a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "sanette";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-1MGbsekaBoCz4vAwg+Dfzsl0xUKgs8dUEr+OpLopnig=";
   };
 
diff --git a/pkgs/development/ocaml-modules/tsort/default.nix b/pkgs/development/ocaml-modules/tsort/default.nix
index e026ecb27ffc..f9eb4648e28c 100644
--- a/pkgs/development/ocaml-modules/tsort/default.nix
+++ b/pkgs/development/ocaml-modules/tsort/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "dmbaturin";
     repo = "ocaml-tsort";
-    rev = version;
+    tag = version;
     sha256 = "sha256-SCd0R8iGwMeRhhSxMid9lzqj5fm+owCJ2dzwtLpFqB4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix
index ef5fae48b37c..1c6edd3f1081 100644
--- a/pkgs/development/ocaml-modules/twt/default.nix
+++ b/pkgs/development/ocaml-modules/twt/default.nix
@@ -17,7 +17,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "mlin";
       repo = "twt";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-xbjLPd7P1KyuC3i6WHLBcdLwd14atcBsd5ER+l97KAk=";
     };
 
diff --git a/pkgs/development/ocaml-modules/uecc/default.nix b/pkgs/development/ocaml-modules/uecc/default.nix
index e9bdc340647a..271f00af2315 100644
--- a/pkgs/development/ocaml-modules/uecc/default.nix
+++ b/pkgs/development/ocaml-modules/uecc/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "ocaml-uecc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o/DylUx+olRRloiCU6b1t/xOmW8A5IZB2n3U7fkMo80=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix
index ac98285c101f..11b003ec5061 100644
--- a/pkgs/development/ocaml-modules/ulex/default.nix
+++ b/pkgs/development/ocaml-modules/ulex/default.nix
@@ -34,7 +34,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "whitequark";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       inherit (param) sha256;
     };
 
diff --git a/pkgs/development/ocaml-modules/vorbis/default.nix b/pkgs/development/ocaml-modules/vorbis/default.nix
index 968c51f5e373..d686541b062e 100644
--- a/pkgs/development/ocaml-modules/vorbis/default.nix
+++ b/pkgs/development/ocaml-modules/vorbis/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-vorbis";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iCoE7I70wAp4n4XfETVKeaob2811E97/e6144bY/nqk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/vpl-core/default.nix b/pkgs/development/ocaml-modules/vpl-core/default.nix
index bdc78d941925..863b30fefbbb 100644
--- a/pkgs/development/ocaml-modules/vpl-core/default.nix
+++ b/pkgs/development/ocaml-modules/vpl-core/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "VERIMAG-Polyhedra";
     repo = "vpl";
-    rev = version;
+    tag = version;
     hash = "sha256-mSD/xSweeK9WMxWDdX/vzN96iXo74RkufjuNvtzsP9o=";
   };
 
diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix
index 3cd3fb98e481..86739685f38e 100644
--- a/pkgs/development/ocaml-modules/webmachine/default.nix
+++ b/pkgs/development/ocaml-modules/webmachine/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = "ocaml-webmachine";
-    rev = version;
+    tag = version;
     sha256 = "03ynb1l2jjqba88m9r8m5hwlm8izpfp617r4vcab5kmdim1l2ffx";
   };
 
diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix
index 2955755ccb41..7b476589ea40 100644
--- a/pkgs/development/ocaml-modules/xenstore/default.nix
+++ b/pkgs/development/ocaml-modules/xenstore/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mirage";
     repo = "ocaml-xenstore";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LaynsbCE/+2QfbQCOLZi8nw1rqmZtgrwAov9cSxYZw8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix
index 735495979cc5..7eb501621234 100644
--- a/pkgs/development/ocaml-modules/xenstore_transport/default.nix
+++ b/pkgs/development/ocaml-modules/xenstore_transport/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "xapi-project";
     repo = "ocaml-xenstore-clients";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1kxxd9i4qiq98r7sgvl59iq2ni7y6drnv48qj580q5cyiyyc85q3";
   };
 
diff --git a/pkgs/development/ocaml-modules/xmlplaylist/default.nix b/pkgs/development/ocaml-modules/xmlplaylist/default.nix
index a9294cf162df..6f0379b53648 100644
--- a/pkgs/development/ocaml-modules/xmlplaylist/default.nix
+++ b/pkgs/development/ocaml-modules/xmlplaylist/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-xmlplaylist";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1x5lbwkr2ip00x8vyfbl8936yy79j138vx8a16ix7g9p2j5qsfcq";
   };
 
diff --git a/pkgs/development/ocaml-modules/yuujinchou/default.nix b/pkgs/development/ocaml-modules/yuujinchou/default.nix
index 3a0f6b08ea46..79ddbd4f8323 100644
--- a/pkgs/development/ocaml-modules/yuujinchou/default.nix
+++ b/pkgs/development/ocaml-modules/yuujinchou/default.nix
@@ -35,7 +35,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "RedPRL";
     repo = pname;
-    rev = version;
+    tag = version;
     inherit (params) hash;
   };
 
diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix
index 1e2dea1420b6..1479fb8a3baa 100644
--- a/pkgs/development/ocaml-modules/zed/default.nix
+++ b/pkgs/development/ocaml-modules/zed/default.nix
@@ -26,7 +26,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-community";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-lbhqjZxeUqHdd+yahRO+B6L2mc+h+4T2+qKVgWC2HY8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/zelus/default.nix b/pkgs/development/ocaml-modules/zelus/default.nix
index 5425038111fb..b1e0d40e5da8 100644
--- a/pkgs/development/ocaml-modules/zelus/default.nix
+++ b/pkgs/development/ocaml-modules/zelus/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "INRIA";
     repo = "zelus";
-    rev = version;
+    tag = version;
     hash = "sha256-NcGX343LProADtzJwlq1kmihLaya1giY6xv9ScvdgTA=";
   };
 
diff --git a/pkgs/development/octave-modules/bim/default.nix b/pkgs/development/octave-modules/bim/default.nix
index afffe81ef8e9..5df6370e2de9 100644
--- a/pkgs/development/octave-modules/bim/default.nix
+++ b/pkgs/development/octave-modules/bim/default.nix
@@ -13,7 +13,7 @@ buildOctavePackage rec {
   src = fetchFromGitHub {
     owner = "carlodefalco";
     repo = "bim";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hgFb1KFE1KJC8skIaeT/7h/fg1aqRpedGnEPY24zZSI=";
   };
 
diff --git a/pkgs/development/octave-modules/msh/default.nix b/pkgs/development/octave-modules/msh/default.nix
index 181b0c2ac58f..7415a5a0ce4c 100644
--- a/pkgs/development/octave-modules/msh/default.nix
+++ b/pkgs/development/octave-modules/msh/default.nix
@@ -20,7 +20,7 @@ buildOctavePackage rec {
   src = fetchFromGitHub {
     owner = "carlodefalco";
     repo = "msh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UnMrIruzm3ARoTgUlMMxfjTOMZw/znZUQJmj3VEOw8I=";
   };
 
diff --git a/pkgs/development/octave-modules/video/default.nix b/pkgs/development/octave-modules/video/default.nix
index 903d68589d2f..b16da24c87d0 100644
--- a/pkgs/development/octave-modules/video/default.nix
+++ b/pkgs/development/octave-modules/video/default.nix
@@ -14,7 +14,7 @@ buildOctavePackage rec {
   src = fetchFromGitHub {
     owner = "Andy1978";
     repo = "octave-video";
-    rev = version;
+    tag = version;
     hash = "sha256-JFySAu/3lCnfuFMNGYPzX2MqhsRi1+IyJQBcKB9vCo0=";
   };
 
diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
index 8a86295dc45c..633e32ef1472 100644
--- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix
+++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
@@ -16,7 +16,7 @@ buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "percona";
     repo = "percona-toolkit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "084ldpskvlfm32lfss5qqzm5y9b8hf029aa4i5pcnzgb53xaxkqx";
   };
 
diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
index 0669f5b7c7af..7ffc31b53e78 100644
--- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
+++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
@@ -18,7 +18,7 @@ buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "trizen";
     repo = "youtube-viewer";
-    rev = version;
+    tag = version;
     sha256 = "9Z4fv2B0AnwtYsp7h9phnRMmHtBOMObIJvK8DmKQRxs=";
   };
 
diff --git a/pkgs/development/php-packages/amqp/default.nix b/pkgs/development/php-packages/amqp/default.nix
index 8891aba7cd9d..164dec9812d2 100644
--- a/pkgs/development/php-packages/amqp/default.nix
+++ b/pkgs/development/php-packages/amqp/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "php-amqp";
     repo = "php-amqp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jVD5dq2kgFnprj190W9hnLG+9yPLWm19AjoGBBz6v8c=";
   };
 
diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix
index e6a617d1aed2..4064e9a5f653 100644
--- a/pkgs/development/php-packages/apcu/default.nix
+++ b/pkgs/development/php-packages/apcu/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "krakjoe";
     repo = "apcu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-g+Oo6y+24VOWHaDZ23iItkGwOa5bTtKMAjZOmAi6EOo=";
   };
 
diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix
index 027c80d02c86..7dfa81851545 100644
--- a/pkgs/development/php-packages/ast/default.nix
+++ b/pkgs/development/php-packages/ast/default.nix
@@ -14,7 +14,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "nikic";
     repo = "php-ast";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-9HP+hKcpkWmvsx335JiCVjFG+xyAMEm5dWxWC1nZPxU=";
   };
 
diff --git a/pkgs/development/php-packages/composer-local-repo-plugin/default.nix b/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
index d6199a568659..c61a096a1b43 100644
--- a/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
+++ b/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
@@ -14,7 +14,7 @@ php.buildComposerWithPlugin {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "composer-local-repo-plugin";
-    rev = version;
+    tag = version;
     hash = "sha256-edbn07r/Uc1g0qOuVBZBs6N1bMN5kIfA1b4FCufdw5M=";
   };
 
diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix
index fb98e4846d83..ff5efe577732 100644
--- a/pkgs/development/php-packages/couchbase/default.nix
+++ b/pkgs/development/php-packages/couchbase/default.nix
@@ -17,7 +17,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "php-couchbase";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JpzLR4NcyShl2VTivj+15iAsTTsZmdMIdZYc3dLCbIA=";
   };
 
diff --git a/pkgs/development/php-packages/cyclonedx-php-composer/default.nix b/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
index d3af20b63bc7..44bffde927ad 100644
--- a/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
+++ b/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
@@ -14,7 +14,7 @@ php.buildComposerWithPlugin {
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-php-composer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0fb1QiuVJqcB7CAEyB0y60/O9iiibT06mccZYe52dFQ=";
   };
 
diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix
index 866de8be10ab..10cf492f5788 100644
--- a/pkgs/development/php-packages/datadog_trace/default.nix
+++ b/pkgs/development/php-packages/datadog_trace/default.nix
@@ -20,7 +20,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "DataDog";
     repo = "dd-trace-php";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-Kx2HaWvRT+mFIs0LAAptx6nm9DQ83QEuyHNcEPEr7A4=";
   };
diff --git a/pkgs/development/php-packages/ds/default.nix b/pkgs/development/php-packages/ds/default.nix
index a78974c42a0f..bf10b58add8f 100644
--- a/pkgs/development/php-packages/ds/default.nix
+++ b/pkgs/development/php-packages/ds/default.nix
@@ -16,7 +16,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "php-ds";
     repo = "ext-ds";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lL1PUjc4bMTsWm2th0wDxnMaGuVziBUtgK88bUJXuBY=";
   };
 
diff --git a/pkgs/development/php-packages/imap/default.nix b/pkgs/development/php-packages/imap/default.nix
index 208130e95158..48d6afc6113c 100644
--- a/pkgs/development/php-packages/imap/default.nix
+++ b/pkgs/development/php-packages/imap/default.nix
@@ -21,7 +21,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "php";
     repo = "pecl-mail-imap";
-    rev = version;
+    tag = version;
     hash = "sha256-QVeimxm3rfWMvMpSgadhMKd24yPdDGVuhXIOs8668do=";
   };
 
diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix
index 173b2753dc85..531819e7b61e 100644
--- a/pkgs/development/php-packages/maxminddb/default.nix
+++ b/pkgs/development/php-packages/maxminddb/default.nix
@@ -14,7 +14,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "maxmind";
     repo = "MaxMind-DB-Reader-php";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-zFO77h++OHxnk0Rz61jiCBZS80g0+GmRbw2LxayIFuo=";
   };
 
diff --git a/pkgs/development/php-packages/memcache/default.nix b/pkgs/development/php-packages/memcache/default.nix
index 30180ed16723..8cda14d2cc97 100644
--- a/pkgs/development/php-packages/memcache/default.nix
+++ b/pkgs/development/php-packages/memcache/default.nix
@@ -14,7 +14,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "websupport-sk";
     repo = "pecl-memcache";
-    rev = version;
+    tag = version;
     hash = "sha256-77GvQ59XUpIZmdYZP6IhtjdkYwXKuNBSG+LBScz2BtI=";
   };
 
diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix
index 1b85b25671ae..7ae3589d8eac 100644
--- a/pkgs/development/php-packages/memcached/default.nix
+++ b/pkgs/development/php-packages/memcached/default.nix
@@ -16,7 +16,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "php-memcached-dev";
     repo = "php-memcached";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-V4d6bY0m1nuEfjZjt3qio4/HOBcSlD9+XMEl1GPfbhs=";
   };
 
diff --git a/pkgs/development/php-packages/memprof/default.nix b/pkgs/development/php-packages/memprof/default.nix
index 2b6b3de25fdf..fd874dae1f04 100644
--- a/pkgs/development/php-packages/memprof/default.nix
+++ b/pkgs/development/php-packages/memprof/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "arnaud-lb";
     repo = "php-memory-profiler";
-    rev = version;
+    tag = version;
     hash = "sha256-gq+txAU2Fw+Zm1aIu0lwPUHRqtccNcHFpp0fm3f7BnQ=";
   };
 
diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix
index 0f44ca36c387..43bc37ba66f2 100644
--- a/pkgs/development/php-packages/mongodb/default.nix
+++ b/pkgs/development/php-packages/mongodb/default.nix
@@ -21,7 +21,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-php-driver";
-    rev = version;
+    tag = version;
     hash = "sha256-BMa0JOhk3jMiuhKX9AcGC2cpL1K0mocOs5wH8F43F0U=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix
index 2b4e107b91b9..dde3c8314bcb 100644
--- a/pkgs/development/php-packages/openswoole/default.nix
+++ b/pkgs/development/php-packages/openswoole/default.nix
@@ -18,7 +18,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "openswoole";
     repo = "swoole-src";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1Bq/relLhjPRROikpCzSzzrelxW3AiMA5G17Ln2lg34=";
   };
 
diff --git a/pkgs/development/php-packages/opentelemetry/default.nix b/pkgs/development/php-packages/opentelemetry/default.nix
index 9f22936e6a6f..8f521acd11a3 100644
--- a/pkgs/development/php-packages/opentelemetry/default.nix
+++ b/pkgs/development/php-packages/opentelemetry/default.nix
@@ -14,7 +14,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-php-instrumentation";
-    rev = version;
+    tag = version;
     hash = "sha256-frFnL49tF74cDKdlTJorOOrs8rNgFMZdMdVmqsyO3cI=";
   };
 
diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix
index 75714ac70640..a5a55f5e891e 100644
--- a/pkgs/development/php-packages/pdlib/default.nix
+++ b/pkgs/development/php-packages/pdlib/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "goodspb";
     repo = "pdlib";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-AKZ3F2XzEQCeZkacSXBinxeGQrHBmqjP7mDGQ3RBAiE=";
   };
 
diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix
index 6202a1adc7ab..a8684ab7802f 100644
--- a/pkgs/development/php-packages/phalcon/default.nix
+++ b/pkgs/development/php-packages/phalcon/default.nix
@@ -14,7 +14,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "phalcon";
     repo = "cphalcon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SuY65GZ4eys2N5jX3/cmRMF4g+tGTeeQecoZvFkOnr4=";
   };
 
diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix
index 2b49c13a86b2..081c2b5cd1bf 100644
--- a/pkgs/development/php-packages/phan/default.nix
+++ b/pkgs/development/php-packages/phan/default.nix
@@ -12,7 +12,7 @@
     src = fetchFromGitHub {
       owner = "phan";
       repo = "phan";
-      rev = finalAttrs.version;
+      tag = finalAttrs.version;
       hash = "sha256-CSV+kapCzGOCBaYnX0lJVlDdZGNBCKZ/nogOac1xj1A=";
     };
 
diff --git a/pkgs/development/php-packages/pspell/default.nix b/pkgs/development/php-packages/pspell/default.nix
index fb8609bca3a3..aa66d8911af6 100644
--- a/pkgs/development/php-packages/pspell/default.nix
+++ b/pkgs/development/php-packages/pspell/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "php";
     repo = "pecl-text-pspell";
-    rev = version;
+    tag = version;
     hash = "sha256-IVBuEVsUKah8W+oVpIPT9Iln6MFox0e5/5Y14/Kgcg4=";
   };
 
diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix
index 30f7ca2a99cb..c9e4d012aa59 100644
--- a/pkgs/development/php-packages/redis/default.nix
+++ b/pkgs/development/php-packages/redis/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     repo = "phpredis";
     owner = "phpredis";
-    rev = version;
+    tag = version;
     hash = "sha256-uUnH+AS4PgIm+uias5T5+W7X5Pzq4hx4c6zAl4OYk1g=";
   };
 
diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix
index 8a2e5a45f7f1..7866aff30fc2 100644
--- a/pkgs/development/php-packages/snuffleupagus/default.nix
+++ b/pkgs/development/php-packages/snuffleupagus/default.nix
@@ -16,7 +16,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "jvoisin";
     repo = "snuffleupagus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W+EQXjvmDHih5YW/SjRcEdUELePUPKrNWB8vW9dLK/g=";
   };
 
diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix
index 7b9e73b538de..51eecd7c4c56 100644
--- a/pkgs/development/php-packages/spx/default.nix
+++ b/pkgs/development/php-packages/spx/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "NoiseByNorthwest";
     repo = "php-spx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Dcv8ncYPIug7e24mvL1gn0x0CeLNAck8djm/r/yiPe8=";
   };
 
diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix
index 16e121531ad3..89aef535f3cb 100644
--- a/pkgs/development/php-packages/swoole/default.nix
+++ b/pkgs/development/php-packages/swoole/default.nix
@@ -18,7 +18,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "swoole";
     repo = "swoole-src";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mCJj0vLpJinxK/EfPq+CeVWnoxouqClOKYbrgj7GNDc=";
   };
 
diff --git a/pkgs/development/php-packages/uv/default.nix b/pkgs/development/php-packages/uv/default.nix
index 1bbc6450d0b2..098103ce5de5 100644
--- a/pkgs/development/php-packages/uv/default.nix
+++ b/pkgs/development/php-packages/uv/default.nix
@@ -12,7 +12,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "amphp";
     repo = "ext-uv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RYb7rszHbdTLfBi66o9hVkFwX+7RlcxH5PAw5frjpFg=";
   };
 
diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index 1bb8ddde7164..c7fb19f44565 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "xdebug";
     repo = "xdebug";
-    rev = version;
+    tag = version;
     hash = "sha256-LTM2c9DC837y0t4S3m9292x37q4tXg1Poh2dm0KAyJc=";
   };
 
diff --git a/pkgs/development/php-packages/zstd/default.nix b/pkgs/development/php-packages/zstd/default.nix
index 1e249c5aa9ad..97159bfce62b 100644
--- a/pkgs/development/php-packages/zstd/default.nix
+++ b/pkgs/development/php-packages/zstd/default.nix
@@ -16,7 +16,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "kjdev";
     repo = "php-ext-zstd";
-    rev = version;
+    tag = version;
     hash = "sha256-XB8GatrL2gQbTiZp6eJCFu8yRAOcrQbcJCaKol3or8Q=";
   };
 
diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix
index 35d39fed9a6f..c00a670c12a6 100644
--- a/pkgs/development/python-modules/accupy/default.nix
+++ b/pkgs/development/python-modules/accupy/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = "accupy";
-    rev = version;
+    tag = version;
     hash = "sha256-xxwLmL/rFgDFQNr8mRBFG1/NArQk9wanelL4Lu7ls2s=";
   };
 
diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index bb6b018fd849..bbc638b1f24d 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AzureAD";
     repo = "azure-activedirectory-library-for-python";
-    rev = version;
+    tag = version;
     hash = "sha256-HE8/P0aohoZNeMdcQVKdz6M31FMrjsd7oVytiaD0idI=";
   };
 
diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix
index 3aaf814b608c..bf93cfc2cfbd 100644
--- a/pkgs/development/python-modules/adb-shell/default.nix
+++ b/pkgs/development/python-modules/adb-shell/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JeffLIrion";
     repo = "adb_shell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pOkFUh3SEu/ch9R1lVoQn50nufQp8oI+D4/+Ybal5CA=";
   };
 
diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix
index 08da1feadb11..40e5bb4f317b 100644
--- a/pkgs/development/python-modules/add-trailing-comma/default.nix
+++ b/pkgs/development/python-modules/add-trailing-comma/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B+wjBy42RwabVz/6qEMGpB0JmwJ9hqSskwcNj4x/B/k=";
   };
 
diff --git a/pkgs/development/python-modules/advocate/default.nix b/pkgs/development/python-modules/advocate/default.nix
index a0954dae4439..4dda0ea26414 100644
--- a/pkgs/development/python-modules/advocate/default.nix
+++ b/pkgs/development/python-modules/advocate/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JordanMilne";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-opObkjkad+yrLE2b7DULHjGuNeVhu4fEmSavgA39YPw=";
   };
 
diff --git a/pkgs/development/python-modules/aggdraw/default.nix b/pkgs/development/python-modules/aggdraw/default.nix
index 5eaa52f72676..36e1fad0a748 100644
--- a/pkgs/development/python-modules/aggdraw/default.nix
+++ b/pkgs/development/python-modules/aggdraw/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytroll";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-J9+mxlUxOoRBFdz+p8me2T93jaov5rNvKbAZ2YX/VhA=";
   };
 
diff --git a/pkgs/development/python-modules/aggregate6/default.nix b/pkgs/development/python-modules/aggregate6/default.nix
index 2be5f07a85ac..4152ee2da8d9 100644
--- a/pkgs/development/python-modules/aggregate6/default.nix
+++ b/pkgs/development/python-modules/aggregate6/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "job";
     repo = "aggregate6";
-    rev = version;
+    tag = version;
     hash = "sha256-tBo9LSmEu/0KPSeg17dlh7ngUvP9GyW6b01qqpr5Bx0=";
   };
 
diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix
index 47f7108309e6..2a601f0eaa76 100644
--- a/pkgs/development/python-modules/aiocontextvars/default.nix
+++ b/pkgs/development/python-modules/aiocontextvars/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fantix";
     repo = "aiocontextvars";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-s1YhpBLz+YNmUO+0BOltfjr3nz4m6mERszNqlmquTyg=";
   };
 
diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix
index bb484353a5da..44f08e34b165 100644
--- a/pkgs/development/python-modules/aiodhcpwatcher/default.nix
+++ b/pkgs/development/python-modules/aiodhcpwatcher/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiodhcpwatcher";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qdtOEfhBrLpO14IJNuTL71ajmf9sjgKgjuT/3Mqycc8=";
   };
 
diff --git a/pkgs/development/python-modules/aioemonitor/default.nix b/pkgs/development/python-modules/aioemonitor/default.nix
index a9fcde7fb79a..b3d8a133716f 100644
--- a/pkgs/development/python-modules/aioemonitor/default.nix
+++ b/pkgs/development/python-modules/aioemonitor/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0h8zqqy8v8r1fl9bp3m8icr2sy44p0mbfl1hbb0zni17r9r50dhn";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix
index f20c0156768b..3488b7796eee 100644
--- a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix
+++ b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiohttp-asyncmdnsresolver";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gtB5vnlOVeAFACnhR5DIS5p3caZkOXrollXFINl/7hQ=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix
index 0b7dc5c6ea2e..bd903ec2e07a 100644
--- a/pkgs/development/python-modules/aiohttp-swagger/default.nix
+++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cr0hn";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-M43sNpbXWXFRTd549cZhvhO35nBB6OH+ki36BzSk87Q=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix
index f962c82166e9..d916a455ab67 100644
--- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix
+++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "etianen";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3Q00FidZWV1KueuHyHKQf1PsDJGOaRW6v/kBy7lzD4Q=";
   };
 
diff --git a/pkgs/development/python-modules/aiohwenergy/default.nix b/pkgs/development/python-modules/aiohwenergy/default.nix
index a5f6c852d13f..eca8f37a5a18 100644
--- a/pkgs/development/python-modules/aiohwenergy/default.nix
+++ b/pkgs/development/python-modules/aiohwenergy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DCSBL";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho=";
   };
 
diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix
index ed6251b4ce04..cf37a4b28f45 100644
--- a/pkgs/development/python-modules/aiokef/default.nix
+++ b/pkgs/development/python-modules/aiokef/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "basnijholt";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9";
   };
 
diff --git a/pkgs/development/python-modules/aiomcache/default.nix b/pkgs/development/python-modules/aiomcache/default.nix
index f320ae7945d3..d876340c21e3 100644
--- a/pkgs/development/python-modules/aiomcache/default.nix
+++ b/pkgs/development/python-modules/aiomcache/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiomcache";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+rlKHDop0kNxJ0HoXROs/oyI4zE3MDyxXXhWZtVDMj4=";
   };
 
diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix
index 103c2e9fad03..9a5b6fe0e109 100644
--- a/pkgs/development/python-modules/aiomodernforms/default.nix
+++ b/pkgs/development/python-modules/aiomodernforms/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wonderslug";
     repo = "aiomodernforms";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Vx51WBjjNPIfLlwMnAuwHnGNljhnjKkU0tWB9M9rjsw=";
   };
 
diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix
index a54ce5436b7a..1b62c6a2a261 100644
--- a/pkgs/development/python-modules/aiopg/default.nix
+++ b/pkgs/development/python-modules/aiopg/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GD5lRSUjASTwBk5vEK8v3xD8eNyxpwSrO3HHvtwubmk=";
   };
 
diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix
index 8a23532f6345..52bafecf5a2b 100644
--- a/pkgs/development/python-modules/aiopylgtv/default.nix
+++ b/pkgs/development/python-modules/aiopylgtv/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bendavid";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM=";
   };
 
diff --git a/pkgs/development/python-modules/aiosenz/default.nix b/pkgs/development/python-modules/aiosenz/default.nix
index 430c5ba68d63..829afdf58630 100644
--- a/pkgs/development/python-modules/aiosenz/default.nix
+++ b/pkgs/development/python-modules/aiosenz/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "milanmeu";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-ODdWPS14zzptxuS6mff51f0s1SYnIqjF40DmvT0sL0w=";
   };
 
diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix
index 128e8c4f2d9b..c8e96855820d 100644
--- a/pkgs/development/python-modules/aiosignal/default.nix
+++ b/pkgs/development/python-modules/aiosignal/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CvNarJpSq8EKnt+PuSerMK/ZVbxL9rp7rQ4dkWykG1M=";
   };
 
diff --git a/pkgs/development/python-modules/airium/default.nix b/pkgs/development/python-modules/airium/default.nix
index c433c0066771..35b50bbb4c21 100644
--- a/pkgs/development/python-modules/airium/default.nix
+++ b/pkgs/development/python-modules/airium/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     owner = "kamichal";
     repo = "airium";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qAU+rmj2ZHw7KdxVvRyponcPiRcyENfDyW1y9JTiwsY=";
   };
 
diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix
index c9e3d2726e36..be3c60043eef 100644
--- a/pkgs/development/python-modules/airly/default.nix
+++ b/pkgs/development/python-modules/airly/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ak-ambi";
     repo = "python-airly";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-weliT/FYnRX+pzVAyRWFly7lfj2z7P+hpq5SIhyIgmI=";
   };
 
diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix
index 185843b7db50..c71c41eaf793 100644
--- a/pkgs/development/python-modules/alarmdecoder/default.nix
+++ b/pkgs/development/python-modules/alarmdecoder/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nutechsoftware";
     repo = "alarmdecoder";
-    rev = version;
+    tag = version;
     hash = "sha256-d9xNXPhFX2TUjnzZlhvqq/YASITBn6lMVTzqi+TPNjI=";
   };
 
diff --git a/pkgs/development/python-modules/amshan/default.nix b/pkgs/development/python-modules/amshan/default.nix
index f019474e89b4..da5ed6ff68db 100644
--- a/pkgs/development/python-modules/amshan/default.nix
+++ b/pkgs/development/python-modules/amshan/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "toreamun";
     repo = "amshan";
-    rev = version;
+    tag = version;
     hash = "sha256-aw0wTqb2s84STVUN55h6L926pXwaMSppBCfXZVb87w0=";
   };
 
diff --git a/pkgs/development/python-modules/android-backup/default.nix b/pkgs/development/python-modules/android-backup/default.nix
index cc153ab2e395..3106d6e692a9 100644
--- a/pkgs/development/python-modules/android-backup/default.nix
+++ b/pkgs/development/python-modules/android-backup/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bluec0re";
     repo = "android-backup-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0c436hv64ddqrjs77pa7z6spiv49pjflbmgg31p38haj5mzlrqvw";
   };
 
diff --git a/pkgs/development/python-modules/anitopy/default.nix b/pkgs/development/python-modules/anitopy/default.nix
index d7d3f2a0e56b..e87319a22330 100644
--- a/pkgs/development/python-modules/anitopy/default.nix
+++ b/pkgs/development/python-modules/anitopy/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "igorcmoura";
     repo = "anitopy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xXEf7AJKg7grDmkKfFuC4Fk6QYFJtezClyfA3vq8TfQ=";
   };
 
diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix
index 6982aa47b297..5512e90f5e04 100644
--- a/pkgs/development/python-modules/anonip/default.nix
+++ b/pkgs/development/python-modules/anonip/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DigitaleGesellschaft";
     repo = "Anonip";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc";
   };
 
diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix
index 4e5a82dc3339..830b5929143c 100644
--- a/pkgs/development/python-modules/ansiconv/default.nix
+++ b/pkgs/development/python-modules/ansiconv/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ansible";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4";
   };
 
diff --git a/pkgs/development/python-modules/anyqt/default.nix b/pkgs/development/python-modules/anyqt/default.nix
index 7e6742b432ca..bfaf83ec5423 100644
--- a/pkgs/development/python-modules/anyqt/default.nix
+++ b/pkgs/development/python-modules/anyqt/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ales-erjavec";
     repo = "anyqt";
-    rev = version;
+    tag = version;
     hash = "sha256-iDUgu+x9rnpxpHzO7Rf2rJFXsheivrK7HI3FUbomkTU=";
   };
 
diff --git a/pkgs/development/python-modules/apcaccess/default.nix b/pkgs/development/python-modules/apcaccess/default.nix
index 5fb60a8c6f82..2462f713ec82 100644
--- a/pkgs/development/python-modules/apcaccess/default.nix
+++ b/pkgs/development/python-modules/apcaccess/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "flyte";
     repo = "apcaccess";
-    rev = version;
+    tag = version;
     hash = "sha256-XLoNRh6MgXCfRtWD9NpVZSyroW6E9nRYw6Grxa+AQkc=";
   };
 
diff --git a/pkgs/development/python-modules/appnope/default.nix b/pkgs/development/python-modules/appnope/default.nix
index 19a9263a0697..2d558524d97b 100644
--- a/pkgs/development/python-modules/appnope/default.nix
+++ b/pkgs/development/python-modules/appnope/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "minrk";
     repo = "appnope";
-    rev = version;
+    tag = version;
     hash = "sha256-JYzNOPD1ofOrtZK5TTKxbF1ausmczsltR7F1Vwss8Sw=";
   };
 
diff --git a/pkgs/development/python-modules/aprslib/default.nix b/pkgs/development/python-modules/aprslib/default.nix
index 72f9d05d4e2b..c5188d0ae70d 100644
--- a/pkgs/development/python-modules/aprslib/default.nix
+++ b/pkgs/development/python-modules/aprslib/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rossengeorgiev";
     repo = "aprs-python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2bYTnbJ8wF/smTpZ2tV+3ZRae7FpbNBtXoaR2Sc9Pek=";
   };
 
diff --git a/pkgs/development/python-modules/aqipy-atmotech/default.nix b/pkgs/development/python-modules/aqipy-atmotech/default.nix
index 549e49b3d486..de5aa88eae61 100644
--- a/pkgs/development/python-modules/aqipy-atmotech/default.nix
+++ b/pkgs/development/python-modules/aqipy-atmotech/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "atmotube";
     repo = "aqipy";
-    rev = version;
+    tag = version;
     hash = "sha256-tqHhfJmtVFUSO57Cid9y3LK4pOoG7ROtwDT2hY5IE1Y=";
   };
 
diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix
index 4e5ac2e73f48..2b2bc53a4ee7 100644
--- a/pkgs/development/python-modules/aqualogic/default.nix
+++ b/pkgs/development/python-modules/aqualogic/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "swilson";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-hBg02Wypd+MyqM2SUD53djhm5OMP2QAmsp8Stf+UT2c=";
   };
 
diff --git a/pkgs/development/python-modules/arc4/default.nix b/pkgs/development/python-modules/arc4/default.nix
index 6706519259c7..a594b324390c 100644
--- a/pkgs/development/python-modules/arc4/default.nix
+++ b/pkgs/development/python-modules/arc4/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "manicmaniac";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-DlZIygf5v3ZNY2XFmrKOA15ccMo3Rv0kf6hZJ0CskeQ=";
   };
 
diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix
index 5c8c98177b69..cd448c7a0979 100644
--- a/pkgs/development/python-modules/aresponses/default.nix
+++ b/pkgs/development/python-modules/aresponses/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aresponses";
     repo = "aresponses";
-    rev = version;
+    tag = version;
     hash = "sha256-RklXlIsbdq46/7D6Hv4mdskunqw1a7SFF09OjhrvMRY=";
   };
 
diff --git a/pkgs/development/python-modules/arpy/default.nix b/pkgs/development/python-modules/arpy/default.nix
index 819d4559dc94..91edbb3332a2 100644
--- a/pkgs/development/python-modules/arpy/default.nix
+++ b/pkgs/development/python-modules/arpy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "viraptor";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-jD1XJJhcpJymn0CwZ65U06xLKm1JjHffmx/umEO7a5s=";
   };
 
diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/pkgs/development/python-modules/arxiv2bib/default.nix
index 889159ccff34..073f4ff17d7a 100644
--- a/pkgs/development/python-modules/arxiv2bib/default.nix
+++ b/pkgs/development/python-modules/arxiv2bib/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nathangrigg";
     repo = "arxiv2bib";
-    rev = version;
+    tag = version;
     sha256 = "1kp2iyx20lpc9dv4qg5fgwf83a1wx6f7hj1ldqyncg0kn9xcrhbg";
   };
 
diff --git a/pkgs/development/python-modules/asciitree/default.nix b/pkgs/development/python-modules/asciitree/default.nix
index ab8ec69bef49..c7575b691536 100644
--- a/pkgs/development/python-modules/asciitree/default.nix
+++ b/pkgs/development/python-modules/asciitree/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mbr";
     repo = "asciitree";
-    rev = version;
+    tag = version;
     hash = "sha256-AaLDO27W6fGHGU11rRpBf5gg1we+9SS1MEJdFP2lPBw=";
   };
 
diff --git a/pkgs/development/python-modules/asks/default.nix b/pkgs/development/python-modules/asks/default.nix
index 1bab5a583c1a..2798b1dcd17c 100644
--- a/pkgs/development/python-modules/asks/default.nix
+++ b/pkgs/development/python-modules/asks/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "theelous3";
     repo = "asks";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ipQ5n2386DqR3kNpmTVhNPG+LC7gfCbvrlZ97+UP55g=";
   };
 
diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix
index 0a1032259c84..e7f1e541e555 100644
--- a/pkgs/development/python-modules/asn1ate/default.nix
+++ b/pkgs/development/python-modules/asn1ate/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     sha256 = "1p8hv4gsyqsdr0gafcq497n52pybiqmc22di8ai4nsj60fv0km45";
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "kimgr";
     repo = pname;
   };
diff --git a/pkgs/development/python-modules/aspy-refactor-imports/default.nix b/pkgs/development/python-modules/aspy-refactor-imports/default.nix
index dbc97cca6efb..e313e196cf82 100644
--- a/pkgs/development/python-modules/aspy-refactor-imports/default.nix
+++ b/pkgs/development/python-modules/aspy-refactor-imports/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = "aspy.refactor_imports";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "MlCM3zNTQZJ1RWrTQG0AN28RUepWINKCeLENykbu2nw=";
   };
 
diff --git a/pkgs/development/python-modules/assertpy/default.nix b/pkgs/development/python-modules/assertpy/default.nix
index e45e59409c72..dbc71cf4ceb9 100644
--- a/pkgs/development/python-modules/assertpy/default.nix
+++ b/pkgs/development/python-modules/assertpy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f";
   };
 
diff --git a/pkgs/development/python-modules/async-dns/default.nix b/pkgs/development/python-modules/async-dns/default.nix
index cbc8f15ed210..f28a0fc48d9d 100644
--- a/pkgs/development/python-modules/async-dns/default.nix
+++ b/pkgs/development/python-modules/async-dns/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gera2ld";
     repo = "async_dns";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0vn7hxvpzikd7q61a27fwzal4lwsra2063awyr6fjpy6lh3cjdwf";
   };
 
diff --git a/pkgs/development/python-modules/asyncio-throttle/default.nix b/pkgs/development/python-modules/asyncio-throttle/default.nix
index dc8dc03599a1..99f4e24fdc12 100644
--- a/pkgs/development/python-modules/asyncio-throttle/default.nix
+++ b/pkgs/development/python-modules/asyncio-throttle/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hallazzang";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1hsjcymdcm0hf4l68scf9n8j7ba89azgh96xhxrnyvwxfs5acnmv";
   };
 
diff --git a/pkgs/development/python-modules/attr/default.nix b/pkgs/development/python-modules/attr/default.nix
index 5a6400d3e5e3..cd77d01039ac 100644
--- a/pkgs/development/python-modules/attr/default.nix
+++ b/pkgs/development/python-modules/attr/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "denis-ryzhkov";
     repo = "attr";
-    rev = version;
+    tag = version;
     hash = "sha256-1gOAONDuZb7xEPFZJc00BRtFF06uX65S8b3RRRNGeSo=";
   };
 
diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix
index babb22ee434f..c97188bc0258 100644
--- a/pkgs/development/python-modules/aubio/default.nix
+++ b/pkgs/development/python-modules/aubio/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aubio";
     repo = "aubio";
-    rev = version;
+    tag = version;
     hash = "sha256-RvzhB1kQNP0IbAygwH2RBi/kSyuFPAHgsiCATPeMHTo=";
   };
 
diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix
index 6154b82465b9..100026c56c81 100644
--- a/pkgs/development/python-modules/augeas/default.nix
+++ b/pkgs/development/python-modules/augeas/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hercules-team";
     repo = "python-augeas";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Lq8ckra3sqN38zo1d5JsEq6U5TtLKRmqysoWNwR9J9A=";
   };
 
diff --git a/pkgs/development/python-modules/autograd-gamma/default.nix b/pkgs/development/python-modules/autograd-gamma/default.nix
index 0e38848d6f7d..d73390a9d8e9 100644
--- a/pkgs/development/python-modules/autograd-gamma/default.nix
+++ b/pkgs/development/python-modules/autograd-gamma/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CamDavidsonPilon";
     repo = "autograd-gamma";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0v03gly5k3a1hzb54zpw6409m3riak49qd27hkq2f66ai42ivqz2";
   };
 
diff --git a/pkgs/development/python-modules/avea/default.nix b/pkgs/development/python-modules/avea/default.nix
index 202d6e7b7742..f1d9806201df 100644
--- a/pkgs/development/python-modules/avea/default.nix
+++ b/pkgs/development/python-modules/avea/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "k0rventen";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1dirf0zdf4hb941w1dvh97vsvcy4h3w9r8jwdgr1ggmhdf9kfx4v";
   };
 
diff --git a/pkgs/development/python-modules/aw-core/default.nix b/pkgs/development/python-modules/aw-core/default.nix
index 591c862597d5..f0fdecb8d156 100644
--- a/pkgs/development/python-modules/aw-core/default.nix
+++ b/pkgs/development/python-modules/aw-core/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ActivityWatch";
     repo = "aw-core";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-bKxf+fqm+6V3JgDluKVpqq5hRL3Z+x8SHMRQmNe8vUA=";
   };
 
diff --git a/pkgs/development/python-modules/backports-tarfile/default.nix b/pkgs/development/python-modules/backports-tarfile/default.nix
index 450db5506756..6050d4bba097 100644
--- a/pkgs/development/python-modules/backports-tarfile/default.nix
+++ b/pkgs/development/python-modules/backports-tarfile/default.nix
@@ -18,7 +18,7 @@ let
     src = fetchFromGitHub {
       owner = "jaraco";
       repo = "backports.tarfile";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-X3rkL35aDG+DnIOq0fI7CFoWGNtgLkLjtT9y6+23oto=";
     };
 
diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix
index 6742f35877c4..ced175a55557 100644
--- a/pkgs/development/python-modules/bagit/default.nix
+++ b/pkgs/development/python-modules/bagit/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LibraryOfCongress";
     repo = "bagit-python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-t01P7MPWgOrktuW2zF0TIzt6u/jkLmrpD2OnqawhJaI=";
   };
 
diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index f598b1aa7907..73d3d3e375a6 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap-python";
-    rev = version;
+    tag = version;
     sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp";
   };
 
diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix
index 968570904067..21a04cc2e9f6 100644
--- a/pkgs/development/python-modules/barectf/default.nix
+++ b/pkgs/development/python-modules/barectf/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "efficios";
     repo = "barectf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JelFfd3WS012dveNlIljhLdyPmgE9VEOXoZE3MBA/Gw=";
   };
 
diff --git a/pkgs/development/python-modules/base36/default.nix b/pkgs/development/python-modules/base36/default.nix
index 33909a6c942a..d01bbfc2721c 100644
--- a/pkgs/development/python-modules/base36/default.nix
+++ b/pkgs/development/python-modules/base36/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tonyseek";
     repo = "python-base36";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "076nmk9s0zkmgs2zqzkaqij5cmzhf4mrhivbb9n6cvz52i1mppr5";
   };
 
diff --git a/pkgs/development/python-modules/base58check/default.nix b/pkgs/development/python-modules/base58check/default.nix
index 338775bf6cee..d782d714307e 100644
--- a/pkgs/development/python-modules/base58check/default.nix
+++ b/pkgs/development/python-modules/base58check/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joeblackwaslike";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Tig6beLRDsXC//x4+t/z2BGaJQWzcP0J+QEKx3D0rhs=";
   };
 
diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix
index 17d2485c6def..6df00c05a354 100644
--- a/pkgs/development/python-modules/bashlex/default.nix
+++ b/pkgs/development/python-modules/bashlex/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "idank";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-ddZN91H95RiTLXx4lpES1Dmz7nNsSVUeuFuOEpJ7LQI=";
   };
 
diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix
index 6c02b8e8cb20..aa96759a2729 100644
--- a/pkgs/development/python-modules/batchgenerators/default.nix
+++ b/pkgs/development/python-modules/batchgenerators/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MIC-DKFZ";
     repo = "batchgenerators";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L2mWH2t8PN9o1M67KDdl1Tj2ZZ02MY4icsJY2VNrj3A=";
   };
 
diff --git a/pkgs/development/python-modules/bcf/default.nix b/pkgs/development/python-modules/bcf/default.nix
index f8a1f6825d8e..66cad5a83519 100644
--- a/pkgs/development/python-modules/bcf/default.nix
+++ b/pkgs/development/python-modules/bcf/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hardwario";
     repo = "bch-firmware-tool";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "i28VewTB2XEZSfk0UeCuwB7Z2wz4qPBhzvxJIYkKwJ4=";
   };
 
diff --git a/pkgs/development/python-modules/bcg/default.nix b/pkgs/development/python-modules/bcg/default.nix
index 4065c235861c..ad747386a963 100644
--- a/pkgs/development/python-modules/bcg/default.nix
+++ b/pkgs/development/python-modules/bcg/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hardwario";
     repo = "bch-gateway";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "2Yh5MeIv+BIxjoO9GOPqq7xTAFhyBvnxPy7DeO2FrkI=";
   };
 
diff --git a/pkgs/development/python-modules/bch/default.nix b/pkgs/development/python-modules/bch/default.nix
index b29e2f0dfe94..67f4891f98ec 100644
--- a/pkgs/development/python-modules/bch/default.nix
+++ b/pkgs/development/python-modules/bch/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hardwario";
     repo = "bch-control-tool";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY=";
   };
 
diff --git a/pkgs/development/python-modules/beancount-plugin-utils/default.nix b/pkgs/development/python-modules/beancount-plugin-utils/default.nix
index 01fb3178182c..39fac3170562 100644
--- a/pkgs/development/python-modules/beancount-plugin-utils/default.nix
+++ b/pkgs/development/python-modules/beancount-plugin-utils/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Akuukis";
     repo = "beancount_plugin_utils";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oyfL2K/sS4zZ7cq1P36h0dTcW1m5GUyQ9+IyZGfpb2E=";
   };
 
diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix
index ce9d606553ef..95080a0fe6f9 100644
--- a/pkgs/development/python-modules/beanstalkc/default.nix
+++ b/pkgs/development/python-modules/beanstalkc/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bosondata";
     repo = "beanstalkc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1dpb1yimp2pfnikmgsb2fr9x6h8riixlsx3xfqphnfvrid49vw5s";
   };
 
diff --git a/pkgs/development/python-modules/beaupy/default.nix b/pkgs/development/python-modules/beaupy/default.nix
index 33e5a8e5eeca..ab364078467d 100644
--- a/pkgs/development/python-modules/beaupy/default.nix
+++ b/pkgs/development/python-modules/beaupy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "petereon";
     repo = "beaupy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tN78OV0Ks1MIdqVh8yisTgK4dOaKqYlZxvIoCa44eAI=";
   };
 
diff --git a/pkgs/development/python-modules/beautifultable/default.nix b/pkgs/development/python-modules/beautifultable/default.nix
index 9b1544ae2bd0..b8d0f1e69052 100644
--- a/pkgs/development/python-modules/beautifultable/default.nix
+++ b/pkgs/development/python-modules/beautifultable/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pri22296";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/SReCEvSwiNjBoz/3tGJ9zUNBAag4mLsHlUXwm47zCw=";
   };
 
diff --git a/pkgs/development/python-modules/beautysh/default.nix b/pkgs/development/python-modules/beautysh/default.nix
index 8c8af617f833..48e490145dea 100644
--- a/pkgs/development/python-modules/beautysh/default.nix
+++ b/pkgs/development/python-modules/beautysh/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lovesegfault";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o=";
   };
 
diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index e196257a8377..813fbcb3b66c 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "behave";
     repo = "behave";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-G1o0a57MRczwjGLl/tEYC+yx3nxpk6+E58RvR9kVJpA=";
   };
 
diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix
index e0fdaaca9c0a..373941df8b06 100644
--- a/pkgs/development/python-modules/beziers/default.nix
+++ b/pkgs/development/python-modules/beziers/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simoncozens";
     repo = "beziers.py";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NjmWsRz/NPPwXPbiSaOeKJMrYmSyNTt5ikONyAljgvM=";
   };
 
diff --git a/pkgs/development/python-modules/bip32/default.nix b/pkgs/development/python-modules/bip32/default.nix
index ea8e22a52cc6..ce6dbf75dcb1 100644
--- a/pkgs/development/python-modules/bip32/default.nix
+++ b/pkgs/development/python-modules/bip32/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "darosior";
     repo = "python-bip32";
-    rev = version;
+    tag = version;
     hash = "sha256-o8UKR17XDWp1wTWYeDL0DJY+D11YI4mg0UuGEAPkHxE=";
   };
 
diff --git a/pkgs/development/python-modules/birch/default.nix b/pkgs/development/python-modules/birch/default.nix
index 772ab25109e4..552ef0034fdc 100644
--- a/pkgs/development/python-modules/birch/default.nix
+++ b/pkgs/development/python-modules/birch/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "shaypal5";
     repo = "birch";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KdQZzQJvJ+logpcLQfaqqEEZJ/9VmNTQX/a4v0oBC98=";
   };
 
diff --git a/pkgs/development/python-modules/bitcoinrpc/default.nix b/pkgs/development/python-modules/bitcoinrpc/default.nix
index cfdc523b1213..aae47daa1330 100644
--- a/pkgs/development/python-modules/bitcoinrpc/default.nix
+++ b/pkgs/development/python-modules/bitcoinrpc/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bibajz";
     repo = "bitcoin-python-async-rpc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uxkSz99X9ior7l825PaXGIC5XJzO/Opv0vTyY1ixvxU=";
   };
 
diff --git a/pkgs/development/python-modules/bitvavo-aio/default.nix b/pkgs/development/python-modules/bitvavo-aio/default.nix
index 0df3e7add098..b303008e08b2 100644
--- a/pkgs/development/python-modules/bitvavo-aio/default.nix
+++ b/pkgs/development/python-modules/bitvavo-aio/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1d9nbbvv7xnkixj03sfhs2da5j3i2m7p73r7j1yb7b39zas2rbig";
   };
 
diff --git a/pkgs/development/python-modules/bitvector-for-humans/default.nix b/pkgs/development/python-modules/bitvector-for-humans/default.nix
index 5652d850a7ea..e09944279b5b 100644
--- a/pkgs/development/python-modules/bitvector-for-humans/default.nix
+++ b/pkgs/development/python-modules/bitvector-for-humans/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JnyJny";
     repo = "bitvector";
-    rev = version;
+    tag = version;
     hash = "sha256-GVTRD83tq/Hea53US4drOD5ruoYCLTVd24aZOSdDsSo=";
   };
 
diff --git a/pkgs/development/python-modules/bizkaibus/default.nix b/pkgs/development/python-modules/bizkaibus/default.nix
index c79a3c35b966..c9923821838b 100644
--- a/pkgs/development/python-modules/bizkaibus/default.nix
+++ b/pkgs/development/python-modules/bizkaibus/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "UgaitzEtxebarria";
     repo = "BizkaibusRTPI";
-    rev = version;
+    tag = version;
     hash = "sha256-TM02pSSOELRGSwsKc5C+34W94K6mnS0C69aijsPqSWs=";
   };
 
diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix
index ca8663c1d656..4f515f5742da 100644
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ b/pkgs/development/python-modules/bjoern/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jonashaag";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-d7u/lEh2Zr5NYWYu4Zr7kgyeOIQuHQLYrZeiZMHbpio=";
     fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules
   };
diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix
index da26ce0ed3a8..9fdddeb36bd3 100644
--- a/pkgs/development/python-modules/black-macchiato/default.nix
+++ b/pkgs/development/python-modules/black-macchiato/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wbolster";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0lc9w50nlbmlzj44krk7kxcia202fhybbnwfh77xixlc7vb4rayl";
   };
 
diff --git a/pkgs/development/python-modules/blacken-docs/default.nix b/pkgs/development/python-modules/blacken-docs/default.nix
index 7370471c2604..8ff9baa2ec8b 100644
--- a/pkgs/development/python-modules/blacken-docs/default.nix
+++ b/pkgs/development/python-modules/blacken-docs/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "blacken-docs";
-    rev = version;
+    tag = version;
     hash = "sha256-3FGuFOAHCcybPwujWlh58NWtuF5CebaKTgBWgCGpSL8=";
   };
 
diff --git a/pkgs/development/python-modules/blurhash-python/default.nix b/pkgs/development/python-modules/blurhash-python/default.nix
index e8acda803941..fd0098c36e9e 100644
--- a/pkgs/development/python-modules/blurhash-python/default.nix
+++ b/pkgs/development/python-modules/blurhash-python/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "woltapp";
     repo = "blurhash-python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Cz+PkPp1knvT3U5ofyb1PstM9kzBOkgPbx03LgOLXgw=";
   };
 
diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix
index 2131fa0bfb2d..0624bbb7a9be 100644
--- a/pkgs/development/python-modules/bond-api/default.nix
+++ b/pkgs/development/python-modules/bond-api/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "prystupa";
     repo = "bond-api";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+87/j94eHyW3EMMBK+aXaNTVoNxsixeLusyBsPWa9yM=";
   };
 
diff --git a/pkgs/development/python-modules/bonsai/default.nix b/pkgs/development/python-modules/bonsai/default.nix
index ad14127686ce..e115b61a9227 100644
--- a/pkgs/development/python-modules/bonsai/default.nix
+++ b/pkgs/development/python-modules/bonsai/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "noirello";
     repo = "bonsai";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SAP/YeWqow5dqXlXDzjnTWIfJhMwVeZSSUfWr1Mgmng=";
   };
 
diff --git a/pkgs/development/python-modules/boolean-py/default.nix b/pkgs/development/python-modules/boolean-py/default.nix
index fde29936132f..9d3928bb69d2 100644
--- a/pkgs/development/python-modules/boolean-py/default.nix
+++ b/pkgs/development/python-modules/boolean-py/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bastikr";
     repo = "boolean.py";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-i6aNzGDhZip9YHXLiuh9crGm2qT2toBU2xze4PDLleg=";
   };
 
diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix
index 854f1451c0b1..e2ea3cec604f 100644
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/pkgs/development/python-modules/braintree/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "braintree";
     repo = "braintree_python";
-    rev = version;
+    tag = version;
     hash = "sha256-5MF8W2zUVvNiOnmszgJkMDmeYLZ6ppFHqmH6dmlCzQY=";
   };
 
diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix
index e3832e5ed550..4a7ff5578705 100644
--- a/pkgs/development/python-modules/bravado-core/default.nix
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kyHmZNPl5lLKmm5i3TSi8Tfi96mQHqaiyBfceBJcOdw=";
   };
 
diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix
index 9339066299a3..604179c03abe 100644
--- a/pkgs/development/python-modules/bravia-tv/default.nix
+++ b/pkgs/development/python-modules/bravia-tv/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dcnielsen90";
     repo = "python-bravia-tv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g47bDd5bZl0jad3o6T1jJLcnZj8nx944kz3Vxv8gD2U=";
   };
 
diff --git a/pkgs/development/python-modules/brotli-asgi/default.nix b/pkgs/development/python-modules/brotli-asgi/default.nix
index 79d090f6127a..1209959f2123 100644
--- a/pkgs/development/python-modules/brotli-asgi/default.nix
+++ b/pkgs/development/python-modules/brotli-asgi/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "fullonic";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y=";
   };
 
diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix
index 53c0280b56b3..33ba3d40dd35 100644
--- a/pkgs/development/python-modules/brotlicffi/default.nix
+++ b/pkgs/development/python-modules/brotlicffi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-hyper";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oW4y1WBJ7+4XwNwwSSR0qUqN03cZYXUYQ6EAwce9dzI=";
   };
 
diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix
index 8de7c2194ab2..b81ce4530c4b 100644
--- a/pkgs/development/python-modules/brottsplatskartan/default.nix
+++ b/pkgs/development/python-modules/brottsplatskartan/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrillux";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "07iwmnchvpw156j23yfccg4c32izbwm8b02bjr1xgmcwzbq21ks9";
   };
 
diff --git a/pkgs/development/python-modules/btsmarthub-devicelist/default.nix b/pkgs/development/python-modules/btsmarthub-devicelist/default.nix
index e55dd620e4e3..e1fa0128a58b 100644
--- a/pkgs/development/python-modules/btsmarthub-devicelist/default.nix
+++ b/pkgs/development/python-modules/btsmarthub-devicelist/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jxwolstenholme";
     repo = "btsmarthub_devicelist";
-    rev = version;
+    tag = version;
     hash = "sha256-7ncxCpY+A2SuSFa3k21QchrmFs1dPRUMb1r1z/laa6M=";
   };
 
diff --git a/pkgs/development/python-modules/bubop/default.nix b/pkgs/development/python-modules/bubop/default.nix
index 9c6c39fd25d2..3b2881957c04 100644
--- a/pkgs/development/python-modules/bubop/default.nix
+++ b/pkgs/development/python-modules/bubop/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bergercookie";
     repo = "bubop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-p4Mv73oX5bsYKby7l0nGon89KyAMIUhDAEKSTNB++Cw=";
   };
 
diff --git a/pkgs/development/python-modules/cachey/default.nix b/pkgs/development/python-modules/cachey/default.nix
index a8cb498b2026..1ca1dcae70f6 100644
--- a/pkgs/development/python-modules/cachey/default.nix
+++ b/pkgs/development/python-modules/cachey/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-5USmuufrrWtmgibpfkjo9NtgN30hdl8plJfythmxM4s=";
   };
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/calver/default.nix b/pkgs/development/python-modules/calver/default.nix
index 528632743605..6d7be3a263d9 100644
--- a/pkgs/development/python-modules/calver/default.nix
+++ b/pkgs/development/python-modules/calver/default.nix
@@ -18,7 +18,7 @@ let
     src = fetchFromGitHub {
       owner = "di";
       repo = "calver";
-      rev = version;
+      tag = version;
       hash = "sha256-YaXTkeUazwzghCX96Wfx39hGvukWKtHMLLeyF9OeiZI=";
     };
 
diff --git a/pkgs/development/python-modules/calysto/default.nix b/pkgs/development/python-modules/calysto/default.nix
index 04d428e9e6fc..c7fc22a2a060 100644
--- a/pkgs/development/python-modules/calysto/default.nix
+++ b/pkgs/development/python-modules/calysto/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Calysto";
     repo = "calysto";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lr/cHFshpFs/PGMCsa3FKMRPTP+eE9ziH5XCpV+KzO8=";
   };
 
diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix
index b9895dd18f97..bd34f35e8f53 100644
--- a/pkgs/development/python-modules/capturer/default.nix
+++ b/pkgs/development/python-modules/capturer/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-capturer";
-    rev = version;
+    tag = version;
     sha256 = "0fwrxa049gzin5dck7fvwhdp1856jrn0d7mcjcjsd7ndqvhgvjj1";
   };
 
diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix
index a09cc9fd444e..d9a05776c759 100644
--- a/pkgs/development/python-modules/catkin-pkg/default.nix
+++ b/pkgs/development/python-modules/catkin-pkg/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ros-infrastructure";
     repo = "catkin_pkg";
-    rev = version;
+    tag = version;
     hash = "sha256-lHUKhE9dQLO1MbkstUEiGrHc9Rm+bY/AmgLyh7AbvFQ=";
   };
 
diff --git a/pkgs/development/python-modules/celery-singleton/default.nix b/pkgs/development/python-modules/celery-singleton/default.nix
index 3d75770e932a..0cee95e107e0 100644
--- a/pkgs/development/python-modules/celery-singleton/default.nix
+++ b/pkgs/development/python-modules/celery-singleton/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "steinitzu";
     repo = "celery-singleton";
-    rev = version;
+    tag = version;
     hash = "sha256-fHlakxxjYIADELZdxIj6rvsZ/+1QfnKvAg3w5cdzvDc=";
   };
 
diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index a125dc86da39..fe636ae8f265 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "python-certifi";
-    rev = version;
+    tag = version;
     hash = "sha256-LHoFI9+vrrrRzyhWNchQYp4AAiFcQwZHdeNzMjTJ8jk=";
   };
 
diff --git a/pkgs/development/python-modules/certvalidator/default.nix b/pkgs/development/python-modules/certvalidator/default.nix
index c59e2b6738e0..9f6e414141b3 100644
--- a/pkgs/development/python-modules/certvalidator/default.nix
+++ b/pkgs/development/python-modules/certvalidator/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wbond";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-yVF7t4FuU3C9fDg67JeM7LWZZh/mv5F4EKmjlO4AuBY=";
   };
 
diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix
index e5ae3494d88b..9e09057986b2 100644
--- a/pkgs/development/python-modules/cfn-flip/default.nix
+++ b/pkgs/development/python-modules/cfn-flip/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-cfn-template-flip";
-    rev = version;
+    tag = version;
     hash = "sha256-lfhTR3+D1FvblhQGF83AB8+I8WDPBTmo+q22ksgDgt4=";
   };
 
diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix
index 17047a321389..96b51a9c9dfa 100644
--- a/pkgs/development/python-modules/cgroup-utils/default.nix
+++ b/pkgs/development/python-modules/cgroup-utils/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "peo3";
     repo = "cgroup-utils";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq";
   };
 
diff --git a/pkgs/development/python-modules/checksumdir/default.nix b/pkgs/development/python-modules/checksumdir/default.nix
index ae54695e8a54..4f40a8b439f7 100644
--- a/pkgs/development/python-modules/checksumdir/default.nix
+++ b/pkgs/development/python-modules/checksumdir/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "to-mc";
     repo = "checksumdir";
-    rev = version;
+    tag = version;
     hash = "sha256-PO8sRGFQ1Dt/UYJuFH6Y3EaQVaS+4DJlOQtvF8ZmBWQ=";
   };
 
diff --git a/pkgs/development/python-modules/chirpstack-api/default.nix b/pkgs/development/python-modules/chirpstack-api/default.nix
index 38ea1d8739cf..0676480d21cb 100644
--- a/pkgs/development/python-modules/chirpstack-api/default.nix
+++ b/pkgs/development/python-modules/chirpstack-api/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "brocaar";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-69encHMk0eXE2Av87ysKvxoiXog5o68qCUlOx/lgHFU=";
   };
 
diff --git a/pkgs/development/python-modules/cjkwrap/default.nix b/pkgs/development/python-modules/cjkwrap/default.nix
index bf93185a122e..f1d5dcc4d226 100644
--- a/pkgs/development/python-modules/cjkwrap/default.nix
+++ b/pkgs/development/python-modules/cjkwrap/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     owner = "fgallaire";
     repo = "cjkwrap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0wTx3rnlUfQEE2/Z8Y7iwlsHk+CIy6ut+QIpC5yg4aM=";
   };
 
diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix
index 53eaf1745231..97cd43d437b8 100644
--- a/pkgs/development/python-modules/classify-imports/default.nix
+++ b/pkgs/development/python-modules/classify-imports/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU=";
   };
 
diff --git a/pkgs/development/python-modules/cleanit/default.nix b/pkgs/development/python-modules/cleanit/default.nix
index 7ce39e3392a5..334a32a60e5f 100644
--- a/pkgs/development/python-modules/cleanit/default.nix
+++ b/pkgs/development/python-modules/cleanit/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ratoaq2";
     repo = "cleanit";
-    rev = version;
+    tag = version;
     hash = "sha256-z1QAWWm+yg/pRCQfPqGbL0EFFT9UwqIkwhmjUuRHyuk=";
   };
 
diff --git a/pkgs/development/python-modules/click-aliases/default.nix b/pkgs/development/python-modules/click-aliases/default.nix
index cf1a33cf3140..23a4ccca29c2 100644
--- a/pkgs/development/python-modules/click-aliases/default.nix
+++ b/pkgs/development/python-modules/click-aliases/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "click-contrib";
     repo = "click-aliases";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vR5MUbgQfgownnq/VuEB/Jreibh/SB8wbDWGOmareRU=";
   };
 
diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix
index 170ffd907128..f551ad495ed2 100644
--- a/pkgs/development/python-modules/clickclick/default.nix
+++ b/pkgs/development/python-modules/clickclick/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     domain = "codeberg.org";
     owner = "hjacobs";
     repo = "python-clickclick";
-    rev = version;
+    tag = version;
     hash = "sha256-gefU6CI4ibtvonsaKZmuffuUNUioBn5ODs72BI5zXOw=";
   };
 
diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix
index 6eb3013063f5..f20bac1e28d7 100644
--- a/pkgs/development/python-modules/clickhouse-driver/default.nix
+++ b/pkgs/development/python-modules/clickhouse-driver/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mymarilyn";
     repo = "clickhouse-driver";
-    rev = version;
+    tag = version;
     hash = "sha256-l0YHWY25PMHgZG/sAZjtGhwmcxWdA8k96zlm9hbKcek=";
   };
 
diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix
index 1d3c57b3edfc..4a7d2d30061d 100644
--- a/pkgs/development/python-modules/cligj/default.nix
+++ b/pkgs/development/python-modules/cligj/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "cligj";
-    rev = version;
+    tag = version;
     hash = "sha256-0f9+I6ozX93Vn0l7+WR0mpddDZymJQ3+Krovt6co22Y=";
   };
 
diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix
index e0d3e1e30e5f..611dc9be0b90 100644
--- a/pkgs/development/python-modules/clldutils/default.nix
+++ b/pkgs/development/python-modules/clldutils/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "clld";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OD+WJ9JuYZb/oXDgVqL4i5YlcVEt0+swq0SB3cutyRo=";
   };
 
diff --git a/pkgs/development/python-modules/coapthon3/default.nix b/pkgs/development/python-modules/coapthon3/default.nix
index b565349584b3..195d4b039fd5 100644
--- a/pkgs/development/python-modules/coapthon3/default.nix
+++ b/pkgs/development/python-modules/coapthon3/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Tanganelli";
     repo = "CoAPthon3";
-    rev = version;
+    tag = version;
     hash = "sha256-9QApoPUu3XFZY/lgjAsf5r2StFiRtUd1UXWDrzYUh6w=";
   };
 
diff --git a/pkgs/development/python-modules/codepy/default.nix b/pkgs/development/python-modules/codepy/default.nix
index edcda2857bc3..4f730642c46f 100644
--- a/pkgs/development/python-modules/codepy/default.nix
+++ b/pkgs/development/python-modules/codepy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "inducer";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-viMfB/nDrvDA/IGRZEX+yXylxbbmqbh/fgdYXBzK0zM=";
   };
 
diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix
index c3852dc4ad07..27e9bf2ebd14 100644
--- a/pkgs/development/python-modules/coloredlogs/default.nix
+++ b/pkgs/development/python-modules/coloredlogs/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-coloredlogs";
-    rev = version;
+    tag = version;
     hash = "sha256-TodI2Wh8M0qMM2K5jzqlLmUKILa5+5qq4ByLttmAA7E=";
   };
 
diff --git a/pkgs/development/python-modules/colorthief/default.nix b/pkgs/development/python-modules/colorthief/default.nix
index 66fb4f9fe502..73fbe8b2faad 100644
--- a/pkgs/development/python-modules/colorthief/default.nix
+++ b/pkgs/development/python-modules/colorthief/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fengsp";
     repo = "color-thief-py";
-    rev = version;
+    tag = version;
     sha256 = "0lzpflal1iqbj4k7hayss5z024qf2sn8c3wxw03a0mgxg06ca2hm";
   };
 
diff --git a/pkgs/development/python-modules/commandlines/default.nix b/pkgs/development/python-modules/commandlines/default.nix
index aa5da9c0d37f..bcd66ae59737 100644
--- a/pkgs/development/python-modules/commandlines/default.nix
+++ b/pkgs/development/python-modules/commandlines/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrissimpkins";
     repo = "commandlines";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-x3iUeOTAaTKNW5Y5foMPMJcWVxu52uYZoY3Hhe3UvQ4=";
   };
 
diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix
index f410d16628f4..2ef7dee01bd0 100644
--- a/pkgs/development/python-modules/commentjson/default.nix
+++ b/pkgs/development/python-modules/commentjson/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vaidik";
     repo = "commentjson";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dPnIcv7TIeyG7rU938w7FrDklmaGuPpXz34uw/JjOgY=";
   };
 
diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix
index 59ba5a4b3faf..9fd9c494dcd7 100644
--- a/pkgs/development/python-modules/confuse/default.nix
+++ b/pkgs/development/python-modules/confuse/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8=";
   };
 
diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix
index a89f8f030a0e..71fe66c4d514 100644
--- a/pkgs/development/python-modules/construct-classes/default.nix
+++ b/pkgs/development/python-modules/construct-classes/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matejcik";
     repo = "construct-classes";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-l4sVacKTuQbhXCw2lVHCl1OzpCiKmEAm9nSQ8pxFuTo=";
   };
 
diff --git a/pkgs/development/python-modules/controku/default.nix b/pkgs/development/python-modules/controku/default.nix
index 9aff50bfc087..bfb3a1ba3e93 100644
--- a/pkgs/development/python-modules/controku/default.nix
+++ b/pkgs/development/python-modules/controku/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "benthetechguy";
     repo = "controku";
-    rev = version;
+    tag = version;
     hash = "sha256-sye2GtL3a77pygllZc6ylaIP7faPb+NFbyKKyqJzIXw=";
   };
 
diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix
index e4c2e9bd8ec0..e62e6fc1c82d 100644
--- a/pkgs/development/python-modules/convertdate/default.nix
+++ b/pkgs/development/python-modules/convertdate/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fitnr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE=";
   };
 
diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix
index f70b8a73a65e..baa3da19cbc9 100644
--- a/pkgs/development/python-modules/coreapi/default.nix
+++ b/pkgs/development/python-modules/coreapi/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "python-client";
     owner = "core-api";
-    rev = version;
+    tag = version;
     sha256 = "1c6chm3q3hyn8fmjv23qgc79ai1kr3xvrrkp4clbqkssn10k7mcw";
   };
 
diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix
index 1aede8b9f587..fc73863b8ab6 100644
--- a/pkgs/development/python-modules/coreschema/default.nix
+++ b/pkgs/development/python-modules/coreschema/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "python-coreschema";
     owner = "core-api";
-    rev = version;
+    tag = version;
     sha256 = "027pc753mkgbb3r1v1x7dsdaarq93drx0f79ppvw9pfkcjcq6wb1";
   };
 
diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix
index 639ddcacd487..38192b22c1d0 100644
--- a/pkgs/development/python-modules/cornice/default.nix
+++ b/pkgs/development/python-modules/cornice/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Cornices";
     repo = "cornice";
-    rev = version;
+    tag = version;
     hash = "sha256-jAf8unDPpr/ZAWkb9LhOW4URjwcRnaYVUKmfnYBStTg=";
   };
 
diff --git a/pkgs/development/python-modules/cose/default.nix b/pkgs/development/python-modules/cose/default.nix
index 6ddb5676bef6..2cb7ccc77b65 100644
--- a/pkgs/development/python-modules/cose/default.nix
+++ b/pkgs/development/python-modules/cose/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TimothyClaeys";
     repo = "pycose";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8d6HebWlSKgx7dmOnT7ZZ5mrMfg6mNWhz1hHPv75XF4=";
   };
 
diff --git a/pkgs/development/python-modules/crownstone-core/default.nix b/pkgs/development/python-modules/crownstone-core/default.nix
index 7e297cce4f55..767737ddd146 100644
--- a/pkgs/development/python-modules/crownstone-core/default.nix
+++ b/pkgs/development/python-modules/crownstone-core/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crownstone";
     repo = "crownstone-lib-python-core";
-    rev = version;
+    tag = version;
     hash = "sha256-zrlCzx7N3aUcTUNa64jSzDdWgQneX+Hc5n8TTTcZ4ck=";
   };
 
diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix
index 177b319ca4cb..2c3de3ab1609 100644
--- a/pkgs/development/python-modules/crownstone-uart/default.nix
+++ b/pkgs/development/python-modules/crownstone-uart/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crownstone";
     repo = "crownstone-lib-python-uart";
-    rev = version;
+    tag = version;
     hash = "sha256-Sc6BCIRbf1+GraTScmV4EAgwtSE/JXNe0f2XhKyACIY=";
   };
 
diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix
index 0639c1e021bb..3f1831258f2a 100644
--- a/pkgs/development/python-modules/cryptg/default.nix
+++ b/pkgs/development/python-modules/cryptg/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cher-nov";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GCTVxCJQvpvHpzaU+OaFM/AKoRvxLyA0u6VIV+94UTY=";
   };
 
diff --git a/pkgs/development/python-modules/crysp/default.nix b/pkgs/development/python-modules/crysp/default.nix
index d3a555a6d801..94aed57a8fd8 100644
--- a/pkgs/development/python-modules/crysp/default.nix
+++ b/pkgs/development/python-modules/crysp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdcht";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-51SKS6OOXIFT1L3YICR6a4QGSz/rbB8V+Z0u0jMO474=";
   };
 
diff --git a/pkgs/development/python-modules/csv2md/default.nix b/pkgs/development/python-modules/csv2md/default.nix
index f3c6faf3f195..7ae90274c17e 100644
--- a/pkgs/development/python-modules/csv2md/default.nix
+++ b/pkgs/development/python-modules/csv2md/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lzakharov";
     repo = "csv2md";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CzURejGIxsD7IBSbAYXz0kj5oX47e+uN13fqd56CM1A=";
   };
 
diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix
index be429844d13d..8cd254bc0335 100644
--- a/pkgs/development/python-modules/csvw/default.nix
+++ b/pkgs/development/python-modules/csvw/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cldf";
     repo = "csvw";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1393xwqawaxsflbq62vks92vv4zch8p6dd1mdvdi7j4vvf0zljkg";
   };
 
diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix
index e5e27c7c9be5..ba6ad847b903 100644
--- a/pkgs/development/python-modules/cxxheaderparser/default.nix
+++ b/pkgs/development/python-modules/cxxheaderparser/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robotpy";
     repo = "cxxheaderparser";
-    rev = version;
+    tag = version;
     hash = "sha256-+Q8EaVhx8/e+37GEHW3In5tMTIMl+5MySuCLgAzTypo=";
   };
 
diff --git a/pkgs/development/python-modules/cython-test-exception-raiser/default.nix b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix
index 70a2746b1c60..b14c8929bfa4 100644
--- a/pkgs/development/python-modules/cython-test-exception-raiser/default.nix
+++ b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "twisted";
     repo = "cython-test-exception-raiser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fwMq0pOrFUJnPndH/a6ghoo6mlcVSxtsWazqE9mCx3M=";
   };
 
diff --git a/pkgs/development/python-modules/daemonocle/default.nix b/pkgs/development/python-modules/daemonocle/default.nix
index abe58995650f..4cd8f1f623cc 100644
--- a/pkgs/development/python-modules/daemonocle/default.nix
+++ b/pkgs/development/python-modules/daemonocle/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jnrbsn";
     repo = "daemonocle";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-K+IqpEQ4yhfSguPPm2Ult3kGNO/9H56B+kD5ntaCZdk=";
   };
 
diff --git a/pkgs/development/python-modules/darkdetect/default.nix b/pkgs/development/python-modules/darkdetect/default.nix
index c51f22fb368d..f6eecc5cfba5 100644
--- a/pkgs/development/python-modules/darkdetect/default.nix
+++ b/pkgs/development/python-modules/darkdetect/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "albertosottile";
     repo = "darkdetect";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OOINgrgjSLr3L07E9zf1+mlTPr+7ZlgN3CfkWE8+LoE=";
   };
 
diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix
index f1aa0dbc6fb3..d88ecd188de6 100644
--- a/pkgs/development/python-modules/dask-gateway-server/default.nix
+++ b/pkgs/development/python-modules/dask-gateway-server/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-gateway";
-    rev = version;
+    tag = version;
     hash = "sha256-hwNLcuFN6ItH5KhC2gDUsaZT7qTC48fPR/Qx6u8B1+M=";
   };
 
diff --git a/pkgs/development/python-modules/dataclass-factory/default.nix b/pkgs/development/python-modules/dataclass-factory/default.nix
index 83de3f721832..9b4e705e04fa 100644
--- a/pkgs/development/python-modules/dataclass-factory/default.nix
+++ b/pkgs/development/python-modules/dataclass-factory/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "reagento";
     repo = "dataclass-factory";
-    rev = version;
+    tag = version;
     hash = "sha256-0BIWgyAV1hJzFX4xYFqswvQi5F1Ce+V9FKSmNYuJfZM=";
   };
 
diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix
index 21a5ddcee0fa..b3892e482b78 100644
--- a/pkgs/development/python-modules/dataclass-wizard/default.nix
+++ b/pkgs/development/python-modules/dataclass-wizard/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rnag";
     repo = "dataclass-wizard";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ufi4lZc+UkM6NZr4bS2OibpOmMjyiBEoVKxmrqauW50=";
   };
 
diff --git a/pkgs/development/python-modules/dataclasses-serialization/default.nix b/pkgs/development/python-modules/dataclasses-serialization/default.nix
index d99f4ada0bdf..8bf3fa1ff842 100644
--- a/pkgs/development/python-modules/dataclasses-serialization/default.nix
+++ b/pkgs/development/python-modules/dataclasses-serialization/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "madman-bob";
     repo = "python-dataclasses-serialization";
-    rev = version;
+    tag = version;
     hash = "sha256-jLMR2D01KgzHHRP0zduMBJt8xgBmIquWLCjZYLo2/AA=";
   };
 
diff --git a/pkgs/development/python-modules/datasette-template-sql/default.nix b/pkgs/development/python-modules/datasette-template-sql/default.nix
index 5bdb48aa28cb..6d9278ecb6b0 100644
--- a/pkgs/development/python-modules/datasette-template-sql/default.nix
+++ b/pkgs/development/python-modules/datasette-template-sql/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonw";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-VmdIEDk3iCBFrTPMm6ud00Z5CWqO0Wk707IQ4oVx5ak=";
   };
 
diff --git a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix
index aa3892ee9aaa..9ef15b38984c 100644
--- a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix
+++ b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+jY8kg3jBDpZr5doih3DiyUEcSskq7TgubmW3qdBoZM=";
   };
 
diff --git a/pkgs/development/python-modules/deepwave/default.nix b/pkgs/development/python-modules/deepwave/default.nix
index 56b9765686e8..fb3815c75ca4 100644
--- a/pkgs/development/python-modules/deepwave/default.nix
+++ b/pkgs/development/python-modules/deepwave/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ar4";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DOOy+B12jgwJzQ90qzX50OFxYLPRcVdVYSE5gi3pqDM=";
   };
 
diff --git a/pkgs/development/python-modules/dehinter/default.nix b/pkgs/development/python-modules/dehinter/default.nix
index 55dc1c503fb4..2bc691c55df9 100644
--- a/pkgs/development/python-modules/dehinter/default.nix
+++ b/pkgs/development/python-modules/dehinter/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "source-foundry";
     repo = "dehinter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-l988SW6OWKXzJK0WGAJZR/QDFvgnSir+5TwMMvFcOxg=";
   };
 
diff --git a/pkgs/development/python-modules/dek/default.nix b/pkgs/development/python-modules/dek/default.nix
index 4f528b855133..c8e3fe3ea85f 100644
--- a/pkgs/development/python-modules/dek/default.nix
+++ b/pkgs/development/python-modules/dek/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rec";
     repo = "dek";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DYODdImTRCukGmGbkZ+9TQeI9DYaeRd/EHS6VND5IDs=";
   };
 
diff --git a/pkgs/development/python-modules/deploykit/default.nix b/pkgs/development/python-modules/deploykit/default.nix
index e2882a7fa7f5..7fcb82a1232e 100644
--- a/pkgs/development/python-modules/deploykit/default.nix
+++ b/pkgs/development/python-modules/deploykit/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "numtide";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-7PiXq1bQJ1jswLHNqCDSYZabgfp8HRuRt5YPGzd5Ej0=";
   };
 
diff --git a/pkgs/development/python-modules/desktop-entry-lib/default.nix b/pkgs/development/python-modules/desktop-entry-lib/default.nix
index 6582d0fd283a..3af1c772b81a 100644
--- a/pkgs/development/python-modules/desktop-entry-lib/default.nix
+++ b/pkgs/development/python-modules/desktop-entry-lib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     domain = "codeberg.org";
     owner = "JakobDev";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-+c+FuLv88wc4yVw3iyFFtfbocnWzTCIe2DS0SWoj+VI=";
   };
 
diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix
index b4f3ea395e0f..d787fe072fbc 100644
--- a/pkgs/development/python-modules/devolo-home-control-api/default.nix
+++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "2Fake";
     repo = "devolo_home_control_api";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4AyC1DDYtKl8SwJf75BbzoOAhbZXmBZ05ma9YmLzksM=";
   };
 
diff --git a/pkgs/development/python-modules/dfdiskcache/default.nix b/pkgs/development/python-modules/dfdiskcache/default.nix
index 600818090024..d0afa82a8d63 100644
--- a/pkgs/development/python-modules/dfdiskcache/default.nix
+++ b/pkgs/development/python-modules/dfdiskcache/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thombashi";
     repo = "df-diskcache";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-s+sqEPXw6tbEz9mnG+qeUSF6BmDssYhaDYOmraFaRbw=";
   };
 
diff --git a/pkgs/development/python-modules/dictdiffer/default.nix b/pkgs/development/python-modules/dictdiffer/default.nix
index 496c3d51af71..c8b0d552eaf2 100644
--- a/pkgs/development/python-modules/dictdiffer/default.nix
+++ b/pkgs/development/python-modules/dictdiffer/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "inveniosoftware";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lQyPs3lQWtsvNPuvvwJUTDzrFaOX5uwGuRHe3yWUheU=";
   };
 
diff --git a/pkgs/development/python-modules/dingz/default.nix b/pkgs/development/python-modules/dingz/default.nix
index 9f8d8a4a551f..3c125e49d74f 100644
--- a/pkgs/development/python-modules/dingz/default.nix
+++ b/pkgs/development/python-modules/dingz/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-dingz";
-    rev = version;
+    tag = version;
     hash = "sha256-bCytQwLWw8D1UkKb/3LQ301eDCkVR4alD6NHjTs6I+4=";
   };
 
diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix
index 43a1a1d0e655..6e9689015467 100644
--- a/pkgs/development/python-modules/directv/default.nix
+++ b/pkgs/development/python-modules/directv/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ctalkington";
     repo = "python-directv";
-    rev = version;
+    tag = version;
     sha256 = "19jckf6qvl8fwi8yff1qy8c44xdz3zpi1ip1md6zl2c503qc91mk";
   };
 
diff --git a/pkgs/development/python-modules/dirsearch/default.nix b/pkgs/development/python-modules/dirsearch/default.nix
index 74b97e1f9ce3..126aa43ac452 100644
--- a/pkgs/development/python-modules/dirsearch/default.nix
+++ b/pkgs/development/python-modules/dirsearch/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maurosoria";
     repo = "dirsearch";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eXB103qUB3m7V/9hlq2xv3Y3bIz89/pGJsbPZQ+AZXs=";
   };
 
diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix
index 8211267f2eb0..a35fa3bcef07 100644
--- a/pkgs/development/python-modules/diskcache/default.nix
+++ b/pkgs/development/python-modules/diskcache/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "grantjenks";
     repo = "python-diskcache";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1cDpdf+rLaG14TDd1wEHAiYXb69NFTFeOHD1Ib1oOVY=";
   };
 
diff --git a/pkgs/development/python-modules/dissononce/default.nix b/pkgs/development/python-modules/dissononce/default.nix
index b4745c059465..4deac2738870 100644
--- a/pkgs/development/python-modules/dissononce/default.nix
+++ b/pkgs/development/python-modules/dissononce/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tgalal";
     repo = "dissononce";
-    rev = version;
+    tag = version;
     sha256 = "0hn64qfr0d5npmza6rjyxwwp12k2z2y1ma40zpl104ghac6g3mbs";
   };
 
diff --git a/pkgs/development/python-modules/dj-static/default.nix b/pkgs/development/python-modules/dj-static/default.nix
index 83e07a45bc04..77fb47315ff1 100644
--- a/pkgs/development/python-modules/dj-static/default.nix
+++ b/pkgs/development/python-modules/dj-static/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "heroku-python";
     repo = "dj-static";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B6TydlezbDkmfFgJjdFniZIYo/JjzPvFj43co+HYCdc=";
   };
 
diff --git a/pkgs/development/python-modules/django-apscheduler/default.nix b/pkgs/development/python-modules/django-apscheduler/default.nix
index e2f544615b0a..d1ff2fa62962 100644
--- a/pkgs/development/python-modules/django-apscheduler/default.nix
+++ b/pkgs/development/python-modules/django-apscheduler/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jcass77";
     repo = "django-apscheduler";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2YSVX4FxE1OfJkSYV9IRKd2scV4BrMA/mBzJARQCX38=";
   };
 
diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix
index 880512f617de..360ea93c74fc 100644
--- a/pkgs/development/python-modules/django-auditlog/default.nix
+++ b/pkgs/development/python-modules/django-auditlog/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-auditlog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SJ4GJp/gVIxiLbdAj3ZS+weevqIDZCMQnW/pqc5liJU=";
   };
 
diff --git a/pkgs/development/python-modules/django-bootstrap5/default.nix b/pkgs/development/python-modules/django-bootstrap5/default.nix
index 7b7f2bba0620..c3a3670e0d72 100644
--- a/pkgs/development/python-modules/django-bootstrap5/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap5/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zostera";
     repo = "django-bootstrap5";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5VYw9Kq33/YFW9mFzkFzhrxavfx6r/CtC1SJhZbanhg=";
   };
 
diff --git a/pkgs/development/python-modules/django-celery-email/default.nix b/pkgs/development/python-modules/django-celery-email/default.nix
index ea7608ffca47..854fda4eaafb 100644
--- a/pkgs/development/python-modules/django-celery-email/default.nix
+++ b/pkgs/development/python-modules/django-celery-email/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pmclanahan";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-LBavz5Nh2ObmIwLCem8nHvsuKgPwkzbS/OzFPmSje/M=";
   };
 
diff --git a/pkgs/development/python-modules/django-choices-field/default.nix b/pkgs/development/python-modules/django-choices-field/default.nix
index ea115e5c6258..5b7b802f8411 100644
--- a/pkgs/development/python-modules/django-choices-field/default.nix
+++ b/pkgs/development/python-modules/django-choices-field/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bellini666";
     repo = "django-choices-field";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2oLMUM/aE4aY0eEU+CLIjTNQJAMUt/GK5Fw26QN7t34=";
   };
 
diff --git a/pkgs/development/python-modules/django-context-decorator/default.nix b/pkgs/development/python-modules/django-context-decorator/default.nix
index e1c6d17259fb..dd725ac77a94 100644
--- a/pkgs/development/python-modules/django-context-decorator/default.nix
+++ b/pkgs/development/python-modules/django-context-decorator/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rixx";
     repo = "django-context-decorator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lNmZDsguOu2+gtMVjbwr709sbLCQOQ1sAePN7UJQbcw=";
   };
 
diff --git a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
index 0f8ab4fed5ec..e75756ee9fd3 100644
--- a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
+++ b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "flavors";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0fikr7xl786jqfkjdifymqpqnxy4qj8g3nlkgfm24wwq0za719dw";
   };
 
diff --git a/pkgs/development/python-modules/django-htmx/default.nix b/pkgs/development/python-modules/django-htmx/default.nix
index f5a342d66f1c..92d0a6cad419 100644
--- a/pkgs/development/python-modules/django-htmx/default.nix
+++ b/pkgs/development/python-modules/django-htmx/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "django-htmx";
-    rev = version;
+    tag = version;
     hash = "sha256-IgVkHgTk4hC0lL6LVM16QoT2xtPWxKNu+NrcyxZ5oVY=";
   };
 
diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix
index 49a6e3cb6b5b..b133867bc0a6 100644
--- a/pkgs/development/python-modules/django-js-reverse/default.nix
+++ b/pkgs/development/python-modules/django-js-reverse/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BITSOLVER";
     repo = "django-js-reverse";
-    rev = version;
+    tag = version;
     hash = "sha256-i78UsxVwxyDAc8LrOVEXLG0tdidoQhvUx7GvPDaH0KY=";
   };
 
diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix
index 8a8f7a8effe9..b85e79a6c497 100644
--- a/pkgs/development/python-modules/django-logentry-admin/default.nix
+++ b/pkgs/development/python-modules/django-logentry-admin/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yprez";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1bndxgvisw8kk52zfdifvly6dl4833wqilxf77pg473172yaf5gq";
   };
 
diff --git a/pkgs/development/python-modules/django-mdeditor/default.nix b/pkgs/development/python-modules/django-mdeditor/default.nix
index a495b41c892d..ff91eb7a1a1b 100644
--- a/pkgs/development/python-modules/django-mdeditor/default.nix
+++ b/pkgs/development/python-modules/django-mdeditor/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "pylixm";
     repo = "django-mdeditor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-t57j1HhjNQtBwlbqe4mAHQ9WiNcIhMKYmrZkiqh+k5k=";
   };
 
diff --git a/pkgs/development/python-modules/django-mptt/default.nix b/pkgs/development/python-modules/django-mptt/default.nix
index 404b6df1bc90..aebed58ba922 100644
--- a/pkgs/development/python-modules/django-mptt/default.nix
+++ b/pkgs/development/python-modules/django-mptt/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-mptt";
     repo = "django-mptt";
-    rev = version;
+    tag = version;
     hash = "sha256-vWnXKWzaa5AWoNaIc8NA1B2mnzKXRliQmi5VdrRMadE=";
   };
 
diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index cf9685e0b2ac..26beffcacae8 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jimfunk";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-76vGvxxfNZQBCCsTkkSgQZ8PpFspWxJQDj/xq9iOSTU=";
   };
 
diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix
index e15174d56ae4..9fdcecd06419 100644
--- a/pkgs/development/python-modules/django-prometheus/default.nix
+++ b/pkgs/development/python-modules/django-prometheus/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "korfuri";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JiLH+4mmNdb9BN81J5YFiMPna/3gaKUK6ARjmCa3fE8=";
   };
 
diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix
index 316b07a274e0..ba1172bc9783 100644
--- a/pkgs/development/python-modules/django-rest-auth/default.nix
+++ b/pkgs/development/python-modules/django-rest-auth/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Tivix";
     repo = "django-rest-auth";
-    rev = version;
+    tag = version;
     hash = "sha256-rCChUHv8sTEFErDCZnPN5b5XVtMJ7JNVZwBYF3d99mY=";
   };
 
diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix
index e83ab1239f45..cc103867c917 100644
--- a/pkgs/development/python-modules/django-sites/default.nix
+++ b/pkgs/development/python-modules/django-sites/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niwinz";
     repo = "django-sites";
-    rev = version;
+    tag = version;
     hash = "sha256-MQtQC+9DyS1ICXXovbqPpkKIQ5wpuJDgq3Lcd/1kORU=";
   };
 
diff --git a/pkgs/development/python-modules/django-split-settings/default.nix b/pkgs/development/python-modules/django-split-settings/default.nix
index 31ac1836b5dc..7a95fb34b1a5 100644
--- a/pkgs/development/python-modules/django-split-settings/default.nix
+++ b/pkgs/development/python-modules/django-split-settings/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wemake-services";
     repo = "django-split-settings";
-    rev = version;
+    tag = version;
     hash = "sha256-Bk2/DU+K524mCUvteWT0fIQH5ZgeMHiufMTF+dJYVtc=";
   };
 
diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix
index 978ae2e8e39e..1c65fcb44ed1 100644
--- a/pkgs/development/python-modules/django-timezone-field/default.nix
+++ b/pkgs/development/python-modules/django-timezone-field/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mfogel";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-q06TuYkBA4z6tJdT3an6Z8o1i/o85XbYa1JYZBHC8lI=";
   };
 
diff --git a/pkgs/development/python-modules/djangorestframework-guardian/default.nix b/pkgs/development/python-modules/djangorestframework-guardian/default.nix
index 4d4a1d45fc9c..8c8a2374b1af 100644
--- a/pkgs/development/python-modules/djangorestframework-guardian/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-guardian/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rpkilby";
     repo = "django-rest-framework-guardian";
-    rev = version;
+    tag = version;
     hash = "sha256-jl/VEl1pUHU8J1d5ZQSGJweNJayIGw1iVAmwID85fqw=";
   };
 
diff --git a/pkgs/development/python-modules/djangorestframework-recursive/default.nix b/pkgs/development/python-modules/djangorestframework-recursive/default.nix
index cdb68b5164f3..25444752e286 100644
--- a/pkgs/development/python-modules/djangorestframework-recursive/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-recursive/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "heywbj";
     repo = "django-rest-framework-recursive";
-    rev = version;
+    tag = version;
     hash = "sha256-Q/6yxpz3c402sMZudAeFIht9+5GmTRlzM51AMAx5muY=";
   };
 
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 43a5c0779801..ee3463de1791 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = "django-rest-framework";
-    rev = version;
+    tag = version;
     hash = "sha256-ne0sk4m11Ha77tNmCsdhj7QVmCkYj5GjLn/dLF4qxU8=";
   };
 
diff --git a/pkgs/development/python-modules/dodgy/default.nix b/pkgs/development/python-modules/dodgy/default.nix
index 3e4569f3035a..ed21b8957104 100644
--- a/pkgs/development/python-modules/dodgy/default.nix
+++ b/pkgs/development/python-modules/dodgy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "landscapeio";
     repo = "dodgy";
-    rev = version;
+    tag = version;
     sha256 = "0ywwjpz0p6ls3hp1lndjr9ql6s5lkj7dgpll1h87w04kwan70j0x";
   };
 
diff --git a/pkgs/development/python-modules/doit-py/default.nix b/pkgs/development/python-modules/doit-py/default.nix
index 8ebaadbcf2e7..5583c91c1c81 100644
--- a/pkgs/development/python-modules/doit-py/default.nix
+++ b/pkgs/development/python-modules/doit-py/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydoit";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-DBl6/no04ZGRHHmN9gkEtBmAMgmyZWcfPCcFz0uxAv4=";
   };
 
diff --git a/pkgs/development/python-modules/donfig/default.nix b/pkgs/development/python-modules/donfig/default.nix
index 3c06c81917c7..49b307480d4b 100644
--- a/pkgs/development/python-modules/donfig/default.nix
+++ b/pkgs/development/python-modules/donfig/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytroll";
     repo = "donfig";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hF4hzI1MTLgUexRIqwBEEEMV7Az2oDkp5GQQ5282vwE=";
   };
 
diff --git a/pkgs/development/python-modules/donut-shellcode/default.nix b/pkgs/development/python-modules/donut-shellcode/default.nix
index 42be76fc8c3f..5efa746a0fbf 100644
--- a/pkgs/development/python-modules/donut-shellcode/default.nix
+++ b/pkgs/development/python-modules/donut-shellcode/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TheWover";
     repo = "donut";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gKa7ngq2+r4EYRdwH9AWnJodJjCdppzKch4Ve/4ZPhk=";
   };
 
diff --git a/pkgs/development/python-modules/drafthorse/default.nix b/pkgs/development/python-modules/drafthorse/default.nix
index 81874cc6017a..9f2f1ca7db9c 100644
--- a/pkgs/development/python-modules/drafthorse/default.nix
+++ b/pkgs/development/python-modules/drafthorse/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "python-drafthorse";
-    rev = version;
+    tag = version;
     hash = "sha256-v4yN2VHSA6pOXCSHscHIECeQchZkzH+/Hal4JwGXh74=";
   };
 
diff --git a/pkgs/development/python-modules/drf-jwt/default.nix b/pkgs/development/python-modules/drf-jwt/default.nix
index 5e4960385803..1b32cb8eda7c 100644
--- a/pkgs/development/python-modules/drf-jwt/default.nix
+++ b/pkgs/development/python-modules/drf-jwt/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Styria-Digital";
     repo = "django-rest-framework-jwt";
-    rev = version;
+    tag = version;
     hash = "sha256-bbkk78uYTG+JTzY3AyOmEVtVSgout/TETfr5N5fUto4=";
   };
 
diff --git a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
index 426a9e440013..5fa5de0eb5f6 100644
--- a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
+++ b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tfranzel";
     repo = "drf-spectacular-sidecar";
-    rev = version;
+    tag = version;
     hash = "sha256-EoQKbxzXEuKC50/W1/tBB2wASJZmNNwg9r1qhIB4Ws8=";
   };
 
diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/pkgs/development/python-modules/ds4drv/default.nix
index d4ebc468f9ef..132258120332 100644
--- a/pkgs/development/python-modules/ds4drv/default.nix
+++ b/pkgs/development/python-modules/ds4drv/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrippa";
     repo = "ds4drv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0vinpla0apizzykcyfis79mrm1i6fhns83nkzw85svypdhkx2g8v";
   };
 
diff --git a/pkgs/development/python-modules/dsinternals/default.nix b/pkgs/development/python-modules/dsinternals/default.nix
index ef827f13ba15..838cb2f74ca3 100644
--- a/pkgs/development/python-modules/dsinternals/default.nix
+++ b/pkgs/development/python-modules/dsinternals/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "p0dalirius";
     repo = "pydsinternals";
-    rev = version;
+    tag = version;
     hash = "sha256-C1ar9c4F4WI5ICX7PJe8FzVwK8bxZds+kMBpttEp9Ko=";
   };
 
diff --git a/pkgs/development/python-modules/duct-py/default.nix b/pkgs/development/python-modules/duct-py/default.nix
index 2d9b7ca504ce..1154fb037e93 100644
--- a/pkgs/development/python-modules/duct-py/default.nix
+++ b/pkgs/development/python-modules/duct-py/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oconnor663";
     repo = "duct.py";
-    rev = version;
+    tag = version;
     hash = "sha256-4ja/SQ9R/SbKlf3NqKxLi+Fl/4JI0Fl/zG9EmTZjWZc=";
   };
 
diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix
index dc47ee1e976e..a0d4afef5b29 100644
--- a/pkgs/development/python-modules/duden/default.nix
+++ b/pkgs/development/python-modules/duden/default.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitHub {
       owner = "radomirbosak";
       repo = "duden";
-      rev = finalAttrs.version;
+      tag = finalAttrs.version;
       hash = "sha256-c6IItrjFVbsdYg3sDrExcxv7aRcKhd/M5hiZD+wBZ2Y=";
     };
 
diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix
index 53ef911b8814..efa3dcd0096b 100644
--- a/pkgs/development/python-modules/dufte/default.nix
+++ b/pkgs/development/python-modules/dufte/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48";
   };
 
diff --git a/pkgs/development/python-modules/dungeon-eos/default.nix b/pkgs/development/python-modules/dungeon-eos/default.nix
index d4282575c88b..42ac01708ba3 100644
--- a/pkgs/development/python-modules/dungeon-eos/default.nix
+++ b/pkgs/development/python-modules/dungeon-eos/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY=";
   };
 
diff --git a/pkgs/development/python-modules/durationpy/default.nix b/pkgs/development/python-modules/durationpy/default.nix
index 79f9bf439a79..ebf525c029f7 100644
--- a/pkgs/development/python-modules/durationpy/default.nix
+++ b/pkgs/development/python-modules/durationpy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "icholy";
     repo = "durationpy";
-    rev = version;
+    tag = version;
     hash = "sha256-R/cZPnUUlosGHCOcqwRJ0GJlcB6Lu5a3e5h1CQ6fysA=";
   };
 
diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix
index b60e57b34c9c..8da8db1955da 100644
--- a/pkgs/development/python-modules/dynd/default.nix
+++ b/pkgs/development/python-modules/dynd/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "libdynd";
     repo = "dynd-python";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh";
   };
 
diff --git a/pkgs/development/python-modules/ebooklib/default.nix b/pkgs/development/python-modules/ebooklib/default.nix
index 67e00275f3b9..4af858b31074 100644
--- a/pkgs/development/python-modules/ebooklib/default.nix
+++ b/pkgs/development/python-modules/ebooklib/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aerkalov";
     repo = "ebooklib";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ciks/eeRpkqkWnyLgyHC+x/dSOcj/ZT45KUElKqv1F8=";
   };
 
diff --git a/pkgs/development/python-modules/editdistance-s/default.nix b/pkgs/development/python-modules/editdistance-s/default.nix
index e0ae8a91703d..7f05296fa1ff 100644
--- a/pkgs/development/python-modules/editdistance-s/default.nix
+++ b/pkgs/development/python-modules/editdistance-s/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0w2qd5b6a3c3ahd0xy9ykq4wzqk0byqwdqrr26dyn8j2425j46lg";
   };
 
diff --git a/pkgs/development/python-modules/editor/default.nix b/pkgs/development/python-modules/editor/default.nix
index 5cf8a6d2de33..a174ce9eb72a 100644
--- a/pkgs/development/python-modules/editor/default.nix
+++ b/pkgs/development/python-modules/editor/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rec";
     repo = "editor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FVtat3gUsK5Lv6XSkVXj0hY6NkMGw6LxRWMJrZ/cIis=";
   };
 
diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix
index 7de5770e67c7..d1438724407b 100644
--- a/pkgs/development/python-modules/editorconfig/default.nix
+++ b/pkgs/development/python-modules/editorconfig/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "editorconfig";
     repo = "editorconfig-core-py";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vYuXW+Yb0GXZAwaarV4WBIJtS31+EleiddU9ibBn/hs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/einx/default.nix b/pkgs/development/python-modules/einx/default.nix
index 0f181b5051aa..c919c7dd1395 100644
--- a/pkgs/development/python-modules/einx/default.nix
+++ b/pkgs/development/python-modules/einx/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fferflo";
     repo = "einx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lbcf47h1tW1fj94NLG4iJPEs6ziGPkcX1Q+wn59PvS8=";
   };
 
diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix
index 30bcb15c2106..7f79b2962d40 100644
--- a/pkgs/development/python-modules/elmax/default.nix
+++ b/pkgs/development/python-modules/elmax/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-elmax";
-    rev = version;
+    tag = version;
     hash = "sha256-EcYEpYv+EwwEfW8Sy7aQjFAPpmsA6qVbmlwrPdxdnEw=";
   };
 
diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix
index b18d0f1e6d7b..0116df9315b3 100644
--- a/pkgs/development/python-modules/emailthreads/default.nix
+++ b/pkgs/development/python-modules/emailthreads/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "python-emailthreads";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7BhYS1DQCW9QpG31asPCq5qPyJy+WW2onZpvEHhwQCs=";
   };
 
diff --git a/pkgs/development/python-modules/emulated-roku/default.nix b/pkgs/development/python-modules/emulated-roku/default.nix
index 1e29bead57fb..f8e1d086cb17 100644
--- a/pkgs/development/python-modules/emulated-roku/default.nix
+++ b/pkgs/development/python-modules/emulated-roku/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mindigmarton";
     repo = "emulated_roku";
-    rev = version;
+    tag = version;
     hash = "sha256-7DbJl1e1ESWPCNuQX7m/ggXNDyPYZ5eNGwSz+jnxZj0=";
   };
 
diff --git a/pkgs/development/python-modules/encodec/default.nix b/pkgs/development/python-modules/encodec/default.nix
index 6c8c363e75ec..d3bbdcd6d378 100644
--- a/pkgs/development/python-modules/encodec/default.nix
+++ b/pkgs/development/python-modules/encodec/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = "encodec";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+iJZkX1HoyuNFu9VRxMO6aAzNQybkH9lrQJ5Ao9+/CY=";
   };
 
diff --git a/pkgs/development/python-modules/enturclient/default.nix b/pkgs/development/python-modules/enturclient/default.nix
index 372bdf17e075..bb30a91b871b 100644
--- a/pkgs/development/python-modules/enturclient/default.nix
+++ b/pkgs/development/python-modules/enturclient/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hfurubotten";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Y2sBPikCAxumylP1LUy8XgjBRCWaNryn5XHSrRjJIIo=";
   };
 
diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix
index 46a8249d9e2f..92d44aac445d 100644
--- a/pkgs/development/python-modules/envoy-reader/default.nix
+++ b/pkgs/development/python-modules/envoy-reader/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jesserizzo";
     repo = "envoy_reader";
-    rev = version;
+    tag = version;
     hash = "sha256-aIpZ4ln4L57HwK8H0FqsyNnXosnAp3ingrJI6/MPS90=";
   };
 
diff --git a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix
index d582c5cfc37c..1d7b634f7d80 100644
--- a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix
+++ b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = "ephemeral-port-reserve";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-R6NRpfaT05PO/cTWgCakiGfCuCyucjVOXbAezn5x1cU=";
   };
 
diff --git a/pkgs/development/python-modules/esprima/default.nix b/pkgs/development/python-modules/esprima/default.nix
index 8969ec792282..7bf434c2e9b8 100644
--- a/pkgs/development/python-modules/esprima/default.nix
+++ b/pkgs/development/python-modules/esprima/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Kronuz";
     repo = "esprima-python";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "WtkPCReXhxyr6pOzE9gsdIeBlLk+nSnbxkS3OowEaHo=";
   };
 
diff --git a/pkgs/development/python-modules/essentials/default.nix b/pkgs/development/python-modules/essentials/default.nix
index e94a3ccf98b8..d4a8e5219a32 100644
--- a/pkgs/development/python-modules/essentials/default.nix
+++ b/pkgs/development/python-modules/essentials/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Neoteroi";
     repo = "essentials";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WMHjBVkeSoQ4Naj1U7Bg9j2hcoErH1dx00BPKiom9T4=";
   };
 
diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix
index d9dc4fcd0753..c99a79dcd886 100644
--- a/pkgs/development/python-modules/etcd/default.nix
+++ b/pkgs/development/python-modules/etcd/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dsoprea";
     repo = "PythonEtcdClient";
-    rev = version;
+    tag = version;
     hash = "sha256-h+jYIRSNdrGkW3tBV1ifIDEXU46EQGyeJoz/Mxym4pI=";
   };
 
diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix
index 10e71d28cb2f..f3669fd4c531 100644
--- a/pkgs/development/python-modules/etebase/default.nix
+++ b/pkgs/development/python-modules/etebase/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "etesync";
     repo = "etebase-py";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZNUUp/0fGJxL/Rt8sAZ864rg8uCcNybIYSk4POt0vqg=";
   };
 
diff --git a/pkgs/development/python-modules/eth-rlp/default.nix b/pkgs/development/python-modules/eth-rlp/default.nix
index 3bc8d7c35b83..fc78616a85d0 100644
--- a/pkgs/development/python-modules/eth-rlp/default.nix
+++ b/pkgs/development/python-modules/eth-rlp/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "eth-rlp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FTqIutndf+epmO5XNEUoRAUEmn299aTLIZNe5SMcxAQ=";
   };
 
diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix
index 58c766811fe1..e43810ed99c1 100644
--- a/pkgs/development/python-modules/executing/default.nix
+++ b/pkgs/development/python-modules/executing/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexmojaki";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2BT4VTZBAJx8Gk4qTTyhSoBMjJvKzmL4PO8IfTpN+2g=";
   };
 
diff --git a/pkgs/development/python-modules/expects/default.nix b/pkgs/development/python-modules/expects/default.nix
index a36769259e36..c2fbcddfe4e0 100644
--- a/pkgs/development/python-modules/expects/default.nix
+++ b/pkgs/development/python-modules/expects/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaimegildesagredo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0mk1mhh8n9ly820krkhazn1w96f10vmgh21y2wr44sn8vwr4ngyy";
   };
 
diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix
index d94227989c49..ee193ad6b0f5 100644
--- a/pkgs/development/python-modules/fabulous/default.nix
+++ b/pkgs/development/python-modules/fabulous/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jart";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4=";
   };
 
diff --git a/pkgs/development/python-modules/fairseq/default.nix b/pkgs/development/python-modules/fairseq/default.nix
index aa2932bbf91f..42bf6d88158e 100644
--- a/pkgs/development/python-modules/fairseq/default.nix
+++ b/pkgs/development/python-modules/fairseq/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XX/grU5ljQCwx33miGoFc/7Uj9fZDtmhm4Fz7L4U+Bc=";
   };
 
diff --git a/pkgs/development/python-modules/farama-notifications/default.nix b/pkgs/development/python-modules/farama-notifications/default.nix
index c04c3a50a584..8c18b1f17708 100644
--- a/pkgs/development/python-modules/farama-notifications/default.nix
+++ b/pkgs/development/python-modules/farama-notifications/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-UUrJ/5t5x54xs1gweNUhwqrMJQXiyrUPn1bBfTsiPcw=";
   };
 
diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix
index 5d55886302b0..4d7c78573fa2 100644
--- a/pkgs/development/python-modules/fastdtw/default.nix
+++ b/pkgs/development/python-modules/fastdtw/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "slaypni";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0irc5x4ahfp7f7q4ic97qa898s2awi0vdjznahxrfjirn8b157dw";
   };
 
diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix
index ad250ee1715c..4b14bd0d76e4 100644
--- a/pkgs/development/python-modules/fastjsonschema/default.nix
+++ b/pkgs/development/python-modules/fastjsonschema/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "horejsek";
     repo = "python-fastjsonschema";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-H/jmvm5U4RB9KuD5EgCedbc499Fl8L2S9Y5SXy51JP0=";
   };
diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix
index 2d6d68a3842d..2c8afe28666a 100644
--- a/pkgs/development/python-modules/fastpbkdf2/default.nix
+++ b/pkgs/development/python-modules/fastpbkdf2/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ayrx";
     repo = "python-fastpbkdf2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1hvvlk3j28i6nswb6gy3mq7278nq0mgfnpxh1rv6jvi7xhd7qmlc";
   };
 
diff --git a/pkgs/development/python-modules/filedate/default.nix b/pkgs/development/python-modules/filedate/default.nix
index 5317169caa68..3cf760253d70 100644
--- a/pkgs/development/python-modules/filedate/default.nix
+++ b/pkgs/development/python-modules/filedate/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kubinka0505";
     repo = "filedate";
-    rev = version;
+    tag = version;
     hash = "sha256-HvuGP+QlUlfAUfFmaVVvtPHGdrbWVxghQipnqTTvAQc=";
   };
 
diff --git a/pkgs/development/python-modules/finalfusion/default.nix b/pkgs/development/python-modules/finalfusion/default.nix
index 2452a6cbf07d..3da5f7fbda82 100644
--- a/pkgs/development/python-modules/finalfusion/default.nix
+++ b/pkgs/development/python-modules/finalfusion/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "finalfusion";
     repo = "finalfusion-python";
-    rev = version;
+    tag = version;
     sha256 = "0pwzflamxqvpl1wcz0zbhhd6aa4xn18rmza6rggaic3ckidhyrh4";
   };
 
diff --git a/pkgs/development/python-modules/fingerprints/default.nix b/pkgs/development/python-modules/fingerprints/default.nix
index 6b3bf80810f6..81ce12d9d339 100644
--- a/pkgs/development/python-modules/fingerprints/default.nix
+++ b/pkgs/development/python-modules/fingerprints/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alephdata";
     repo = "fingerprints";
-    rev = version;
+    tag = version;
     hash = "sha256-U2UslCy1OagVTtllCKsEBX4zI/qIczbxs2Cxzy+/Xys=";
   };
 
diff --git a/pkgs/development/python-modules/fissix/default.nix b/pkgs/development/python-modules/fissix/default.nix
index d600d8410795..4e9e06bfd2cd 100644
--- a/pkgs/development/python-modules/fissix/default.nix
+++ b/pkgs/development/python-modules/fissix/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "amyreese";
     repo = "fissix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-geGctke+1PWFqJyiH1pQ0zWj9wVIjV/SQ5njOOk9gOw=";
   };
 
diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix
index f53eba81b2ea..cdd85841e9ea 100644
--- a/pkgs/development/python-modules/fitbit/default.nix
+++ b/pkgs/development/python-modules/fitbit/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "orcasgit";
     repo = "python-fitbit";
-    rev = version;
+    tag = version;
     hash = "sha256-1u3h47lRBrJ7EUWBl5+RLGW4KHHqXqqrXbboZdy7VPA=";
   };
 
diff --git a/pkgs/development/python-modules/fixerio/default.nix b/pkgs/development/python-modules/fixerio/default.nix
index 550181765263..e34211a3eabf 100644
--- a/pkgs/development/python-modules/fixerio/default.nix
+++ b/pkgs/development/python-modules/fixerio/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amatellanes";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "009h1mys175xdyznn5bl980vly40544s4ph1zcgqwg2i2ic93gvb";
   };
 
diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix
index b7cb3821defc..d659850301db 100644
--- a/pkgs/development/python-modules/flasgger/default.nix
+++ b/pkgs/development/python-modules/flasgger/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "flasgger";
     repo = "flasgger";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cYFMKZxpi69gVWqyZUltCL0ZwcfIABNsJKqAhN2TTSg=";
   };
 
diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix
index da98864cf818..11876321bcc4 100644
--- a/pkgs/development/python-modules/flask-bcrypt/default.nix
+++ b/pkgs/development/python-modules/flask-bcrypt/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maxcountryman";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-WlIholi/nzq6Ikc0LS6FhG0Q5Kz0kvvAlA2YJ7EksZ4=";
   };
 
diff --git a/pkgs/development/python-modules/flask-expects-json/default.nix b/pkgs/development/python-modules/flask-expects-json/default.nix
index a0598642d497..24d6dd4db71a 100644
--- a/pkgs/development/python-modules/flask-expects-json/default.nix
+++ b/pkgs/development/python-modules/flask-expects-json/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Fischerfredl";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-CUxuwqjjAb9Fy6xWtX1WtSANYaYr5//vY8k89KghYoQ=";
   };
 
diff --git a/pkgs/development/python-modules/flask-mysqldb/default.nix b/pkgs/development/python-modules/flask-mysqldb/default.nix
index 995d44efcc57..0c0768737ba3 100644
--- a/pkgs/development/python-modules/flask-mysqldb/default.nix
+++ b/pkgs/development/python-modules/flask-mysqldb/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexferl";
     repo = "flask-mysqldb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RHAB9WGRzojH6eAOG61QguwF+4LssO9EcFjbWxoOtF4=";
   };
 
diff --git a/pkgs/development/python-modules/flask-paranoid/default.nix b/pkgs/development/python-modules/flask-paranoid/default.nix
index 0e4d49127ae9..fcd7f38520d4 100644
--- a/pkgs/development/python-modules/flask-paranoid/default.nix
+++ b/pkgs/development/python-modules/flask-paranoid/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tikD8efc3Q3xIQnaC3SSBaCRQxMI1HzXxeupvYeNnE4=";
   };
 
diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
index a4ea585c909c..d0be0d06db2d 100644
--- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
+++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "antarctica";
     repo = "flask-reverse-proxy-fix";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZRZI1psr1dnY2FbuLZXOQvLMJd4TF7BfBNZnW9kxeck=";
   };
 
diff --git a/pkgs/development/python-modules/flask-sock/default.nix b/pkgs/development/python-modules/flask-sock/default.nix
index bb5f82925cfb..a42aaf1114ca 100644
--- a/pkgs/development/python-modules/flask-sock/default.nix
+++ b/pkgs/development/python-modules/flask-sock/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "flask-sock";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GKfOVdeLPag2IKGCWrMjQp4NTL1/9GiyLhXhf9jQKhQ=";
   };
 
diff --git a/pkgs/development/python-modules/flatdict/default.nix b/pkgs/development/python-modules/flatdict/default.nix
index d0aacabfbbca..1ef142fd94f9 100644
--- a/pkgs/development/python-modules/flatdict/default.nix
+++ b/pkgs/development/python-modules/flatdict/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gmr";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-CWsTiCNdIKSQtjpQC07lhZoU1hXT/MGpXdj649x2GlU=";
   };
 
diff --git a/pkgs/development/python-modules/flatten-dict/default.nix b/pkgs/development/python-modules/flatten-dict/default.nix
index 9f50f2c7dab9..62861916c42f 100644
--- a/pkgs/development/python-modules/flatten-dict/default.nix
+++ b/pkgs/development/python-modules/flatten-dict/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ianlini";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-uHenKoD4eLm9sMREVuV0BB/oUgh4NMiuj+IWd0hlxNQ=";
   };
 
diff --git a/pkgs/development/python-modules/flatten-json/default.nix b/pkgs/development/python-modules/flatten-json/default.nix
index 408eb95d572c..6c978d7bad00 100644
--- a/pkgs/development/python-modules/flatten-json/default.nix
+++ b/pkgs/development/python-modules/flatten-json/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amirziai";
     repo = "flatten";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ViOLbfJtFWkDQ5cGNYerTk2BqVg5f5B3hZ96t0uvhpk=";
   };
 
diff --git a/pkgs/development/python-modules/flexcache/default.nix b/pkgs/development/python-modules/flexcache/default.nix
index a15801505ca9..cd0cb310edce 100644
--- a/pkgs/development/python-modules/flexcache/default.nix
+++ b/pkgs/development/python-modules/flexcache/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hgrecco";
     repo = "flexcache";
-    rev = version;
+    tag = version;
     hash = "sha256-MAbTe7NxzfRPzo/Wnb5SnPJvJWf6zVeYsaw/g9OJYSE=";
   };
 
diff --git a/pkgs/development/python-modules/flexparser/default.nix b/pkgs/development/python-modules/flexparser/default.nix
index 4cb3cfbf6c58..1573426f8338 100644
--- a/pkgs/development/python-modules/flexparser/default.nix
+++ b/pkgs/development/python-modules/flexparser/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hgrecco";
     repo = "flexparser";
-    rev = version;
+    tag = version;
     hash = "sha256-0Ocp4GsrnzkpSqnP+AK5OxJ3KyUf5Uc6CegDXpRYRqo=";
   };
 
diff --git a/pkgs/development/python-modules/flit-gettext/default.nix b/pkgs/development/python-modules/flit-gettext/default.nix
index cdf3dadf14ed..9c1008436546 100644
--- a/pkgs/development/python-modules/flit-gettext/default.nix
+++ b/pkgs/development/python-modules/flit-gettext/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "codingjoe";
     repo = "flit-gettext";
-    rev = version;
+    tag = version;
     hash = "sha256-YsRfpciSrHmivEJKfzdp6UaPx2tSr3VdjU4ZIbYQX6c=";
   };
 
diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix
index 2bf1e93072d2..d26819078b82 100644
--- a/pkgs/development/python-modules/flit/default.nix
+++ b/pkgs/development/python-modules/flit/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "flit";
-    rev = version;
+    tag = version;
     hash = "sha256-AK5iuR1l/i2Cgj8D4CnyV6mQkSNbFw4sHGQF2OdwNkU=";
   };
 
diff --git a/pkgs/development/python-modules/fnvhash/default.nix b/pkgs/development/python-modules/fnvhash/default.nix
index 76ec4ed770b4..a418dcce0f10 100644
--- a/pkgs/development/python-modules/fnvhash/default.nix
+++ b/pkgs/development/python-modules/fnvhash/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "znerol";
     repo = "py-fnvhash";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "00h8i70qd3dpsyf2dp7fkcb9m2prd6m3l33qv3wf6idpnqgjz6fq";
   };
 
diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/development/python-modules/font-v/default.nix
index fd2970d07a34..dfcbf2c2b535 100644
--- a/pkgs/development/python-modules/font-v/default.nix
+++ b/pkgs/development/python-modules/font-v/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "source-foundry";
     repo = "font-v";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ceASyYcNul5aWPAPGajCQrqsQ3bN1sE+nMbCbj7f35w=";
   };
 
diff --git a/pkgs/development/python-modules/fordpass/default.nix b/pkgs/development/python-modules/fordpass/default.nix
index 0a7d9f68e6ec..cedfa4d1884a 100644
--- a/pkgs/development/python-modules/fordpass/default.nix
+++ b/pkgs/development/python-modules/fordpass/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "clarkd";
     repo = "fordpass-python";
-    rev = version;
+    tag = version;
     sha256 = "0i1dlswxc2bv1smc5d4r1adbxbl7sgr1swh2cjfajp73vs43xa0m";
   };
 
diff --git a/pkgs/development/python-modules/fqdn/default.nix b/pkgs/development/python-modules/fqdn/default.nix
index dd8f5b8d8ca8..778af7f48e44 100644
--- a/pkgs/development/python-modules/fqdn/default.nix
+++ b/pkgs/development/python-modules/fqdn/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ypcrts";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T0CdWWr8p3JVhp3nol5hyxsrD3951JE2EDpFt+m+3bE=";
   };
 
diff --git a/pkgs/development/python-modules/frilouz/default.nix b/pkgs/development/python-modules/frilouz/default.nix
index 962c0bc45884..0a8fd9d8dd51 100644
--- a/pkgs/development/python-modules/frilouz/default.nix
+++ b/pkgs/development/python-modules/frilouz/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "QuantStack";
     repo = "frilouz";
-    rev = version;
+    tag = version;
     sha256 = "0w2qzi4zb10r9iw64151ay01vf0yzyhh0bsjkx1apxp8fs15cdiw";
   };
 
diff --git a/pkgs/development/python-modules/frozenlist2/default.nix b/pkgs/development/python-modules/frozenlist2/default.nix
index ca7ab067ea06..a90b123162be 100644
--- a/pkgs/development/python-modules/frozenlist2/default.nix
+++ b/pkgs/development/python-modules/frozenlist2/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rohanpm";
     repo = "frozenlist2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fF0oFZ2q1wRH7IKBlCjm3Za4xtEMSHyEaGL09rHgtTY=";
   };
 
diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix
index 4c67565fd5f3..8e6ec9c3c4c0 100644
--- a/pkgs/development/python-modules/funcparserlib/default.nix
+++ b/pkgs/development/python-modules/funcparserlib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vlasovskikh";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-LE9ItCaEzEGeahpM3M3sSnDBXEr6uX5ogEkO5x2Jgzc=";
   };
 
diff --git a/pkgs/development/python-modules/functions-framework/default.nix b/pkgs/development/python-modules/functions-framework/default.nix
index b9df27a48b5f..67d58c49893e 100644
--- a/pkgs/development/python-modules/functions-framework/default.nix
+++ b/pkgs/development/python-modules/functions-framework/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "functions-framework-python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wLL8VWhRb3AEa41DO/mwx3G0AwmLACiXeDvo+LEq1xM=";
   };
 
diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix
index 7e99404d942a..3a1953e46b8d 100644
--- a/pkgs/development/python-modules/fx2/default.nix
+++ b/pkgs/development/python-modules/fx2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "whitequark";
     repo = "libfx2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PtWxjT+97+EeNMN36zOT1+ost/w3lRRkaON3Cl3dpp4=";
   };
 
diff --git a/pkgs/development/python-modules/garminconnect-aio/default.nix b/pkgs/development/python-modules/garminconnect-aio/default.nix
index 362ffd393e4e..dab04e1ff7d9 100644
--- a/pkgs/development/python-modules/garminconnect-aio/default.nix
+++ b/pkgs/development/python-modules/garminconnect-aio/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "python-garminconnect-aio";
-    rev = version;
+    tag = version;
     hash = "sha256-GWY2kTG2D+wOJqM/22pNV5rLvWjAd4jxVGlHBou/T2g=";
   };
 
diff --git a/pkgs/development/python-modules/gatt/default.nix b/pkgs/development/python-modules/gatt/default.nix
index 5a928d5c7991..812c72d1a2b8 100644
--- a/pkgs/development/python-modules/gatt/default.nix
+++ b/pkgs/development/python-modules/gatt/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getsenic";
     repo = "gatt-python";
-    rev = version;
+    tag = version;
     hash = "sha256-GMLqQ9ojQ649hbbJB+KiQoOhiTWweOgv6zaCDzhIB5A=";
   };
 
diff --git a/pkgs/development/python-modules/gawd/default.nix b/pkgs/development/python-modules/gawd/default.nix
index b3afe56d9daf..04c9fbb9db0f 100644
--- a/pkgs/development/python-modules/gawd/default.nix
+++ b/pkgs/development/python-modules/gawd/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pooya-rostami";
     repo = "gawd";
-    rev = version;
+    tag = version;
     hash = "sha256-DCcU7vO5VApRsO+ljVs827TrHIfe3R+1/2wgBEcp1+c=";
   };
 
diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix
index df7477fe8ddc..36275bab4124 100644
--- a/pkgs/development/python-modules/gb-io/default.nix
+++ b/pkgs/development/python-modules/gb-io/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "althonos";
     repo = "gb-io.py";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1B7BUJ8H+pTtmDtazfPfYtlXzL/x4rAHtRIFAAsSoWs=";
   };
 
diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix
index 24bf6109e8ac..d7378eac338a 100644
--- a/pkgs/development/python-modules/gbinder-python/default.nix
+++ b/pkgs/development/python-modules/gbinder-python/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "erfanoabdi";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1X9gAux9w/mCEVmE3Yqvvq3kU7hu4iAFaZWNZZZxt3E=";
   };
 
diff --git a/pkgs/development/python-modules/gcodepy/default.nix b/pkgs/development/python-modules/gcodepy/default.nix
index 6e62d9bb3bf6..69b30c3406f7 100644
--- a/pkgs/development/python-modules/gcodepy/default.nix
+++ b/pkgs/development/python-modules/gcodepy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rmeno12";
     repo = "gcodepy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+amBkwwISPyes8ABdqgCw50Zg5ioDa46WZgQsZZgl+8=";
   };
 
diff --git a/pkgs/development/python-modules/gcsa/default.nix b/pkgs/development/python-modules/gcsa/default.nix
index c487881f92b4..25436d9b1153 100644
--- a/pkgs/development/python-modules/gcsa/default.nix
+++ b/pkgs/development/python-modules/gcsa/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kuzmoyev";
     repo = "google-calendar-simple-api";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ye8mQSzgaEZx0vUpt5xiMrJTFh2AmSB7ZZlKaEj/YpM=";
   };
 
diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix
index b2282a04a1c0..be7bce85d7d3 100644
--- a/pkgs/development/python-modules/gdsfactory/default.nix
+++ b/pkgs/development/python-modules/gdsfactory/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gdsfactory";
     repo = "gdsfactory";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wDz8QpRgu40FB8+otnGsHVn2e6/SWXIZgA1aeMqMhPQ=";
   };
 
diff --git a/pkgs/development/python-modules/gekitchen/default.nix b/pkgs/development/python-modules/gekitchen/default.nix
index 615be02d1785..a24879df23f0 100644
--- a/pkgs/development/python-modules/gekitchen/default.nix
+++ b/pkgs/development/python-modules/gekitchen/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ajmarks";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eKGundh7j9LqFd71bx86rNBVu2iAcgLN25JfFa39+VA=";
   };
 
diff --git a/pkgs/development/python-modules/georss-generic-client/default.nix b/pkgs/development/python-modules/georss-generic-client/default.nix
index d0ac06cf8122..b7f761164f9a 100644
--- a/pkgs/development/python-modules/georss-generic-client/default.nix
+++ b/pkgs/development/python-modules/georss-generic-client/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-generic-client";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Y19zMHL6DjAqiDi47Lmst8m9d9kEtTgyRiECKo6CqZY=";
   };
 
diff --git a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
index 299d78bd3c82..d9ce2d4c8204 100644
--- a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
+++ b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-nrcan-earthquakes-client";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FFm37+dCkdoZXgvAjYhcHOYFf0oQ37bxJb7vzbWDTro=";
   };
 
diff --git a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
index 764fc3fc92f8..e2c59fdaf7a5 100644
--- a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
+++ b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-tfs-incidents-client";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Cz0PRcGReAE0mg04ktCUaoLqPTjvyU1TiB/Pdz7o7zo=";
   };
 
diff --git a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
index d686f5049aef..a7444c85d6c1 100644
--- a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
+++ b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-wa-dfes-client";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-s7qGTlWFdOtw0eMK7idld7HPOxO8CjODCmUi0WmRLdI=";
   };
 
diff --git a/pkgs/development/python-modules/gerbonara/default.nix b/pkgs/development/python-modules/gerbonara/default.nix
index 46a226f5637d..a0b148b0c64e 100644
--- a/pkgs/development/python-modules/gerbonara/default.nix
+++ b/pkgs/development/python-modules/gerbonara/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaseg";
     repo = "gerbonara";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SwXoCA9ru5VgH4geKUDgdcPrgEYgNoVwNb5YUBAcXlo=";
   };
 
diff --git a/pkgs/development/python-modules/gfal2-python/default.nix b/pkgs/development/python-modules/gfal2-python/default.nix
index 52cb5ad1b227..64f194e70df5 100644
--- a/pkgs/development/python-modules/gfal2-python/default.nix
+++ b/pkgs/development/python-modules/gfal2-python/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cern-fts";
     repo = "gfal2-python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Xk+gLTrqfWb0kGB6QhnM62zAHVFb8rRAqCIBxn0V824=";
   };
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/gfal2-util/default.nix b/pkgs/development/python-modules/gfal2-util/default.nix
index 4294aa48b741..ba17c3ec7245 100644
--- a/pkgs/development/python-modules/gfal2-util/default.nix
+++ b/pkgs/development/python-modules/gfal2-util/default.nix
@@ -15,7 +15,7 @@
   src = fetchFromGitHub {
     owner = "cern-fts";
     repo = "gfal2-util";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3JbJgKD17aYkrB/aaww7IQU8fLFrTCh868KWlLPxmlk=";
   };
 
diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix
index d03703b37e96..74cc334361bb 100644
--- a/pkgs/development/python-modules/gibberish-detector/default.nix
+++ b/pkgs/development/python-modules/gibberish-detector/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "domanchi";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b";
   };
 
diff --git a/pkgs/development/python-modules/git-dummy/default.nix b/pkgs/development/python-modules/git-dummy/default.nix
index 2fffa2d6e06c..a2f0e94d2b9d 100644
--- a/pkgs/development/python-modules/git-dummy/default.nix
+++ b/pkgs/development/python-modules/git-dummy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "initialcommit-com";
     repo = "git-dummy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-viybxn2J7SO7NgSvjwlP+tgtm+H6QrACafIy82d9XEk=";
   };
 
diff --git a/pkgs/development/python-modules/git-find-repos/default.nix b/pkgs/development/python-modules/git-find-repos/default.nix
index d97d153ee6c1..bf47ae7a377d 100644
--- a/pkgs/development/python-modules/git-find-repos/default.nix
+++ b/pkgs/development/python-modules/git-find-repos/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "acroz";
     repo = "git-find-repos";
-    rev = version;
+    tag = version;
     sha256 = "sha256-4TuZlt6XH4//DBHPuIMl/i3Tp6Uft62dGCTAuZ2rseE=";
   };
 
diff --git a/pkgs/development/python-modules/git-url-parse/default.nix b/pkgs/development/python-modules/git-url-parse/default.nix
index 67a0e5a38030..2ec51928c897 100644
--- a/pkgs/development/python-modules/git-url-parse/default.nix
+++ b/pkgs/development/python-modules/git-url-parse/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coala";
     repo = "git-url-parse";
-    rev = version;
+    tag = version;
     hash = "sha256-+0V/C3wE02ppdDGn7iqdvmgsUwTR7THUakUilvkzoYg=";
   };
 
diff --git a/pkgs/development/python-modules/git-versioner/default.nix b/pkgs/development/python-modules/git-versioner/default.nix
index ed2fc5ec732e..042dcc82e33f 100644
--- a/pkgs/development/python-modules/git-versioner/default.nix
+++ b/pkgs/development/python-modules/git-versioner/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     owner = "alelec";
     repo = "__version__";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bnpuFJSd4nBXJA75V61kiB+nU5pUzdEAIScfKx7aaGU=";
   };
 
diff --git a/pkgs/development/python-modules/github-to-sqlite/default.nix b/pkgs/development/python-modules/github-to-sqlite/default.nix
index 20ca2879ae3f..22b6e69c86f5 100644
--- a/pkgs/development/python-modules/github-to-sqlite/default.nix
+++ b/pkgs/development/python-modules/github-to-sqlite/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dogsheep";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-KwLaaZxBBzRhiBv4p8Imb5XI1hyka9rmr/rxA6wDc7Q=";
   };
 
diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix
index 17a2b18c536d..a500a36807f0 100644
--- a/pkgs/development/python-modules/glean-sdk/default.nix
+++ b/pkgs/development/python-modules/glean-sdk/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "glean";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-egn6RYQHY173fvTCTYrTJltn923UowCjBZg1DI+iHSk=";
   };
 
diff --git a/pkgs/development/python-modules/gpt-2-simple/default.nix b/pkgs/development/python-modules/gpt-2-simple/default.nix
index 6d12f2629793..c6ffc8e8df75 100644
--- a/pkgs/development/python-modules/gpt-2-simple/default.nix
+++ b/pkgs/development/python-modules/gpt-2-simple/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "minimaxir";
     repo = "gpt-2-simple";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WwD4sDcc28zXEOISJsq8e+rgaNrrgIy79Wa4J3E7Ovc=";
   };
 
diff --git a/pkgs/development/python-modules/gpxpy/default.nix b/pkgs/development/python-modules/gpxpy/default.nix
index 640f2b4d6fe1..5a322173ec7c 100644
--- a/pkgs/development/python-modules/gpxpy/default.nix
+++ b/pkgs/development/python-modules/gpxpy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tkrajina";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-s65k0u4LIwHX9RJMJIYMkNS4/Z0wstzqYVPAjydo2iI=";
   };
 
diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix
index c447d061e4a2..6f7c9e9906ce 100644
--- a/pkgs/development/python-modules/grandalf/default.nix
+++ b/pkgs/development/python-modules/grandalf/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdcht";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j2SvpQvDMfwoj2PAQSxzEIyIzzJ61Eb9wgetKyni6A4=";
   };
 
diff --git a/pkgs/development/python-modules/graphlib-backport/default.nix b/pkgs/development/python-modules/graphlib-backport/default.nix
index 7f91976b4c21..a850de86b5cf 100644
--- a/pkgs/development/python-modules/graphlib-backport/default.nix
+++ b/pkgs/development/python-modules/graphlib-backport/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mariushelf";
     repo = "graphlib_backport";
-    rev = version;
+    tag = version;
     hash = "sha256-ssJLtBQH8sSnccgcAKLKfYpPyw5U0RIm1F66/Er81lo=";
   };
 
diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix
index 7d19247c2a34..17e986229dce 100644
--- a/pkgs/development/python-modules/graphql-server-core/default.nix
+++ b/pkgs/development/python-modules/graphql-server-core/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "graphql-python";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1w3biv2za2m1brwjy0z049c2m94gm1zfwxzgc6lwrsci724jv9fr";
   };
 
diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix
index f29e44d2f440..dceb43fea137 100644
--- a/pkgs/development/python-modules/grip/default.nix
+++ b/pkgs/development/python-modules/grip/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joeyespo";
     repo = "grip";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CHL2dy0H/i0pLo653F7aUHFvZHTeZA6jC/rwn1KrEW4=";
   };
 
diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix
index 5ebc3f1f3361..9c8557a10110 100644
--- a/pkgs/development/python-modules/gruut-ipa/default.nix
+++ b/pkgs/development/python-modules/gruut-ipa/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Q2UKELoG8OaAPxIrZNCpXgeWZ2fCzb3g3SOVzCm/gg0=";
   };
 
diff --git a/pkgs/development/python-modules/gtts-token/default.nix b/pkgs/development/python-modules/gtts-token/default.nix
index a747522827ca..cca1c03efbd0 100644
--- a/pkgs/development/python-modules/gtts-token/default.nix
+++ b/pkgs/development/python-modules/gtts-token/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "boudewijn26";
     repo = "gTTS-token";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0vr52zc0jqyfvsccl67j1baims3cdx2is1y2lpx2kav9gadkn8hp";
   };
 
diff --git a/pkgs/development/python-modules/help2man/default.nix b/pkgs/development/python-modules/help2man/default.nix
index df9398fcb265..69c9c50a2fb7 100644
--- a/pkgs/development/python-modules/help2man/default.nix
+++ b/pkgs/development/python-modules/help2man/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Freed-Wu";
     repo = "help2man";
-    rev = version;
+    tag = version;
     hash = "sha256-BIDn+LQzBtDHUtFvIRL3NMXNouO3cMLibuYBoFtCUxI=";
   };
 
diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix
index 930d743b7bf0..505ac130b1a5 100644
--- a/pkgs/development/python-modules/helper/default.nix
+++ b/pkgs/development/python-modules/helper/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gmr";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0zypjv8rncvrsgl200v7d3bn08gs48dwqvgamfqv71h07cj6zngp";
   };
 
diff --git a/pkgs/development/python-modules/here-routing/default.nix b/pkgs/development/python-modules/here-routing/default.nix
index d8e6e4a3c800..16e384886e93 100644
--- a/pkgs/development/python-modules/here-routing/default.nix
+++ b/pkgs/development/python-modules/here-routing/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eifinger";
     repo = "here_routing";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sdNs5QNYvL1Cpbk9Yi+7PSiDZ6LEgAXQ19IYSAY78p0=";
   };
 
diff --git a/pkgs/development/python-modules/here-transit/default.nix b/pkgs/development/python-modules/here-transit/default.nix
index 2aae9b51fe53..d83b3d91cee3 100644
--- a/pkgs/development/python-modules/here-transit/default.nix
+++ b/pkgs/development/python-modules/here-transit/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eifinger";
     repo = "here_transit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fORg1iqRcD75Is1EW9XeAu8astibypmnNXo3vHduQdk=";
   };
 
diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix
index fd4eb8496ce9..ae2aeee423e1 100644
--- a/pkgs/development/python-modules/hetzner/default.nix
+++ b/pkgs/development/python-modules/hetzner/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "hetzner";
     owner = "aszlig";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0nhm7j2y4rgmrl0c1rklg982qllp7fky34dchqwd4czbsdnv9j7a";
   };
 
diff --git a/pkgs/development/python-modules/hightime/default.nix b/pkgs/development/python-modules/hightime/default.nix
index eb2d6b6ad60c..995ba1d3aaf5 100644
--- a/pkgs/development/python-modules/hightime/default.nix
+++ b/pkgs/development/python-modules/hightime/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ni";
     repo = "hightime";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P/ZP5smKyNg18YGYWpm/57YGFY3MrX1UIVDU5RsF+rA=";
   };
 
diff --git a/pkgs/development/python-modules/hlk-sw16/default.nix b/pkgs/development/python-modules/hlk-sw16/default.nix
index 49a2da2686e4..43d5add58da3 100644
--- a/pkgs/development/python-modules/hlk-sw16/default.nix
+++ b/pkgs/development/python-modules/hlk-sw16/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jameshilliard";
     repo = "hlk-sw16";
-    rev = version;
+    tag = version;
     sha256 = "010s85nr6xn89i8yvdagg72a97dh1v2pyfqa33v76p9p8xbgh8dz";
   };
 
diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix
index 40d2653d6c0d..3648e90f26d7 100644
--- a/pkgs/development/python-modules/hocr-tools/default.nix
+++ b/pkgs/development/python-modules/hocr-tools/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tmbdev";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p";
   };
 
diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix
index 7af19f73f6fe..11746d32b670 100644
--- a/pkgs/development/python-modules/homepluscontrol/default.nix
+++ b/pkgs/development/python-modules/homepluscontrol/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chemaaa";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-COOGqfYiR4tueQHXuCvVxShrYS0XNltcW4mclbFWcfA=";
   };
 
diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix
index df23b4ec3c8e..6495c197cec7 100644
--- a/pkgs/development/python-modules/hpack/default.nix
+++ b/pkgs/development/python-modules/hpack/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-hyper";
     repo = "hpack";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2CehGy3K5fKbkB1J8+8x1D4XvnBn1Mbapx+p8rdXDYc=";
   };
 
diff --git a/pkgs/development/python-modules/hsh/default.nix b/pkgs/development/python-modules/hsh/default.nix
index f7efbc14e8ae..27edb2daee2d 100644
--- a/pkgs/development/python-modules/hsh/default.nix
+++ b/pkgs/development/python-modules/hsh/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrissimpkins";
     repo = "hsh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bAAytoidFHH2dSXqN9aqBd2H4p/rwTWXIZa1t5Djdz0=";
   };
 
diff --git a/pkgs/development/python-modules/hsluv/default.nix b/pkgs/development/python-modules/hsluv/default.nix
index 063137b74e4d..f19ec807e264 100644
--- a/pkgs/development/python-modules/hsluv/default.nix
+++ b/pkgs/development/python-modules/hsluv/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hsluv";
     repo = "hsluv-python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bjivmPTU3Gp3pcC0ru4GSZANdhPqS1QSTMeiPGN8GCI=";
   };
 
diff --git a/pkgs/development/python-modules/html-table-parser-python3/default.nix b/pkgs/development/python-modules/html-table-parser-python3/default.nix
index c4f3f8fc46aa..f8e3c320b3e5 100644
--- a/pkgs/development/python-modules/html-table-parser-python3/default.nix
+++ b/pkgs/development/python-modules/html-table-parser-python3/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "schmijos";
     repo = "html-table-parser-python3";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-okYl0T12wVld7GVbFQH2hgEVKXSScipJN/vYaiRVdGY=";
   };
 
diff --git a/pkgs/development/python-modules/html-tag-names/default.nix b/pkgs/development/python-modules/html-tag-names/default.nix
index e61fee5d89ab..d2149d8ecf80 100644
--- a/pkgs/development/python-modules/html-tag-names/default.nix
+++ b/pkgs/development/python-modules/html-tag-names/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Riverside-Healthcare";
     repo = "html-tag-names";
-    rev = version;
+    tag = version;
     hash = "sha256-2YywP4/0yocejuJwanC5g9BR7mcy5C+zMhCjNZ9FRH4=";
   };
 
diff --git a/pkgs/development/python-modules/html-void-elements/default.nix b/pkgs/development/python-modules/html-void-elements/default.nix
index 41cbefbf7ada..3c0f69583759 100644
--- a/pkgs/development/python-modules/html-void-elements/default.nix
+++ b/pkgs/development/python-modules/html-void-elements/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Riverside-Healthcare";
     repo = "html-void-elements";
-    rev = version;
+    tag = version;
     hash = "sha256-Q5OEczTdgCCyoOsKv3MKRE3w4t/qyPG4YKbF19jlC88=";
   };
 
diff --git a/pkgs/development/python-modules/html5tagger/default.nix b/pkgs/development/python-modules/html5tagger/default.nix
index 527e3660481b..ac0260a20640 100644
--- a/pkgs/development/python-modules/html5tagger/default.nix
+++ b/pkgs/development/python-modules/html5tagger/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sanic-org";
     repo = "html5tagger";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Or0EizZC9FMjTcbgecDvgGB09KNGyxHreSDojgB7ysg=";
   };
 
diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix
index 6428b99868f2..4e2a0cc883f1 100644
--- a/pkgs/development/python-modules/httmock/default.nix
+++ b/pkgs/development/python-modules/httmock/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "patrys";
     repo = "httmock";
-    rev = version;
+    tag = version;
     hash = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I=";
   };
 
diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix
index d4010abc5242..b185f3e8be34 100644
--- a/pkgs/development/python-modules/http-ece/default.nix
+++ b/pkgs/development/python-modules/http-ece/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "web-push-libs";
     repo = "encrypted-content-encoding";
-    rev = version;
+    tag = version;
     hash = "sha256-HjXJWoOvCVOdEto4Ss4HPUuf+uNcQkfvj/cxJGHOhQ8=";
   };
 
diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix
index 47041ff971fa..d771e0006f5e 100644
--- a/pkgs/development/python-modules/http-message-signatures/default.nix
+++ b/pkgs/development/python-modules/http-message-signatures/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyauth";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Jsivw4lNA/2oqsOGGx8D4gUPftzuys877A9RXyapnSQ=";
   };
 
diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index a6c3e42a5317..d014c36c3a3f 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-76gdiRbF535CEaNXwNqsVeVc0dKglovMPQpGsOkbd/4=";
   };
 
diff --git a/pkgs/development/python-modules/huisbaasje-client/default.nix b/pkgs/development/python-modules/huisbaasje-client/default.nix
index 65d12537cda8..58cc4c2ff664 100644
--- a/pkgs/development/python-modules/huisbaasje-client/default.nix
+++ b/pkgs/development/python-modules/huisbaasje-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dennisschroer";
     repo = "huisbaasje-client";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "113aymffyz1nki3a43j5cyj87qa0762j38qlz0wd5px7diwjxsfl";
   };
 
diff --git a/pkgs/development/python-modules/humblewx/default.nix b/pkgs/development/python-modules/humblewx/default.nix
index 2a60e7e97212..9f7a96a85892 100644
--- a/pkgs/development/python-modules/humblewx/default.nix
+++ b/pkgs/development/python-modules/humblewx/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thetimelineproj";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210";
   };
 
diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix
index 84ffe3bcc7e3..fb8d27db2383 100644
--- a/pkgs/development/python-modules/hydrawiser/default.nix
+++ b/pkgs/development/python-modules/hydrawiser/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ptcryan";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "161hazlpvd71xcl2ja86560wm5lnrjv210ki3ji37l6c6gwmhjdj";
   };
 
diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix
index 6c0285e8cadd..58f058927ab5 100644
--- a/pkgs/development/python-modules/hyperion-py/default.nix
+++ b/pkgs/development/python-modules/hyperion-py/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dermotduffy";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-arcnpCQsRuiWCrAz/t4TCjTe8DRDtRuzYp8k7nnjGDk=";
   };
 
diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix
index febac35bc4a4..f5ba5ff55db7 100644
--- a/pkgs/development/python-modules/i3ipc/default.nix
+++ b/pkgs/development/python-modules/i3ipc/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "i3ipc-python";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "13bzs9dcv27czpnnbgz7a037lm8h991c8gk0qzzk5mq5yak24715";
   };
   propagatedBuildInputs = [ xlib ];
diff --git a/pkgs/development/python-modules/ibis/default.nix b/pkgs/development/python-modules/ibis/default.nix
index 2300af234784..912b5a24892f 100644
--- a/pkgs/development/python-modules/ibis/default.nix
+++ b/pkgs/development/python-modules/ibis/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dmulholl";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-EPz9zHnxR75WoRaiHKJNiCRWFwU1TBpC4uHz62jUOqM=";
   };
 
diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix
index 1ea2b702001b..6f182ec16da6 100644
--- a/pkgs/development/python-modules/icmplib/default.nix
+++ b/pkgs/development/python-modules/icmplib/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ValentinBELYN";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PnBcGiUvftz/KYg9Qd2GaIcF3OW4lYH301uI5/M5CBI=";
   };
 
diff --git a/pkgs/development/python-modules/image-diff/default.nix b/pkgs/development/python-modules/image-diff/default.nix
index 1b64799cb0af..7e5f4883c049 100644
--- a/pkgs/development/python-modules/image-diff/default.nix
+++ b/pkgs/development/python-modules/image-diff/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "image-diff";
-    rev = version;
+    tag = version;
     hash = "sha256-AQykJNvBgVjmPVTwJOX17eKWelqvZZieq/giid8GYAY=";
   };
 
diff --git a/pkgs/development/python-modules/imaplib2/default.nix b/pkgs/development/python-modules/imaplib2/default.nix
index 5df25d7ca5ee..3ce1cd1f21a3 100644
--- a/pkgs/development/python-modules/imaplib2/default.nix
+++ b/pkgs/development/python-modules/imaplib2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "imaplib2";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "14asi3xnvf4bb394k5j8c3by6svvmrr75pawzy6kaax5jx0h793m";
   };
 
diff --git a/pkgs/development/python-modules/imgdiff/default.nix b/pkgs/development/python-modules/imgdiff/default.nix
index 6a168c965d67..43602996edd8 100644
--- a/pkgs/development/python-modules/imgdiff/default.nix
+++ b/pkgs/development/python-modules/imgdiff/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mgedmin";
     repo = "imgdiff";
-    rev = version;
+    tag = version;
     hash = "sha256-Y5nUnjihRpVVehhP1LUgfuJN5nCxEJu6P1w99Igpxjs=";
   };
 
diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix
index 64e9a3191a67..d27fb1c13dba 100644
--- a/pkgs/development/python-modules/installer/default.nix
+++ b/pkgs/development/python-modules/installer/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A=";
   };
 
diff --git a/pkgs/development/python-modules/interface-meta/default.nix b/pkgs/development/python-modules/interface-meta/default.nix
index 34754618b5a5..f8d8e7c9220d 100644
--- a/pkgs/development/python-modules/interface-meta/default.nix
+++ b/pkgs/development/python-modules/interface-meta/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matthewwardrop";
     repo = "interface_meta";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0rzh11wnab33b11391vc2ynf8ncxn22b12wn46lmgkrc5mqza8hd";
   };
 
diff --git a/pkgs/development/python-modules/into-dbus-python/default.nix b/pkgs/development/python-modules/into-dbus-python/default.nix
index 004138c13bdb..8ca2662ca770 100644
--- a/pkgs/development/python-modules/into-dbus-python/default.nix
+++ b/pkgs/development/python-modules/into-dbus-python/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ld/DyhVaDiWUXgqmvSmEHqFW2dcoRNM0O4X5DXE3UtM=";
   };
 
diff --git a/pkgs/development/python-modules/ionhash/default.nix b/pkgs/development/python-modules/ionhash/default.nix
index 8d99e24101f3..1cc215661df7 100644
--- a/pkgs/development/python-modules/ionhash/default.nix
+++ b/pkgs/development/python-modules/ionhash/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amzn";
     repo = "ion-hash-python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mXOLKXauWwwIA/LnF4qyZsBiF/QM+rF9MmE2ewmozYo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix
index 263870816dab..0a8c567bdeb8 100644
--- a/pkgs/development/python-modules/ipfshttpclient/default.nix
+++ b/pkgs/development/python-modules/ipfshttpclient/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ipfs-shipyard";
     repo = "py-ipfs-http-client";
-    rev = version;
+    tag = version;
     hash = "sha256-OmC67pN2BbuGwM43xNDKlsLhwVeUbpvfOazyIDvoMEA=";
   };
 
diff --git a/pkgs/development/python-modules/ipyniivue/default.nix b/pkgs/development/python-modules/ipyniivue/default.nix
index cdc0a1d2308d..8746cc540f70 100644
--- a/pkgs/development/python-modules/ipyniivue/default.nix
+++ b/pkgs/development/python-modules/ipyniivue/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niivue";
     repo = "ipyniivue";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rgScBBJ0Jqr5REZ+YFJcKwWcV33RzJ/sn6RqTL/limo=";
   };
 
diff --git a/pkgs/development/python-modules/ipyxact/default.nix b/pkgs/development/python-modules/ipyxact/default.nix
index 803ed5378cb4..3fce40e72527 100644
--- a/pkgs/development/python-modules/ipyxact/default.nix
+++ b/pkgs/development/python-modules/ipyxact/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "olofk";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-myD+NnqcxxaSAV7qZa8xqeciaiFqFePqIzd7sb/2GXA=";
   };
 
diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix
index 7fcb1280987f..ca583755b7c0 100644
--- a/pkgs/development/python-modules/ircrobots/default.nix
+++ b/pkgs/development/python-modules/ircrobots/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jesopo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-slz4AH2Mi21N3aV+OrnoXoQsseS7arW2NuUZARQJsf0=";
   };
 
diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix
index 3efe469fe093..3592aad0445e 100644
--- a/pkgs/development/python-modules/ircstates/default.nix
+++ b/pkgs/development/python-modules/ircstates/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jesopo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Mq9aOj6PXzPjaz3ofoPcAbur59oUWffmEg8aHt0v+0Q=";
   };
 
diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix
index 1e2b962d0f6a..974c4d6f1a72 100644
--- a/pkgs/development/python-modules/irctokens/default.nix
+++ b/pkgs/development/python-modules/irctokens/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jesopo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Y9NBqxGUkt48hnXxsmfydHkJmWWb+sRrElV8C7l9bpw=";
   };
 
diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix
index bc4cca3eb2cd..c1cdfd1d00b5 100644
--- a/pkgs/development/python-modules/isal/default.nix
+++ b/pkgs/development/python-modules/isal/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pycompression";
     repo = "python-isal";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gvUVSGarPA4KupQTd61x75CfqNVqZfFC1zq0R21Clf8=";
   };
 
diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix
index 0cf69fbd7660..fe0962bfcf43 100644
--- a/pkgs/development/python-modules/isbnlib/default.nix
+++ b/pkgs/development/python-modules/isbnlib/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xlcnd";
     repo = "isbnlib";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-d6p0wv7kj+NOZJRE2rzQgb7PXv+E3tASIibYCjzCdx8=";
   };
 
diff --git a/pkgs/development/python-modules/isoduration/default.nix b/pkgs/development/python-modules/isoduration/default.nix
index 613f21105d9b..c61b68804e16 100644
--- a/pkgs/development/python-modules/isoduration/default.nix
+++ b/pkgs/development/python-modules/isoduration/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bolsote";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-6LqsH+3V/K0s2YD1gvmelo+cCH+yCAmmyTYGhUegVdk=";
   };
 
diff --git a/pkgs/development/python-modules/item-synchronizer/default.nix b/pkgs/development/python-modules/item-synchronizer/default.nix
index 5e8ecf202995..4cf0ce22c26b 100644
--- a/pkgs/development/python-modules/item-synchronizer/default.nix
+++ b/pkgs/development/python-modules/item-synchronizer/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bergercookie";
     repo = "item_synchronizer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+mviKtCLlJhYV576Q07kcFJvtls5qohKSrqZtBqE/s4=";
   };
 
diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix
index a1e83de89c12..c8b404890a32 100644
--- a/pkgs/development/python-modules/itypes/default.nix
+++ b/pkgs/development/python-modules/itypes/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "tomchristie";
-    rev = version;
+    tag = version;
     sha256 = "1ljhjp9pacbrv2phs58vppz1dlxix01p98kfhyclvbml6dgjcr52";
   };
 
diff --git a/pkgs/development/python-modules/jax-jumpy/default.nix b/pkgs/development/python-modules/jax-jumpy/default.nix
index 1fbda8b2cd3e..42c6f4d97e1a 100644
--- a/pkgs/development/python-modules/jax-jumpy/default.nix
+++ b/pkgs/development/python-modules/jax-jumpy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-tPQ/v2AVnAEC+08BVAvvgJ8Pj89nXZSn2tQ6nxXuSfA=";
   };
 
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 8e31fe41c780..cdfb2b2a75bb 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "davidhalter";
     repo = "jedi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2nDQJS6LIaq91PG3Av85OMFfs1ZwId00K/kvog3PGXE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/jello/default.nix b/pkgs/development/python-modules/jello/default.nix
index bd945515fff8..b0f1ee172a7f 100644
--- a/pkgs/development/python-modules/jello/default.nix
+++ b/pkgs/development/python-modules/jello/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kellyjonbrazil";
     repo = "jello";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EN09Kcnw4HNT2roCoQyZkoHEfkM9qxqtneZPuBg46z4=";
   };
 
diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix
index ca47c0ca312b..4c116f5df6aa 100644
--- a/pkgs/development/python-modules/jellyfish/default.nix
+++ b/pkgs/development/python-modules/jellyfish/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jamesturk";
     repo = "jellyfish";
-    rev = version;
+    tag = version;
     hash = "sha256-xInjoTXYgZuHyvyKm+N4PAwHozE5BOkxoYhRzZnPs3Q=";
   };
 
diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix
index efce378d706b..9f89ef60de0d 100644
--- a/pkgs/development/python-modules/jieba/default.nix
+++ b/pkgs/development/python-modules/jieba/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fxsjy";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk";
   };
 
diff --git a/pkgs/development/python-modules/jproperties/default.nix b/pkgs/development/python-modules/jproperties/default.nix
index 83ba9855a0e2..222795c5ccae 100644
--- a/pkgs/development/python-modules/jproperties/default.nix
+++ b/pkgs/development/python-modules/jproperties/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Tblue";
     repo = "python-jproperties";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-O+ALeGHMNjW1dc9IRyLzO81k8DW2vbGjuZqXxgrhYjo=";
   };
 
diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix
index 951ce91ce43c..8f65574e1be0 100644
--- a/pkgs/development/python-modules/jpylyzer/default.nix
+++ b/pkgs/development/python-modules/jpylyzer/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openpreserve";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-P42qAks8suI/Xknwd8WAkymbGE7RApRa/a11J/V4LA0=";
   };
 
diff --git a/pkgs/development/python-modules/jschon/default.nix b/pkgs/development/python-modules/jschon/default.nix
index a2308db968c4..cd160ef2cee0 100644
--- a/pkgs/development/python-modules/jschon/default.nix
+++ b/pkgs/development/python-modules/jschon/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "marksparkza";
     repo = "jschon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uOvEIEUEILsoLuV5U9AJCQAlT4iHQhsnSt65gfCiW0k=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/json-home-client/default.nix b/pkgs/development/python-modules/json-home-client/default.nix
index fa74eec1676a..798f84cb3779 100644
--- a/pkgs/development/python-modules/json-home-client/default.nix
+++ b/pkgs/development/python-modules/json-home-client/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "plinss";
     repo = "json_home_client";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DhnvvY1nMe1sdRE+OgjBt4TsLmiqnD8If4rl700zW9E=";
   };
 
diff --git a/pkgs/development/python-modules/json2html/default.nix b/pkgs/development/python-modules/json2html/default.nix
index 8a7ef46d7241..3eef3376efef 100644
--- a/pkgs/development/python-modules/json2html/default.nix
+++ b/pkgs/development/python-modules/json2html/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "softvar";
     repo = "json2html";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Y+mwJ0p4Q2TKMU8qQvuvo08RiMdsReO7psgXaiW9ntk=";
   };
 
diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix
index b5f3da6150ff..c237eae59224 100644
--- a/pkgs/development/python-modules/jsonlines/default.nix
+++ b/pkgs/development/python-modules/jsonlines/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wbolster";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-KNEJdAxEgd0NGPnk9J51C3yUN2e6Cvvevth0iKOMlhE=";
   };
 
diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix
index 52224a0b8dcd..8334b5d4ec59 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emlove";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-KOnycsOZFDEVj8CJDwGbdtbOpMPQMVdrXbHG0fzr9PI=";
   };
 
diff --git a/pkgs/development/python-modules/jsonstreams/default.nix b/pkgs/development/python-modules/jsonstreams/default.nix
index 49ffcee24b82..6e90f2c159e0 100644
--- a/pkgs/development/python-modules/jsonstreams/default.nix
+++ b/pkgs/development/python-modules/jsonstreams/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dcbaker";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0qw74wz9ngz9wiv89vmilbifsbvgs457yn1bxnzhrh7g4vs2wcav";
   };
 
diff --git a/pkgs/development/python-modules/jsonxs/default.nix b/pkgs/development/python-modules/jsonxs/default.nix
index cf71095cf765..8ce2511f61e9 100644
--- a/pkgs/development/python-modules/jsonxs/default.nix
+++ b/pkgs/development/python-modules/jsonxs/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "fboender";
     repo = "jsonxs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CmKK+qStb9xjmEACY41tQnffD4cMUUQPb74Cni5FTEk=";
   };
 
diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix
index 2ff93168391a..f64184c981e1 100644
--- a/pkgs/development/python-modules/junitparser/default.nix
+++ b/pkgs/development/python-modules/junitparser/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "weiwei";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-rhDP05GSWT4K6Z2ip8C9+e3WbvBJOwP0vctvANBs7cw=";
   };
 
diff --git a/pkgs/development/python-modules/justbackoff/default.nix b/pkgs/development/python-modules/justbackoff/default.nix
index e8c680a89d37..39576c015eac 100644
--- a/pkgs/development/python-modules/justbackoff/default.nix
+++ b/pkgs/development/python-modules/justbackoff/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexferl";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "097j6jxgl4b3z46x9y9z10643vnr9v831vhagrxzrq6nviil2z6l";
   };
 
diff --git a/pkgs/development/python-modules/jwt/default.nix b/pkgs/development/python-modules/jwt/default.nix
index 2da80c7e183c..050ae0b3e161 100644
--- a/pkgs/development/python-modules/jwt/default.nix
+++ b/pkgs/development/python-modules/jwt/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     inherit version;
     owner = "GehirnInc";
     repo = "python-jwt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N1J8yBVX/O+92cRp+q2gA2cFsd+C7JjUR9jo0VGoINg=";
   };
 
diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix
index c26bbabb60c7..6f30b1f50799 100644
--- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix
+++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "daanzu";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0lilk6yjzcy31avy2z36bl9lr60gzwhmyqwqn8akq11qc3mbffsk";
   };
 
diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
index 00d2e2802f09..f28353881e57 100644
--- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
+++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "daanzu";
     repo = "kaldi-fork-active-grammar";
-    rev = version;
+    tag = version;
     sha256 = "+kT2xJRwDj/ECv/v/J1FpsINWOK8XkP9ZvZ9moFRl70=";
   };
 
diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix
index f0633a06b838..fd126f1aac33 100644
--- a/pkgs/development/python-modules/keepkey/default.nix
+++ b/pkgs/development/python-modules/keepkey/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "keepkey";
     repo = "python-keepkey";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "00hqppdj3s9y25x4ad59y8axq94dd4chhw9zixq32sdrd9v8z55a";
   };
 
diff --git a/pkgs/development/python-modules/keyboard/default.nix b/pkgs/development/python-modules/keyboard/default.nix
index 7620e272ea71..b80367909c06 100644
--- a/pkgs/development/python-modules/keyboard/default.nix
+++ b/pkgs/development/python-modules/keyboard/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "boppreh";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-U4GWhPp28azBE3Jn9xpLxudOKx0PjnYO77EM2HsJ9lM=";
   };
 
diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix
index e9b09ba1e0ec..16e10820df07 100644
--- a/pkgs/development/python-modules/keyutils/default.nix
+++ b/pkgs/development/python-modules/keyutils/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sassoftware";
     repo = "python-keyutils";
-    rev = version;
+    tag = version;
     sha256 = "0pfqfr5xqgsqkxzrmj8xl2glyl4nbq0irs0k6ik7iy3gd3mxf5g1";
   };
 
diff --git a/pkgs/development/python-modules/kfactory/default.nix b/pkgs/development/python-modules/kfactory/default.nix
index 3652d517d048..b543601fc48a 100644
--- a/pkgs/development/python-modules/kfactory/default.nix
+++ b/pkgs/development/python-modules/kfactory/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gdsfactory";
     repo = "kfactory";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VLhAJ5rOBKEO1FDCnlaseA+SmrMSoyS+BaEzjdHm59Y=";
   };
 
diff --git a/pkgs/development/python-modules/kivy-garden/default.nix b/pkgs/development/python-modules/kivy-garden/default.nix
index 34792e64d144..015cd084e49a 100644
--- a/pkgs/development/python-modules/kivy-garden/default.nix
+++ b/pkgs/development/python-modules/kivy-garden/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kivy-garden";
     repo = "garden";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xOMBPFKV7mTa51Q0VKja7b0E509IaWjwlJVlSRVdct8=";
   };
 
diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix
index c120217683c6..7a5f56ba3812 100644
--- a/pkgs/development/python-modules/klaus/default.nix
+++ b/pkgs/development/python-modules/klaus/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jonashaag";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-GflSDhBmMsQ34o3ApraEJ6GmlXXP2kK6WW3lsfr6b7g=";
   };
 
diff --git a/pkgs/development/python-modules/kml2geojson/default.nix b/pkgs/development/python-modules/kml2geojson/default.nix
index 3b392a227aae..e23fd7833638 100644
--- a/pkgs/development/python-modules/kml2geojson/default.nix
+++ b/pkgs/development/python-modules/kml2geojson/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mrcagney";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-iJEcXpvy+Y3MkxAF2Q1Tkcx8GxUVjeVzv6gl134zdiI=";
   };
 
diff --git a/pkgs/development/python-modules/kotsu/default.nix b/pkgs/development/python-modules/kotsu/default.nix
index 9add6e9733a3..6c251d729c08 100644
--- a/pkgs/development/python-modules/kotsu/default.nix
+++ b/pkgs/development/python-modules/kotsu/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "datavaluepeople";
     repo = "kotsu";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-V5OkgiLUTRNbNt6m94+aYUZd9Nw+/60LfhrqqdFhiUw=";
   };
 
diff --git a/pkgs/development/python-modules/krakenex/default.nix b/pkgs/development/python-modules/krakenex/default.nix
index fb756b65ae64..b51c5b5f5e0b 100644
--- a/pkgs/development/python-modules/krakenex/default.nix
+++ b/pkgs/development/python-modules/krakenex/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "veox";
     repo = "python3-krakenex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-htldEds3vf9bjFkJAew0e0fHDLD15OTcVYybSmIp3DI=";
   };
 
diff --git a/pkgs/development/python-modules/laszip/default.nix b/pkgs/development/python-modules/laszip/default.nix
index 461102cc69db..97d43819b903 100644
--- a/pkgs/development/python-modules/laszip/default.nix
+++ b/pkgs/development/python-modules/laszip/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tmontaigu";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-MiPzL9TDCf1xnCv7apwdfcpkFnBRi4PO/atTQxqL8cw=";
   };
 
diff --git a/pkgs/development/python-modules/latex2mathml/default.nix b/pkgs/development/python-modules/latex2mathml/default.nix
index 0cf23f39e3e9..152ec203e71c 100644
--- a/pkgs/development/python-modules/latex2mathml/default.nix
+++ b/pkgs/development/python-modules/latex2mathml/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "roniemartinez";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-DLdSFMsNA0gD6Iw0kn+0IrbvyI0VEGOpz0ZYD48nRkY=";
   };
 
diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix
index 0cbc048ee670..af4536e85233 100644
--- a/pkgs/development/python-modules/ledgerwallet/default.nix
+++ b/pkgs/development/python-modules/ledgerwallet/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LedgerHQ";
     repo = "ledgerctl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PBULYvyO3+YaW+a1/enJtKB/DR4ndL/o/WdpETbWyZ0=";
   };
 
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index cf13ca12e3e2..c40b26513e17 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libArcus";
-    rev = version;
+    tag = version;
     hash = "sha256-X33ptwYj9YkVWqUDPP+Ic+hoIb+rwsLdQXvHLA9z+3w=";
   };
 
diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix
index 65e4c578dff9..a506c0a1cd65 100644
--- a/pkgs/development/python-modules/liblarch/default.nix
+++ b/pkgs/development/python-modules/liblarch/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getting-things-gnome";
     repo = "liblarch";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A2qChe2z6rAhjRVX5VoHQitebf/nMATdVZQgtlquuYg=";
   };
 
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index 265bfeab5443..7c806e0c4175 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "saltstack";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-phECLGDcBfDi/r2y0eGtqgIX/hvirtBqO8UUvEJ66zo=";
   };
 
diff --git a/pkgs/development/python-modules/libpyvivotek/default.nix b/pkgs/development/python-modules/libpyvivotek/default.nix
index 7320880a1539..0b7e980f53b9 100644
--- a/pkgs/development/python-modules/libpyvivotek/default.nix
+++ b/pkgs/development/python-modules/libpyvivotek/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HarlemSquirrel";
     repo = "python-vivotek";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "pNlnGpDjdYE7Lxog8GGZV+UZZmfmt5bwHof5LngPQjg=";
   };
 
diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
index da39e67f5225..ea54a3a2eee7 100644
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libSavitar";
-    rev = version;
+    tag = version;
     hash = "sha256-MAA1WtGED6lvU6N4BE6wwY1aYaFrCq/gkmQFz3VWqNA=";
   };
 
diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix
index b311d6888d6c..fd5c080819cb 100644
--- a/pkgs/development/python-modules/libversion/default.nix
+++ b/pkgs/development/python-modules/libversion/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "repology";
     repo = "py-libversion";
-    rev = version;
+    tag = version;
     hash = "sha256-p0wtSB+QXAERf+57MMb8cqWoy1bG3XaCpR9GPwYYvJM=";
   };
 
diff --git a/pkgs/development/python-modules/lightparam/default.nix b/pkgs/development/python-modules/lightparam/default.nix
index 635827b45669..f0d5b2fdb55e 100644
--- a/pkgs/development/python-modules/lightparam/default.nix
+++ b/pkgs/development/python-modules/lightparam/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "portugueslab";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "13hlkvjcyz2lhvlfqyavja64jccbidshhs39sl4fibrn9iq34s3i";
   };
 
diff --git a/pkgs/development/python-modules/limiter/default.nix b/pkgs/development/python-modules/limiter/default.nix
index 4da1afdb4f88..4c4f54f869c4 100644
--- a/pkgs/development/python-modules/limiter/default.nix
+++ b/pkgs/development/python-modules/limiter/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexdelorenzo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2Et4ozVf9t+tp2XtLbDk/LgLIU+jQAEAlU8hA5lpxdk=";
   };
 
diff --git a/pkgs/development/python-modules/lineedit/default.nix b/pkgs/development/python-modules/lineedit/default.nix
index 51f5e5a83407..89e4154c86b1 100644
--- a/pkgs/development/python-modules/lineedit/default.nix
+++ b/pkgs/development/python-modules/lineedit/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "fq2NpjIQkIq1yzXEUxi6cz80kutVqcH6MqJXHtpTFsk=";
   };
 
diff --git a/pkgs/development/python-modules/litemapy/default.nix b/pkgs/development/python-modules/litemapy/default.nix
index 02e321182f05..62cafa694733 100644
--- a/pkgs/development/python-modules/litemapy/default.nix
+++ b/pkgs/development/python-modules/litemapy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SmylerMC";
     repo = "litemapy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mGRnrFfrg0VD9pXs0WOuiP6QnYyu0Jbv/bqCWtkOie0=";
   };
 
diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix
index df6ab5c4b7b3..9a77cb48d7e3 100644
--- a/pkgs/development/python-modules/lizard/default.nix
+++ b/pkgs/development/python-modules/lizard/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "terryyin";
     repo = "lizard";
-    rev = version;
+    tag = version;
     hash = "sha256-4jq6gXpI1hFtX7ka2c/qQ+S6vZCThKOGhQwJ2FOYItY=";
   };
 
diff --git a/pkgs/development/python-modules/logi-circle/default.nix b/pkgs/development/python-modules/logi-circle/default.nix
index af73f77aadef..5510591ac3ad 100644
--- a/pkgs/development/python-modules/logi-circle/default.nix
+++ b/pkgs/development/python-modules/logi-circle/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "evanjd";
     repo = "python-logi-circle";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Q+uoaimJjn6MiO3jXGYyZ6cS0tqI06Azkq1QbNq2FN8=";
   };
 
diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix
index 19fa5b64b9ed..42b48b1d8f95 100644
--- a/pkgs/development/python-modules/logster/default.nix
+++ b/pkgs/development/python-modules/logster/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "etsy";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "06ac5hydas24h2cn8l5i69v1z0min5hwh6a1lcm1b08xnvpsi85q";
   };
 
diff --git a/pkgs/development/python-modules/lpc-checksum/default.nix b/pkgs/development/python-modules/lpc-checksum/default.nix
index 810878cec585..2ec9840c5352 100644
--- a/pkgs/development/python-modules/lpc-checksum/default.nix
+++ b/pkgs/development/python-modules/lpc-checksum/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "basilfx";
     repo = "lpc_checksum";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-POgV0BdkMLmdjBh/FToPPmJTAxsPASB7ZE32SqGGKHk=";
   };
 
diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix
index 213db1480c14..d24b14072ce3 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/pkgs/development/python-modules/luftdaten/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-luftdaten";
-    rev = version;
+    tag = version;
     hash = "sha256-nOhJKlUJ678DJ/ilyRHaiQ2fGfoCl+x6l9lsczVLAGw=";
   };
 
diff --git a/pkgs/development/python-modules/luhn/default.nix b/pkgs/development/python-modules/luhn/default.nix
index b0407235fe0a..0319c8a09431 100644
--- a/pkgs/development/python-modules/luhn/default.nix
+++ b/pkgs/development/python-modules/luhn/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mmcloughlin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-ZifaCjOVhWdXuzi5n6V+6eVN5vrEHKgUdpSOXoMyR18=";
   };
 
diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix
index fd1f6c474fa0..89b79b61e88c 100644
--- a/pkgs/development/python-modules/luxtronik/default.nix
+++ b/pkgs/development/python-modules/luxtronik/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bouni";
     repo = "python-luxtronik";
-    rev = version;
+    tag = version;
     hash = "sha256-7TuvqOAb/MUumOF6BKTRLOJuvteqZPmFUXXsuwEpmOM=";
   };
 
diff --git a/pkgs/development/python-modules/lzallright/default.nix b/pkgs/development/python-modules/lzallright/default.nix
index bb6138bb7d16..d3d721f84e35 100644
--- a/pkgs/development/python-modules/lzallright/default.nix
+++ b/pkgs/development/python-modules/lzallright/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vlaci";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6Dez14qlZ7cnVQfaiTHGuiTSAHvBoKtolgKF7ne9ASw=";
   };
 
diff --git a/pkgs/development/python-modules/macaddress/default.nix b/pkgs/development/python-modules/macaddress/default.nix
index 137561253049..a6238a0dd478 100644
--- a/pkgs/development/python-modules/macaddress/default.nix
+++ b/pkgs/development/python-modules/macaddress/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mentalisttraceur";
     repo = "python-macaddress";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2eD5Ui8kUduKLJ0mSiwaz7TQSeF1+2ASirp70V/8+EA=";
   };
 
diff --git a/pkgs/development/python-modules/macholib/default.nix b/pkgs/development/python-modules/macholib/default.nix
index 6bf2ec3eeeb7..2e36ef54e41c 100644
--- a/pkgs/development/python-modules/macholib/default.nix
+++ b/pkgs/development/python-modules/macholib/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ronaldoussoren";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bTql10Ceny4fBCxnEWz1m1wi03EWMDW9u99IQiWYbnY=";
   };
 
diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix
index d87d2de44bb5..948794579959 100644
--- a/pkgs/development/python-modules/macropy/default.nix
+++ b/pkgs/development/python-modules/macropy/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lihaoyi";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1bd2fzpa30ddva3f8lw2sbixxf069idwib8srd64s5v46ricm2cf";
   };
 
diff --git a/pkgs/development/python-modules/mando/default.nix b/pkgs/development/python-modules/mando/default.nix
index d6b8055a730c..7198c434f17d 100644
--- a/pkgs/development/python-modules/mando/default.nix
+++ b/pkgs/development/python-modules/mando/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rubik";
     repo = "mando";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FuQZ53ojrQO++0TN0C3hk0LXH+mcfRqtGq8VvfYDufg=";
   };
 
diff --git a/pkgs/development/python-modules/manuf/default.nix b/pkgs/development/python-modules/manuf/default.nix
index 2210f4a40fae..95575e9a884e 100644
--- a/pkgs/development/python-modules/manuf/default.nix
+++ b/pkgs/development/python-modules/manuf/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coolbho3k";
     repo = "manuf";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-3CFs3aqwE8rZPwU1QBqAGxNHT5jg7ymG12yBD56gTNI=";
   };
 
diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix
index 304f143b884b..f53443dca1e8 100644
--- a/pkgs/development/python-modules/matchpy/default.nix
+++ b/pkgs/development/python-modules/matchpy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HPAC";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-n5rXIjqVQZzEbfIZVQiGLh2PR1DHAJ9gumcrbvwnasA=";
   };
 
diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix
index 43b766a5662f..c8c5a20ff03c 100644
--- a/pkgs/development/python-modules/materialx/default.nix
+++ b/pkgs/development/python-modules/materialx/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "MaterialX";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo=";
   };
 
diff --git a/pkgs/development/python-modules/matplotx/default.nix b/pkgs/development/python-modules/matplotx/default.nix
index 17bf869e874a..3fd34261ad25 100644
--- a/pkgs/development/python-modules/matplotx/default.nix
+++ b/pkgs/development/python-modules/matplotx/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = "matplotx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EWEiEY23uFwd/vgWVLCH/buUmgRqz1rqqlJEdXINYMg=";
   };
 
diff --git a/pkgs/development/python-modules/mbddns/default.nix b/pkgs/development/python-modules/mbddns/default.nix
index d738cca95394..7f0595aac503 100644
--- a/pkgs/development/python-modules/mbddns/default.nix
+++ b/pkgs/development/python-modules/mbddns/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thinkl33t";
     repo = "mb-ddns";
-    rev = version;
+    tag = version;
     sha256 = "13xzkprqk1v0zlzx4a0n9zzpnlb1g2h6pc62ms66fj72lsmjynj7";
   };
 
diff --git a/pkgs/development/python-modules/mdurl/default.nix b/pkgs/development/python-modules/mdurl/default.nix
index 6a5e3a7cdc73..ae1bec1d7f68 100644
--- a/pkgs/development/python-modules/mdurl/default.nix
+++ b/pkgs/development/python-modules/mdurl/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-wxV8DKeTwKpFTUBuGTQXaVHc0eW1//Y+2V8Kgs85TDM=";
   };
 
diff --git a/pkgs/development/python-modules/medvol/default.nix b/pkgs/development/python-modules/medvol/default.nix
index 79eec9d2cb64..ed265a0848f7 100644
--- a/pkgs/development/python-modules/medvol/default.nix
+++ b/pkgs/development/python-modules/medvol/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MIC-DKFZ";
     repo = "medvol";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JOw0ODx5yuBY5FyXy9z5C/NE/iok5GwiInalgXW/1J8=";
   };
 
diff --git a/pkgs/development/python-modules/memory-tempfile/default.nix b/pkgs/development/python-modules/memory-tempfile/default.nix
index a50a7c50de60..a105d595a6e7 100644
--- a/pkgs/development/python-modules/memory-tempfile/default.nix
+++ b/pkgs/development/python-modules/memory-tempfile/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mbello";
     repo = "memory-tempfile";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4fz2CLkZdy2e1GwGw/afG54LkUVJ4cza70jcbX3rVlQ=";
   };
 
diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix
index 7fd6e040a2af..d7179b4cd815 100644
--- a/pkgs/development/python-modules/mercantile/default.nix
+++ b/pkgs/development/python-modules/mercantile/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w=";
   };
 
diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix
index ebb396a99089..48de8d7c6b79 100644
--- a/pkgs/development/python-modules/mergedeep/default.nix
+++ b/pkgs/development/python-modules/mergedeep/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "clarketm";
     repo = "mergedeep";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1msvvdzk33sxzgyvs4fs8dlsrsi7fjj038z83s0yw5h8m8d78469";
   };
 
diff --git a/pkgs/development/python-modules/messagebird/default.nix b/pkgs/development/python-modules/messagebird/default.nix
index 302ce5087bc6..8ee32c481c79 100644
--- a/pkgs/development/python-modules/messagebird/default.nix
+++ b/pkgs/development/python-modules/messagebird/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "messagebird";
     repo = "python-rest-api";
-    rev = version;
+    tag = version;
     hash = "sha256-OiLhnmZ725VbyoOHvSf4nKQRA7JsxqcOv0VKBL6rUtU=";
   };
 
diff --git a/pkgs/development/python-modules/meteocalc/default.nix b/pkgs/development/python-modules/meteocalc/default.nix
index 38c39d7d42ca..80c6e2f81be2 100644
--- a/pkgs/development/python-modules/meteocalc/default.nix
+++ b/pkgs/development/python-modules/meteocalc/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "malexer";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-WuIW6hROQkjMfbCLUouECIrp4s6oCd2/N79hsrTbVTk=";
   };
 
diff --git a/pkgs/development/python-modules/methodtools/default.nix b/pkgs/development/python-modules/methodtools/default.nix
index 88898db177ee..b742eb6d7014 100644
--- a/pkgs/development/python-modules/methodtools/default.nix
+++ b/pkgs/development/python-modules/methodtools/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "youknowone";
     repo = "methodtools";
-    rev = version;
+    tag = version;
     hash = "sha256-Y5VdYVSb3A+32waUUoIDDGW+AhRapN71pebTTlJC0es=";
   };
 
diff --git a/pkgs/development/python-modules/microdata/default.nix b/pkgs/development/python-modules/microdata/default.nix
index d53ecea8defc..6c8f1700fa3d 100644
--- a/pkgs/development/python-modules/microdata/default.nix
+++ b/pkgs/development/python-modules/microdata/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "edsu";
     repo = "microdata";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BAygCLBLxZ033ZWRFSR52dSM2nPY8jXplDXQ8WW3KPo=";
   };
 
diff --git a/pkgs/development/python-modules/minexr/default.nix b/pkgs/development/python-modules/minexr/default.nix
index d99149d8b568..d34b3cf973f1 100644
--- a/pkgs/development/python-modules/minexr/default.nix
+++ b/pkgs/development/python-modules/minexr/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cheind";
     repo = "py-minexr";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Om67ttAHxu7C3IwPB+JHYi78E9qBi1E6layMVg4+S3M=";
   };
 
diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix
index 63e8ef0b3778..e96c8e7268dd 100644
--- a/pkgs/development/python-modules/minimock/default.nix
+++ b/pkgs/development/python-modules/minimock/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lowks";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ut3iKc7Sr28uGgWCV3K3CS+gBta2icvbUPMjjo4fflU=";
   };
 
diff --git a/pkgs/development/python-modules/mitmproxy-rs/default.nix b/pkgs/development/python-modules/mitmproxy-rs/default.nix
index e5f9300a38d1..2b8896c8a06c 100644
--- a/pkgs/development/python-modules/mitmproxy-rs/default.nix
+++ b/pkgs/development/python-modules/mitmproxy-rs/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "mitmproxy_rs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vC+Vsv7UWjkO+6lm7gAb91Ig04Y7r9gYQoz6R9xpxsA=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-get-deps/default.nix b/pkgs/development/python-modules/mkdocs-get-deps/default.nix
index 60faf85431f3..379f107a2c2c 100644
--- a/pkgs/development/python-modules/mkdocs-get-deps/default.nix
+++ b/pkgs/development/python-modules/mkdocs-get-deps/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkdocs";
     repo = "get-deps";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DahmSYWYhVch950InYBiCh6qz1pH2Kibf5ixwCNdsTg=";
   };
 
diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix
index 284222299cd3..73a5f5f12519 100644
--- a/pkgs/development/python-modules/mlrose/default.nix
+++ b/pkgs/development/python-modules/mlrose/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gkhayes";
     repo = "mlrose";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1dn43k3rcypj58ymcj849b37w66jz7fphw8842v6mlbij3x0rxfl";
   };
 
diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix
index 4250e048430e..a16aff9aeba2 100644
--- a/pkgs/development/python-modules/mnemonic/default.nix
+++ b/pkgs/development/python-modules/mnemonic/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trezor";
     repo = "python-mnemonic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D1mS/JQhefYmwrShfWR9SdiGsBUM+jmuCkfWix9tDOU=";
   };
 
diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix
index 3cf1095b20ea..2669463ebf1e 100644
--- a/pkgs/development/python-modules/mock-open/default.nix
+++ b/pkgs/development/python-modules/mock-open/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nivbend";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm";
   };
 
diff --git a/pkgs/development/python-modules/mock-services/default.nix b/pkgs/development/python-modules/mock-services/default.nix
index 723ec6f78233..0674206ce6f7 100644
--- a/pkgs/development/python-modules/mock-services/default.nix
+++ b/pkgs/development/python-modules/mock-services/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "peopledoc";
     repo = "mock-services";
-    rev = version;
+    tag = version;
     sha256 = "1rqyyfwngi1xsd9a81irjxacinkj1zf6nqfvfxhi55ky34x5phf9";
   };
 
diff --git a/pkgs/development/python-modules/mockfs/default.nix b/pkgs/development/python-modules/mockfs/default.nix
index 5e6da22c91d4..e9ead7662c88 100644
--- a/pkgs/development/python-modules/mockfs/default.nix
+++ b/pkgs/development/python-modules/mockfs/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mockfs";
     repo = "mockfs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JwSkOI0dz9ZetfE0ZL3CthvcCSXGFYX+yQZy/oC6VBk=";
   };
 
diff --git a/pkgs/development/python-modules/moddb/default.nix b/pkgs/development/python-modules/moddb/default.nix
index 9da9cb837c51..0173841c4362 100644
--- a/pkgs/development/python-modules/moddb/default.nix
+++ b/pkgs/development/python-modules/moddb/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ClementJ18";
     repo = "moddb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2t5QQAmSLOrdNCl0XdsFPdP2UF10/qq69DovqeQ1Vt8=";
   };
 
diff --git a/pkgs/development/python-modules/monero/default.nix b/pkgs/development/python-modules/monero/default.nix
index af2afd3d7502..9268800b3c17 100644
--- a/pkgs/development/python-modules/monero/default.nix
+++ b/pkgs/development/python-modules/monero/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "monero-ecosystem";
     repo = "monero-python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WIF3pFBOLgozYTrQHLzIRgSlT3dTZTe+7sF/dVjVdTo=";
   };
 
diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix
index 487de3c3228c..d6981a14f0e0 100644
--- a/pkgs/development/python-modules/motioneye-client/default.nix
+++ b/pkgs/development/python-modules/motioneye-client/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dermotduffy";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kgFSd5RjO+OtnPeAOimPTDVEfJ47rXh2Ku5xEYStHv8=";
   };
 
diff --git a/pkgs/development/python-modules/mozilla-django-oidc/default.nix b/pkgs/development/python-modules/mozilla-django-oidc/default.nix
index cd44808efc57..bb3e79141336 100644
--- a/pkgs/development/python-modules/mozilla-django-oidc/default.nix
+++ b/pkgs/development/python-modules/mozilla-django-oidc/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "mozilla-django-oidc";
-    rev = version;
+    tag = version;
     hash = "sha256-72F1aLLIId+YClTrpOz3bL8LSq6ZhZjjtv8V/GJGkqs=";
   };
 
diff --git a/pkgs/development/python-modules/mpegdash/default.nix b/pkgs/development/python-modules/mpegdash/default.nix
index 3480c4dcafd8..bc21eb9df839 100644
--- a/pkgs/development/python-modules/mpegdash/default.nix
+++ b/pkgs/development/python-modules/mpegdash/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sangwonl";
     repo = "python-mpegdash";
-    rev = version;
+    tag = version;
     hash = "sha256-eKtJ+QzeoMog5X1r1ix9vrmGTi/9KzdJiu80vrTX14I=";
   };
 
diff --git a/pkgs/development/python-modules/mplcursors/default.nix b/pkgs/development/python-modules/mplcursors/default.nix
index 1a1c2dda4c4a..dc8d2dd101ac 100644
--- a/pkgs/development/python-modules/mplcursors/default.nix
+++ b/pkgs/development/python-modules/mplcursors/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "anntzer";
     repo = "mplcursors";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L5pJqRpgPRQEsRDoP10+Pi8uzH5TQNBuGRx7hIL1x7s=";
   };
 
diff --git a/pkgs/development/python-modules/mpldatacursor/default.nix b/pkgs/development/python-modules/mpldatacursor/default.nix
index 4b33f34b93ed..fd98a968d3e2 100644
--- a/pkgs/development/python-modules/mpldatacursor/default.nix
+++ b/pkgs/development/python-modules/mpldatacursor/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joferkington";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0i1lwl6x6hgjq4xwsc138i4v5895lmnpfqwpzpnj5mlck6fy6rda";
   };
 
diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix
index 716a51f00d86..44c84dd875e0 100644
--- a/pkgs/development/python-modules/mpv/default.nix
+++ b/pkgs/development/python-modules/mpv/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaseg";
     repo = "python-mpv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2sYWTzj7+ozezNX0uFdJW+A0K6bwAmiVvqo/lr9UToA=";
   };
 
diff --git a/pkgs/development/python-modules/ms-cv/default.nix b/pkgs/development/python-modules/ms-cv/default.nix
index d651ce1a3771..f5db26e0c424 100644
--- a/pkgs/development/python-modules/ms-cv/default.nix
+++ b/pkgs/development/python-modules/ms-cv/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OpenXbox";
     repo = "ms_cv";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0pkna0kvmq1cp4rx3dnzxsvvlxxngryp77k42wkyw2phv19a2mjd";
   };
 
diff --git a/pkgs/development/python-modules/mutf8/default.nix b/pkgs/development/python-modules/mutf8/default.nix
index c7d2afdd1308..22b6b5d18b18 100644
--- a/pkgs/development/python-modules/mutf8/default.nix
+++ b/pkgs/development/python-modules/mutf8/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TkTech";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4Ojn3t0EbOVdrYEiY8JegJuvW9sz8jt9tKFwOluiGQo=";
   };
 
diff --git a/pkgs/development/python-modules/mygene/default.nix b/pkgs/development/python-modules/mygene/default.nix
index 42da42425495..bcff032fb29c 100644
--- a/pkgs/development/python-modules/mygene/default.nix
+++ b/pkgs/development/python-modules/mygene/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "biothings";
     repo = "mygene.py";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/KxlzOTbZTN5BA0PrJyivVFh4cLtW90/EFwczda61Tg=";
   };
 
diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix
index badf6d899708..37916c04f6ba 100644
--- a/pkgs/development/python-modules/mygpoclient/default.nix
+++ b/pkgs/development/python-modules/mygpoclient/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gpodder";
     repo = "mygpoclient";
-    rev = version;
+    tag = version;
     hash = "sha256-McHllitWiBiCdNuJlUg6K/vgr2l3ychu+KOx3r/UCv0=";
   };
 
diff --git a/pkgs/development/python-modules/myhome/default.nix b/pkgs/development/python-modules/myhome/default.nix
index ce22d1a25c63..81fa459d95db 100644
--- a/pkgs/development/python-modules/myhome/default.nix
+++ b/pkgs/development/python-modules/myhome/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "speijnik";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DJzwvgvSA9Q0kpueUoQV64pdDDNA7WzGu7r+g5aqutk=";
   };
 
diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix
index 3282a6b6e863..ed792fea5849 100644
--- a/pkgs/development/python-modules/mypy/extensions.nix
+++ b/pkgs/development/python-modules/mypy/extensions.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python";
     repo = "mypy_extensions";
-    rev = version;
+    tag = version;
     hash = "sha256-gOfHC6dUeBE7SsWItpUHHIxW3wzhPM5SuGW1U8P7DD0=";
   };
 
diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix
index be6966cd9a1e..b587dacefb96 100644
--- a/pkgs/development/python-modules/mysql-connector/default.nix
+++ b/pkgs/development/python-modules/mysql-connector/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mysql";
     repo = "mysql-connector-python";
-    rev = version;
+    tag = version;
     hash = "sha256-GtMq7E2qBqFu54hjUotzPyxScTKXNdEQcmgHnS7lBhc=";
   };
 
diff --git a/pkgs/development/python-modules/nad-receiver/default.nix b/pkgs/development/python-modules/nad-receiver/default.nix
index 35b6cacf54f8..8ef8c8aed310 100644
--- a/pkgs/development/python-modules/nad-receiver/default.nix
+++ b/pkgs/development/python-modules/nad-receiver/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joopert";
     repo = "nad_receiver";
-    rev = version;
+    tag = version;
     hash = "sha256-jRMk/yMA48ei+g/33+mMYwfwixaKTMYcU/z/VOoJbvY=";
   };
 
diff --git a/pkgs/development/python-modules/naked/default.nix b/pkgs/development/python-modules/naked/default.nix
index adabd6c6f5aa..44113126507e 100644
--- a/pkgs/development/python-modules/naked/default.nix
+++ b/pkgs/development/python-modules/naked/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrissimpkins";
     repo = "naked";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KhygnURFggvUTR9wwWtORtfQES8ANd5sIaCONvIhfRM=";
   };
 
diff --git a/pkgs/development/python-modules/name-that-hash/default.nix b/pkgs/development/python-modules/name-that-hash/default.nix
index ae094b0a142c..01b4e82ab857 100644
--- a/pkgs/development/python-modules/name-that-hash/default.nix
+++ b/pkgs/development/python-modules/name-that-hash/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HashPals";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-zOb4BS3zG1x8GLXAooqqvMOw0fNbw35JuRWOdGP26/8=";
   };
 
diff --git a/pkgs/development/python-modules/names/default.nix b/pkgs/development/python-modules/names/default.nix
index c4648e171a72..0a13054c9b71 100644
--- a/pkgs/development/python-modules/names/default.nix
+++ b/pkgs/development/python-modules/names/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "treyhunner";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0jfn11bl05k3qkqw0f4vi2i2lhllxdrbb1732qiisdy9fbvv8611";
   };
 
diff --git a/pkgs/development/python-modules/nbtlib/default.nix b/pkgs/development/python-modules/nbtlib/default.nix
index cb4a0ad4f6f3..792e2b41d603 100644
--- a/pkgs/development/python-modules/nbtlib/default.nix
+++ b/pkgs/development/python-modules/nbtlib/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vberlier";
     repo = "nbtlib";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L8eX6/0qiQ4UxbmDicLedzj+oBjYmlK96NpljE/A3eI=";
   };
 
diff --git a/pkgs/development/python-modules/nc-dnsapi/default.nix b/pkgs/development/python-modules/nc-dnsapi/default.nix
index cf6511b1eb97..5b6a9ea291e3 100644
--- a/pkgs/development/python-modules/nc-dnsapi/default.nix
+++ b/pkgs/development/python-modules/nc-dnsapi/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nbuchwitz";
     repo = "nc_dnsapi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OE4+wJbJbUZ+YB5J5OyvytLFCcrnXCeZEqmphHKKprQ=";
   };
 
diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix
index 6773eed000c8..3127b4f08a9c 100644
--- a/pkgs/development/python-modules/ndg-httpsclient/default.nix
+++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cedadev";
     repo = "ndg_httpsclient";
-    rev = version;
+    tag = version;
     sha256 = "0lhsgs4am4xyjssng5p0vkfwqncczj1dpa0vss4lrhzq86mnn5rz";
   };
 
diff --git a/pkgs/development/python-modules/ndms2-client/default.nix b/pkgs/development/python-modules/ndms2-client/default.nix
index 619cbe171cfa..817b5823201f 100644
--- a/pkgs/development/python-modules/ndms2-client/default.nix
+++ b/pkgs/development/python-modules/ndms2-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "foxel";
     repo = "python_ndms2_client";
-    rev = version;
+    tag = version;
     hash = "sha256-A19olC1rTHTy0xyeSP45fqvv9GUynQSrMgXBgW8ySOs=";
   };
 
diff --git a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix
index d3b03558148e..0cd9ea5fa3c2 100644
--- a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix
+++ b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "netbox-napalm-plugin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nog6DymnnD0ABzG21jy00yNWhSTHfd7vJ4vo1DjsfKs=";
   };
 
diff --git a/pkgs/development/python-modules/netdata-pandas/default.nix b/pkgs/development/python-modules/netdata-pandas/default.nix
index ff8bc2c4622e..f16b8e07504c 100644
--- a/pkgs/development/python-modules/netdata-pandas/default.nix
+++ b/pkgs/development/python-modules/netdata-pandas/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "netdata";
     repo = "netdata-pandas";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AXt8BKWyM3glm5hrRryb+vBzs3z2x61HhbR6DDZkh9o=";
   };
 
diff --git a/pkgs/development/python-modules/netmap/default.nix b/pkgs/development/python-modules/netmap/default.nix
index 81d326f50e41..0e4de1f6044d 100644
--- a/pkgs/development/python-modules/netmap/default.nix
+++ b/pkgs/development/python-modules/netmap/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "python-nmap";
-    rev = version;
+    tag = version;
     sha256 = "1a44zz9zsxy48ahlpjjrddpyfi7cnfknicfcp35hi588qm430mag";
   };
 
diff --git a/pkgs/development/python-modules/newick/default.nix b/pkgs/development/python-modules/newick/default.nix
index ccda2606a56f..31618ca09dc5 100644
--- a/pkgs/development/python-modules/newick/default.nix
+++ b/pkgs/development/python-modules/newick/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dlce-eva";
     repo = "python-newick";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TxyR6RYvy2oIcDNZnHrExtPYGspyWOtZqNy488OmWwk=";
   };
 
diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix
index d1437292d7bb..a71c25afb8de 100644
--- a/pkgs/development/python-modules/nh3/default.nix
+++ b/pkgs/development/python-modules/nh3/default.nix
@@ -14,7 +14,7 @@ let
   src = fetchFromGitHub {
     owner = "messense";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-N+xMS1sb3Qq80eNaI5GUACjCHaCba2d8zZeizayy4kY=";
   };
 in
diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix
index b054bc1a21d7..c88e8549f8e4 100644
--- a/pkgs/development/python-modules/nidaqmx/default.nix
+++ b/pkgs/development/python-modules/nidaqmx/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ni";
     repo = "nidaqmx-python";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-rf5cGq3Iv6ucURSUFuFANQzaGeufBZ+adjKlg4B5DRY=";
   };
 
diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix
index de23fe6548bd..0aa0bf0d106e 100644
--- a/pkgs/development/python-modules/nix-prefetch-github/default.nix
+++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "seppeljordan";
     repo = "nix-prefetch-github";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eQd/MNlnuzXzgFzvwUMchvHoIvkIrbpGKV7iknO14Cc=";
   };
 
diff --git a/pkgs/development/python-modules/nmapthon2/default.nix b/pkgs/development/python-modules/nmapthon2/default.nix
index 0a518c29013c..ef7d06299602 100644
--- a/pkgs/development/python-modules/nmapthon2/default.nix
+++ b/pkgs/development/python-modules/nmapthon2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cblopez";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4Na75TdKDywUomJF4tDWUWwCCtcOSxBUMOF7+FDhbpY=";
   };
 
diff --git a/pkgs/development/python-modules/norfair/default.nix b/pkgs/development/python-modules/norfair/default.nix
index 7624e396b9de..d57621c94426 100644
--- a/pkgs/development/python-modules/norfair/default.nix
+++ b/pkgs/development/python-modules/norfair/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tryolabs";
     repo = "norfair";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aKB5TYSLW7FOXIy9u2hK7px6eEmIQdKPrhChKaU1uYs=";
   };
 
diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix
index 3e46d2cdf2bf..c960c9a7cc7a 100644
--- a/pkgs/development/python-modules/normality/default.nix
+++ b/pkgs/development/python-modules/normality/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pudo";
     repo = "normality";
-    rev = version;
+    tag = version;
     hash = "sha256-RsZP/GkEuPKGZK2+/57kvMwm9vk0FTKN2/XtOmfoZxA=";
   };
 
diff --git a/pkgs/development/python-modules/nose2pytest/default.nix b/pkgs/development/python-modules/nose2pytest/default.nix
index 72f554e8a501..62ec8908d328 100644
--- a/pkgs/development/python-modules/nose2pytest/default.nix
+++ b/pkgs/development/python-modules/nose2pytest/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "nose2pytest";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BYyj2ZOZvWBpmzQACpmxAzCdQhlZlDYt+HLMdft+wYY=";
   };
 
diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix
index 76b22857f172..a8b7162db1bf 100644
--- a/pkgs/development/python-modules/nplusone/default.nix
+++ b/pkgs/development/python-modules/nplusone/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jmcarp";
     repo = "nplusone";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0qdwpvvg7dzmksz3vqkvb27n52lq5sa8i06m7idnj5xk2dgjkdxg";
   };
 
diff --git a/pkgs/development/python-modules/nuclear/default.nix b/pkgs/development/python-modules/nuclear/default.nix
index 5daade948aa8..c20fb75c141b 100644
--- a/pkgs/development/python-modules/nuclear/default.nix
+++ b/pkgs/development/python-modules/nuclear/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "igrek51";
     repo = "nuclear";
-    rev = version;
+    tag = version;
     hash = "sha256-UeU803SYMBLSWXjuxtWP2R2dBumRom+qsj2ljTiYFm0=";
   };
 
diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix
index 45e7fa77eb03..f9b2ec8523bc 100644
--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/pkgs/development/python-modules/nuitka/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Nuitka";
     repo = "Nuitka";
-    rev = version;
+    tag = version;
     hash = "sha256-nKdCMgA92v9VsSgfktXDbSh3DyKsGlcTjpn0Y7u4rxU=";
   };
 
diff --git a/pkgs/development/python-modules/numdifftools/default.nix b/pkgs/development/python-modules/numdifftools/default.nix
index 29dee4bbbaa4..eaa9dd890772 100644
--- a/pkgs/development/python-modules/numdifftools/default.nix
+++ b/pkgs/development/python-modules/numdifftools/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pbrod";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HYacLaowSDdrwkxL1h3h+lw/8ahzaecpXEnwrCqMCWk=";
   };
 
diff --git a/pkgs/development/python-modules/oasatelematics/default.nix b/pkgs/development/python-modules/oasatelematics/default.nix
index fca7740dc6de..d951cc45675e 100644
--- a/pkgs/development/python-modules/oasatelematics/default.nix
+++ b/pkgs/development/python-modules/oasatelematics/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "panosmz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3O7XbNVj1S3ZwheklEhm0ivw16Tj7drML/xYC9383Kg=";
   };
 
diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix
index ea504ea4f621..9a1af0ae81b0 100644
--- a/pkgs/development/python-modules/oauthlib/default.nix
+++ b/pkgs/development/python-modules/oauthlib/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oauthlib";
     repo = "oauthlib";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KADS1pEaLYi86LEt2VVuz8FVTBANzxC8EeQLgGMxuBU=";
   };
 
diff --git a/pkgs/development/python-modules/ochre/default.nix b/pkgs/development/python-modules/ochre/default.nix
index 023fb09d1ef4..03e43dbc048e 100644
--- a/pkgs/development/python-modules/ochre/default.nix
+++ b/pkgs/development/python-modules/ochre/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getcuia";
     repo = "ochre";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-U6qycLnldwNze3XMAn6DS3XGX4RaCZgW0pH/y/FEAkk=";
   };
 
diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
index 8ad3f94c534e..dd6b459177ba 100644
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ocrmypdf";
     repo = "OCRmyPDF";
-    rev = "v${version}";
+    tag = "v${version}";
     # The content of .git_archival.txt is substituted upon tarball creation,
     # which creates indeterminism if master no longer points to the tag.
     # See https://github.com/ocrmypdf/OCRmyPDF/issues/841
diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix
index 0110cfdba10d..b2f43540163a 100644
--- a/pkgs/development/python-modules/ofxhome/default.nix
+++ b/pkgs/development/python-modules/ofxhome/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "captin411";
     repo = "ofxhome";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-i16bE9iuafhAKco2jYfg5T5QCWFHdnYVztf1z2XbO9g=";
   };
 
diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix
index cbf5d5e3c0b2..8e85143891e9 100644
--- a/pkgs/development/python-modules/ofxtools/default.nix
+++ b/pkgs/development/python-modules/ofxtools/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "csingley";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-NsImnD+erhpakQnl1neuHfSKiV6ipNBMPGKMDM0gwWc=";
   };
 
diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix
index 0858e4bc7b90..391603e3783a 100644
--- a/pkgs/development/python-modules/oletools/default.nix
+++ b/pkgs/development/python-modules/oletools/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "decalage2";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ons1VeWStxUZw2CPpnX9p5I3Q7cMhi34JU8TeuUDt+Y=";
   };
 
diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix
index a36c97dd2cda..0a2f96ff0bbb 100644
--- a/pkgs/development/python-modules/opcua-widgets/default.nix
+++ b/pkgs/development/python-modules/opcua-widgets/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "FreeOpcUa";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-ABJlKYN5H/1k8ynvSTSoJBX12vTTyavuNUAmTJ84mn0=";
   };
 
diff --git a/pkgs/development/python-modules/open-garage/default.nix b/pkgs/development/python-modules/open-garage/default.nix
index ff50be9476e4..b95a51718e73 100644
--- a/pkgs/development/python-modules/open-garage/default.nix
+++ b/pkgs/development/python-modules/open-garage/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pyOpenGarage";
-    rev = version;
+    tag = version;
     hash = "sha256-iJ7HcJhpTceFpHTUdNZOYDuxUWZGWPmZ9lxD3CyGvk8=";
   };
 
diff --git a/pkgs/development/python-modules/open-interpreter/default.nix b/pkgs/development/python-modules/open-interpreter/default.nix
index dcd9ec37333c..a89fe1239c17 100644
--- a/pkgs/development/python-modules/open-interpreter/default.nix
+++ b/pkgs/development/python-modules/open-interpreter/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KillianLucas";
     repo = "open-interpreter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TeBiRylrq5CrAG9XS47Z9GlruAv7V7Nsl4QbSV55isM=";
   };
 
diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix
index cab5d956effd..e210469ef716 100644
--- a/pkgs/development/python-modules/open-meteo/default.nix
+++ b/pkgs/development/python-modules/open-meteo/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-open-meteo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PddQyCCYbI9DjTvlJ4F3IQB6VichwcNhC04DJMULYZM=";
   };
 
diff --git a/pkgs/development/python-modules/openapi-pydantic/default.nix b/pkgs/development/python-modules/openapi-pydantic/default.nix
index da4053638982..e68c9b0dceb5 100644
--- a/pkgs/development/python-modules/openapi-pydantic/default.nix
+++ b/pkgs/development/python-modules/openapi-pydantic/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mike-oakley";
     repo = "openapi-pydantic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SMAjzHGuu+QVWe/y8jQ4UWJI9f+pLR2BxgjvE6vOT0Q=";
   };
 
diff --git a/pkgs/development/python-modules/openapi3/default.nix b/pkgs/development/python-modules/openapi3/default.nix
index 1ddd3a9bbfb6..4591bcdf0826 100644
--- a/pkgs/development/python-modules/openapi3/default.nix
+++ b/pkgs/development/python-modules/openapi3/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Dorthu";
     repo = "openapi3";
-    rev = version;
+    tag = version;
     hash = "sha256-Crn+nRbptRycnWJzH8Tm/BBLcBSRCcNtLX8NoKnSDdA=";
   };
 
diff --git a/pkgs/development/python-modules/openevsewifi/default.nix b/pkgs/development/python-modules/openevsewifi/default.nix
index 8a65b3e56f34..7b1449ef6ab0 100644
--- a/pkgs/development/python-modules/openevsewifi/default.nix
+++ b/pkgs/development/python-modules/openevsewifi/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miniconfig";
     repo = "python-openevse-wifi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7+BC5WG0JoyHNjgsoJBQRVDpmdXMJCV4bMf6pIaS5qo=";
   };
 
diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
index a54f14c99602..39a494ac9983 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -6,7 +6,7 @@ rec {
   src = fetchFromGitHub {
     owner = "openrazer";
     repo = "openrazer";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MLwhqLPWdjg1ZUZP5Sig37RgZEeHlU+DyELpyMif6iY=";
   };
 
diff --git a/pkgs/development/python-modules/openrouteservice/default.nix b/pkgs/development/python-modules/openrouteservice/default.nix
index eae98abfeeb9..63c842858f51 100644
--- a/pkgs/development/python-modules/openrouteservice/default.nix
+++ b/pkgs/development/python-modules/openrouteservice/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GIScience";
     repo = "${pname}-py";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1d5qbygb81fhpwfdm1a118r3xv45xz9n9avfkgxkvw1n8y6ywz2q";
   };
 
diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix
index 634efaf196b2..6175a934da43 100644
--- a/pkgs/development/python-modules/opensimplex/default.nix
+++ b/pkgs/development/python-modules/opensimplex/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lmas";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "C/MTKTHjxMsOgzuXvokw039Kv6N/PgBoOqKleWPLpw0=";
   };
 
diff --git a/pkgs/development/python-modules/opytimark/default.nix b/pkgs/development/python-modules/opytimark/default.nix
index 29b5fcee2c51..4f238a8d758d 100644
--- a/pkgs/development/python-modules/opytimark/default.nix
+++ b/pkgs/development/python-modules/opytimark/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gugarosa";
     repo = "opytimark";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T3OFm10gvGrUXAAHOnO0Zv1nWrXPBXSmEWnbJxrWYU0=";
   };
 
diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix
index 20825a18b550..b76f492562ae 100644
--- a/pkgs/development/python-modules/orm/default.nix
+++ b/pkgs/development/python-modules/orm/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = "orm";
-    rev = version;
+    tag = version;
     hash = "sha256-nlKEWdqttFnjBnXutlxTy9oILqFzKHKKPJpTtCUbJ5k=";
   };
 
diff --git a/pkgs/development/python-modules/orvibo/default.nix b/pkgs/development/python-modules/orvibo/default.nix
index 15ff4dcee51b..b6c7f5709dc4 100644
--- a/pkgs/development/python-modules/orvibo/default.nix
+++ b/pkgs/development/python-modules/orvibo/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "happyleavesaoc";
     repo = "python-orvibo";
-    rev = version;
+    tag = version;
     sha256 = "sha256-Azmho47CEbRo18emmLKhYa/sViQX0oxUTUk4zdrpOaE=";
   };
 
diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix
index db1ecc6d51d2..4d8eba71266f 100644
--- a/pkgs/development/python-modules/osc-lib/default.nix
+++ b/pkgs/development/python-modules/osc-lib/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "osc-lib";
-    rev = version;
+    tag = version;
     hash = "sha256-DDjWM4hjHPXYDeAJ6FDZZPzi65DG1rJ3efs8MouX1WY=";
   };
 
diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix
index bb16aa7d40e0..318e3045f51a 100644
--- a/pkgs/development/python-modules/osc/default.nix
+++ b/pkgs/development/python-modules/osc/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "osc";
-    rev = version;
+    tag = version;
     hash = "sha256-03EDarU7rmsiE96IYHXFuPtD8nWur0qwj8NDzSj8OX0=";
   };
 
diff --git a/pkgs/development/python-modules/oscpy/default.nix b/pkgs/development/python-modules/oscpy/default.nix
index 9889b746405a..8518adff4188 100644
--- a/pkgs/development/python-modules/oscpy/default.nix
+++ b/pkgs/development/python-modules/oscpy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kivy";
     repo = "oscpy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Luj36JLgU9xbBMydeobyf98U5zs5VwWQOPGV7TPXQwA=";
   };
 
diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix
index ef90df289af6..32565af05996 100644
--- a/pkgs/development/python-modules/oscrypto/default.nix
+++ b/pkgs/development/python-modules/oscrypto/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wbond";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw=";
   };
 
diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix
index b64ea716e553..c2478ff718df 100644
--- a/pkgs/development/python-modules/osmpythontools/default.nix
+++ b/pkgs/development/python-modules/osmpythontools/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mocnik-science";
     repo = "osm-python-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lTDA1Rad9aYI/ymU/0xzdJHmebUGcpVJ0GW7D0Ujdko=";
   };
 
diff --git a/pkgs/development/python-modules/pa-ringbuffer/default.nix b/pkgs/development/python-modules/pa-ringbuffer/default.nix
index 4ddd9af2b063..d10174961e81 100644
--- a/pkgs/development/python-modules/pa-ringbuffer/default.nix
+++ b/pkgs/development/python-modules/pa-ringbuffer/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spatialaudio";
     repo = "python-pa-ringbuffer";
-    rev = version;
+    tag = version;
     sha256 = "1d4k6z13mc1f88m6wbhfx8hillb7q78n33ws5bmyblsdkv1gx607";
   };
 
diff --git a/pkgs/development/python-modules/paginate/default.nix b/pkgs/development/python-modules/paginate/default.nix
index 096fdb92719f..25feed2dce23 100644
--- a/pkgs/development/python-modules/paginate/default.nix
+++ b/pkgs/development/python-modules/paginate/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Pylons";
     repo = "paginate";
-    rev = version;
+    tag = version;
     hash = "sha256-+zX9uGNWcV4BWbD2lcd1u9zZ4m7CnbsYZnc99HNaF8I=";
   };
 
diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix
index 10afacd1c197..dc240cff546f 100644
--- a/pkgs/development/python-modules/paho-mqtt/default.nix
+++ b/pkgs/development/python-modules/paho-mqtt/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "paho.mqtt.python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VMq+WTW+njK34QUUTE6fR2j2OmHxVzR0wrC92zYb1rY=";
   };
 
diff --git a/pkgs/development/python-modules/paintcompiler/default.nix b/pkgs/development/python-modules/paintcompiler/default.nix
index c2e6009fa4f7..f2f90281c7aa 100644
--- a/pkgs/development/python-modules/paintcompiler/default.nix
+++ b/pkgs/development/python-modules/paintcompiler/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simoncozens";
     repo = "paintcompiler";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dmVBQUUyFc71zq8fXBQ4ii/llrGdtUCOponCzSeut6g=";
   };
 
diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix
index 184df403f5e7..4c6cc0ec01d3 100644
--- a/pkgs/development/python-modules/pamqp/default.nix
+++ b/pkgs/development/python-modules/pamqp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gmr";
     repo = "pamqp";
-    rev = version;
+    tag = version;
     hash = "sha256-0vjiPBLd8afnATjmV2sINsBd4j7L544u5DA3jLiLSsY=";
   };
 
diff --git a/pkgs/development/python-modules/pasimple/default.nix b/pkgs/development/python-modules/pasimple/default.nix
index 515fb636ae31..1f719aad9c71 100644
--- a/pkgs/development/python-modules/pasimple/default.nix
+++ b/pkgs/development/python-modules/pasimple/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "henrikschnor";
     repo = "pasimple";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Z271FdBCqPFcQzVqGidL74nO85rO9clNvP4czAHmdEw=";
   };
 
diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/pkgs/development/python-modules/path-and-address/default.nix
index 09918dec9309..21d6a60313c8 100644
--- a/pkgs/development/python-modules/path-and-address/default.nix
+++ b/pkgs/development/python-modules/path-and-address/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joeyespo";
     repo = "path-and-address";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0b0afpsaim06mv3lhbpm8fmawcraggc11jhzr6h72kdj1cqjk5h6";
   };
 
diff --git a/pkgs/development/python-modules/patrowl4py/default.nix b/pkgs/development/python-modules/patrowl4py/default.nix
index ada7a272918f..73b1f0d6361f 100644
--- a/pkgs/development/python-modules/patrowl4py/default.nix
+++ b/pkgs/development/python-modules/patrowl4py/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Patrowl";
     repo = "Patrowl4py";
-    rev = version;
+    tag = version;
     hash = "sha256-ZGvntLbXIWmL0WoT+kQoNT6gDPgsSKwHQQjYlarvnKo=";
   };
 
diff --git a/pkgs/development/python-modules/pcapy-ng/default.nix b/pkgs/development/python-modules/pcapy-ng/default.nix
index 97313c157072..0e31ab4b325b 100644
--- a/pkgs/development/python-modules/pcapy-ng/default.nix
+++ b/pkgs/development/python-modules/pcapy-ng/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stamparm";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-6LA2n7Kv0MiZcqUJpi0lDN4Q+GcOttYw7hJwVqK/DU0=";
   };
 
diff --git a/pkgs/development/python-modules/pcodedmp/default.nix b/pkgs/development/python-modules/pcodedmp/default.nix
index eef04412632a..323185b38c00 100644
--- a/pkgs/development/python-modules/pcodedmp/default.nix
+++ b/pkgs/development/python-modules/pcodedmp/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bontchev";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-SYOFGMvrzxDPMACaCvqwU28Mh9LEuvFBGvAph4X+geo=";
   };
 
diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix
index 986965a927d8..7d0789a15c00 100644
--- a/pkgs/development/python-modules/pdoc/default.nix
+++ b/pkgs/development/python-modules/pdoc/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "pdoc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HDrDGnK557EWbBQtsvDzTst3oV0NjLRm4ilXaxd6/j8=";
   };
 
diff --git a/pkgs/development/python-modules/pepit/default.nix b/pkgs/development/python-modules/pepit/default.nix
index 37017f445e9e..6a53c12fb7fc 100644
--- a/pkgs/development/python-modules/pepit/default.nix
+++ b/pkgs/development/python-modules/pepit/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PerformanceEstimation";
     repo = "PEPit";
-    rev = version;
+    tag = version;
     hash = "sha256-Gdymdfi0Iv9KXBNSbAEWGYIQ4k5EONnbyWs+99L5D/A=";
   };
 
diff --git a/pkgs/development/python-modules/permissionedforms/default.nix b/pkgs/development/python-modules/permissionedforms/default.nix
index 053786250673..997481c6cd69 100644
--- a/pkgs/development/python-modules/permissionedforms/default.nix
+++ b/pkgs/development/python-modules/permissionedforms/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "django-permissionedforms";
     owner = "wagtail";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DQzPGmh5UEVpGWnW3IrEVPkZZ8mdiW9J851Ej4agTDc=";
   };
 
diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix
index 585c9ed93419..ee5f30cdd47e 100644
--- a/pkgs/development/python-modules/pgpy/default.nix
+++ b/pkgs/development/python-modules/pgpy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SecurityInnovation";
     repo = "PGPy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-47YiHNxmjyCOYHHUV3Zyhs3Att9HZtCXYfbN34ooTxU=";
   };
 
diff --git a/pkgs/development/python-modules/pickpack/default.nix b/pkgs/development/python-modules/pickpack/default.nix
index 98a96749f592..b6cdfdeb5b75 100644
--- a/pkgs/development/python-modules/pickpack/default.nix
+++ b/pkgs/development/python-modules/pickpack/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "anafvana";
     repo = "pickpack";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IUIs+Cgl2fvjSougyVSzhmY2SeEYL2T2ODrBWBg3zZM=";
   };
 
diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix
index 9abd4d5cdc10..14ecfb56c1b1 100644
--- a/pkgs/development/python-modules/piexif/default.nix
+++ b/pkgs/development/python-modules/piexif/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hMatoba";
     repo = "Piexif";
-    rev = version;
+    tag = version;
     sha256 = "1akmaxq1cjr8wghwaaql1bd3sajl8psshl58lprgfsigrvnklp8b";
   };
 
diff --git a/pkgs/development/python-modules/pinboard/default.nix b/pkgs/development/python-modules/pinboard/default.nix
index dd4e489defd6..29af195bca79 100644
--- a/pkgs/development/python-modules/pinboard/default.nix
+++ b/pkgs/development/python-modules/pinboard/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lionheart";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0ppc3vwv48ahqx6n5c7d7066zhi31cjdik0ma9chq6fscq2idgdf";
   };
 
diff --git a/pkgs/development/python-modules/pixel-ring/default.nix b/pkgs/development/python-modules/pixel-ring/default.nix
index 1628276f5b19..b43bcaf0f8ab 100644
--- a/pkgs/development/python-modules/pixel-ring/default.nix
+++ b/pkgs/development/python-modules/pixel-ring/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "respeaker";
     repo = "pixel_ring";
-    rev = version;
+    tag = version;
     hash = "sha256-J9kScjD6Xon0YWGxFU881bIbjmDpY7cnWzJ8G0SOKaw=";
   };
 
diff --git a/pkgs/development/python-modules/pkce/default.nix b/pkgs/development/python-modules/pkce/default.nix
index 08539054316a..3ee712238881 100644
--- a/pkgs/development/python-modules/pkce/default.nix
+++ b/pkgs/development/python-modules/pkce/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RomeoDespres";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME=";
   };
 
diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix
index aa69c7f286ca..271ce9cd1f0b 100644
--- a/pkgs/development/python-modules/pkgconfig/default.nix
+++ b/pkgs/development/python-modules/pkgconfig/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matze";
     repo = "pkgconfig";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uuLUGRNLCR3NS9g6OPCI+qG7tPWsLhI3OE5WmSI3vm8=";
   };
 
diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix
index c46bf6f66ea6..fc5b8712d07d 100644
--- a/pkgs/development/python-modules/pkginfo2/default.nix
+++ b/pkgs/development/python-modules/pkginfo2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nexB";
     repo = "pkginfo2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-E9EyaN3ncf/34vvvhRe0rwV28VrjqJo79YFgXq2lKWU=";
   };
 
diff --git a/pkgs/development/python-modules/playsound/default.nix b/pkgs/development/python-modules/playsound/default.nix
index 54537341ba38..abeb3b27797a 100644
--- a/pkgs/development/python-modules/playsound/default.nix
+++ b/pkgs/development/python-modules/playsound/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TaylorSMarks";
     repo = "playsound";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0jbq641lmb0apq4fy6r2zyag8rdqgrz8c4wvydzrzmxrp6yx6wyd";
   };
 
diff --git a/pkgs/development/python-modules/pleroma-bot/default.nix b/pkgs/development/python-modules/pleroma-bot/default.nix
index 9678a3449f82..1a61b6d8abf6 100644
--- a/pkgs/development/python-modules/pleroma-bot/default.nix
+++ b/pkgs/development/python-modules/pleroma-bot/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robertoszek";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-vJxblpf3NMSyYMHeWG7vHP5AeluTtMtVxOsHgvGDHeA=";
   };
 
diff --git a/pkgs/development/python-modules/plexauth/default.nix b/pkgs/development/python-modules/plexauth/default.nix
index 7e4767c76c60..91e7d06ba8b4 100644
--- a/pkgs/development/python-modules/plexauth/default.nix
+++ b/pkgs/development/python-modules/plexauth/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jjlawren";
     repo = "python-plexauth";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1wy6syz3cgfw28zvigh2br4jabg8rzpi5l0bhfb6vjjc7aam13ag";
   };
 
diff --git a/pkgs/development/python-modules/plugp100/default.nix b/pkgs/development/python-modules/plugp100/default.nix
index 0cc356e3d15b..138f9c96ba5a 100644
--- a/pkgs/development/python-modules/plugp100/default.nix
+++ b/pkgs/development/python-modules/plugp100/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "petretiandrea";
     repo = "plugp100";
-    rev = version;
+    tag = version;
     sha256 = "sha256-V+9cVBMN8H4oFU51T9BDrLF46xgQHqIsMj8nuPedUGA=";
   };
 
diff --git a/pkgs/development/python-modules/pluthon/default.nix b/pkgs/development/python-modules/pluthon/default.nix
index 21994bd0817e..7904c43bb3a1 100644
--- a/pkgs/development/python-modules/pluthon/default.nix
+++ b/pkgs/development/python-modules/pluthon/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OpShin";
     repo = "pluthon";
-    rev = version;
+    tag = version;
     hash = "sha256-IYpkb/RXRu53HoeVKik7Jog5FyXwrWItrxSla9dN0s4=";
   };
 
diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix
index 3e4eb695bde8..4f59d082fbdc 100644
--- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix
+++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-uhLmEViiJ5+2Aw9MJP8GL7nhk8lMPcRZRB8WTDFXe+s=";
   };
 
diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix
index f95fb719212f..1b19101aea31 100644
--- a/pkgs/development/python-modules/podcats/default.nix
+++ b/pkgs/development/python-modules/podcats/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jakubroztocil";
     repo = "podcats";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0zjdgry5n209rv19kj9yaxy7c7zq5gxr488izrgs4sc75vdzz8xc";
   };
 
diff --git a/pkgs/development/python-modules/polling/default.nix b/pkgs/development/python-modules/polling/default.nix
index bbf858356234..baf83b6810be 100644
--- a/pkgs/development/python-modules/polling/default.nix
+++ b/pkgs/development/python-modules/polling/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "justiniso";
     repo = "polling";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Qy2QxCWzAjZMJ6yxZiDT/80I2+rLimoG8/SYxq960Tk=";
   };
 
diff --git a/pkgs/development/python-modules/pre-commit-po-hooks/default.nix b/pkgs/development/python-modules/pre-commit-po-hooks/default.nix
index 1b682ad2c0a6..126aa7253692 100644
--- a/pkgs/development/python-modules/pre-commit-po-hooks/default.nix
+++ b/pkgs/development/python-modules/pre-commit-po-hooks/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mondeja";
     repo = "pre-commit-po-hooks";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wTmcV8KkoQLuK4EWDt0pbp+EQJRatxnQYeBfikK+vlA=";
   };
 
diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix
index f35fcb5e9c87..5ea281c1bacb 100644
--- a/pkgs/development/python-modules/pretend/default.nix
+++ b/pkgs/development/python-modules/pretend/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alex";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OqMfeIMFNBBLq6ejR3uOCIHZ9aA4zew7iefVlAsy1JQ=";
   };
 
diff --git a/pkgs/development/python-modules/prison/default.nix b/pkgs/development/python-modules/prison/default.nix
index 5abb41f26910..1ae94c9afb00 100644
--- a/pkgs/development/python-modules/prison/default.nix
+++ b/pkgs/development/python-modules/prison/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "betodealmeida";
     repo = "python-rison";
-    rev = version;
+    tag = version;
     hash = "sha256-qor40vUQeTdlO3vwug3GGNX5vkNaF0H7EWlRdsY4bvc=";
   };
 
diff --git a/pkgs/development/python-modules/prodict/default.nix b/pkgs/development/python-modules/prodict/default.nix
index fdee36a3c615..08c844d069d3 100644
--- a/pkgs/development/python-modules/prodict/default.nix
+++ b/pkgs/development/python-modules/prodict/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ramazanpolat";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-c46JEQFg4KRwerqpMSgh6+tYRpKTOX02Lzsq4/meS3o=";
   };
 
diff --git a/pkgs/development/python-modules/prometheus-async/default.nix b/pkgs/development/python-modules/prometheus-async/default.nix
index a8c89b503d61..95208ea0874c 100644
--- a/pkgs/development/python-modules/prometheus-async/default.nix
+++ b/pkgs/development/python-modules/prometheus-async/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hynek";
     repo = "prometheus-async";
-    rev = version;
+    tag = version;
     hash = "sha256-e/BVxATpafxddq26Rt7XTiK4ajY+saUApXbmTG0/I6I=";
   };
 
diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix
index 2aa6ce30ebe4..9da8e0d839f4 100644
--- a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix
+++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rycus86";
     repo = "prometheus_flask_exporter";
-    rev = version;
+    tag = version;
     hash = "sha256-GAQ80J7at8Apqu+DUMN3+rLi/lrNv5Y7w/DKpUN2iu8=";
   };
 
diff --git a/pkgs/development/python-modules/prompthub-py/default.nix b/pkgs/development/python-modules/prompthub-py/default.nix
index 8becc3b2ac30..33e707919a52 100644
--- a/pkgs/development/python-modules/prompthub-py/default.nix
+++ b/pkgs/development/python-modules/prompthub-py/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "deepset-ai";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FA4IfhHViSL1u4pgd7jh40rEcS0BldSFDwCPG5irk1g=";
   };
 
diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix
index 71fa0e1aeddb..33a4267045ac 100644
--- a/pkgs/development/python-modules/property-manager/default.nix
+++ b/pkgs/development/python-modules/property-manager/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-property-manager";
-    rev = version;
+    tag = version;
     sha256 = "1v7hjm7qxpgk92i477fjhpcnjgp072xgr8jrgmbrxfbsv4cvl486";
   };
 
diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix
index 710b3e893d72..4fb072671ee9 100644
--- a/pkgs/development/python-modules/prophet/default.nix
+++ b/pkgs/development/python-modules/prophet/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "prophet";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vvSn2sVs6KZsTAKPuq9irlHgM1BmpkG8LJbvcu8ohd0=";
   };
 
diff --git a/pkgs/development/python-modules/proton-client/default.nix b/pkgs/development/python-modules/proton-client/default.nix
index b7a4db2ae9b0..98074429932a 100644
--- a/pkgs/development/python-modules/proton-client/default.nix
+++ b/pkgs/development/python-modules/proton-client/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ProtonMail";
     repo = "proton-python-client";
-    rev = version;
+    tag = version;
     hash = "sha256-mhPq9O/LCu3+E1jKlaJmrI8dxbA9BIwlc34qGwoxi5g=";
   };
 
diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
index 0361703a9df8..2232f5bf4c02 100644
--- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-vpn-api-core";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/GV5DFWc6RBWP723APNxn9FTxdePumYOtdwDQEg4ccA=";
   };
 
diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix
index 605936dd8637..c8a67f98d026 100644
--- a/pkgs/development/python-modules/psautohint/default.nix
+++ b/pkgs/development/python-modules/psautohint/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adobe-type-tools";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "125nx7accvbk626qlfar90va1995kp9qfrz6a978q4kv2kk37xai";
     fetchSubmodules = true; # data dir for tests
   };
diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix
index 926cb058cec8..271027af21f7 100644
--- a/pkgs/development/python-modules/pure-eval/default.nix
+++ b/pkgs/development/python-modules/pure-eval/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexmojaki";
     repo = "pure_eval";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gdP8/MkzTyjkZaWUG5PoaOtBqzbCXYNYBX2XBLWLh18=";
   };
 
diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix
index 493ac2fd2960..d125b8dc7ff2 100644
--- a/pkgs/development/python-modules/purl/default.nix
+++ b/pkgs/development/python-modules/purl/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "codeinthehole";
     repo = "purl";
-    rev = version;
+    tag = version;
     hash = "sha256-Jb3JRW/PtQ7NlO4eQ9DmTPu/sjvFTg2mztphoIF79gc=";
   };
 
diff --git a/pkgs/development/python-modules/py-air-control/default.nix b/pkgs/development/python-modules/py-air-control/default.nix
index 73cac52da828..65a7d4770e9c 100644
--- a/pkgs/development/python-modules/py-air-control/default.nix
+++ b/pkgs/development/python-modules/py-air-control/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rgerganov";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0mkggl5hwmj90djxbbz4svim6iv7xl8k324cb4rlc75p5rgcdwmh";
   };
 
diff --git a/pkgs/development/python-modules/py-cid/default.nix b/pkgs/development/python-modules/py-cid/default.nix
index 7b986be7dc42..8128d254d0da 100644
--- a/pkgs/development/python-modules/py-cid/default.nix
+++ b/pkgs/development/python-modules/py-cid/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ipld";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aN7ee25ghKKa90+FoMDCdGauToePc5AzDLV3tONvh4U=";
   };
 
diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix
index 8485fe8c2837..d4254a6b6068 100644
--- a/pkgs/development/python-modules/py-cpuinfo/default.nix
+++ b/pkgs/development/python-modules/py-cpuinfo/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "workhorsy";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Q5u0guAqDVhf6bvJTzNvCpWbIzjxxAjE7s0OuXj9T4Q=";
   };
 
diff --git a/pkgs/development/python-modules/py-deprecate/default.nix b/pkgs/development/python-modules/py-deprecate/default.nix
index c6c2c62ee041..cb624963b0c5 100644
--- a/pkgs/development/python-modules/py-deprecate/default.nix
+++ b/pkgs/development/python-modules/py-deprecate/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "Borda";
     repo = "pyDeprecate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-84RmQvLxwtLPQk3hX7Q6eeJeejhrO3t+mc95W1E85Fg=";
   };
 
diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix
index 6ee5b0534673..60e9039729e1 100644
--- a/pkgs/development/python-modules/py-ecc/default.nix
+++ b/pkgs/development/python-modules/py-ecc/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "py_ecc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DKe+bI1GEzXg4Y4n5OA1/hWYz9L3X1AvaOFPEnCaAfs=";
   };
 
diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix
index bf95fb2da73f..a66b7e7ef9b3 100644
--- a/pkgs/development/python-modules/py-eth-sig-utils/default.nix
+++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rmeissner";
     repo = "py-eth-sig-utils";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PNvEHH5w2ptntRGzqWrqlbIzJJsT60OXg/Dh5f6Wq9k=";
   };
 
diff --git a/pkgs/development/python-modules/py-expression-eval/default.nix b/pkgs/development/python-modules/py-expression-eval/default.nix
index f184c025e218..704e84ddeb63 100644
--- a/pkgs/development/python-modules/py-expression-eval/default.nix
+++ b/pkgs/development/python-modules/py-expression-eval/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "axiacore";
     repo = "py-expression-eval";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "YxhZd8V6ofphcNdcbBbrT5mc37O9c6W1mfhsvFVC+KM=";
   };
 
diff --git a/pkgs/development/python-modules/py-multiaddr/default.nix b/pkgs/development/python-modules/py-multiaddr/default.nix
index 95016f826c62..1a0ba4dd93da 100644
--- a/pkgs/development/python-modules/py-multiaddr/default.nix
+++ b/pkgs/development/python-modules/py-multiaddr/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "multiformats";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cGM7iYQPP+UOkbTxRhzuED0pkcydFCO8vpx9wTc0/HI=";
   };
 
diff --git a/pkgs/development/python-modules/py-nightscout/default.nix b/pkgs/development/python-modules/py-nightscout/default.nix
index e690f1b1caca..17f7843e1d60 100644
--- a/pkgs/development/python-modules/py-nightscout/default.nix
+++ b/pkgs/development/python-modules/py-nightscout/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "marciogranzotto";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0kslmm3wrxhm307nqmjmq8i8vy1x6mjaqlgba0hgvisj6b4hx65k";
   };
 
diff --git a/pkgs/development/python-modules/py-ubjson/default.nix b/pkgs/development/python-modules/py-ubjson/default.nix
index 7eca2165efc1..dc8b6b79da60 100644
--- a/pkgs/development/python-modules/py-ubjson/default.nix
+++ b/pkgs/development/python-modules/py-ubjson/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Iotic-Labs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1frn97xfa88zrfmpnvdk1pc03yihlchhph99bhjayvzlfcrhm5v3";
   };
 
diff --git a/pkgs/development/python-modules/py3buddy/default.nix b/pkgs/development/python-modules/py3buddy/default.nix
index e076aa3b667e..be3af959eb14 100644
--- a/pkgs/development/python-modules/py3buddy/default.nix
+++ b/pkgs/development/python-modules/py3buddy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "armijnhemel";
     repo = "py3buddy";
-    rev = version;
+    tag = version;
     hash = "sha256-KJ0xGEXHY6o2074WFZ0u7gATS+wrrjyzanYretckWYk=";
   };
 
diff --git a/pkgs/development/python-modules/pyaehw4a1/default.nix b/pkgs/development/python-modules/pyaehw4a1/default.nix
index 1506bfd80a78..d51cd1a683cc 100644
--- a/pkgs/development/python-modules/pyaehw4a1/default.nix
+++ b/pkgs/development/python-modules/pyaehw4a1/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bannhead";
     repo = "pyaehw4a1";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0grs7kiyhzlwqzmw2yxkkglnwjfpimgwxbgp0047rlp3k8md7sjv";
   };
 
diff --git a/pkgs/development/python-modules/pyarlo/default.nix b/pkgs/development/python-modules/pyarlo/default.nix
index a9b9c8c040db..cb2636018f36 100644
--- a/pkgs/development/python-modules/pyarlo/default.nix
+++ b/pkgs/development/python-modules/pyarlo/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tchellomello";
     repo = "python-arlo";
-    rev = version;
+    tag = version;
     sha256 = "0pp7y2llk4xnf6zh57j5xas0gw5zqm42qaqssd8p4qa3g5rds8k3";
   };
 
diff --git a/pkgs/development/python-modules/pyasn/default.nix b/pkgs/development/python-modules/pyasn/default.nix
index 7e684c27ae1e..70c9e6d8a3dc 100644
--- a/pkgs/development/python-modules/pyasn/default.nix
+++ b/pkgs/development/python-modules/pyasn/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   datasrc = fetchFromGitHub {
     owner = "hadiasghari";
     repo = "pyasn";
-    rev = version;
+    tag = version;
     hash = "sha256-R7Vi1Mn44Mg3HQLDk9O43MkXXwbLRr/jjVKSHJvgYj0";
   };
 
diff --git a/pkgs/development/python-modules/pyasynchat/default.nix b/pkgs/development/python-modules/pyasynchat/default.nix
index b8f7cd764133..7d1e062adc4a 100644
--- a/pkgs/development/python-modules/pyasynchat/default.nix
+++ b/pkgs/development/python-modules/pyasynchat/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonrob";
     repo = "pyasynchat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Cep8tsapLjhPbVhMrC1ZUgd4jZZLOliL4yF0OX2KrYs=";
   };
 
diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
index 6e4a7e846b3e..c4f551a1a075 100644
--- a/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "appknox";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NtAsO/I1jDEv676yhAgLguQnB/kHdAqPoLt2QFWbvmw=";
   };
 
diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index e7c8750ad8ee..0a8280ca3e2a 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bids-standard";
     repo = "pybids";
-    rev = version;
+    tag = version;
     hash = "sha256-nSBc4vhkCdRo7CNBwvJreCiwoxJK6ztyI5gvcpzYZ/Y=";
   };
 
diff --git a/pkgs/development/python-modules/pybind11-abseil/default.nix b/pkgs/development/python-modules/pybind11-abseil/default.nix
index de497d6eec18..3feb3e2c567b 100644
--- a/pkgs/development/python-modules/pybind11-abseil/default.nix
+++ b/pkgs/development/python-modules/pybind11-abseil/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pybind";
     repo = "pybind11_abseil";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hFVuGzEFqAEm2p2RmfhFtLB6qOqNuVNcwcLh8dIWi0k=";
   };
 
diff --git a/pkgs/development/python-modules/pycarwings2/default.nix b/pkgs/development/python-modules/pycarwings2/default.nix
index 2d83d009aad8..40e65882c85a 100644
--- a/pkgs/development/python-modules/pycarwings2/default.nix
+++ b/pkgs/development/python-modules/pycarwings2/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "filcole";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kqj/NZXqgPUsOnnzMPmIlICHek7RBxksmL3reNBK+bo=";
   };
 
diff --git a/pkgs/development/python-modules/pychannels/default.nix b/pkgs/development/python-modules/pychannels/default.nix
index 48310b769912..7ab1904a3ecd 100644
--- a/pkgs/development/python-modules/pychannels/default.nix
+++ b/pkgs/development/python-modules/pychannels/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fancybits";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-E+VL4mJ2KxS5bJZc3Va+wvyVjT55LJz+1wHkxDRa85s=";
   };
 
diff --git a/pkgs/development/python-modules/pycketcasts/default.nix b/pkgs/development/python-modules/pycketcasts/default.nix
index 7b4c51fcc6e8..2d153da4b495 100644
--- a/pkgs/development/python-modules/pycketcasts/default.nix
+++ b/pkgs/development/python-modules/pycketcasts/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nwithan8";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-O4j89fE7fYPthhCH8b2gGskkelEA4mU6GvSbKIl+4Mk=";
   };
 
diff --git a/pkgs/development/python-modules/pyclimacell/default.nix b/pkgs/development/python-modules/pyclimacell/default.nix
index 8b61e177f5db..8b06a0360edc 100644
--- a/pkgs/development/python-modules/pyclimacell/default.nix
+++ b/pkgs/development/python-modules/pyclimacell/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "raman325";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jWHjnebg4Aar48gid7bB7XYXOQtSqbmVmASsZd0YoPc=";
   };
 
diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix
index 9b3733939c02..d190b85b801d 100644
--- a/pkgs/development/python-modules/pycodestyle/default.nix
+++ b/pkgs/development/python-modules/pycodestyle/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "pycodestyle";
-    rev = version;
+    tag = version;
     hash = "sha256-rQkOjDikJPHCBqrqxFQ9PLikYSeQZwJnHAmPGRUZecA=";
   };
 
diff --git a/pkgs/development/python-modules/pycolorecho/default.nix b/pkgs/development/python-modules/pycolorecho/default.nix
index 91d29555800d..51e7a9645747 100644
--- a/pkgs/development/python-modules/pycolorecho/default.nix
+++ b/pkgs/development/python-modules/pycolorecho/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coldsofttech";
     repo = "pycolorecho";
-    rev = version;
+    tag = version;
     hash = "sha256-h/7Wi0x8iLMZpPYekK6W9LTM+2nYJTaKClNtRTzbmdg=";
   };
 
diff --git a/pkgs/development/python-modules/pycompliance/default.nix b/pkgs/development/python-modules/pycompliance/default.nix
index af1d976c0471..c27735fabf3b 100644
--- a/pkgs/development/python-modules/pycompliance/default.nix
+++ b/pkgs/development/python-modules/pycompliance/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhmdnd";
     repo = "pycompliance";
-    rev = version;
+    tag = version;
     hash = "sha256-gCrKbKqRDlh9q9bETQ9NEPbf+40WKF1ltfBy6LYjlVw=";
   };
 
diff --git a/pkgs/development/python-modules/pycsdr/default.nix b/pkgs/development/python-modules/pycsdr/default.nix
index 53a8f25d78d8..1c6eec9627f6 100644
--- a/pkgs/development/python-modules/pycsdr/default.nix
+++ b/pkgs/development/python-modules/pycsdr/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jketterl";
     repo = "pycsdr";
-    rev = version;
+    tag = version;
     hash = "sha256-OyfcXCcbvOOhBUkbAba3ayPzpH5z2nJWHbR6GcrCMy8=";
   };
 
diff --git a/pkgs/development/python-modules/pydigiham/default.nix b/pkgs/development/python-modules/pydigiham/default.nix
index 77653bc83c34..21458b9f6136 100644
--- a/pkgs/development/python-modules/pydigiham/default.nix
+++ b/pkgs/development/python-modules/pydigiham/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jketterl";
     repo = "pydigiham";
-    rev = version;
+    tag = version;
     hash = "sha256-QenoMyVFs8MEDPoMV6TT6XfzktfN/gAMIHR0Scq11wk=";
   };
 
diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix
index 6ccc5f099e4c..d08cd6fdeaac 100644
--- a/pkgs/development/python-modules/pyeight/default.nix
+++ b/pkgs/development/python-modules/pyeight/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mezz64";
     repo = "pyEight";
-    rev = version;
+    tag = version;
     hash = "sha256-JYmhEZQw11qPNV2jZhP+0VFb387kNom70R3C13PM7kc=";
   };
 
diff --git a/pkgs/development/python-modules/pyeverlights/default.nix b/pkgs/development/python-modules/pyeverlights/default.nix
index dd9abeca4f31..0aac76b0c74b 100644
--- a/pkgs/development/python-modules/pyeverlights/default.nix
+++ b/pkgs/development/python-modules/pyeverlights/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joncar";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "16xpq933j8yydq78fnf4f7ivyw5a45ix4mfycpmm91aj549p6pm0";
   };
 
diff --git a/pkgs/development/python-modules/pyevilgenius/default.nix b/pkgs/development/python-modules/pyevilgenius/default.nix
index 40d48342e57e..0bb049bfed97 100644
--- a/pkgs/development/python-modules/pyevilgenius/default.nix
+++ b/pkgs/development/python-modules/pyevilgenius/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o=";
   };
 
diff --git a/pkgs/development/python-modules/pyevmasm/default.nix b/pkgs/development/python-modules/pyevmasm/default.nix
index c683c93143b2..1a4945f88bb7 100644
--- a/pkgs/development/python-modules/pyevmasm/default.nix
+++ b/pkgs/development/python-modules/pyevmasm/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crytic";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "134q0z0dqzxzr0jw5jr98kp90kx2dl0qw9smykwxdgq555q1l6qa";
   };
 
diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix
index 8d0196473c09..e77a6992fc4c 100644
--- a/pkgs/development/python-modules/pyexcel-ods/default.nix
+++ b/pkgs/development/python-modules/pyexcel-ods/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyexcel";
     repo = "pyexcel-ods";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wptjCSi56hotmiIE0TrLY7jsCHKwDR+a7d89sAQWBHg=";
   };
 
diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix
index 81bcc8ade772..9092bba1bdaa 100644
--- a/pkgs/development/python-modules/pyexcel-xls/default.nix
+++ b/pkgs/development/python-modules/pyexcel-xls/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyexcel";
     repo = "pyexcel-xls";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wxsx/LfeBxi+NnHxfxk3svzsBcdwOiLQ1660eoHfmLg=";
   };
 
diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix
index 04534f99c58d..0491e9ad744b 100644
--- a/pkgs/development/python-modules/pyflakes/default.nix
+++ b/pkgs/development/python-modules/pyflakes/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "pyflakes";
-    rev = version;
+    tag = version;
     hash = "sha256-ouCkkm9OrYob00uLTilqgWsTWfHhzaiZp7sa2C5liqk=";
   };
 
diff --git a/pkgs/development/python-modules/pyflexit/default.nix b/pkgs/development/python-modules/pyflexit/default.nix
index 22190d150b40..bd9afd126012 100644
--- a/pkgs/development/python-modules/pyflexit/default.nix
+++ b/pkgs/development/python-modules/pyflexit/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Sabesto";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1ajlqr3z6zj4fyslqzpwpfkvh8xjx94wsznzij0vx0q7jp43bqig";
   };
 
diff --git a/pkgs/development/python-modules/pyflic/default.nix b/pkgs/development/python-modules/pyflic/default.nix
index f780c16cd144..0c58c55d9657 100644
--- a/pkgs/development/python-modules/pyflic/default.nix
+++ b/pkgs/development/python-modules/pyflic/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "soldag";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-K1trMBZfc1aHSNSddq0v//Gv8ySgT/ONQYgrKWzw2qs=";
   };
 
diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix
index 926d03bf3743..63f7c8b2f1b9 100644
--- a/pkgs/development/python-modules/pyfma/default.nix
+++ b/pkgs/development/python-modules/pyfma/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = "pyfma";
-    rev = version;
+    tag = version;
     hash = "sha256-1qNa+FcIAP1IMzdNKrEbTVPo6gTOSCvhTRIHm6REJoo=";
   };
 
diff --git a/pkgs/development/python-modules/pyfzf/default.nix b/pkgs/development/python-modules/pyfzf/default.nix
index 296d2d11670e..701c330eb835 100644
--- a/pkgs/development/python-modules/pyfzf/default.nix
+++ b/pkgs/development/python-modules/pyfzf/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nk412";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-w+ZjQGFd/lR2TiTHc2uQSJXORmzJJZXsr9BO4PIw/Co=";
   };
 
diff --git a/pkgs/development/python-modules/pygrok/default.nix b/pkgs/development/python-modules/pygrok/default.nix
index 3313a921808d..c9b87d703698 100644
--- a/pkgs/development/python-modules/pygrok/default.nix
+++ b/pkgs/development/python-modules/pygrok/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "garyelephant";
     repo = "pygrok";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "07487rcmv74srnchh60jp0vg46g086qmpkaj8gxqhp9rj47r1s4m";
   };
 
diff --git a/pkgs/development/python-modules/pygtail/default.nix b/pkgs/development/python-modules/pygtail/default.nix
index 8ef39af5c314..e70dd97d1787 100644
--- a/pkgs/development/python-modules/pygtail/default.nix
+++ b/pkgs/development/python-modules/pygtail/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bgreenlee";
     repo = "pygtail";
-    rev = version;
+    tag = version;
     hash = "sha256-TlXTlxeGDd+elGpMjxcJCmRuJmp5k9xj6MrViRzcST4=";
   };
 
diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix
index d4abb9fabaae..58d9f6c1bdf7 100644
--- a/pkgs/development/python-modules/pyhcl/default.nix
+++ b/pkgs/development/python-modules/pyhcl/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "virtuald";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0rcpx4vvj2c6wxp31vay7a2xa5p62kabi91vps9plj6710yz29nc";
   };
 
diff --git a/pkgs/development/python-modules/pyhomepilot/default.nix b/pkgs/development/python-modules/pyhomepilot/default.nix
index db00d9190ff0..ffc45069cce9 100644
--- a/pkgs/development/python-modules/pyhomepilot/default.nix
+++ b/pkgs/development/python-modules/pyhomepilot/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nico0302";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "00gmqx8cwsd15iccnlr8ypgqrdg6nw9ha518cfk7pyp8vhw1ziwy";
   };
 
diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix
index e5f36fe22d9d..229fdbf9ee23 100644
--- a/pkgs/development/python-modules/pyhumps/default.nix
+++ b/pkgs/development/python-modules/pyhumps/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nficano";
     repo = "humps";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ElL/LY2V2Z3efdV5FnDy9dSoBltULrzxsjaOx+7W9Oo=";
   };
 
diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix
index f76788180202..cfb263d03c15 100644
--- a/pkgs/development/python-modules/pyialarm/default.nix
+++ b/pkgs/development/python-modules/pyialarm/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RyuzakiKK";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rOdeYewjoFVbHdNPHN6ZC2g6X5yr84/JFE6tGSDIoRU=";
   };
 
diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix
index 6aebdaa47f52..dd1bd4661c08 100644
--- a/pkgs/development/python-modules/pyicloud/default.nix
+++ b/pkgs/development/python-modules/pyicloud/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "picklepete";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-2E1pdHHt8o7CGpdG+u4xy5OyNCueUGVw5CY8oicYd5w=";
   };
 
diff --git a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
index f941b8dc67c1..8af7000acfad 100644
--- a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
+++ b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DudeNr33";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lz1GuiXU+r8sMld5SsG3qS+FOsWfbvkQmO2bxAR3XcY=";
   };
 
diff --git a/pkgs/development/python-modules/pykostalpiko/default.nix b/pkgs/development/python-modules/pykostalpiko/default.nix
index c9c183819818..e91ed6d4f815 100644
--- a/pkgs/development/python-modules/pykostalpiko/default.nix
+++ b/pkgs/development/python-modules/pykostalpiko/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Florian7843";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kmzFsOgmMb8bOkulg7G6vXEPdb0xizh7u5LjnHfEWWQ=";
   };
 
diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix
index 55cdaf71b4bb..33733ba3b30e 100644
--- a/pkgs/development/python-modules/pykrakenapi/default.nix
+++ b/pkgs/development/python-modules/pykrakenapi/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dominiktraxl";
     repo = "pykrakenapi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sMtNdXM+47iCnDgo33DCD1nx/I+jVX/oG/9aN80LfRg=";
   };
 
diff --git a/pkgs/development/python-modules/pykulersky/default.nix b/pkgs/development/python-modules/pykulersky/default.nix
index 1c3ddaea9cd7..43ffde5bc5f1 100644
--- a/pkgs/development/python-modules/pykulersky/default.nix
+++ b/pkgs/development/python-modules/pykulersky/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emlove";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-BaGcsHlQpuEnUn8OgSUsJi2q89vFl7vpkinviKnUZJk=";
   };
 
diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix
index 39b5657819ad..6bc39d1f4a52 100644
--- a/pkgs/development/python-modules/pylama/default.nix
+++ b/pkgs/development/python-modules/pylama/default.nix
@@ -27,7 +27,7 @@ let
       name = "${pname}-${version}-source";
       owner = "klen";
       repo = "pylama";
-      rev = version;
+      tag = version;
       hash = "sha256-WOGtZ412tX3YH42JCd5HIngunluwtMmQrOSUZp23LPU=";
     };
 
diff --git a/pkgs/development/python-modules/pylatex/default.nix b/pkgs/development/python-modules/pylatex/default.nix
index ecd6adf3cdd2..bc32614284f6 100644
--- a/pkgs/development/python-modules/pylatex/default.nix
+++ b/pkgs/development/python-modules/pylatex/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JelteF";
     repo = "PyLaTeX";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gZKMYGMp7bzDY5+Xx9h1AFP4l0Zd936fDfSXyW5lY1k=";
   };
 
diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix
index d48fe47bf447..db8a84c29c28 100644
--- a/pkgs/development/python-modules/pylatexenc/default.nix
+++ b/pkgs/development/python-modules/pylatexenc/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "phfaist";
     repo = "pylatexenc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3Ho04qrmCtmmrR+BUJNbtdCZcK7lXhUGJjm4yfCTUkM=";
   };
 
diff --git a/pkgs/development/python-modules/pyld/default.nix b/pkgs/development/python-modules/pyld/default.nix
index aa66ac581c3c..1833c368ae66 100644
--- a/pkgs/development/python-modules/pyld/default.nix
+++ b/pkgs/development/python-modules/pyld/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "digitalbazaar";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0z2vkllw8bvzxripwb6l757r7av5qwhzsiy4061gmlhq8z8gq961";
   };
 
diff --git a/pkgs/development/python-modules/pyldavis/default.nix b/pkgs/development/python-modules/pyldavis/default.nix
index 8b26af56615c..64dcefcf70b2 100644
--- a/pkgs/development/python-modules/pyldavis/default.nix
+++ b/pkgs/development/python-modules/pyldavis/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bmabey";
     repo = "pyLDAvis";
-    rev = version;
+    tag = version;
     sha256 = "sha256-WIQytds3PeU85l6ix2UUIwypjpM5rMZvQxiHx9BY91Y=";
   };
 
diff --git a/pkgs/development/python-modules/pylddwrap/default.nix b/pkgs/development/python-modules/pylddwrap/default.nix
index cb68291f27e6..a3b57cf45e26 100644
--- a/pkgs/development/python-modules/pylddwrap/default.nix
+++ b/pkgs/development/python-modules/pylddwrap/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Parquery";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Gm82VRu8GP52BohQzpMUJfh6q2tiUA2GJWOcG7ymGgg=";
   };
 
diff --git a/pkgs/development/python-modules/pylev/default.nix b/pkgs/development/python-modules/pylev/default.nix
index 30831a8c5727..b8d73205cf1f 100644
--- a/pkgs/development/python-modules/pylev/default.nix
+++ b/pkgs/development/python-modules/pylev/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "toastdriven";
     repo = "pylev";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0fgxjdnvnvavnxmxxd0fl5jyr2f31g3a26bwyxcpy56mgpd095c1";
   };
 
diff --git a/pkgs/development/python-modules/pylibdmtx/default.nix b/pkgs/development/python-modules/pylibdmtx/default.nix
index 97037747a25b..d0cbe7d8344c 100644
--- a/pkgs/development/python-modules/pylibdmtx/default.nix
+++ b/pkgs/development/python-modules/pylibdmtx/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NaturalHistoryMuseum";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-vNWzhO4V0mj4eItZ0Z5UG9RBCqprIcgMGNyIe1+mXWY=";
   };
 
diff --git a/pkgs/development/python-modules/pylint-celery/default.nix b/pkgs/development/python-modules/pylint-celery/default.nix
index 99ffa65d6cd7..90c8092ffc93 100644
--- a/pkgs/development/python-modules/pylint-celery/default.nix
+++ b/pkgs/development/python-modules/pylint-celery/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "05fhwraq12c2724pn4py1bjzy5rmsrb1x68zck73nlp5icba6yap";
   };
 
diff --git a/pkgs/development/python-modules/pyloggermanager/default.nix b/pkgs/development/python-modules/pyloggermanager/default.nix
index 827f826c99e2..64286daf6d4e 100644
--- a/pkgs/development/python-modules/pyloggermanager/default.nix
+++ b/pkgs/development/python-modules/pyloggermanager/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coldsofttech";
     repo = "pyloggermanager";
-    rev = version;
+    tag = version;
     hash = "sha256-1hfcmMLH2d71EV71ExKqjZ7TMcqVd1AQrEwJhmEWOVU=";
   };
 
diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix
index 27dd4c93d6fc..1ffa1bbdd3ef 100644
--- a/pkgs/development/python-modules/pylru/default.nix
+++ b/pkgs/development/python-modules/pylru/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jlhutch";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dTYiD+/zt0ZSP+sefYyeD87To1nRXyoFodlBg8pm1YE=";
   };
 
diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix
index de2cbdae88b8..7fec36f98064 100644
--- a/pkgs/development/python-modules/pyls-spyder/default.nix
+++ b/pkgs/development/python-modules/pyls-spyder/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spyder-ide";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "11ajbsia60d4c9s6m6rbvaqp1d69fcdbq6a98lkzkkzv2b9pdhkk";
   };
 
diff --git a/pkgs/development/python-modules/pymailgunner/default.nix b/pkgs/development/python-modules/pymailgunner/default.nix
index 7e5a5bd5d8c4..dd9b50ba1a14 100644
--- a/pkgs/development/python-modules/pymailgunner/default.nix
+++ b/pkgs/development/python-modules/pymailgunner/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pschmitt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-QKwpW1aeN6OI76Kocow1Zhghq4/fl/cMPexny0MTwQs=";
   };
 
diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix
index 44bd1c815614..e46ae368758b 100644
--- a/pkgs/development/python-modules/pymarshal/default.nix
+++ b/pkgs/development/python-modules/pymarshal/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stargateaudio";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A=";
   };
 
diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix
index d516ba9b38e7..d1a352f7fe1a 100644
--- a/pkgs/development/python-modules/pymata-express/default.nix
+++ b/pkgs/development/python-modules/pymata-express/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MrYsLab";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1mibyn84kjahrv3kn51yl5mhkyig4piv6wanggzjflh5nm96bhy8";
   };
 
diff --git a/pkgs/development/python-modules/pymdstat/default.nix b/pkgs/development/python-modules/pymdstat/default.nix
index f447d15e45af..43e88110274b 100644
--- a/pkgs/development/python-modules/pymdstat/default.nix
+++ b/pkgs/development/python-modules/pymdstat/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "pymdstat";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ifQZXc+it/UTltHc1ZL2zxJu7GvAxYzzmB4D+mCqEoE=";
   };
 
diff --git a/pkgs/development/python-modules/pymelcloud/default.nix b/pkgs/development/python-modules/pymelcloud/default.nix
index d859da4ff22a..ee9fffe2b0c1 100644
--- a/pkgs/development/python-modules/pymelcloud/default.nix
+++ b/pkgs/development/python-modules/pymelcloud/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vilppuvuorinen";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1q6ny58cn9qy86blxbk6l2iklab7y11b734l7yb1bp35dmy27w26";
   };
 
diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix
index 6f570f8d8306..661738c8eb0d 100644
--- a/pkgs/development/python-modules/pymemcache/default.nix
+++ b/pkgs/development/python-modules/pymemcache/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pinterest";
     repo = "pymemcache";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WgtHhp7lE6StoOBfSy9+v3ODe/+zUC7lGrc2S4M68+M=";
   };
 
diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix
index 9178399610b3..3f7f4002119d 100644
--- a/pkgs/development/python-modules/pymysensors/default.nix
+++ b/pkgs/development/python-modules/pymysensors/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "theolind";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-3t9YrSJf02kc5CuTqPBc/qNJV7yy7Vke4WqhtuOaAYo=";
   };
 
diff --git a/pkgs/development/python-modules/pynamecheap/default.nix b/pkgs/development/python-modules/pynamecheap/default.nix
index adf63d29af72..12f3fb09fd91 100644
--- a/pkgs/development/python-modules/pynamecheap/default.nix
+++ b/pkgs/development/python-modules/pynamecheap/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bemmu";
     repo = "PyNamecheap";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1g1cd2yc6rpdsc5ax7s93y5nfkf91gcvbgcaqyl9ida6srd9hr97";
   };
 
diff --git a/pkgs/development/python-modules/pynello/default.nix b/pkgs/development/python-modules/pynello/default.nix
index 919674c639fc..299c873ea904 100644
--- a/pkgs/development/python-modules/pynello/default.nix
+++ b/pkgs/development/python-modules/pynello/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pschmitt";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-sUy37sEPEMyFYFVBzFVdcg31nZAyC+Ricm4LqxmjuQQ=";
   };
 
diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix
index 87cbebb03d7f..da6d5bb171de 100644
--- a/pkgs/development/python-modules/pynest2d/default.nix
+++ b/pkgs/development/python-modules/pynest2d/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "pynest2d";
-    rev = version;
+    tag = version;
     hash = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo=";
   };
 
diff --git a/pkgs/development/python-modules/pynotifier/default.nix b/pkgs/development/python-modules/pynotifier/default.nix
index f264d9a32803..80eb6add920e 100644
--- a/pkgs/development/python-modules/pynotifier/default.nix
+++ b/pkgs/development/python-modules/pynotifier/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "YuriyLisovskiy";
     repo = "pynotifier";
-    rev = version;
+    tag = version;
     hash = "sha256-xS3hH3cyqgDD7uoWkIYXpQAh7SN7XJ/qMfB0Vq5bva0=";
   };
 
diff --git a/pkgs/development/python-modules/pynut2/default.nix b/pkgs/development/python-modules/pynut2/default.nix
index 44c687f12592..4b8036287cd0 100644
--- a/pkgs/development/python-modules/pynut2/default.nix
+++ b/pkgs/development/python-modules/pynut2/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mezz64";
     repo = "python-nut2";
-    rev = version;
+    tag = version;
     sha256 = "1lg7n1frndfgw73s0ssl1h7kc6zxm7fpiwlc6v6d60kxzaj1dphx";
   };
 
diff --git a/pkgs/development/python-modules/pyperscan/default.nix b/pkgs/development/python-modules/pyperscan/default.nix
index 99511047b1a5..f07a4230ecb0 100644
--- a/pkgs/development/python-modules/pyperscan/default.nix
+++ b/pkgs/development/python-modules/pyperscan/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vlaci";
     repo = "pyperscan";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uGZ0XFxnZHSLEWcwoHVd+xMulDRqEIrQ5Lf7886GdlM=";
   };
 
diff --git a/pkgs/development/python-modules/pypika/default.nix b/pkgs/development/python-modules/pypika/default.nix
index 70e3d3bcb114..b7d52aee1a6c 100644
--- a/pkgs/development/python-modules/pypika/default.nix
+++ b/pkgs/development/python-modules/pypika/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kayak";
     repo = "pypika";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9HKT1xRu23F5ptiKhIgIR8srLIcpDzpowBNuYOhqMU0=";
   };
 
diff --git a/pkgs/development/python-modules/pyqt5-stubs/default.nix b/pkgs/development/python-modules/pyqt5-stubs/default.nix
index a891942d1d45..80cdd365b8d8 100644
--- a/pkgs/development/python-modules/pyqt5-stubs/default.nix
+++ b/pkgs/development/python-modules/pyqt5-stubs/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-qt-tools";
     repo = "PyQt5-stubs";
-    rev = version;
+    tag = version;
     hash = "sha256-qWnvlHnFRy8wbZJ28C0pYqAxod623Epe5z5FZufheDc=";
   };
   postPatch =
diff --git a/pkgs/development/python-modules/pyqtdarktheme/default.nix b/pkgs/development/python-modules/pyqtdarktheme/default.nix
index 2d4841227071..7beeda6ea12b 100644
--- a/pkgs/development/python-modules/pyqtdarktheme/default.nix
+++ b/pkgs/development/python-modules/pyqtdarktheme/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "5yutan5";
     repo = "PyQtDarkTheme";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jK+wnIyPE8Bav0pzbvVisYYCzdRshYw1S2t0H3Pro5M=";
   };
 
diff --git a/pkgs/development/python-modules/pyquaternion/default.nix b/pkgs/development/python-modules/pyquaternion/default.nix
index f3e1212d9847..7bb645e9e6f5 100644
--- a/pkgs/development/python-modules/pyquaternion/default.nix
+++ b/pkgs/development/python-modules/pyquaternion/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KieranWynn";
     repo = "pyquaternion";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L0wT9DFUDRcmmN7OpmIDNvtQWQrM7iFnZt6R2xrJ+3A=";
   };
 
diff --git a/pkgs/development/python-modules/pyqvrpro/default.nix b/pkgs/development/python-modules/pyqvrpro/default.nix
index 53392e3cb18d..d31c05e9e827 100644
--- a/pkgs/development/python-modules/pyqvrpro/default.nix
+++ b/pkgs/development/python-modules/pyqvrpro/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oblogic7";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lOd2AqnrkexNqT/usmJts5NW7vJtV8CRsliYgkhgRaU=";
   };
 
diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix
index 9003ad79c530..f90fc0bc83e4 100644
--- a/pkgs/development/python-modules/pyrate-limiter/default.nix
+++ b/pkgs/development/python-modules/pyrate-limiter/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vutran1710";
     repo = "PyrateLimiter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0=";
   };
 
diff --git a/pkgs/development/python-modules/pyrituals/default.nix b/pkgs/development/python-modules/pyrituals/default.nix
index c8514f59ae78..c6c1b9572838 100644
--- a/pkgs/development/python-modules/pyrituals/default.nix
+++ b/pkgs/development/python-modules/pyrituals/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "milanmeu";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0ynjz7khp67bwxjp580w3zijxr9yn44nmnbvkxjxq9scyb2mjf6g";
   };
 
diff --git a/pkgs/development/python-modules/pyrmvtransport/default.nix b/pkgs/development/python-modules/pyrmvtransport/default.nix
index 89eea0f2ecbb..9bf2a61c588d 100644
--- a/pkgs/development/python-modules/pyrmvtransport/default.nix
+++ b/pkgs/development/python-modules/pyrmvtransport/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cgtobi";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40=";
   };
 
diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix
index b7961fa3e690..22c579a4f1fb 100644
--- a/pkgs/development/python-modules/pyrogram/default.nix
+++ b/pkgs/development/python-modules/pyrogram/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyrogram";
     repo = "pyrogram";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W/t3v5q0s+ba0Uly+JUaJl75uDQGeFaj2zDKGRMIMow=";
   };
 
diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix
index eacbbe5b8b9c..cffd3d249c6b 100644
--- a/pkgs/development/python-modules/pyroma/default.nix
+++ b/pkgs/development/python-modules/pyroma/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "regebro";
     repo = "pyroma";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ElSw+bY6fbHJPTX7O/9JZ4drttfbUQsU/fv3Cqqb/J4=";
   };
 
diff --git a/pkgs/development/python-modules/pysaj/default.nix b/pkgs/development/python-modules/pysaj/default.nix
index 499cb552b36e..a0294ec65771 100644
--- a/pkgs/development/python-modules/pysaj/default.nix
+++ b/pkgs/development/python-modules/pysaj/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fredericvl";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7mN6GPRbXfEUfCrCrCs71SSt4x2Ch2y3a5rfXnuwVA0=";
   };
 
diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix
index 0921aa790e80..131c8d2cf0df 100644
--- a/pkgs/development/python-modules/pysatochip/default.nix
+++ b/pkgs/development/python-modules/pysatochip/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "toporin";
     repo = "pysatochip";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7wA9erk2OA1FyNSzOSWJzjyp9QeYq6C+YA8B0Dk2iQE=";
   };
 
diff --git a/pkgs/development/python-modules/pysbd/default.nix b/pkgs/development/python-modules/pysbd/default.nix
index fcc440fe4c74..d9fd306a677e 100644
--- a/pkgs/development/python-modules/pysbd/default.nix
+++ b/pkgs/development/python-modules/pysbd/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nipunsadvilkar";
     repo = "pySBD";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "12p7qm237z56hw4zr03n8rycgfymhki2m9c4w3ib0mvqq122a5dp";
   };
 
diff --git a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix
index 17951563bed7..bda8aca64d18 100644
--- a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix
+++ b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "pyserial-asyncio-fast";
-    rev = version;
+    tag = version;
     hash = "sha256-ZnXuwHvYq/BrEW6YV6T0sQ03u2rpwNBnpF+dXAmvxKQ=";
   };
 
diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix
index 176e04eed522..2f17412b5093 100644
--- a/pkgs/development/python-modules/pyshp/default.nix
+++ b/pkgs/development/python-modules/pyshp/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GeospatialPython";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-yfxhgk8a1rdpGVkE1sjJqT6tiFLimhu2m2SjGxLI6wo=";
   };
 
diff --git a/pkgs/development/python-modules/pyskyqhub/default.nix b/pkgs/development/python-modules/pyskyqhub/default.nix
index ee460a27f566..d358ce28b78f 100644
--- a/pkgs/development/python-modules/pyskyqhub/default.nix
+++ b/pkgs/development/python-modules/pyskyqhub/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RogerSelwyn";
     repo = "skyq_hub";
-    rev = version;
+    tag = version;
     hash = "sha256-yXqtABbsCh1yb96lsEA0gquikVenGLCo6J93AeXAC8k=";
   };
 
diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix
index dbf3d11da54b..418557aec465 100644
--- a/pkgs/development/python-modules/pysmappee/default.nix
+++ b/pkgs/development/python-modules/pysmappee/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "smappee";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Ffi55FZsZUKDcS4qV46NpRK3VP6axzrL2BO+hYW7J9E=";
   };
 
diff --git a/pkgs/development/python-modules/pysmartapp/default.nix b/pkgs/development/python-modules/pysmartapp/default.nix
index 295624bafc76..7322d97591dd 100644
--- a/pkgs/development/python-modules/pysmartapp/default.nix
+++ b/pkgs/development/python-modules/pysmartapp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "andrewsayre";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-RiRGOO5l5hcHllyDDGLtQHr51JOTZhAa/wK8BfMqmAY=";
   };
 
diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix
index 7197bb1b6bb5..9b7c30179cfc 100644
--- a/pkgs/development/python-modules/pysmt/default.nix
+++ b/pkgs/development/python-modules/pysmt/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pysmt";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HmEdCJOF04h0z5UPpfYa07b78EEBj5KyVAk6aNRFPEo=";
   };
 
diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix
index 80897afcf851..05858f98dae7 100644
--- a/pkgs/development/python-modules/pysnow/default.nix
+++ b/pkgs/development/python-modules/pysnow/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rbw";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-nKOPCkS2b3ObmBnk/7FTv4o4vwUX+tOtZI5OQQ4HSTY=";
   };
 
diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix
index a95787c5444a..3b4ccd16c41f 100644
--- a/pkgs/development/python-modules/pysonos/default.nix
+++ b/pkgs/development/python-modules/pysonos/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amelchio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gBOknYHL5nQWFVhCbLN0Ah+1fovcNY4P2myryZnUadk=";
   };
 
diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix
index 9be5028a8787..3066ea95bf5d 100644
--- a/pkgs/development/python-modules/pysrt/default.nix
+++ b/pkgs/development/python-modules/pysrt/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "byroot";
     repo = "pysrt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1f5hxyzlh5mdvvi52qapys9qcinffr6ghgivb6k4jxa92cbs3mfg";
   };
 
diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix
index a0145c30c553..aa4622ba0e41 100644
--- a/pkgs/development/python-modules/pyssim/default.nix
+++ b/pkgs/development/python-modules/pyssim/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jterrace";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LDNIugQeRqNsAZ5ZxS/NxHokEAwefpfRutTRpR0IcXk=";
   };
 
diff --git a/pkgs/development/python-modules/pystardict/default.nix b/pkgs/development/python-modules/pystardict/default.nix
index ac890f7fdbf6..f4c529db9c31 100644
--- a/pkgs/development/python-modules/pystardict/default.nix
+++ b/pkgs/development/python-modules/pystardict/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lig";
     repo = "pystardict";
-    rev = version;
+    tag = version;
     hash = "sha256-YrZpIhyxfA3G7rP0SJ+EvzGwAXlne80AYilkj6cIDnA=";
   };
 
diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix
index 632356001c59..c42689589197 100644
--- a/pkgs/development/python-modules/pystray/default.nix
+++ b/pkgs/development/python-modules/pystray/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "moses-palmer";
     repo = "pystray";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CZhbaXwKFrRBEomzfFPMQdMkTOl5lbgI64etfDRiRu4=";
   };
 
diff --git a/pkgs/development/python-modules/pysubs2/default.nix b/pkgs/development/python-modules/pysubs2/default.nix
index 03f7077afd42..265b7fb62873 100644
--- a/pkgs/development/python-modules/pysubs2/default.nix
+++ b/pkgs/development/python-modules/pysubs2/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tkarabela";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-fKSb7MfBHGft8Tp6excjfkVXKnHRER11X0QxbR1zD4I=";
   };
 
diff --git a/pkgs/development/python-modules/pysvg-py3/default.nix b/pkgs/development/python-modules/pysvg-py3/default.nix
index 77d430e67052..d3d17f8c8e4a 100644
--- a/pkgs/development/python-modules/pysvg-py3/default.nix
+++ b/pkgs/development/python-modules/pysvg-py3/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alorence";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1slync0knpcjgl4xpym8w4249iy6vmrwbarpnbjzn9xca8g1h2f0";
   };
 
diff --git a/pkgs/development/python-modules/pytap2/default.nix b/pkgs/development/python-modules/pytap2/default.nix
index 1e080f0bbad3..09efc79663ff 100644
--- a/pkgs/development/python-modules/pytap2/default.nix
+++ b/pkgs/development/python-modules/pytap2/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "johnthagen";
     repo = "pytap2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GN8yFnS7HVgIP73/nVtYnwwhCBI9doGHLGSOaFiWIdw=";
   };
 
diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix
index 0110008ae3dd..f3cd24bb0f00 100644
--- a/pkgs/development/python-modules/pyte/default.nix
+++ b/pkgs/development/python-modules/pyte/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "selectel";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-u24ltX/LEteiZ2a/ioKqxV2AZgrFmKOHXmySmw21sLE=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix
index 2a970b16e7e0..27f33ca0e486 100644
--- a/pkgs/development/python-modules/pytest-click/default.nix
+++ b/pkgs/development/python-modules/pytest-click/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Stranger6667";
     repo = "pytest-click";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A/RF+SgPu2yYF3eHEFiZwKJW2VwQ185Ln6S3wn2cS0k=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-error-for-skips/default.nix b/pkgs/development/python-modules/pytest-error-for-skips/default.nix
index 594c16c4a87f..bf3ea025cc33 100644
--- a/pkgs/development/python-modules/pytest-error-for-skips/default.nix
+++ b/pkgs/development/python-modules/pytest-error-for-skips/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jankatins";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "04i4jd3bg4lgn2jfh0a0dzg3ml9b2bjv2ndia6b64w96r3r4p3qr";
   };
 
diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix
index 5b10967a0b00..c28c9ab2e683 100644
--- a/pkgs/development/python-modules/pytest-factoryboy/default.nix
+++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-factoryboy";
-    rev = version;
+    tag = version;
     sha256 = "sha256-GYqYwtbmMWVqImVPPBbZNRJJGcbksUPsIbi6QuPRMco=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-freezegun/default.nix b/pkgs/development/python-modules/pytest-freezegun/default.nix
index 259f698431ab..66b915854a16 100644
--- a/pkgs/development/python-modules/pytest-freezegun/default.nix
+++ b/pkgs/development/python-modules/pytest-freezegun/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ktosiek";
     repo = "pytest-freezegun";
-    rev = version;
+    tag = version;
     sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas";
   };
 
diff --git a/pkgs/development/python-modules/pytest-logdog/default.nix b/pkgs/development/python-modules/pytest-logdog/default.nix
index b047d86acc12..ff4eaa397a6f 100644
--- a/pkgs/development/python-modules/pytest-logdog/default.nix
+++ b/pkgs/development/python-modules/pytest-logdog/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ods";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Tmoq+KAGzn0MMj29rukDfAc4LSIwC8DoMTuBAppV32I=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-mockito/default.nix b/pkgs/development/python-modules/pytest-mockito/default.nix
index 06b9a9355367..d84830e6a59a 100644
--- a/pkgs/development/python-modules/pytest-mockito/default.nix
+++ b/pkgs/development/python-modules/pytest-mockito/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kaste";
     repo = "pytest-mockito";
-    rev = version;
+    tag = version;
     hash = "sha256-vY/i1YV1lo4mZvnxsXBOyaq31YTiF0BY6PTVwdVX10I=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-mockservers/default.nix b/pkgs/development/python-modules/pytest-mockservers/default.nix
index 3ab4e4e63cbf..7b2bff70a7e9 100644
--- a/pkgs/development/python-modules/pytest-mockservers/default.nix
+++ b/pkgs/development/python-modules/pytest-mockservers/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Gr1N";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Mb3wSbambC1h+lFI+fafwZzm78IvADNAsF/Uw60DFHc=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-mpi/default.nix b/pkgs/development/python-modules/pytest-mpi/default.nix
index 7a474fd084b0..ea91edb9c69a 100644
--- a/pkgs/development/python-modules/pytest-mpi/default.nix
+++ b/pkgs/development/python-modules/pytest-mpi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aragilar";
     repo = "pytest-mpi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m3HTGLoPnYeg0oeIA1nzTzch7FtkuXTYpox4rRgo5MU=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-pytestrail/default.nix b/pkgs/development/python-modules/pytest-pytestrail/default.nix
index 99c2c8786673..19330c434fca 100644
--- a/pkgs/development/python-modules/pytest-pytestrail/default.nix
+++ b/pkgs/development/python-modules/pytest-pytestrail/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tolstislon";
     repo = "pytest-pytestrail";
-    rev = version;
+    tag = version;
     sha256 = "sha256-y34aRxQ8mu6b6GBRMFVzn1shMVc7TumdjRS3daMEZJM=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-raisin/default.nix b/pkgs/development/python-modules/pytest-raisin/default.nix
index 762a3a6fa0ec..23f7ccfdd8e4 100644
--- a/pkgs/development/python-modules/pytest-raisin/default.nix
+++ b/pkgs/development/python-modules/pytest-raisin/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wimglenn";
     repo = "pytest-raisin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-BI0SWy671DYDTPH4iO811ku6SzpH4ho7eQFUA8PmxW8=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix
index b2ecfb4edb50..112af28891ff 100644
--- a/pkgs/development/python-modules/pytest-randomly/default.nix
+++ b/pkgs/development/python-modules/pytest-randomly/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "pytest-dev";
-    rev = version;
+    tag = version;
     hash = "sha256-bxbW22Nf/0hfJYSiz3xdrNCzrb7vZwuVvSIrWl0Bkv4=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix
index 66389e622e64..bef2e62f2df2 100644
--- a/pkgs/development/python-modules/pytest-resource-path/default.nix
+++ b/pkgs/development/python-modules/pytest-resource-path/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yukihiko-shinoda";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2";
   };
 
diff --git a/pkgs/development/python-modules/pytest-reverse/default.nix b/pkgs/development/python-modules/pytest-reverse/default.nix
index 9e6736625b36..7ad085558e4d 100644
--- a/pkgs/development/python-modules/pytest-reverse/default.nix
+++ b/pkgs/development/python-modules/pytest-reverse/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "pytest-reverse";
-    rev = version;
+    tag = version;
     hash = "sha256-r0aSbUgArHQkpaXUvMT6oyOxEliQRtSGuDt4IILzhH4=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-tap/default.nix b/pkgs/development/python-modules/pytest-tap/default.nix
index 91513ca894e2..58205abcdbbc 100644
--- a/pkgs/development/python-modules/pytest-tap/default.nix
+++ b/pkgs/development/python-modules/pytest-tap/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-tap";
     repo = "pytest-tap";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "R0RSdKTyJYGq+x0+ut4pJEywTGNgGp/ps36ZaH5dyY4=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix
index 31caf8fc5e09..132aa061ec80 100644
--- a/pkgs/development/python-modules/pytest-trio/default.nix
+++ b/pkgs/development/python-modules/pytest-trio/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-trio";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gUH35Yk/pBD2EdCEt8D0XQKWU8BwmX5xtAW10qRhoYk=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-vcr/default.nix b/pkgs/development/python-modules/pytest-vcr/default.nix
index 2e77d3af8261..c0661e97136c 100644
--- a/pkgs/development/python-modules/pytest-vcr/default.nix
+++ b/pkgs/development/python-modules/pytest-vcr/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ktosiek";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i";
   };
 
diff --git a/pkgs/development/python-modules/python-awair/default.nix b/pkgs/development/python-modules/python-awair/default.nix
index c814188477fa..c46366e106d0 100644
--- a/pkgs/development/python-modules/python-awair/default.nix
+++ b/pkgs/development/python-modules/python-awair/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ahayworth";
     repo = "python_awair";
-    rev = version;
+    tag = version;
     hash = "sha256-zdZyA6adM4bfEYupdZl7CzMjwyfRkQBrntNh0MusynE=";
   };
 
diff --git a/pkgs/development/python-modules/python-barbicanclient/default.nix b/pkgs/development/python-modules/python-barbicanclient/default.nix
index 9c65649a2336..6497880c7905 100644
--- a/pkgs/development/python-modules/python-barbicanclient/default.nix
+++ b/pkgs/development/python-modules/python-barbicanclient/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     domain = "opendev.org";
     owner = "openstack";
     repo = "python-barbicanclient";
-    rev = version;
+    tag = version;
     hash = "sha256-odoYyBulOQkjUpymFyZgvI+DYmdHJY3PaG8hh2ms+/0=";
   };
 
diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix
index ae00c34c3354..1eb4082e6214 100644
--- a/pkgs/development/python-modules/python-constraint/default.nix
+++ b/pkgs/development/python-modules/python-constraint/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-constraint";
     repo = "python-constraint";
-    rev = version;
+    tag = version;
     sha256 = "1dv11406yxmmgkkhwzqicajbg2bmla5xfad7lv57zyahxz8jzz94";
   };
 
diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix
index aa82db324c16..97b163c5c9bf 100644
--- a/pkgs/development/python-modules/python-ctags3/default.nix
+++ b/pkgs/development/python-modules/python-ctags3/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "universal-ctags";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-XVsZckNVJ1H5q8FzqoVd1UWRw0zOygvRtb7arX9dwGE=";
   };
 
diff --git a/pkgs/development/python-modules/python-designateclient/default.nix b/pkgs/development/python-modules/python-designateclient/default.nix
index 44b5b4a665ef..c131dc98e092 100644
--- a/pkgs/development/python-modules/python-designateclient/default.nix
+++ b/pkgs/development/python-modules/python-designateclient/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     domain = "opendev.org";
     owner = "openstack";
     repo = "python-designateclient";
-    rev = version;
+    tag = version;
     hash = "sha256-MwcpRQXH8EjWv41iHxorbFL9EpYu8qOLkDeUx6inEAU=";
   };
 
diff --git a/pkgs/development/python-modules/python-doi/default.nix b/pkgs/development/python-modules/python-doi/default.nix
index c624d1284532..5d03e0e15bf7 100644
--- a/pkgs/development/python-modules/python-doi/default.nix
+++ b/pkgs/development/python-modules/python-doi/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "papis";
     repo = "python-doi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1wa5inh2a0drjswrnhjv6m23mvbfdgqj2jb8fya7q0armzp7l6fr";
   };
 
diff --git a/pkgs/development/python-modules/python-ev3dev2/default.nix b/pkgs/development/python-modules/python-ev3dev2/default.nix
index dc185aced7d1..5963c95722bc 100644
--- a/pkgs/development/python-modules/python-ev3dev2/default.nix
+++ b/pkgs/development/python-modules/python-ev3dev2/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ev3dev";
     repo = "ev3dev-lang-python";
-    rev = version;
+    tag = version;
     sha256 = "XxsiQs3k5xKb+3RewARbvBbxaztdvdq3w5ZMgTq+kRc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/python-flirt/default.nix b/pkgs/development/python-modules/python-flirt/default.nix
index 47fdc3cfa08d..d8f3633d2ce8 100644
--- a/pkgs/development/python-modules/python-flirt/default.nix
+++ b/pkgs/development/python-modules/python-flirt/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "williballenthin";
     repo = "lancelot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-J48tRgJw6JjUrcAQdRELFE50pyDptbmbgYbr+rAK/PA=";
   };
 
diff --git a/pkgs/development/python-modules/python-gammu/default.nix b/pkgs/development/python-modules/python-gammu/default.nix
index ed35a96f7752..341156e603da 100644
--- a/pkgs/development/python-modules/python-gammu/default.nix
+++ b/pkgs/development/python-modules/python-gammu/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gammu";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-lFQBrKWwdvUScwsBva08izZVeVDn1u+ldzixtL9YTpA=";
   };
 
diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix
index 7d303d71ef01..734fada88765 100644
--- a/pkgs/development/python-modules/python-http-client/default.nix
+++ b/pkgs/development/python-modules/python-http-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sendgrid";
     repo = "python-http-client";
-    rev = version;
+    tag = version;
     hash = "sha256-8Qs5Jw0LMV2UucLnlFKJQ2PUhYaQx6uJdIV/4gaPH3w=";
   };
 
diff --git a/pkgs/development/python-modules/python-i18n/default.nix b/pkgs/development/python-modules/python-i18n/default.nix
index 319fe49f8d1f..c51f055e9093 100644
--- a/pkgs/development/python-modules/python-i18n/default.nix
+++ b/pkgs/development/python-modules/python-i18n/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "danhper";
     repo = "python-i18n";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "6FahoHZqaOWYGaT9RqLARCm2kLfUIlYuauB6+0eX7jA=";
   };
 
diff --git a/pkgs/development/python-modules/python-juicenet/default.nix b/pkgs/development/python-modules/python-juicenet/default.nix
index 1ceb9d031cc6..817be3cdf947 100644
--- a/pkgs/development/python-modules/python-juicenet/default.nix
+++ b/pkgs/development/python-modules/python-juicenet/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jesserockz";
     repo = "python-juicenet";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5RKnVwOfEHzFZCiC8OUpS8exKrENK+I3Ok45HlKEvtU=";
   };
 
diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix
index ee9503865f70..2015f7637b2e 100644
--- a/pkgs/development/python-modules/python-magic/default.nix
+++ b/pkgs/development/python-modules/python-magic/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ahupp";
     repo = "python-magic";
-    rev = version;
+    tag = version;
     hash = "sha256-fZ+5xJ3P0EYK+6rQ8VzXv2zckKfEH5VUdISIR6ybIfQ=";
   };
 
diff --git a/pkgs/development/python-modules/python-mbedtls/default.nix b/pkgs/development/python-modules/python-mbedtls/default.nix
index 8459559938c7..ec6b653d59ad 100644
--- a/pkgs/development/python-modules/python-mbedtls/default.nix
+++ b/pkgs/development/python-modules/python-mbedtls/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Synss";
     repo = "python-mbedtls";
-    rev = version;
+    tag = version;
     hash = "sha256-gMFludfAprQ/1JR77Ee6/xVvGLJ9pY1LrouLpSKVrzk=";
   };
 
diff --git a/pkgs/development/python-modules/python-memcached/default.nix b/pkgs/development/python-modules/python-memcached/default.nix
index 048e53e7eb4c..3d2d87aa3fad 100644
--- a/pkgs/development/python-modules/python-memcached/default.nix
+++ b/pkgs/development/python-modules/python-memcached/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "linsomniac";
     repo = "python-memcached";
-    rev = version;
+    tag = version;
     hash = "sha256-Qko4Qr9WofeklU0uRRrSPrT8YaBYMCy0GP+TF7YZHLI=";
   };
 
diff --git a/pkgs/development/python-modules/python-mistralclient/default.nix b/pkgs/development/python-modules/python-mistralclient/default.nix
index 6452fe3063e2..b0e660bc37c7 100644
--- a/pkgs/development/python-modules/python-mistralclient/default.nix
+++ b/pkgs/development/python-modules/python-mistralclient/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     domain = "opendev.org";
     owner = "openstack";
     repo = "python-mistralclient";
-    rev = version;
+    tag = version;
     hash = "sha256-Vi56+OlFU2Aj7yJ/cH5y0ZbzPhglTciJcTnkbA0S7Qo=";
   };
 
diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
index 76570a030980..8051c213dbb9 100644
--- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
+++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iwalton3";
     repo = "python-mpv-jsonipc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W9TNtbRhQmwZXhi0TJIDkZRtWhi92/iwL056YIcWnLM=";
   };
 
diff --git a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
index 5aaca9b14f11..b600866cf4d9 100644
--- a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
+++ b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zaproxy";
     repo = "zap-api-python";
-    rev = version;
+    tag = version;
     sha256 = "0b46m9s0vwaaq8vhiqspdr2ns9qdw65fnjh8mf58gjinlsd27ygk";
   };
 
diff --git a/pkgs/development/python-modules/python-pae/default.nix b/pkgs/development/python-modules/python-pae/default.nix
index 731626689adf..ad4c043276bb 100644
--- a/pkgs/development/python-modules/python-pae/default.nix
+++ b/pkgs/development/python-modules/python-pae/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MatthiasValvekens";
     repo = "python-pae";
-    rev = version;
+    tag = version;
     hash = "sha256-D0X2T0ze79KR6Gno4UWpA/XvlkK6Y/jXUtLbzlOKr3E=";
   };
 
diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix
index b4891105ce22..312e12ea172b 100644
--- a/pkgs/development/python-modules/python-pkcs11/default.nix
+++ b/pkgs/development/python-modules/python-pkcs11/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "danni";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0kncbipfpsb7m7mhv5s5b9wk604h1j08i2j26fn90pklgqll0xhv";
   };
 
diff --git a/pkgs/development/python-modules/python-pptx/default.nix b/pkgs/development/python-modules/python-pptx/default.nix
index 542ffd9f21d4..f73d82a85b55 100644
--- a/pkgs/development/python-modules/python-pptx/default.nix
+++ b/pkgs/development/python-modules/python-pptx/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scanny";
     repo = "python-pptx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KyBttTAtP8sVPjYdrY0XReB+4Xfru8GdyYWuiyNZ67w=";
   };
 
diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix
index fee2f88d5038..e46abd4b3d68 100644
--- a/pkgs/development/python-modules/python-rabbitair/default.nix
+++ b/pkgs/development/python-modules/python-rabbitair/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rabbit-air";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CGr7NvnGRNTiKq5BpB/zmfgyd/2ggTbO0nj+Q+MavTs=";
   };
 
diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix
index bf1c6c45982c..dc8a0578a599 100644
--- a/pkgs/development/python-modules/python-sat/default.nix
+++ b/pkgs/development/python-modules/python-sat/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pysathq";
     repo = "pysat";
-    rev = version;
+    tag = version;
     hash = "sha256-zGdgD+SgoMB7/zDQI/trmV70l91TB7OkDxaJ30W3dkI=";
   };
 
diff --git a/pkgs/development/python-modules/python-tds/default.nix b/pkgs/development/python-modules/python-tds/default.nix
index f4775b8e1798..886a3b117b07 100644
--- a/pkgs/development/python-modules/python-tds/default.nix
+++ b/pkgs/development/python-modules/python-tds/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "denisenkom";
     repo = "pytds";
-    rev = version;
+    tag = version;
     hash = "sha256-ubAXCifSfNtxbFIJZD8IuK/8oPT9vo77YBCexoO9zsw=";
   };
 
diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix
index 1811ba176a1e..a2d36af68e38 100644
--- a/pkgs/development/python-modules/python-twitter/default.nix
+++ b/pkgs/development/python-modules/python-twitter/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bear";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "08ydmf6dcd416cvw6xq1wxsz6b9s21f2mf9fh3y4qz9swj6n9h8z";
   };
 
diff --git a/pkgs/development/python-modules/python-u2flib-server/default.nix b/pkgs/development/python-modules/python-u2flib-server/default.nix
index fa93cb83fce8..0d4cd944891c 100644
--- a/pkgs/development/python-modules/python-u2flib-server/default.nix
+++ b/pkgs/development/python-modules/python-u2flib-server/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "python-u2flib-server";
-    rev = version;
+    tag = version;
     hash = "sha256-ginP9u+aHcdaWpwcFYJWu0Ghf7+nDZq9i3TVAacIPhg=";
   };
 
diff --git a/pkgs/development/python-modules/python-xapp/default.nix b/pkgs/development/python-modules/python-xapp/default.nix
index 9abed704189a..4d3018b8d6e7 100644
--- a/pkgs/development/python-modules/python-xapp/default.nix
+++ b/pkgs/development/python-modules/python-xapp/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "python-xapp";
-    rev = version;
+    tag = version;
     hash = "sha256-Gbm4YT9ZyrROOAbKz5xYd9J9YG9cUL2Oo6dDCPciaBs=";
   };
 
diff --git a/pkgs/development/python-modules/python-yakh/default.nix b/pkgs/development/python-modules/python-yakh/default.nix
index a3fba540022b..66339528800c 100644
--- a/pkgs/development/python-modules/python-yakh/default.nix
+++ b/pkgs/development/python-modules/python-yakh/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "petereon";
     repo = "yakh";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mXG0fit+0MLOkn2ezRzLboDGKxkES/T7kyWAfaF0EQQ=";
   };
 
diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix
index 0904441944de..96e8efd290f0 100644
--- a/pkgs/development/python-modules/python3-eventlib/default.nix
+++ b/pkgs/development/python-modules/python3-eventlib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AGProjects";
     repo = "python3-eventlib";
-    rev = version;
+    tag = version;
     hash = "sha256-LFW3rCGa7A8tk6SjgYgjkLQ+72GE2WN8wG+XkXYTAoQ=";
   };
 
diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix
index 18eb56419219..801f40e068da 100644
--- a/pkgs/development/python-modules/pythonix/default.nix
+++ b/pkgs/development/python-modules/pythonix/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "pythonix";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1wxqv3i4bva2qq9mx670bcx0g0irjn68fvk28dwvhay9ndwcspqf";
   };
 
diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix
index 98b20b6ffc46..ceaa9122cc7b 100644
--- a/pkgs/development/python-modules/pytomlpp/default.nix
+++ b/pkgs/development/python-modules/pytomlpp/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bobfang1992";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-QJeXvj1M3Vq5ctmx7RhczONsPRXAecv3WhJgKWtNK+M=";
   };
diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix
index eabf55c89caa..00c692d37f40 100644
--- a/pkgs/development/python-modules/pytube/default.nix
+++ b/pkgs/development/python-modules/pytube/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytube";
     repo = "pytube";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Nvs/YlOjk/P5nd1kpUnCM2n6yiEaqZP830UQI0Ug1rk=";
   };
 
diff --git a/pkgs/development/python-modules/pytun/default.nix b/pkgs/development/python-modules/pytun/default.nix
index 166afc454433..f591c966df8d 100644
--- a/pkgs/development/python-modules/pytun/default.nix
+++ b/pkgs/development/python-modules/pytun/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   format = "setuptools";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "montag451";
     repo = "pytun";
     sha256 = "sha256-DZ7CoLi6LPhuc55HF9dtek+/N4A29ecnZn7bk7jweuI=";
diff --git a/pkgs/development/python-modules/pyuca/default.nix b/pkgs/development/python-modules/pyuca/default.nix
index e4a7a2a0b5f1..dc12b8c0fa63 100644
--- a/pkgs/development/python-modules/pyuca/default.nix
+++ b/pkgs/development/python-modules/pyuca/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jtauber";
     repo = "pyuca";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KIWk+/o1MX5J9cO7xITvjHrYg0NdgdTetOzfGVwAI/4=";
   };
 
diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix
index a2e0af522d83..aecfd30bd825 100644
--- a/pkgs/development/python-modules/pyupgrade/default.nix
+++ b/pkgs/development/python-modules/pyupgrade/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bijW1uxoaVKLO0Psv3JeAG6rKeTwGa9ZW06VU1qFrrU=";
   };
 
diff --git a/pkgs/development/python-modules/pyuseragents/default.nix b/pkgs/development/python-modules/pyuseragents/default.nix
index f817a04222de..ae0805d18636 100644
--- a/pkgs/development/python-modules/pyuseragents/default.nix
+++ b/pkgs/development/python-modules/pyuseragents/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Animenosekai";
     repo = "useragents";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "D7Qs3vsfkRH2FDkbfakrR+FfWzQFiOCQM7q9AdJavyU=";
   };
 
diff --git a/pkgs/development/python-modules/pyversasense/default.nix b/pkgs/development/python-modules/pyversasense/default.nix
index d6328c4acf81..b31548800864 100644
--- a/pkgs/development/python-modules/pyversasense/default.nix
+++ b/pkgs/development/python-modules/pyversasense/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "imstevenxyz";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "vTaDEwImWDMInwti0Jj+j+RFEtXOOKtiH5wOMD6ZmJk=";
   };
 
diff --git a/pkgs/development/python-modules/pyvolumio/default.nix b/pkgs/development/python-modules/pyvolumio/default.nix
index 10a846948f24..4769d89beda8 100644
--- a/pkgs/development/python-modules/pyvolumio/default.nix
+++ b/pkgs/development/python-modules/pyvolumio/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OnFreund";
     repo = "PyVolumio";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1nyvflap39cwq1cm9wwl9idvfmz1ixsl80f1dnskx22fk0lmvj4h";
   };
 
diff --git a/pkgs/development/python-modules/pywavefront/default.nix b/pkgs/development/python-modules/pywavefront/default.nix
index 676f2aaab661..40840423c831 100644
--- a/pkgs/development/python-modules/pywavefront/default.nix
+++ b/pkgs/development/python-modules/pywavefront/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pywavefront";
     repo = "PyWavefront";
-    rev = version;
+    tag = version;
     hash = "sha256-ci40L2opJ+NYYtaAeX1Y5pzkdK+loFspTriX/xv4KR8=";
   };
 
diff --git a/pkgs/development/python-modules/pywebcopy/default.nix b/pkgs/development/python-modules/pywebcopy/default.nix
index b8065204a811..b1b632e6e600 100644
--- a/pkgs/development/python-modules/pywebcopy/default.nix
+++ b/pkgs/development/python-modules/pywebcopy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rajatomar788";
     repo = "pywebcopy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XTPk3doF9dqImsLtTB03YKMWLzQrJpJtjNXe+691rZo=";
   };
 
diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix
index 213d33de2314..753ab6d94fa1 100644
--- a/pkgs/development/python-modules/pywizlight/default.nix
+++ b/pkgs/development/python-modules/pywizlight/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sbidy";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JT0Ud17U9etByaDVu9+hcadymze1rfj+mEK6nqksuWc=";
   };
 
diff --git a/pkgs/development/python-modules/pyws66i/default.nix b/pkgs/development/python-modules/pyws66i/default.nix
index aa196c646a69..822519e67546 100644
--- a/pkgs/development/python-modules/pyws66i/default.nix
+++ b/pkgs/development/python-modules/pyws66i/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ssaenger";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NTL2+xLqSNsz4YdUTwr0nFjhm1NNgB8qDnWSoE2sizY=";
   };
 
diff --git a/pkgs/development/python-modules/pyxiaomigateway/default.nix b/pkgs/development/python-modules/pyxiaomigateway/default.nix
index c42d7f055c8c..a33f22192d09 100644
--- a/pkgs/development/python-modules/pyxiaomigateway/default.nix
+++ b/pkgs/development/python-modules/pyxiaomigateway/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "PyXiaomiGateway";
-    rev = version;
+    tag = version;
     hash = "sha256-TAbZvs1RrUy9+l2KpfbBopc3poTy+M+Q3ERQLFYbQis=";
   };
 
diff --git a/pkgs/development/python-modules/qnap-qsw/default.nix b/pkgs/development/python-modules/qnap-qsw/default.nix
index 697b0b98fe8a..41f8a482b7d7 100644
--- a/pkgs/development/python-modules/qnap-qsw/default.nix
+++ b/pkgs/development/python-modules/qnap-qsw/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Noltari";
     repo = "python-qnap-qsw";
-    rev = version;
+    tag = version;
     sha256 = "WP1bGt7aAtSVFOMJgPXKqVSbi5zj9K7qoIVrYCrPGqk=";
   };
 
diff --git a/pkgs/development/python-modules/quadprog/default.nix b/pkgs/development/python-modules/quadprog/default.nix
index 17faac7d13d4..20784847f1c8 100644
--- a/pkgs/development/python-modules/quadprog/default.nix
+++ b/pkgs/development/python-modules/quadprog/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "quadprog";
     repo = "quadprog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8gPuqDY3ajw/+B6kJdtpq+HL+Oq2Nsy/O7m+IWzxP38=";
   };
 
diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix
index a95cf4903b5d..07d212dcea80 100644
--- a/pkgs/development/python-modules/quantiphy-eval/default.nix
+++ b/pkgs/development/python-modules/quantiphy-eval/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "quantiphy_eval";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg=";
   };
 
diff --git a/pkgs/development/python-modules/quantum-gateway/default.nix b/pkgs/development/python-modules/quantum-gateway/default.nix
index e39b66b42ae6..b01b102133a7 100644
--- a/pkgs/development/python-modules/quantum-gateway/default.nix
+++ b/pkgs/development/python-modules/quantum-gateway/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cisasteelersfan";
     repo = "quantum_gateway";
-    rev = version;
+    tag = version;
     hash = "sha256-jwLfth+UaisPR0p+UHfm6qMXT2eSYWnsYEp0BqyeI9U=";
   };
 
diff --git a/pkgs/development/python-modules/questo/default.nix b/pkgs/development/python-modules/questo/default.nix
index c1f8ad3b4b8f..52aa09624231 100644
--- a/pkgs/development/python-modules/questo/default.nix
+++ b/pkgs/development/python-modules/questo/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "petereon";
     repo = "questo";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XCxSH2TSU4YdfyqfLpVSEeDeU1S24C+NezP1IL5qj/4=";
   };
 
diff --git a/pkgs/development/python-modules/radiotherm/default.nix b/pkgs/development/python-modules/radiotherm/default.nix
index c574b09301b8..321a15a2eecb 100644
--- a/pkgs/development/python-modules/radiotherm/default.nix
+++ b/pkgs/development/python-modules/radiotherm/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mhrivnak";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0p37pc7l2malmjfkdlh4q2cfa6dqpsk1rah2j2xil0pj57ai6bks";
   };
 
diff --git a/pkgs/development/python-modules/radon/default.nix b/pkgs/development/python-modules/radon/default.nix
index 6a9baf65e6a6..137eaf9fa0b8 100644
--- a/pkgs/development/python-modules/radon/default.nix
+++ b/pkgs/development/python-modules/radon/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rubik";
     repo = "radon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yY+j9kuX0ou/uDoVI/Qfqsmq0vNHv735k+vRl22LwwY=";
   };
 
diff --git a/pkgs/development/python-modules/range-typed-integers/default.nix b/pkgs/development/python-modules/range-typed-integers/default.nix
index 912bee04ffc7..4c62337eb609 100644
--- a/pkgs/development/python-modules/range-typed-integers/default.nix
+++ b/pkgs/development/python-modules/range-typed-integers/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "theCapypara";
     repo = "range-typed-integers";
-    rev = version;
+    tag = version;
     sha256 = "sha256-4+XdalHq6Q2cBbuYi4x7kmCNQh1MwYf+XlLP9FzzzgE=";
   };
 
diff --git a/pkgs/development/python-modules/rank-bm25/default.nix b/pkgs/development/python-modules/rank-bm25/default.nix
index 7318aa2a7934..6f126d1fb35e 100644
--- a/pkgs/development/python-modules/rank-bm25/default.nix
+++ b/pkgs/development/python-modules/rank-bm25/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "dorianbrown";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-+BxQBflMm2AvCLAFFj52Jpkqn+KErwYXU1wztintgOg=";
   };
 
diff --git a/pkgs/development/python-modules/rapidfuzz-capi/default.nix b/pkgs/development/python-modules/rapidfuzz-capi/default.nix
index 342f09b2708b..312030dc0ef3 100644
--- a/pkgs/development/python-modules/rapidfuzz-capi/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz-capi/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "rapidfuzz_capi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0IvJl2JU/k1WbGPWRoucVGbVsEFNPHZT1ozEQAKQnPk=";
   };
 
diff --git a/pkgs/development/python-modules/ratelimit/default.nix b/pkgs/development/python-modules/ratelimit/default.nix
index b17d017fbd6a..e32bc748ece8 100644
--- a/pkgs/development/python-modules/ratelimit/default.nix
+++ b/pkgs/development/python-modules/ratelimit/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tomasbasham";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "04hy3hhh5xdqcsz0lx8j18zbj88kh5ik4wyi5d3a5sfy2hx70in2";
   };
 
diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix
index ac4f03faaa78..8caecb2e0649 100644
--- a/pkgs/development/python-modules/raven/default.nix
+++ b/pkgs/development/python-modules/raven/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "raven-python";
-    rev = version;
+    tag = version;
     sha256 = "16x9ldl8cy7flw5kh7qmgbmflqyf210j3q6ac2lw61sgwajsnvw8";
   };
 
diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix
index 7c75c32be269..94d9615f14db 100644
--- a/pkgs/development/python-modules/readability-lxml/default.nix
+++ b/pkgs/development/python-modules/readability-lxml/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "buriy";
     repo = "python-readability";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MKdQRety24qOG9xgIdaCJ72XEImP42SlMG6tC7bwzo4=";
   };
 
diff --git a/pkgs/development/python-modules/readlike/default.nix b/pkgs/development/python-modules/readlike/default.nix
index fa7480f31ad4..66d303b15a22 100644
--- a/pkgs/development/python-modules/readlike/default.nix
+++ b/pkgs/development/python-modules/readlike/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jangler";
     repo = "readlike";
-    rev = version;
+    tag = version;
     sha256 = "1mw8j8ads8hqdbz42siwpffi4wi5s33z9g14a5c2i7vxp8m68qc1";
   };
 
diff --git a/pkgs/development/python-modules/readmdict/default.nix b/pkgs/development/python-modules/readmdict/default.nix
index 9089bd1b44dd..e46da18003a3 100644
--- a/pkgs/development/python-modules/readmdict/default.nix
+++ b/pkgs/development/python-modules/readmdict/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ffreemt";
     repo = "readmdict";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1/f+o2bVscT3EA8XQyS2hWjhimLRzfIBM6u2O7UqwcA=";
   };
 
diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix
index a61f2804d71f..39dfb0c54902 100644
--- a/pkgs/development/python-modules/recommonmark/default.nix
+++ b/pkgs/development/python-modules/recommonmark/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rtfd";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0kwm4smxbgq0c0ybkxfvlgrfb3gq9amdw94141jyykk9mmz38379";
   };
 
diff --git a/pkgs/development/python-modules/rectangle-packer/default.nix b/pkgs/development/python-modules/rectangle-packer/default.nix
index 53a58f1246b6..64edd9f16955 100644
--- a/pkgs/development/python-modules/rectangle-packer/default.nix
+++ b/pkgs/development/python-modules/rectangle-packer/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Penlect";
     repo = "rectangle-packer";
-    rev = version;
+    tag = version;
     hash = "sha256-YsMLB9jfAC5yB8TnlY9j6ybXM2ILireOgQ8m8wYo4ts=";
   };
 
diff --git a/pkgs/development/python-modules/rectpack/default.nix b/pkgs/development/python-modules/rectpack/default.nix
index d469d7021ef3..b9138eeb07fc 100644
--- a/pkgs/development/python-modules/rectpack/default.nix
+++ b/pkgs/development/python-modules/rectpack/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "secnot";
     repo = "rectpack";
-    rev = version;
+    tag = version;
     hash = "sha256-kU0TT3wiudcLXrT+lYPYHYRtf7aNj/IKpnYKb/H91ng=";
   };
 
diff --git a/pkgs/development/python-modules/releases/default.nix b/pkgs/development/python-modules/releases/default.nix
index 2db172bdeb5b..137ca659e8ff 100644
--- a/pkgs/development/python-modules/releases/default.nix
+++ b/pkgs/development/python-modules/releases/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bitprophet";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-IgEKAUk97R3ZvqvexD/ptT8i0uf48K+DKkk4q3pn3G8=";
   };
 
diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix
index b88ab282a6ad..68b84d1b30c7 100644
--- a/pkgs/development/python-modules/remi/default.nix
+++ b/pkgs/development/python-modules/remi/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rawpython";
     repo = "remi";
-    rev = version;
+    tag = version;
     hash = "sha256-VQn+Uzp6oGSit8ot0e8B0C2N41Q8+J+o91skyVN1gDA=";
   };
 
diff --git a/pkgs/development/python-modules/remote-pdb/default.nix b/pkgs/development/python-modules/remote-pdb/default.nix
index c17f48d45155..a336280b9bf9 100644
--- a/pkgs/development/python-modules/remote-pdb/default.nix
+++ b/pkgs/development/python-modules/remote-pdb/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ionelmc";
     repo = "python-remote-pdb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/7RysJOJigU4coC6d/Ob2lrtw8u8nLZI8wBk4oEEY3g=";
   };
   meta = with lib; {
diff --git a/pkgs/development/python-modules/reparser/default.nix b/pkgs/development/python-modules/reparser/default.nix
index 4ea2dab3e785..2a7f8651c9e8 100644
--- a/pkgs/development/python-modules/reparser/default.nix
+++ b/pkgs/development/python-modules/reparser/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xmikos";
     repo = "reparser";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "04v7h52wny0j2qj37501nk33j0s4amm134kagdicx2is49zylzq1";
   };
 
diff --git a/pkgs/development/python-modules/reprint/default.nix b/pkgs/development/python-modules/reprint/default.nix
index 5981e3abb4b2..601ee9081ce9 100644
--- a/pkgs/development/python-modules/reprint/default.nix
+++ b/pkgs/development/python-modules/reprint/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yinzo";
     repo = "reprint";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-99FC12LcvvRRwNAxDSvWo9vRYmieL0JHSaCJqO/UGEs=";
   };
 
diff --git a/pkgs/development/python-modules/reprshed/default.nix b/pkgs/development/python-modules/reprshed/default.nix
index fb05ed572625..060378f9d1a4 100644
--- a/pkgs/development/python-modules/reprshed/default.nix
+++ b/pkgs/development/python-modules/reprshed/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mentalisttraceur";
     repo = "python-reprshed";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XfmiewI74eDLKTAU6Ed76QXfJYMRb+idRACl6CW07ME=";
   };
 
diff --git a/pkgs/development/python-modules/requests-credssp/default.nix b/pkgs/development/python-modules/requests-credssp/default.nix
index 428b4ac18777..375a0c7f12ed 100644
--- a/pkgs/development/python-modules/requests-credssp/default.nix
+++ b/pkgs/development/python-modules/requests-credssp/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HHLEmQ+mNjMjpR6J+emrKFM+2PiYq32o7Gnoo0gUrNA=";
   };
 
diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix
index 541604089e25..69e274608f3c 100644
--- a/pkgs/development/python-modules/requests-http-signature/default.nix
+++ b/pkgs/development/python-modules/requests-http-signature/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyauth";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sW2vYqT/nY27DvEKHdptc3dUpuqKmD7PLMs+Xp+cpeU=";
   };
 
diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix
index 70a5eebacdb5..df0b30772309 100644
--- a/pkgs/development/python-modules/requests-kerberos/default.nix
+++ b/pkgs/development/python-modules/requests-kerberos/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "requests";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-s1Q3zqKPSuTkiFExr+axai9Eta1xjw/cip8xzfDGR88=";
   };
 
diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix
index 550465962e31..0d711eb4d78b 100644
--- a/pkgs/development/python-modules/requests-pkcs12/default.nix
+++ b/pkgs/development/python-modules/requests-pkcs12/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "m-click";
     repo = "requests_pkcs12";
-    rev = version;
+    tag = version;
     hash = "sha256-ukS0vxG2Rd71GsF1lmpsDSM2JovwqhXsaAnZdF8WGQo=";
   };
 
diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix
index 3bb181342c65..fb2d170ee56a 100644
--- a/pkgs/development/python-modules/resolvelib/default.nix
+++ b/pkgs/development/python-modules/resolvelib/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sarugaku";
     repo = "resolvelib";
-    rev = version;
+    tag = version;
     hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8=";
   };
 
diff --git a/pkgs/development/python-modules/result/default.nix b/pkgs/development/python-modules/result/default.nix
index cd4793401976..95a464b9126d 100644
--- a/pkgs/development/python-modules/result/default.nix
+++ b/pkgs/development/python-modules/result/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rustedpy";
     repo = "result";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o+7qKxGQCeMUnsmEReggvf+XwQWFHRCYArYk3DxCa50=";
   };
 
diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix
index 596a2ca07290..55b146f43614 100644
--- a/pkgs/development/python-modules/rfc6555/default.nix
+++ b/pkgs/development/python-modules/rfc6555/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sethmlarson";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM=";
   };
 
diff --git a/pkgs/development/python-modules/rich-argparse-plus/default.nix b/pkgs/development/python-modules/rich-argparse-plus/default.nix
index 159190d45e1d..86c1ad2976a9 100644
--- a/pkgs/development/python-modules/rich-argparse-plus/default.nix
+++ b/pkgs/development/python-modules/rich-argparse-plus/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "michelcrypt4d4mus";
     repo = "rich-argparse-plus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oF2wuvyLYwObVJ4fhJl9b/sdfmQ2ahgKkfd9ZwObfPw=";
   };
 
diff --git a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
index 014f651e18c3..f5b492267522 100644
--- a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
+++ b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RIPE-NCC";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xIBIKsQvDmVBa/C8/7Wr3WKeepHaGhoXlgatXSUtWLA=";
   };
 
diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index 3c258f2b8fea..c659d78206b3 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "pyrlp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cRp+ZOPYs9kcqMKGaiYMOFBY+aPCyFqu+1/5wloLwqU=";
   };
 
diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix
index 5041ec57ab1a..4b7e583597e1 100644
--- a/pkgs/development/python-modules/roku/default.nix
+++ b/pkgs/development/python-modules/roku/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jcarbaugh";
     repo = "python-roku";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09mq59kjll7gj1srw4qc921ncsm7cld95sbz5v3p2bwmgckpqza7";
   };
 
diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix
index 76f93dc33905..acda0181650b 100644
--- a/pkgs/development/python-modules/roonapi/default.nix
+++ b/pkgs/development/python-modules/roonapi/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pavoni";
     repo = "pyroon";
-    rev = version;
+    tag = version;
     hash = "sha256-6wQsaZ50J2xIPXzICglg5pf8U0r4tL8iqcbdwjZadwU=";
   };
 
diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index 4d88ca3d47d8..21c62fabfcb6 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sashs";
     repo = "Ropper";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yuHJ+EpglumEAXEu0iJKIXK1ouW1yptNahM9Wmk7AW4=";
   };
 
diff --git a/pkgs/development/python-modules/rowan/default.nix b/pkgs/development/python-modules/rowan/default.nix
index 84b872d871a7..da77f867150e 100644
--- a/pkgs/development/python-modules/rowan/default.nix
+++ b/pkgs/development/python-modules/rowan/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "glotzerlab";
     repo = "rowan";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-klIqyX04w1xYmYtAbLF5jwpcJ83oKOaENboxyCL70EY=";
   };
 
diff --git a/pkgs/development/python-modules/rpi-bad-power/default.nix b/pkgs/development/python-modules/rpi-bad-power/default.nix
index 00e7830fbd7c..eaca16184d77 100644
--- a/pkgs/development/python-modules/rpi-bad-power/default.nix
+++ b/pkgs/development/python-modules/rpi-bad-power/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "shenxn";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256:1yvfz28blq4fdnn614n985vbs5hcw1gm3i9am53k410sfs7ilvkk";
   };
 
diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix
index 064a7a7a9040..46c7ec835636 100644
--- a/pkgs/development/python-modules/rply/default.nix
+++ b/pkgs/development/python-modules/rply/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alex";
     repo = "rply";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mO/wcIsDIBjoxUsFvzftj5H5ziJijJcoyrUk52fcyE4=";
   };
 
diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix
index 24aa686c807c..9c2fe5fc537b 100644
--- a/pkgs/development/python-modules/rtoml/default.nix
+++ b/pkgs/development/python-modules/rtoml/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "samuelcolvin";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1movtKMQkQ6PEpKpSkK0Oy4AV0ee7XrS0P9m6QwZTaM=";
   };
 
diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix
index f7c96b10d3e1..175bdede9f15 100644
--- a/pkgs/development/python-modules/ruffus/default.nix
+++ b/pkgs/development/python-modules/ruffus/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cgat-developers";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0fnzpchwwqsy5h18fs0n90s51w25n0dx0l74j0ka6lvhjl5sxn4c";
   };
 
diff --git a/pkgs/development/python-modules/runs/default.nix b/pkgs/development/python-modules/runs/default.nix
index 19ea9683b378..ba4dca8a6ea3 100644
--- a/pkgs/development/python-modules/runs/default.nix
+++ b/pkgs/development/python-modules/runs/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rec";
     repo = "runs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aEamhXr3C+jYDzQGzcmGFyl5oEtovxlNacFM08y0ZEk=";
   };
 
diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix
index cdf4143afb04..37b013c7c459 100644
--- a/pkgs/development/python-modules/rustworkx/default.nix
+++ b/pkgs/development/python-modules/rustworkx/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Qiskit";
     repo = "rustworkx";
-    rev = version;
+    tag = version;
     hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0=";
   };
 
diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix
index 30be2072b595..abf4099d034f 100644
--- a/pkgs/development/python-modules/rxv/default.nix
+++ b/pkgs/development/python-modules/rxv/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wuub";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0jldnlzbfg5jm1nbgv91mlvcqkswd9f2n3qj9aqlbmj1cxq19yz8";
   };
 
diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix
index 08960b6dbc39..4314690ce77c 100644
--- a/pkgs/development/python-modules/sacremoses/default.nix
+++ b/pkgs/development/python-modules/sacremoses/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alvations";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1gzr56w8yx82mn08wax5m0xyg15ym4ri5l80gmagp8r53443j770";
   };
 
diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix
index e9ad2980e319..478323551f9f 100644
--- a/pkgs/development/python-modules/sarge/default.nix
+++ b/pkgs/development/python-modules/sarge/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vsajip";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-bT1DbcQi+SbeRBsL7ILuQbSnAj3BBB4+FNl+Zek5xU4=";
   };
 
diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix
index 63014b75aa34..bcc3f0e390be 100644
--- a/pkgs/development/python-modules/scramp/default.nix
+++ b/pkgs/development/python-modules/scramp/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tlocke";
     repo = "scramp";
-    rev = version;
+    tag = version;
     hash = "sha256-KpododRJ+CYRGBR7Sr5cVBhJvUwh9YmPERd/DAJqEcY=";
   };
 
diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix
index 257955ed8d5c..e4e1efff1927 100644
--- a/pkgs/development/python-modules/seekpath/default.nix
+++ b/pkgs/development/python-modules/seekpath/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "giovannipizzi";
     repo = "seekpath";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8Nm8SKHda2qt1kncXZxC4T3cpicXpDZhxPzs78JICzE=";
   };
 
diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix
index 322446fd0353..a4486159c421 100644
--- a/pkgs/development/python-modules/segments/default.nix
+++ b/pkgs/development/python-modules/segments/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cldf";
     repo = "segments";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Z9AQnsK/0HUCZDzdpQKNfSBWxfAOjWNBytcfI6yBY84=";
   };
 
diff --git a/pkgs/development/python-modules/semgrep/default.nix b/pkgs/development/python-modules/semgrep/default.nix
index 91abd5bea075..8342caeab0ce 100644
--- a/pkgs/development/python-modules/semgrep/default.nix
+++ b/pkgs/development/python-modules/semgrep/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "semgrep";
     repo = "semgrep";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = common.srcHash;
   };
 
diff --git a/pkgs/development/python-modules/sentence-splitter/default.nix b/pkgs/development/python-modules/sentence-splitter/default.nix
index 1b88987698ce..7e22c1ff60ef 100644
--- a/pkgs/development/python-modules/sentence-splitter/default.nix
+++ b/pkgs/development/python-modules/sentence-splitter/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mediacloud";
     repo = "sentence-splitter";
-    rev = version;
+    tag = version;
     hash = "sha256-FxRi8fhKB9++lCTFpCAug0fxjkSVTKChLY84vkshR34=";
   };
 
diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix
index d1e12b2ae1fa..bd83c96ad44e 100644
--- a/pkgs/development/python-modules/sepaxml/default.nix
+++ b/pkgs/development/python-modules/sepaxml/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "python-sepaxml";
-    rev = version;
+    tag = version;
     hash = "sha256-l5UMy0M3Ovzb6rcSAteGOnKdmBPHn4L9ZWY+YGOCn40=";
   };
 
diff --git a/pkgs/development/python-modules/seqeval/default.nix b/pkgs/development/python-modules/seqeval/default.nix
index a8a06ed89ab2..7e6617a7f16e 100644
--- a/pkgs/development/python-modules/seqeval/default.nix
+++ b/pkgs/development/python-modules/seqeval/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chakki-works";
     repo = "seqeval";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0qv05gn54kc4wpmwnflmfqw4gwwb8lxqhkiihl0pvl7s2i7qzx2j";
   };
 
diff --git a/pkgs/development/python-modules/seventeentrack/default.nix b/pkgs/development/python-modules/seventeentrack/default.nix
index d0331594e3fd..2a7336b442d7 100644
--- a/pkgs/development/python-modules/seventeentrack/default.nix
+++ b/pkgs/development/python-modules/seventeentrack/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "McSwindler";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-vMdRXcd0es/LjgsVyWItSLFzlSTEa3oaA6lr/NL4i8U=";
   };
 
diff --git a/pkgs/development/python-modules/shellescape/default.nix b/pkgs/development/python-modules/shellescape/default.nix
index fe0a29458b6f..d0c6d13a8344 100644
--- a/pkgs/development/python-modules/shellescape/default.nix
+++ b/pkgs/development/python-modules/shellescape/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrissimpkins";
     repo = "shellescape";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HAe3Qf3lLeVWw/tVkW0J+CfoxSoOnCcWDR2nEWZn7HM=";
   };
 
diff --git a/pkgs/development/python-modules/shutilwhich/default.nix b/pkgs/development/python-modules/shutilwhich/default.nix
index bc022fbe0f85..157fbe15e794 100644
--- a/pkgs/development/python-modules/shutilwhich/default.nix
+++ b/pkgs/development/python-modules/shutilwhich/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mbr";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "05fwcjn86w8wprck04iv1zccfi39skdf0lhwpb4b9gpvklyc9mj0";
   };
 
diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix
index 2bd0bd80be06..ec265dec157a 100644
--- a/pkgs/development/python-modules/simanneal/default.nix
+++ b/pkgs/development/python-modules/simanneal/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "perrygeo";
     repo = "simanneal";
-    rev = version;
+    tag = version;
     hash = "sha256-yKZHkrf6fM0WsHczIEK5Kxusz5dSBgydK3fLu1nDyvk=";
   };
 
diff --git a/pkgs/development/python-modules/simple-rest-client/default.nix b/pkgs/development/python-modules/simple-rest-client/default.nix
index 023b604c8a57..05c9f6d9f5d7 100644
--- a/pkgs/development/python-modules/simple-rest-client/default.nix
+++ b/pkgs/development/python-modules/simple-rest-client/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "allisson";
     repo = "python-simple-rest-client";
-    rev = version;
+    tag = version;
     hash = "sha256-IaLo7nBMIabi4ZjZ4ZLJliCL/dzidaCBCmn0cq7Fzdw=";
   };
 
diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix
index 8e336d4e61c2..3e9001b8e08f 100644
--- a/pkgs/development/python-modules/simpleaudio/default.nix
+++ b/pkgs/development/python-modules/simpleaudio/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hamiltron";
     repo = "py-simple-audio";
-    rev = version;
+    tag = version;
     sha256 = "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i";
   };
 
diff --git a/pkgs/development/python-modules/simplehound/default.nix b/pkgs/development/python-modules/simplehound/default.nix
index bf2efed90c09..631722cebe71 100644
--- a/pkgs/development/python-modules/simplehound/default.nix
+++ b/pkgs/development/python-modules/simplehound/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robmarkcole";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1b5m3xjmk0l6ynf0yvarplsfsslgklalfcib7sikxg3v5hiv9qwh";
   };
 
diff --git a/pkgs/development/python-modules/simplenote/default.nix b/pkgs/development/python-modules/simplenote/default.nix
index 2c3203446683..5ae0616db447 100644
--- a/pkgs/development/python-modules/simplenote/default.nix
+++ b/pkgs/development/python-modules/simplenote/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simplenote-vim";
     repo = "simplenote.py";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1grvvgzdybhxjydalnsgh2aaz3f48idv5lqs48gr0cn7n18xwhd5";
   };
 
diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix
index 00d5dd7a784e..690cd7ec75f8 100644
--- a/pkgs/development/python-modules/sklearn-deap/default.nix
+++ b/pkgs/development/python-modules/sklearn-deap/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rsteca";
     repo = "sklearn-deap";
-    rev = version;
+    tag = version;
     hash = "sha256-bXBHlv1pIOyDLKCBeffyHaTZ7gNiZNl0soa73e8E4/M=";
   };
 
diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix
index b917cf214890..25420e038e58 100644
--- a/pkgs/development/python-modules/skyfield/default.nix
+++ b/pkgs/development/python-modules/skyfield/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "skyfielders";
     repo = "python-skyfield";
-    rev = version;
+    tag = version;
     hash = "sha256-PZ63sohdfpop3nYQr2RIMjPbrL9jdfincEhw5D8NZ+Y=";
   };
 
diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix
index 2ce2555a25ca..a1d71ab647a7 100644
--- a/pkgs/development/python-modules/skytemple-dtef/default.nix
+++ b/pkgs/development/python-modules/skytemple-dtef/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = "skytemple-dtef";
-    rev = version;
+    tag = version;
     hash = "sha256-vVh4WRjx/iFJnTZC7D/OCi0gOwKaXs/waVXUEu5Cda8=";
   };
 
diff --git a/pkgs/development/python-modules/skytemple-eventserver/default.nix b/pkgs/development/python-modules/skytemple-eventserver/default.nix
index 275948b3970d..daf2286c2fa8 100644
--- a/pkgs/development/python-modules/skytemple-eventserver/default.nix
+++ b/pkgs/development/python-modules/skytemple-eventserver/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-PWLGPORNprTfG+jgXI1sxyVkRTwSEib4SZhPdOBchwE=";
   };
 
diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix
index 3d68f501919c..7a8a18de6963 100644
--- a/pkgs/development/python-modules/skytemple-files/default.nix
+++ b/pkgs/development/python-modules/skytemple-files/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = "skytemple-files";
-    rev = version;
+    tag = version;
     hash = "sha256-4ENuYq074j/VdzLyrGVCGaZhoStwlgJWTqGbrt20A3Q=";
     # Most patches are in submodules
     fetchSubmodules = true;
diff --git a/pkgs/development/python-modules/skytemple-icons/default.nix b/pkgs/development/python-modules/skytemple-icons/default.nix
index 20c6187a2c25..4abbcf196051 100644
--- a/pkgs/development/python-modules/skytemple-icons/default.nix
+++ b/pkgs/development/python-modules/skytemple-icons/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0wagdvzks9irdl5lj8sfqkkvfwwmdpvjyzx6424shvpp5mk28dcv";
   };
 
diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix
index f635aa35f9ec..52f094ea3e05 100644
--- a/pkgs/development/python-modules/skytemple-rust/default.nix
+++ b/pkgs/development/python-modules/skytemple-rust/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = "skytemple-rust";
-    rev = version;
+    tag = version;
     hash = "sha256-0hIwFJn/cwtKHKoD+upeorC52YnDlej3TrWf3PmAQAQ=";
   };
 
diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
index 64bd47671d03..49c018831c66 100644
--- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
+++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = "skytemple-ssb-debugger";
-    rev = version;
+    tag = version;
     hash = "sha256-HmJOjHX2/P284DSIdKuSz3++Qr1fKVGRQmA/+cMrcYw=";
   };
 
diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix
index 8c7b0e242ce4..9b2126366fe9 100644
--- a/pkgs/development/python-modules/slicedimage/default.nix
+++ b/pkgs/development/python-modules/slicedimage/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spacetx";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1vpg8varvfx0nj6xscdfm7m118hzsfz7qfzn28r9rsfvrhr0dlcw";
   };
 
diff --git a/pkgs/development/python-modules/slugid/default.nix b/pkgs/development/python-modules/slugid/default.nix
index 3e9a885a6023..5dfeeb9ef7d3 100644
--- a/pkgs/development/python-modules/slugid/default.nix
+++ b/pkgs/development/python-modules/slugid/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "taskcluster";
     repo = "slugid.py";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "McBxGRi8KqVhe2Xez5k4G67R5wBCCoh41dRsTKW4xMA=";
   };
 
diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix
index b742c8d6985a..15175c0f3dfd 100644
--- a/pkgs/development/python-modules/snuggs/default.nix
+++ b/pkgs/development/python-modules/snuggs/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1p3lh9s2ylsnrzbs931y2vn7mp2y2xskgqmh767c9l1a33shfgwf";
   };
 
diff --git a/pkgs/development/python-modules/socketio-client/default.nix b/pkgs/development/python-modules/socketio-client/default.nix
index 4f7177766821..49afa3d77f5a 100644
--- a/pkgs/development/python-modules/socketio-client/default.nix
+++ b/pkgs/development/python-modules/socketio-client/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "invisibleroads";
     repo = "socketio-client";
-    rev = version;
+    tag = version;
     hash = "sha256-71sjiGJDDYElPGUNCH1HaVdvgMt8KeD/kXVDpF615ho=";
   };
 
diff --git a/pkgs/development/python-modules/solidpython2/default.nix b/pkgs/development/python-modules/solidpython2/default.nix
index 124945750e7d..6b7e576131ae 100644
--- a/pkgs/development/python-modules/solidpython2/default.nix
+++ b/pkgs/development/python-modules/solidpython2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jeff-dh";
     repo = "SolidPython";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Tq3hrsC2MmueCqChk6mY/u/pCjF/pFuU2o3K+qw7ImY=";
   };
 
diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix
index 679351c90657..235ec97e4a32 100644
--- a/pkgs/development/python-modules/solo-python/default.nix
+++ b/pkgs/development/python-modules/solo-python/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "solokeys";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU=";
   };
 
diff --git a/pkgs/development/python-modules/somfy-mylink-synergy/default.nix b/pkgs/development/python-modules/somfy-mylink-synergy/default.nix
index 1bb28e17cd1f..16ad50c367dc 100644
--- a/pkgs/development/python-modules/somfy-mylink-synergy/default.nix
+++ b/pkgs/development/python-modules/somfy-mylink-synergy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bendews";
     repo = "somfy-mylink-synergy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1aa178b5lxdzfa4z7sjw6ky39dkfazp7dqs9dq78z2zay2sqgmgr";
   };
 
diff --git a/pkgs/development/python-modules/somweb/default.nix b/pkgs/development/python-modules/somweb/default.nix
index 7abe33c14bf3..cd5dd0a7dded 100644
--- a/pkgs/development/python-modules/somweb/default.nix
+++ b/pkgs/development/python-modules/somweb/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "taarskog";
     repo = "pySOMweb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cLKEKDCMK7lCtbmj2KbhgJUCZpPnPI5tZvO5L+ey8qI=";
   };
 
diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix
index a525167635b6..5b05a6262d40 100644
--- a/pkgs/development/python-modules/sortedcollections/default.nix
+++ b/pkgs/development/python-modules/sortedcollections/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "grantjenks";
     repo = "python-sortedcollections";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GkZO8afUAgDpDjIa3dhO6nxykqrljeKldunKMODSXfg=";
   };
 
diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix
index 967119bbe776..ba62a7c44bb6 100644
--- a/pkgs/development/python-modules/sortedcontainers/default.nix
+++ b/pkgs/development/python-modules/sortedcontainers/default.nix
@@ -14,7 +14,7 @@ let
     src = fetchFromGitHub {
       owner = "grantjenks";
       repo = "python-sortedcontainers";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-YRbSM2isWi7AzfquFvuZBlpEMNUnBJTBLBn0/XYVHKQ=";
     };
 
diff --git a/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/pkgs/development/python-modules/sphinx-basic-ng/default.nix
index 9afde893cfde..bb4fb0b0a4dd 100644
--- a/pkgs/development/python-modules/sphinx-basic-ng/default.nix
+++ b/pkgs/development/python-modules/sphinx-basic-ng/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pradyunsg";
     repo = "sphinx-basic-ng";
-    rev = version;
+    tag = version;
     hash = "sha256-MHBGIKOKhGklrx3O075LRud8NhY2hzlTWh+jalrFpko=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-better-theme/default.nix b/pkgs/development/python-modules/sphinx-better-theme/default.nix
index 130f96e3b78c..217e85c56d09 100644
--- a/pkgs/development/python-modules/sphinx-better-theme/default.nix
+++ b/pkgs/development/python-modules/sphinx-better-theme/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "irskep";
     repo = "sphinx-better-theme";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "07lhfmsjcfzcchsjzh6kxdq5s47j2a6lb5wv3m1kmv2hcm3gvddh";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-copybutton/default.nix b/pkgs/development/python-modules/sphinx-copybutton/default.nix
index 67216681b75e..9a10da901a69 100644
--- a/pkgs/development/python-modules/sphinx-copybutton/default.nix
+++ b/pkgs/development/python-modules/sphinx-copybutton/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "sphinx-copybutton";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LM2LtQuYsPRJ2XX9aAW36xRtwghTkzug6A6fpVJ6hbk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix
index 903005d0df9a..3fdcd50dfc84 100644
--- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix
+++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "readthedocs";
     repo = "sphinx-hoverxref";
-    rev = version;
+    tag = version;
     hash = "sha256-DJ+mHu9IeEYEyf/SD+nDNtWpTf6z7tQzG0ogaECDpkU=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix
index 5a36420dc430..7d871b6b5f27 100644
--- a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix
+++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pradyunsg";
     repo = "sphinx-inline-tabs";
-    rev = version;
+    tag = version;
     hash = "sha256-1oZheHDNOQU0vWL3YClQrJe94WyUJ72bCAF1UKtjJ0w=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-issues/default.nix b/pkgs/development/python-modules/sphinx-issues/default.nix
index ea8f4268fb97..357167a8d8d4 100644
--- a/pkgs/development/python-modules/sphinx-issues/default.nix
+++ b/pkgs/development/python-modules/sphinx-issues/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sloria";
     repo = "sphinx-issues";
-    rev = version;
+    tag = version;
     sha256 = "1lns6isq9kwcw8z4jwgy927f7idx9srvri5adaa5zmypw5x47hha";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-lv2-theme/default.nix b/pkgs/development/python-modules/sphinx-lv2-theme/default.nix
index 47689da31158..0321ace366d4 100644
--- a/pkgs/development/python-modules/sphinx-lv2-theme/default.nix
+++ b/pkgs/development/python-modules/sphinx-lv2-theme/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     owner = "LV2";
     repo = "sphinx_lv2_theme";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-x3h2hOQIyzOmnh58WMHjuOARdML1sDiVAf7m0YghhJ4=";
   };
 
diff --git a/pkgs/development/python-modules/spiderpy/default.nix b/pkgs/development/python-modules/spiderpy/default.nix
index 88823aff54ba..7430c989ddb2 100644
--- a/pkgs/development/python-modules/spiderpy/default.nix
+++ b/pkgs/development/python-modules/spiderpy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "peternijssen";
     repo = "spiderpy";
-    rev = version;
+    tag = version;
     hash = "sha256-Yujy8HSMbK2DQ/913r2c74hKPYDfcHFKq04ysqxG+go=";
   };
 
diff --git a/pkgs/development/python-modules/sqlalchemy-file/default.nix b/pkgs/development/python-modules/sqlalchemy-file/default.nix
index 0cd6d46988ae..858ea3b3b43a 100644
--- a/pkgs/development/python-modules/sqlalchemy-file/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-file/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jowilf";
     repo = "sqlalchemy-file";
-    rev = version;
+    tag = version;
     hash = "sha256-gtW7YA/rQ48tnqPdypMnSqqtwb90nhAkiQNhgEr1M3I=";
   };
 
diff --git a/pkgs/development/python-modules/ssdpy/default.nix b/pkgs/development/python-modules/ssdpy/default.nix
index 8cadb4ec74fa..2cb916edb982 100644
--- a/pkgs/development/python-modules/ssdpy/default.nix
+++ b/pkgs/development/python-modules/ssdpy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MoshiBin";
     repo = "ssdpy";
-    rev = version;
+    tag = version;
     hash = "sha256-luOanw4aOepGxoGtmnWZosq9JyHLJb3E+25tPkkL1w0=";
   };
 
diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix
index 0f2fc24474a1..9d15f6c49194 100644
--- a/pkgs/development/python-modules/sshpubkeys/default.nix
+++ b/pkgs/development/python-modules/sshpubkeys/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ojarva";
     repo = "python-${pname}";
-    rev = version;
+    tag = version;
     sha256 = "1qsixmqg97kyvg1naw76blq4314vaw4hl5f9wi0v111mcmdia1r4";
   };
 
diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix
index 5ff77b3a6488..c5f97b69e10e 100644
--- a/pkgs/development/python-modules/starlette-admin/default.nix
+++ b/pkgs/development/python-modules/starlette-admin/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jowilf";
     repo = "starlette-admin";
-    rev = version;
+    tag = version;
     hash = "sha256-DoYD8Hc5pd68+BhASw3mwwCdhu0vYHiELjVmVwU8FHs=";
   };
 
diff --git a/pkgs/development/python-modules/static3/default.nix b/pkgs/development/python-modules/static3/default.nix
index 13a41618feb3..352416b9de63 100644
--- a/pkgs/development/python-modules/static3/default.nix
+++ b/pkgs/development/python-modules/static3/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rmohr";
     repo = "static3";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uFgv+57/UZs4KoOdkFxbvTEDQrJbb0iYJ5JoWWN4yFY=";
   };
 
diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix
index 2967f11b9aa6..f0d55464cff1 100644
--- a/pkgs/development/python-modules/staticjinja/default.nix
+++ b/pkgs/development/python-modules/staticjinja/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "staticjinja";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-LfJTQhZtnTOm39EWF1m2MP5rxz/5reE0G1Uk9L7yx0w=";
   };
 
diff --git a/pkgs/development/python-modules/stopit/default.nix b/pkgs/development/python-modules/stopit/default.nix
index 4569b1ba88e2..f71471c7b7d3 100644
--- a/pkgs/development/python-modules/stopit/default.nix
+++ b/pkgs/development/python-modules/stopit/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "glenfant";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-uXJUA70JOGWT2NmS6S7fPrTWAJZ0mZ/hICahIUzjfbw=";
   };
 
diff --git a/pkgs/development/python-modules/stransi/default.nix b/pkgs/development/python-modules/stransi/default.nix
index 52e6ee474549..6c024a6126cf 100644
--- a/pkgs/development/python-modules/stransi/default.nix
+++ b/pkgs/development/python-modules/stransi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getcuia";
     repo = "stransi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PDMel6emra5bzX+FwHvUVpFu2YkRKy31UwkCL4sGJ14=";
   };
 
diff --git a/pkgs/development/python-modules/strct/default.nix b/pkgs/development/python-modules/strct/default.nix
index 989b4e006d30..0d11d793cc13 100644
--- a/pkgs/development/python-modules/strct/default.nix
+++ b/pkgs/development/python-modules/strct/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "shaypal5";
     repo = "strct";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uPM2U+emZUCGqEhIeTBmaOu8eSfK4arqvv9bItBWpUs=";
   };
 
diff --git a/pkgs/development/python-modules/streamcontroller-plugin-tools/default.nix b/pkgs/development/python-modules/streamcontroller-plugin-tools/default.nix
index 1375f6eae785..00ae02831029 100644
--- a/pkgs/development/python-modules/streamcontroller-plugin-tools/default.nix
+++ b/pkgs/development/python-modules/streamcontroller-plugin-tools/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "StreamController";
     repo = "streamcontroller-plugin-tools";
-    rev = version;
+    tag = version;
     hash = "sha256-dQZPRSzHhI3X+Pf7miwJlECGFgUfp68PtvwXAmpq5/s=";
   };
 
diff --git a/pkgs/development/python-modules/streaming-form-data/default.nix b/pkgs/development/python-modules/streaming-form-data/default.nix
index 0d13b9db97cc..8bfabae1e74d 100644
--- a/pkgs/development/python-modules/streaming-form-data/default.nix
+++ b/pkgs/development/python-modules/streaming-form-data/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "siddhantgoel";
     repo = "streaming-form-data";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ntiad5GZtfRd+2uDPgbDzLBzErGFroffK6ZAmMcsfXA=";
   };
 
diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix
index 7b37464a69be..fd2106585d79 100644
--- a/pkgs/development/python-modules/stups-cli-support/default.nix
+++ b/pkgs/development/python-modules/stups-cli-support/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zalando-stups";
     repo = "stups-cli-support";
-    rev = version;
+    tag = version;
     sha256 = "1r6g29gd009p87m8a6wv4rzx7f0564zdv67qz5xys4wsgvc95bx0";
   };
 
diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix
index a2662d754c55..51229696c590 100644
--- a/pkgs/development/python-modules/stups-fullstop/default.nix
+++ b/pkgs/development/python-modules/stups-fullstop/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zalando-stups";
     repo = "fullstop-cli";
-    rev = version;
+    tag = version;
     sha256 = "1cpzz1b8g2mich7c1p74vfgw70vlxpgwi82a1ld82wv3srwqa0h3";
   };
 
diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix
index 1415e07ab1af..1ee4c775ba66 100644
--- a/pkgs/development/python-modules/stups-pierone/default.nix
+++ b/pkgs/development/python-modules/stups-pierone/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zalando-stups";
     repo = "pierone-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-OypGYHfiFUfcUndylM2N2WfPnfXXJ4gvWypUbltYAYE=";
   };
 
diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/pkgs/development/python-modules/stups-tokens/default.nix
index 3d9c4cd07735..eb7892a7f05f 100644
--- a/pkgs/development/python-modules/stups-tokens/default.nix
+++ b/pkgs/development/python-modules/stups-tokens/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zalando-stups";
     repo = "python-tokens";
-    rev = version;
+    tag = version;
     sha256 = "09z3l3xzdlwpivbi141gk1k0zd9m75mjwbdy81zc386rr9k8s0im";
   };
 
diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix
index 1c54cdb51212..89f3b42e3aa0 100644
--- a/pkgs/development/python-modules/stups-zign/default.nix
+++ b/pkgs/development/python-modules/stups-zign/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zalando-stups";
     repo = "zign";
-    rev = version;
+    tag = version;
     sha256 = "1vk6pnprnd5lfx96hc2c1n7kwh99f260r730x4y2h7lamlv82fh4";
   };
 
diff --git a/pkgs/development/python-modules/sumtypes/default.nix b/pkgs/development/python-modules/sumtypes/default.nix
index 91ae86b01206..df5f35ece83e 100644
--- a/pkgs/development/python-modules/sumtypes/default.nix
+++ b/pkgs/development/python-modules/sumtypes/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "radix";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-qwQyFKVnGEqHUqFmUSnHVvedsp2peM6rJZcS90paLOo=";
   };
 
diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix
index 24bb2622ecc1..3375f5502ff8 100644
--- a/pkgs/development/python-modules/svgwrite/default.nix
+++ b/pkgs/development/python-modules/svgwrite/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozman";
     repo = "svgwrite";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uOsrDhE9AwWU7GIrCVuL3uXTPqtrh8sofvo2C5t+25I=";
   };
 
diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix
index c6f41fd03b1c..109129d2232a 100644
--- a/pkgs/development/python-modules/swagger-spec-validator/default.nix
+++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = "swagger_spec_validator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7+kFmtzeze0QlGf6z/M4J4F7z771a5NWewB1S3+bxn4=";
   };
 
diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix
index 7ed844e91d6a..b352c7870e85 100644
--- a/pkgs/development/python-modules/swspotify/default.nix
+++ b/pkgs/development/python-modules/swspotify/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SwagLyrics";
     repo = "SwSpotify";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY=";
   };
 
diff --git a/pkgs/development/python-modules/syncer/default.nix b/pkgs/development/python-modules/syncer/default.nix
index aed4172d9a3f..e23e1e904465 100644
--- a/pkgs/development/python-modules/syncer/default.nix
+++ b/pkgs/development/python-modules/syncer/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miyakogi";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3EYWy6LuZ/3i+9d0QaclCqWMMw5O3WzhTY3LUL5iMso=";
   };
 
diff --git a/pkgs/development/python-modules/systembridge/default.nix b/pkgs/development/python-modules/systembridge/default.nix
index 3af2cb7c4964..14f897302192 100644
--- a/pkgs/development/python-modules/systembridge/default.nix
+++ b/pkgs/development/python-modules/systembridge/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timmo001";
     repo = "system-bridge-connector-py";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ts8zPRK6S5iLnl19Y/Uz0YAh6hDeVRNBY6HsvLwdUFw=";
   };
 
diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix
index 72fe6ed5cd2b..908b4b99eb84 100644
--- a/pkgs/development/python-modules/systemd/default.nix
+++ b/pkgs/development/python-modules/systemd/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "python-systemd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8p4m4iM/z4o6PHRQIpuSXb64tPTWGlujEYCDVLiIt2o=";
   };
 
diff --git a/pkgs/development/python-modules/systemdunitparser/default.nix b/pkgs/development/python-modules/systemdunitparser/default.nix
index 0b3431c06680..c7e23aa577d3 100644
--- a/pkgs/development/python-modules/systemdunitparser/default.nix
+++ b/pkgs/development/python-modules/systemdunitparser/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sgallagher";
     repo = "systemdunitparser";
-    rev = version;
+    tag = version;
     hash = "sha256-lcvXEieaifPUDhLdaz2FXaNdbw7wKR+x/kC+MMDT0tE=";
   };
 
diff --git a/pkgs/development/python-modules/tabview/default.nix b/pkgs/development/python-modules/tabview/default.nix
index 4db25a42b8cd..ea463e7880a7 100644
--- a/pkgs/development/python-modules/tabview/default.nix
+++ b/pkgs/development/python-modules/tabview/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TabViewer";
     repo = "tabview";
-    rev = version;
+    tag = version;
     sha256 = "1d1l8fhdn3w2zg7wakvlmjmgjh9lh9h5fal1clgyiqmhfix4cn4m";
   };
 
diff --git a/pkgs/development/python-modules/tahoma-api/default.nix b/pkgs/development/python-modules/tahoma-api/default.nix
index 13744f25f24d..29916da2c74e 100644
--- a/pkgs/development/python-modules/tahoma-api/default.nix
+++ b/pkgs/development/python-modules/tahoma-api/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "philklei";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YwOKSBlN4lNyS+hfdbQDUq1gc14FBof463ofxtUVLC4=";
   };
 
diff --git a/pkgs/development/python-modules/tailer/default.nix b/pkgs/development/python-modules/tailer/default.nix
index dbdc4e527962..ff8998571c4d 100644
--- a/pkgs/development/python-modules/tailer/default.nix
+++ b/pkgs/development/python-modules/tailer/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "six8";
     repo = "pytailer";
-    rev = version;
+    tag = version;
     sha256 = "1s5p5m3q9k7r1m0wx5wcxf20xzs0rj14qwg1ydwhf6adr17y2w5y";
   };
 
diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix
index 6fd45eef85eb..e6262571e470 100644
--- a/pkgs/development/python-modules/taxi/default.nix
+++ b/pkgs/development/python-modules/taxi/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sephii";
     repo = "taxi";
-    rev = version;
+    tag = version;
     hash = "sha256-QB88RpgzrQy7DGeRdMHC2SV5Esp/r5LZtlaY5C8vJxw=";
   };
 
diff --git a/pkgs/development/python-modules/tbats/default.nix b/pkgs/development/python-modules/tbats/default.nix
index 1f0545b49caf..a165bfd0eae3 100644
--- a/pkgs/development/python-modules/tbats/default.nix
+++ b/pkgs/development/python-modules/tbats/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "intive-DataScience";
     repo = "tbats";
-    rev = version;
+    tag = version;
     hash = "sha256-f6QqDq/ffbnFBZRAT6KQRlqvZZSE+Pff2/o+htVabZI=";
   };
 
diff --git a/pkgs/development/python-modules/tcxparser/default.nix b/pkgs/development/python-modules/tcxparser/default.nix
index 4de4e9a39a97..c96f18a1bd87 100644
--- a/pkgs/development/python-modules/tcxparser/default.nix
+++ b/pkgs/development/python-modules/tcxparser/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vkurup";
     repo = "python-tcxparser";
-    rev = version;
+    tag = version;
     hash = "sha256-HOACQpPVg/UKopz3Jdsyg0CIBnXYuVyhWUVPA+OXI0k=";
   };
 
diff --git a/pkgs/development/python-modules/tdir/default.nix b/pkgs/development/python-modules/tdir/default.nix
index c00e0b3f0bc5..2658e9fd2eb7 100644
--- a/pkgs/development/python-modules/tdir/default.nix
+++ b/pkgs/development/python-modules/tdir/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rec";
     repo = "tdir";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YYQ33Blhqk/CbocqkB9Nh6qbzMjQT07fmzx+fDTvdw8=";
   };
 
diff --git a/pkgs/development/python-modules/telepath/default.nix b/pkgs/development/python-modules/telepath/default.nix
index 3af1ba09950f..b97e8705e0d6 100644
--- a/pkgs/development/python-modules/telepath/default.nix
+++ b/pkgs/development/python-modules/telepath/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "telepath";
     owner = "wagtail";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MS4Q41WVSrjFmFjv4fztyf0U2+5WkNU79aPEKv/CeUQ=";
   };
 
diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix
index 18b67b6bf502..e530367a3caa 100644
--- a/pkgs/development/python-modules/telfhash/default.nix
+++ b/pkgs/development/python-modules/telfhash/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trendmicro";
     repo = "telfhash";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "124zajv43wx9l8rvdvmzcnbh0xpzmbn253pznpbjwvygfx16gq02";
   };
 
diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix
index d690ad1aa5a9..d71f4a5ec8bf 100644
--- a/pkgs/development/python-modules/termplotlib/default.nix
+++ b/pkgs/development/python-modules/termplotlib/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1qfrv2w7vb2bbjvd5lqfq57c23iqkry0pwmif1ha3asmz330rja1";
   };
 
diff --git a/pkgs/development/python-modules/tesla-wall-connector/default.nix b/pkgs/development/python-modules/tesla-wall-connector/default.nix
index cc5907be5b37..4d19fc44db02 100644
--- a/pkgs/development/python-modules/tesla-wall-connector/default.nix
+++ b/pkgs/development/python-modules/tesla-wall-connector/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "einarhauks";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-GblKXWV9h37E3bxNsx17hEe0uDm8ahzJUx8wiE+Vc38=";
   };
 
diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix
index d133362c3fb2..c546209ee495 100644
--- a/pkgs/development/python-modules/test-tube/default.nix
+++ b/pkgs/development/python-modules/test-tube/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "williamFalcon";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0w60xarmcw06gc4002sy7bjfykdz34gbgniswxkl0lw8a1v0xn2m";
   };
 
diff --git a/pkgs/development/python-modules/testbook/default.nix b/pkgs/development/python-modules/testbook/default.nix
index 3e6661ceb687..f21493ff6de7 100644
--- a/pkgs/development/python-modules/testbook/default.nix
+++ b/pkgs/development/python-modules/testbook/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nteract";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-qaDgae/5TRpjmjOf7aom7TC5HLHp0PHM/ds47AKtq8U=";
   };
 
diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix
index 89ba02bf4f25..329345244d34 100644
--- a/pkgs/development/python-modules/textfsm/default.nix
+++ b/pkgs/development/python-modules/textfsm/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IHgKG8v0X+LSK6purWBdwDnI/BCs5XA12ZJixuqqXWg=";
   };
 
diff --git a/pkgs/development/python-modules/textstat/default.nix b/pkgs/development/python-modules/textstat/default.nix
index 127c6f453a92..6f065919d073 100644
--- a/pkgs/development/python-modules/textstat/default.nix
+++ b/pkgs/development/python-modules/textstat/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "textstat";
     repo = "textstat";
-    rev = version;
+    tag = version;
     hash = "sha256-UOCWsIdoVGxmkro4kNBYNMYhA3kktngRDxKjo6o+GXY=";
   };
 
diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix
index 924464439578..9429c65dd072 100644
--- a/pkgs/development/python-modules/textx/default.nix
+++ b/pkgs/development/python-modules/textx/default.nix
@@ -18,7 +18,7 @@ let
     src = fetchFromGitHub {
       owner = pname;
       repo = pname;
-      rev = version;
+      tag = version;
       hash = "sha256-qiKOG6B7yWWzkL7bmcRAVv6AOHKTWmrlrsJlXD5RoaQ=";
     };
 
diff --git a/pkgs/development/python-modules/thorlabspm100/default.nix b/pkgs/development/python-modules/thorlabspm100/default.nix
index c88dab853f57..0fe8e2b0a226 100644
--- a/pkgs/development/python-modules/thorlabspm100/default.nix
+++ b/pkgs/development/python-modules/thorlabspm100/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "clade";
     repo = "ThorlabsPM100";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-X4qEow6u4aE0sbFwZfK3YEso2RS0c9j4iaWJPHaPQV4=";
   };
 
diff --git a/pkgs/development/python-modules/threat9-test-bed/default.nix b/pkgs/development/python-modules/threat9-test-bed/default.nix
index e98cdd6fdd2f..73d4c6ca0a9c 100644
--- a/pkgs/development/python-modules/threat9-test-bed/default.nix
+++ b/pkgs/development/python-modules/threat9-test-bed/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "threat9";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0YSjMf2gDdrvkDaT77iwfCkiDDXKHnZyI8d7JmBSuCg=";
   };
 
diff --git a/pkgs/development/python-modules/tikzplotlib/default.nix b/pkgs/development/python-modules/tikzplotlib/default.nix
index e09c735f4c1f..c013eb91f639 100644
--- a/pkgs/development/python-modules/tikzplotlib/default.nix
+++ b/pkgs/development/python-modules/tikzplotlib/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PLExHhEnxkEiXsE0rqvpNWwVZ+YoaDa2BTx8LktdHl0=";
   };
 
diff --git a/pkgs/development/python-modules/timeago/default.nix b/pkgs/development/python-modules/timeago/default.nix
index a1bd21cf16ae..aebf5a75c56a 100644
--- a/pkgs/development/python-modules/timeago/default.nix
+++ b/pkgs/development/python-modules/timeago/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hustcc";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-PqORJKAVrjezU/yP2ky3gb1XsM8obDI3GQzi+mok/OM=";
   };
 
diff --git a/pkgs/development/python-modules/tls-parser/default.nix b/pkgs/development/python-modules/tls-parser/default.nix
index 9c5cc5724f19..6a821b1b60b9 100644
--- a/pkgs/development/python-modules/tls-parser/default.nix
+++ b/pkgs/development/python-modules/tls-parser/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nabla-c0d3";
     repo = "tls_parser";
-    rev = version;
+    tag = version;
     hash = "sha256-2XHhUDiJ1EctnYdxYFbNSVLF8dmHP9cZXjziOE9+Dew=";
   };
 
diff --git a/pkgs/development/python-modules/tlv8/default.nix b/pkgs/development/python-modules/tlv8/default.nix
index 4e3045ddff50..5acbe1b22569 100644
--- a/pkgs/development/python-modules/tlv8/default.nix
+++ b/pkgs/development/python-modules/tlv8/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jlusiardi";
     repo = "tlv8_python";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-G35xMFYasKD3LnGi9q8wBmmFvqgtg0HPdC+y82nxRWA=";
   };
 
diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix
index 9c97153d9d22..85d60a54e050 100644
--- a/pkgs/development/python-modules/tmb/default.nix
+++ b/pkgs/development/python-modules/tmb/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alemuro";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-XuRhRmeTXAplb14UwISyzaqEIrFeg8/aCdMxUccMUos=";
   };
 
diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix
index b3e994e26020..c5da2234439f 100644
--- a/pkgs/development/python-modules/tokenize-rt/default.nix
+++ b/pkgs/development/python-modules/tokenize-rt/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7ykczY73KkqR99tYLL/5bgr9bqU444qHs2ONz+ldVyg=";
   };
 
diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix
index 59a19b81a3f9..f7e2fdc08b2e 100644
--- a/pkgs/development/python-modules/tokenlib/default.nix
+++ b/pkgs/development/python-modules/tokenlib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = "tokenlib";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-+KybaLb4XAcuBARJUhL5gK71jfNMb8YL8dV5Vzf7yXI=";
   };
 
diff --git a/pkgs/development/python-modules/tomli-w/default.nix b/pkgs/development/python-modules/tomli-w/default.nix
index 3741f4e2881e..6c0cc6290862 100644
--- a/pkgs/development/python-modules/tomli-w/default.nix
+++ b/pkgs/development/python-modules/tomli-w/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-wZSC5uOi1JUeKXIli1I8/Vo0wGsv9Q1I84dAMQQP95w=";
   };
 
diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix
index ea17a226873e..cd536b224ca6 100644
--- a/pkgs/development/python-modules/tomli/default.nix
+++ b/pkgs/development/python-modules/tomli/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-4MWp9pPiUZZkjvGXzw8/gDele743NBj8uG4jvK2ohUM=";
   };
 
diff --git a/pkgs/development/python-modules/torpy/default.nix b/pkgs/development/python-modules/torpy/default.nix
index d6f257dfa9ad..97d249fff906 100644
--- a/pkgs/development/python-modules/torpy/default.nix
+++ b/pkgs/development/python-modules/torpy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "torpyorg";
     repo = "torpy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ni7GcpkxzAMtP4wBOFsi4KnxK+nC0XCZR/2Z/eS/C+w=";
   };
 
diff --git a/pkgs/development/python-modules/torrent-parser/default.nix b/pkgs/development/python-modules/torrent-parser/default.nix
index ae1c3a601624..49a1cda66916 100644
--- a/pkgs/development/python-modules/torrent-parser/default.nix
+++ b/pkgs/development/python-modules/torrent-parser/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "7sDream";
     repo = "torrent_parser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zM738r3o9dGZYoWLN7fM4E06m6YPcAODEkgDS6wU/Sc=";
   };
 
diff --git a/pkgs/development/python-modules/trakit/default.nix b/pkgs/development/python-modules/trakit/default.nix
index 5fbe67a6cf17..89afd8eddd62 100644
--- a/pkgs/development/python-modules/trakit/default.nix
+++ b/pkgs/development/python-modules/trakit/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ratoaq2";
     repo = "trakit";
-    rev = version;
+    tag = version;
     hash = "sha256-VV+pdsQ5WEALYZgu4AmvNce1rCTLSYPZtTMjh+aExsU=";
   };
 
diff --git a/pkgs/development/python-modules/tree-sitter-languages/default.nix b/pkgs/development/python-modules/tree-sitter-languages/default.nix
index 0e6ae4e47530..835b598c9b96 100644
--- a/pkgs/development/python-modules/tree-sitter-languages/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-languages/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "grantjenks";
     repo = "py-tree-sitter-languages";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wKU2c8QRBKFVFqg+DAeH5+cwm5jpDLmPZG3YBUsh/lM=";
     # Use git, to also fetch tree-sitter repositories that upstream puts their
     # hashes in the repository as well, in repos.txt.
diff --git a/pkgs/development/python-modules/tree-sitter-make/default.nix b/pkgs/development/python-modules/tree-sitter-make/default.nix
index 3a2abf3d04ee..ce16b45140fe 100644
--- a/pkgs/development/python-modules/tree-sitter-make/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-make/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tree-sitter-grammars";
     repo = "tree-sitter-make";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WiuhAp9JZKLd0wKCui9MV7AYFOW9dCbUp+kkVl1OEz0=";
   };
 
diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix
index afcc26350ee9..ef077ee597ee 100644
--- a/pkgs/development/python-modules/trio-websocket/default.nix
+++ b/pkgs/development/python-modules/trio-websocket/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HyperionGray";
     repo = "trio-websocket";
-    rev = version;
+    tag = version;
     hash = "sha256-TGFf4WUeZDrjp/UiQ9O/GoaK5BRC2aaGZVPfqZ4Ip9I=";
   };
 
diff --git a/pkgs/development/python-modules/tunigo/default.nix b/pkgs/development/python-modules/tunigo/default.nix
index 034aed0251b3..416e90d86e50 100644
--- a/pkgs/development/python-modules/tunigo/default.nix
+++ b/pkgs/development/python-modules/tunigo/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trygveaa";
     repo = "python-tunigo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs";
   };
 
diff --git a/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix b/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
index cf8c96e1b143..f83452d77737 100644
--- a/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
+++ b/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tuya";
     repo = "tuya-iot-python-sdk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KmSVa71CM/kNhzE4GznaxISGmIaV+UcTSn3v+fmxmrQ=";
   };
 
diff --git a/pkgs/development/python-modules/tuyaha/default.nix b/pkgs/development/python-modules/tuyaha/default.nix
index eb56f96547d6..a428befc0fde 100644
--- a/pkgs/development/python-modules/tuyaha/default.nix
+++ b/pkgs/development/python-modules/tuyaha/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PaulAnnekov";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-PTIw/2NRHHiqV6E5oj2pMeGq1uApevKfT2n5zV8AQmM=";
   };
 
diff --git a/pkgs/development/python-modules/tweedledum/default.nix b/pkgs/development/python-modules/tweedledum/default.nix
index bb7f83599ecd..4a327658b29b 100644
--- a/pkgs/development/python-modules/tweedledum/default.nix
+++ b/pkgs/development/python-modules/tweedledum/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "boschmitt";
     repo = "tweedledum";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wgrY5ajaMYxznyNvlD0ul1PFr3W8oV9I/OVsStlZEBM=";
   };
 
diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix
index 41a4b5147fa9..086c54eb83a4 100644
--- a/pkgs/development/python-modules/typesystem/default.nix
+++ b/pkgs/development/python-modules/typesystem/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-fjnheHWjIDbJY1iXCRKCpqTCwtUWK9YXbynRCZquQ7c=";
   };
 
diff --git a/pkgs/development/python-modules/uasiren/default.nix b/pkgs/development/python-modules/uasiren/default.nix
index a30bc00e8ba3..f35080d01c84 100644
--- a/pkgs/development/python-modules/uasiren/default.nix
+++ b/pkgs/development/python-modules/uasiren/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "PaulAnnekov";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NHrnG5Vhz+JZgcTJyfIgGz0Ye+3dFVv2zLCCqw2++oM=";
   };
 
diff --git a/pkgs/development/python-modules/ueagle/default.nix b/pkgs/development/python-modules/ueagle/default.nix
index 5edd077416ef..93b647e4b7f7 100644
--- a/pkgs/development/python-modules/ueagle/default.nix
+++ b/pkgs/development/python-modules/ueagle/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jcalbert";
     repo = "uEagle";
-    rev = version;
+    tag = version;
     sha256 = "1hxwk5alalvmhc31y917dxsnbiwq1xci2krma3235581319xr3w7";
   };
 
diff --git a/pkgs/development/python-modules/ufolint/default.nix b/pkgs/development/python-modules/ufolint/default.nix
index 714a5cac45f3..a6951eb3de7c 100644
--- a/pkgs/development/python-modules/ufolint/default.nix
+++ b/pkgs/development/python-modules/ufolint/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "source-foundry";
     repo = "ufolint";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sv8WbnDd2LFHkwNsB9FO04OlLhemdzwjq0tC9+Fd6/M=";
   };
 
diff --git a/pkgs/development/python-modules/ukkonen/default.nix b/pkgs/development/python-modules/ukkonen/default.nix
index 136303b02b72..aff715efac5f 100644
--- a/pkgs/development/python-modules/ukkonen/default.nix
+++ b/pkgs/development/python-modules/ukkonen/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "jG6VP/P5sadrdrmneH36/ExSld9blyMAAG963QS9+p0=";
   };
 
diff --git a/pkgs/development/python-modules/unasync/default.nix b/pkgs/development/python-modules/unasync/default.nix
index afdfc152bfa8..f64e45323e46 100644
--- a/pkgs/development/python-modules/unasync/default.nix
+++ b/pkgs/development/python-modules/unasync/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-trio";
     repo = "unasync";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZRvmX1fSfSJ1HNEymzhIuUi3tdjFmUoidfr0rN8c7tk=";
   };
 
diff --git a/pkgs/development/python-modules/unifiled/default.nix b/pkgs/development/python-modules/unifiled/default.nix
index 0c2ec7dd9645..b8079ea90b87 100644
--- a/pkgs/development/python-modules/unifiled/default.nix
+++ b/pkgs/development/python-modules/unifiled/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "florisvdk";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1nmqxxhwa0isxdb889nhbp7w4axj1mcrwd3pr9d8nhpw4yj9h3vq";
   };
 
diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix
index 9dbbe1b8bf4f..7f7a4bd86973 100644
--- a/pkgs/development/python-modules/upass/default.nix
+++ b/pkgs/development/python-modules/upass/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Kwpolska";
     repo = "upass";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IlNqPmDaRZ3yRV8O6YKjQkZ3fKNcFgzJHtIX0ADrOyU=";
   };
 
diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix
index d6f92a0e4061..fcfed389f60d 100644
--- a/pkgs/development/python-modules/update-dotdee/default.nix
+++ b/pkgs/development/python-modules/update-dotdee/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-update-dotdee";
-    rev = version;
+    tag = version;
     hash = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A=";
   };
 
diff --git a/pkgs/development/python-modules/upnpy/default.nix b/pkgs/development/python-modules/upnpy/default.nix
index b6677afbd2b2..c12ddee951fa 100644
--- a/pkgs/development/python-modules/upnpy/default.nix
+++ b/pkgs/development/python-modules/upnpy/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "5kyc0d3r";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "17rqcmmwsl0m4722b1cr74f80kqwq7cgxsy7lq9c88zf6srcgjsf";
   };
 
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index cb3bde14e581..dcf913081fd9 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Uranium";
-    rev = version;
+    tag = version;
     hash = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk=";
   };
 
diff --git a/pkgs/development/python-modules/url-normalize/default.nix b/pkgs/development/python-modules/url-normalize/default.nix
index b914c8ae61eb..0cbf4b59bd24 100644
--- a/pkgs/development/python-modules/url-normalize/default.nix
+++ b/pkgs/development/python-modules/url-normalize/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niksite";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-WE3MM9B/voI23taFbLp2FYhl0uxOfuUWsaCTBG1hyiY=";
   };
 
diff --git a/pkgs/development/python-modules/urlman/default.nix b/pkgs/development/python-modules/urlman/default.nix
index fb6ca4ebb5e9..832a7ffac3c0 100644
--- a/pkgs/development/python-modules/urlman/default.nix
+++ b/pkgs/development/python-modules/urlman/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "andrewgodwin";
     repo = "urlman";
-    rev = version;
+    tag = version;
     hash = "sha256-p6lRuMHM2xJrlY5LDa0XLCGQPDE39UwCouK6e0U9zJE=";
   };
 
diff --git a/pkgs/development/python-modules/urlpy/default.nix b/pkgs/development/python-modules/urlpy/default.nix
index fda5519701fa..59f11edbae1f 100644
--- a/pkgs/development/python-modules/urlpy/default.nix
+++ b/pkgs/development/python-modules/urlpy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nexB";
     repo = "urlpy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "962jLyx+/GS8wrDPzG2ONnHvtUG5Pqe6l1Z5ml63Cmg=";
   };
 
diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix
index 9220c3acde9e..7e501c9d461a 100644
--- a/pkgs/development/python-modules/usbtmc/default.nix
+++ b/pkgs/development/python-modules/usbtmc/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-ivi";
     repo = "python-usbtmc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-69kqBTqnVqdWC2mqlXylzb9VkdhwTGZI0Ykf6lqbypI=";
   };
 
diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix
index 1da16e9c6864..d689628cb92b 100644
--- a/pkgs/development/python-modules/user-agents/default.nix
+++ b/pkgs/development/python-modules/user-agents/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "selwin";
     repo = "python-user-agents";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0pcbjqj21c2ixhl414bh2h8khi8y1igzfpkyqwan1pakix0lq45a";
   };
 
diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix
index 714bb5a630b0..35c3533e11e4 100644
--- a/pkgs/development/python-modules/ush/default.nix
+++ b/pkgs/development/python-modules/ush/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tarruda";
     repo = "python-ush";
-    rev = version;
+    tag = version;
     hash = "sha256-a6ICbd8647DRtuHl2vs64bsChUjlpuWHV1ipBdFA600=";
   };
 
diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix
index e76fa6e6bab0..fb0ec9a93e9e 100644
--- a/pkgs/development/python-modules/utils/default.nix
+++ b/pkgs/development/python-modules/utils/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "haaksmash";
     repo = "pyutils";
-    rev = version;
+    tag = version;
     sha256 = "07pr39cfw5ayzkp6h53y7lfpd0w19pphsdzsf100fsyy3npavgbr";
   };
 
diff --git a/pkgs/development/python-modules/vat-moss/default.nix b/pkgs/development/python-modules/vat-moss/default.nix
index a3fba68a65c0..735b12c99500 100644
--- a/pkgs/development/python-modules/vat-moss/default.nix
+++ b/pkgs/development/python-modules/vat-moss/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "vat_moss-python";
-    rev = version;
+    tag = version;
     hash = "sha256-c0lcyeW8IUhWKcfn3BmsbNmHyAzm8T0sdYp0Zp0FbFw=";
   };
 
diff --git a/pkgs/development/python-modules/verboselogs/default.nix b/pkgs/development/python-modules/verboselogs/default.nix
index 63393b593fc6..e392636039a1 100644
--- a/pkgs/development/python-modules/verboselogs/default.nix
+++ b/pkgs/development/python-modules/verboselogs/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-verboselogs";
-    rev = version;
+    tag = version;
     hash = "sha256-hcIdbn0gdkdJ33KcOx6uv0iMXW0x+i880SoROi+qX4I=";
   };
 
diff --git a/pkgs/development/python-modules/versionfinder/default.nix b/pkgs/development/python-modules/versionfinder/default.nix
index 647b339f4e90..498570569580 100644
--- a/pkgs/development/python-modules/versionfinder/default.nix
+++ b/pkgs/development/python-modules/versionfinder/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jantman";
     repo = "versionfinder";
-    rev = version;
+    tag = version;
     hash = "sha256-aa2bRGn8Hn7gpEMUM7byh1qZVsqvJeMXomnwCj2Xu5o=";
   };
 
diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix
index 4bd46a3f8fba..d45db6b4de48 100644
--- a/pkgs/development/python-modules/vfblib/default.nix
+++ b/pkgs/development/python-modules/vfblib/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LucasFonts";
     repo = "vfbLib";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D37i4dJPWGruwhLVEEPY3mzu0ONM38JTbC3Pt+/35lQ=";
   };
 
diff --git a/pkgs/development/python-modules/vincenty/default.nix b/pkgs/development/python-modules/vincenty/default.nix
index c4e28ff23f44..6f3ac2511a06 100644
--- a/pkgs/development/python-modules/vincenty/default.nix
+++ b/pkgs/development/python-modules/vincenty/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maurycyp";
     repo = "vincenty";
-    rev = version;
+    tag = version;
     sha256 = "1li8gv0zb1pdbxdybgaykm38lqbkb5dr7rph6zs1k4k3sh15ldw3";
   };
 
diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index 056e38a32923..6f03359f3349 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "edwardgeorge";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-qrN74IwLRqiVPxU8gVhdiM34yBmiS/5ot07uroYPDVw=";
   };
 
diff --git a/pkgs/development/python-modules/visions/default.nix b/pkgs/development/python-modules/visions/default.nix
index b79e2a403704..9db74acd120e 100644
--- a/pkgs/development/python-modules/visions/default.nix
+++ b/pkgs/development/python-modules/visions/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dylan-profiler";
     repo = "visions";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MHseb1XJ0t7jQ45VXKQclYPgddrzmJAC7cde8qqYhNQ=";
   };
 
diff --git a/pkgs/development/python-modules/vnoise/default.nix b/pkgs/development/python-modules/vnoise/default.nix
index 169f5b3fd61b..d74ca423ed65 100644
--- a/pkgs/development/python-modules/vnoise/default.nix
+++ b/pkgs/development/python-modules/vnoise/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "plottertools";
     repo = "vnoise";
-    rev = version;
+    tag = version;
     hash = "sha256-nflAh3vj48wneM0wy/+M+XD6GC63KZEIFb1x4SS46YI=";
   };
 
diff --git a/pkgs/development/python-modules/vpk/default.nix b/pkgs/development/python-modules/vpk/default.nix
index 188ef50b36f1..eddae9e917b0 100644
--- a/pkgs/development/python-modules/vpk/default.nix
+++ b/pkgs/development/python-modules/vpk/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ValvePython";
     repo = "vpk";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SPkPb8kveAR2cN9kd2plS+TjmBYBCfa6pJ0c22l69M0=";
   };
 
diff --git a/pkgs/development/python-modules/vttlib/default.nix b/pkgs/development/python-modules/vttlib/default.nix
index d90b9c3c3bfd..c6bb540e5fec 100644
--- a/pkgs/development/python-modules/vttlib/default.nix
+++ b/pkgs/development/python-modules/vttlib/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "daltonmaag";
     repo = "vttLib";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ChsuzeFRQFDYGlAE4TWzE+et7yGLOfha1VqGcOdayOs=";
   };
 
diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix
index 4e10e0144243..ebc563c0bcee 100644
--- a/pkgs/development/python-modules/vultr/default.nix
+++ b/pkgs/development/python-modules/vultr/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spry-group";
     repo = "python-vultr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "00lc5hdhchvm0472p03019bp9541d8y2773xkjy8vblq9qhys8q7";
   };
 
diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix
index f68979cf2fea..7c39192b61aa 100644
--- a/pkgs/development/python-modules/vxi11/default.nix
+++ b/pkgs/development/python-modules/vxi11/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-ivi";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn";
   };
 
diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix
index 5ea52995d331..c0e3223226ad 100644
--- a/pkgs/development/python-modules/wasmer/default.nix
+++ b/pkgs/development/python-modules/wasmer/default.nix
@@ -33,7 +33,7 @@ let
       src = fetchFromGitHub {
         owner = "wasmerio";
         repo = "wasmer-python";
-        rev = version;
+        tag = version;
         hash = "sha256-Iu28LMDNmtL2r7gJV5Vbb8HZj18dlkHe+mw/Y1L8YKE=";
       };
 
diff --git a/pkgs/development/python-modules/wasserstein/default.nix b/pkgs/development/python-modules/wasserstein/default.nix
index c9a9495b42ef..1b578b70349f 100644
--- a/pkgs/development/python-modules/wasserstein/default.nix
+++ b/pkgs/development/python-modules/wasserstein/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pkomiske";
     repo = "Wasserstein";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-s9en6XwvO/WPsF7/+SEmGePHZQgl7zLgu5sEn4nD9YE=";
   };
 
diff --git a/pkgs/development/python-modules/wat/default.nix b/pkgs/development/python-modules/wat/default.nix
index 3cad48246313..a724be75b6d5 100644
--- a/pkgs/development/python-modules/wat/default.nix
+++ b/pkgs/development/python-modules/wat/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "igrek51";
     repo = "wat";
-    rev = version;
+    tag = version;
     hash = "sha256-vTq+R/EBkBm27qWR4S9Za6/ppfWD9CLE21SXhTabkhc=";
   };
 
diff --git a/pkgs/development/python-modules/webthing/default.nix b/pkgs/development/python-modules/webthing/default.nix
index 4f4ede0e8ba1..52f594338f2f 100644
--- a/pkgs/development/python-modules/webthing/default.nix
+++ b/pkgs/development/python-modules/webthing/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "WebThingsIO";
     repo = "webthing-python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-z4GVycdq25QZxuzZPLg6nhj0MAD1bHrsqph4yHgmRhg=";
   };
 
diff --git a/pkgs/development/python-modules/wgnlpy/default.nix b/pkgs/development/python-modules/wgnlpy/default.nix
index 11cb4e38b046..784bb427f0de 100644
--- a/pkgs/development/python-modules/wgnlpy/default.nix
+++ b/pkgs/development/python-modules/wgnlpy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ArgosyLabs";
     repo = "wgnlpy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5XAfBiKx4SqouA57PxmaCb0ea7mT2VeUI1tgnQE/ZwQ=";
   };
 
diff --git a/pkgs/development/python-modules/whois-api/default.nix b/pkgs/development/python-modules/whois-api/default.nix
index f3a40dcc9a1a..9cbcbe3dfc9f 100644
--- a/pkgs/development/python-modules/whois-api/default.nix
+++ b/pkgs/development/python-modules/whois-api/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "whois-api-llc";
     repo = "whois-api-py";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SeBeJ6k2R53LxHov+8t70geqUosk/yBJQCi6GaVteMM=";
   };
 
diff --git a/pkgs/development/python-modules/widlparser/default.nix b/pkgs/development/python-modules/widlparser/default.nix
index 9b961c89a9a9..464e6f5a5978 100644
--- a/pkgs/development/python-modules/widlparser/default.nix
+++ b/pkgs/development/python-modules/widlparser/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "plinss";
     repo = "widlparser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-G5N29K0/ByfKwP1XfxZH9u/5x361JD/8qAD6eZaySnU=";
   };
 
diff --git a/pkgs/development/python-modules/wifi/default.nix b/pkgs/development/python-modules/wifi/default.nix
index b99d4782f47b..9bc1171fb977 100644
--- a/pkgs/development/python-modules/wifi/default.nix
+++ b/pkgs/development/python-modules/wifi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rockymeza";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-scg/DvApvyQZtzDgkHFJzf9gCRfJgBvZ64CG/c2Cx8E=";
   };
 
diff --git a/pkgs/development/python-modules/wikitextparser/default.nix b/pkgs/development/python-modules/wikitextparser/default.nix
index 1b5fe1da7e3a..531b5620c2ef 100644
--- a/pkgs/development/python-modules/wikitextparser/default.nix
+++ b/pkgs/development/python-modules/wikitextparser/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "5j9";
     repo = "wikitextparser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g0Hvxw8evmCebM2joGT7XMnakVjDG74VJmZhlvUiQMU=";
   };
 
diff --git a/pkgs/development/python-modules/wirerope/default.nix b/pkgs/development/python-modules/wirerope/default.nix
index 10622e40b2b4..fde09344d158 100644
--- a/pkgs/development/python-modules/wirerope/default.nix
+++ b/pkgs/development/python-modules/wirerope/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "youknowone";
     repo = "wirerope";
-    rev = version;
+    tag = version;
     hash = "sha256-oojnv+2+nwL/TJhN+QZ5eiV6WGHC3SCxBQrCri0aHQc=";
   };
 
diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix
index a9a5b5153fbd..dec5df40316f 100644
--- a/pkgs/development/python-modules/worldengine/default.nix
+++ b/pkgs/development/python-modules/worldengine/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Mindwerks";
     repo = "worldengine";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry";
   };
 
diff --git a/pkgs/development/python-modules/wsdiscovery/default.nix b/pkgs/development/python-modules/wsdiscovery/default.nix
index 7af12d7689fe..94952134abaa 100644
--- a/pkgs/development/python-modules/wsdiscovery/default.nix
+++ b/pkgs/development/python-modules/wsdiscovery/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "andreikop";
     repo = "python-ws-discovery";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6LGZogNRCnmCrRXvHq9jmHwqW13KQPpaGaao/52JPtk=";
   };
 
diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/pkgs/development/python-modules/wsgiproxy2/default.nix
index 25c66e98cf6d..925834cbaae3 100644
--- a/pkgs/development/python-modules/wsgiproxy2/default.nix
+++ b/pkgs/development/python-modules/wsgiproxy2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gawel";
     repo = "WSGIProxy2";
-    rev = version;
+    tag = version;
     hash = "sha256-ouofw3cBQzBwSh3Pdtdl7KI2pg/T/z3qoh8zoeiKiSs=";
   };
 
diff --git a/pkgs/development/python-modules/wtforms-bootstrap5/default.nix b/pkgs/development/python-modules/wtforms-bootstrap5/default.nix
index 280fc791e0b0..1fc0dd7e98d4 100644
--- a/pkgs/development/python-modules/wtforms-bootstrap5/default.nix
+++ b/pkgs/development/python-modules/wtforms-bootstrap5/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LaunchPlatform";
     repo = "wtforms-bootstrap5";
-    rev = version;
+    tag = version;
     hash = "sha256-TJJ3KOeC9JXnxK0YpnfeBNq1KHwaAZ4+t9CXbc+85Ro=";
   };
 
diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix
index 07aabe725302..98f12ed089a4 100644
--- a/pkgs/development/python-modules/xbox-webapi/default.nix
+++ b/pkgs/development/python-modules/xbox-webapi/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OpenXbox";
     repo = "xbox-webapi-python";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9A3gdSlRjBCx5fBW+jkaSWsFuGieXQKvbEbZzGzLf94=";
   };
 
diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix
index 944b9f4619e9..f0eb82b0dfab 100644
--- a/pkgs/development/python-modules/xdot/default.nix
+++ b/pkgs/development/python-modules/xdot/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jrfonseca";
     repo = "xdot.py";
-    rev = version;
+    tag = version;
     hash = "sha256-fkO1bINRkCCzVRrQg9+vIODbN+bpXq2OHBKkzzZUZNA=";
   };
 
diff --git a/pkgs/development/python-modules/xmind/default.nix b/pkgs/development/python-modules/xmind/default.nix
index 3b5565955bdd..162267b9bdcb 100644
--- a/pkgs/development/python-modules/xmind/default.nix
+++ b/pkgs/development/python-modules/xmind/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zhuifengshen";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "xC1WpHz2eHb5+xShM/QUQAIYnJNyK1EKWbTXJKhDwbQ=";
   };
 
diff --git a/pkgs/development/python-modules/xmod/default.nix b/pkgs/development/python-modules/xmod/default.nix
index 34b197579c3e..4553350f2a8e 100644
--- a/pkgs/development/python-modules/xmod/default.nix
+++ b/pkgs/development/python-modules/xmod/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rec";
     repo = "xmod";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pfFxtDQ4kaBrx4XzYMQO1vE4dUr2zs8jgGUQUdXB798=";
   };
 
diff --git a/pkgs/development/python-modules/xpath-expressions/default.nix b/pkgs/development/python-modules/xpath-expressions/default.nix
index 56d514db4055..d0a602048201 100644
--- a/pkgs/development/python-modules/xpath-expressions/default.nix
+++ b/pkgs/development/python-modules/xpath-expressions/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "orf";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UAzDXrz1Tr9/OOjKAg/5Std9Qlrnizei8/3XL3hMSFA=";
   };
 
diff --git a/pkgs/development/python-modules/xpybutil/default.nix b/pkgs/development/python-modules/xpybutil/default.nix
index 631cf33a77c2..b0fe3ce2f024 100644
--- a/pkgs/development/python-modules/xpybutil/default.nix
+++ b/pkgs/development/python-modules/xpybutil/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "17gbqq955fcl29aayn8l0x14azc60cxgkvdxblz9q8x3l50w0xpg";
   };
 
diff --git a/pkgs/development/python-modules/xtensor-python/default.nix b/pkgs/development/python-modules/xtensor-python/default.nix
index 14d063a802d6..827e937b10c4 100644
--- a/pkgs/development/python-modules/xtensor-python/default.nix
+++ b/pkgs/development/python-modules/xtensor-python/default.nix
@@ -18,7 +18,7 @@ toPythonModule (
     src = fetchFromGitHub {
       owner = "xtensor-stack";
       repo = "xtensor-python";
-      rev = finalAttrs.version;
+      tag = finalAttrs.version;
       hash = "sha256-Cy/aXuiriE/qxSd4Apipzak30DjgE7jX8ai1ThJ/VnE=";
     };
 
diff --git a/pkgs/development/python-modules/yacs/default.nix b/pkgs/development/python-modules/yacs/default.nix
index f3e15c5ce41e..0166fa4f67f7 100644
--- a/pkgs/development/python-modules/yacs/default.nix
+++ b/pkgs/development/python-modules/yacs/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rbgirshick";
     repo = "yacs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nO8FL4tTkfTthXYXxXORLieFwvn780DDxfrxC9EUUJ0=";
   };
 
diff --git a/pkgs/development/python-modules/yasi/default.nix b/pkgs/development/python-modules/yasi/default.nix
index 1c2fc835be57..9d4f0388464d 100644
--- a/pkgs/development/python-modules/yasi/default.nix
+++ b/pkgs/development/python-modules/yasi/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nkmathew";
     repo = "yasi-sexp-indenter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xKhVTmh/vrtBkatxtk8R4yqbGroH0I+xTKNYUpuikt4=";
   };
 
diff --git a/pkgs/development/python-modules/zenoh/default.nix b/pkgs/development/python-modules/zenoh/default.nix
index 56dde703451e..2aa653676c80 100644
--- a/pkgs/development/python-modules/zenoh/default.nix
+++ b/pkgs/development/python-modules/zenoh/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh-python";
-    rev = version;
+    tag = version;
     hash = "sha256-AIsIjMcT9g0mTAgxOL/shBEjpeuOm/7Wn4EOSyYbShE=";
   };
 
diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix
index 048fc2b17d10..dc30bd04848f 100644
--- a/pkgs/development/python-modules/zigpy-cc/default.nix
+++ b/pkgs/development/python-modules/zigpy-cc/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-cc";
-    rev = version;
+    tag = version;
     sha256 = "U3S8tQ3zPlexZDt5GvCd+rOv7CBVeXJJM1NGe7nRl2o=";
   };
 
diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix
index 15380edc65fa..c3e3bc45b791 100644
--- a/pkgs/development/python-modules/zlib-ng/default.nix
+++ b/pkgs/development/python-modules/zlib-ng/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pycompression";
     repo = "python-zlib-ng";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UsdZgpRI7h6GemT1+1g/cP/8uhLykZ//saH4JMwwlY4=";
   };
 
diff --git a/pkgs/development/python-modules/zulip-emoji-mapping/default.nix b/pkgs/development/python-modules/zulip-emoji-mapping/default.nix
index d27d2fd355b0..e20aeeaecb63 100644
--- a/pkgs/development/python-modules/zulip-emoji-mapping/default.nix
+++ b/pkgs/development/python-modules/zulip-emoji-mapping/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GearKite";
     repo = "zulip-emoji-mapping";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-logm5uAnLAcFqI7mUxKEO9ZmHqRkd6CFiCW4B5tqZzg=";
   };
 
diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix
index d5bec61a0c0f..8acad2d01633 100644
--- a/pkgs/development/python-modules/zulip/default.nix
+++ b/pkgs/development/python-modules/zulip/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zulip";
     repo = "python-zulip-api";
-    rev = version;
+    tag = version;
     hash = "sha256-YnNXduZ2KOjRHGwhojkqpMP2mwhflk8/f4FVZL8NvHU=";
   };
   sourceRoot = "${src.name}/zulip";
diff --git a/pkgs/development/python2-modules/pip/default.nix b/pkgs/development/python2-modules/pip/default.nix
index 229f34fa1a7a..452a1eb1f456 100644
--- a/pkgs/development/python2-modules/pip/default.nix
+++ b/pkgs/development/python2-modules/pip/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0hkhs9yc1cjdj1gn9wkycd3sy65c05q8k8rhqgsm5jbpksfssiwn";
     name = "${pname}-${version}-source";
   };
diff --git a/pkgs/development/python2-modules/pycairo/default.nix b/pkgs/development/python2-modules/pycairo/default.nix
index 85430cae6ac2..989811961d6f 100644
--- a/pkgs/development/python2-modules/pycairo/default.nix
+++ b/pkgs/development/python2-modules/pycairo/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pygobject";
     repo = "pycairo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "142145a2whvlk92jijrbf3i2bqrzmspwpysj0bfypw0krzi0aa6j";
   };
 
diff --git a/pkgs/development/python2-modules/setuptools/default.nix b/pkgs/development/python2-modules/setuptools/default.nix
index 3761a055a0a2..96605273965a 100644
--- a/pkgs/development/python2-modules/setuptools/default.nix
+++ b/pkgs/development/python2-modules/setuptools/default.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitHub {
       owner = "pypa";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "0z3q0qinyp1rmnxkw3y5f6nbsxhqlfq5k7skfrqa6ymb3zr009y1";
       name = "${pname}-${version}-source";
     };
diff --git a/pkgs/development/python2-modules/wheel/default.nix b/pkgs/development/python2-modules/wheel/default.nix
index 95841e413c63..360f9623316d 100644
--- a/pkgs/development/python2-modules/wheel/default.nix
+++ b/pkgs/development/python2-modules/wheel/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-JlTmUPY3yo/uROyd3nW1dJa23zbLhgQTwcmqZkPOrHs=";
     name = "${pname}-${version}-source";
     postFetch = ''
diff --git a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix
index f199bc9b9277..15adce8774fa 100644
--- a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix
+++ b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "rocm-docs-core";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-++Vi0jZLtHWsGy5IUohgF3P+Q6Jg/d0xWyDA6urbHUA=";
   };
 
diff --git a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix
index 63c9a551fe11..2d9da15b8a70 100644
--- a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocm-docs-core";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-++Vi0jZLtHWsGy5IUohgF3P+Q6Jg/d0xWyDA6urbHUA=";
   };
 
diff --git a/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix b/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix
index ff61e9a8d94b..eb564a5dc01c 100644
--- a/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix
+++ b/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix
@@ -12,7 +12,7 @@ mkTclDerivation rec {
   src = fetchFromGitHub {
     owner = "ianka";
     repo = "mustache.tcl";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-apM57LEZ0Y9hXcEPWrKYOoTVtP5QSqiaQrjTHQc3pc4=";
   };
 
diff --git a/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
index c0321c734f04..6dbbf1397dfe 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
@@ -17,7 +17,7 @@ mkTclDerivation rec {
   src = fetchFromGitHub {
     owner = "flightaware";
     repo = "tclreadline";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6FIQJsAm28jPIfNG+7xsMlCJSLw9JStOVzDemw2P+EI=";
   };
 
diff --git a/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix
index a82b75b56faf..bf593ee9412d 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix
@@ -11,7 +11,7 @@ mkTclDerivation rec {
   src = fetchFromGitHub {
     owner = "flightaware";
     repo = "tclx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bzLF6qOF9o24joWnGR7B4S+Doj7zv9iTh/mo50iFbUs=";
   };
 
diff --git a/pkgs/development/tcl-modules/critcl/default.nix b/pkgs/development/tcl-modules/critcl/default.nix
index 045b9a28958c..587a682be14c 100644
--- a/pkgs/development/tcl-modules/critcl/default.nix
+++ b/pkgs/development/tcl-modules/critcl/default.nix
@@ -13,7 +13,7 @@ mkTclDerivation rec {
   src = fetchFromGitHub {
     owner = "andreas-kupries";
     repo = "critcl";
-    rev = version;
+    tag = version;
     hash = "sha256-LBTAuwTrvwj42vo/TXVSUK8euxHgvSLai23e1jmhMso=";
   };
 
diff --git a/pkgs/development/tools/amazon-qldb-shell/default.nix b/pkgs/development/tools/amazon-qldb-shell/default.nix
index 6cd0c01ad20a..abcffdaf173d 100644
--- a/pkgs/development/tools/amazon-qldb-shell/default.nix
+++ b/pkgs/development/tools/amazon-qldb-shell/default.nix
@@ -17,7 +17,7 @@ let
     src = fetchFromGitHub {
       owner = "awslabs";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-aXScqJ1LijMSAy9YkS5QyXtTqxd19lLt3BbyVXlbw8o=";
     };
 
diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
index bf51057d1786..eb9ab929c35d 100644
--- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
+++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
-    rev = version;
+    tag = version;
     hash = "sha256-sKb+e2aROl1IBUUR0LB8aHxQfEOkbqz9WYqUWVNj8W8=";
   };
 
diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix
index 04be4a79ca19..b3f391899e49 100644
--- a/pkgs/development/tools/analysis/dotenv-linter/default.nix
+++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dotenv-linter";
     repo = "dotenv-linter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo=";
   };
 
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 50c839d12ba1..16af86682aaf 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WlHta/wXTULehopXeIUdNAQb12Lf0SJnm1HIVHTDshA=";
   };
 
diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix
index f4ff446abe59..a86f0da30848 100644
--- a/pkgs/development/tools/analysis/ikos/default.nix
+++ b/pkgs/development/tools/analysis/ikos/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NASA-SW-VnV";
     repo = "ikos";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kqgGD0plTW0N30kD7Y8xOvGODplJbi37Wh6yYAkzNKI=";
   };
 
diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index 6ba10c6611c7..d5d9ed11f624 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "clarkware";
     repo = "jdepend";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-0/xGgAaJ7TTUHxShJbbcPzTODk4lDn+FOn5St5McrtM=";
   };
 
diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix
index 213894fa62e3..07539fa8bcc6 100644
--- a/pkgs/development/tools/analysis/rizin/cutter.nix
+++ b/pkgs/development/tools/analysis/rizin/cutter.nix
@@ -30,7 +30,7 @@ let
     src = fetchFromGitHub {
       owner = "rizinorg";
       repo = "cutter";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-TSEi1mXVvvaGo4koo3EnN/veXPUHF747g+gifnl4IDQ=";
       fetchSubmodules = true;
     };
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index eade75043d16..d876a27dccf6 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rr-debugger";
     repo = "rr";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-o+HXrgGXdsvjlNh70qsXRtp2yXOiZIT30ejfs1KEaqE=";
   };
 
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index 4cc3b44a37df..d6e4df9b5436 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yegord";
     repo = "snowman";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1mrmhj2nddi0d47c266vsg5vbapbqbcpj5ld4v1qcwnnk6z2zn0j";
   };
 
diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
index 9564cc5ee7e0..346a780dcdb8 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7xS1V7Ec3eWiVjMB/4MLeKlGxNKRYeHVFc61dpoBU/8=";
   };
 
diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
index 71f0cc211e0c..670e5748dfd4 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DMFIJ0ywR2goHad3SvUSbj5w2057HJ4k0pNbiR/Y0pI=";
   };
 
diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix
index be236cb5464d..24eddb0262ed 100644
--- a/pkgs/development/tools/asn2quickder/default.nix
+++ b/pkgs/development/tools/asn2quickder/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "quick-der";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk=";
   };
 
diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index ca639ca9b254..24a86b288da7 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BoomerangDecompiler";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0xncdp0z8ry4lkzmvbj5d7hlzikivghpwicgywlv47spgh8ny0ix";
   };
 
diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index c4066663a9d9..15a429ddbee4 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "15v4sk1l43pgd5jxr5lxnh0ks6vb3xk5253n66s7vvsnph48j14q";
   };
 
diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix
index d566431b5062..7af005c9126d 100644
--- a/pkgs/development/tools/build-managers/moon/default.nix
+++ b/pkgs/development/tools/build-managers/moon/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-25qRoWj3QeO/T/JLCkq41ZUI0CH0qgltbUy+wA9feJY=";
   };
 
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index fb2cb702e5b5..9798cfa481a0 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "qbs";
     repo = "qbs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-nL7UZh29Oecu3RvXYg5xsin2IvPWpApleLH37sEdSAI=";
   };
 
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index b6fc00753c5c..0828601cca8b 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rebar";
     repo = "rebar";
-    rev = version;
+    tag = version;
     sha256 = "sha256-okvG7X2uHtZ1p+HUoFOmslrWvYjk0QWBAvAMAW2E40c=";
   };
 
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index 9a70da3f09fd..bdbc065b9fa9 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -28,7 +28,7 @@ let
     src = fetchFromGitHub {
       inherit owner;
       repo = pname;
-      rev = version;
+      tag = version;
       sha256 = "OhzgDipFhscHtRGlfc33ZewBgHgQLa9Zhjby/r1m49A=";
     };
 
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index c53d412f7d30..5783bf11e28a 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "buildah";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-k7nlBvoAVUTsh98XurTSRuk+yzEKbJh2HFSU1IvX1g0=";
   };
 
diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix
index ad072ca9ce3f..8afb64559abb 100644
--- a/pkgs/development/tools/comby/default.nix
+++ b/pkgs/development/tools/comby/default.nix
@@ -29,7 +29,7 @@ let
       src = fetchFromGitHub {
         owner = "comby-tools";
         repo = "comby";
-        rev = version;
+        tag = version;
         sha256 = "sha256-yQrfSzJgJm0OWJxhxst2XjZULIVHeEfPMvMIwH7BYDc=";
       };
 
diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix
index d1a77f0ab25a..59071c3785c7 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/master.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix
@@ -83,7 +83,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "buildbot";
     repo = "buildbot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Kf8sxZE2cQDQSVSMpRTokJU4f3/M6OJq6bXzGonrRLU=";
   };
 
diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
index fae399658a30..0b8f5ad8ebc0 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "test-collector-rust";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PF2TFfzWmHXLgTopzJ04dfnzd3Sc/A6Hduffz2guxmU=";
   };
 
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index c077fae90f93..ea0263baa79d 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "harness";
     repo = "drone";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rTMu3wd/drxALAZB0O5bAJuWdYsHSwwOD4nbAFIhXbg=";
   };
 
diff --git a/pkgs/development/tools/database/replibyte/default.nix b/pkgs/development/tools/database/replibyte/default.nix
index a71e14136239..0e608347faf4 100644
--- a/pkgs/development/tools/database/replibyte/default.nix
+++ b/pkgs/development/tools/database/replibyte/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Qovery";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VExA92g+1y65skxLKU62ZPUPOwdm9N73Ne9xW7Q0Sic=";
   };
 
diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix
index 25e379eaa01f..ea0efd6730c0 100644
--- a/pkgs/development/tools/database/surrealdb-migrations/default.nix
+++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Odonno";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OiH3O74tJQFAW+ZyyspvOXUMcWkqjpd4GVU4cKn1jBg=";
   };
 
diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix
index 2f57f15fd49a..4f6c7cf60175 100644
--- a/pkgs/development/tools/devbox/default.nix
+++ b/pkgs/development/tools/devbox/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jetpack-io";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-ka3knS57Nc9LvGxr2DitcfI7VlkqsVXIi/llFFMb14g=";
   };
 
diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix
index e7851d7d1e29..522d40008295 100644
--- a/pkgs/development/tools/devpod/default.nix
+++ b/pkgs/development/tools/devpod/default.nix
@@ -29,7 +29,7 @@ let
   src = fetchFromGitHub {
     owner = "loft-sh";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8LbqrOKC1als3Xm6ZuU2AySwT0UWjLN2xh+/CvioYew=";
   };
 
diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix
index 88f1f2bcf251..d5eb5495b8e6 100644
--- a/pkgs/development/tools/dump_syms/default.nix
+++ b/pkgs/development/tools/dump_syms/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6VDuZ5rw2N4z6wOVbaOKO6TNaq8QA5RstsIzmuE3QrI=";
   };
 
diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix
index 05563a439981..614a1bf0e9a6 100644
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aDxheDMeQYqCT9XO3In6RbmzmXVchn+bjgf3nL3VE4I=";
   };
 
diff --git a/pkgs/development/tools/gammaray/default.nix b/pkgs/development/tools/gammaray/default.nix
index a00ddf3cb699..2c2b02d99b34 100644
--- a/pkgs/development/tools/gammaray/default.nix
+++ b/pkgs/development/tools/gammaray/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KDAB";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-mJw9yckbkFVYZlcakai/hH/gAD0xOQir5JqGMNnB/dE=";
   };
 
diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index 850acef69f0e..03bd183d5310 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "getgauge";
     repo = "gauge";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eWVU1uAUAM7GGMI6uTpn+89rdwhNVq4sMIfll6NE2XY=";
   };
 
diff --git a/pkgs/development/tools/gauge/plugins/js/default.nix b/pkgs/development/tools/gauge/plugins/js/default.nix
index c3f2923cdb31..3426392a5476 100644
--- a/pkgs/development/tools/gauge/plugins/js/default.nix
+++ b/pkgs/development/tools/gauge/plugins/js/default.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "getgauge";
     repo = "gauge-js";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OUjB/ZETv8z3YDf/ftyqL8oKDEqyp1h1pK5IgEcq+rw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix
index 6053aaae41f7..e4b6bbda12a7 100644
--- a/pkgs/development/tools/git-ps-rs/default.nix
+++ b/pkgs/development/tools/git-ps-rs/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "uptech";
     repo = "git-ps-rs";
-    rev = version;
+    tag = version;
     hash = "sha256-4lk6AHquWKgDk0pBaswbVShZbUDA3wO6cPakhrvrwac=";
   };
 
diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
index c6ccd1588cea..4aa399312be9 100644
--- a/pkgs/development/tools/github/cligh/default.nix
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CMB";
     repo = "cligh";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0d1fd78rzl2n75xpmy1gnxh1shvcs4qm0j4qqszqvfriwkg2flxn";
   };
 
diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
index dc2dc3f7c457..598a1ab5dce6 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     owner = "patriciogonzalezvivo";
     repo = "glslViewer";
     fetchSubmodules = true;
-    rev = version;
+    tag = version;
     hash = "sha256-Ve3wmX5+kABCu8IRe4ySrwsBJm47g1zvMqDbqrpQl88=";
   };
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix
index a3f07bf00f50..e8e60f9914dc 100644
--- a/pkgs/development/tools/gptcommit/default.nix
+++ b/pkgs/development/tools/gptcommit/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "zurawiki";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw=";
   };
 
diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index d19f1fb1f5aa..4748378c7cbc 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -37,7 +37,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "channable";
     repo = "vaultenv";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Jb+Y/Cbapw2ZCXMwXMw1hsy0vT/K8mM/A/Z1all7y+A=";
   };
 
diff --git a/pkgs/development/tools/hors/default.nix b/pkgs/development/tools/hors/default.nix
index 09bf6b2ec98a..3d81384c3c64 100644
--- a/pkgs/development/tools/hors/default.nix
+++ b/pkgs/development/tools/hors/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "windsoilder";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1q17i8zg7dwd8al42wfnkn891dy5hdhw4325plnihkarr50avbr0";
   };
 
diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix
index 76f7bb443aa2..71be5d57dfd1 100644
--- a/pkgs/development/tools/htmlq/default.nix
+++ b/pkgs/development/tools/htmlq/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mgdm";
     repo = "htmlq";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kZtK2QuefzfxxuE1NjXphR7otr+RYfMif/RSpR6TxY0=";
   };
 
diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix
index 61918c6b7a95..483329b040c6 100644
--- a/pkgs/development/tools/ilspycmd/default.nix
+++ b/pkgs/development/tools/ilspycmd/default.nix
@@ -15,7 +15,7 @@ buildDotnetModule (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "icsharpcode";
     repo = "ILSpy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7cPXFaEKr76GtqcNsKx7tstRUeTpSTF8ggxbyEnQa9M=";
   };
 
diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix
index a3a26c4eae2c..cc9c8c9f5042 100644
--- a/pkgs/development/tools/jless/default.nix
+++ b/pkgs/development/tools/jless/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PaulJuliusMartinez";
     repo = "jless";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-76oFPUWROX389U8DeMjle/GkdItu+0eYxZkt1c6l0V4=";
   };
 
diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix
index c01d074e7079..016371df2778 100644
--- a/pkgs/development/tools/kdash/default.nix
+++ b/pkgs/development/tools/kdash/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kdash-rs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fFpdWVoeWycnp/hRw2S+hYpnXYmCs+rLqcZdmSSMGwI=";
   };
 
diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix
index 846667aaf457..87f41503827f 100644
--- a/pkgs/development/tools/kubie/default.nix
+++ b/pkgs/development/tools/kubie/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.25.1";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "sbstp";
     repo = "kubie";
     sha256 = "sha256-aZM4rIYDEO1oezHeG2cL0O3hWrj7OJFzW/uFaX+cczw=";
diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix
index 9db6c4d19ccf..ee0ac8c5370a 100644
--- a/pkgs/development/tools/kustomize/kustomize-sops.nix
+++ b/pkgs/development/tools/kustomize/kustomize-sops.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "viaduct-ai";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qIYV0wDzBRPt6s6d2dL4FobBSMlmVm+Z0ogig3r0Q/c=";
   };
 
diff --git a/pkgs/development/tools/language-servers/crystalline/default.nix b/pkgs/development/tools/language-servers/crystalline/default.nix
index 1555dc35e824..ddc05b0cf19e 100644
--- a/pkgs/development/tools/language-servers/crystalline/default.nix
+++ b/pkgs/development/tools/language-servers/crystalline/default.nix
@@ -17,7 +17,7 @@ crystal.buildCrystalPackage {
   src = fetchFromGitHub {
     owner = "elbywan";
     repo = "crystalline";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-6ZAogEuOJH1QQ6NSJ+8KZUSFSgQAcvd4U9vWNAGix/M=";
   };
 
diff --git a/pkgs/development/tools/loganalyzer/default.nix b/pkgs/development/tools/loganalyzer/default.nix
index 76e782e8f8b9..7c6420c5036a 100644
--- a/pkgs/development/tools/loganalyzer/default.nix
+++ b/pkgs/development/tools/loganalyzer/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pbek";
     repo = "loganalyzer";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-k9hOGI/TmiftwhSHQEh3ZVV8kkMSs1yKejqHelFSQJ4=";
   };
diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index f85d1a61c734..10dfea26c1a5 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "MiniZinc";
     repo = "libminizinc";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-rR+QvRt73wvulx+T+vhSc3354Cpx1QC6+adaodEiQ7Q=";
   };
 
diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix
index 6e297e0c075e..9eba42f200a0 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/development/tools/minizinc/ide.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MiniZinc";
     repo = "MiniZincIDE";
-    rev = version;
+    tag = version;
     hash = "sha256-gUsv4peZhWrwujRloNisuSf/0Wx5W5xRusAHJCx0wNA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix
index 279c1238f055..eee94c34caee 100644
--- a/pkgs/development/tools/misc/chruby/default.nix
+++ b/pkgs/development/tools/misc/chruby/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "postmodern";
     repo = "chruby";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1894g6fymr8kra9vwhbmnrcr58l022mcd7g9ans4zd3izla2j3gx";
   };
 
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 5d5a7e81407b..271242cccb97 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     repo = "coccinelle";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     owner = "coccinelle";
     hash = "sha256-be95cuFP6bAdpCT0Z9zBAx9cc3gYuuXAmHYaI/bmyTE=";
   };
diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix
index a0d9a450ff55..7a3f231a787c 100644
--- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix
+++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix
@@ -30,7 +30,7 @@ let
 
         src = fetchgit {
           url = "https://review.coreboot.org/coreboot";
-          rev = finalAttrs.version;
+          tag = finalAttrs.version;
           hash = "sha256-zyfBQKVton+2vjYd6fqrUqkHY9bci411pujRGabvTjQ=";
           fetchSubmodules = false;
           leaveDotGit = true;
diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix
index 390c9661ef80..db453884838d 100644
--- a/pkgs/development/tools/misc/dura/default.nix
+++ b/pkgs/development/tools/misc/dura/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tkellogg";
     repo = "dura";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-xAcFk7z26l4BYYBEw+MvbG6g33MpPUvnpGvgmcqhpGM=";
   };
 
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index eb13e9d9b738..7383f4dd987b 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
-    rev = version;
+    tag = version;
     sha256 = "sha256-C/NHDhhRTQppu8xRWe9fy1+KIutyoRbkkabUtGlJ1fE=";
   };
 
diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix
index d646d96ea9ef..016b72b286cd 100644
--- a/pkgs/development/tools/misc/linuxkit/default.nix
+++ b/pkgs/development/tools/misc/linuxkit/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxkit";
     repo = "linuxkit";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dCRTBy2Nbl5KP8dxXt+1ww1BF/gWm3PfLtSBAaVcBvw=";
   };
 
diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix
index 0cb6f1c24b74..37680bfbae53 100644
--- a/pkgs/development/tools/misc/nixbang/default.nix
+++ b/pkgs/development/tools/misc/nixbang/default.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "madjar";
     repo = "nixbang";
-    rev = version;
+    tag = version;
     sha256 = "1kzk53ry60i814wa6n9y2ni0bcxhbi9p8gdv10b974gf23mhi8vc";
   };
 
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix
index 6ab724089453..279bc0167866 100644
--- a/pkgs/development/tools/misc/premake/5.nix
+++ b/pkgs/development/tools/misc/premake/5.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "premake";
     repo = "premake-core";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sNLCyIHWDW/8jIrMFCZAqtWsh4SRugqtPR4HaoW/Vzk=";
   };
 
diff --git a/pkgs/development/tools/misc/pwninit/default.nix b/pkgs/development/tools/misc/pwninit/default.nix
index 7a645f4b8106..8dfb253299ba 100644
--- a/pkgs/development/tools/misc/pwninit/default.nix
+++ b/pkgs/development/tools/misc/pwninit/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "io12";
     repo = "pwninit";
-    rev = version;
+    tag = version;
     sha256 = "sha256-tbZS7PdRFvO2ifoHA/w3cSPfqqHrLeLHAg6V8oG9gVE=";
   };
 
diff --git a/pkgs/development/tools/misc/seer/default.nix b/pkgs/development/tools/misc/seer/default.nix
index 7b959c4fa102..5285f3be4933 100644
--- a/pkgs/development/tools/misc/seer/default.nix
+++ b/pkgs/development/tools/misc/seer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "epasveer";
     repo = "seer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+3yghoK8fAM6UFomv1Ga05kxwsLcoL2CpuIDXkFfWHc=";
   };
 
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index a9026979efea..1fc9c34e4cc5 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI=";
   };
 
diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix
index e7dd2ec40735..5acf85dfc8ed 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/pkgs/development/tools/misc/whatstyle/default.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mikr";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "08lfd8h5fnvy5gci4f3an411cypad7p2yiahvbmlp51r9xwpaiwr";
   };
 
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 4f6f0463e23f..af7342ed8cf9 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -27,7 +27,7 @@ else
           src = fetchFromGitHub {
             owner = "camlp5";
             repo = "camlp5";
-            rev = version;
+            tag = version;
             hash = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o=";
           };
 
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index 6a94480be688..105ea5c67565 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -33,7 +33,7 @@ if lib.versionAtLeast ocaml.version "4.02" then
     src = fetchFromGitHub {
       owner = "ocaml-community";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-+HnAGM+GddYJK0RCvKrs+baZS+1o8Yq+/cVa3U3nFWg=";
     };
 
@@ -55,7 +55,7 @@ else
     src = fetchFromGitHub {
       owner = "mjambon";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8";
     };
 
diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix
index 7a24d014a733..b79aa5681010 100644
--- a/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -11,7 +11,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "Lelio-Brun";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JJ8k9/6awKZH87T9Ut8x/hlshiUI6sy2fZtY6x2dIIk=";
   };
 
diff --git a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
index 2057bb0c8f3e..1ed8c9cf0975 100644
--- a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
@@ -23,7 +23,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "serokell";
       repo = pname;
-      rev = version;
+      tag = version;
       sha256 = "gOKvjmlcHDOgsTllj2sPL/qNtW/rlNlEVIrosahNsAQ=";
     };
 
diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
index 03460b3b5548..2d1a0ec6929a 100644
--- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "ocamlbuild";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash =
       {
         "0.14.3" = "sha256-dfcNu4ugOYu/M0rRQla7lXum/g1UzncdLGmpPYo0QUM=";
diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix
index fee5a45b3f5d..31df126ea361 100644
--- a/pkgs/development/tools/ocaml/ocamlscript/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix
@@ -16,7 +16,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
     src = fetchFromGitHub {
       owner = "mjambon";
       repo = "ocamlscript";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256:10xz8jknlmcgnf233nahd04q98ijnxpijhpvb8hl7sv94dgkvpql";
     };
 
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index d7d780d1a6d5..b1d4225a497f 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -21,7 +21,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "OCamlPro";
       repo = "ocp-build";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "1641xzik98c7xnjwxpacijd6d9jzx340fmdn6i372z8h554jjlg9";
     };
 
diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix
index 73c834c6624f..3818de2c81d2 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocp-indent";
-    rev = version;
+    tag = version;
     sha256 = "sha256-IyvURw/6R0eKrnahV1fqLV0iIeypykrmxDbliECgbLc=";
   };
 
diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
index 1fa391f607f8..fa95db1e71da 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocp-index";
-    rev = version;
+    tag = version;
     hash = "sha256-FbkVJRbFNSho/E59QMUoGK+TrdnnacmykJWWG2JVDVA=";
   };
 
diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix
index 9d85c9594ad8..f7983e990a47 100644
--- a/pkgs/development/tools/pactorio/default.nix
+++ b/pkgs/development/tools/pactorio/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "figsoda";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3+irejeDltf7x+gyJxWBgvPgpQx5uU3DewU23Z4Nr/A=";
   };
 
diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index 492864c6d9ae..ced087c961f6 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KDE";
     repo = "heaptrack";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pP+s60ERnmOctYTe/vezCg0VYzziApNY0QaF3aTccZU=";
   };
 
diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix
index 61e9c252c12c..04924301335a 100644
--- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix
+++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc-web";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-yqiSuqan4vynE3AS8OnYdzA+3AVlVFTBkxTuJe17114=";
   };
 
diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix
index f0000dd4c458..59033ace6a89 100644
--- a/pkgs/development/tools/py-spy/default.nix
+++ b/pkgs/development/tools/py-spy/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "benfred";
     repo = "py-spy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T96F8xgB9HRwuvDLXi6+lfi8za/iNn1NAbG4AIpE0V0=";
   };
 
diff --git a/pkgs/development/tools/remodel/default.nix b/pkgs/development/tools/remodel/default.nix
index 6d3f6a560271..628f304d28ab 100644
--- a/pkgs/development/tools/remodel/default.nix
+++ b/pkgs/development/tools/remodel/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rojo-rbx";
     repo = "remodel";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-tZ6ptGeNBULJaoFomMFN294wY8YUu1SrJh4UfOL/MnI=";
   };
 
diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix
index 720066ca6910..2384c1ac43c5 100644
--- a/pkgs/development/tools/rover/default.nix
+++ b/pkgs/development/tools/rover/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "apollographql";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-uyeePAHBDCzXzwIWrKcc9LHClwSI7DMBYod/o4LfK+Y=";
   };
 
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 39fd3f726caf..e049d29eb922 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -35,7 +35,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/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix
index ebb5769e8082..712b3418b012 100644
--- a/pkgs/development/tools/rubyfmt/default.nix
+++ b/pkgs/development/tools/rubyfmt/default.nix
@@ -26,7 +26,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/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix
index 1aad2fdf19b9..47ac78e2a3b9 100644
--- a/pkgs/development/tools/rust/cargo-clone/default.nix
+++ b/pkgs/development/tools/rust/cargo-clone/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "janlikar";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kK0J1Vfx1T17CgZ3DV9kQbAUxk4lEfje5p6QvdBS5VQ=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix
index 3d8fef633af4..6636e52e1fc6 100644
--- a/pkgs/development/tools/rust/cargo-codspeed/default.nix
+++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "CodSpeedHQ";
     repo = "codspeed-rust";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VAl9UceVDS2XltP3G1YxNp07R+PmuJGJ8zvtxblcQLc=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix
index faf717762fba..67035ce2dfc9 100644
--- a/pkgs/development/tools/rust/cargo-crev/default.nix
+++ b/pkgs/development/tools/rust/cargo-crev/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "crev-dev";
     repo = "cargo-crev";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OxE0+KK2qt06gAi7rw3hiG2lczBqbyNThb4aCpyM6q8=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix
index d2ee4011a5ee..fa86634af392 100644
--- a/pkgs/development/tools/rust/cargo-edit/default.nix
+++ b/pkgs/development/tools/rust/cargo-edit/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "killercup";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kwchy30i2zYS7uwUonDusumLbpZxdzZ/8Rts25zwqdo=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix
index 0a62e9a99992..698106410047 100644
--- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix
+++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "flamegraph-rs";
     repo = "flamegraph";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-OpneGyulSreUKhmnLfsJ2sEbkDPCcrDjkRu9ccKZcJc=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix
index 589186bd86e0..749cf877dec4 100644
--- a/pkgs/development/tools/rust/cargo-fund/default.nix
+++ b/pkgs/development/tools/rust/cargo-fund/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "acfoltzer";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-8mnCwWwReNH9s/gbxIhe7XdJRIA6BSUKm5jzykU5qMU=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix
index e132991be676..ffb56b5d9914 100644
--- a/pkgs/development/tools/rust/cargo-ndk/default.nix
+++ b/pkgs/development/tools/rust/cargo-ndk/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bbqsrc";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-tzjiq1jjluWqTl+8MhzFs47VRp3jIRJ7EOLhUP8ydbM=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index 9eedd3129e2e..343bded490c0 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "est31";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4/JfD2cH46it8PkU58buTHwFXBZI3sytyJCUWl+vSAE=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix
index 6ff8f75f407e..2b96c6a38281 100644
--- a/pkgs/development/tools/rust/cargo-vet/default.nix
+++ b/pkgs/development/tools/rust/cargo-vet/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-VnOqQ1dKgNZSHTzJrD7stoCzNGrSkYxcLDJAsrJUsEQ=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix
index 8564f62150d7..8d3eb7151ed6 100644
--- a/pkgs/development/tools/rust/cargo-watch/default.nix
+++ b/pkgs/development/tools/rust/cargo-watch/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "watchexec";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-agwK20MkvnhqSVAWMy3HLkUJbraINn12i6VAg8mTzBk=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix
index 6014baaf3a90..6a77c1eaf407 100644
--- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix
+++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "museun";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YJ08oBTn9OwovnTOuuc1OuVsQp+/TPO3vcY4ybJ26Ms=";
   };
 
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index fa4842c65a79..7b910737d204 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cbindgen";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1GT+EgltLhveEACxhY+748L1HIIyQHbEs7wLKANFWr0=";
   };
 
diff --git a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix
index 63ddaae84bd9..adb6a19a7697 100644
--- a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix
+++ b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kennytm";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-J25ER/g8Kylw/oTIEl4Gl8i1xmhR+4JM5M5EHpl1ras=";
   };
 
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 649497629329..90755be239fc 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rustup";
-    rev = version;
+    tag = version;
     sha256 = "sha256-BehkJTEIbZHaM+ABaWN/grl9pX75lPqyBj1q1Kt273M=";
   };
 
diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix
index 4a3b1880436f..95ff26c827ad 100644
--- a/pkgs/development/tools/rust/sqlx-cli/default.nix
+++ b/pkgs/development/tools/rust/sqlx-cli/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "launchbadge";
     repo = "sqlx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kAZUconMYUF9gZbLSg7KW3fVb7pkTq/d/yQyVzscxRw=";
   };
 
diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix
index 0b69da6c8de9..2b907659ed11 100644
--- a/pkgs/development/tools/sentry-cli/default.nix
+++ b/pkgs/development/tools/sentry-cli/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-Nm9MN20M5NbnqONKe2JREjX03f/fLirbuypamVTzC5I=";
   };
   doCheck = false;
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index 9a8dc3ef60e7..09313873a1ea 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "buserror";
     repo = "simavr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0njz03lkw5374x1lxrq08irz4b86lzj2hibx46ssp7zv712pq55q";
   };
 
diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix
index 873314138265..aa03bf8785d5 100644
--- a/pkgs/development/tools/solarus-quest-editor/default.nix
+++ b/pkgs/development/tools/solarus-quest-editor/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn";
   };
 
diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix
index fbe1416808f7..f9f8e8f31937 100644
--- a/pkgs/development/tools/toluapp/default.nix
+++ b/pkgs/development/tools/toluapp/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LuaDist";
     repo = "toluapp";
-    rev = version;
+    tag = version;
     sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0";
   };
 
diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix
index 3b2481f49c33..ee0734f8548f 100644
--- a/pkgs/development/tools/viceroy/default.nix
+++ b/pkgs/development/tools/viceroy/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fastly";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NmXBD/BEQnAH4ES5SYwf8fInC4k++JX2OIhvusLlmG8=";
   };
 
diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix
index d21ac338f34f..a1f72fa1e56f 100644
--- a/pkgs/development/tools/wasmedge/default.nix
+++ b/pkgs/development/tools/wasmedge/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "WasmEdge";
     repo = "WasmEdge";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-70vvQGYcer3dosb1ulWO1F4xFwKwfo35l/TFSFa5idM=";
   };
 
diff --git a/pkgs/development/tools/wrangler_1/default.nix b/pkgs/development/tools/wrangler_1/default.nix
index b51d26745bf2..62f4e802d51a 100644
--- a/pkgs/development/tools/wrangler_1/default.nix
+++ b/pkgs/development/tools/wrangler_1/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "wrangler";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GfuU+g4tPU3TorzymEa9q8n4uKYsG0ZTz8rJirGOLfQ=";
   };
 
diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix
index ab0638768a08..cee8678f642e 100644
--- a/pkgs/development/web/playwright/driver.nix
+++ b/pkgs/development/web/playwright/driver.nix
@@ -32,7 +32,7 @@ let
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "playwright";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-s4lJRdsA4H+Uf9LjriZ6OimBl5A9Pf4fvhWDw2kOMkg=";
   };
 
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 76033e6fdec7..0af732ed9685 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -37,7 +37,7 @@ let
   src = fetchFromGitHub {
     owner = "ankitects";
     repo = "anki";
-    rev = version;
+    tag = version;
     hash = "sha256-pAQBl5KbTu7LD3gKBaiyn4QiWeGYoGmxD3sDJfCZVdA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index a55b58c7e83a..9add47c41845 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arx";
     repo = "ArxLibertatis";
-    rev = version;
+    tag = version;
     sha256 = "GBJcsibolZP3oVOTSaiVqG2nMmvXonKTp5i/0NNODKY=";
   };
 
diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix
index b38c6dffa88d..34771580bdea 100644
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/games/blightmud/default.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk=";
   };
 
diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix
index 3c47f02131c2..d56b750c4b71 100644
--- a/pkgs/games/bugdom/default.nix
+++ b/pkgs/games/bugdom/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jorio";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-0c7v5tSqYuqtLOFl4sqD7+naJNqX/wlKHVntkZQGJ8A=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix
index cead8704e11b..e5554b7fd466 100644
--- a/pkgs/games/chiaki-ng/default.nix
+++ b/pkgs/games/chiaki-ng/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "streetpea";
     repo = "chiaki-ng";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TY27Xc13RiTcAgrUFJ3M3ALnxgeY+/4re3cjZ5kNwc8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix
index 5f12863d9f67..bcb0d4c23c8a 100644
--- a/pkgs/games/cockatrice/default.nix
+++ b/pkgs/games/cockatrice/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Cockatrice";
     repo = "Cockatrice";
-    rev = version;
+    tag = version;
     sha256 = "sha256-vM12ufqoItlDeYXHhyN3Jkqm+chGgm9gB4xtIdDbI94=";
   };
 
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 81e8f826e509..2ed7cf98979c 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "crawl";
     repo = "crawl";
-    rev = version;
+    tag = version;
     hash = "sha256-jhjFC8+A2dQomMwKZPSiEViXeQpty2Dk9alDcNsLvq0=";
   };
 
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
index 87c6accaaad5..517dd8124d84 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/pkgs/games/devilutionx/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "diasurgical";
     repo = "devilutionX";
-    rev = version;
+    tag = version;
     sha256 = "sha256-4cA2OHTc51U8XIk3iS16En7JJExkcn4a4VdtjNkZfH8=";
   };
 
diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix
index 6db8e8dd2a91..22ecaefb9f21 100644
--- a/pkgs/games/doom-ports/slade/default.nix
+++ b/pkgs/games/doom-ports/slade/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
-    rev = version;
+    tag = version;
     hash = "sha256-pcWmv1fnH18X/S8ljfHxaL1PjApo5jyM8W+WYn+/7zI=";
   };
 
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 05cc82297acb..ef34d2a9bddf 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Dwarf-Therapist";
     repo = "Dwarf-Therapist";
-    rev = "v${version}";
+    tag = "v${version}";
     inherit hash;
   };
 
diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix
index be92949cb91a..51dca37dc4da 100644
--- a/pkgs/games/easyrpg-player/default.nix
+++ b/pkgs/games/easyrpg-player/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EasyRPG";
     repo = "Player";
-    rev = version;
+    tag = version;
     hash = "sha256-t0sa9ONVVfsiTy+us06vU2bMa4QmmQeYxU395g0WS6w=";
   };
 
diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix
index 1ac4db6a2ac7..4bb50aebba14 100644
--- a/pkgs/games/exult/default.nix
+++ b/pkgs/games/exult/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exult";
     repo = "exult";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-NlvtYtmJNYhOC1BtIxIij3NEQHWAGOeD4XgRq7evjzE=";
   };
 
diff --git a/pkgs/games/fallout-ce/fallout-ce.nix b/pkgs/games/fallout-ce/fallout-ce.nix
index 6754fad6a1b5..6409ce41cf63 100644
--- a/pkgs/games/fallout-ce/fallout-ce.nix
+++ b/pkgs/games/fallout-ce/fallout-ce.nix
@@ -11,7 +11,7 @@ callPackage ./build.nix rec {
   src = fetchFromGitHub {
     owner = "alexbatalov";
     repo = "fallout1-ce";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZiBoF3SL00sN0QrD3fkWG9SAknumOvzRB1oQJff6ITA=";
   };
 
diff --git a/pkgs/games/fallout-ce/fallout2-ce.nix b/pkgs/games/fallout-ce/fallout2-ce.nix
index a1b4f28b1971..cd326d7a5cce 100644
--- a/pkgs/games/fallout-ce/fallout2-ce.nix
+++ b/pkgs/games/fallout-ce/fallout2-ce.nix
@@ -12,7 +12,7 @@ callPackage ./build.nix rec {
   src = fetchFromGitHub {
     owner = "alexbatalov";
     repo = "fallout2-ce";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-r1pnmyuo3uw2R0x9vGScSHIVNA6t+txxABzgHkUEY5U=";
   };
 
diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix
index 4c835cab698a..49fed5002a34 100644
--- a/pkgs/games/ferium/default.nix
+++ b/pkgs/games/ferium/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gorilla-devs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eeQjezB6pRdnPADLgDLo8b+bUSP12gfBhFNt/uYCwHU=";
   };
 
diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix
index 8d4069874bd6..c8b1c080dd18 100644
--- a/pkgs/games/flare/engine.nix
+++ b/pkgs/games/flare/engine.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc=";
   };
 
diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix
index 74dbcaaaae31..370794d8ab1f 100644
--- a/pkgs/games/flare/game.nix
+++ b/pkgs/games/flare/game.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo=";
   };
 
diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix
index 3fdd60a5fa2c..940e97c28202 100644
--- a/pkgs/games/gshogi/default.nix
+++ b/pkgs/games/gshogi/default.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "johncheetham";
     repo = "gshogi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EPOIYPSFAhilxuZeYfuZ4Cd29ReJs/E4KNF5/lyzbxs=";
   };
 
diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/games/iortcw/sp.nix
index b614d3b37f0f..bbe43b887c38 100644
--- a/pkgs/games/iortcw/sp.nix
+++ b/pkgs/games/iortcw/sp.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iortcw";
     repo = "iortcw";
-    rev = version;
+    tag = version;
     sha256 = "0g5wgqb1gm34pd05dj2i8nj3qhsz0831p3m7bsgxpjcg9c00jpyw";
   };
 
diff --git a/pkgs/games/koboredux/default.nix b/pkgs/games/koboredux/default.nix
index 5f4d0a39a8a9..dabf376ab735 100644
--- a/pkgs/games/koboredux/default.nix
+++ b/pkgs/games/koboredux/default.nix
@@ -28,7 +28,7 @@ let
   main_src = fetchFromGitHub {
     owner = "olofson";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig";
   };
 
diff --git a/pkgs/games/ldmud/default.nix b/pkgs/games/ldmud/default.nix
index bdfff52c3e74..e0999f818a94 100644
--- a/pkgs/games/ldmud/default.nix
+++ b/pkgs/games/ldmud/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA=";
   };
 
diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix
index da7c815fa056..4e83dfc2f5aa 100644
--- a/pkgs/games/leela-zero/default.nix
+++ b/pkgs/games/leela-zero/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gcp";
     repo = "leela-zero";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-AQRp2rkL9KCZdsJN6uz2Y+3kV4lyRLYjWn0p7UOjBMw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/games/libremines/default.nix b/pkgs/games/libremines/default.nix
index b3b7cda9d4c6..57816d6095e5 100644
--- a/pkgs/games/libremines/default.nix
+++ b/pkgs/games/libremines/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Bollos00";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TQwjEgtqAvKnrpia6VloRgFwtq5TNDmxU+ZWjtEK/n8=";
   };
 
diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix
index aa24289ba070..56aabfbd916e 100644
--- a/pkgs/games/nile/default.nix
+++ b/pkgs/games/nile/default.nix
@@ -24,7 +24,7 @@ buildPythonApplication {
   src = fetchFromGitHub {
     owner = "imLinguin";
     repo = "nile";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI=";
   };
 
diff --git a/pkgs/games/openra_2019/mods.nix b/pkgs/games/openra_2019/mods.nix
index a9f95d0f25c8..c3ba646dbc9c 100644
--- a/pkgs/games/openra_2019/mods.nix
+++ b/pkgs/games/openra_2019/mods.nix
@@ -58,7 +58,7 @@ in
       src = fetchFromGitHub {
         owner = "OpenRA";
         repo = "OpenRA";
-        rev = version;
+        tag = version;
         sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r";
         name = "engine";
         inherit postFetch;
@@ -110,7 +110,7 @@ in
       src = fetchFromGitHub {
         owner = "MustaphaTR";
         repo = "OpenRA";
-        rev = version;
+        tag = version;
         sha256 = "1x6byz37s8qcpqj902zvkvbv95rv2mv2kj35c12gbpyc92xkqkq0";
         name = "generals-alpha-engine";
         inherit postFetch;
@@ -194,7 +194,7 @@ in
       src = fetchFromGitHub {
         owner = "OpenRA";
         repo = "OpenRA";
-        rev = version;
+        tag = version;
         sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5";
         name = "engine";
         inherit postFetch;
@@ -222,7 +222,7 @@ in
       src = fetchFromGitHub {
         owner = "OpenRA";
         repo = "OpenRA";
-        rev = version;
+        tag = version;
         sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr";
         name = "engine";
         inherit postFetch;
@@ -327,7 +327,7 @@ in
       src = fetchFromGitHub {
         owner = "RAunplugged";
         repo = "OpenRA";
-        rev = version;
+        tag = version;
         sha256 = "1p5hgxxvxlz8480vj0qkmnxjh7zj3hahk312m0zljxfdb40652w1";
         name = "engine";
         inherit postFetch;
@@ -351,7 +351,7 @@ in
       src = fetchFromGitHub {
         owner = "OpenRA";
         repo = "OpenRA";
-        rev = version;
+        tag = version;
         sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr";
         name = "engine";
         inherit postFetch;
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index 8ad42af360bd..baef1cfd4833 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yvt";
     repo = "openspades";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1fvmqbif9fbipd0vphp57pk6blb4yp8xvqlc2ppipk5pjv6a3d2h";
   };
 
diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix
index 5278cd20c6e1..de715ba18bae 100644
--- a/pkgs/games/orthorobot/default.nix
+++ b/pkgs/games/orthorobot/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Stabyourself";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ca6hvd890kxmamsmsfiqzw15ngsvb4lkihjb6kabgmss61a6s5p";
   };
 
diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix
index cbcddf570b03..9923921b28b9 100644
--- a/pkgs/games/pentobi/default.nix
+++ b/pkgs/games/pentobi/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "enz";
     repo = "pentobi";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DQM3IJ0pRkX4OsrjZGROg50LfKb621UnpvtqSjxchz8=";
   };
 
diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix
index f8ef4e598d0f..57e43f47530c 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@@ -26,7 +26,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pokerth";
     repo = "pokerth";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j4E3VMpaPqX7+hE3wYRZZUeRD//F+K2Gp8oPmJqX5FQ=";
   };
 
diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix
index 88894e2fb99d..f89d16d8dab1 100644
--- a/pkgs/games/pro-office-calculator/default.nix
+++ b/pkgs/games/pro-office-calculator/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RobJinman";
     repo = "pro_office_calc";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1v75cysargmp4fk7px5zgib1p6h5ya4w39rndbzk614fcnv0iipd";
   };
 
diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix
index 4de706b5c50d..3b7058131e88 100644
--- a/pkgs/games/qtads/default.nix
+++ b/pkgs/games/qtads/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "realnc";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KIqufpvl7zeUtDBXUOAZxBIbfv+s51DoSaZr3jol+bw=";
   };
 
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index ea8b0bf1cf0c..61148df574ab 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scummvm";
     repo = "scummvm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4/h1bzauYWNvG7skn6afF79t0KEdgYLZoeqeqRudH7I=";
   };
 
diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix
index d5b64267d216..23daee7df3b1 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/default.nix
@@ -11,7 +11,7 @@ callPackage ./generic.nix rec {
   src = fetchFromGitHub {
     owner = "00-Evan";
     repo = "shattered-pixel-dungeon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tEgwB/YIhSpwUZrEC4Gw9+6lLllNK8JuTMNKgVzqv7c=";
   };
 
diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
index 094641c94b11..819992e19f62 100644
--- a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
@@ -10,7 +10,7 @@ callPackage ../generic.nix rec {
   src = fetchFromGitHub {
     owner = "TrashboxBobylev";
     repo = "Rat-King-Adventure";
-    rev = version;
+    tag = version;
     hash = "sha256-mh54m2YwGOmE03fxndk3wNX/xi6UyIdXWEguiC3mDeA=";
   };
 
diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix b/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix
index 747162444a13..d57ab446f746 100644
--- a/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix
@@ -10,7 +10,7 @@ callPackage ../generic.nix rec {
   src = fetchFromGitHub {
     owner = "Zrp200";
     repo = "rkpd2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jM4CtC3AVXXBjHAfeDp4dFomDpRl76DhD+q9vIAeEhA=";
   };
 
diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix
index 90b988de4796..7e5028b95418 100644
--- a/pkgs/games/solarus/default.nix
+++ b/pkgs/games/solarus/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sbdlf+R9OskDQ5U5rqUX2gF8l/fj0sDJv6BL7H1I1Ng=";
   };
 
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
index c847ad4ceda4..aa8b3042e267 100644
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@@ -39,13 +39,13 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stuntrally";
     repo = "stuntrally";
-    rev = version;
+    tag = version;
     hash = "sha256-0Eh9ilIHSh/Uz8TuPnXxLQfy7KF7qqNXUgBXQUCz9ys=";
   };
   tracks = fetchFromGitHub {
     owner = "stuntrally";
     repo = "tracks";
-    rev = version;
+    tag = version;
     hash = "sha256-fglm1FetFGHM/qGTtpxDb8+k2iAREn5DQR5GPujuLms=";
   };
 
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index 31aaf3a5f46b..b9c0135bdcc3 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "supertuxkart";
     repo = "stk-code";
-    rev = version;
+    tag = version;
     hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM=";
   };
 
diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index 047562bc028a..7172a79ecebe 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "teeworlds";
     repo = "teeworlds";
-    rev = version;
+    tag = version;
     sha256 = "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz";
     fetchSubmodules = true;
   };
diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix
index f36b912b471f..02674ad4cffc 100644
--- a/pkgs/games/vcmi/default.nix
+++ b/pkgs/games/vcmi/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vcmi";
     repo = "vcmi";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-ImfEKVyuvl8VAsaq34DBe+fiAxf11Mr0jWVI51EsSRs=";
   };
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 74c2e5230d18..e259ca650e66 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   version = "1.18.4";
 
   src = fetchFromGitHub {
-    rev = version;
+    tag = version;
     owner = "wesnoth";
     repo = "wesnoth";
     hash = "sha256-c3BoTFnSUqtp71QeSCsC2teVuzsQwV8hOJtIcZdP+1E=";
diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix
index 33ab54b180cf..689506ffd1c7 100644
--- a/pkgs/kde/third-party/applet-window-buttons6/default.nix
+++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moodyhunter";
     repo = "applet-window-buttons6";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-HnlgBQKT99vVkl6DWqMkN8Vz+QzzZBGj5tqOJ22VkJ8=";
   };
 
diff --git a/pkgs/kde/third-party/koi/default.nix b/pkgs/kde/third-party/koi/default.nix
index 3a7e8ceda25d..abb5328fd5cb 100644
--- a/pkgs/kde/third-party/koi/default.nix
+++ b/pkgs/kde/third-party/koi/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baduhai";
     repo = "Koi";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ip7e/Sz/l5UiTFUTLJPorPO7NltE2Isij2MCmvHZV40=";
   };
 
diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix
index c8bc4d7140ec..4bad66ebcc83 100644
--- a/pkgs/misc/apulse/default.nix
+++ b/pkgs/misc/apulse/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "i-rinat";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn";
   };
 
diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix
index 311b87f6b429..f431dac7177a 100644
--- a/pkgs/misc/calaos/installer/default.nix
+++ b/pkgs/misc/calaos/installer/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "calaos";
     repo = "calaos_installer";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY=";
   };
 
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index a5468f00fecc..14878d2e0c35 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -58,7 +58,7 @@
       src = fetchFromGitHub {
         owner = "OpenPrinting";
         repo = "cups-filters";
-        rev = version;
+        tag = version;
         hash = "sha256-bLOl64bdeZ10JLcQ7GbU+VffJu3Lzo0ves7O7GQIOWY=";
       };
 
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index d509cb443db6..9ba776f6aba1 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -20,7 +20,7 @@ let
         src = fetchFromGitHub {
           owner = "elastic";
           repo = "beats";
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-TzcKB1hIHe1LNZ59GcvR527yvYqPKNXPIhpWH2vyMTY=";
         };
 
diff --git a/pkgs/misc/opcua-client-gui/default.nix b/pkgs/misc/opcua-client-gui/default.nix
index 9315bdd8ca3d..63cb377162c9 100644
--- a/pkgs/misc/opcua-client-gui/default.nix
+++ b/pkgs/misc/opcua-client-gui/default.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "FreeOpcUa";
     repo = "opcua-client-gui";
-    rev = version;
+    tag = version;
     hash = "sha256-0BH1Txr3z4a7iFcsfnovmBUreXMvIX2zpZa8QivQVx8=";
   };
 
diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix
index 5e8ff5be7ed1..748afe7770e0 100644
--- a/pkgs/misc/t-rec/default.nix
+++ b/pkgs/misc/t-rec/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sassman";
     repo = "t-rec-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-aQX+JJ2MwzzxJkA1vsE8JqvYpWtqyycvycPc2pyFU7g=";
   };
 
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 8cc8f8200cd5..82315655c5c5 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -116,7 +116,7 @@ in
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "tmux";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-Is0CQ1ZJMXIwpDjrI5MDNHJtq+R3jlNcd9NXQESUe2w=";
     };
     postInstall = ''
@@ -213,7 +213,7 @@ in
     src = fetchFromGitHub {
       owner = "eraserhd";
       repo = "tmux-ctrlw";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-YYbPkGQmukIDD1fcYleioETFai/SOJni+aZ9Jh2+Zc8=";
     };
   };
@@ -562,7 +562,7 @@ in
     src = fetchFromGitHub {
       owner = "eraserhd";
       repo = "tmux-plumb";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-WcTyAeuGAF+Xsqeb3MtRtHDSXiUmTJNDQOkrQJsj07A=";
     };
     postInstall = ''
@@ -940,7 +940,7 @@ in
     src = pkgs.fetchFromGitHub {
       owner = "joshmedeski";
       repo = "t-smart-tmux-session-manager";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-EMDEEIWJ+XFOk0WsQPAwj9BFBVDNwFUCyd1ScceqKpc=";
     };
     nativeBuildInputs = [ pkgs.makeWrapper ];
@@ -1046,7 +1046,7 @@ in
     src = fetchFromGitHub {
       owner = "o0th";
       repo = "tmux-nova";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-0LIql8as2+OendEHVqR0F3pmQTxC1oqapwhxT+34lJo=";
     };
     meta = with lib; {
diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix
index b9cc9abb40bf..17567a73dd6d 100644
--- a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix
+++ b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix
@@ -12,7 +12,7 @@ let
     src = fetchFromGitHub {
       owner = "Morantron";
       repo = "tmux-fingers";
-      rev = "${version}";
+      tag = version;
       sha256 = "sha256-m9QON7diHVEDnnv/alXCJOG+BnfrAKygScrubZZ605I=";
     };
 
diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix
index 2f9919ed7d42..42876168afef 100644
--- a/pkgs/misc/wiki-tui/default.nix
+++ b/pkgs/misc/wiki-tui/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Builditluc";
     repo = "wiki-tui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-eTDxRrTP9vX7F1lmDCuF6g1pfaZChqB8Pv1kfrd7I9w=";
   };
 
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix
index 002b9276cf5b..6b83613a4372 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "freebsd";
     repo = "drm-kmod-firmware";
-    rev = version;
+    tag = version;
     hash = "sha256-Ly9B0zf+YODel/X1sZYVVUVWh38faNLhkcXcjEnQwII=";
   };
 
diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index 474d750ecc8c..431cb934b711 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "khd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0nzfhknv1s71870w2dk9dy56a3g5zsbjphmfrz0vsvi438g099r4";
   };
 
diff --git a/pkgs/os-specific/darwin/noah/default.nix b/pkgs/os-specific/darwin/noah/default.nix
index 421b11df3232..e2da94f16d60 100644
--- a/pkgs/os-specific/darwin/noah/default.nix
+++ b/pkgs/os-specific/darwin/noah/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-noah";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0bivfsgb56kndz61lzjgdcnqlhjikqw89ma0h6f6radyvfzy0vis";
   };
 
diff --git a/pkgs/os-specific/darwin/pngpaste/default.nix b/pkgs/os-specific/darwin/pngpaste/default.nix
index 3df66b88534a..65f7ed47f6e8 100644
--- a/pkgs/os-specific/darwin/pngpaste/default.nix
+++ b/pkgs/os-specific/darwin/pngpaste/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "jcsalterego";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "uvajxSelk1Wfd5is5kmT2fzDShlufBgC0PDCeabEOSE=";
   };
 
diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index 9aacbce1c790..56130e685857 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ChrisJohnsen";
     repo = "tmux-MacOSX-pasteboard";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1qgimh58hcx5f646gj2kpd36ayvrdkw616ad8cb3lcm11kg0ag79";
   };
 
diff --git a/pkgs/os-specific/darwin/sigtool/default.nix b/pkgs/os-specific/darwin/sigtool/default.nix
index 41dccbfff6c0..d38db0d8464c 100644
--- a/pkgs/os-specific/darwin/sigtool/default.nix
+++ b/pkgs/os-specific/darwin/sigtool/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thefloweringash";
     repo = "sigtool";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-K3VSFaqcZEomF7kROJz+AwxdW1MmxxEFDaRnWnzcw54=";
   };
 
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix
index d3bfcf6420d1..489bbc720cd6 100644
--- a/pkgs/os-specific/darwin/trash/default.nix
+++ b/pkgs/os-specific/darwin/trash/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ali-rantakari";
     repo = "trash";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1d3rc03vgz32faj7qi18iiggxvxlqrj9lsk5jkpa9r1mcs5d89my";
   };
 
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index 504b713b908d..f159c64f8d7b 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "acpi_call";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1s7h9y3adyfhw7cjldlfmid79lrwz3vqlvziw9nwd6x5qdj4w9vp";
   };
 
diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix
index ffbdf880efa8..3626e574afb5 100644
--- a/pkgs/os-specific/linux/akvcam/default.nix
+++ b/pkgs/os-specific/linux/akvcam/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "webcamoid";
     repo = "akvcam";
-    rev = version;
+    tag = version;
     sha256 = "sha256-8jQxBvWRE9Bsh0oz76gO7o+ROm6Z5QGAIe3WERIouUw=";
   };
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 63ad87c6a1fa..c6f6959d094d 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brndnmtthws";
     repo = "conky";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L8YSbdk+qQl17L4IRajFD/AEWRXb2w7xH9sM9qPGrQo=";
   };
 
diff --git a/pkgs/os-specific/linux/corefreq/default.nix b/pkgs/os-specific/linux/corefreq/default.nix
index 3f69b46b76bd..79b7fe733fd6 100644
--- a/pkgs/os-specific/linux/corefreq/default.nix
+++ b/pkgs/os-specific/linux/corefreq/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cyring";
     repo = "CoreFreq";
-    rev = version;
+    tag = version;
     hash = "sha256-gdJ3yaE/Q10NV9TTbBUwzlF2wogiXFNy8gA36Fr/S7o=";
   };
 
diff --git a/pkgs/os-specific/linux/cpupower-gui/default.nix b/pkgs/os-specific/linux/cpupower-gui/default.nix
index f29cce5b8f19..493fe2cfd3ae 100644
--- a/pkgs/os-specific/linux/cpupower-gui/default.nix
+++ b/pkgs/os-specific/linux/cpupower-gui/default.nix
@@ -32,7 +32,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "vagnum08";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "05lvpi3wgyi741sd8lgcslj8i7yi3wz7jwl7ca3y539y50hwrdas";
   };
 
diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix
index 926e024d9e3e..605ee33c3037 100644
--- a/pkgs/os-specific/linux/digimend/default.nix
+++ b/pkgs/os-specific/linux/digimend/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "digimend";
     repo = "digimend-kernel-drivers";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YYCxTyoZGMnqC2nKkRi5Z1uofldGvJDGY2/sO9iMNIo=";
   };
 
diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix
index d4e7841518f9..73ebe8edf944 100644
--- a/pkgs/os-specific/linux/facetimehd/default.nix
+++ b/pkgs/os-specific/linux/facetimehd/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "patjak";
     repo = "facetimehd";
-    rev = version;
+    tag = version;
     sha256 = "sha256-3BDIQNMdNeZyuEgnAkJ0uy7b5lOOx1CfS3eamyZyZm8=";
   };
 
diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix
index 44a5d65358b4..8a14cbf4037b 100644
--- a/pkgs/os-specific/linux/firmware/ath9k/default.nix
+++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
         }
       else
         {
-          rev = finalAttrs.version;
+          tag = finalAttrs.version;
           hash = "sha256-Q/A0ryIC5E1pt2Sh7o79gxHbe4OgdlrwflOWtxWSS5o=";
         }
     )
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 8f8210c65466..2600b68788bb 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
-    rev = version;
+    tag = version;
     hash = "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=";
   };
 
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index cb01e684735a..a63037890764 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DimitryAndric";
     repo = "i7z";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "00c4ng30ry88hcya4g1i9dngiqmz3cs31x7qh1a10nalxn1829xy";
   };
 
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 7bf1f155b21d..12ffb19a84da 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-2CjzIOe1hrW3He9DN+w+Wi2zaaMBkVEdA7dezTpkx8I=";
   };
 
diff --git a/pkgs/os-specific/linux/libbpf/0.x.nix b/pkgs/os-specific/linux/libbpf/0.x.nix
index 603fded29262..b91b4d7ee673 100644
--- a/pkgs/os-specific/linux/libbpf/0.x.nix
+++ b/pkgs/os-specific/linux/libbpf/0.x.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "libbpf";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-J5cUvfUYc+uLdkFa2jx/2bqBoZg/eSzc6SWlgKqcfIc=";
   };
 
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index 7fa6d3fcef1b..b09e883c8dbf 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "libbpf";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+L/rbp0a3p4PHq1yTJmuMcNj0gT5sqAPeaNRo3Sh6U8=";
   };
 
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 846c5ae0beff..b229e719c4b1 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lttng";
     repo = "lttng-modules";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cEiv1EjsEvyreRERrCGKKpJdA1IKvuyVmgA7S3EkEnU=";
   };
 
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 28eb2ef55385..0885748b8dcb 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andikleen";
     repo = "mcelog";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1xy1082c67yd48idg5vwvrw7yx74gn6jj2d9c67d0rh6yji091ki";
   };
 
diff --git a/pkgs/os-specific/linux/nullfs/default.nix b/pkgs/os-specific/linux/nullfs/default.nix
index db2c52d6c068..dc6a0f4f666e 100644
--- a/pkgs/os-specific/linux/nullfs/default.nix
+++ b/pkgs/os-specific/linux/nullfs/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "abbbi";
     repo = "nullfsvfs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Hkplhem4Gb1xsYQtRSWub0m15Fiil3qJAO183ygP+WI=";
   };
 
diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix
index fc74771d74d6..878d23e54e6d 100644
--- a/pkgs/os-specific/linux/projecteur/default.nix
+++ b/pkgs/os-specific/linux/projecteur/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jahnf";
     repo = "Projecteur";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = false;
     hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A=";
   };
diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix
index 77d91d039bc6..fb477c0beb25 100644
--- a/pkgs/os-specific/linux/r8168/default.nix
+++ b/pkgs/os-specific/linux/r8168/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mtorromeo";
     repo = "r8168";
-    rev = version;
+    tag = version;
     sha256 = "0bHGs8jyWd+ZiixOoNkBqhS9RjDpRp3vveAgk1YuOWU=";
   };
 
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index d1a420d22422..5f86d54282f2 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "draios";
     repo = "sysdig";
-    rev = version;
+    tag = version;
     hash = "sha256-oufRTr5TFdpF50pmem2L3bBFIfwxCR8f1xi0A328iHo=";
   };
 
diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix
index 299129a7f025..efb2672a3900 100644
--- a/pkgs/os-specific/linux/system76-acpi/default.nix
+++ b/pkgs/os-specific/linux/system76-acpi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-acpi-dkms";
-    rev = version;
+    tag = version;
     inherit sha256;
   };
 
diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix
index 708eb6f80208..ab9b5619cae4 100644
--- a/pkgs/os-specific/linux/system76-io/default.nix
+++ b/pkgs/os-specific/linux/system76-io/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-io-dkms";
-    rev = version;
+    tag = version;
     inherit hash;
   };
 
diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix
index fe84cc4df83c..bf78f478cfe7 100644
--- a/pkgs/os-specific/linux/system76/default.nix
+++ b/pkgs/os-specific/linux/system76/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-dkms";
-    rev = version;
+    tag = version;
     inherit hash;
   };
 
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index c67384b3d938..59bcb325db43 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -214,7 +214,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "systemd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GvRn55grHWR6M+tA86RMzqinuXNpPZzRB4ApuGN/ZvU=";
   };
 
diff --git a/pkgs/os-specific/linux/usbrelay/default.nix b/pkgs/os-specific/linux/usbrelay/default.nix
index bf5935b6af67..988cb1ce39a5 100644
--- a/pkgs/os-specific/linux/usbrelay/default.nix
+++ b/pkgs/os-specific/linux/usbrelay/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "darrylb123";
     repo = "usbrelay";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-9jEiMmBEpqY4+nKh3H8N/JrLohp/7oPK3rPmRjp2gvc=";
   };
 
diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index f119c5c1ad24..4d96d40c12d1 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "umlaeute";
     repo = "v4l2loopback";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-rcwgOXnhRPTmNKUppupfe/2qNUBDUqVb3TeDbrP5pnU=";
   };
 
diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix
index 55ce63db7902..2a66e31c3607 100644
--- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix
+++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jlam55555";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "11mg74ds58jwvdmi3i7c4chxs6v9g09r9ll22pc2kbxjdnrp8zrn";
   };
 
diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix
index edd77f3fb9e4..e1fb87f5a4d5 100644
--- a/pkgs/os-specific/linux/virtio_vmmci/default.nix
+++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "voutilad";
     repo = "virtio_vmmci";
-    rev = version;
+    tag = version;
     hash = "sha256-h8yu4+vTgpAD+sKa1KnVD+qubiIlkYtG2nmQnXOi/sk=";
   };
 
diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix
index 11242fccbc95..0e7ed67d67b0 100644
--- a/pkgs/os-specific/linux/vmm_clock/default.nix
+++ b/pkgs/os-specific/linux/vmm_clock/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "voutilad";
     repo = "vmm_clock";
-    rev = version;
+    tag = version;
     hash = "sha256-XYRxrVixvImxr2j3qxBcv1df1LvPRKqKKgegW3HqUcQ=";
   };
 
diff --git a/pkgs/os-specific/windows/dlfcn/default.nix b/pkgs/os-specific/windows/dlfcn/default.nix
index 1f4ea20d550d..95f0eb3b39bc 100644
--- a/pkgs/os-specific/windows/dlfcn/default.nix
+++ b/pkgs/os-specific/windows/dlfcn/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dlfcn-win32";
     repo = "dlfcn-win32";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ljVTMBiGp8TPufrQcK4zQtcVH1To4zcfBAbUOb+v910=";
   };
 
diff --git a/pkgs/os-specific/windows/npiperelay/default.nix b/pkgs/os-specific/windows/npiperelay/default.nix
index a0c22a8552c5..7f0c406157ee 100644
--- a/pkgs/os-specific/windows/npiperelay/default.nix
+++ b/pkgs/os-specific/windows/npiperelay/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jstarks";
     repo = "npiperelay";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cg4aZmpTysc8m1euxIO2XPv8OMnBk1DwhFcuIFHF/1o=";
   };
 
diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix
index be8ec5069ca3..f20243491331 100644
--- a/pkgs/servers/authelia/sources.nix
+++ b/pkgs/servers/authelia/sources.nix
@@ -6,7 +6,7 @@ rec {
   src = fetchFromGitHub {
     owner = "authelia";
     repo = "authelia";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Q/NGjJphuZ7MMnOSTAukzEg4iAQWc/VDFWs0jj4e0dY=";
   };
   vendorHash = "sha256-FE4YABsWKhifVjdzJSnjWPesjuSe/hWDa6oTg8MZjo8=";
diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix
index 4121a5e8b4d3..868c25a266a8 100644
--- a/pkgs/servers/code-server/default.nix
+++ b/pkgs/servers/code-server/default.nix
@@ -45,7 +45,7 @@ let
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
-            rev = "v${version}";
+            tag = "v${version}";
             hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix
index ee7b4919f194..84903a220c8a 100644
--- a/pkgs/servers/etcd/3.4.nix
+++ b/pkgs/servers/etcd/3.4.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "etcd-io";
     repo = "etcd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-M0iD05Wk3pC56kGKeIb0bfMUpy9idMKin0+DYhBo/cw=";
   };
 
diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix
index aee1cc8892c8..3f936efade7e 100644
--- a/pkgs/servers/etcd/3.5/default.nix
+++ b/pkgs/servers/etcd/3.5/default.nix
@@ -17,7 +17,7 @@ let
   src = fetchFromGitHub {
     owner = "etcd-io";
     repo = "etcd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = etcdSrcHash;
   };
 
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 1612f518a795..2c82f3c1b42c 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -91,7 +91,7 @@ rec {
       src = fetchFromGitHub {
         owner = "FirebirdSQL";
         repo = "firebird";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-po8tMrOahfwayVXa7Eadr9+ZEmZizHlCmxi094cOJSY=";
       };
 
@@ -114,7 +114,7 @@ rec {
       src = fetchFromGitHub {
         owner = "FirebirdSQL";
         repo = "firebird";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-OxkPpmnYTl65ns+hKHJd5IAPUiMj0g3HUpyRpwDNut8=";
       };
 
diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix
index 9d48f9c1136b..2b168fb2ba00 100644
--- a/pkgs/servers/geospatial/martin/default.nix
+++ b/pkgs/servers/geospatial/martin/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "maplibre";
     repo = "martin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Jq72aEwM5bIaVywmS3HetR6nnBZnr3oa9a/4ZbgeL9E=";
   };
 
diff --git a/pkgs/servers/hockeypuck/sources.nix b/pkgs/servers/hockeypuck/sources.nix
index b504cd331410..f17034673ad5 100644
--- a/pkgs/servers/hockeypuck/sources.nix
+++ b/pkgs/servers/hockeypuck/sources.nix
@@ -10,7 +10,7 @@ in
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "0da3ffbqck0dr7d89gy2yillp7g9a4ziyjlvrm8vgkkg2fs8dlb1";
   };
 }
diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix
index d8839e155d56..825c591f76b9 100644
--- a/pkgs/servers/home-assistant/cli.nix
+++ b/pkgs/servers/home-assistant/cli.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "home-assistant-cli";
-    rev = version;
+    tag = version;
     hash = "sha256-4OeHJ7icDZUOC5K4L0F0Nd9lbJPgdW4LCU0wniLvJ1Q=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
index ba19b714ae4c..0fbd3cb25dad 100644
--- a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
@@ -14,7 +14,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
-    rev = version;
+    tag = version;
     hash = "sha256-6bYKqU9yucISjTrmCUx1bNn9kqvT9jW1OBrqAa4ayEQ=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix
index 43fff7a6fde3..9e5ea81ff5bd 100644
--- a/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "sanjoyg";
     repo = "dirigera_platform";
-    rev = version;
+    tag = version;
     hash = "sha256-FNcGl6INQlVP+P3qmExWLI1ALh9ZacjJAbNKRtgM3ms=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/dwd/package.nix b/pkgs/servers/home-assistant/custom-components/dwd/package.nix
index 9968ba73fc35..cf9ef97049f2 100644
--- a/pkgs/servers/home-assistant/custom-components/dwd/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/dwd/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "hg1337";
     repo = "homeassistant-dwd";
-    rev = version;
+    tag = version;
     hash = "sha256-v5xSIUW8EMTdLY66yZ31cR/1DWVvn85CfIl/Y4xpXiw=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix
index c4a1d9893f42..0c88be384c58 100644
--- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "magico13";
     repo = "ha-emporia-vue";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OfJvln80ek/+4PURk23REhIyUckAEZ+Ybb5rZyKs6h4=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix b/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
index 19c5cc3d4d0e..0506c0c4dde6 100644
--- a/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
@@ -12,7 +12,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "lichtteil";
     repo = "local_luftdaten";
-    rev = version;
+    tag = version;
     hash = "sha256-68clZgS7Qo62srcZWD3Un9BnNSwQUBr4Z5oBMTC9m8o=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/localtuya/package.nix b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix
index 5c4e63386784..27ee664e0da4 100644
--- a/pkgs/servers/home-assistant/custom-components/localtuya/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix
@@ -12,7 +12,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "xZetsubou";
     repo = "hass-localtuya";
-    rev = version;
+    tag = version;
     hash = "sha256-6JE2hVD650YE7pSrLt+Ie1QpvHcG0bJ2yrTpwTukBG0=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix b/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix
index 8e4b7ca0059c..0c6a02558e4c 100644
--- a/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant-midea-air-appliances-lan";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-61LAecJRHQi9/Wf4L25HwAMOV5Yzsr8irAnh5xuWJ7c=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
index fdc34a3f679f..0ef5db69dc65 100644
--- a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant_integration_ntfy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cdqO8fwaEZzAEa7aVjV00OQYnmx0vJZqz7Nd9+MUHN8=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix b/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix
index ec5eaf815b7c..70d8dc362ded 100644
--- a/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix
@@ -15,7 +15,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "philips-airpurifier-coap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jQXQdcgW8IDmjaHjmeyXHcNTXYmknNDw7Flegy6wj2A=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix
index 89609238a092..9fcba5dd78d2 100644
--- a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix
@@ -15,7 +15,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha-smartthinq-sensors";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L0diABbUq/0wmwvhHeMOg6ieNrvM+LWZ/ynezEpBblk=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix
index 2d1a056407cf..4e6db194fb88 100644
--- a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix
@@ -14,7 +14,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "hultenvp";
     repo = "solis-sensor";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-RgsKIav3ozWYO9CXzvhMVmvOW74L/AHGOW8OWOMFBcQ=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
index 081590df249b..f2d1a4fb3443 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
@@ -14,7 +14,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "XiaomiGateway3";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VvuvOUldhmROTs1+YbCT7++VJ71GgGKRbHjqZxQQY0w=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
index 9204ee81fe66..7087822ba4cc 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "al-one";
     repo = "hass-xiaomi-miot";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2qUzLGFXbBq5m+ecSQScC2PHeI6kz6CDeRAjyVu4oWk=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix
index 739491acb180..6a71f6ee9377 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "RomRider";
     repo = "apexcharts-card";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bB/FCNVBK8vOfT3q9+qNssNJCtiN7ReqrsJoobf5dpU=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
index a9e8e5485c1c..294969233174 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "totaldebug";
     repo = "atomic-calendar-revive";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TaxvxAUcewQH0IMJ0/VjW4+T6squ1tuZIFGn3PE3jhU=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
index 811709ef4d7f..08b11ffdac8f 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Clooos";
     repo = "Bubble-Card";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Hn6jH7lT+bjkOM/iRCmD1B8l6ZRqjNTmVMj4IN7ixE4=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix
index e0c4883406cc..4dd8aa9b3ede 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "custom-cards";
     repo = "button-card";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ntg1sNgAehcL2fT0rP0YHzV5q6rB5p1TyFXtbZyB3Vo=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
index 8a6df713f416..c81e09b3fe87 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "thomasloven";
     repo = "lovelace-card-mod";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MjeLbo1r/PMbzDfZurZYm1fHUukHfzOx6njRgEB8rWk=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix
index bed75c9c63b7..2f9b3a9bb12b 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "custom-cards";
     repo = "decluttering-card";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8pf7G6RbLdpIdXYz801+wwAc3NcNs8l0x4fSGqlAmG0=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
index f046c21aecca..11aff6076411 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "decompil3d";
     repo = "lovelace-hourly-weather";
-    rev = version;
+    tag = version;
     hash = "sha256-D2kCUcUgLyMVeba3xc02q/5PrEzXrBVCX+75F58j8y0=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix
index 674dd3b4e741..3377846a1f22 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "madmicio";
     repo = "LG-WebOS-Remote-Control";
-    rev = version;
+    tag = version;
     hash = "sha256-ICOAi8q8dWrBFCv18JYSWc6MIwqxfDXOcc6kCKLGehs=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix
index ebfca7e42437..8c338c550ff8 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "kalkih";
     repo = "mini-media-player";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-tEG8xmqsPDssXmsCobHJoNK3qdRvBRe6FcTfm16r6+g=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix
index 2ece70bd477d..b24743016a79 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "benct";
     repo = "lovelace-multiple-entity-row";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CXRgXyH1NUg7ssQhenqP0tXr1m2qOkHna3Rf30K3SjI=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix
index eeefe1b1cd13..02a5520804a2 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "piitaya";
     repo = "lovelace-mushroom";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IYixXKitnrqw9t4UMfIl6v1v627FQwiv0TZEh1LVJTI=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
index 308d5bba3170..4177291ccac6 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "MindFreeze";
     repo = "ha-sankey-chart";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Yjh9HrL7zcMFSlXLRW071zG4Wiyv9q2siIw5Ego4e80=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix
index d4fbd31640ec..7fbe42ad60ed 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "thomasloven";
     repo = "lovelace-template-entity-row";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XQxdnRQywWki5mJhmQU5Etz2XSB8jYC32tFGLWb3IXs=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
index 2bead7d12330..af39576ba1f1 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "android-tv-card";
-    rev = version;
+    tag = version;
     hash = "sha256-93qPYFr7qNDlQH28dT461EQjWKZJOpL3EpfBBGt4acw=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix
index 1b384501eb03..4130b62f8423 100755
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "denysdovhan";
     repo = "vacuum-card";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-egWseYspxm+zkfFwTEBYQfBox3sswYMuOYqU6oEQTb4=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix
index d08b8dd0ba60..d26cf84bb1d8 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Hypfer";
     repo = "lovelace-valetudo-map-card";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-owOIbA1tRlnbWJ/p/wAUpeDnz/Wzu+GmUammJ6VFxHc=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
index c15d1b4fd5cd..41c3b5d9493b 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jmcollin78";
     repo = "versatile-thermostat-ui-card";
-    rev = "${version}";
+    tag = version;
     hash = "sha256-yPp478uXiRWDH4DP/d0Mloie7nPY1hWLt8X1vLhysvA=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix
index b93b44ae96b5..5f8ed9ec1595 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "azuwis";
     repo = "zigbee2mqtt-networkmap";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-S4iUTjI+pFfa8hg1/lJSI1tl2nEIh+LO2WTYhWWLh/s=";
   };
 
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 1a25a9bf1007..cd3420d0f56e 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -236,7 +236,7 @@ let
         src = fetchFromGitHub {
           owner = "MatsNl";
           repo = "pyatag";
-          rev = version;
+          tag = version;
           sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6";
         };
       });
@@ -370,7 +370,7 @@ let
         src = fetchFromGitHub {
           owner = "spry-group";
           repo = "python-vultr";
-          rev = version;
+          tag = version;
           hash = "sha256-sHCZ8Csxs5rwg1ZG++hP3MfK7ldeAdqm5ta9tEXeW+I=";
         };
       });
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index 3691aa8e80bb..b5d6dc5b0f38 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "mod_auth_mellon";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VcR+HZ5S7fLrGqT1SHCQLQw6v516G0x+wf8Wb5Sy4Gk=";
   };
 
diff --git a/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix b/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix
index 2ee6f59041a4..abbf85c6fd4f 100644
--- a/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wyattoday";
     repo = "mod_cspnonce";
-    rev = version;
+    tag = version;
     hash = "sha256-uUWRKUjS2LvHgT5xrK+LZLQRHc6wMaxGca2OsVxVlRs=";
   };
 
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index d2f6a7ae3bb5..e5caba38f11e 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FastCGI-Archives";
     repo = "mod_fastcgi";
-    rev = version;
+    tag = version;
     hash = "sha256-ovir59kCjKkgbraX23nsmzlMzGdeNTyj3MQd8cgvLsg=";
   };
 
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 83940d9e1fab..86a2bd89bf73 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GrahamDumpleton";
     repo = "mod_wsgi";
-    rev = version;
+    tag = version;
     hash = "sha256-FhOSU8/4QoWa73bNi/qkgKm3CeEEdboh2MgxgQxcYzE=";
   };
 
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 14176166d3a9..e3271507cff4 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -103,7 +103,7 @@ let
           src = fetchFromGitLab {
             owner = "arpa2";
             repo = "arpa2common";
-            rev = "v${version}";
+            tag = "v${version}";
             sha256 = "sha256-8zVsAlGtmya9EK4OkGUMu2FKJRn2Q3bg2QWGjqcii64=";
           };
         }))
@@ -245,7 +245,7 @@ let
         name = "echo";
         owner = "openresty";
         repo = "echo-nginx-module";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-K7oOE0yxPYLf+3YMVbBsncpHRpGHXjs/8B5QPO3MQC4=";
       };
 
@@ -391,7 +391,7 @@ let
         name = "lua";
         owner = "openresty";
         repo = "lua-nginx-module";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-007up/XncaSBimBumHpbwgB1WnkXgBe8e/q/yT6vthI=";
       };
 
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index d60b8ec7815b..72c7f6fe79f1 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alibaba";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-cClSNBlresMHqJrqSFWvUo589TlwJ2tL5FWJG9QBuis=";
   };
 
diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index a8ebcc9e2e56..8f69d528363f 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Icinga";
     repo = "icingaweb2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PWP5fECKjdXhdX1E5hYaGv/fqb1KIKfclcPiCY/MMZM=";
   };
 
diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix
index e408fc8130c2..35f1db000e74 100644
--- a/pkgs/servers/icingaweb2/ipl.nix
+++ b/pkgs/servers/icingaweb2/ipl.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Icinga";
     repo = "icinga-php-library";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dzrYiZJx7h0gQzXbmp1X3NKlWZAl7hKCEd05+lSRomg=";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-april/default.nix b/pkgs/servers/icingaweb2/theme-april/default.nix
index 51633ea0a8d0..d77d847f12ed 100644
--- a/pkgs/servers/icingaweb2/theme-april/default.nix
+++ b/pkgs/servers/icingaweb2/theme-april/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mikesch-mp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0i1js2k47llzgmc77q9frvcmr02mqlhg0qhswx1486fvm6myxg0g";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-lsd/default.nix b/pkgs/servers/icingaweb2/theme-lsd/default.nix
index 5e3afdc72bb3..56c91b0f7257 100644
--- a/pkgs/servers/icingaweb2/theme-lsd/default.nix
+++ b/pkgs/servers/icingaweb2/theme-lsd/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mikesch-mp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "172y08sar4nbyv5pfq5chw8xa3b7fg1dacmsg778zky5zf49qz2w";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-particles/default.nix b/pkgs/servers/icingaweb2/theme-particles/default.nix
index da9aaaf6a499..d083028e8d26 100644
--- a/pkgs/servers/icingaweb2/theme-particles/default.nix
+++ b/pkgs/servers/icingaweb2/theme-particles/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mikesch-mp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0m6bbz191686k4djqbk8v0zcdm4cyi159jb3zwz7q295xbpi2vfy";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-snow/default.nix b/pkgs/servers/icingaweb2/theme-snow/default.nix
index e38ea325e2ab..b7e732506752 100644
--- a/pkgs/servers/icingaweb2/theme-snow/default.nix
+++ b/pkgs/servers/icingaweb2/theme-snow/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mikesch-mp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1c974v85mbsis52y2knwzh33996q8sza7pqrcs6ydx033s0rxjrp";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-spring/default.nix b/pkgs/servers/icingaweb2/theme-spring/default.nix
index 618e78a1bd74..203a6e2c0c32 100644
--- a/pkgs/servers/icingaweb2/theme-spring/default.nix
+++ b/pkgs/servers/icingaweb2/theme-spring/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mikesch-mp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09v4871pndarhm2spxm9fdab58l5wj8m40kh53wvk1xc3g7pqki9";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-unicorn/default.nix b/pkgs/servers/icingaweb2/theme-unicorn/default.nix
index 7fc162b90b25..4a94e8f9f564 100644
--- a/pkgs/servers/icingaweb2/theme-unicorn/default.nix
+++ b/pkgs/servers/icingaweb2/theme-unicorn/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     (fetchFromGitHub {
       owner = "Mikesch-mp";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "1qmcajdf0g70vp2avqa50lfrfigq22k91kggbgn5ablwyg9dki05";
     })
     (fetchurl {
diff --git a/pkgs/servers/icingaweb2/thirdparty.nix b/pkgs/servers/icingaweb2/thirdparty.nix
index 87a12d2f5788..97531059de3a 100644
--- a/pkgs/servers/icingaweb2/thirdparty.nix
+++ b/pkgs/servers/icingaweb2/thirdparty.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Icinga";
     repo = "icinga-php-thirdparty";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-T67DcsHVf3yDQveNtSPqLoOOPuT4ThkUSCJ9aCSVaIc=";
   };
 
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index a698422da543..727a2852d141 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -16,7 +16,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha512-AnyCT52wZR+2rhUXg3BOaWo7ESZUQNMLtaiVld2c2vYw7atq78N+uDFUIYfsvxemDAStB5tjw1mdwdLevzCkTA==";
   };
 
diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix
index fd8f627fa316..abd4a9338cb2 100644
--- a/pkgs/servers/krill/default.nix
+++ b/pkgs/servers/krill/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-3pkDu20vgzslJcK5KQH+GY+jnimEZgm+bQxy8QMUeCk=";
   };
 
diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix
index 473df8ed243a..812621011af3 100644
--- a/pkgs/servers/mail/mailpit/default.nix
+++ b/pkgs/servers/mail/mailpit/default.nix
@@ -24,7 +24,7 @@ let
   src = fetchFromGitHub {
     owner = "axllent";
     repo = "mailpit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = source.hash;
   };
 
diff --git a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix
index 0cba39036ffe..381bd276c0b6 100644
--- a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix
+++ b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "poolpOrg";
     repo = "filter-rspamd";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Ud1irvEyYr9QDsm2PsnWoWkXoDH0WWeH73k/IbLrVf4=";
   };
 
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 58563cc2a07a..6fde6dddf81f 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -11,7 +11,7 @@ in
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-KmeWBMuyJ/ZdZnFXAlpvgXV+J8IZrcaTXvvui4l6mjY=";
   };
   patches = patches ++ [ ];
diff --git a/pkgs/servers/memos/default.nix b/pkgs/servers/memos/default.nix
index 4abdcf3f7e56..233d0a4b3c5d 100644
--- a/pkgs/servers/memos/default.nix
+++ b/pkgs/servers/memos/default.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "usememos";
     repo = "memos";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lcOZg5mlFPp04ZCm5GDhQfSwE2ahSmGhmdAw+pygK0A=";
   };
 
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 1b30c6ead78f..5363222c3b49 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -55,7 +55,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-oXotHi79XBhxD/qYC7QDQwn7jiX0wKWe/RXZS5DwN9o=";
   };
 
diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix
index 403420cb9962..0b1ecb800333 100644
--- a/pkgs/servers/monitoring/icinga2/default.nix
+++ b/pkgs/servers/monitoring/icinga2/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "icinga";
     repo = "icinga2";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-QXe/+yQlyyOa78eEiudDni08SCUP3nhTYVpbmVUVKA8=";
   };
 
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_openvpn/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_openvpn/default.nix
index 6fec9f0f0077..03ec735b0307 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_openvpn/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_openvpn/default.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "liquidat";
     repo = "nagios-icinga-openvpn";
-    rev = version;
+    tag = version;
     sha256 = "1vz3p7nckc5k5f06nm1xfzpykhyndh2dzyagmifrzg5k478p1lpm";
   };
 
diff --git a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
index 36ca174a8e66..dd7343022db1 100644
--- a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "alexander-naumov";
     repo = "openbsd_snmp3_check";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qDYANMvQU72f9wz8os7S1PfBH08AAqhtWLHVuSmkub4=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
index 585f0ca58c99..72427f923446 100644
--- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "apcupsd_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-c0LsUqpJbmWQmbmSGdEy7Bbk20my6iWNLeqtU5BjYlw=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix
index 5aaa34f65c52..2b535a54ebb4 100644
--- a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "czerwonk";
     repo = "atlas_exporter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-vhUhWO7fQpUHT5nyxbT8AylgUqDNZRSb+EGRNGZJ14E=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
index bdfee37adbde..b7fa1cabe78e 100644
--- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ribbybibby";
     repo = "s3_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dYkMCCAIlFDFOFUNJd4NvtAeJDTsHeJoH90b5pSGlQE=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
index ff60ee2c8232..5d39ad4f1ef6 100644
--- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   version = "0.7.0";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "prometheus-community";
     repo = "bind_exporter";
     sha256 = "sha256-x/XGatlXCKo9cI92JzFItApsjuZAfZX+8IZRpy7PVUo=";
diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix
index b25523083d23..6d379556d519 100644
--- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "czerwonk";
     repo = "bird_exporter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-aClwJ+J83iuZbfNP+Y1vKEjBULD5wh/R3TMceCccacc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix
index 6740df977e4e..f11a6b1d5b6b 100644
--- a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jvstein";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZWr+bBNnRYzqjatOJ4jYGzvTyfheceY2UDvG4Juvo5I=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix b/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix
index a02de197b6d2..566b8abb52b9 100644
--- a/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.0.16";
 
   src = fetchFromGitHub {
-    rev = version;
+    tag = version;
     owner = "lablabs";
     repo = pname;
     sha256 = "sha256-7cyHAN4VQWfWMdlFbZvHL38nIEeC1z/vpCDR5R2pOAw=";
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index e50c4f2fe549..30b6cbd24e31 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "collectd_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MxgHJ9+e94ReY/8ISPfGEX9Z9ZHDyNsV0AqlPfsjXvc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
index 9364526b9864..367d2f4b60b2 100644
--- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "dnsmasq_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2sOOJWEEseWwozIyZ7oes400rBjlxIrOOtkP3rSNFXo=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix
index 3ab4e9795df9..975dda650ce9 100644
--- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "domain_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qk/shaWY7M2JDx6W4e7z8Nv7yWUZKZNGZE/mj4zCZHw=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix
index 636e49ddd8a3..ff02c0a807e3 100644
--- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "fastly-exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-1xgTAMsUw+eYeHD6NEo2Zw3fL1Hdm6fxQWfgp/VQaXc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/pkgs/servers/monitoring/prometheus/flow-exporter.nix
index 2de347f3010d..0f2155c1b82e 100644
--- a/pkgs/servers/monitoring/prometheus/flow-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/flow-exporter.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "1.1.1";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "neptune-networks";
     repo = pname;
     sha256 = "sha256-6FqupoYWRvex7XhM7ly8f7ICnuS9JvCRIVEBIJe+64k=";
diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
index 21feb543c9d4..6d6a8ad95b31 100644
--- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mvisonneau";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-G298u9bitEst8QzZd1/B6PTCNpGqq88Z8W8w67/cVkQ=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix
index 4837b6d6190a..0a9b17e6c9eb 100644
--- a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "graphite_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Dr7I4+gQXZYKUMnf/P9DgLYRb4SRaDnvqvDwHfMpAn0=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index 527c8e0b2d0d..e60c56eb8606 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "haproxy_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hpZnMvHAAEbvzASK3OgfG34AhPkCdRM7eOm15PRemkA=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix
index 26ff81f60e32..0a8892d5ed3f 100644
--- a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "ipmi_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Go47Txf/NX9ytMvvFQeNVCw0ORWqbsg2sIWK4MVRyIA=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
index 7a9a6007bed9..027ca59d488c 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "json_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Zeq4gbwGd16MkGQRL8+bq0Ns06Yg+H9GAEo3qaMGDbc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix
index fc92bf47a8e0..6ce200bb46ac 100644
--- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "czerwonk";
     repo = "junos_exporter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-PZKP8kcxU5ArC+bkYIO91Dg/f85T5qneX4wuKTj/jP4=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix
index 45525cd946e2..cf9c16413dd5 100644
--- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "keylight_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yI1mmEb5SP2lbP37CpPxYITJL/nvd/mIwxB0RIQRe4I=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/kthxbye.nix b/pkgs/servers/monitoring/prometheus/kthxbye.nix
index a8cd32b3e02d..ccdcb270462e 100644
--- a/pkgs/servers/monitoring/prometheus/kthxbye.nix
+++ b/pkgs/servers/monitoring/prometheus/kthxbye.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prymitive";
     repo = "kthxbye";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B6AgD79q0kA67iC9pIfv8PH8xejx2srpRccdds1GsZo=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
index 69e504dba384..d9e96f5c5dfb 100644
--- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "lndmon";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-PzmDotyuG8Fgkr6SlBWofqQamDG39v65fFjRUKjIWWM=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix
index e6b2afa7500a..4f927ab6ab1a 100644
--- a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "modemmanager_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wQATmTjYsm1J2DicPryoa/jVpbLjXz+1TTQUH5yGV6w=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
index b9f3983d5a56..fd4eb9256470 100644
--- a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "percona";
     repo = "mongodb_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FwY4rAmv7P55EGfEHrs0y15BvU3qnq0VHf37R7W2yA4=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index ff8e33b3ad41..ae7b9af90c30 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "mysqld_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vkbjOWVV79fDBdCa6/ueY9QhPDkFCApR/EZn20SYHYU=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/servers/monitoring/prometheus/nats-exporter.nix
index 3ea933d48527..bea89eb00453 100644
--- a/pkgs/servers/monitoring/prometheus/nats-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nats-exporter.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-siucc55qi1SS2R07xgxh25CWYjxncUqvzxo0XoIPyOo=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
index de6e31c91eae..142537114d5a 100644
--- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xperimental";
     repo = "nextcloud-exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lK5a63ZokFlm5S3k1a0MGBm+vAAqQV/5ERjJ0zZ4Yno=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 8f1d9e765bee..d09cf6ee4306 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nginxinc";
     repo = "nginx-prometheus-exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-yujMufcL4uJHxbEd8mwqxPmPlopVm6szkDxz+GZITio=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
index 08e49707907d..c70333ecd7e5 100644
--- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "martin-helmich";
     repo = "prometheus-nginxlog-exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UkXrVHHHZ9mEgsMUcHu+wI6NZFw4h3X4atDBjpBcz8E=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix
index b6a8cefded99..40479979fd79 100644
--- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DRuggeri";
     repo = "nut_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6qexTBCLitL+dgT1Ff+414AUQqgn9s+CP5J5MkByb7s=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
index 569e84501099..3ea3123fdc60 100644
--- a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "pgbouncer_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8ChYYJIHdzH2vWxqnzS6sz9fDeLe+Y29fzia3/aBkgc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix b/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix
index c4c25909bedd..1080189115ad 100644
--- a/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hipages";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ggrFnyEdGBoZVh4dHMw+7RUm8nJ1hJXo/fownO3wvzE=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
index 60dea11316c7..65124990541c 100644
--- a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "eko";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7gomafTMK8rk+QFw3Vm8KUgNFqiUDILeTwNFa7vdgAw=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/ping-exporter.nix b/pkgs/servers/monitoring/prometheus/ping-exporter.nix
index 60e60a795e3b..306ab5e69db2 100644
--- a/pkgs/servers/monitoring/prometheus/ping-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/ping-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "czerwonk";
     repo = "ping_exporter";
-    rev = version;
+    tag = version;
     hash = "sha256-Jdo+6/e9gES8q4wTGRuy5HSj7VimOMZ9q3guKDcKJxg=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
index d84cb5d931dd..e7a9902f0771 100644
--- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "postgres_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-F7nLz6NkvWSeZTzjo1/wNWCPn3Veo9/SkJdlFRwdlo4=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix
index 068c7e416078..78df154948f6 100644
--- a/pkgs/servers/monitoring/prometheus/process-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ncabatoff";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WGfKF7GE9RHrMiqbx5c3WtHEKUA2SShwuUUAqAeiMts=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index d11e1a16aa21..37bdce2ca137 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "1.4.1";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "prometheus";
     repo = "prom2json";
     sha256 = "sha256-cKz+ZFQYjsL7dFfXXCrl4T8OuvQkdqVAotG9HRNtN7o=";
diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
index 8fa0995e38cc..68880c10ec2d 100644
--- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "oliver006";
     repo = "redis_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KIbrJJ2QNghj/dehcDXJqWJU2pD6mt8Gw9RPLK3RTk0=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix b/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix
index 80f1ecc37cc5..a08ce7889d14 100644
--- a/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mhansen";
     repo = "rtl_433_prometheus";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ggtGi1gnpTLGvZnfAW9vyYyU7ELbTRNhXyCMotx+KKU=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/sachet.nix b/pkgs/servers/monitoring/prometheus/sachet.nix
index 8011b96e23a2..85c61d0574b5 100644
--- a/pkgs/servers/monitoring/prometheus/sachet.nix
+++ b/pkgs/servers/monitoring/prometheus/sachet.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "messagebird";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-zcFViE1/B+wrkxZ3YIyfy2IBbxLvXOf8iK/6eqZb1ZQ=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/script-exporter.nix b/pkgs/servers/monitoring/prometheus/script-exporter.nix
index a3e1d76a3ec5..65df6d1a4569 100644
--- a/pkgs/servers/monitoring/prometheus/script-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/script-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adhocteam";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-t/xgRalcHxEcT1peU1ePJUItD02rQdfz1uWpXDBo6C0=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
index e5917819b631..70235b6bf4c3 100644
--- a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aexel90";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-L0TuBDq5eEahQvzqd1WuvmXuQbbblCM+Nvj15IybnVo=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix
index cafe88657ac4..831723ee1c8b 100644
--- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix
+++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SuperQ";
     repo = "smokeping_prober";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TOt0YKgzcASQVY0ohoIwRJhjoH/Q0cuPabaItPnhv+w=";
   };
   vendorHash = "sha256-m6jOZx4zuVl1Bay4OCvPTF/pRFXfBfitWfQ+S10xe9I=";
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index 7c2ad7f12dd6..94a01ab421b3 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "snmp_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/uNmY4xON9VFXEi4njAC5nD1RVWn+nUr1oQnt9w8pmQ=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
index 83423fef422c..393458bd9a29 100644
--- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "justwatchcom";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-KygxnNbElzRtVwjKmlbgdCxO3oEYssfFl5UAk5+F50c=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
index c2874b4b6a67..39a90317952a 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "statsd_exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-h58yD+jmvUCvYsJqNcBSR1f+5YgDyMbLDd3I0HW9/kA=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix
index d0759e991f7a..029a7a84065d 100644
--- a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wWXtAyQ48fsh/9BBo2tHXf4QS3Pbsmj6rha28TdBRWI=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix
index 9a3f339b5fbf..2808b8f80d40 100644
--- a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wi1dcard";
     repo = "v2ray-exporter";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "12mzng3cw24fyyh8zjfi26gh853k5blzg3zbxcccnv5lryh2r0yi";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index 772069ddeb06..8f46dff28418 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jonnenauha";
     repo = "prometheus_varnish_exporter";
-    rev = version;
+    tag = version;
     hash = "sha256-1sUzKLNkLP/eX0wYSestMAJpjAmX1iimjYoFYb6Mgpc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index b77b1254c86c..95d0aa7f9bf5 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MindFlavor";
     repo = "prometheus_wireguard_exporter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2e31ZuGJvpvu7L2Lb+n6bZWpC1JhETzEzSiNaxxsAtA=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
index 3e397eb0cfc8..20a44e8b5d6d 100644
--- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
+++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jelmer";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-iwqcowwJktZQfdxykpsw/MweAPY0KF7ojVwvk1LP8a4=";
   };
 
diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index 9181b19189df..efef9ba71a95 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -20,7 +20,7 @@ let
       src = fetchFromGitHub {
         owner = "sensu";
         repo = "sensu-go";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = "sha256-Vcay8vUYLjV65g526btQX0+m5n/cRocIKx7C2LuWeP4=";
       };
 
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 158d0cc142e4..207b329a89cb 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -205,7 +205,7 @@ let
       src = fetchFromGitHub {
         owner = "MusicPlayerDaemon";
         repo = "MPD";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = "sha256-6wEFgiMsEoWvmfH609d+UZY7jzqDoNmXalpHBipqTN0=";
       };
 
diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix
index 4c0ed8d0abda..587502e42308 100644
--- a/pkgs/servers/mtprotoproxy/default.nix
+++ b/pkgs/servers/mtprotoproxy/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexbers";
     repo = "mtprotoproxy";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-tQ6e1Y25V4qAqBvhhKdirSCYzeALfH+PhNtcHTuBurs=";
   };
 
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index a6f053467a5b..511a4dd29c73 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -74,7 +74,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Aibu3yG/D1501Hr2F2qsGvjig14tbEAI+MBfqbxlpg8=";
   };
 
diff --git a/pkgs/servers/nosql/influxdb2/cli.nix b/pkgs/servers/nosql/influxdb2/cli.nix
index 85b3e910b696..b2c4fc4ae3bb 100644
--- a/pkgs/servers/nosql/influxdb2/cli.nix
+++ b/pkgs/servers/nosql/influxdb2/cli.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "influx-cli";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0Gyoy9T5pA+40k8kKybWBMtOfpKZxw3Vvp4ZB4ptcJs=";
   };
 
diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
index c90a77f4af36..ed769f05c7a8 100644
--- a/pkgs/servers/nosql/influxdb2/default.nix
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -21,7 +21,7 @@ let
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "influxdb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-0gqFUIV0ETdVuVmC+SwoKsO6OkoT/s+qKO1f8fkaZj4=";
   };
 
diff --git a/pkgs/servers/nosql/influxdb2/provision.nix b/pkgs/servers/nosql/influxdb2/provision.nix
index 01be841f6a8a..feca1ef3867d 100644
--- a/pkgs/servers/nosql/influxdb2/provision.nix
+++ b/pkgs/servers/nosql/influxdb2/provision.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oddlama";
     repo = "influxdb2-provision";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-kgpUtXmwy9buupNzQj/6AIeN8XG2x0XjIckK3WIFC+I=";
   };
 
diff --git a/pkgs/servers/nosql/influxdb2/token-manipulator.nix b/pkgs/servers/nosql/influxdb2/token-manipulator.nix
index 12db726fdb56..7722da0134d0 100644
--- a/pkgs/servers/nosql/influxdb2/token-manipulator.nix
+++ b/pkgs/servers/nosql/influxdb2/token-manipulator.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "oddlama";
     repo = "influxdb2-token-manipulator";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9glz+TdqvGJgSsbLm4J/fn7kzMC75z74/jxZrEZiooc=";
   };
 
diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix
index 309030b4d303..2311b5c76053 100644
--- a/pkgs/servers/openvscode-server/default.nix
+++ b/pkgs/servers/openvscode-server/default.nix
@@ -54,7 +54,7 @@ let
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
-            rev = "v${version}";
+            tag = "v${version}";
             hash = "sha256-4TC1d5FOZHUMuEMTcTOBLZZM+sFUswhyblI5HVWyvPA=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/servers/osmocom/libasn1c/default.nix b/pkgs/servers/osmocom/libasn1c/default.nix
index 983ef5dbc196..ee09814419f6 100644
--- a/pkgs/servers/osmocom/libasn1c/default.nix
+++ b/pkgs/servers/osmocom/libasn1c/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libasn1c";
-    rev = version;
+    tag = version;
     hash = "sha256-cnXcUvP6WwHVvpdsIVsMkizlLyg9KMwVj8XYX/nIfic=";
   };
 
diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix
index 4c53bbc5200f..f316953c3889 100644
--- a/pkgs/servers/oxigraph/default.nix
+++ b/pkgs/servers/oxigraph/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-sv9LpAoPQ4oFrGI6j6NgVZwEwpM1wt93lHkUwnvmhIY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix
index 18c718734d56..de2c489f2f64 100644
--- a/pkgs/servers/pingvin-share/default.nix
+++ b/pkgs/servers/pingvin-share/default.nix
@@ -9,7 +9,7 @@ let
   src = fetchFromGitHub {
     owner = "stonith404";
     repo = "pingvin-share";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xP6XiehTbbXu9hCxF1mwb9ud/2SCnaskhz9XMtF3HKI=";
   };
 in
diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix
index 2798e203542e..138d0e785328 100644
--- a/pkgs/servers/piping-server-rust/default.nix
+++ b/pkgs/servers/piping-server-rust/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nwtgck";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8kYaANVWmBOncTdhtjjbaYnEFQeuWjemdz/kTjwj2fw=";
   };
 
diff --git a/pkgs/servers/plik/programs.nix b/pkgs/servers/plik/programs.nix
index 791cd96d03b7..3b643e73d23b 100644
--- a/pkgs/servers/plik/programs.nix
+++ b/pkgs/servers/plik/programs.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "root-gg";
     repo = "plik";
-    rev = version;
+    tag = version;
     hash = "sha256-WCtfkzlZnyzZDwNDBrW06bUbLYTL2C704Y7aXbiVi5c=";
   };
 
diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix
index 0d958d6e5a28..6df39c267c4c 100644
--- a/pkgs/servers/polaris/default.nix
+++ b/pkgs/servers/polaris/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "agersant";
     repo = "polaris";
-    rev = version;
+    tag = version;
     hash = "sha256-2GHYIlEzRS7KXahdrxMjyIcPCNw8gXJw5/4ZpB/zT3Y=";
 
     # The polaris version upstream in Cargo.lock is "0.0.0".
diff --git a/pkgs/servers/rtrtr/default.nix b/pkgs/servers/rtrtr/default.nix
index 4774ebd1ce2d..732d7a511dab 100644
--- a/pkgs/servers/rtrtr/default.nix
+++ b/pkgs/servers/rtrtr/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-c1jzUP7cYjqn49gbjXLWTge8ywHBI29gSnhzWDzNCV8=";
   };
 
diff --git a/pkgs/servers/search/quickwit/default.nix b/pkgs/servers/search/quickwit/default.nix
index f056a726d476..e29173b5f544 100644
--- a/pkgs/servers/search/quickwit/default.nix
+++ b/pkgs/servers/search/quickwit/default.nix
@@ -26,7 +26,7 @@ let
   src = fetchFromGitHub {
     owner = "quickwit-oss";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OrCO0mCFmhYBdpr4Gps56KJJ37uuJpV6ZJHWspOScyw=";
   };
 
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index bbbccaea5fc2..c40dee0614b9 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uOO+TpKjJkdjEp4nHzxcHtZOXqXzpkIF3dno1AX17d8=";
   };
 
diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix
index 731b6c43b759..6b9ab7affeeb 100644
--- a/pkgs/servers/spicedb/default.nix
+++ b/pkgs/servers/spicedb/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7E9wbPi82F9mqqEsnK96a376QRu9NnpdZRAFB0pe1Lc=";
   };
 
diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix
index f7ae38c731c0..ee3f17908226 100644
--- a/pkgs/servers/spicedb/zed.nix
+++ b/pkgs/servers/spicedb/zed.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "zed";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m9RHgMqbYBo/p4hXVbLa6j8ms9JcNH0CccF8rjfeUns=";
   };
 
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
index 6b5a5674078f..ef3f7195a9e9 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "mariadb-corporation";
     repo = "mariadb-connector-c";
-    rev = "v${version}";
+    tag = "v${version}";
     inherit hash;
   };
 
diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix
index 0663d08b2424..365703f5d514 100644
--- a/pkgs/servers/teleport/generic.nix
+++ b/pkgs/servers/teleport/generic.nix
@@ -36,7 +36,7 @@ let
   src = fetchFromGitHub {
     owner = "gravitational";
     repo = "teleport";
-    rev = "v${version}";
+    tag = "v${version}";
     inherit hash;
   };
   pname = "teleport";
diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix
index f916716c3eb5..73ccd934aabb 100644
--- a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix
+++ b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix
@@ -13,7 +13,7 @@ import ./versions.nix (
     src = fetchFromGitHub {
       owner = "honeycombio";
       repo = "honeymarker";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = sha256;
     };
 
diff --git a/pkgs/servers/tracing/honeycomb/honeytail/default.nix b/pkgs/servers/tracing/honeycomb/honeytail/default.nix
index cebed31d7213..9b791fec5511 100644
--- a/pkgs/servers/tracing/honeycomb/honeytail/default.nix
+++ b/pkgs/servers/tracing/honeycomb/honeytail/default.nix
@@ -13,7 +13,7 @@ import ./versions.nix (
     src = fetchFromGitHub {
       owner = "honeycombio";
       repo = "honeytail";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = sha256;
     };
 
diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix
index 7f083e5c377f..2871902833de 100644
--- a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix
+++ b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix
@@ -13,7 +13,7 @@ import ./versions.nix (
     src = fetchFromGitHub {
       owner = "honeycombio";
       repo = "honeyvent";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = sha256;
     };
 
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index 7b4ea22faa13..b21ecf745ecd 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -17,7 +17,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/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix
index bcdfb989bee8..b07f65adb4b9 100644
--- a/pkgs/servers/trickster/trickster.nix
+++ b/pkgs/servers/trickster/trickster.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trickstercache";
     repo = "trickster";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BRD8IF3s9RaDorVtXRvbKLVVVXWiEQTQyKBR9jFo1eM=";
   };
 
diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix
index 0e01767fa2ba..e3e1a5d9c5e7 100644
--- a/pkgs/servers/unpackerr/default.nix
+++ b/pkgs/servers/unpackerr/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "davidnewhall";
     repo = "unpackerr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-uQwpdgV6ksouW9JTuiiuQjxBGOE/ypDW769kNJgWrHw=";
   };
 
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
index 763e534a5697..11a9ab53202e 100644
--- a/pkgs/servers/varnish/digest.nix
+++ b/pkgs/servers/varnish/digest.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "varnish";
     repo = "libvmod-digest";
-    rev = version;
+    tag = version;
     inherit sha256;
   };
 
diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix
index da1df5fc50a6..eac1e1eef559 100644
--- a/pkgs/servers/varnish/dynamic.nix
+++ b/pkgs/servers/varnish/dynamic.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "nigoroll";
     repo = "libvmod-dynamic";
-    rev = "v${version}";
+    tag = "v${version}";
     inherit sha256;
   };
 
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index d51a2dae3f7c..9e62cafbe282 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -22,7 +22,7 @@ let
       src = fetchFromGitHub {
         owner = "varnish";
         repo = "varnish-modules";
-        rev = version;
+        tag = version;
         inherit hash;
       };
 
diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix
index f52cc3c3ef0e..74f16ad18dde 100644
--- a/pkgs/servers/web-apps/bookstack/default.nix
+++ b/pkgs/servers/web-apps/bookstack/default.nix
@@ -32,7 +32,7 @@ package.override rec {
   src = fetchFromGitHub {
     owner = "bookstackapp";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-uuek56256NCIhvvLYTHgbRBea66SUg+9xnfcOsK5Bo0=";
   };
 
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 347aefd22d28..6ac3a29da1a0 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -53,7 +53,7 @@ let
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FaPcUta5z/8oasw+9zGBRZnUVYD8eCo1t/XwwsFoSM8=";
   };
 
diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix
index f6cc8c6fead6..6f8e689b4f9a 100644
--- a/pkgs/servers/web-apps/freshrss/default.nix
+++ b/pkgs/servers/web-apps/freshrss/default.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FreshRSS";
     repo = "FreshRSS";
-    rev = version;
+    tag = version;
     hash = "sha256-hgkFNZg+A1cF+xh17d2n4SCvxTZm/Eryj6jP7MvnpTE=";
   };
 
diff --git a/pkgs/servers/web-apps/freshrss/extensions/default.nix b/pkgs/servers/web-apps/freshrss/extensions/default.nix
index 3c7c920350a6..82a0360da4ca 100644
--- a/pkgs/servers/web-apps/freshrss/extensions/default.nix
+++ b/pkgs/servers/web-apps/freshrss/extensions/default.nix
@@ -27,7 +27,7 @@ let
         src = fetchFromGitHub {
           owner = "mgnsk";
           repo = "FreshRSS-AutoTTL";
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-OiTiLZ2BjQD1W/BD8EkUt7WB2wOjL6GMGJ+APT4YpwE=";
         };
         meta = {
@@ -82,7 +82,7 @@ let
         src = fetchFromGitHub {
           owner = "aledeg";
           repo = "xExtension-RedditImage";
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-H/uxt441ygLL0RoUdtTn9Q6Q/Ois8RHlhF8eLpTza4Q=";
         };
         meta = {
diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix
index 2c0d7c0cf57f..c8b54239883f 100644
--- a/pkgs/servers/web-apps/lemmy/server.nix
+++ b/pkgs/servers/web-apps/lemmy/server.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LemmyNet";
     repo = "lemmy";
-    rev = version;
+    tag = version;
     hash = pinData.serverHash;
     fetchSubmodules = true;
   };
diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix
index b423bcd8748f..6d7b90c02928 100644
--- a/pkgs/servers/web-apps/lemmy/ui.nix
+++ b/pkgs/servers/web-apps/lemmy/ui.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     fetchFromGitHub {
       owner = "LemmyNet";
       repo = pname;
-      rev = version;
+      tag = version;
       fetchSubmodules = true;
       hash = pinData.uiHash;
     };
diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix
index 49f0ae356713..b2b455a9ec47 100644
--- a/pkgs/servers/web-apps/outline/default.nix
+++ b/pkgs/servers/web-apps/outline/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nCXyR4k/Ny0OLAE18B+GJDyOMTjt6rc375yj+d+c8zQ=";
   };
 
diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix
index aa5ab0595910..70694152ae98 100644
--- a/pkgs/servers/web-apps/plausible/default.nix
+++ b/pkgs/servers/web-apps/plausible/default.nix
@@ -23,7 +23,7 @@ let
   src = fetchFromGitHub {
     owner = "plausible";
     repo = "analytics";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4gwK/AxzhsU0vgvKgIXrOyQLCgZMeZyKjj7PWbUmJ+8=";
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/assets/package-lock.json
diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix
index f5efb7306312..8982be6b4f22 100644
--- a/pkgs/shells/carapace/default.nix
+++ b/pkgs/shells/carapace/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "carapace-sh";
     repo = "carapace-bin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ewZ06HPAS7UXmnRlrOaHegVrfYxwko/jyHqtQV/0JwY=";
   };
 
diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix
index d5a317b61863..605e4da998ee 100644
--- a/pkgs/shells/fish/babelfish.nix
+++ b/pkgs/shells/fish/babelfish.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bouk";
     repo = "babelfish";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/rWX77n9wqWxkHG7gVOinCJ6ahuEfbAcGijC1oAxrno=";
   };
 
diff --git a/pkgs/shells/fish/plugins/async-prompt.nix b/pkgs/shells/fish/plugins/async-prompt.nix
index 2f25dcf87060..99568bb104ce 100644
--- a/pkgs/shells/fish/plugins/async-prompt.nix
+++ b/pkgs/shells/fish/plugins/async-prompt.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "acomagu";
     repo = "fish-async-prompt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-B7Ze0a5Zp+5JVsQUOv97mKHh5wiv3ejsDhJMrK7YOx4=";
   };
 
diff --git a/pkgs/shells/fish/plugins/autopair.nix b/pkgs/shells/fish/plugins/autopair.nix
index 6832c0bf746b..2ed41d568cdb 100644
--- a/pkgs/shells/fish/plugins/autopair.nix
+++ b/pkgs/shells/fish/plugins/autopair.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "jorgebucaran";
     repo = "autopair.fish";
-    rev = version;
+    tag = version;
     sha256 = "sha256-s1o188TlwpUQEN3X5MxUlD/2CFCpEkWu83U9O+wg3VU=";
   };
 
diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix
index 7c94772dc8df..4d86b9e07b5d 100644
--- a/pkgs/shells/fish/plugins/done.nix
+++ b/pkgs/shells/fish/plugins/done.nix
@@ -12,7 +12,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "franciscolourenco";
     repo = "done";
-    rev = version;
+    tag = version;
     hash = "sha256-DMIRKRAVOn7YEnuAtz4hIxrU93ULxNoQhW6juxCoh4o=";
   };
 
diff --git a/pkgs/shells/fish/plugins/fifc.nix b/pkgs/shells/fish/plugins/fifc.nix
index 0b287d39ba2f..34809a367309 100644
--- a/pkgs/shells/fish/plugins/fifc.nix
+++ b/pkgs/shells/fish/plugins/fifc.nix
@@ -10,7 +10,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "gazorby";
     repo = "fifc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-p5E4Mx6j8hcM1bDbeftikyhfHxQ+qPDanuM1wNqGm6E=";
   };
 
diff --git a/pkgs/shells/fish/plugins/fish-bd.nix b/pkgs/shells/fish/plugins/fish-bd.nix
index 154fc6213389..fc5c10693336 100644
--- a/pkgs/shells/fish/plugins/fish-bd.nix
+++ b/pkgs/shells/fish/plugins/fish-bd.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "0rax";
     repo = "fish-bd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GeWjoakXa0t2TsMC/wpLEmsSVGhHFhBVK3v9eyQdzv0=";
   };
 
diff --git a/pkgs/shells/fish/plugins/fishtape.nix b/pkgs/shells/fish/plugins/fishtape.nix
index 6bfe0dba1a7d..e049f5982c00 100644
--- a/pkgs/shells/fish/plugins/fishtape.nix
+++ b/pkgs/shells/fish/plugins/fishtape.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "jorgebucaran";
     repo = "fishtape";
-    rev = version;
+    tag = version;
     sha256 = "0dxcyhs2shhgy5xnwcimqja8vqsyk841x486lgq13i3y1h0kp2kd";
   };
 
diff --git a/pkgs/shells/fish/plugins/fishtape_3.nix b/pkgs/shells/fish/plugins/fishtape_3.nix
index fa9d1c3839a0..5354a04529b8 100644
--- a/pkgs/shells/fish/plugins/fishtape_3.nix
+++ b/pkgs/shells/fish/plugins/fishtape_3.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "jorgebucaran";
     repo = "fishtape";
-    rev = version;
+    tag = version;
     sha256 = "072a3qbk1lpxw53bxp91drsffylx8fbywhss3x0jbnayn9m8i7aa";
   };
 
diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix
index acb3783bb968..d415809af8c8 100644
--- a/pkgs/shells/fish/plugins/forgit.nix
+++ b/pkgs/shells/fish/plugins/forgit.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
-    rev = version;
+    tag = version;
     hash = "sha256-wYCuCxPv3HGEGaze/+an6ZprCtXu5ThsTCwaIquEy3Y=";
   };
 
diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix
index 1bf3f640e309..f97295227d6a 100644
--- a/pkgs/shells/fish/plugins/fzf-fish.nix
+++ b/pkgs/shells/fish/plugins/fzf-fish.nix
@@ -21,7 +21,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "PatrickF1";
     repo = "fzf.fish";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM=";
   };
 
diff --git a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix
index 0a1370f71561..6718c3d9dd2a 100644
--- a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix
+++ b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "z11i";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-CFXbeO0euC/UtvQV0KCz4WQfdJgsuXKPM6M9oaw7hvg=";
   };
 
diff --git a/pkgs/shells/fish/plugins/pisces.nix b/pkgs/shells/fish/plugins/pisces.nix
index be59b248277b..f643127d2ce8 100644
--- a/pkgs/shells/fish/plugins/pisces.nix
+++ b/pkgs/shells/fish/plugins/pisces.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "laughedelic";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Oou2IeNNAqR00ZT3bss/DbhrJjGeMsn9dBBYhgdafBw=";
   };
 
diff --git a/pkgs/shells/fish/plugins/puffer.nix b/pkgs/shells/fish/plugins/puffer.nix
index 107191ca52e6..d58f81813e27 100644
--- a/pkgs/shells/fish/plugins/puffer.nix
+++ b/pkgs/shells/fish/plugins/puffer.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "nickeb96";
     repo = "puffer-fish";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2niYj0NLfmVIQguuGTA7RrPIcorJEPkxhH6Dhcy+6Bk=";
   };
 
diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix
index c5a288b8f027..aa1445924585 100644
--- a/pkgs/shells/fish/plugins/pure.nix
+++ b/pkgs/shells/fish/plugins/pure.nix
@@ -13,7 +13,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "pure-fish";
     repo = "pure";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8zxqPU9N5XGbKc0b3bZYkQ3yH64qcbakMsHIpHZSne4=";
   };
 
diff --git a/pkgs/shells/fish/plugins/sdkman-for-fish.nix b/pkgs/shells/fish/plugins/sdkman-for-fish.nix
index c137cc2cded9..f49f89afe983 100644
--- a/pkgs/shells/fish/plugins/sdkman-for-fish.nix
+++ b/pkgs/shells/fish/plugins/sdkman-for-fish.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "reitzig";
     repo = "sdkman-for-fish";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7cgyR3hQ30Jv+9lJS5qaBvSaI/0YVT8xPXlUhDBTdFc=";
   };
 
diff --git a/pkgs/shells/fish/plugins/sponge.nix b/pkgs/shells/fish/plugins/sponge.nix
index 81b29d775366..895177278986 100644
--- a/pkgs/shells/fish/plugins/sponge.nix
+++ b/pkgs/shells/fish/plugins/sponge.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "meaningful-ooo";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w=";
   };
 
diff --git a/pkgs/shells/fish/plugins/tide.nix b/pkgs/shells/fish/plugins/tide.nix
index a0bfc69e95e7..04f40baf0e55 100644
--- a/pkgs/shells/fish/plugins/tide.nix
+++ b/pkgs/shells/fish/plugins/tide.nix
@@ -13,7 +13,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "IlanCosman";
     repo = "tide";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZyEk/WoxdX5Fr2kXRERQS1U1QHH3oVSyBQvlwYnEYyc=";
   };
 
diff --git a/pkgs/shells/fish/plugins/wakatime-fish.nix b/pkgs/shells/fish/plugins/wakatime-fish.nix
index 743164202ddf..f6c42e93a804 100644
--- a/pkgs/shells/fish/plugins/wakatime-fish.nix
+++ b/pkgs/shells/fish/plugins/wakatime-fish.nix
@@ -12,7 +12,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "ik11235";
     repo = "wakatime.fish";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Hsr69n4fCvPc64NztgaBZQuR0znkzlL8Uotw9Jf2S1o=";
   };
 
diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/shells/nushell/plugins/dbus.nix
index 91d63bb9f316..c958f394aced 100644
--- a/pkgs/shells/nushell/plugins/dbus.nix
+++ b/pkgs/shells/nushell/plugins/dbus.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "devyn";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Ga+1zFwS/v+3iKVEz7TFmJjyBW/gq6leHeyH2vjawto=";
   };
 
diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix
index 4be46ad05f7e..3288a7c4690f 100644
--- a/pkgs/shells/nushell/plugins/units.nix
+++ b/pkgs/shells/nushell/plugins/units.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     repo = "nu_plugin_units";
     owner = "JosephTLyons";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iDRrA8bvufV92ADeG+eF3xu7I/4IinJcSxEkwuhkHlg=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index 27f57ab1ab9d..7e137179f9f4 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -140,7 +140,7 @@ let
         src = pkgs.fetchFromGitHub {
           owner = "knqyf263";
           repo = "pet";
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-Gjw1dRrgM8D3G7v6WIM2+50r4HmTXvx0Xxme2fH9TlQ=";
         };
 
@@ -161,7 +161,7 @@ let
         src = pkgs.fetchFromGitHub {
           owner = "knqyf263";
           repo = "pet";
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg=";
         };
 
@@ -181,7 +181,7 @@ let
 
           src = pkgs.fetchFromGitHub {
             inherit (previousAttrs.src) owner repo;
-            rev = "v${finalAttrs.version}";
+            tag = "v${finalAttrs.version}";
             hash = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg=";
           };
 
diff --git a/pkgs/tools/admin/aws-mfa/default.nix b/pkgs/tools/admin/aws-mfa/default.nix
index 69b2a5a56622..962aeb7323ec 100644
--- a/pkgs/tools/admin/aws-mfa/default.nix
+++ b/pkgs/tools/admin/aws-mfa/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "broamski";
     repo = "aws-mfa";
-    rev = version;
+    tag = version;
     hash = "sha256-XhnDri7QV8esKtx0SttWAvevE3SH2Yj2YMq/P4K6jK4=";
   };
 
diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/tools/admin/awsume/default.nix
index 98cba0c23403..db9f656d4b49 100644
--- a/pkgs/tools/admin/awsume/default.nix
+++ b/pkgs/tools/admin/awsume/default.nix
@@ -19,7 +19,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "trek10inc";
     repo = "awsume";
-    rev = version;
+    tag = version;
     sha256 = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc=";
   };
 
diff --git a/pkgs/tools/admin/cdist/default.nix b/pkgs/tools/admin/cdist/default.nix
index d15ce58e0566..334ff629f65b 100644
--- a/pkgs/tools/admin/cdist/default.nix
+++ b/pkgs/tools/admin/cdist/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
     domain = "code.ungleich.ch";
     owner = "ungleich-public";
     repo = "cdist";
-    rev = version;
+    tag = version;
     hash = "sha256-lIx0RtGQJdY2e00azI9yS6TV+5pCegpKOOD0dQmgMqA=";
   };
 
diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 37d84e65cef1..69547815ca22 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dalance";
     repo = "procs";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-+qY0BG3XNCm5vm5W6VX4a0JWCb4JSat/oK9GLXRis/M=";
   };
 
diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix
index 6fa866e6bd11..c0eb8e4becb2 100644
--- a/pkgs/tools/admin/turbovnc/default.nix
+++ b/pkgs/tools/admin/turbovnc/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "TurboVNC";
     repo = "turbovnc";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Qt9yGyGWKFBppO91D+hUfmN7CMg0I66rAXyRoCYUOEA=";
   };
 
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index af927a4a45de..2d0b35fba293 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zpaq";
     repo = "zpaq";
-    rev = version;
+    tag = version;
     sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4";
   };
 
diff --git a/pkgs/tools/audio/beets/plugins/audible.nix b/pkgs/tools/audio/beets/plugins/audible.nix
index f1aee4179ea9..17b7138f71e3 100644
--- a/pkgs/tools/audio/beets/plugins/audible.nix
+++ b/pkgs/tools/audio/beets/plugins/audible.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Neurrone";
     repo = "beets-audible";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Sds16h+W9t7N755ADPXXDi+SxwouBMxP9ApUqaXedqY=";
   };
 
diff --git a/pkgs/tools/audio/opl3bankeditor/common.nix b/pkgs/tools/audio/opl3bankeditor/common.nix
index 8c0ce9eabfee..a6f31148a299 100644
--- a/pkgs/tools/audio/opl3bankeditor/common.nix
+++ b/pkgs/tools/audio/opl3bankeditor/common.nix
@@ -31,7 +31,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Wohlstand";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     inherit sha256;
   };
 
diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix
index 86367d92dad7..940d06ae73da 100644
--- a/pkgs/tools/backup/bupstash/default.nix
+++ b/pkgs/tools/backup/bupstash/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "andrewchambers";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Ekjxna3u+71s1q7jjXp7PxYUQIfbp2E+jAqKGuszU6g=";
   };
 
diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix
index eb081f742075..2f8a8cf22ad1 100644
--- a/pkgs/tools/backup/monolith/default.nix
+++ b/pkgs/tools/backup/monolith/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Y2Z";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-048WUDMMaTjGsNY54m2eKY1MdyX9llojIzGvbcC+Buc=";
   };
 
diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index 3b49848beffd..975e5d2db882 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dpc";
     repo = "rdedup";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GEYP18CaCQShvCg8T7YTvlybH1LNO34KBxgmsTv2Lzs=";
   };
 
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index e4723e357a41..483ae7f77362 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "restic";
     repo = "restic";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-odyKcpNAhk1dlVBhjrtmgKjWTOCMtooYOJ5p0J9OUFY=";
   };
 
diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix
index 5d6938a0570a..63c796da04ca 100644
--- a/pkgs/tools/backup/restic/rest-server.nix
+++ b/pkgs/tools/backup/restic/rest-server.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "restic";
     repo = "rest-server";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o55y+g9XklKghVK1c6MTRI8EHLplTv5YKUWGRyyvmtk=";
   };
 
diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix
index 21df241f7db8..b3c59849ffbd 100644
--- a/pkgs/tools/backup/zbackup/default.nix
+++ b/pkgs/tools/backup/zbackup/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zbackup";
     repo = "zbackup";
-    rev = version;
+    tag = version;
     hash = "sha256-9Fk4EhEeQ2J4Kirc7oad4CzmW70Mmza6uozd87qfgZI=";
   };
 
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index bd2e66c72b47..2ee0e569795b 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-psX15XicPXAsd36BhuvK0G3GQS8hV/hazzO0HByCqV4=";
   };
 
diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix
index 8c00769c1f76..c0629cae364b 100644
--- a/pkgs/tools/compression/bzip3/default.nix
+++ b/pkgs/tools/compression/bzip3/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kspalaiologos";
     repo = "bzip3";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-QMvK0MP0Zx2mQfvYvrOjGV1Lo/ObO5diXcibmwtQATk=";
   };
 
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 971811517a2e..f32f43ee68af 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "09mmsalc7dwlvgrda56s2k927rpl3a5dzfa88aslkqcjnr790wjy";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "xdelta-devel";
     owner = "jmacd";
   };
diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix
index a8272fdb7653..94bc0fc88eef 100644
--- a/pkgs/tools/compression/xdelta/unstable.nix
+++ b/pkgs/tools/compression/xdelta/unstable.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "09mmsalc7dwlvgrda56s2k927rpl3a5dzfa88aslkqcjnr790wjy";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "xdelta-devel";
     owner = "jmacd";
   };
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 9923adf3e001..586de4b1ba54 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "zstd";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-qcd92hQqVBjMT3hyntjcgk29o9wGQsg5Hg7HE5C0UNc=";
   };
 
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix
index d7a48f8ed9ed..886ef7ccd467 100644
--- a/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "whoozle";
     repo = "android-file-transfer-linux";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UOARMtOnG6tekmOsIWRZbl2y32mR0kPD6w7IHRG8VsU=";
   };
 
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 0cb9d3158564..a67c4e64af7b 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -297,7 +297,7 @@ let
           src = fetchFromGitHub {
             owner = "kubernetes-client";
             repo = "python";
-            rev = "v${version}";
+            tag = "v${version}";
             sha256 = "1sawp62j7h0yksmg9jlv4ik9b9i1a1w9syywc9mv8x89wibf5ql1";
             fetchSubmodules = true;
           };
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index dcc80c0acca7..afa9f13a594c 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "099rjb02knr6yz7przlnyj62ic0ag5ncs7vvcc36ikyqrmpqsdch";
-    rev = "v${version}";
+    tag = "v${version}";
     repo = "encfs";
     owner = "vgough";
   };
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index e5e6f29e7eb4..5f48f2306eaa 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -98,7 +98,7 @@ rec {
       src = fetchFromGitHub {
         owner = "irods";
         repo = "irods";
-        rev = finalAttrs.version;
+        tag = finalAttrs.version;
         hash = "sha256-SmN2FzeoA2/gjiDfGs2oifOVj0mK2WdQCgiSdIlENfk=";
         fetchSubmodules = true;
       };
@@ -143,7 +143,7 @@ rec {
       src = fetchFromGitHub {
         owner = "irods";
         repo = "irods_client_icommands";
-        rev = finalAttrs.version;
+        tag = finalAttrs.version;
         hash = "sha256-cc0V6BztJk3njobWt27VeJNmQUXyH6aBJkvYIDFEzWY=";
       };
 
diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix
index e094f6ce5ee8..ea71e43704b2 100644
--- a/pkgs/tools/filesystems/kdiskmark/default.nix
+++ b/pkgs/tools/filesystems/kdiskmark/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jonmagon";
     repo = "kdiskmark";
-    rev = version;
+    tag = version;
     hash = "sha256-JueY7zw9PIo9ETi7pQLpw8FGRhNXYXeXEvTzZGz9lbw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index ff57c0c4ba78..2334cedef9d1 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trapexit";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-3DfSGuTtM+h0IdtsIhLVXQxX5/Tj9G5Qcha3DWmyyq4=";
   };
 
diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix
index 808b27dd687d..422150a82a65 100644
--- a/pkgs/tools/filesystems/mkspiffs/default.nix
+++ b/pkgs/tools/filesystems/mkspiffs/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "igrr";
     repo = "mkspiffs";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-oa6Lmo2yb66IjtEKkZyJBgM/p7rdvmrKfgNd2rAM/Lk=";
   };
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index ff1347c6c7e1..9fd117c60861 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tuxera";
     repo = "ntfs-3g";
-    rev = version;
+    tag = version;
     sha256 = "sha256-nuFTsGkm3zmSzpwmhyY7Ke0VZfZU0jHOzEWaLBbglQk=";
   };
 
diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix
index 387d17ce1861..911867df136e 100644
--- a/pkgs/tools/filesystems/romdirfs/default.nix
+++ b/pkgs/tools/filesystems/romdirfs/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mlafeldt";
     repo = "romdirfs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1jbsmpklrycz5q86qmzvbz4iz2g5fvd7p9nca160aw2izwpws0g7";
   };
 
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 4ca4d71a8f6b..688b3794b54d 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "s3fs-fuse";
     repo = "s3fs-fuse";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wHszw3S+fuZRwTvJy+FkxQTR2BAvr8H924Wd4/C5heE=";
   };
 
diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix
index 1dd426b55a37..41785780aa88 100644
--- a/pkgs/tools/filesystems/securefs/default.nix
+++ b/pkgs/tools/filesystems/securefs/default.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/tools/games/alice-tools/default.nix b/pkgs/tools/games/alice-tools/default.nix
index 7964aa77c38a..c3c549d519b9 100644
--- a/pkgs/tools/games/alice-tools/default.nix
+++ b/pkgs/tools/games/alice-tools/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nunuhara";
     repo = "alice-tools";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-DazWnBeI5XShkIx41GFZLP3BbE0O8T9uflvKIZUXCHo=";
   };
diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix
index ed9d62db08ce..f20b8d87859a 100644
--- a/pkgs/tools/games/pokefinder/default.nix
+++ b/pkgs/tools/games/pokefinder/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Admiral-Fish";
     repo = "PokeFinder";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "R0FrRRQRe0tWrHUoU4PPwOgIsltUEImEMTXL79ISfRE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/tools/games/slipstream/default.nix
index 8269072876f3..54d7e25fefa8 100644
--- a/pkgs/tools/games/slipstream/default.nix
+++ b/pkgs/tools/games/slipstream/default.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "Vhati";
     repo = "Slipstream-Mod-Manager";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU=";
   };
 
diff --git a/pkgs/tools/graphics/hobbits/default.nix b/pkgs/tools/graphics/hobbits/default.nix
index 6a429f9e7065..7ab9709733f7 100644
--- a/pkgs/tools/graphics/hobbits/default.nix
+++ b/pkgs/tools/graphics/hobbits/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mahlet-Inc";
     repo = "hobbits";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SbSuw5e2ll/wU5UBV0MOlvCXb4rvPtsE4l8XzRbBiLI=";
   };
 
diff --git a/pkgs/tools/graphics/maskromtool/default.nix b/pkgs/tools/graphics/maskromtool/default.nix
index 94fbfdb61fe0..79cd09453c73 100644
--- a/pkgs/tools/graphics/maskromtool/default.nix
+++ b/pkgs/tools/graphics/maskromtool/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "travisgoodspeed";
     repo = "maskromtool";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iuCjAAVEKVwJuAgKITwkXGhKau2DVWhFQLPjp28tjIo=";
   };
 
diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
index 649071755e98..95a1de2394f8 100644
--- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
+++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SaschaWillems";
     repo = "VulkanCapsViewer";
-    rev = version;
+    tag = version;
     hash = "sha256-fliiNeZPEP4uNMRDgG093fvU01ZTxwv08YLGwBooOLA=";
     # Note: this derivation strictly requires vulkan-header to be the same it was developed against.
     # To help us, they've put it in a git-submodule.
diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
index 1464e0b0beb2..afa56fdb1758 100644
--- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
+++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DeadSix27";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0rv8bnyxz89za6gwk9gmdbaf3j7c1j52mip7h81rir288j35m84x";
   };
 
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index ce7968e11131..cd3da8494c9a 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mchehab";
     repo = "zbar";
-    rev = version;
+    tag = version;
     sha256 = "sha256-6gOqMsmlYy6TK+iYPIBsCPAk8tYDliZYMYeTOidl4XQ=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index 325c1a7e6b3b..71bd51a9bc8d 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Jk7YY6nrY1Yn9KeNlRJbMF/fCMIlUVg/Elt7SymlK84=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
index ce6815843a39..cb1d8d030285 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-bamboo";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-yvyJHIXUYpOIeiSQasSRKTbN4Z0BAjohz8VlZKqMg0Q=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
index 163c922359da..8a0ef9965b07 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-QL1rRMsaDP98as0zlmoDPoVnbqbKQFoUFSCX+j31JcM=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
index 4203126e72e5..d009cceba687 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-QO136EbUFxT7yA1Fs4DvV0CKpdCMw/s5s9sW3vRzGD8=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index 2bb6a8659051..f3fadef64c88 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-4CvRQU6tcr3l14KzCGIhMvtYuT8DbSywxz6knbl+HgA=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
index d59449b7d6a1..be2d9961dfd0 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-qckaD2VDlXyaXe52PTjYfKIJbsIBRgD5s3b9Oc6l/64=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
index 61ac278d0239..3a50269307f2 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-WTTMW86KsrncfDHttri2eSA0bp/Vm4QVyl9tWkJn00E=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
index 4a6b3dc7268b..f18c0d399c1b 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-7FBUOsaKr9cuEaqd4dqnAGL5sd3RF+qV6GEkOUQ1/k4=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
index 7eaaa0fc818d..adcaad2a4cec 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-kHMCMsJ8+rI0AtS9zEE5knGvKALhgfmgS8lC/CTmYs0=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index f8c7d6742d19..be55934a8a93 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-qt";
-    rev = version;
+    tag = version;
     hash = "sha256-cOCLPsWRcwukGCKAYHrZSRUYlmfYxdyspX5Y0rqbD2w=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
index 0978efc04c07..734b6662fc81 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-1gfR0wXBXM6Gttwldg2vm8DUUW4OciqKMQkpFQHqLoE=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
index 6989bab1100e..839a3de83ee6 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-3Er01Qj3XEIO36xTQrBISzxMaIO4j8uqPe7+w9uk3UM=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
index bbfb6d53800d..0a53b388ecbd 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-Yt6lAievCj9FC4eO6EIqUxiSaBPMvjSEb1PNyXPa82Q=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
index c6b43043956b..83d93d669403 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-unikey";
-    rev = version;
+    tag = version;
     hash = "sha256-hx3GXoloO3eQP9yhLY8v1ahwvOTCe5XcBey+ZbReRjE=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index 0db733c43034..caa034addbf8 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libhangul";
     repo = "ibus-hangul";
-    rev = version;
+    tag = version;
     hash = "sha256-x2oOW8eiEuwmdCGUo+r/KcsitfGccSyianwIEaOBS3M=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index 1f8f443adc22..65f078d3ba01 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ibus";
     repo = "ibus-m17n";
-    rev = version;
+    tag = version;
     sha256 = "sha256-+pNECooSLFqTRkijJiU4a3NpTnDNL9qzhkMp6gSq4XY=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix
index 8574b04875f0..7824dce788a3 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ibus";
     repo = "ibus-pinyin";
-    rev = version;
+    tag = version;
     hash = "sha256-8nM/dEjkNhQNv6Ikv4xtRkS3mALDT6OYC1EAKn1zNtI=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
index ad1aae82f170..e0066d4651c1 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rime";
     repo = "ibus-rime";
-    rev = version;
+    tag = version;
     sha256 = "sha256-6lqPdcIJmwHcr4G6BhIDMhEtEOpOPgWqfkKXqaDjUY0=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 0a938c0ef170..2db202aede31 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kaio";
     repo = "ibus-table";
-    rev = version;
+    tag = version;
     sha256 = "sha256-0322G1cmiISkFaCq5RVFLRdWRUxS66B7E4omxB+7ntE=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index 1c94f999ded8..b559256d55fd 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
-    rev = version;
+    tag = version;
     hash = "sha256-0dyp7kNnmuw9YcYTH/5Eln+EzIbM2HTojXXC9NCA8vE=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 8e2f0bfbbc80..60e00c5f976c 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ibus";
     repo = "ibus";
-    rev = version;
+    tag = version;
     sha256 = "sha256-YMCtLIK/9iUdS37Oiow7WMhFFPKhomNXvzWbLzlUkdQ=";
   };
 
diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix
index 4713d7f2f4c0..057d25c83809 100644
--- a/pkgs/tools/inputmethods/input-remapper/default.nix
+++ b/pkgs/tools/inputmethods/input-remapper/default.nix
@@ -41,7 +41,7 @@ in
   src = fetchFromGitHub {
     owner = "sezanzeb";
     repo = "input-remapper";
-    rev = version;
+    tag = version;
     hash = "sha256-rwlVGF/cWSv6Bsvhrs6nMDQ8avYT80aasrhWyQv55/A=";
   };
 
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix
index 84ed9eb6a8b0..74479a2b5732 100644
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "interception/linux";
     repo = "tools";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jhdgfCWbkF+jD/iXsJ+fYKOtPymxcC46Q4w0aqpvcek=";
   };
 
diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix
index 4fa71b40fbad..6a88ed1b1626 100644
--- a/pkgs/tools/misc/antimicrox/default.nix
+++ b/pkgs/tools/misc/antimicrox/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AntiMicroX";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-ZIHhgyOpabWkdFZoha/Hj/1d8/b6qVolE6dn0xAFZVw=";
   };
 
diff --git a/pkgs/tools/misc/aoc-cli/default.nix b/pkgs/tools/misc/aoc-cli/default.nix
index b0c7c615cfaf..bc6df1b41ff8 100644
--- a/pkgs/tools/misc/aoc-cli/default.nix
+++ b/pkgs/tools/misc/aoc-cli/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "scarvalhojr";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-UdeCKhEWr1BjQ6OMLP19OLWPlvvP7FGAO+mi+bQUPQA=";
   };
 
diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index 323b1dc21cc7..35946245c098 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -44,7 +44,7 @@ let
     src = fetchFromGitHub {
       owner = "eth-p";
       repo = "bat-extras";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-6IRAKSy5f/WcQZBcJKVSweTjHLznzdxhsyx074bXnUQ=";
       fetchSubmodules = true;
     };
diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix
index 8fe0143d9258..27d654c4b0de 100644
--- a/pkgs/tools/misc/brotab/default.nix
+++ b/pkgs/tools/misc/brotab/default.nix
@@ -13,7 +13,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "balta2ar";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-HKKjiW++FwjdorqquSCIdi1InE6KbMbFKZFYHBxzg8Q=";
   };
 
diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix
index 490d1a7049d9..6e3dbc291004 100644
--- a/pkgs/tools/misc/chafa/default.nix
+++ b/pkgs/tools/misc/chafa/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hpjansson";
     repo = "chafa";
-    rev = version;
+    tag = version;
     sha256 = "sha256-9RkN0yZnHf5cx6tsp3P6jsi0/xtplWxMm3hYCPjWj0M=";
   };
 
diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix
index 921e1094997e..20da3b2fa602 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/pkgs/tools/misc/ckb-next/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ckb-next";
     repo = "ckb-next";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lA1FpUee2SpUQwJotbYhG0QX7LT5l2PP9lJ9F3uNtdU=";
   };
 
diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix
index e0892eda4b57..82b0a4ec2b7a 100644
--- a/pkgs/tools/misc/coreboot-utils/default.nix
+++ b/pkgs/tools/misc/coreboot-utils/default.nix
@@ -44,7 +44,7 @@ let
 
         src = fetchgit {
           url = "https://review.coreboot.org/coreboot";
-          rev = version;
+          tag = version;
           hash = "sha256-tsNdsH+GxjLUTd7KXHMZUTNTIAWeKJ3BNy1Lehjo8Eo=";
         };
 
diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix
index 9ff4b4d058fa..0dc75096d27c 100644
--- a/pkgs/tools/misc/dijo/default.nix
+++ b/pkgs/tools/misc/dijo/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NerdyPepper";
     repo = "dijo";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index 7404b142fc00..733fae1b01f7 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "diskus";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-88+U5Y2CC0PhikRO3VqoUwZEYZjwln+61OPWbLLb8T0=";
   };
 
diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix
index cfbc7b343d1b..95d3f69cac54 100644
--- a/pkgs/tools/misc/envchain/default.nix
+++ b/pkgs/tools/misc/envchain/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sorah";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QUy38kJzMbYOyT86as4/yq2ctcszSnB8a3eVWxgd4Fo=";
   };
 
diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix
index 8f896ec44cae..eb52c14aeb1a 100644
--- a/pkgs/tools/misc/fclones/default.nix
+++ b/pkgs/tools/misc/fclones/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pkolaczk";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-OCRfJh6vfAkL86J1GuLgfs57from3fx0NS1Bh1+/oXE=";
   };
 
diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix
index 5eeac952d277..06bce7a739c6 100644
--- a/pkgs/tools/misc/fclones/gui.nix
+++ b/pkgs/tools/misc/fclones/gui.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pkolaczk";
     repo = "fclones-gui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ad7wyoCjSQ8i6c+4IorImqAY2Q6pwBtI2JkkbkGa46U=";
   };
 
diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 5ec56de3c064..1c3006bf32b5 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "timvisee";
     repo = "ffsend";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo=";
   };
 
diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix
index f70e9a5a2583..55b48b82fab6 100644
--- a/pkgs/tools/misc/fltrdr/default.nix
+++ b/pkgs/tools/misc/fltrdr/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "fltrdr";
     owner = "octobanana";
-    rev = version;
+    tag = version;
     sha256 = "1vpci7vqzcpdd21zgigyz38k77r9fc81dmiwsvfr8w7gad5sg6sj";
   };
 
diff --git a/pkgs/tools/misc/freshfetch/default.nix b/pkgs/tools/misc/freshfetch/default.nix
index eb7799428958..96f6aa2067e7 100644
--- a/pkgs/tools/misc/freshfetch/default.nix
+++ b/pkgs/tools/misc/freshfetch/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "k4rakara";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1l9zngr5l12g71j85iyph4jjri3crxc2pi9q0gczrrzvs03439mn";
   };
 
diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index 1b434c71aea8..b6d7b1a15d85 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-WYolvHAK7l1HJZuBXsPJ+X6uzWFHBlHELx4zvD/S934=";
   };
 
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 109b1b347938..4bb358093204 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "garabik";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1h0h88h484a9796hai0wasi1xmjxxhpyxgixn6fgdyc5h69gv8nl";
   };
 
diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix
index b302e7c4fbe5..dd0ffc261346 100644
--- a/pkgs/tools/misc/grex/default.nix
+++ b/pkgs/tools/misc/grex/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pemistahl";
     repo = "grex";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ut2H2H66XN1+wHpYivnuhil21lbd7bwIcIcMyIimdis=";
   };
 
diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix
index 9777c5d1a001..5bdb505e5b88 100644
--- a/pkgs/tools/misc/h/default.nix
+++ b/pkgs/tools/misc/h/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zimbatm";
     repo = "h";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4rhol8a+OMX2+MxFPEM1WzM/70C7sye8jw4pg7CujRo=";
   };
 
diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 90af4652dad1..7eb77f305395 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Benjamin-Dobell";
     repo = "Heimdall";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1ygn4snvcmi98rgldgxf5hwm7zzi1zcsihfvm6awf9s6mpcjzbqz";
   };
 
diff --git a/pkgs/tools/misc/hiksink/default.nix b/pkgs/tools/misc/hiksink/default.nix
index fb2fd6df3fe5..1be0558b08bd 100644
--- a/pkgs/tools/misc/hiksink/default.nix
+++ b/pkgs/tools/misc/hiksink/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "CornerBit";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-k/cBCc7DywyBbAzCRCHdrOVmo+QVCsSgDn8hcyTIUI8=";
   };
 
diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
index 79859ce7f990..007e2ef8b3b6 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "hyperfine";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-c8yK9U8UWRWUSGGGrAds6zAqxAiBLWq/RcZ6pvYNpgk=";
   };
 
diff --git a/pkgs/tools/misc/iay/default.nix b/pkgs/tools/misc/iay/default.nix
index d30f38d3d4fc..4816645215cd 100644
--- a/pkgs/tools/misc/iay/default.nix
+++ b/pkgs/tools/misc/iay/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aaqaishtyaq";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oNUK2ROcocKoIlAuNZcJczDYtSchzpB1qaYbSYsjN50=";
   };
 
diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/tools/misc/kcollectd/default.nix
index 86fb2628866d..a36ff4d51f8d 100644
--- a/pkgs/tools/misc/kcollectd/default.nix
+++ b/pkgs/tools/misc/kcollectd/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "aerusso";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bUVL5eRQ5UkSZo562pnyEcj0fVoSC5WHRq4BfN67jEM=";
   };
 
diff --git a/pkgs/tools/misc/krunner-translator/default.nix b/pkgs/tools/misc/krunner-translator/default.nix
index ce20c400f5b9..a6a95f39b698 100644
--- a/pkgs/tools/misc/krunner-translator/default.nix
+++ b/pkgs/tools/misc/krunner-translator/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "naraesk";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "8MusGvNhTxa8Sm8WiSwRaVIfZOeXmgcO4T6H9LqFGLs=";
   };
 
diff --git a/pkgs/tools/misc/ksnip/default.nix b/pkgs/tools/misc/ksnip/default.nix
index f56c9a537378..4fbeef716256 100644
--- a/pkgs/tools/misc/ksnip/default.nix
+++ b/pkgs/tools/misc/ksnip/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ksnip";
     repo = "ksnip";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-n7YwDXd73hyrzb6L8utZFuHh9HnjVtkU6CC4jfWPj/I=";
   };
 
diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix
index 9979cd0dc2a9..c608a3d2d7dd 100644
--- a/pkgs/tools/misc/lighthouse-steamvr/default.nix
+++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ShayBox";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-FiS+jB5l5xtFIVISA6+K/jbyJZFPwLvy7G+dA+78kZU=";
   };
 
diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix
index a0febe773a63..b3661c9240d8 100644
--- a/pkgs/tools/misc/lorri/default.nix
+++ b/pkgs/tools/misc/lorri/default.nix
@@ -27,7 +27,7 @@ in
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
-    rev = version;
+    tag = version;
     inherit sha256;
   };
 
diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix
index 71fb707312c9..64b2617e8f45 100644
--- a/pkgs/tools/misc/noti/default.nix
+++ b/pkgs/tools/misc/noti/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "variadico";
     repo = "noti";
-    rev = version;
+    tag = version;
     hash = "sha256-8CHSbKOiWNYqKBU1kqQm5t02DJq0JfoIaPsU6Ylc46E=";
   };
 
diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix
index b4601e2f365a..b704c4cdc2c1 100644
--- a/pkgs/tools/misc/ntfy-sh/default.nix
+++ b/pkgs/tools/misc/ntfy-sh/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "binwiederhier";
     repo = "ntfy";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lSj4LfS4nBC1xtTE/ee2Nhx9TmlU+138miwC0nEfVRY=";
   };
 
diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/tools/misc/nvfancontrol/default.nix
index c35a4715936c..ba068f7d244a 100644
--- a/pkgs/tools/misc/nvfancontrol/default.nix
+++ b/pkgs/tools/misc/nvfancontrol/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "foucault";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-0WBQSnTYVc3sNmZf/KFzznMg9AVsyaBgdx/IvG1dZAw=";
   };
 
diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix
index e3fbe0415d41..b20969259152 100644
--- a/pkgs/tools/misc/octofetch/default.nix
+++ b/pkgs/tools/misc/octofetch/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "azur1s";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI=";
   };
 
diff --git a/pkgs/tools/misc/online-judge-template-generator/default.nix b/pkgs/tools/misc/online-judge-template-generator/default.nix
index 5eb3cd93224a..c3b401ad558a 100644
--- a/pkgs/tools/misc/online-judge-template-generator/default.nix
+++ b/pkgs/tools/misc/online-judge-template-generator/default.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "online-judge-tools";
     repo = "template-generator";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cS1ED1a92fEFqy6ht8UFjxocWIm35IA/VuaPSLsdlqg=";
   };
 
diff --git a/pkgs/tools/misc/opentelemetry-collector/releases.nix b/pkgs/tools/misc/opentelemetry-collector/releases.nix
index a4d8cc4a188b..d2813f3aba0d 100644
--- a/pkgs/tools/misc/opentelemetry-collector/releases.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/releases.nix
@@ -25,7 +25,7 @@ let
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector-releases";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-VJ/lIvTXU8jbmoA0eONotxIwo9TT8MZbbu7hbO0PK7k=";
   };
 
diff --git a/pkgs/tools/misc/owofetch/default.nix b/pkgs/tools/misc/owofetch/default.nix
index f850a9ad6949..c24d4683da02 100644
--- a/pkgs/tools/misc/owofetch/default.nix
+++ b/pkgs/tools/misc/owofetch/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "netthier";
     repo = "owofetch-rs";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-I8mzOUvm72KLLBumpgn9gNyx9FKvUrB4ze1iM1+OA18=";
   };
 
diff --git a/pkgs/tools/misc/pandoc-drawio-filter/default.nix b/pkgs/tools/misc/pandoc-drawio-filter/default.nix
index cea114175301..3507f5bbe036 100644
--- a/pkgs/tools/misc/pandoc-drawio-filter/default.nix
+++ b/pkgs/tools/misc/pandoc-drawio-filter/default.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "tfc";
     repo = "pandoc-drawio-filter";
-    rev = version;
+    tag = version;
     sha256 = "sha256-2XJSAfxqEmmamWIAM3vZqi0mZjUUugmR3zWw8Imjadk=";
   };
 
diff --git a/pkgs/tools/misc/pandoc-eqnos/default.nix b/pkgs/tools/misc/pandoc-eqnos/default.nix
index 0947d6769aac..bc614440ff84 100644
--- a/pkgs/tools/misc/pandoc-eqnos/default.nix
+++ b/pkgs/tools/misc/pandoc-eqnos/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tomduck";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-7GQdfGHhtQs6LZK+ZyMmcPSkoFfBWmATTMejMiFcS7Y=";
   };
 
diff --git a/pkgs/tools/misc/pandoc-fignos/default.nix b/pkgs/tools/misc/pandoc-fignos/default.nix
index 226405ba1429..f0ef762a42d8 100644
--- a/pkgs/tools/misc/pandoc-fignos/default.nix
+++ b/pkgs/tools/misc/pandoc-fignos/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tomduck";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-eDwAW0nLB4YqrWT3Ajt9bmX1A43wl+tOPm2St5VpCLk=";
   };
 
diff --git a/pkgs/tools/misc/pandoc-imagine/default.nix b/pkgs/tools/misc/pandoc-imagine/default.nix
index f075776a4b0f..fd6fc109b87f 100644
--- a/pkgs/tools/misc/pandoc-imagine/default.nix
+++ b/pkgs/tools/misc/pandoc-imagine/default.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     repo = "imagine";
     owner = "hertogp";
-    rev = version;
+    tag = version;
     sha256 = "1wpnckc7qyrf6ga5xhr6gv38k1anpy9nx888n7n3rh6nixzcz2dw";
   };
 
diff --git a/pkgs/tools/misc/pandoc-secnos/default.nix b/pkgs/tools/misc/pandoc-secnos/default.nix
index d76e2d905fe9..caff2e626bac 100644
--- a/pkgs/tools/misc/pandoc-secnos/default.nix
+++ b/pkgs/tools/misc/pandoc-secnos/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tomduck";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-J9KLZvioYM3Pl2UXjrEgd4PuLTwCLYy9SsJIzgw5/jU=";
   };
 
diff --git a/pkgs/tools/misc/pandoc-tablenos/default.nix b/pkgs/tools/misc/pandoc-tablenos/default.nix
index eede87b92e19..06a5c62aa68b 100644
--- a/pkgs/tools/misc/pandoc-tablenos/default.nix
+++ b/pkgs/tools/misc/pandoc-tablenos/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tomduck";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-FwzsRziY3PoySo9hIFuLw6tOO9oQij6oQEyoY8HgnII=";
   };
 
diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix
index a39b4d9f8ac8..6877bd71f22a 100644
--- a/pkgs/tools/misc/parcellite/default.nix
+++ b/pkgs/tools/misc/parcellite/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rickyrockrat";
     repo = "parcellite";
-    rev = version;
+    tag = version;
     sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy";
   };
 
diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix
index b8e971e767e7..934d0d0b7cd1 100644
--- a/pkgs/tools/misc/qflipper/default.nix
+++ b/pkgs/tools/misc/qflipper/default.nix
@@ -37,7 +37,7 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "flipperdevices";
     repo = "qFlipper";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     inherit hash;
   };
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
index e26bcf6d403c..e8708c78de4e 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "panzi";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256:1w26ddxb1xirb7qjf7kv9llxzjhbhcb7warnxbx41qhbni46g26y";
   };
 
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index 5b39116a42cf..98aee234b956 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -26,7 +26,7 @@ mkDerivation rec {
     (fetchFromGitHub {
       owner = "marazmista";
       repo = "radeon-profile";
-      rev = version;
+      tag = version;
       sha256 = "0z6a9w79s5wiy8cvwcdp5wmgf6702d0wzw95f6176yhp4cwy4cq2";
     })
     + "/radeon-profile";
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 4a06287dc93e..ef72a809f3f2 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sahib";
     repo = "rmlint";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pOo1YfeqHUU6xyBRFbcj2lX1MHJ+a5Hi31BMC1nYZGo=";
   };
 
diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix
index 54ffb7caf835..05012025c473 100644
--- a/pkgs/tools/misc/rust-motd/default.nix
+++ b/pkgs/tools/misc/rust-motd/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-motd";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-pgmAf9izrIun6+EayxSNy9glTUFd0x/uy5r/aijVi4U=";
   };
 
diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix
index c4e787f1d503..aef4997e1a16 100644
--- a/pkgs/tools/misc/shadowenv/default.nix
+++ b/pkgs/tools/misc/shadowenv/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-ZipFcwTpKKFnQWOPxXg07V71jitG0NSLpGLEzUSsUFA=";
   };
 
diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix
index fec1bdb3e5b0..9257cfaaf50e 100644
--- a/pkgs/tools/misc/sheldon/default.nix
+++ b/pkgs/tools/misc/sheldon/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rossmacarthur";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-C4rGE+tKlpEJabyGAexIoPmUiLvl87GkL6XH5aJHCrU=";
   };
 
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 094be04ce9a3..ad27b4a26f54 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-YoLi4wxBK9TFTtZRm+2N8HO5ZiC3V2GMqKFKKLHq++s=";
   };
 
diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix
index 9dd4cb6ff039..563d6c5d85d3 100644
--- a/pkgs/tools/misc/synth/default.nix
+++ b/pkgs/tools/misc/synth/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shuttle-hq";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/z2VEfeCCuffxlMh4WOpYkMSAgmh+sbx3ajcD5d4DdE=";
   };
 
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index aa1d78d7658d..edc5c07c1a72 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openPrinting";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-l3HEnYycP56vZWREWkAyHmcFgtu09dy4Ds65u7eqNZk=";
   };
 
diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix
index 7d5d1a906ff0..cc086091d0ec 100644
--- a/pkgs/tools/misc/tab-rs/default.nix
+++ b/pkgs/tools/misc/tab-rs/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "austinjones";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr";
   };
 
diff --git a/pkgs/tools/misc/thinkpad-scripts/default.nix b/pkgs/tools/misc/thinkpad-scripts/default.nix
index ec0c74aa0131..a54244473c51 100644
--- a/pkgs/tools/misc/thinkpad-scripts/default.nix
+++ b/pkgs/tools/misc/thinkpad-scripts/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "martin-ueding";
     repo = "thinkpad-scripts";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "08adx8r5pwwazbnfahay42l5f203mmvcn2ipz5hg8myqc9jxm2ky";
   };
 
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 5da5d402196b..3c76d69c9ea7 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linrunner";
     repo = "TLP";
-    rev = version;
+    tag = version;
     hash = "sha256-Bqg0IwLh3XIVJd2VkPQFDCZ/hVrzRFrRLlSHJXlJGWU=";
   };
 
diff --git a/pkgs/tools/misc/tmux-sessionizer/default.nix b/pkgs/tools/misc/tmux-sessionizer/default.nix
index 37bfd5a8aa8e..a21786c497f5 100644
--- a/pkgs/tools/misc/tmux-sessionizer/default.nix
+++ b/pkgs/tools/misc/tmux-sessionizer/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "jrmoulton";
     repo = name;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-uoSm9oWZSiqwsg7dVVMay9COL5MEK3a5Pd+D66RzzPM=";
   };
 
diff --git a/pkgs/tools/misc/toastify/default.nix b/pkgs/tools/misc/toastify/default.nix
index a95122afbeef..1c911604a4d7 100644
--- a/pkgs/tools/misc/toastify/default.nix
+++ b/pkgs/tools/misc/toastify/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hoodie";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hSBh1LTfe3rQDPUryo2Swdf/yLYrOQ/Fg3Dz7ZqV3gw=";
   };
 
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index e445c7668a83..8e870796f818 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-TLeShvDdVqFBIStdRlgF1Zmi8FwS9pmeQ9qOu63nq/E=";
   };
 
diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix
index 4301f58926c1..8e553c2bd58a 100644
--- a/pkgs/tools/misc/toybox/default.nix
+++ b/pkgs/tools/misc/toybox/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "landley";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-D+tf2bJQlf2pLMNZdMUOoUdE3ea/KgkqoXGsnl1MVOE=";
   };
 
diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix
index 3d53fe0b43bb..06652d83300f 100644
--- a/pkgs/tools/misc/tremor-rs/default.nix
+++ b/pkgs/tools/misc/tremor-rs/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tremor-rs";
     repo = "tremor-runtime";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-DoFqHKTu4CvgDYPT4vbwNvSZ/lNTdAF+wlHOOIBJKUw=";
   };
 
diff --git a/pkgs/tools/misc/tremor-rs/ls.nix b/pkgs/tools/misc/tremor-rs/ls.nix
index 88f0db427d56..70f1a02cf8d2 100644
--- a/pkgs/tools/misc/tremor-rs/ls.nix
+++ b/pkgs/tools/misc/tremor-rs/ls.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tremor-rs";
     repo = "tremor-language-server";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-odYhpb3FkbIF1dc2DSpz3Lg+r39lhDKml9KGmbqJAtA=";
   };
 
diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix
index 8069e7cec5d1..ea3ca7435820 100644
--- a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix
+++ b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jlam55555";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j";
   };
 
diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix
index b711e6d8ca9a..40317ce69f99 100644
--- a/pkgs/tools/misc/wagyu/default.nix
+++ b/pkgs/tools/misc/wagyu/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AleoHQ";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5n8BmETv5jUvgu0rskAPYaBgYyNL2QU2t/iUb3hNMMw=";
   };
 
diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix
index 581ac08c5bd6..6be26a09e67c 100644
--- a/pkgs/tools/misc/watchexec/default.nix
+++ b/pkgs/tools/misc/watchexec/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yZGMibh6Qo4gIwj5v0LRt7kdrHGsJ1OG3ACvVKZY7hQ=";
   };
 
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix
index dd511b708481..c841eb18ecdc 100644
--- a/pkgs/tools/misc/xflux/gui.nix
+++ b/pkgs/tools/misc/xflux/gui.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     repo = "xflux-gui";
     owner = "xflux-gui";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "09zphcd9821ink63636swql4g85hg6lpsazqg1mawlk9ikc8zbps";
   };
 
diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix
index 62eac3d811f3..5ecbf379c9c7 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/tools/networking/axel/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "axel-download-accelerator";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5GUna5k8GhAx1Xe8n9IvXT7IO6gksxCLh+sMANlxTBM=";
   };
 
diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix
index 892e7e4c0e21..b9dd78a8c2f8 100644
--- a/pkgs/tools/networking/bore-cli/default.nix
+++ b/pkgs/tools/networking/bore-cli/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ekzhang";
     repo = "bore";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Wkhcv8q/dGRJqG7ArsnsPsRBnXdScGedwxunbOzAjyY=";
   };
 
diff --git a/pkgs/tools/networking/cocom/default.nix b/pkgs/tools/networking/cocom/default.nix
index 98f837cf0bba..6d16b7289aec 100644
--- a/pkgs/tools/networking/cocom/default.nix
+++ b/pkgs/tools/networking/cocom/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LamdaLamdaLamda";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0sl4ivn95sr5pgw2z877gmhyfc4mk9xr457i5g2i4wqnf2jmy14j";
   };
 
diff --git a/pkgs/tools/networking/curl-impersonate/chrome/default.nix b/pkgs/tools/networking/curl-impersonate/chrome/default.nix
index dce29e548661..1ba657fb2c06 100644
--- a/pkgs/tools/networking/curl-impersonate/chrome/default.nix
+++ b/pkgs/tools/networking/curl-impersonate/chrome/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yifeikong";
     repo = "curl-impersonate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-m6zeQUL+yBh3ixS+crbJWHX5TLa61A/3oqMz5UVELso=";
   };
 
diff --git a/pkgs/tools/networking/curl-impersonate/firefox/default.nix b/pkgs/tools/networking/curl-impersonate/firefox/default.nix
index e0d178466ea2..92b05214ae82 100644
--- a/pkgs/tools/networking/curl-impersonate/firefox/default.nix
+++ b/pkgs/tools/networking/curl-impersonate/firefox/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lwthiker";
     repo = "curl-impersonate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ExmEhjJC8FPzx08RuKOhRxKgJ4Dh+ElEl+OUHzRCzZc=";
   };
 
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index d2ccb30dbb5b..0417da40fd48 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -27,7 +27,7 @@ let
 
   src = fetchFromGitHub {
     inherit owner repo;
-    rev = version;
+    tag = version;
     hash = "sha256-rU3eg92MuGs/6r7oJho2roeUCZoyfqYt1xOERoRPqmQ=";
   };
   rtloader = stdenv.mkDerivation {
diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix
index 263b5f51d277..1a0d27108b93 100644
--- a/pkgs/tools/networking/dd-agent/integrations-core.nix
+++ b/pkgs/tools/networking/dd-agent/integrations-core.nix
@@ -46,7 +46,7 @@ let
   src = fetchFromGitHub {
     owner = "DataDog";
     repo = "integrations-core";
-    rev = version;
+    tag = version;
     sha256 = "sha256-p5eoNNHQQl314mfUk2t3qQaerPu02GKA+tKkAY7bojk=";
   };
   version = "7.56.2";
diff --git a/pkgs/tools/networking/dnsviz/default.nix b/pkgs/tools/networking/dnsviz/default.nix
index 46a9617cc2cc..2e33f3a535d4 100644
--- a/pkgs/tools/networking/dnsviz/default.nix
+++ b/pkgs/tools/networking/dnsviz/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dnsviz";
     repo = "dnsviz";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-x6LdPVQFfsJIuKde1+LbFKz5bBEi+Mri9sVH0nGsbCU=";
   };
 
diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix
index e02263f7a3f7..cc4d6cb9ebe9 100644
--- a/pkgs/tools/networking/drill/default.nix
+++ b/pkgs/tools/networking/drill/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fcsonline";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-4y5gpkQB0U6Yq92O6DDD5eq/i/36l/VfeyiE//pcZOk=";
   };
 
diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix
index bcc257143e88..79f6033e5b0f 100644
--- a/pkgs/tools/networking/flannel/plugin.nix
+++ b/pkgs/tools/networking/flannel/plugin.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "flannel-io";
     repo = "cni-plugin";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mhDUpQf1HQLx4vn+Ju5jN5DYgkdsAs8CcmZbBqEITB4=";
   };
 
diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix
index 42b9d4ed0522..5861e6eaf049 100644
--- a/pkgs/tools/networking/gandi-cli/default.nix
+++ b/pkgs/tools/networking/gandi-cli/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Gandi";
     repo = "gandi.cli";
-    rev = version;
+    tag = version;
     sha256 = "sha256-KLeEbbzgqpmBjeTc5RYsFScym8xtMqVjU+H0lyDM0+o=";
   };
 
diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix
index 1be8d6d62a6a..6a5a3456941b 100644
--- a/pkgs/tools/networking/gmrender-resurrect/default.nix
+++ b/pkgs/tools/networking/gmrender-resurrect/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "gmrender-resurrect";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Zt8YYRqqX5L/MGLsFzR8JOdYoNX9ypXLX5i+fqkzPkk=";
   };
 
diff --git a/pkgs/tools/networking/ifwifi/default.nix b/pkgs/tools/networking/ifwifi/default.nix
index 3504a56c920f..0bda48d723b3 100644
--- a/pkgs/tools/networking/ifwifi/default.nix
+++ b/pkgs/tools/networking/ifwifi/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "araujobsd";
     repo = "ifwifi";
-    rev = version;
+    tag = version;
     sha256 = "sha256-DPMCwyKqGJrav0wASBky9bS1bvJ3xaGsDzsk1bKaH1U=";
   };
 
diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix
index 40ac48b15f82..2562c7a9b10f 100644
--- a/pkgs/tools/networking/lxi-tools/default.nix
+++ b/pkgs/tools/networking/lxi-tools/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxi-tools";
     repo = "lxi-tools";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lmWZpKI3TXwF76LDFfZcOGUtPeBmBu+0Lu/3eCMMb3Y=";
   };
 
diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix
index 20fddf5ba910..cdacd1afb211 100644
--- a/pkgs/tools/networking/mozwire/default.nix
+++ b/pkgs/tools/networking/mozwire/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NilsIrl";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-2i8C1XgfI3MXnwXZzY6n8tIcw45G9h3vZqRlFaVoLH0=";
   };
 
diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index c3fc477f1c2d..3cbf1e428f69 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "traviscross";
     repo = "mtr";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-f5bL3IdXibIc1xXCuZHwcEV5vhypRE2mLsS3A8HW2QM=";
   };
 
diff --git a/pkgs/tools/networking/networkmanager/tray.nix b/pkgs/tools/networking/networkmanager/tray.nix
index 1e1882c35cf9..ea9c7da6f74e 100644
--- a/pkgs/tools/networking/networkmanager/tray.nix
+++ b/pkgs/tools/networking/networkmanager/tray.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "palinek";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-JTH1cmkgdW2aRWMYPRvOAvCJz0ClCIpjUtcWcqJQGSU=";
   };
 
diff --git a/pkgs/tools/networking/octodns/providers/bind/default.nix b/pkgs/tools/networking/octodns/providers/bind/default.nix
index 6d9ddd5afdc6..2a7fb7a46274 100644
--- a/pkgs/tools/networking/octodns/providers/bind/default.nix
+++ b/pkgs/tools/networking/octodns/providers/bind/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "octodns";
     repo = "octodns-bind";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IxZr7Wds8wLfJg6rqCtJ59Sg/mCIJ1g9jDJ8CTM7O8w=";
   };
 
diff --git a/pkgs/tools/networking/opendrop/default.nix b/pkgs/tools/networking/opendrop/default.nix
index 704ee944b685..6df6f369302d 100644
--- a/pkgs/tools/networking/opendrop/default.nix
+++ b/pkgs/tools/networking/opendrop/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "seemoo-lab";
     repo = "opendrop";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-4FeVQO7Z6t9mjIgesdjKx4Mi+Ro5EVGJpEFjCvB2SlA=";
   };
 
diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
index bc0ef08d56c9..2b7caaa8d01b 100644
--- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
+++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jonathanio";
     repo = "update-systemd-resolved";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lYJTR3oBmpENcqNHa9PFXsw7ly6agwjBWf4UXf1d8Kc=";
   };
 
diff --git a/pkgs/tools/networking/pingu/default.nix b/pkgs/tools/networking/pingu/default.nix
index c5778b735bf4..63c1a15f0a26 100644
--- a/pkgs/tools/networking/pingu/default.nix
+++ b/pkgs/tools/networking/pingu/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sheepla";
     repo = "pingu";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-iAHj6/qaZgpTfrUZZ9qdsjiNMJ2zH0CzhR4TVSC9oLE=";
   };
 
diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/tools/networking/q/default.nix
index 6aac0616b554..05ab3f209192 100644
--- a/pkgs/tools/networking/q/default.nix
+++ b/pkgs/tools/networking/q/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "natesales";
     repo = "q";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kfuf0iwRYNxd9TfIIHvAqLxXjesQh7jC0evT9DQrrzQ=";
   };
 
diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix
index 0326f9df532d..46a0164b9070 100644
--- a/pkgs/tools/networking/rosenpass/default.nix
+++ b/pkgs/tools/networking/rosenpass/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-fQIeKGyTkFWUV9M1o256G4U1Os5OlVsRZu+5olEkbD4=";
   };
 
diff --git a/pkgs/tools/networking/s3rs/default.nix b/pkgs/tools/networking/s3rs/default.nix
index 3a09bee66c52..dc7ec6393a76 100644
--- a/pkgs/tools/networking/s3rs/default.nix
+++ b/pkgs/tools/networking/s3rs/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yanganto";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mJ1bMfv/HY74TknpRvu8RIs1d2VlNreEVtHCtQSHQw8=";
   };
 
diff --git a/pkgs/tools/networking/suckit/default.nix b/pkgs/tools/networking/suckit/default.nix
index 8cbbefeab601..65589170a759 100644
--- a/pkgs/tools/networking/suckit/default.nix
+++ b/pkgs/tools/networking/suckit/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "skallwar";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-M4/vD1sVny7hAf4h56Z2xy7yuCqH/H3qHYod6haZOs0=";
   };
 
diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index a02f6e5c9936..42a497fd7006 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -25,7 +25,7 @@ pythonPackages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "telepresenceio";
     repo = "telepresence";
-    rev = version;
+    tag = version;
     sha256 = "1ccc8bzcdxp6rh6llk7grcnmyc05fq7dz5w0mifdzjv3a473hsky";
   };
 
diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix
index d6c66cc514cd..b1a3ec1f3dec 100644
--- a/pkgs/tools/networking/veilid/default.nix
+++ b/pkgs/tools/networking/veilid/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "veilid";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-p9bQ90zUXVeVPUDuns+gmZb9SJHpAVrJOHe+RvEru7w=";
   };
 
diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix
index 884667c39172..81f4fd315d71 100644
--- a/pkgs/tools/networking/vpn-slice/default.nix
+++ b/pkgs/tools/networking/vpn-slice/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dlenski";
     repo = "vpn-slice";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-T6VULLNRLWO4OcAsuTmhty6H4EhinyxQSg0dfv2DUJs=";
   };
 
diff --git a/pkgs/tools/package-management/libcomps/default.nix b/pkgs/tools/package-management/libcomps/default.nix
index 048c6af62c3a..780ed5b91e29 100644
--- a/pkgs/tools/package-management/libcomps/default.nix
+++ b/pkgs/tools/package-management/libcomps/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "libcomps";
-    rev = version;
+    tag = version;
     hash = "sha256-2ZxU1g5HDWnSxTabnmfyQwz1ZCXK+7kJXLofeFBiwn0=";
   };
 
diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index ffb6053cd0a3..8669d4f14243 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "librepo";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ws57vFoK5yBMHHNQ9W48Icp4am0/5k3n4ybem1aAzVM=";
   };
 
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 21834a5299c3..a2d96fd8686f 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -98,7 +98,7 @@ lib.makeExtensible (self: {
       src = fetchFromGitHub {
         owner = "lix-project";
         repo = "lix";
-        rev = version;
+        tag = version;
         hash = "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=";
       };
 
@@ -128,7 +128,7 @@ lib.makeExtensible (self: {
       src = fetchFromGitHub {
         owner = "lix-project";
         repo = "lix";
-        rev = version;
+        tag = version;
         hash = "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=";
       };
 
@@ -158,7 +158,7 @@ lib.makeExtensible (self: {
       src = fetchFromGitHub {
         owner = "lix-project";
         repo = "lix";
-        rev = version;
+        tag = version;
         hash = "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=";
       };
 
@@ -174,7 +174,7 @@ lib.makeExtensible (self: {
       version = "2.92.0";
       src = fetchgit {
         url = "https://git.lix.systems/lix-project/nix-eval-jobs.git";
-        rev = version;
+        tag = version;
         hash = "sha256-tPr61X9v/OMVt7VXOs1RRStciwN8gDGxEKx+h0/Fg48=";
       };
     };
diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
index 623b17695ea7..8e28938aa6dc 100644
--- a/pkgs/tools/package-management/nix-eval-jobs/default.nix
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-v5n6t49X7MOpqS9j0FtI6TWOXvxuZMmGsp2OfUK5QfA=";
   };
   buildInputs = [
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index de1cf8319039..b9b030bc4294 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-index";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-r3Vg9ox953HdUp5Csxd2DYUyBe9u61fmA94PpcAZRqo=";
   };
 
diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix
index 1f255aef6796..2f9313b9041a 100644
--- a/pkgs/tools/package-management/nix-template/default.nix
+++ b/pkgs/tools/package-management/nix-template/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     name = "${pname}-${version}-src";
     owner = "jonringer";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-42u5FmTIKHpfQ2zZQXIrFkAN2/XvU0wWnCRrQkQzcNI=";
   };
 
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index 1617854abcd2..657227e8e032 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -7,7 +7,7 @@
   src ? fetchFromGitHub {
     owner = "NixOS";
     repo = "nix";
-    rev = version;
+    tag = version;
     inherit hash;
   },
   patches ? [ ],
diff --git a/pkgs/tools/package-management/nix/dependencies.nix b/pkgs/tools/package-management/nix/dependencies.nix
index a1a964836959..a8cdeeb4c77c 100644
--- a/pkgs/tools/package-management/nix/dependencies.nix
+++ b/pkgs/tools/package-management/nix/dependencies.nix
@@ -43,7 +43,7 @@ in
           src = fetchFromGitHub {
             owner = "aws";
             repo = "aws-sdk-cpp";
-            rev = version;
+            tag = version;
             hash = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g=";
           };
           postPatch =
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 0c66f2310825..9a0fb38507e5 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PackageKit";
     repo = "PackageKit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-MYZFI1Q90F/AXVSJJBhmw+E7IMLXrdwmSuFJwv5D/z4=";
   };
 
diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index 1cce9329b6f4..4757c9d1345b 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "PackageKit-Qt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rLNeVjzIT18qUZgj6Qcf7E59CL4gx/ArYJfs9KHrqNs=";
   };
 
diff --git a/pkgs/tools/security/age-plugin-ledger/default.nix b/pkgs/tools/security/age-plugin-ledger/default.nix
index 9c441ccda539..e0fb27a441f7 100644
--- a/pkgs/tools/security/age-plugin-ledger/default.nix
+++ b/pkgs/tools/security/age-plugin-ledger/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Ledger-Donjon";
     repo = "age-plugin-ledger";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-g5GbWXhaGEafiM3qkGlRXHcOzPZl2pbDWEBPg4gQWcg=";
   };
 
diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
index 04c0e3e89543..ecae1f3d6de4 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BLAKE2";
     repo = "BLAKE2";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-6BVl3Rh+CRPQq3QxcUlk5ArvjIj/IcPCA2/Ok0Zu7UI=";
   };
 
diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix
index ab25caee50ac..7d02393daa55 100644
--- a/pkgs/tools/security/bitwarden-directory-connector/default.nix
+++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix
@@ -25,7 +25,7 @@ let
       src = fetchFromGitHub {
         owner = "bitwarden";
         repo = "directory-connector";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-8EY+bU7i3fdUBQYsykUzgOIWS5VAJlmRYW8fsp0xfnY=";
       };
 
diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index 086a59d7a781..97e62771f7e4 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "chipsec";
     repo = "chipsec";
-    rev = version;
+    tag = version;
     hash = "sha256-+pbFG1SmSO/cnt1e+kel7ereC0I1OCJKKsS0KaJDWdc=";
   };
 
diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix
index 51e4aceb9bce..46c712eff8d2 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/pkgs/tools/security/chrome-token-signing/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "open-eid";
     repo = "chrome-token-signing";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-wKy/RVR7jx5AkMJgHXsuV+jlzyfH5nDRggcIUgh2ML4=";
   };
 
diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix
index 42a048b78ca4..07c277c50de5 100644
--- a/pkgs/tools/security/cosign/default.nix
+++ b/pkgs/tools/security/cosign/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9hUf6J3kTI0nvLExReUUovW8pZjlaoqgFmLd5mShZzU=";
   };
 
diff --git a/pkgs/tools/security/echidna/default.nix b/pkgs/tools/security/echidna/default.nix
index f3bfb9fbffee..68315afdbb18 100644
--- a/pkgs/tools/security/echidna/default.nix
+++ b/pkgs/tools/security/echidna/default.nix
@@ -16,7 +16,7 @@ mkDerivation (
     src = fetchFromGitHub {
       owner = "crytic";
       repo = "echidna";
-      rev = "v${version}";
+      tag = "v${version}";
       sha256 = "sha256-NJ2G6EkexYE4P3GD7PZ+lLEs1dqnoqIB2zfAOD5SQ8M=";
     };
 
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index cc4eb1e06f46..0f7398258f7a 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Fedict";
     repo = "eid-mw";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-WFXVQ2CNrEEy4R6xGiwWkAZmbvXK44FtO5w6s1ZUZpA=";
   };
 
diff --git a/pkgs/tools/security/fwbuilder/default.nix b/pkgs/tools/security/fwbuilder/default.nix
index 284e302f0188..f8a3e1ef9890 100644
--- a/pkgs/tools/security/fwbuilder/default.nix
+++ b/pkgs/tools/security/fwbuilder/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fwbuilder";
     repo = "fwbuilder";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-j5HjGcIqq93Ca9OBqEgSotoSXyw+q6Fqxa3hKk1ctwQ=";
   };
 
diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix
index daa7e274712c..98b0b111379c 100644
--- a/pkgs/tools/security/fwknop/default.nix
+++ b/pkgs/tools/security/fwknop/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mrash";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "05kvqhmxj9p2y835w75f3jvhr38bb96cd58mvfd7xil9dhmhn9ra";
   };
 
diff --git a/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
index 37d5148051ee..8e648dd7cf4b 100644
--- a/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
@@ -13,7 +13,7 @@ buildGhidraExtension {
   src = fetchFromGitHub {
     owner = "antoniovazquezblanco";
     repo = "GhidraFindcrypt";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-gWVYy+PWpNXlcgD83jap4IFRv66qdhloOwvpQVU2TcI=";
   };
 
diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
index 22b53b61ab53..07039ca5b566 100644
--- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
@@ -13,7 +13,7 @@ let
     src = fetchFromGitHub {
       owner = "boricj";
       repo = "ghidra-delinker-extension";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-h6F50Z7S6tPOl9mIhChLKoFxHuAkq/n36ysUEFwWGxI=";
     };
 
diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix
index 34baf6c971f5..020febaf49b0 100644
--- a/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix
@@ -10,7 +10,7 @@ buildGhidraExtension rec {
   src = fetchFromGitHub {
     owner = "mooncat-greenpy";
     repo = "Ghidra_GolangAnalyzerExtension";
-    rev = version;
+    tag = version;
     hash = "sha256-uxozIJ+BLcP1vBnLOCZD9ueY10hd37fON/Miii3zabo=";
   };
 
diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
index 54f45aaecf9b..3e5c78ad1123 100644
--- a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
@@ -31,7 +31,7 @@ let
     src = fetchFromGitHub {
       owner = "CERTCC";
       repo = "kaiju";
-      rev = version;
+      tag = version;
       hash = "sha256-o9VAmZl0dJfap5WccDXUWS4PSKvb/DYmeZotKZ1v/ps=";
     };
 
diff --git a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix
index 54d30e996b9e..b0bbbd76a2ab 100644
--- a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix
@@ -10,7 +10,7 @@ buildGhidraExtension rec {
   src = fetchFromGitHub {
     owner = "WorksButNotTested";
     repo = "lightkeeper";
-    rev = version;
+    tag = version;
     hash = "sha256-aGMWg6VQleKH/txlxpSw19QOotWZSqeW5Ve2SpWGhgA=";
   };
   preConfigure = ''
diff --git a/pkgs/tools/security/ghidra/extensions/wasm/default.nix b/pkgs/tools/security/ghidra/extensions/wasm/default.nix
index b8c8eaff8001..e1f798822799 100644
--- a/pkgs/tools/security/ghidra/extensions/wasm/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/wasm/default.nix
@@ -15,7 +15,7 @@ buildGhidraExtension {
   src = fetchFromGitHub {
     owner = "nneonneo";
     repo = "ghidra-wasm-plugin";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aoSMNzv+TgydiXM4CbvAyu/YsxmdZPvpkZkYEE3C+V4=";
   };
 
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index c24a3536179c..f2e52235ccc7 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-GL0vnrNz9vcdybubYIjiK0tDH3L4lNWNo+rAAWv7d8o=";
   };
 
diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix
index f6ee7ceb28a2..7f75a746ba9c 100644
--- a/pkgs/tools/security/gopass/git-credential.nix
+++ b/pkgs/tools/security/gopass/git-credential.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "git-credential-gopass";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xtZAT1Lb7YJ0Hy2cMT2riVbEoWtz7lusKJ9QT4ZI6Ek=";
   };
 
diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix
index d458b99dba91..dc2474d2284f 100644
--- a/pkgs/tools/security/gopass/hibp.nix
+++ b/pkgs/tools/security/gopass/hibp.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-hibp";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-auY0Wg5ki4WIHtA172wJJj9VxQEHWMmQop5bIviinn8=";
   };
 
diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix
index 4d0116b22b50..657dbe9983a7 100644
--- a/pkgs/tools/security/gopass/summon.nix
+++ b/pkgs/tools/security/gopass/summon.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-summon-provider";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yMua3BSl4u/1axLMmLIzjqj8wYvMMPTqmRgcuH1tqN0=";
   };
 
diff --git a/pkgs/tools/security/gotrue/default.nix b/pkgs/tools/security/gotrue/default.nix
index 6bff0c026a2a..985ec6e546c6 100644
--- a/pkgs/tools/security/gotrue/default.nix
+++ b/pkgs/tools/security/gotrue/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "netlify";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9h6CyCY7741tJR+qWDLwgPkAtE/kmaoTqlXEY+mOW58=";
   };
 
diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix
index e028e085d02d..3a5a201bc3c7 100644
--- a/pkgs/tools/security/gotrue/supabase.nix
+++ b/pkgs/tools/security/gotrue/supabase.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "auth";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-dm6JBBHFX61acQ4tnkklZqAM4hiOqtvea0oy7/bSovQ=";
   };
 
diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix
index 2d650d3ac395..152fc8f231d1 100644
--- a/pkgs/tools/security/gpg-tui/default.nix
+++ b/pkgs/tools/security/gpg-tui/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "gpg-tui";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-aHmLcWiDy5GMbcKi285tfBggNmGkpVAoZMm4dt8LKak=";
   };
 
diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix
index 056d9699a745..63f5686861e5 100644
--- a/pkgs/tools/security/kbs2/default.nix
+++ b/pkgs/tools/security/kbs2/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "woodruffw";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-o8/ENAWzVqs7rokST6xnyu9Q/pKqq/UnKWOFRuIuGes=";
   };
 
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index c58852e05ab8..701cb8924f39 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "keybase";
     repo = "client";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-hRqxA2gPL1UKbz9DwgfZfjE6e5pB7zenZqK+k1i8F2g=";
   };
   vendorHash = "sha256-KHahkGzkXr6xp0XY9MyEeeiHnmphaNYi9dPBQ476+us=";
diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix
index 00f76354d09d..e70e2ae0b2f5 100644
--- a/pkgs/tools/security/krunner-pass/default.nix
+++ b/pkgs/tools/security/krunner-pass/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "akermu";
     repo = "krunner-pass";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "032fs2174ls545kjixbhzyd65wgxkw4s5vg8b20irc5c9ak3pxm0";
   };
 
diff --git a/pkgs/tools/security/lethe/default.nix b/pkgs/tools/security/lethe/default.nix
index c654c975eebc..f0d914f8a727 100644
--- a/pkgs/tools/security/lethe/default.nix
+++ b/pkgs/tools/security/lethe/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kostassoid";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-y2D/80pnpYpTl+q9COTQkvtj9lzBlOWuMcnn5WFnX8E=";
   };
 
diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix
index 544363a24fca..ba6e61bbb2c4 100644
--- a/pkgs/tools/security/libmodsecurity/default.nix
+++ b/pkgs/tools/security/libmodsecurity/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "owasp-modsecurity";
     repo = "ModSecurity";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-SaeBO3+WvPhHiJoiOmijB0G3/QYxjAdxgeCVqESS+4U=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
index 2e6665c7204a..a767127bea5a 100644
--- a/pkgs/tools/security/nsjail/default.nix
+++ b/pkgs/tools/security/nsjail/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "nsjail";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-/K+qJV5Dq+my45Cpw6czdsWLtO9lnJwZTsOIRt4Iijk=";
   };
diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix
index 4aa96fe40909..49544c7aa244 100644
--- a/pkgs/tools/security/pass/extensions/audit/default.nix
+++ b/pkgs/tools/security/pass/extensions/audit/default.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "pass-audit";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xigP8LxRXITLF3X21zhWx6ooFNSTKGv46yFSt1dd4vs=";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/checkup.nix b/pkgs/tools/security/pass/extensions/checkup.nix
index 633b0be00cc7..b8357624f9b5 100644
--- a/pkgs/tools/security/pass/extensions/checkup.nix
+++ b/pkgs/tools/security/pass/extensions/checkup.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "etu";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1p65yxr00k35g4bnagszp8i03pmhnrcmipgrdsawps2ba8faqp6r";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/file.nix b/pkgs/tools/security/pass/extensions/file.nix
index 54c7e0f8e12c..888505163b79 100644
--- a/pkgs/tools/security/pass/extensions/file.nix
+++ b/pkgs/tools/security/pass/extensions/file.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dvogt23";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-18KvmcfLwelyk9RV/IMaj6O/nkQEQz84eUEB/mRaKE4=";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix
index 085b77342fbe..ef9e4e890704 100644
--- a/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "congma";
     repo = "pass-genphrase";
-    rev = version;
+    tag = version;
     sha256 = "01dff2jlp111y7vlmp1wbgijzphhlzc19m02fs8nzmn5vxyffanx";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix
index dbde743461af..2c4c54f387a8 100644
--- a/pkgs/tools/security/pass/extensions/otp.nix
+++ b/pkgs/tools/security/pass/extensions/otp.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tadfisher";
     repo = "pass-otp";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix
index f9ad7fe0f894..3265fdc699fd 100644
--- a/pkgs/tools/security/pass/extensions/tomb.nix
+++ b/pkgs/tools/security/pass/extensions/tomb.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "pass-tomb";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-kbbMHmYmeyt7HM8YiNhknePm1vUaXWWXPWePKGpbU+o=";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix
index 6f53159c9b67..341bb623e225 100644
--- a/pkgs/tools/security/pass/extensions/update.nix
+++ b/pkgs/tools/security/pass/extensions/update.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "pass-update";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-NFdPnGMs8myiHufeHAQUNDUuvDzYeoWYZllI9+4HL+s=";
   };
 
diff --git a/pkgs/tools/security/pass/wofi-pass.nix b/pkgs/tools/security/pass/wofi-pass.nix
index 68039864ffb5..a35eb1cceb22 100644
--- a/pkgs/tools/security/pass/wofi-pass.nix
+++ b/pkgs/tools/security/pass/wofi-pass.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "schmidtandreas";
     repo = "wofi-pass";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oRGDhr28UQjr+g//fWcLKWXqKSsRUWtdh39UMFSaPfw=";
   };
 
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index faef0c0c08ba..89b9cf718f88 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GPGTools";
     repo = "pinentry";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QnDuqFrI/U7aZ5WcOCp5vLE+w59LVvDGOFNQy9fSy70=";
   };
 
diff --git a/pkgs/tools/security/quill/default.nix b/pkgs/tools/security/quill/default.nix
index 8f9cf642c969..a6e8fb000de3 100644
--- a/pkgs/tools/security/quill/default.nix
+++ b/pkgs/tools/security/quill/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dfinity";
     repo = "quill";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lCDKM9zzGcey4oWp6imiHvGSNRor0xhlmlhRkSXFLlU=";
   };
 
diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix
index 187306d44859..88242b087f42 100644
--- a/pkgs/tools/security/rekor/default.nix
+++ b/pkgs/tools/security/rekor/default.nix
@@ -19,7 +19,7 @@ let
       src = fetchFromGitHub {
         owner = "sigstore";
         repo = "rekor";
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-JJzLOu8UJbkLT+JywddKtgmDNxAiSV6n9eaQu1ihqSg=";
         # 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/tools/security/rucredstash/default.nix b/pkgs/tools/security/rucredstash/default.nix
index f98cd0f74858..6b288702be98 100644
--- a/pkgs/tools/security/rucredstash/default.nix
+++ b/pkgs/tools/security/rucredstash/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "psibi";
     repo = "rucredstash";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-trupBiinULzD8TAy3eh1MYXhQilO08xu2a4yN7wwhwk=";
   };
 
diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
index 6da20e6ba3e3..c51cb520574d 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Versent";
     repo = "saml2aws";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5g7mbjBkjNl1xvMMJXcITOZTNWXE7m2WhzzvLuULcuo=";
   };
 
diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix
index 99a633dafe61..c66d2440d671 100644
--- a/pkgs/tools/security/solo2-cli/default.nix
+++ b/pkgs/tools/security/solo2-cli/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "solokeys";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7tpO5ir42mIKJXD0NJzEPXi/Xe6LdyEeBQWNfOdgX5I=";
   };
 
diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
index bef9a55bd31d..bff483aeeeae 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/pkgs/tools/security/stoken/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cernekee";
     repo = "stoken";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8N7TXdBu37eXWIKCBdaXVW0pvN094oRWrdlcy9raddI=";
   };
 
diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix
index de0793a6a89c..7ba9545c221b 100644
--- a/pkgs/tools/security/vaultwarden/default.nix
+++ b/pkgs/tools/security/vaultwarden/default.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dani-garcia";
     repo = "vaultwarden";
-    rev = version;
+    tag = version;
     hash = "sha256-Lu3/qVTi5Eedcm+3XlHAAJ1nPHm9hW4HZncQKmzDdoo=";
   };
 
diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix
index 9779d63b25b8..d0baf9362f00 100644
--- a/pkgs/tools/security/vaultwarden/webvault.nix
+++ b/pkgs/tools/security/vaultwarden/webvault.nix
@@ -16,7 +16,7 @@ let
   bw_web_builds = fetchFromGitHub {
     owner = "dani-garcia";
     repo = "bw_web_builds";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wQGpl7N0D83FrrV4T+LFe9h3n5Q/MqLbGGO2F5R9k2g=";
   };
 
diff --git a/pkgs/tools/security/web-eid-app/default.nix b/pkgs/tools/security/web-eid-app/default.nix
index 11afcd40003e..544639672e3f 100644
--- a/pkgs/tools/security/web-eid-app/default.nix
+++ b/pkgs/tools/security/web-eid-app/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "web-eid";
     repo = "web-eid-app";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-UqHT85zuoT/ISFP2qgG2J1518eGEvm5L96ntZ/lx9BE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/tools/security/whatweb/default.nix b/pkgs/tools/security/whatweb/default.nix
index f672f4410245..318658b8a12b 100644
--- a/pkgs/tools/security/whatweb/default.nix
+++ b/pkgs/tools/security/whatweb/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "urbanadventurer";
     repo = "whatweb";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-HLF55x4C8n8aPO4SI0d6Z9wZe80krtUaGUFmMaYRBIE=";
   };
 
diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix
index 2623821e16dc..4c557e7aa52d 100644
--- a/pkgs/tools/system/btop/default.nix
+++ b/pkgs/tools/system/btop/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aristocratos";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-A5hOBxj8tKlkHd8zDHfDoU6fIu8gDpt3/usbiDk0/G0=";
   };
 
diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix
index 4db3a1d780ba..ab1c0ef25ef1 100644
--- a/pkgs/tools/system/clinfo/default.nix
+++ b/pkgs/tools/system/clinfo/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Oblomov";
     repo = "clinfo";
-    rev = version;
+    tag = version;
     sha256 = "sha256-UkkrRpmY5vZtTeEqPNYfxAGaJDoTSrNUG9N1Bknozow=";
   };
 
diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix
index 577cf0a179bb..8fe68cac78c2 100644
--- a/pkgs/tools/system/cm-rgb/default.nix
+++ b/pkgs/tools/system/cm-rgb/default.nix
@@ -18,7 +18,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gfduszynski";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-m0ZAjSLRzcjzygLEbvCiDd7krc1gRqTg1ZV4H/o2c68=";
   };
 
diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix
index 3c220cf9fd05..5e587ea9688d 100644
--- a/pkgs/tools/system/gotop/default.nix
+++ b/pkgs/tools/system/gotop/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xxxserxxx";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-W7a3QnSIR95N88RqU2sr6oEDSqOXVfAwacPvS219+1Y=";
   };
 
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index eba4a390e77c..ac790e7d8368 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "htop-dev";
     repo = pname;
-    rev = version;
+    tag = version;
     hash = "sha256-4M2Kzy/tTpIZzpyubnXWywQh7Np5InT4sYkVG2v6wWs=";
   };
 
diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix
index e0f2b28c4dee..a67642dd2c41 100644
--- a/pkgs/tools/system/hw-probe/default.nix
+++ b/pkgs/tools/system/hw-probe/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxhw";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-8dLfk2k7xG2CXMHfMPrpgq43j3ttj5a0bgNPEahl2rQ=";
   };
 
diff --git a/pkgs/tools/system/nvidia-system-monitor-qt/default.nix b/pkgs/tools/system/nvidia-system-monitor-qt/default.nix
index d7ef01f0c9cc..4931f5f32a22 100644
--- a/pkgs/tools/system/nvidia-system-monitor-qt/default.nix
+++ b/pkgs/tools/system/nvidia-system-monitor-qt/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "congard";
     repo = "nvidia-system-monitor-qt";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-JHK7idyk5UxgDyt+SzvYjTLmlNzx6+Z+OPYsRD4NWPg=";
   };
 
diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix
index 7caac445a33d..80b71ebe28e5 100644
--- a/pkgs/tools/system/nvtop/build-nvtop.nix
+++ b/pkgs/tools/system/nvtop/build-nvtop.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Syllo";
     repo = "nvtop";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-8iChT55L2NSnHg8tLIry0rgi/4966MffShE0ib+2ywc=";
   };
 
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 345afacf0016..46f6c1dfdb7d 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pciutils";
     repo = "pciutils";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-buhq7SN6eH+sckvT5mJ8eP4C1EP/4CUFt3gooJohJW0=";
   };
 
diff --git a/pkgs/tools/system/stacer/default.nix b/pkgs/tools/system/stacer/default.nix
index 05303b472ac9..2c24b66a050f 100644
--- a/pkgs/tools/system/stacer/default.nix
+++ b/pkgs/tools/system/stacer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oguzhaninan";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0qndzzkbq6abapvwq202kva8j619jdn9977sbqmmfs9zkjz4mbsd";
   };
 
diff --git a/pkgs/tools/system/uefitool/common.nix b/pkgs/tools/system/uefitool/common.nix
index fa8da1a9ac8a..987720d8145b 100644
--- a/pkgs/tools/system/uefitool/common.nix
+++ b/pkgs/tools/system/uefitool/common.nix
@@ -26,7 +26,7 @@ mkDerivation rec {
     inherit sha256;
     owner = "LongSoft";
     repo = pname;
-    rev = version;
+    tag = version;
   };
 
   buildInputs = [ qtbase ];
diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix
index 043e96d4d39a..f6a57a95d2b9 100644
--- a/pkgs/tools/text/amber/default.nix
+++ b/pkgs/tools/text/amber/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo=";
   };
 
diff --git a/pkgs/tools/text/autocorrect/default.nix b/pkgs/tools/text/autocorrect/default.nix
index 29b3f9ed2ea7..b57cdf162586 100644
--- a/pkgs/tools/text/autocorrect/default.nix
+++ b/pkgs/tools/text/autocorrect/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "huacnlee";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fwq+Q2GpPXWfIQjfSACBjdyjrmYwVKSSZxCy3+NIKNI=";
   };
 
diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix
index 02933bf8fa2d..f3c28a96d7a9 100644
--- a/pkgs/tools/text/chars/default.nix
+++ b/pkgs/tools/text/chars/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "antifuchs";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mBtwdPzIc6RgEFTyReStFlhS4UhhRWjBTKT6gD3tzpQ=";
   };
 
diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix
index 3b9c6d2b383a..7ca8f3ff1bc7 100644
--- a/pkgs/tools/text/coloursum/default.nix
+++ b/pkgs/tools/text/coloursum/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ticky";
     repo = "coloursum";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zA2JhSnlFccSY01WMGsgF4AmrF/3BRUCcSMfoEbEPgA=";
   };
 
diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix
index e3502dd3c54f..3c2303fa2cb6 100644
--- a/pkgs/tools/text/diffr/default.nix
+++ b/pkgs/tools/text/diffr/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mookid";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ylZE2NtTXbGqsxE72ylEQCacTyxBO+/WgvEpoXd5OZI=";
   };
 
diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix
index 5d94bd299fd0..11020f2245a8 100644
--- a/pkgs/tools/text/fastmod/default.nix
+++ b/pkgs/tools/text/fastmod/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-A/3vzfwaStoQ9gdNM8yjmL2J/pQjj6yb68WThiTF+1E=";
   };
 
diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix
index e3ac44ff4dbd..6471ee9a7f65 100644
--- a/pkgs/tools/text/glogg/default.nix
+++ b/pkgs/tools/text/glogg/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nickbnf";
     repo = "glogg";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "0hf1c2m8n88frmxmyn0ndr8129p7iky49nq565sw1asaydm5z6pb";
   };
 
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 6ef03ad24d95..1d583e1793dc 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitLab {
       owner = "saalen";
       repo = "highlight";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-CpbVm5Z9cKPQdOzBNOXsgrX3rfC6DTVE7xfmOAshbEs=";
     };
 
diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix
index 77537ec0adbd..ea9236a6820e 100644
--- a/pkgs/tools/text/igrep/default.nix
+++ b/pkgs/tools/text/igrep/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "konradsz";
     repo = "igrep";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ZZhzBGLpzd9+rok+S/ypKpWXVzXaA1CnviC7LfgP/CU=";
   };
 
diff --git a/pkgs/tools/text/languagetool-rust/default.nix b/pkgs/tools/text/languagetool-rust/default.nix
index 389f36581b22..9361d1cf5295 100644
--- a/pkgs/tools/text/languagetool-rust/default.nix
+++ b/pkgs/tools/text/languagetool-rust/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jeertmans";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-8YgSxAF4DA1r7ylj6rx+fGubvT7MeiRQeowuiu0GWwQ=";
   };
 
diff --git a/pkgs/tools/text/mdbook-linkcheck/default.nix b/pkgs/tools/text/mdbook-linkcheck/default.nix
index 474f4f5004c5..7a738b0dd124 100644
--- a/pkgs/tools/text/mdbook-linkcheck/default.nix
+++ b/pkgs/tools/text/mdbook-linkcheck/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Michael-F-Bryan";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZbraChBHuKAcUA62EVHZ1RygIotNEEGv24nhSPAEj00=";
   };
 
diff --git a/pkgs/tools/text/pinyin-tool/default.nix b/pkgs/tools/text/pinyin-tool/default.nix
index 05dd8c2305c7..353eecf7e347 100644
--- a/pkgs/tools/text/pinyin-tool/default.nix
+++ b/pkgs/tools/text/pinyin-tool/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "briankung";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b";
   };
 
diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix
index afb2e7f55660..e81c8e0dd0a6 100644
--- a/pkgs/tools/text/ripgrep-all/default.nix
+++ b/pkgs/tools/text/ripgrep-all/default.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "phiresky";
     repo = "ripgrep-all";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ns7RL7kiG72r07LkF6RzShNg8M2SU6tU5+gXDxzUQHM=";
   };
 
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 3f8caf570f62..84c2ea13183d 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -149,7 +149,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "asciidoc-py";
     repo = "asciidoc-py";
-    rev = version;
+    tag = version;
     hash = "sha256-td3C7xTWfSzdo9Bbz0dHW2oPaCQYmUE9H2sUFfg5HH0=";
   };
 
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix
index 143b919778cb..3973dc7823bf 100644
--- a/pkgs/tools/typesetting/htmldoc/default.nix
+++ b/pkgs/tools/typesetting/htmldoc/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = "htmldoc";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-nEDvG2Q6uMYWyb49EKOZimkOfEavCjvfFgucwi3u64k=";
   };
 
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index b180d4007c45..0871b04f39c9 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://pagure.io/xmlto.git";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-wttag8J1t9cBPBHNY7me2H0IPOzS8IjfCLIHNWq67Do=";
   };
 
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index 3b5ccde7979e..881e54d0f3cb 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wez";
     repo = pname;
-    rev = version;
+    tag = version;
     sha256 = "sha256-VhrOMpGNMkNNYjcfCqlHI8gdApWr1ThtcxDwQ6gyV/g=";
   };
 
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index d08d2c1eaf69..8029b5a4f373 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "compute-image-packages";
-    rev = version;
+    tag = version;
     sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp";
   };
 
diff --git a/pkgs/tools/wayland/swaytools/default.nix b/pkgs/tools/wayland/swaytools/default.nix
index 3f994ef03eb2..9e4ebf644b87 100644
--- a/pkgs/tools/wayland/swaytools/default.nix
+++ b/pkgs/tools/wayland/swaytools/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tmccombs";
     repo = "swaytools";
-    rev = version;
+    tag = version;
     sha256 = "sha256-UoWK53B1DNmKwNLFwJW1ZEm9dwMOvQeO03+RoMl6M0Q=";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31c29debb5ea..e5814f15e1b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11148,7 +11148,7 @@ with pkgs;
     src = fetchFromGitHub {
       owner = "facebook";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-ZrU7G3xeimF3H2LRGBDHOq936u5pH/3nGecM4XEoWc8=";
     };
   };
@@ -11159,7 +11159,7 @@ with pkgs;
     src = fetchFromGitHub {
       owner = "facebook";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg=";
     };
   };
@@ -11170,7 +11170,7 @@ with pkgs;
     src = fetchFromGitHub {
       owner = "facebook";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs=";
     };
   };
@@ -11181,7 +11181,7 @@ with pkgs;
     src = fetchFromGitHub {
       owner = "facebook";
       repo = pname;
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk=";
     };
   };
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 5e682627d109..2226f5648c49 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -168,7 +168,7 @@ rec {
       src = fetchFromGitHub {
         owner = "openresty";
         repo = "lua-resty-core";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = "sha256-RJ2wcHTu447wM0h1fa2qCBl4/p9XL6ZqX9pktRW64RI=";
       };
 
@@ -192,7 +192,7 @@ rec {
       src = fetchFromGitHub {
         owner = "openresty";
         repo = "lua-resty-lrucache";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = "sha256-J8RNAMourxqUF8wPKd8XBhNwGC/x1KKvrVnZtYDEu4Q=";
       };
 
@@ -263,7 +263,7 @@ rec {
       src = fetchFromGitHub {
         owner = "vicious-widgets";
         repo = "vicious";
-        rev = "v${version}";
+        tag = "v${version}";
         sha256 = "sha256-VlJ2hNou2+t7eSyHmFkC2xJ92OH/uJ/ewYHkFLQjUPQ=";
       };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2645a5e619d..576b55104641 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16930,7 +16930,7 @@ self: super: with self; {
             src = pkgs.fetchFromGitHub {
               owner = "grpc";
               repo = "grpc";
-              rev = "v${version}";
+              tag = "v${version}";
               hash = "sha256-PpiOT4ZJe1uMp5j+ReQulC9jpT0xoR2sAl6vRYKA0AA=";
               fetchSubmodules = true;
             };

From c7f81b984f363014eaaba977799d0b769d9758fb Mon Sep 17 00:00:00 2001
From: Yongun Seong <nevivurn@nevi.dev>
Date: Tue, 8 Apr 2025 00:24:42 +0900
Subject: [PATCH 239/489] kubelogin-oidc: 1.32.2 -> 1.32.3

---
 pkgs/by-name/ku/kubelogin-oidc/package.nix | 6 +++---
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix
index a130356f9821..d6873e804dc6 100644
--- a/pkgs/by-name/ku/kubelogin-oidc/package.nix
+++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubelogin";
-  version = "1.32.2";
+  version = "1.32.3";
 
   src = fetchFromGitHub {
     owner = "int128";
     repo = "kubelogin";
     tag = "v${version}";
-    hash = "sha256-fX0Hjb0j6KbdGuFdy5MaZc3zL/EOVXFTTNlIUQZjnsc=";
+    hash = "sha256-ZmNiFO1YGZC+vxpeliNuXfL8Azy2YmLgKqga/a3/9U8=";
   };
 
   subPackages = [ "." ];
@@ -22,7 +22,7 @@ buildGoModule rec {
     "-X main.version=v${version}"
   ];
 
-  vendorHash = "sha256-93B2TzptvXNevNLGGpWhUoLfefwb6uFk7tObnEf2wNg=";
+  vendorHash = "sha256-b8d06JhapPF8HwP1twgkcSR6RzM9x1G4zW3YBqmM3YM=";
 
   # test all packages
   preCheck = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5814f15e1b1..5f9579f64131 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15095,7 +15095,7 @@ with pkgs;
   };
 
   kubelogin-oidc = callPackage ../by-name/ku/kubelogin-oidc/package.nix {
-    buildGoModule = buildGo123Module;
+    buildGoModule = buildGo124Module;
   };
 
   kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { };

From c4eca4b00d65689757f095ced24ca7be2c9412d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?=
 <22820003+c4f3z1n@users.noreply.github.com>
Date: Wed, 26 Mar 2025 14:48:15 +0100
Subject: [PATCH 240/489] rush: add c4f3z1n as a maintainer

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

diff --git a/pkgs/by-name/ru/rush/package.nix b/pkgs/by-name/ru/rush/package.nix
index 0c4bea374c00..0efa21b7f8fb 100644
--- a/pkgs/by-name/ru/rush/package.nix
+++ b/pkgs/by-name/ru/rush/package.nix
@@ -45,9 +45,11 @@ stdenv.mkDerivation rec {
 
     homepage = "https://www.gnu.org/software/rush/";
     license = lib.licenses.gpl3Plus;
-
-    maintainers = [ ];
     platforms = lib.platforms.all;
+
+    maintainers = with lib.maintainers; [
+      c4f3z1n
+    ];
   };
 
   passthru = {

From 14434a98430d7fb6662f79da3990b9d0e379d3d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?=
 <22820003+c4f3z1n@users.noreply.github.com>
Date: Mon, 7 Apr 2025 17:39:21 +0200
Subject: [PATCH 241/489] rush: add `meta.mainProgram`

Suppress warnings when using `lib.getExe`.
---
 pkgs/by-name/ru/rush/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ru/rush/package.nix b/pkgs/by-name/ru/rush/package.nix
index 0efa21b7f8fb..bc48c78c07b8 100644
--- a/pkgs/by-name/ru/rush/package.nix
+++ b/pkgs/by-name/ru/rush/package.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
+    mainProgram = "rush";
     broken = stdenv.hostPlatform.isDarwin;
     description = "Restricted User Shell";
 

From dd1110d1b22f5ea6ea3c67ae4ba109f718188227 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 15:45:14 +0000
Subject: [PATCH 242/489] nushellPlugins.net: 1.8.0 -> 1.9.0

---
 pkgs/shells/nushell/plugins/net.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix
index fa3fcc55ad95..26253b679db7 100644
--- a/pkgs/shells/nushell/plugins/net.nix
+++ b/pkgs/shells/nushell/plugins/net.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_net";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "fennewald";
     repo = "nu_plugin_net";
     rev = "refs/tags/${version}";
-    hash = "sha256-nKcB919M9FkDloulh9IusWYPhf8vlhUmKVs6Gd6w3Bw=";
+    hash = "sha256-Cop2gI5xhhWhw5Cyb4CABSzqs2bxDreohOzgGh/wPXg=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-nQILwEZaVL1xJ/CKGGObogFGPmW0UPq0v3vFP2kHqWo=";
+  cargoHash = "sha256-8IlCUI0HOsr06vsSv0WBxfoaEe1Dz21tZdWZ6jrNkaw=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 

From cbb30bb86cc19f279640344de31cde289a1e1fb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 16:32:55 +0000
Subject: [PATCH 243/489] star-history: 1.0.29 -> 1.0.30

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

diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix
index 1778f16b97d7..bf082e1b358f 100644
--- a/pkgs/by-name/st/star-history/package.nix
+++ b/pkgs/by-name/st/star-history/package.nix
@@ -10,15 +10,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "star-history";
-  version = "1.0.29";
+  version = "1.0.30";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-RpGR4DlAvSuaecHPiD367rRR7H5zQs0JOgtvh/PXgpM=";
+    hash = "sha256-QTTBWuRXjx7UEMjnrIb4KQW+rtyKy4Q0Hu7OLt1Dph0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-lVwH8NnmBl3ZakVbFYslvH39mjAOhmPRmXdshbwkx1Y=";
+  cargoHash = "sha256-2GwZtNbUbdzxK31Gh4U2LsFkzV1ylXkZnP5r5FQ/hvU=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 0c80ea2df0df2e52c89a267868e95553aed7abd6 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 7 Apr 2025 18:41:09 +0200
Subject: [PATCH 244/489] vale: 3.11.1 -> 3.11.2

Diff: https://github.com/errata-ai/vale/compare/refs/tags/v3.11.1...v3.11.2

Changelog: https://github.com/errata-ai/vale/releases/tag/v3.11.2
---
 pkgs/by-name/va/vale/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix
index 9d4f3c703f72..67abc5317743 100644
--- a/pkgs/by-name/va/vale/package.nix
+++ b/pkgs/by-name/va/vale/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "vale";
-  version = "3.11.1";
+  version = "3.11.2";
 
   subPackages = [ "cmd/vale" ];
 
@@ -19,7 +19,7 @@ buildGoModule rec {
     owner = "errata-ai";
     repo = "vale";
     tag = "v${version}";
-    hash = "sha256-UPbeml7W90ICmbDjvNIy+DmolAAYF6Tci4R/kZa5cr8=";
+    hash = "sha256-7wBMdATN2kAXUG6fWwq/8JifLrhxDjjPWlZSA47yrxM=";
   };
 
   vendorHash = "sha256-Zhhp/qbwGTQEZ28S+p7GJodwQcnkFNqNU7WCZKdeoz0=";

From 651ceef8830bae895330da43f08db78bfa17fae7 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Mon, 7 Apr 2025 19:16:45 +0200
Subject: [PATCH 245/489] qvge: 0.6.3 -> 0.6.3-unstable-2024-04-08

---
 pkgs/applications/graphics/qvge/default.nix             | 9 +++++----
 pkgs/applications/graphics/qvge/set-graphviz-path.patch | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix
index 18cae4c331ad..38f74d11f327 100644
--- a/pkgs/applications/graphics/qvge/default.nix
+++ b/pkgs/applications/graphics/qvge/default.nix
@@ -12,13 +12,14 @@
 
 stdenv.mkDerivation rec {
   pname = "qvge";
-  version = "0.6.3";
+  version = "0.6.3-unstable-2024-04-08";
 
   src = fetchFromGitHub {
     owner = "ArsMasiuk";
-    repo = pname;
-    tag = "v${version}";
-    sha256 = "sha256-rtbUAp3l0VZsu+D9HCHM3q0UkDLflw50rYRq/LP4Wu4=";
+    repo = "qvge";
+    #tag = "v${version}";
+    rev = "5751948358d407673cfda10f52892683be143d42";
+    hash = "sha256-Rh8ahS/9x2aWu4THjLKoog58+yJoCQ6GETaAQTW4Hq8=";
   };
 
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/applications/graphics/qvge/set-graphviz-path.patch b/pkgs/applications/graphics/qvge/set-graphviz-path.patch
index d18eb81c5d04..3d003c0657c3 100644
--- a/pkgs/applications/graphics/qvge/set-graphviz-path.patch
+++ b/pkgs/applications/graphics/qvge/set-graphviz-path.patch
@@ -1,7 +1,7 @@
 diff --git i/commonui/CNodeEditorUIController.cpp w/commonui/CNodeEditorUIController.cpp
 index 7dacd48..64983e4 100644
---- i/commonui/CNodeEditorUIController.cpp
-+++ w/commonui/CNodeEditorUIController.cpp
+--- i/qvgeui/CNodeEditorUIController.cpp
++++ w/qvgeui/CNodeEditorUIController.cpp
 @@ -123,7 +123,7 @@ CNodeEditorUIController::CNodeEditorUIController(CMainWindow *parent) :
  	QString pathToGraphviz = QCoreApplication::applicationDirPath() + "/../tools/graphviz";
  	m_optionsData.graphvizPath = QFileInfo(pathToGraphviz).absoluteFilePath();

From 46f4333ef257f16be8f796f40ef8a79e74049722 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 7 Apr 2025 19:36:17 +0200
Subject: [PATCH 246/489] pnpm_10: 10.7.1 -> 10.8.0

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/development/tools/pnpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index d3c4d70dce74..b7dc82ca8cf1 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -16,8 +16,8 @@ let
       hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
     };
     "10" = {
-      version = "10.7.1";
-      hash = "sha256-3FFIkOpxkAPLelfWshryT9r63Z8XHnVn7KFmXXz873Y=";
+      version = "10.8.0";
+      hash = "sha256-Kb8sXOrqeZHugu7BX+cWLg+tgW0MSms1oWwB05J0v2k=";
     };
   };
 

From 0d5dc32b97c4530d45bca3e51c612cecb1ec828b Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 7 Apr 2025 17:37:52 +0000
Subject: [PATCH 247/489] gnucash: 5.10 -> 5.11 (#394973)

---
 pkgs/by-name/gn/gnucash/package.nix | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix
index dd37827859db..1a5d5db37261 100644
--- a/pkgs/by-name/gn/gnucash/package.nix
+++ b/pkgs/by-name/gn/gnucash/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   fetchurl,
-  fetchpatch,
   aqbanking,
   boost,
   cmake,
@@ -30,12 +29,12 @@
 
 stdenv.mkDerivation rec {
   pname = "gnucash";
-  version = "5.10";
+  version = "5.11";
 
   # raw source code doesn't work out of box; fetchFromGitHub not usable
   src = fetchurl {
     url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2";
-    hash = "sha256-eJ2fNpjuW4ZyAnmjo+EOd0QhDhLFJa5/A9MvpwQHrZM=";
+    hash = "sha256-a6QjE6qqmbXwf/bk28WLM/v19L5ukRN2cB1lwm/U3r4=";
   };
 
   nativeBuildInputs = [
@@ -80,18 +79,6 @@ stdenv.mkDerivation rec {
     ./0003-remove-valgrind.patch
     # this patch makes gnucash exec the Finance::Quote wrapper directly
     ./0004-exec-fq-wrapper.patch
-    # this patch fixes the build against icu 76
-    (fetchpatch {
-      name = "icu-76.patch";
-      url = "https://github.com/Gnucash/gnucash/commit/579eed1facc0f7834ea70b1a342ebca0f125d788.patch";
-      hash = "sha256-XzRPHDPxt2TfeqO48vaNEcfF58neVDMxVqkPKrG5xoM=";
-    })
-    # fixes QIF imports: https://bugs.gnucash.org/show_bug.cgi?id=799492
-    (fetchpatch {
-      name = "qif-import.patch";
-      url = "https://github.com/Gnucash/gnucash/commit/6531d3e46b7bee1add61aa6c6aaf8fb1f889a586.patch";
-      hash = "sha256-Lque2w9X9yencNVzI/DfuE3H2dN46yVNnbBdiEQE6/4=";
-    })
   ];
 
   # this needs to be an environment variable and not a cmake flag to suppress

From a1b5951e58a288d75cb1567757b7a9c2bf2ca341 Mon Sep 17 00:00:00 2001
From: Adam Chance <6444703+drakon64@users.noreply.github.com>
Date: Mon, 7 Apr 2025 13:45:17 +0100
Subject: [PATCH 248/489] maintainers: add drakon64

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 88c7136059d3..d5ac699d5aab 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6444,6 +6444,11 @@
     github = "DrakeTDL";
     githubId = 22124013;
   };
+  drakon64 = {
+    name = "Adam Chance";
+    email = "nixpkgs@drakon.cloud";
+    githubId = 6444703;
+  };
   dramaturg = {
     email = "seb@ds.ag";
     github = "dramaturg";

From f181f1c4ecddf1778de6983ca34d0f93d1b49891 Mon Sep 17 00:00:00 2001
From: Adam Chance <6444703+drakon64@users.noreply.github.com>
Date: Mon, 7 Apr 2025 17:42:34 +0100
Subject: [PATCH 249/489] cosmic-settings-daemon: add drakon64 to maintainers

---
 pkgs/by-name/co/cosmic-settings-daemon/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index 48345bac9841..e63ca30c9c2c 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -43,7 +43,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Settings Daemon for the COSMIC Desktop Environment";
     mainProgram = "cosmic-settings-daemon";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ nyabinary ];
+    maintainers = with maintainers; [
+      nyabinary
+      drakon64
+    ];
     platforms = platforms.linux;
   };
 })

From eb49b51810e6e1cee467f8d306711c79a9087d81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 17:55:17 +0000
Subject: [PATCH 250/489] python312Packages.tldextract: 5.1.3 -> 5.2.0

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

diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix
index 8c2ade0628f9..e9a5d5efd7de 100644
--- a/pkgs/development/python-modules/tldextract/default.nix
+++ b/pkgs/development/python-modules/tldextract/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "tldextract";
-  version = "5.1.3";
+  version = "5.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "john-kurkowski";
     repo = "tldextract";
     tag = version;
-    hash = "sha256-gcgQGZS/dsTTC4Szpjreb2fAsVZxxOCE1erVvU1q4xM=";
+    hash = "sha256-5/o/9XRIe1BpLJCiTln0C80aT9V9sg308SDtCae6HAE=";
   };
 
   nativeBuildInputs = [
@@ -57,7 +57,7 @@ buildPythonPackage rec {
       from the registered domain and subdomains of a URL.
     '';
     homepage = "https://github.com/john-kurkowski/tldextract";
-    changelog = "https://github.com/john-kurkowski/tldextract/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/john-kurkowski/tldextract/blob/${src.tag}/CHANGELOG.md";
     license = with licenses; [ bsd3 ];
     maintainers = with maintainers; [ fab ];
     mainProgram = "tldextract";

From b8e9b34dbbfef7e9f904522ecf32fe40531fe2fa Mon Sep 17 00:00:00 2001
From: Ralph Seichter <github@seichter.de>
Date: Mon, 7 Apr 2025 19:22:45 +0200
Subject: [PATCH 251/489] stown: add nix-update-script

---
 pkgs/by-name/st/stown/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/st/stown/package.nix b/pkgs/by-name/st/stown/package.nix
index 7a85908e97b0..b4a5013a10f5 100644
--- a/pkgs/by-name/st/stown/package.nix
+++ b/pkgs/by-name/st/stown/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   tree,
   versionCheckHook,
+  nix-update-script,
 }:
 let
   version = "1.2.0";
@@ -30,6 +31,8 @@ python3Packages.buildPythonApplication {
     versionCheckHook
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Manage file system object mapping via symlinks. Lightweight alternative to GNU Stow";
     homepage = "https://www.seichter.de/stown/";

From 00fde3a5979d0ab7655362ec89c21164bdbfb043 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 7 Apr 2025 20:05:18 +0200
Subject: [PATCH 252/489] python312Packages.speechbrain: 1.0.2 -> 1.0.3

Diff: https://github.com/speechbrain/speechbrain/compare/refs/tags/v1.0.2...refs/tags/v1.0.3

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

diff --git a/pkgs/development/python-modules/speechbrain/default.nix b/pkgs/development/python-modules/speechbrain/default.nix
index 34dc9f7b9dec..d9fabf1dc0de 100644
--- a/pkgs/development/python-modules/speechbrain/default.nix
+++ b/pkgs/development/python-modules/speechbrain/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "speechbrain";
-  version = "1.0.2";
+  version = "1.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "speechbrain";
     repo = "speechbrain";
     tag = "v${version}";
-    hash = "sha256-Un7RPxMq1sD7uD3jcw3Bjp+Oo8ld+XC5g2I89gF6jxs=";
+    hash = "sha256-H45kTOIO6frbrRu+TP+udn1z60ZEcrShNB9iTCLInQs=";
   };
 
   dependencies = [

From a37f0b2ed3f61a5d68ae532f33fad2d83df52ea3 Mon Sep 17 00:00:00 2001
From: gautaz <11046232+gautaz@users.noreply.github.com>
Date: Mon, 7 Apr 2025 20:08:59 +0200
Subject: [PATCH 253/489] python3Packages.youtube-search-python: patch for
 httpx >= 0.28 (#396845)

youtube-search-python: fix for proxies issue
---
 .../youtube-search-python/default.nix         |  2 +
 .../fix-httpx-proxies.patch                   | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/youtube-search-python/fix-httpx-proxies.patch

diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix
index 344427e53e16..325b541fa7f4 100644
--- a/pkgs/development/python-modules/youtube-search-python/default.nix
+++ b/pkgs/development/python-modules/youtube-search-python/default.nix
@@ -18,6 +18,8 @@ buildPythonPackage rec {
     hash = "sha256-RWjR12ns1+tLuDZfBO7G42TF9w7sezdl9UPa67E1/PU=";
   };
 
+  patches = [ ./fix-httpx-proxies.patch ];
+
   propagatedBuildInputs = [ httpx ];
 
   pythonImportsCheck = [ "youtubesearchpython" ];
diff --git a/pkgs/development/python-modules/youtube-search-python/fix-httpx-proxies.patch b/pkgs/development/python-modules/youtube-search-python/fix-httpx-proxies.patch
new file mode 100644
index 000000000000..ff3860bfaff0
--- /dev/null
+++ b/pkgs/development/python-modules/youtube-search-python/fix-httpx-proxies.patch
@@ -0,0 +1,39 @@
+--- a/youtubesearchpython/core/requests.py
++++ b/youtubesearchpython/core/requests.py
+@@ -11,29 +11,28 @@ class RequestCore:
+         self.proxy = {}
+         http_proxy = os.environ.get("HTTP_PROXY")
+         if http_proxy:
+-            self.proxy["http://"] = http_proxy
++            self.proxy["http://"] = httpx.HTTPTransport(proxy=http_proxy)
+         https_proxy = os.environ.get("HTTPS_PROXY")
+         if https_proxy:
+-            self.proxy["https://"] = https_proxy
++            self.proxy["https://"] = httpx.HTTPTransport(proxy=https_proxy)
+
+     def syncPostRequest(self) -> httpx.Response:
+-        return httpx.post(
++        return httpx.Client(mounts=self.proxy).post(
+             self.url,
+             headers={"User-Agent": userAgent},
+             json=self.data,
+-            timeout=self.timeout,
+-            proxies=self.proxy
++            timeout=self.timeout
+         )
+
+     async def asyncPostRequest(self) -> httpx.Response:
+-        async with httpx.AsyncClient(proxies=self.proxy) as client:
++        async with httpx.AsyncClient(mounts=self.proxy) as client:
+             r = await client.post(self.url, headers={"User-Agent": userAgent}, json=self.data, timeout=self.timeout)
+             return r
+
+     def syncGetRequest(self) -> httpx.Response:
+-        return httpx.get(self.url, headers={"User-Agent": userAgent}, timeout=self.timeout, cookies={'CONSENT': 'YES+1'}, proxies=self.proxy)
++        return httpx.Client(mounts=self.proxy).get(self.url, headers={"User-Agent": userAgent}, timeout=self.timeout, cookies={'CONSENT': 'YES+1'})
+
+     async def asyncGetRequest(self) -> httpx.Response:
+-        async with httpx.AsyncClient(proxies=self.proxy) as client:
++        async with httpx.AsyncClient(mounts=self.proxy) as client:
+             r = await client.get(self.url, headers={"User-Agent": userAgent}, timeout=self.timeout, cookies={'CONSENT': 'YES+1'})
+             return r

From 797ee0663d8204fc032a30d7c9b9eaa1a596b378 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Tue, 25 Mar 2025 16:30:00 +0100
Subject: [PATCH 254/489] yaml-language-server: 1.15.0 -> 1.17.0

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

diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix
index 4f3d95b2a492..6f1f84a1068d 100644
--- a/pkgs/by-name/ya/yaml-language-server/package.nix
+++ b/pkgs/by-name/ya/yaml-language-server/package.nix
@@ -11,18 +11,18 @@
 
 stdenv.mkDerivation rec {
   pname = "yaml-language-server";
-  version = "1.15.0";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "yaml-language-server";
     tag = version;
-    hash = "sha256-Y3Q/y9UIiy7US8Jl4vxT0Pfw8h3hiXK+Cu9TEQHyAaA=";
+    hash = "sha256-YGPktMZxYi6eihCDc8JIfN/Ht2uu3wGKoKPJWlDKu+g=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-zHcxZ4VU6CGux72Nsy0foU4gFshK1wO/LTfnwOoirmg=";
+    hash = "sha256-2OVxvvijnfB8Bytgoaybyx4p66nD/aahtyjxLf8womE=";
   };
 
   nativeBuildInputs = [

From eae90bb6c6b41fa398f7dd99be1fa1088c141b08 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Tue, 25 Mar 2025 16:30:00 +0100
Subject: [PATCH 255/489] yaml-language-server: use writableTmpDirAsHomeHook

---
 pkgs/by-name/ya/yaml-language-server/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix
index 6f1f84a1068d..03d0655b1fd5 100644
--- a/pkgs/by-name/ya/yaml-language-server/package.nix
+++ b/pkgs/by-name/ya/yaml-language-server/package.nix
@@ -5,6 +5,7 @@
   fixup-yarn-lock,
   makeWrapper,
   nodejs,
+  writableTmpDirAsHomeHook,
   stdenv,
   yarn,
 }:
@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
     fixup-yarn-lock
     yarn
     nodejs
+    writableTmpDirAsHomeHook
   ];
 
   # NodeJS is also needed here so that script interpreter get patched
@@ -40,7 +42,6 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     runHook preConfigure
 
-    export HOME=$(mktemp -d)
     yarn config --offline set yarn-offline-mirror "$offlineCache"
     fixup-yarn-lock yarn.lock
     yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install

From 7d9a97f5b730fec2914f27feba2b606f25a1d1b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 18:31:47 +0000
Subject: [PATCH 256/489] tokyonight-gtk-theme: 0-unstable-2024-11-06 ->
 0-unstable-2025-04-04

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

diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
index 346b4d69a03d..364c09933290 100644
--- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
+++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
@@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2024-11-06";
+    version = "0-unstable-2025-04-04";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Tokyonight-GTK-Theme";
-      rev = "4dc45d60bf35f50ebd9ee41f16ab63783f80dd64";
-      hash = "sha256-AKZA+WCcfxDeNrNrq3XYw+SFoWd1VV2T9+CwK2y6+jA=";
+      rev = "7c6fa4221a480da928e28761ddbc84a68a5afbed";
+      hash = "sha256-D/TivtXnSCkmFk3HVgQlZD7xxmugPkzCRrA3x3Vd4eU=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From a008b75acaab99f9e8442137401afe1e1de64e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 7 Apr 2025 11:32:51 -0700
Subject: [PATCH 257/489] python313Packages.mat2: fix test with exiftool 13.25

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

diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index 4f781d6109c5..f998632610d5 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   pytestCheckHook,
   fetchFromGitLab,
+  fetchpatch,
   replaceVars,
   bubblewrap,
   exiftool,
@@ -36,6 +37,11 @@ buildPythonPackage rec {
 
   patches =
     [
+      (fetchpatch {
+        name = "exiftool-13.25-compat.patch";
+        url = "https://0xacab.org/jvoisin/mat2/-/commit/473903b70e1b269a6110242a9c098a10c18554e2.patch";
+        hash = "sha256-vxxjAFwiTDlcTT3ZlfhOG4rlzBJS+LhLoA++8y2hEok=";
+      })
       # hardcode paths to some binaries
       (replaceVars ./paths.patch {
         exiftool = lib.getExe exiftool;

From 5b2b4870d9103a72e0ccbe624b46b3d956a3dc98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 18:34:28 +0000
Subject: [PATCH 258/489] thunderbird-128-unwrapped: 128.8.1esr -> 128.9.1esr

---
 .../networking/mailreaders/thunderbird/packages.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 5ec027401bf8..08de8ea78c46 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -99,8 +99,8 @@ rec {
   thunderbird-128 = common {
     applicationName = "Thunderbird ESR";
 
-    version = "128.8.1esr";
-    sha512 = "f1ef0a665f2cef49b427cbfb4a3548df0cccf4470c03367cdb3d2729d4f6bbf25056c378ffa9e1184b6687332998d12ff9ba251b97b7ca859d9d43be9d7414ba";
+    version = "128.9.1esr";
+    sha512 = "bc53ad210c6942fd4a5d31e693d6f376c009873397ea4e3c36d9de33d9dc1af5a3ff9e6ca9039dd8849ea8b56daa220f08b7bef4e2ea1b86e98dfe3b9b58dc0d";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-128";

From 7cdf2bbf3d9a6fb48a28efe191769080281d19ba Mon Sep 17 00:00:00 2001
From: Eric Kim-Butler <eric@kimbutler.xyz>
Date: Mon, 7 Apr 2025 14:46:00 -0400
Subject: [PATCH 259/489] jujutsu: 0.28.1 -> 0.28.2

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

diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index 61d5cd071ced..14af7bc7b2f8 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -18,18 +18,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jujutsu";
-  version = "0.28.1";
+  version = "0.28.2";
 
   src = fetchFromGitHub {
     owner = "jj-vcs";
     repo = "jj";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LDMHMFg9fjEMi8I2Fc3TEyWMctqJurAbckubCgkkZiM=";
+    hash = "sha256-EAD40ZZr6VK4w9OuYzx2YcVgOODopF7IWN7GVjTlblE=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-y/GQSzI7bVPieuAmQKdZY1qticmmRYibBtgXSEJ7dU4=";
+  cargoHash = "sha256-WOzzBhZLV4kfsmTGreg1m+sPcDjznB4Kh8ONVNZkp5A=";
 
   nativeBuildInputs = [
     installShellFiles

From f9760f523b3b718d445c3ca0f136b0ccbe2f4b61 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 7 Apr 2025 20:12:20 +0200
Subject: [PATCH 260/489] python312Packages.orbax-checkpoint: 0.11.10 ->
 0.11.11

Diff: https://github.com/google/orbax/compare/refs/tags/v0.11.10...refs/tags/v0.11.11

Changelog: https://github.com/google/orbax/blob/v0.11.11/checkpoint/CHANGELOG.md
---
 .../development/python-modules/orbax-checkpoint/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix
index ba221650503f..f6b516d4c2c6 100644
--- a/pkgs/development/python-modules/orbax-checkpoint/default.nix
+++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix
@@ -23,6 +23,7 @@
   typing-extensions,
 
   # tests
+  aiofiles,
   chex,
   google-cloud-logging,
   mock,
@@ -34,14 +35,14 @@
 
 buildPythonPackage rec {
   pname = "orbax-checkpoint";
-  version = "0.11.10";
+  version = "0.11.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "orbax";
     tag = "v${version}";
-    hash = "sha256-bS4JmS8NkYkf6YUN9JLcIjMco94QuAw/7H0SguCWH+Y=";
+    hash = "sha256-KEh1w2lVQKch5QMwqLoAFnnaMOPqWX6WA7QM9sfunUU=";
   };
 
   sourceRoot = "${src.name}/checkpoint";
@@ -69,6 +70,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    aiofiles
     chex
     google-cloud-logging
     mock

From 2ab1f218fb3ec043693480f6224727f2efd46438 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 7 Apr 2025 21:04:44 +0200
Subject: [PATCH 261/489] nixos/services.mysql: fix
 galeraCluster.clusterAddress is evaluated before assertions are checked

---
 nixos/modules/services/databases/mysql.nix | 90 +++++++++++-----------
 1 file changed, 46 insertions(+), 44 deletions(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 23551f414a63..59c868d6628e 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -18,6 +18,22 @@ let
   format = pkgs.formats.ini { listsAsDuplicateKeys = true; };
   configFile = format.generate "my.cnf" cfg.settings;
 
+  generateClusterAddressExpr = ''
+    if (config.services.mysql.galeraCluster.nodeAddresses == [ ]) then
+      ""
+    else
+      "gcomm://''${builtins.concatStringsSep \",\" config.services.mysql.galeraCluster.nodeAddresses}"
+      + lib.optionalString (config.services.mysql.galeraCluster.clusterPassword != "")
+        "?gmcast.seg=1:''${config.services.mysql.galeraCluster.clusterPassword}"
+  '';
+  generateClusterAddress =
+    if (cfg.galeraCluster.nodeAddresses == [ ]) then
+      ""
+    else
+      "gcomm://${builtins.concatStringsSep "," cfg.galeraCluster.nodeAddresses}"
+      + lib.optionalString (
+        cfg.galeraCluster.clusterPassword != ""
+      ) "?gmcast.seg=1:${cfg.galeraCluster.clusterPassword}";
 in
 
 {
@@ -378,22 +394,8 @@ in
           type = lib.types.str;
           description = "Full Galera cluster connection string. If nodeAddresses is set, this will be auto-generated, but you can override it with a custom value. Format is typically 'gcomm://node1,node2,node3' with optional parameters.";
           example = "gcomm://10.0.0.10,10.0.0.20,10.0.0.30?gmcast.seg=1:SomePassword";
-          default =
-            if (cfg.galeraCluster.nodeAddresses == [ ]) then
-              ""
-            else
-              "gcomm://${builtins.concatStringsSep "," cfg.galeraCluster.nodeAddresses}"
-              + lib.optionalString (
-                cfg.galeraCluster.clusterPassword != ""
-              ) "?gmcast.seg=1:${cfg.galeraCluster.clusterPassword}";
-          defaultText = lib.literalExpression ''
-            if (config.services.mysql.galeraCluster.nodeAddresses == [ ]) then
-              ""
-            else
-              "gcomm://''${builtins.concatStringsSep \",\" config.services.mysql.galeraCluster.nodeAddresses}"
-              + lib.optionalString (config.services.mysql.galeraCluster.clusterPassword != "")
-                "?gmcast.seg=1:''${config.services.mysql.galeraCluster.clusterPassword}"
-          '';
+          default = ""; # will be evaluate by generateClusterAddress
+          defaultText = lib.literalExpression generateClusterAddressExpr;
         };
 
       };
@@ -404,34 +406,30 @@ in
   ###### implementation
 
   config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = !cfg.galeraCluster.enable || isMariaDB;
-        message = "'services.mysql.galeraCluster.enable' expect services.mysql.package to be an mariadb variant";
-      }
-      {
-        assertion =
-          !cfg.galeraCluster.enable
-          || (
+    assertions =
+      [
+        {
+          assertion = !cfg.galeraCluster.enable || isMariaDB;
+          message = "'services.mysql.galeraCluster.enable' expect services.mysql.package to be an mariadb variant";
+        }
+      ]
+      # galeraCluster options checks
+      ++ lib.optionals cfg.galeraCluster.enable [
+        {
+          assertion =
             cfg.galeraCluster.localAddress != ""
-            && (cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != "")
-          );
-        message = "mariadb galera cluster is enabled but the localAddress and (nodeAddresses or clusterAddress) are not set";
-      }
-      {
-        assertion = !(cfg.galeraCluster.clusterAddress != "" && cfg.galeraCluster.clusterPassword != "");
-        message = "mariadb galera clusterPassword is set but overwritten by clusterAddress";
-      }
-      {
-        assertion =
-          !(
-            cfg.galeraCluster.enable
-            && cfg.galeraCluster.nodeAddresses != [ ]
-            && cfg.galeraCluster.clusterAddress != ""
-          );
-        message = "When services.mysql.galeraCluster.clusterAddress is set, setting services.mysql.galeraCluster.nodeAddresses is redundant and will be overwritten by clusterAddress. Choose one approach.";
-      }
-    ];
+            && (cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != "");
+          message = "mariadb galera cluster is enabled but the localAddress and (nodeAddresses or clusterAddress) are not set";
+        }
+        {
+          assertion = cfg.galeraCluster.clusterPassword == "" || cfg.galeraCluster.clusterAddress == "";
+          message = "mariadb galera clusterPassword is set but overwritten by clusterAddress";
+        }
+        {
+          assertion = cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != "";
+          message = "When services.mysql.galeraCluster.clusterAddress is set, setting services.mysql.galeraCluster.nodeAddresses is redundant and will be overwritten by clusterAddress. Choose one approach.";
+        }
+      ];
 
     services.mysql.dataDir = lib.mkDefault (
       if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"
@@ -475,7 +473,11 @@ in
       wsrep_provider = "${cfg.galeraCluster.package}/lib/galera/libgalera_smm.so";
 
       wsrep_cluster_name = cfg.galeraCluster.name;
-      wsrep_cluster_address = cfg.galeraCluster.clusterAddress;
+      wsrep_cluster_address =
+        if (cfg.galeraCluster.clusterAddress != "") then
+          cfg.galeraCluster.clusterAddress
+        else
+          generateClusterAddress;
 
       wsrep_node_address = cfg.galeraCluster.localAddress;
       wsrep_node_name = "${cfg.galeraCluster.localName}";

From 0dfd859628b803cc141c28f9cec6ac3bee53fae0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 19:19:42 +0000
Subject: [PATCH 262/489] sequoia-sq: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index 3dfbd7f562ec..9f239af4f2f9 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sequoia-sq";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-sq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1jssSlyjbrGgkxGC1gieZooVVI42Qvz0q+pIfcZRIj0=";
+    hash = "sha256-lM+j1KtH3U/lbPXnKALAP75YokDufbdz8s8bjb0VXUY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-tATxGaoF/+cUDywvlnW1N2sKo/FbKhJM7yUb74mxB5s=";
+  cargoHash = "sha256-3z1Qm/eeVlH0/x3C8PSSPIlQaRKk1U6mRlEiKk0AaVQ=";
 
   nativeBuildInputs = [
     pkg-config

From 64c692458084568d3b4d5f20ffa58688bd6129f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 19:37:37 +0000
Subject: [PATCH 263/489] stardust-xr-magnetar: 0-unstable-2024-12-29 ->
 0-unstable-2025-04-03

---
 pkgs/by-name/st/stardust-xr-magnetar/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stardust-xr-magnetar/package.nix b/pkgs/by-name/st/stardust-xr-magnetar/package.nix
index a6a8584e3675..7b34b80c8a8c 100644
--- a/pkgs/by-name/st/stardust-xr-magnetar/package.nix
+++ b/pkgs/by-name/st/stardust-xr-magnetar/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage {
   pname = "stardust-xr-magnetar";
-  version = "0-unstable-2024-12-29";
+  version = "0-unstable-2025-04-03";
 
   src = fetchFromGitHub {
     owner = "stardustxr";
     repo = "magnetar";
-    rev = "d00c5ecf0bcaf2b4382ec3b4f3373ea5b761ee7b";
-    hash = "sha256-2I6BRjw5t68OMc93cis4/qnyYT9OBYIr1S+ZF8LmFCc=";
+    rev = "63ff648bb64c23023a0047ea3ff2c0b6b1fd3caf";
+    hash = "sha256-LRI3HKuOUfUb93mHB8DUpp0hvES+GbzsKAxpkLCLzKQ=";
   };
 
   useFetchCargoVendor = true;

From a3085f21a97c5709b8b6d8ca194cdb2e65dde69f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 19:42:55 +0000
Subject: [PATCH 264/489] hyprgraphics: 0.1.2 -> 0.1.3

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

diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix
index a695361fca0a..bb1930f77332 100644
--- a/pkgs/by-name/hy/hyprgraphics/package.nix
+++ b/pkgs/by-name/hy/hyprgraphics/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprgraphics";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprgraphics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-U62Fo0w+aIXBAsSSYsfDsoe3YmoxWMArJ7pN2HNOAqo=";
+    hash = "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=";
   };
 
   nativeBuildInputs = [

From 1cf315747dc84f4fc91747605192aa3c9f61d8e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 7 Apr 2025 21:43:40 +0200
Subject: [PATCH 265/489] python313Packages.nexia: 2.6.0 -> 2.7.0

Diff: https://github.com/bdraco/nexia/compare/refs/tags/2.6.0...refs/tags/2.7.0

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

diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix
index 84a2c7bc58d9..724c6a808208 100644
--- a/pkgs/development/python-modules/nexia/default.nix
+++ b/pkgs/development/python-modules/nexia/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "nexia";
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "nexia";
     tag = version;
-    hash = "sha256-1rhbVXQ7a9YxW/w6Hbp8QbD1h1kKwtpS+lViOdxJJYc=";
+    hash = "sha256-q7g4MIMW4yIUhvSMN3EmMU/9EsT+jOiJ9gV9P7sjVhg=";
   };
 
   build-system = [ setuptools ];

From 758551e4587d75882aebc21a04bee960418f8ce9 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 03:56:34 +0800
Subject: [PATCH 266/489] refine: fix eval

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

diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix
index c5bee1e438de..6445c28e9359 100644
--- a/pkgs/by-name/re/refine/package.nix
+++ b/pkgs/by-name/re/refine/package.nix
@@ -23,6 +23,7 @@ let
   libadwaita' = libadwaita.overrideAttrs (oldAttrs: {
     version = "1.6.2-unstable-2025-01-02";
     src = oldAttrs.src.override {
+      tag = null;
       rev = "f5f0e7ce69405846a8f8bdad11cef2e2a7e99010";
       hash = "sha256-n5RbGHtt2g627T/Tg8m3PjYIl9wfYTIcrplq1pdKAXk=";
     };

From d44d94926c8261bfde5a64a70b00e95d3e9013c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 10:39:20 +0000
Subject: [PATCH 267/489] sentry-native: 0.8.2 -> 0.8.3

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

diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index 4d2dbe0fa782..73a8d0ca78dc 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sentry-native";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-native";
     tag = version;
-    hash = "sha256-X5QA27y/7bJoGC1qDNhvbh5Cqm4StiZ9jkdsed+oVL4=";
+    hash = "sha256-9jsn7oydaOYOAq6XYYlPjzzy6LSiKOpRtp+PxMlzwz0=";
   };
 
   nativeBuildInputs = [

From 8562345e83817140d9ab682f8d0371cdb8500491 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 01:39:28 +0000
Subject: [PATCH 268/489] ocamlPackages.metadata: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix
index f09f5189c683..ae695a3d5ed0 100644
--- a/pkgs/development/ocaml-modules/metadata/default.nix
+++ b/pkgs/development/ocaml-modules/metadata/default.nix
@@ -6,13 +6,13 @@
 
 buildDunePackage rec {
   pname = "metadata";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-metadata";
     tag = "v${version}";
-    sha256 = "sha256-SQ8fNl62fvoCgbIt0axQyE3Eqwl8EOtYiz3xN96al+g=";
+    sha256 = "sha256-CsmKk14jk/PuTibEmlFr/QZbmDIkLJ5QJSIZQXLRmGw=";
   };
 
   minimalOCamlVersion = "4.14";

From 71967c47e54c56557c0ee7bec7fe554c018e37c4 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon@is.currently.online>
Date: Wed, 25 Sep 2024 01:51:22 -0400
Subject: [PATCH 269/489] nixos/syncoid: allow interval to be list of strings

The syncoid module generates systemd services with a `startAt` config
based on its `interval` value. However, it is currently not possible
to completely disable this timer, or set multiple `startAt` values.

By accepting the same types that `systemd.services.<name>.startAt`
accepts, we can disable generating a timer unit or set multiple
`startAt` timers.
---
 nixos/modules/services/backup/syncoid.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix
index 0d379f6c915d..8b4c59155f4d 100644
--- a/nixos/modules/services/backup/syncoid.nix
+++ b/nixos/modules/services/backup/syncoid.nix
@@ -106,14 +106,17 @@ in
     package = lib.mkPackageOption pkgs "sanoid" { };
 
     interval = lib.mkOption {
-      type = lib.types.str;
+      type = with lib.types; either str (listOf str);
       default = "hourly";
       example = "*-*-* *:15:00";
       description = ''
         Run syncoid at this interval. The default is to run hourly.
 
-        The format is described in
-        {manpage}`systemd.time(7)`.
+        Must be in the format described in {manpage}`systemd.time(7)`.  This is
+        equivalent to adding a corresponding timer unit with
+        {option}`OnCalendar` set to the value given here.
+
+        Set to an empty list to avoid starting syncoid automatically.
       '';
     };
 

From c518a91efa1bcf70b78a797e2df33d582f82f7f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Apr 2025 10:17:12 +0000
Subject: [PATCH 270/489] keymapper: 4.11.1 -> 4.11.4

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

diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix
index 0456573d780f..889edefebdbb 100644
--- a/pkgs/by-name/ke/keymapper/package.nix
+++ b/pkgs/by-name/ke/keymapper/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keymapper";
-  version = "4.11.1";
+  version = "4.11.4";
 
   src = fetchFromGitHub {
     owner = "houmain";
     repo = "keymapper";
     tag = finalAttrs.version;
-    hash = "sha256-Dq9oyCMMXWBDxX2Bj/IsrjBIxREwMQ12F5/SJ+sQfNY=";
+    hash = "sha256-H2JdGfS+MMh6EDac2bjfcCtjdDSobClAgsqYbZYuSAo=";
   };
 
   # all the following must be in nativeBuildInputs

From 82c27c2116cbb654e1c9645cfe6cb1dc868513cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 12:46:12 +0000
Subject: [PATCH 271/489] btcpayserver: 2.0.7 -> 2.0.8

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

diff --git a/pkgs/by-name/bt/btcpayserver/package.nix b/pkgs/by-name/bt/btcpayserver/package.nix
index 0a66d9239534..7cbfafa4fea4 100644
--- a/pkgs/by-name/bt/btcpayserver/package.nix
+++ b/pkgs/by-name/bt/btcpayserver/package.nix
@@ -8,13 +8,13 @@
 
 buildDotnetModule rec {
   pname = "btcpayserver";
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchFromGitHub {
     owner = "btcpayserver";
     repo = "btcpayserver";
     tag = "v${version}";
-    sha256 = "sha256-LOyGNdlU8wvDFmYQ2v1H3Z12++ChVrGM53zBTWCCiCk=";
+    sha256 = "sha256-OK2OqI4h2SLtnGM2Oen5IgmFKqCkd1ZPuXgCOx6Gixs=";
   };
 
   projectFile = "BTCPayServer/BTCPayServer.csproj";

From cc3e21953f0ab0d1b6addbff92d0fc211c239b66 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 20:18:29 +0000
Subject: [PATCH 272/489] python312Packages.hishel: 0.1.1 -> 0.1.2

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

diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix
index bda79ee5f34d..dac2158d8a07 100644
--- a/pkgs/development/python-modules/hishel/default.nix
+++ b/pkgs/development/python-modules/hishel/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "hishel";
-  version = "0.1.1";
+  version = "0.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "karpetrosyan";
     repo = "hishel";
     tag = version;
-    hash = "sha256-V8QiBnOz5l/vjTFf9gKjxth4YsGCYuADlbwiWc7VFds=";
+    hash = "sha256-EaVE70lzjvMqMJlXObz450FwunaPZv86kJCKgI174a8=";
   };
 
   build-system = [
@@ -67,7 +67,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "HTTP Cache implementation for HTTPX and HTTP Core";
     homepage = "https://github.com/karpetrosyan/hishel";
-    changelog = "https://github.com/karpetrosyan/hishel/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/karpetrosyan/hishel/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
   };

From 8c31e3f5cb0176dad2dc387ecbb03e45b85fdb6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 12:50:02 +0000
Subject: [PATCH 273/489] ghq: 1.7.1 -> 1.8.0

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

diff --git a/pkgs/by-name/gh/ghq/package.nix b/pkgs/by-name/gh/ghq/package.nix
index 99e4f3a5aca1..e644d316f253 100644
--- a/pkgs/by-name/gh/ghq/package.nix
+++ b/pkgs/by-name/gh/ghq/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "ghq";
-  version = "1.7.1";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "x-motemen";
     repo = "ghq";
     tag = "v${version}";
-    sha256 = "sha256-5elUUZxhKZArtToEDfjYam7GS6m30GpbBLlUNy6dIyo=";
+    sha256 = "sha256-5BN96/RShfJpkfpJe0qrZVDuyFoAV9kgCiBv4REY/5Y=";
   };
 
   vendorHash = "sha256-jP2Ne/EhmE3tACY1+lHucgBt3VnT4gaQisE3/gVM5Ec=";

From 8fd1ef7eb44820175bbcc05b0a964fb9bc33de4f Mon Sep 17 00:00:00 2001
From: Arthur Gautier <arthur.gautier@arista.com>
Date: Mon, 7 Apr 2025 13:20:47 -0700
Subject: [PATCH 274/489] rpm-sequoia: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/by-name/rp/rpm-sequoia/package.nix b/pkgs/by-name/rp/rpm-sequoia/package.nix
index 57af3f6ffae0..aa28141583e3 100644
--- a/pkgs/by-name/rp/rpm-sequoia/package.nix
+++ b/pkgs/by-name/rp/rpm-sequoia/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rpm-sequoia";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "rpm-sequoia";
     tag = "v${version}";
-    hash = "sha256-AZCsboUv4muKOw5El2Hw5O1cvAgD3JhBppacrQCJT2k=";
+    hash = "sha256-Z2falZxewgMrrAyh8sDlIr9NfCzNs8GA+RHmfNYfzio=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-X+5Ww+cnt08mleA6FzxVGprjIEQVInQPSvTWGjXuGI8=";
+  cargoHash = "sha256-LJyq2gWP/I6+4lArhsWmcAHlub0Ww76jkq2gagP86ao=";
 
   patches = [
     ./objdump.patch

From 3cbe4dca916b2a4d9f87288264638952c628b5c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 19:37:24 +0000
Subject: [PATCH 275/489] pc: 0.4 -> 0.6

---
 pkgs/by-name/pc/pc/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pc/pc/package.nix b/pkgs/by-name/pc/pc/package.nix
index 9abcda1d567b..d8bf35a59b51 100644
--- a/pkgs/by-name/pc/pc/package.nix
+++ b/pkgs/by-name/pc/pc/package.nix
@@ -8,18 +8,24 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pc";
-  version = "0.4";
+  version = "0.6";
 
   src = fetchFromSourcehut {
     owner = "~ft";
     repo = "pc";
     rev = finalAttrs.version;
-    hash = "sha256-fzEDI20o5ROY9n/QRzCW66iCKYaBbI++Taur6EoA0wA=";
+    hash = "sha256-hmFzFaBMb/hqKqc+2hYda1+iowWhs/pC+6LPPhhqzJo=";
   };
 
   nativeBuildInputs = [ byacc ];
   makeFlags = [ "PREFIX=$(out)" ];
 
+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optionals stdenv.hostPlatform.isDarwin [
+      "-Wno-error=implicit-function-declaration"
+    ]
+  );
+
   strictDeps = true;
 
   enableParallelBuilding = true;

From 0d5ceba2c3c84ce8d6d463ecec17be0035c127d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 20:26:53 +0000
Subject: [PATCH 276/489] wasmi: 0.43.0 -> 0.44.0

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

diff --git a/pkgs/by-name/wa/wasmi/package.nix b/pkgs/by-name/wa/wasmi/package.nix
index 3648df610461..f7febba5cbfa 100644
--- a/pkgs/by-name/wa/wasmi/package.nix
+++ b/pkgs/by-name/wa/wasmi/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmi";
-  version = "0.43.0";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "wasmi";
     tag = "v${version}";
-    hash = "sha256-h8eViInYiq0HhdYtqjurOOw93to+J5NsOdFXJYZsl8g=";
+    hash = "sha256-tKUkcuVT2945+pf7qdCgbUYbtiZmfE7tfzRlf8H/GkU=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-f4oN82T/PepntbDsFTugZkYclaeQXMPAxoV7R7gtqf0=";
+  cargoHash = "sha256-1p/cibicoH39+/Xrf28W2jOWK23LVu7L0nnsVDgvIV8=";
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {

From 4ae49051cb02ab0348ce28c9e51895926034ad8f Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 7 Apr 2025 21:27:16 +0100
Subject: [PATCH 277/489] nixos/homebox: allow using UNIX sockets

This is necessary to use PostgreSQL with a local socket.
---
 nixos/modules/services/web-apps/homebox.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/homebox.nix b/nixos/modules/services/web-apps/homebox.nix
index 06c9e05a1e90..69faba644fea 100644
--- a/nixos/modules/services/web-apps/homebox.nix
+++ b/nixos/modules/services/web-apps/homebox.nix
@@ -82,6 +82,7 @@ in
         ProcSubset = "pid";
         ProtectSystem = "strict";
         RestrictAddressFamilies = [
+          "AF_UNIX"
           "AF_INET"
           "AF_INET6"
           "AF_NETLINK"

From fa6c1b73b352f70bbbfc17c5a0c4bb9b6ccf1f66 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Mar 2025 07:43:18 +0000
Subject: [PATCH 278/489] yourkit-java: 2024.9-b164 -> 2025.3-b134

---
 pkgs/by-name/yo/yourkit-java/package.nix | 6 +++---
 pkgs/top-level/all-packages.nix          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix
index 4f9e10a3d812..30e7202c3c2e 100644
--- a/pkgs/by-name/yo/yourkit-java/package.nix
+++ b/pkgs/by-name/yo/yourkit-java/package.nix
@@ -10,7 +10,7 @@
 let
   vPath = v: lib.elemAt (lib.splitString "-" v) 0;
 
-  version = "2024.9-b164";
+  version = "2025.3-b134";
 
   arches = {
     aarch64-linux = "arm64";
@@ -20,8 +20,8 @@ let
   arch = arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system");
 
   hashes = {
-    arm64 = "sha256-tqo9QgIQUg6/OIoX0Cfr4srzPUoySEslNvfusR+IoyM=";
-    x64 = "sha256-L+wj4bAABbo+4Lto+AGR+Aq4fKn26Hg2sN9ATcYhefg=";
+    arm64 = "sha256-n6G04Gf+jIRfamo0B+EAfpNT0YDT0Mt9PTnxItlC06c=";
+    x64 = "sha256-RHGJd3GkP2bA9c/fhfFd9JLFK90mqt5hCbZmN0Ht0jE=";
   };
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f9579f64131..3bb21e64bf6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8928,7 +8928,7 @@ with pkgs;
   };
 
   yourkit-java = callPackage ../by-name/yo/yourkit-java/package.nix {
-    jre = jdk17;
+    jre = jdk21;
   };
 
   yq = python3.pkgs.toPythonApplication python3.pkgs.yq;

From 2830bf83f8f2098bd265ed010e127d9d4392d360 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 7 Apr 2025 21:31:47 +0100
Subject: [PATCH 279/489] nixos/homebox: remove 'network.target' dependency

---
 nixos/modules/services/web-apps/homebox.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/homebox.nix b/nixos/modules/services/web-apps/homebox.nix
index 69faba644fea..e8724dcdd301 100644
--- a/nixos/modules/services/web-apps/homebox.nix
+++ b/nixos/modules/services/web-apps/homebox.nix
@@ -52,7 +52,6 @@ in
       HBOX_MODE = mkDefault "production";
     };
     systemd.services.homebox = {
-      after = [ "network.target" ];
       environment = cfg.settings;
       serviceConfig = {
         User = "homebox";

From 6c0199204091e50340ceac59733acb879533fbf4 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 7 Apr 2025 22:45:24 +0200
Subject: [PATCH 280/489] pythonPackages.dirsearch: fix build

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

diff --git a/pkgs/development/python-modules/dirsearch/default.nix b/pkgs/development/python-modules/dirsearch/default.nix
index 74b97e1f9ce3..f29892dec108 100644
--- a/pkgs/development/python-modules/dirsearch/default.nix
+++ b/pkgs/development/python-modules/dirsearch/default.nix
@@ -102,7 +102,7 @@ buildPythonPackage rec {
   ];
   pythonRemoveDeps = [
     # not available, see above
-    "ntlm-auth"
+    "ntlm_auth"
   ];
   pythonRelaxDeps = [
     # version checker doesn't recognize 0.8.0.rc2 as >=0.7.0
@@ -110,7 +110,7 @@ buildPythonPackage rec {
     # probably not but we don't have old charset-normalizer versions in nixpkgs
     # and requests also depends on it so we can't just override it with an
     # older version due to package duplication
-    "charset-normalizer"
+    "charset_normalizer"
   ];
 
   meta = {

From 134bc9de5348cc783b4cb3283ea9b920d92cf2d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 14:15:35 +0000
Subject: [PATCH 281/489] adminer: 5.1.0 -> 5.1.1

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

diff --git a/pkgs/by-name/ad/adminer/package.nix b/pkgs/by-name/ad/adminer/package.nix
index e6122df922f4..fbda3c4b7897 100644
--- a/pkgs/by-name/ad/adminer/package.nix
+++ b/pkgs/by-name/ad/adminer/package.nix
@@ -8,13 +8,13 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "5.1.0";
+  version = "5.1.1";
   pname = "adminer";
 
   # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file
   src = fetchurl {
     url = "https://github.com/vrana/adminer/releases/download/v${finalAttrs.version}/adminer-${finalAttrs.version}.zip";
-    hash = "sha256-SLu7NJoCkfEL9WhYQSHEx5QZmD6cjkBXpwEnp7d6Elo=";
+    hash = "sha256-L1akLFljp4UW/YEVLi317ijY62WN9L4g+OQ127vUP/4=";
   };
 
   nativeBuildInputs = [

From 9c09962137644dec3fe0969910accc643196b612 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 7 Apr 2025 21:42:18 +0100
Subject: [PATCH 282/489] nixos/homebox: add 'database.createLocally'

---
 nixos/modules/services/web-apps/homebox.nix | 45 +++++++++++++++++----
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/web-apps/homebox.nix b/nixos/modules/services/web-apps/homebox.nix
index e8724dcdd301..132cc874d5c1 100644
--- a/nixos/modules/services/web-apps/homebox.nix
+++ b/nixos/modules/services/web-apps/homebox.nix
@@ -35,6 +35,15 @@ in
         [documentation](https://homebox.software/en/configure-homebox.html).
       '';
     };
+    database = {
+      createLocally = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = ''
+          Configure local PostgreSQL database server for Homebox.
+        '';
+      };
+    };
   };
 
   config = mkIf cfg.enable {
@@ -43,15 +52,37 @@ in
       group = "homebox";
     };
     users.groups.homebox = { };
-    services.homebox.settings = {
-      HBOX_STORAGE_DATA = mkDefault "/var/lib/homebox/data";
-      HBOX_DATABASE_DRIVER = mkDefault "sqlite3";
-      HBOX_DATABASE_SQLITE_PATH = mkDefault "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
-      HBOX_OPTIONS_ALLOW_REGISTRATION = mkDefault "false";
-      HBOX_OPTIONS_CHECK_GITHUB_RELEASE = mkDefault "false";
-      HBOX_MODE = mkDefault "production";
+    services.homebox.settings = lib.mkMerge [
+      (lib.mapAttrs (_: mkDefault) {
+        HBOX_STORAGE_DATA = "/var/lib/homebox/data";
+        HBOX_DATABASE_DRIVER = "sqlite3";
+        HBOX_DATABASE_SQLITE_PATH = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
+        HBOX_OPTIONS_ALLOW_REGISTRATION = "false";
+        HBOX_OPTIONS_CHECK_GITHUB_RELEASE = "false";
+        HBOX_MODE = "production";
+      })
+
+      (lib.mkIf cfg.database.createLocally {
+        HBOX_DATABASE_DRIVER = "postgres";
+        HBOX_DATABASE_HOST = "/run/postgresql";
+        HBOX_DATABASE_USERNAME = "homebox";
+        HBOX_DATABASE_DATABASE = "homebox";
+        HBOX_DATABASE_PORT = toString config.services.postgresql.settings.port;
+      })
+    ];
+    services.postgresql = lib.mkIf cfg.database.createLocally {
+      enable = true;
+      ensureDatabases = [ "homebox" ];
+      ensureUsers = [
+        {
+          name = "homebox";
+          ensureDBOwnership = true;
+        }
+      ];
     };
     systemd.services.homebox = {
+      requires = lib.optional cfg.database.createLocally "postgresql.service";
+      after = lib.optional cfg.database.createLocally "postgresql.service";
       environment = cfg.settings;
       serviceConfig = {
         User = "homebox";

From 52cb257ea6b3da911b134143117d9c7480c4a312 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 7 Apr 2025 21:43:39 +0100
Subject: [PATCH 283/489] nixosTest.homebox: test postgres provisioning

---
 nixos/tests/homebox.nix | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/homebox.nix b/nixos/tests/homebox.nix
index 2d14a153c976..aadcd4269774 100644
--- a/nixos/tests/homebox.nix
+++ b/nixos/tests/homebox.nix
@@ -8,19 +8,36 @@ import ./make-test-python.nix (
     meta = with pkgs.lib.maintainers; {
       maintainers = [ patrickdag ];
     };
-    nodes.machine = {
-      services.homebox = {
-        enable = true;
-        settings.HBOX_WEB_PORT = port;
-      };
-    };
-    testScript = ''
-      machine.wait_for_unit("homebox.service")
-      machine.wait_for_open_port(${port})
+    nodes =
+      let
+        self = {
+          simple = {
+            services.homebox = {
+              enable = true;
+              settings.HBOX_WEB_PORT = port;
+            };
+          };
 
-      machine.succeed("curl --fail -X GET 'http://localhost:${port}/'")
-      out = machine.succeed("curl --fail 'http://localhost:${port}/api/v1/status'")
-      assert '"health":true' in out
+          postgres = {
+            imports = [ self.simple ];
+            services.homebox.database.createLocally = true;
+          };
+        };
+      in
+      self;
+    testScript = ''
+      def test_homebox(node):
+        node.wait_for_unit("homebox.service")
+        node.wait_for_open_port(${port})
+
+        node.succeed("curl --fail -X GET 'http://localhost:${port}/'")
+        out = node.succeed("curl --fail 'http://localhost:${port}/api/v1/status'")
+        assert '"health":true' in out
+
+      test_homebox(simple)
+      simple.send_monitor_command("quit")
+      simple.wait_for_shutdown()
+      test_homebox(postgres)
     '';
   }
 )

From 94778672f7f272b57c6e0e9ec1edd869b9773e5f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 7 Apr 2025 23:53:29 +0200
Subject: [PATCH 284/489] lidarr: add aarch64-darwin support

---
 pkgs/servers/lidarr/default.nix | 3 +++
 pkgs/servers/lidarr/update.sh   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix
index 09f2fd414c53..9d2ca1603f78 100644
--- a/pkgs/servers/lidarr/default.nix
+++ b/pkgs/servers/lidarr/default.nix
@@ -22,6 +22,7 @@ let
       x86_64-linux = "x64";
       aarch64-linux = "arm64";
       x86_64-darwin = "x64";
+      aarch64-darwin = "arm64";
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   hash =
@@ -29,6 +30,7 @@ let
       x64-linux_hash = "sha256-PwHIUbXxk9VOKd+I7EcrTEYlikfw2NUdO6IQdiQWhWs=";
       arm64-linux_hash = "sha256-uu7iVexyss29Q7mZ280KeDLZWp6wwCh+TJj9XeZc/lQ=";
       x64-osx_hash = "sha256-POjIY2iPoYOQQci6AV/7X8t7GGbxVqROjlMzwERH/3c=";
+      arm64-osx_hash = "sha256-JSdiyA0opa4dy5/RTSn/QvnKJ9VCWJcGhTkH5YIi5lg=";
     }
     ."${arch}-${os}_hash";
 in
@@ -79,6 +81,7 @@ stdenv.mkDerivation rec {
       "x86_64-linux"
       "aarch64-linux"
       "x86_64-darwin"
+      "aarch64-darwin"
     ];
   };
 }
diff --git a/pkgs/servers/lidarr/update.sh b/pkgs/servers/lidarr/update.sh
index 0da098f89bed..e87f6888a8dd 100755
--- a/pkgs/servers/lidarr/update.sh
+++ b/pkgs/servers/lidarr/update.sh
@@ -40,3 +40,4 @@ updateVersion $latestVersion
 updateHash $latestVersion x64 linux
 updateHash $latestVersion arm64 linux
 updateHash $latestVersion x64 osx
+updateHash $latestVersion arm64 osx

From f457793bb9eeced95440c4269e1fc044c634df6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 22:13:33 +0000
Subject: [PATCH 285/489] python312Packages.django-cms: 4.1.4 -> 4.1.5

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

diff --git a/pkgs/development/python-modules/django-cms/default.nix b/pkgs/development/python-modules/django-cms/default.nix
index 728585d24e54..bec6596c64a7 100644
--- a/pkgs/development/python-modules/django-cms/default.nix
+++ b/pkgs/development/python-modules/django-cms/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "django-cms";
-  version = "4.1.4";
+  version = "4.1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "django-cms";
     repo = "django-cms";
     tag = version;
-    hash = "sha256-2vA1teV6IkjtDo44uwEts1OGsBZ4dXRFGrasAHmgnRA=";
+    hash = "sha256-XxLg6IkoC/LT6eCeEx8Bd4u2Q63fObD/lv8p1+jhYdw=";
   };
 
   patches = [
@@ -94,7 +94,7 @@ buildPythonPackage rec {
   meta = {
     description = "Lean enterprise content management powered by Django";
     homepage = "https://django-cms.org";
-    changelog = "https://github.com/django-cms/django-cms/releases/tag/${version}";
+    changelog = "https://github.com/django-cms/django-cms/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.onny ];
   };

From 56f65fa2fefa379092db1f04ec2b3d6229d7d92b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 22:35:30 +0000
Subject: [PATCH 286/489] nu_scripts: 0-unstable-2025-03-23 ->
 0-unstable-2025-04-07

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

diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index 59c65eab35af..78018aa4dcc7 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nu_scripts";
-  version = "0-unstable-2025-03-23";
+  version = "0-unstable-2025-04-07";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = pname;
-    rev = "e956708244820d2b98620ef0ed10e63cb7d42b3a";
-    hash = "sha256-fzQ8f6mB7cVRbwVOCxPD/4nFmI3s5mXzJagn8us6ngA=";
+    rev = "b7869a8f337dc64f4d1dbf8f2c7a5833bc3abfbf";
+    hash = "sha256-IoyClULiILl5wPwyf7zzTK5Rb0yEbkVpFRtUSHksrjc=";
   };
 
   installPhase = ''

From 04e44c5dc23338994c64a508e32fd7dda9f8cbcc Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 7 Apr 2025 23:36:52 +0200
Subject: [PATCH 287/489] cnsprcy: fix updateScript

---
 pkgs/by-name/cn/cnsprcy/package.nix | 4 +---
 pkgs/by-name/cn/cnsprcy/update.sh   | 7 +++++++
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100755 pkgs/by-name/cn/cnsprcy/update.sh

diff --git a/pkgs/by-name/cn/cnsprcy/package.nix b/pkgs/by-name/cn/cnsprcy/package.nix
index 2c3ac68857c0..f764b4b162df 100644
--- a/pkgs/by-name/cn/cnsprcy/package.nix
+++ b/pkgs/by-name/cn/cnsprcy/package.nix
@@ -22,9 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-8hNuF5tD1PwdIJB0q3wxDOGDcppo0ac+zol3AHWGv0s=";
 
-  passthru.updateScript = lib.mkUpdateScript {
-    extraFetchers = [ fetchFromSourcehut ];
-  };
+  passthru.updateScript = ./update.sh;
 
   RUSTC_BOOTSTRAP = true;
   buildInputs = [ sqlite ];
diff --git a/pkgs/by-name/cn/cnsprcy/update.sh b/pkgs/by-name/cn/cnsprcy/update.sh
new file mode 100755
index 000000000000..c6ab5fe5ba46
--- /dev/null
+++ b/pkgs/by-name/cn/cnsprcy/update.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-update common-updater-scripts gnused
+
+set -euo pipefail
+
+version=$(list-git-tags --url="https://git.sr.ht/~xaos/cnsprcy" | sed -En 's/^cnspr\/v(.*)/\1/p' | tail -1)
+nix-update cnsprcy --version="$version"

From 9267af0cc66f296cb5b7a52d93150d2923eb1050 Mon Sep 17 00:00:00 2001
From: commiterate <111539270+commiterate@users.noreply.github.com>
Date: Mon, 7 Apr 2025 19:03:55 -0400
Subject: [PATCH 288/489] gitlab-runner: 17.2.0 -> 17.10.1

---
 pkgs/by-name/gi/gitlab-runner/package.nix | 37 +++++++++++++++--------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index bbf6b3592832..30f90db82be6 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "17.2.0";
+  version = "17.10.1";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-a2Igy4DS3fYTvPW1vvDrH/DjMQ4lG9cm/P3mFr+y9s4=";
+    hash = "sha256-pLmDWZHxd9dNhmbcHJRBxPuY0IpcJoXz/fOJeP1lVlA=";
   };
 
-  vendorHash = "sha256-1MwHss76apA9KoFhEU6lYiUACrPMGYzjhds6nTyNuJI=";
+  vendorHash = "sha256-1NteDxcGjsC0kT/9u7BT065EN/rBhaNznegdPHZUKxo=";
 
   # For patchShebangs
   nativeBuildInputs = [ bash ];
@@ -33,32 +33,43 @@ buildGoModule (finalAttrs: {
     ''
       # Remove some tests that can't work during a nix build
 
-      # Requires to run in a git repo
+      # Needs the build directory to be a git repo
       sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go
       sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go
+      rm shells/abstract_test.go
 
       # No writable developer environment
-      rm common/build_test.go
       rm common/build_settings_test.go
+      rm common/build_test.go
       rm executors/custom/custom_test.go
 
-      # No docker during build
-      rm executors/docker/terminal_test.go
+      # No Docker during build
       rm executors/docker/docker_test.go
-      rm helpers/docker/auth/auth_test.go
       rm executors/docker/services_test.go
+      rm executors/docker/terminal_test.go
+      rm helpers/docker/auth/auth_test.go
+
+      # No Kubernetes during build
+      rm executors/kubernetes/feature_test.go
+      rm executors/kubernetes/kubernetes_test.go
+      rm executors/kubernetes/overwrites_test.go
     ''
     + lib.optionalString stdenv.buildPlatform.isDarwin ''
+      # Invalid bind arguments break Unix socket tests
+      sed -i "s/func TestRunnerWrapperCommand_createListener/func OFF_TestRunnerWrapperCommand_createListener/" commands/wrapper_test.go
+
       # No keychain access during build breaks X.509 certificate tests
-      rm helpers/certificate/x509_test.go
-      rm network/client_test.go
+      sed -i "s/func TestCertificate/func OFF_TestCertificate/" helpers/certificate/x509_test.go
+      sed -i "s/func TestClientInvalidSSL/func OFF_TestClientInvalidSSL/" network/client_test.go
     '';
 
   excludedPackages = [
-    # CI helper script for pushing images to Docker and ECR registries
+    # Nested dependency Go module, used with go.mod replace directive
     #
-    # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4139
-    "./scripts/sync-docker-images"
+    # https://gitlab.com/gitlab-org/gitlab-runner/-/commit/57ea9df5d8a8deb78c8d1972930bbeaa80d05e78
+    "./helpers/runner_wrapper/api"
+    # Helper scripts for upstream Make targets, not intended for downstream consumers
+    "./scripts"
   ];
 
   ldflags =

From e2869b813e817b662694bbd3b084c9e2d7c79206 Mon Sep 17 00:00:00 2001
From: Sean Behan <codebam@riseup.net>
Date: Tue, 1 Apr 2025 23:52:49 -0400
Subject: [PATCH 289/489] linux/common-config: SCHED_DEBUG is removed in 6.15

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 08d2291d686c..0c5ee542de44 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -89,7 +89,7 @@ let
       # Easier debugging of NFS issues.
       SUNRPC_DEBUG = yes;
       # Provide access to tunables like sched_migration_cost_ns
-      SCHED_DEBUG = yes;
+      SCHED_DEBUG = whenOlder "6.15" yes;
 
       # Count IRQ and steal CPU time separately
       IRQ_TIME_ACCOUNTING = yes;

From 73bd9906eabab61c180fbb31173b3d6173dddc0f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 1 Apr 2025 19:09:41 +0200
Subject: [PATCH 290/489] synapse-admin: 0.10.0 -> 0.10.3

---
 pkgs/by-name/sy/synapse-admin/package.json |  91 --------------
 pkgs/by-name/sy/synapse-admin/package.nix  | 134 ++++++++++++++++-----
 2 files changed, 104 insertions(+), 121 deletions(-)
 delete mode 100644 pkgs/by-name/sy/synapse-admin/package.json

diff --git a/pkgs/by-name/sy/synapse-admin/package.json b/pkgs/by-name/sy/synapse-admin/package.json
deleted file mode 100644
index 851fba613b30..000000000000
--- a/pkgs/by-name/sy/synapse-admin/package.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "name": "synapse-admin",
-  "version": "0.10.0",
-  "description": "Admin GUI for the Matrix.org server Synapse",
-  "type": "module",
-  "author": "Awesome Technologies Innovationslabor GmbH",
-  "license": "Apache-2.0",
-  "homepage": ".",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Awesome-Technologies/synapse-admin"
-  },
-  "devDependencies": {
-    "@babel/preset-env": "^7.24.4",
-    "@babel/preset-react": "^7.24.1",
-    "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^15.0.2",
-    "@testing-library/user-event": "^14.5.2",
-    "@vitejs/plugin-react": "^4.0.0",
-    "babel-jest": "^29.7.0",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-prettier": "^5.1.3",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-fetch-mock": "^3.0.3",
-    "prettier": "^3.2.5",
-    "react-test-renderer": "^18.2.0",
-    "vite": "^5.0.0",
-    "vite-plugin-version-mark": "^0.0.13"
-  },
-  "dependencies": {
-    "@haleos/ra-language-german": "^1.0.0",
-    "@haxqer/ra-language-chinese": "^4.16.2",
-    "@mui/icons-material": "^5.15.15",
-    "@mui/material": "^5.15.15",
-    "@mui/styles": "^5.15.15",
-    "papaparse": "^5.4.1",
-    "ra-language-farsi": "^4.2.0",
-    "ra-language-french": "^4.16.15",
-    "ra-language-italian": "^3.13.1",
-    "react": "^18.0.0",
-    "react-admin": "^4.16.15",
-    "react-dom": "^18.0.0"
-  },
-  "scripts": {
-    "start": "vite serve",
-    "build": "vite build",
-    "fix:other": "yarn prettier --write",
-    "fix:code": "yarn test:lint --fix",
-    "fix": "yarn fix:code && yarn fix:other",
-    "prettier": "prettier --ignore-path .gitignore \"**/*.{js,jsx,json,md,scss,yaml,yml}\"",
-    "test:code": "jest",
-    "test:lint": "eslint --ignore-path .gitignore --ext .js,.jsx .",
-    "test:style": "yarn prettier --list-different",
-    "test": "yarn test:style && yarn test:lint && yarn test:code"
-  },
-  "babel": {
-    "presets": [
-      "@babel/preset-env",
-      [
-        "@babel/preset-react",
-        {
-          "runtime": "automatic"
-        }
-      ]
-    ]
-  },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
-  "jest": {
-    "testEnvironment": "jsdom",
-    "setupFilesAfterEnv": [
-      "<rootDir>/src/setupTests.js"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
-}
diff --git a/pkgs/by-name/sy/synapse-admin/package.nix b/pkgs/by-name/sy/synapse-admin/package.nix
index 4c2e5bfce656..6142b758f89c 100644
--- a/pkgs/by-name/sy/synapse-admin/package.nix
+++ b/pkgs/by-name/sy/synapse-admin/package.nix
@@ -1,67 +1,141 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
-  fetchYarnDeps,
-  mkYarnPackage,
+  nodejs,
+  yarn-berry,
+  cacert,
+  formats,
   baseUrl ? null,
-  writeShellScriptBin,
 }:
 
-mkYarnPackage rec {
+let
+  config = lib.optionalAttrs (baseUrl != null) { restrictBaseUrl = baseUrl; };
+  configFormat = formats.json { };
+  configFile = configFormat.generate "synapse-admin-config" config;
+in
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "synapse-admin";
-  version = "0.10.0";
+  version = "0.10.3";
+
   src = fetchFromGitHub {
     owner = "Awesome-Technologies";
     repo = "synapse-admin";
-    tag = version;
-    sha256 = "sha256-3MC5PCEwYfZzJy9AW9nHTpvU49Lk6wbYC4Rcv9J9MEg=";
+    tag = finalAttrs.version;
+    hash = "sha256-o2HzGuKjmIeJ+Kxd9KiFWmQgGVtvRdydiQJlr6P0+s8=";
   };
 
-  packageJSON = ./package.json;
+  # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles
+  yarnOfflineCache = stdenv.mkDerivation {
+    pname = "yarn-deps";
+    inherit (finalAttrs) version src;
 
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-vpCwPL1B+hbIaVSHtlkGjPAteu9BFNNmCTE66CSyFkg=";
+    nativeBuildInputs = [ yarn-berry ];
+
+    dontInstall = true;
+
+    env = {
+      YARN_ENABLE_TELEMETRY = 0;
+      NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+    };
+
+    supportedArchitectures = builtins.toJSON {
+      os = [
+        "darwin"
+        "linux"
+      ];
+      cpu = [
+        "arm"
+        "arm64"
+        "ia32"
+        "x64"
+      ];
+      libc = [
+        "glibc"
+        "musl"
+      ];
+    };
+
+    configurePhase = ''
+      runHook preConfigure
+
+      export HOME="$NIX_BUILD_TOP"
+      yarn config set enableGlobalCache false
+      yarn config set cacheFolder $out
+      yarn config set --json supportedArchitectures "$supportedArchitectures"
+
+      runHook postConfigure
+    '';
+
+    buildPhase = ''
+      runHook preBuild
+
+      mkdir -p $out
+      yarn install --immutable --mode skip-build
+
+      runHook postBuild
+    '';
+
+    outputHash = "sha256-hIz+tWaDiq9qslEKjRyNzC0z1zA5TFgVr/hf3/T6YGw=";
+    outputHashMode = "recursive";
   };
 
   nativeBuildInputs = [
-    (writeShellScriptBin "git" "echo ${version}")
+    nodejs
+    yarn-berry
   ];
 
-  NODE_ENV = "production";
-  ${if baseUrl != null then "REACT_APP_SERVER" else null} = baseUrl;
+  env = {
+    NODE_ENV = "production";
+  };
 
-  # error:0308010C:digital envelope routines::unsupported
-  NODE_OPTIONS = "--openssl-legacy-provider";
+  postPatch = ''
+    substituteInPlace vite.config.ts \
+      --replace-fail "git describe --tags" "echo ${finalAttrs.version}"
+  '';
+
+  configurePhase = ''
+    runHook preConfigure
+
+    export HOME="$NIX_BUILD_TOP"
+    yarn config set enableGlobalCache false
+    yarn config set cacheFolder $yarnOfflineCache
+
+    runHook postConfigure
+  '';
 
   buildPhase = ''
     runHook preBuild
 
-    export HOME=$(mktemp -d)
-    yarn --offline run build
+    yarn install --immutable --immutable-cache
+    yarn build
 
     runHook postBuild
   '';
 
-  distPhase = ''
-    runHook preDist
+  installPhase = ''
+    runHook preInstall
 
-    cp -r deps/synapse-admin/dist $out
+    cp -r dist $out
+    cp ${configFile} $out/config.json
 
-    runHook postDist
+    runHook postInstall
   '';
 
-  dontFixup = true;
-  dontInstall = true;
-
-  meta = with lib; {
+  meta = {
     description = "Admin UI for Synapse Homeservers";
     homepage = "https://github.com/Awesome-Technologies/synapse-admin";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    maintainers = with lib.maintainers; [
       mkg20001
       ma27
     ];
   };
-}
+})

From bdcdeb7111490f682ffbdced5e94c996593ac853 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 1 Apr 2025 19:13:54 +0200
Subject: [PATCH 291/489] synapse-admin: add updateScript

---
 pkgs/by-name/sy/synapse-admin/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/sy/synapse-admin/package.nix b/pkgs/by-name/sy/synapse-admin/package.nix
index 6142b758f89c..6fdb92e96d17 100644
--- a/pkgs/by-name/sy/synapse-admin/package.nix
+++ b/pkgs/by-name/sy/synapse-admin/package.nix
@@ -5,6 +5,7 @@
   nodejs,
   yarn-berry,
   cacert,
+  nix-update-script,
   formats,
   baseUrl ? null,
 }:
@@ -123,6 +124,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Admin UI for Synapse Homeservers";
     homepage = "https://github.com/Awesome-Technologies/synapse-admin";

From 7c0b894e3d9d98cdda81ca9eb131708339a77182 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 1 Apr 2025 21:14:48 +0200
Subject: [PATCH 292/489] synapse-admin: add meta.changelog

---
 pkgs/by-name/sy/synapse-admin/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sy/synapse-admin/package.nix b/pkgs/by-name/sy/synapse-admin/package.nix
index 6fdb92e96d17..b7d050e645ef 100644
--- a/pkgs/by-name/sy/synapse-admin/package.nix
+++ b/pkgs/by-name/sy/synapse-admin/package.nix
@@ -129,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Admin UI for Synapse Homeservers";
     homepage = "https://github.com/Awesome-Technologies/synapse-admin";
+    changelog = "https://github.com/Awesome-Technologies/synapse-admin/releases/tag/${finalAttrs.version}";
     license = lib.licenses.asl20;
     platforms = [
       "x86_64-linux"

From 6d3624e305d6de091685cefe214b0df8c3bade5f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 7 Apr 2025 19:34:06 -0400
Subject: [PATCH 293/489] nixVersions.git: Reintroduce

It was removed in 68472b90a670e7fc692b053b51a3ac27d73bc632 because it
was out of date, using the old build system. Now, it is up to date, and
uses the Meson build system and the per-component build.

I am especially keen to get this is because once 2.28 uses the
monolithic build (#393509) out of an abundance of caution, this is will
be the only use of the per-component build, until the next Nix version
(and Nix 2.28 on master after Nixpkgs 25.05 is forked off and released).
---
 pkgs/by-name/ni/nix-plugin-pijul/package.nix    |  1 +
 pkgs/tools/package-management/nix/default.nix   | 15 ++++++++++++++-
 pkgs/tools/package-management/nix/update-all.sh |  6 ++++++
 pkgs/top-level/release-cross.nix                |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
index bd83cecddbd1..c39ef2281118 100644
--- a/pkgs/by-name/ni/nix-plugin-pijul/package.nix
+++ b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
@@ -81,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     {
       stable = localRepoCheck nixVersions.stable;
       latest = localRepoCheck nixVersions.latest;
+      git = localRepoCheck nixVersions.git;
       nix_2_24 = localRepoCheck nixVersions.nix_2_24;
     };
 
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 46b6c6aefe9b..de70aa46badf 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -197,6 +197,20 @@ lib.makeExtensible (
 
       nix_2_28 = addTests "nix_2_28" self.nixComponents_2_28.nix-everything;
 
+      nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
+        version = "2.29pre20250407_${lib.substring 0 8 src.rev}";
+        inherit (self.nix_2_24.meta) maintainers;
+        otherSplices = generateSplicesForNixComponents "nixComponents_git";
+        src = fetchFromGitHub {
+          owner = "NixOS";
+          repo = "nix";
+          rev = "73d3159ba0b4b711c1f124a587f16e2486d685d7";
+          hash = "sha256-9wJXUGqXIqMjNyKWJKCcxrDHM/KxDkvJMwo6S3s+WuM=";
+        };
+      };
+
+      git = addTests "git" self.nixComponents_git.nix-everything;
+
       latest = self.nix_2_28;
 
       # The minimum Nix version supported by Nixpkgs
@@ -234,7 +248,6 @@ lib.makeExtensible (
         nix_2_27 = throw "nix_2_27 has been removed. use nix_2_28.";
 
         unstable = throw "nixVersions.unstable has been removed. use nixVersions.latest or the nix flake.";
-        git = throw "nixVersions.git has been removed. use nixVersions.latest or the nix flake.";
       }
     )
   )
diff --git a/pkgs/tools/package-management/nix/update-all.sh b/pkgs/tools/package-management/nix/update-all.sh
index 547721d8b392..a2b459e67e7f 100755
--- a/pkgs/tools/package-management/nix/update-all.sh
+++ b/pkgs/tools/package-management/nix/update-all.sh
@@ -36,3 +36,9 @@ for name in $nix_versions; do
         break
     fi
 done
+
+commit_json=$(curl -s https://api.github.com/repos/NixOS/nix/commits/master) # format: 2024-11-01T10:18:53Z
+date_of_commit=$(echo "$commit_json" | jq -r '.commit.author.date')
+suffix="pre$(date -d "$date_of_commit" +%Y%m%d)_"
+sed -i -e "s|\"pre[0-9]\{8\}_|\"$suffix|g" "$SCRIPT_DIR/default.nix"
+nix-update --override-filename "$SCRIPT_DIR/default.nix" --version branch --build --commit "nixVersions.git"
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index f15758260d33..340c8b92f133 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -79,6 +79,7 @@ let
     gmp = nativePlatforms;
     libcCross = nativePlatforms;
     nix = nativePlatforms;
+    nixVersions.git = nativePlatforms;
     mesa = nativePlatforms;
     rustc = nativePlatforms;
     cargo = nativePlatforms;

From b429401c30b208f5ebd40f70425f323a69cc366a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 23:37:51 +0000
Subject: [PATCH 294/489] pixi-pack: 0.3.3 -> 0.5.0

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

diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix
index 99a30c51a70c..059c581e9cac 100644
--- a/pkgs/by-name/pi/pixi-pack/package.nix
+++ b/pkgs/by-name/pi/pixi-pack/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pixi-pack";
-  version = "0.3.3";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "Quantco";
     repo = "pixi-pack";
     tag = "v${version}";
-    hash = "sha256-Yf0ewDGDYpdl/tk4qvhKTbFmnGceqTJFv0bExL7N9AE=";
+    hash = "sha256-th7hlxjnar9VoWINpxblzUGbxxz8hPKmLERd1y+mHKY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-W8C3d+2KYgPwb5zyC59cdUC79W9Ho4gX4McKm/xtWjU=";
+  cargoHash = "sha256-AEqhJWztOI4byViex4d0m85wBlGGYMykPNjgUfPAt6Q=";
 
   buildInputs = [ openssl ];
 

From 4ecab764cf6e1f3c51eeb206a6d923c6a07c7a7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 23:39:28 +0000
Subject: [PATCH 295/489] starsector: 0.98a-RC5 -> 0.98a-RC7

---
 pkgs/games/starsector/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix
index 4787cefc379b..fe6621ab0468 100644
--- a/pkgs/games/starsector/default.nix
+++ b/pkgs/games/starsector/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "starsector";
-  version = "0.98a-RC5";
+  version = "0.98a-RC7";
 
   src = fetchzip {
     url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip";
-    sha256 = "sha256-otssjDpc4FjhTjS2A/JttlglJtMNVyDfhyTv9X+NiX0=";
+    sha256 = "sha256-qA4/9AvRWBOIbNKA9U8U7PoPmIwz8wgJZyYFln7LZHw=";
   };
 
   nativeBuildInputs = [

From 1033d92c02a3f34630431fc13abecabed5945ce1 Mon Sep 17 00:00:00 2001
From: emaryn <197520219+emaryn@users.noreply.github.com>
Date: Mon, 7 Apr 2025 23:57:17 +0000
Subject: [PATCH 296/489] flutter324: 3.24.4 -> 3.24.5

---
 .../compilers/flutter/versions/3_24/data.json | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/compilers/flutter/versions/3_24/data.json b/pkgs/development/compilers/flutter/versions/3_24/data.json
index 021ec288e0e3..5111395d5990 100644
--- a/pkgs/development/compilers/flutter/versions/3_24/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_24/data.json
@@ -1,17 +1,17 @@
 {
-  "version": "3.24.4",
-  "engineVersion": "db49896cf25ceabc44096d5f088d86414e05a7aa",
+  "version": "3.24.5",
+  "engineVersion": "a18df97ca57a249df5d8d68cd0820600223ce262",
   "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",
   "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
   "channel": "stable",
   "engineHashes": {
     "aarch64-linux": {
-      "aarch64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=",
-      "x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU="
+      "aarch64-linux": "sha256-tHdbyDs02+iJiWOynLEWXIiYVmdpkxRTbrfMljjKwG8=",
+      "x86_64-linux": "sha256-tHdbyDs02+iJiWOynLEWXIiYVmdpkxRTbrfMljjKwG8="
     },
     "x86_64-linux": {
-      "aarch64-linux": "sha256-aQK3uD8n/V1ZH5+RbCNVZ1Fxx0Z33y5IEG4B0MVKh58=",
-      "x86_64-linux": "sha256-aQK3uD8n/V1ZH5+RbCNVZ1Fxx0Z33y5IEG4B0MVKh58="
+      "aarch64-linux": "sha256-R0BROAR1KIJvA4CZRBMbUU6zN3sL8I/F8LFZrdaTJ/Q=",
+      "x86_64-linux": "sha256-R0BROAR1KIJvA4CZRBMbUU6zN3sL8I/F8LFZrdaTJ/Q="
     }
   },
   "dartVersion": "3.5.4",
@@ -21,13 +21,13 @@
     "x86_64-darwin": "sha256-9BJL3FjwmPbJw2pdiXH0EjPqjaYavzxt6ohyNKAeyOg=",
     "aarch64-darwin": "sha256-tebVH1N2VtPnyecH6wYyptkE0xjINpPv/mvKgaucBHk="
   },
-  "flutterHash": "sha256-ykR2ul5JWEvopTMqXvRCAfqZ8ZlirNu0txVczWc/Nvg=",
+  "flutterHash": "sha256-9aA0HU/c32ixhnqAGwm1v87uDnYhNbe5laFbed1XPw8=",
   "artifactHashes": {
     "android": {
-      "aarch64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=",
-      "aarch64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo=",
-      "x86_64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=",
-      "x86_64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo="
+      "aarch64-darwin": "sha256-4jeSa003DWoixXx+x1OgNKaIqfQV85en9rJmC1lZ/tQ=",
+      "aarch64-linux": "sha256-3FQ4Q0IKSMvsgmvuoJGHeZaveuTgyMrW65V23F3aZNk=",
+      "x86_64-darwin": "sha256-4jeSa003DWoixXx+x1OgNKaIqfQV85en9rJmC1lZ/tQ=",
+      "x86_64-linux": "sha256-3FQ4Q0IKSMvsgmvuoJGHeZaveuTgyMrW65V23F3aZNk="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
@@ -36,38 +36,38 @@
       "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
     },
     "ios": {
-      "aarch64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=",
-      "aarch64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=",
-      "x86_64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=",
-      "x86_64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E="
+      "aarch64-darwin": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=",
+      "aarch64-linux": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=",
+      "x86_64-darwin": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=",
+      "x86_64-linux": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM="
     },
     "linux": {
-      "aarch64-darwin": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=",
-      "aarch64-linux": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=",
-      "x86_64-darwin": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM=",
-      "x86_64-linux": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM="
+      "aarch64-darwin": "sha256-Wrb6UhaPBYxkoESi1TXu2KtzBo7VKnagfNbTMmcKNC0=",
+      "aarch64-linux": "sha256-Wrb6UhaPBYxkoESi1TXu2KtzBo7VKnagfNbTMmcKNC0=",
+      "x86_64-darwin": "sha256-mY+duJmrVIGjazfXs5hJIFswev4Yhw2FIzfwcGbFKig=",
+      "x86_64-linux": "sha256-mY+duJmrVIGjazfXs5hJIFswev4Yhw2FIzfwcGbFKig="
     },
     "macos": {
-      "aarch64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=",
-      "aarch64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=",
-      "x86_64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=",
-      "x86_64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w="
+      "aarch64-darwin": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=",
+      "aarch64-linux": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=",
+      "x86_64-darwin": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=",
+      "x86_64-linux": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k="
     },
     "universal": {
-      "aarch64-darwin": "sha256-SVrhfvGunkEKraIapt2PcNr4VzWI9d5DYMwkE82hKC8=",
-      "aarch64-linux": "sha256-N4/BCd8JTXqMdfX65IhKlZo7EK88t0I47QVoqdlOg7s=",
-      "x86_64-darwin": "sha256-GdBinxPZHgYZdmHvtcT9+qPGadZKqWTOIHJcIJwN2rU=",
-      "x86_64-linux": "sha256-a/AMUZC3n4e/TAquu076vXq+4cuODYJyvIrayTw4o5U="
+      "aarch64-darwin": "sha256-o2dT/b6mWm34I3uGrrONVljGr6ApH6oOJbhTuUHQ664=",
+      "aarch64-linux": "sha256-M78yC1x+LXBnvTNogC6xrQ1QM+wu5hxMna5Ii50HcMA=",
+      "x86_64-darwin": "sha256-4Gx4SPvm+kJnDUJSA5DmYuMluhNp3qulA+dkM+XkDVY=",
+      "x86_64-linux": "sha256-AM8fDpGb4BLl/xbvq5IjXZqrtrUTW340WqUGAPguep8="
     },
     "web": {
-      "aarch64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=",
-      "aarch64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=",
-      "x86_64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=",
-      "x86_64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g="
+      "aarch64-darwin": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=",
+      "aarch64-linux": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=",
+      "x86_64-darwin": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=",
+      "x86_64-linux": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0="
     },
     "windows": {
-      "x86_64-darwin": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI=",
-      "x86_64-linux": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI="
+      "x86_64-darwin": "sha256-ReMOUrSsbXSpRb8tidGootba6p+q+JCvyG5yKU8e20I=",
+      "x86_64-linux": "sha256-ReMOUrSsbXSpRb8tidGootba6p+q+JCvyG5yKU8e20I="
     }
   },
   "pubspecLock": {

From a9691ce732e26df12f0f2cbe4a91dc9f3d375527 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 8 Apr 2025 02:25:09 +0200
Subject: [PATCH 297/489] music-assistant: yank broken airplay support

The source build ships with native musl binaries that segfault after
being patchelf'd. In addition, it supports no dynamic linking and depends
on OpenSSL 1.1, which is a non-starter.
---
 pkgs/by-name/mu/music-assistant/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index d518bb0a0a24..1fee9eac799a 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -42,6 +42,10 @@ let
   pythonPath = python.pkgs.makePythonPath providerDependencies;
 in
 
+assert
+  (lib.elem "airplay" providers)
+  -> throw "music-assistant: airplay support is missing libraop, a library we will not package because it depends on OpenSSL 1.1.";
+
 python.pkgs.buildPythonApplication rec {
   pname = "music-assistant";
   version = "2.5.0";
@@ -154,6 +158,11 @@ python.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "music_assistant" ];
 
+  postFixup = ''
+    # binary native code, segfaults when autopatchelf'd, requires openssl 1.1 to build
+    rm $out/${python3.sitePackages}/music_assistant/providers/airplay/bin/cliraop-*
+  '';
+
   passthru = {
     inherit
       python

From b1643d661a9a2d70168d6d7b722d1fe74dd3e283 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 00:39:18 +0000
Subject: [PATCH 298/489] alioth: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix
index 72c325b8297f..8ddb7c933f52 100644
--- a/pkgs/by-name/al/alioth/package.nix
+++ b/pkgs/by-name/al/alioth/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "alioth";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "alioth";
     tag = "v${version}";
-    hash = "sha256-CQYh/F7eGk94dsXP7j3udhhBReYBvV6D8nzK/3VicwU=";
+    hash = "sha256-xFNX2cxmaw2H8D21qs6mnTMuSidmJ0xJ/b4pxdLTvow=";
   };
 
   # Checks use `debug_assert_eq!`
   checkType = "debug";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-kW76EBlpzeSmIhW5UsYjPYp5KeH2mPuf3aAiTSM06g4=";
+  cargoHash = "sha256-x2Abw/RVKpPx0EWyF3w0kywtd23A+NSNaHRVZ4oB1jI=";
 
   separateDebugInfo = true;
 

From cc02c9ee3324a3091804ab0dd3e9148d31a3ab10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 00:49:32 +0000
Subject: [PATCH 299/489] github-mcp-server: 0.1.0 -> 0.1.1

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

diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index 45d487615bf9..d140654911b9 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "github-mcp-server";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "github-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LpD4zLAeLFod7sCNvBW8u9Wk0lL75OmlRXZqpQsQMOs=";
+    hash = "sha256-cIS6awIzGadeDdIfSmHKlL9NhouZwQAND7Au8zz0HJA=";
   };
 
-  vendorHash = "sha256-YqjcPP4elzdwEVvYUcFBoPYWlFzeT+q2+pxNzgj1X0Q=";
+  vendorHash = "sha256-eBKTnuJk705oE//ejdwu/hi1hq8N88C6e4dEkKuM+5g=";
 
   ldflags = [
     "-s"

From f93579f9732030bccc1fc1b3aaadaa9d36c8c788 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 01:23:25 +0000
Subject: [PATCH 300/489] cloudlist: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix
index 737e24e42554..74372b7a2ae0 100644
--- a/pkgs/by-name/cl/cloudlist/package.nix
+++ b/pkgs/by-name/cl/cloudlist/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "cloudlist";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cloudlist";
     tag = "v${version}";
-    hash = "sha256-HYCD7mCfIJOijKTPvL5OixZ6zmI/P/+0Agx9bBhxy0Y=";
+    hash = "sha256-xCGGyPfD6cQgVTowh8ZO9Ak3xH5Hct51Vm18FJWLF1E=";
   };
 
-  vendorHash = "sha256-fZ7l4+No/a8EYqC1nacSyh5fD2QAdzANjTTmbY0d/L4=";
+  vendorHash = "sha256-PW9Yu8d5PPIL6cc692N8e5qO73drEgfu7JrVeihggcs=";
 
   subPackages = [ "cmd/cloudlist/" ];
 

From 34b52464cc8f90c774ec18df016ba845add3da33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 01:25:24 +0000
Subject: [PATCH 301/489] jql: 8.0.4 -> 8.0.5

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

diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix
index c99ebe9e3c4d..3de35f8e43a2 100644
--- a/pkgs/by-name/jq/jql/package.nix
+++ b/pkgs/by-name/jq/jql/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jql";
-  version = "8.0.4";
+  version = "8.0.5";
 
   src = fetchFromGitHub {
     owner = "yamafaktory";
     repo = "jql";
     rev = "jql-v${version}";
-    hash = "sha256-J+Zqmfev2DyD0SLFGaI0egVgmEC+a2nqBrNDGX4zNnE=";
+    hash = "sha256-0sQEC2kUnuuKp73DJsNBFB0VL0rkBkudmr7ZQpS1v04=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-tMxy0bi3518VjzJuy4Agpq+UydMEyJRqavX5kIsBYjY=";
+  cargoHash = "sha256-10eM7tczFoQVYagyP1btsCp4PHm+zRoh2oAEVVxsROA=";
 
   meta = with lib; {
     description = "JSON Query Language CLI tool built with Rust";

From ab9d81ee014151de9c205f4834cd10771b6ca4ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 01:51:31 +0000
Subject: [PATCH 302/489] parca-agent: 0.36.0 -> 0.37.0

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

diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix
index 001611316e0f..8de28d987633 100644
--- a/pkgs/by-name/pa/parca-agent/package.nix
+++ b/pkgs/by-name/pa/parca-agent/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "parca-agent";
-  version = "0.36.0";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca-agent";
     tag = "v${version}";
-    hash = "sha256-06TrG4cDf5RjwScIhX4zEjcx4zlFCjnWySpZHmaXT7E=";
+    hash = "sha256-U9Yomvw4bqKrrd9kMHmjV6kt7gLdkFHI+0iCJ0IRJSw=";
     fetchSubmodules = true;
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-6PD2qd0Qeqb1yQiQcOw0nRX6lWjLsWcLDTlmbz0T5+k=";
+  vendorHash = "sha256-hG6dM94gidbDNPY7I8gh1Nt8F3oQelzNIyfDsuNe5y8=";
 
   buildInputs = [
     stdenv.cc.libc.static

From 1a8255357129df965e8deab79af0c854f43966fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 02:08:04 +0000
Subject: [PATCH 303/489] mieru: 3.13.0 -> 3.13.1

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index eff21c563892..393045e5ff2b 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mieru";
-  version = "3.13.0";
+  version = "3.13.1";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${version}";
-    hash = "sha256-Hy5Uy6lC3d8N2lsnGLrcN/D5/eiycp7X7h6V8vo3tPA=";
+    hash = "sha256-jZvF0vagzQRhw2vPhY61/ayki/gneG66e2MPBaqwlyk=";
   };
 
   vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

From 9846bd6158beb891c8760a3fbd0c2f91c4e7e7d5 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Mon, 7 Apr 2025 19:10:34 -0700
Subject: [PATCH 304/489] claude-code: 0.2.62 -> 0.2.65

---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 56560fe90f17..fa3dbcc79939 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^0.2.62"
+        "@anthropic-ai/claude-code": "^0.2.65"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "0.2.62",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.62.tgz",
-      "integrity": "sha512-Mod9/kbqKy344lm5YmDJLn8dR3HYlA2zGCQy4exU7hmECNqg3KlTAz8u4O4YdiRMxXeUJ3Izi9YSJUT7oZOKdg==",
+      "version": "0.2.65",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.65.tgz",
+      "integrity": "sha512-LCxFb/WeHoHfVhQfEQGbGlFURYCm5Brcff4GHD+lVX2N3GtexLTcf0iXElAYz3S2vlWX9km8nGVfB/Yd/ieVUw==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index d7dc872039d9..e6a2c8022be6 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "0.2.62";
+  version = "0.2.65";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-O6jkpx3OxEh/npZjyJb+osoeJrG+HZ6NRB9T4EMkdf8=";
+    hash = "sha256-4YFdDEpKi7agSqJUetcItqElec5VD0uQARwDSsh1S8o=";
   };
 
-  npmDepsHash = "sha256-tVA4VbPaPc+KwZzUK0QI9In3QSXXoELaNM2U65wxGGA=";
+  npmDepsHash = "sha256-157BP/8DfEBE2dhOYj3CGzlV7M2EE44L0Zr0qwAQoQw=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json
@@ -24,8 +24,7 @@ buildNpmPackage rec {
   AUTHORIZED = "1";
 
   # `claude-code` tries to auto-update by default, this disables that functionality.
-  # Note that the `DISABLE_AUTOUPDATER` environment variable is not documented, so this trick may
-  # not continue to work.
+  # https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview#environment-variables
   postInstall = ''
     wrapProgram $out/bin/claude \
       --set DISABLE_AUTOUPDATER 1

From 5bc10be4b9f24a3360b8be38e1889e3c79d18275 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 02:41:09 +0000
Subject: [PATCH 305/489] python312Packages.twilio: 9.5.1 -> 9.5.2

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

diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index fd83e5e252ba..4b7b59fc1209 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "9.5.1";
+  version = "9.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "twilio";
     repo = "twilio-python";
     tag = version;
-    hash = "sha256-qmXvs9CjHjkd/DsbqMPA90wCDiS+pMwaHXCRBUNnv30=";
+    hash = "sha256-zHy/EqoWuQ3fZuA8wqatmcg+YwQB7w+kAGTWY453PnY=";
   };
 
   build-system = [ setuptools ];
@@ -70,7 +70,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Twilio API client and TwiML generator";
     homepage = "https://github.com/twilio/twilio-python/";
-    changelog = "https://github.com/twilio/twilio-python/blob/${version}/CHANGES.md";
+    changelog = "https://github.com/twilio/twilio-python/blob/${src.tag}/CHANGES.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From acbadea016b9645ffc002f493161e1ba818f4b38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 02:49:42 +0000
Subject: [PATCH 306/489] elasticsearch-curator: 8.0.20 -> 8.0.21

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

diff --git a/pkgs/by-name/el/elasticsearch-curator/package.nix b/pkgs/by-name/el/elasticsearch-curator/package.nix
index ceb56e9b4d12..ab135355eba8 100644
--- a/pkgs/by-name/el/elasticsearch-curator/package.nix
+++ b/pkgs/by-name/el/elasticsearch-curator/package.nix
@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "elasticsearch-curator";
-  version = "8.0.20";
+  version = "8.0.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "curator";
     tag = "v${version}";
-    hash = "sha256-oeQ36CvR/v0Mvo+aGL+dYHTgEsq9TesZoBMdoePmgnI=";
+    hash = "sha256-yVOZBz4AJNjmpxRp3t03KwDzp/3W8uJiHwuSRJbfLvk=";
   };
 
   pythonRelaxDeps = [ "es-client" ];

From 6afc61c612885b9dfdf594f34b0558471f3afbca Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 8 Apr 2025 04:07:18 +0000
Subject: [PATCH 307/489] nano: fix cross compilation, enable strictDeps

---
 pkgs/by-name/na/nano/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix
index a421c33c44d7..d0b543fa0a37 100644
--- a/pkgs/by-name/na/nano/package.nix
+++ b/pkgs/by-name/na/nano/package.nix
@@ -46,11 +46,15 @@ stdenv.mkDerivation rec {
     "info"
   ];
 
-  configureFlags = [
-    "--sysconfdir=/etc"
-    (lib.enableFeature enableNls "nls")
-    (lib.enableFeature enableTiny "tiny")
-  ];
+  configureFlags =
+    [
+      "--sysconfdir=/etc"
+      (lib.enableFeature enableNls "nls")
+      (lib.enableFeature enableTiny "tiny")
+    ]
+    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+      "gl_cv_func_strcasecmp_works=yes"
+    ];
 
   postInstall =
     if enableTiny then
@@ -61,6 +65,7 @@ stdenv.mkDerivation rec {
       '';
 
   enableParallelBuilding = true;
+  strictDeps = true;
 
   passthru = {
     tests = {

From 48664ba4602c916126efef13fb446c3c554d0c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 8 Apr 2025 04:59:41 +0000
Subject: [PATCH 308/489] dbeaver-bin: 25.0.1 -> 25.0.2

---
 pkgs/by-name/db/dbeaver-bin/package.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index fac1601d14d8..d2c418761f1b 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -17,7 +17,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbeaver-bin";
-  version = "25.0.1";
+  version = "25.0.2";
 
   src =
     let
@@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-p4bVQxP5dazNPSGJN6tu2rsowLf5VPJN30W+q8HiUNM=";
-        aarch64-linux = "sha256-3vrJOqC5szOWcj/oDg3uc1BND5vfbMRR+MNTDcG4vk8=";
-        x86_64-darwin = "sha256-bu67Tz8awAQ69inY2s330g2qPan2tRLWImeYx9HB3tU=";
-        aarch64-darwin = "sha256-3TnswzRm3l7egoZttaOBSfO0aGasD56dOndMZ0howDI=";
+        x86_64-linux = "sha256-UmTy4Flxz/zIh3cLxRi7EhNDf0Ojc7fuzCbRKIE/+CQ=";
+        aarch64-linux = "sha256-I+V/2kfdxGx8zNkH98b2685IQPbVPSe9++qS4QEg0LU=";
+        x86_64-darwin = "sha256-8Qf69OHXPiqdMs//f1jbKbyKoll+oX+P+l3mpdOvraI=";
+        aarch64-darwin = "sha256-bGxn8y9hvJyqj1/i5tScufO5/ZjdlOlPChmeL+DWwoY=";
       };
     in
     fetchurl {
@@ -89,10 +89,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           }"
 
         mkdir -p $out/share/icons/hicolor/256x256/apps
-        # for some reason it's missing from the aarch64 build
-        if [ -e $out/opt/dbeaver/dbeaver.png ]; then
-          ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png
-        fi
+        ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png
 
         mkdir -p $out/share/applications
         ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop

From 506ad02a5c6356661fb5bb8ae3cb844ffab43455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 7 Apr 2025 22:09:01 -0700
Subject: [PATCH 309/489] libdeltachat: 1.158.0 -> 1.159.0

Diff: https://github.com/chatmail/core/compare/refs/tags/v1.158.0...v1.159.0

Changelog: https://github.com/chatmail/core/blob/v1.159.0/CHANGELOG.md
---
 pkgs/by-name/li/libdeltachat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index fce99820962a..95822525c670 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.158.0";
+  version = "1.159.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${version}";
-    hash = "sha256-0po4nPCunq9cBaVFSsS1uo18dv6Y6IHGzL1zC2zwXdI=";
+    hash = "sha256-Pdrb2A4OhW2+XsBuwTQfIjZms9byaMg/KV2fGWD35/w=";
   };
 
   patches = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "deltachat-core-rust";
     inherit version src;
-    hash = "sha256-k8TN6YtCVPR8RnFoiGX9APvKwpQzj7T53DlKMD9r/e0=";
+    hash = "sha256-5xihycfIdZ/DINoKZ7kiRB46xKyEB4aAQz2OkejoXJc=";
   };
 
   nativeBuildInputs =

From eb63ed5b3fe75056f9450ba04838bc3d8e957d22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 05:43:35 +0000
Subject: [PATCH 310/489] simdutf: 6.2.1 -> 6.4.2

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

diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index 29c51230a730..37c97a8ba41b 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "6.2.1";
+  version = "6.4.2";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-nWJOqMCP75E9E0fZ63OILroDS4bUMrJPM7h2IQ0K+aU=";
+    hash = "sha256-at1MBvbsgu7Z7UJQqVaakT1Ux16jJVP5JSVubrqF7VY=";
   };
 
   # Fix build on darwin

From ba203306d81dee3a786bdfc91c24559b0bee89fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 05:52:33 +0000
Subject: [PATCH 311/489] stac-validator: 3.5.0 -> 3.6.0

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

diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix
index 9abb9da75c03..d00bce066590 100644
--- a/pkgs/by-name/st/stac-validator/package.nix
+++ b/pkgs/by-name/st/stac-validator/package.nix
@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "stac-validator";
-  version = "3.5.0";
+  version = "3.6.0";
   pyproject = true;
   disabled = python3Packages.pythonOlder "3.8";
 
@@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec {
     owner = "stac-utils";
     repo = "stac-validator";
     tag = "v${version}";
-    hash = "sha256-/MConEN+fcY3JKqP/24k0l/m2FHNhIqG7k42ldSPZ1U=";
+    hash = "sha256-j29Bo8n+/85fzJtif0eWYxDP86k9n4Osl9/piWmTxSs=";
   };
 
   build-system = [ python3Packages.setuptools ];

From e2d520205eba568131d882593aebca941763574f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 06:34:49 +0000
Subject: [PATCH 312/489] mpvScripts.twitch-chat: 0-unstable-2024-06-23 ->
 0-unstable-2025-03-30

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

diff --git a/pkgs/applications/video/mpv/scripts/twitch-chat.nix b/pkgs/applications/video/mpv/scripts/twitch-chat.nix
index cdcadf2f9ead..bf6eab70d187 100644
--- a/pkgs/applications/video/mpv/scripts/twitch-chat.nix
+++ b/pkgs/applications/video/mpv/scripts/twitch-chat.nix
@@ -7,13 +7,13 @@
 }:
 buildLua {
   pname = "twitch-chat";
-  version = "0-unstable-2024-06-23";
+  version = "0-unstable-2025-03-30";
 
   src = fetchFromGitHub {
     owner = "CrendKing";
     repo = "mpv-twitch-chat";
-    rev = "bb0c2e84675f4f1e0c221c8e1d3516b60242b985";
-    hash = "sha256-lnWYcr49koI60Su85OWbcxrARWTfXW2zIvfCZ6c3GtI=";
+    rev = "97c94ae58b4a898067b9c63c477716280327d8e1";
+    hash = "sha256-KjlzVuj47zos2RQHbveijsyJoN2f7VGBboWolISom7M=";
 
     postFetch = "rm $out/screenshot.webp";
   };

From a6d91cd3f8238f6c36109661ba7b6f03425c567a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 06:35:48 +0000
Subject: [PATCH 313/489] airwindows: 0-unstable-2025-03-23 ->
 0-unstable-2025-04-06

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

diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index 1d324fa7e43d..3703b3b04c2d 100644
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2025-03-23";
+  version = "0-unstable-2025-04-06";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "9de336a436cb5ea1e47a319947acb1ea44cede6e";
-    hash = "sha256-gI5dmI5ysoCmUBTL6CgUw+F/K8D4RbXlXNTpIJMbotk=";
+    rev = "d109d6b9948449a883a9694d3f5aa8702a57f56b";
+    hash = "sha256-4yXcPedz5wYqAiLyF5Cgc/DH4jjfJGSLv4qDyIJW4x0=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables

From 94492d91e9da931cf833200c12f8d773bc4f38d0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 8 Apr 2025 08:46:30 +0200
Subject: [PATCH 314/489] cpplint: 2.0.1 -> 2.0.2

Diff: https://github.com/cpplint/cpplint/compare/refs/tags/2.0.1...refs/tags/2.0.2

Changelog: https://github.com/cpplint/cpplint/releases/tag/2.0.2
---
 pkgs/by-name/cp/cpplint/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix
index de9cff77feab..20fc80c99e5f 100644
--- a/pkgs/by-name/cp/cpplint/package.nix
+++ b/pkgs/by-name/cp/cpplint/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "cpplint";
-  version = "2.0.1";
+  version = "2.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cpplint";
     repo = "cpplint";
     tag = version;
-    hash = "sha256-IM1XznnpdL1Piei9kKR1nCwfs7TVgLcTgMI4r+cQXLg=";
+    hash = "sha256-4crTuqynQt8Nyjqea6DpREtLy7ydRF0hNVnc7tUnO1k=";
   };
 
   # We use pytest-cov-stub instead

From 3640e17ca3376d8916bb66ccee545ac4be8f7403 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 06:55:04 +0000
Subject: [PATCH 315/489] icloudpd: 1.27.1 -> 1.27.2

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

diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix
index 22e540f1182c..a7e1c389581d 100644
--- a/pkgs/by-name/ic/icloudpd/package.nix
+++ b/pkgs/by-name/ic/icloudpd/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "icloudpd";
-  version = "1.27.1";
+  version = "1.27.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "icloud-photos-downloader";
     repo = "icloud_photos_downloader";
     tag = "v${version}";
-    hash = "sha256-gJ1Vx0p8GiJ4esJuOanojlCHvqzOz8ttgAVn6idrLPM=";
+    hash = "sha256-XRQadI2NCtjJ02uRoigDP92TmfAUoItmG42fM3QE6kI=";
   };
 
   pythonRelaxDeps = true;

From a19cd4ffb1f4b953a76f3ac29c6520d0b1877108 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Tue, 8 Apr 2025 02:51:45 -0400
Subject: [PATCH 316/489] Revert "treewide: replace `rev` with `tag`"

This reverts commit 65a333600d5c88a98d674f637d092807cfc12253.

This wasn't tested for correctness with something like fodwatch [0],
and should not have been (self-)merged so quickly, especially without
further review.

It also resulted in the breakage of at least one package [1] (and that's
the one we know of and was caught).

A few packages that were updated in between this commit and this revert
were not reverted back to using `rev`, but other than that, this is a
1:1 revert.

[0]: https://codeberg.org/raphaelr/fodwatch
[1]: https://github.com/NixOS/nixpkgs/pull/396904 / 758551e4587d75882aebc21a04bee960418f8ce9
---
 doc/languages-frameworks/crystal.section.md   |  4 +-
 doc/languages-frameworks/dart.section.md      |  2 +-
 doc/languages-frameworks/dlang.section.md     |  2 +-
 doc/languages-frameworks/go.section.md        |  2 +-
 .../javascript.section.md                     |  2 +-
 doc/languages-frameworks/rust.section.md      |  6 +-
 doc/languages-frameworks/swift.section.md     |  2 +-
 nixos/tests/dokuwiki.nix                      |  2 +-
 pkgs/applications/audio/airwave/default.nix   |  2 +-
 pkgs/applications/audio/ardour/7.nix          |  2 +-
 pkgs/applications/audio/ardour/default.nix    |  2 +-
 .../audio/bucklespring/default.nix            |  2 +-
 pkgs/applications/audio/cmus/default.nix      |  2 +-
 .../audio/codecserver/default.nix             |  2 +-
 .../audio/csound/csound-qt/default.nix        |  2 +-
 pkgs/applications/audio/deadbeef/default.nix  |  2 +-
 .../audio/deadbeef/plugins/headerbar-gtk3.nix |  2 +-
 .../audio/deadbeef/plugins/mpris2.nix         |  2 +-
 .../audio/deadbeef/plugins/statusnotifier.nix |  2 +-
 pkgs/applications/audio/dfasma/default.nix    |  2 +-
 .../audio/easyaudiosync/default.nix           |  2 +-
 pkgs/applications/audio/espeak-ng/default.nix |  2 +-
 pkgs/applications/audio/faust/faust2.nix      |  2 +-
 pkgs/applications/audio/faust/faustlive.nix   |  2 +-
 pkgs/applications/audio/flacon/default.nix    |  2 +-
 pkgs/applications/audio/fmit/default.nix      |  2 +-
 pkgs/applications/audio/ft2-clone/default.nix |  2 +-
 .../applications/audio/grandorgue/default.nix |  2 +-
 pkgs/applications/audio/hydrogen/default.nix  |  2 +-
 pkgs/applications/audio/jackmix/default.nix   |  2 +-
 pkgs/applications/audio/jamesdsp/default.nix  |  2 +-
 .../audio/ladspa-plugins/default.nix          |  2 +-
 pkgs/applications/audio/librespot/default.nix |  2 +-
 .../audio/linvstmanager/default.nix           |  2 +-
 pkgs/applications/audio/lmms/default.nix      |  2 +-
 .../applications/audio/lpd8editor/default.nix |  2 +-
 .../magnetophonDSP/VoiceOfFaust/default.nix   |  2 +-
 .../faustCompressors/default.nix              |  2 +-
 pkgs/applications/audio/master_me/default.nix |  2 +-
 .../audio/mellowplayer/default.nix            |  2 +-
 .../audio/melmatcheq.lv2/default.nix          |  2 +-
 pkgs/applications/audio/minidsp/default.nix   |  2 +-
 pkgs/applications/audio/mixxx/default.nix     |  2 +-
 .../audio/mopidy/musicbox-webclient.nix       |  2 +-
 pkgs/applications/audio/mopidy/soundcloud.nix |  2 +-
 pkgs/applications/audio/mopidy/subidy.nix     |  2 +-
 pkgs/applications/audio/mopidy/ytmusic.nix    |  2 +-
 pkgs/applications/audio/muse/default.nix      |  2 +-
 pkgs/applications/audio/noson/default.nix     |  2 +-
 .../audio/pianobooster/default.nix            |  2 +-
 .../audio/pipecontrol/default.nix             |  2 +-
 pkgs/applications/audio/playbar2/default.nix  |  2 +-
 pkgs/applications/audio/polyphone/default.nix |  2 +-
 pkgs/applications/audio/pragha/default.nix    |  2 +-
 .../applications/audio/projectm_3/default.nix |  2 +-
 .../audio/radiotray-ng/default.nix            |  2 +-
 pkgs/applications/audio/sayonara/default.nix  |  2 +-
 pkgs/applications/audio/seq66/default.nix     |  2 +-
 pkgs/applications/audio/sfxr-qt/default.nix   |  2 +-
 pkgs/applications/audio/sisco.lv2/default.nix |  2 +-
 pkgs/applications/audio/snapcast/default.nix  |  2 +-
 pkgs/applications/audio/sonic-pi/default.nix  |  2 +-
 pkgs/applications/audio/spek/default.nix      |  2 +-
 .../applications/audio/strawberry/default.nix |  2 +-
 pkgs/applications/audio/tageditor/default.nix |  2 +-
 .../backup/timeshift/unwrapped.nix            |  2 +-
 .../blockchains/alfis/default.nix             |  2 +-
 .../blockchains/bitcoin-abc/default.nix       |  2 +-
 .../blockchains/digibyte/default.nix          |  2 +-
 .../blockchains/electrs/default.nix           |  2 +-
 .../blockchains/fulcrum/default.nix           |  2 +-
 .../blockchains/gridcoin-research/default.nix |  2 +-
 .../blockchains/groestlcoin/default.nix       |  2 +-
 .../blockchains/lighthouse/default.nix        |  2 +-
 .../blockchains/monero-cli/default.nix        |  2 +-
 .../blockchains/monero-gui/default.nix        |  2 +-
 .../blockchains/optimism/geth.nix             |  2 +-
 .../blockchains/snarkos/default.nix           |  2 +-
 .../applications/blockchains/teos/default.nix |  2 +-
 .../blockchains/zcash/default.nix             |  2 +-
 .../display-managers/greetd/regreet.nix       |  2 +-
 .../display-managers/lightdm/default.nix      |  2 +-
 .../applications/editors/cpeditor/default.nix |  2 +-
 .../applications/editors/cudatext/default.nix |  2 +-
 .../manual-packages/copilot/package.nix       |  2 +-
 .../manual-packages/idris2-mode/package.nix   |  2 +-
 .../manual-packages/rect-mark/package.nix     |  2 +-
 .../manual-packages/tsc/package.nix           |  2 +-
 .../editors/focuswriter/default.nix           |  2 +-
 .../jupyter-kernels/clojupyter/default.nix    |  2 +-
 .../editors/jupyter-kernels/coq/kernel.nix    |  2 +-
 .../jupyter-kernels/wolfram/kernel.nix        |  2 +-
 .../jupyter-kernels/xeus-cling/xeus-cling.nix |  2 +-
 .../editors/kakoune/plugins/overrides.nix     |  4 +-
 .../editors/leo-editor/default.nix            |  2 +-
 pkgs/applications/editors/lite-xl/default.nix |  2 +-
 .../editors/mindforger/default.nix            |  2 +-
 .../editors/neovim/gnvim/default.nix          |  2 +-
 .../editors/notepadqq/default.nix             |  2 +-
 .../applications/editors/qxmledit/default.nix |  2 +-
 pkgs/applications/editors/tiled/default.nix   |  2 +-
 pkgs/applications/editors/vim/common.nix      |  2 +-
 .../non-generated/gitlab-vim/default.nix      |  2 +-
 .../rescript-editor-analysis.nix              |  2 +-
 .../vadimcn.vscode-lldb/default.nix           |  2 +-
 .../editors/your-editor/default.nix           |  2 +-
 pkgs/applications/editors/zee/default.nix     |  2 +-
 pkgs/applications/emulators/blink/default.nix |  2 +-
 .../emulators/firebird-emu/default.nix        |  2 +-
 .../emulators/goldberg-emu/default.nix        |  2 +-
 pkgs/applications/emulators/wibo/default.nix  |  2 +-
 pkgs/applications/emulators/zsnes/2.x.nix     |  2 +-
 pkgs/applications/gis/grass/default.nix       |  2 +-
 .../gis/whitebox-tools/default.nix            |  2 +-
 .../applications/graphics/ImageMagick/6.x.nix |  2 +-
 .../graphics/apitrace/default.nix             |  2 +-
 .../graphics/cloudcompare/default.nix         |  2 +-
 pkgs/applications/graphics/drawio/default.nix |  2 +-
 .../graphics/drawpile/default.nix             |  2 +-
 .../graphics/emulsion/default.nix             |  2 +-
 pkgs/applications/graphics/feh/default.nix    |  2 +-
 .../graphics/fontmatrix/default.nix           |  2 +-
 .../graphics/foxotron/default.nix             |  2 +-
 .../graphics/gimp/plugins/default.nix         |  6 +-
 .../graphics/gnome-decoder/default.nix        |  2 +-
 .../graphics/gnome-obfuscate/default.nix      |  2 +-
 pkgs/applications/graphics/imgp/default.nix   |  2 +-
 pkgs/applications/graphics/ktikz/default.nix  |  2 +-
 .../graphics/mandelbulber/default.nix         |  2 +-
 .../applications/graphics/menyoki/default.nix |  2 +-
 pkgs/applications/graphics/ovito/default.nix  |  2 +-
 .../graphics/photoflare/default.nix           |  2 +-
 .../graphics/phototonic/default.nix           |  2 +-
 .../graphics/pineapple-pictures/default.nix   |  2 +-
 .../graphics/qcomicbook/default.nix           |  2 +-
 pkgs/applications/graphics/qosmic/default.nix |  2 +-
 pkgs/applications/graphics/qview/default.nix  |  2 +-
 .../rapid-photo-downloader/default.nix        |  2 +-
 .../graphics/rawtherapee/default.nix          |  2 +-
 pkgs/applications/graphics/sane/xsane.nix     |  2 +-
 .../graphics/scantailor/advanced.nix          |  2 +-
 .../graphics/scantailor/universal.nix         |  2 +-
 pkgs/applications/graphics/sxiv/default.nix   |  2 +-
 .../graphics/tesseract/tesseract3.nix         |  2 +-
 .../graphics/tesseract/tesseract4.nix         |  2 +-
 .../graphics/tesseract/tesseract5.nix         |  2 +-
 .../graphics/xournalpp/default.nix            |  2 +-
 .../graphics/yacreader/default.nix            |  2 +-
 .../misc/ArchiSteamFarm/default.nix           |  2 +-
 .../misc/ArchiSteamFarm/web-ui/default.nix    |  2 +-
 pkgs/applications/misc/ape/clex.nix           |  2 +-
 pkgs/applications/misc/ausweisapp/default.nix |  2 +-
 .../misc/avalonia-ilspy/default.nix           |  2 +-
 pkgs/applications/misc/barrier/default.nix    |  2 +-
 pkgs/applications/misc/binocle/default.nix    |  2 +-
 pkgs/applications/misc/birdtray/default.nix   |  2 +-
 .../misc/bluetooth_battery/default.nix        |  2 +-
 pkgs/applications/misc/brewtarget/default.nix |  2 +-
 pkgs/applications/misc/candle/default.nix     |  2 +-
 .../misc/chewing-editor/default.nix           |  2 +-
 pkgs/applications/misc/clight/clightd.nix     |  2 +-
 pkgs/applications/misc/clight/default.nix     |  2 +-
 pkgs/applications/misc/collision/default.nix  |  2 +-
 pkgs/applications/misc/copyq/default.nix      |  2 +-
 .../misc/cubiomes-viewer/default.nix          |  2 +-
 .../cubocore-packages/coreaction/default.nix  |  2 +-
 .../corearchiver/default.nix                  |  2 +-
 .../misc/cubocore-packages/corefm/default.nix |  2 +-
 .../cubocore-packages/coregarage/default.nix  |  2 +-
 .../cubocore-packages/corehunt/default.nix    |  2 +-
 .../cubocore-packages/coreimage/default.nix   |  2 +-
 .../cubocore-packages/coreinfo/default.nix    |  2 +-
 .../corekeyboard/default.nix                  |  2 +-
 .../cubocore-packages/corepad/default.nix     |  2 +-
 .../cubocore-packages/corepaint/default.nix   |  2 +-
 .../cubocore-packages/corepdf/default.nix     |  2 +-
 .../cubocore-packages/corepins/default.nix    |  2 +-
 .../cubocore-packages/corerenamer/default.nix |  2 +-
 .../cubocore-packages/coreshot/default.nix    |  2 +-
 .../cubocore-packages/corestats/default.nix   |  2 +-
 .../cubocore-packages/corestuff/default.nix   |  2 +-
 .../coreterminal/default.nix                  |  2 +-
 .../cubocore-packages/coretime/default.nix    |  2 +-
 .../coretoppings/default.nix                  |  2 +-
 .../coreuniverse/default.nix                  |  2 +-
 .../cubocore-packages/libcprime/default.nix   |  2 +-
 .../cubocore-packages/libcsys/default.nix     |  2 +-
 pkgs/applications/misc/cura/default.nix       |  2 +-
 pkgs/applications/misc/cura/plugins.nix       |  2 +-
 pkgs/applications/misc/curaengine/default.nix |  2 +-
 pkgs/applications/misc/curaengine/stable.nix  |  2 +-
 pkgs/applications/misc/ddcui/default.nix      |  2 +-
 .../deadd-notification-center/default.nix     |  2 +-
 pkgs/applications/misc/diff-pdf/default.nix   |  2 +-
 .../misc/digitalbitbox/default.nix            |  2 +-
 pkgs/applications/misc/dmensamenu/default.nix |  2 +-
 pkgs/applications/misc/dupeguru/default.nix   |  2 +-
 pkgs/applications/misc/edgetx/default.nix     |  2 +-
 pkgs/applications/misc/electrum/ltc.nix       |  2 +-
 .../misc/eureka-ideas/default.nix             |  2 +-
 pkgs/applications/misc/goldendict/default.nix |  2 +-
 pkgs/applications/misc/gphoto2/default.nix    |  2 +-
 pkgs/applications/misc/heimer/default.nix     |  2 +-
 pkgs/applications/misc/hovercraft/default.nix |  2 +-
 pkgs/applications/misc/huggle/default.nix     |  2 +-
 .../misc/inherd-quake/default.nix             |  2 +-
 pkgs/applications/misc/inlyne/default.nix     |  2 +-
 pkgs/applications/misc/inochi2d/default.nix   |  4 +-
 pkgs/applications/misc/input-leap/default.nix |  2 +-
 .../misc/johnny-reborn/default.nix            |  2 +-
 pkgs/applications/misc/k4dirstat/default.nix  |  2 +-
 pkgs/applications/misc/kapow/default.nix      |  2 +-
 pkgs/applications/misc/keepassxc/default.nix  |  2 +-
 pkgs/applications/misc/kemai/default.nix      |  2 +-
 pkgs/applications/misc/kiwix/default.nix      |  2 +-
 pkgs/applications/misc/kiwix/lib.nix          |  2 +-
 pkgs/applications/misc/klayout/default.nix    |  2 +-
 .../misc/klipper-estimator/default.nix        |  2 +-
 .../applications/misc/ksmoothdock/default.nix |  2 +-
 pkgs/applications/misc/lutris/default.nix     |  2 +-
 pkgs/applications/misc/makehuman/default.nix  |  4 +-
 .../misc/maliit-keyboard/default.nix          |  2 +-
 pkgs/applications/misc/mdzk/default.nix       |  2 +-
 pkgs/applications/misc/mediaelch/default.nix  |  2 +-
 pkgs/applications/misc/moolticute/default.nix |  2 +-
 pkgs/applications/misc/nimbo/default.nix      |  2 +-
 pkgs/applications/misc/nixnote2/default.nix   |  2 +-
 pkgs/applications/misc/openambit/default.nix  |  2 +-
 .../misc/osmscout-server/default.nix          |  2 +-
 pkgs/applications/misc/pastel/default.nix     |  2 +-
 pkgs/applications/misc/pdfpc/default.nix      |  2 +-
 pkgs/applications/misc/pe-bear/default.nix    |  2 +-
 pkgs/applications/misc/peaclock/default.nix   |  2 +-
 pkgs/applications/misc/pgmodeler/default.nix  |  2 +-
 .../plasma-applet-volumewin7mixer/default.nix |  2 +-
 .../misc/plasma-theme-switcher/default.nix    |  2 +-
 pkgs/applications/misc/plover/default.nix     |  2 +-
 .../misc/prusa-slicer/super-slicer.nix        |  2 +-
 pkgs/applications/misc/pueue/default.nix      |  2 +-
 pkgs/applications/misc/pure-maps/default.nix  |  2 +-
 pkgs/applications/misc/q4wine/default.nix     |  2 +-
 .../misc/qMasterPassword/default.nix          |  2 +-
 pkgs/applications/misc/qcad/default.nix       |  2 +-
 pkgs/applications/misc/qsudo/default.nix      |  2 +-
 .../misc/qsyncthingtray/default.nix           |  2 +-
 pkgs/applications/misc/qtpass/default.nix     |  2 +-
 pkgs/applications/misc/reddsaver/default.nix  |  2 +-
 .../misc/redshift-plasma-applet/default.nix   |  2 +-
 pkgs/applications/misc/redshift/default.nix   |  4 +-
 pkgs/applications/misc/resp-app/default.nix   |  2 +-
 pkgs/applications/misc/rofi-emoji/default.nix |  2 +-
 pkgs/applications/misc/rofi/default.nix       |  2 +-
 pkgs/applications/misc/rofi/wayland.nix       |  2 +-
 pkgs/applications/misc/slstatus/default.nix   |  2 +-
 pkgs/applications/misc/stog/default.nix       |  2 +-
 pkgs/applications/misc/stork/default.nix      |  2 +-
 pkgs/applications/misc/swappy/default.nix     |  2 +-
 pkgs/applications/misc/synergy/default.nix    |  2 +-
 .../misc/terminal-typeracer/default.nix       |  2 +-
 pkgs/applications/misc/tipp10/default.nix     |  2 +-
 pkgs/applications/misc/tuxclocker/default.nix |  2 +-
 .../misc/twitch-chat-downloader/default.nix   |  2 +-
 pkgs/applications/misc/ubpm/default.nix       |  2 +-
 pkgs/applications/misc/valentina/default.nix  |  2 +-
 pkgs/applications/misc/visidata/default.nix   |  2 +-
 pkgs/applications/misc/wikicurses/default.nix |  2 +-
 pkgs/applications/misc/xsw/default.nix        |  2 +-
 .../networking/browsers/elinks/default.nix    |  2 +-
 .../networking/browsers/qtchan/default.nix    |  2 +-
 .../networking/browsers/surf/default.nix      |  2 +-
 .../networking/browsers/webmacs/default.nix   |  2 +-
 .../networking/cluster/calico/default.nix     |  2 +-
 .../networking/cluster/cni/default.nix        |  2 +-
 .../networking/cluster/cni/plugins.nix        |  2 +-
 .../cluster/helm/plugins/helm-cm-push.nix     |  2 +-
 .../cluster/helm/plugins/helm-diff.nix        |  2 +-
 .../cluster/helm/plugins/helm-git.nix         |  2 +-
 .../cluster/helm/plugins/helm-mapkubeapis.nix |  2 +-
 .../cluster/helm/plugins/helm-s3.nix          |  2 +-
 .../cluster/helm/plugins/helm-secrets.nix     |  2 +-
 .../cluster/helm/plugins/helm-unittest.nix    |  2 +-
 .../networking/cluster/helmfile/default.nix   |  2 +-
 .../networking/cluster/k3s/builder.nix        |  2 +-
 .../cluster/kubectl-evict-pod/default.nix     |  2 +-
 .../networking/cluster/kubernetes/default.nix |  2 +-
 .../networking/cluster/kubeval/default.nix    |  2 +-
 .../networking/cluster/kuma/default.nix       |  2 +-
 .../networking/cluster/minikube/default.nix   |  2 +-
 .../networking/cluster/nomad/default.nix      |  2 +-
 .../networking/cluster/roxctl/default.nix     |  2 +-
 .../networking/cluster/sonobuoy/default.nix   |  2 +-
 .../networking/cluster/terraform/default.nix  |  2 +-
 .../networking/cluster/timoni/default.nix     |  2 +-
 .../networking/compactor/default.nix          |  2 +-
 .../networking/firehol/default.nix            |  2 +-
 .../networking/ftp/gftp/default.nix           |  2 +-
 pkgs/applications/networking/geph/default.nix |  4 +-
 .../google-drive-ocamlfuse/default.nix        |  2 +-
 .../networking/icemon/default.nix             |  2 +-
 .../networking/ids/zeek/broker/default.nix    |  2 +-
 .../discord-screenaudio/default.nix           |  2 +-
 .../instant-messengers/jami/default.nix       |  2 +-
 .../instant-messengers/linphone/default.nix   |  2 +-
 .../matrix-commander/default.nix              |  2 +-
 .../pantalaimon/default.nix                   |  2 +-
 .../pidgin/pidgin-plugins/carbons/default.nix |  2 +-
 .../pidgin-plugins/msn-pecan/default.nix      |  2 +-
 .../pidgin-indicator/default.nix              |  2 +-
 .../pidgin-opensteamworks/default.nix         |  2 +-
 .../pidgin-skypeweb/default.nix               |  2 +-
 .../pidgin-plugins/purple-lurch/default.nix   |  2 +-
 .../pidgin-plugins/purple-signald/default.nix |  2 +-
 .../pidgin-plugins/tdlib-purple/default.nix   |  2 +-
 .../instant-messengers/profanity/default.nix  |  2 +-
 .../instant-messengers/psi-plus/default.nix   |  2 +-
 .../instant-messengers/psi/default.nix        |  2 +-
 .../instant-messengers/quaternion/default.nix |  2 +-
 .../telegram/tg/default.nix                   |  2 +-
 .../networking/irc/quassel/default.nix        |  2 +-
 .../networking/irc/tiny/default.nix           |  2 +-
 .../irc/weechat/scripts/edit/default.nix      |  2 +-
 .../irc/weechat/scripts/wee-slack/default.nix |  2 +-
 .../scripts/weechat-matrix/default.nix        |  2 +-
 .../scripts/weechat-notify-send/default.nix   |  2 +-
 .../weechat/scripts/weechat-otr/default.nix   |  2 +-
 .../networking/ktailctl/default.nix           |  2 +-
 .../networking/libcoap/default.nix            |  2 +-
 .../mailreaders/astroid/default.nix           |  2 +-
 .../mailreaders/mailnag/default.nix           |  2 +-
 .../mailreaders/mailnag/goa-plugin.nix        |  2 +-
 .../applications/networking/mhost/default.nix |  2 +-
 .../networking/mujmap/default.nix             |  2 +-
 .../networking/mumble/default.nix             |  2 +-
 .../networking/netmaker/default.nix           |  2 +-
 .../newsreaders/quiterss/default.nix          |  2 +-
 .../networking/ostinato/default.nix           |  2 +-
 .../networking/p2p/eiskaltdcpp/default.nix    |  2 +-
 .../networking/p2p/jesec-rtorrent/default.nix |  2 +-
 .../p2p/jesec-rtorrent/libtorrent.nix         |  2 +-
 .../networking/p2p/retroshare/default.nix     |  2 +-
 .../networking/p2p/transmission/4.nix         |  2 +-
 .../networking/rymdport/default.nix           |  2 +-
 .../networking/seafile-client/default.nix     |  2 +-
 .../networking/sniffers/wireshark/default.nix |  2 +-
 .../networking/sync/acd_cli/default.nix       |  2 +-
 .../networking/sync/backintime/common.nix     |  2 +-
 .../networking/sync/rclone/browser.nix        |  2 +-
 .../networking/wgnord/default.nix             |  2 +-
 pkgs/applications/networking/znc/modules.nix  |  2 +-
 pkgs/applications/office/PageEdit/default.nix |  2 +-
 .../office/activitywatch/default.nix          |  2 +-
 .../office/beamerpresenter/default.nix        |  2 +-
 .../office/beancount/beancount-ing-diba.nix   |  2 +-
 pkgs/applications/office/jabref/default.nix   |  2 +-
 .../office/pdfmixtool/default.nix             |  2 +-
 pkgs/applications/radio/cqrlog/default.nix    |  2 +-
 pkgs/applications/radio/cubicsdr/default.nix  |  2 +-
 pkgs/applications/radio/direwolf/default.nix  |  2 +-
 pkgs/applications/radio/gnuradio/shared.nix   |  2 +-
 pkgs/applications/radio/gqrx/default.nix      |  2 +-
 pkgs/applications/radio/guglielmo/default.nix |  2 +-
 pkgs/applications/radio/limesuite/default.nix |  2 +-
 pkgs/applications/radio/openwebrx/default.nix |  6 +-
 pkgs/applications/radio/qdmr/default.nix      |  2 +-
 pkgs/applications/radio/qlog/default.nix      |  2 +-
 pkgs/applications/radio/rtl-sdr/default.nix   |  4 +-
 pkgs/applications/radio/sigdigger/default.nix |  2 +-
 pkgs/applications/radio/welle-io/default.nix  |  2 +-
 .../science/astronomy/celestia/default.nix    |  2 +-
 .../science/astronomy/gpredict/default.nix    |  2 +-
 .../science/biology/hh-suite/default.nix      |  2 +-
 .../science/biology/kallisto/default.nix      |  2 +-
 .../science/biology/nest/default.nix          |  2 +-
 .../science/biology/truvari/default.nix       |  2 +-
 .../science/chemistry/avogadro2/default.nix   |  2 +-
 .../timeloop/default.nix                      |  2 +-
 .../science/electronics/caneda/default.nix    |  2 +-
 .../hal-hardware-analyzer/default.nix         |  2 +-
 .../science/electronics/librepcb/default.nix  |  2 +-
 .../science/electronics/openems/default.nix   |  2 +-
 .../electronics/openhantek6022/default.nix    |  2 +-
 .../science/electronics/qucs-s/default.nix    |  2 +-
 .../science/logic/cedille/default.nix         |  2 +-
 .../science/logic/klee/default.nix            |  2 +-
 .../science/logic/potassco/clingcon.nix       |  2 +-
 .../science/logic/potassco/clingo.nix         |  2 +-
 .../science/logic/tamarin-prover/default.nix  |  2 +-
 .../finalfusion-utils/default.nix             |  2 +-
 .../science/math/caffe/default.nix            |  2 +-
 .../math/engauge-digitizer/default.nix        |  2 +-
 .../science/math/mpsolve/default.nix          |  2 +-
 .../science/math/yacas/default.nix            |  2 +-
 .../science/misc/colmap/default.nix           |  2 +-
 .../science/misc/convertall/default.nix       |  2 +-
 .../science/misc/foldingathome/client.nix     |  2 +-
 .../science/misc/graphia/default.nix          |  2 +-
 .../science/misc/openmvg/default.nix          |  2 +-
 .../science/misc/openmvs/default.nix          |  2 +-
 .../science/misc/openrefine/default.nix       |  2 +-
 .../science/misc/rink/default.nix             |  2 +-
 .../molecular-dynamics/raspa/default.nix      |  2 +-
 .../science/robotics/apmplanner2/default.nix  |  2 +-
 .../robotics/sumorobot-manager/default.nix    |  2 +-
 pkgs/applications/system/monitor/default.nix  |  2 +-
 .../system/qjournalctl/default.nix            |  2 +-
 .../default.nix                               |  2 +-
 .../urxvt-font-size/default.nix               |  2 +-
 .../urxvt-perls/default.nix                   |  2 +-
 .../urxvt-tabbedex/default.nix                |  2 +-
 .../terminal-emulators/st/xst.nix             |  2 +-
 .../terminal-emulators/termite/default.nix    |  2 +-
 .../version-management/blackbox/default.nix   |  2 +-
 .../git-annex-metadata-gui/default.nix        |  2 +-
 .../git-archive-all/default.nix               |  2 +-
 .../git-credential-manager/default.nix        |  2 +-
 .../git-machete/default.nix                   |  2 +-
 .../git-publish/default.nix                   |  2 +-
 .../version-management/git-recent/default.nix |  2 +-
 .../version-management/git-review/default.nix |  2 +-
 .../version-management/git-stack/default.nix  |  2 +-
 .../version-management/gita/default.nix       |  2 +-
 .../version-management/gitqlient/default.nix  |  2 +-
 .../lucky-commit/default.nix                  |  2 +-
 .../version-management/nitpick/default.nix    |  2 +-
 .../version-management/sapling/default.nix    |  2 +-
 .../silver-platter/default.nix                |  2 +-
 .../svn-all-fast-export/default.nix           |  2 +-
 .../version-management/svn2git/default.nix    |  2 +-
 .../video/anilibria-winmaclinux/default.nix   |  2 +-
 pkgs/applications/video/haruna/default.nix    |  2 +-
 .../video/hyperion-ng/default.nix             |  2 +-
 .../video/jellyfin-media-player/default.nix   |  2 +-
 .../kodi/addons/archive_tool/default.nix      |  2 +-
 .../controller-topology-project/default.nix   |  2 +-
 .../video/kodi/addons/iagl/default.nix        |  2 +-
 .../video/kodi/addons/infotagger/default.nix  |  2 +-
 .../video/kodi/addons/jellycon/default.nix    |  2 +-
 .../video/kodi/addons/jellyfin/default.nix    |  2 +-
 .../video/kodi/addons/netflix/default.nix     |  2 +-
 .../video/kodi/addons/orftvthek/default.nix   |  2 +-
 .../video/kodi/addons/pdfreader/default.nix   |  2 +-
 .../video/kodi/addons/sendtokodi/default.nix  |  2 +-
 .../kodi/addons/sponsorblock/default.nix      |  2 +-
 .../kodi/addons/steam-library/default.nix     |  2 +-
 .../video/kodi/addons/svtplay/default.nix     |  2 +-
 .../video/kodi/addons/xbmcswift2/default.nix  |  2 +-
 .../video/kodi/addons/youtube/default.nix     |  2 +-
 pkgs/applications/video/mapmap/default.nix    |  2 +-
 pkgs/applications/video/minitube/default.nix  |  2 +-
 pkgs/applications/video/mpc-qt/default.nix    |  2 +-
 .../video/mpv/scripts/inhibit-gnome.nix       |  2 +-
 .../video/mpv/scripts/modernx-zydezu.nix      |  2 +-
 .../video/mpv/scripts/modernx.nix             |  2 +-
 pkgs/applications/video/mpv/scripts/mpris.nix |  2 +-
 .../video/mpv/scripts/mpv-discord.nix         |  2 +-
 .../video/mpv/scripts/mpvacious.nix           |  2 +-
 .../video/mpv/scripts/quality-menu.nix        |  2 +-
 .../video/mpv/scripts/simple-mpv-webui.nix    |  2 +-
 .../video/mpv/scripts/thumbnail.nix           |  2 +-
 pkgs/applications/video/mpv/scripts/uosc.nix  |  2 +-
 .../video/mpv/scripts/vr-reversal.nix         |  2 +-
 .../video/mpv/scripts/webtorrent-mpv-hook.nix |  2 +-
 .../video/mpv/scripts/youtube-upnext.nix      |  2 +-
 pkgs/applications/video/mythtv/default.nix    |  2 +-
 pkgs/applications/video/natron/default.nix    |  2 +-
 .../applications/video/obs-studio/default.nix |  2 +-
 .../advanced-scene-switcher/default.nix       |  2 +-
 .../obs-studio/plugins/obs-3d-effect.nix      |  2 +-
 .../plugins/obs-backgroundremoval/default.nix |  2 +-
 .../obs-studio/plugins/obs-command-source.nix |  2 +-
 .../obs-studio/plugins/obs-freeze-filter.nix  |  2 +-
 .../plugins/obs-gradient-source.nix           |  2 +-
 .../obs-studio/plugins/obs-gstreamer.nix      |  2 +-
 .../plugins/obs-hyperion/default.nix          |  2 +-
 .../plugins/obs-livesplit-one/default.nix     |  2 +-
 .../plugins/obs-move-transition.nix           |  2 +-
 .../plugins/obs-multi-rtmp/default.nix        |  2 +-
 .../obs-studio/plugins/obs-mute-filter.nix    |  2 +-
 .../obs-studio/plugins/obs-ndi/default.nix    |  2 +-
 .../video/obs-studio/plugins/obs-nvfbc.nix    |  2 +-
 .../plugins/obs-pipewire-audio-capture.nix    |  2 +-
 .../plugins/obs-rgb-levels-filter.nix         |  2 +-
 .../obs-studio/plugins/obs-shaderfilter.nix   |  2 +-
 .../obs-studio/plugins/obs-source-record.nix  |  2 +-
 .../plugins/obs-teleport/default.nix          |  2 +-
 .../obs-studio/plugins/obs-text-pthread.nix   |  2 +-
 .../obs-studio/plugins/obs-vaapi/default.nix  |  2 +-
 .../plugins/obs-vertical-canvas.nix           |  2 +-
 .../obs-studio/plugins/obs-vintage-filter.nix |  2 +-
 .../obs-studio/plugins/obs-websocket.nix      |  2 +-
 .../obs-studio/plugins/waveform/default.nix   |  2 +-
 .../video/pipe-viewer/default.nix             |  2 +-
 .../video/qmediathekview/default.nix          |  2 +-
 pkgs/applications/video/vdr/default.nix       |  2 +-
 .../video/vdr/epgsearch/default.nix           |  2 +-
 pkgs/applications/video/vdr/plugins.nix       |  6 +-
 .../video/vdr/softhddevice/default.nix        |  2 +-
 .../video/vdr/streamdev/default.nix           |  2 +-
 .../applications/video/vokoscreen/default.nix |  2 +-
 .../virtualization/cri-o/default.nix          |  2 +-
 .../virtualization/docker/buildx.nix          |  2 +-
 .../virtualization/docker/compose.nix         |  2 +-
 .../virtualization/krunvm/default.nix         |  2 +-
 .../virtualization/lima/default.nix           |  2 +-
 .../virtualization/sail-riscv/default.nix     |  2 +-
 .../virtualization/virt-manager/default.nix   |  2 +-
 .../virtualization/virt-manager/qt.nix        |  2 +-
 .../window-managers/2bwm/default.nix          |  2 +-
 .../window-managers/awesome/default.nix       |  2 +-
 .../window-managers/cagebreak/default.nix     |  2 +-
 .../window-managers/dwm/dwm-status.nix        |  2 +-
 .../hyprwm/hyprland-plugins/hycov.nix         |  2 +-
 .../i3/bumblebee-status/default.nix           |  2 +-
 .../window-managers/i3/i3-ratiosplit.nix      |  2 +-
 .../window-managers/i3/i3ipc-glib.nix         |  2 +-
 .../window-managers/i3/lock-blur.nix          |  2 +-
 .../window-managers/i3/lock-color.nix         |  2 +-
 pkgs/applications/window-managers/i3/lock.nix |  2 +-
 .../window-managers/i3/wmfocus.nix            |  2 +-
 pkgs/applications/window-managers/i3/wsr.nix  |  2 +-
 .../window-managers/jwm/default.nix           |  2 +-
 .../window-managers/lemonbar/default.nix      |  2 +-
 .../window-managers/stumpwm/default.nix       |  2 +-
 .../window-managers/tabbed/default.nix        |  2 +-
 .../window-managers/wayfire/firedecor.nix     |  2 +-
 .../dlang/builddubpackage/default.nix         |  2 +-
 pkgs/build-support/mitm-cache/default.nix     |  2 +-
 pkgs/by-name/_1/_1fps/package.nix             |  2 +-
 pkgs/by-name/_2/_20kly/package.nix            |  2 +-
 pkgs/by-name/_2/_2ship2harkinian/package.nix  |  2 +-
 pkgs/by-name/_3/_3mux/package.nix             |  2 +-
 pkgs/by-name/_3/_3proxy/package.nix           |  2 +-
 pkgs/by-name/_6/_6tunnel/package.nix          |  2 +-
 pkgs/by-name/_7/_7z2hashcat/package.nix       |  2 +-
 pkgs/by-name/_9/_9pfs/package.nix             |  2 +-
 pkgs/by-name/aa/aaa/package.nix               |  2 +-
 pkgs/by-name/aa/aaaaxy/package.nix            |  2 +-
 .../aa/aarch64-esr-decoder/package.nix        |  2 +-
 pkgs/by-name/aa/aardvark-dns/package.nix      |  2 +-
 pkgs/by-name/aa/aaxtomp3/package.nix          |  2 +-
 pkgs/by-name/ab/ab-av1/package.nix            |  2 +-
 pkgs/by-name/ab/abaddon/package.nix           |  2 +-
 pkgs/by-name/ab/abbaye-des-morts/package.nix  |  2 +-
 pkgs/by-name/ab/abbreviate/package.nix        |  2 +-
 .../ab/abi-compliance-checker/package.nix     |  2 +-
 pkgs/by-name/ab/abi-dumper/package.nix        |  2 +-
 pkgs/by-name/ab/abracadabra/package.nix       |  2 +-
 pkgs/by-name/ab/abuild/package.nix            |  2 +-
 pkgs/by-name/ac/acc/package.nix               |  2 +-
 pkgs/by-name/ac/acr/package.nix               |  2 +-
 pkgs/by-name/ac/acsccid/package.nix           |  2 +-
 pkgs/by-name/ac/action-validator/package.nix  |  2 +-
 .../by-name/ad/adapta-backgrounds/package.nix |  2 +-
 pkgs/by-name/ad/adapta-gtk-theme/package.nix  |  2 +-
 pkgs/by-name/ad/adapta-kde-theme/package.nix  |  2 +-
 pkgs/by-name/ad/adbtuifm/package.nix          |  2 +-
 pkgs/by-name/ad/addlicense/package.nix        |  2 +-
 pkgs/by-name/ad/adementary-theme/package.nix  |  2 +-
 pkgs/by-name/ad/adguardian/package.nix        |  2 +-
 pkgs/by-name/ad/adif-multitool/package.nix    |  2 +-
 pkgs/by-name/ad/adrgen/package.nix            |  2 +-
 pkgs/by-name/ad/adrs/package.nix              |  2 +-
 pkgs/by-name/ad/advancecomp/package.nix       |  2 +-
 pkgs/by-name/ae/aeron-cpp/package.nix         |  2 +-
 pkgs/by-name/ae/aerospike/package.nix         |  2 +-
 pkgs/by-name/ae/aether-lv2/package.nix        |  2 +-
 pkgs/by-name/af/afflib/package.nix            |  2 +-
 pkgs/by-name/af/afio/package.nix              |  2 +-
 pkgs/by-name/af/afsctool/package.nix          |  2 +-
 pkgs/by-name/af/afterburn/package.nix         |  2 +-
 pkgs/by-name/af/afterstep/package.nix         |  2 +-
 pkgs/by-name/af/afuse/package.nix             |  2 +-
 pkgs/by-name/ag/agate/package.nix             |  2 +-
 pkgs/by-name/ag/agdsn-zsh-config/package.nix  |  2 +-
 .../ag/age-plugin-fido2-hmac/package.nix      |  2 +-
 pkgs/by-name/ag/agebox/package.nix            |  2 +-
 pkgs/by-name/ag/agenda/package.nix            |  2 +-
 pkgs/by-name/ag/agenix-cli/package.nix        |  2 +-
 .../by-name/ag/agkozak-zsh-prompt/package.nix |  2 +-
 pkgs/by-name/ag/agola/package.nix             |  2 +-
 pkgs/by-name/ah/aha/package.nix               |  2 +-
 pkgs/by-name/ah/ahoviewer/package.nix         |  2 +-
 pkgs/by-name/ai/aiac/package.nix              |  2 +-
 pkgs/by-name/ai/aiken/package.nix             |  2 +-
 pkgs/by-name/ai/ain/package.nix               |  2 +-
 pkgs/by-name/ai/air/package.nix               |  2 +-
 pkgs/by-name/ai/aircrack-ng/package.nix       |  2 +-
 pkgs/by-name/ai/airshipper/package.nix        |  2 +-
 pkgs/by-name/ai/airspy/package.nix            |  2 +-
 pkgs/by-name/ai/airspyhf/package.nix          |  2 +-
 pkgs/by-name/ai/aixlog/package.nix            |  2 +-
 pkgs/by-name/ak/akira-unstable/package.nix    |  2 +-
 .../by-name/al/alarm-clock-applet/package.nix |  2 +-
 pkgs/by-name/al/albatross/package.nix         |  2 +-
 pkgs/by-name/al/alegreya-sans/package.nix     |  2 +-
 pkgs/by-name/al/alegreya/package.nix          |  2 +-
 pkgs/by-name/al/alejandra/package.nix         |  2 +-
 .../al/alertmanager-irc-relay/package.nix     |  2 +-
 .../alertmanager-webhook-logger/package.nix   |  2 +-
 pkgs/by-name/al/algia/package.nix             |  2 +-
 pkgs/by-name/al/algolia-cli/package.nix       |  2 +-
 pkgs/by-name/al/alice-lg/package.nix          |  2 +-
 pkgs/by-name/al/alienarena/package.nix        |  2 +-
 pkgs/by-name/al/align/package.nix             |  2 +-
 pkgs/by-name/al/allmark/package.nix           |  2 +-
 pkgs/by-name/al/almonds/package.nix           |  2 +-
 pkgs/by-name/al/alp/package.nix               |  2 +-
 pkgs/by-name/al/alpaca-proxy/package.nix      |  2 +-
 .../by-name/al/alpine-make-rootfs/package.nix |  2 +-
 .../al/alpine-make-vm-image/package.nix       |  2 +-
 pkgs/by-name/al/alpnpass/package.nix          |  2 +-
 pkgs/by-name/al/alsa-scarlett-gui/package.nix |  2 +-
 pkgs/by-name/al/alttab/package.nix            |  2 +-
 .../amazon-ecr-credential-helper/package.nix  |  2 +-
 pkgs/by-name/am/amber-lang/package.nix        |  2 +-
 pkgs/by-name/am/amber-secret/package.nix      |  2 +-
 pkgs/by-name/am/amber-theme/package.nix       |  2 +-
 pkgs/by-name/am/amd-blis/package.nix          |  2 +-
 pkgs/by-name/am/amd-libflame/package.nix      |  2 +-
 pkgs/by-name/am/amdctl/package.nix            |  2 +-
 pkgs/by-name/am/amdgpu_top/package.nix        |  2 +-
 pkgs/by-name/am/amf-headers/package.nix       |  2 +-
 pkgs/by-name/am/amfora/package.nix            |  2 +-
 pkgs/by-name/am/aml/package.nix               |  2 +-
 pkgs/by-name/am/amneziawg-go/package.nix      |  2 +-
 pkgs/by-name/am/amoco/package.nix             |  2 +-
 pkgs/by-name/am/amphetype/package.nix         |  2 +-
 pkgs/by-name/am/amqpcat/package.nix           |  2 +-
 pkgs/by-name/am/ams-lv2/package.nix           |  2 +-
 pkgs/by-name/am/amule/package.nix             |  2 +-
 pkgs/by-name/an/analog/package.nix            |  2 +-
 pkgs/by-name/an/anchor/package.nix            |  2 +-
 pkgs/by-name/an/anders/package.nix            |  2 +-
 .../by-name/an/android-udev-rules/package.nix |  2 +-
 pkgs/by-name/an/anew/package.nix              |  2 +-
 pkgs/by-name/an/anewer/package.nix            |  2 +-
 pkgs/by-name/an/angband/package.nix           |  2 +-
 pkgs/by-name/an/angle-grinder/package.nix     |  2 +-
 pkgs/by-name/an/angsd/package.nix             |  2 +-
 pkgs/by-name/an/anime-downloader/package.nix  |  2 +-
 pkgs/by-name/an/anko/package.nix              |  2 +-
 pkgs/by-name/an/annextimelog/package.nix      |  2 +-
 pkgs/by-name/an/annotator/package.nix         |  2 +-
 pkgs/by-name/an/ansel/package.nix             |  2 +-
 pkgs/by-name/an/ansible-cmdb/package.nix      |  2 +-
 pkgs/by-name/an/antibody/package.nix          |  2 +-
 .../an/antora-lunr-extension/package.nix      |  2 +-
 pkgs/by-name/an/antora/package.nix            |  2 +-
 pkgs/by-name/an/any-nix-shell/package.nix     |  2 +-
 pkgs/by-name/ao/aocl-utils/package.nix        |  2 +-
 pkgs/by-name/ap/aperture/package.nix          |  2 +-
 pkgs/by-name/ap/apfel/package.nix             |  2 +-
 pkgs/by-name/ap/apfelgrid/package.nix         |  2 +-
 pkgs/by-name/ap/api-linter/package.nix        |  2 +-
 pkgs/by-name/ap/aporetic/package.nix          |  2 +-
 pkgs/by-name/ap/appeditor/package.nix         |  2 +-
 pkgs/by-name/ap/appimageupdate/package.nix    |  2 +-
 .../by-name/ap/appindicator-sharp/package.nix |  2 +-
 pkgs/by-name/ap/approxmc/package.nix          |  2 +-
 pkgs/by-name/ap/apt-mirror/package.nix        |  2 +-
 pkgs/by-name/ap/apt/package.nix               |  2 +-
 pkgs/by-name/ap/aptdec/package.nix            |  2 +-
 pkgs/by-name/ap/aptly/package.nix             |  2 +-
 pkgs/by-name/ar/arangodb/package.nix          |  2 +-
 pkgs/by-name/ar/aravis/package.nix            |  2 +-
 pkgs/by-name/ar/arc-icon-theme/package.nix    |  2 +-
 pkgs/by-name/ar/arc-kde-theme/package.nix     |  2 +-
 pkgs/by-name/ar/arc-theme/package.nix         |  2 +-
 pkgs/by-name/ar/archiver/package.nix          |  2 +-
 pkgs/by-name/ar/ardugotools/package.nix       |  2 +-
 pkgs/by-name/ar/arduino-ci/package.nix        |  2 +-
 .../ar/arduino-create-agent/package.nix       |  2 +-
 pkgs/by-name/ar/arduino-mk/package.nix        |  2 +-
 pkgs/by-name/ar/arduinoOTA/package.nix        |  2 +-
 pkgs/by-name/ar/ares-cli/package.nix          |  2 +-
 pkgs/by-name/ar/argagg/package.nix            |  2 +-
 pkgs/by-name/ar/argbash/package.nix           |  2 +-
 pkgs/by-name/ar/argc/package.nix              |  2 +-
 pkgs/by-name/ar/argo-expr/package.nix         |  2 +-
 pkgs/by-name/ar/argo-rollouts/package.nix     |  2 +-
 pkgs/by-name/ar/argocd-autopilot/package.nix  |  2 +-
 .../ar/argocd-vault-plugin/package.nix        |  2 +-
 pkgs/by-name/ar/argocd/package.nix            |  2 +-
 pkgs/by-name/ar/argp-standalone/package.nix   |  2 +-
 pkgs/by-name/ar/argparse/package.nix          |  2 +-
 pkgs/by-name/ar/ariang/package.nix            |  2 +-
 pkgs/by-name/ar/arjun-cnf/package.nix         |  2 +-
 pkgs/by-name/ar/arkade/package.nix            |  2 +-
 pkgs/by-name/ar/arp-scan/package.nix          |  2 +-
 pkgs/by-name/ar/arpa2cm/package.nix           |  2 +-
 pkgs/by-name/ar/arsenal/package.nix           |  2 +-
 pkgs/by-name/ar/artem/package.nix             |  2 +-
 .../as/ascii-image-converter/package.nix      |  2 +-
 pkgs/by-name/as/asciigraph/package.nix        |  2 +-
 pkgs/by-name/as/asciinema-agg/package.nix     |  2 +-
 .../as/asciinema-automation/package.nix       |  2 +-
 pkgs/by-name/as/asciinema/package.nix         |  2 +-
 .../as/asciiquarium-transparent/package.nix   |  2 +-
 pkgs/by-name/as/asdf-vm/package.nix           |  2 +-
 pkgs/by-name/as/asfa/package.nix              |  2 +-
 pkgs/by-name/as/ashuffle/package.nix          |  2 +-
 pkgs/by-name/as/asm-lsp/package.nix           |  2 +-
 pkgs/by-name/as/asmfmt/package.nix            |  2 +-
 pkgs/by-name/as/asn1editor/package.nix        |  2 +-
 pkgs/by-name/as/asouldocs/package.nix         |  2 +-
 pkgs/by-name/as/aspcud/package.nix            |  2 +-
 pkgs/by-name/as/assaultcube/package.nix       |  2 +-
 pkgs/by-name/as/assemblyscript/package.nix    |  2 +-
 pkgs/by-name/as/assetfinder/package.nix       |  2 +-
 pkgs/by-name/as/assh/package.nix              |  2 +-
 pkgs/by-name/as/assign-lb-ip/package.nix      |  2 +-
 pkgs/by-name/as/assimp/package.nix            |  2 +-
 pkgs/by-name/as/astartectl/package.nix        |  2 +-
 pkgs/by-name/as/astc-encoder/package.nix      |  2 +-
 .../as/asterisk-module-sccp/package.nix       |  2 +-
 pkgs/by-name/as/astromenace/package.nix       |  2 +-
 pkgs/by-name/as/astronomer/package.nix        |  2 +-
 pkgs/by-name/as/async-profiler/package.nix    |  2 +-
 pkgs/by-name/at/atac/package.nix              |  2 +-
 pkgs/by-name/at/athens/package.nix            |  2 +-
 pkgs/by-name/at/atlantis/package.nix          |  2 +-
 pkgs/by-name/at/atlas/package.nix             |  2 +-
 pkgs/by-name/at/atmos/package.nix             |  2 +-
 pkgs/by-name/at/atomic-operator/package.nix   |  2 +-
 pkgs/by-name/at/atomic-swap/package.nix       |  2 +-
 pkgs/by-name/at/atuin/package.nix             |  2 +-
 pkgs/by-name/au/audio-sharing/package.nix     |  2 +-
 pkgs/by-name/au/audiowaveform/package.nix     |  2 +-
 pkgs/by-name/au/augustus/package.nix          |  2 +-
 pkgs/by-name/au/authentik/package.nix         |  2 +-
 pkgs/by-name/au/authz0/package.nix            |  2 +-
 pkgs/by-name/au/autokey/package.nix           |  2 +-
 .../au/automatic-timezoned/package.nix        |  2 +-
 .../au/automaticcomponenttoolkit/package.nix  |  2 +-
 pkgs/by-name/au/automirror/package.nix        |  2 +-
 pkgs/by-name/au/automysqlbackup/package.nix   |  2 +-
 pkgs/by-name/au/autoprefixer/package.nix      |  2 +-
 pkgs/by-name/au/autoraise/package.nix         |  2 +-
 pkgs/by-name/au/autorestic/package.nix        |  2 +-
 pkgs/by-name/au/autotiling-rs/package.nix     |  2 +-
 pkgs/by-name/au/autotrace/package.nix         |  2 +-
 pkgs/by-name/av/avalonia/package.nix          |  2 +-
 pkgs/by-name/av/aviator/package.nix           |  2 +-
 pkgs/by-name/av/avizo/package.nix             |  2 +-
 pkgs/by-name/av/avra/package.nix              |  2 +-
 pkgs/by-name/aw/await/package.nix             |  2 +-
 pkgs/by-name/aw/awatcher/package.nix          |  2 +-
 pkgs/by-name/aw/awf/package.nix               |  2 +-
 pkgs/by-name/aw/aws-c-auth/package.nix        |  2 +-
 pkgs/by-name/aw/aws-c-common/package.nix      |  2 +-
 pkgs/by-name/aw/aws-c-compression/package.nix |  2 +-
 .../by-name/aw/aws-c-event-stream/package.nix |  2 +-
 pkgs/by-name/aw/aws-c-http/package.nix        |  2 +-
 pkgs/by-name/aw/aws-c-mqtt/package.nix        |  2 +-
 pkgs/by-name/aw/aws-c-s3/package.nix          |  2 +-
 pkgs/by-name/aw/aws-c-sdkutils/package.nix    |  2 +-
 pkgs/by-name/aw/aws-checksums/package.nix     |  2 +-
 .../aw/aws-codeartifact-proxy/package.nix     |  2 +-
 pkgs/by-name/aw/aws-crt-cpp/package.nix       |  2 +-
 pkgs/by-name/aw/aws-gate/package.nix          |  2 +-
 pkgs/by-name/aw/aws-lambda-rie/package.nix    |  2 +-
 pkgs/by-name/aw/aws-rotate-key/package.nix    |  2 +-
 .../by-name/aw/aws-signing-helper/package.nix |  2 +-
 pkgs/by-name/aw/aws-sso-cli/package.nix       |  2 +-
 pkgs/by-name/aw/aws-sso-creds/package.nix     |  2 +-
 pkgs/by-name/aw/aws-vault/package.nix         |  2 +-
 pkgs/by-name/aw/awsbck/package.nix            |  2 +-
 pkgs/by-name/aw/awslogs/package.nix           |  2 +-
 pkgs/by-name/aw/awsls/package.nix             |  2 +-
 pkgs/by-name/aw/awsrm/package.nix             |  2 +-
 pkgs/by-name/aw/awsweeper/package.nix         |  2 +-
 pkgs/by-name/ax/axmldec/package.nix           |  2 +-
 pkgs/by-name/ay/ayatana-ido/package.nix       |  2 +-
 pkgs/by-name/az/azimuth/package.nix           |  2 +-
 pkgs/by-name/az/azpainter/package.nix         |  2 +-
 .../azure-artifacts-credprovider/package.nix  |  2 +-
 pkgs/by-name/az/azurite/package.nix           |  2 +-
 pkgs/by-name/b6/b612/package.nix              |  2 +-
 pkgs/by-name/ba/babeltrace2/package.nix       |  2 +-
 pkgs/by-name/ba/backdown/package.nix          |  2 +-
 pkgs/by-name/ba/backgroundremover/package.nix |  2 +-
 pkgs/by-name/ba/backlight-auto/package.nix    |  2 +-
 pkgs/by-name/ba/backward-cpp/package.nix      |  2 +-
 pkgs/by-name/ba/badger/package.nix            |  2 +-
 pkgs/by-name/ba/badrobot/package.nix          |  2 +-
 pkgs/by-name/ba/badvpn/package.nix            |  2 +-
 pkgs/by-name/ba/baidupcs-go/package.nix       |  2 +-
 pkgs/by-name/ba/balena-cli/package.nix        |  2 +-
 pkgs/by-name/ba/balls/package.nix             |  2 +-
 pkgs/by-name/ba/bam/package.nix               |  2 +-
 pkgs/by-name/ba/bambu-studio/package.nix      |  2 +-
 pkgs/by-name/ba/bamf/package.nix              |  2 +-
 pkgs/by-name/ba/bandwhich/package.nix         |  2 +-
 pkgs/by-name/ba/bankstown-lv2/package.nix     |  2 +-
 pkgs/by-name/ba/bant/package.nix              |  2 +-
 pkgs/by-name/ba/baresip/package.nix           |  2 +-
 pkgs/by-name/ba/bartib/package.nix            |  2 +-
 .../ba/base16-universal-manager/package.nix   |  2 +-
 pkgs/by-name/ba/base16384/package.nix         |  2 +-
 pkgs/by-name/ba/bash-env-json/package.nix     |  2 +-
 pkgs/by-name/ba/bash-preexec/package.nix      |  2 +-
 pkgs/by-name/ba/bashSnippets/package.nix      |  2 +-
 pkgs/by-name/ba/bash_unit/package.nix         |  2 +-
 pkgs/by-name/ba/bashcards/package.nix         |  2 +-
 pkgs/by-name/ba/bashmount/package.nix         |  2 +-
 pkgs/by-name/ba/bastet/package.nix            |  2 +-
 pkgs/by-name/ba/bat/package.nix               |  2 +-
 pkgs/by-name/ba/bato/package.nix              |  2 +-
 pkgs/by-name/ba/bats/package.nix              |  2 +-
 pkgs/by-name/ba/batsignal/package.nix         |  2 +-
 pkgs/by-name/ba/bazel-buildtools/package.nix  |  2 +-
 pkgs/by-name/ba/bazel-gazelle/package.nix     |  2 +-
 pkgs/by-name/ba/bazel-kazel/package.nix       |  2 +-
 pkgs/by-name/ba/bazel-remote/package.nix      |  2 +-
 pkgs/by-name/ba/bazel-watcher/package.nix     |  2 +-
 pkgs/by-name/ba/bazelisk/package.nix          |  2 +-
 pkgs/by-name/bb/bbin/package.nix              |  2 +-
 pkgs/by-name/bc/bc-ur/package.nix             |  2 +-
 pkgs/by-name/bc/bcache-tools/package.nix      |  2 +-
 pkgs/by-name/bc/bcal/package.nix              |  2 +-
 pkgs/by-name/bc/bchoppr/package.nix           |  2 +-
 pkgs/by-name/bd/bdf2sfd/package.nix           |  2 +-
 pkgs/by-name/bd/bdsync/package.nix            |  2 +-
 .../be/beancount-language-server/package.nix  |  2 +-
 pkgs/by-name/be/beanstalkd/package.nix        |  2 +-
 pkgs/by-name/be/bear/package.nix              |  2 +-
 pkgs/by-name/be/beats/package.nix             |  2 +-
 pkgs/by-name/be/bedops/package.nix            |  2 +-
 pkgs/by-name/be/bedtools/package.nix          |  2 +-
 pkgs/by-name/be/bee/package.nix               |  2 +-
 pkgs/by-name/be/beefi/package.nix             |  2 +-
 pkgs/by-name/be/beep/package.nix              |  2 +-
 pkgs/by-name/be/bees/package.nix              |  2 +-
 pkgs/by-name/be/behdad-fonts/package.nix      |  2 +-
 pkgs/by-name/be/beidconnect/package.nix       |  2 +-
 pkgs/by-name/be/bemenu/package.nix            |  2 +-
 pkgs/by-name/be/benchexec/package.nix         |  2 +-
 pkgs/by-name/be/bencode/package.nix           |  2 +-
 pkgs/by-name/be/bento4/package.nix            |  2 +-
 pkgs/by-name/be/bepass/package.nix            |  2 +-
 pkgs/by-name/be/berglas/package.nix           |  2 +-
 pkgs/by-name/be/berry/package.nix             |  2 +-
 pkgs/by-name/be/bettercap/package.nix         |  2 +-
 pkgs/by-name/be/betterlockscreen/package.nix  |  2 +-
 pkgs/by-name/bf/bfc/package.nix               |  2 +-
 pkgs/by-name/bf/bfs/package.nix               |  2 +-
 pkgs/by-name/bg/bgpdump/package.nix           |  2 +-
 pkgs/by-name/bg/bgpq3/package.nix             |  2 +-
 pkgs/by-name/bg/bgpq4/package.nix             |  2 +-
 pkgs/by-name/bg/bgs/package.nix               |  2 +-
 pkgs/by-name/bi/bibata-cursors/package.nix    |  2 +-
 .../by-name/bi/biber-for-tectonic/package.nix |  2 +-
 pkgs/by-name/bi/biblatex-check/package.nix    |  2 +-
 pkgs/by-name/bi/biblesync/package.nix         |  2 +-
 pkgs/by-name/bi/bibtex-tidy/package.nix       |  2 +-
 pkgs/by-name/bi/bic/package.nix               |  2 +-
 pkgs/by-name/bi/bicep/package.nix             |  2 +-
 pkgs/by-name/bi/binbloom/package.nix          |  2 +-
 pkgs/by-name/bi/bindle/package.nix            |  2 +-
 pkgs/by-name/bi/bingo/package.nix             |  2 +-
 pkgs/by-name/bi/bingrep/package.nix           |  2 +-
 pkgs/by-name/bi/binserve/package.nix          |  2 +-
 pkgs/by-name/bi/binsider/package.nix          |  2 +-
 pkgs/by-name/bi/biodiff/package.nix           |  2 +-
 pkgs/by-name/bi/biosdevname/package.nix       |  2 +-
 pkgs/by-name/bi/bird-lg/package.nix           |  2 +-
 pkgs/by-name/bi/birdwatcher/package.nix       |  2 +-
 pkgs/by-name/bi/biscuit-cli/package.nix       |  2 +-
 pkgs/by-name/bi/bit/package.nix               |  2 +-
 .../bi/bitbake-language-server/package.nix    |  2 +-
 pkgs/by-name/bi/bitbox/package.nix            |  2 +-
 pkgs/by-name/bi/bitbucket-cli/package.nix     |  2 +-
 pkgs/by-name/bi/bitlbee-discord/package.nix   |  2 +-
 pkgs/by-name/bi/bitlbee-facebook/package.nix  |  2 +-
 pkgs/by-name/bi/bitlbee-steam/package.nix     |  2 +-
 pkgs/by-name/bi/bitmagnet/package.nix         |  2 +-
 pkgs/by-name/bi/bitrise/package.nix           |  2 +-
 pkgs/by-name/bi/bitwise/package.nix           |  2 +-
 pkgs/by-name/bi/bitwuzla/package.nix          |  2 +-
 pkgs/by-name/bj/bjumblr/package.nix           |  2 +-
 pkgs/by-name/bk/bkt/package.nix               |  2 +-
 pkgs/by-name/bl/blahaj/package.nix            |  2 +-
 pkgs/by-name/bl/blahtexml/package.nix         |  2 +-
 pkgs/by-name/bl/blanket/package.nix           |  2 +-
 pkgs/by-name/bl/blasfeo/package.nix           |  2 +-
 pkgs/by-name/bl/blendfarm/package.nix         |  2 +-
 pkgs/by-name/bl/blflash/package.nix           |  2 +-
 pkgs/by-name/bl/blink1-tool/package.nix       |  2 +-
 pkgs/by-name/bl/blis/package.nix              |  2 +-
 pkgs/by-name/bl/blitz/package.nix             |  2 +-
 pkgs/by-name/bl/blockbook/package.nix         |  2 +-
 pkgs/by-name/bl/blockhash/package.nix         |  2 +-
 pkgs/by-name/bl/blocky/package.nix            |  2 +-
 pkgs/by-name/bl/blogc/package.nix             |  2 +-
 pkgs/by-name/bl/blueberry/package.nix         |  2 +-
 pkgs/by-name/bl/bluespec/package.nix          |  2 +-
 pkgs/by-name/bl/bluetui/package.nix           |  2 +-
 pkgs/by-name/bl/bluetuith/package.nix         |  2 +-
 pkgs/by-name/bl/bluewalker/package.nix        |  2 +-
 pkgs/by-name/bl/blugon/package.nix            |  2 +-
 pkgs/by-name/bl/blur-effect/package.nix       |  2 +-
 pkgs/by-name/bm/bmaptool/package.nix          |  2 +-
 pkgs/by-name/bm/bmon/package.nix              |  2 +-
 pkgs/by-name/bn/bngblaster/package.nix        |  2 +-
 pkgs/by-name/bo/boa/package.nix               |  2 +-
 pkgs/by-name/bo/bob/package.nix               |  2 +-
 pkgs/by-name/bo/boca/package.nix              |  2 +-
 pkgs/by-name/bo/boltbrowser/package.nix       |  2 +-
 pkgs/by-name/bo/bom/package.nix               |  2 +-
 pkgs/by-name/bo/bombadillo/package.nix        |  2 +-
 pkgs/by-name/bo/bombardier/package.nix        |  2 +-
 pkgs/by-name/bo/bomutils/package.nix          |  2 +-
 pkgs/by-name/bo/bonk/package.nix              |  2 +-
 pkgs/by-name/bo/bonzomatic/package.nix        |  2 +-
 pkgs/by-name/bo/boogie/package.nix            |  2 +-
 pkgs/by-name/bo/boolector/package.nix         |  2 +-
 pkgs/by-name/bo/boops/package.nix             |  2 +-
 pkgs/by-name/bo/boost-sml/package.nix         |  2 +-
 pkgs/by-name/bo/booster/package.nix           |  2 +-
 pkgs/by-name/bo/bootc/package.nix             |  2 +-
 pkgs/by-name/bo/bootiso/package.nix           |  2 +-
 pkgs/by-name/bo/bootspec/package.nix          |  2 +-
 pkgs/by-name/bo/borealis-cursors/package.nix  |  2 +-
 pkgs/by-name/bo/bosh-cli/package.nix          |  2 +-
 pkgs/by-name/bo/bossa-arduino/package.nix     |  2 +-
 pkgs/by-name/bo/bossa/package.nix             |  2 +-
 pkgs/by-name/bo/bowtie/package.nix            |  2 +-
 pkgs/by-name/bo/boxbuddy/package.nix          |  2 +-
 pkgs/by-name/bo/boxes/package.nix             |  2 +-
 pkgs/by-name/bo/boxfort/package.nix           |  2 +-
 pkgs/by-name/bo/boxxy/package.nix             |  2 +-
 pkgs/by-name/bp/bpftrace/package.nix          |  2 +-
 pkgs/by-name/bp/bpp-core/package.nix          |  2 +-
 pkgs/by-name/bp/bpp-phyl/package.nix          |  2 +-
 pkgs/by-name/bp/bpp-popgen/package.nix        |  2 +-
 pkgs/by-name/bp/bpp-seq/package.nix           |  2 +-
 pkgs/by-name/bp/bppsuite/package.nix          |  2 +-
 pkgs/by-name/br/braincurses/package.nix       |  2 +-
 pkgs/by-name/br/break-time/package.nix        |  2 +-
 pkgs/by-name/br/brev-cli/package.nix          |  2 +-
 pkgs/by-name/br/brial/package.nix             |  2 +-
 pkgs/by-name/br/brickd/package.nix            |  2 +-
 pkgs/by-name/br/brig/package.nix              |  2 +-
 pkgs/by-name/br/brightnessctl/package.nix     |  2 +-
 pkgs/by-name/br/brillo/package.nix            |  2 +-
 pkgs/by-name/br/brmodelo/package.nix          |  2 +-
 pkgs/by-name/br/brook/package.nix             |  2 +-
 pkgs/by-name/br/broom/package.nix             |  2 +-
 pkgs/by-name/br/broot/package.nix             |  2 +-
 pkgs/by-name/br/browserpass/package.nix       |  2 +-
 pkgs/by-name/br/browsh/package.nix            |  2 +-
 pkgs/by-name/br/brunsli/package.nix           |  2 +-
 pkgs/by-name/br/bruteforce-luks/package.nix   |  2 +-
 .../br/bruteforce-salted-openssl/package.nix  |  2 +-
 pkgs/by-name/br/bruteforce-wallet/package.nix |  2 +-
 pkgs/by-name/bs/bs2b-lv2/package.nix          |  2 +-
 pkgs/by-name/bs/bschaffl/package.nix          |  2 +-
 pkgs/by-name/bs/bsequencer/package.nix        |  2 +-
 pkgs/by-name/bs/bshapr/package.nix            |  2 +-
 pkgs/by-name/bs/bslizr/package.nix            |  2 +-
 pkgs/by-name/bs/bspwm/package.nix             |  2 +-
 pkgs/by-name/bt/btc-rpc-explorer/package.nix  |  2 +-
 pkgs/by-name/bt/btcd/package.nix              |  2 +-
 pkgs/by-name/bt/btdu/package.nix              |  2 +-
 pkgs/by-name/bt/btfs/package.nix              |  2 +-
 pkgs/by-name/bt/btrfs-assistant/package.nix   |  2 +-
 .../bt/btrfs-auto-snapshot/package.nix        |  2 +-
 pkgs/by-name/bt/btrfs-heatmap/package.nix     |  2 +-
 pkgs/by-name/bt/btrfs-snap/package.nix        |  2 +-
 pkgs/by-name/bu/bubblewrap/package.nix        |  2 +-
 pkgs/by-name/bu/buckle/package.nix            |  2 +-
 pkgs/by-name/bu/buf/package.nix               |  2 +-
 pkgs/by-name/bu/buffer/package.nix            |  2 +-
 pkgs/by-name/bu/bufisk/package.nix            |  2 +-
 pkgs/by-name/bu/bugstalker/package.nix        |  2 +-
 pkgs/by-name/bu/buildkit-nix/package.nix      |  2 +-
 pkgs/by-name/bu/buildkit/package.nix          |  2 +-
 .../bu/buildkite-agent-metrics/package.nix    |  2 +-
 pkgs/by-name/bu/buildkite-agent/package.nix   |  2 +-
 pkgs/by-name/bu/buildkite-cli/package.nix     |  2 +-
 pkgs/by-name/bu/buku/package.nix              |  2 +-
 pkgs/by-name/bu/bukubrow/package.nix          |  2 +-
 pkgs/by-name/bu/bulky/package.nix             |  2 +-
 pkgs/by-name/bu/bulloak/package.nix           |  2 +-
 pkgs/by-name/bu/bully/package.nix             |  2 +-
 pkgs/by-name/bu/bump/package.nix              |  2 +-
 pkgs/by-name/bu/bundix/package.nix            |  2 +-
 pkgs/by-name/bu/bunnyfetch/package.nix        |  2 +-
 pkgs/by-name/bu/bunyan-rs/package.nix         |  2 +-
 pkgs/by-name/bu/bup/package.nix               |  2 +-
 pkgs/by-name/bu/burp/package.nix              |  2 +-
 pkgs/by-name/bu/bustools/package.nix          |  2 +-
 pkgs/by-name/bu/butane/package.nix            |  2 +-
 pkgs/by-name/bu/buttermanager/package.nix     |  2 +-
 pkgs/by-name/by/byobu/package.nix             |  2 +-
 pkgs/by-name/by/bytecode-viewer/package.nix   |  2 +-
 pkgs/by-name/c-/c-for-go/package.nix          |  2 +-
 pkgs/by-name/c2/c2fmzq/package.nix            |  2 +-
 pkgs/by-name/c2/c2nim/package.nix             |  2 +-
 pkgs/by-name/c2/c2patool/package.nix          |  2 +-
 pkgs/by-name/c3/c3-lsp/package.nix            |  2 +-
 pkgs/by-name/ca/cabal-cli/package.nix         |  2 +-
 pkgs/by-name/ca/cadvisor/package.nix          |  2 +-
 pkgs/by-name/ca/cadzinho/package.nix          |  2 +-
 pkgs/by-name/ca/caf/package.nix               |  2 +-
 pkgs/by-name/ca/cairo-lang/package.nix        |  2 +-
 .../ca/calamares-nixos-extensions/package.nix |  2 +-
 pkgs/by-name/ca/calendar-cli/package.nix      |  2 +-
 pkgs/by-name/ca/caligula/package.nix          |  2 +-
 pkgs/by-name/ca/cameractrls/package.nix       |  2 +-
 pkgs/by-name/ca/cameradar/package.nix         |  2 +-
 pkgs/by-name/ca/can-utils/package.nix         |  2 +-
 pkgs/by-name/ca/canta-theme/package.nix       |  2 +-
 pkgs/by-name/ca/canto-curses/package.nix      |  2 +-
 pkgs/by-name/ca/canto-daemon/package.nix      |  2 +-
 pkgs/by-name/ca/cantoolz/package.nix          |  2 +-
 pkgs/by-name/ca/caper/package.nix             |  2 +-
 pkgs/by-name/ca/capnproto-java/package.nix    |  2 +-
 pkgs/by-name/ca/capnproto/package.nix         |  2 +-
 pkgs/by-name/ca/caprice32/package.nix         |  2 +-
 pkgs/by-name/ca/caprine/package.nix           |  2 +-
 pkgs/by-name/ca/capslock/package.nix          |  2 +-
 pkgs/by-name/ca/capypdf/package.nix           |  2 +-
 pkgs/by-name/ca/carbon-now-cli/package.nix    |  2 +-
 pkgs/by-name/ca/cargo-about/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-autoinherit/package.nix |  2 +-
 pkgs/by-name/ca/cargo-benchcmp/package.nix    |  2 +-
 pkgs/by-name/ca/cargo-binstall/package.nix    |  2 +-
 .../by-name/ca/cargo-bisect-rustc/package.nix |  2 +-
 pkgs/by-name/ca/cargo-bitbake/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-bloat/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-bootimage/package.nix   |  2 +-
 pkgs/by-name/ca/cargo-bump/package.nix        |  2 +-
 .../ca/cargo-bundle-licenses/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-cache/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-careful/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-component/package.nix   |  2 +-
 pkgs/by-name/ca/cargo-cranky/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-criterion/package.nix   |  2 +-
 pkgs/by-name/ca/cargo-deadlinks/package.nix   |  2 +-
 pkgs/by-name/ca/cargo-deb/package.nix         |  2 +-
 pkgs/by-name/ca/cargo-deny/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-dephell/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-diet/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-dist/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-docset/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-duplicates/package.nix  |  2 +-
 pkgs/by-name/ca/cargo-espmonitor/package.nix  |  2 +-
 pkgs/by-name/ca/cargo-expand/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-feature/package.nix     |  2 +-
 .../ca/cargo-features-manager/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-fuzz/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-generate/package.nix    |  2 +-
 pkgs/by-name/ca/cargo-i18n/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-leptos/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-limit/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-llvm-cov/package.nix    |  2 +-
 pkgs/by-name/ca/cargo-llvm-lines/package.nix  |  2 +-
 .../ca/cargo-local-registry/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-machete/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-make/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-mutants/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-outdated/package.nix    |  2 +-
 pkgs/by-name/ca/cargo-pgo/package.nix         |  2 +-
 pkgs/by-name/ca/cargo-play/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-raze/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-readme/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-rr/package.nix          |  2 +-
 pkgs/by-name/ca/cargo-shear/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-shuttle/package.nix     |  2 +-
 pkgs/by-name/ca/cargo-sort/package.nix        |  2 +-
 .../by-name/ca/cargo-supply-chain/package.nix |  2 +-
 pkgs/by-name/ca/cargo-sweep/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-swift/package.nix       |  2 +-
 pkgs/by-name/ca/cargo-sync-readme/package.nix |  2 +-
 pkgs/by-name/ca/cargo-temp/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-typify/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-wipe/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-wizard/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-xbuild/package.nix      |  2 +-
 pkgs/by-name/ca/cargo-xwin/package.nix        |  2 +-
 pkgs/by-name/ca/cargo-zigbuild/package.nix    |  2 +-
 pkgs/by-name/ca/carl/package.nix              |  2 +-
 pkgs/by-name/ca/caroline/package.nix          |  2 +-
 pkgs/by-name/ca/carp/package.nix              |  2 +-
 pkgs/by-name/ca/carto/package.nix             |  2 +-
 pkgs/by-name/ca/casadi/package.nix            |  2 +-
 pkgs/by-name/ca/cassette/package.nix          |  2 +-
 pkgs/by-name/ca/cassowary/package.nix         |  2 +-
 pkgs/by-name/ca/castero/package.nix           |  2 +-
 pkgs/by-name/ca/castnow/package.nix           |  2 +-
 pkgs/by-name/ca/catatonit/package.nix         |  2 +-
 pkgs/by-name/ca/catch/package.nix             |  2 +-
 pkgs/by-name/ca/catimg/package.nix            |  2 +-
 pkgs/by-name/ca/catnip/package.nix            |  2 +-
 .../by-name/ca/catppuccin-cursors/package.nix |  2 +-
 pkgs/by-name/ca/catppuccin-grub/package.nix   |  2 +-
 pkgs/by-name/ca/catppuccin-gtk/package.nix    |  2 +-
 pkgs/by-name/ca/catppuccin-kde/package.nix    |  2 +-
 pkgs/by-name/ca/catppuccin-sddm/package.nix   |  2 +-
 .../ca/catppuccinifier-cli/package.nix        |  2 +-
 pkgs/by-name/ca/cava/package.nix              |  2 +-
 pkgs/by-name/ca/cayley/package.nix            |  2 +-
 pkgs/by-name/cb/cbatticon/package.nix         |  2 +-
 pkgs/by-name/cb/cbconvert/package.nix         |  2 +-
 pkgs/by-name/cb/cbfmt/package.nix             |  2 +-
 pkgs/by-name/cb/cbmp/package.nix              |  2 +-
 pkgs/by-name/cb/cbonsai/package.nix           |  2 +-
 pkgs/by-name/cc/ccls/package.nix              |  2 +-
 pkgs/by-name/cc/cconv/package.nix             |  2 +-
 pkgs/by-name/cd/cddlib/package.nix            |  2 +-
 pkgs/by-name/cd/cde/package.nix               |  2 +-
 pkgs/by-name/cd/cdogs-sdl/package.nix         |  2 +-
 pkgs/by-name/cd/cdwe/package.nix              |  2 +-
 pkgs/by-name/ce/cel-go/package.nix            |  2 +-
 pkgs/by-name/ce/celeste/package.nix           |  2 +-
 pkgs/by-name/ce/celeste64/package.nix         |  2 +-
 pkgs/by-name/ce/cemu/package.nix              |  2 +-
 pkgs/by-name/ce/centerpiece/package.nix       |  2 +-
 pkgs/by-name/ce/centrifugo/package.nix        |  2 +-
 pkgs/by-name/ce/ceph-csi/package.nix          |  2 +-
 pkgs/by-name/ce/cero/package.nix              |  2 +-
 pkgs/by-name/ce/certgraph/package.nix         |  2 +-
 pkgs/by-name/ce/certigo/package.nix           |  2 +-
 pkgs/by-name/ce/certinfo/package.nix          |  2 +-
 pkgs/by-name/ce/certmgr/package.nix           |  2 +-
 pkgs/by-name/ce/certspotter/package.nix       |  2 +-
 pkgs/by-name/ce/certstrap/package.nix         |  2 +-
 pkgs/by-name/ce/cewl/package.nix              |  2 +-
 pkgs/by-name/ce/cewler/package.nix            |  2 +-
 pkgs/by-name/cf/cf-terraforming/package.nix   |  2 +-
 pkgs/by-name/cf/cf-tool/package.nix           |  2 +-
 pkgs/by-name/cf/cf-vault/package.nix          |  2 +-
 pkgs/by-name/cf/cfdyndns/package.nix          |  2 +-
 pkgs/by-name/cf/cfm/package.nix               |  2 +-
 pkgs/by-name/cf/cfs-zen-tweaks/package.nix    |  2 +-
 pkgs/by-name/cf/cfssl/package.nix             |  2 +-
 pkgs/by-name/cg/cg3/package.nix               |  2 +-
 pkgs/by-name/cg/cglm/package.nix              |  2 +-
 pkgs/by-name/cg/cgminer/package.nix           |  2 +-
 pkgs/by-name/cg/cgreen/package.nix            |  2 +-
 pkgs/by-name/cg/cgt-calc/package.nix          |  2 +-
 pkgs/by-name/ch/chain-bench/package.nix       |  2 +-
 pkgs/by-name/ch/chamber/package.nix           |  2 +-
 pkgs/by-name/ch/changelogger/package.nix      |  2 +-
 pkgs/by-name/ch/changetower/package.nix       |  2 +-
 pkgs/by-name/ch/changie/package.nix           |  2 +-
 pkgs/by-name/ch/charasay/package.nix          |  2 +-
 pkgs/by-name/ch/charliecloud/package.nix      |  2 +-
 pkgs/by-name/ch/charm-freeze/package.nix      |  2 +-
 pkgs/by-name/ch/charm/package.nix             |  2 +-
 pkgs/by-name/ch/chart-testing/package.nix     |  2 +-
 pkgs/by-name/ch/chatd/package.nix             |  2 +-
 pkgs/by-name/ch/chatgpt-cli/package.nix       |  2 +-
 pkgs/by-name/ch/chatgpt-shell-cli/package.nix |  2 +-
 pkgs/by-name/ch/cheat/package.nix             |  2 +-
 pkgs/by-name/ch/checkmake/package.nix         |  2 +-
 pkgs/by-name/ch/checkmate/package.nix         |  2 +-
 pkgs/by-name/ch/checksec/package.nix          |  2 +-
 pkgs/by-name/ch/chelf/package.nix             |  2 +-
 pkgs/by-name/ch/cherry/package.nix            |  2 +-
 pkgs/by-name/ch/chess-tui/package.nix         |  2 +-
 pkgs/by-name/ch/chez-matchable/package.nix    |  2 +-
 pkgs/by-name/ch/chez-mit/package.nix          |  2 +-
 pkgs/by-name/ch/chez-scmutils/package.nix     |  2 +-
 pkgs/by-name/ch/chez-srfi/package.nix         |  2 +-
 pkgs/by-name/ch/chibi/package.nix             |  2 +-
 .../ch/chirpstack-concentratord/package.nix   |  2 +-
 .../ch/chirpstack-gateway-bridge/package.nix  |  2 +-
 .../ch/chirpstack-mqtt-forwarder/package.nix  |  2 +-
 .../ch/chirpstack-rest-api/package.nix        |  2 +-
 .../ch/chirpstack-udp-forwarder/package.nix   |  2 +-
 pkgs/by-name/ch/chit/package.nix              |  2 +-
 pkgs/by-name/ch/cholmod-extra/package.nix     |  2 +-
 pkgs/by-name/ch/choose-gui/package.nix        |  2 +-
 pkgs/by-name/ch/choose/package.nix            |  2 +-
 pkgs/by-name/ch/chopchop/package.nix          |  2 +-
 pkgs/by-name/ch/chroma/package.nix            |  2 +-
 pkgs/by-name/ch/chrome-export/package.nix     |  2 +-
 pkgs/by-name/ch/chruby-fish/package.nix       |  2 +-
 pkgs/by-name/ci/ciano/package.nix             |  2 +-
 pkgs/by-name/ci/ciao/package.nix              |  2 +-
 pkgs/by-name/ci/cicero-tui/package.nix        |  2 +-
 pkgs/by-name/ci/cidr-merger/package.nix       |  2 +-
 .../ci/cie-middleware-linux/package.nix       |  2 +-
 pkgs/by-name/ci/cinnamon-common/package.nix   |  2 +-
 .../ci/cinnamon-control-center/package.nix    |  2 +-
 pkgs/by-name/ci/cinnamon-desktop/package.nix  |  2 +-
 pkgs/by-name/ci/cinnamon-menus/package.nix    |  2 +-
 .../ci/cinnamon-screensaver/package.nix       |  2 +-
 pkgs/by-name/ci/cinnamon-session/package.nix  |  2 +-
 .../ci/cinnamon-settings-daemon/package.nix   |  2 +-
 .../ci/cinnamon-translations/package.nix      |  2 +-
 pkgs/by-name/ci/cinny-unwrapped/package.nix   |  2 +-
 pkgs/by-name/ci/cipher/package.nix            |  2 +-
 pkgs/by-name/ci/circleci-cli/package.nix      |  2 +-
 pkgs/by-name/ci/circom/package.nix            |  2 +-
 pkgs/by-name/ci/circumflex/package.nix        |  2 +-
 pkgs/by-name/ci/cirrus-cli/package.nix        |  2 +-
 pkgs/by-name/ci/cirrusgo/package.nix          |  2 +-
 pkgs/by-name/ci/cista/package.nix             |  2 +-
 pkgs/by-name/ci/citations/package.nix         |  2 +-
 pkgs/by-name/ci/civetweb/package.nix          |  2 +-
 pkgs/by-name/ci/civo/package.nix              |  2 +-
 pkgs/by-name/cj/cjose/package.nix             |  2 +-
 pkgs/by-name/cj/cjs/package.nix               |  2 +-
 pkgs/by-name/cj/cjson/package.nix             |  2 +-
 pkgs/by-name/cl/cl-wordle/package.nix         |  2 +-
 pkgs/by-name/cl/clair/package.nix             |  2 +-
 pkgs/by-name/cl/clairvoyant/package.nix       |  2 +-
 pkgs/by-name/cl/clamtk/package.nix            |  2 +-
 pkgs/by-name/cl/clang-uml/package.nix         |  2 +-
 pkgs/by-name/cl/clap/package.nix              |  2 +-
 pkgs/by-name/cl/clapboard/package.nix         |  2 +-
 pkgs/by-name/cl/classicube/package.nix        |  2 +-
 pkgs/by-name/cl/claws/package.nix             |  2 +-
 pkgs/by-name/cl/clblast/package.nix           |  2 +-
 pkgs/by-name/cl/clean-css-cli/package.nix     |  2 +-
 pkgs/by-name/cl/clever-tools/package.nix      |  2 +-
 pkgs/by-name/cl/clfft/package.nix             |  2 +-
 pkgs/by-name/cl/cli-visualizer/package.nix    |  2 +-
 pkgs/by-name/cl/cli53/package.nix             |  2 +-
 pkgs/by-name/cl/cliam/package.nix             |  2 +-
 pkgs/by-name/cl/clib/package.nix              |  2 +-
 pkgs/by-name/cl/click/package.nix             |  2 +-
 pkgs/by-name/cl/clickable/package.nix         |  2 +-
 pkgs/by-name/cl/clickhouse-backup/package.nix |  2 +-
 pkgs/by-name/cl/clifm/package.nix             |  2 +-
 pkgs/by-name/cl/clima/package.nix             |  2 +-
 pkgs/by-name/cl/cling/package.nix             |  2 +-
 pkgs/by-name/cl/clipboard-jh/package.nix      |  2 +-
 pkgs/by-name/cl/clipman/package.nix           |  2 +-
 pkgs/by-name/cl/clipmenu/package.nix          |  2 +-
 pkgs/by-name/cl/clipp/package.nix             |  2 +-
 pkgs/by-name/cl/clipqr/package.nix            |  2 +-
 pkgs/by-name/cl/clipse/package.nix            |  2 +-
 pkgs/by-name/cl/clipster/package.nix          |  2 +-
 pkgs/by-name/cl/cliquer/package.nix           |  2 +-
 pkgs/by-name/cl/cloak-pt/package.nix          |  2 +-
 pkgs/by-name/cl/cloc/package.nix              |  2 +-
 pkgs/by-name/cl/clojure-lsp/package.nix       |  2 +-
 pkgs/by-name/cl/clolcat/package.nix           |  2 +-
 pkgs/by-name/cl/cloud-hypervisor/package.nix  |  2 +-
 pkgs/by-name/cl/cloudbrute/package.nix        |  2 +-
 pkgs/by-name/cl/cloudflare-dyndns/package.nix |  2 +-
 pkgs/by-name/cl/cloudflare-utils/package.nix  |  2 +-
 pkgs/by-name/cl/cloudfoundry-cli/package.nix  |  2 +-
 pkgs/by-name/cl/cloudlens/package.nix         |  2 +-
 pkgs/by-name/cl/cloudlog/package.nix          |  2 +-
 pkgs/by-name/cl/cloudmonkey/package.nix       |  2 +-
 pkgs/by-name/cl/clpeak/package.nix            |  2 +-
 pkgs/by-name/cl/clubhouse-cli/package.nix     |  2 +-
 pkgs/by-name/cl/clusterctl/package.nix        |  2 +-
 pkgs/by-name/cm/cm256cc/package.nix           |  2 +-
 pkgs/by-name/cm/cmakerc/package.nix           |  2 +-
 pkgs/by-name/cm/cmark-gfm/package.nix         |  2 +-
 pkgs/by-name/cm/cmark/package.nix             |  2 +-
 pkgs/by-name/cm/cmatrix/package.nix           |  2 +-
 pkgs/by-name/cm/cmctl/package.nix             |  2 +-
 pkgs/by-name/cm/cmd-wrapped/package.nix       |  2 +-
 pkgs/by-name/cm/cmdstan/package.nix           |  2 +-
 pkgs/by-name/cm/cminpack/package.nix          |  2 +-
 pkgs/by-name/cm/cmrt/package.nix              |  2 +-
 pkgs/by-name/cm/cmusfm/package.nix            |  2 +-
 pkgs/by-name/cn/cntb/package.nix              |  2 +-
 pkgs/by-name/cn/cntr/package.nix              |  2 +-
 pkgs/by-name/co/cobra-cli/package.nix         |  2 +-
 pkgs/by-name/co/coc-css/package.nix           |  2 +-
 pkgs/by-name/co/cocogitto/package.nix         |  2 +-
 pkgs/by-name/co/cod/package.nix               |  2 +-
 pkgs/by-name/co/code-minimap/package.nix      |  2 +-
 pkgs/by-name/co/code2prompt/package.nix       |  2 +-
 pkgs/by-name/co/codebraid/package.nix         |  2 +-
 pkgs/by-name/co/codec2/package.nix            |  2 +-
 pkgs/by-name/co/codecrafters-cli/package.nix  |  2 +-
 pkgs/by-name/co/codeowners/package.nix        |  2 +-
 pkgs/by-name/co/codesearch/package.nix        |  2 +-
 pkgs/by-name/co/codespelunker/package.nix     |  2 +-
 pkgs/by-name/co/codevis/package.nix           |  2 +-
 pkgs/by-name/co/coffeescript/package.nix      |  2 +-
 pkgs/by-name/co/cog/package.nix               |  2 +-
 pkgs/by-name/co/cointop/package.nix           |  2 +-
 pkgs/by-name/co/coldsnap/package.nix          |  2 +-
 pkgs/by-name/co/colima/package.nix            |  2 +-
 pkgs/by-name/co/colloid-gtk-theme/package.nix |  2 +-
 .../by-name/co/colloid-icon-theme/package.nix |  2 +-
 pkgs/by-name/co/colmena/package.nix           |  2 +-
 pkgs/by-name/co/coloquinte/package.nix        |  2 +-
 pkgs/by-name/co/colordiff/package.nix         |  2 +-
 pkgs/by-name/co/colstr/package.nix            |  2 +-
 pkgs/by-name/co/comma/package.nix             |  2 +-
 pkgs/by-name/co/commafeed/package.nix         |  2 +-
 pkgs/by-name/co/commandergenius/package.nix   |  2 +-
 pkgs/by-name/co/commit-formatter/package.nix  |  2 +-
 pkgs/by-name/co/commitizen-go/package.nix     |  2 +-
 pkgs/by-name/co/commitmsgfmt/package.nix      |  2 +-
 pkgs/by-name/co/comodoro/package.nix          |  2 +-
 pkgs/by-name/co/compdb/package.nix            |  2 +-
 pkgs/by-name/co/compile-daemon/package.nix    |  2 +-
 pkgs/by-name/co/complete-alias/package.nix    |  2 +-
 pkgs/by-name/co/complgen/package.nix          |  2 +-
 pkgs/by-name/co/compose2nix/package.nix       |  2 +-
 pkgs/by-name/co/compsize/package.nix          |  2 +-
 pkgs/by-name/co/comrak/package.nix            |  2 +-
 pkgs/by-name/co/conceal/package.nix           |  2 +-
 pkgs/by-name/co/conduwuit/package.nix         |  2 +-
 .../co/configurable-http-proxy/package.nix    |  2 +-
 pkgs/by-name/co/confluencepot/package.nix     |  2 +-
 pkgs/by-name/co/conform/package.nix           |  2 +-
 pkgs/by-name/co/conjure/package.nix           |  2 +-
 pkgs/by-name/co/conmon-rs/package.nix         |  2 +-
 pkgs/by-name/co/conmon/package.nix            |  2 +-
 pkgs/by-name/co/connman-gtk/package.nix       |  2 +-
 pkgs/by-name/co/conserve/package.nix          |  2 +-
 pkgs/by-name/co/conserver/package.nix         |  2 +-
 pkgs/by-name/co/console-bridge/package.nix    |  2 +-
 pkgs/by-name/co/construct/package.nix         |  2 +-
 pkgs/by-name/co/consul-alerts/package.nix     |  2 +-
 pkgs/by-name/co/consul-template/package.nix   |  2 +-
 .../co/container-structure-test/package.nix   |  2 +-
 pkgs/by-name/co/containerlab/package.nix      |  2 +-
 pkgs/by-name/co/convco/package.nix            |  2 +-
 pkgs/by-name/co/convimg/package.nix           |  2 +-
 pkgs/by-name/co/convos/package.nix            |  2 +-
 pkgs/by-name/co/cook-cli/package.nix          |  2 +-
 pkgs/by-name/co/copilot-cli/package.nix       |  2 +-
 .../co/copilot-node-server/package.nix        |  2 +-
 pkgs/by-name/co/coppwr/package.nix            |  2 +-
 pkgs/by-name/co/coq2html/package.nix          |  2 +-
 pkgs/by-name/co/cordless/package.nix          |  2 +-
 pkgs/by-name/co/cordova/package.nix           |  2 +-
 pkgs/by-name/co/coredns/package.nix           |  2 +-
 pkgs/by-name/co/corerad/package.nix           |  2 +-
 pkgs/by-name/co/coreth/package.nix            |  2 +-
 pkgs/by-name/co/corkscrew/package.nix         |  2 +-
 pkgs/by-name/co/coroot-node-agent/package.nix |  2 +-
 pkgs/by-name/co/coroot/package.nix            |  2 +-
 pkgs/by-name/co/corrosion/package.nix         |  2 +-
 pkgs/by-name/co/cosmopolitan/package.nix      |  2 +-
 pkgs/by-name/co/costa/package.nix             |  2 +-
 pkgs/by-name/co/cotp/package.nix              |  2 +-
 pkgs/by-name/co/couchbase-shell/package.nix   |  2 +-
 pkgs/by-name/co/coulr/package.nix             |  2 +-
 pkgs/by-name/co/cowpatty/package.nix          |  2 +-
 pkgs/by-name/co/coz/package.nix               |  2 +-
 pkgs/by-name/co/coze/package.nix              |  2 +-
 pkgs/by-name/co/cozy/package.nix              |  2 +-
 pkgs/by-name/cp/cp2k/package.nix              |  2 +-
 pkgs/by-name/cp/cp437/package.nix             |  2 +-
 pkgs/by-name/cp/cpcfs/package.nix             |  2 +-
 pkgs/by-name/cp/cplay-ng/package.nix          |  2 +-
 pkgs/by-name/cp/cpp-hocon/package.nix         |  2 +-
 pkgs/by-name/cp/cpp-jwt/package.nix           |  2 +-
 pkgs/by-name/cp/cpp-redis/package.nix         |  2 +-
 pkgs/by-name/cp/cppclean/package.nix          |  2 +-
 pkgs/by-name/cp/cppe/package.nix              |  2 +-
 pkgs/by-name/cp/cppzmq/package.nix            |  2 +-
 pkgs/by-name/cp/cpu-energy-meter/package.nix  |  2 +-
 pkgs/by-name/cp/cpu_features/package.nix      |  2 +-
 pkgs/by-name/cp/cpufetch/package.nix          |  2 +-
 pkgs/by-name/cp/cpulimit/package.nix          |  2 +-
 pkgs/by-name/cp/cpuminer/package.nix          |  2 +-
 pkgs/by-name/cp/cpuset/package.nix            |  2 +-
 pkgs/by-name/cq/cq/package.nix                |  2 +-
 pkgs/by-name/cr/crabz/package.nix             |  2 +-
 pkgs/by-name/cr/crackxls/package.nix          |  2 +-
 pkgs/by-name/cr/craftos-pc/package.nix        |  6 +-
 pkgs/by-name/cr/crate2nix/package.nix         |  2 +-
 pkgs/by-name/cr/crawley/package.nix           |  2 +-
 pkgs/by-name/cr/crc/package.nix               |  2 +-
 pkgs/by-name/cr/crc32c/package.nix            |  2 +-
 pkgs/by-name/cr/crd2pulumi/package.nix        |  2 +-
 pkgs/by-name/cr/cre2/package.nix              |  2 +-
 pkgs/by-name/cr/create-react-app/package.nix  |  2 +-
 .../cr/credential-detector/package.nix        |  2 +-
 pkgs/by-name/cr/credhub-cli/package.nix       |  2 +-
 pkgs/by-name/cr/creep/package.nix             |  2 +-
 pkgs/by-name/cr/crex/package.nix              |  2 +-
 pkgs/by-name/cr/cri-tools/package.nix         |  2 +-
 pkgs/by-name/cr/critcmp/package.nix           |  2 +-
 pkgs/by-name/cr/criterion/package.nix         |  2 +-
 pkgs/by-name/cr/criu/package.nix              |  2 +-
 pkgs/by-name/cr/crlfuzz/package.nix           |  2 +-
 pkgs/by-name/cr/croaring/package.nix          |  2 +-
 pkgs/by-name/cr/croc/package.nix              |  2 +-
 pkgs/by-name/cr/crossplane-cli/package.nix    |  2 +-
 pkgs/by-name/cr/crudini/package.nix           |  2 +-
 pkgs/by-name/cr/crumbs/package.nix            |  2 +-
 pkgs/by-name/cr/crun/package.nix              |  2 +-
 pkgs/by-name/cr/cryfs/package.nix             |  2 +-
 pkgs/by-name/cr/crypto-tracker/package.nix    |  2 +-
 pkgs/by-name/cr/cryptominisat/package.nix     |  2 +-
 pkgs/by-name/cr/cryptpad/package.nix          |  2 +-
 pkgs/by-name/cr/crystal2nix/package.nix       |  2 +-
 pkgs/by-name/cs/csdr/package.nix              |  2 +-
 pkgs/by-name/cs/cshatag/package.nix           |  2 +-
 pkgs/by-name/cs/csound-manual/package.nix     |  2 +-
 pkgs/by-name/cs/css-checker/package.nix       |  2 +-
 pkgs/by-name/cs/csv-tui/package.nix           |  2 +-
 pkgs/by-name/cs/csv2parquet/package.nix       |  2 +-
 pkgs/by-name/cs/csvdiff/package.nix           |  2 +-
 pkgs/by-name/cs/csview/package.nix            |  2 +-
 pkgs/by-name/cs/csvq/package.nix              |  2 +-
 pkgs/by-name/cs/csvquote/package.nix          |  2 +-
 pkgs/by-name/cs/csvs-to-sqlite/package.nix    |  2 +-
 pkgs/by-name/cs/csxcad/package.nix            |  2 +-
 pkgs/by-name/ct/ctlptl/package.nix            |  2 +-
 pkgs/by-name/ct/ctodo/package.nix             |  2 +-
 pkgs/by-name/ct/ctop/package.nix              |  2 +-
 pkgs/by-name/ct/ctpv/package.nix              |  2 +-
 pkgs/by-name/ct/ctre/package.nix              |  2 +-
 pkgs/by-name/ct/ctypes_sh/package.nix         |  2 +-
 pkgs/by-name/cu/cuelsp/package.nix            |  2 +-
 pkgs/by-name/cu/cuetools/package.nix          |  2 +-
 pkgs/by-name/cu/cuetsy/package.nix            |  2 +-
 pkgs/by-name/cu/cunicu/package.nix            |  2 +-
 pkgs/by-name/cu/cups-browsed/package.nix      |  2 +-
 pkgs/by-name/cu/curlie/package.nix            |  2 +-
 pkgs/by-name/cu/curlpp/package.nix            |  2 +-
 pkgs/by-name/cu/cursewords/package.nix        |  2 +-
 pkgs/by-name/cv/cvc4/package.nix              |  2 +-
 pkgs/by-name/cw/cw/package.nix                |  2 +-
 pkgs/by-name/cw/cwe-client-cli/package.nix    |  2 +-
 pkgs/by-name/cw/cwm/package.nix               |  2 +-
 pkgs/by-name/cx/cxx-rs/package.nix            |  2 +-
 pkgs/by-name/cx/cxxopts/package.nix           |  2 +-
 pkgs/by-name/cy/cyan/package.nix              |  2 +-
 pkgs/by-name/cy/cyclone-scheme/package.nix    |  4 +-
 pkgs/by-name/cy/cyclonedds-cxx/package.nix    |  2 +-
 pkgs/by-name/cy/cyclonedds/package.nix        |  2 +-
 pkgs/by-name/cy/cyme/package.nix              |  2 +-
 .../by-name/cy/cyrus-sasl-xoauth2/package.nix |  2 +-
 pkgs/by-name/d-/d-seams/package.nix           |  2 +-
 pkgs/by-name/da/dablin/package.nix            |  2 +-
 pkgs/by-name/da/dae/package.nix               |  2 +-
 pkgs/by-name/da/daktilo/package.nix           |  2 +-
 pkgs/by-name/da/dapper/package.nix            |  2 +-
 pkgs/by-name/da/dapr-cli/package.nix          |  2 +-
 pkgs/by-name/da/darkhttpd/package.nix         |  2 +-
 pkgs/by-name/da/darklua/package.nix           |  2 +-
 pkgs/by-name/da/darkman/package.nix           |  2 +-
 pkgs/by-name/da/darktile/package.nix          |  2 +-
 pkgs/by-name/da/dart-sass/package.nix         |  2 +-
 pkgs/by-name/da/dasel/package.nix             |  2 +-
 pkgs/by-name/da/dashing/package.nix           |  2 +-
 pkgs/by-name/da/dasht/package.nix             |  2 +-
 pkgs/by-name/da/dasm/package.nix              |  2 +-
 pkgs/by-name/da/datafusion-cli/package.nix    |  2 +-
 pkgs/by-name/da/dav1d/package.nix             |  2 +-
 pkgs/by-name/db/db-rest/package.nix           |  2 +-
 pkgs/by-name/db/dbcsr/package.nix             |  2 +-
 pkgs/by-name/db/dblab/package.nix             |  2 +-
 pkgs/by-name/db/dbqn/package.nix              |  2 +-
 pkgs/by-name/db/dbus-cpp/package.nix          |  2 +-
 pkgs/by-name/dc/dcap/package.nix              |  2 +-
 pkgs/by-name/dd/ddccontrol-db/package.nix     |  2 +-
 pkgs/by-name/dd/ddccontrol/package.nix        |  2 +-
 pkgs/by-name/dd/ddclient/package.nix          |  2 +-
 pkgs/by-name/dd/ddev/package.nix              |  2 +-
 pkgs/by-name/dd/ddgr/package.nix              |  2 +-
 pkgs/by-name/dd/ddh/package.nix               |  2 +-
 pkgs/by-name/dd/ddns-go/package.nix           |  2 +-
 pkgs/by-name/dd/ddns-updater/package.nix      |  2 +-
 pkgs/by-name/dd/dduper/package.nix            |  2 +-
 pkgs/by-name/de/deadnix/package.nix           |  2 +-
 pkgs/by-name/de/decker/package.nix            |  2 +-
 pkgs/by-name/de/decktape/package.nix          |  2 +-
 pkgs/by-name/de/deepfilternet/package.nix     |  2 +-
 pkgs/by-name/de/deepsea/package.nix           |  2 +-
 pkgs/by-name/de/deepsource/package.nix        |  2 +-
 pkgs/by-name/de/deer/package.nix              |  2 +-
 pkgs/by-name/de/degit/package.nix             |  2 +-
 pkgs/by-name/de/dehydrated/package.nix        |  2 +-
 pkgs/by-name/de/deja-dup/package.nix          |  2 +-
 pkgs/by-name/de/dejsonlz4/package.nix         |  2 +-
 pkgs/by-name/de/delve/package.nix             |  2 +-
 pkgs/by-name/de/demoit/package.nix            |  2 +-
 pkgs/by-name/de/denaro/package.nix            |  2 +-
 pkgs/by-name/de/dendrite/package.nix          |  2 +-
 pkgs/by-name/de/dep-tree/package.nix          |  2 +-
 pkgs/by-name/de/dependabot-cli/package.nix    |  2 +-
 pkgs/by-name/de/dependency-track/package.nix  |  4 +-
 pkgs/by-name/de/der-ascii/package.nix         |  2 +-
 pkgs/by-name/de/design/package.nix            |  2 +-
 pkgs/by-name/de/deskew/package.nix            |  2 +-
 pkgs/by-name/de/desktop-postflop/package.nix  |  2 +-
 pkgs/by-name/de/detect-it-easy/package.nix    |  2 +-
 pkgs/by-name/de/detox/package.nix             |  2 +-
 pkgs/by-name/de/devenv/package.nix            |  2 +-
 pkgs/by-name/de/devour/package.nix            |  2 +-
 pkgs/by-name/de/devspace/package.nix          |  2 +-
 pkgs/by-name/de/dex-oidc/package.nix          |  2 +-
 pkgs/by-name/de/dex/package.nix               |  2 +-
 pkgs/by-name/df/dfrs/package.nix              |  2 +-
 pkgs/by-name/df/dftd4/package.nix             |  2 +-
 pkgs/by-name/dg/dgraph/package.nix            |  2 +-
 pkgs/by-name/dh/dhcpcd/package.nix            |  2 +-
 pkgs/by-name/dh/dhewm3/package.nix            |  2 +-
 pkgs/by-name/di/di-tui/package.nix            |  2 +-
 pkgs/by-name/di/diamond/package.nix           |  2 +-
 pkgs/by-name/di/dictu/package.nix             |  2 +-
 pkgs/by-name/di/didder/package.nix            |  2 +-
 pkgs/by-name/di/didyoumean/package.nix        |  2 +-
 pkgs/by-name/di/diff-so-fancy/package.nix     |  2 +-
 pkgs/by-name/di/diffoci/package.nix           |  2 +-
 pkgs/by-name/di/diffsitter/package.nix        |  2 +-
 pkgs/by-name/di/diffuse/package.nix           |  2 +-
 pkgs/by-name/di/digital/package.nix           |  2 +-
 pkgs/by-name/di/digitemp/package.nix          |  2 +-
 pkgs/by-name/di/dinit/package.nix             |  2 +-
 pkgs/by-name/di/diopser/package.nix           |  2 +-
 pkgs/by-name/di/dippi/package.nix             |  2 +-
 pkgs/by-name/di/directx-headers/package.nix   |  2 +-
 pkgs/by-name/di/direnv/package.nix            |  2 +-
 pkgs/by-name/di/dirstalk/package.nix          |  2 +-
 pkgs/by-name/di/discocss/package.nix          |  2 +-
 pkgs/by-name/di/discord-sh/package.nix        |  2 +-
 .../di/discordchatexporter-cli/package.nix    |  2 +-
 .../discordchatexporter-desktop/package.nix   |  2 +-
 pkgs/by-name/di/discount/package.nix          |  2 +-
 .../di/discourse-mail-receiver/package.nix    |  2 +-
 pkgs/by-name/di/disfetch/package.nix          |  2 +-
 pkgs/by-name/di/diskrsync/package.nix         |  2 +-
 pkgs/by-name/di/diskscan/package.nix          |  2 +-
 pkgs/by-name/di/dislocker/package.nix         |  2 +-
 pkgs/by-name/di/dismap/package.nix            |  2 +-
 pkgs/by-name/di/dispad/package.nix            |  2 +-
 pkgs/by-name/di/distrobox-tui/package.nix     |  2 +-
 pkgs/by-name/di/distrobox/package.nix         |  2 +-
 pkgs/by-name/di/diswall/package.nix           |  2 +-
 pkgs/by-name/di/dive/package.nix              |  2 +-
 pkgs/by-name/dj/djenrandom/package.nix        |  2 +-
 pkgs/by-name/dj/djent/package.nix             |  2 +-
 pkgs/by-name/dk/dkh/package.nix               |  2 +-
 pkgs/by-name/dl/dl-librescore/package.nix     |  2 +-
 .../dl/dleyna-connector-dbus/package.nix      |  2 +-
 pkgs/by-name/dl/dleyna-core/package.nix       |  2 +-
 pkgs/by-name/dl/dleyna-renderer/package.nix   |  2 +-
 pkgs/by-name/dl/dleyna-server/package.nix     |  2 +-
 .../dm/dmarc-report-converter/package.nix     |  2 +-
 pkgs/by-name/dm/dmrconfig/package.nix         |  2 +-
 pkgs/by-name/dn/dnadd/package.nix             |  2 +-
 pkgs/by-name/dn/dnglab/package.nix            |  2 +-
 pkgs/by-name/dn/dnscrypt-proxy/package.nix    |  2 +-
 pkgs/by-name/dn/dnsdbq/package.nix            |  2 +-
 pkgs/by-name/dn/dnsenum/package.nix           |  2 +-
 pkgs/by-name/dn/dnsname-cni/package.nix       |  2 +-
 pkgs/by-name/dn/dnspeep/package.nix           |  2 +-
 pkgs/by-name/dn/dnsperf/package.nix           |  2 +-
 pkgs/by-name/dn/dnsproxy/package.nix          |  2 +-
 pkgs/by-name/dn/dnstake/package.nix           |  2 +-
 pkgs/by-name/do/do-agent/package.nix          |  2 +-
 pkgs/by-name/do/doas-sudo-shim/package.nix    |  2 +-
 pkgs/by-name/do/doas/package.nix              |  2 +-
 pkgs/by-name/do/doc2go/package.nix            |  2 +-
 pkgs/by-name/do/docfd/package.nix             |  2 +-
 pkgs/by-name/do/dockbarx/package.nix          |  2 +-
 .../package.nix                               |  2 +-
 .../do/docker-credential-helpers/package.nix  |  2 +-
 pkgs/by-name/do/docker-ls/package.nix         |  2 +-
 pkgs/by-name/do/docker-slim/package.nix       |  2 +-
 .../package.nix                               |  2 +-
 pkgs/by-name/do/dockle/package.nix            |  2 +-
 pkgs/by-name/do/dockutil/package.nix          |  2 +-
 pkgs/by-name/do/docopt_cpp/package.nix        |  2 +-
 pkgs/by-name/do/doctave/package.nix           |  2 +-
 pkgs/by-name/do/doctest/package.nix           |  2 +-
 pkgs/by-name/do/doctl/package.nix             |  2 +-
 pkgs/by-name/do/doctoc/package.nix            |  2 +-
 pkgs/by-name/do/docui/package.nix             |  2 +-
 pkgs/by-name/do/documenso/package.nix         |  2 +-
 .../by-name/do/documize-community/package.nix |  2 +-
 pkgs/by-name/do/docuum/package.nix            |  2 +-
 pkgs/by-name/do/doge/package.nix              |  2 +-
 pkgs/by-name/do/dogedns/package.nix           |  2 +-
 pkgs/by-name/do/doggo/package.nix             |  2 +-
 pkgs/by-name/do/dolt/package.nix              |  2 +-
 pkgs/by-name/do/done/package.nix              |  2 +-
 pkgs/by-name/do/dool/package.nix              |  2 +-
 pkgs/by-name/do/door-knocker/package.nix      |  2 +-
 pkgs/by-name/do/doppler/package.nix           |  2 +-
 pkgs/by-name/do/dorkscout/package.nix         |  2 +-
 pkgs/by-name/do/dosfstools/package.nix        |  2 +-
 .../do/dot-language-server/package.nix        |  2 +-
 pkgs/by-name/do/dotconf/package.nix           |  2 +-
 pkgs/by-name/do/dotenv-cli/package.nix        |  2 +-
 pkgs/by-name/do/dotnet-outdated/package.nix   |  2 +-
 pkgs/by-name/do/dotter/package.nix            |  2 +-
 pkgs/by-name/do/double-conversion/package.nix |  2 +-
 .../do/double-entry-generator/package.nix     |  2 +-
 .../by-name/do/dovecot_fts_xapian/package.nix |  2 +-
 pkgs/by-name/dp/dpt-rp1-py/package.nix        |  2 +-
 pkgs/by-name/dr/dr14_tmeter/package.nix       |  2 +-
 pkgs/by-name/dr/dracut/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/dreamchess/package.nix        |  2 +-
 pkgs/by-name/dr/driftctl/package.nix          |  2 +-
 pkgs/by-name/dr/drip/package.nix              |  2 +-
 pkgs/by-name/dr/drive/package.nix             |  2 +-
 pkgs/by-name/dr/droidcam/package.nix          |  2 +-
 pkgs/by-name/dr/drone-scp/package.nix         |  2 +-
 pkgs/by-name/dr/dropwatch/package.nix         |  2 +-
 pkgs/by-name/dr/dry/package.nix               |  2 +-
 pkgs/by-name/ds/dsda-doom/package.nix         |  2 +-
 pkgs/by-name/ds/dsq/package.nix               |  2 +-
 pkgs/by-name/ds/dstask/package.nix            |  2 +-
 pkgs/by-name/ds/dstep/package.nix             |  2 +-
 pkgs/by-name/ds/dstp/package.nix              |  2 +-
 pkgs/by-name/ds/dsvpn/package.nix             |  2 +-
 pkgs/by-name/dt/dtcmp/package.nix             |  2 +-
 pkgs/by-name/dt/dtool/package.nix             |  2 +-
 pkgs/by-name/dt/dtrx/package.nix              |  2 +-
 pkgs/by-name/du/duc/package.nix               |  2 +-
 pkgs/by-name/du/duf/package.nix               |  2 +-
 pkgs/by-name/du/dufs/package.nix              |  2 +-
 pkgs/by-name/du/dum/package.nix               |  2 +-
 pkgs/by-name/du/dumb-init/package.nix         |  2 +-
 pkgs/by-name/du/dumb/package.nix              |  2 +-
 pkgs/by-name/du/dumbpipe/package.nix          |  2 +-
 pkgs/by-name/du/dummyhttp/package.nix         |  2 +-
 pkgs/by-name/du/dump1090/package.nix          |  2 +-
 pkgs/by-name/du/dupd/package.nix              |  2 +-
 pkgs/by-name/du/dupe-krill/package.nix        |  2 +-
 pkgs/by-name/du/duperemove/package.nix        |  2 +-
 pkgs/by-name/du/duplicacy/package.nix         |  2 +-
 pkgs/by-name/du/dust/package.nix              |  2 +-
 pkgs/by-name/du/dutree/package.nix            |  2 +-
 pkgs/by-name/dy/dyff/package.nix              |  2 +-
 pkgs/by-name/dy/dynamic-colors/package.nix    |  2 +-
 pkgs/by-name/dy/dynamic-wallpaper/package.nix |  2 +-
 pkgs/by-name/dy/dynein/package.nix            |  2 +-
 pkgs/by-name/dy/dysk/package.nix              |  2 +-
 pkgs/by-name/ea/ea/package.nix                |  2 +-
 pkgs/by-name/ea/each/package.nix              |  2 +-
 pkgs/by-name/ea/earlybird/package.nix         |  2 +-
 pkgs/by-name/ea/earthly/package.nix           |  2 +-
 pkgs/by-name/ea/earthlyls/package.nix         |  2 +-
 pkgs/by-name/ea/easeprobe/package.nix         |  2 +-
 pkgs/by-name/ea/eask-cli/package.nix          |  2 +-
 pkgs/by-name/ea/easyjson/package.nix          |  2 +-
 pkgs/by-name/ea/easyloggingpp/package.nix     |  2 +-
 pkgs/by-name/ea/easypdkprog/package.nix       |  2 +-
 pkgs/by-name/ea/easyrsa/package.nix           |  2 +-
 pkgs/by-name/eb/ebusd/package.nix             |  2 +-
 pkgs/by-name/ec/ec2-metadata-mock/package.nix |  2 +-
 pkgs/by-name/ec/ecc/package.nix               |  2 +-
 pkgs/by-name/ec/ecdsautils/package.nix        |  2 +-
 pkgs/by-name/ec/eclint/package.nix            |  2 +-
 pkgs/by-name/ec/ecos/package.nix              |  2 +-
 pkgs/by-name/ec/ecs-agent/package.nix         |  2 +-
 pkgs/by-name/ed/edge-runtime/package.nix      |  2 +-
 pkgs/by-name/ed/editline/package.nix          |  2 +-
 .../ed/editorconfig-checker/package.nix       |  2 +-
 pkgs/by-name/ed/edwood/package.nix            |  2 +-
 pkgs/by-name/ef/eff/package.nix               |  2 +-
 .../ef/efficient-compression-tool/package.nix |  2 +-
 pkgs/by-name/ef/effitask/package.nix          |  2 +-
 pkgs/by-name/ef/efivar/package.nix            |  2 +-
 pkgs/by-name/ef/efm-langserver/package.nix    |  2 +-
 pkgs/by-name/ef/efmt/package.nix              |  2 +-
 pkgs/by-name/eg/eg25-manager/package.nix      |  2 +-
 pkgs/by-name/eg/eget/package.nix              |  2 +-
 pkgs/by-name/eg/egglog/package.nix            |  2 +-
 pkgs/by-name/eg/egl-wayland/package.nix       |  2 +-
 .../eg/eglexternalplatform/package.nix        |  2 +-
 pkgs/by-name/eg/ego/package.nix               |  2 +-
 pkgs/by-name/ei/eiciel/package.nix            |  2 +-
 pkgs/by-name/ei/eigenlayer/package.nix        |  2 +-
 pkgs/by-name/ei/eiwd/package.nix              |  2 +-
 pkgs/by-name/ej/ejs/package.nix               |  2 +-
 pkgs/by-name/ej/ejson/package.nix             |  2 +-
 pkgs/by-name/ej/ejson2env/package.nix         |  2 +-
 pkgs/by-name/ej/ejsonkms/package.nix          |  2 +-
 pkgs/by-name/ek/eksctl/package.nix            |  2 +-
 pkgs/by-name/el/elan/package.nix              |  2 +-
 pkgs/by-name/el/elektroid/package.nix         |  2 +-
 .../el/element-desktop/keytar/default.nix     |  2 +-
 .../el/element-desktop/seshat/default.nix     |  2 +-
 pkgs/by-name/el/element/package.nix           |  2 +-
 .../el/elementary-xfce-icon-theme/package.nix |  2 +-
 pkgs/by-name/el/elf-info/package.nix          |  2 +-
 pkgs/by-name/el/elf2nucleus/package.nix       |  2 +-
 pkgs/by-name/el/elfcat/package.nix            |  2 +-
 pkgs/by-name/el/elfinfo/package.nix           |  2 +-
 pkgs/by-name/el/ell/package.nix               |  2 +-
 pkgs/by-name/el/elm-land/package.nix          |  2 +-
 pkgs/by-name/el/elogind/package.nix           |  2 +-
 pkgs/by-name/el/eludris/package.nix           |  2 +-
 pkgs/by-name/el/elvish/package.nix            |  2 +-
 pkgs/by-name/em/emacs-lsp-booster/package.nix |  2 +-
 pkgs/by-name/em/emacspeak/package.nix         |  2 +-
 pkgs/by-name/em/emmet-ls/package.nix          |  2 +-
 pkgs/by-name/em/emoji-picker/package.nix      |  2 +-
 pkgs/by-name/em/emojify/package.nix           |  2 +-
 pkgs/by-name/em/emote/package.nix             |  2 +-
 pkgs/by-name/em/emptty/package.nix            |  2 +-
 pkgs/by-name/em/emulsion-palette/package.nix  |  2 +-
 pkgs/by-name/en/enc/package.nix               |  2 +-
 pkgs/by-name/en/enchive/package.nix           |  2 +-
 pkgs/by-name/en/encpipe/package.nix           |  2 +-
 .../en/endgame-singularity/package.nix        |  2 +-
 pkgs/by-name/en/endlessh-go/package.nix       |  2 +-
 pkgs/by-name/en/endlessh/package.nix          |  2 +-
 pkgs/by-name/en/endlines/package.nix          |  2 +-
 pkgs/by-name/en/enjarify/package.nix          |  2 +-
 pkgs/by-name/en/enkei/package.nix             |  2 +-
 pkgs/by-name/en/ent-go/package.nix            |  2 +-
 pkgs/by-name/en/entropy/package.nix           |  2 +-
 pkgs/by-name/en/entt/package.nix              |  2 +-
 pkgs/by-name/en/entwine/package.nix           |  2 +-
 pkgs/by-name/en/enum4linux/package.nix        |  2 +-
 pkgs/by-name/en/envconsul/package.nix         |  2 +-
 pkgs/by-name/en/envfs/package.nix             |  2 +-
 pkgs/by-name/en/envio/package.nix             |  2 +-
 .../by-name/en/envision-unwrapped/package.nix |  2 +-
 pkgs/by-name/en/envsubst/package.nix          |  2 +-
 pkgs/by-name/en/enzyme/package.nix            |  2 +-
 pkgs/by-name/ep/epeg/package.nix              |  2 +-
 pkgs/by-name/ep/epgstation/package.nix        |  2 +-
 pkgs/by-name/ep/ephemeral/package.nix         |  2 +-
 pkgs/by-name/ep/epilys-bb/package.nix         |  2 +-
 pkgs/by-name/ep/epm/package.nix               |  2 +-
 pkgs/by-name/ep/epr/package.nix               |  2 +-
 pkgs/by-name/er/er-patcher/package.nix        |  2 +-
 pkgs/by-name/er/erdtree/package.nix           |  2 +-
 pkgs/by-name/er/eresi/package.nix             |  2 +-
 pkgs/by-name/er/erg/package.nix               |  2 +-
 pkgs/by-name/er/ergochat/package.nix          |  2 +-
 pkgs/by-name/er/ericw-tools/package.nix       |  2 +-
 pkgs/by-name/er/erigon/package.nix            |  2 +-
 pkgs/by-name/er/eris-go/package.nix           |  2 +-
 pkgs/by-name/er/errbot/package.nix            |  2 +-
 pkgs/by-name/er/errcheck/package.nix          |  2 +-
 pkgs/by-name/es/esbuild-config/package.nix    |  2 +-
 pkgs/by-name/es/escambo/package.nix           |  2 +-
 pkgs/by-name/es/esdm/package.nix              |  2 +-
 pkgs/by-name/es/esh/package.nix               |  2 +-
 pkgs/by-name/es/eslint_d/package.nix          |  2 +-
 pkgs/by-name/es/esp-generate/package.nix      |  2 +-
 pkgs/by-name/es/espeakup/package.nix          |  2 +-
 pkgs/by-name/es/espresso/package.nix          |  2 +-
 pkgs/by-name/es/espup/package.nix             |  2 +-
 pkgs/by-name/et/et/package.nix                |  2 +-
 pkgs/by-name/et/eternity/package.nix          |  2 +-
 pkgs/by-name/et/ethash/package.nix            |  2 +-
 pkgs/by-name/et/etherguard/package.nix        |  2 +-
 pkgs/by-name/et/ets/package.nix               |  2 +-
 pkgs/by-name/et/ettercap/package.nix          |  2 +-
 pkgs/by-name/ev/evans/package.nix             |  2 +-
 pkgs/by-name/ev/evebox/package.nix            |  2 +-
 pkgs/by-name/ev/evscript/package.nix          |  2 +-
 pkgs/by-name/ev/evsieve/package.nix           |  2 +-
 pkgs/by-name/ex/exaile/package.nix            |  2 +-
 pkgs/by-name/ex/exfat/package.nix             |  2 +-
 pkgs/by-name/ex/exfatprogs/package.nix        |  2 +-
 pkgs/by-name/ex/exhaustive/package.nix        |  2 +-
 pkgs/by-name/ex/exhibit/package.nix           |  2 +-
 pkgs/by-name/ex/exiflooter/package.nix        |  2 +-
 pkgs/by-name/ex/exiv2/package.nix             |  2 +-
 pkgs/by-name/ex/exoscale-cli/package.nix      |  2 +-
 pkgs/by-name/ex/expected-lite/package.nix     |  2 +-
 pkgs/by-name/ex/expenses/package.nix          |  2 +-
 pkgs/by-name/ex/exportarr/package.nix         |  2 +-
 pkgs/by-name/ex/expr/package.nix              |  2 +-
 pkgs/by-name/ex/exprtk/package.nix            |  2 +-
 pkgs/by-name/ex/extest/package.nix            |  2 +-
 pkgs/by-name/ex/extra-container/package.nix   |  2 +-
 pkgs/by-name/ex/extrace/package.nix           |  2 +-
 pkgs/by-name/ex/extract_url/package.nix       |  2 +-
 pkgs/by-name/ex/extractpdfmark/package.nix    |  2 +-
 pkgs/by-name/ex/extrude/package.nix           |  2 +-
 pkgs/by-name/ey/eyedropper/package.nix        |  2 +-
 pkgs/by-name/ey/eyewitness/package.nix        |  2 +-
 pkgs/by-name/ez/ezquake/package.nix           |  2 +-
 pkgs/by-name/f1/f1viewer/package.nix          |  2 +-
 pkgs/by-name/f2/f2/package.nix                |  2 +-
 pkgs/by-name/f3/f3/package.nix                |  2 +-
 pkgs/by-name/fa/faad2/package.nix             |  2 +-
 pkgs/by-name/fa/faas-cli/package.nix          |  2 +-
 pkgs/by-name/fa/faba-icon-theme/package.nix   |  2 +-
 pkgs/by-name/fa/fabric-ai/package.nix         |  2 +-
 pkgs/by-name/fa/fabs/package.nix              |  2 +-
 pkgs/by-name/fa/facedetect/package.nix        |  2 +-
 pkgs/by-name/fa/fail2ban/package.nix          |  2 +-
 pkgs/by-name/fa/faircamp/package.nix          |  2 +-
 pkgs/by-name/fa/fakechroot/package.nix        |  2 +-
 pkgs/by-name/fa/falcoctl/package.nix          |  2 +-
 pkgs/by-name/fa/fan2go/package.nix            |  2 +-
 pkgs/by-name/fa/fanbox-dl/package.nix         |  2 +-
 pkgs/by-name/fa/fanctl/package.nix            |  2 +-
 pkgs/by-name/fa/faraday/package.nix           |  2 +-
 pkgs/by-name/fa/fasole/package.nix            |  2 +-
 pkgs/by-name/fa/fastd/package.nix             |  2 +-
 pkgs/by-name/fa/fastddsgen/package.nix        |  2 +-
 pkgs/by-name/fa/fastp/package.nix             |  2 +-
 pkgs/by-name/fa/fastpbkdf2/package.nix        |  2 +-
 pkgs/by-name/fa/fatcat/package.nix            |  2 +-
 pkgs/by-name/fa/fatrace/package.nix           |  2 +-
 pkgs/by-name/fa/fatresize/package.nix         |  2 +-
 pkgs/by-name/fa/faudio/package.nix            |  2 +-
 .../fa/faustPhysicalModeling/package.nix      |  2 +-
 pkgs/by-name/fb/fbcat/package.nix             |  2 +-
 pkgs/by-name/fb/fbjni/package.nix             |  2 +-
 pkgs/by-name/fb/fblog/package.nix             |  2 +-
 pkgs/by-name/fb/fbmark/package.nix            |  2 +-
 pkgs/by-name/fb/fbmenugen/package.nix         |  2 +-
 pkgs/by-name/fc/fcft/package.nix              |  2 +-
 pkgs/by-name/fc/fcgi/package.nix              |  2 +-
 pkgs/by-name/fc/fcgiwrap/package.nix          |  2 +-
 .../fc/fcitx5-material-color/package.nix      |  2 +-
 pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix |  2 +-
 pkgs/by-name/fc/fcl/package.nix               |  2 +-
 pkgs/by-name/fc/fcppt/package.nix             |  2 +-
 pkgs/by-name/fd/fd/package.nix                |  2 +-
 pkgs/by-name/fd/fdk-aac-encoder/package.nix   |  2 +-
 pkgs/by-name/fd/fdm/package.nix               |  2 +-
 pkgs/by-name/fd/fdupes/package.nix            |  2 +-
 pkgs/by-name/fe/feather/package.nix           |  2 +-
 pkgs/by-name/fe/fedimint/package.nix          |  2 +-
 pkgs/by-name/fe/feed2imap-go/package.nix      |  2 +-
 pkgs/by-name/fe/feedgnuplot/package.nix       |  2 +-
 pkgs/by-name/fe/feishin/package.nix           |  2 +-
 pkgs/by-name/fe/fend/package.nix              |  2 +-
 pkgs/by-name/fe/ferretdb/package.nix          |  2 +-
 pkgs/by-name/fe/fet-sh/package.nix            |  2 +-
 pkgs/by-name/fe/fetch-scm/package.nix         |  2 +-
 pkgs/by-name/fe/fetchit/package.nix           |  2 +-
 pkgs/by-name/ff/ff2mpv-rust/package.nix       |  2 +-
 pkgs/by-name/ff/ff2mpv/package.nix            |  2 +-
 pkgs/by-name/ff/ffcast/package.nix            |  2 +-
 pkgs/by-name/ff/fff/package.nix               |  2 +-
 pkgs/by-name/ff/ffizer/package.nix            |  2 +-
 pkgs/by-name/ff/fflas-ffpack/package.nix      |  2 +-
 pkgs/by-name/ff/ffms/package.nix              |  2 +-
 pkgs/by-name/fh/fh/package.nix                |  2 +-
 pkgs/by-name/fh/fheroes2/package.nix          |  2 +-
 pkgs/by-name/fi/fiano/package.nix             |  2 +-
 pkgs/by-name/fi/fiche/package.nix             |  2 +-
 pkgs/by-name/fi/fido2luks/package.nix         |  2 +-
 pkgs/by-name/fi/figurine/package.nix          |  2 +-
 pkgs/by-name/fi/filebrowser/package.nix       |  2 +-
 pkgs/by-name/fi/files-cli/package.nix         |  2 +-
 pkgs/by-name/fi/fileshelter/package.nix       |  2 +-
 pkgs/by-name/fi/filter-audio/package.nix      |  2 +-
 pkgs/by-name/fi/filterpath/package.nix        |  2 +-
 pkgs/by-name/fi/filtron/package.nix           |  2 +-
 pkgs/by-name/fi/finamp/package.nix            |  2 +-
 pkgs/by-name/fi/find-cursor/package.nix       |  2 +-
 pkgs/by-name/fi/findex/package.nix            |  2 +-
 pkgs/by-name/fi/fioctl/package.nix            |  2 +-
 pkgs/by-name/fi/firecracker/package.nix       |  2 +-
 pkgs/by-name/fi/firectl/package.nix           |  2 +-
 .../fi/firefox-sync-client/package.nix        |  2 +-
 pkgs/by-name/fi/firefoxpwa/package.nix        |  2 +-
 pkgs/by-name/fi/firejail/package.nix          |  2 +-
 pkgs/by-name/fi/firestarter/package.nix       |  2 +-
 pkgs/by-name/fi/firewalld/package.nix         |  2 +-
 pkgs/by-name/fi/firmware-manager/package.nix  |  2 +-
 pkgs/by-name/fi/fishnet/package.nix           |  2 +-
 pkgs/by-name/fi/fission/package.nix           |  2 +-
 pkgs/by-name/fi/fits-cloudctl/package.nix     |  2 +-
 pkgs/by-name/fi/fityk/package.nix             |  2 +-
 pkgs/by-name/fl/flaca/package.nix             |  2 +-
 pkgs/by-name/fl/flake-checker/package.nix     |  2 +-
 pkgs/by-name/fl/flake-edit/package.nix        |  2 +-
 pkgs/by-name/fl/flamerobin/package.nix        |  2 +-
 pkgs/by-name/fl/flann/package.nix             |  2 +-
 pkgs/by-name/fl/flare-signal/package.nix      |  2 +-
 pkgs/by-name/fl/flarectl/package.nix          |  2 +-
 pkgs/by-name/fl/flat-remix-gnome/package.nix  |  2 +-
 pkgs/by-name/fl/flat-remix-gtk/package.nix    |  2 +-
 pkgs/by-name/fl/flatcc/package.nix            |  2 +-
 pkgs/by-name/fl/flavours/package.nix          |  2 +-
 pkgs/by-name/fl/flawz/package.nix             |  2 +-
 pkgs/by-name/fl/flex-ncat/package.nix         |  2 +-
 pkgs/by-name/fl/flex-ndax/package.nix         |  2 +-
 pkgs/by-name/fl/flexcpp/package.nix           |  2 +-
 pkgs/by-name/fl/flintlock/package.nix         |  2 +-
 pkgs/by-name/fl/flip-link/package.nix         |  2 +-
 pkgs/by-name/fl/flitter/package.nix           |  2 +-
 pkgs/by-name/fl/flock/package.nix             |  2 +-
 pkgs/by-name/fl/flood/package.nix             |  2 +-
 pkgs/by-name/fl/flottbot/package.nix          |  2 +-
 pkgs/by-name/fl/flowblade/package.nix         |  2 +-
 pkgs/by-name/fl/flowtime/package.nix          |  2 +-
 pkgs/by-name/fl/fluent-gtk-theme/package.nix  |  2 +-
 .../flutter_rust_bridge_codegen/package.nix   |  2 +-
 pkgs/by-name/fl/fluxcd/package.nix            |  2 +-
 pkgs/by-name/fl/fluxctl/package.nix           |  2 +-
 pkgs/by-name/fl/fly/package.nix               |  2 +-
 pkgs/by-name/fl/flycast/package.nix           |  2 +-
 pkgs/by-name/fl/flyctl/package.nix            |  2 +-
 pkgs/by-name/fm/fm-tune/package.nix           |  2 +-
 pkgs/by-name/fn/fn-cli/package.nix            |  2 +-
 pkgs/by-name/fn/fna3d/package.nix             |  2 +-
 pkgs/by-name/fn/fnm/package.nix               |  2 +-
 pkgs/by-name/fn/fnott/package.nix             |  2 +-
 pkgs/by-name/fo/focus-stack/package.nix       |  2 +-
 pkgs/by-name/fo/follow/package.nix            |  2 +-
 pkgs/by-name/fo/fondo/package.nix             |  2 +-
 pkgs/by-name/fo/font-config-info/package.nix  |  2 +-
 pkgs/by-name/fo/font-manager/package.nix      |  2 +-
 pkgs/by-name/fo/fontfinder/package.nix        |  2 +-
 pkgs/by-name/fo/fontfor/package.nix           |  2 +-
 pkgs/by-name/fo/fontforge/package.nix         |  2 +-
 pkgs/by-name/fo/fontpreview/package.nix       |  2 +-
 pkgs/by-name/fo/foot/package.nix              |  2 +-
 pkgs/by-name/fo/forge-sparks/package.nix      |  2 +-
 pkgs/by-name/fo/fork-cleaner/package.nix      |  2 +-
 pkgs/by-name/fo/formatter/package.nix         |  2 +-
 pkgs/by-name/fo/fortune-kind/package.nix      |  2 +-
 pkgs/by-name/fo/foxmarks/package.nix          |  2 +-
 pkgs/by-name/fp/fpp/package.nix               |  2 +-
 pkgs/by-name/fp/fprettify/package.nix         |  2 +-
 pkgs/by-name/fq/fq/package.nix                |  2 +-
 pkgs/by-name/fr/frangipanni/package.nix       |  2 +-
 pkgs/by-name/fr/fre/package.nix               |  2 +-
 pkgs/by-name/fr/freac/package.nix             |  2 +-
 pkgs/by-name/fr/frece/package.nix             |  2 +-
 pkgs/by-name/fr/freebayes/package.nix         |  2 +-
 pkgs/by-name/fr/freecad/package.nix           |  2 +-
 pkgs/by-name/fr/freerdp/package.nix           |  2 +-
 pkgs/by-name/fr/freewheeling/package.nix      |  2 +-
 pkgs/by-name/fr/freeze/package.nix            |  2 +-
 pkgs/by-name/fr/frei/package.nix              |  2 +-
 pkgs/by-name/fr/frei0r/package.nix            |  2 +-
 pkgs/by-name/fr/fricas/package.nix            |  2 +-
 pkgs/by-name/fr/friture/package.nix           |  2 +-
 pkgs/by-name/fr/frogmouth/package.nix         |  2 +-
 pkgs/by-name/fr/frp/package.nix               |  2 +-
 pkgs/by-name/fr/frugal/package.nix            |  2 +-
 pkgs/by-name/fs/fsarchiver/package.nix        |  2 +-
 pkgs/by-name/fs/fscan/package.nix             |  2 +-
 .../fs/fscrypt-experimental/package.nix       |  2 +-
 pkgs/by-name/fs/fsearch/package.nix           |  2 +-
 pkgs/by-name/fs/fselect/package.nix           |  2 +-
 pkgs/by-name/fs/fsharp/package.nix            |  2 +-
 pkgs/by-name/fs/fsql/package.nix              |  2 +-
 pkgs/by-name/fs/fsrx/package.nix              |  2 +-
 pkgs/by-name/fs/fstrm/package.nix             |  2 +-
 pkgs/by-name/ft/ftgl/package.nix              |  2 +-
 pkgs/by-name/fu/fuc/package.nix               |  2 +-
 pkgs/by-name/fu/fuchsia-cursor/package.nix    |  2 +-
 pkgs/by-name/fu/fulcio/package.nix            |  2 +-
 pkgs/by-name/fu/function-runner/package.nix   |  2 +-
 pkgs/by-name/fu/functionalplus/package.nix    |  2 +-
 pkgs/by-name/fu/fundoc/package.nix            |  2 +-
 pkgs/by-name/fu/funzzy/package.nix            |  2 +-
 pkgs/by-name/fu/fuse-overlayfs/package.nix    |  2 +-
 pkgs/by-name/fu/fusionInventory/package.nix   |  2 +-
 pkgs/by-name/fu/fuzzel/package.nix            |  2 +-
 pkgs/by-name/fu/fuzzylite/package.nix         |  2 +-
 pkgs/by-name/fv/fvwm2/package.nix             |  2 +-
 pkgs/by-name/fv/fvwm3/package.nix             |  2 +-
 pkgs/by-name/fw/fw/package.nix                |  2 +-
 pkgs/by-name/fw/fwanalyzer/package.nix        |  2 +-
 pkgs/by-name/fx/fx-cast-bridge/package.nix    |  2 +-
 pkgs/by-name/fx/fx/package.nix                |  2 +-
 pkgs/by-name/fy/fyi/package.nix               |  2 +-
 pkgs/by-name/fy/fypp/package.nix              |  2 +-
 pkgs/by-name/fz/fzf-make/package.nix          |  2 +-
 pkgs/by-name/fz/fzf-obc/package.nix           |  2 +-
 pkgs/by-name/fz/fzf/package.nix               |  2 +-
 pkgs/by-name/fz/fzy/package.nix               |  2 +-
 pkgs/by-name/g3/g3kb-switch/package.nix       |  2 +-
 pkgs/by-name/ga/gabutdm/package.nix           |  2 +-
 pkgs/by-name/ga/galaxis/package.nix           |  2 +-
 pkgs/by-name/ga/galerio/package.nix           |  2 +-
 pkgs/by-name/ga/gambit-chess/package.nix      |  2 +-
 .../ga/game-devices-udev-rules/package.nix    |  2 +-
 pkgs/by-name/ga/game-rs/package.nix           |  2 +-
 pkgs/by-name/ga/gamecube-tools/package.nix    |  2 +-
 pkgs/by-name/ga/gammu/package.nix             |  2 +-
 pkgs/by-name/ga/gandom-fonts/package.nix      |  2 +-
 pkgs/by-name/ga/gargoyle/package.nix          |  2 +-
 pkgs/by-name/ga/gatus/package.nix             |  2 +-
 pkgs/by-name/ga/gavin-bc/package.nix          |  2 +-
 pkgs/by-name/gb/gbenchmark/package.nix        |  2 +-
 pkgs/by-name/gb/gbsplay/package.nix           |  2 +-
 pkgs/by-name/gc/gci/package.nix               |  2 +-
 pkgs/by-name/gc/gcli/package.nix              |  2 +-
 pkgs/by-name/gc/gcov2lcov/package.nix         |  2 +-
 pkgs/by-name/gc/gcsfuse/package.nix           |  2 +-
 pkgs/by-name/gc/gcstar/package.nix            |  2 +-
 pkgs/by-name/gd/gdlv/package.nix              |  2 +-
 pkgs/by-name/gd/gdrive/package.nix            |  2 +-
 pkgs/by-name/gd/gdrive3/package.nix           |  2 +-
 pkgs/by-name/gd/gdtoolkit_3/package.nix       |  2 +-
 pkgs/by-name/gd/gdtoolkit_4/package.nix       |  2 +-
 pkgs/by-name/ge/gebaar-libinput/package.nix   |  2 +-
 pkgs/by-name/ge/geek-life/package.nix         |  2 +-
 pkgs/by-name/ge/geeqie/package.nix            |  2 +-
 pkgs/by-name/ge/geesefs/package.nix           |  2 +-
 pkgs/by-name/ge/gef/package.nix               |  2 +-
 pkgs/by-name/ge/gemget/package.nix            |  2 +-
 pkgs/by-name/ge/gemrb/package.nix             |  2 +-
 pkgs/by-name/ge/gen-license/package.nix       |  2 +-
 pkgs/by-name/ge/gen-oath-safe/package.nix     |  2 +-
 pkgs/by-name/ge/genact/package.nix            |  2 +-
 pkgs/by-name/ge/genann/package.nix            |  2 +-
 pkgs/by-name/ge/genext2fs/package.nix         |  2 +-
 pkgs/by-name/ge/genxword/package.nix          |  2 +-
 pkgs/by-name/ge/geo/package.nix               |  2 +-
 pkgs/by-name/ge/geoipupdate/package.nix       |  2 +-
 pkgs/by-name/ge/geonkick/package.nix          |  2 +-
 pkgs/by-name/ge/gephi/package.nix             |  2 +-
 pkgs/by-name/ge/gerbera/package.nix           |  2 +-
 pkgs/by-name/ge/gerbolyze/package.nix         |  2 +-
 pkgs/by-name/ge/gerrit-queue/package.nix      |  2 +-
 pkgs/by-name/ge/get_iplayer/package.nix       |  2 +-
 pkgs/by-name/ge/getdata/package.nix           |  2 +-
 pkgs/by-name/ge/getoptions/package.nix        |  2 +-
 pkgs/by-name/ge/gex/package.nix               |  2 +-
 pkgs/by-name/gf/gflags/package.nix            |  2 +-
 pkgs/by-name/gf/gfold/package.nix             |  2 +-
 pkgs/by-name/gf/gforth/package.nix            |  2 +-
 pkgs/by-name/gf/gfshare/package.nix           |  2 +-
 pkgs/by-name/gf/gfxreconstruct/package.nix    |  2 +-
 pkgs/by-name/gg/gg-scm/package.nix            |  2 +-
 pkgs/by-name/gh/gh-actions-cache/package.nix  |  2 +-
 pkgs/by-name/gh/gh-contribs/package.nix       |  2 +-
 pkgs/by-name/gh/gh-dash/package.nix           |  2 +-
 pkgs/by-name/gh/gh-f/package.nix              |  2 +-
 pkgs/by-name/gh/gh-gei/package.nix            |  2 +-
 pkgs/by-name/gh/gh-i/package.nix              |  2 +-
 .../gh/gh-markdown-preview/package.nix        |  2 +-
 pkgs/by-name/gh/gh-ost/package.nix            |  2 +-
 pkgs/by-name/gh/gh-poi/package.nix            |  2 +-
 pkgs/by-name/gh/gh-s/package.nix              |  2 +-
 pkgs/by-name/gh/gh-screensaver/package.nix    |  2 +-
 pkgs/by-name/gh/ghbackup/package.nix          |  2 +-
 pkgs/by-name/gh/ghciwatch/package.nix         |  2 +-
 pkgs/by-name/gh/ghfetch/package.nix           |  2 +-
 pkgs/by-name/gh/ghorg/package.nix             |  2 +-
 pkgs/by-name/gh/ghost/package.nix             |  2 +-
 pkgs/by-name/gh/ghostie/package.nix           |  2 +-
 pkgs/by-name/gh/ghosttohugo/package.nix       |  2 +-
 pkgs/by-name/gh/ghostunnel/package.nix        |  2 +-
 pkgs/by-name/gh/ghr/package.nix               |  2 +-
 pkgs/by-name/gh/ghz/package.nix               |  2 +-
 pkgs/by-name/gi/gImageReader/package.nix      |  2 +-
 pkgs/by-name/gi/gi-crystal/package.nix        |  2 +-
 pkgs/by-name/gi/giada/package.nix             |  2 +-
 pkgs/by-name/gi/gibo/package.nix              |  2 +-
 pkgs/by-name/gi/gifgen/package.nix            |  2 +-
 pkgs/by-name/gi/gifski/package.nix            |  2 +-
 pkgs/by-name/gi/gimme-aws-creds/package.nix   |  2 +-
 pkgs/by-name/gi/gimoji/package.nix            |  2 +-
 pkgs/by-name/gi/gimx/package.nix              |  2 +-
 pkgs/by-name/gi/ginkgo/package.nix            |  2 +-
 pkgs/by-name/gi/gio-sharp/package.nix         |  2 +-
 pkgs/by-name/gi/giph/package.nix              |  2 +-
 pkgs/by-name/gi/gir-rs/package.nix            |  2 +-
 pkgs/by-name/gi/girouette/package.nix         |  2 +-
 .../gi/git-annex-remote-rclone/package.nix    |  2 +-
 pkgs/by-name/gi/git-autoshare/package.nix     |  2 +-
 pkgs/by-name/gi/git-backup-go/package.nix     |  2 +-
 pkgs/by-name/gi/git-branchless/package.nix    |  2 +-
 pkgs/by-name/gi/git-bug-migration/package.nix |  2 +-
 pkgs/by-name/gi/git-bug/package.nix           |  2 +-
 pkgs/by-name/gi/git-chglog/package.nix        |  2 +-
 pkgs/by-name/gi/git-cliff/package.nix         |  2 +-
 pkgs/by-name/gi/git-codereview/package.nix    |  2 +-
 .../gi/git-credential-keepassxc/package.nix   |  2 +-
 .../gi/git-credential-oauth/package.nix       |  2 +-
 pkgs/by-name/gi/git-crypt/package.nix         |  2 +-
 pkgs/by-name/gi/git-dive/package.nix          |  2 +-
 pkgs/by-name/gi/git-extras/package.nix        |  2 +-
 pkgs/by-name/gi/git-ftp/package.nix           |  2 +-
 pkgs/by-name/gi/git-get/package.nix           |  2 +-
 pkgs/by-name/gi/git-hound/package.nix         |  2 +-
 pkgs/by-name/gi/git-hub/package.nix           |  2 +-
 pkgs/by-name/gi/git-igitt/package.nix         |  2 +-
 pkgs/by-name/gi/git-ignore/package.nix        |  2 +-
 pkgs/by-name/gi/git-instafix/package.nix      |  2 +-
 .../git-interactive-rebase-tool/package.nix   |  2 +-
 pkgs/by-name/gi/git-mit/package.nix           |  2 +-
 pkgs/by-name/gi/git-my/package.nix            |  2 +-
 pkgs/by-name/gi/git-nomad/package.nix         |  2 +-
 pkgs/by-name/gi/git-octopus/package.nix       |  2 +-
 pkgs/by-name/gi/git-open/package.nix          |  2 +-
 pkgs/by-name/gi/git-pr/package.nix            |  2 +-
 pkgs/by-name/gi/git-privacy/package.nix       |  2 +-
 pkgs/by-name/gi/git-quick-stats/package.nix   |  2 +-
 pkgs/by-name/gi/git-quickfix/package.nix      |  2 +-
 pkgs/by-name/gi/git-radar/package.nix         |  2 +-
 pkgs/by-name/gi/git-repo/package.nix          |  2 +-
 pkgs/by-name/gi/git-run/package.nix           |  2 +-
 pkgs/by-name/gi/git-secrets/package.nix       |  2 +-
 pkgs/by-name/gi/git-sim/package.nix           |  2 +-
 pkgs/by-name/gi/git-sizer/package.nix         |  2 +-
 pkgs/by-name/gi/git-standup/package.nix       |  2 +-
 pkgs/by-name/gi/git-subrepo/package.nix       |  2 +-
 pkgs/by-name/gi/git-subtrac/package.nix       |  2 +-
 pkgs/by-name/gi/git-team/package.nix          |  2 +-
 pkgs/by-name/gi/git-test/package.nix          |  2 +-
 pkgs/by-name/gi/git-trim/package.nix          |  2 +-
 pkgs/by-name/gi/git-vendor/package.nix        |  2 +-
 pkgs/by-name/gi/git-when-merged/package.nix   |  2 +-
 pkgs/by-name/gi/git-who/package.nix           |  2 +-
 pkgs/by-name/gi/git2-cpp/package.nix          |  2 +-
 pkgs/by-name/gi/gitaly/git.nix                |  2 +-
 pkgs/by-name/gi/gitaly/package.nix            |  2 +-
 pkgs/by-name/gi/gitbatch/package.nix          |  2 +-
 pkgs/by-name/gi/gitcs/package.nix             |  2 +-
 pkgs/by-name/gi/gitflow/package.nix           |  2 +-
 pkgs/by-name/gi/gitfs/package.nix             |  2 +-
 pkgs/by-name/gi/githooks/package.nix          |  2 +-
 pkgs/by-name/gi/github-commenter/package.nix  |  2 +-
 .../gi/github-markdown-toc-go/package.nix     |  2 +-
 pkgs/by-name/gi/gitjacker/package.nix         |  2 +-
 pkgs/by-name/gi/gitlab-ci-local/package.nix   |  2 +-
 pkgs/by-name/gi/gitlab-ci-ls/package.nix      |  2 +-
 .../gitlab-elasticsearch-indexer/package.nix  |  2 +-
 pkgs/by-name/gi/gitlab-pages/package.nix      |  2 +-
 .../by-name/gi/gitlab-release-cli/package.nix |  2 +-
 pkgs/by-name/gi/gitlab-shell/package.nix      |  2 +-
 pkgs/by-name/gi/gitless/package.nix           |  2 +-
 pkgs/by-name/gi/gitls/package.nix             |  2 +-
 pkgs/by-name/gi/gitnr/package.nix             |  2 +-
 pkgs/by-name/gi/gitolite/package.nix          |  2 +-
 pkgs/by-name/gi/gitopper/package.nix          |  2 +-
 pkgs/by-name/gi/gitoxide/package.nix          |  2 +-
 pkgs/by-name/gi/gitprompt-rs/package.nix      |  2 +-
 pkgs/by-name/gi/gitrs/package.nix             |  2 +-
 pkgs/by-name/gi/gitsign/package.nix           |  2 +-
 pkgs/by-name/gi/gitstatus/package.nix         |  2 +-
 pkgs/by-name/gi/gittuf/package.nix            |  2 +-
 pkgs/by-name/gi/gitty/package.nix             |  2 +-
 pkgs/by-name/gi/gitu/package.nix              |  2 +-
 pkgs/by-name/gi/gitui/package.nix             |  2 +-
 pkgs/by-name/gi/gitwatch/package.nix          |  2 +-
 pkgs/by-name/gi/gixy/package.nix              |  2 +-
 pkgs/by-name/gj/gjo/package.nix               |  2 +-
 pkgs/by-name/gl/glas/package.nix              |  2 +-
 pkgs/by-name/gl/glauth/package.nix            |  2 +-
 pkgs/by-name/gl/glava/package.nix             |  2 +-
 pkgs/by-name/gl/glbinding/package.nix         |  2 +-
 pkgs/by-name/gl/glfw3/package.nix             |  2 +-
 pkgs/by-name/gl/glicol-cli/package.nix        |  2 +-
 .../by-name/gl/glide-media-player/package.nix |  2 +-
 pkgs/by-name/gl/glider/package.nix            |  2 +-
 pkgs/by-name/gl/glitter/package.nix           |  2 +-
 pkgs/by-name/gl/glm/package.nix               |  2 +-
 pkgs/by-name/gl/glmark2/package.nix           |  2 +-
 .../gl/global-platform-pro/package.nix        |  2 +-
 pkgs/by-name/gl/globalarrays/package.nix      |  2 +-
 pkgs/by-name/gl/globalping-cli/package.nix    |  2 +-
 pkgs/by-name/gl/glog/package.nix              |  2 +-
 pkgs/by-name/gl/glooctl/package.nix           |  2 +-
 pkgs/by-name/gl/glow/package.nix              |  2 +-
 pkgs/by-name/gl/glowing-bear/package.nix      |  2 +-
 pkgs/by-name/gl/glrnvim/package.nix           |  2 +-
 pkgs/by-name/gl/glslang/package.nix           |  2 +-
 pkgs/by-name/gl/glslls/package.nix            |  2 +-
 pkgs/by-name/gl/gluesql/package.nix           |  2 +-
 pkgs/by-name/gl/glui/package.nix              |  2 +-
 pkgs/by-name/gl/glusterfs/package.nix         |  2 +-
 pkgs/by-name/gl/glyr/package.nix              |  2 +-
 pkgs/by-name/gm/gmailctl/package.nix          |  2 +-
 pkgs/by-name/gm/gmid/package.nix              |  2 +-
 pkgs/by-name/gn/gnirehtet/package.nix         |  2 +-
 pkgs/by-name/gn/gnmic/package.nix             |  2 +-
 .../gn/gnome-extension-manager/package.nix    |  2 +-
 pkgs/by-name/gn/gnome-firmware/package.nix    |  2 +-
 .../gn/gnome-online-accounts-gtk/package.nix  |  2 +-
 .../gn/gnome-pass-search-provider/package.nix |  2 +-
 pkgs/by-name/gn/gnome-pomodoro/package.nix    |  2 +-
 pkgs/by-name/gn/gnome-session/ctl.nix         |  2 +-
 pkgs/by-name/gn/gnostic/package.nix           |  2 +-
 pkgs/by-name/gn/gnss-sdr/package.nix          |  2 +-
 pkgs/by-name/gn/gnss-share/package.nix        |  2 +-
 pkgs/by-name/gn/gnu-efi_3/package.nix         |  2 +-
 pkgs/by-name/gn/gnucash/package.nix           |  2 +-
 pkgs/by-name/go/go-2fa/package.nix            |  2 +-
 pkgs/by-name/go/go-audit/package.nix          |  2 +-
 pkgs/by-name/go/go-bindata/package.nix        |  2 +-
 pkgs/by-name/go/go-blueprint/package.nix      |  2 +-
 pkgs/by-name/go/go-callvis/package.nix        |  2 +-
 pkgs/by-name/go/go-camo/package.nix           |  2 +-
 .../go/go-containerregistry/package.nix       |  2 +-
 pkgs/by-name/go/go-cover-treemap/package.nix  |  2 +-
 pkgs/by-name/go/go-cqhttp/package.nix         |  2 +-
 pkgs/by-name/go/go-critic/package.nix         |  2 +-
 pkgs/by-name/go/go-dnscollector/package.nix   |  2 +-
 pkgs/by-name/go/go-errorlint/package.nix      |  2 +-
 pkgs/by-name/go/go-ethereum/package.nix       |  2 +-
 pkgs/by-name/go/go-graft/package.nix          |  2 +-
 pkgs/by-name/go/go-ios/package.nix            |  2 +-
 pkgs/by-name/go/go-jet/package.nix            |  2 +-
 pkgs/by-name/go/go-jira/package.nix           |  2 +-
 pkgs/by-name/go/go-jsonnet/package.nix        |  2 +-
 pkgs/by-name/go/go-judge/package.nix          |  2 +-
 pkgs/by-name/go/go-junit-report/package.nix   |  2 +-
 pkgs/by-name/go/go-libp2p-daemon/package.nix  |  2 +-
 .../go/go-licence-detector/package.nix        |  2 +-
 .../go/go-license-detector/package.nix        |  2 +-
 pkgs/by-name/go/go-md2man/package.nix         |  2 +-
 pkgs/by-name/go/go-migrate/package.nix        |  2 +-
 pkgs/by-name/go/go-minimock/package.nix       |  2 +-
 pkgs/by-name/go/go-mockery/package.nix        |  2 +-
 .../by-name/go/go-mod-graph-chart/package.nix |  2 +-
 pkgs/by-name/go/go-motion/package.nix         |  2 +-
 pkgs/by-name/go/go-mtpfs/package.nix          |  2 +-
 pkgs/by-name/go/go-musicfox/package.nix       |  2 +-
 pkgs/by-name/go/go-org/package.nix            |  2 +-
 pkgs/by-name/go/go-passbolt-cli/package.nix   |  2 +-
 pkgs/by-name/go/go-protobuf/package.nix       |  2 +-
 pkgs/by-name/go/go-rice/package.nix           |  2 +-
 pkgs/by-name/go/go-shadowsocks2/package.nix   |  2 +-
 pkgs/by-name/go/go-swag/package.nix           |  2 +-
 pkgs/by-name/go/go-symbols/package.nix        |  2 +-
 pkgs/by-name/go/go-toml/package.nix           |  2 +-
 pkgs/by-name/go/go-tools/package.nix          |  2 +-
 pkgs/by-name/go/goa/package.nix               |  2 +-
 pkgs/by-name/go/goat-cli/package.nix          |  2 +-
 pkgs/by-name/go/goatcounter/package.nix       |  2 +-
 pkgs/by-name/go/goawk/package.nix             |  2 +-
 pkgs/by-name/go/gobang/package.nix            |  2 +-
 pkgs/by-name/go/gobble/package.nix            |  2 +-
 pkgs/by-name/go/gobby/package.nix             |  2 +-
 pkgs/by-name/go/gobetween/package.nix         |  2 +-
 pkgs/by-name/go/gobgp/package.nix             |  2 +-
 pkgs/by-name/go/gocode-gomod/package.nix      |  2 +-
 pkgs/by-name/go/goconst/package.nix           |  2 +-
 pkgs/by-name/go/gocover-cobertura/package.nix |  2 +-
 pkgs/by-name/go/gocryptfs/package.nix         |  2 +-
 pkgs/by-name/go/gocyclo/package.nix           |  2 +-
 pkgs/by-name/go/goda/package.nix              |  2 +-
 pkgs/by-name/go/godu/package.nix              |  2 +-
 pkgs/by-name/go/goeland/package.nix           |  2 +-
 pkgs/by-name/go/gof5/package.nix              |  2 +-
 pkgs/by-name/go/goflow/package.nix            |  2 +-
 pkgs/by-name/go/goflow2/package.nix           |  2 +-
 pkgs/by-name/go/gofumpt/package.nix           |  2 +-
 pkgs/by-name/go/gogup/package.nix             |  2 +-
 pkgs/by-name/go/goimports-reviser/package.nix |  2 +-
 pkgs/by-name/go/gojq/package.nix              |  2 +-
 pkgs/by-name/go/gojsontoyaml/package.nix      |  2 +-
 pkgs/by-name/go/gokart/package.nix            |  2 +-
 pkgs/by-name/go/golangci-lint/package.nix     |  2 +-
 pkgs/by-name/go/goldwarden/package.nix        |  2 +-
 pkgs/by-name/go/golex/package.nix             |  2 +-
 pkgs/by-name/go/golines/package.nix           |  2 +-
 pkgs/by-name/go/gomapenum/package.nix         |  2 +-
 pkgs/by-name/go/gomarkdoc/package.nix         |  2 +-
 pkgs/by-name/go/gomatrix/package.nix          |  2 +-
 pkgs/by-name/go/gomodifytags/package.nix      |  2 +-
 pkgs/by-name/go/gomtree/package.nix           |  2 +-
 pkgs/by-name/go/gomuks/package.nix            |  2 +-
 pkgs/by-name/go/gonic/package.nix             |  2 +-
 pkgs/by-name/go/goodhosts/package.nix         |  2 +-
 pkgs/by-name/go/goodvibes/package.nix         |  2 +-
 .../go/google-authenticator/package.nix       |  2 +-
 pkgs/by-name/go/google-cloud-cpp/package.nix  |  2 +-
 .../go/google-cloud-sql-proxy/package.nix     |  2 +-
 .../go/google-guest-configs/package.nix       |  2 +-
 .../go/google-guest-oslogin/package.nix       |  2 +-
 pkgs/by-name/go/google-play/package.nix       |  2 +-
 pkgs/by-name/go/goose-lang/package.nix        |  2 +-
 pkgs/by-name/go/goose/package.nix             |  2 +-
 pkgs/by-name/go/gopacked/package.nix          |  2 +-
 pkgs/by-name/go/gopass-jsonapi/package.nix    |  2 +-
 pkgs/by-name/go/gopatch/package.nix           |  2 +-
 pkgs/by-name/go/gophernotes/package.nix       |  2 +-
 pkgs/by-name/go/gophish/package.nix           |  2 +-
 pkgs/by-name/go/gopkgs/package.nix            |  2 +-
 pkgs/by-name/go/gopro/package.nix             |  2 +-
 pkgs/by-name/go/gops/package.nix              |  2 +-
 pkgs/by-name/go/gopsuinfo/package.nix         |  2 +-
 pkgs/by-name/go/gore/package.nix              |  2 +-
 pkgs/by-name/go/goread/package.nix            |  2 +-
 pkgs/by-name/go/goreleaser/package.nix        |  2 +-
 pkgs/by-name/go/goreman/package.nix           |  2 +-
 pkgs/by-name/go/goreplay/package.nix          |  2 +-
 pkgs/by-name/go/goresym/package.nix           |  2 +-
 pkgs/by-name/go/gorilla-cli/package.nix       |  2 +-
 pkgs/by-name/go/gortr/package.nix             |  2 +-
 pkgs/by-name/go/gosec/package.nix             |  2 +-
 pkgs/by-name/go/gosimports/package.nix        |  2 +-
 pkgs/by-name/go/gosmee/package.nix            |  2 +-
 pkgs/by-name/go/gospider/package.nix          |  2 +-
 pkgs/by-name/go/gossa/package.nix             |  2 +-
 pkgs/by-name/go/gostatic/package.nix          |  2 +-
 pkgs/by-name/go/gosu/package.nix              |  2 +-
 pkgs/by-name/go/gotest/package.nix            |  2 +-
 pkgs/by-name/go/gotestdox/package.nix         |  2 +-
 pkgs/by-name/go/gotestfmt/package.nix         |  2 +-
 pkgs/by-name/go/gotests/package.nix           |  2 +-
 pkgs/by-name/go/gotify-cli/package.nix        |  2 +-
 pkgs/by-name/go/gotify-desktop/package.nix    |  2 +-
 pkgs/by-name/go/gotify-server/package.nix     |  2 +-
 pkgs/by-name/go/gotools/package.nix           |  2 +-
 pkgs/by-name/go/gotraceui/package.nix         |  2 +-
 pkgs/by-name/go/gotree/package.nix            |  2 +-
 pkgs/by-name/go/gotty/package.nix             |  2 +-
 pkgs/by-name/go/gotypist/package.nix          |  2 +-
 pkgs/by-name/go/govc/package.nix              |  2 +-
 pkgs/by-name/go/govee2mqtt/package.nix        |  2 +-
 pkgs/by-name/go/goverlay/package.nix          |  2 +-
 pkgs/by-name/go/gowall/package.nix            |  2 +-
 pkgs/by-name/go/gox/package.nix               |  2 +-
 pkgs/by-name/go/goxlr-utility/package.nix     |  2 +-
 pkgs/by-name/gp/gpac/package.nix              |  2 +-
 pkgs/by-name/gp/gpart/package.nix             |  2 +-
 pkgs/by-name/gp/gpauth/package.nix            |  2 +-
 pkgs/by-name/gp/gpclient/package.nix          |  2 +-
 pkgs/by-name/gp/gphotos-sync/package.nix      |  2 +-
 pkgs/by-name/gp/gpick/package.nix             |  2 +-
 pkgs/by-name/gp/gpodder/package.nix           |  2 +-
 pkgs/by-name/gp/gptman/package.nix            |  2 +-
 pkgs/by-name/gp/gpustat/package.nix           |  2 +-
 pkgs/by-name/gp/gpuvis/package.nix            |  2 +-
 pkgs/by-name/gp/gpx-viewer/package.nix        |  2 +-
 pkgs/by-name/gp/gpx/package.nix               |  2 +-
 pkgs/by-name/gp/gpxlab/package.nix            |  2 +-
 pkgs/by-name/gp/gpython/package.nix           |  2 +-
 pkgs/by-name/gq/gql/package.nix               |  2 +-
 pkgs/by-name/gq/gqlgenc/package.nix           |  2 +-
 pkgs/by-name/gq/gqlint/package.nix            |  2 +-
 pkgs/by-name/gr/gr-framework/package.nix      |  2 +-
 pkgs/by-name/gr/grabserial/package.nix        |  2 +-
 pkgs/by-name/gr/gradescope-submit/package.nix |  2 +-
 .../gr/grafana-dash-n-grab/package.nix        |  2 +-
 .../gr/grafana-image-renderer/package.nix     |  2 +-
 pkgs/by-name/gr/grafana-kiosk/package.nix     |  2 +-
 pkgs/by-name/gr/grafana-loki/package.nix      |  2 +-
 pkgs/by-name/gr/grafana-reporter/package.nix  |  2 +-
 pkgs/by-name/gr/grafterm/package.nix          |  2 +-
 pkgs/by-name/gr/granted/package.nix           |  2 +-
 .../gr/graphene-hardened-malloc/package.nix   |  2 +-
 pkgs/by-name/gr/graphene/package.nix          |  2 +-
 pkgs/by-name/gr/graphite-cursors/package.nix  |  2 +-
 .../by-name/gr/graphite-gtk-theme/package.nix |  2 +-
 pkgs/by-name/gr/graphqurl/package.nix         |  2 +-
 pkgs/by-name/gr/graphwar/package.nix          |  2 +-
 pkgs/by-name/gr/gravit/package.nix            |  2 +-
 pkgs/by-name/gr/greybird/package.nix          |  2 +-
 pkgs/by-name/gr/gridtracker/package.nix       |  2 +-
 pkgs/by-name/gr/grip-search/package.nix       |  2 +-
 pkgs/by-name/gr/grit/package.nix              |  2 +-
 pkgs/by-name/gr/grive2/package.nix            |  2 +-
 pkgs/by-name/gr/grizzly/package.nix           |  2 +-
 pkgs/by-name/gr/grml-zsh-config/package.nix   |  2 +-
 pkgs/by-name/gr/grmon/package.nix             |  2 +-
 pkgs/by-name/gr/grobi/package.nix             |  2 +-
 pkgs/by-name/gr/gron/package.nix              |  2 +-
 pkgs/by-name/gr/grpc-client-cli/package.nix   |  2 +-
 pkgs/by-name/gr/grpc/package.nix              |  2 +-
 pkgs/by-name/gr/grpc_cli/package.nix          |  2 +-
 pkgs/by-name/gr/grpcui/package.nix            |  2 +-
 pkgs/by-name/gr/grpcurl/package.nix           |  2 +-
 pkgs/by-name/gr/gruvbox-dark-gtk/package.nix  |  2 +-
 pkgs/by-name/gs/gsctl/package.nix             |  2 +-
 pkgs/by-name/gs/gsimplecal/package.nix        |  2 +-
 pkgs/by-name/gs/gsocket/package.nix           |  2 +-
 pkgs/by-name/gs/gspeech/package.nix           |  2 +-
 pkgs/by-name/gs/gst/package.nix               |  2 +-
 pkgs/by-name/gs/gst123/package.nix            |  2 +-
 pkgs/by-name/gt/gtest/package.nix             |  2 +-
 pkgs/by-name/gt/gtg/package.nix               |  2 +-
 pkgs/by-name/gt/gthree/package.nix            |  2 +-
 pkgs/by-name/gt/gti/package.nix               |  2 +-
 pkgs/by-name/gt/gtk-sharp-beans/package.nix   |  2 +-
 pkgs/by-name/gt/gtkclipblock/package.nix      |  2 +-
 pkgs/by-name/gt/gtkhash/package.nix           |  2 +-
 pkgs/by-name/gt/gtkterm/package.nix           |  2 +-
 pkgs/by-name/gt/gtop/package.nix              |  2 +-
 pkgs/by-name/gt/gtrash/package.nix            |  2 +-
 pkgs/by-name/gt/gtree/package.nix             |  2 +-
 pkgs/by-name/gt/gtt/package.nix               |  2 +-
 pkgs/by-name/gu/guacamole-server/package.nix  |  2 +-
 pkgs/by-name/gu/gubbi-font/package.nix        |  2 +-
 pkgs/by-name/gu/gucharmap/package.nix         |  2 +-
 pkgs/by-name/gu/guetzli/package.nix           |  2 +-
 pkgs/by-name/gu/guff/package.nix              |  2 +-
 pkgs/by-name/gu/guile-aspell/package.nix      |  2 +-
 pkgs/by-name/gu/guile-fibers/package.nix      |  2 +-
 pkgs/by-name/gu/guile-git/package.nix         |  2 +-
 pkgs/by-name/gu/guile-hoot/package.nix        |  2 +-
 pkgs/by-name/gu/guilt/package.nix             |  2 +-
 pkgs/by-name/gu/gum/package.nix               |  2 +-
 pkgs/by-name/gu/gumbo/package.nix             |  2 +-
 pkgs/by-name/gu/gummi/package.nix             |  2 +-
 pkgs/by-name/gu/gummy/package.nix             |  2 +-
 pkgs/by-name/gu/gungnir/package.nix           |  2 +-
 pkgs/by-name/gu/gut/package.nix               |  2 +-
 pkgs/by-name/gv/gvproxy/package.nix           |  2 +-
 pkgs/by-name/gw/gwc/package.nix               |  2 +-
 pkgs/by-name/gx/gx/package.nix                |  2 +-
 pkgs/by-name/gx/gxkb/package.nix              |  2 +-
 pkgs/by-name/gx/gxml/package.nix              |  2 +-
 pkgs/by-name/gx/gxplugins-lv2/package.nix     |  2 +-
 pkgs/by-name/ha/habitat/package.nix           |  2 +-
 pkgs/by-name/ha/hackedbox/package.nix         |  2 +-
 pkgs/by-name/ha/hackrf/package.nix            |  2 +-
 pkgs/by-name/ha/hacompanion/package.nix       |  2 +-
 pkgs/by-name/ha/hacpack/package.nix           |  2 +-
 pkgs/by-name/ha/hactool/package.nix           |  2 +-
 pkgs/by-name/ha/hakrawler/package.nix         |  2 +-
 pkgs/by-name/ha/halfempty/package.nix         |  2 +-
 pkgs/by-name/ha/halp/package.nix              |  2 +-
 pkgs/by-name/ha/handlr-regex/package.nix      |  2 +-
 pkgs/by-name/ha/hans/package.nix              |  2 +-
 pkgs/by-name/ha/hap-py/package.nix            |  2 +-
 pkgs/by-name/ha/harbor-cli/package.nix        |  2 +-
 pkgs/by-name/ha/harminv/package.nix           |  2 +-
 pkgs/by-name/ha/harper/package.nix            |  2 +-
 pkgs/by-name/ha/harsh/package.nix             |  2 +-
 pkgs/by-name/ha/hash-slinger/package.nix      |  2 +-
 pkgs/by-name/ha/hashcat-utils/package.nix     |  2 +-
 pkgs/by-name/ha/hashi-up/package.nix          |  2 +-
 pkgs/by-name/ha/hashit/package.nix            |  2 +-
 pkgs/by-name/ha/hashlink/package.nix          |  2 +-
 pkgs/by-name/ha/haveged/package.nix           |  2 +-
 pkgs/by-name/ha/havoc/package.nix             |  2 +-
 pkgs/by-name/hb/hblock/package.nix            |  2 +-
 pkgs/by-name/hc/hck/package.nix               |  2 +-
 pkgs/by-name/hc/hcl2json/package.nix          |  2 +-
 pkgs/by-name/hc/hcledit/package.nix           |  2 +-
 pkgs/by-name/hc/hclfmt/package.nix            |  2 +-
 pkgs/by-name/hc/hcxdumptool/package.nix       |  2 +-
 pkgs/by-name/hc/hcxtools/package.nix          |  2 +-
 pkgs/by-name/hd/hd-idle/package.nix           |  2 +-
 pkgs/by-name/hd/hdaps-gl/package.nix          |  2 +-
 pkgs/by-name/hd/hdf5-blosc/package.nix        |  2 +-
 pkgs/by-name/hd/hdrop/package.nix             |  2 +-
 pkgs/by-name/hd/hdt/package.nix               |  2 +-
 pkgs/by-name/he/headache/package.nix          |  2 +-
 pkgs/by-name/he/headphones/package.nix        |  2 +-
 pkgs/by-name/he/headsetcontrol/package.nix    |  2 +-
 pkgs/by-name/he/heatseeker/package.nix        |  2 +-
 pkgs/by-name/he/hebcal/package.nix            |  2 +-
 pkgs/by-name/he/hedgedoc-cli/package.nix      |  2 +-
 pkgs/by-name/he/heh/package.nix               |  2 +-
 pkgs/by-name/he/helio-workstation/package.nix |  2 +-
 pkgs/by-name/he/heliocron/package.nix         |  2 +-
 pkgs/by-name/he/helm-dashboard/package.nix    |  2 +-
 pkgs/by-name/he/helm-docs/package.nix         |  2 +-
 pkgs/by-name/he/helm-ls/package.nix           |  2 +-
 pkgs/by-name/he/helmsman/package.nix          |  2 +-
 pkgs/by-name/he/herbe/package.nix             |  2 +-
 pkgs/by-name/he/hermitcli/package.nix         |  2 +-
 pkgs/by-name/he/hetzner-kube/package.nix      |  2 +-
 pkgs/by-name/he/hex/package.nix               |  2 +-
 pkgs/by-name/he/hexbinhex/package.nix         |  2 +-
 pkgs/by-name/he/hexchat/package.nix           |  2 +-
 pkgs/by-name/he/hexcurse/package.nix          |  2 +-
 pkgs/by-name/he/hexd/package.nix              |  2 +-
 pkgs/by-name/he/hexdino/package.nix           |  2 +-
 pkgs/by-name/he/hexedit/package.nix           |  2 +-
 pkgs/by-name/he/hexo-cli/package.nix          |  2 +-
 pkgs/by-name/he/hextazy/package.nix           |  2 +-
 pkgs/by-name/he/hey/package.nix               |  2 +-
 pkgs/by-name/he/heygpt/package.nix            |  2 +-
 pkgs/by-name/hh/hhpc/package.nix              |  2 +-
 pkgs/by-name/hi/hidviz/package.nix            |  2 +-
 pkgs/by-name/hi/highfive/package.nix          |  2 +-
 .../hi/highlight-assertions/package.nix       |  2 +-
 pkgs/by-name/hi/himalaya/package.nix          |  2 +-
 pkgs/by-name/hi/hime/package.nix              |  2 +-
 pkgs/by-name/hi/hiraeth/package.nix           |  2 +-
 pkgs/by-name/hi/hiredis/package.nix           |  2 +-
 pkgs/by-name/hi/hisat2/package.nix            |  2 +-
 pkgs/by-name/hi/hishtory/package.nix          |  2 +-
 pkgs/by-name/hi/hivemind/package.nix          |  2 +-
 pkgs/by-name/hj/hjson-go/package.nix          |  2 +-
 pkgs/by-name/hn/hn-text/package.nix           |  2 +-
 pkgs/by-name/ho/hoard/package.nix             |  2 +-
 pkgs/by-name/ho/hof/package.nix               |  2 +-
 pkgs/by-name/ho/holo-build/package.nix        |  2 +-
 pkgs/by-name/ho/hologram/package.nix          |  2 +-
 pkgs/by-name/ho/holos/package.nix             |  2 +-
 pkgs/by-name/ho/homebox/package.nix           |  2 +-
 pkgs/by-name/ho/homer/package.nix             |  2 +-
 pkgs/by-name/ho/honcho/package.nix            |  2 +-
 .../by-name/ho/honeycomb-refinery/package.nix |  2 +-
 pkgs/by-name/ho/honggfuzz/package.nix         |  2 +-
 pkgs/by-name/ho/horizon-eda/base.nix          |  2 +-
 pkgs/by-name/ho/horst/package.nix             |  2 +-
 pkgs/by-name/ho/host-spawn/package.nix        |  2 +-
 pkgs/by-name/ho/hostapd-mana/package.nix      |  2 +-
 pkgs/by-name/ho/hostctl/package.nix           |  2 +-
 pkgs/by-name/ho/hostess/package.nix           |  2 +-
 pkgs/by-name/ho/hostmux/package.nix           |  2 +-
 pkgs/by-name/ho/hound/package.nix             |  2 +-
 pkgs/by-name/ho/hover/package.nix             |  2 +-
 .../ho/howard-hinnant-date/package.nix        |  2 +-
 pkgs/by-name/hp/hpe-ltfs/package.nix          |  2 +-
 pkgs/by-name/hp/hpx/package.nix               |  2 +-
 pkgs/by-name/hr/hr/package.nix                |  2 +-
 pkgs/by-name/hr/hred/package.nix              |  2 +-
 pkgs/by-name/hs/hsd/package.nix               |  2 +-
 pkgs/by-name/hs/hsetroot/package.nix          |  2 +-
 pkgs/by-name/hs/hstr/package.nix              |  2 +-
 pkgs/by-name/ht/htcondor/package.nix          |  2 +-
 pkgs/by-name/ht/html-minifier/package.nix     |  2 +-
 pkgs/by-name/ht/html-tidy/package.nix         |  2 +-
 pkgs/by-name/ht/html2text/package.nix         |  2 +-
 pkgs/by-name/ht/htmlhint/package.nix          |  2 +-
 pkgs/by-name/ht/htmltest/package.nix          |  2 +-
 pkgs/by-name/ht/htmx-lsp/package.nix          |  2 +-
 pkgs/by-name/ht/htop-vim/package.nix          |  2 +-
 pkgs/by-name/ht/htpdate/package.nix           |  2 +-
 pkgs/by-name/ht/httm/package.nix              |  2 +-
 pkgs/by-name/ht/http-parser/package.nix       |  2 +-
 pkgs/by-name/ht/http-server/package.nix       |  2 +-
 pkgs/by-name/ht/httplab/package.nix           |  2 +-
 pkgs/by-name/ht/httpref/package.nix           |  2 +-
 pkgs/by-name/ht/httprobe/package.nix          |  2 +-
 pkgs/by-name/ht/httpstat/package.nix          |  2 +-
 pkgs/by-name/hu/hubicfuse/package.nix         |  2 +-
 pkgs/by-name/hu/hueadm/package.nix            |  2 +-
 pkgs/by-name/hu/humioctl/package.nix          |  2 +-
 pkgs/by-name/hu/hunt/package.nix              |  2 +-
 pkgs/by-name/hu/husky/package.nix             |  2 +-
 pkgs/by-name/hw/hwdata/package.nix            |  2 +-
 pkgs/by-name/hw/hwinfo/package.nix            |  2 +-
 pkgs/by-name/hy/hydroxide/package.nix         |  2 +-
 pkgs/by-name/hy/hyp2mat/package.nix           |  2 +-
 pkgs/by-name/hy/hyperbeam/package.nix         |  2 +-
 .../by-name/hy/hyperledger-fabric/package.nix |  2 +-
 pkgs/by-name/hy/hyperlink/package.nix         |  2 +-
 pkgs/by-name/hy/hyperpotamus/package.nix      |  2 +-
 pkgs/by-name/hy/hypershell/package.nix        |  2 +-
 pkgs/by-name/hy/hypnotix/package.nix          |  2 +-
 pkgs/by-name/hy/hyprdim/package.nix           |  2 +-
 pkgs/by-name/hy/hyprkeys/package.nix          |  2 +-
 .../hy/hyprland-activewindow/package.nix      |  2 +-
 .../hyprland-autoname-workspaces/package.nix  |  2 +-
 .../hy/hyprland-monitor-attached/package.nix  |  2 +-
 .../hy/hyprland-per-window-layout/package.nix |  2 +-
 .../hy/hyprland-workspaces/package.nix        |  2 +-
 pkgs/by-name/hy/hyprls/package.nix            |  2 +-
 pkgs/by-name/hy/hyprnome/package.nix          |  2 +-
 pkgs/by-name/hy/hyprnotify/package.nix        |  2 +-
 pkgs/by-name/hy/hyprshot/package.nix          |  2 +-
 pkgs/by-name/i3/i3-volume/package.nix         |  2 +-
 pkgs/by-name/i3/i3bar-river/package.nix       |  2 +-
 pkgs/by-name/i3/i3minator/package.nix         |  2 +-
 .../iam-policy-json-to-terraform/package.nix  |  2 +-
 pkgs/by-name/ia/iamy/package.nix              |  2 +-
 pkgs/by-name/ia/ianny/package.nix             |  2 +-
 pkgs/by-name/ib/ibus-theme-tools/package.nix  |  2 +-
 pkgs/by-name/ic/ic-keysmith/package.nix       |  2 +-
 pkgs/by-name/ic/ical2orgpy/package.nix        |  2 +-
 pkgs/by-name/ic/icecream/package.nix          |  2 +-
 pkgs/by-name/ic/icewm/package.nix             |  2 +-
 pkgs/by-name/ic/icnsify/package.nix           |  2 +-
 pkgs/by-name/ic/icoextract/package.nix        |  2 +-
 pkgs/by-name/ic/iconpack-jade/package.nix     |  2 +-
 pkgs/by-name/ic/iconpack-obsidian/package.nix |  2 +-
 pkgs/by-name/ic/icr/package.nix               |  2 +-
 pkgs/by-name/ic/ictree/package.nix            |  2 +-
 pkgs/by-name/id/id3/package.nix               |  2 +-
 pkgs/by-name/id/ideogram/package.nix          |  2 +-
 pkgs/by-name/id/idsk/package.nix              |  2 +-
 pkgs/by-name/ie/ieda/package.nix              |  2 +-
 pkgs/by-name/if/ifrextractor-rs/package.nix   |  2 +-
 pkgs/by-name/ig/igir/package.nix              |  2 +-
 pkgs/by-name/ig/igmpproxy/package.nix         |  2 +-
 pkgs/by-name/ig/ignite-cli/package.nix        |  2 +-
 pkgs/by-name/ig/igprof/package.nix            |  2 +-
 pkgs/by-name/ig/igraph/package.nix            |  2 +-
 pkgs/by-name/ih/ihp-new/package.nix           |  2 +-
 pkgs/by-name/ii/iir1/package.nix              |  2 +-
 pkgs/by-name/ik/ike-scan/package.nix          |  2 +-
 pkgs/by-name/ik/ikill/package.nix             |  2 +-
 pkgs/by-name/il/illum/package.nix             |  2 +-
 pkgs/by-name/im/image-roll/package.nix        |  2 +-
 pkgs/by-name/im/imagelol/package.nix          |  2 +-
 pkgs/by-name/im/imageworsener/package.nix     |  2 +-
 pkgs/by-name/im/imaginary/package.nix         |  2 +-
 pkgs/by-name/im/imaginer/package.nix          |  2 +-
 pkgs/by-name/im/imath/package.nix             |  2 +-
 pkgs/by-name/im/img-cat/package.nix           |  2 +-
 pkgs/by-name/im/img/package.nix               |  2 +-
 pkgs/by-name/im/imgcat/package.nix            |  2 +-
 pkgs/by-name/im/imgcrypt/package.nix          |  2 +-
 pkgs/by-name/im/imgpatchtools/package.nix     |  2 +-
 pkgs/by-name/im/imgpkg/package.nix            |  2 +-
 pkgs/by-name/im/imgproxy/package.nix          |  2 +-
 pkgs/by-name/im/imgur-screenshot/package.nix  |  2 +-
 pkgs/by-name/im/imgurbash2/package.nix        |  2 +-
 pkgs/by-name/im/immudb/package.nix            |  2 +-
 pkgs/by-name/im/impala/package.nix            |  2 +-
 pkgs/by-name/im/impl/package.nix              |  2 +-
 pkgs/by-name/im/implot/package.nix            |  2 +-
 pkgs/by-name/im/imtui/package.nix             |  2 +-
 pkgs/by-name/in/inadyn/package.nix            |  2 +-
 pkgs/by-name/in/infamousPlugins/package.nix   |  2 +-
 pkgs/by-name/in/inferno/package.nix           |  2 +-
 pkgs/by-name/in/inflow/package.nix            |  2 +-
 pkgs/by-name/in/infra-arcana/package.nix      |  2 +-
 pkgs/by-name/in/infra/package.nix             |  2 +-
 pkgs/by-name/in/infracost/package.nix         |  2 +-
 pkgs/by-name/in/inframap/package.nix          |  2 +-
 .../in/infrastructure-agent/package.nix       |  2 +-
 pkgs/by-name/in/ingress2gateway/package.nix   |  2 +-
 pkgs/by-name/in/inhibridge/package.nix        |  2 +-
 pkgs/by-name/in/initool/package.nix           |  2 +-
 pkgs/by-name/in/inklecate/package.nix         |  2 +-
 pkgs/by-name/in/inotify-tools/package.nix     |  2 +-
 .../in/inputmodule-control/package.nix        |  2 +-
 pkgs/by-name/in/inriafonts/package.nix        |  2 +-
 pkgs/by-name/in/inspector/package.nix         |  2 +-
 pkgs/by-name/in/inspectrum/package.nix        |  2 +-
 pkgs/by-name/in/inspircd/package.nix          |  2 +-
 pkgs/by-name/in/insulator2/package.nix        |  2 +-
 pkgs/by-name/in/integresql/package.nix        |  2 +-
 pkgs/by-name/in/intel-cmt-cat/package.nix     |  2 +-
 .../intel-compute-runtime-legacy1/package.nix |  2 +-
 pkgs/by-name/in/intelli-shell/package.nix     |  2 +-
 pkgs/by-name/in/interlock/package.nix         |  2 +-
 pkgs/by-name/in/intermodal/package.nix        |  2 +-
 pkgs/by-name/in/invoice/package.nix           |  2 +-
 pkgs/by-name/in/invoice2data/package.nix      |  2 +-
 pkgs/by-name/in/inxi/package.nix              |  2 +-
 pkgs/by-name/io/ioccheck/package.nix          |  4 +-
 pkgs/by-name/io/ioping/package.nix            |  2 +-
 pkgs/by-name/io/ior/package.nix               |  2 +-
 pkgs/by-name/io/ios-deploy/package.nix        |  2 +-
 pkgs/by-name/io/iosevka/package.nix           |  2 +-
 pkgs/by-name/io/iotop-c/package.nix           |  2 +-
 pkgs/by-name/io/ioztat/package.nix            |  2 +-
 pkgs/by-name/ip/ip2location-c/package.nix     |  2 +-
 pkgs/by-name/ip/ip2unix/package.nix           |  2 +-
 pkgs/by-name/ip/ipatool/package.nix           |  2 +-
 pkgs/by-name/ip/iperf3d/package.nix           |  2 +-
 pkgs/by-name/ip/ipfs-cluster/package.nix      |  2 +-
 .../by-name/ip/ipfs-upload-client/package.nix |  2 +-
 pkgs/by-name/ip/ipget/package.nix             |  2 +-
 pkgs/by-name/ip/ipgrep/package.nix            |  2 +-
 pkgs/by-name/ip/iplan/package.nix             |  2 +-
 pkgs/by-name/ip/ipp-usb/package.nix           |  2 +-
 pkgs/by-name/ip/iptraf-ng/package.nix         |  2 +-
 pkgs/by-name/ip/ipv6calc/package.nix          |  2 +-
 pkgs/by-name/iq/iqtree/package.nix            |  2 +-
 pkgs/by-name/ir/ir-standard-fonts/package.nix |  2 +-
 pkgs/by-name/ir/irccat/package.nix            |  2 +-
 pkgs/by-name/ir/iredis/package.nix            |  2 +-
 pkgs/by-name/ir/iroh/package.nix              |  2 +-
 pkgs/by-name/ir/ironbar/package.nix           |  2 +-
 pkgs/by-name/ir/irqbalance/package.nix        |  2 +-
 pkgs/by-name/ir/irrd/package.nix              |  2 +-
 pkgs/by-name/ir/irssi/package.nix             |  2 +-
 pkgs/by-name/is/isolate/package.nix           |  2 +-
 pkgs/by-name/is/isomd5sum/package.nix         |  2 +-
 pkgs/by-name/is/ispc/package.nix              |  2 +-
 pkgs/by-name/is/istioctl/package.nix          |  2 +-
 pkgs/by-name/it/it-tools/package.nix          |  2 +-
 pkgs/by-name/it/itch/package.nix              |  2 +-
 pkgs/by-name/it/itchiodl/package.nix          |  2 +-
 pkgs/by-name/it/ite-backlight/package.nix     |  2 +-
 pkgs/by-name/it/itools/package.nix            |  2 +-
 pkgs/by-name/iu/iucode-tool/package.nix       |  2 +-
 pkgs/by-name/iv/ivan/package.nix              |  2 +-
 pkgs/by-name/iv/ivy/package.nix               |  2 +-
 pkgs/by-name/iw/iwd/package.nix               |  2 +-
 pkgs/by-name/iw/iwgtk/package.nix             |  2 +-
 pkgs/by-name/j/j/package.nix                  |  2 +-
 pkgs/by-name/ja/jake/package.nix              |  2 +-
 pkgs/by-name/ja/janus-gateway/package.nix     |  2 +-
 pkgs/by-name/ja/jarowinkler-cpp/package.nix   |  2 +-
 pkgs/by-name/ja/jasp-desktop/package.nix      |  2 +-
 .../package.nix                               |  2 +-
 pkgs/by-name/ja/jay/package.nix               |  2 +-
 pkgs/by-name/jb/jbig2enc/package.nix          |  2 +-
 pkgs/by-name/jb/jbofihe/package.nix           |  2 +-
 pkgs/by-name/jc/jcal/package.nix              |  2 +-
 pkgs/by-name/jd/jd-diff-patch/package.nix     |  2 +-
 pkgs/by-name/je/jefferson/package.nix         |  2 +-
 pkgs/by-name/je/jellycli/package.nix          |  2 +-
 pkgs/by-name/je/jellyfin-ffmpeg/package.nix   |  2 +-
 pkgs/by-name/je/jellyfin-web/package.nix      |  2 +-
 pkgs/by-name/je/jellyfin/package.nix          |  2 +-
 pkgs/by-name/je/jetbrains-runner/package.nix  |  2 +-
 pkgs/by-name/jf/jf/package.nix                |  2 +-
 pkgs/by-name/jf/jfmt/package.nix              |  2 +-
 pkgs/by-name/jf/jftui/package.nix             |  2 +-
 pkgs/by-name/jg/jgmenu/package.nix            |  2 +-
 pkgs/by-name/jh/jhead/package.nix             |  2 +-
 pkgs/by-name/ji/jid/package.nix               |  2 +-
 pkgs/by-name/ji/jikken/package.nix            |  2 +-
 pkgs/by-name/ji/jimtcl/package.nix            |  2 +-
 pkgs/by-name/ji/jinja2-cli/package.nix        |  2 +-
 pkgs/by-name/ji/jiq/package.nix               |  2 +-
 pkgs/by-name/ji/jiten/package.nix             |  4 +-
 .../ji/jitsi-meet-electron/package.nix        |  2 +-
 .../by-name/ji/jitterentropy-rngd/package.nix |  2 +-
 pkgs/by-name/ji/jitterentropy/package.nix     |  2 +-
 pkgs/by-name/jj/jj/package.nix                |  2 +-
 pkgs/by-name/jm/jmc2obj/package.nix           |  2 +-
 pkgs/by-name/jm/jmespath/package.nix          |  2 +-
 pkgs/by-name/jm/jmtpfs/package.nix            |  2 +-
 pkgs/by-name/jn/jna/package.nix               |  2 +-
 pkgs/by-name/jo/jo/package.nix                |  2 +-
 pkgs/by-name/jo/jobber/package.nix            |  2 +-
 pkgs/by-name/jo/johnny/package.nix            |  2 +-
 pkgs/by-name/jo/joker/package.nix             |  2 +-
 pkgs/by-name/jo/jose/package.nix              |  2 +-
 pkgs/by-name/jo/jot/package.nix               |  2 +-
 pkgs/by-name/jo/jotdown/package.nix           |  2 +-
 pkgs/by-name/jo/joularjx/package.nix          |  2 +-
 pkgs/by-name/jo/jove/package.nix              |  2 +-
 pkgs/by-name/jp/jp/package.nix                |  2 +-
 pkgs/by-name/jp/jp2a/package.nix              |  2 +-
 pkgs/by-name/jp/jpegoptim/package.nix         |  2 +-
 pkgs/by-name/jq/jqp/package.nix               |  2 +-
 pkgs/by-name/jr/jrsonnet/package.nix          |  2 +-
 pkgs/by-name/js/json-fortran/package.nix      |  2 +-
 pkgs/by-name/js/json-plot/package.nix         |  2 +-
 pkgs/by-name/js/json2hcl/package.nix          |  2 +-
 pkgs/by-name/js/jsoncpp/package.nix           |  2 +-
 pkgs/by-name/js/jsonfmt/package.nix           |  2 +-
 pkgs/by-name/js/jsonld-cli/package.nix        |  2 +-
 pkgs/by-name/js/jsonnet-bundler/package.nix   |  2 +-
 pkgs/by-name/js/jsonnet/package.nix           |  2 +-
 .../by-name/jt/jtag-remote-server/package.nix |  2 +-
 pkgs/by-name/jt/jtbl/package.nix              |  2 +-
 pkgs/by-name/jt/jtc/package.nix               |  2 +-
 pkgs/by-name/ju/jugglinglab/package.nix       |  2 +-
 pkgs/by-name/ju/juicefs/package.nix           |  2 +-
 pkgs/by-name/ju/juicity/package.nix           |  2 +-
 pkgs/by-name/ju/juju/package.nix              |  2 +-
 pkgs/by-name/ju/julius/package.nix            |  2 +-
 pkgs/by-name/ju/jump/package.nix              |  2 +-
 pkgs/by-name/ju/jumpapp/package.nix           |  2 +-
 pkgs/by-name/ju/jumppad/package.nix           |  2 +-
 pkgs/by-name/ju/jumpy/package.nix             |  2 +-
 pkgs/by-name/ju/junction/package.nix          |  2 +-
 pkgs/by-name/ju/junkie/package.nix            |  2 +-
 pkgs/by-name/jw/jwtinfo/package.nix           |  2 +-
 pkgs/by-name/jw/jwx/package.nix               |  2 +-
 pkgs/by-name/jx/jx/package.nix                |  2 +-
 pkgs/by-name/k2/k2tf/package.nix              |  2 +-
 pkgs/by-name/k3/k3sup/package.nix             |  2 +-
 pkgs/by-name/k6/k6/package.nix                |  2 +-
 .../k8/k8s-manifest-sigstore/package.nix      |  2 +-
 pkgs/by-name/k8/k8sgpt/package.nix            |  2 +-
 pkgs/by-name/k9/k9s/package.nix               |  2 +-
 pkgs/by-name/ka/kaf/package.nix               |  2 +-
 pkgs/by-name/ka/kail/package.nix              |  2 +-
 pkgs/by-name/ka/kakoune-lsp/package.nix       |  2 +-
 pkgs/by-name/ka/kalamine/package.nix          |  2 +-
 pkgs/by-name/ka/kalker/package.nix            |  2 +-
 pkgs/by-name/ka/kamp/package.nix              |  2 +-
 pkgs/by-name/ka/kanata/package.nix            |  2 +-
 pkgs/by-name/ka/kanidm-provision/package.nix  |  2 +-
 pkgs/by-name/ka/kaniko/package.nix            |  2 +-
 pkgs/by-name/ka/kanjidraw/package.nix         |  2 +-
 .../ka/kapitonov-plugins-pack/package.nix     |  2 +-
 pkgs/by-name/ka/kapowbang/package.nix         |  2 +-
 pkgs/by-name/ka/kapp/package.nix              |  2 +-
 pkgs/by-name/ka/kappanhang/package.nix        |  2 +-
 pkgs/by-name/ka/karlender/package.nix         |  2 +-
 pkgs/by-name/ka/karma-runner/package.nix      |  2 +-
 pkgs/by-name/ka/karma/package.nix             |  2 +-
 pkgs/by-name/ka/karmor/package.nix            |  2 +-
 pkgs/by-name/ka/kata-runtime/package.nix      |  2 +-
 pkgs/by-name/ka/katago/package.nix            |  2 +-
 pkgs/by-name/ka/kaufkauflist/package.nix      |  2 +-
 pkgs/by-name/kb/kb/package.nix                |  2 +-
 pkgs/by-name/kb/kbdlight/package.nix          |  2 +-
 pkgs/by-name/kb/kbld/package.nix              |  2 +-
 pkgs/by-name/kb/kbst/package.nix              |  2 +-
 pkgs/by-name/kb/kbt/package.nix               |  2 +-
 pkgs/by-name/kc/kcat/package.nix              |  2 +-
 pkgs/by-name/kc/kcl/package.nix               |  2 +-
 pkgs/by-name/kc/kcli/package.nix              |  2 +-
 pkgs/by-name/kc/kclvm/package.nix             |  2 +-
 pkgs/by-name/kc/kclvm_cli/package.nix         |  2 +-
 pkgs/by-name/kc/kconf/package.nix             |  2 +-
 pkgs/by-name/kc/kcov/package.nix              |  2 +-
 pkgs/by-name/kc/kcp/package.nix               |  2 +-
 pkgs/by-name/kd/kdigger/package.nix           |  2 +-
 pkgs/by-name/kd/kdlfmt/package.nix            |  2 +-
 pkgs/by-name/kd/kdocker/package.nix           |  2 +-
 pkgs/by-name/kd/kdotool/package.nix           |  2 +-
 pkgs/by-name/ke/keepalived/package.nix        |  2 +-
 .../ke/keepass-keepasshttp/package.nix        |  2 +-
 pkgs/by-name/ke/keepassxc-go/package.nix      |  2 +-
 pkgs/by-name/ke/keeperrl/package.nix          |  2 +-
 pkgs/by-name/ke/keepmenu/package.nix          |  2 +-
 pkgs/by-name/ke/kepubify/package.nix          |  2 +-
 pkgs/by-name/ke/kermit-terminal/package.nix   |  2 +-
 .../ke/kernel-hardening-checker/package.nix   |  2 +-
 pkgs/by-name/ke/kestrel/package.nix           |  2 +-
 pkgs/by-name/ke/keto/package.nix              |  2 +-
 pkgs/by-name/ke/key-rack/package.nix          |  2 +-
 pkgs/by-name/ke/keycard-cli/package.nix       |  2 +-
 pkgs/by-name/ke/keychain/package.nix          |  2 +-
 .../keycloak-restrict-client-auth/default.nix |  2 +-
 .../ke/keycloak/scim-for-keycloak/default.nix |  2 +-
 pkgs/by-name/ke/keyfinder-cli/package.nix     |  2 +-
 .../package.nix                               |  2 +-
 pkgs/by-name/ke/keymapviz/package.nix         |  2 +-
 pkgs/by-name/ke/keystone/package.nix          |  2 +-
 pkgs/by-name/kf/kfilt/package.nix             |  2 +-
 .../kh/khronos-ocl-icd-loader/package.nix     |  2 +-
 pkgs/by-name/kh/khronos/package.nix           |  2 +-
 pkgs/by-name/ki/kibi/package.nix              |  2 +-
 pkgs/by-name/ki/kickoff/package.nix           |  2 +-
 pkgs/by-name/ki/kickstart/package.nix         |  2 +-
 pkgs/by-name/ki/kicli/package.nix             |  2 +-
 pkgs/by-name/ki/kikoplay/package.nix          |  2 +-
 pkgs/by-name/ki/kind/package.nix              |  2 +-
 pkgs/by-name/ki/kine/package.nix              |  2 +-
 pkgs/by-name/ki/kirc/package.nix              |  2 +-
 pkgs/by-name/ki/kissfft/package.nix           |  2 +-
 pkgs/by-name/ki/kiterunner/package.nix        |  2 +-
 pkgs/by-name/ki/kitex/package.nix             |  2 +-
 pkgs/by-name/ki/kitsas/package.nix            |  2 +-
 pkgs/by-name/ki/kittysay/package.nix          |  2 +-
 pkgs/by-name/kl/klick/package.nix             |  2 +-
 pkgs/by-name/kl/klipperscreen/package.nix     |  2 +-
 pkgs/by-name/kl/klog-rs/package.nix           |  2 +-
 pkgs/by-name/kl/klog-time-tracker/package.nix |  2 +-
 pkgs/by-name/kl/kluctl/package.nix            |  2 +-
 pkgs/by-name/kl/klystrack/package.nix         |  2 +-
 pkgs/by-name/km/kmon/package.nix              |  2 +-
 pkgs/by-name/km/kmsvnc/package.nix            |  2 +-
 pkgs/by-name/kn/knightos-genkfs/package.nix   |  2 +-
 pkgs/by-name/kn/knightos-kcc/package.nix      |  2 +-
 pkgs/by-name/kn/knightos-kimg/package.nix     |  2 +-
 pkgs/by-name/kn/knightos-kpack/package.nix    |  2 +-
 pkgs/by-name/kn/knightos-mkrom/package.nix    |  2 +-
 .../kn/knightos-mktiupgrade/package.nix       |  2 +-
 pkgs/by-name/kn/knightos-patchrom/package.nix |  2 +-
 pkgs/by-name/kn/knightos-scas/package.nix     |  2 +-
 pkgs/by-name/kn/knightos-z80e/package.nix     |  2 +-
 pkgs/by-name/kn/knit/package.nix              |  2 +-
 pkgs/by-name/kn/knossosnet/package.nix        |  2 +-
 pkgs/by-name/ko/kodi-cli/package.nix          |  2 +-
 pkgs/by-name/ko/kokkos/package.nix            |  2 +-
 pkgs/by-name/ko/kolla/package.nix             |  2 +-
 pkgs/by-name/ko/kompose/package.nix           |  2 +-
 pkgs/by-name/ko/konbucase/package.nix         |  2 +-
 pkgs/by-name/ko/kondo/package.nix             |  2 +-
 pkgs/by-name/ko/konf/package.nix              |  2 +-
 pkgs/by-name/ko/konstraint/package.nix        |  2 +-
 pkgs/by-name/ko/kontroll/package.nix          |  2 +-
 pkgs/by-name/ko/kooha/package.nix             |  2 +-
 pkgs/by-name/ko/kool/package.nix              |  2 +-
 pkgs/by-name/ko/kor/package.nix               |  2 +-
 pkgs/by-name/ko/kord/package.nix              |  2 +-
 pkgs/by-name/ko/kore/package.nix              |  2 +-
 pkgs/by-name/ko/koreader/package.nix          |  2 +-
 pkgs/by-name/ko/koruri/package.nix            |  2 +-
 .../ko/kotlin-interactive-shell/package.nix   |  2 +-
 pkgs/by-name/kp/kpt/package.nix               |  2 +-
 pkgs/by-name/kr/kraft/package.nix             |  2 +-
 pkgs/by-name/kr/krankerl/package.nix          |  2 +-
 pkgs/by-name/kr/krapslog/package.nix          |  2 +-
 pkgs/by-name/kr/kratos/package.nix            |  2 +-
 pkgs/by-name/kr/krelay/package.nix            |  2 +-
 pkgs/by-name/kr/krew/package.nix              |  2 +-
 pkgs/by-name/kr/kronosnet/package.nix         |  2 +-
 pkgs/by-name/kr/krop/package.nix              |  2 +-
 .../kr/krunner-vscodeprojects/package.nix     |  2 +-
 pkgs/by-name/ks/ks/package.nix                |  2 +-
 pkgs/by-name/ks/ksmbd-tools/package.nix       |  2 +-
 pkgs/by-name/ks/ksuperkey/package.nix         |  2 +-
 pkgs/by-name/kt/kt/package.nix                |  2 +-
 pkgs/by-name/kt/ktop/package.nix              |  2 +-
 pkgs/by-name/kt/ktunnel/package.nix           |  2 +-
 pkgs/by-name/kt/ktx-tools/package.nix         |  2 +-
 pkgs/by-name/ku/kube-capacity/package.nix     |  2 +-
 pkgs/by-name/ku/kube-linter/package.nix       |  2 +-
 pkgs/by-name/ku/kube-prompt/package.nix       |  2 +-
 pkgs/by-name/ku/kube-router/package.nix       |  2 +-
 pkgs/by-name/ku/kube-score/package.nix        |  2 +-
 .../by-name/ku/kube-state-metrics/package.nix |  2 +-
 pkgs/by-name/ku/kubebuilder/package.nix       |  2 +-
 pkgs/by-name/ku/kubecfg/package.nix           |  2 +-
 pkgs/by-name/ku/kubecm/package.nix            |  2 +-
 pkgs/by-name/ku/kubecolor/package.nix         |  2 +-
 pkgs/by-name/ku/kubeconform/package.nix       |  2 +-
 pkgs/by-name/ku/kubectl-cnpg/package.nix      |  2 +-
 pkgs/by-name/ku/kubectl-df-pv/package.nix     |  2 +-
 pkgs/by-name/ku/kubectl-doctor/package.nix    |  2 +-
 pkgs/by-name/ku/kubectl-example/package.nix   |  2 +-
 pkgs/by-name/ku/kubectl-explore/package.nix   |  2 +-
 pkgs/by-name/ku/kubectl-gadget/package.nix    |  2 +-
 pkgs/by-name/ku/kubectl-graph/package.nix     |  2 +-
 pkgs/by-name/ku/kubectl-images/package.nix    |  2 +-
 pkgs/by-name/ku/kubectl-klock/package.nix     |  2 +-
 pkgs/by-name/ku/kubectl-ktop/package.nix      |  2 +-
 pkgs/by-name/ku/kubectl-neat/package.nix      |  2 +-
 .../by-name/ku/kubectl-node-shell/package.nix |  2 +-
 pkgs/by-name/ku/kubectl-tree/package.nix      |  2 +-
 pkgs/by-name/ku/kubectl-validate/package.nix  |  2 +-
 .../ku/kubectl-view-secret/package.nix        |  2 +-
 pkgs/by-name/ku/kubectx/package.nix           |  2 +-
 pkgs/by-name/ku/kubedock/package.nix          |  2 +-
 pkgs/by-name/ku/kubedog/package.nix           |  2 +-
 pkgs/by-name/ku/kubefetch/package.nix         |  2 +-
 pkgs/by-name/ku/kubefwd/package.nix           |  2 +-
 pkgs/by-name/ku/kubelogin/package.nix         |  2 +-
 pkgs/by-name/ku/kubemq-community/package.nix  |  2 +-
 pkgs/by-name/ku/kubemqctl/package.nix         |  2 +-
 pkgs/by-name/ku/kubent/package.nix            |  2 +-
 pkgs/by-name/ku/kubeone/package.nix           |  2 +-
 pkgs/by-name/ku/kubeprompt/package.nix        |  2 +-
 pkgs/by-name/ku/kubepug/package.nix           |  2 +-
 pkgs/by-name/ku/kubergrunt/package.nix        |  2 +-
 .../ku/kubernetes-code-generator/package.nix  |  2 +-
 .../ku/kubernetes-metrics-server/package.nix  |  2 +-
 .../by-name/ku/kubernetes-polaris/package.nix |  2 +-
 pkgs/by-name/ku/kubernix/package.nix          |  2 +-
 pkgs/by-name/ku/kubeseal/package.nix          |  2 +-
 pkgs/by-name/ku/kubeshark/package.nix         |  2 +-
 pkgs/by-name/ku/kubespy/package.nix           |  2 +-
 pkgs/by-name/ku/kubeswitch/package.nix        |  2 +-
 pkgs/by-name/ku/kubetail/package.nix          |  2 +-
 pkgs/by-name/ku/kubevela/package.nix          |  2 +-
 pkgs/by-name/ku/kubevirt/package.nix          |  2 +-
 pkgs/by-name/ku/kubevpn/package.nix           |  2 +-
 pkgs/by-name/ku/kubexit/package.nix           |  2 +-
 pkgs/by-name/ku/kulala-fmt/package.nix        |  2 +-
 pkgs/by-name/ku/kuro/package.nix              |  2 +-
 pkgs/by-name/ku/kuttl/package.nix             |  2 +-
 pkgs/by-name/ky/kyverno-chainsaw/package.nix  |  2 +-
 pkgs/by-name/ky/kyverno/package.nix           |  2 +-
 pkgs/by-name/la/LAStools/package.nix          |  2 +-
 pkgs/by-name/la/lab/package.nix               |  2 +-
 pkgs/by-name/la/labelImg/package.nix          |  2 +-
 pkgs/by-name/la/lact/package.nix              |  2 +-
 pkgs/by-name/la/lalrpop/package.nix           |  2 +-
 pkgs/by-name/la/lambda-delta/package.nix      |  2 +-
 pkgs/by-name/la/laminar/package.nix           |  2 +-
 pkgs/by-name/la/lan-mouse/package.nix         |  2 +-
 pkgs/by-name/la/lanzaboote-tool/package.nix   |  2 +-
 pkgs/by-name/la/lastpass-cli/package.nix      |  2 +-
 pkgs/by-name/la/laszip/package.nix            |  2 +-
 pkgs/by-name/la/latex2html/package.nix        |  2 +-
 pkgs/by-name/la/lavanda-gtk-theme/package.nix |  2 +-
 pkgs/by-name/la/lavat/package.nix             |  2 +-
 pkgs/by-name/la/layan-gtk-theme/package.nix   |  2 +-
 pkgs/by-name/la/lazycli/package.nix           |  2 +-
 pkgs/by-name/la/lazydocker/package.nix        |  2 +-
 pkgs/by-name/la/lazyjj/package.nix            |  2 +-
 pkgs/by-name/la/lazymc/package.nix            |  2 +-
 pkgs/by-name/la/lazysql/package.nix           |  2 +-
 pkgs/by-name/lb/lbzip2/package.nix            |  2 +-
 pkgs/by-name/lc/lcdf-typetools/package.nix    |  2 +-
 pkgs/by-name/lc/lcdproc/package.nix           |  2 +-
 pkgs/by-name/lc/lcm/package.nix               |  2 +-
 pkgs/by-name/lc/lcov/package.nix              |  2 +-
 pkgs/by-name/ld/ldacbt/package.nix            |  2 +-
 pkgs/by-name/ld/ldproxy/package.nix           |  2 +-
 pkgs/by-name/le/leaf/package.nix              |  2 +-
 pkgs/by-name/le/leaps/package.nix             |  2 +-
 pkgs/by-name/le/leatherman/package.nix        |  2 +-
 pkgs/by-name/le/ledger-autosync/package.nix   |  2 +-
 pkgs/by-name/le/ledger/package.nix            |  2 +-
 pkgs/by-name/le/ledger2beancount/package.nix  |  2 +-
 pkgs/by-name/le/ledmon/package.nix            |  2 +-
 pkgs/by-name/le/leetgo/package.nix            |  2 +-
 pkgs/by-name/le/lefthook/package.nix          |  2 +-
 pkgs/by-name/le/legba/package.nix             |  2 +-
 pkgs/by-name/le/legendary-heroic/package.nix  |  2 +-
 pkgs/by-name/le/legit-web/package.nix         |  2 +-
 pkgs/by-name/le/lemminx/package.nix           |  2 +-
 pkgs/by-name/le/lemmy-help/package.nix        |  2 +-
 pkgs/by-name/le/lensfun/package.nix           |  2 +-
 pkgs/by-name/le/leptonica/package.nix         |  2 +-
 pkgs/by-name/le/leptosfmt/package.nix         |  2 +-
 pkgs/by-name/le/lessc/package.nix             |  2 +-
 pkgs/by-name/le/lesspass-cli/package.nix      |  2 +-
 pkgs/by-name/le/lesspipe/package.nix          |  2 +-
 pkgs/by-name/le/levant/package.nix            |  2 +-
 pkgs/by-name/le/leveldb/package.nix           |  2 +-
 pkgs/by-name/le/lexido/package.nix            |  2 +-
 pkgs/by-name/li/lianad/package.nix            |  2 +-
 pkgs/by-name/li/lib3270/package.nix           |  2 +-
 pkgs/by-name/li/libGDSII/package.nix          |  2 +-
 pkgs/by-name/li/libad9361/package.nix         |  2 +-
 pkgs/by-name/li/libaosd/package.nix           |  2 +-
 pkgs/by-name/li/libappimage/package.nix       |  2 +-
 pkgs/by-name/li/libargon2/package.nix         |  2 +-
 pkgs/by-name/li/libargs/package.nix           |  2 +-
 pkgs/by-name/li/libaribcaption/package.nix    |  2 +-
 pkgs/by-name/li/libast/package.nix            |  2 +-
 pkgs/by-name/li/libation/package.nix          |  2 +-
 pkgs/by-name/li/libaudec/package.nix          |  2 +-
 pkgs/by-name/li/libavif/package.nix           |  2 +-
 .../li/libayatana-appindicator/package.nix    |  2 +-
 .../li/libayatana-indicator/package.nix       |  2 +-
 pkgs/by-name/li/libb64/package.nix            |  2 +-
 pkgs/by-name/li/libbase58/package.nix         |  2 +-
 pkgs/by-name/li/libbaseencode/package.nix     |  2 +-
 pkgs/by-name/li/libblockdev/package.nix       |  2 +-
 pkgs/by-name/li/libbytesize/package.nix       |  2 +-
 pkgs/by-name/li/libcaca/package.nix           |  2 +-
 pkgs/by-name/li/libcaption/package.nix        |  2 +-
 pkgs/by-name/li/libccd/package.nix            |  2 +-
 pkgs/by-name/li/libcdada/package.nix          |  2 +-
 pkgs/by-name/li/libcgroup/package.nix         |  2 +-
 pkgs/by-name/li/libchardet/package.nix        |  2 +-
 pkgs/by-name/li/libcint/package.nix           |  2 +-
 pkgs/by-name/li/libcircle/package.nix         |  2 +-
 pkgs/by-name/li/libck/package.nix             |  2 +-
 pkgs/by-name/li/libcmis/package.nix           |  2 +-
 pkgs/by-name/li/libconfuse/package.nix        |  2 +-
 pkgs/by-name/li/libcork/package.nix           |  2 +-
 pkgs/by-name/li/libcotp/package.nix           |  2 +-
 pkgs/by-name/li/libcouchbase/package.nix      |  2 +-
 pkgs/by-name/li/libcpr/package.nix            |  2 +-
 pkgs/by-name/li/libcpr_1_10_5/package.nix     |  2 +-
 pkgs/by-name/li/libcpuid/package.nix          |  2 +-
 pkgs/by-name/li/libcsptr/package.nix          |  2 +-
 pkgs/by-name/li/libctl/package.nix            |  2 +-
 pkgs/by-name/li/libcue/package.nix            |  2 +-
 pkgs/by-name/li/libcyaml/package.nix          |  2 +-
 pkgs/by-name/li/libdatachannel/package.nix    |  2 +-
 pkgs/by-name/li/libdict/package.nix           |  2 +-
 pkgs/by-name/li/libdivsufsort/package.nix     |  2 +-
 pkgs/by-name/li/libdmtx/package.nix           |  2 +-
 pkgs/by-name/li/libdynd/package.nix           |  2 +-
 pkgs/by-name/li/libebur128/package.nix        |  2 +-
 pkgs/by-name/li/libedgetpu/package.nix        |  2 +-
 pkgs/by-name/li/libemf2svg/package.nix        |  2 +-
 .../li/liberation-sans-narrow/package.nix     |  2 +-
 pkgs/by-name/li/liberfa/package.nix           |  2 +-
 pkgs/by-name/li/libesmtp/package.nix          |  2 +-
 pkgs/by-name/li/libetebase/package.nix        |  2 +-
 pkgs/by-name/li/libetpan/package.nix          |  2 +-
 pkgs/by-name/li/libevdevc/package.nix         |  2 +-
 pkgs/by-name/li/libexsid/package.nix          |  2 +-
 pkgs/by-name/li/libfabric/package.nix         |  2 +-
 pkgs/by-name/li/libfaketime/package.nix       |  2 +-
 pkgs/by-name/li/libfann/package.nix           |  2 +-
 pkgs/by-name/li/libff/package.nix             |  2 +-
 pkgs/by-name/li/libfixposix/package.nix       |  2 +-
 pkgs/by-name/li/libfreeaptx/package.nix       |  2 +-
 pkgs/by-name/li/libgadu/package.nix           |  2 +-
 pkgs/by-name/li/libgbinder/package.nix        |  2 +-
 pkgs/by-name/li/libgedit-gfls/package.nix     |  2 +-
 .../li/libgedit-gtksourceview/package.nix     |  2 +-
 pkgs/by-name/li/libgen-cli/package.nix        |  2 +-
 pkgs/by-name/li/libgeotiff/package.nix        |  2 +-
 pkgs/by-name/li/libgestures/package.nix       |  2 +-
 pkgs/by-name/li/libglibutil/package.nix       |  2 +-
 pkgs/by-name/li/libharu/package.nix           |  2 +-
 pkgs/by-name/li/libheif/package.nix           |  2 +-
 pkgs/by-name/li/libhomfly/package.nix         |  2 +-
 pkgs/by-name/li/libhttpserver/package.nix     |  2 +-
 pkgs/by-name/li/libhwy/package.nix            |  2 +-
 pkgs/by-name/li/libical/package.nix           |  2 +-
 pkgs/by-name/li/libid3tag/package.nix         |  2 +-
 pkgs/by-name/li/libimagequant/package.nix     |  2 +-
 pkgs/by-name/li/libime/package.nix            |  2 +-
 .../li/libimobiledevice-glue/package.nix      |  2 +-
 pkgs/by-name/li/libinotify-kqueue/package.nix |  2 +-
 pkgs/by-name/li/libinstpatch/package.nix      |  2 +-
 pkgs/by-name/li/libipt/package.nix            |  2 +-
 pkgs/by-name/li/libirecovery/package.nix      |  2 +-
 pkgs/by-name/li/libiscsi/package.nix          |  2 +-
 pkgs/by-name/li/libite/package.nix            |  2 +-
 pkgs/by-name/li/libjcat/package.nix           |  2 +-
 pkgs/by-name/li/libjpeg_turbo/package.nix     |  2 +-
 pkgs/by-name/li/libjson-rpc-cpp/package.nix   |  2 +-
 pkgs/by-name/li/libjwt/package.nix            |  2 +-
 pkgs/by-name/li/libjxl/package.nix            |  2 +-
 pkgs/by-name/li/libkcapi/package.nix          |  2 +-
 pkgs/by-name/li/libkeyfinder/package.nix      |  2 +-
 pkgs/by-name/li/libkqueue/package.nix         |  2 +-
 pkgs/by-name/li/libks/package.nix             |  2 +-
 pkgs/by-name/li/libksi/package.nix            |  2 +-
 pkgs/by-name/li/liblaxjson/package.nix        |  2 +-
 pkgs/by-name/li/liblc3/package.nix            |  2 +-
 pkgs/by-name/li/liblcf/package.nix            |  2 +-
 pkgs/by-name/li/liblsl/package.nix            |  2 +-
 pkgs/by-name/li/libmbd/package.nix            |  2 +-
 pkgs/by-name/li/libmesode/package.nix         |  2 +-
 pkgs/by-name/li/libmicrodns/package.nix       |  2 +-
 pkgs/by-name/li/libmodbus/package.nix         |  2 +-
 pkgs/by-name/li/libmodule/package.nix         |  2 +-
 pkgs/by-name/li/libmongocrypt/package.nix     |  2 +-
 pkgs/by-name/li/libmowgli/package.nix         |  2 +-
 pkgs/by-name/li/libmpack/package.nix          |  2 +-
 pkgs/by-name/li/libmsym/package.nix           |  2 +-
 pkgs/by-name/li/libmypaint/package.nix        |  2 +-
 pkgs/by-name/li/libmysofa/package.nix         |  2 +-
 pkgs/by-name/li/libnabo/package.nix           |  2 +-
 pkgs/by-name/li/libnats-c/package.nix         |  2 +-
 pkgs/by-name/li/libndctl/package.nix          |  2 +-
 pkgs/by-name/li/libnet/package.nix            |  2 +-
 pkgs/by-name/li/libnsl/package.nix            |  2 +-
 pkgs/by-name/li/libnss-mysql/package.nix      |  2 +-
 pkgs/by-name/li/libnss_nis/package.nix        |  2 +-
 .../li/libnvidia-container/package.nix        |  6 +-
 pkgs/by-name/li/libofx/package.nix            |  2 +-
 pkgs/by-name/li/libomemo-c/package.nix        |  2 +-
 pkgs/by-name/li/libopenaptx/package.nix       |  2 +-
 pkgs/by-name/li/liboqs/package.nix            |  2 +-
 pkgs/by-name/li/libosmo-netif/package.nix     |  2 +-
 pkgs/by-name/li/libosmo-sigtran/package.nix   |  2 +-
 pkgs/by-name/li/libosmoabis/package.nix       |  2 +-
 pkgs/by-name/li/libosmocore/package.nix       |  2 +-
 pkgs/by-name/li/libow/package.nix             |  2 +-
 pkgs/by-name/li/libowlevelzs/package.nix      |  2 +-
 pkgs/by-name/li/libplist/package.nix          |  2 +-
 pkgs/by-name/li/libpointmatcher/package.nix   |  2 +-
 pkgs/by-name/li/libportal/package.nix         |  2 +-
 pkgs/by-name/li/libppd/package.nix            |  2 +-
 pkgs/by-name/li/libpqxx/package.nix           |  2 +-
 pkgs/by-name/li/libproxy/package.nix          |  2 +-
 pkgs/by-name/li/libqb/package.nix             |  2 +-
 pkgs/by-name/li/libr3/package.nix             |  2 +-
 pkgs/by-name/li/libraqm/package.nix           |  2 +-
 pkgs/by-name/li/libratbag/package.nix         |  2 +-
 pkgs/by-name/li/libraw/package.nix            |  2 +-
 pkgs/by-name/li/librearp/package.nix          |  2 +-
 pkgs/by-name/li/libredwg/package.nix          |  2 +-
 .../li/libreelec-dvb-firmware/package.nix     |  2 +-
 pkgs/by-name/li/librelp/package.nix           |  2 +-
 pkgs/by-name/li/librem/package.nix            |  2 +-
 pkgs/by-name/li/librespeed-cli/package.nix    |  2 +-
 .../by-name/li/libretro-core-info/package.nix |  2 +-
 pkgs/by-name/li/librime/package.nix           |  2 +-
 pkgs/by-name/li/librsync/package.nix          |  2 +-
 pkgs/by-name/li/librtprocess/package.nix      |  2 +-
 pkgs/by-name/li/libsass/package.nix           |  2 +-
 pkgs/by-name/li/libscrypt/package.nix         |  2 +-
 pkgs/by-name/li/libserdes/package.nix         |  2 +-
 .../li/libsignal-protocol-c/package.nix       |  2 +-
 pkgs/by-name/li/libsmartcols/package.nix      |  2 +-
 pkgs/by-name/li/libsmbios/package.nix         |  2 +-
 pkgs/by-name/li/libsolv/package.nix           |  2 +-
 pkgs/by-name/li/libspatialaudio/package.nix   |  2 +-
 pkgs/by-name/li/libspatialindex/package.nix   |  2 +-
 pkgs/by-name/li/libspecbleach/package.nix     |  2 +-
 pkgs/by-name/li/libspf2/package.nix           |  2 +-
 pkgs/by-name/li/libspiro/package.nix          |  2 +-
 pkgs/by-name/li/libspng/package.nix           |  2 +-
 pkgs/by-name/li/libstemmer/package.nix        |  2 +-
 pkgs/by-name/li/libstrophe/package.nix        |  2 +-
 pkgs/by-name/li/libsurvive/package.nix        |  2 +-
 pkgs/by-name/li/libsv/package.nix             |  2 +-
 pkgs/by-name/li/libtickit/package.nix         |  2 +-
 pkgs/by-name/li/libtins/package.nix           |  2 +-
 .../li/libtorrent-rasterbar-1_2_x/package.nix |  2 +-
 .../li/libtorrent-rasterbar-2_0_x/package.nix |  2 +-
 pkgs/by-name/li/libtorrent/package.nix        |  2 +-
 pkgs/by-name/li/libtpms/package.nix           |  2 +-
 pkgs/by-name/li/libucl/package.nix            |  2 +-
 pkgs/by-name/li/libucontext/package.nix       |  2 +-
 pkgs/by-name/li/libudev-zero/package.nix      |  2 +-
 pkgs/by-name/li/libudev0-shim/package.nix     |  2 +-
 pkgs/by-name/li/libuev/package.nix            |  2 +-
 pkgs/by-name/li/libuldaq/package.nix          |  2 +-
 pkgs/by-name/li/libuninameslist/package.nix   |  2 +-
 pkgs/by-name/li/libusbmuxd/package.nix        |  2 +-
 pkgs/by-name/li/libusbp/package.nix           |  2 +-
 pkgs/by-name/li/libv3270/package.nix          |  2 +-
 pkgs/by-name/li/libvarlink/package.nix        |  2 +-
 pkgs/by-name/li/libvdpau-va-gl/package.nix    |  2 +-
 pkgs/by-name/li/libversion/package.nix        |  2 +-
 pkgs/by-name/li/libverto/package.nix          |  2 +-
 pkgs/by-name/li/libvibrant/package.nix        |  2 +-
 pkgs/by-name/li/libvisio2svg/package.nix      |  2 +-
 pkgs/by-name/li/libvpx/package.nix            |  2 +-
 pkgs/by-name/li/libwebp/package.nix           |  2 +-
 pkgs/by-name/li/libwebsockets/package.nix     |  2 +-
 pkgs/by-name/li/libwhereami/package.nix       |  2 +-
 pkgs/by-name/li/libwhich/package.nix          |  2 +-
 pkgs/by-name/li/libwmf/package.nix            |  2 +-
 pkgs/by-name/li/libx86emu/package.nix         |  2 +-
 pkgs/by-name/li/libxls/package.nix            |  2 +-
 pkgs/by-name/li/libxmlb/package.nix           |  2 +-
 pkgs/by-name/li/libxo/package.nix             |  2 +-
 pkgs/by-name/li/libxsmm/package.nix           |  2 +-
 pkgs/by-name/li/libyaml/package.nix           |  2 +-
 pkgs/by-name/li/libyang/package.nix           |  2 +-
 pkgs/by-name/li/libytnef/package.nix          |  2 +-
 pkgs/by-name/li/libzbc/package.nix            |  2 +-
 pkgs/by-name/li/libzbd/package.nix            |  2 +-
 pkgs/by-name/li/license-go/package.nix        |  2 +-
 pkgs/by-name/li/licenseclassifier/package.nix |  2 +-
 pkgs/by-name/li/licensure/package.nix         |  2 +-
 pkgs/by-name/li/lifecycled/package.nix        |  2 +-
 .../li/lightdm-mini-greeter/package.nix       |  2 +-
 .../li/lightdm-slick-greeter/package.nix      |  2 +-
 .../li/lightdm-tiny-greeter/package.nix       |  2 +-
 pkgs/by-name/li/lightlocker/package.nix       |  2 +-
 pkgs/by-name/li/lightning-loop/package.nix    |  2 +-
 pkgs/by-name/li/lightning-pool/package.nix    |  2 +-
 pkgs/by-name/li/lightspark/package.nix        |  2 +-
 pkgs/by-name/li/lightwalletd/package.nix      |  2 +-
 pkgs/by-name/li/lilipod/package.nix           |  2 +-
 pkgs/by-name/li/limesurvey/package.nix        |  2 +-
 pkgs/by-name/li/linbox/package.nix            |  2 +-
 pkgs/by-name/li/linenoise-ng/package.nix      |  2 +-
 pkgs/by-name/li/lineselect/package.nix        |  2 +-
 pkgs/by-name/li/lint-staged/package.nix       |  2 +-
 pkgs/by-name/li/linux_logo/package.nix        |  2 +-
 pkgs/by-name/li/linuxptp/package.nix          |  2 +-
 pkgs/by-name/li/liquidprompt/package.nix      |  2 +-
 pkgs/by-name/li/listmonk/package.nix          |  2 +-
 pkgs/by-name/li/listmonk/stuffbin.nix         |  2 +-
 pkgs/by-name/li/lite/package.nix              |  2 +-
 pkgs/by-name/li/litecli/package.nix           |  2 +-
 pkgs/by-name/li/litefs/package.nix            |  2 +-
 pkgs/by-name/li/litestream/package.nix        |  2 +-
 pkgs/by-name/li/litmus/package.nix            |  2 +-
 pkgs/by-name/li/litmusctl/package.nix         |  2 +-
 pkgs/by-name/li/little_boxes/package.nix      |  2 +-
 pkgs/by-name/li/littlefs-fuse/package.nix     |  2 +-
 pkgs/by-name/li/live-chart/package.nix        |  2 +-
 pkgs/by-name/li/live-server/package.nix       |  2 +-
 pkgs/by-name/li/livekit-cli/package.nix       |  2 +-
 pkgs/by-name/li/livekit/package.nix           |  2 +-
 pkgs/by-name/li/lizardfs/package.nix          |  2 +-
 pkgs/by-name/lk/lksctp-tools/package.nix      |  2 +-
 pkgs/by-name/ll/lldap/package.nix             |  2 +-
 pkgs/by-name/ll/llpp/package.nix              |  2 +-
 pkgs/by-name/lm/lmdbxx/package.nix            |  2 +-
 pkgs/by-name/lm/lmp/package.nix               |  2 +-
 pkgs/by-name/lm/lms/package.nix               |  2 +-
 pkgs/by-name/ln/lnd/package.nix               |  2 +-
 pkgs/by-name/ln/lndconnect/package.nix        |  2 +-
 pkgs/by-name/ln/lndhub-go/package.nix         |  2 +-
 pkgs/by-name/ln/lndinit/package.nix           |  2 +-
 pkgs/by-name/lo/local-ai/package.nix          |  2 +-
 .../lo/locate-dominating-file/package.nix     |  2 +-
 pkgs/by-name/lo/log4j-sniffer/package.nix     |  2 +-
 .../by-name/lo/log4j-vuln-scanner/package.nix |  2 +-
 pkgs/by-name/lo/logiops_0_2_3/package.nix     |  2 +-
 pkgs/by-name/lo/logrotate/package.nix         |  2 +-
 pkgs/by-name/lo/lokalise2-cli/package.nix     |  2 +-
 pkgs/by-name/lo/loksh/package.nix             |  2 +-
 pkgs/by-name/lo/lolcode/package.nix           |  2 +-
 pkgs/by-name/lo/longview/package.nix          |  2 +-
 .../lo/looking-glass-client/package.nix       |  2 +-
 pkgs/by-name/lo/lorem/package.nix             |  2 +-
 pkgs/by-name/lo/lorien/package.nix            |  2 +-
 pkgs/by-name/lo/loudgain/package.nix          |  2 +-
 pkgs/by-name/lo/lounge-gtk-theme/package.nix  |  2 +-
 pkgs/by-name/lo/lout/package.nix              |  2 +-
 pkgs/by-name/lp/lparchive2epub/package.nix    |  2 +-
 pkgs/by-name/lp/lprint/package.nix            |  2 +-
 pkgs/by-name/lr/lr/package.nix                |  2 +-
 pkgs/by-name/lr/lrcget/package.nix            |  2 +-
 pkgs/by-name/lr/lrdf/package.nix              |  2 +-
 pkgs/by-name/lr/lrzip/package.nix             |  2 +-
 pkgs/by-name/ls/ls-lint/package.nix           |  2 +-
 pkgs/by-name/ls/lsd/package.nix               |  2 +-
 pkgs/by-name/ls/lsd2dsl/package.nix           |  2 +-
 pkgs/by-name/ls/lsh/package.nix               |  2 +-
 pkgs/by-name/ls/lsix/package.nix              |  2 +-
 pkgs/by-name/ls/lsof/package.nix              |  2 +-
 pkgs/by-name/lt/ltc-tools/package.nix         |  2 +-
 pkgs/by-name/lt/ltunify/package.nix           |  2 +-
 pkgs/by-name/lu/luabridge/package.nix         |  2 +-
 pkgs/by-name/lu/luaformatter/package.nix      |  2 +-
 pkgs/by-name/lu/luakit/package.nix            |  2 +-
 pkgs/by-name/lu/luau/package.nix              |  2 +-
 pkgs/by-name/lu/lubelogger/package.nix        |  2 +-
 pkgs/by-name/lu/lucky-cli/package.nix         |  2 +-
 pkgs/by-name/lu/ludtwig/package.nix           |  2 +-
 pkgs/by-name/lu/ludusavi/package.nix          |  2 +-
 pkgs/by-name/lu/luminous-ttv/package.nix      |  2 +-
 pkgs/by-name/lu/lunatic/package.nix           |  2 +-
 pkgs/by-name/lu/lune/package.nix              |  2 +-
 pkgs/by-name/lu/luneta/package.nix            |  2 +-
 pkgs/by-name/lu/lutgen/package.nix            |  2 +-
 pkgs/by-name/lu/lux/package.nix               |  2 +-
 pkgs/by-name/lv/lv2bm/package.nix             |  2 +-
 pkgs/by-name/lv/lv_font_conv/package.nix      |  2 +-
 pkgs/by-name/lw/lwan/package.nix              |  2 +-
 pkgs/by-name/lw/lwgrp/package.nix             |  2 +-
 pkgs/by-name/lx/lxcfs/package.nix             |  2 +-
 pkgs/by-name/lx/lxd-image-server/package.nix  |  2 +-
 pkgs/by-name/lx/lxgw-fusionkai/package.nix    |  2 +-
 .../lx/lxqt-panel-profiles/package.nix        |  2 +-
 pkgs/by-name/ly/lynis/package.nix             |  2 +-
 pkgs/by-name/ly/lyra/package.nix              |  2 +-
 pkgs/by-name/lz/lzbench/package.nix           |  2 +-
 pkgs/by-name/lz/lzsa/package.nix              |  2 +-
 pkgs/by-name/m-/m-cli/package.nix             |  2 +-
 pkgs/by-name/m1/m17-cxx-demod/package.nix     |  2 +-
 pkgs/by-name/m4/m4acut/package.nix            |  2 +-
 pkgs/by-name/m4/m4ri/package.nix              |  2 +-
 pkgs/by-name/m4/m4rie/package.nix             |  2 +-
 pkgs/by-name/ma/maa-cli/package.nix           |  2 +-
 pkgs/by-name/ma/macchanger/package.nix        |  2 +-
 pkgs/by-name/ma/macchina/package.nix          |  2 +-
 pkgs/by-name/ma/macdylibbundler/package.nix   |  2 +-
 pkgs/by-name/ma/mackerel-agent/package.nix    |  2 +-
 pkgs/by-name/ma/mackup/package.nix            |  2 +-
 pkgs/by-name/ma/macmon/package.nix            |  2 +-
 pkgs/by-name/ma/maddy/package.nix             |  2 +-
 pkgs/by-name/ma/madonctl/package.nix          |  2 +-
 pkgs/by-name/ma/maeparser/package.nix         |  2 +-
 pkgs/by-name/ma/mage/package.nix              |  2 +-
 pkgs/by-name/ma/magic-wormhole-rs/package.nix |  2 +-
 pkgs/by-name/ma/mailhog/package.nix           |  2 +-
 pkgs/by-name/ma/mailsy/package.nix            |  2 +-
 pkgs/by-name/ma/maim/package.nix              |  2 +-
 pkgs/by-name/ma/mainsail/package.nix          |  2 +-
 pkgs/by-name/ma/maizzle/package.nix           |  2 +-
 pkgs/by-name/ma/maker-panel/package.nix       |  2 +-
 pkgs/by-name/ma/makerpm/package.nix           |  2 +-
 pkgs/by-name/ma/makima/package.nix            |  2 +-
 pkgs/by-name/ma/malt/package.nix              |  2 +-
 pkgs/by-name/ma/mamba/package.nix             |  2 +-
 pkgs/by-name/ma/manga-tui/package.nix         |  2 +-
 pkgs/by-name/ma/mangal/package.nix            |  2 +-
 pkgs/by-name/ma/mangareader/package.nix       |  2 +-
 pkgs/by-name/ma/manifest-tool/package.nix     |  2 +-
 pkgs/by-name/ma/manix/package.nix             |  2 +-
 pkgs/by-name/ma/manticoresearch/package.nix   |  2 +-
 pkgs/by-name/ma/map-cmd/package.nix           |  2 +-
 pkgs/by-name/ma/mapscii/package.nix           |  2 +-
 pkgs/by-name/ma/marathonctl/package.nix       |  2 +-
 pkgs/by-name/ma/mari0/package.nix             |  2 +-
 pkgs/by-name/ma/marisa/package.nix            |  2 +-
 pkgs/by-name/ma/mark/package.nix              |  2 +-
 .../ma/markdown-link-check/package.nix        |  2 +-
 pkgs/by-name/ma/markdownlint-cli/package.nix  |  2 +-
 pkgs/by-name/ma/marked-man/package.nix        |  2 +-
 pkgs/by-name/ma/marker/package.nix            |  2 +-
 pkgs/by-name/ma/markets/package.nix           |  2 +-
 pkgs/by-name/ma/markscribe/package.nix        |  2 +-
 pkgs/by-name/ma/marksman/package.nix          |  2 +-
 pkgs/by-name/ma/markuplinkchecker/package.nix |  2 +-
 pkgs/by-name/ma/marp-cli/package.nix          |  2 +-
 pkgs/by-name/ma/marwaita-icons/package.nix    |  2 +-
 pkgs/by-name/ma/marwaita-mint/package.nix     |  2 +-
 pkgs/by-name/ma/marwaita-orange/package.nix   |  2 +-
 pkgs/by-name/ma/marwaita-red/package.nix      |  2 +-
 pkgs/by-name/ma/marwaita-teal/package.nix     |  2 +-
 pkgs/by-name/ma/marwaita-x/package.nix        |  2 +-
 pkgs/by-name/ma/marwaita-yellow/package.nix   |  2 +-
 pkgs/by-name/ma/marwaita/package.nix          |  2 +-
 pkgs/by-name/ma/masklint/package.nix          |  2 +-
 pkgs/by-name/ma/masscan/package.nix           |  2 +-
 pkgs/by-name/ma/massdns/package.nix           |  2 +-
 pkgs/by-name/ma/massren/package.nix           |  2 +-
 pkgs/by-name/ma/mastodon-archive/package.nix  |  2 +-
 pkgs/by-name/ma/mastotool/package.nix         |  2 +-
 pkgs/by-name/ma/matcha-gtk-theme/package.nix  |  2 +-
 pkgs/by-name/ma/matcha-rss-digest/package.nix |  2 +-
 pkgs/by-name/ma/matchbox-server/package.nix   |  2 +-
 pkgs/by-name/ma/materia-kde-theme/package.nix |  2 +-
 pkgs/by-name/ma/materia-theme/package.nix     |  2 +-
 .../ma/material-design-icons/package.nix      |  2 +-
 pkgs/by-name/ma/material-icons/package.nix    |  2 +-
 pkgs/by-name/ma/material-maker/package.nix    |  2 +-
 pkgs/by-name/ma/math-preview/package.nix      |  2 +-
 pkgs/by-name/ma/mathjax-node-cli/package.nix  |  2 +-
 .../ma/matrix-alertmanager/package.nix        |  2 +-
 .../ma/matrix-appservice-discord/package.nix  |  2 +-
 pkgs/by-name/ma/matrix-conduit/package.nix    |  2 +-
 pkgs/by-name/ma/matrix-corporal/package.nix   |  2 +-
 pkgs/by-name/ma/matrix-hook/package.nix       |  2 +-
 pkgs/by-name/ma/matrix-media-repo/package.nix |  2 +-
 .../ma/matrix-sdk-crypto-nodejs/package.nix   |  2 +-
 .../ma/matrix-synapse-unwrapped/package.nix   |  2 +-
 .../matrix-synapse-unwrapped/plugins/pam.nix  |  2 +-
 .../plugins/rendezvous.nix                    |  2 +-
 .../plugins/shared-secret-auth.nix            |  2 +-
 .../ma/matrix-zulip-bridge/package.nix        |  2 +-
 pkgs/by-name/ma/matterircd/package.nix        |  2 +-
 pkgs/by-name/ma/maturin/package.nix           |  2 +-
 pkgs/by-name/ma/maturin/pyo3-test/default.nix |  2 +-
 pkgs/by-name/ma/mautrix-discord/package.nix   |  2 +-
 pkgs/by-name/ma/mautrix-meta/package.nix      |  2 +-
 pkgs/by-name/ma/mautrix-whatsapp/package.nix  |  2 +-
 pkgs/by-name/ma/maxcso/package.nix            |  2 +-
 pkgs/by-name/ma/maxflow/package.nix           |  2 +-
 pkgs/by-name/ma/maxlib/package.nix            |  2 +-
 pkgs/by-name/mb/mbelib/package.nix            |  2 +-
 pkgs/by-name/mb/mblaze/package.nix            |  2 +-
 pkgs/by-name/mb/mbpfan/package.nix            |  2 +-
 pkgs/by-name/mb/mbtileserver/package.nix      |  2 +-
 pkgs/by-name/mb/mbusd/package.nix             |  2 +-
 pkgs/by-name/mc/mcfly-fzf/package.nix         |  2 +-
 pkgs/by-name/mc/mcfly/package.nix             |  2 +-
 pkgs/by-name/mc/mcontrolcenter/package.nix    |  2 +-
 pkgs/by-name/mc/mcpp/package.nix              |  2 +-
 pkgs/by-name/mc/mcrcon/package.nix            |  2 +-
 pkgs/by-name/mc/mctc-lib/package.nix          |  2 +-
 pkgs/by-name/mc/mcumgr-client/package.nix     |  2 +-
 pkgs/by-name/md/mdbook-alerts/package.nix     |  2 +-
 pkgs/by-name/md/mdbook-d2/package.nix         |  2 +-
 pkgs/by-name/md/mdbook-emojicodes/package.nix |  2 +-
 .../md/mdbook-kroki-preprocessor/package.nix  |  2 +-
 pkgs/by-name/md/mdbook-open-on-gh/package.nix |  2 +-
 pkgs/by-name/md/mdbook-pagetoc/package.nix    |  2 +-
 pkgs/by-name/md/mdbtools/package.nix          |  2 +-
 pkgs/by-name/md/mdds/package.nix              |  2 +-
 pkgs/by-name/md/mdhtml/package.nix            |  2 +-
 pkgs/by-name/md/mdns/package.nix              |  2 +-
 pkgs/by-name/md/mdp/package.nix               |  2 +-
 pkgs/by-name/md/mdr/package.nix               |  2 +-
 pkgs/by-name/md/mdsh/package.nix              |  2 +-
 pkgs/by-name/me/me_cleaner/package.nix        |  2 +-
 pkgs/by-name/me/measureme/package.nix         |  2 +-
 pkgs/by-name/me/med/package.nix               |  2 +-
 pkgs/by-name/me/media-downloader/package.nix  |  2 +-
 pkgs/by-name/me/mediamtx/package.nix          |  2 +-
 pkgs/by-name/me/mediasynclite/package.nix     |  2 +-
 pkgs/by-name/me/mednaffe/package.nix          |  2 +-
 pkgs/by-name/me/meg/package.nix               |  2 +-
 pkgs/by-name/me/megaglest/package.nix         |  2 +-
 pkgs/by-name/me/megahit/package.nix           |  2 +-
 pkgs/by-name/me/megapixels/package.nix        |  2 +-
 pkgs/by-name/me/megatools/package.nix         |  2 +-
 pkgs/by-name/me/mekuteriya/package.nix        |  2 +-
 pkgs/by-name/me/mela/package.nix              |  2 +-
 pkgs/by-name/me/melange/package.nix           |  2 +-
 pkgs/by-name/me/melt/package.nix              |  2 +-
 .../me/meme-image-generator/package.nix       |  2 +-
 pkgs/by-name/me/memo/package.nix              |  2 +-
 pkgs/by-name/me/memtest_vulkan/package.nix    |  2 +-
 pkgs/by-name/me/meow/package.nix              |  2 +-
 pkgs/by-name/me/mercure/package.nix           |  2 +-
 pkgs/by-name/me/merkaartor/package.nix        |  2 +-
 pkgs/by-name/me/mermaid-cli/package.nix       |  2 +-
 pkgs/by-name/me/mermaid-filter/package.nix    |  2 +-
 pkgs/by-name/me/meshoptimizer/package.nix     |  2 +-
 pkgs/by-name/me/meson-tools/package.nix       |  2 +-
 pkgs/by-name/me/mesos-dns/package.nix         |  2 +-
 pkgs/by-name/me/messer-slim/package.nix       |  2 +-
 pkgs/by-name/me/metadata-cleaner/package.nix  |  2 +-
 pkgs/by-name/me/metal-cli/package.nix         |  2 +-
 pkgs/by-name/me/metamath/package.nix          |  2 +-
 pkgs/by-name/me/metastore/package.nix         |  2 +-
 pkgs/by-name/me/meteor-git/package.nix        |  2 +-
 pkgs/by-name/me/metersLv2/package.nix         |  2 +-
 pkgs/by-name/me/mev-boost/package.nix         |  2 +-
 pkgs/by-name/mg/mgitstatus/package.nix        |  2 +-
 pkgs/by-name/mi/microbin/package.nix          |  2 +-
 pkgs/by-name/mi/microcom/package.nix          |  2 +-
 pkgs/by-name/mi/microdnf/package.nix          |  2 +-
 pkgs/by-name/mi/micromdm/package.nix          |  2 +-
 pkgs/by-name/mi/micronucleus/package.nix      |  2 +-
 pkgs/by-name/mi/microplane/package.nix        |  2 +-
 pkgs/by-name/mi/micropython/package.nix       |  2 +-
 pkgs/by-name/mi/microscheme/package.nix       |  2 +-
 pkgs/by-name/mi/microserver/package.nix       |  2 +-
 pkgs/by-name/mi/microsocks/package.nix        |  2 +-
 pkgs/by-name/mi/microsoft-gsl/package.nix     |  2 +-
 pkgs/by-name/mi/midi-trigger/package.nix      |  2 +-
 pkgs/by-name/mi/mieru/package.nix             |  2 +-
 pkgs/by-name/mi/migra/package.nix             |  2 +-
 pkgs/by-name/mi/mihomo/package.nix            |  2 +-
 pkgs/by-name/mi/miller/package.nix            |  2 +-
 pkgs/by-name/mi/millet/package.nix            |  2 +-
 pkgs/by-name/mi/millipixels/package.nix       |  2 +-
 pkgs/by-name/mi/mimalloc/package.nix          |  2 +-
 pkgs/by-name/mi/mimic/package.nix             |  2 +-
 pkgs/by-name/mi/minder/package.nix            |  2 +-
 pkgs/by-name/mi/mindustry/package.nix         |  4 +-
 .../minecraft-server-hibernation/package.nix  |  2 +-
 pkgs/by-name/mi/minesweep-rs/package.nix      |  2 +-
 .../by-name/mi/minetest-mapserver/package.nix |  2 +-
 pkgs/by-name/mi/mini-calc/package.nix         |  2 +-
 pkgs/by-name/mi/minia/package.nix             |  2 +-
 pkgs/by-name/mi/miniaudio/package.nix         |  2 +-
 pkgs/by-name/mi/minica/package.nix            |  2 +-
 pkgs/by-name/mi/minify/package.nix            |  2 +-
 pkgs/by-name/mi/minijinja/package.nix         |  2 +-
 pkgs/by-name/mi/minimacy/package.nix          |  2 +-
 pkgs/by-name/mi/minimap2/package.nix          |  2 +-
 pkgs/by-name/mi/mininet/package.nix           |  2 +-
 pkgs/by-name/mi/minio-certgen/package.nix     |  2 +-
 pkgs/by-name/mi/minio-warp/package.nix        |  2 +-
 pkgs/by-name/mi/miniserve/package.nix         |  2 +-
 pkgs/by-name/mi/minisign/package.nix          |  2 +-
 pkgs/by-name/mi/minivmac/package.nix          |  2 +-
 pkgs/by-name/mi/minixml/package.nix           |  2 +-
 pkgs/by-name/mi/miniz/package.nix             |  2 +-
 pkgs/by-name/mi/minizign/package.nix          |  2 +-
 pkgs/by-name/mi/minizip-ng/package.nix        |  2 +-
 pkgs/by-name/mi/mint-l-theme/package.nix      |  2 +-
 pkgs/by-name/mi/mint-themes/package.nix       |  2 +-
 pkgs/by-name/mi/mint-x-icons/package.nix      |  2 +-
 pkgs/by-name/mi/mint-y-icons/package.nix      |  2 +-
 pkgs/by-name/mi/mint/package.nix              |  2 +-
 pkgs/by-name/mi/mirakurun/package.nix         |  2 +-
 pkgs/by-name/mi/mirrorbits/package.nix        |  2 +-
 pkgs/by-name/mi/mise/package.nix              |  2 +-
 pkgs/by-name/mi/mission-center/package.nix    |  2 +-
 pkgs/by-name/mi/misskey/package.nix           |  2 +-
 pkgs/by-name/mi/mix2nix/package.nix           |  2 +-
 pkgs/by-name/mk/mkcert/package.nix            |  2 +-
 pkgs/by-name/mk/mkjson/generated.nix          |  2 +-
 pkgs/by-name/mk/mkp224o/package.nix           |  2 +-
 pkgs/by-name/mk/mktorrent/package.nix         |  2 +-
 pkgs/by-name/ml/mle/package.nix               |  2 +-
 pkgs/by-name/ml/mlkit/package.nix             |  2 +-
 pkgs/by-name/ml/mlvwm/package.nix             |  2 +-
 pkgs/by-name/mm/mmake/package.nix             |  2 +-
 pkgs/by-name/mm/mmdoc/package.nix             |  2 +-
 pkgs/by-name/mm/mmex/package.nix              |  2 +-
 pkgs/by-name/mm/mmsd-tng/package.nix          |  2 +-
 pkgs/by-name/mm/mmtc/package.nix              |  2 +-
 pkgs/by-name/mm/mmutils/package.nix           |  2 +-
 pkgs/by-name/mm/mmv-go/package.nix            |  2 +-
 pkgs/by-name/mm/mmv/package.nix               |  2 +-
 pkgs/by-name/mn/mnemonicode/package.nix       |  2 +-
 pkgs/by-name/mo/mo/package.nix                |  2 +-
 pkgs/by-name/mo/moar/package.nix              |  2 +-
 pkgs/by-name/mo/mob/package.nix               |  2 +-
 pkgs/by-name/mo/mockgen/package.nix           |  2 +-
 pkgs/by-name/mo/mod/package.nix               |  2 +-
 pkgs/by-name/mo/modern-cpp-kafka/package.nix  |  2 +-
 pkgs/by-name/mo/modprobed-db/package.nix      |  2 +-
 pkgs/by-name/mo/mods/package.nix              |  2 +-
 pkgs/by-name/mo/modsecurity-crs/package.nix   |  2 +-
 .../mo/modsecurity_standalone/package.nix     |  2 +-
 pkgs/by-name/mo/mojave-gtk-theme/package.nix  |  2 +-
 pkgs/by-name/mo/mokutil/package.nix           |  2 +-
 pkgs/by-name/mo/mold/package.nix              |  2 +-
 pkgs/by-name/mo/mole/package.nix              |  2 +-
 pkgs/by-name/mo/molot-lite/package.nix        |  2 +-
 pkgs/by-name/mo/mommy/package.nix             |  2 +-
 pkgs/by-name/mo/mongoaudit/package.nix        |  2 +-
 pkgs/by-name/mo/mongodb-tools/package.nix     |  2 +-
 .../by-name/mo/monitoring-plugins/package.nix |  2 +-
 pkgs/by-name/mo/monophony/package.nix         |  2 +-
 .../by-name/mo/moonlight-embedded/package.nix |  2 +-
 pkgs/by-name/mo/moosefs/package.nix           |  2 +-
 pkgs/by-name/mo/mop/package.nix               |  2 +-
 pkgs/by-name/mo/mopac/package.nix             |  2 +-
 pkgs/by-name/mo/moproxy/package.nix           |  2 +-
 pkgs/by-name/mo/moq/package.nix               |  2 +-
 pkgs/by-name/mo/morph/package.nix             |  2 +-
 pkgs/by-name/mo/morsel/package.nix            |  2 +-
 pkgs/by-name/mo/mosquitto/package.nix         |  2 +-
 pkgs/by-name/mo/mountpoint-s3/package.nix     |  2 +-
 pkgs/by-name/mo/mousai/package.nix            |  2 +-
 pkgs/by-name/mo/mouse-actions/package.nix     |  2 +-
 pkgs/by-name/mo/mozc/package.nix              |  2 +-
 pkgs/by-name/mo/mozjpeg/package.nix           |  2 +-
 pkgs/by-name/mp/mp3blaster/package.nix        |  2 +-
 pkgs/by-name/mp/mp3cat/package.nix            |  2 +-
 pkgs/by-name/mp/mp3fs/package.nix             |  2 +-
 pkgs/by-name/mp/mpd-discord-rpc/package.nix   |  2 +-
 pkgs/by-name/mp/mpd-mpris/package.nix         |  2 +-
 pkgs/by-name/mp/mpd-notification/package.nix  |  2 +-
 pkgs/by-name/mp/mpdas/package.nix             |  2 +-
 pkgs/by-name/mp/mpdris2/package.nix           |  2 +-
 pkgs/by-name/mp/mpifileutils/package.nix      |  2 +-
 pkgs/by-name/mp/mpris-notifier/package.nix    |  2 +-
 pkgs/by-name/mp/mpris-scrobbler/package.nix   |  2 +-
 .../mp/mpv-shim-default-shaders/package.nix   |  2 +-
 pkgs/by-name/mp/mpv-subs-popout/package.nix   |  2 +-
 pkgs/by-name/mp/mpvpaper/package.nix          |  2 +-
 pkgs/by-name/mq/mqtt-explorer/package.nix     |  2 +-
 pkgs/by-name/mr/mrbayes/package.nix           |  2 +-
 pkgs/by-name/mr/mruby/package.nix             |  2 +-
 .../msbuild-structured-log-viewer/package.nix |  2 +-
 pkgs/by-name/ms/mscompress/package.nix        |  2 +-
 pkgs/by-name/ms/msfpc/package.nix             |  2 +-
 pkgs/by-name/ms/msgpack-tools/package.nix     |  2 +-
 pkgs/by-name/ms/msgpuck/package.nix           |  2 +-
 pkgs/by-name/ms/mstore/package.nix            |  2 +-
 pkgs/by-name/ms/mstpd/package.nix             |  2 +-
 pkgs/by-name/mt/mtail/package.nix             |  2 +-
 pkgs/by-name/mt/mtm/package.nix               |  2 +-
 pkgs/by-name/mt/mtr-exporter/package.nix      |  2 +-
 pkgs/by-name/mt/mtxclient/package.nix         |  2 +-
 pkgs/by-name/mu/mu/package.nix                |  2 +-
 pkgs/by-name/mu/mucommander/package.nix       |  2 +-
 pkgs/by-name/mu/muffet/package.nix            |  2 +-
 pkgs/by-name/mu/muffin/package.nix            |  2 +-
 pkgs/by-name/mu/multicharge/package.nix       |  2 +-
 pkgs/by-name/mu/multilockscreen/package.nix   |  2 +-
 pkgs/by-name/mu/multimarkdown/package.nix     |  2 +-
 pkgs/by-name/mu/multimon-ng/package.nix       |  2 +-
 pkgs/by-name/mu/multiplex/package.nix         |  2 +-
 pkgs/by-name/mu/multirun/package.nix          |  2 +-
 pkgs/by-name/mu/multitail/package.nix         |  2 +-
 pkgs/by-name/mu/multus-cni/package.nix        |  2 +-
 pkgs/by-name/mu/munin/package.nix             |  2 +-
 pkgs/by-name/mu/muparser/package.nix          |  2 +-
 pkgs/by-name/mu/muparserx/package.nix         |  2 +-
 pkgs/by-name/mu/murex/package.nix             |  2 +-
 pkgs/by-name/mu/muscle/package.nix            |  2 +-
 pkgs/by-name/mu/musikcube/package.nix         |  2 +-
 pkgs/by-name/mu/musl-fts/package.nix          |  2 +-
 pkgs/by-name/mu/musl-obstack/package.nix      |  2 +-
 pkgs/by-name/mu/mustache-go/package.nix       |  2 +-
 pkgs/by-name/mu/mustache-hpp/package.nix      |  2 +-
 pkgs/by-name/mu/mustache-spec/package.nix     |  2 +-
 pkgs/by-name/mu/mutagen-compose/package.nix   |  2 +-
 pkgs/by-name/mu/mutagen/package.nix           |  2 +-
 pkgs/by-name/mu/mutt-wizard/package.nix       |  2 +-
 pkgs/by-name/mv/mvnd/package.nix              |  2 +-
 pkgs/by-name/mx/mxt-app/package.nix           |  2 +-
 pkgs/by-name/my/mycelium/package.nix          |  2 +-
 pkgs/by-name/my/mycorrhiza/package.nix        |  2 +-
 pkgs/by-name/my/mysqltuner/package.nix        |  2 +-
 pkgs/by-name/my/myxer/package.nix             |  2 +-
 pkgs/by-name/n2/n2n/package.nix               |  2 +-
 pkgs/by-name/na/naev/package.nix              |  2 +-
 pkgs/by-name/na/nahid-fonts/package.nix       |  2 +-
 pkgs/by-name/na/nali/package.nix              |  2 +-
 pkgs/by-name/na/namaka/package.nix            |  2 +-
 pkgs/by-name/na/namespace-cli/package.nix     |  2 +-
 pkgs/by-name/na/nanodbc/package.nix           |  2 +-
 pkgs/by-name/na/nanomq/package.nix            |  2 +-
 pkgs/by-name/na/nanomsg/package.nix           |  2 +-
 pkgs/by-name/na/nanovna-qt/package.nix        |  2 +-
 pkgs/by-name/na/nap/package.nix               |  2 +-
 pkgs/by-name/na/naps2/package.nix             |  2 +-
 pkgs/by-name/na/nar-serve/package.nix         |  2 +-
 pkgs/by-name/na/narrowlink/package.nix        |  2 +-
 pkgs/by-name/na/nasc/package.nix              |  2 +-
 pkgs/by-name/na/natls/package.nix             |  2 +-
 pkgs/by-name/na/nats-kafka/package.nix        |  2 +-
 pkgs/by-name/na/nats-server/package.nix       |  2 +-
 .../na/nats-streaming-server/package.nix      |  2 +-
 pkgs/by-name/na/navidrome/package.nix         |  2 +-
 pkgs/by-name/na/navilu-font/package.nix       |  2 +-
 pkgs/by-name/na/nawk/package.nix              |  2 +-
 pkgs/by-name/nb/nb/package.nix                |  2 +-
 pkgs/by-name/nb/nbfc-linux/package.nix        |  2 +-
 pkgs/by-name/nb/nbstripout/package.nix        |  2 +-
 pkgs/by-name/nb/nbxplorer/package.nix         |  2 +-
 pkgs/by-name/nc/ncdns/package.nix             |  2 +-
 pkgs/by-name/nc/ncgopher/package.nix          |  2 +-
 pkgs/by-name/nc/ncnn/package.nix              |  2 +-
 pkgs/by-name/nc/nco/package.nix               |  2 +-
 pkgs/by-name/nc/ncompress/package.nix         |  2 +-
 pkgs/by-name/nc/ncrack/package.nix            |  2 +-
 pkgs/by-name/nd/ndppd/package.nix             |  2 +-
 pkgs/by-name/nd/ndstool/package.nix           |  2 +-
 pkgs/by-name/nd/ndstrim/package.nix           |  2 +-
 pkgs/by-name/ne/ne/package.nix                |  2 +-
 pkgs/by-name/ne/near-cli/package.nix          |  2 +-
 pkgs/by-name/ne/neatvnc/package.nix           |  2 +-
 pkgs/by-name/ne/needle/package.nix            |  2 +-
 pkgs/by-name/ne/neil/package.nix              |  2 +-
 pkgs/by-name/ne/nemo-emblems/package.nix      |  2 +-
 pkgs/by-name/ne/nemo-fileroller/package.nix   |  2 +-
 pkgs/by-name/ne/nemo-python/package.nix       |  2 +-
 pkgs/by-name/ne/nemo/package.nix              |  2 +-
 pkgs/by-name/ne/neo-cowsay/package.nix        |  2 +-
 pkgs/by-name/ne/neocmakelsp/package.nix       |  2 +-
 pkgs/by-name/ne/neosay/package.nix            |  2 +-
 pkgs/by-name/ne/neothesia/package.nix         |  2 +-
 pkgs/by-name/ne/neovim-gtk/package.nix        |  2 +-
 .../ne/neovim-qt-unwrapped/package.nix        |  2 +-
 pkgs/by-name/ne/neovim-remote/package.nix     |  2 +-
 pkgs/by-name/ne/nerdctl/package.nix           |  2 +-
 pkgs/by-name/ne/nerdfix/package.nix           |  2 +-
 pkgs/by-name/ne/nest-cli/package.nix          |  2 +-
 pkgs/by-name/ne/nestopia-ue/package.nix       |  2 +-
 pkgs/by-name/ne/net-cpp/package.nix           |  2 +-
 pkgs/by-name/ne/netassert/package.nix         |  2 +-
 pkgs/by-name/ne/netavark/package.nix          |  2 +-
 pkgs/by-name/ne/netbird-dashboard/package.nix |  2 +-
 pkgs/by-name/ne/netbox2netshot/package.nix    |  2 +-
 pkgs/by-name/ne/netcdfcxx4/package.nix        |  2 +-
 pkgs/by-name/ne/netclient/package.nix         |  2 +-
 pkgs/by-name/ne/netcoredbg/package.nix        |  2 +-
 pkgs/by-name/ne/nethogs/package.nix           |  2 +-
 pkgs/by-name/ne/nethoscope/package.nix        |  2 +-
 pkgs/by-name/ne/netmask/package.nix           |  2 +-
 pkgs/by-name/ne/netop/package.nix             |  2 +-
 pkgs/by-name/ne/netplan/package.nix           |  2 +-
 pkgs/by-name/ne/netproc/package.nix           |  2 +-
 pkgs/by-name/ne/netsniff-ng/package.nix       |  2 +-
 .../ne/networkmanager-l2tp/package.nix        |  2 +-
 .../ne/networkmanager_dmenu/package.nix       |  2 +-
 .../ne/neural-amp-modeler-lv2/package.nix     |  2 +-
 pkgs/by-name/ne/neuron/package.nix            |  2 +-
 pkgs/by-name/ne/neverest/package.nix          |  2 +-
 .../ne/new-session-manager/package.nix        |  2 +-
 pkgs/by-name/ne/newcomputermodern/package.nix |  2 +-
 pkgs/by-name/ne/nextdns/package.nix           |  2 +-
 pkgs/by-name/ne/nexttrace/package.nix         |  2 +-
 pkgs/by-name/nf/nfft/package.nix              |  2 +-
 pkgs/by-name/nf/nfpm/package.nix              |  2 +-
 pkgs/by-name/nf/nfstrace/package.nix          |  2 +-
 .../ng/nginx-config-formatter/package.nix     |  2 +-
 pkgs/by-name/ng/nginx-sso/package.nix         |  2 +-
 pkgs/by-name/ng/ngrid/package.nix             |  2 +-
 pkgs/by-name/ng/ngrrram/package.nix           |  2 +-
 pkgs/by-name/nh/nheko/package.nix             |  2 +-
 pkgs/by-name/nh/nhentai/package.nix           |  2 +-
 pkgs/by-name/ni/niff/package.nix              |  2 +-
 pkgs/by-name/ni/nifticlib/package.nix         |  2 +-
 pkgs/by-name/ni/niftyseg/package.nix          |  2 +-
 pkgs/by-name/ni/nika-fonts/package.nix        |  2 +-
 pkgs/by-name/ni/nikto/package.nix             |  2 +-
 pkgs/by-name/ni/nil/package.nix               |  2 +-
 pkgs/by-name/ni/nilfs-utils/package.nix       |  2 +-
 pkgs/by-name/ni/nimlangserver/package.nix     |  2 +-
 pkgs/by-name/ni/ninjas2/package.nix           |  2 +-
 pkgs/by-name/ni/ninvaders/package.nix         |  2 +-
 .../ni/nitrokey-pro-firmware/package.nix      |  2 +-
 .../ni/nix-bash-completions/package.nix       |  2 +-
 .../by-name/ni/nix-build-uncached/package.nix |  2 +-
 pkgs/by-name/ni/nix-bundle/package.nix        |  2 +-
 pkgs/by-name/ni/nix-direnv/package.nix        |  2 +-
 pkgs/by-name/ni/nix-doc/package.nix           |  2 +-
 pkgs/by-name/ni/nix-init/package.nix          |  2 +-
 pkgs/by-name/ni/nix-ld/package.nix            |  2 +-
 pkgs/by-name/ni/nix-melt/package.nix          |  2 +-
 pkgs/by-name/ni/nix-plugins/package.nix       |  2 +-
 .../ni/nix-query-tree-viewer/package.nix      |  2 +-
 pkgs/by-name/ni/nix-search/package.nix        |  2 +-
 pkgs/by-name/ni/nix-snapshotter/package.nix   |  2 +-
 .../ni/nix-store-gcs-proxy/package.nix        |  2 +-
 .../package.nix                               |  2 +-
 pkgs/by-name/ni/nix-top/package.nix           |  2 +-
 pkgs/by-name/ni/nix-weather/package.nix       |  2 +-
 pkgs/by-name/ni/nix-your-shell/package.nix    |  2 +-
 pkgs/by-name/ni/nixdoc/package.nix            |  2 +-
 pkgs/by-name/ni/nixel/package.nix             |  2 +-
 pkgs/by-name/ni/nixops-dns/package.nix        |  2 +-
 pkgs/by-name/ni/nixos-anywhere/package.nix    |  2 +-
 pkgs/by-name/ni/nixos-facter/package.nix      |  2 +-
 pkgs/by-name/ni/nixos-generators/package.nix  |  2 +-
 pkgs/by-name/ni/nixos-shell/package.nix       |  2 +-
 pkgs/by-name/ni/nixpacks/package.nix          |  2 +-
 pkgs/by-name/ni/nixpkgs-fmt/package.nix       |  2 +-
 .../ni/nixpkgs-lint-community/package.nix     |  2 +-
 .../ni/nixseparatedebuginfod/package.nix      |  2 +-
 pkgs/by-name/ni/nixtract/package.nix          |  2 +-
 .../package.nix                               |  2 +-
 .../nm/nm-file-secret-agent/package.nix       |  2 +-
 pkgs/by-name/nm/nmap-formatter/package.nix    |  2 +-
 pkgs/by-name/nm/nmapsi4/package.nix           |  2 +-
 pkgs/by-name/nm/nmrpflash/package.nix         |  2 +-
 pkgs/by-name/nm/nms/package.nix               |  2 +-
 pkgs/by-name/nn/nng/package.nix               |  2 +-
 pkgs/by-name/nn/nnpdf/package.nix             |  2 +-
 pkgs/by-name/no/noaa-apt/package.nix          |  2 +-
 pkgs/by-name/no/node-glob/package.nix         |  2 +-
 pkgs/by-name/no/node-manta/package.nix        |  2 +-
 .../no/node-problem-detector/package.nix      |  2 +-
 pkgs/by-name/no/nodemon/package.nix           |  2 +-
 pkgs/by-name/no/nodenv/package.nix            |  2 +-
 pkgs/by-name/no/nofi/package.nix              |  2 +-
 pkgs/by-name/no/noise-repellent/package.nix   |  2 +-
 pkgs/by-name/no/noisetorch/package.nix        |  2 +-
 pkgs/by-name/no/nomacs/package.nix            |  2 +-
 pkgs/by-name/no/nomad-autoscaler/package.nix  |  2 +-
 .../no/nomad-driver-containerd/package.nix    |  2 +-
 .../no/nomad-driver-podman/package.nix        |  2 +-
 pkgs/by-name/no/nomad-pack/package.nix        |  2 +-
 pkgs/by-name/no/nominatim/package.nix         |  2 +-
 pkgs/by-name/no/nomino/package.nix            |  2 +-
 .../no/nordzy-cursor-theme/package.nix        |  2 +-
 pkgs/by-name/no/nordzy-icon-theme/package.nix |  2 +-
 pkgs/by-name/no/norouter/package.nix          |  2 +-
 pkgs/by-name/no/noseyparker/package.nix       |  2 +-
 pkgs/by-name/no/nosqli/package.nix            |  2 +-
 pkgs/by-name/no/nostr-rs-relay/package.nix    |  2 +-
 pkgs/by-name/no/nostui/package.nix            |  2 +-
 pkgs/by-name/no/notation/package.nix          |  2 +-
 pkgs/by-name/no/notcurses/package.nix         |  2 +-
 pkgs/by-name/no/notejot/package.nix           |  2 +-
 pkgs/by-name/no/notes-up/package.nix          |  2 +-
 pkgs/by-name/no/noteshrink/package.nix        |  2 +-
 pkgs/by-name/no/notify-client/package.nix     |  2 +-
 pkgs/by-name/no/notify/package.nix            |  2 +-
 pkgs/by-name/no/notion/package.nix            |  2 +-
 .../by-name/no/notmuch-addrlookup/package.nix |  2 +-
 pkgs/by-name/no/notmuch-bower/package.nix     |  2 +-
 pkgs/by-name/no/notmuch-mailmover/package.nix |  2 +-
 .../no/noto-fonts-color-emoji/package.nix     |  2 +-
 pkgs/by-name/no/nova/package.nix              |  2 +-
 pkgs/by-name/no/novelwriter/package.nix       |  2 +-
 pkgs/by-name/no/novnc/package.nix             |  2 +-
 pkgs/by-name/no/novops/package.nix            |  2 +-
 pkgs/by-name/np/npkill/package.nix            |  2 +-
 pkgs/by-name/np/npm-check/package.nix         |  2 +-
 pkgs/by-name/np/npm-lockfile-fix/package.nix  |  2 +-
 pkgs/by-name/nq/nq/package.nix                |  2 +-
 pkgs/by-name/nr/nrr/package.nix               |  2 +-
 pkgs/by-name/nr/nrsc5/package.nix             |  2 +-
 pkgs/by-name/ns/ns-usbloader/package.nix      |  2 +-
 pkgs/by-name/ns/nsc/package.nix               |  2 +-
 pkgs/by-name/ns/nsh/package.nix               |  2 +-
 pkgs/by-name/ns/nsnake/package.nix            |  2 +-
 pkgs/by-name/ns/nsncd/package.nix             |  2 +-
 pkgs/by-name/ns/nsq/package.nix               |  2 +-
 pkgs/by-name/ns/nssmdns/package.nix           |  2 +-
 pkgs/by-name/ns/nsync/package.nix             |  2 +-
 pkgs/by-name/nt/ntfy/package.nix              |  2 +-
 pkgs/by-name/nt/ntfy/webpush.nix              |  2 +-
 pkgs/by-name/nt/ntirpc/package.nix            |  2 +-
 pkgs/by-name/nt/ntk/package.nix               |  2 +-
 pkgs/by-name/nt/ntpstat/package.nix           |  2 +-
 pkgs/by-name/nt/ntttcp/package.nix            |  2 +-
 pkgs/by-name/nu/nudoku/package.nix            |  2 +-
 pkgs/by-name/nu/nullidentdmod/package.nix     |  2 +-
 pkgs/by-name/nu/nulloy/package.nix            |  2 +-
 pkgs/by-name/nu/numactl/package.nix           |  2 +-
 pkgs/by-name/nu/numatop/package.nix           |  2 +-
 .../by-name/nu/numix-cursor-theme/package.nix |  2 +-
 .../nu/numix-icon-theme-circle/package.nix    |  2 +-
 .../nu/numix-icon-theme-square/package.nix    |  2 +-
 .../nu/numix-solarized-gtk-theme/package.nix  |  2 +-
 pkgs/by-name/nu/numworks-epsilon/package.nix  |  2 +-
 pkgs/by-name/nu/nuraft/package.nix            |  2 +-
 pkgs/by-name/nu/nurl/package.nix              |  2 +-
 pkgs/by-name/nu/nuv/package.nix               |  2 +-
 .../nvidia-docker.nix                         |  2 +-
 .../nv/nvidia-container-toolkit/package.nix   |  2 +-
 pkgs/by-name/nv/nvidia-modprobe/package.nix   |  2 +-
 pkgs/by-name/nv/nvimpager/package.nix         |  2 +-
 pkgs/by-name/nv/nvme-cli/package.nix          |  2 +-
 pkgs/by-name/nv/nvmetcfg/package.nix          |  2 +-
 pkgs/by-name/nw/nwg-bar/package.nix           |  2 +-
 pkgs/by-name/nw/nwg-dock/package.nix          |  2 +-
 pkgs/by-name/nw/nwg-drawer/package.nix        |  2 +-
 pkgs/by-name/nw/nwg-launchers/package.nix     |  2 +-
 pkgs/by-name/nw/nwg-look/package.nix          |  2 +-
 pkgs/by-name/nw/nwg-menu/package.nix          |  2 +-
 pkgs/by-name/nw/nwipe/package.nix             |  2 +-
 pkgs/by-name/nx/nx-libs/package.nix           |  2 +-
 pkgs/by-name/ny/nyancat/package.nix           |  2 +-
 pkgs/by-name/oa/oak/package.nix               |  2 +-
 pkgs/by-name/oa/oathkeeper/package.nix        |  2 +-
 pkgs/by-name/oa/oatpp/package.nix             |  2 +-
 pkgs/by-name/oa/oauth2-proxy/package.nix      |  2 +-
 pkgs/by-name/oa/oauth2c/package.nix           |  2 +-
 pkgs/by-name/oa/oauth2l/package.nix           |  2 +-
 pkgs/by-name/ob/obs-cmd/package.nix           |  2 +-
 pkgs/by-name/ob/obsidian-export/package.nix   |  2 +-
 pkgs/by-name/oc/ocaml-top/package.nix         |  2 +-
 .../oc/ocf-resource-agents/package.nix        |  2 +-
 .../oc/oci-seccomp-bpf-hook/package.nix       |  2 +-
 pkgs/by-name/oc/ocl-icd/package.nix           |  2 +-
 pkgs/by-name/oc/oclgrind/package.nix          |  2 +-
 pkgs/by-name/oc/ocm/package.nix               |  2 +-
 pkgs/by-name/oc/ocproxy/package.nix           |  2 +-
 pkgs/by-name/oc/ocrodjvu/package.nix          |  2 +-
 pkgs/by-name/oc/ocsigen-i18n/package.nix      |  2 +-
 pkgs/by-name/oc/octomap/package.nix           |  2 +-
 pkgs/by-name/oc/octoprint/package.nix         |  8 +--
 pkgs/by-name/oc/octoprint/plugins.nix         | 56 +++++++++----------
 pkgs/by-name/oc/octopus-caller/package.nix    |  2 +-
 pkgs/by-name/oc/octosql/package.nix           |  2 +-
 pkgs/by-name/oc/oculante/package.nix          |  2 +-
 pkgs/by-name/od/odin2/package.nix             |  2 +-
 pkgs/by-name/od/odo/package.nix               |  2 +-
 pkgs/by-name/od/odoo15/package.nix            |  2 +-
 pkgs/by-name/od/odp-dpdk/package.nix          |  2 +-
 pkgs/by-name/od/odpic/package.nix             |  2 +-
 pkgs/by-name/od/odyssey/package.nix           |  2 +-
 pkgs/by-name/of/offensive-azure/package.nix   |  2 +-
 pkgs/by-name/of/office-code-pro/package.nix   |  2 +-
 pkgs/by-name/of/offlineimap/package.nix       |  2 +-
 pkgs/by-name/oh/oh-my-git/package.nix         |  2 +-
 pkgs/by-name/oh/oh/package.nix                |  2 +-
 pkgs/by-name/oi/oidc-agent/package.nix        |  2 +-
 pkgs/by-name/oi/oil-buku/package.nix          |  2 +-
 pkgs/by-name/oi/oink/package.nix              |  2 +-
 pkgs/by-name/ok/okolors/package.nix           |  2 +-
 pkgs/by-name/ok/okta-aws-cli/package.nix      |  2 +-
 pkgs/by-name/ok/okteto/package.nix            |  2 +-
 pkgs/by-name/ol/olsrd/package.nix             |  2 +-
 pkgs/by-name/om/omekasy/package.nix           |  2 +-
 pkgs/by-name/om/omnictl/package.nix           |  2 +-
 pkgs/by-name/om/omping/package.nix            |  2 +-
 pkgs/by-name/on/one-click-backup/package.nix  |  2 +-
 pkgs/by-name/on/onedrivegui/package.nix       |  2 +-
 pkgs/by-name/on/onedriver/package.nix         |  2 +-
 pkgs/by-name/on/onefetch/package.nix          |  2 +-
 pkgs/by-name/on/oneshot/package.nix           |  2 +-
 pkgs/by-name/on/onetun/package.nix            |  2 +-
 pkgs/by-name/on/onmetal-image/package.nix     |  2 +-
 pkgs/by-name/on/onscripter-en/package.nix     |  2 +-
 pkgs/by-name/oo/oo7/package.nix               |  2 +-
 pkgs/by-name/oo/oonf-olsrd2/package.nix       |  2 +-
 pkgs/by-name/oo/ooniprobe-cli/package.nix     |  2 +-
 pkgs/by-name/op/opaline/package.nix           |  2 +-
 pkgs/by-name/op/opam-publish/package.nix      |  2 +-
 pkgs/by-name/op/opam2json/package.nix         |  2 +-
 pkgs/by-name/op/opcr-policy/package.nix       |  2 +-
 pkgs/by-name/op/opcua-commander/package.nix   |  2 +-
 pkgs/by-name/op/open-dyslexic/package.nix     |  2 +-
 pkgs/by-name/op/open-fprintd/package.nix      |  2 +-
 pkgs/by-name/op/open-in-mpv/package.nix       |  2 +-
 pkgs/by-name/op/open-isns/package.nix         |  2 +-
 pkgs/by-name/op/open-policy-agent/package.nix |  2 +-
 pkgs/by-name/op/open-scq30/package.nix        |  2 +-
 .../by-name/op/open-stage-control/package.nix |  2 +-
 pkgs/by-name/op/openapi-changes/package.nix   |  2 +-
 pkgs/by-name/op/openapi-tui/package.nix       |  2 +-
 pkgs/by-name/op/openbgpd/package.nix          |  2 +-
 pkgs/by-name/op/openboardview/package.nix     |  2 +-
 pkgs/by-name/op/opencbm/package.nix           |  2 +-
 pkgs/by-name/op/opencl-clhpp/package.nix      |  2 +-
 pkgs/by-name/op/opencollada/package.nix       |  2 +-
 pkgs/by-name/op/opencommit/package.nix        |  2 +-
 pkgs/by-name/op/opencryptoki/package.nix      |  2 +-
 pkgs/by-name/op/opendune/package.nix          |  2 +-
 pkgs/by-name/op/openfga-cli/package.nix       |  2 +-
 pkgs/by-name/op/openfga/package.nix           |  2 +-
 pkgs/by-name/op/openhmd/package.nix           |  2 +-
 pkgs/by-name/op/openiscsi/package.nix         |  2 +-
 pkgs/by-name/op/openjpeg/package.nix          |  2 +-
 pkgs/by-name/op/openjph/package.nix           |  2 +-
 pkgs/by-name/op/openlibm/package.nix          |  2 +-
 pkgs/by-name/op/openlierox/package.nix        |  2 +-
 pkgs/by-name/op/openmm/package.nix            |  2 +-
 pkgs/by-name/op/openmolcas/package.nix        |  2 +-
 .../op/openorienteering-mapper/package.nix    |  2 +-
 pkgs/by-name/op/openresolv/package.nix        |  2 +-
 pkgs/by-name/op/openrussian-cli/package.nix   |  2 +-
 pkgs/by-name/op/opensaml-cpp/package.nix      |  2 +-
 pkgs/by-name/op/openscap/package.nix          |  2 +-
 pkgs/by-name/op/openseachest/package.nix      |  2 +-
 pkgs/by-name/op/opensearch-cli/package.nix    |  2 +-
 pkgs/by-name/op/opensm/package.nix            |  2 +-
 pkgs/by-name/op/opensmt/package.nix           |  2 +-
 pkgs/by-name/op/opensoundmeter/package.nix    |  2 +-
 pkgs/by-name/op/openspecfun/package.nix       |  2 +-
 pkgs/by-name/op/opensupaplex/package.nix      |  2 +-
 pkgs/by-name/op/opentracing-cpp/package.nix   |  2 +-
 pkgs/by-name/op/opentyrian/package.nix        |  2 +-
 pkgs/by-name/op/openvi/package.nix            |  2 +-
 pkgs/by-name/op/openzone-cursors/package.nix  |  2 +-
 pkgs/by-name/op/oppai-ng/package.nix          |  2 +-
 pkgs/by-name/op/ops/package.nix               |  2 +-
 pkgs/by-name/op/opustags/package.nix          |  2 +-
 pkgs/by-name/oq/oq/package.nix                |  2 +-
 pkgs/by-name/oq/oqs-provider/package.nix      |  2 +-
 .../or/oranchelo-icon-theme/package.nix       |  2 +-
 pkgs/by-name/or/oranda/package.nix            |  2 +-
 pkgs/by-name/or/oras/package.nix              |  2 +-
 pkgs/by-name/or/orcania/package.nix           |  2 +-
 pkgs/by-name/or/orchard/package.nix           |  2 +-
 pkgs/by-name/or/orchis-theme/package.nix      |  2 +-
 pkgs/by-name/or/ord/package.nix               |  2 +-
 pkgs/by-name/or/org-stats/package.nix         |  2 +-
 pkgs/by-name/or/orjail/package.nix            |  2 +-
 pkgs/by-name/or/orocos-kdl/package.nix        |  2 +-
 pkgs/by-name/or/orogene/package.nix           |  2 +-
 pkgs/by-name/os/osc-cli/package.nix           |  2 +-
 pkgs/by-name/os/oscar/package.nix             |  2 +-
 pkgs/by-name/os/oscclip/package.nix           |  2 +-
 pkgs/by-name/os/osdlyrics/package.nix         |  2 +-
 pkgs/by-name/os/osgqt/package.nix             |  2 +-
 pkgs/by-name/os/oshka/package.nix             |  2 +-
 pkgs/by-name/os/osm2pgsql/package.nix         |  2 +-
 pkgs/by-name/os/osm2xmap/package.nix          |  2 +-
 pkgs/by-name/os/osmid/package.nix             |  2 +-
 pkgs/by-name/os/osmo-bsc/package.nix          |  2 +-
 pkgs/by-name/os/osmo-bts/package.nix          |  2 +-
 pkgs/by-name/os/osmo-ggsn/package.nix         |  2 +-
 pkgs/by-name/os/osmo-hlr/package.nix          |  2 +-
 pkgs/by-name/os/osmo-hnbgw/package.nix        |  2 +-
 pkgs/by-name/os/osmo-hnodeb/package.nix       |  2 +-
 pkgs/by-name/os/osmo-iuh/package.nix          |  2 +-
 pkgs/by-name/os/osmo-mgw/package.nix          |  2 +-
 pkgs/by-name/os/osmo-msc/package.nix          |  2 +-
 pkgs/by-name/os/osmo-pcu/package.nix          |  2 +-
 pkgs/by-name/os/osmo-sgsn/package.nix         |  2 +-
 .../by-name/os/osmo-sip-connector/package.nix |  2 +-
 pkgs/by-name/os/osmtogeojson/package.nix      |  2 +-
 pkgs/by-name/os/osqp/package.nix              |  2 +-
 pkgs/by-name/os/osslsigncode/package.nix      |  2 +-
 pkgs/by-name/os/osv-detector/package.nix      |  2 +-
 pkgs/by-name/os/osxsnarf/package.nix          |  2 +-
 pkgs/by-name/ot/otadump/package.nix           |  2 +-
 pkgs/by-name/ot/otel-cli/package.nix          |  2 +-
 .../ot/otel-desktop-viewer/package.nix        |  2 +-
 pkgs/by-name/ot/otf2bdf/package.nix           |  2 +-
 pkgs/by-name/ot/otfcc/package.nix             |  2 +-
 pkgs/by-name/ot/otpauth/package.nix           |  2 +-
 pkgs/by-name/ot/otree/package.nix             |  2 +-
 pkgs/by-name/ot/ots/package.nix               |  2 +-
 pkgs/by-name/ot/ott/package.nix               |  2 +-
 pkgs/by-name/ot/otus-lisp/package.nix         |  2 +-
 pkgs/by-name/ou/ouch/package.nix              |  2 +-
 pkgs/by-name/ou/oui/package.nix               |  2 +-
 pkgs/by-name/ou/outils/package.nix            |  2 +-
 pkgs/by-name/ov/oven-media-engine/package.nix |  2 +-
 pkgs/by-name/ov/overmind/package.nix          |  2 +-
 pkgs/by-name/ov/overskride/package.nix        |  2 +-
 pkgs/by-name/ov/oversteer/package.nix         |  2 +-
 pkgs/by-name/ov/ovh-ttyrec/package.nix        |  2 +-
 pkgs/by-name/ow/owamp/package.nix             |  2 +-
 pkgs/by-name/ow/owl-lisp/package.nix          |  2 +-
 pkgs/by-name/ow/owncast/package.nix           |  2 +-
 .../by-name/ow/owntracks-recorder/package.nix |  2 +-
 pkgs/by-name/ox/oxefmsynth/package.nix        |  2 +-
 pkgs/by-name/ox/oxide-rs/package.nix          |  2 +-
 pkgs/by-name/p1/p11-kit/package.nix           |  2 +-
 pkgs/by-name/p2/p2pool/package.nix            |  2 +-
 pkgs/by-name/p9/p910nd/package.nix            |  2 +-
 pkgs/by-name/pa/pachyderm/package.nix         |  2 +-
 pkgs/by-name/pa/pack/package.nix              |  2 +-
 pkgs/by-name/pa/packer/package.nix            |  2 +-
 pkgs/by-name/pa/packet-sd/package.nix         |  2 +-
 pkgs/by-name/pa/packr/package.nix             |  4 +-
 pkgs/by-name/pa/paco/package.nix              |  2 +-
 pkgs/by-name/pa/pacparser/package.nix         |  2 +-
 pkgs/by-name/pa/pacproxy/package.nix          |  2 +-
 pkgs/by-name/pa/page/package.nix              |  2 +-
 pkgs/by-name/pa/pagmo2/package.nix            |  2 +-
 pkgs/by-name/pa/pairdrop/package.nix          |  2 +-
 pkgs/by-name/pa/paleta/package.nix            |  2 +-
 pkgs/by-name/pa/pam-reattach/package.nix      |  2 +-
 pkgs/by-name/pa/pam_gnupg/package.nix         |  2 +-
 pkgs/by-name/pa/pam_mysql/package.nix         |  2 +-
 pkgs/by-name/pa/pam_rssh/package.nix          |  2 +-
 pkgs/by-name/pa/pamixer/package.nix           |  2 +-
 pkgs/by-name/pa/pandoc-katex/package.nix      |  2 +-
 .../by-name/pa/pandoc-lua-filters/package.nix |  2 +-
 pkgs/by-name/pa/panicparse/package.nix        |  2 +-
 pkgs/by-name/pa/pantheon-tweaks/package.nix   |  2 +-
 pkgs/by-name/pa/papeer/package.nix            |  2 +-
 pkgs/by-name/pa/paper-age/package.nix         |  2 +-
 .../pa/paperless-asn-qr-codes/package.nix     |  2 +-
 pkgs/by-name/pa/papirus-folders/package.nix   |  2 +-
 pkgs/by-name/pa/papirus-nord/package.nix      |  2 +-
 pkgs/by-name/pa/paps/package.nix              |  2 +-
 pkgs/by-name/pa/par2cmdline-turbo/package.nix |  2 +-
 pkgs/by-name/pa/par2cmdline/package.nix       |  2 +-
 .../pa/parallel-disk-usage/package.nix        |  2 +-
 pkgs/by-name/pa/paralus-cli/package.nix       |  2 +-
 pkgs/by-name/pa/parastoo-fonts/package.nix    |  2 +-
 pkgs/by-name/pa/paretosecurity/package.nix    |  2 +-
 .../pa/parinfer-rust-emacs/package.nix        |  2 +-
 pkgs/by-name/pa/parlatype/package.nix         |  2 +-
 pkgs/by-name/pa/parlay/package.nix            |  2 +-
 pkgs/by-name/pa/parsedmarc/package.nix        |  2 +-
 pkgs/by-name/pa/partclone/package.nix         |  2 +-
 pkgs/by-name/pa/particl-core/package.nix      |  2 +-
 pkgs/by-name/pa/paru/package.nix              |  2 +-
 pkgs/by-name/pa/passage/package.nix           |  2 +-
 pkgs/by-name/pa/passdetective/package.nix     |  2 +-
 pkgs/by-name/pa/passerine/package.nix         |  2 +-
 pkgs/by-name/pa/passff-host/package.nix       |  2 +-
 pkgs/by-name/pa/passphrase2pgp/package.nix    |  2 +-
 pkgs/by-name/pa/pastebinit/package.nix        |  2 +-
 pkgs/by-name/pa/pasystray/package.nix         |  2 +-
 pkgs/by-name/pa/pat/package.nix               |  2 +-
 pkgs/by-name/pa/patch2pr/package.nix          |  2 +-
 pkgs/by-name/pa/patchage/package.nix          |  2 +-
 pkgs/by-name/pa/pathvector/package.nix        |  2 +-
 pkgs/by-name/pa/patsh/package.nix             |  2 +-
 pkgs/by-name/pa/payme/package.nix             |  2 +-
 pkgs/by-name/pa/pazi/package.nix              |  2 +-
 pkgs/by-name/pb/pbgopy/package.nix            |  2 +-
 pkgs/by-name/pb/pbpctrl/package.nix           |  2 +-
 pkgs/by-name/pb/pbzx/package.nix              |  2 +-
 pkgs/by-name/pc/pcapc/package.nix             |  2 +-
 pkgs/by-name/pc/pcaudiolib/package.nix        |  2 +-
 pkgs/by-name/pc/pcb2gcode/package.nix         |  2 +-
 pkgs/by-name/pc/pcm/package.nix               |  2 +-
 pkgs/by-name/pc/pcmanx-gtk2/package.nix       |  2 +-
 pkgs/by-name/pc/pcmsolver/package.nix         |  2 +-
 pkgs/by-name/pc/pcp/package.nix               |  2 +-
 pkgs/by-name/pc/pcstat/package.nix            |  2 +-
 pkgs/by-name/pd/pdal/package.nix              |  2 +-
 pkgs/by-name/pd/pdf2djvu/package.nix          |  2 +-
 pkgs/by-name/pd/pdf2svg/package.nix           |  2 +-
 pkgs/by-name/pd/pdfannots/package.nix         |  2 +-
 pkgs/by-name/pd/pdfcpu/package.nix            |  2 +-
 pkgs/by-name/pd/pdfdiff/package.nix           |  2 +-
 pkgs/by-name/pd/pdfslicer/package.nix         |  2 +-
 pkgs/by-name/pd/pdftag/package.nix            |  2 +-
 pkgs/by-name/pd/pdftk/package.nix             |  2 +-
 pkgs/by-name/pd/pdftoipe/package.nix          |  2 +-
 pkgs/by-name/pd/pdpmake/package.nix           |  2 +-
 pkgs/by-name/pe/pe-parse/package.nix          |  2 +-
 pkgs/by-name/pe/peazip/package.nix            |  2 +-
 pkgs/by-name/pe/pebble/package.nix            |  2 +-
 pkgs/by-name/pe/peco/package.nix              |  2 +-
 pkgs/by-name/pe/peek/package.nix              |  2 +-
 pkgs/by-name/pe/peep/package.nix              |  2 +-
 pkgs/by-name/pe/peergos/package.nix           |  2 +-
 pkgs/by-name/pe/pegtl/package.nix             |  2 +-
 pkgs/by-name/pe/perceptualdiff/package.nix    |  2 +-
 pkgs/by-name/pe/percollate/package.nix        |  2 +-
 pkgs/by-name/pe/perfect-hash/package.nix      |  2 +-
 .../by-name/pe/perl-debug-adapter/package.nix |  2 +-
 pkgs/by-name/pe/perlnavigator/package.nix     |  2 +-
 .../pe/persistent-cache-cpp/package.nix       |  2 +-
 pkgs/by-name/pe/peru/package.nix              |  2 +-
 pkgs/by-name/pe/pest-ide-tools/package.nix    |  2 +-
 pkgs/by-name/pe/pet/package.nix               |  2 +-
 pkgs/by-name/pf/pfetch-rs/package.nix         |  2 +-
 pkgs/by-name/pf/pfsshell/package.nix          |  2 +-
 pkgs/by-name/pg/pg_checksums/package.nix      |  2 +-
 pkgs/by-name/pg/pg_featureserv/package.nix    |  2 +-
 pkgs/by-name/pg/pg_flame/package.nix          |  2 +-
 pkgs/by-name/pg/pg_tileserv/package.nix       |  2 +-
 pkgs/by-name/pg/pgagroal/package.nix          |  2 +-
 pkgs/by-name/pg/pgcat/package.nix             |  2 +-
 pkgs/by-name/pg/pgcenter/package.nix          |  2 +-
 pkgs/by-name/pg/pget/package.nix              |  2 +-
 pkgs/by-name/pg/pgformatter/package.nix       |  2 +-
 pkgs/by-name/pg/pgmetrics/package.nix         |  2 +-
 pkgs/by-name/pg/pgmoneta/package.nix          |  2 +-
 pkgs/by-name/pg/pgo-client/package.nix        |  2 +-
 pkgs/by-name/pg/pgpdump/package.nix           |  2 +-
 pkgs/by-name/pg/pgsrip/package.nix            |  2 +-
 pkgs/by-name/pg/pgtop/package.nix             |  2 +-
 pkgs/by-name/pg/pgweb/package.nix             |  2 +-
 pkgs/by-name/ph/phash/package.nix             |  2 +-
 pkgs/by-name/ph/phd2/package.nix              |  2 +-
 pkgs/by-name/ph/phockup/package.nix           |  2 +-
 pkgs/by-name/ph/photocollage/package.nix      |  2 +-
 pkgs/by-name/ph/photon/package.nix            |  2 +-
 pkgs/by-name/ph/photoprism/package.nix        |  2 +-
 pkgs/by-name/ph/phpactor/package.nix          |  2 +-
 pkgs/by-name/ph/phrase-cli/package.nix        |  2 +-
 pkgs/by-name/ph/phraze/package.nix            |  2 +-
 pkgs/by-name/ph/physlock/package.nix          |  2 +-
 pkgs/by-name/pi/piano-rs/package.nix          |  2 +-
 pkgs/by-name/pi/pianotrans/package.nix        |  2 +-
 pkgs/by-name/pi/pick/package.nix              |  2 +-
 pkgs/by-name/pi/picocom/package.nix           |  2 +-
 pkgs/by-name/pi/picocrypt-cli/package.nix     |  2 +-
 pkgs/by-name/pi/pid1/package.nix              |  2 +-
 pkgs/by-name/pi/pigeon/package.nix            |  2 +-
 pkgs/by-name/pi/pik/package.nix               |  2 +-
 pkgs/by-name/pi/piknik/package.nix            |  2 +-
 pkgs/by-name/pi/pinchflat/package.nix         |  2 +-
 pkgs/by-name/pi/pinentry-bemenu/package.nix   |  2 +-
 pkgs/by-name/pi/pinentry-rofi/package.nix     |  2 +-
 pkgs/by-name/pi/pinfo/package.nix             |  2 +-
 pkgs/by-name/pi/pingme/package.nix            |  2 +-
 pkgs/by-name/pi/pingtunnel/package.nix        |  2 +-
 pkgs/by-name/pi/pinit/package.nix             |  2 +-
 pkgs/by-name/pi/pinniped/package.nix          |  2 +-
 pkgs/by-name/pi/pinta/package.nix             |  2 +-
 pkgs/by-name/pi/pioasm/package.nix            |  2 +-
 pkgs/by-name/pi/pioneer/package.nix           |  2 +-
 pkgs/by-name/pi/pipectl/package.nix           |  2 +-
 pkgs/by-name/pi/piper/package.nix             |  2 +-
 pkgs/by-name/pi/pipes-rs/package.nix          |  2 +-
 pkgs/by-name/pi/pipes/package.nix             |  2 +-
 pkgs/by-name/pi/pipet/package.nix             |  2 +-
 pkgs/by-name/pi/pipr/package.nix              |  2 +-
 pkgs/by-name/pi/pistol/package.nix            |  2 +-
 pkgs/by-name/pi/pius/package.nix              |  2 +-
 pkgs/by-name/pi/piv-agent/package.nix         |  2 +-
 pkgs/by-name/pi/pix/package.nix               |  2 +-
 pkgs/by-name/pi/pixd/package.nix              |  2 +-
 pkgs/by-name/pi/pixiewps/package.nix          |  2 +-
 pkgs/by-name/pi/pixz/package.nix              |  2 +-
 pkgs/by-name/pi/pizarra/package.nix           |  2 +-
 pkgs/by-name/pk/pkarr/package.nix             |  2 +-
 pkgs/by-name/pk/pkcs11-provider/package.nix   |  2 +-
 pkgs/by-name/pk/pkg/package.nix               |  2 +-
 pkgs/by-name/pk/pkgdiff/package.nix           |  2 +-
 pkgs/by-name/pk/pkger/package.nix             |  2 +-
 pkgs/by-name/pk/pkgtop/package.nix            |  2 +-
 pkgs/by-name/pl/planify/package.nix           |  2 +-
 pkgs/by-name/pl/plano-theme/package.nix       |  2 +-
 pkgs/by-name/pl/plasma-hud/package.nix        |  2 +-
 pkgs/by-name/pl/platform-folders/package.nix  |  2 +-
 pkgs/by-name/pl/platinum-searcher/package.nix |  2 +-
 pkgs/by-name/pl/playerctl/package.nix         |  2 +-
 pkgs/by-name/pl/please/package.nix            |  2 +-
 pkgs/by-name/pl/plfit/package.nix             |  2 +-
 pkgs/by-name/pl/plink-ng/package.nix          |  2 +-
 pkgs/by-name/pl/plocate/package.nix           |  2 +-
 pkgs/by-name/pl/plog/package.nix              |  2 +-
 pkgs/by-name/pl/plotinus/package.nix          |  2 +-
 pkgs/by-name/pl/plowshare/package.nix         |  2 +-
 pkgs/by-name/pl/plumber/package.nix           |  2 +-
 pkgs/by-name/pl/plumed/package.nix            |  2 +-
 pkgs/by-name/pl/pluto/package.nix             |  2 +-
 pkgs/by-name/pl/plymouth/package.nix          |  2 +-
 pkgs/by-name/pm/pm2/package.nix               |  2 +-
 pkgs/by-name/pn/pn/package.nix                |  2 +-
 pkgs/by-name/pn/pngoptimizer/package.nix      |  2 +-
 pkgs/by-name/pn/pngquant/package.nix          |  2 +-
 pkgs/by-name/pn/pnmixer/package.nix           |  2 +-
 .../pn/pnpm-shell-completion/package.nix      |  2 +-
 pkgs/by-name/po/pocket-casts/package.nix      |  2 +-
 pkgs/by-name/po/pocketbase/package.nix        |  2 +-
 pkgs/by-name/po/podman-tui/package.nix        |  2 +-
 pkgs/by-name/po/podman/package.nix            |  2 +-
 pkgs/by-name/po/poetry2conda/package.nix      |  2 +-
 pkgs/by-name/po/pokeget-rs/package.nix        |  2 +-
 pkgs/by-name/po/pokemonsay/package.nix        |  2 +-
 pkgs/by-name/po/polkit/package.nix            |  2 +-
 pkgs/by-name/po/polybar/package.nix           |  2 +-
 pkgs/by-name/po/polylux2pdfpc/package.nix     |  2 +-
 pkgs/by-name/po/pomerium-cli/package.nix      |  2 +-
 pkgs/by-name/po/pomerium/package.nix          |  2 +-
 pkgs/by-name/po/pommed_light/package.nix      |  2 +-
 pkgs/by-name/po/pomsky/package.nix            |  2 +-
 pkgs/by-name/po/ponymix/package.nix           |  2 +-
 pkgs/by-name/po/poop/package.nix              |  2 +-
 pkgs/by-name/po/pop-icon-theme/package.nix    |  2 +-
 pkgs/by-name/po/pop-launcher/package.nix      |  2 +-
 pkgs/by-name/po/pop/package.nix               |  2 +-
 pkgs/by-name/po/popeye/package.nix            |  2 +-
 pkgs/by-name/po/popl/package.nix              |  2 +-
 pkgs/by-name/po/poppins/package.nix           |  2 +-
 pkgs/by-name/po/popsicle/package.nix          |  2 +-
 pkgs/by-name/po/poptop/package.nix            |  2 +-
 pkgs/by-name/po/popura/package.nix            |  2 +-
 pkgs/by-name/po/porsmo/package.nix            |  2 +-
 pkgs/by-name/po/portal/package.nix            |  2 +-
 .../po/portfolio-filemanager/package.nix      |  2 +-
 pkgs/by-name/po/portmod/package.nix           |  2 +-
 pkgs/by-name/po/portunus/package.nix          |  2 +-
 .../by-name/po/postiats-utilities/package.nix |  2 +-
 pkgs/by-name/po/postsrsd/package.nix          |  2 +-
 pkgs/by-name/po/pouf/package.nix              |  2 +-
 .../po/power-profiles-daemon/package.nix      |  2 +-
 pkgs/by-name/po/powercap/package.nix          |  2 +-
 pkgs/by-name/po/powerdns-admin/package.nix    |  2 +-
 pkgs/by-name/po/powerjoular/package.nix       |  2 +-
 pkgs/by-name/po/powerline-go/package.nix      |  2 +-
 pkgs/by-name/pp/pps-tools/package.nix         |  2 +-
 pkgs/by-name/pq/pqiv/package.nix              |  2 +-
 pkgs/by-name/pq/pql/package.nix               |  2 +-
 pkgs/by-name/pq/pqrs/package.nix              |  2 +-
 pkgs/by-name/pr/prboom-plus/package.nix       |  2 +-
 pkgs/by-name/pr/precice/package.nix           |  2 +-
 pkgs/by-name/pr/preserves-nim/package.nix     |  2 +-
 pkgs/by-name/pr/pretalx/package.nix           |  2 +-
 .../by-name/pr/pretalx/plugins/downstream.nix |  2 +-
 .../pr/pretalx/plugins/media-ccc-de.nix       |  2 +-
 pkgs/by-name/pr/pretalx/plugins/pages.nix     |  2 +-
 .../pr/pretalx/plugins/public-voting.nix      |  2 +-
 pkgs/by-name/pr/pretalx/plugins/venueless.nix |  2 +-
 pkgs/by-name/pr/pretalx/plugins/vimeo.nix     |  2 +-
 pkgs/by-name/pr/pretalx/plugins/youtube.nix   |  2 +-
 pkgs/by-name/pr/pretix-banktool/package.nix   |  2 +-
 .../pr/pretix/plugins/dbvat/package.nix       |  2 +-
 .../pr/pretix/plugins/pages/package.nix       |  2 +-
 .../pr/pretix/plugins/passbook/package.nix    |  2 +-
 .../pr/pretix/plugins/zugferd/package.nix     |  2 +-
 pkgs/by-name/pr/prettier-d-slim/package.nix   |  2 +-
 pkgs/by-name/pr/prettyping/package.nix        |  2 +-
 pkgs/by-name/pr/prevo-tools/package.nix       |  2 +-
 pkgs/by-name/pr/prime-server/package.nix      |  2 +-
 pkgs/by-name/pr/principia/package.nix         |  2 +-
 pkgs/by-name/pr/prisma-engines/package.nix    |  2 +-
 pkgs/by-name/pr/prisma/package.nix            |  2 +-
 pkgs/by-name/pr/pritunl-client/package.nix    |  2 +-
 pkgs/by-name/pr/pritunl-ssh/package.nix       |  2 +-
 pkgs/by-name/pr/procdump/package.nix          |  2 +-
 pkgs/by-name/pr/process-compose/package.nix   |  2 +-
 pkgs/by-name/pr/process-cpp/package.nix       |  2 +-
 pkgs/by-name/pr/prodigal/package.nix          |  2 +-
 pkgs/by-name/pr/profetch/package.nix          |  2 +-
 pkgs/by-name/pr/profile-cleaner/package.nix   |  2 +-
 .../pr/profile-sync-daemon/package.nix        |  2 +-
 .../pr/programmer-calculator/package.nix      |  2 +-
 pkgs/by-name/pr/progress/package.nix          |  2 +-
 pkgs/by-name/pr/proj-datumgrid/package.nix    |  2 +-
 pkgs/by-name/pr/projectable/package.nix       |  2 +-
 .../package.nix                               |  2 +-
 .../pr/prometheus-frr-exporter/package.nix    |  2 +-
 .../prometheus-klipper-exporter/package.nix   |  2 +-
 .../package.nix                               |  2 +-
 .../pr/prometheus-pushgateway/package.nix     |  2 +-
 .../pr/prometheus-restic-exporter/package.nix |  2 +-
 .../pr/prometheus-squid-exporter/package.nix  |  2 +-
 .../prometheus-surfboard-exporter/package.nix |  2 +-
 pkgs/by-name/pr/promptfoo/package.nix         |  2 +-
 pkgs/by-name/pr/promql-cli/package.nix        |  2 +-
 pkgs/by-name/pr/promscale/package.nix         |  2 +-
 pkgs/by-name/pr/proot/package.nix             |  2 +-
 pkgs/by-name/pr/properties-cpp/package.nix    |  2 +-
 pkgs/by-name/pr/protege/package.nix           |  2 +-
 pkgs/by-name/pr/proteus/package.nix           |  2 +-
 pkgs/by-name/pr/proto-contrib/package.nix     |  2 +-
 pkgs/by-name/pr/proto/package.nix             |  2 +-
 pkgs/by-name/pr/protoc-gen-doc/package.nix    |  2 +-
 .../by-name/pr/protoc-gen-entgrpc/package.nix |  2 +-
 .../pr/protoc-gen-go-vtproto/package.nix      |  2 +-
 pkgs/by-name/pr/protoc-gen-go/package.nix     |  2 +-
 pkgs/by-name/pr/protoc-gen-js/package.nix     |  2 +-
 pkgs/by-name/pr/protoc-gen-swift/package.nix  |  2 +-
 pkgs/by-name/pr/protoc-gen-twirp/package.nix  |  2 +-
 .../pr/protoc-gen-validate/package.nix        |  2 +-
 .../pr/protoc-go-inject-tag/package.nix       |  2 +-
 pkgs/by-name/pr/protolint/package.nix         |  2 +-
 pkgs/by-name/pr/protolock/package.nix         |  2 +-
 pkgs/by-name/pr/proton-caller/package.nix     |  2 +-
 .../pr/proton-vpn-local-agent/package.nix     |  2 +-
 pkgs/by-name/pr/protonmail-bridge/package.nix |  2 +-
 pkgs/by-name/pr/prototool/package.nix         |  2 +-
 pkgs/by-name/pr/prox/package.nix              |  2 +-
 pkgs/by-name/pr/proximity-sort/package.nix    |  2 +-
 pkgs/by-name/pr/proxmove/package.nix          |  2 +-
 pkgs/by-name/pr/proxychains-ng/package.nix    |  2 +-
 pkgs/by-name/pr/proxysql/package.nix          |  2 +-
 pkgs/by-name/pr/prqlc/package.nix             |  2 +-
 pkgs/by-name/pr/prr/package.nix               |  2 +-
 pkgs/by-name/pr/prrte/package.nix             |  2 +-
 pkgs/by-name/ps/ps2eps/package.nix            |  2 +-
 pkgs/by-name/ps/ps_mem/package.nix            |  2 +-
 pkgs/by-name/ps/pscale/package.nix            |  2 +-
 pkgs/by-name/ps/pscircle/package.nix          |  2 +-
 pkgs/by-name/ps/psi-notify/package.nix        |  2 +-
 pkgs/by-name/ps/psitop/package.nix            |  2 +-
 pkgs/by-name/ps/psitransfer/package.nix       |  2 +-
 pkgs/by-name/ps/psmisc/package.nix            |  2 +-
 pkgs/by-name/ps/pspg/package.nix              |  2 +-
 pkgs/by-name/ps/psql2csv/package.nix          |  2 +-
 pkgs/by-name/ps/pssh/package.nix              |  2 +-
 pkgs/by-name/ps/psstop/package.nix            |  2 +-
 pkgs/by-name/ps/psw/package.nix               |  2 +-
 pkgs/by-name/pt/ptags/package.nix             |  2 +-
 pkgs/by-name/pt/ptex/package.nix              |  2 +-
 pkgs/by-name/pt/ptouch-driver/package.nix     |  2 +-
 pkgs/by-name/pt/ptyxis/package.nix            |  2 +-
 pkgs/by-name/pu/pufferpanel/package.nix       |  2 +-
 pkgs/by-name/pu/puffin/package.nix            |  2 +-
 pkgs/by-name/pu/pulsarctl/package.nix         |  2 +-
 pkgs/by-name/pu/pulseaudio-ctl/package.nix    |  2 +-
 .../pu/pulseaudio-module-xrdp/package.nix     |  2 +-
 pkgs/by-name/pu/pulsemixer/package.nix        |  2 +-
 pkgs/by-name/pu/pulumi-esc/package.nix        |  2 +-
 pkgs/by-name/pu/pulumictl/package.nix         |  2 +-
 pkgs/by-name/pu/pupdate/package.nix           |  2 +-
 pkgs/by-name/pu/puppeteer-cli/package.nix     |  2 +-
 pkgs/by-name/pu/pure-prompt/package.nix       |  2 +-
 pkgs/by-name/pu/pushup/package.nix            |  2 +-
 pkgs/by-name/pv/pvsneslib/package.nix         |  2 +-
 pkgs/by-name/pw/pw-viz/package.nix            |  2 +-
 pkgs/by-name/pw/pw-volume/package.nix         |  2 +-
 pkgs/by-name/pw/pw3270/package.nix            |  2 +-
 pkgs/by-name/pw/pwalarmctl/package.nix        |  2 +-
 pkgs/by-name/pw/pwalarmd/package.nix          |  2 +-
 pkgs/by-name/pw/pwgen-secure/package.nix      |  2 +-
 pkgs/by-name/pw/pwgen/package.nix             |  2 +-
 pkgs/by-name/pw/pwru/package.nix              |  2 +-
 pkgs/by-name/pw/pwsafe/package.nix            |  2 +-
 pkgs/by-name/px/pxder/package.nix             |  2 +-
 pkgs/by-name/py/py3c/package.nix              |  2 +-
 pkgs/by-name/py/pyCA/package.nix              |  4 +-
 pkgs/by-name/py/pychess/package.nix           |  2 +-
 pkgs/by-name/py/pylint-exit/package.nix       |  2 +-
 pkgs/by-name/py/pymol/package.nix             |  2 +-
 pkgs/by-name/py/pyrseas/package.nix           |  4 +-
 pkgs/by-name/py/pysentation/package.nix       |  2 +-
 pkgs/by-name/py/pystring/package.nix          |  2 +-
 pkgs/by-name/py/python-launcher/package.nix   |  2 +-
 pkgs/by-name/py/pytrainer/package.nix         |  2 +-
 pkgs/by-name/py/pyxel/package.nix             |  2 +-
 pkgs/by-name/pz/pzip/package.nix              |  2 +-
 pkgs/by-name/q-/q-text-as-data/package.nix    |  2 +-
 .../qa/qadwaitadecorations/package.nix        |  2 +-
 pkgs/by-name/qa/qastools/package.nix          |  2 +-
 pkgs/by-name/qb/qbec/package.nix              |  2 +-
 pkgs/by-name/qc/qc/package.nix                |  2 +-
 pkgs/by-name/qd/qdirstat/package.nix          |  2 +-
 pkgs/by-name/qg/qgrep/package.nix             |  2 +-
 pkgs/by-name/qg/qgroundcontrol/package.nix    |  2 +-
 pkgs/by-name/qh/qhull/package.nix             |  2 +-
 pkgs/by-name/qm/qm-dsp/package.nix            |  2 +-
 pkgs/by-name/qm/qmk_hid/package.nix           |  2 +-
 pkgs/by-name/qm/qmqtt/package.nix             |  2 +-
 pkgs/by-name/qo/qogir-icon-theme/package.nix  |  2 +-
 pkgs/by-name/qo/qogir-theme/package.nix       |  2 +-
 pkgs/by-name/qp/qperf/package.nix             |  2 +-
 pkgs/by-name/qr/qrrs/package.nix              |  2 +-
 pkgs/by-name/qr/qrscan/package.nix            |  2 +-
 pkgs/by-name/qr/qrtool/package.nix            |  2 +-
 pkgs/by-name/qs/qsreplace/package.nix         |  2 +-
 pkgs/by-name/qs/qsv/package.nix               |  2 +-
 pkgs/by-name/qu/quadrafuzz/package.nix        |  2 +-
 pkgs/by-name/qu/quark-goldleaf/package.nix    |  2 +-
 .../qu/qubes-core-vchan-xen/package.nix       |  2 +-
 pkgs/by-name/qu/qucsator-rf/package.nix       |  2 +-
 pkgs/by-name/qu/quich/package.nix             |  2 +-
 pkgs/by-name/qu/quick-lint-js/package.nix     |  2 +-
 pkgs/by-name/qu/quickder/package.nix          |  2 +-
 pkgs/by-name/qu/quickemu/package.nix          |  2 +-
 pkgs/by-name/qu/quickfix/package.nix          |  2 +-
 pkgs/by-name/qu/quickgui/package.nix          |  2 +-
 pkgs/by-name/qu/quickmem/package.nix          |  2 +-
 pkgs/by-name/qu/quicktemplate/package.nix     |  2 +-
 pkgs/by-name/qu/quill-log/package.nix         |  2 +-
 pkgs/by-name/qu/quill-qr/package.nix          |  2 +-
 pkgs/by-name/qu/quorum/package.nix            |  2 +-
 pkgs/by-name/r0/r0vm/package.nix              |  2 +-
 pkgs/by-name/r1/r128gain/package.nix          |  2 +-
 pkgs/by-name/r2/r2mod_cli/package.nix         |  2 +-
 pkgs/by-name/r5/r53-ddns/package.nix          |  2 +-
 pkgs/by-name/ra/ra-multiplex/package.nix      |  2 +-
 pkgs/by-name/ra/rabtap/package.nix            |  2 +-
 pkgs/by-name/ra/radeontop/package.nix         |  2 +-
 pkgs/by-name/ra/radio-cli/package.nix         |  2 +-
 pkgs/by-name/ra/radioboat/package.nix         |  2 +-
 pkgs/by-name/ra/raffi/package.nix             |  2 +-
 pkgs/by-name/ra/rage/package.nix              |  2 +-
 pkgs/by-name/ra/ragnarwm/package.nix          |  2 +-
 pkgs/by-name/ra/raider/package.nix            |  2 +-
 pkgs/by-name/ra/railway/package.nix           |  2 +-
 pkgs/by-name/ra/rain/package.nix              |  2 +-
 pkgs/by-name/ra/rakkess/package.nix           |  2 +-
 pkgs/by-name/ra/ramfetch/package.nix          |  2 +-
 pkgs/by-name/ra/ran/package.nix               |  2 +-
 pkgs/by-name/ra/rancher/package.nix           |  2 +-
 pkgs/by-name/ra/range-v3/package.nix          |  2 +-
 pkgs/by-name/ra/rapidyaml/package.nix         |  2 +-
 pkgs/by-name/ra/rar2fs/package.nix            |  2 +-
 pkgs/by-name/ra/rar2hashcat/package.nix       |  2 +-
 pkgs/by-name/ra/rare-regex/package.nix        |  2 +-
 pkgs/by-name/ra/rasm/package.nix              |  2 +-
 pkgs/by-name/ra/ratman/package.nix            |  2 +-
 pkgs/by-name/ra/ratools/package.nix           |  2 +-
 pkgs/by-name/ra/ratslap/package.nix           |  2 +-
 pkgs/by-name/ra/rauc/package.nix              |  2 +-
 pkgs/by-name/ra/raxml/package.nix             |  2 +-
 pkgs/by-name/ra/raylib/package.nix            |  2 +-
 pkgs/by-name/ra/razer-cli/package.nix         |  2 +-
 pkgs/by-name/rb/rbdoom-3-bfg/package.nix      |  2 +-
 pkgs/by-name/rc/rcon/package.nix              |  2 +-
 pkgs/by-name/rc/rcp/package.nix               |  2 +-
 pkgs/by-name/rd/rdap/package.nix              |  2 +-
 pkgs/by-name/re/re-flex/package.nix           |  2 +-
 pkgs/by-name/re/re2/package.nix               |  2 +-
 pkgs/by-name/re/re2c/package.nix              |  2 +-
 pkgs/by-name/re/react-static/package.nix      |  2 +-
 pkgs/by-name/re/readability-cli/package.nix   |  2 +-
 pkgs/by-name/re/readstat/package.nix          |  2 +-
 .../re/realcugan-ncnn-vulkan/package.nix      |  2 +-
 .../re/realesrgan-ncnn-vulkan/package.nix     |  2 +-
 pkgs/by-name/re/realm/package.nix             |  2 +-
 pkgs/by-name/re/reason-shell/package.nix      |  2 +-
 pkgs/by-name/re/reaverwps-t6x/package.nix     |  2 +-
 pkgs/by-name/re/recapp/package.nix            |  2 +-
 pkgs/by-name/re/reco/package.nix              |  2 +-
 .../re/redhat-official-fonts/package.nix      |  2 +-
 pkgs/by-name/re/redict/package.nix            |  2 +-
 pkgs/by-name/re/redir/package.nix             |  2 +-
 pkgs/by-name/re/redis-plus-plus/package.nix   |  2 +-
 pkgs/by-name/re/redisinsight/package.nix      |  2 +-
 pkgs/by-name/re/redka/package.nix             |  2 +-
 pkgs/by-name/re/redo-c/package.nix            |  2 +-
 pkgs/by-name/re/redpanda-client/package.nix   |  2 +-
 pkgs/by-name/re/reflex/package.nix            |  2 +-
 pkgs/by-name/re/refmt/package.nix             |  2 +-
 pkgs/by-name/re/reg/package.nix               |  2 +-
 pkgs/by-name/re/regal/package.nix             |  2 +-
 pkgs/by-name/re/regex2json/package.nix        |  2 +-
 pkgs/by-name/re/regexploit/package.nix        |  2 +-
 pkgs/by-name/re/regextester/package.nix       |  2 +-
 pkgs/by-name/re/regols/package.nix            |  2 +-
 pkgs/by-name/re/rehex/package.nix             |  2 +-
 pkgs/by-name/re/relic/package.nix             |  2 +-
 pkgs/by-name/re/remind/package.nix            |  2 +-
 pkgs/by-name/re/remote-touchpad/package.nix   |  2 +-
 pkgs/by-name/re/rename/package.nix            |  2 +-
 pkgs/by-name/re/renderizer/package.nix        |  2 +-
 pkgs/by-name/re/rep/package.nix               |  2 +-
 pkgs/by-name/re/repgrep/package.nix           |  2 +-
 pkgs/by-name/re/replacement/package.nix       |  2 +-
 pkgs/by-name/re/repro-get/package.nix         |  2 +-
 pkgs/by-name/re/reproc/package.nix            |  2 +-
 pkgs/by-name/re/reredirect/package.nix        |  2 +-
 pkgs/by-name/re/rescrobbled/package.nix       |  2 +-
 pkgs/by-name/re/resgate/package.nix           |  2 +-
 pkgs/by-name/re/restic-browser/package.nix    |  2 +-
 pkgs/by-name/re/restls/package.nix            |  2 +-
 pkgs/by-name/re/restman/package.nix           |  2 +-
 pkgs/by-name/re/restream/package.nix          |  2 +-
 pkgs/by-name/re/resumed/package.nix           |  2 +-
 pkgs/by-name/re/resvg/package.nix             |  2 +-
 pkgs/by-name/re/retroarch-bare/package.nix    |  2 +-
 .../retroarch-joypad-autoconfig/package.nix   |  2 +-
 pkgs/by-name/re/retrospy/package.nix          |  2 +-
 pkgs/by-name/re/reveal-md/package.nix         |  2 +-
 pkgs/by-name/re/reviewdog/package.nix         |  2 +-
 pkgs/by-name/re/revive/package.nix            |  2 +-
 pkgs/by-name/re/rewrk/package.nix             |  2 +-
 pkgs/by-name/rf/rfc/package.nix               |  2 +-
 pkgs/by-name/rg/rgbds/package.nix             |  2 +-
 pkgs/by-name/rh/rhack/package.nix             |  2 +-
 pkgs/by-name/rh/rhai-doc/package.nix          |  2 +-
 pkgs/by-name/rh/rhash/package.nix             |  2 +-
 pkgs/by-name/rh/rhoas/package.nix             |  2 +-
 pkgs/by-name/rh/rhodium-libre/package.nix     |  2 +-
 pkgs/by-name/rh/rhvoice/package.nix           |  2 +-
 pkgs/by-name/ri/richgo/package.nix            |  2 +-
 .../rictydiminished-with-firacode/package.nix |  2 +-
 pkgs/by-name/ri/riff/package.nix              |  2 +-
 pkgs/by-name/ri/riko4/package.nix             |  2 +-
 pkgs/by-name/ri/rime-cli/package.nix          |  2 +-
 pkgs/by-name/ri/rime-ls/package.nix           |  2 +-
 pkgs/by-name/ri/rinetd/package.nix            |  2 +-
 pkgs/by-name/ri/rio/package.nix               |  2 +-
 pkgs/by-name/ri/rip2/package.nix              |  2 +-
 pkgs/by-name/ri/ripdrag/package.nix           |  2 +-
 pkgs/by-name/ri/ripgrep/package.nix           |  2 +-
 pkgs/by-name/ri/ripsecrets/package.nix        |  2 +-
 pkgs/by-name/ri/ripser/package.nix            |  2 +-
 pkgs/by-name/ri/ripunzip/package.nix          |  2 +-
 pkgs/by-name/ri/risor/package.nix             |  2 +-
 pkgs/by-name/ri/river-bsp-layout/package.nix  |  2 +-
 pkgs/by-name/ri/river-filtile/package.nix     |  2 +-
 pkgs/by-name/ri/river-luatile/package.nix     |  2 +-
 pkgs/by-name/rk/rke/package.nix               |  2 +-
 pkgs/by-name/rk/rkrlv2/package.nix            |  2 +-
 pkgs/by-name/rk/rkvm/package.nix              |  2 +-
 pkgs/by-name/rl/rl_json/package.nix           |  2 +-
 pkgs/by-name/rl/rlaunch/package.nix           |  2 +-
 pkgs/by-name/rl/rlci/package.nix              |  2 +-
 pkgs/by-name/rl/rlottie/package.nix           |  2 +-
 pkgs/by-name/rl/rlwrap/package.nix            |  2 +-
 pkgs/by-name/rm/rm-improved/package.nix       |  2 +-
 pkgs/by-name/rm/rmapi/package.nix             |  2 +-
 pkgs/by-name/rm/rmenu/package.nix             |  2 +-
 pkgs/by-name/rm/rmfakecloud/package.nix       |  2 +-
 pkgs/by-name/rm/rmount/package.nix            |  2 +-
 pkgs/by-name/rm/rmpc/package.nix              |  2 +-
 pkgs/by-name/rm/rmtrash/package.nix           |  2 +-
 pkgs/by-name/rm/rmw/package.nix               |  2 +-
 pkgs/by-name/rn/rnd-name/package.nix          |  2 +-
 pkgs/by-name/rn/rng-tools/package.nix         |  2 +-
 pkgs/by-name/rn/rnr/package.nix               |  2 +-
 pkgs/by-name/ro/robotfindskitten/package.nix  |  2 +-
 pkgs/by-name/ro/robustirc-bridge/package.nix  |  2 +-
 pkgs/by-name/ro/roc-toolkit/package.nix       |  2 +-
 pkgs/by-name/ro/rockcraft/package.nix         |  2 +-
 pkgs/by-name/ro/rofi-calc/package.nix         |  2 +-
 pkgs/by-name/ro/rofi-file-browser/package.nix |  2 +-
 pkgs/by-name/ro/rofi-mpd/package.nix          |  2 +-
 pkgs/by-name/ro/rofi-power-menu/package.nix   |  2 +-
 pkgs/by-name/ro/rofi-systemd/package.nix      |  2 +-
 pkgs/by-name/ro/rofi-vpn/package.nix          |  2 +-
 pkgs/by-name/ro/rojo/package.nix              |  2 +-
 pkgs/by-name/ro/roogle/package.nix            |  2 +-
 pkgs/by-name/ro/roon-tui/package.nix          |  2 +-
 pkgs/by-name/ro/rootlesskit/package.nix       |  2 +-
 pkgs/by-name/ro/rosa/package.nix              |  2 +-
 pkgs/by-name/ro/roslyn/package.nix            |  2 +-
 pkgs/by-name/ro/rospo/package.nix             |  2 +-
 pkgs/by-name/ro/roswell/package.nix           |  2 +-
 pkgs/by-name/ro/rotate-backups/package.nix    |  2 +-
 pkgs/by-name/ro/round/package.nix             |  2 +-
 pkgs/by-name/ro/roundup/package.nix           |  2 +-
 pkgs/by-name/ro/routedns/package.nix          |  2 +-
 pkgs/by-name/ro/router/package.nix            |  2 +-
 pkgs/by-name/ro/routinator/package.nix        |  2 +-
 pkgs/by-name/ro/roxterm/package.nix           |  2 +-
 pkgs/by-name/rp/rpPPPoE/package.nix           |  2 +-
 pkgs/by-name/rp/rpcsvc-proto/package.nix      |  2 +-
 pkgs/by-name/rp/rpg-cli/package.nix           |  2 +-
 pkgs/by-name/rp/rpiboot/package.nix           |  2 +-
 pkgs/by-name/rq/rq/package.nix                |  2 +-
 pkgs/by-name/rq/rqbit/package.nix             |  2 +-
 pkgs/by-name/rq/rqlite/package.nix            |  2 +-
 pkgs/by-name/rr/rrdtool/package.nix           |  2 +-
 pkgs/by-name/rs/rs-tftpd/package.nix          |  2 +-
 pkgs/by-name/rs/rsbep/package.nix             |  2 +-
 pkgs/by-name/rs/rsclock/package.nix           |  2 +-
 pkgs/by-name/rs/rsgain/package.nix            |  2 +-
 pkgs/by-name/rs/rshijack/package.nix          |  2 +-
 pkgs/by-name/rs/rslint/package.nix            |  2 +-
 pkgs/by-name/rs/rspamd/package.nix            |  2 +-
 pkgs/by-name/rs/rss-bridge/package.nix        |  2 +-
 pkgs/by-name/rt/rtg-tools/package.nix         |  2 +-
 pkgs/by-name/rt/rtl_433/package.nix           |  2 +-
 pkgs/by-name/rt/rtlcss/package.nix            |  2 +-
 pkgs/by-name/rt/rtrlib/package.nix            |  2 +-
 pkgs/by-name/rt/rtss/package.nix              |  2 +-
 pkgs/by-name/rt/rttr/package.nix              |  2 +-
 pkgs/by-name/rt/rtz/package.nix               |  2 +-
 pkgs/by-name/ru/ruapu/package.nix             |  2 +-
 pkgs/by-name/ru/rubyripper/package.nix        |  2 +-
 pkgs/by-name/ru/rucksack/package.nix          |  2 +-
 pkgs/by-name/ru/rucola/package.nix            |  2 +-
 pkgs/by-name/ru/run/package.nix               |  2 +-
 pkgs/by-name/ru/runc/package.nix              |  2 +-
 pkgs/by-name/ru/rund/package.nix              |  2 +-
 pkgs/by-name/ru/runelite/package.nix          |  2 +-
 pkgs/by-name/ru/runitor/package.nix           |  2 +-
 pkgs/by-name/ru/runme/package.nix             |  2 +-
 pkgs/by-name/ru/runpodctl/package.nix         |  2 +-
 pkgs/by-name/ru/runzip/package.nix            |  2 +-
 pkgs/by-name/ru/ruplacer/package.nix          |  2 +-
 pkgs/by-name/ru/rush-parallel/package.nix     |  2 +-
 .../ru/rust-analyzer-unwrapped/package.nix    |  2 +-
 pkgs/by-name/ru/rust-parallel/package.nix     |  2 +-
 pkgs/by-name/ru/rust-script/package.nix       |  2 +-
 .../rust-synapse-compress-state/package.nix   |  2 +-
 pkgs/by-name/ru/rust-traverse/package.nix     |  2 +-
 pkgs/by-name/ru/rustc-demangle/package.nix    |  2 +-
 pkgs/by-name/ru/rustdesk-flutter/package.nix  |  2 +-
 pkgs/by-name/ru/rustdesk-server/package.nix   |  2 +-
 pkgs/by-name/ru/rusti-cal/package.nix         |  2 +-
 pkgs/by-name/ru/rustlings/package.nix         |  2 +-
 pkgs/by-name/ru/rustmission/package.nix       |  2 +-
 pkgs/by-name/ru/rustypaste-cli/package.nix    |  2 +-
 pkgs/by-name/ru/rustypaste/package.nix        |  2 +-
 pkgs/by-name/ru/rustywind/package.nix         |  2 +-
 pkgs/by-name/rv/rvvm/package.nix              |  2 +-
 pkgs/by-name/rv/rvz/package.nix               |  2 +-
 pkgs/by-name/rw/rwc/package.nix               |  2 +-
 pkgs/by-name/rw/rwedid/package.nix            |  2 +-
 pkgs/by-name/rw/rwpspread/package.nix         |  2 +-
 pkgs/by-name/rx/rx/package.nix                |  2 +-
 pkgs/by-name/ry/ryokucha/package.nix          |  2 +-
 pkgs/by-name/ry/ryzenadj/package.nix          |  2 +-
 pkgs/by-name/s2/s2n-tls/package.nix           |  2 +-
 pkgs/by-name/s2/s2png/package.nix             |  2 +-
 pkgs/by-name/s3/s3backer/package.nix          |  2 +-
 pkgs/by-name/s3/s3scanner/package.nix         |  2 +-
 pkgs/by-name/s5/s5/package.nix                |  2 +-
 pkgs/by-name/s5/s5cmd/package.nix             |  2 +-
 pkgs/by-name/sa/sabnzbd/package.nix           |  2 +-
 pkgs/by-name/sa/sacd/package.nix              |  2 +-
 pkgs/by-name/sa/safe/package.nix              |  2 +-
 pkgs/by-name/sa/safecloset/package.nix        |  2 +-
 pkgs/by-name/sa/sage/sage-src.nix             |  2 +-
 pkgs/by-name/sa/sage/threejs-sage.nix         |  2 +-
 pkgs/by-name/sa/sagetex/package.nix           |  2 +-
 pkgs/by-name/sa/sagoin/package.nix            |  2 +-
 pkgs/by-name/sa/sahel-fonts/package.nix       |  2 +-
 pkgs/by-name/sa/sailsd/package.nix            |  2 +-
 pkgs/by-name/sa/saldl/package.nix             |  2 +-
 pkgs/by-name/sa/sambamba/package.nix          |  2 +-
 pkgs/by-name/sa/sameboy/package.nix           |  2 +-
 pkgs/by-name/sa/samim-fonts/package.nix       |  2 +-
 pkgs/by-name/sa/sampler/package.nix           |  2 +-
 pkgs/by-name/sa/samplicator/package.nix       |  2 +-
 pkgs/by-name/sa/samurai/package.nix           |  2 +-
 pkgs/by-name/sa/sane-airscan/package.nix      |  2 +-
 pkgs/by-name/sa/sanjuuni/package.nix          |  2 +-
 pkgs/by-name/sa/sanoid/package.nix            |  2 +-
 pkgs/by-name/sa/sassc/package.nix             |  2 +-
 pkgs/by-name/sa/satty/package.nix             |  2 +-
 pkgs/by-name/sa/savepagenow/package.nix       |  2 +-
 pkgs/by-name/sb/sblast/package.nix            |  2 +-
 pkgs/by-name/sb/sbs/package.nix               |  2 +-
 pkgs/by-name/sc/sc-im/package.nix             |  2 +-
 pkgs/by-name/sc/scaleway-cli/package.nix      |  2 +-
 pkgs/by-name/sc/scalingo/package.nix          |  2 +-
 pkgs/by-name/sc/scalr-cli/package.nix         |  2 +-
 pkgs/by-name/sc/scanmem/package.nix           |  2 +-
 pkgs/by-name/sc/scanservjs/package.nix        |  2 +-
 pkgs/by-name/sc/scaphandre/package.nix        |  2 +-
 pkgs/by-name/sc/scc/package.nix               |  2 +-
 pkgs/by-name/sc/sccache/package.nix           |  2 +-
 pkgs/by-name/sc/sccmhunter/package.nix        |  2 +-
 pkgs/by-name/sc/scenebuilder/package.nix      |  2 +-
 pkgs/by-name/sc/scenic-view/package.nix       |  2 +-
 pkgs/by-name/sc/schemamap/package.nix         |  2 +-
 .../sc/scheme-bytestructures/package.nix      |  2 +-
 pkgs/by-name/sc/scid/package.nix              |  2 +-
 .../by-name/sc/scion-bootstrapper/package.nix |  2 +-
 pkgs/by-name/sc/scion/package.nix             |  2 +-
 pkgs/by-name/sc/scip-go/package.nix           |  2 +-
 pkgs/by-name/sc/scip/package.nix              |  2 +-
 pkgs/by-name/sc/scmpuff/package.nix           |  2 +-
 pkgs/by-name/sc/scons/package.nix             |  2 +-
 pkgs/by-name/sc/scooter/package.nix           |  2 +-
 pkgs/by-name/sc/scope-lite/package.nix        |  2 +-
 pkgs/by-name/sc/scout/package.nix             |  2 +-
 pkgs/by-name/sc/scream/package.nix            |  2 +-
 pkgs/by-name/sc/screego/package.nix           |  2 +-
 pkgs/by-name/sc/screen-message/package.nix    |  2 +-
 pkgs/by-name/sc/screen-pipe/package.nix       |  2 +-
 pkgs/by-name/sc/screenfetch/package.nix       |  2 +-
 pkgs/by-name/sc/screenkey/package.nix         |  2 +-
 pkgs/by-name/sc/script-directory/package.nix  |  2 +-
 pkgs/by-name/sc/scripthaus/package.nix        |  2 +-
 pkgs/by-name/sc/scriptisto/package.nix        |  2 +-
 pkgs/by-name/sc/scrot/package.nix             |  2 +-
 pkgs/by-name/sc/scrub/package.nix             |  2 +-
 pkgs/by-name/sc/scryer-prolog/package.nix     |  2 +-
 pkgs/by-name/sc/scudcloud/package.nix         |  2 +-
 pkgs/by-name/sd/SDL2_sound/package.nix        |  2 +-
 pkgs/by-name/sd/sd-local/package.nix          |  2 +-
 pkgs/by-name/sd/sd/package.nix                |  2 +-
 pkgs/by-name/sd/sdate/package.nix             |  2 +-
 pkgs/by-name/sd/sdcv/package.nix              |  2 +-
 pkgs/by-name/sd/sdlpop/package.nix            |  2 +-
 pkgs/by-name/se/seabird/package.nix           |  2 +-
 pkgs/by-name/se/seafile-shared/package.nix    |  2 +-
 pkgs/by-name/se/seasocks/package.nix          |  2 +-
 pkgs/by-name/se/seaweedfs/package.nix         |  2 +-
 pkgs/by-name/se/sec/package.nix               |  2 +-
 pkgs/by-name/se/see-cat/package.nix           |  2 +-
 pkgs/by-name/se/seilfahrt/package.nix         |  2 +-
 pkgs/by-name/se/selene/package.nix            |  2 +-
 pkgs/by-name/se/sem/package.nix               |  2 +-
 pkgs/by-name/se/semantic-release/package.nix  |  2 +-
 pkgs/by-name/se/semver-tool/package.nix       |  2 +-
 pkgs/by-name/se/semver/package.nix            |  2 +-
 pkgs/by-name/se/sendme/package.nix            |  2 +-
 pkgs/by-name/se/senv/package.nix              |  2 +-
 pkgs/by-name/se/seqkit/package.nix            |  2 +-
 pkgs/by-name/se/seqtk/package.nix             |  2 +-
 pkgs/by-name/se/sequeler/package.nix          |  2 +-
 .../se/sequoia-chameleon-gnupg/package.nix    |  2 +-
 pkgs/by-name/se/sequoia-sqv/package.nix       |  2 +-
 pkgs/by-name/se/sequoia-wot/package.nix       |  2 +-
 pkgs/by-name/se/ser2net/package.nix           |  2 +-
 pkgs/by-name/se/serfdom/package.nix           |  2 +-
 pkgs/by-name/se/serial-studio/package.nix     |  2 +-
 pkgs/by-name/se/serialdv/package.nix          |  2 +-
 pkgs/by-name/se/serie/package.nix             |  2 +-
 pkgs/by-name/se/serpl/package.nix             |  2 +-
 pkgs/by-name/se/serve-d/package.nix           |  2 +-
 pkgs/by-name/se/serverless/package.nix        |  2 +-
 pkgs/by-name/se/sesh/package.nix              |  2 +-
 pkgs/by-name/se/setbfree/package.nix          |  2 +-
 pkgs/by-name/se/setroot/package.nix           |  2 +-
 pkgs/by-name/se/setup-envtest/package.nix     |  2 +-
 pkgs/by-name/se/seturgent/package.nix         |  2 +-
 pkgs/by-name/sf/sfizz/package.nix             |  2 +-
 pkgs/by-name/sf/sfm/package.nix               |  2 +-
 pkgs/by-name/sf/sfsexp/package.nix            |  2 +-
 pkgs/by-name/sf/sftpman/package.nix           |  2 +-
 pkgs/by-name/sf/sfwbar/package.nix            |  2 +-
 pkgs/by-name/sf/sfz/package.nix               |  2 +-
 .../sg/sgx-azure-dcap-client/package.nix      |  2 +-
 pkgs/by-name/sh/shab/package.nix              |  2 +-
 pkgs/by-name/sh/shabnam-fonts/package.nix     |  2 +-
 pkgs/by-name/sh/shadered/package.nix          |  2 +-
 .../sh/shades-of-gray-theme/package.nix       |  2 +-
 pkgs/by-name/sh/shadow-tls/package.nix        |  2 +-
 pkgs/by-name/sh/shadow/package.nix            |  2 +-
 pkgs/by-name/sh/shadowfox/package.nix         |  2 +-
 .../sh/shadowsocks-v2ray-plugin/package.nix   |  2 +-
 pkgs/by-name/sh/shaq/package.nix              |  2 +-
 pkgs/by-name/sh/share-preview/package.nix     |  2 +-
 pkgs/by-name/sh/sharing/package.nix           |  2 +-
 pkgs/by-name/sh/shavee/package.nix            |  2 +-
 pkgs/by-name/sh/shell2http/package.nix        |  2 +-
 pkgs/by-name/sh/shellharden/package.nix       |  2 +-
 pkgs/by-name/sh/shellhub-agent/package.nix    |  2 +-
 pkgs/by-name/sh/shellspec/package.nix         |  2 +-
 pkgs/by-name/sh/shellz/package.nix            |  2 +-
 pkgs/by-name/sh/shepherd/package.nix          |  2 +-
 pkgs/by-name/sh/shfm/package.nix              |  2 +-
 pkgs/by-name/sh/shfmt/package.nix             |  2 +-
 pkgs/by-name/sh/shibboleth-sp/package.nix     |  2 +-
 pkgs/by-name/sh/shikane/package.nix           |  2 +-
 pkgs/by-name/sh/shim-unsigned/package.nix     |  2 +-
 pkgs/by-name/sh/shine/package.nix             |  2 +-
 pkgs/by-name/sh/shiori/package.nix            |  2 +-
 pkgs/by-name/sh/shisho/package.nix            |  2 +-
 pkgs/by-name/sh/shmig/package.nix             |  2 +-
 pkgs/by-name/sh/shocco/package.nix            |  2 +-
 pkgs/by-name/sh/shod/package.nix              |  2 +-
 pkgs/by-name/sh/shopify-themekit/package.nix  |  2 +-
 pkgs/by-name/sh/shotgun/package.nix           |  2 +-
 pkgs/by-name/sh/show-midi/package.nix         |  2 +-
 pkgs/by-name/sh/shpool/package.nix            |  2 +-
 pkgs/by-name/sh/shunit2/package.nix           |  2 +-
 pkgs/by-name/sh/shutter/package.nix           |  2 +-
 pkgs/by-name/si/sic-image-cli/package.nix     |  2 +-
 pkgs/by-name/si/sidekick/package.nix          |  2 +-
 pkgs/by-name/si/sieve-connect/package.nix     |  2 +-
 pkgs/by-name/si/sift/package.nix              |  2 +-
 pkgs/by-name/si/sig/package.nix               |  2 +-
 pkgs/by-name/si/siglo/package.nix             |  2 +-
 .../by-name/si/signalbackup-tools/package.nix |  2 +-
 pkgs/by-name/si/signaldctl/package.nix        |  2 +-
 pkgs/by-name/si/signaturepdf/package.nix      |  2 +-
 pkgs/by-name/si/signify/package.nix           |  2 +-
 pkgs/by-name/si/sigslot/package.nix           |  2 +-
 pkgs/by-name/si/sigtop/package.nix            |  2 +-
 pkgs/by-name/si/siketyan-ghr/package.nix      |  2 +-
 pkgs/by-name/si/sil-q/package.nix             |  2 +-
 pkgs/by-name/si/silicon/package.nix           |  2 +-
 pkgs/by-name/si/silver-searcher/package.nix   |  2 +-
 pkgs/by-name/si/simde/package.nix             |  2 +-
 pkgs/by-name/si/simdjson/package.nix          |  2 +-
 pkgs/by-name/si/simg2img/package.nix          |  2 +-
 pkgs/by-name/si/simh/package.nix              |  2 +-
 .../by-name/si/simple-http-server/package.nix |  2 +-
 pkgs/by-name/si/simple-mtpfs/package.nix      |  2 +-
 pkgs/by-name/si/simpleTpmPk11/package.nix     |  2 +-
 pkgs/by-name/si/simplehttp2server/package.nix |  2 +-
 pkgs/by-name/si/simplotask/package.nix        |  2 +-
 pkgs/by-name/si/sing-box/package.nix          |  2 +-
 pkgs/by-name/si/sink-rotate/package.nix       |  2 +-
 pkgs/by-name/si/sipexer/package.nix           |  2 +-
 pkgs/by-name/si/sirikali/package.nix          |  2 +-
 pkgs/by-name/si/sirius/package.nix            |  2 +-
 pkgs/by-name/si/sitespeed-io/package.nix      |  2 +-
 pkgs/by-name/sj/sjasmplus/package.nix         |  2 +-
 pkgs/by-name/sk/skaffold/package.nix          |  2 +-
 pkgs/by-name/sk/skate/package.nix             |  2 +-
 pkgs/by-name/sk/skeditor/package.nix          |  2 +-
 pkgs/by-name/sk/skeema/package.nix            |  2 +-
 pkgs/by-name/sk/skeu/package.nix              |  2 +-
 pkgs/by-name/sk/skia-aseprite/package.nix     |  2 +-
 pkgs/by-name/sk/skopeo/package.nix            |  2 +-
 pkgs/by-name/sl/sl/package.nix                |  2 +-
 pkgs/by-name/sl/slack-cli/package.nix         |  2 +-
 pkgs/by-name/sl/slack-term/package.nix        |  2 +-
 pkgs/by-name/sl/sleek/package.nix             |  2 +-
 pkgs/by-name/sl/slic3r/package.nix            |  2 +-
 pkgs/by-name/sl/slides/package.nix            |  2 +-
 pkgs/by-name/sl/slimevr/package.nix           |  2 +-
 pkgs/by-name/sl/slimserver/package.nix        |  2 +-
 pkgs/by-name/sl/slingshot/package.nix         |  2 +-
 pkgs/by-name/sl/slippy/package.nix            |  2 +-
 pkgs/by-name/sl/slirp4netns/package.nix       |  2 +-
 pkgs/by-name/sl/slop/package.nix              |  2 +-
 pkgs/by-name/sl/sloth/package.nix             |  2 +-
 pkgs/by-name/sl/slowhttptest/package.nix      |  2 +-
 pkgs/by-name/sl/slsa-verifier/package.nix     |  2 +-
 .../sl/slurm-spank-stunnel/package.nix        |  2 +-
 pkgs/by-name/sl/slurm-spank-x11/package.nix   |  2 +-
 pkgs/by-name/sm/smag/package.nix              |  2 +-
 pkgs/by-name/sm/smarty3-i18n/package.nix      |  2 +-
 pkgs/by-name/sm/smarty3/package.nix           |  2 +-
 pkgs/by-name/sm/smassh/package.nix            |  2 +-
 pkgs/by-name/sm/smatch/package.nix            |  2 +-
 pkgs/by-name/sm/smcroute/package.nix          |  2 +-
 pkgs/by-name/sm/smenu/package.nix             |  2 +-
 pkgs/by-name/sm/smimesign/package.nix         |  2 +-
 pkgs/by-name/sm/smlfmt/package.nix            |  2 +-
 pkgs/by-name/sm/smlfut/package.nix            |  2 +-
 pkgs/by-name/sm/smlpkg/package.nix            |  2 +-
 pkgs/by-name/sm/smooth/package.nix            |  2 +-
 pkgs/by-name/sm/smu/package.nix               |  2 +-
 pkgs/by-name/sm/smug/package.nix              |  2 +-
 pkgs/by-name/sn/sn-pro/package.nix            |  2 +-
 pkgs/by-name/sn/snabb/package.nix             |  2 +-
 pkgs/by-name/sn/snapper/package.nix           |  2 +-
 pkgs/by-name/sn/snappy/package.nix            |  2 +-
 pkgs/by-name/sn/snapraid/package.nix          |  2 +-
 pkgs/by-name/sn/snapweb/package.nix           |  2 +-
 pkgs/by-name/sn/snazy/package.nix             |  2 +-
 pkgs/by-name/sn/snes9x/package.nix            |  2 +-
 pkgs/by-name/sn/sngrep/package.nix            |  2 +-
 pkgs/by-name/sn/sniffglue/package.nix         |  2 +-
 pkgs/by-name/sn/snippetpixie/package.nix      |  2 +-
 pkgs/by-name/sn/sniproxy/package.nix          |  2 +-
 pkgs/by-name/sn/snips-sh/package.nix          |  2 +-
 pkgs/by-name/sn/snooze/package.nix            |  2 +-
 pkgs/by-name/sn/snore/package.nix             |  2 +-
 pkgs/by-name/sn/snowcat/package.nix           |  2 +-
 .../so/social-engineer-toolkit/package.nix    |  2 +-
 pkgs/by-name/so/sockperf/package.nix          |  2 +-
 pkgs/by-name/so/soco-cli/package.nix          |  2 +-
 pkgs/by-name/so/sof-tools/package.nix         |  2 +-
 pkgs/by-name/so/soft-serve/package.nix        |  2 +-
 pkgs/by-name/so/solvespace/package.nix        |  2 +-
 pkgs/by-name/so/somafm-cli/package.nix        |  2 +-
 pkgs/by-name/so/somatic-sniper/package.nix    |  2 +-
 pkgs/by-name/so/sonarlint-ls/package.nix      |  2 +-
 pkgs/by-name/so/sonata/package.nix            |  2 +-
 pkgs/by-name/so/songrec/package.nix           |  2 +-
 pkgs/by-name/so/sonivox/package.nix           |  2 +-
 pkgs/by-name/so/sonobus/package.nix           |  2 +-
 .../so/sony-headphones-client/package.nix     |  2 +-
 pkgs/by-name/so/sooperlooper/package.nix      |  2 +-
 pkgs/by-name/so/sophus/package.nix            |  2 +-
 pkgs/by-name/so/sord/package.nix              |  2 +-
 pkgs/by-name/so/souffle/package.nix           |  2 +-
 pkgs/by-name/so/soundtouch/package.nix        |  2 +-
 pkgs/by-name/so/sov/package.nix               |  2 +-
 pkgs/by-name/so/sozu/package.nix              |  2 +-
 .../space-station-14-launcher.nix             |  2 +-
 pkgs/by-name/sp/spaceFM/package.nix           |  2 +-
 pkgs/by-name/sp/spacebar/package.nix          |  2 +-
 pkgs/by-name/sp/spacectl/package.nix          |  2 +-
 pkgs/by-name/sp/spacer/package.nix            |  2 +-
 pkgs/by-name/sp/spaceship-prompt/package.nix  |  2 +-
 pkgs/by-name/sp/spacevim/package.nix          |  2 +-
 pkgs/by-name/sp/spade/package.nix             |  2 +-
 pkgs/by-name/sp/span-lite/package.nix         |  2 +-
 pkgs/by-name/sp/sparkleshare/package.nix      |  2 +-
 pkgs/by-name/sp/spatial-shell/package.nix     |  2 +-
 pkgs/by-name/sp/spdk/package.nix              |  2 +-
 .../sp/spdx-license-list-data/package.nix     |  2 +-
 pkgs/by-name/sp/spectra/package.nix           |  2 +-
 pkgs/by-name/sp/spfft/package.nix             |  2 +-
 pkgs/by-name/sp/spice-up/package.nix          |  2 +-
 pkgs/by-name/sp/spicetify-cli/package.nix     |  2 +-
 .../sp/spicy-parser-generator/package.nix     |  2 +-
 pkgs/by-name/sp/spicy/package.nix             |  2 +-
 pkgs/by-name/sp/spire/package.nix             |  2 +-
 pkgs/by-name/sp/spla/package.nix              |  2 +-
 pkgs/by-name/sp/spoof/package.nix             |  2 +-
 pkgs/by-name/sp/spoofdpi/package.nix          |  2 +-
 pkgs/by-name/sp/spotify-tray/package.nix      |  2 +-
 pkgs/by-name/sp/spral/package.nix             |  2 +-
 pkgs/by-name/sp/spruce/package.nix            |  2 +-
 pkgs/by-name/sp/sptk/package.nix              |  2 +-
 pkgs/by-name/sp/sptlrx/package.nix            |  2 +-
 pkgs/by-name/sp/spyre/package.nix             |  2 +-
 pkgs/by-name/sq/sq/package.nix                |  2 +-
 pkgs/by-name/sq/sql-formatter/package.nix     |  2 +-
 pkgs/by-name/sq/sql-studio/package.nix        |  2 +-
 pkgs/by-name/sq/sqlcheck/package.nix          |  2 +-
 pkgs/by-name/sq/sqlcipher/package.nix         |  2 +-
 pkgs/by-name/sq/sqlcmd/package.nix            |  2 +-
 pkgs/by-name/sq/sqldef/package.nix            |  2 +-
 pkgs/by-name/sq/sqlitecpp/package.nix         |  2 +-
 pkgs/by-name/sq/sqlitestudio/package.nix      |  2 +-
 pkgs/by-name/sq/sqls/package.nix              |  2 +-
 pkgs/by-name/sq/squashfsTools/package.nix     |  2 +-
 pkgs/by-name/sq/squashfuse/package.nix        |  2 +-
 pkgs/by-name/sq/squirreldisk/package.nix      |  2 +-
 pkgs/by-name/sr/srain/package.nix             |  2 +-
 pkgs/by-name/sr/srandrd/package.nix           |  2 +-
 pkgs/by-name/sr/src-cli/package.nix           |  2 +-
 pkgs/by-name/sr/sregex/package.nix            |  2 +-
 pkgs/by-name/sr/srisum/package.nix            |  2 +-
 pkgs/by-name/sr/srt/package.nix               |  2 +-
 pkgs/by-name/sr/srtp/package.nix              |  2 +-
 pkgs/by-name/sr/srtrelay/package.nix          |  2 +-
 pkgs/by-name/ss/ssh-agents/package.nix        |  2 +-
 pkgs/by-name/ss/ssh-chat/package.nix          |  2 +-
 pkgs/by-name/ss/ssh-key-confirmer/package.nix |  2 +-
 pkgs/by-name/ss/ssh-to-age/package.nix        |  2 +-
 pkgs/by-name/ss/ssh-to-pgp/package.nix        |  2 +-
 pkgs/by-name/ss/ssh-tpm-agent/package.nix     |  2 +-
 pkgs/by-name/ss/sshchecker/package.nix        |  2 +-
 pkgs/by-name/ss/sshed/package.nix             |  2 +-
 pkgs/by-name/ss/sshesame/package.nix          |  2 +-
 pkgs/by-name/ss/sshlatex/package.nix          |  2 +-
 pkgs/by-name/ss/sshping/package.nix           |  2 +-
 pkgs/by-name/ss/sshportal/package.nix         |  2 +-
 pkgs/by-name/ss/sshs/package.nix              |  2 +-
 pkgs/by-name/ss/sslh/package.nix              |  2 +-
 pkgs/by-name/ss/sslsplit/package.nix          |  2 +-
 .../ss/ssm-session-manager-plugin/package.nix |  2 +-
 pkgs/by-name/ss/ssmsh/package.nix             |  2 +-
 pkgs/by-name/ss/ssocr/package.nix             |  2 +-
 pkgs/by-name/ss/sss-cli/package.nix           |  2 +-
 pkgs/by-name/ss/sssnake/package.nix           |  2 +-
 pkgs/by-name/st/stackblur-go/package.nix      |  2 +-
 pkgs/by-name/st/stackit-cli/package.nix       |  2 +-
 pkgs/by-name/st/stackql/package.nix           |  2 +-
 pkgs/by-name/st/stacs/package.nix             |  2 +-
 pkgs/by-name/st/stagit/package.nix            |  2 +-
 pkgs/by-name/st/stalonetray/package.nix       |  2 +-
 pkgs/by-name/st/stanc/package.nix             |  2 +-
 pkgs/by-name/st/star/package.nix              |  2 +-
 pkgs/by-name/st/starboard/package.nix         |  2 +-
 pkgs/by-name/st/starcharts/package.nix        |  2 +-
 pkgs/by-name/st/starfetch/package.nix         |  2 +-
 pkgs/by-name/st/stargate-libcds/package.nix   |  2 +-
 pkgs/by-name/st/static-server/package.nix     |  2 +-
 pkgs/by-name/st/static-web-server/package.nix |  2 +-
 pkgs/by-name/st/statik/package.nix            |  2 +-
 pkgs/by-name/st/statix/package.nix            |  2 +-
 pkgs/by-name/st/stayrtr/package.nix           |  2 +-
 pkgs/by-name/st/stc-cli/package.nix           |  2 +-
 pkgs/by-name/st/stdman/package.nix            |  2 +-
 pkgs/by-name/st/stdoutisatty/package.nix      |  2 +-
 pkgs/by-name/st/stduuid/package.nix           |  2 +-
 pkgs/by-name/st/steam-acf/package.nix         |  2 +-
 pkgs/by-name/st/steam-tui/package.nix         |  2 +-
 pkgs/by-name/st/steamguard-cli/package.nix    |  2 +-
 pkgs/by-name/st/steghide/package.nix          |  2 +-
 pkgs/by-name/st/stegseek/package.nix          |  2 +-
 pkgs/by-name/st/stella/package.nix            |  2 +-
 pkgs/by-name/st/stellarsolver/package.nix     |  2 +-
 pkgs/by-name/st/step-kms-plugin/package.nix   |  2 +-
 pkgs/by-name/st/stern/package.nix             |  2 +-
 pkgs/by-name/st/stgit/package.nix             |  2 +-
 pkgs/by-name/st/sticky-notes/package.nix      |  2 +-
 pkgs/by-name/st/sticky/package.nix            |  2 +-
 pkgs/by-name/st/stig/package.nix              |  2 +-
 pkgs/by-name/st/stilo-themes/package.nix      |  2 +-
 pkgs/by-name/st/stl-to-obj/package.nix        |  2 +-
 pkgs/by-name/st/stlink/package.nix            |  2 +-
 pkgs/by-name/st/stochas/package.nix           |  2 +-
 pkgs/by-name/st/stone-phaser/package.nix      |  2 +-
 pkgs/by-name/st/stopmotion/package.nix        |  2 +-
 pkgs/by-name/st/storj-uplink/package.nix      |  2 +-
 pkgs/by-name/st/strace-analyzer/package.nix   |  2 +-
 pkgs/by-name/st/streamdeck-ui/package.nix     |  2 +-
 pkgs/by-name/st/streamrip/package.nix         |  2 +-
 pkgs/by-name/st/stripe-cli/package.nix        |  2 +-
 pkgs/by-name/st/strongswan/package.nix        |  2 +-
 pkgs/by-name/st/structorizer/package.nix      |  2 +-
 pkgs/by-name/st/sttr/package.nix              |  2 +-
 pkgs/by-name/st/stu/package.nix               |  2 +-
 pkgs/by-name/st/stuffbin/package.nix          |  2 +-
 pkgs/by-name/st/stxxl/package.nix             |  2 +-
 pkgs/by-name/st/stylua/package.nix            |  2 +-
 pkgs/by-name/st/styx/package.nix              |  2 +-
 pkgs/by-name/su/su-exec/package.nix           |  2 +-
 pkgs/by-name/su/sub-batch/package.nix         |  2 +-
 pkgs/by-name/su/subberthehut/package.nix      |  2 +-
 pkgs/by-name/su/subjs/package.nix             |  2 +-
 pkgs/by-name/su/subtitlr/package.nix          |  2 +-
 pkgs/by-name/su/subxt/package.nix             |  2 +-
 pkgs/by-name/su/sudo-rs/package.nix           |  2 +-
 .../su/suitesparse-graphblas/package.nix      |  2 +-
 pkgs/by-name/su/summon/package.nix            |  2 +-
 pkgs/by-name/su/sunwait/package.nix           |  2 +-
 pkgs/by-name/su/supabase-cli/package.nix      |  2 +-
 pkgs/by-name/su/supercronic/package.nix       |  2 +-
 pkgs/by-name/su/supersonic/package.nix        |  2 +-
 pkgs/by-name/su/supertag/package.nix          |  2 +-
 pkgs/by-name/su/surface-control/package.nix   |  2 +-
 pkgs/by-name/su/surfer/package.nix            |  2 +-
 pkgs/by-name/su/surge-cli/package.nix         |  2 +-
 pkgs/by-name/su/surrealist/package.nix        |  2 +-
 pkgs/by-name/su/suscan/package.nix            |  2 +-
 pkgs/by-name/su/sutils/package.nix            |  2 +-
 pkgs/by-name/sv/sv-lang/package.nix           |  2 +-
 pkgs/by-name/sv/svaba/package.nix             |  2 +-
 pkgs/by-name/sv/svg2pdf/package.nix           |  2 +-
 pkgs/by-name/sv/svix-server/package.nix       |  2 +-
 pkgs/by-name/sv/svls/package.nix              |  2 +-
 pkgs/by-name/sv/svtplay-dl/package.nix        |  2 +-
 pkgs/by-name/sv/svu/package.nix               |  2 +-
 pkgs/by-name/sw/swagger-cli/package.nix       |  2 +-
 .../sw/sway-launcher-desktop/package.nix      |  2 +-
 .../by-name/sw/sway-new-workspace/package.nix |  2 +-
 pkgs/by-name/sw/sway-overfocus/package.nix    |  2 +-
 pkgs/by-name/sw/sway-scratch/package.nix      |  2 +-
 pkgs/by-name/sw/sway-unwrapped/package.nix    |  2 +-
 pkgs/by-name/sw/swayest-workstyle/package.nix |  2 +-
 pkgs/by-name/sw/swayidle/package.nix          |  2 +-
 pkgs/by-name/sw/swaykbdd/package.nix          |  2 +-
 pkgs/by-name/sw/swaylock-effects/package.nix  |  2 +-
 pkgs/by-name/sw/swaynag-battery/package.nix   |  2 +-
 .../sw/swaynotificationcenter/package.nix     |  2 +-
 pkgs/by-name/sw/swayosd/package.nix           |  2 +-
 pkgs/by-name/sw/swh_lv2/package.nix           |  2 +-
 pkgs/by-name/sw/swiftformat/package.nix       |  2 +-
 pkgs/by-name/sw/swim/package.nix              |  2 +-
 pkgs/by-name/sx/sx-go/package.nix             |  2 +-
 pkgs/by-name/sx/sx/package.nix                |  2 +-
 pkgs/by-name/sx/sxhkd/package.nix             |  2 +-
 pkgs/by-name/sy/symbolicator/package.nix      |  2 +-
 pkgs/by-name/sy/symengine/package.nix         |  2 +-
 pkgs/by-name/sy/symlinks/package.nix          |  2 +-
 pkgs/by-name/sy/sympa/package.nix             |  2 +-
 pkgs/by-name/sy/syn2mas/package.nix           |  2 +-
 pkgs/by-name/sy/syncall/package.nix           |  2 +-
 pkgs/by-name/sy/synchrony/package.nix         |  2 +-
 pkgs/by-name/sy/syncthing-tray/package.nix    |  2 +-
 pkgs/by-name/sy/syncyomi/package.nix          |  2 +-
 pkgs/by-name/sy/syndicate_utils/package.nix   |  2 +-
 pkgs/by-name/sy/synfigstudio/package.nix      |  2 +-
 pkgs/by-name/sy/syntax/package.nix            |  2 +-
 pkgs/by-name/sy/sysbench/package.nix          |  2 +-
 pkgs/by-name/sy/system76-firmware/package.nix |  2 +-
 .../package.nix                               |  2 +-
 .../by-name/sy/system76-scheduler/package.nix |  2 +-
 pkgs/by-name/sy/systembus-notify/package.nix  |  2 +-
 pkgs/by-name/sy/systemc/package.nix           |  2 +-
 pkgs/by-name/sy/systemfd/package.nix          |  2 +-
 pkgs/by-name/sy/systeroid/package.nix         |  2 +-
 pkgs/by-name/sy/sysz/package.nix              |  2 +-
 pkgs/by-name/sz/szyszka/package.nix           |  2 +-
 pkgs/by-name/t-/t-rex/package.nix             |  2 +-
 pkgs/by-name/ta/ta-lib/package.nix            |  2 +-
 pkgs/by-name/ta/tab/package.nix               |  2 +-
 pkgs/by-name/ta/tabiew/package.nix            |  2 +-
 pkgs/by-name/ta/tabula-java/package.nix       |  2 +-
 pkgs/by-name/ta/tagger/package.nix            |  2 +-
 pkgs/by-name/ta/tagparser/package.nix         |  2 +-
 pkgs/by-name/ta/tagref/package.nix            |  2 +-
 pkgs/by-name/ta/tagutil/package.nix           |  2 +-
 pkgs/by-name/ta/tailer/package.nix            |  2 +-
 pkgs/by-name/ta/tailscale/package.nix         |  2 +-
 pkgs/by-name/ta/tailscalesd/package.nix       |  2 +-
 pkgs/by-name/ta/talentedhack/package.nix      |  2 +-
 pkgs/by-name/ta/taler-wallet-core/package.nix |  2 +-
 pkgs/by-name/ta/tambura/package.nix           |  2 +-
 pkgs/by-name/ta/tandoor-recipes/common.nix    |  2 +-
 pkgs/by-name/ta/tango/package.nix             |  2 +-
 pkgs/by-name/ta/tangram/package.nix           |  2 +-
 pkgs/by-name/ta/tanka/package.nix             |  2 +-
 pkgs/by-name/ta/taoup/package.nix             |  2 +-
 pkgs/by-name/ta/taproot-assets/package.nix    |  2 +-
 pkgs/by-name/ta/tar2ext4/package.nix          |  2 +-
 pkgs/by-name/ta/tarantool/package.nix         |  2 +-
 pkgs/by-name/ta/target-isns/package.nix       |  2 +-
 pkgs/by-name/ta/tarsnapper/package.nix        |  2 +-
 pkgs/by-name/ta/tarssh/package.nix            |  2 +-
 pkgs/by-name/ta/taskopen/package.nix          |  2 +-
 pkgs/by-name/ta/tasktimer/package.nix         |  2 +-
 pkgs/by-name/ta/taskwarrior-tui/package.nix   |  2 +-
 pkgs/by-name/ta/taskwarrior2/package.nix      |  2 +-
 pkgs/by-name/ta/tau-hydrogen/package.nix      |  2 +-
 pkgs/by-name/ta/taxi/package.nix              |  2 +-
 pkgs/by-name/tb/tbox/package.nix              |  2 +-
 pkgs/by-name/tc/tcat/package.nix              |  2 +-
 pkgs/by-name/tc/tcpcrypt/package.nix          |  2 +-
 pkgs/by-name/tc/tcpkali/package.nix           |  2 +-
 pkgs/by-name/td/tdl/package.nix               |  2 +-
 pkgs/by-name/td/tdrop/package.nix             |  2 +-
 pkgs/by-name/te/tealdeer/package.nix          |  2 +-
 pkgs/by-name/te/teapot/package.nix            |  2 +-
 pkgs/by-name/te/tebreak/package.nix           |  2 +-
 pkgs/by-name/te/techmino/ccloader.nix         |  2 +-
 pkgs/by-name/te/teehee/package.nix            |  2 +-
 pkgs/by-name/te/teensy-loader-cli/package.nix |  2 +-
 pkgs/by-name/te/teip/package.nix              |  2 +-
 pkgs/by-name/te/tektoncd-cli/package.nix      |  2 +-
 pkgs/by-name/te/tela-icon-theme/package.nix   |  2 +-
 pkgs/by-name/te/telegraf/package.nix          |  2 +-
 pkgs/by-name/te/telepresence2/package.nix     |  4 +-
 pkgs/by-name/te/telescope/package.nix         |  2 +-
 pkgs/by-name/te/teller/package.nix            |  2 +-
 pkgs/by-name/te/templ/package.nix             |  2 +-
 pkgs/by-name/te/tempo/package.nix             |  2 +-
 pkgs/by-name/te/temporal-cli/package.nix      |  2 +-
 pkgs/by-name/te/temporal/package.nix          |  2 +-
 pkgs/by-name/te/temporalite/package.nix       |  2 +-
 pkgs/by-name/te/tendermint/package.nix        |  2 +-
 pkgs/by-name/te/tenki/package.nix             |  2 +-
 pkgs/by-name/te/tensorflow-lite/package.nix   |  2 +-
 pkgs/by-name/te/termbg/package.nix            |  2 +-
 pkgs/by-name/te/termbook/package.nix          |  2 +-
 pkgs/by-name/te/termcolor/package.nix         |  2 +-
 pkgs/by-name/te/terminal-colors/package.nix   |  2 +-
 pkgs/by-name/te/terminal-parrot/package.nix   |  2 +-
 pkgs/by-name/te/terminal-stocks/package.nix   |  2 +-
 pkgs/by-name/te/termshark/package.nix         |  2 +-
 pkgs/by-name/te/termsvg/package.nix           |  2 +-
 pkgs/by-name/te/termtekst/package.nix         |  2 +-
 pkgs/by-name/te/termusic/package.nix          |  2 +-
 pkgs/by-name/te/terracognita/package.nix      |  2 +-
 .../te/terraform-backend-git/package.nix      |  2 +-
 pkgs/by-name/te/terraform-docs/package.nix    |  2 +-
 .../te/terraform-inventory/package.nix        |  2 +-
 pkgs/by-name/te/terraform-ls/package.nix      |  2 +-
 pkgs/by-name/te/terraform-lsp/package.nix     |  2 +-
 pkgs/by-name/te/terraformer/package.nix       |  2 +-
 pkgs/by-name/te/terramate/package.nix         |  2 +-
 pkgs/by-name/te/terranix/package.nix          |  2 +-
 pkgs/by-name/te/terser/package.nix            |  2 +-
 pkgs/by-name/te/tesh/package.nix              |  2 +-
 pkgs/by-name/te/test-drive/package.nix        |  2 +-
 pkgs/by-name/te/testkube/package.nix          |  2 +-
 pkgs/by-name/te/testssl/package.nix           |  2 +-
 pkgs/by-name/te/tev/package.nix               |  2 +-
 pkgs/by-name/te/tewi-font/package.nix         |  2 +-
 pkgs/by-name/te/texstudio/package.nix         |  2 +-
 pkgs/by-name/te/text-engine/package.nix       |  2 +-
 pkgs/by-name/te/textual-paint/package.nix     |  4 +-
 pkgs/by-name/te/texture-synthesis/package.nix |  2 +-
 pkgs/by-name/te/tezos-rust-libs/package.nix   |  2 +-
 pkgs/by-name/tf/tf-summarize/package.nix      |  2 +-
 pkgs/by-name/tf/tf2pulumi/package.nix         |  2 +-
 pkgs/by-name/tf/tfautomv/package.nix          |  2 +-
 pkgs/by-name/tf/tfswitch/package.nix          |  2 +-
 pkgs/by-name/tf/tfupdate/package.nix          |  2 +-
 pkgs/by-name/tg/tgswitch/package.nix          |  2 +-
 pkgs/by-name/tg/tgt/package.nix               |  2 +-
 pkgs/by-name/th/thc-hydra/package.nix         |  2 +-
 pkgs/by-name/th/thc-ipv6/package.nix          |  2 +-
 .../th/the-legend-of-edgar/package.nix        |  2 +-
 pkgs/by-name/th/theforceengine/package.nix    |  2 +-
 pkgs/by-name/th/theft/package.nix             |  2 +-
 pkgs/by-name/th/theme-sh/package.nix          |  2 +-
 pkgs/by-name/th/theme-vertex/package.nix      |  2 +-
 pkgs/by-name/th/themechanger/package.nix      |  2 +-
 pkgs/by-name/th/themix-gui/package.nix        |  2 +-
 pkgs/by-name/th/thermald/package.nix          |  2 +-
 pkgs/by-name/th/thicket/package.nix           |  2 +-
 .../th/thin-provisioning-tools/package.nix    |  2 +-
 pkgs/by-name/th/thinkfan/package.nix          |  2 +-
 pkgs/by-name/th/thokr/package.nix             |  2 +-
 pkgs/by-name/th/thrift-ls/package.nix         |  2 +-
 pkgs/by-name/th/throttled/package.nix         |  2 +-
 pkgs/by-name/th/thud/package.nix              |  2 +-
 pkgs/by-name/th/thumbs/package.nix            |  2 +-
 pkgs/by-name/th/thunderbolt/package.nix       |  2 +-
 pkgs/by-name/ti/tidb/package.nix              |  2 +-
 pkgs/by-name/ti/tidy-viewer/package.nix       |  2 +-
 pkgs/by-name/ti/tigervnc/package.nix          |  2 +-
 pkgs/by-name/ti/tiledb/package.nix            |  2 +-
 pkgs/by-name/ti/tilix/package.nix             |  2 +-
 pkgs/by-name/ti/tilt/package.nix              |  2 +-
 pkgs/by-name/ti/time-ghc-modules/package.nix  |  2 +-
 .../ti/timelapse-deflicker/package.nix        |  2 +-
 pkgs/by-name/ti/timemachine/package.nix       |  2 +-
 pkgs/by-name/ti/timer/package.nix             |  2 +-
 pkgs/by-name/ti/timescaledb-tune/package.nix  |  2 +-
 pkgs/by-name/ti/timew-sync-client/package.nix |  2 +-
 pkgs/by-name/ti/timew-sync-server/package.nix |  2 +-
 pkgs/by-name/ti/timewall/package.nix          |  2 +-
 pkgs/by-name/ti/timewarrior/package.nix       |  2 +-
 pkgs/by-name/ti/tini/package.nix              |  2 +-
 pkgs/by-name/ti/tintin/package.nix            |  2 +-
 pkgs/by-name/ti/tiny-dfr/package.nix          |  2 +-
 pkgs/by-name/ti/tinycbor/package.nix          |  2 +-
 pkgs/by-name/ti/tinyfecvpn/package.nix        |  2 +-
 pkgs/by-name/ti/tinygo/package.nix            |  2 +-
 pkgs/by-name/ti/tinymembench/package.nix      |  2 +-
 pkgs/by-name/ti/tinyobjloader/package.nix     |  2 +-
 pkgs/by-name/ti/tinyproxy/package.nix         |  2 +-
 pkgs/by-name/ti/tinyxml-2/package.nix         |  2 +-
 pkgs/by-name/ti/tiv/package.nix               |  2 +-
 pkgs/by-name/tk/tkey-ssh-agent/package.nix    |  2 +-
 pkgs/by-name/tl/tl-expected/package.nix       |  2 +-
 pkgs/by-name/tl/tllist/package.nix            |  2 +-
 pkgs/by-name/tl/tlock/package.nix             |  2 +-
 pkgs/by-name/tl/tlrc/package.nix              |  2 +-
 pkgs/by-name/tl/tlwg/package.nix              |  2 +-
 pkgs/by-name/tm/tmatrix/package.nix           |  2 +-
 pkgs/by-name/tm/tml/package.nix               |  2 +-
 pkgs/by-name/tm/tmpmail/package.nix           |  2 +-
 pkgs/by-name/tm/tmux-mem-cpu-load/package.nix |  2 +-
 pkgs/by-name/tm/tmux-xpanes/package.nix       |  2 +-
 pkgs/by-name/tm/tmux/package.nix              |  2 +-
 pkgs/by-name/tm/tmuxifier/package.nix         |  2 +-
 pkgs/by-name/tn/tncattach/package.nix         |  2 +-
 pkgs/by-name/tn/tnef/package.nix              |  2 +-
 pkgs/by-name/to/to-html/package.nix           |  2 +-
 pkgs/by-name/to/toast/package.nix             |  2 +-
 pkgs/by-name/to/tocpdf/package.nix            |  2 +-
 pkgs/by-name/to/todo/package.nix              |  2 +-
 pkgs/by-name/to/todofi-sh/package.nix         |  2 +-
 pkgs/by-name/to/todoist/package.nix           |  2 +-
 pkgs/by-name/to/tofi/package.nix              |  2 +-
 pkgs/by-name/to/toml-f/package.nix            |  2 +-
 pkgs/by-name/to/ton/package.nix               |  2 +-
 pkgs/by-name/to/toolbox/package.nix           |  2 +-
 pkgs/by-name/to/topfew-rs/package.nix         |  2 +-
 pkgs/by-name/to/topfew/package.nix            |  2 +-
 pkgs/by-name/to/topicctl/package.nix          |  2 +-
 pkgs/by-name/to/topydo/package.nix            |  2 +-
 pkgs/by-name/to/torctl/package.nix            |  2 +-
 pkgs/by-name/to/torrent7z/package.nix         |  2 +-
 pkgs/by-name/to/torrential/package.nix        |  2 +-
 pkgs/by-name/to/torrentstream/package.nix     |  2 +-
 pkgs/by-name/to/toss/package.nix              |  2 +-
 pkgs/by-name/to/touchegg/package.nix          |  2 +-
 pkgs/by-name/to/tox-node/package.nix          |  2 +-
 pkgs/by-name/to/toxic/package.nix             |  2 +-
 pkgs/by-name/to/toxiproxy/package.nix         |  2 +-
 pkgs/by-name/tp/tp-auto-kbbl/package.nix      |  2 +-
 pkgs/by-name/tp/tpacpi-bat/package.nix        |  2 +-
 pkgs/by-name/tp/tparse/package.nix            |  2 +-
 pkgs/by-name/tp/tpi/package.nix               |  2 +-
 pkgs/by-name/tp/tplay/package.nix             |  2 +-
 pkgs/by-name/tp/tpm2-abrmd/package.nix        |  2 +-
 pkgs/by-name/tp/tpm2-openssl/package.nix      |  2 +-
 pkgs/by-name/tp/tpm2-totp/package.nix         |  2 +-
 pkgs/by-name/tp/tpsecore/package.nix          |  2 +-
 pkgs/by-name/tr/tracebox/package.nix          |  2 +-
 pkgs/by-name/tr/trackballs/package.nix        |  2 +-
 pkgs/by-name/tr/trackma/package.nix           |  2 +-
 pkgs/by-name/tr/tracy/package.nix             |  2 +-
 .../tr/traefik-certs-dumper/package.nix       |  2 +-
 pkgs/by-name/tr/traitor/package.nix           |  2 +-
 pkgs/by-name/tr/trak/package.nix              |  2 +-
 pkgs/by-name/tr/tran/package.nix              |  2 +-
 pkgs/by-name/tr/transcrypt/package.nix        |  2 +-
 pkgs/by-name/tr/transfer-sh/package.nix       |  2 +-
 pkgs/by-name/tr/transifex-cli/package.nix     |  2 +-
 pkgs/by-name/tr/translate-shell/package.nix   |  2 +-
 pkgs/by-name/tr/transmission_3/package.nix    |  2 +-
 pkgs/by-name/tr/trash-cli/package.nix         |  2 +-
 pkgs/by-name/tr/trayscale/package.nix         |  2 +-
 pkgs/by-name/tr/trdl-client/package.nix       |  2 +-
 pkgs/by-name/tr/tre-command/package.nix       |  2 +-
 pkgs/by-name/tr/tree-from-tags/package.nix    |  2 +-
 pkgs/by-name/tr/treedome/package.nix          |  2 +-
 pkgs/by-name/tr/treefmt/package.nix           |  2 +-
 pkgs/by-name/tr/tremc/package.nix             |  2 +-
 pkgs/by-name/tr/trexio/package.nix            |  2 +-
 pkgs/by-name/tr/trf/package.nix               |  2 +-
 pkgs/by-name/tr/triforce-lv2/package.nix      |  2 +-
 pkgs/by-name/tr/trillian/package.nix          |  2 +-
 pkgs/by-name/tr/trimal/package.nix            |  2 +-
 pkgs/by-name/tr/trippy/package.nix            |  2 +-
 pkgs/by-name/tr/triton/package.nix            |  2 +-
 pkgs/by-name/tr/trlib/package.nix             |  2 +-
 pkgs/by-name/tr/trompeloeil/package.nix       |  2 +-
 pkgs/by-name/tr/trunk-ng/package.nix          |  2 +-
 pkgs/by-name/tr/trunk-recorder/package.nix    |  2 +-
 pkgs/by-name/tr/trunk/package.nix             |  2 +-
 pkgs/by-name/tr/try/package.nix               |  2 +-
 pkgs/by-name/ts/ts-warp/package.nix           |  2 +-
 pkgs/by-name/ts/ts_query_ls/package.nix       |  2 +-
 pkgs/by-name/ts/tsduck/package.nix            |  2 +-
 pkgs/by-name/ts/tslib/package.nix             |  2 +-
 .../tt/tt-rss-plugin-feediron/package.nix     |  2 +-
 .../tt/tt-rss-theme-feedly/package.nix        |  2 +-
 pkgs/by-name/tt/tt/package.nix                |  2 +-
 pkgs/by-name/tt/tt2020/package.nix            |  2 +-
 pkgs/by-name/tt/ttags/package.nix             |  2 +-
 pkgs/by-name/tt/ttchat/package.nix            |  2 +-
 pkgs/by-name/tt/ttdl/package.nix              |  2 +-
 pkgs/by-name/tt/tty-share/package.nix         |  2 +-
 pkgs/by-name/tt/tty-solitaire/package.nix     |  2 +-
 pkgs/by-name/tt/ttygif/package.nix            |  2 +-
 pkgs/by-name/tt/ttylog/package.nix            |  2 +-
 pkgs/by-name/tt/ttyper/package.nix            |  2 +-
 pkgs/by-name/tt/ttyplot/package.nix           |  2 +-
 pkgs/by-name/tu/tuba/package.nix              |  2 +-
 pkgs/by-name/tu/tuc/package.nix               |  2 +-
 pkgs/by-name/tu/tuckr/package.nix             |  2 +-
 pkgs/by-name/tu/tuhi/package.nix              |  2 +-
 pkgs/by-name/tu/tui-journal/package.nix       |  2 +-
 pkgs/by-name/tu/tuir/package.nix              |  2 +-
 pkgs/by-name/tu/tuntox/package.nix            |  2 +-
 pkgs/by-name/tu/tunwg/package.nix             |  2 +-
 pkgs/by-name/tu/tup/package.nix               |  2 +-
 pkgs/by-name/tu/tuptime/package.nix           |  2 +-
 pkgs/by-name/tu/turbocase/package.nix         |  2 +-
 pkgs/by-name/tu/turnon/package.nix            |  2 +-
 pkgs/by-name/tu/turso-cli/package.nix         |  2 +-
 pkgs/by-name/tu/turtle-build/package.nix      |  2 +-
 pkgs/by-name/tu/tusc-sh/package.nix           |  2 +-
 pkgs/by-name/tu/tut/package.nix               |  2 +-
 pkgs/by-name/tu/tuxmux/package.nix            |  2 +-
 pkgs/by-name/tv/tv/package.nix                |  2 +-
 pkgs/by-name/tv/tvm/package.nix               |  2 +-
 pkgs/by-name/tw/twa/package.nix               |  2 +-
 pkgs/by-name/tw/tweego/package.nix            |  2 +-
 pkgs/by-name/tw/twitch-cli/package.nix        |  2 +-
 pkgs/by-name/tw/twitch-hls-client/package.nix |  2 +-
 .../tw/twitter-color-emoji/package.nix        |  2 +-
 pkgs/by-name/tx/txtw/package.nix              |  2 +-
 pkgs/by-name/ty/tydra/package.nix             |  2 +-
 pkgs/by-name/ty/tygo/package.nix              |  2 +-
 pkgs/by-name/ty/tym/package.nix               |  2 +-
 pkgs/by-name/ty/typescript/package.nix        |  2 +-
 pkgs/by-name/ty/typeshare/package.nix         |  2 +-
 pkgs/by-name/ty/typical/package.nix           |  2 +-
 pkgs/by-name/ty/typioca/package.nix           |  2 +-
 pkgs/by-name/ty/typstfmt/package.nix          |  2 +-
 pkgs/by-name/tz/tz/package.nix                |  2 +-
 pkgs/by-name/u2/u2ps/package.nix              |  2 +-
 pkgs/by-name/ua/uacme/package.nix             |  2 +-
 pkgs/by-name/ua/uair/package.nix              |  2 +-
 pkgs/by-name/ua/uarmsolver/package.nix        |  2 +-
 pkgs/by-name/ub/ubertooth/package.nix         |  2 +-
 pkgs/by-name/ub/ubi_reader/package.nix        |  2 +-
 pkgs/by-name/uc/uchess/package.nix            |  2 +-
 pkgs/by-name/uc/ucode/package.nix             |  2 +-
 pkgs/by-name/uc/ucx/package.nix               |  2 +-
 pkgs/by-name/ud/uddup/package.nix             |  2 +-
 pkgs/by-name/ud/udevil/package.nix            |  2 +-
 pkgs/by-name/ud/udict/package.nix             |  2 +-
 pkgs/by-name/ud/udiskie/package.nix           |  2 +-
 pkgs/by-name/ud/udp2raw/package.nix           |  2 +-
 pkgs/by-name/ud/udpreplay/package.nix         |  2 +-
 pkgs/by-name/ud/udpt/package.nix              |  2 +-
 pkgs/by-name/ue/ueberzugpp/package.nix        |  2 +-
 .../ue/uefi-firmware-parser/package.nix       |  2 +-
 pkgs/by-name/ue/uefi-run/package.nix          |  2 +-
 pkgs/by-name/ue/uesave/package.nix            |  2 +-
 pkgs/by-name/uf/ufiformat/package.nix         |  2 +-
 pkgs/by-name/uf/uftpd/package.nix             |  2 +-
 pkgs/by-name/uf/uftrace/package.nix           |  2 +-
 pkgs/by-name/ug/uget-integrator/package.nix   |  2 +-
 pkgs/by-name/ug/uglify-js/package.nix         |  2 +-
 pkgs/by-name/ug/ugm/package.nix               |  2 +-
 pkgs/by-name/ug/ugtrain/package.nix           |  2 +-
 pkgs/by-name/uh/uhttpmock_1_0/package.nix     |  2 +-
 pkgs/by-name/uh/uhubctl/package.nix           |  2 +-
 pkgs/by-name/ui/uivonim/package.nix           |  2 +-
 pkgs/by-name/ul/ulid/package.nix              |  2 +-
 pkgs/by-name/ul/ultralist/package.nix         |  2 +-
 pkgs/by-name/ul/ultrastardx/package.nix       |  2 +-
 pkgs/by-name/um/umoci/package.nix             |  2 +-
 pkgs/by-name/um/umoria/package.nix            |  2 +-
 pkgs/by-name/um/umpire/package.nix            |  2 +-
 pkgs/by-name/um/umurmur/package.nix           |  2 +-
 pkgs/by-name/un/unbook/package.nix            |  2 +-
 pkgs/by-name/un/unclutter-xfixes/package.nix  |  2 +-
 pkgs/by-name/un/undervolt/package.nix         |  2 +-
 pkgs/by-name/un/unfurl/package.nix            |  2 +-
 pkgs/by-name/un/ungit/package.nix             |  2 +-
 pkgs/by-name/un/unhide/package.nix            |  2 +-
 pkgs/by-name/un/unibilium/package.nix         |  2 +-
 pkgs/by-name/un/unicode-paracode/package.nix  |  2 +-
 .../un/unifiedpush-common-proxies/package.nix |  2 +-
 pkgs/by-name/un/unimap/package.nix            |  2 +-
 pkgs/by-name/un/unison-fsmonitor/package.nix  |  2 +-
 pkgs/by-name/un/unit/package.nix              |  2 +-
 pkgs/by-name/un/unittest-cpp/package.nix      |  2 +-
 pkgs/by-name/un/unnethack/package.nix         |  2 +-
 pkgs/by-name/un/unoconv/package.nix           |  2 +-
 pkgs/by-name/un/unpoller/package.nix          |  2 +-
 pkgs/by-name/un/unshield/package.nix          |  2 +-
 pkgs/by-name/un/unsilence/package.nix         |  2 +-
 pkgs/by-name/un/unstructured-api/package.nix  |  2 +-
 pkgs/by-name/un/unused/package.nix            |  2 +-
 pkgs/by-name/un/unvanquished/package.nix      |  2 +-
 pkgs/by-name/un/unyaffs/package.nix           |  2 +-
 pkgs/by-name/un/unzoo/package.nix             |  2 +-
 pkgs/by-name/up/up/package.nix                |  2 +-
 pkgs/by-name/up/updatecli/package.nix         |  2 +-
 pkgs/by-name/up/uplosi/package.nix            |  2 +-
 pkgs/by-name/up/ups/package.nix               |  2 +-
 pkgs/by-name/up/upterm/package.nix            |  2 +-
 pkgs/by-name/up/uptime-kuma/package.nix       |  2 +-
 pkgs/by-name/up/uptimed/package.nix           |  2 +-
 pkgs/by-name/uq/uqm/3dovideo.nix              |  2 +-
 pkgs/by-name/ur/urban-cli/package.nix         |  2 +-
 pkgs/by-name/ur/urdfdom-headers/package.nix   |  2 +-
 pkgs/by-name/ur/urdfdom/package.nix           |  2 +-
 pkgs/by-name/ur/uri/package.nix               |  2 +-
 pkgs/by-name/ur/urlencode/package.nix         |  2 +-
 pkgs/by-name/ur/urlhunter/package.nix         |  2 +-
 pkgs/by-name/ur/urlwatch/package.nix          |  2 +-
 pkgs/by-name/ur/urn/package.nix               |  2 +-
 pkgs/by-name/us/usage/package.nix             |  2 +-
 pkgs/by-name/us/usbview/package.nix           |  2 +-
 pkgs/by-name/us/userborn/package.nix          |  2 +-
 pkgs/by-name/us/userhosts/package.nix         |  2 +-
 pkgs/by-name/us/usrsctp/package.nix           |  2 +-
 pkgs/by-name/us/ustreamer/package.nix         |  2 +-
 pkgs/by-name/ut/utf8cpp/package.nix           |  2 +-
 pkgs/by-name/ut/utf8proc/package.nix          |  2 +-
 pkgs/by-name/ut/uthash/package.nix            |  2 +-
 pkgs/by-name/ut/uthenticode/package.nix       |  2 +-
 pkgs/by-name/ut/utox/package.nix              |  2 +-
 pkgs/by-name/uw/uwufetch/package.nix          |  2 +-
 pkgs/by-name/uw/uwuify/package.nix            |  2 +-
 .../v2ray-domain-list-community/package.nix   |  2 +-
 pkgs/by-name/v2/v2ray/package.nix             |  2 +-
 .../by-name/va/vaapi-intel-hybrid/package.nix |  2 +-
 .../va/vala-language-server/package.nix       |  2 +-
 pkgs/by-name/va/vale/styles.nix               | 14 ++---
 pkgs/by-name/va/valijson/package.nix          |  2 +-
 pkgs/by-name/va/valkey/package.nix            |  2 +-
 pkgs/by-name/va/vals/package.nix              |  2 +-
 pkgs/by-name/va/valum/package.nix             |  2 +-
 pkgs/by-name/va/valuta/package.nix            |  2 +-
 .../va/vapoursynth-mvtools/package.nix        |  2 +-
 pkgs/by-name/va/vault-medusa/package.nix      |  2 +-
 pkgs/by-name/va/vault-ssh-plus/package.nix    |  2 +-
 pkgs/by-name/va/vault-tasks/package.nix       |  2 +-
 pkgs/by-name/va/vault-unseal/package.nix      |  2 +-
 pkgs/by-name/va/vault/package.nix             |  2 +-
 pkgs/by-name/va/vazir-code-font/package.nix   |  2 +-
 pkgs/by-name/va/vazir-fonts/package.nix       |  2 +-
 pkgs/by-name/vc/vcftools/package.nix          |  2 +-
 pkgs/by-name/vc/vcg/package.nix               |  2 +-
 pkgs/by-name/vc/vcpkg-tool/package.nix        |  2 +-
 pkgs/by-name/vc/vcpkg/package.nix             |  2 +-
 pkgs/by-name/vc/vcs_query/package.nix         |  2 +-
 pkgs/by-name/vd/vde2/package.nix              |  2 +-
 pkgs/by-name/vd/vdhcoapp/filepicker.nix       |  2 +-
 pkgs/by-name/vd/vdhcoapp/package.nix          |  2 +-
 pkgs/by-name/vd/vdo/package.nix               |  2 +-
 pkgs/by-name/ve/vector/package.nix            |  2 +-
 pkgs/by-name/ve/vegeta/package.nix            |  2 +-
 pkgs/by-name/ve/velero/package.nix            |  2 +-
 pkgs/by-name/ve/vendir/package.nix            |  2 +-
 pkgs/by-name/ve/venta/package.nix             |  2 +-
 pkgs/by-name/ve/vep/package.nix               |  2 +-
 pkgs/by-name/ve/verapdf/package.nix           |  2 +-
 pkgs/by-name/ve/vercel-pkg/package.nix        |  2 +-
 pkgs/by-name/ve/verco/package.nix             |  2 +-
 pkgs/by-name/ve/verifpal/package.nix          |  2 +-
 pkgs/by-name/ve/verilator/package.nix         |  2 +-
 pkgs/by-name/ve/vermin/package.nix            |  2 +-
 pkgs/by-name/ve/versus/package.nix            |  2 +-
 pkgs/by-name/ve/veryl/package.nix             |  2 +-
 pkgs/by-name/vf/vfkit/package.nix             |  2 +-
 pkgs/by-name/vg/vgrep/package.nix             |  2 +-
 pkgs/by-name/vh/vhdl-ls/package.nix           |  2 +-
 pkgs/by-name/vh/vhs/package.nix               |  2 +-
 pkgs/by-name/vi/viddy/package.nix             |  2 +-
 pkgs/by-name/vi/vidmerger/package.nix         |  2 +-
 pkgs/by-name/vi/vieb/package.nix              |  2 +-
 pkgs/by-name/vi/vikunja/package.nix           |  2 +-
 pkgs/by-name/vi/vim-startuptime/package.nix   |  2 +-
 pkgs/by-name/vi/vimcats/package.nix           |  2 +-
 pkgs/by-name/vi/vimer/package.nix             |  2 +-
 pkgs/by-name/vi/vimiv-qt/package.nix          |  2 +-
 pkgs/by-name/vi/vimix-gtk-themes/package.nix  |  2 +-
 pkgs/by-name/vi/vimix-icon-theme/package.nix  |  2 +-
 pkgs/by-name/vi/vimpc/package.nix             |  2 +-
 pkgs/by-name/vi/virter/package.nix            |  2 +-
 pkgs/by-name/vi/virtiofsd/package.nix         |  2 +-
 pkgs/by-name/vi/vis/package.nix               |  2 +-
 pkgs/by-name/vi/vitess/package.nix            |  2 +-
 pkgs/by-name/vi/vitetris/package.nix          |  2 +-
 pkgs/by-name/vi/viu/package.nix               |  2 +-
 pkgs/by-name/vi/vivictpp/package.nix          |  2 +-
 pkgs/by-name/vi/vivid/package.nix             |  2 +-
 pkgs/by-name/vk/vk-bootstrap/package.nix      |  2 +-
 pkgs/by-name/vk/vkbasalt-cli/package.nix      |  2 +-
 pkgs/by-name/vk/vkdevicechooser/package.nix   |  2 +-
 pkgs/by-name/vk/vkdisplayinfo/package.nix     |  2 +-
 pkgs/by-name/vk/vkmark/package.nix            |  2 +-
 pkgs/by-name/vl/vlang/package.nix             |  2 +-
 pkgs/by-name/vm/vmtouch/package.nix           |  2 +-
 pkgs/by-name/vn/vnstat/package.nix            |  2 +-
 pkgs/by-name/vo/vo-amrwbenc/package.nix       |  2 +-
 pkgs/by-name/vo/vocal/package.nix             |  2 +-
 pkgs/by-name/vo/volctl/package.nix            |  2 +-
 pkgs/by-name/vo/volumeicon/package.nix        |  2 +-
 pkgs/by-name/vp/vpp/package.nix               |  2 +-
 pkgs/by-name/vs/vscode-js-debug/package.nix   |  2 +-
 .../vscode-langservers-extracted/package.nix  |  2 +-
 pkgs/by-name/vs/vscode-runner/package.nix     |  2 +-
 pkgs/by-name/vs/vsh/package.nix               |  2 +-
 pkgs/by-name/vt/vtable-dumper/package.nix     |  2 +-
 pkgs/by-name/vt/vtracer/package.nix           |  2 +-
 .../robin-hood-hashing.nix                    |  2 +-
 pkgs/by-name/vu/vultr-cli/package.nix         |  2 +-
 pkgs/by-name/vu/vultr/package.nix             |  2 +-
 pkgs/by-name/vv/vvvvvv/package.nix            |  2 +-
 pkgs/by-name/w3/w3m/package.nix               |  2 +-
 pkgs/by-name/w_/w_scan2/package.nix           |  2 +-
 pkgs/by-name/wa/wabt/package.nix              |  2 +-
 pkgs/by-name/wa/wad/package.nix               |  2 +-
 pkgs/by-name/wa/wait4x/package.nix            |  2 +-
 pkgs/by-name/wa/wakeonlan/package.nix         |  2 +-
 pkgs/by-name/wa/wal-g/package.nix             |  2 +-
 pkgs/by-name/wa/wal-listener/package.nix      |  2 +-
 pkgs/by-name/wa/walk/package.nix              |  2 +-
 pkgs/by-name/wa/walker/package.nix            |  2 +-
 pkgs/by-name/wa/wallust/package.nix           |  2 +-
 pkgs/by-name/wa/wallutils/package.nix         |  2 +-
 pkgs/by-name/wa/wander/package.nix            |  2 +-
 pkgs/by-name/wa/wannier90/package.nix         |  2 +-
 pkgs/by-name/wa/waon/package.nix              |  2 +-
 pkgs/by-name/wa/wapm/package.nix              |  2 +-
 pkgs/by-name/wa/wargus/package.nix            |  2 +-
 pkgs/by-name/wa/wargus/stratagus.nix          |  2 +-
 pkgs/by-name/wa/warp-plus/package.nix         |  2 +-
 pkgs/by-name/wa/warpd/package.nix             |  2 +-
 pkgs/by-name/wa/warpinator/package.nix        |  2 +-
 pkgs/by-name/wa/wasm-tools/package.nix        |  2 +-
 pkgs/by-name/wa/wasm3/package.nix             |  2 +-
 pkgs/by-name/wa/wasmer-pack/package.nix       |  2 +-
 pkgs/by-name/wa/wasmserve/package.nix         |  2 +-
 pkgs/by-name/wa/wastebin/package.nix          |  2 +-
 pkgs/by-name/wa/wasynth/package.nix           |  2 +-
 pkgs/by-name/wa/watchdogd/package.nix         |  2 +-
 pkgs/by-name/wa/watchlog/package.nix          |  2 +-
 pkgs/by-name/wa/watershot/package.nix         |  2 +-
 pkgs/by-name/wa/watson/package.nix            |  2 +-
 pkgs/by-name/wa/wavemon/package.nix           |  2 +-
 pkgs/by-name/wa/wavpack/package.nix           |  2 +-
 pkgs/by-name/wa/way-displays/package.nix      |  2 +-
 .../wa/wayback-machine-archiver/package.nix   |  2 +-
 pkgs/by-name/wa/wayback/package.nix           |  2 +-
 pkgs/by-name/wa/waybox/package.nix            |  2 +-
 pkgs/by-name/wa/wayfarer/package.nix          |  2 +-
 pkgs/by-name/wa/wayland-logout/package.nix    |  2 +-
 .../wayland-pipewire-idle-inhibit/package.nix |  2 +-
 pkgs/by-name/wa/waylyrics/package.nix         |  2 +-
 pkgs/by-name/wa/waynergy/package.nix          |  2 +-
 pkgs/by-name/wa/wayshot/package.nix           |  2 +-
 pkgs/by-name/wa/wayvnc/package.nix            |  2 +-
 pkgs/by-name/wa/wazero/package.nix            |  2 +-
 pkgs/by-name/wb/wb32-dfu-updater/package.nix  |  2 +-
 pkgs/by-name/wb/wbg/package.nix               |  2 +-
 pkgs/by-name/wc/wcpg/package.nix              |  2 +-
 pkgs/by-name/wd/wdisplays/package.nix         |  2 +-
 pkgs/by-name/we/weave-gitops/package.nix      |  2 +-
 pkgs/by-name/we/weaver/package.nix            |  2 +-
 pkgs/by-name/we/weaviate/package.nix          |  2 +-
 pkgs/by-name/we/web-ext/package.nix           |  2 +-
 pkgs/by-name/we/webcat/package.nix            |  2 +-
 pkgs/by-name/we/webdis/package.nix            |  2 +-
 .../we/webfontkitgenerator/package.nix        |  2 +-
 pkgs/by-name/we/webhook/package.nix           |  2 +-
 pkgs/by-name/we/webmesh/package.nix           |  2 +-
 .../by-name/we/webp-pixbuf-loader/package.nix |  2 +-
 pkgs/by-name/we/websocketd/package.nix        |  2 +-
 pkgs/by-name/we/websocketpp/package.nix       |  2 +-
 pkgs/by-name/we/weggli/package.nix            |  2 +-
 pkgs/by-name/we/wego/package.nix              |  2 +-
 pkgs/by-name/we/weidu/package.nix             |  2 +-
 pkgs/by-name/we/wesher/package.nix            |  2 +-
 pkgs/by-name/wf/wf-recorder/package.nix       |  2 +-
 pkgs/by-name/wf/wfa2-lib/package.nix          |  2 +-
 pkgs/by-name/wg/wg-access-server/package.nix  |  2 +-
 pkgs/by-name/wg/wget2/package.nix             |  2 +-
 pkgs/by-name/wg/wgo/package.nix               |  2 +-
 pkgs/by-name/wh/whatfiles/package.nix         |  2 +-
 pkgs/by-name/wh/whipper/package.nix           |  2 +-
 pkgs/by-name/wh/whisper/package.nix           |  2 +-
 pkgs/by-name/wh/whistle/package.nix           |  2 +-
 pkgs/by-name/wh/whitebophir/package.nix       |  2 +-
 .../by-name/wh/whitesur-gtk-theme/package.nix |  2 +-
 pkgs/by-name/wh/whoami/package.nix            |  2 +-
 pkgs/by-name/wh/whois/package.nix             |  2 +-
 pkgs/by-name/wh/whsniff/package.nix           |  2 +-
 pkgs/by-name/wi/widelands/package.nix         |  2 +-
 pkgs/by-name/wi/wifi-password/package.nix     |  2 +-
 pkgs/by-name/wi/wifish/package.nix            |  2 +-
 pkgs/by-name/wi/wifite2/package.nix           |  2 +-
 pkgs/by-name/wi/wiggle/package.nix            |  2 +-
 pkgs/by-name/wi/wiiload/package.nix           |  2 +-
 pkgs/by-name/wi/wike/package.nix              |  2 +-
 pkgs/by-name/wi/wimboot/package.nix           |  2 +-
 pkgs/by-name/wi/win2xcur/package.nix          |  2 +-
 pkgs/by-name/wi/windmill/package.nix          |  2 +-
 pkgs/by-name/wi/windowchef/package.nix        |  2 +-
 pkgs/by-name/wi/windows10-icons/package.nix   |  2 +-
 pkgs/by-name/wi/wineasio/package.nix          |  2 +-
 pkgs/by-name/wi/wire/package.nix              |  2 +-
 pkgs/by-name/wi/wiredtiger/package.nix        |  2 +-
 .../wi/wireguard-vanity-keygen/package.nix    |  2 +-
 pkgs/by-name/wi/wireproxy/package.nix         |  2 +-
 pkgs/by-name/wi/wiringpi/package.nix          |  2 +-
 pkgs/by-name/wi/wiseunpacker/package.nix      |  2 +-
 pkgs/by-name/wi/wishbone-tool/package.nix     |  2 +-
 pkgs/by-name/wi/wishlist/package.nix          |  2 +-
 pkgs/by-name/wi/wit-bindgen/package.nix       |  2 +-
 pkgs/by-name/wi/witness/package.nix           |  2 +-
 pkgs/by-name/wl/wl-clip-persist/package.nix   |  2 +-
 pkgs/by-name/wl/wl-clipboard-rs/package.nix   |  2 +-
 pkgs/by-name/wl/wl-clipboard-x11/package.nix  |  2 +-
 pkgs/by-name/wl/wl-clipboard/package.nix      |  2 +-
 pkgs/by-name/wl/wl-color-picker/package.nix   |  2 +-
 pkgs/by-name/wl/wl-gammarelay-rs/package.nix  |  2 +-
 pkgs/by-name/wl/wl-mirror/package.nix         |  2 +-
 pkgs/by-name/wl/wldash/package.nix            |  2 +-
 pkgs/by-name/wl/wleave/package.nix            |  2 +-
 pkgs/by-name/wl/wljoywake/package.nix         |  2 +-
 pkgs/by-name/wl/wlogout/package.nix           |  2 +-
 pkgs/by-name/wl/wlr-which-key/package.nix     |  2 +-
 pkgs/by-name/wl/wlx-overlay-s/package.nix     |  2 +-
 pkgs/by-name/wm/wmic-bin/package.nix          |  2 +-
 pkgs/by-name/wm/wmutils-core/package.nix      |  2 +-
 pkgs/by-name/wm/wmutils-opt/package.nix       |  2 +-
 pkgs/by-name/wo/wob/package.nix               |  2 +-
 pkgs/by-name/wo/woeusb-ng/package.nix         |  2 +-
 pkgs/by-name/wo/woeusb/package.nix            |  2 +-
 pkgs/by-name/wo/woff2/package.nix             |  2 +-
 pkgs/by-name/wo/wolf-shaper/package.nix       |  2 +-
 pkgs/by-name/wo/wolfebin/package.nix          |  2 +-
 pkgs/by-name/wo/wordgrinder/package.nix       |  2 +-
 pkgs/by-name/wo/workshop-runner/package.nix   |  2 +-
 pkgs/by-name/wo/wormhole-william/package.nix  |  2 +-
 pkgs/by-name/wp/wpaperd/package.nix           |  2 +-
 pkgs/by-name/wp/wpgtk/package.nix             |  2 +-
 pkgs/by-name/wp/wprecon/package.nix           |  2 +-
 pkgs/by-name/wr/wrap/package.nix              |  2 +-
 pkgs/by-name/wr/write-good/package.nix        |  2 +-
 pkgs/by-name/wr/writefreely/package.nix       |  2 +-
 pkgs/by-name/wr/wrk/package.nix               |  2 +-
 pkgs/by-name/ws/wsdd/package.nix              |  2 +-
 pkgs/by-name/ws/wsl-open/package.nix          |  2 +-
 pkgs/by-name/ws/wsl-vpnkit/package.nix        |  2 +-
 pkgs/by-name/ws/wslu/package.nix              |  2 +-
 pkgs/by-name/ws/wsysmon/package.nix           |  2 +-
 pkgs/by-name/wt/wtfutil/package.nix           |  2 +-
 pkgs/by-name/wt/wthrr/package.nix             |  2 +-
 pkgs/by-name/wt/wttrbar/package.nix           |  2 +-
 pkgs/by-name/wt/wtwitch/package.nix           |  2 +-
 pkgs/by-name/wt/wtype/package.nix             |  2 +-
 pkgs/by-name/wu/wush/package.nix              |  2 +-
 pkgs/by-name/wu/wuzz/package.nix              |  2 +-
 pkgs/by-name/wx/wxGTK31/package.nix           |  2 +-
 pkgs/by-name/wx/wxGTK32/package.nix           |  2 +-
 pkgs/by-name/wx/wxhexeditor/package.nix       |  2 +-
 pkgs/by-name/wx/wxmacmolplt/package.nix       |  2 +-
 pkgs/by-name/wx/wxsqlite3/package.nix         |  2 +-
 pkgs/by-name/wx/wxsqliteplus/package.nix      |  2 +-
 .../x-/x-create-mouse-void/package.nix        |  2 +-
 pkgs/by-name/x1/x11docker/package.nix         |  2 +-
 pkgs/by-name/x1/x11vnc/package.nix            |  2 +-
 pkgs/by-name/x4/x4/package.nix                |  2 +-
 pkgs/by-name/x4/x42-avldrums/package.nix      |  2 +-
 pkgs/by-name/x4/x42-gmsynth/package.nix       |  2 +-
 pkgs/by-name/xa/xapp/package.nix              |  2 +-
 pkgs/by-name/xa/xarchiver/package.nix         |  2 +-
 pkgs/by-name/xa/xautoclick/package.nix        |  2 +-
 pkgs/by-name/xb/xbanish/package.nix           |  2 +-
 pkgs/by-name/xb/xbps/package.nix              |  2 +-
 pkgs/by-name/xc/xcaddy/package.nix            |  2 +-
 pkgs/by-name/xc/xcalib/package.nix            |  2 +-
 pkgs/by-name/xc/xcat/package.nix              |  2 +-
 pkgs/by-name/xc/xcb-imdkit/package.nix        |  2 +-
 pkgs/by-name/xc/xcfun/package.nix             |  2 +-
 pkgs/by-name/xc/xchm/package.nix              |  2 +-
 pkgs/by-name/xc/xclip/package.nix             |  2 +-
 pkgs/by-name/xc/xcodes/package.nix            |  2 +-
 pkgs/by-name/xc/xcolor/package.nix            |  2 +-
 pkgs/by-name/xc/xcp/package.nix               |  2 +-
 pkgs/by-name/xc/xcur2png/package.nix          |  2 +-
 pkgs/by-name/xd/xd/package.nix                |  2 +-
 .../xd/xdg-desktop-portal-gtk/package.nix     |  2 +-
 .../xd/xdg-desktop-portal-shana/package.nix   |  2 +-
 .../xd/xdg-desktop-portal-wlr/package.nix     |  2 +-
 .../xd/xdg-desktop-portal-xapp/package.nix    |  2 +-
 pkgs/by-name/xd/xdg-launch/package.nix        |  2 +-
 pkgs/by-name/xd/xdg-ninja/package.nix         |  2 +-
 pkgs/by-name/xd/xdg-utils-cxx/package.nix     |  2 +-
 pkgs/by-name/xd/xdgmenumaker/package.nix      |  2 +-
 pkgs/by-name/xd/xdo/package.nix               |  2 +-
 pkgs/by-name/xd/xdotool/package.nix           |  2 +-
 pkgs/by-name/xd/xdp-tools/package.nix         |  2 +-
 .../by-name/xe/xe-guest-utilities/package.nix |  2 +-
 pkgs/by-name/xe/xed-editor/package.nix        |  2 +-
 pkgs/by-name/xe/xed/package.nix               |  4 +-
 pkgs/by-name/xe/xenomapper/package.nix        |  2 +-
 pkgs/by-name/xe/xephem/package.nix            |  2 +-
 pkgs/by-name/xe/xeus-zmq/package.nix          |  2 +-
 pkgs/by-name/xf/xf86_input_cmt/package.nix    |  2 +-
 pkgs/by-name/xg/xgboost/package.nix           |  2 +-
 pkgs/by-name/xh/xh/package.nix                |  2 +-
 pkgs/by-name/xi/xiccd/package.nix             |  2 +-
 pkgs/by-name/xi/xilinx-bootgen/package.nix    |  2 +-
 pkgs/by-name/xi/xinput_calibrator/package.nix |  2 +-
 pkgs/by-name/xi/xiphos/package.nix            |  2 +-
 pkgs/by-name/xi/xits-math/package.nix         |  2 +-
 pkgs/by-name/xi/xiu/package.nix               |  2 +-
 pkgs/by-name/xj/xjadeo/package.nix            |  2 +-
 pkgs/by-name/xk/xkb-switch-i3/package.nix     |  2 +-
 pkgs/by-name/xk/xkb-switch/package.nix        |  2 +-
 pkgs/by-name/xk/xkblayout-state/package.nix   |  2 +-
 pkgs/by-name/xk/xkbmon/package.nix            |  2 +-
 pkgs/by-name/xl/xl2tpd/package.nix            |  2 +-
 pkgs/by-name/xl/xlayoutdisplay/package.nix    |  2 +-
 .../xl/xlibinput-calibrator/package.nix       |  2 +-
 pkgs/by-name/xm/xmenu/package.nix             |  2 +-
 pkgs/by-name/xm/xml-security-c/package.nix    |  2 +-
 pkgs/by-name/xm/xml-tooling-c/package.nix     |  2 +-
 pkgs/by-name/xm/xmldiff/package.nix           |  2 +-
 pkgs/by-name/xm/xmloscopy/package.nix         |  2 +-
 pkgs/by-name/xm/xmlroff/package.nix           |  2 +-
 pkgs/by-name/xm/xmltoman/package.nix          |  2 +-
 pkgs/by-name/xm/xmoto/package.nix             |  2 +-
 pkgs/by-name/xm/xmousepasteblock/package.nix  |  2 +-
 pkgs/by-name/xm/xmpp-bridge/package.nix       |  2 +-
 pkgs/by-name/xm/xmppc/package.nix             |  2 +-
 pkgs/by-name/xm/xmrig-mo/package.nix          |  2 +-
 pkgs/by-name/xm/xmrig-proxy/package.nix       |  2 +-
 pkgs/by-name/xm/xmrig/package.nix             |  2 +-
 pkgs/by-name/xn/xnotify/package.nix           |  2 +-
 pkgs/by-name/xo/xob/package.nix               |  2 +-
 pkgs/by-name/xo/xorex/package.nix             |  2 +-
 pkgs/by-name/xo/xosview/package.nix           |  2 +-
 pkgs/by-name/xp/xpano/package.nix             |  2 +-
 pkgs/by-name/xp/xpar/package.nix              |  2 +-
 pkgs/by-name/xp/xplr/package.nix              |  2 +-
 pkgs/by-name/xp/xplugd/package.nix            |  2 +-
 pkgs/by-name/xp/xprintidle/package.nix        |  2 +-
 pkgs/by-name/xp/xprompt/package.nix           |  2 +-
 pkgs/by-name/xq/xq-xml/package.nix            |  2 +-
 .../xr/xrandr-invert-colors/package.nix       |  2 +-
 pkgs/by-name/xr/xray/package.nix              |  2 +-
 pkgs/by-name/xr/xrdp/package.nix              |  4 +-
 pkgs/by-name/xr/xreader/package.nix           |  2 +-
 pkgs/by-name/xr/xrectsel/package.nix          |  2 +-
 pkgs/by-name/xs/xschem/package.nix            |  2 +-
 pkgs/by-name/xs/xsecurelock/package.nix       |  2 +-
 pkgs/by-name/xs/xsel/package.nix              |  2 +-
 pkgs/by-name/xs/xsettingsd/package.nix        |  2 +-
 pkgs/by-name/xs/xsimd/package.nix             |  2 +-
 pkgs/by-name/xs/xsos/package.nix              |  2 +-
 pkgs/by-name/xs/xssproxy/package.nix          |  2 +-
 pkgs/by-name/xs/xstow/package.nix             |  2 +-
 pkgs/by-name/xs/xsuspender/package.nix        |  2 +-
 pkgs/by-name/xt/xtensor/package.nix           |  2 +-
 pkgs/by-name/xt/xteve/package.nix             |  2 +-
 pkgs/by-name/xt/xtitle/package.nix            |  2 +-
 pkgs/by-name/xt/xtl/package.nix               |  2 +-
 pkgs/by-name/xt/xtuner/package.nix            |  2 +-
 pkgs/by-name/xu/xunit-viewer/package.nix      |  2 +-
 pkgs/by-name/xv/xv/package.nix                |  2 +-
 pkgs/by-name/xv/xva-img/package.nix           |  2 +-
 pkgs/by-name/xv/xviewer/package.nix           |  2 +-
 pkgs/by-name/xw/xwallpaper/package.nix        |  2 +-
 pkgs/by-name/xx/xxHash/package.nix            |  2 +-
 pkgs/by-name/ya/yad/package.nix               |  2 +-
 pkgs/by-name/ya/yadm/package.nix              |  2 +-
 pkgs/by-name/ya/yaegi/package.nix             |  2 +-
 pkgs/by-name/ya/yafc-ce/package.nix           |  2 +-
 pkgs/by-name/ya/yaft/package.nix              |  2 +-
 pkgs/by-name/ya/yai/package.nix               |  2 +-
 pkgs/by-name/ya/yajsv/package.nix             |  2 +-
 pkgs/by-name/ya/yallback/package.nix          |  2 +-
 .../ya/yambar-hyprland-wses/package.nix       |  2 +-
 pkgs/by-name/ya/yambar/package.nix            |  2 +-
 pkgs/by-name/ya/yaml-filter/package.nix       |  2 +-
 pkgs/by-name/ya/yaml2json/package.nix         |  2 +-
 pkgs/by-name/ya/yams/package.nix              |  2 +-
 pkgs/by-name/ya/yandex-music/package.nix      |  2 +-
 pkgs/by-name/ya/yanic/package.nix             |  2 +-
 pkgs/by-name/ya/yank/package.nix              |  2 +-
 pkgs/by-name/ya/yarGen/package.nix            |  2 +-
 .../ya/yarn-bash-completion/package.nix       |  2 +-
 pkgs/by-name/ya/yarp/package.nix              |  2 +-
 pkgs/by-name/ya/yarr/package.nix              |  2 +-
 pkgs/by-name/ya/yaru-remix-theme/package.nix  |  2 +-
 pkgs/by-name/ya/yaru-theme/package.nix        |  2 +-
 pkgs/by-name/ya/yas/package.nix               |  2 +-
 pkgs/by-name/ya/yascreen/package.nix          |  2 +-
 pkgs/by-name/ya/yash/package.nix              |  2 +-
 pkgs/by-name/yd/yder/package.nix              |  2 +-
 pkgs/by-name/yd/ydict/package.nix             |  2 +-
 pkgs/by-name/ye/yeahconsole/package.nix       |  2 +-
 pkgs/by-name/ye/yeetgif/package.nix           |  2 +-
 pkgs/by-name/yg/yggdrasil/package.nix         |  2 +-
 pkgs/by-name/yg/yggstack/package.nix          |  2 +-
 pkgs/by-name/yj/yj/package.nix                |  2 +-
 pkgs/by-name/yl/yle-dl/package.nix            |  2 +-
 pkgs/by-name/ym/ympd/package.nix              |  2 +-
 pkgs/by-name/ym/ymuse/package.nix             |  2 +-
 pkgs/by-name/yo/yo/package.nix                |  2 +-
 pkgs/by-name/yo/yoink/package.nix             |  2 +-
 pkgs/by-name/yo/yor/package.nix               |  2 +-
 pkgs/by-name/yo/yoshimi/package.nix           |  2 +-
 pkgs/by-name/yo/youki/package.nix             |  2 +-
 pkgs/by-name/yq/yq-go/package.nix             |  2 +-
 pkgs/by-name/yt/yt-dlg/package.nix            |  2 +-
 pkgs/by-name/yt/ytarchive/package.nix         |  2 +-
 pkgs/by-name/yt/ytcast/package.nix            |  2 +-
 pkgs/by-name/yt/ytcc/package.nix              |  2 +-
 pkgs/by-name/yt/ytfzf/package.nix             |  2 +-
 pkgs/by-name/yt/ytt/package.nix               |  2 +-
 pkgs/by-name/yt/ytui-music/package.nix        |  2 +-
 pkgs/by-name/yu/yubihsm-connector/package.nix |  2 +-
 pkgs/by-name/yu/yubihsm-shell/package.nix     |  2 +-
 pkgs/by-name/yu/yubikey-agent/package.nix     |  2 +-
 pkgs/by-name/yu/yubikey-manager/package.nix   |  2 +-
 .../yu/yubikey-touch-detector/package.nix     |  2 +-
 pkgs/by-name/yu/yubioath-flutter/package.nix  |  2 +-
 pkgs/by-name/yu/yunfaavatar/package.nix       |  2 +-
 pkgs/by-name/yy/yyjson/package.nix            |  2 +-
 pkgs/by-name/z-/z-lua/package.nix             |  2 +-
 pkgs/by-name/za/zam-plugins/package.nix       |  2 +-
 pkgs/by-name/za/zap-chip/package.nix          |  2 +-
 pkgs/by-name/za/zarchive/package.nix          |  2 +-
 pkgs/by-name/za/zarf/package.nix              |  2 +-
 pkgs/by-name/za/zasm/package.nix              |  2 +-
 pkgs/by-name/zc/zcfan/package.nix             |  2 +-
 pkgs/by-name/zc/zchunk/package.nix            |  2 +-
 pkgs/by-name/ze/zed/package.nix               |  2 +-
 pkgs/by-name/ze/zenith/package.nix            |  2 +-
 pkgs/by-name/ze/zenoh/package.nix             |  2 +-
 pkgs/by-name/ze/zerobin/package.nix           |  2 +-
 pkgs/by-name/ze/zeroc-ice/package.nix         |  4 +-
 .../ze/zeronet-conservancy/package.nix        |  2 +-
 pkgs/by-name/ze/zeronet/package.nix           |  2 +-
 pkgs/by-name/ze/zeronsd/package.nix           |  2 +-
 pkgs/by-name/ze/zet/package.nix               |  2 +-
 pkgs/by-name/zf/zfind/package.nix             |  2 +-
 pkgs/by-name/zf/zfp/package.nix               |  2 +-
 .../zf/zfs-prune-snapshots/package.nix        |  2 +-
 pkgs/by-name/zf/zfsnap/package.nix            |  2 +-
 pkgs/by-name/zf/zfstools/package.nix          |  2 +-
 pkgs/by-name/zf/zfxtop/package.nix            |  2 +-
 pkgs/by-name/zi/zigbee2mqtt_1/package.nix     |  2 +-
 pkgs/by-name/zi/zimfw/package.nix             |  2 +-
 pkgs/by-name/zi/zitadel-tools/package.nix     |  2 +-
 pkgs/by-name/zi/zitadel/package.nix           |  2 +-
 pkgs/by-name/zi/zix/package.nix               |  2 +-
 pkgs/by-name/zk/zk/package.nix                |  2 +-
 pkgs/by-name/zk/zktree/package.nix            |  2 +-
 pkgs/by-name/zl/zlib-ng/package.nix           |  2 +-
 pkgs/by-name/zl/zls/package.nix               |  2 +-
 pkgs/by-name/zm/zmap/package.nix              |  2 +-
 pkgs/by-name/zm/zmqpp/package.nix             |  2 +-
 pkgs/by-name/zm/zmusic/package.nix            |  2 +-
 pkgs/by-name/zo/zola/package.nix              |  2 +-
 pkgs/by-name/zo/zon2nix/package.nix           |  2 +-
 pkgs/by-name/zo/zoneminder/package.nix        |  2 +-
 pkgs/by-name/zp/zpaqfranz/package.nix         |  2 +-
 pkgs/by-name/zp/zplug/package.nix             |  2 +-
 .../zpool-auto-expand-partitions/package.nix  |  2 +-
 pkgs/by-name/zp/zps/package.nix               |  2 +-
 pkgs/by-name/zr/zram-generator/package.nix    |  2 +-
 pkgs/by-name/zr/zrepl/package.nix             |  2 +-
 pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix   |  2 +-
 pkgs/by-name/zs/zs/package.nix                |  2 +-
 pkgs/by-name/zs/zscroll/package.nix           |  2 +-
 pkgs/by-name/zs/zsh-autocomplete/package.nix  |  2 +-
 .../zs/zsh-autosuggestions/package.nix        |  2 +-
 pkgs/by-name/zs/zsh-completions/package.nix   |  2 +-
 pkgs/by-name/zs/zsh-f-sy-h/package.nix        |  2 +-
 .../zsh-fast-syntax-highlighting/package.nix  |  2 +-
 pkgs/by-name/zs/zsh-fzf-tab/package.nix       |  2 +-
 .../zsh-history-substring-search/package.nix  |  2 +-
 .../zs/zsh-navigation-tools/package.nix       |  2 +-
 pkgs/by-name/zs/zsh-nix-shell/package.nix     |  2 +-
 .../zs/zsh-syntax-highlighting/package.nix    |  2 +-
 .../zs/zsh-system-clipboard/package.nix       |  2 +-
 pkgs/by-name/zs/zsh-vi-mode/package.nix       |  2 +-
 pkgs/by-name/zs/zsh-wd/package.nix            |  2 +-
 pkgs/by-name/zs/zsync2/package.nix            |  2 +-
 pkgs/by-name/zu/zug/package.nix               |  2 +-
 pkgs/by-name/zu/zuki-themes/package.nix       |  2 +-
 pkgs/by-name/zu/zuo/package.nix               |  2 +-
 pkgs/by-name/zw/zwave-js-server/package.nix   |  2 +-
 pkgs/by-name/zx/zx/package.nix                |  4 +-
 pkgs/by-name/zx/zxcvbn-c/package.nix          |  2 +-
 pkgs/by-name/zx/zxfer/package.nix             |  2 +-
 pkgs/by-name/zy/zydis/package.nix             |  2 +-
 pkgs/by-name/zy/zydis/zycore.nix              |  2 +-
 pkgs/by-name/zz/zziplib/package.nix           |  2 +-
 pkgs/data/fonts/emojione/default.nix          |  2 +-
 pkgs/data/fonts/iosevka/comfy.nix             |  2 +-
 pkgs/data/fonts/liberation-fonts/default.nix  |  2 +-
 pkgs/data/fonts/openmoji/default.nix          |  2 +-
 .../icons/beauty-line-icon-theme/default.nix  |  2 +-
 .../data/icons/bibata-cursors/translucent.nix |  2 +-
 .../icons/flat-remix-icon-theme/default.nix   |  2 +-
 .../icons/gruvbox-dark-icons-gtk/default.nix  |  2 +-
 pkgs/data/icons/kora-icon-theme/default.nix   |  2 +-
 .../icons/la-capitaine-icon-theme/default.nix |  2 +-
 pkgs/data/icons/numix-icon-theme/default.nix  |  2 +-
 .../data/icons/papirus-icon-theme/default.nix |  2 +-
 .../icons/tela-circle-icon-theme/default.nix  |  2 +-
 pkgs/data/icons/zafiro-icons/default.nix      |  2 +-
 pkgs/data/themes/adwaita-qt/default.nix       |  2 +-
 .../themes/gtk-theme-framework/default.nix    |  2 +-
 pkgs/data/themes/kde2/default.nix             |  2 +-
 .../kde-rounded-corners/default.nix           |  2 +-
 pkgs/data/themes/lightly-qt/default.nix       |  2 +-
 pkgs/data/themes/qtcurve/default.nix          |  2 +-
 pkgs/data/themes/sddm-sugar-dark/default.nix  |  2 +-
 pkgs/data/themes/whitesur-kde/default.nix     |  2 +-
 .../deepin/apps/deepin-calculator/default.nix |  2 +-
 .../deepin/apps/deepin-compressor/default.nix |  2 +-
 .../deepin/apps/deepin-draw/default.nix       |  2 +-
 .../deepin/apps/deepin-editor/default.nix     |  2 +-
 .../deepin/apps/deepin-music/default.nix      |  2 +-
 .../deepin/apps/deepin-picker/default.nix     |  2 +-
 .../deepin/apps/deepin-reader/default.nix     |  2 +-
 .../apps/deepin-screensaver/default.nix       |  2 +-
 .../apps/deepin-shortcut-viewer/default.nix   |  2 +-
 .../apps/deepin-system-monitor/default.nix    |  2 +-
 .../deepin/apps/deepin-terminal/default.nix   |  2 +-
 .../artwork/dde-account-faces/default.nix     |  2 +-
 .../artwork/deepin-desktop-theme/default.nix  |  2 +-
 .../artwork/deepin-gtk-theme/default.nix      |  2 +-
 .../artwork/deepin-icon-theme/default.nix     |  2 +-
 .../artwork/deepin-sound-theme/default.nix    |  2 +-
 .../artwork/deepin-wallpapers/default.nix     |  2 +-
 .../deepin/core/dde-api-proxy/default.nix     |  2 +-
 .../deepin/core/dde-app-services/default.nix  |  2 +-
 .../deepin/core/dde-appearance/default.nix    |  2 +-
 .../core/dde-application-manager/default.nix  |  2 +-
 .../deepin/core/dde-calendar/default.nix      |  2 +-
 .../deepin/core/dde-clipboard/default.nix     |  2 +-
 .../core/dde-control-center/default.nix       |  2 +-
 .../deepin/core/dde-file-manager/default.nix  |  2 +-
 .../deepin/core/dde-grand-search/default.nix  |  2 +-
 .../deepin/core/dde-launchpad/default.nix     |  2 +-
 .../deepin/core/dde-network-core/default.nix  |  2 +-
 .../deepin/core/dde-polkit-agent/default.nix  |  2 +-
 .../deepin/core/dde-session-shell/default.nix |  2 +-
 .../deepin/core/dde-session-ui/default.nix    |  2 +-
 .../deepin/core/dde-session/default.nix       |  2 +-
 .../deepin/core/dde-shell/default.nix         |  2 +-
 .../deepin/core/dde-tray-loader/default.nix   |  2 +-
 .../deepin/core/dde-widgets/default.nix       |  2 +-
 .../deepin/core/deepin-kwin/default.nix       |  2 +-
 .../core/deepin-service-manager/default.nix   |  2 +-
 .../core/dpa-ext-gnomekeyring/default.nix     |  2 +-
 .../deepin/go-package/dde-api/default.nix     |  2 +-
 .../deepin/go-package/dde-daemon/default.nix  |  2 +-
 .../deepin-desktop-schemas/default.nix        |  2 +-
 .../go-package/deepin-pw-check/default.nix    |  2 +-
 .../deepin/go-package/startdde/default.nix    |  2 +-
 .../library/dde-qt-dbus-factory/default.nix   |  2 +-
 .../deepin/library/deepin-pdfium/default.nix  |  2 +-
 .../deepin-wayland-protocols/default.nix      |  2 +-
 .../deepin/library/disomaster/default.nix     |  2 +-
 .../deepin/library/docparser/default.nix      |  2 +-
 .../deepin/library/dtk6core/default.nix       |  2 +-
 .../library/dtk6declarative/default.nix       |  2 +-
 .../deepin/library/dtk6gui/default.nix        |  2 +-
 .../deepin/library/dtk6log/default.nix        |  2 +-
 .../library/dtk6systemsettings/default.nix    |  2 +-
 .../deepin/library/dtk6widget/default.nix     |  2 +-
 .../deepin/library/dtkcommon/default.nix      |  2 +-
 .../deepin/library/dtkcore/default.nix        |  2 +-
 .../deepin/library/dtkdeclarative/default.nix |  2 +-
 .../deepin/library/dtkgui/default.nix         |  2 +-
 .../deepin/library/dtklog/default.nix         |  2 +-
 .../deepin/library/dtkwidget/default.nix      |  2 +-
 .../deepin/library/dwayland/default.nix       |  2 +-
 .../deepin/library/gio-qt/default.nix         |  2 +-
 .../deepin/library/qt5integration/default.nix |  2 +-
 .../library/qt5platform-plugins/default.nix   |  2 +-
 .../deepin/library/qt6integration/default.nix |  2 +-
 .../deepin/library/qt6mpris/default.nix       |  2 +-
 .../library/qt6platform-plugins/default.nix   |  2 +-
 .../library/treeland-protocols/default.nix    |  2 +-
 .../deepin/library/udisks2-qt5/default.nix    |  2 +-
 .../deepin/library/util-dfm/default.nix       |  2 +-
 .../misc/deepin-desktop-base/default.nix      |  2 +-
 .../tools/dde-device-formatter/default.nix    |  2 +-
 .../deepin/tools/deepin-anything/default.nix  |  2 +-
 .../tools/deepin-gettext-tools/default.nix    |  2 +-
 pkgs/desktops/expidus/calculator/default.nix  |  2 +-
 .../desktops/expidus/file-manager/default.nix |  2 +-
 .../extensions/EasyScreenCast/default.nix     |  2 +-
 .../gnome/extensions/arcmenu/default.nix      |  2 +-
 .../gnome/extensions/gsconnect/default.nix    |  2 +-
 .../gnome/extensions/icon-hider/default.nix   |  2 +-
 .../pidgin-im-integration/default.nix         |  2 +-
 .../extensions/systemd-manager/default.nix    |  2 +-
 .../extensions/taskwhisperer/default.nix      |  2 +-
 .../extensions/topicons-plus/default.nix      |  2 +-
 .../gnome/extensions/unite/default.nix        |  2 +-
 .../lomiri-system-settings/default.nix        |  2 +-
 .../lomiri/applications/lomiri/default.nix    |  2 +-
 .../lomiri/data/lomiri-session/default.nix    |  2 +-
 .../lomiri/data/lomiri-sounds/default.nix     |  2 +-
 .../lomiri/data/lomiri-wallpapers/default.nix |  2 +-
 .../lomiri/data/suru-icon-theme/default.nix   |  2 +-
 .../lomiri/development/deviceinfo/default.nix |  2 +-
 .../lomiri/development/geonames/default.nix   |  2 +-
 .../development/gmenuharness/default.nix      |  2 +-
 .../development/libusermetrics/default.nix    |  2 +-
 .../development/trust-store/default.nix       |  2 +-
 .../lomiri/development/u1db-qt/default.nix    |  2 +-
 .../lomiri/qml/lomiri-action-api/default.nix  |  2 +-
 .../lomiri-settings-components/default.nix    |  2 +-
 .../lomiri/qml/lomiri-ui-extras/default.nix   |  2 +-
 .../lomiri/qml/lomiri-ui-toolkit/default.nix  |  2 +-
 .../lomiri/services/biometryd/default.nix     |  2 +-
 .../lomiri/services/hfd-service/default.nix   |  2 +-
 .../services/lomiri-content-hub/default.nix   |  2 +-
 .../lomiri-download-manager/default.nix       |  2 +-
 .../lomiri-history-service/default.nix        |  2 +-
 .../lomiri-url-dispatcher/default.nix         |  2 +-
 .../lomiri/services/mediascanner2/default.nix |  2 +-
 .../lumina/lumina-calculator/default.nix      |  2 +-
 pkgs/desktops/lumina/lumina-pdf/default.nix   |  2 +-
 pkgs/desktops/lumina/lumina/default.nix       |  2 +-
 pkgs/desktops/lxde/core/lxsession/default.nix |  2 +-
 pkgs/desktops/lxde/core/lxtask/default.nix    |  2 +-
 pkgs/desktops/lxqt/compton-conf/default.nix   |  2 +-
 .../lxqt/libdbusmenu-lxqt/default.nix         |  2 +-
 pkgs/desktops/lxqt/libfm-qt/default.nix       |  2 +-
 pkgs/desktops/lxqt/liblxqt/default.nix        |  2 +-
 pkgs/desktops/lxqt/libqtxdg/default.nix       |  2 +-
 pkgs/desktops/lxqt/libsysstat/default.nix     |  2 +-
 pkgs/desktops/lxqt/lximage-qt/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-about/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-admin/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-archiver/default.nix  |  2 +-
 .../lxqt/lxqt-build-tools/default.nix         |  2 +-
 pkgs/desktops/lxqt/lxqt-config/default.nix    |  2 +-
 .../desktops/lxqt/lxqt-globalkeys/default.nix |  2 +-
 pkgs/desktops/lxqt/lxqt-menu-data/default.nix |  2 +-
 .../lxqt/lxqt-notificationd/default.nix       |  2 +-
 .../lxqt/lxqt-openssh-askpass/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-panel/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-policykit/default.nix |  2 +-
 .../lxqt/lxqt-powermanagement/default.nix     |  2 +-
 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix  |  2 +-
 pkgs/desktops/lxqt/lxqt-runner/default.nix    |  2 +-
 pkgs/desktops/lxqt/lxqt-session/default.nix   |  2 +-
 pkgs/desktops/lxqt/lxqt-sudo/default.nix      |  2 +-
 pkgs/desktops/lxqt/lxqt-themes/default.nix    |  2 +-
 .../lxqt/lxqt-wayland-session/default.nix     |  2 +-
 pkgs/desktops/lxqt/obconf-qt/default.nix      |  2 +-
 pkgs/desktops/lxqt/pavucontrol-qt/default.nix |  2 +-
 pkgs/desktops/lxqt/pcmanfm-qt/default.nix     |  2 +-
 pkgs/desktops/lxqt/qlipper/default.nix        |  2 +-
 pkgs/desktops/lxqt/qps/default.nix            |  2 +-
 pkgs/desktops/lxqt/qterminal/default.nix      |  2 +-
 pkgs/desktops/lxqt/qtermwidget/default.nix    |  2 +-
 pkgs/desktops/lxqt/qtxdg-tools/default.nix    |  2 +-
 pkgs/desktops/lxqt/screengrab/default.nix     |  2 +-
 .../lxqt/xdg-desktop-portal-lxqt/default.nix  |  2 +-
 pkgs/desktops/mate/mate-tweak/default.nix     |  2 +-
 .../mate/mate-wayland-session/default.nix     |  2 +-
 .../pantheon/apps/appcenter/default.nix       |  2 +-
 .../apps/elementary-calculator/default.nix    |  2 +-
 .../apps/elementary-calendar/default.nix      |  2 +-
 .../apps/elementary-camera/default.nix        |  2 +-
 .../pantheon/apps/elementary-code/default.nix |  2 +-
 .../pantheon/apps/elementary-dock/default.nix |  2 +-
 .../apps/elementary-feedback/default.nix      |  2 +-
 .../apps/elementary-files/default.nix         |  2 +-
 .../apps/elementary-iconbrowser/default.nix   |  2 +-
 .../apps/elementary-music/default.nix         |  2 +-
 .../apps/elementary-photos/default.nix        |  2 +-
 .../apps/elementary-screenshot/default.nix    |  2 +-
 .../apps/elementary-tasks/default.nix         |  2 +-
 .../apps/elementary-terminal/default.nix      |  2 +-
 .../apps/elementary-videos/default.nix        |  2 +-
 .../pantheon/apps/sideload/default.nix        |  2 +-
 .../apps/switchboard-plugs/about/default.nix  |  2 +-
 .../applications/default.nix                  |  2 +-
 .../switchboard-plugs/bluetooth/default.nix   |  2 +-
 .../switchboard-plugs/datetime/default.nix    |  2 +-
 .../switchboard-plugs/display/default.nix     |  2 +-
 .../switchboard-plugs/keyboard/default.nix    |  2 +-
 .../mouse-touchpad/default.nix                |  2 +-
 .../switchboard-plugs/network/default.nix     |  2 +-
 .../notifications/default.nix                 |  2 +-
 .../onlineaccounts/default.nix                |  2 +-
 .../pantheon-shell/default.nix                |  2 +-
 .../apps/switchboard-plugs/power/default.nix  |  2 +-
 .../switchboard-plugs/printers/default.nix    |  2 +-
 .../security-privacy/default.nix              |  2 +-
 .../switchboard-plugs/sharing/default.nix     |  2 +-
 .../apps/switchboard-plugs/sound/default.nix  |  2 +-
 .../apps/switchboard-plugs/wacom/default.nix  |  2 +-
 .../pantheon/apps/switchboard/default.nix     |  2 +-
 .../artwork/elementary-gtk-theme/default.nix  |  2 +-
 .../artwork/elementary-icon-theme/default.nix |  2 +-
 .../elementary-redacted-script/default.nix    |  2 +-
 .../elementary-sound-theme/default.nix        |  2 +-
 .../artwork/elementary-wallpapers/default.nix |  2 +-
 .../elementary-default-settings/default.nix   |  2 +-
 .../desktop/elementary-greeter/default.nix    |  2 +-
 .../desktop/elementary-onboarding/default.nix |  2 +-
 .../desktop/elementary-print-shim/default.nix |  2 +-
 .../elementary-session-settings/default.nix   |  2 +-
 .../elementary-shortcut-overlay/default.nix   |  2 +-
 .../pantheon/desktop/gala/default.nix         |  2 +-
 .../wingpanel-indicators/a11y/default.nix     |  2 +-
 .../applications-menu/default.nix             |  2 +-
 .../bluetooth/default.nix                     |  2 +-
 .../wingpanel-indicators/datetime/default.nix |  2 +-
 .../wingpanel-indicators/keyboard/default.nix |  2 +-
 .../wingpanel-indicators/network/default.nix  |  2 +-
 .../nightlight/default.nix                    |  2 +-
 .../notifications/default.nix                 |  2 +-
 .../wingpanel-indicators/power/default.nix    |  2 +-
 .../quick-settings/default.nix                |  2 +-
 .../wingpanel-indicators/sound/default.nix    |  2 +-
 .../pantheon/desktop/wingpanel/default.nix    |  2 +-
 .../pantheon/libraries/granite/7/default.nix  |  2 +-
 .../pantheon/libraries/granite/default.nix    |  2 +-
 .../libraries/pantheon-wayland/default.nix    |  2 +-
 .../pantheon/services/contractor/default.nix  |  2 +-
 .../elementary-bluetooth-daemon/default.nix   |  2 +-
 .../elementary-capnet-assist/default.nix      |  2 +-
 .../elementary-notifications/default.nix      |  2 +-
 .../elementary-settings-daemon/default.nix    |  2 +-
 .../pantheon-agent-geoclue2/default.nix       |  2 +-
 .../pantheon-agent-polkit/default.nix         |  2 +-
 .../xdg-desktop-portal-pantheon/default.nix   |  2 +-
 .../3rdparty/addons/bismuth/default.nix       |  2 +-
 .../3rdparty/addons/caffeine-plus.nix         |  2 +-
 .../3rdparty/addons/krunner-symbols.nix       |  2 +-
 .../kwin/scripts/dynamic-workspaces.nix       |  2 +-
 .../3rdparty/kwin/scripts/krohnkite.nix       |  2 +-
 .../3rdparty/kwin/scripts/parachute.nix       |  2 +-
 .../plasma-5/3rdparty/kwin/scripts/tiling.nix |  2 +-
 .../plasma-5/3rdparty/lightly/default.nix     |  2 +-
 .../xfce4-dockbarx-plugin/default.nix         |  2 +-
 .../xfce4-i3-workspaces-plugin/default.nix    |  2 +-
 .../xfce/thunar-plugins/dropbox/default.nix   |  2 +-
 .../ada-modules/gnatcoll/bindings.nix         |  2 +-
 .../development/ada-modules/gnatcoll/core.nix |  2 +-
 pkgs/development/ada-modules/gnatcoll/db.nix  |  2 +-
 .../ada-modules/gnatprove/default.nix         |  2 +-
 .../development/ada-modules/gprbuild/boot.nix |  4 +-
 .../ada-modules/xmlada/default.nix            |  2 +-
 .../beam-modules/elixir-ls/default.nix        |  2 +-
 .../beam-modules/elvis-erlang/default.nix     |  2 +-
 .../beam-modules/erlang-ls/default.nix        |  2 +-
 .../beam-modules/erlfmt/default.nix           |  2 +-
 .../beam-modules/ex_doc/default.nix           |  2 +-
 pkgs/development/beam-modules/hex/default.nix |  2 +-
 .../beam-modules/rebar3-nix/default.nix       |  2 +-
 pkgs/development/compilers/alan/default.nix   |  2 +-
 pkgs/development/compilers/armips/default.nix |  2 +-
 .../compilers/chicken/4/egg2nix.nix           |  2 +-
 pkgs/development/compilers/codon/default.nix  |  2 +-
 pkgs/development/compilers/corretto/11.nix    |  2 +-
 pkgs/development/compilers/corretto/17.nix    |  2 +-
 pkgs/development/compilers/corretto/21.nix    |  2 +-
 .../development/compilers/crystal/default.nix |  2 +-
 .../elm/packages/elm-review/default.nix       |  2 +-
 .../elm/packages/elm-test/default.nix         |  2 +-
 .../compilers/elm/packages/node/default.nix   |  2 +-
 .../elm/packages/node/elm-pages/default.nix   |  2 +-
 .../compilers/emscripten/default.nix          |  2 +-
 .../development/compilers/flutter/default.nix |  2 +-
 pkgs/development/compilers/fstar/default.nix  |  2 +-
 pkgs/development/compilers/haxe/default.nix   |  2 +-
 pkgs/development/compilers/idris2/idris2.nix  |  2 +-
 pkgs/development/compilers/koka/default.nix   |  2 +-
 pkgs/development/compilers/mkcl/default.nix   |  2 +-
 pkgs/development/compilers/osl/default.nix    |  2 +-
 pkgs/development/compilers/polyml/5.7.nix     |  2 +-
 pkgs/development/compilers/polyml/default.nix |  2 +-
 pkgs/development/compilers/ponyc/default.nix  |  2 +-
 .../compilers/ponyc/pony-corral.nix           |  2 +-
 .../compilers/rust/cargo-auditable.nix        |  2 +-
 .../development/compilers/shaderc/default.nix |  2 +-
 .../compilers/x11basic/default.nix            |  2 +-
 .../compilers/yosys/plugins/symbiflow.nix     |  2 +-
 pkgs/development/compilers/zig/generic.nix    |  2 +-
 .../embedded/arduino/arduino-core/default.nix |  2 +-
 .../embedded/fpga/apio/default.nix            |  2 +-
 .../embedded/fpga/ecpdap/default.nix          |  2 +-
 .../embedded/fpga/fujprog/default.nix         |  2 +-
 pkgs/development/embedded/tytools/default.nix |  2 +-
 .../emilua-plugins/bech32/default.nix         |  2 +-
 .../emilua-plugins/botan/default.nix          |  2 +-
 .../emilua-plugins/qt5/default.nix            |  2 +-
 .../emilua-plugins/qt6/default.nix            |  2 +-
 .../emilua-plugins/secp256k1/default.nix      |  2 +-
 .../emilua-plugins/tdlib/default.nix          |  2 +-
 .../emilua-plugins/this-thread/default.nix    |  2 +-
 .../haskell-modules/configuration-common.nix  |  2 +-
 pkgs/development/idris-modules/sdl2.nix       |  2 +-
 .../development/interpreters/acl2/default.nix |  2 +-
 pkgs/development/interpreters/clojure/obb.nix |  2 +-
 .../interpreters/evcxr/default.nix            |  2 +-
 .../interpreters/gnudatalanguage/default.nix  |  2 +-
 pkgs/development/interpreters/janet/jpm.nix   |  2 +-
 pkgs/development/interpreters/love/0.10.nix   |  2 +-
 pkgs/development/interpreters/love/11.nix     |  2 +-
 .../interpreters/luajit/openresty.nix         |  2 +-
 .../python/cpython/2.7/default.nix            |  2 +-
 .../interpreters/rakudo/default.nix           |  2 +-
 .../interpreters/rakudo/moarvm.nix            |  2 +-
 pkgs/development/interpreters/rakudo/nqp.nix  |  2 +-
 .../interpreters/wasmtime/default.nix         |  2 +-
 .../libraries/abseil-cpp/202103.nix           |  2 +-
 .../agda/agda-categories/default.nix          |  2 +-
 .../libraries/agda/agdarsec/default.nix       |  2 +-
 .../libraries/agda/cubical/default.nix        |  2 +-
 .../functional-linear-algebra/default.nix     |  2 +-
 .../libraries/agda/generic/default.nix        |  2 +-
 .../libraries/agda/generics/default.nix       |  2 +-
 .../libraries/agda/iowa-stdlib/default.nix    |  2 +-
 .../agda/standard-library/default.nix         |  2 +-
 .../development/libraries/alembic/default.nix |  2 +-
 pkgs/development/libraries/allegro/5.nix      |  2 +-
 .../applet-window-buttons/default.nix         |  2 +-
 .../libraries/audio/rtaudio/default.nix       |  2 +-
 .../libraries/audio/suil/default.nix          |  2 +-
 .../libraries/aws-c-io/default.nix            |  2 +-
 .../libraries/aws-sdk-cpp/default.nix         |  2 +-
 pkgs/development/libraries/bullet/default.nix |  2 +-
 pkgs/development/libraries/capstone/4.nix     |  2 +-
 .../libraries/capstone/default.nix            |  2 +-
 pkgs/development/libraries/catch2/3.nix       |  2 +-
 pkgs/development/libraries/catch2/default.nix |  2 +-
 pkgs/development/libraries/cctag/default.nix  |  2 +-
 pkgs/development/libraries/cctz/default.nix   |  2 +-
 .../libraries/ctranslate2/default.nix         |  2 +-
 .../development/libraries/cxxtest/default.nix |  2 +-
 .../dbus-sharp-glib/dbus-sharp-glib-1.0.nix   |  2 +-
 .../libraries/dbus-sharp-glib/default.nix     |  2 +-
 .../libraries/dbus-sharp/dbus-sharp-1.0.nix   |  2 +-
 .../libraries/dbus-sharp/default.nix          |  2 +-
 .../libraries/discord-rpc/default.nix         |  2 +-
 pkgs/development/libraries/draco/default.nix  |  2 +-
 pkgs/development/libraries/draco/tinygltf.nix |  2 +-
 pkgs/development/libraries/embree/default.nix |  2 +-
 pkgs/development/libraries/flatbuffers/23.nix |  2 +-
 .../libraries/flatbuffers/default.nix         |  2 +-
 pkgs/development/libraries/fmt/default.nix    |  2 +-
 pkgs/development/libraries/fplll/default.nix  |  2 +-
 .../libraries/freenect/default.nix            |  2 +-
 .../gamenetworkingsockets/default.nix         |  2 +-
 pkgs/development/libraries/gensio/default.nix |  2 +-
 pkgs/development/libraries/geoip/default.nix  |  2 +-
 .../libraries/grantlee/5/default.nix          |  2 +-
 .../libraries/grantlee/default.nix            |  2 +-
 .../libraries/gstreamer/rs/default.nix        |  2 +-
 pkgs/development/libraries/gtk-sharp/2.0.nix  |  2 +-
 .../libraries/hunspell/default.nix            |  2 +-
 .../libraries/hunspell/dictionaries.nix       |  6 +-
 .../development/libraries/iksemel/default.nix |  2 +-
 .../libraries/kcolorpicker/default.nix        |  2 +-
 .../libraries/kddockwidgets/default.nix       |  2 +-
 .../libraries/keybinder/default.nix           |  2 +-
 .../libraries/kimageannotator/default.nix     |  2 +-
 .../development/libraries/kompute/default.nix |  2 +-
 .../development/libraries/l-smash/default.nix |  2 +-
 .../libraries/libadwaita/default.nix          |  2 +-
 pkgs/development/libraries/libao/default.nix  |  2 +-
 .../libraries/libarchive-qt/default.nix       |  2 +-
 .../development/libraries/libbtbb/default.nix |  2 +-
 .../libraries/libcommuni/default.nix          |  2 +-
 .../libraries/libepoxy/default.nix            |  2 +-
 pkgs/development/libraries/libiio/default.nix |  2 +-
 pkgs/development/libraries/libint/default.nix |  2 +-
 .../libraries/liblqr-1/default.nix            |  2 +-
 .../libraries/libpulsar/default.nix           |  2 +-
 .../libraries/libqofono/default.nix           |  2 +-
 .../libraries/libqtdbusmock/default.nix       |  2 +-
 .../libraries/libqtdbustest/default.nix       |  2 +-
 .../libraries/libquotient/default.nix         |  2 +-
 pkgs/development/libraries/libre/default.nix  |  2 +-
 .../libraries/librealsense/default.nix        |  2 +-
 .../libraries/libsndfile/default.nix          |  2 +-
 .../libraries/libsoundio/default.nix          |  2 +-
 .../libraries/libuiohook/default.nix          |  2 +-
 .../libraries/libusb-compat/0.1.nix           |  2 +-
 .../development/libraries/libusb1/default.nix |  2 +-
 pkgs/development/libraries/libva/1.nix        |  2 +-
 pkgs/development/libraries/libva/default.nix  |  2 +-
 pkgs/development/libraries/libva/utils.nix    |  2 +-
 .../libraries/liquid-dsp/default.nix          |  2 +-
 .../libraries/luksmeta/default.nix            |  2 +-
 .../libraries/mailcore2/default.nix           |  2 +-
 pkgs/development/libraries/mapnik/default.nix |  2 +-
 pkgs/development/libraries/mlt/default.nix    |  2 +-
 .../libraries/mypaint-brushes/1.0.nix         |  2 +-
 .../libraries/mypaint-brushes/default.nix     |  2 +-
 .../libraries/netcdf-fortran/default.nix      |  2 +-
 .../development/libraries/nghttp3/default.nix |  2 +-
 pkgs/development/libraries/ngtcp2/default.nix |  2 +-
 pkgs/development/libraries/ngtcp2/gnutls.nix  |  2 +-
 pkgs/development/libraries/nlopt/default.nix  |  2 +-
 .../development/libraries/nuspell/default.nix |  2 +-
 .../libraries/nvidia-vaapi-driver/default.nix |  2 +-
 pkgs/development/libraries/ogre/default.nix   |  2 +-
 pkgs/development/libraries/ois/default.nix    |  2 +-
 .../libraries/openal-soft/default.nix         |  2 +-
 .../development/libraries/opencolorio/1.x.nix |  2 +-
 .../libraries/opencolorio/default.nix         |  2 +-
 pkgs/development/libraries/openexr/3.nix      |  2 +-
 .../development/libraries/openexr/default.nix |  2 +-
 .../libraries/openimageio/default.nix         |  2 +-
 pkgs/development/libraries/openvdb/11.nix     |  2 +-
 .../development/libraries/openvdb/default.nix |  2 +-
 .../libraries/pangolin/default.nix            |  2 +-
 .../libraries/pc-ble-driver/default.nix       |  2 +-
 .../libraries/pdfhummus/default.nix           |  2 +-
 .../libraries/phonetisaurus/default.nix       |  2 +-
 .../libraries/pipewire/default.nix            |  2 +-
 pkgs/development/libraries/podofo/0.10.x.nix  |  2 +-
 .../libraries/portmidi/default.nix            |  2 +-
 pkgs/development/libraries/proj/7.nix         |  2 +-
 pkgs/development/libraries/proj/default.nix   |  2 +-
 .../libraries/prometheus-client-c/default.nix |  2 +-
 .../libraries/pyotherside/default.nix         |  2 +-
 pkgs/development/libraries/qcoro/default.nix  |  2 +-
 .../libraries/qgnomeplatform/default.nix      |  2 +-
 pkgs/development/libraries/qjson/default.nix  |  2 +-
 .../libraries/qmenumodel/default.nix          |  2 +-
 .../libraries/qmlbox2d/default.nix            |  2 +-
 pkgs/development/libraries/qoauth/default.nix |  2 +-
 pkgs/development/libraries/qt-5/5.15/srcs.nix |  4 +-
 .../libraries/qtdbusextended/default.nix      |  2 +-
 .../libraries/qtkeychain/default.nix          |  2 +-
 .../development/libraries/qtmpris/default.nix |  2 +-
 .../development/libraries/qtspell/default.nix |  2 +-
 pkgs/development/libraries/quazip/default.nix |  2 +-
 .../libraries/qwlroots/default.nix            |  2 +-
 pkgs/development/libraries/qxlsx/default.nix  |  2 +-
 pkgs/development/libraries/qxmpp/default.nix  |  2 +-
 .../development/libraries/randomx/default.nix |  2 +-
 .../libraries/rnnoise-plugin/default.nix      |  2 +-
 .../chemistry/avogadrolibs/default.nix        |  2 +-
 .../science/chemistry/molequeue/default.nix   |  2 +-
 .../science/chemistry/tblite/default.nix      |  2 +-
 .../libraries/science/math/clblas/default.nix |  2 +-
 .../science/math/openblas/default.nix         |  2 +-
 .../science/math/suitesparse/default.nix      |  2 +-
 pkgs/development/libraries/soci/default.nix   |  2 +-
 .../libraries/sofia-sip/default.nix           |  2 +-
 pkgs/development/libraries/spglib/default.nix |  2 +-
 .../libraries/structuresynth/default.nix      |  2 +-
 pkgs/development/libraries/tbb/2020_3.nix     |  2 +-
 pkgs/development/libraries/tbb/default.nix    |  2 +-
 .../libraries/tpm2-tss/default.nix            |  2 +-
 .../libraries/unixODBCDrivers/default.nix     |  2 +-
 .../development/libraries/unqlite/default.nix |  2 +-
 pkgs/development/libraries/vc/0.7.nix         |  2 +-
 pkgs/development/libraries/vc/default.nix     |  2 +-
 .../libraries/waylandpp/default.nix           |  2 +-
 pkgs/development/libraries/waylib/default.nix |  2 +-
 .../libraries/webkit2-sharp/default.nix       |  2 +-
 pkgs/development/libraries/wiiuse/default.nix |  2 +-
 .../development/libraries/wlroots/default.nix |  2 +-
 pkgs/development/libraries/wt/default.nix     |  2 +-
 .../libraries/yaml-cpp/default.nix            |  2 +-
 .../libraries/yubico-pam/default.nix          |  2 +-
 pkgs/development/libraries/zint/default.nix   |  2 +-
 pkgs/development/lisp-modules/packages.nix    |  2 +-
 pkgs/development/misc/msp430/mspdebug.nix     |  2 +-
 pkgs/development/misc/resholve/deps.nix       |  2 +-
 pkgs/development/misc/resholve/source.nix     |  2 +-
 pkgs/development/mobile/fdroidcl/default.nix  |  2 +-
 .../ocaml-modules/afl-persistent/default.nix  |  2 +-
 .../ocaml-modules/algaeff/default.nix         |  2 +-
 .../ocaml-modules/alsa/default.nix            |  2 +-
 .../ocaml-modules/angstrom/default.nix        |  2 +-
 pkgs/development/ocaml-modules/ao/default.nix |  2 +-
 .../ocaml-modules/apron/default.nix           |  2 +-
 .../ocaml-modules/asai/default.nix            |  2 +-
 .../development/ocaml-modules/bap/default.nix |  2 +-
 .../ocaml-modules/batteries/default.nix       |  2 +-
 .../ocaml-modules/bigarray-compat/default.nix |  2 +-
 .../ocaml-modules/bigstring/default.nix       |  2 +-
 .../ocaml-modules/bigstringaf/default.nix     |  2 +-
 .../ocaml-modules/bindlib/default.nix         |  2 +-
 .../ocaml-modules/biocaml/default.nix         |  2 +-
 .../ocaml-modules/bisect_ppx/default.nix      |  2 +-
 .../ocaml-modules/bitstring/default.nix       |  2 +-
 .../ocaml-modules/bjack/default.nix           |  2 +-
 .../development/ocaml-modules/bwd/default.nix |  2 +-
 .../ocaml-modules/calendar/default.nix        |  2 +-
 .../ocaml-modules/camlp-streams/default.nix   |  2 +-
 .../ocaml-modules/camlpdf/default.nix         |  2 +-
 .../ocaml-modules/camomile/default.nix        |  4 +-
 .../ocaml-modules/capnp/default.nix           |  2 +-
 .../ocaml-modules/cfstream/default.nix        |  2 +-
 .../ocaml-modules/chacha/default.nix          |  2 +-
 .../ocaml-modules/clap/default.nix            |  2 +-
 .../ocaml-modules/class_group_vdf/default.nix |  2 +-
 .../ocaml-modules/containers/default.nix      |  2 +-
 .../ocaml-modules/cpdf/default.nix            |  2 +-
 .../development/ocaml-modules/cpu/default.nix |  2 +-
 .../ocaml-modules/crowbar/default.nix         |  2 +-
 .../development/ocaml-modules/cry/default.nix |  2 +-
 .../ocaml-modules/ctypes/default.nix          |  2 +-
 .../ocaml-modules/cudf/default.nix            |  2 +-
 .../ocaml-modules/curses/default.nix          |  2 +-
 .../ocaml-modules/dates_calc/default.nix      |  2 +-
 .../development/ocaml-modules/dbf/default.nix |  2 +-
 .../ocaml-modules/dedukti/default.nix         |  2 +-
 .../ocaml-modules/directories/default.nix     |  2 +-
 .../ocaml-modules/dispatch/default.nix        |  2 +-
 .../ocaml-modules/dolog/default.nix           |  2 +-
 .../ocaml-modules/dssi/default.nix            |  2 +-
 .../ocaml-modules/dtools/default.nix          |  2 +-
 .../development/ocaml-modules/dum/default.nix |  2 +-
 .../ocaml-modules/duppy/default.nix           |  2 +-
 .../ocaml-modules/dypgen/default.nix          |  2 +-
 .../ocaml-modules/earley/default.nix          |  2 +-
 .../ocaml-modules/earlybird/default.nix       |  2 +-
 .../ocaml-modules/eigen/default.nix           |  2 +-
 .../ocaml-modules/eliom/default.nix           |  2 +-
 .../ocaml-modules/expat/default.nix           |  2 +-
 .../ocaml-modules/faad/default.nix            |  2 +-
 .../ocaml-modules/faraday/default.nix         |  2 +-
 .../ocaml-modules/fdkaac/default.nix          |  2 +-
 .../ocaml-modules/flac/default.nix            |  2 +-
 .../ocaml-modules/frei0r/default.nix          |  2 +-
 .../ocaml-modules/frontc/default.nix          |  2 +-
 .../ocaml-modules/gapi-ocaml/default.nix      |  2 +-
 pkgs/development/ocaml-modules/gd/default.nix |  2 +-
 .../development/ocaml-modules/gen/default.nix |  2 +-
 .../ocaml-modules/gen_js_api/default.nix      |  2 +-
 .../ocaml-modules/get-activity/lib.nix        |  2 +-
 .../ocaml-modules/getopt/default.nix          |  2 +-
 .../ocaml-modules/github/default.nix          |  2 +-
 .../ocaml-modules/gitlab/default.nix          |  2 +-
 .../ocaml-modules/gnuplot/default.nix         |  2 +-
 .../ocaml-modules/graphql_ppx/default.nix     |  2 +-
 .../development/ocaml-modules/gsl/default.nix |  2 +-
 .../ocaml-modules/gstreamer/default.nix       |  2 +-
 .../ocaml-modules/hack_parallel/default.nix   |  2 +-
 .../ocaml-modules/hidapi/default.nix          |  2 +-
 .../ocaml-modules/httpaf/default.nix          |  2 +-
 .../ocaml-modules/inotify/default.nix         |  2 +-
 .../ocaml-modules/integers/default.nix        |  2 +-
 .../integers_stubs_js/default.nix             |  2 +-
 .../ocaml-modules/iso8601/default.nix         |  2 +-
 .../janestreet/janePackage_0_12.nix           |  2 +-
 .../janestreet/janePackage_0_14.nix           |  2 +-
 .../janestreet/janePackage_0_15.nix           |  2 +-
 .../janestreet/janePackage_0_16.nix           |  2 +-
 .../janestreet/janePackage_0_17.nix           |  2 +-
 .../ocaml-modules/javalib/default.nix         |  2 +-
 .../ocaml-modules/jingoo/default.nix          |  2 +-
 .../json-data-encoding/default.nix            |  2 +-
 .../ocaml-modules/jwto/default.nix            |  2 +-
 .../ocaml-modules/lablgl/default.nix          |  2 +-
 .../ocaml-modules/lablgtk/default.nix         |  2 +-
 .../ocaml-modules/ladspa/default.nix          |  2 +-
 .../ocaml-modules/lambda-term/default.nix     |  2 +-
 .../ocaml-modules/lambdasoup/default.nix      |  2 +-
 .../ocaml-modules/lame/default.nix            |  2 +-
 .../ocaml-modules/lastfm/default.nix          |  2 +-
 .../development/ocaml-modules/lem/default.nix |  2 +-
 .../ocaml-modules/lens/default.nix            |  2 +-
 .../ocaml-modules/lilv/default.nix            |  2 +-
 .../ocaml-modules/linenoise/default.nix       |  2 +-
 .../ocaml-modules/linksem/default.nix         |  2 +-
 pkgs/development/ocaml-modules/lo/default.nix |  2 +-
 .../ocaml-modules/lua-ml/default.nix          |  2 +-
 .../ocaml-modules/lwt-canceler/default.nix    |  2 +-
 .../ocaml-modules/lwt-watcher/default.nix     |  2 +-
 .../development/ocaml-modules/lwt/default.nix |  2 +-
 .../ocaml-modules/lwt_log/default.nix         |  2 +-
 .../development/ocaml-modules/mad/default.nix |  2 +-
 .../ocaml-modules/magic-trace/default.nix     |  2 +-
 .../ocaml-modules/markup/default.nix          |  2 +-
 .../ocaml-modules/mccs/default.nix            |  2 +-
 .../ocaml-modules/mem_usage/default.nix       |  2 +-
 .../ocaml-modules/memprof-limits/default.nix  |  2 +-
 .../ocaml-modules/memtrace/default.nix        |  2 +-
 .../development/ocaml-modules/mew/default.nix |  2 +-
 .../ocaml-modules/mew_vi/default.nix          |  2 +-
 .../ocaml-modules/minisat/default.nix         |  2 +-
 .../ocaml-modules/mldoc/default.nix           |  2 +-
 .../ocaml-modules/mlgmpidl/default.nix        |  2 +-
 .../development/ocaml-modules/mlx/default.nix |  2 +-
 pkgs/development/ocaml-modules/mm/default.nix |  2 +-
 .../ocaml-modules/morbig/default.nix          |  2 +-
 .../ocaml-modules/mparser/default.nix         |  2 +-
 .../ocaml-modules/msat/default.nix            |  2 +-
 .../ocaml-modules/msgpck/default.nix          |  2 +-
 .../multipart-form-data/default.nix           |  2 +-
 .../ocaml-modules/mustache/default.nix        |  2 +-
 .../development/ocaml-modules/npy/default.nix |  2 +-
 .../development/ocaml-modules/num/default.nix |  2 +-
 .../ocaml-freestanding/default.nix            |  2 +-
 .../ocaml-modules/ocaml-libvirt/default.nix   |  2 +-
 .../ocaml-migrate-parsetree/1.8.x.nix         |  2 +-
 .../ocaml-modules/ocaml-monadic/default.nix   |  2 +-
 .../ocaml-print-intf/default.nix              |  2 +-
 .../ocaml-protoc-plugin/default.nix           |  2 +-
 .../ocaml-modules/ocaml-r/default.nix         |  2 +-
 .../ocaml-sat-solvers/default.nix             |  2 +-
 .../ocaml-modules/ocamlfuse/default.nix       |  2 +-
 .../ocaml-modules/ocamline/default.nix        |  2 +-
 .../ocaml-modules/ocp-ocamlres/default.nix    |  2 +-
 .../ocaml-modules/ocplib-endian/default.nix   |  2 +-
 .../ocaml-modules/ocplib-simplex/default.nix  |  2 +-
 .../ocaml-modules/ocsigen-ppx-rpc/default.nix |  2 +-
 .../ocaml-modules/ocsigen-start/default.nix   |  2 +-
 .../ocaml-modules/ocsigen-toolkit/default.nix |  2 +-
 .../ocaml-modules/ocsipersist/lib.nix         |  2 +-
 .../ocaml-modules/octavius/default.nix        |  2 +-
 .../ocaml-modules/odate/default.nix           |  2 +-
 .../development/ocaml-modules/ogg/default.nix |  2 +-
 .../opam-file-format/default.nix              |  2 +-
 .../ocaml-modules/opus/default.nix            |  2 +-
 .../ocaml-modules/oseq/default.nix            |  2 +-
 .../ocaml-modules/otfed/default.nix           |  2 +-
 .../ocaml-modules/otoml/default.nix           |  2 +-
 .../ocaml-modules/parany/default.nix          |  2 +-
 .../ocaml-modules/parmap/default.nix          |  2 +-
 .../ocaml-modules/pgocaml/default.nix         |  2 +-
 .../ocaml-modules/pgsolver/default.nix        |  2 +-
 .../ocaml-modules/piqi-ocaml/default.nix      |  2 +-
 .../ocaml-modules/piqi/default.nix            |  2 +-
 .../ocaml-modules/portaudio/default.nix       |  2 +-
 .../ocaml-modules/pprint/default.nix          |  2 +-
 .../ocaml-modules/ppx_bap/default.nix         |  2 +-
 .../ocaml-modules/ppx_cstubs/default.nix      |  2 +-
 .../ocaml-modules/ppx_derivers/default.nix    |  2 +-
 .../ppx_deriving_cmdliner/default.nix         |  2 +-
 .../ppx_deriving_yojson/default.nix           |  2 +-
 .../ocaml-modules/ppx_monad/default.nix       |  2 +-
 .../ocaml-modules/ppx_show/default.nix        |  2 +-
 .../ppx_tools_versioned/default.nix           |  2 +-
 .../ocaml-modules/ppx_yojson_conv/default.nix |  2 +-
 .../ppx_yojson_conv_lib/default.nix           |  2 +-
 .../ocaml-modules/printbox/default.nix        |  2 +-
 .../ocaml-modules/process/default.nix         |  2 +-
 .../ocaml-modules/psmt2-frontend/default.nix  |  2 +-
 .../ocaml-modules/pulseaudio/default.nix      |  2 +-
 .../ocaml-modules/pure-splitmix/default.nix   |  2 +-
 .../ocaml-modules/pyml/default.nix            |  2 +-
 .../development/ocaml-modules/qcheck/core.nix |  2 +-
 .../qcheck/multicoretests-util.nix            |  2 +-
 .../ocaml-modules/qtest/default.nix           |  2 +-
 .../ocaml-modules/reactivedata/default.nix    |  2 +-
 .../ocaml-modules/repr/default.nix            |  2 +-
 .../resource-pooling/default.nix              |  2 +-
 .../ocaml-modules/resto/default.nix           |  2 +-
 .../ocaml-modules/rfc7748/default.nix         |  2 +-
 .../ocaml-modules/ringo/default.nix           |  2 +-
 .../ocaml-modules/safepass/default.nix        |  2 +-
 .../ocaml-modules/samplerate/default.nix      |  2 +-
 .../ocaml-modules/sawja/default.nix           |  2 +-
 .../secp256k1-internal/default.nix            |  2 +-
 .../ocaml-modules/secp256k1/default.nix       |  2 +-
 .../ocaml-modules/sedlex/default.nix          |  2 +-
 .../ocaml-modules/simple-diff/default.nix     |  2 +-
 .../ocaml-modules/slug/default.nix            |  2 +-
 .../ocaml-modules/sodium/default.nix          |  2 +-
 .../ocaml-modules/soundtouch/default.nix      |  2 +-
 .../ocaml-modules/speex/default.nix           |  2 +-
 .../ocaml-modules/spelll/default.nix          |  2 +-
 .../development/ocaml-modules/srt/default.nix |  2 +-
 .../development/ocaml-modules/ssl/default.nix |  2 +-
 .../ocaml-modules/swhid_core/default.nix      |  2 +-
 .../ocaml-modules/syslog/default.nix          |  2 +-
 .../ocaml-modules/taglib/default.nix          |  2 +-
 .../ocaml-modules/tcslib/default.nix          |  2 +-
 .../ocaml-modules/tdigest/default.nix         |  2 +-
 .../ocaml-modules/terml/default.nix           |  2 +-
 .../ocaml-modules/theora/default.nix          |  2 +-
 .../ocaml-modules/timed/default.nix           |  2 +-
 .../ocaml-modules/tiny_httpd/default.nix      |  2 +-
 .../ocaml-modules/toml/default.nix            |  2 +-
 .../ocaml-modules/torch/default.nix           |  2 +-
 .../ocaml-modules/trie/default.nix            |  2 +-
 .../ocaml-modules/tsdl-image/default.nix      |  2 +-
 .../ocaml-modules/tsdl-mixer/default.nix      |  2 +-
 .../ocaml-modules/tsdl-ttf/default.nix        |  2 +-
 .../ocaml-modules/tsort/default.nix           |  2 +-
 .../development/ocaml-modules/twt/default.nix |  2 +-
 .../ocaml-modules/uecc/default.nix            |  2 +-
 .../ocaml-modules/ulex/default.nix            |  2 +-
 .../ocaml-modules/vorbis/default.nix          |  2 +-
 .../ocaml-modules/vpl-core/default.nix        |  2 +-
 .../ocaml-modules/webmachine/default.nix      |  2 +-
 .../ocaml-modules/xenstore/default.nix        |  2 +-
 .../xenstore_transport/default.nix            |  2 +-
 .../ocaml-modules/xmlplaylist/default.nix     |  2 +-
 .../ocaml-modules/yuujinchou/default.nix      |  2 +-
 .../development/ocaml-modules/zed/default.nix |  2 +-
 .../ocaml-modules/zelus/default.nix           |  2 +-
 .../octave-modules/bim/default.nix            |  2 +-
 .../octave-modules/msh/default.nix            |  2 +-
 .../octave-modules/video/default.nix          |  2 +-
 .../perl-modules/Percona-Toolkit/default.nix  |  2 +-
 .../WWW-YoutubeViewer/default.nix             |  2 +-
 .../development/php-packages/amqp/default.nix |  2 +-
 .../development/php-packages/apcu/default.nix |  2 +-
 pkgs/development/php-packages/ast/default.nix |  2 +-
 .../composer-local-repo-plugin/default.nix    |  2 +-
 .../php-packages/couchbase/default.nix        |  2 +-
 .../cyclonedx-php-composer/default.nix        |  2 +-
 .../php-packages/datadog_trace/default.nix    |  2 +-
 pkgs/development/php-packages/ds/default.nix  |  2 +-
 .../development/php-packages/imap/default.nix |  2 +-
 .../php-packages/maxminddb/default.nix        |  2 +-
 .../php-packages/memcache/default.nix         |  2 +-
 .../php-packages/memcached/default.nix        |  2 +-
 .../php-packages/memprof/default.nix          |  2 +-
 .../php-packages/mongodb/default.nix          |  2 +-
 .../php-packages/openswoole/default.nix       |  2 +-
 .../php-packages/opentelemetry/default.nix    |  2 +-
 .../php-packages/pdlib/default.nix            |  2 +-
 .../php-packages/phalcon/default.nix          |  2 +-
 .../development/php-packages/phan/default.nix |  2 +-
 .../php-packages/pspell/default.nix           |  2 +-
 .../php-packages/redis/default.nix            |  2 +-
 .../php-packages/snuffleupagus/default.nix    |  2 +-
 pkgs/development/php-packages/spx/default.nix |  2 +-
 .../php-packages/swoole/default.nix           |  2 +-
 pkgs/development/php-packages/uv/default.nix  |  2 +-
 .../php-packages/xdebug/default.nix           |  2 +-
 .../development/php-packages/zstd/default.nix |  2 +-
 .../python-modules/accupy/default.nix         |  2 +-
 .../python-modules/adal/default.nix           |  2 +-
 .../python-modules/adb-shell/default.nix      |  2 +-
 .../add-trailing-comma/default.nix            |  2 +-
 .../python-modules/advocate/default.nix       |  2 +-
 .../python-modules/aggdraw/default.nix        |  2 +-
 .../python-modules/aggregate6/default.nix     |  2 +-
 .../python-modules/aiocontextvars/default.nix |  2 +-
 .../python-modules/aiodhcpwatcher/default.nix |  2 +-
 .../python-modules/aioemonitor/default.nix    |  2 +-
 .../aiohttp-asyncmdnsresolver/default.nix     |  2 +-
 .../aiohttp-swagger/default.nix               |  2 +-
 .../python-modules/aiohttp-wsgi/default.nix   |  2 +-
 .../python-modules/aiohwenergy/default.nix    |  2 +-
 .../python-modules/aiokef/default.nix         |  2 +-
 .../python-modules/aiomcache/default.nix      |  2 +-
 .../python-modules/aiomodernforms/default.nix |  2 +-
 .../python-modules/aiopg/default.nix          |  2 +-
 .../python-modules/aiopylgtv/default.nix      |  2 +-
 .../python-modules/aiosenz/default.nix        |  2 +-
 .../python-modules/aiosignal/default.nix      |  2 +-
 .../python-modules/airium/default.nix         |  2 +-
 .../python-modules/airly/default.nix          |  2 +-
 .../python-modules/alarmdecoder/default.nix   |  2 +-
 .../python-modules/amshan/default.nix         |  2 +-
 .../python-modules/android-backup/default.nix |  2 +-
 .../python-modules/anitopy/default.nix        |  2 +-
 .../python-modules/anonip/default.nix         |  2 +-
 .../python-modules/ansiconv/default.nix       |  2 +-
 .../python-modules/anyqt/default.nix          |  2 +-
 .../python-modules/apcaccess/default.nix      |  2 +-
 .../python-modules/appnope/default.nix        |  2 +-
 .../python-modules/aprslib/default.nix        |  2 +-
 .../python-modules/aqipy-atmotech/default.nix |  2 +-
 .../python-modules/aqualogic/default.nix      |  2 +-
 .../python-modules/arc4/default.nix           |  2 +-
 .../python-modules/aresponses/default.nix     |  2 +-
 .../python-modules/arpy/default.nix           |  2 +-
 .../python-modules/arxiv2bib/default.nix      |  2 +-
 .../python-modules/asciitree/default.nix      |  2 +-
 .../python-modules/asks/default.nix           |  2 +-
 .../python-modules/asn1ate/default.nix        |  2 +-
 .../aspy-refactor-imports/default.nix         |  2 +-
 .../python-modules/assertpy/default.nix       |  2 +-
 .../python-modules/async-dns/default.nix      |  2 +-
 .../asyncio-throttle/default.nix              |  2 +-
 .../python-modules/attr/default.nix           |  2 +-
 .../python-modules/aubio/default.nix          |  2 +-
 .../python-modules/augeas/default.nix         |  2 +-
 .../python-modules/autograd-gamma/default.nix |  2 +-
 .../python-modules/avea/default.nix           |  2 +-
 .../python-modules/aw-core/default.nix        |  2 +-
 .../backports-tarfile/default.nix             |  2 +-
 .../python-modules/bagit/default.nix          |  2 +-
 .../python-modules/bap/default.nix            |  2 +-
 .../python-modules/barectf/default.nix        |  2 +-
 .../python-modules/base36/default.nix         |  2 +-
 .../python-modules/base58check/default.nix    |  2 +-
 .../python-modules/bashlex/default.nix        |  2 +-
 .../batchgenerators/default.nix               |  2 +-
 .../python-modules/bcf/default.nix            |  2 +-
 .../python-modules/bcg/default.nix            |  2 +-
 .../python-modules/bch/default.nix            |  2 +-
 .../beancount-plugin-utils/default.nix        |  2 +-
 .../python-modules/beanstalkc/default.nix     |  2 +-
 .../python-modules/beaupy/default.nix         |  2 +-
 .../python-modules/beautifultable/default.nix |  2 +-
 .../python-modules/beautysh/default.nix       |  2 +-
 .../python-modules/behave/default.nix         |  2 +-
 .../python-modules/beziers/default.nix        |  2 +-
 .../python-modules/bip32/default.nix          |  2 +-
 .../python-modules/birch/default.nix          |  2 +-
 .../python-modules/bitcoinrpc/default.nix     |  2 +-
 .../python-modules/bitvavo-aio/default.nix    |  2 +-
 .../bitvector-for-humans/default.nix          |  2 +-
 .../python-modules/bizkaibus/default.nix      |  2 +-
 .../python-modules/bjoern/default.nix         |  2 +-
 .../black-macchiato/default.nix               |  2 +-
 .../python-modules/blacken-docs/default.nix   |  2 +-
 .../blurhash-python/default.nix               |  2 +-
 .../python-modules/bond-api/default.nix       |  2 +-
 .../python-modules/bonsai/default.nix         |  2 +-
 .../python-modules/boolean-py/default.nix     |  2 +-
 .../python-modules/braintree/default.nix      |  2 +-
 .../python-modules/bravado-core/default.nix   |  2 +-
 .../python-modules/bravia-tv/default.nix      |  2 +-
 .../python-modules/brotli-asgi/default.nix    |  2 +-
 .../python-modules/brotlicffi/default.nix     |  2 +-
 .../brottsplatskartan/default.nix             |  2 +-
 .../btsmarthub-devicelist/default.nix         |  2 +-
 .../python-modules/bubop/default.nix          |  2 +-
 .../python-modules/cachey/default.nix         |  2 +-
 .../python-modules/calver/default.nix         |  2 +-
 .../python-modules/calysto/default.nix        |  2 +-
 .../python-modules/capturer/default.nix       |  2 +-
 .../python-modules/catkin-pkg/default.nix     |  2 +-
 .../celery-singleton/default.nix              |  2 +-
 .../python-modules/certifi/default.nix        |  2 +-
 .../python-modules/certvalidator/default.nix  |  2 +-
 .../python-modules/cfn-flip/default.nix       |  2 +-
 .../python-modules/cgroup-utils/default.nix   |  2 +-
 .../python-modules/checksumdir/default.nix    |  2 +-
 .../python-modules/chirpstack-api/default.nix |  2 +-
 .../python-modules/cjkwrap/default.nix        |  2 +-
 .../classify-imports/default.nix              |  2 +-
 .../python-modules/cleanit/default.nix        |  2 +-
 .../python-modules/click-aliases/default.nix  |  2 +-
 .../python-modules/clickclick/default.nix     |  2 +-
 .../clickhouse-driver/default.nix             |  2 +-
 .../python-modules/cligj/default.nix          |  2 +-
 .../python-modules/clldutils/default.nix      |  2 +-
 .../python-modules/coapthon3/default.nix      |  2 +-
 .../python-modules/codepy/default.nix         |  2 +-
 .../python-modules/coloredlogs/default.nix    |  2 +-
 .../python-modules/colorthief/default.nix     |  2 +-
 .../python-modules/commandlines/default.nix   |  2 +-
 .../python-modules/commentjson/default.nix    |  2 +-
 .../python-modules/confuse/default.nix        |  2 +-
 .../construct-classes/default.nix             |  2 +-
 .../python-modules/controku/default.nix       |  2 +-
 .../python-modules/convertdate/default.nix    |  2 +-
 .../python-modules/coreapi/default.nix        |  2 +-
 .../python-modules/coreschema/default.nix     |  2 +-
 .../python-modules/cornice/default.nix        |  2 +-
 .../python-modules/cose/default.nix           |  2 +-
 .../crownstone-core/default.nix               |  2 +-
 .../crownstone-uart/default.nix               |  2 +-
 .../python-modules/cryptg/default.nix         |  2 +-
 .../python-modules/crysp/default.nix          |  2 +-
 .../python-modules/csv2md/default.nix         |  2 +-
 .../python-modules/csvw/default.nix           |  2 +-
 .../cxxheaderparser/default.nix               |  2 +-
 .../cython-test-exception-raiser/default.nix  |  2 +-
 .../python-modules/daemonocle/default.nix     |  2 +-
 .../python-modules/darkdetect/default.nix     |  2 +-
 .../dask-gateway-server/default.nix           |  2 +-
 .../dataclass-factory/default.nix             |  2 +-
 .../dataclass-wizard/default.nix              |  2 +-
 .../dataclasses-serialization/default.nix     |  2 +-
 .../datasette-template-sql/default.nix        |  2 +-
 .../dbus-signature-pyparsing/default.nix      |  2 +-
 .../python-modules/deepwave/default.nix       |  2 +-
 .../python-modules/dehinter/default.nix       |  2 +-
 .../python-modules/dek/default.nix            |  2 +-
 .../python-modules/deploykit/default.nix      |  2 +-
 .../desktop-entry-lib/default.nix             |  2 +-
 .../devolo-home-control-api/default.nix       |  2 +-
 .../python-modules/dfdiskcache/default.nix    |  2 +-
 .../python-modules/dictdiffer/default.nix     |  2 +-
 .../python-modules/dingz/default.nix          |  2 +-
 .../python-modules/directv/default.nix        |  2 +-
 .../python-modules/dirsearch/default.nix      |  2 +-
 .../python-modules/diskcache/default.nix      |  2 +-
 .../python-modules/dissononce/default.nix     |  2 +-
 .../python-modules/dj-static/default.nix      |  2 +-
 .../django-apscheduler/default.nix            |  2 +-
 .../django-auditlog/default.nix               |  2 +-
 .../django-bootstrap5/default.nix             |  2 +-
 .../django-celery-email/default.nix           |  2 +-
 .../django-choices-field/default.nix          |  2 +-
 .../django-context-decorator/default.nix      |  2 +-
 .../django-graphiql-debug-toolbar/default.nix |  2 +-
 .../python-modules/django-htmx/default.nix    |  2 +-
 .../django-js-reverse/default.nix             |  2 +-
 .../django-logentry-admin/default.nix         |  2 +-
 .../django-mdeditor/default.nix               |  2 +-
 .../python-modules/django-mptt/default.nix    |  2 +-
 .../django-postgresql-netfields/default.nix   |  2 +-
 .../django-prometheus/default.nix             |  2 +-
 .../django-rest-auth/default.nix              |  2 +-
 .../python-modules/django-sites/default.nix   |  2 +-
 .../django-split-settings/default.nix         |  2 +-
 .../django-timezone-field/default.nix         |  2 +-
 .../djangorestframework-guardian/default.nix  |  2 +-
 .../djangorestframework-recursive/default.nix |  2 +-
 .../djangorestframework/default.nix           |  2 +-
 .../python-modules/dodgy/default.nix          |  2 +-
 .../python-modules/doit-py/default.nix        |  2 +-
 .../python-modules/donfig/default.nix         |  2 +-
 .../donut-shellcode/default.nix               |  2 +-
 .../python-modules/drafthorse/default.nix     |  2 +-
 .../python-modules/drf-jwt/default.nix        |  2 +-
 .../drf-spectacular-sidecar/default.nix       |  2 +-
 .../python-modules/ds4drv/default.nix         |  2 +-
 .../python-modules/dsinternals/default.nix    |  2 +-
 .../python-modules/duct-py/default.nix        |  2 +-
 .../python-modules/duden/default.nix          |  2 +-
 .../python-modules/dufte/default.nix          |  2 +-
 .../python-modules/dungeon-eos/default.nix    |  2 +-
 .../python-modules/durationpy/default.nix     |  2 +-
 .../python-modules/dynd/default.nix           |  2 +-
 .../python-modules/ebooklib/default.nix       |  2 +-
 .../python-modules/editdistance-s/default.nix |  2 +-
 .../python-modules/editor/default.nix         |  2 +-
 .../python-modules/editorconfig/default.nix   |  2 +-
 .../python-modules/einx/default.nix           |  2 +-
 .../python-modules/elmax/default.nix          |  2 +-
 .../python-modules/emailthreads/default.nix   |  2 +-
 .../python-modules/emulated-roku/default.nix  |  2 +-
 .../python-modules/encodec/default.nix        |  2 +-
 .../python-modules/enturclient/default.nix    |  2 +-
 .../python-modules/envoy-reader/default.nix   |  2 +-
 .../ephemeral-port-reserve/default.nix        |  2 +-
 .../python-modules/esprima/default.nix        |  2 +-
 .../python-modules/essentials/default.nix     |  2 +-
 .../python-modules/etcd/default.nix           |  2 +-
 .../python-modules/etebase/default.nix        |  2 +-
 .../python-modules/eth-rlp/default.nix        |  2 +-
 .../python-modules/executing/default.nix      |  2 +-
 .../python-modules/expects/default.nix        |  2 +-
 .../python-modules/fabulous/default.nix       |  2 +-
 .../python-modules/fairseq/default.nix        |  2 +-
 .../farama-notifications/default.nix          |  2 +-
 .../python-modules/fastdtw/default.nix        |  2 +-
 .../python-modules/fastjsonschema/default.nix |  2 +-
 .../python-modules/fastpbkdf2/default.nix     |  2 +-
 .../python-modules/filedate/default.nix       |  2 +-
 .../python-modules/finalfusion/default.nix    |  2 +-
 .../python-modules/fingerprints/default.nix   |  2 +-
 .../python-modules/fissix/default.nix         |  2 +-
 .../python-modules/fitbit/default.nix         |  2 +-
 .../python-modules/fixerio/default.nix        |  2 +-
 .../python-modules/flasgger/default.nix       |  2 +-
 .../python-modules/flask-bcrypt/default.nix   |  2 +-
 .../flask-expects-json/default.nix            |  2 +-
 .../python-modules/flask-mysqldb/default.nix  |  2 +-
 .../python-modules/flask-paranoid/default.nix |  2 +-
 .../flask-reverse-proxy-fix/default.nix       |  2 +-
 .../python-modules/flask-sock/default.nix     |  2 +-
 .../python-modules/flatdict/default.nix       |  2 +-
 .../python-modules/flatten-dict/default.nix   |  2 +-
 .../python-modules/flatten-json/default.nix   |  2 +-
 .../python-modules/flexcache/default.nix      |  2 +-
 .../python-modules/flexparser/default.nix     |  2 +-
 .../python-modules/flit-gettext/default.nix   |  2 +-
 .../python-modules/flit/default.nix           |  2 +-
 .../python-modules/fnvhash/default.nix        |  2 +-
 .../python-modules/font-v/default.nix         |  2 +-
 .../python-modules/fordpass/default.nix       |  2 +-
 .../python-modules/fqdn/default.nix           |  2 +-
 .../python-modules/frilouz/default.nix        |  2 +-
 .../python-modules/frozenlist2/default.nix    |  2 +-
 .../python-modules/funcparserlib/default.nix  |  2 +-
 .../functions-framework/default.nix           |  2 +-
 .../python-modules/fx2/default.nix            |  2 +-
 .../garminconnect-aio/default.nix             |  2 +-
 .../python-modules/gatt/default.nix           |  2 +-
 .../python-modules/gawd/default.nix           |  2 +-
 .../python-modules/gb-io/default.nix          |  2 +-
 .../python-modules/gbinder-python/default.nix |  2 +-
 .../python-modules/gcodepy/default.nix        |  2 +-
 .../python-modules/gcsa/default.nix           |  2 +-
 .../python-modules/gdsfactory/default.nix     |  2 +-
 .../python-modules/gekitchen/default.nix      |  2 +-
 .../georss-generic-client/default.nix         |  2 +-
 .../default.nix                               |  2 +-
 .../georss-tfs-incidents-client/default.nix   |  2 +-
 .../georss-wa-dfes-client/default.nix         |  2 +-
 .../python-modules/gerbonara/default.nix      |  2 +-
 .../python-modules/gfal2-python/default.nix   |  2 +-
 .../python-modules/gfal2-util/default.nix     |  2 +-
 .../gibberish-detector/default.nix            |  2 +-
 .../python-modules/git-dummy/default.nix      |  2 +-
 .../python-modules/git-find-repos/default.nix |  2 +-
 .../python-modules/git-url-parse/default.nix  |  2 +-
 .../python-modules/git-versioner/default.nix  |  2 +-
 .../github-to-sqlite/default.nix              |  2 +-
 .../python-modules/glean-sdk/default.nix      |  2 +-
 .../python-modules/gpt-2-simple/default.nix   |  2 +-
 .../python-modules/gpxpy/default.nix          |  2 +-
 .../python-modules/grandalf/default.nix       |  2 +-
 .../graphlib-backport/default.nix             |  2 +-
 .../graphql-server-core/default.nix           |  2 +-
 .../python-modules/grip/default.nix           |  2 +-
 .../python-modules/gruut-ipa/default.nix      |  2 +-
 .../python-modules/gtts-token/default.nix     |  2 +-
 .../python-modules/help2man/default.nix       |  2 +-
 .../python-modules/helper/default.nix         |  2 +-
 .../python-modules/here-routing/default.nix   |  2 +-
 .../python-modules/here-transit/default.nix   |  2 +-
 .../python-modules/hetzner/default.nix        |  2 +-
 .../python-modules/hightime/default.nix       |  2 +-
 .../python-modules/hlk-sw16/default.nix       |  2 +-
 .../python-modules/hocr-tools/default.nix     |  2 +-
 .../homepluscontrol/default.nix               |  2 +-
 .../python-modules/hpack/default.nix          |  2 +-
 .../python-modules/hsh/default.nix            |  2 +-
 .../python-modules/hsluv/default.nix          |  2 +-
 .../html-table-parser-python3/default.nix     |  2 +-
 .../python-modules/html-tag-names/default.nix |  2 +-
 .../html-void-elements/default.nix            |  2 +-
 .../python-modules/html5tagger/default.nix    |  2 +-
 .../python-modules/httmock/default.nix        |  2 +-
 .../python-modules/http-ece/default.nix       |  2 +-
 .../http-message-signatures/default.nix       |  2 +-
 .../python-modules/httplib2/default.nix       |  2 +-
 .../huisbaasje-client/default.nix             |  2 +-
 .../python-modules/humblewx/default.nix       |  2 +-
 .../python-modules/hydrawiser/default.nix     |  2 +-
 .../python-modules/hyperion-py/default.nix    |  2 +-
 .../python-modules/i3ipc/default.nix          |  2 +-
 .../python-modules/ibis/default.nix           |  2 +-
 .../python-modules/icmplib/default.nix        |  2 +-
 .../python-modules/image-diff/default.nix     |  2 +-
 .../python-modules/imaplib2/default.nix       |  2 +-
 .../python-modules/imgdiff/default.nix        |  2 +-
 .../python-modules/installer/default.nix      |  2 +-
 .../python-modules/interface-meta/default.nix |  2 +-
 .../into-dbus-python/default.nix              |  2 +-
 .../python-modules/ionhash/default.nix        |  2 +-
 .../python-modules/ipfshttpclient/default.nix |  2 +-
 .../python-modules/ipyniivue/default.nix      |  2 +-
 .../python-modules/ipyxact/default.nix        |  2 +-
 .../python-modules/ircrobots/default.nix      |  2 +-
 .../python-modules/ircstates/default.nix      |  2 +-
 .../python-modules/irctokens/default.nix      |  2 +-
 .../python-modules/isal/default.nix           |  2 +-
 .../python-modules/isbnlib/default.nix        |  2 +-
 .../python-modules/isoduration/default.nix    |  2 +-
 .../item-synchronizer/default.nix             |  2 +-
 .../python-modules/itypes/default.nix         |  2 +-
 .../python-modules/jax-jumpy/default.nix      |  2 +-
 .../python-modules/jedi/default.nix           |  2 +-
 .../python-modules/jello/default.nix          |  2 +-
 .../python-modules/jellyfish/default.nix      |  2 +-
 .../python-modules/jieba/default.nix          |  2 +-
 .../python-modules/jproperties/default.nix    |  2 +-
 .../python-modules/jpylyzer/default.nix       |  2 +-
 .../python-modules/jschon/default.nix         |  2 +-
 .../json-home-client/default.nix              |  2 +-
 .../python-modules/json2html/default.nix      |  2 +-
 .../python-modules/jsonlines/default.nix      |  2 +-
 .../python-modules/jsonrpc-async/default.nix  |  2 +-
 .../python-modules/jsonstreams/default.nix    |  2 +-
 .../python-modules/jsonxs/default.nix         |  2 +-
 .../python-modules/junitparser/default.nix    |  2 +-
 .../python-modules/justbackoff/default.nix    |  2 +-
 .../python-modules/jwt/default.nix            |  2 +-
 .../kaldi-active-grammar/default.nix          |  2 +-
 .../kaldi-active-grammar/fork.nix             |  2 +-
 .../python-modules/keepkey/default.nix        |  2 +-
 .../python-modules/keyboard/default.nix       |  2 +-
 .../python-modules/keyutils/default.nix       |  2 +-
 .../python-modules/kfactory/default.nix       |  2 +-
 .../python-modules/kivy-garden/default.nix    |  2 +-
 .../python-modules/klaus/default.nix          |  2 +-
 .../python-modules/kml2geojson/default.nix    |  2 +-
 .../python-modules/kotsu/default.nix          |  2 +-
 .../python-modules/krakenex/default.nix       |  2 +-
 .../python-modules/laszip/default.nix         |  2 +-
 .../python-modules/latex2mathml/default.nix   |  2 +-
 .../python-modules/ledgerwallet/default.nix   |  2 +-
 .../python-modules/libarcus/default.nix       |  2 +-
 .../python-modules/liblarch/default.nix       |  2 +-
 .../python-modules/libnacl/default.nix        |  2 +-
 .../python-modules/libpyvivotek/default.nix   |  2 +-
 .../python-modules/libsavitar/default.nix     |  2 +-
 .../python-modules/libversion/default.nix     |  2 +-
 .../python-modules/lightparam/default.nix     |  2 +-
 .../python-modules/limiter/default.nix        |  2 +-
 .../python-modules/lineedit/default.nix       |  2 +-
 .../python-modules/litemapy/default.nix       |  2 +-
 .../python-modules/lizard/default.nix         |  2 +-
 .../python-modules/logi-circle/default.nix    |  2 +-
 .../python-modules/logster/default.nix        |  2 +-
 .../python-modules/lpc-checksum/default.nix   |  2 +-
 .../python-modules/luftdaten/default.nix      |  2 +-
 .../python-modules/luhn/default.nix           |  2 +-
 .../python-modules/luxtronik/default.nix      |  2 +-
 .../python-modules/lzallright/default.nix     |  2 +-
 .../python-modules/macaddress/default.nix     |  2 +-
 .../python-modules/macholib/default.nix       |  2 +-
 .../python-modules/macropy/default.nix        |  2 +-
 .../python-modules/mando/default.nix          |  2 +-
 .../python-modules/manuf/default.nix          |  2 +-
 .../python-modules/matchpy/default.nix        |  2 +-
 .../python-modules/materialx/default.nix      |  2 +-
 .../python-modules/matplotx/default.nix       |  2 +-
 .../python-modules/mbddns/default.nix         |  2 +-
 .../python-modules/mdurl/default.nix          |  2 +-
 .../python-modules/medvol/default.nix         |  2 +-
 .../memory-tempfile/default.nix               |  2 +-
 .../python-modules/mercantile/default.nix     |  2 +-
 .../python-modules/mergedeep/default.nix      |  2 +-
 .../python-modules/messagebird/default.nix    |  2 +-
 .../python-modules/meteocalc/default.nix      |  2 +-
 .../python-modules/methodtools/default.nix    |  2 +-
 .../python-modules/microdata/default.nix      |  2 +-
 .../python-modules/minexr/default.nix         |  2 +-
 .../python-modules/minimock/default.nix       |  2 +-
 .../python-modules/mitmproxy-rs/default.nix   |  2 +-
 .../mkdocs-get-deps/default.nix               |  2 +-
 .../python-modules/mlrose/default.nix         |  2 +-
 .../python-modules/mnemonic/default.nix       |  2 +-
 .../python-modules/mock-open/default.nix      |  2 +-
 .../python-modules/mock-services/default.nix  |  2 +-
 .../python-modules/mockfs/default.nix         |  2 +-
 .../python-modules/moddb/default.nix          |  2 +-
 .../python-modules/monero/default.nix         |  2 +-
 .../motioneye-client/default.nix              |  2 +-
 .../mozilla-django-oidc/default.nix           |  2 +-
 .../python-modules/mpegdash/default.nix       |  2 +-
 .../python-modules/mplcursors/default.nix     |  2 +-
 .../python-modules/mpldatacursor/default.nix  |  2 +-
 .../python-modules/mpv/default.nix            |  2 +-
 .../python-modules/ms-cv/default.nix          |  2 +-
 .../python-modules/mutf8/default.nix          |  2 +-
 .../python-modules/mygene/default.nix         |  2 +-
 .../python-modules/mygpoclient/default.nix    |  2 +-
 .../python-modules/myhome/default.nix         |  2 +-
 .../python-modules/mypy/extensions.nix        |  2 +-
 .../mysql-connector/default.nix               |  2 +-
 .../python-modules/nad-receiver/default.nix   |  2 +-
 .../python-modules/naked/default.nix          |  2 +-
 .../python-modules/name-that-hash/default.nix |  2 +-
 .../python-modules/names/default.nix          |  2 +-
 .../python-modules/nbtlib/default.nix         |  2 +-
 .../python-modules/nc-dnsapi/default.nix      |  2 +-
 .../ndg-httpsclient/default.nix               |  2 +-
 .../python-modules/ndms2-client/default.nix   |  2 +-
 .../netbox-napalm-plugin/default.nix          |  2 +-
 .../python-modules/netdata-pandas/default.nix |  2 +-
 .../python-modules/netmap/default.nix         |  2 +-
 .../python-modules/newick/default.nix         |  2 +-
 .../python-modules/nh3/default.nix            |  2 +-
 .../python-modules/nidaqmx/default.nix        |  2 +-
 .../nix-prefetch-github/default.nix           |  2 +-
 .../python-modules/nmapthon2/default.nix      |  2 +-
 .../python-modules/norfair/default.nix        |  2 +-
 .../python-modules/normality/default.nix      |  2 +-
 .../python-modules/nose2pytest/default.nix    |  2 +-
 .../python-modules/nplusone/default.nix       |  2 +-
 .../python-modules/nuclear/default.nix        |  2 +-
 .../python-modules/nuitka/default.nix         |  2 +-
 .../python-modules/numdifftools/default.nix   |  2 +-
 .../python-modules/oasatelematics/default.nix |  2 +-
 .../python-modules/oauthlib/default.nix       |  2 +-
 .../python-modules/ochre/default.nix          |  2 +-
 .../python-modules/ocrmypdf/default.nix       |  2 +-
 .../python-modules/ofxhome/default.nix        |  2 +-
 .../python-modules/ofxtools/default.nix       |  2 +-
 .../python-modules/oletools/default.nix       |  2 +-
 .../python-modules/opcua-widgets/default.nix  |  2 +-
 .../python-modules/open-garage/default.nix    |  2 +-
 .../open-interpreter/default.nix              |  2 +-
 .../python-modules/open-meteo/default.nix     |  2 +-
 .../openapi-pydantic/default.nix              |  2 +-
 .../python-modules/openapi3/default.nix       |  2 +-
 .../python-modules/openevsewifi/default.nix   |  2 +-
 .../python-modules/openrazer/common.nix       |  2 +-
 .../openrouteservice/default.nix              |  2 +-
 .../python-modules/opensimplex/default.nix    |  2 +-
 .../python-modules/opytimark/default.nix      |  2 +-
 .../python-modules/orm/default.nix            |  2 +-
 .../python-modules/orvibo/default.nix         |  2 +-
 .../python-modules/osc-lib/default.nix        |  2 +-
 .../python-modules/osc/default.nix            |  2 +-
 .../python-modules/oscpy/default.nix          |  2 +-
 .../python-modules/oscrypto/default.nix       |  2 +-
 .../python-modules/osmpythontools/default.nix |  2 +-
 .../python-modules/pa-ringbuffer/default.nix  |  2 +-
 .../python-modules/paginate/default.nix       |  2 +-
 .../python-modules/paho-mqtt/default.nix      |  2 +-
 .../python-modules/paintcompiler/default.nix  |  2 +-
 .../python-modules/pamqp/default.nix          |  2 +-
 .../python-modules/pasimple/default.nix       |  2 +-
 .../path-and-address/default.nix              |  2 +-
 .../python-modules/patrowl4py/default.nix     |  2 +-
 .../python-modules/pcapy-ng/default.nix       |  2 +-
 .../python-modules/pcodedmp/default.nix       |  2 +-
 .../python-modules/pdoc/default.nix           |  2 +-
 .../python-modules/pepit/default.nix          |  2 +-
 .../permissionedforms/default.nix             |  2 +-
 .../python-modules/pgpy/default.nix           |  2 +-
 .../python-modules/pickpack/default.nix       |  2 +-
 .../python-modules/piexif/default.nix         |  2 +-
 .../python-modules/pinboard/default.nix       |  2 +-
 .../python-modules/pixel-ring/default.nix     |  2 +-
 .../python-modules/pkce/default.nix           |  2 +-
 .../python-modules/pkgconfig/default.nix      |  2 +-
 .../python-modules/pkginfo2/default.nix       |  2 +-
 .../python-modules/playsound/default.nix      |  2 +-
 .../python-modules/pleroma-bot/default.nix    |  2 +-
 .../python-modules/plexauth/default.nix       |  2 +-
 .../python-modules/plugp100/default.nix       |  2 +-
 .../python-modules/pluthon/default.nix        |  2 +-
 .../pmdsky-debug-py/default.nix               |  2 +-
 .../python-modules/podcats/default.nix        |  2 +-
 .../python-modules/polling/default.nix        |  2 +-
 .../pre-commit-po-hooks/default.nix           |  2 +-
 .../python-modules/pretend/default.nix        |  2 +-
 .../python-modules/prison/default.nix         |  2 +-
 .../python-modules/prodict/default.nix        |  2 +-
 .../prometheus-async/default.nix              |  2 +-
 .../prometheus-flask-exporter/default.nix     |  2 +-
 .../python-modules/prompthub-py/default.nix   |  2 +-
 .../property-manager/default.nix              |  2 +-
 .../python-modules/prophet/default.nix        |  2 +-
 .../python-modules/proton-client/default.nix  |  2 +-
 .../proton-vpn-api-core/default.nix           |  2 +-
 .../python-modules/psautohint/default.nix     |  2 +-
 .../python-modules/pure-eval/default.nix      |  2 +-
 .../python-modules/purl/default.nix           |  2 +-
 .../python-modules/py-air-control/default.nix |  2 +-
 .../python-modules/py-cid/default.nix         |  2 +-
 .../python-modules/py-cpuinfo/default.nix     |  2 +-
 .../python-modules/py-deprecate/default.nix   |  2 +-
 .../python-modules/py-ecc/default.nix         |  2 +-
 .../py-eth-sig-utils/default.nix              |  2 +-
 .../py-expression-eval/default.nix            |  2 +-
 .../python-modules/py-multiaddr/default.nix   |  2 +-
 .../python-modules/py-nightscout/default.nix  |  2 +-
 .../python-modules/py-ubjson/default.nix      |  2 +-
 .../python-modules/py3buddy/default.nix       |  2 +-
 .../python-modules/pyaehw4a1/default.nix      |  2 +-
 .../python-modules/pyarlo/default.nix         |  2 +-
 .../python-modules/pyasn/default.nix          |  2 +-
 .../python-modules/pyasynchat/default.nix     |  2 +-
 .../python-modules/pyaxmlparser/default.nix   |  2 +-
 .../python-modules/pybids/default.nix         |  2 +-
 .../pybind11-abseil/default.nix               |  2 +-
 .../python-modules/pycarwings2/default.nix    |  2 +-
 .../python-modules/pychannels/default.nix     |  2 +-
 .../python-modules/pycketcasts/default.nix    |  2 +-
 .../python-modules/pyclimacell/default.nix    |  2 +-
 .../python-modules/pycodestyle/default.nix    |  2 +-
 .../python-modules/pycolorecho/default.nix    |  2 +-
 .../python-modules/pycompliance/default.nix   |  2 +-
 .../python-modules/pycsdr/default.nix         |  2 +-
 .../python-modules/pydigiham/default.nix      |  2 +-
 .../python-modules/pyeight/default.nix        |  2 +-
 .../python-modules/pyeverlights/default.nix   |  2 +-
 .../python-modules/pyevilgenius/default.nix   |  2 +-
 .../python-modules/pyevmasm/default.nix       |  2 +-
 .../python-modules/pyexcel-ods/default.nix    |  2 +-
 .../python-modules/pyexcel-xls/default.nix    |  2 +-
 .../python-modules/pyflakes/default.nix       |  2 +-
 .../python-modules/pyflexit/default.nix       |  2 +-
 .../python-modules/pyflic/default.nix         |  2 +-
 .../python-modules/pyfma/default.nix          |  2 +-
 .../python-modules/pyfzf/default.nix          |  2 +-
 .../python-modules/pygrok/default.nix         |  2 +-
 .../python-modules/pygtail/default.nix        |  2 +-
 .../python-modules/pyhcl/default.nix          |  2 +-
 .../python-modules/pyhomepilot/default.nix    |  2 +-
 .../python-modules/pyhumps/default.nix        |  2 +-
 .../python-modules/pyialarm/default.nix       |  2 +-
 .../python-modules/pyicloud/default.nix       |  2 +-
 .../pyinstaller-versionfile/default.nix       |  2 +-
 .../python-modules/pykostalpiko/default.nix   |  2 +-
 .../python-modules/pykrakenapi/default.nix    |  2 +-
 .../python-modules/pykulersky/default.nix     |  2 +-
 .../python-modules/pylama/default.nix         |  2 +-
 .../python-modules/pylatex/default.nix        |  2 +-
 .../python-modules/pylatexenc/default.nix     |  2 +-
 .../python-modules/pyld/default.nix           |  2 +-
 .../python-modules/pyldavis/default.nix       |  2 +-
 .../python-modules/pylddwrap/default.nix      |  2 +-
 .../python-modules/pylev/default.nix          |  2 +-
 .../python-modules/pylibdmtx/default.nix      |  2 +-
 .../python-modules/pylint-celery/default.nix  |  2 +-
 .../pyloggermanager/default.nix               |  2 +-
 .../python-modules/pylru/default.nix          |  2 +-
 .../python-modules/pyls-spyder/default.nix    |  2 +-
 .../python-modules/pymailgunner/default.nix   |  2 +-
 .../python-modules/pymarshal/default.nix      |  2 +-
 .../python-modules/pymata-express/default.nix |  2 +-
 .../python-modules/pymdstat/default.nix       |  2 +-
 .../python-modules/pymelcloud/default.nix     |  2 +-
 .../python-modules/pymemcache/default.nix     |  2 +-
 .../python-modules/pymysensors/default.nix    |  2 +-
 .../python-modules/pynamecheap/default.nix    |  2 +-
 .../python-modules/pynello/default.nix        |  2 +-
 .../python-modules/pynest2d/default.nix       |  2 +-
 .../python-modules/pynotifier/default.nix     |  2 +-
 .../python-modules/pynut2/default.nix         |  2 +-
 .../python-modules/pyperscan/default.nix      |  2 +-
 .../python-modules/pypika/default.nix         |  2 +-
 .../python-modules/pyqt5-stubs/default.nix    |  2 +-
 .../python-modules/pyqtdarktheme/default.nix  |  2 +-
 .../python-modules/pyquaternion/default.nix   |  2 +-
 .../python-modules/pyqvrpro/default.nix       |  2 +-
 .../python-modules/pyrate-limiter/default.nix |  2 +-
 .../python-modules/pyrituals/default.nix      |  2 +-
 .../python-modules/pyrmvtransport/default.nix |  2 +-
 .../python-modules/pyrogram/default.nix       |  2 +-
 .../python-modules/pyroma/default.nix         |  2 +-
 .../python-modules/pysaj/default.nix          |  2 +-
 .../python-modules/pysatochip/default.nix     |  2 +-
 .../python-modules/pysbd/default.nix          |  2 +-
 .../pyserial-asyncio-fast/default.nix         |  2 +-
 .../python-modules/pyshp/default.nix          |  2 +-
 .../python-modules/pyskyqhub/default.nix      |  2 +-
 .../python-modules/pysmappee/default.nix      |  2 +-
 .../python-modules/pysmartapp/default.nix     |  2 +-
 .../python-modules/pysmt/default.nix          |  2 +-
 .../python-modules/pysnow/default.nix         |  2 +-
 .../python-modules/pysonos/default.nix        |  2 +-
 .../python-modules/pysrt/default.nix          |  2 +-
 .../python-modules/pyssim/default.nix         |  2 +-
 .../python-modules/pystardict/default.nix     |  2 +-
 .../python-modules/pystray/default.nix        |  2 +-
 .../python-modules/pysubs2/default.nix        |  2 +-
 .../python-modules/pysvg-py3/default.nix      |  2 +-
 .../python-modules/pytap2/default.nix         |  2 +-
 .../python-modules/pyte/default.nix           |  2 +-
 .../python-modules/pytest-click/default.nix   |  2 +-
 .../pytest-error-for-skips/default.nix        |  2 +-
 .../pytest-factoryboy/default.nix             |  2 +-
 .../pytest-freezegun/default.nix              |  2 +-
 .../python-modules/pytest-logdog/default.nix  |  2 +-
 .../python-modules/pytest-mockito/default.nix |  2 +-
 .../pytest-mockservers/default.nix            |  2 +-
 .../python-modules/pytest-mpi/default.nix     |  2 +-
 .../pytest-pytestrail/default.nix             |  2 +-
 .../python-modules/pytest-raisin/default.nix  |  2 +-
 .../pytest-randomly/default.nix               |  2 +-
 .../pytest-resource-path/default.nix          |  2 +-
 .../python-modules/pytest-reverse/default.nix |  2 +-
 .../python-modules/pytest-tap/default.nix     |  2 +-
 .../python-modules/pytest-trio/default.nix    |  2 +-
 .../python-modules/pytest-vcr/default.nix     |  2 +-
 .../python-modules/python-awair/default.nix   |  2 +-
 .../python-barbicanclient/default.nix         |  2 +-
 .../python-constraint/default.nix             |  2 +-
 .../python-modules/python-ctags3/default.nix  |  2 +-
 .../python-designateclient/default.nix        |  2 +-
 .../python-modules/python-doi/default.nix     |  2 +-
 .../python-modules/python-ev3dev2/default.nix |  2 +-
 .../python-modules/python-flirt/default.nix   |  2 +-
 .../python-modules/python-gammu/default.nix   |  2 +-
 .../python-http-client/default.nix            |  2 +-
 .../python-modules/python-i18n/default.nix    |  2 +-
 .../python-juicenet/default.nix               |  2 +-
 .../python-modules/python-magic/default.nix   |  2 +-
 .../python-modules/python-mbedtls/default.nix |  2 +-
 .../python-memcached/default.nix              |  2 +-
 .../python-mistralclient/default.nix          |  2 +-
 .../python-mpv-jsonipc/default.nix            |  2 +-
 .../python-owasp-zap-v2-4/default.nix         |  2 +-
 .../python-modules/python-pae/default.nix     |  2 +-
 .../python-modules/python-pkcs11/default.nix  |  2 +-
 .../python-modules/python-pptx/default.nix    |  2 +-
 .../python-rabbitair/default.nix              |  2 +-
 .../python-modules/python-sat/default.nix     |  2 +-
 .../python-modules/python-tds/default.nix     |  2 +-
 .../python-modules/python-twitter/default.nix |  2 +-
 .../python-u2flib-server/default.nix          |  2 +-
 .../python-modules/python-xapp/default.nix    |  2 +-
 .../python-modules/python-yakh/default.nix    |  2 +-
 .../python3-eventlib/default.nix              |  2 +-
 .../python-modules/pythonix/default.nix       |  2 +-
 .../python-modules/pytomlpp/default.nix       |  2 +-
 .../python-modules/pytube/default.nix         |  2 +-
 .../python-modules/pytun/default.nix          |  2 +-
 .../python-modules/pyuca/default.nix          |  2 +-
 .../python-modules/pyupgrade/default.nix      |  2 +-
 .../python-modules/pyuseragents/default.nix   |  2 +-
 .../python-modules/pyversasense/default.nix   |  2 +-
 .../python-modules/pyvolumio/default.nix      |  2 +-
 .../python-modules/pywavefront/default.nix    |  2 +-
 .../python-modules/pywebcopy/default.nix      |  2 +-
 .../python-modules/pywizlight/default.nix     |  2 +-
 .../python-modules/pyws66i/default.nix        |  2 +-
 .../pyxiaomigateway/default.nix               |  2 +-
 .../python-modules/qnap-qsw/default.nix       |  2 +-
 .../python-modules/quadprog/default.nix       |  2 +-
 .../python-modules/quantiphy-eval/default.nix |  2 +-
 .../quantum-gateway/default.nix               |  2 +-
 .../python-modules/questo/default.nix         |  2 +-
 .../python-modules/radiotherm/default.nix     |  2 +-
 .../python-modules/radon/default.nix          |  2 +-
 .../range-typed-integers/default.nix          |  2 +-
 .../python-modules/rank-bm25/default.nix      |  2 +-
 .../python-modules/rapidfuzz-capi/default.nix |  2 +-
 .../python-modules/ratelimit/default.nix      |  2 +-
 .../python-modules/raven/default.nix          |  2 +-
 .../readability-lxml/default.nix              |  2 +-
 .../python-modules/readlike/default.nix       |  2 +-
 .../python-modules/readmdict/default.nix      |  2 +-
 .../python-modules/recommonmark/default.nix   |  2 +-
 .../rectangle-packer/default.nix              |  2 +-
 .../python-modules/rectpack/default.nix       |  2 +-
 .../python-modules/releases/default.nix       |  2 +-
 .../python-modules/remi/default.nix           |  2 +-
 .../python-modules/remote-pdb/default.nix     |  2 +-
 .../python-modules/reparser/default.nix       |  2 +-
 .../python-modules/reprint/default.nix        |  2 +-
 .../python-modules/reprshed/default.nix       |  2 +-
 .../requests-credssp/default.nix              |  2 +-
 .../requests-http-signature/default.nix       |  2 +-
 .../requests-kerberos/default.nix             |  2 +-
 .../requests-pkcs12/default.nix               |  2 +-
 .../python-modules/resolvelib/default.nix     |  2 +-
 .../python-modules/result/default.nix         |  2 +-
 .../python-modules/rfc6555/default.nix        |  2 +-
 .../rich-argparse-plus/default.nix            |  2 +-
 .../ripe-atlas-sagan/default.nix              |  2 +-
 .../python-modules/rlp/default.nix            |  2 +-
 .../python-modules/roku/default.nix           |  2 +-
 .../python-modules/roonapi/default.nix        |  2 +-
 .../python-modules/ropper/default.nix         |  2 +-
 .../python-modules/rowan/default.nix          |  2 +-
 .../python-modules/rpi-bad-power/default.nix  |  2 +-
 .../python-modules/rply/default.nix           |  2 +-
 .../python-modules/rtoml/default.nix          |  2 +-
 .../python-modules/ruffus/default.nix         |  2 +-
 .../python-modules/runs/default.nix           |  2 +-
 .../python-modules/rustworkx/default.nix      |  2 +-
 .../python-modules/rxv/default.nix            |  2 +-
 .../python-modules/sacremoses/default.nix     |  2 +-
 .../python-modules/sarge/default.nix          |  2 +-
 .../python-modules/scramp/default.nix         |  2 +-
 .../python-modules/seekpath/default.nix       |  2 +-
 .../python-modules/segments/default.nix       |  2 +-
 .../python-modules/semgrep/default.nix        |  2 +-
 .../sentence-splitter/default.nix             |  2 +-
 .../python-modules/sepaxml/default.nix        |  2 +-
 .../python-modules/seqeval/default.nix        |  2 +-
 .../python-modules/seventeentrack/default.nix |  2 +-
 .../python-modules/shellescape/default.nix    |  2 +-
 .../python-modules/shutilwhich/default.nix    |  2 +-
 .../python-modules/simanneal/default.nix      |  2 +-
 .../simple-rest-client/default.nix            |  2 +-
 .../python-modules/simpleaudio/default.nix    |  2 +-
 .../python-modules/simplehound/default.nix    |  2 +-
 .../python-modules/simplenote/default.nix     |  2 +-
 .../python-modules/sklearn-deap/default.nix   |  2 +-
 .../python-modules/skyfield/default.nix       |  2 +-
 .../python-modules/skytemple-dtef/default.nix |  2 +-
 .../skytemple-eventserver/default.nix         |  2 +-
 .../skytemple-files/default.nix               |  2 +-
 .../skytemple-icons/default.nix               |  2 +-
 .../python-modules/skytemple-rust/default.nix |  2 +-
 .../skytemple-ssb-debugger/default.nix        |  2 +-
 .../python-modules/slicedimage/default.nix    |  2 +-
 .../python-modules/slugid/default.nix         |  2 +-
 .../python-modules/snuggs/default.nix         |  2 +-
 .../socketio-client/default.nix               |  2 +-
 .../python-modules/solidpython2/default.nix   |  2 +-
 .../python-modules/solo-python/default.nix    |  2 +-
 .../somfy-mylink-synergy/default.nix          |  2 +-
 .../python-modules/somweb/default.nix         |  2 +-
 .../sortedcollections/default.nix             |  2 +-
 .../sortedcontainers/default.nix              |  2 +-
 .../sphinx-basic-ng/default.nix               |  2 +-
 .../sphinx-better-theme/default.nix           |  2 +-
 .../sphinx-copybutton/default.nix             |  2 +-
 .../sphinx-hoverxref/default.nix              |  2 +-
 .../sphinx-inline-tabs/default.nix            |  2 +-
 .../python-modules/sphinx-issues/default.nix  |  2 +-
 .../sphinx-lv2-theme/default.nix              |  2 +-
 .../python-modules/spiderpy/default.nix       |  2 +-
 .../sqlalchemy-file/default.nix               |  2 +-
 .../python-modules/ssdpy/default.nix          |  2 +-
 .../python-modules/sshpubkeys/default.nix     |  2 +-
 .../starlette-admin/default.nix               |  2 +-
 .../python-modules/static3/default.nix        |  2 +-
 .../python-modules/staticjinja/default.nix    |  2 +-
 .../python-modules/stopit/default.nix         |  2 +-
 .../python-modules/stransi/default.nix        |  2 +-
 .../python-modules/strct/default.nix          |  2 +-
 .../streamcontroller-plugin-tools/default.nix |  2 +-
 .../streaming-form-data/default.nix           |  2 +-
 .../stups-cli-support/default.nix             |  2 +-
 .../python-modules/stups-fullstop/default.nix |  2 +-
 .../python-modules/stups-pierone/default.nix  |  2 +-
 .../python-modules/stups-tokens/default.nix   |  2 +-
 .../python-modules/stups-zign/default.nix     |  2 +-
 .../python-modules/sumtypes/default.nix       |  2 +-
 .../python-modules/svgwrite/default.nix       |  2 +-
 .../swagger-spec-validator/default.nix        |  2 +-
 .../python-modules/swspotify/default.nix      |  2 +-
 .../python-modules/syncer/default.nix         |  2 +-
 .../python-modules/systembridge/default.nix   |  2 +-
 .../python-modules/systemd/default.nix        |  2 +-
 .../systemdunitparser/default.nix             |  2 +-
 .../python-modules/tabview/default.nix        |  2 +-
 .../python-modules/tahoma-api/default.nix     |  2 +-
 .../python-modules/tailer/default.nix         |  2 +-
 .../python-modules/taxi/default.nix           |  2 +-
 .../python-modules/tbats/default.nix          |  2 +-
 .../python-modules/tcxparser/default.nix      |  2 +-
 .../python-modules/tdir/default.nix           |  2 +-
 .../python-modules/telepath/default.nix       |  2 +-
 .../python-modules/telfhash/default.nix       |  2 +-
 .../python-modules/termplotlib/default.nix    |  2 +-
 .../tesla-wall-connector/default.nix          |  2 +-
 .../python-modules/test-tube/default.nix      |  2 +-
 .../python-modules/testbook/default.nix       |  2 +-
 .../python-modules/textfsm/default.nix        |  2 +-
 .../python-modules/textstat/default.nix       |  2 +-
 .../python-modules/textx/default.nix          |  2 +-
 .../python-modules/thorlabspm100/default.nix  |  2 +-
 .../threat9-test-bed/default.nix              |  2 +-
 .../python-modules/tikzplotlib/default.nix    |  2 +-
 .../python-modules/timeago/default.nix        |  2 +-
 .../python-modules/tls-parser/default.nix     |  2 +-
 .../python-modules/tlv8/default.nix           |  2 +-
 .../python-modules/tmb/default.nix            |  2 +-
 .../python-modules/tokenize-rt/default.nix    |  2 +-
 .../python-modules/tokenlib/default.nix       |  2 +-
 .../python-modules/tomli-w/default.nix        |  2 +-
 .../python-modules/tomli/default.nix          |  2 +-
 .../python-modules/torpy/default.nix          |  2 +-
 .../python-modules/torrent-parser/default.nix |  2 +-
 .../python-modules/trakit/default.nix         |  2 +-
 .../tree-sitter-languages/default.nix         |  2 +-
 .../tree-sitter-make/default.nix              |  2 +-
 .../python-modules/trio-websocket/default.nix |  2 +-
 .../python-modules/tunigo/default.nix         |  2 +-
 .../tuya-iot-py-sdk/default.nix               |  2 +-
 .../python-modules/tuyaha/default.nix         |  2 +-
 .../python-modules/tweedledum/default.nix     |  2 +-
 .../python-modules/typesystem/default.nix     |  2 +-
 .../python-modules/uasiren/default.nix        |  2 +-
 .../python-modules/ueagle/default.nix         |  2 +-
 .../python-modules/ufolint/default.nix        |  2 +-
 .../python-modules/ukkonen/default.nix        |  2 +-
 .../python-modules/unasync/default.nix        |  2 +-
 .../python-modules/unifiled/default.nix       |  2 +-
 .../python-modules/upass/default.nix          |  2 +-
 .../python-modules/update-dotdee/default.nix  |  2 +-
 .../python-modules/upnpy/default.nix          |  2 +-
 .../python-modules/uranium/default.nix        |  2 +-
 .../python-modules/url-normalize/default.nix  |  2 +-
 .../python-modules/urlman/default.nix         |  2 +-
 .../python-modules/urlpy/default.nix          |  2 +-
 .../python-modules/usbtmc/default.nix         |  2 +-
 .../python-modules/user-agents/default.nix    |  2 +-
 .../python-modules/ush/default.nix            |  2 +-
 .../python-modules/utils/default.nix          |  2 +-
 .../python-modules/vat-moss/default.nix       |  2 +-
 .../python-modules/verboselogs/default.nix    |  2 +-
 .../python-modules/versionfinder/default.nix  |  2 +-
 .../python-modules/vfblib/default.nix         |  2 +-
 .../python-modules/vincenty/default.nix       |  2 +-
 .../virtualenv-clone/default.nix              |  2 +-
 .../python-modules/visions/default.nix        |  2 +-
 .../python-modules/vnoise/default.nix         |  2 +-
 .../python-modules/vpk/default.nix            |  2 +-
 .../python-modules/vttlib/default.nix         |  2 +-
 .../python-modules/vultr/default.nix          |  2 +-
 .../python-modules/vxi11/default.nix          |  2 +-
 .../python-modules/wasmer/default.nix         |  2 +-
 .../python-modules/wasserstein/default.nix    |  2 +-
 .../python-modules/wat/default.nix            |  2 +-
 .../python-modules/webthing/default.nix       |  2 +-
 .../python-modules/wgnlpy/default.nix         |  2 +-
 .../python-modules/whois-api/default.nix      |  2 +-
 .../python-modules/widlparser/default.nix     |  2 +-
 .../python-modules/wifi/default.nix           |  2 +-
 .../python-modules/wikitextparser/default.nix |  2 +-
 .../python-modules/wirerope/default.nix       |  2 +-
 .../python-modules/worldengine/default.nix    |  2 +-
 .../python-modules/wsdiscovery/default.nix    |  2 +-
 .../python-modules/wsgiproxy2/default.nix     |  2 +-
 .../wtforms-bootstrap5/default.nix            |  2 +-
 .../python-modules/xbox-webapi/default.nix    |  2 +-
 .../python-modules/xdot/default.nix           |  2 +-
 .../python-modules/xmind/default.nix          |  2 +-
 .../python-modules/xmod/default.nix           |  2 +-
 .../xpath-expressions/default.nix             |  2 +-
 .../python-modules/xpybutil/default.nix       |  2 +-
 .../python-modules/xtensor-python/default.nix |  2 +-
 .../python-modules/yacs/default.nix           |  2 +-
 .../python-modules/yasi/default.nix           |  2 +-
 .../python-modules/zenoh/default.nix          |  2 +-
 .../python-modules/zigpy-cc/default.nix       |  2 +-
 .../python-modules/zlib-ng/default.nix        |  2 +-
 .../zulip-emoji-mapping/default.nix           |  2 +-
 .../python-modules/zulip/default.nix          |  2 +-
 .../python2-modules/pip/default.nix           |  2 +-
 .../python2-modules/pycairo/default.nix       |  2 +-
 .../python2-modules/setuptools/default.nix    |  2 +-
 .../python2-modules/wheel/default.nix         |  2 +-
 .../rocm-modules/5/rocm-docs-core/default.nix |  2 +-
 .../rocm-modules/6/rocm-docs-core/default.nix |  2 +-
 .../by-name/mu/mustache-tcl/package.nix       |  2 +-
 .../by-name/tc/tclreadline/package.nix        |  2 +-
 .../tcl-modules/by-name/tc/tclx/package.nix   |  2 +-
 .../tcl-modules/critcl/default.nix            |  2 +-
 .../tools/amazon-qldb-shell/default.nix       |  2 +-
 .../analysis/cargo-tarpaulin/default.nix      |  2 +-
 .../tools/analysis/dotenv-linter/default.nix  |  2 +-
 .../tools/analysis/flow/default.nix           |  2 +-
 .../tools/analysis/ikos/default.nix           |  2 +-
 .../tools/analysis/jdepend/default.nix        |  2 +-
 .../tools/analysis/rizin/cutter.nix           |  2 +-
 .../development/tools/analysis/rr/default.nix |  2 +-
 .../tools/analysis/snowman/default.nix        |  2 +-
 .../tflint-plugins/tflint-ruleset-aws.nix     |  2 +-
 .../tflint-plugins/tflint-ruleset-google.nix  |  2 +-
 .../tools/asn2quickder/default.nix            |  2 +-
 pkgs/development/tools/boomerang/default.nix  |  2 +-
 .../tools/build-managers/buck/default.nix     |  2 +-
 .../tools/build-managers/moon/default.nix     |  2 +-
 .../tools/build-managers/qbs/default.nix      |  2 +-
 .../tools/build-managers/rebar/default.nix    |  2 +-
 .../tools/build-managers/rebar3/default.nix   |  2 +-
 pkgs/development/tools/buildah/default.nix    |  2 +-
 pkgs/development/tools/comby/default.nix      |  2 +-
 .../buildbot/master.nix                       |  2 +-
 .../buildkite-test-collector-rust/default.nix |  2 +-
 .../continuous-integration/drone/default.nix  |  2 +-
 .../tools/database/replibyte/default.nix      |  2 +-
 .../database/surrealdb-migrations/default.nix |  2 +-
 pkgs/development/tools/devbox/default.nix     |  2 +-
 pkgs/development/tools/devpod/default.nix     |  2 +-
 pkgs/development/tools/dump_syms/default.nix  |  2 +-
 pkgs/development/tools/esbuild/default.nix    |  2 +-
 pkgs/development/tools/gammaray/default.nix   |  2 +-
 pkgs/development/tools/gauge/default.nix      |  2 +-
 .../tools/gauge/plugins/js/default.nix        |  2 +-
 pkgs/development/tools/git-ps-rs/default.nix  |  2 +-
 .../tools/github/cligh/default.nix            |  2 +-
 pkgs/development/tools/glslviewer/default.nix |  2 +-
 pkgs/development/tools/gptcommit/default.nix  |  2 +-
 .../tools/haskell/vaultenv/default.nix        |  2 +-
 pkgs/development/tools/hors/default.nix       |  2 +-
 pkgs/development/tools/htmlq/default.nix      |  2 +-
 pkgs/development/tools/ilspycmd/default.nix   |  2 +-
 pkgs/development/tools/jless/default.nix      |  2 +-
 pkgs/development/tools/kdash/default.nix      |  2 +-
 pkgs/development/tools/kubie/default.nix      |  2 +-
 .../tools/kustomize/kustomize-sops.nix        |  2 +-
 .../language-servers/crystalline/default.nix  |  2 +-
 .../development/tools/loganalyzer/default.nix |  2 +-
 pkgs/development/tools/minizinc/default.nix   |  2 +-
 pkgs/development/tools/minizinc/ide.nix       |  2 +-
 .../development/tools/misc/chruby/default.nix |  2 +-
 .../tools/misc/coccinelle/default.nix         |  2 +-
 .../tools/misc/coreboot-toolchain/default.nix |  2 +-
 pkgs/development/tools/misc/dura/default.nix  |  2 +-
 .../tools/misc/fswatch/default.nix            |  2 +-
 .../tools/misc/linuxkit/default.nix           |  2 +-
 .../tools/misc/nixbang/default.nix            |  2 +-
 pkgs/development/tools/misc/premake/5.nix     |  2 +-
 .../tools/misc/pwninit/default.nix            |  2 +-
 pkgs/development/tools/misc/seer/default.nix  |  2 +-
 pkgs/development/tools/misc/tokei/default.nix |  2 +-
 .../tools/misc/whatstyle/default.nix          |  2 +-
 .../tools/ocaml/camlp5/default.nix            |  2 +-
 pkgs/development/tools/ocaml/cppo/default.nix |  4 +-
 .../tools/ocaml/obelisk/default.nix           |  2 +-
 .../ocaml/ocaml-recovery-parser/default.nix   |  2 +-
 .../tools/ocaml/ocamlbuild/default.nix        |  2 +-
 .../tools/ocaml/ocamlscript/default.nix       |  2 +-
 .../tools/ocaml/ocp-build/default.nix         |  2 +-
 .../tools/ocaml/ocp-indent/default.nix        |  2 +-
 .../tools/ocaml/ocp-index/default.nix         |  2 +-
 pkgs/development/tools/pactorio/default.nix   |  2 +-
 .../tools/profiling/heaptrack/default.nix     |  2 +-
 .../tools/protoc-gen-grpc-web/default.nix     |  2 +-
 pkgs/development/tools/py-spy/default.nix     |  2 +-
 pkgs/development/tools/remodel/default.nix    |  2 +-
 pkgs/development/tools/rover/default.nix      |  2 +-
 pkgs/development/tools/rtags/default.nix      |  2 +-
 pkgs/development/tools/rubyfmt/default.nix    |  2 +-
 .../tools/rust/cargo-clone/default.nix        |  2 +-
 .../tools/rust/cargo-codspeed/default.nix     |  2 +-
 .../tools/rust/cargo-crev/default.nix         |  2 +-
 .../tools/rust/cargo-edit/default.nix         |  2 +-
 .../tools/rust/cargo-flamegraph/default.nix   |  2 +-
 .../tools/rust/cargo-fund/default.nix         |  2 +-
 .../tools/rust/cargo-ndk/default.nix          |  2 +-
 .../tools/rust/cargo-udeps/default.nix        |  2 +-
 .../tools/rust/cargo-vet/default.nix          |  2 +-
 .../tools/rust/cargo-watch/default.nix        |  2 +-
 .../tools/rust/cargo-whatfeatures/default.nix |  2 +-
 .../tools/rust/cbindgen/default.nix           |  2 +-
 .../default.nix                               |  2 +-
 .../development/tools/rust/rustup/default.nix |  2 +-
 .../tools/rust/sqlx-cli/default.nix           |  2 +-
 pkgs/development/tools/sentry-cli/default.nix |  2 +-
 pkgs/development/tools/simavr/default.nix     |  2 +-
 .../tools/solarus-quest-editor/default.nix    |  2 +-
 pkgs/development/tools/toluapp/default.nix    |  2 +-
 pkgs/development/tools/viceroy/default.nix    |  2 +-
 pkgs/development/tools/wasmedge/default.nix   |  2 +-
 pkgs/development/tools/wrangler_1/default.nix |  2 +-
 pkgs/development/web/playwright/driver.nix    |  2 +-
 pkgs/games/anki/default.nix                   |  2 +-
 pkgs/games/arx-libertatis/default.nix         |  2 +-
 pkgs/games/blightmud/default.nix              |  2 +-
 pkgs/games/bugdom/default.nix                 |  2 +-
 pkgs/games/chiaki-ng/default.nix              |  2 +-
 pkgs/games/cockatrice/default.nix             |  2 +-
 pkgs/games/crawl/default.nix                  |  2 +-
 pkgs/games/devilutionx/default.nix            |  2 +-
 pkgs/games/doom-ports/slade/default.nix       |  2 +-
 .../dwarf-therapist/default.nix               |  2 +-
 pkgs/games/easyrpg-player/default.nix         |  2 +-
 pkgs/games/exult/default.nix                  |  2 +-
 pkgs/games/fallout-ce/fallout-ce.nix          |  2 +-
 pkgs/games/fallout-ce/fallout2-ce.nix         |  2 +-
 pkgs/games/ferium/default.nix                 |  2 +-
 pkgs/games/flare/engine.nix                   |  2 +-
 pkgs/games/flare/game.nix                     |  2 +-
 pkgs/games/gshogi/default.nix                 |  2 +-
 pkgs/games/iortcw/sp.nix                      |  2 +-
 pkgs/games/koboredux/default.nix              |  2 +-
 pkgs/games/ldmud/default.nix                  |  2 +-
 pkgs/games/leela-zero/default.nix             |  2 +-
 pkgs/games/libremines/default.nix             |  2 +-
 pkgs/games/nile/default.nix                   |  2 +-
 pkgs/games/openra_2019/mods.nix               | 12 ++--
 pkgs/games/openspades/default.nix             |  2 +-
 pkgs/games/orthorobot/default.nix             |  2 +-
 pkgs/games/pentobi/default.nix                |  2 +-
 pkgs/games/pokerth/default.nix                |  2 +-
 pkgs/games/pro-office-calculator/default.nix  |  2 +-
 pkgs/games/qtads/default.nix                  |  2 +-
 pkgs/games/scummvm/default.nix                |  2 +-
 .../games/shattered-pixel-dungeon/default.nix |  2 +-
 .../rat-king-adventure/default.nix            |  2 +-
 .../shattered-pixel-dungeon/rkpd2/default.nix |  2 +-
 pkgs/games/solarus/default.nix                |  2 +-
 pkgs/games/stuntrally/default.nix             |  4 +-
 pkgs/games/super-tux-kart/default.nix         |  2 +-
 pkgs/games/teeworlds/default.nix              |  2 +-
 pkgs/games/vcmi/default.nix                   |  2 +-
 pkgs/games/wesnoth/default.nix                |  2 +-
 .../applet-window-buttons6/default.nix        |  2 +-
 pkgs/kde/third-party/koi/default.nix          |  2 +-
 pkgs/misc/apulse/default.nix                  |  2 +-
 pkgs/misc/calaos/installer/default.nix        |  2 +-
 pkgs/misc/cups/filters.nix                    |  2 +-
 pkgs/misc/logging/beats/7.x.nix               |  2 +-
 pkgs/misc/opcua-client-gui/default.nix        |  2 +-
 pkgs/misc/t-rec/default.nix                   |  2 +-
 pkgs/misc/tmux-plugins/default.nix            | 10 ++--
 .../tmux-plugins/tmux-fingers/default.nix     |  2 +-
 pkgs/misc/wiki-tui/default.nix                |  2 +-
 .../bsd/freebsd/pkgs/drm-kmod-firmware.nix    |  2 +-
 pkgs/os-specific/darwin/khd/default.nix       |  2 +-
 pkgs/os-specific/darwin/noah/default.nix      |  2 +-
 pkgs/os-specific/darwin/pngpaste/default.nix  |  2 +-
 .../reattach-to-user-namespace/default.nix    |  2 +-
 pkgs/os-specific/darwin/sigtool/default.nix   |  2 +-
 pkgs/os-specific/darwin/trash/default.nix     |  2 +-
 pkgs/os-specific/linux/acpi-call/default.nix  |  2 +-
 pkgs/os-specific/linux/akvcam/default.nix     |  2 +-
 pkgs/os-specific/linux/conky/default.nix      |  2 +-
 pkgs/os-specific/linux/corefreq/default.nix   |  2 +-
 .../linux/cpupower-gui/default.nix            |  2 +-
 pkgs/os-specific/linux/digimend/default.nix   |  2 +-
 pkgs/os-specific/linux/facetimehd/default.nix |  2 +-
 .../linux/firmware/ath9k/default.nix          |  2 +-
 .../linux/firmware/raspberrypi/default.nix    |  2 +-
 pkgs/os-specific/linux/i7z/default.nix        |  2 +-
 pkgs/os-specific/linux/iputils/default.nix    |  2 +-
 pkgs/os-specific/linux/libbpf/0.x.nix         |  2 +-
 pkgs/os-specific/linux/libbpf/default.nix     |  2 +-
 .../linux/lttng-modules/default.nix           |  2 +-
 pkgs/os-specific/linux/mcelog/default.nix     |  2 +-
 pkgs/os-specific/linux/nullfs/default.nix     |  2 +-
 pkgs/os-specific/linux/projecteur/default.nix |  2 +-
 pkgs/os-specific/linux/r8168/default.nix      |  2 +-
 pkgs/os-specific/linux/sysdig/default.nix     |  2 +-
 .../linux/system76-acpi/default.nix           |  2 +-
 .../os-specific/linux/system76-io/default.nix |  2 +-
 pkgs/os-specific/linux/system76/default.nix   |  2 +-
 pkgs/os-specific/linux/systemd/default.nix    |  2 +-
 pkgs/os-specific/linux/usbrelay/default.nix   |  2 +-
 .../linux/v4l2loopback/default.nix            |  2 +-
 .../linux/veikk-linux-driver/default.nix      |  2 +-
 .../linux/virtio_vmmci/default.nix            |  2 +-
 pkgs/os-specific/linux/vmm_clock/default.nix  |  2 +-
 pkgs/os-specific/windows/dlfcn/default.nix    |  2 +-
 .../windows/npiperelay/default.nix            |  2 +-
 pkgs/servers/authelia/sources.nix             |  2 +-
 pkgs/servers/code-server/default.nix          |  2 +-
 pkgs/servers/etcd/3.4.nix                     |  2 +-
 pkgs/servers/etcd/3.5/default.nix             |  2 +-
 pkgs/servers/firebird/default.nix             |  4 +-
 pkgs/servers/geospatial/martin/default.nix    |  2 +-
 pkgs/servers/hockeypuck/sources.nix           |  2 +-
 pkgs/servers/home-assistant/cli.nix           |  2 +-
 .../custom-components/bodymiscale/package.nix |  2 +-
 .../dirigera_platform/package.nix             |  2 +-
 .../custom-components/dwd/package.nix         |  2 +-
 .../custom-components/emporia_vue/package.nix |  2 +-
 .../local_luftdaten/package.nix               |  2 +-
 .../custom-components/localtuya/package.nix   |  2 +-
 .../midea-air-appliances-lan/package.nix      |  2 +-
 .../custom-components/ntfy/package.nix        |  2 +-
 .../philips_airpurifier_coap/package.nix      |  2 +-
 .../smartthinq-sensors/package.nix            |  2 +-
 .../solis-sensor/package.nix                  |  2 +-
 .../xiaomi_gateway3/package.nix               |  2 +-
 .../custom-components/xiaomi_miot/package.nix |  2 +-
 .../apexcharts-card/package.nix               |  2 +-
 .../atomic-calendar-revive/package.nix        |  2 +-
 .../bubble-card/package.nix                   |  2 +-
 .../button-card/package.nix                   |  2 +-
 .../card-mod/package.nix                      |  2 +-
 .../decluttering-card/package.nix             |  2 +-
 .../hourly-weather/package.nix                |  2 +-
 .../lg-webos-remote-control/package.nix       |  2 +-
 .../mini-media-player/package.nix             |  2 +-
 .../multiple-entity-row/package.nix           |  2 +-
 .../mushroom/package.nix                      |  2 +-
 .../sankey-chart/package.nix                  |  2 +-
 .../template-entity-row/package.nix           |  2 +-
 .../universal-remote-card/package.nix         |  2 +-
 .../vacuum-card/package.nix                   |  2 +-
 .../valetudo-map-card/package.nix             |  2 +-
 .../versatile-thermostat-ui-card/package.nix  |  2 +-
 .../zigbee2mqtt-networkmap/package.nix        |  2 +-
 pkgs/servers/home-assistant/default.nix       |  4 +-
 .../mod_auth_mellon/default.nix               |  2 +-
 .../apache-modules/mod_cspnonce/default.nix   |  2 +-
 .../apache-modules/mod_fastcgi/default.nix    |  2 +-
 .../http/apache-modules/mod_wsgi/default.nix  |  2 +-
 pkgs/servers/http/nginx/modules.nix           |  6 +-
 pkgs/servers/http/tengine/default.nix         |  2 +-
 pkgs/servers/icingaweb2/default.nix           |  2 +-
 pkgs/servers/icingaweb2/ipl.nix               |  2 +-
 .../icingaweb2/theme-april/default.nix        |  2 +-
 pkgs/servers/icingaweb2/theme-lsd/default.nix |  2 +-
 .../icingaweb2/theme-particles/default.nix    |  2 +-
 .../servers/icingaweb2/theme-snow/default.nix |  2 +-
 .../icingaweb2/theme-spring/default.nix       |  2 +-
 .../icingaweb2/theme-unicorn/default.nix      |  2 +-
 pkgs/servers/icingaweb2/thirdparty.nix        |  2 +-
 pkgs/servers/jackett/default.nix              |  2 +-
 pkgs/servers/krill/default.nix                |  2 +-
 pkgs/servers/mail/mailpit/default.nix         |  2 +-
 pkgs/servers/mail/opensmtpd/filter-rspamd.nix |  2 +-
 pkgs/servers/mastodon/source.nix              |  2 +-
 pkgs/servers/memos/default.nix                |  2 +-
 pkgs/servers/monitoring/grafana/default.nix   |  2 +-
 pkgs/servers/monitoring/icinga2/default.nix   |  2 +-
 .../nagios-plugins/check_openvpn/default.nix  |  2 +-
 .../openbsd_snmp3_check/default.nix           |  2 +-
 .../prometheus/apcupsd-exporter.nix           |  2 +-
 .../monitoring/prometheus/atlas-exporter.nix  |  2 +-
 .../monitoring/prometheus/aws-s3-exporter.nix |  2 +-
 .../monitoring/prometheus/bind-exporter.nix   |  2 +-
 .../monitoring/prometheus/bird-exporter.nix   |  2 +-
 .../prometheus/bitcoin-exporter.nix           |  2 +-
 .../prometheus/cloudflare-exporter.nix        |  2 +-
 .../prometheus/collectd-exporter.nix          |  2 +-
 .../prometheus/dnsmasq-exporter.nix           |  2 +-
 .../monitoring/prometheus/domain-exporter.nix |  2 +-
 .../monitoring/prometheus/fastly-exporter.nix |  2 +-
 .../monitoring/prometheus/flow-exporter.nix   |  2 +-
 .../gitlab-ci-pipelines-exporter.nix          |  2 +-
 .../prometheus/graphite-exporter.nix          |  2 +-
 .../prometheus/haproxy-exporter.nix           |  2 +-
 .../monitoring/prometheus/ipmi-exporter.nix   |  2 +-
 .../monitoring/prometheus/json-exporter.nix   |  2 +-
 .../prometheus/junos-czerwonk-exporter.nix    |  2 +-
 .../prometheus/keylight-exporter.nix          |  2 +-
 .../servers/monitoring/prometheus/kthxbye.nix |  2 +-
 .../monitoring/prometheus/lnd-exporter.nix    |  2 +-
 .../prometheus/modemmanager-exporter.nix      |  2 +-
 .../prometheus/mongodb-exporter.nix           |  2 +-
 .../monitoring/prometheus/mysqld-exporter.nix |  2 +-
 .../monitoring/prometheus/nats-exporter.nix   |  2 +-
 .../prometheus/nextcloud-exporter.nix         |  2 +-
 .../monitoring/prometheus/nginx-exporter.nix  |  2 +-
 .../prometheus/nginxlog-exporter.nix          |  2 +-
 .../monitoring/prometheus/nut-exporter.nix    |  2 +-
 .../prometheus/pgbouncer-exporter.nix         |  2 +-
 .../prometheus/php-fpm-exporter.nix           |  2 +-
 .../monitoring/prometheus/pihole-exporter.nix |  2 +-
 .../monitoring/prometheus/ping-exporter.nix   |  2 +-
 .../prometheus/postgres-exporter.nix          |  2 +-
 .../prometheus/process-exporter.nix           |  2 +-
 .../monitoring/prometheus/prom2json.nix       |  2 +-
 .../monitoring/prometheus/redis-exporter.nix  |  2 +-
 .../prometheus/rtl_433-exporter.nix           |  2 +-
 pkgs/servers/monitoring/prometheus/sachet.nix |  2 +-
 .../monitoring/prometheus/script-exporter.nix |  2 +-
 .../monitoring/prometheus/shelly-exporter.nix |  2 +-
 .../prometheus/smokeping-prober.nix           |  2 +-
 .../monitoring/prometheus/snmp-exporter.nix   |  2 +-
 .../monitoring/prometheus/sql-exporter.nix    |  2 +-
 .../monitoring/prometheus/statsd-exporter.nix |  2 +-
 .../prometheus/systemd-exporter.nix           |  2 +-
 .../monitoring/prometheus/v2ray-exporter.nix  |  2 +-
 .../prometheus/varnish-exporter.nix           |  2 +-
 .../prometheus/wireguard-exporter.nix         |  2 +-
 .../monitoring/prometheus/xmpp-alerts.nix     |  2 +-
 pkgs/servers/monitoring/sensu-go/default.nix  |  2 +-
 pkgs/servers/mpd/default.nix                  |  2 +-
 pkgs/servers/mtprotoproxy/default.nix         |  2 +-
 pkgs/servers/nosql/influxdb/default.nix       |  2 +-
 pkgs/servers/nosql/influxdb2/cli.nix          |  2 +-
 pkgs/servers/nosql/influxdb2/default.nix      |  2 +-
 pkgs/servers/nosql/influxdb2/provision.nix    |  2 +-
 .../nosql/influxdb2/token-manipulator.nix     |  2 +-
 pkgs/servers/openvscode-server/default.nix    |  2 +-
 pkgs/servers/osmocom/libasn1c/default.nix     |  2 +-
 pkgs/servers/oxigraph/default.nix             |  2 +-
 pkgs/servers/pingvin-share/default.nix        |  2 +-
 pkgs/servers/piping-server-rust/default.nix   |  2 +-
 pkgs/servers/plik/programs.nix                |  2 +-
 pkgs/servers/polaris/default.nix              |  2 +-
 pkgs/servers/rtrtr/default.nix                |  2 +-
 pkgs/servers/search/quickwit/default.nix      |  2 +-
 pkgs/servers/sip/freeswitch/default.nix       |  2 +-
 pkgs/servers/spicedb/default.nix              |  2 +-
 pkgs/servers/spicedb/zed.nix                  |  2 +-
 .../sql/mariadb/connector-c/default.nix       |  2 +-
 pkgs/servers/teleport/generic.nix             |  2 +-
 .../tracing/honeycomb/honeymarker/default.nix |  2 +-
 .../tracing/honeycomb/honeytail/default.nix   |  2 +-
 .../tracing/honeycomb/honeyvent/default.nix   |  2 +-
 pkgs/servers/trezord/default.nix              |  2 +-
 pkgs/servers/trickster/trickster.nix          |  2 +-
 pkgs/servers/unpackerr/default.nix            |  2 +-
 pkgs/servers/varnish/digest.nix               |  2 +-
 pkgs/servers/varnish/dynamic.nix              |  2 +-
 pkgs/servers/varnish/modules.nix              |  2 +-
 pkgs/servers/web-apps/bookstack/default.nix   |  2 +-
 pkgs/servers/web-apps/discourse/default.nix   |  2 +-
 pkgs/servers/web-apps/freshrss/default.nix    |  2 +-
 .../web-apps/freshrss/extensions/default.nix  |  4 +-
 pkgs/servers/web-apps/lemmy/server.nix        |  2 +-
 pkgs/servers/web-apps/lemmy/ui.nix            |  2 +-
 pkgs/servers/web-apps/outline/default.nix     |  2 +-
 pkgs/servers/web-apps/plausible/default.nix   |  2 +-
 pkgs/shells/carapace/default.nix              |  2 +-
 pkgs/shells/fish/babelfish.nix                |  2 +-
 pkgs/shells/fish/plugins/async-prompt.nix     |  2 +-
 pkgs/shells/fish/plugins/autopair.nix         |  2 +-
 pkgs/shells/fish/plugins/done.nix             |  2 +-
 pkgs/shells/fish/plugins/fifc.nix             |  2 +-
 pkgs/shells/fish/plugins/fish-bd.nix          |  2 +-
 pkgs/shells/fish/plugins/fishtape.nix         |  2 +-
 pkgs/shells/fish/plugins/fishtape_3.nix       |  2 +-
 pkgs/shells/fish/plugins/forgit.nix           |  2 +-
 pkgs/shells/fish/plugins/fzf-fish.nix         |  2 +-
 .../fish/plugins/github-copilot-cli-fish.nix  |  2 +-
 pkgs/shells/fish/plugins/pisces.nix           |  2 +-
 pkgs/shells/fish/plugins/puffer.nix           |  2 +-
 pkgs/shells/fish/plugins/pure.nix             |  2 +-
 pkgs/shells/fish/plugins/sdkman-for-fish.nix  |  2 +-
 pkgs/shells/fish/plugins/sponge.nix           |  2 +-
 pkgs/shells/fish/plugins/tide.nix             |  2 +-
 pkgs/shells/fish/plugins/wakatime-fish.nix    |  2 +-
 pkgs/shells/nushell/plugins/dbus.nix          |  2 +-
 pkgs/shells/nushell/plugins/units.nix         |  2 +-
 pkgs/test/overriding.nix                      |  6 +-
 pkgs/tools/admin/aws-mfa/default.nix          |  2 +-
 pkgs/tools/admin/awsume/default.nix           |  2 +-
 pkgs/tools/admin/cdist/default.nix            |  2 +-
 pkgs/tools/admin/procs/default.nix            |  2 +-
 pkgs/tools/admin/turbovnc/default.nix         |  2 +-
 pkgs/tools/archivers/zpaq/default.nix         |  2 +-
 pkgs/tools/audio/beets/plugins/audible.nix    |  2 +-
 pkgs/tools/audio/opl3bankeditor/common.nix    |  2 +-
 pkgs/tools/backup/bupstash/default.nix        |  2 +-
 pkgs/tools/backup/monolith/default.nix        |  2 +-
 pkgs/tools/backup/rdedup/default.nix          |  2 +-
 pkgs/tools/backup/restic/default.nix          |  2 +-
 pkgs/tools/backup/restic/rest-server.nix      |  2 +-
 pkgs/tools/backup/zbackup/default.nix         |  2 +-
 pkgs/tools/cd-dvd/unetbootin/default.nix      |  2 +-
 pkgs/tools/compression/bzip3/default.nix      |  2 +-
 pkgs/tools/compression/xdelta/default.nix     |  2 +-
 pkgs/tools/compression/xdelta/unstable.nix    |  2 +-
 pkgs/tools/compression/zstd/default.nix       |  2 +-
 .../android-file-transfer/default.nix         |  2 +-
 pkgs/tools/filesystems/ceph/default.nix       |  2 +-
 pkgs/tools/filesystems/encfs/default.nix      |  2 +-
 pkgs/tools/filesystems/irods/default.nix      |  4 +-
 pkgs/tools/filesystems/kdiskmark/default.nix  |  2 +-
 pkgs/tools/filesystems/mergerfs/default.nix   |  2 +-
 pkgs/tools/filesystems/mkspiffs/default.nix   |  2 +-
 pkgs/tools/filesystems/ntfs-3g/default.nix    |  2 +-
 pkgs/tools/filesystems/romdirfs/default.nix   |  2 +-
 pkgs/tools/filesystems/s3fs/default.nix       |  2 +-
 pkgs/tools/filesystems/securefs/default.nix   |  2 +-
 pkgs/tools/games/alice-tools/default.nix      |  2 +-
 pkgs/tools/games/pokefinder/default.nix       |  2 +-
 pkgs/tools/games/slipstream/default.nix       |  2 +-
 pkgs/tools/graphics/hobbits/default.nix       |  2 +-
 pkgs/tools/graphics/maskromtool/default.nix   |  2 +-
 .../graphics/vulkan-caps-viewer/default.nix   |  2 +-
 .../waifu2x-converter-cpp/default.nix         |  2 +-
 pkgs/tools/graphics/zbar/default.nix          |  2 +-
 pkgs/tools/inputmethods/fcitx5/default.nix    |  2 +-
 .../inputmethods/fcitx5/fcitx5-bamboo.nix     |  2 +-
 .../inputmethods/fcitx5/fcitx5-chewing.nix    |  2 +-
 .../fcitx5/fcitx5-chinese-addons.nix          |  2 +-
 .../inputmethods/fcitx5/fcitx5-configtool.nix |  2 +-
 pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix |  2 +-
 .../inputmethods/fcitx5/fcitx5-hangul.nix     |  2 +-
 pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix |  2 +-
 .../tools/inputmethods/fcitx5/fcitx5-m17n.nix |  2 +-
 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix  |  2 +-
 pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix |  2 +-
 .../fcitx5/fcitx5-table-extra.nix             |  2 +-
 .../fcitx5/fcitx5-table-other.nix             |  2 +-
 .../inputmethods/fcitx5/fcitx5-unikey.nix     |  2 +-
 .../ibus-engines/ibus-hangul/default.nix      |  2 +-
 .../ibus-engines/ibus-m17n/default.nix        |  2 +-
 .../ibus-engines/ibus-pinyin/default.nix      |  2 +-
 .../ibus-engines/ibus-rime/default.nix        |  2 +-
 .../ibus-engines/ibus-table/default.nix       |  2 +-
 .../ibus-typing-booster/default.nix           |  2 +-
 pkgs/tools/inputmethods/ibus/default.nix      |  2 +-
 .../inputmethods/input-remapper/default.nix   |  2 +-
 .../interception-tools/default.nix            |  2 +-
 pkgs/tools/misc/antimicrox/default.nix        |  2 +-
 pkgs/tools/misc/aoc-cli/default.nix           |  2 +-
 pkgs/tools/misc/bat-extras/default.nix        |  2 +-
 pkgs/tools/misc/brotab/default.nix            |  2 +-
 pkgs/tools/misc/chafa/default.nix             |  2 +-
 pkgs/tools/misc/ckb-next/default.nix          |  2 +-
 pkgs/tools/misc/coreboot-utils/default.nix    |  2 +-
 pkgs/tools/misc/dijo/default.nix              |  2 +-
 pkgs/tools/misc/diskus/default.nix            |  2 +-
 pkgs/tools/misc/envchain/default.nix          |  2 +-
 pkgs/tools/misc/fclones/default.nix           |  2 +-
 pkgs/tools/misc/fclones/gui.nix               |  2 +-
 pkgs/tools/misc/ffsend/default.nix            |  2 +-
 pkgs/tools/misc/fltrdr/default.nix            |  2 +-
 pkgs/tools/misc/freshfetch/default.nix        |  2 +-
 pkgs/tools/misc/fwup/default.nix              |  2 +-
 pkgs/tools/misc/grc/default.nix               |  2 +-
 pkgs/tools/misc/grex/default.nix              |  2 +-
 pkgs/tools/misc/h/default.nix                 |  2 +-
 pkgs/tools/misc/heimdall/default.nix          |  2 +-
 pkgs/tools/misc/hiksink/default.nix           |  2 +-
 pkgs/tools/misc/hyperfine/default.nix         |  2 +-
 pkgs/tools/misc/iay/default.nix               |  2 +-
 pkgs/tools/misc/kcollectd/default.nix         |  2 +-
 .../tools/misc/krunner-translator/default.nix |  2 +-
 pkgs/tools/misc/ksnip/default.nix             |  2 +-
 .../tools/misc/lighthouse-steamvr/default.nix |  2 +-
 pkgs/tools/misc/lorri/default.nix             |  2 +-
 pkgs/tools/misc/noti/default.nix              |  2 +-
 pkgs/tools/misc/ntfy-sh/default.nix           |  2 +-
 pkgs/tools/misc/nvfancontrol/default.nix      |  2 +-
 pkgs/tools/misc/octofetch/default.nix         |  2 +-
 .../default.nix                               |  2 +-
 .../misc/opentelemetry-collector/releases.nix |  2 +-
 pkgs/tools/misc/owofetch/default.nix          |  2 +-
 .../misc/pandoc-drawio-filter/default.nix     |  2 +-
 pkgs/tools/misc/pandoc-eqnos/default.nix      |  2 +-
 pkgs/tools/misc/pandoc-fignos/default.nix     |  2 +-
 pkgs/tools/misc/pandoc-imagine/default.nix    |  2 +-
 pkgs/tools/misc/pandoc-secnos/default.nix     |  2 +-
 pkgs/tools/misc/pandoc-tablenos/default.nix   |  2 +-
 pkgs/tools/misc/parcellite/default.nix        |  2 +-
 pkgs/tools/misc/qflipper/default.nix          |  2 +-
 pkgs/tools/misc/qjoypad/default.nix           |  2 +-
 pkgs/tools/misc/radeon-profile/default.nix    |  2 +-
 pkgs/tools/misc/rmlint/default.nix            |  2 +-
 pkgs/tools/misc/rust-motd/default.nix         |  2 +-
 pkgs/tools/misc/shadowenv/default.nix         |  2 +-
 pkgs/tools/misc/sheldon/default.nix           |  2 +-
 pkgs/tools/misc/starship/default.nix          |  2 +-
 pkgs/tools/misc/synth/default.nix             |  2 +-
 .../misc/system-config-printer/default.nix    |  2 +-
 pkgs/tools/misc/tab-rs/default.nix            |  2 +-
 pkgs/tools/misc/thinkpad-scripts/default.nix  |  2 +-
 pkgs/tools/misc/tlp/default.nix               |  2 +-
 pkgs/tools/misc/tmux-sessionizer/default.nix  |  2 +-
 pkgs/tools/misc/toastify/default.nix          |  2 +-
 pkgs/tools/misc/topgrade/default.nix          |  2 +-
 pkgs/tools/misc/toybox/default.nix            |  2 +-
 pkgs/tools/misc/tremor-rs/default.nix         |  2 +-
 pkgs/tools/misc/tremor-rs/ls.nix              |  2 +-
 .../misc/veikk-linux-driver-gui/default.nix   |  2 +-
 pkgs/tools/misc/wagyu/default.nix             |  2 +-
 pkgs/tools/misc/watchexec/default.nix         |  2 +-
 pkgs/tools/misc/xflux/gui.nix                 |  2 +-
 pkgs/tools/networking/axel/default.nix        |  2 +-
 pkgs/tools/networking/bore-cli/default.nix    |  2 +-
 pkgs/tools/networking/cocom/default.nix       |  2 +-
 .../curl-impersonate/chrome/default.nix       |  2 +-
 .../curl-impersonate/firefox/default.nix      |  2 +-
 .../networking/dd-agent/datadog-agent.nix     |  2 +-
 .../networking/dd-agent/integrations-core.nix |  2 +-
 pkgs/tools/networking/dnsviz/default.nix      |  2 +-
 pkgs/tools/networking/drill/default.nix       |  2 +-
 pkgs/tools/networking/flannel/plugin.nix      |  2 +-
 pkgs/tools/networking/gandi-cli/default.nix   |  2 +-
 .../networking/gmrender-resurrect/default.nix |  2 +-
 pkgs/tools/networking/ifwifi/default.nix      |  2 +-
 pkgs/tools/networking/lxi-tools/default.nix   |  2 +-
 pkgs/tools/networking/mozwire/default.nix     |  2 +-
 pkgs/tools/networking/mtr/default.nix         |  2 +-
 pkgs/tools/networking/networkmanager/tray.nix |  2 +-
 .../octodns/providers/bind/default.nix        |  2 +-
 pkgs/tools/networking/opendrop/default.nix    |  2 +-
 .../openvpn/update-systemd-resolved.nix       |  2 +-
 pkgs/tools/networking/pingu/default.nix       |  2 +-
 pkgs/tools/networking/q/default.nix           |  2 +-
 pkgs/tools/networking/rosenpass/default.nix   |  2 +-
 pkgs/tools/networking/s3rs/default.nix        |  2 +-
 pkgs/tools/networking/suckit/default.nix      |  2 +-
 .../tools/networking/telepresence/default.nix |  2 +-
 pkgs/tools/networking/veilid/default.nix      |  2 +-
 pkgs/tools/networking/vpn-slice/default.nix   |  2 +-
 .../package-management/libcomps/default.nix   |  2 +-
 .../package-management/librepo/default.nix    |  2 +-
 pkgs/tools/package-management/lix/default.nix |  8 +--
 .../nix-eval-jobs/default.nix                 |  2 +-
 .../package-management/nix-index/default.nix  |  2 +-
 .../nix-template/default.nix                  |  2 +-
 pkgs/tools/package-management/nix/common.nix  |  2 +-
 .../package-management/nix/dependencies.nix   |  2 +-
 .../package-management/packagekit/default.nix |  2 +-
 .../package-management/packagekit/qt.nix      |  2 +-
 .../security/age-plugin-ledger/default.nix    |  2 +-
 pkgs/tools/security/b2sum/default.nix         |  2 +-
 .../bitwarden-directory-connector/default.nix |  2 +-
 pkgs/tools/security/chipsec/default.nix       |  2 +-
 .../security/chrome-token-signing/default.nix |  2 +-
 pkgs/tools/security/cosign/default.nix        |  2 +-
 pkgs/tools/security/echidna/default.nix       |  2 +-
 pkgs/tools/security/eid-mw/default.nix        |  2 +-
 pkgs/tools/security/fwbuilder/default.nix     |  2 +-
 pkgs/tools/security/fwknop/default.nix        |  2 +-
 .../ghidra/extensions/findcrypt/default.nix   |  2 +-
 .../ghidra-delinker-extension/default.nix     |  2 +-
 .../default.nix                               |  2 +-
 .../ghidra/extensions/kaiju/default.nix       |  2 +-
 .../ghidra/extensions/lightkeeper/default.nix |  2 +-
 .../ghidra/extensions/wasm/default.nix        |  2 +-
 pkgs/tools/security/gopass/default.nix        |  2 +-
 pkgs/tools/security/gopass/git-credential.nix |  2 +-
 pkgs/tools/security/gopass/hibp.nix           |  2 +-
 pkgs/tools/security/gopass/summon.nix         |  2 +-
 pkgs/tools/security/gotrue/default.nix        |  2 +-
 pkgs/tools/security/gotrue/supabase.nix       |  2 +-
 pkgs/tools/security/gpg-tui/default.nix       |  2 +-
 pkgs/tools/security/kbs2/default.nix          |  2 +-
 pkgs/tools/security/keybase/default.nix       |  2 +-
 pkgs/tools/security/krunner-pass/default.nix  |  2 +-
 pkgs/tools/security/lethe/default.nix         |  2 +-
 .../tools/security/libmodsecurity/default.nix |  2 +-
 pkgs/tools/security/nsjail/default.nix        |  2 +-
 .../pass/extensions/audit/default.nix         |  2 +-
 .../security/pass/extensions/checkup.nix      |  2 +-
 pkgs/tools/security/pass/extensions/file.nix  |  2 +-
 .../security/pass/extensions/genphrase.nix    |  2 +-
 pkgs/tools/security/pass/extensions/otp.nix   |  2 +-
 pkgs/tools/security/pass/extensions/tomb.nix  |  2 +-
 .../tools/security/pass/extensions/update.nix |  2 +-
 pkgs/tools/security/pass/wofi-pass.nix        |  2 +-
 pkgs/tools/security/pinentry/mac.nix          |  2 +-
 pkgs/tools/security/quill/default.nix         |  2 +-
 pkgs/tools/security/rekor/default.nix         |  2 +-
 pkgs/tools/security/rucredstash/default.nix   |  2 +-
 pkgs/tools/security/saml2aws/default.nix      |  2 +-
 pkgs/tools/security/solo2-cli/default.nix     |  2 +-
 pkgs/tools/security/stoken/default.nix        |  2 +-
 pkgs/tools/security/vaultwarden/default.nix   |  2 +-
 pkgs/tools/security/vaultwarden/webvault.nix  |  2 +-
 pkgs/tools/security/web-eid-app/default.nix   |  2 +-
 pkgs/tools/security/whatweb/default.nix       |  2 +-
 pkgs/tools/system/btop/default.nix            |  2 +-
 pkgs/tools/system/clinfo/default.nix          |  2 +-
 pkgs/tools/system/cm-rgb/default.nix          |  2 +-
 pkgs/tools/system/gotop/default.nix           |  2 +-
 pkgs/tools/system/htop/default.nix            |  2 +-
 pkgs/tools/system/hw-probe/default.nix        |  2 +-
 .../nvidia-system-monitor-qt/default.nix      |  2 +-
 pkgs/tools/system/nvtop/build-nvtop.nix       |  2 +-
 pkgs/tools/system/pciutils/default.nix        |  2 +-
 pkgs/tools/system/stacer/default.nix          |  2 +-
 pkgs/tools/system/uefitool/common.nix         |  2 +-
 pkgs/tools/text/amber/default.nix             |  2 +-
 pkgs/tools/text/autocorrect/default.nix       |  2 +-
 pkgs/tools/text/chars/default.nix             |  2 +-
 pkgs/tools/text/coloursum/default.nix         |  2 +-
 pkgs/tools/text/diffr/default.nix             |  2 +-
 pkgs/tools/text/fastmod/default.nix           |  2 +-
 pkgs/tools/text/glogg/default.nix             |  2 +-
 pkgs/tools/text/highlight/default.nix         |  2 +-
 pkgs/tools/text/igrep/default.nix             |  2 +-
 pkgs/tools/text/languagetool-rust/default.nix |  2 +-
 pkgs/tools/text/mdbook-linkcheck/default.nix  |  2 +-
 pkgs/tools/text/pinyin-tool/default.nix       |  2 +-
 pkgs/tools/text/ripgrep-all/default.nix       |  2 +-
 pkgs/tools/typesetting/asciidoc/default.nix   |  2 +-
 pkgs/tools/typesetting/htmldoc/default.nix    |  2 +-
 pkgs/tools/typesetting/xmlto/default.nix      |  2 +-
 pkgs/tools/video/atomicparsley/default.nix    |  2 +-
 .../google-compute-engine/default.nix         |  2 +-
 pkgs/tools/wayland/swaytools/default.nix      |  2 +-
 pkgs/top-level/all-packages.nix               |  8 +--
 pkgs/top-level/lua-packages.nix               |  6 +-
 pkgs/top-level/python-packages.nix            |  2 +-
 8120 files changed, 8221 insertions(+), 8221 deletions(-)

diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md
index fd50e595d12f..9953f357048a 100644
--- a/doc/languages-frameworks/crystal.section.md
+++ b/doc/languages-frameworks/crystal.section.md
@@ -26,7 +26,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
-    tag = version;
+    rev = version;
     hash = "sha256-dFN9l5fgrM/TtOPqlQvUYgixE4KPr629aBmkwdDoq28=";
   };
 
@@ -65,7 +65,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
-    tag = version;
+    rev = version;
     hash = "sha256-dFN9l5fgrM/TtOPqlQvUYgixE4KPr629aBmkwdDoq28=";
   };
 
diff --git a/doc/languages-frameworks/dart.section.md b/doc/languages-frameworks/dart.section.md
index 58cae726d870..dfb456ba1941 100644
--- a/doc/languages-frameworks/dart.section.md
+++ b/doc/languages-frameworks/dart.section.md
@@ -39,7 +39,7 @@ buildDartApplication rec {
   src = fetchFromGitHub {
     owner = "sass";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-U6enz8yJcc4Wf8m54eYIAnVg/jsGi247Wy8lp1r1wg4=";
   };
 
diff --git a/doc/languages-frameworks/dlang.section.md b/doc/languages-frameworks/dlang.section.md
index fa211dc6a43d..6e9edefc5e0f 100644
--- a/doc/languages-frameworks/dlang.section.md
+++ b/doc/languages-frameworks/dlang.section.md
@@ -22,7 +22,7 @@ buildDubPackage rec {
   src = fetchFromGitHub {
     owner = "CyberShadow";
     repo = "btdu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3sSZq+5UJH02IO0Y1yL3BLHDb4lk8k6awb5ZysBQciE=";
   };
 
diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
index dfa4071e57f8..34bf913ef1e8 100644
--- a/doc/languages-frameworks/go.section.md
+++ b/doc/languages-frameworks/go.section.md
@@ -20,7 +20,7 @@ The following is an example expression using `buildGoModule`:
     src = fetchFromGitHub {
       owner = "knqyf263";
       repo = "pet";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-Gjw1dRrgM8D3G7v6WIM2+50r4HmTXvx0Xxme2fH9TlQ=";
     };
 
diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index c3de65adc9aa..9acfd4181108 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -194,7 +194,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jesec";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM=";
   };
 
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 8f58f607ac17..34ac80cac998 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
   };
 
@@ -646,7 +646,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Qiskit";
     repo = "retworkx";
-    tag = version;
+    rev = version;
     hash = "sha256-11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20=";
   };
 
@@ -984,7 +984,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
-    tag = version;
+    rev = version;
     hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
   };
 
diff --git a/doc/languages-frameworks/swift.section.md b/doc/languages-frameworks/swift.section.md
index 1dac81c5b665..88d98deeb2dd 100644
--- a/doc/languages-frameworks/swift.section.md
+++ b/doc/languages-frameworks/swift.section.md
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nixos";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
   };
 
diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix
index 6d3f603967c3..2ae25c850011 100644
--- a/nixos/tests/dokuwiki.nix
+++ b/nixos/tests/dokuwiki.nix
@@ -9,7 +9,7 @@ let
     src = pkgs.fetchFromGitHub {
       owner = "giterlizzi";
       repo = "dokuwiki-template-bootstrap3";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-B3Yd4lxdwqfCnfmZdp+i/Mzwn/aEuZ0ovagDxuR6lxo=";
     };
     installPhase = "mkdir -p $out; cp -R * $out/";
diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix
index 0c123309dd31..9789485488be 100644
--- a/pkgs/applications/audio/airwave/default.nix
+++ b/pkgs/applications/audio/airwave/default.nix
@@ -21,7 +21,7 @@ let
   airwave-src = fetchFromGitHub {
     owner = "phantom-code";
     repo = "airwave";
-    tag = version;
+    rev = version;
     sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s";
   };
 
diff --git a/pkgs/applications/audio/ardour/7.nix b/pkgs/applications/audio/ardour/7.nix
index 10a55ee9f6d1..0830ff4ddf54 100644
--- a/pkgs/applications/audio/ardour/7.nix
+++ b/pkgs/applications/audio/ardour/7.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
-    tag = version;
+    rev = version;
     hash = "sha256-cmYt6fGYuuVs6YhAXaO9AG6TrYLDVUaE1/iC67rt76I=";
   };
 
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index fa7ceedc1ad0..45e8e95d2c0a 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
   # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
-    tag = version;
+    rev = version;
     hash = "sha256-z+rIWFVua1IG4GZ8kH3quKaBbN+I7Yr62vukJZk6KAg=";
   };
 
diff --git a/pkgs/applications/audio/bucklespring/default.nix b/pkgs/applications/audio/bucklespring/default.nix
index be4d6d6594ca..a126c227f346 100644
--- a/pkgs/applications/audio/bucklespring/default.nix
+++ b/pkgs/applications/audio/bucklespring/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zevv";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0prhqibivxzmz90k79zpwx3c97h8wa61rk5ihi9a5651mnc46mna";
   };
 
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index d7a67aa76d35..d4fef58281d0 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cmus";
     repo = "cmus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8hgibGtkiwzenMI9YImIApRmw2EzTwE6RhglALpUkp4=";
   };
 
diff --git a/pkgs/applications/audio/codecserver/default.nix b/pkgs/applications/audio/codecserver/default.nix
index 68bbac821906..c055c72c4eaf 100644
--- a/pkgs/applications/audio/codecserver/default.nix
+++ b/pkgs/applications/audio/codecserver/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jketterl";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-JzaVBFl3JsFNDm4gy1qOKA9uAjUjNeMiI39l5gfH0aE=";
   };
 
diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix
index 1cdb98d0630d..9ff6bb2de902 100644
--- a/pkgs/applications/audio/csound/csound-qt/default.nix
+++ b/pkgs/applications/audio/csound/csound-qt/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CsoundQt";
     repo = "CsoundQt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZdQwWRAr6AKLmZ/L0lSxIlvWRLoZIKinn7BAQiR+luk=";
   };
 
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 546043a8be7a..222dfa3acb4e 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -80,7 +80,7 @@ clangStdenv.mkDerivation {
     owner = "DeaDBeeF-Player";
     repo = "deadbeef";
     fetchSubmodules = true;
-    tag = version;
+    rev = version;
     hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q=";
   };
 
diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
index 11d924f14611..784195b23d73 100644
--- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "saivert";
     repo = "ddb_misc_headerbar_GTK3";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1v1schvnps7ypjqgcbqi74a45w8r2gbhrawz7filym22h1qr9wn0";
   };
 
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index d636020059d6..bb41a6f0f5f4 100644
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "DeaDBeeF-Player";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-f6iHgwLdzQJJEquyuUQGWFfOfpjH/Hxh9IqQ5HkYrog=";
   };
 
diff --git a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
index f5b86fc3f1d9..c6a1a08d5954 100644
--- a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vovochka404";
     repo = "deadbeef-statusnotifier-plugin";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6WEbY59vPNrL3W5GUwFQJimmSS+td8Ob+G46fPAxfV4=";
   };
 
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 64273c7f80d5..dd3827ab8a19 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -42,7 +42,7 @@ mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "dfasma";
     owner = "gillesdegottex";
   };
diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/applications/audio/easyaudiosync/default.nix
index bb3b5e38894a..e7166cd9eb80 100644
--- a/pkgs/applications/audio/easyaudiosync/default.nix
+++ b/pkgs/applications/audio/easyaudiosync/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "complexlogic";
     repo = "EasyAudioSync";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UCOL4DzynKjNDvS0HZ4/K+Wn5lOqHZ0bNop0zqJl5kc=";
   };
 
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 6215445a7f3d..14835a9e0b60 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "espeak-ng";
     repo = "espeak-ng";
-    tag = version;
+    rev = version;
     hash = "sha256-aAJ+k+kkOS6k835mEW7BvgAIYGhUHxf7Q4P5cKO8XTk=";
   };
 
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 24ca7658acb2..9304f4536e19 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -30,7 +30,7 @@ let
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
-    tag = version;
+    rev = version;
     hash = "sha256-Rn+Cjpk4vttxARrkDSnpKdBdSRtgElsit8zu1BA8Jd4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
index d7fa14c241a1..d7830565fcc8 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faustlive";
-    tag = version;
+    rev = version;
     hash = "sha256-RqtdDkP63l/30sL5PDocvpar5TI4LdKfeeliSNeOHog=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index d41171c88d05..988b81e2ffb8 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flacon";
     repo = "flacon";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-r9SdQg6JTMoGxO2xUtkkBe5F5cajnsndZEq20BjJGuU=";
   };
 
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 37a5f3e32957..9455874ded68 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -27,7 +27,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gillesdegottex";
     repo = "fmit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1q062pfwz2vr9hbfn29fv54ip3jqfd9r99nhpr8w7mn1csy38azx";
   };
 
diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index dbf9d819112a..90e3d80ad14d 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Xb4LHoon56P6OmHvd7RkODrOc4MDa0+U8npypGhcyw4=";
   };
 
diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix
index 00fc400e44dd..e31dbbed38b2 100644
--- a/pkgs/applications/audio/grandorgue/default.nix
+++ b/pkgs/applications/audio/grandorgue/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GrandOrgue";
     repo = "grandorgue";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-9H7YpTtv9Y36Nc0WCyRy/ohpOQ3WVUd9gMahnGhANRc=";
   };
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index 06029c40dde3..6d81b7cc4a6d 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hydrogen-music";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-OMd8t043JVfMEfRjLdcE/R/4ymGp2yennkCjyX75r8Q=";
   };
 
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index 70bb2c276b1a..d4a0bf6064a4 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kampfschlaefer";
     repo = "jackmix";
-    tag = version;
+    rev = version;
     sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
   };
 
diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix
index 21c51d6cfb0b..f98bdae72975 100644
--- a/pkgs/applications/audio/jamesdsp/default.nix
+++ b/pkgs/applications/audio/jamesdsp/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Audio4Linux";
     repo = "JDSP4Linux";
     fetchSubmodules = true;
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-eVndqIqJ3DRceuFMT++g2riXq0CL5r+TWbvzvaYIfZ8=";
   };
 
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index 121741aedad0..9032f34d5a32 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swh";
     repo = "ladspa";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eOtIhNcuItREUShI8JRlBVKfMfovpdfIYu+m37v4KLE=";
   };
 
diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index 8e09e5d30b3c..6a29a96e470b 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "librespot-org";
     repo = "librespot";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dGQDRb7fgIkXelZKa+PdodIs9DxbgEMlVGJjK/hU3Mo=";
   };
 
diff --git a/pkgs/applications/audio/linvstmanager/default.nix b/pkgs/applications/audio/linvstmanager/default.nix
index 93152364519e..1da68ebb45d1 100644
--- a/pkgs/applications/audio/linvstmanager/default.nix
+++ b/pkgs/applications/audio/linvstmanager/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Goli4thus";
     repo = "linvstmanager";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-K6eugimMy/MZgHYkg+zfF8DDqUuqqoeymxHtcFGu2Uk=";
   };
 
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index fc0ade8edd9c..d4c45a283603 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -32,7 +32,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LMMS";
     repo = "lmms";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "006hwv1pbh3y5whsxkjk20hsbgwkzr4dawz43afq1gil69y7xpda";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/audio/lpd8editor/default.nix b/pkgs/applications/audio/lpd8editor/default.nix
index b8d83df1a21a..b5071a2c5a41 100644
--- a/pkgs/applications/audio/lpd8editor/default.nix
+++ b/pkgs/applications/audio/lpd8editor/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "charlesfleche";
     repo = "lpd8editor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lRp2RhNiIf1VrryfKqYFSbKG3pktw3M7B49fXVoj+C8=";
   };
 
diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 7fdbb5904c97..983e3924f815 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "magnetophon";
     repo = "VoiceOfFaust";
-    tag = version;
+    rev = version;
     sha256 = "sha256-vB8+ymvNuuovFXwOJ3BTIj5mGzCGa1+yhYs4nWMYIxU=";
   };
 
diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
index 1cafb2abeb45..beb40dcbfece 100644
--- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "magnetophon";
     repo = "faustCompressors";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "144f6g17q4m50kxzdncsfzdyycdfprnpwdaxcwgxj4jky1xsha1d";
   };
 
diff --git a/pkgs/applications/audio/master_me/default.nix b/pkgs/applications/audio/master_me/default.nix
index 688a9f4d61b2..3c766b701cf9 100644
--- a/pkgs/applications/audio/master_me/default.nix
+++ b/pkgs/applications/audio/master_me/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trummerschlunk";
     repo = "master_me";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-FG3X1dOF9KRHHSnd5/zP+GrYCB2O0y+tnI5/l9tNhyE=";
   };
diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix
index ce274cf9b8c9..0b51b83f98f7 100644
--- a/pkgs/applications/audio/mellowplayer/default.nix
+++ b/pkgs/applications/audio/mellowplayer/default.nix
@@ -21,7 +21,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "ColinDuquesnoy";
     repo = "MellowPlayer";
-    tag = version;
+    rev = version;
     hash = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk=";
   };
 
diff --git a/pkgs/applications/audio/melmatcheq.lv2/default.nix b/pkgs/applications/audio/melmatcheq.lv2/default.nix
index 555f7ab78499..ef49dc783d2e 100644
--- a/pkgs/applications/audio/melmatcheq.lv2/default.nix
+++ b/pkgs/applications/audio/melmatcheq.lv2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1s805jgb9msxfq9047s7pxrngizb00w8sm4z94iii80ba65rd20x";
   };
 
diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix
index eb400418778d..37f87257bdf3 100644
--- a/pkgs/applications/audio/minidsp/default.nix
+++ b/pkgs/applications/audio/minidsp/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mrene";
     repo = "minidsp-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8bKP9/byVRKj1P1MP3ZVg8yw0WaNB0BcqarCti7B8CA=";
   };
 
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index c790b09a66a6..8c9022df6eca 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mixxxdj";
     repo = "mixxx";
-    tag = version;
+    rev = version;
     hash = "sha256-1ZE2hVwacZve0+IOQs+htK/kl7zFsOWkh/KcrnI6u/M=";
   };
 
diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
index 475e2c66388e..caf18e26e7f1 100644
--- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix
+++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pimusicbox";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1lzarazq67gciyn6r8cdms0f7j0ayyfwhpf28z93ydb280mfrrb9";
   };
 
diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix
index c3bcd0e44356..a601cc2196a6 100644
--- a/pkgs/applications/audio/mopidy/soundcloud.nix
+++ b/pkgs/applications/audio/mopidy/soundcloud.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mopidy";
     repo = "mopidy-soundcloud";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1Qqbfw6NZ+2K1w+abMBfWo0RAmIRbNyIErEmalmWJ0s=";
   };
 
diff --git a/pkgs/applications/audio/mopidy/subidy.nix b/pkgs/applications/audio/mopidy/subidy.nix
index bd4139940a56..0891d19f8a8f 100644
--- a/pkgs/applications/audio/mopidy/subidy.nix
+++ b/pkgs/applications/audio/mopidy/subidy.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Prior99";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0c5ghhhrj5v3yp4zmll9ari6r5c6ha8c1izwqshvadn40b02q7xz";
   };
 
diff --git a/pkgs/applications/audio/mopidy/ytmusic.nix b/pkgs/applications/audio/mopidy/ytmusic.nix
index af0c11a5fb7d..5db613bc3ebe 100644
--- a/pkgs/applications/audio/mopidy/ytmusic.nix
+++ b/pkgs/applications/audio/mopidy/ytmusic.nix
@@ -16,7 +16,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jmcdo29";
     repo = "mopidy-ytmusic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2o4fDtaIxRDvIiAGV/9qK/00BmYXasBUwW03fxFcDAU=";
   };
 
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index 838f1e564fe0..5bf3612596b2 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "muse-sequencer";
     repo = "muse";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-LxibuqopMHuKEfTWXSEXc1g3wTm2F3NQRiV71FHvaY0=";
   };
 
diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix
index ff19c1dcbaf2..0ab89c108524 100644
--- a/pkgs/applications/audio/noson/default.nix
+++ b/pkgs/applications/audio/noson/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "janbar";
     repo = "noson-app";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-hCVGi+++6CcTRMXeRKH8xRncm/Gl83GgU3aAIPI/yGU=";
   };
 
diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index 4a28169d11c9..3ec19cf487dc 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pianobooster";
     repo = "PianoBooster";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1WOlAm/HXSL6QK0Kd1mnFEZxxpMseTG+6WzgMNWt+RA=";
   };
 
diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix
index 35904ab3348a..120ae1bb80bb 100644
--- a/pkgs/applications/audio/pipecontrol/default.nix
+++ b/pkgs/applications/audio/pipecontrol/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "portaloffreedom";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc=";
   };
 
diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix
index 98fd5250ddc7..f698a39440a6 100644
--- a/pkgs/applications/audio/playbar2/default.nix
+++ b/pkgs/applications/audio/playbar2/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "audoban";
     repo = "PlayBar2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0iv2m4flgaz2r0k7f6l0ca8p6cw8j8j2gin1gci2pg3l5g5khbch";
   };
 
diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix
index 514a78d440ef..436a690ffd62 100644
--- a/pkgs/applications/audio/polyphone/default.nix
+++ b/pkgs/applications/audio/polyphone/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "davy7125";
     repo = "polyphone";
-    tag = version;
+    rev = version;
     hash = "sha256-43EswCgNJv11Ov+4vmj2vS/yJ2atyzkRmk/SoCKYD/0=";
   };
 
diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/applications/audio/pragha/default.nix
index 25b22d0788eb..e3ef9f3cdfc6 100644
--- a/pkgs/applications/audio/pragha/default.nix
+++ b/pkgs/applications/audio/pragha/default.nix
@@ -53,7 +53,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pragha-music-player";
     repo = "pragha";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE=";
   };
 
diff --git a/pkgs/applications/audio/projectm_3/default.nix b/pkgs/applications/audio/projectm_3/default.nix
index e6da9ac3704c..09db5ad83393 100644
--- a/pkgs/applications/audio/projectm_3/default.nix
+++ b/pkgs/applications/audio/projectm_3/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "projectM";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oEfOx93JyR94II5NkUCvMwqxuV7ktpOHZ8PNMLCiqDw=";
   };
 
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index 572ac7aeab5f..439fa8e4a0dd 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ebruck";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/0GlQdSsIPKGrDT9CgxvaH8TpAbqxFduwL2A2+BSrEI=";
   };
 
diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix
index 025ab6b59abc..8426cc20e2e1 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/applications/audio/sayonara/default.nix
@@ -30,7 +30,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "luciocarreras";
     repo = "sayonara-player";
-    tag = version;
+    rev = version;
     hash = "sha256-ZcuWe1dsLJS4/nLXSSKB7wzPU9COFyE4vPSwZIo0bgI=";
   };
 
diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix
index a496dc71414b..c6cbbaa53756 100644
--- a/pkgs/applications/audio/seq66/default.nix
+++ b/pkgs/applications/audio/seq66/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ahlstromcj";
     repo = "seq66";
-    tag = version;
+    rev = version;
     hash = "sha256-9cEvwJTH6Iwi4aZQHTjQ/DhUtKYw2QC1Oq+D1/tpE90=";
   };
 
diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix
index 3dffcc921b21..e1caae7c8024 100644
--- a/pkgs/applications/audio/sfxr-qt/default.nix
+++ b/pkgs/applications/audio/sfxr-qt/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agateau";
     repo = "sfxr-qt";
-    tag = version;
+    rev = version;
     hash = "sha256-JAWDk7mGkPtQ5yaA6UT9hlAy770MHrTBhBP9G8UqFKg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix
index 8fb370c6e21f..2163ea5db514 100644
--- a/pkgs/applications/audio/sisco.lv2/default.nix
+++ b/pkgs/applications/audio/sisco.lv2/default.nix
@@ -20,7 +20,7 @@ let
   src = fetchFromGitHub {
     owner = "x42";
     repo = "sisco.lv2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1r6g29yqbdqgkh01x6d3nvmvc58rk2dp94fd0qyyizq37a1qplj1";
   };
 
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 7e171de9ba34..f6cbf58d8954 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "badaix";
     repo = "snapcast";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EJgpZz4PnXfge0rkVH1F7cah+i9AvDJVSUVqL7qChDM=";
   };
 
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index acf6cd7a3b91..9a45ba77ca6a 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sonic-pi-net";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JMextQY0jLShWmqRQoVAbqIzDhA1mOzI7vfsG7+jjX0=";
   };
 
diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix
index 5580154ceba5..ad1c2ff5b7e2 100644
--- a/pkgs/applications/audio/spek/default.nix
+++ b/pkgs/applications/audio/spek/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexkay";
     repo = "spek";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VYt2so2k3Rk3sLSV1Tf1G2pESYiXygrKr9Koop8ChCg=";
   };
 
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index 0001928621f9..2480587792a9 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jonaski";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-EJE6GDyXYMjJUQeTRgmjd0HX3hf4ajSRGsv/2s2oItc=";
   };
 
diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix
index 703d054eb8e3..4c21e137aed1 100644
--- a/pkgs/applications/audio/tageditor/default.nix
+++ b/pkgs/applications/audio/tageditor/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martchus";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VRQV4bTPG4VFhRHFJamUnYd04ZCaNpaxU27Jcl6Chc4=";
   };
 
diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix
index 878edc615e9e..571672dd0d1e 100644
--- a/pkgs/applications/backup/timeshift/unwrapped.nix
+++ b/pkgs/applications/backup/timeshift/unwrapped.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "timeshift";
-    tag = version;
+    rev = version;
     hash = "sha256-umMekxP9bvV01KzfIh2Zxa9Xb+tR5x+tG9dOnBIOkjY=";
   };
 
diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix
index aaf68d6f0e73..c644d6662775 100644
--- a/pkgs/applications/blockchains/alfis/default.nix
+++ b/pkgs/applications/blockchains/alfis/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Alfis";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ettStNktSDZnYNN/IWqTB1Ou1g1QEGFabS4EatnDLaE=";
   };
 
diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix
index 5f46e89e001f..a9270da67d9f 100644
--- a/pkgs/applications/blockchains/bitcoin-abc/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix
@@ -32,7 +32,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+9uBmmdQ/shWYnJ7tM+Y8OgqYcQHHI2qeMw2tl1lE+w=";
   };
 
diff --git a/pkgs/applications/blockchains/digibyte/default.nix b/pkgs/applications/blockchains/digibyte/default.nix
index a42b02703f81..bb254dc0c32f 100644
--- a/pkgs/applications/blockchains/digibyte/default.nix
+++ b/pkgs/applications/blockchains/digibyte/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "digibyte-core";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "zPwnC2qd28fA1saG4nysPlKU1nnXhfuSG3DpCY6T+kM=";
   };
 
diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix
index 5aa307bcc329..d06ce837c0a3 100644
--- a/pkgs/applications/blockchains/electrs/default.nix
+++ b/pkgs/applications/blockchains/electrs/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "romanz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Xo7aqP4tIh/kYthPucscxnl+ZtVioEja4TTFdH0Q350=";
   };
 
diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix
index cfef72f5198c..b52c720267e5 100644
--- a/pkgs/applications/blockchains/fulcrum/default.nix
+++ b/pkgs/applications/blockchains/fulcrum/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cculianu";
     repo = "Fulcrum";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+hBc7jW1MVLVjYXNOV7QvFJJpZ5RzW5/c9NdqOXrsj0=";
   };
 
diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/applications/blockchains/gridcoin-research/default.nix
index cc51098be3a3..011c3a76818e 100644
--- a/pkgs/applications/blockchains/gridcoin-research/default.nix
+++ b/pkgs/applications/blockchains/gridcoin-research/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gridcoin-community";
     repo = "Gridcoin-Research";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-nupZB4nNbitpf5EBCNy0e+ovjayAszup/r7qxbxA5jI=";
   };
 
diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix
index 4341491c893f..d0de5fa729b3 100644
--- a/pkgs/applications/blockchains/groestlcoin/default.nix
+++ b/pkgs/applications/blockchains/groestlcoin/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Groestlcoin";
     repo = "groestlcoin";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0kl7nq62362clgzxwwd5c256xnaar4ilxcvbralazxg47zv95r11";
   };
 
diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix
index 06a8f54ae2ff..8361c2e23f94 100644
--- a/pkgs/applications/blockchains/lighthouse/default.nix
+++ b/pkgs/applications/blockchains/lighthouse/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sigp";
     repo = "lighthouse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8jHNm/MGpHGOt52rLMXLMWIVn8AXqnpAr+Wvk7DH6gc=";
   };
 
diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix
index 7ef95c943aed..e39d5374b9ad 100644
--- a/pkgs/applications/blockchains/monero-cli/default.nix
+++ b/pkgs/applications/blockchains/monero-cli/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nDiFJjhsISYM8kTgJUaPYL44iyccnz5+Pd5beBh+lsM=";
   };
 
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index d1805fca820c..790f691b79b2 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wnU24EmZig2W/psy4OhaQVy2WwR0CgljlyYwOg4bzwM=";
   };
 
diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix
index 55dfbc5d68b7..e88ce594cd8d 100644
--- a/pkgs/applications/blockchains/optimism/geth.nix
+++ b/pkgs/applications/blockchains/optimism/geth.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ethereum-optimism";
     repo = "op-geth";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AKVwwvt77FZlm7089EeayYVRYLo7c3v6LFVpsQN68Zk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix
index c2f1d544476b..219e9f530f4c 100644
--- a/pkgs/applications/blockchains/snarkos/default.nix
+++ b/pkgs/applications/blockchains/snarkos/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AleoHQ";
     repo = "snarkOS";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+z9dgg5HdR+Gomug03gI1zdCU6t4SBHkl1Pxoq69wrc=";
   };
 
diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix
index 393bd5edfd7a..66d28bd3bac8 100644
--- a/pkgs/applications/blockchains/teos/default.nix
+++ b/pkgs/applications/blockchains/teos/default.nix
@@ -16,7 +16,7 @@ let
   src = fetchFromGitHub {
     owner = "talaia-labs";
     repo = "rust-teos";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UrzH9xmhVq12TcSUQ1AihCG1sNGcy/N8LDsZINVKFkY=";
   };
 
diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index 496ebecdf893..1706bcd888d7 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
   src = fetchFromGitHub {
     owner = "zcash";
     repo = "zcash";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XGq/cYUo43FcpmRDO2YiNLCuEQLsTFLBFC4M1wM29l8=";
   };
 
diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix
index 7d0ea55501d5..ec537e7b0d85 100644
--- a/pkgs/applications/display-managers/greetd/regreet.nix
+++ b/pkgs/applications/display-managers/greetd/regreet.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rharish101";
     repo = "ReGreet";
-    tag = version;
+    rev = version;
     hash = "sha256-f8Xvno5QqmWz4SUiFYDvs8lFU1ZaqQ8gpTaVzWxW4T8=";
   };
 
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index b07661243eec..45fa03377e69 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-ttNlhWD0Ran4d3QvZ+PxbFbSUGMkfrRm+hJdQxIDJvM=";
   };
 
diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix
index 60a8bf367106..b869ec3b6d15 100644
--- a/pkgs/applications/editors/cpeditor/default.nix
+++ b/pkgs/applications/editors/cpeditor/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cpeditor";
     repo = "cpeditor";
-    tag = version;
+    rev = version;
     hash = "sha256-t7nn3sO45dOQq5OMWhaseO9XHicQ/1fjukXal5yPMgY";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index 969e68db6907..6b805dbb0870 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
-    tag = version;
+    rev = version;
     hash = "sha256-ZFMO986D4RtrTnLFdcL0a2BNjcsB+9pIolylblku7j4=";
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
index c262eac301e1..86109b57a2ac 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
@@ -19,7 +19,7 @@ let
     src = fetchFromGitHub {
       owner = "jfcherng";
       repo = "copilot-node-server";
-      tag = version;
+      rev = version;
       hash = "sha256-Ds2agoO7LBXI2M1dwvifQyYJ3F9fm9eV2Kmm7WITgyo=";
     };
   });
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
index 86d1642db5a3..3901b4afcc17 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
@@ -16,7 +16,7 @@ melpaBuild {
   src = fetchFromGitHub {
     owner = "idris-community";
     repo = "idris2-mode";
-    tag = version;
+    rev = version;
     hash = "sha256-rTeVjkAw44Q35vjaERs4uoZRJ6XR3FKplEUCVPHhY7Q=";
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
index 3b05bf9a1366..4bdf1c124223 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
@@ -14,7 +14,7 @@ melpaBuild {
   src = fetchFromGitHub {
     owner = "emacsmirror";
     repo = "rect-mark";
-    tag = version;
+    rev = version;
     hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
index 491c6710180e..f96632992080 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
@@ -17,7 +17,7 @@ let
     src = fetchFromGitHub {
       owner = "emacs-tree-sitter";
       repo = "emacs-tree-sitter";
-      tag = version;
+      rev = version;
       hash = "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=";
     };
 
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 8768ba4cad1a..b4b83ff3a587 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gottcode";
     repo = "focuswriter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oivhrDF3HikbEtS1cOlHwmQYNYf3IkX+gQGW0V55IWU=";
   };
 
diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
index 40dfdc959d50..0a1de3a871a2 100644
--- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
@@ -43,7 +43,7 @@ let
       src = fetchFromGitHub {
         owner = "clojupyter";
         repo = "clojupyter";
-        tag = version;
+        rev = version;
         sha256 = "sha256-BCzcPnLSonm+ELFU4JIIzLPlVnP0VzlrRSGxOd/LFow=";
       };
 
diff --git a/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix b/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix
index c268efde8ffc..1fd032e465f0 100644
--- a/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix
+++ b/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "EugeneLoy";
     repo = "coq_jupyter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+Pp51cxeqjg5MW4CEccNWVjNcY9iyFNATIEage9RWJ0=";
   };
 
diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix
index 710b657bf193..eab4626a663c 100644
--- a/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix
+++ b/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WolframResearch";
     repo = "WolframLanguageForJupyter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "19d9dvr0bv7iy0x8mk4f576ha7z7h7id39nyrggwf9cp7gymxf47";
   };
 
diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
index 498df86b137e..af0c5cce88f3 100644
--- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
+++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
@@ -58,7 +58,7 @@ clangStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "QuantStack";
     repo = "xeus-cling";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-OfZU+z+p3/a36GntusBfwfFu3ssJW4Fu7SV3SMCoo1I=";
   };
 
diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix
index d3c289ba4812..c809978616f7 100644
--- a/pkgs/applications/editors/kakoune/plugins/overrides.nix
+++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix
@@ -52,7 +52,7 @@ self: super: {
     src = fetchFromGitHub {
       owner = "eraserhd";
       repo = "kak-ansi";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "kFjTYFy0KF5WWEHU4hHFAnD/03/d3ptjqMMbTSaGImE=";
     };
 
@@ -86,7 +86,7 @@ self: super: {
     src = fetchFromGitHub {
       owner = "eraserhd";
       repo = "kak-plumb";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "1rz6pr786slnf1a78m3sj09axr4d2lb5rg7sfa4mfg1zcjh06ps6";
     };
 
diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index f19ef31d6bb7..b4d32534e284 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leo-editor";
     repo = "leo-editor";
-    tag = version;
+    rev = version;
     sha256 = "sha256-nK6JMR4XrxZxvLOAsYjuyHQo/sob+OLSk/8U3zZ/Iyo=";
   };
 
diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix
index 886adcb2f8ca..8d6d1ac8bc04 100644
--- a/pkgs/applications/editors/lite-xl/default.nix
+++ b/pkgs/applications/editors/lite-xl/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lite-xl";
     repo = "lite-xl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ig0XDxnll/zruAwWHwuXiqumBXgAPxuK0E1ELupvcXo=";
   };
 
diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix
index f20a9825b08b..2883c52fafc8 100644
--- a/pkgs/applications/editors/mindforger/default.nix
+++ b/pkgs/applications/editors/mindforger/default.nix
@@ -18,7 +18,7 @@ let
     mindforger = fetchFromGitHub {
       owner = "dvorka";
       repo = "mindforger";
-      tag = version;
+      rev = version;
       sha256 = "sha256-+8miV2xuQcaWGdWCEXPIg6EXjAHtgD9pX7Z8ZNhpMjA=";
     };
     cmark-gfm = fetchFromGitHub {
diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix
index 2ec7f6a6b521..1fc6f2184f08 100644
--- a/pkgs/applications/editors/neovim/gnvim/default.nix
+++ b/pkgs/applications/editors/neovim/gnvim/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vhakulinen";
     repo = "gnvim";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VyyHlyMW/9zYECobQwngFARQYqcoXmopyCHUwHolXfo=";
   };
 
diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
index 15a2c8af3723..019887ee324b 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/pkgs/applications/editors/notepadqq/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "notepadqq";
     repo = "notepadqq";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-XA9Ay9kJApY+bDeOf0iPv+BWYFuTmIuqsLEPgRTCZCE=";
   };
 
diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix
index 0fd3f6938b94..9d64e6549c8e 100644
--- a/pkgs/applications/editors/qxmledit/default.nix
+++ b/pkgs/applications/editors/qxmledit/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lbellonda";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-UzN5U+aC/uKokSdeUG2zv8+mkaH4ndYZ0sfzkpQ3l1M=";
   };
 
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index aa88727c02e5..95ff14a96bd5 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mapeditor";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E=";
   };
 
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 8140387a270a..68147dd144a1 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -10,7 +10,7 @@ rec {
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Eaxia/FLRCnr8MVDvt+ZUFwIQD5Pqq7SsmWZeQdjuXs=";
   };
 
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix
index 25dad4855d6e..824190179389 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix
@@ -14,7 +14,7 @@ vimUtils.buildVimPlugin {
   src = fetchFromGitLab {
     owner = "gitlab-org/editor-extensions";
     repo = "gitlab.vim";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W/FV+i/QJYX6A8uyxAQN4ov1kMd9UFCghFmSQp1kbnM=";
   };
 
diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix
index 84f054b6d07e..718d14a52851 100644
--- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix
+++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix
@@ -13,7 +13,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rescript-lang";
     repo = "rescript-vscode";
-    tag = version;
+    rev = version;
     hash = "sha256-v+qCVge57wvA97mtzbxAX9Fvi7ruo6ZyIC14O8uWl9Y=";
   };
 
diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
index e617abbbe8ab..590c03c26115 100644
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
@@ -26,7 +26,7 @@ let
   src = fetchFromGitHub {
     owner = "vadimcn";
     repo = "vscode-lldb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ExSS5HxDmJJtYypRYJNz7nY0D50gjoDBc4CnJMfgVw8=";
   };
 
diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix
index e880317e6bee..272729bcb47f 100644
--- a/pkgs/applications/editors/your-editor/default.nix
+++ b/pkgs/applications/editors/your-editor/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "your-editor";
     repo = "yed";
-    tag = version;
+    rev = version;
     sha256 = "sha256-pa9ibXyuWq7jRYsn3bGdqvLWbwQO2VYsP6Bk+BayQ8o=";
   };
 
diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix
index 25600a76cfda..43c63bb95260 100644
--- a/pkgs/applications/editors/zee/default.nix
+++ b/pkgs/applications/editors/zee/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zee-editor";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w=";
   };
 
diff --git a/pkgs/applications/emulators/blink/default.nix b/pkgs/applications/emulators/blink/default.nix
index d82b91a513fa..a65ebf5886b3 100644
--- a/pkgs/applications/emulators/blink/default.nix
+++ b/pkgs/applications/emulators/blink/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jart";
     repo = "blink";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-4wgDftXOYm2fMP+/aTRljDi38EzbbwAJlQkuxjAMl3I=";
   };
 
diff --git a/pkgs/applications/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix
index d7f5a352ecef..e0ff2b7c20a6 100644
--- a/pkgs/applications/emulators/firebird-emu/default.nix
+++ b/pkgs/applications/emulators/firebird-emu/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nspire-emus";
     repo = "firebird";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-ZptjlnOiF+hKuKYvBFJL95H5YQuR99d4biOco/MVEmE=";
   };
diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/applications/emulators/goldberg-emu/default.nix
index 17f8b2707f28..e3100d497681 100644
--- a/pkgs/applications/emulators/goldberg-emu/default.nix
+++ b/pkgs/applications/emulators/goldberg-emu/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "mr_goldberg";
     repo = "goldberg_emulator";
-    tag = version;
+    rev = version;
     hash = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog=";
   };
 
diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix
index 886f63f95eaf..1909e6b0fb8d 100644
--- a/pkgs/applications/emulators/wibo/default.nix
+++ b/pkgs/applications/emulators/wibo/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "decompals";
     repo = "wibo";
-    tag = version;
+    rev = version;
     hash = "sha256-6YcraHBFWmm8TBfuFHbM9jGvUm9KvTOplJrFSTQkt70=";
   };
 
diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/applications/emulators/zsnes/2.x.nix
index 79559949ed01..94cb5ad8e6e0 100644
--- a/pkgs/applications/emulators/zsnes/2.x.nix
+++ b/pkgs/applications/emulators/zsnes/2.x.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "zsnes";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Xz+9YgMpnHyno7vP67aut4tIyG/gTn7SnU2FO2QMND0=";
   };
 
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 0b4e954c515f..fb72f76d29a5 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "grass";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-q1jOimQi+24I1ZBf6Z0cvAyXcBFBpT5aWSNeG6n6y0k=";
   };
 
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index 0c035fbc937a..24be5ebeb558 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jblindsay";
     repo = "whitebox-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kvtfEEydwonoDux1VbAxqrF/Hf8Qh8mhprYnROGOC6g=";
   };
 
diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix
index 4f570c5b32d0..3dd69d56b19d 100644
--- a/pkgs/applications/graphics/ImageMagick/6.x.nix
+++ b/pkgs/applications/graphics/ImageMagick/6.x.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick6";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-AdlJaCJOrN+NkkzzzgELtgAr5iZ9dvlVYVc7tYiM+R8=";
   };
 
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index bdfbd5527fa5..6db2925644d5 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "apitrace";
     repo = "apitrace";
-    tag = version;
+    rev = version;
     hash = "sha256-Y2ceE0F7q5tP64Mtvkc7JHOZQN30MDVCPHfiWDnfTSQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix
index 08ae6b1e4880..39ca9122d13a 100644
--- a/pkgs/applications/graphics/cloudcompare/default.nix
+++ b/pkgs/applications/graphics/cloudcompare/default.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CloudCompare";
     repo = "CloudCompare";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-a/0lf3Mt5ZpLFRM8jAoqZer8pY1ROgPRY4dPt34Bk3E=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 9399870dc8b1..e3e816116831 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jgraph";
     repo = "drawio-desktop";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-se3yxIzxeinOnfltv+fSflypwxRHvW/wxKJ43LPsiho=";
   };
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index 18ea919fca84..82362ee6d90c 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -74,7 +74,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "drawpile";
     repo = "drawpile";
-    tag = version;
+    rev = version;
     sha256 = "sha256-xcutcSpbFt+pb7QP1E/RG6iNnZwpfhIZTxr+1usLKHc=";
   };
 
diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix
index a1bb82521569..89014afb8eb4 100644
--- a/pkgs/applications/graphics/emulsion/default.nix
+++ b/pkgs/applications/graphics/emulsion/default.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ArturKovacs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0t+MUZu1cvkJSL9Ly9kblH8fMr05KuRpOo+JDn/VUc8=";
   };
 
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index f097f5faafee..fcc62660dc0f 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "derf";
     repo = "feh";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-FtaFoLjI3HTLAxRTucp5VDYS73UuWqw9r9UWKK6T+og=";
   };
 
diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index 36f9786670f5..04f0ff9bf358 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fontmatrix";
     repo = "fontmatrix";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DtajGhx79DiecglXHja9q/TKVq8Jl2faQdA5Ib/yT88=";
   };
 
diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix
index dffaaceec1d0..f25c1064a7ac 100644
--- a/pkgs/applications/graphics/foxotron/default.nix
+++ b/pkgs/applications/graphics/foxotron/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gargaj";
     repo = "Foxotron";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-OnZWoiQ5ASKQV73/W6nl17B2ANwqCy/PlybHbNwrOyQ=";
   };
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index a7ea6f0cd28d..b237c5f1bcf1 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -99,7 +99,7 @@ lib.makeScope pkgs.newScope (
       src = fetchFromGitHub {
         owner = "alessandrofrancesconi";
         repo = "gimp-plugin-bimp";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-IJ3+/9UwxJTRo0hUdzlOndOHwso1wGv7Q4UuhbsFkco=";
       };
 
@@ -217,7 +217,7 @@ lib.makeScope pkgs.newScope (
       src = fetchFromGitHub {
         owner = "bootchk";
         repo = "resynthesizer";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = "1jwc8bhhm21xhrgw56nzbma6fwg59gc8anlmyns7jdiw83y0zx3j";
       };
 
@@ -277,7 +277,7 @@ lib.makeScope pkgs.newScope (
       src = fetchFromGitHub {
         owner = "carlobaldassi";
         repo = "gimp-lqr-plugin";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = "81ajdZ2zQi/THxnBlSeT36tVTEzrS1YqLGpHMhFTKAo=";
       };
       patches = [
diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix
index 37ab1d9487a7..21d711d8ba42 100644
--- a/pkgs/applications/graphics/gnome-decoder/default.nix
+++ b/pkgs/applications/graphics/gnome-decoder/default.nix
@@ -35,7 +35,7 @@ clangStdenv.mkDerivation rec {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "decoder";
-    tag = version;
+    rev = version;
     hash = "sha256-qSPuEVW+FwC9OJa+dseIy4/2bhVdTryJSJNSpes9tpY=";
   };
 
diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix
index f9fe1580893a..6e5641cafd2a 100644
--- a/pkgs/applications/graphics/gnome-obfuscate/default.nix
+++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "Obfuscate";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-/Plvvn1tle8t/bsPcsamn5d81CqnyGCyGYPF6j6U5NI=";
   };
 
diff --git a/pkgs/applications/graphics/imgp/default.nix b/pkgs/applications/graphics/imgp/default.nix
index ca78a87d11db..3855d3e16ba5 100644
--- a/pkgs/applications/graphics/imgp/default.nix
+++ b/pkgs/applications/graphics/imgp/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "imgp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yQ2BzOBn6Bl9ieZkREKsj1zLnoPcf0hZhZ90Za5kiKA=";
   };
 
diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix
index 27b887c07972..c267b563d974 100644
--- a/pkgs/applications/graphics/ktikz/default.nix
+++ b/pkgs/applications/graphics/ktikz/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fhackenberger";
     repo = "ktikz";
-    tag = version;
+    rev = version;
     sha256 = "1s83x8r2yi64wc6ah2iz09dj3qahy0fkxx6cfgpkavjw9x0j0582";
   };
 
diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix
index 54cbc9859128..912e3b963175 100644
--- a/pkgs/applications/graphics/mandelbulber/default.nix
+++ b/pkgs/applications/graphics/mandelbulber/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "buddhi1980";
     repo = "mandelbulber2";
-    tag = version;
+    rev = version;
     sha256 = "sha256-amNNRuuk7qtcyXUVLEW71yEETExgKw48HeQQyxbi8BE=";
   };
 
diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix
index 8a470711532f..a0e757cc536f 100644
--- a/pkgs/applications/graphics/menyoki/default.nix
+++ b/pkgs/applications/graphics/menyoki/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y=";
   };
 
diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix
index 3b8daae0dde2..209dc697817b 100644
--- a/pkgs/applications/graphics/ovito/default.nix
+++ b/pkgs/applications/graphics/ovito/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "stuko";
     repo = "ovito";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ulzcsFAiZDg8nABQXNB2/MS7lZdK3czGHLKgKDWS15E=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix
index b0ecfc025e3d..75645349377b 100644
--- a/pkgs/applications/graphics/photoflare/default.nix
+++ b/pkgs/applications/graphics/photoflare/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PhotoFlare";
     repo = "photoflare";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0eAuof/FBro2IKxkJ6JHauW6C96VTPxy7QtfPVzPFi4=";
   };
 
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index 654341c7fe80..fca4490d3448 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oferkv";
     repo = "phototonic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BxJgTKblOKIwt88+PT7XZE0mk0t2B4SfsdXpQHttUTM=";
   };
 
diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix
index a94ca6a4851b..a5e54f3f9120 100644
--- a/pkgs/applications/graphics/pineapple-pictures/default.nix
+++ b/pkgs/applications/graphics/pineapple-pictures/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BLumia";
     repo = "pineapple-pictures";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-NWh0+DEfKT1iZY6tXVGuxgaXF5U+UB9S5BlWyD+1Bko=";
   };
 
diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix
index 6d5eea39e13e..734a49f02622 100644
--- a/pkgs/applications/graphics/qcomicbook/default.nix
+++ b/pkgs/applications/graphics/qcomicbook/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stolowski";
     repo = "QComicBook";
-    tag = version;
+    rev = version;
     sha256 = "1b769lp6gfwds4jb2g7ymhdm9c06zg57zpyz3zpdb40w07zfsjzv";
   };
 
diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix
index 933ce3d4dabf..3643a9e7af4f 100644
--- a/pkgs/applications/graphics/qosmic/default.nix
+++ b/pkgs/applications/graphics/qosmic/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bitsed";
     repo = "qosmic";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "13nw1mkdib14430r21mj352v62vi546vf184vyhxm7yjjygyra1w";
   };
 
diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix
index cf68b3f21454..eb2f81c93984 100644
--- a/pkgs/applications/graphics/qview/default.nix
+++ b/pkgs/applications/graphics/qview/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jurplel";
     repo = "qView";
-    tag = version;
+    rev = version;
     hash = "sha256-h1K1Smfy875NoHtgUrOvZZp0IgcQdbyuQhXU9ndM4bA=";
   };
 
diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index a48785cdc0a9..f7a2685169ca 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -26,7 +26,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "damonlynch";
     repo = "rapid-photo-downloader";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw=";
   };
 
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 7ae6bbc8d448..378706775928 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
-    tag = version;
+    rev = version;
     hash = "sha256-jIAbguwF2aqRTk72ro5oHNTawA7biPSFC41YHgRR730=";
     # The developers ask not to use the tarball from Github releases, see
     # https://www.rawtherapee.com/downloads/5.10/#news-relevant-to-package-maintainers
diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index ede67b62ca3e..ab07837bc678 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     owner = "frontend";
     group = "sane-project";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM=";
   };
 
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index c7645f73e21b..954ddb4f407c 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vigri";
     repo = "scantailor-advanced";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mvoCoYdRTgXW5t8yd9Y9TOl7D3RDVwcjUv2YDUWrtRI=";
   };
 
diff --git a/pkgs/applications/graphics/scantailor/universal.nix b/pkgs/applications/graphics/scantailor/universal.nix
index 1aa35ed4d1da..b7bdc609f61c 100644
--- a/pkgs/applications/graphics/scantailor/universal.nix
+++ b/pkgs/applications/graphics/scantailor/universal.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trufanov-nok";
     repo = pname;
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-n8NbokK+U0FAuYXtjRJcxlI1XAmI4hk5zV3sF86hB/s=";
   };
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 0858eacf4514..e40a1e0b5805 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "muennich";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0xaawlfdy7b277m38mgg4423kd7p1ffn0dq4hciqs6ivbb3q9c4f";
   };
 
diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix
index 80a99eab6806..4d3a97ade7dd 100644
--- a/pkgs/applications/graphics/tesseract/tesseract3.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract3.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tesseract-ocr";
     repo = "tesseract";
-    tag = version;
+    rev = version;
     hash = "sha256-28osuZnVwkJpNTYkU+5D5PI8xtViFzGCMScHzkS2H20=";
   };
 
diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix
index 68ed2848b662..96ce6dda1ead 100644
--- a/pkgs/applications/graphics/tesseract/tesseract4.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract4.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tesseract-ocr";
     repo = "tesseract";
-    tag = version;
+    rev = version;
     hash = "sha256-sV3w53ky13ESc0dGPutMGQ4TcmOeWJkvUwBPIyzSTc8=";
   };
 
diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix
index c9b5281a2aa1..22059873e4bb 100644
--- a/pkgs/applications/graphics/tesseract/tesseract5.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract5.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tesseract-ocr";
     repo = "tesseract";
-    tag = version;
+    rev = version;
     sha256 = "sha256-qyckAQZs3gR1NBqWgE+COSKXhv3kPF+iHVQrt6OPi8s=";
   };
 
diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index c93055cef554..333f08aa9d1b 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xournalpp";
     repo = "xournalpp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VS5f+9daEQpPu5vam8DWhRqU0AWMmJab8KaRzTnRU/M=";
   };
 
diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index 3e4a30817e09..692463174da6 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -21,7 +21,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "YACReader";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-5vCjr8WRwa7Q/84Itgg07K1CJKGnWA1z53et2IxxReE=";
   };
 
diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix
index 275d718e97fc..356127483fe8 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -17,7 +17,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "JustArchiNET";
     repo = "ArchiSteamFarm";
-    tag = version;
+    rev = version;
     hash = "sha256-PTO4x5YKqs4wWonW3N/sMAVlbWJp+eVjLL98G9bNZ4c=";
   };
 
diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
index 3c3a2a00610f..9a185ff1f9f6 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
     repo = "ASF-ui";
     # updated by the update script
     # this is always the commit that should be used with asf-ui from the latest asf version
-    tag = version;
+    rev = version;
     hash = "sha256-B2gn40LWVm75pwV5sQpv1gRsNof9tQUDClu7oLSz/VM=";
   };
 
diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix
index 25914f8fdb97..5403e4d5e95b 100644
--- a/pkgs/applications/misc/ape/clex.nix
+++ b/pkgs/applications/misc/ape/clex.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Attempto";
     repo = "Clex";
-    tag = version;
+    rev = version;
     sha256 = "0p9s64g1jic213bwm6347jqckszgnni9szrrz31qjgaf32kf7nkp";
   };
 
diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix
index bad85693f677..fb94b2d1e4de 100644
--- a/pkgs/applications/misc/ausweisapp/default.nix
+++ b/pkgs/applications/misc/ausweisapp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Governikus";
     repo = "AusweisApp2";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-1G9H+1YBoIgSE8GO8UuUaG9gbVtY+gCp0oPNSNw0oO8=";
   };
 
diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix
index d51e42d65177..69aeb11e2bbd 100644
--- a/pkgs/applications/misc/avalonia-ilspy/default.nix
+++ b/pkgs/applications/misc/avalonia-ilspy/default.nix
@@ -28,7 +28,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "icsharpcode";
     repo = "AvaloniaILSpy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ=";
   };
 
diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix
index f4672526fbe5..d43ed3921c0d 100644
--- a/pkgs/applications/misc/barrier/default.nix
+++ b/pkgs/applications/misc/barrier/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "debauchee";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/binocle/default.nix b/pkgs/applications/misc/binocle/default.nix
index de87589f806e..e2afd9d91b14 100644
--- a/pkgs/applications/misc/binocle/default.nix
+++ b/pkgs/applications/misc/binocle/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WAk7xIrCRfVofn4w+gP5E3wnSZbXm/6MZWlNmtoLm20=";
   };
 
diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix
index 769915cbc4dc..428249549509 100644
--- a/pkgs/applications/misc/birdtray/default.nix
+++ b/pkgs/applications/misc/birdtray/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gyunaev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M=";
   };
 
diff --git a/pkgs/applications/misc/bluetooth_battery/default.nix b/pkgs/applications/misc/bluetooth_battery/default.nix
index 462dfd4e1858..0eff5be2206f 100644
--- a/pkgs/applications/misc/bluetooth_battery/default.nix
+++ b/pkgs/applications/misc/bluetooth_battery/default.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "TheWeirdDev";
     repo = "Bluetooth_Headset_Battery_Level";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "067qfxh228cy1x95bnjp88dx4k00ajj7ay7fz5vr1gkj2yfa203s";
   };
 
diff --git a/pkgs/applications/misc/brewtarget/default.nix b/pkgs/applications/misc/brewtarget/default.nix
index a3c607121915..72e7df62486a 100644
--- a/pkgs/applications/misc/brewtarget/default.nix
+++ b/pkgs/applications/misc/brewtarget/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Brewtarget";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PqaiZ2eLH8+qRRkIolnQClTL9O9EgHMqFH/nUffosV8=";
   };
 
diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix
index dddee75123c5..32c0b872d1ae 100644
--- a/pkgs/applications/misc/candle/default.nix
+++ b/pkgs/applications/misc/candle/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Denvi";
     repo = "Candle";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1gpx08gdz8awbsj6lsczwgffp19z3q0r2fvm72a73qd9az29pmm0";
   };
 
diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix
index c25c5d0f7e89..9f2e10fce874 100644
--- a/pkgs/applications/misc/chewing-editor/default.nix
+++ b/pkgs/applications/misc/chewing-editor/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chewing";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w";
   };
 
diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix
index 72b4f6f74076..cb9bdea22067 100644
--- a/pkgs/applications/misc/clight/clightd.nix
+++ b/pkgs/applications/misc/clight/clightd.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedeDP";
     repo = "Clightd";
-    tag = version;
+    rev = version;
     hash = "sha256-Lmno/TJVCQVNzfpKNZzuDf2OM6w6rbz+zJTr3zVo/CM=";
   };
 
diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix
index d9ec515919b1..820e1f3d62fd 100644
--- a/pkgs/applications/misc/clight/default.nix
+++ b/pkgs/applications/misc/clight/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedeDP";
     repo = "Clight";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Fu38HRP83Yn2jsq9xnCWOXNlV/0hJKD1/cOOp3EV45Q=";
   };
 
diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix
index 7404c8a66a37..fb693b1ff66f 100644
--- a/pkgs/applications/misc/collision/default.nix
+++ b/pkgs/applications/misc/collision/default.nix
@@ -26,7 +26,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "Collision";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-c/74LzDM63w5zW8z2T8o4Efvuzj791/zTSKEDN32uak=";
   };
 
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index b78de7776a72..bb395236a66c 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WBJyLfiPPEQ/Cj5uuwy9KhVc1kw4Hv5TeEuRFDydlGk=";
   };
 
diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix
index e744e84235d5..eafd42bf38e9 100644
--- a/pkgs/applications/misc/cubiomes-viewer/default.nix
+++ b/pkgs/applications/misc/cubiomes-viewer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Cubitect";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-izDKS08LNT2rV5rIxlWRHevJAKEbAVzekjfZy0Oen1I=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix
index 9f0db2a141f8..944dc109c0e9 100644
--- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qhYuLqWXCpOJCqg+JJ8VQQokNEQVwxpHAtYGITxHZ3Y=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix
index 2138f68ca5e8..d06bea646dc7 100644
--- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TKBr/CFY4ixQnJuaN+wJB88s6g4lvQz4rwq9YsccRYk=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix
index 1daaa245c5b0..1bdf0f104dee 100644
--- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mCFFT/vHzfC4jl1I8SkgaX8qu+AFNNcwUZx4eJeE+i4=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix
index 90a6cc2c9797..32ab1063a04b 100644
--- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WCSc3ppYaktj9WnPb4n7SmSNWxT2HiXNmPKS3md3ST4=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix
index a3e6fe78d13a..61d585e347fe 100644
--- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Xir1RQG7AlO166lZq1TJssiWoSixY6EfLEjxek+9ifo=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix
index 3c2cd9bf80c0..d0c01f95c0d2 100644
--- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SyGIeoYC4bTBWZ0adOfYJpWkW3/bvFNZg5zK2MN27kA=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix
index 834284111a53..7d788eea2286 100644
--- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DmvmFMttEvNnIp1zwCe0BLrMx3Wlw1U9LcJwyb4Mx9U=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
index 1dc1fc2c161f..d5df2a0bf830 100644
--- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix
index f81b6ec4ef5d..e3ff6fdf2b36 100644
--- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qiw6P+I9iAcFcBWiMKAzyxM6waXx/2TPVQHLcLjAnoY=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix
index 03a888b4432f..2f4e15543a2f 100644
--- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ndknVT/gl2P0s3ADW0txiVtAyI/l/ZFWEgufFleS0A4=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix
index 65b4381a4ed2..b45330fef2ce 100644
--- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-t3r/bF/uKoprdDoRjrmYTND0Jws+jX6tAGnBeqofBF8=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix
index e52f2932bad8..19e34bfbfea1 100644
--- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vA2Phs+sEs+Gd73xzj6vb91Krm8q3+koWDM7rCUayTQ=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix
index 3115b3b7a4aa..c500ab6fa6a8 100644
--- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jN1keyo2tDlgUu243173zgChw2nhvbsLPH9af6jDhKs=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
index 369e16ed89bf..b283e49237aa 100644
--- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XPECvwZkJIoN/r5oFWJpgl/WASpybgLjCK/F0XVMHyU=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix
index 8328a24f7854..f557f48740f8 100644
--- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-584dSlXhPfvTBeDjex1o2TZPoG40tl1fNDiIYqjyzOI=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix
index b93723b23310..8ec6080a4c32 100644
--- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2tnJMBbROGWZQDWjy/xGBNkv7DXXKLWrHf2XnMjOjWQ=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix
index 0cb443301323..f2671ab3eff2 100644
--- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zMSE1gQ2HJQCqil3MB4slRe0Cojv2XRLd8wLTokF8H0=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix
index e385616029e4..b210b0ca766c 100644
--- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0x3014UG861lXRwIBpYiiYVPmhln9Q20jJ4tIO50Tjs=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
index 8054b3b837e4..ed5d5fc49fa9 100644
--- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
@@ -36,7 +36,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IYUkPGgFGI6889IyromMBobIoqSZtALVsSswQ7O1Bp0=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix
index 0bb93266b7a5..dfe9e4f1ea89 100644
--- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SjD37+uLKJrPvjxK0douNgGCUq9He3EK86takZlrX7Q=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
index 6b9dddb8a89a..353128b091af 100644
--- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j6WFLcjDMkYl+9HCmhMRttwtjNX05oP5mfdOsoLC7og=";
   };
 
diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
index 47a4cdb9b258..ba9162ed33c8 100644
--- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cubocore";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1MHyx01w+dCeAeumcSXRBStgAec2yu1rLwaZaCXRgTc=";
   };
 
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 132a104fce59..88f3579753c2 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Cura";
-    tag = version;
+    rev = version;
     sha256 = "sha256-R88SdAxx3tkQCDInrFTKad1tPSDTSYaVAPUVmdk94Xk=";
   };
 
diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix
index 5080a228794c..0b6ebae802a3 100644
--- a/pkgs/applications/misc/cura/plugins.nix
+++ b/pkgs/applications/misc/cura/plugins.nix
@@ -46,7 +46,7 @@ let
       src = fetchFromGitHub {
         owner = "smartavionics";
         repo = pname;
-        tag = version;
+        rev = version;
         sha256 = "0hvi7qwd4xfnqnhbj9dgfjmvv9df7s42asf3fdfxv43n6nx74scw";
       };
 
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 389ab326b489..20a0359c6ebd 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
-    tag = version;
+    rev = version;
     sha256 = "sha256-dx0Q6cuA66lG4nwR7quW5Tvs9sdxjdV4gtpxXirI4nY=";
   };
 
diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix
index e69469eb097e..103f081fe150 100644
--- a/pkgs/applications/misc/curaengine/stable.nix
+++ b/pkgs/applications/misc/curaengine/stable.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
-    tag = version;
+    rev = version;
     sha256 = "sha256-8V21TRSqCN+hkTlz51d5A5oK5JOwEtx+ROt8cfJBL/0=";
   };
 
diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix
index ebdf60af2cdd..7016c5c74617 100644
--- a/pkgs/applications/misc/ddcui/default.nix
+++ b/pkgs/applications/misc/ddcui/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rockowitz";
     repo = "ddcui";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KcivAoPV/4TihVkwYgq3bWWhG5E8enVSD3bhObl++I0=";
   };
 
diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix
index 39e12a68c569..dda967a113e1 100644
--- a/pkgs/applications/misc/deadd-notification-center/default.nix
+++ b/pkgs/applications/misc/deadd-notification-center/default.nix
@@ -28,7 +28,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phuhl";
     repo = "linux_notification_center";
-    tag = version;
+    rev = version;
     hash = "sha256-VU9NaQVS0n8hFRjWMvCMkaF5mZ4hpnluV31+/SAK7tU=";
   };
 
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index 0c0e6226a4d9..4302d6cde399 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vslavik";
     repo = "diff-pdf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6aKF3Xqp/1BoHEiZVZJSemTjn5Qwwr3QyhsXOIjTr08=";
   };
 
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index da280c8b872d..1aa3ca72eb61 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -55,7 +55,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "digitalbitbox";
     repo = "dbb-app";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA=";
   };
 
diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix
index af077991c36e..447cb0d37794 100644
--- a/pkgs/applications/misc/dmensamenu/default.nix
+++ b/pkgs/applications/misc/dmensamenu/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dotlambda";
     repo = "dmensamenu";
-    tag = version;
+    rev = version;
     sha256 = "1ck1i1k40bli6m3n49ff6987hglby9fn4vfr28jpkm3h70s2km3n";
   };
 
diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix
index b725bf6aadb6..bab21335b1e8 100644
--- a/pkgs/applications/misc/dupeguru/default.nix
+++ b/pkgs/applications/misc/dupeguru/default.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "arsenetar";
     repo = "dupeguru";
-    tag = version;
+    rev = version;
     hash = "sha256-/jkZiCapmCLMp7WfgUmpsR8aNCfb3gBELlMYaC4e7zI=";
   };
 
diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix
index d338ab5dc8af..e4b4e3f3b385 100644
--- a/pkgs/applications/misc/edgetx/default.nix
+++ b/pkgs/applications/misc/edgetx/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EdgeTX";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E=";
   };
diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index 2ea00ad650bb..51df5b17b99d 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -34,7 +34,7 @@ let
   tests = fetchFromGitHub {
     owner = "pooler";
     repo = "electrum-ltc";
-    tag = version;
+    rev = version;
     sha256 = "sha256-qu72LIV07pgHqvKv+Kcw9ZmNk6IBz+4/vdJELlT5tE4=";
 
     postFetch = ''
diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix
index cca045fb8c0a..d43afca3250c 100644
--- a/pkgs/applications/misc/eureka-ideas/default.nix
+++ b/pkgs/applications/misc/eureka-ideas/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "simeg";
     repo = "eureka";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc=";
   };
 
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index cdd8da3d01e5..3a75f783aa51 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "goldendict";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-80o8y+mbzpyMQYUGHYs/zgQT23nLVCs7Jcr8FbbXn8M=";
   };
 
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index e086b13b1e71..3822b1655b1b 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gphoto";
     repo = "gphoto2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-t5EnM4WaDbOTPM+rJW+hQxBgNErnnZEN9lZvxTKoDhA=";
   };
 
diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index bb711093f63c..564d28e73f2b 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "juzzlin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-eKnGCYxC3b7qd/g2IMDyZveBg+jvFA9s3tWEGeTPSkU=";
   };
 
diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix
index 6d990ea52faf..a6c478051703 100644
--- a/pkgs/applications/misc/hovercraft/default.nix
+++ b/pkgs/applications/misc/hovercraft/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "regebro";
     repo = "hovercraft";
-    tag = version;
+    rev = version;
     sha256 = "0k0gjlqjz424rymcfdjpj6a71ppblfls5f8y2hd800d1as4im8az";
   };
 
diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix
index a99d67420d01..5fc2aabfb390 100644
--- a/pkgs/applications/misc/huggle/default.nix
+++ b/pkgs/applications/misc/huggle/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "huggle";
     repo = "huggle3-qt-lx";
-    tag = version;
+    rev = version;
     sha256 = "sha256-f7Oo6x262Ju9KY8f/xjm9gL6I1fRCaDsQWGWJMUNUfY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix
index d74cd88b19f5..a05800414a79 100644
--- a/pkgs/applications/misc/inherd-quake/default.nix
+++ b/pkgs/applications/misc/inherd-quake/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "phodal";
     repo = "quake";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q=";
   };
 
diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix
index 3f33a9a37562..f7f302628b8c 100644
--- a/pkgs/applications/misc/inlyne/default.nix
+++ b/pkgs/applications/misc/inlyne/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Inlyne-Project";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ueE1NKbCMBUBrrdsHkwZ5Yv6LD3tQL3ZAk2O4xoYOcw=";
   };
 
diff --git a/pkgs/applications/misc/inochi2d/default.nix b/pkgs/applications/misc/inochi2d/default.nix
index 76d2c5b38f2e..9e30a883d668 100644
--- a/pkgs/applications/misc/inochi2d/default.nix
+++ b/pkgs/applications/misc/inochi2d/default.nix
@@ -27,7 +27,7 @@ in
     src = fetchFromGitHub {
       owner = "Inochi2D";
       repo = "inochi-creator";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-9d3j5ZL6rGOjN1GUpCIfbjby0mNMvOK7BJbHYgwLY2k=";
     };
 
@@ -58,7 +58,7 @@ in
     src = fetchFromGitHub {
       owner = "Inochi2D";
       repo = "inochi-session";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-FcgzTCpD+L50MsPP90kfL6h6DEUtiYkUV1xKww1pQfg=";
     };
 
diff --git a/pkgs/applications/misc/input-leap/default.nix b/pkgs/applications/misc/input-leap/default.nix
index 4bad158b0559..68287ee614a3 100644
--- a/pkgs/applications/misc/input-leap/default.nix
+++ b/pkgs/applications/misc/input-leap/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "input-leap";
     repo = "input-leap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YkBHvwN573qqQWe/p0n4C2NlyNQHSZNz2jyMKGPITF4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/johnny-reborn/default.nix b/pkgs/applications/misc/johnny-reborn/default.nix
index 286b926e655a..7b3630654933 100644
--- a/pkgs/applications/misc/johnny-reborn/default.nix
+++ b/pkgs/applications/misc/johnny-reborn/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xesf";
     repo = "jc_reborn";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PDh2RKdvm4LkDKi963CB5RiraWcS3FED6ug8T1J65GM=";
   };
 
diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix
index cf56fa24c8f8..0894b4b08b69 100644
--- a/pkgs/applications/misc/k4dirstat/default.nix
+++ b/pkgs/applications/misc/k4dirstat/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeromerobert";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-TXMUtiPS7qRLm6cCy2ZntYrcNJ0fn6X+3o3P5u7oo08=";
   };
 
diff --git a/pkgs/applications/misc/kapow/default.nix b/pkgs/applications/misc/kapow/default.nix
index 3d114d6a604f..d2eef8279c3a 100644
--- a/pkgs/applications/misc/kapow/default.nix
+++ b/pkgs/applications/misc/kapow/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gottcode";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1fz9fb4w21ax8hjs6dwfn2410ig4lqvzdlijq0jcj3jbgxd4i1gw";
   };
 
diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix
index 6d2a85232335..4e0a53397944 100644
--- a/pkgs/applications/misc/keepassxc/default.nix
+++ b/pkgs/applications/misc/keepassxc/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
-    tag = version;
+    rev = version;
     hash = "sha256-FBoqCYNM/leN+w4aV0AJMx/G0bjHbI9KVWrnmq3NfaI=";
   };
 
diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix
index f95e8ebaaddd..3c80d820a129 100644
--- a/pkgs/applications/misc/kemai/default.nix
+++ b/pkgs/applications/misc/kemai/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AlexandrePTJ";
     repo = "kemai";
-    tag = version;
+    rev = version;
     hash = "sha256-wclBAgeDyAIw/nGF6lzIwbwdoZMBTu+tjxsnIxIkODM=";
   };
 
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 4f8918074ad7..bb52de44c15d 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kiwix";
     repo = "kiwix-desktop";
-    tag = version;
+    rev = version;
     hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw=";
   };
 
diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix
index 7eb067f646ba..93381ecce06b 100644
--- a/pkgs/applications/misc/kiwix/lib.nix
+++ b/pkgs/applications/misc/kiwix/lib.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kiwix";
     repo = "libkiwix";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-QP23ZS0FJsMVtnWOofywaAPIU0GJ2L+hLP/x0LXMKiU=";
   };
 
diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix
index 584e582f3e18..4f3e74c4a1ee 100644
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -21,7 +21,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KLayout";
     repo = "klayout";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-i7MQqkVf+NZkmcf589BpLofwqc5KGxRNqdr1Go84M9A=";
   };
 
diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix
index 84dbaca86ec4..609414f21d7f 100644
--- a/pkgs/applications/misc/klipper-estimator/default.nix
+++ b/pkgs/applications/misc/klipper-estimator/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Annex-Engineering";
     repo = "klipper_estimator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EjfW2qeq0ehGhjE2Psz5g/suYMZPvtQi2gaYb+NCa2U=";
   };
 
diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix
index b03a250db839..526ee7eafd96 100644
--- a/pkgs/applications/misc/ksmoothdock/default.nix
+++ b/pkgs/applications/misc/ksmoothdock/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dangvd";
     repo = "ksmoothdock";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hO7xgjFMFrEhQs3oc2peFTjSVEDsl7Ma/TeVybEZMEk=";
   };
 
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index 49329d9bbf0f..e438351f1906 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -79,7 +79,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lutris";
     repo = "lutris";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CAXKnx5+60MITRM8enkYgFl5ZKM6HCXhCYNyG7kHhuQ=";
   };
 
diff --git a/pkgs/applications/misc/makehuman/default.nix b/pkgs/applications/misc/makehuman/default.nix
index be9380ac78eb..c52ae1b813a3 100644
--- a/pkgs/applications/misc/makehuman/default.nix
+++ b/pkgs/applications/misc/makehuman/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   source = fetchFromGitHub {
     owner = "makehumancommunity";
     repo = "makehuman";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-x0v/SkwtOl1lkVi2TRuIgx2Xgz4JcWD3He7NhU44Js4=";
     name = "${pname}-source";
   };
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   assets = fetchFromGitHub {
     owner = "makehumancommunity";
     repo = "makehuman-assets";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Jd2A0PAHVdFMnDLq4Mu5wsK/E6A4QpKjUyv66ix1Gbo=";
     name = "${pname}-assets-source";
   };
diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix
index 5ee4f7f2c6c9..dd7d60049c46 100644
--- a/pkgs/applications/misc/maliit-keyboard/default.nix
+++ b/pkgs/applications/misc/maliit-keyboard/default.nix
@@ -27,7 +27,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maliit";
     repo = "keyboard";
-    tag = version;
+    rev = version;
     sha256 = "sha256-XH3sKQuNMLgJi2aV+bnU2cflwkFIw4RYVfxzQiejCT0=";
   };
 
diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix
index cd630b4b72fd..ce1897b4aed2 100644
--- a/pkgs/applications/misc/mdzk/default.nix
+++ b/pkgs/applications/misc/mdzk/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mdzk-rs";
     repo = "mdzk";
-    tag = version;
+    rev = version;
     hash = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs=";
   };
 
diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix
index 4d0aa9ad4cf8..d815c354f8e6 100644
--- a/pkgs/applications/misc/mediaelch/default.nix
+++ b/pkgs/applications/misc/mediaelch/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Komet";
     repo = "MediaElch";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m2d4lnyD8HhhqovMdeG36dMK+4kJA7rlPHE2tlhfevo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index c25ce8ddb66c..b8023272f60f 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mooltipass";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-S2Pnueo3opP1k6XBBHGAyRJpkNuI1Hotz7ypXa/96eQ=";
   };
 
diff --git a/pkgs/applications/misc/nimbo/default.nix b/pkgs/applications/misc/nimbo/default.nix
index 0bc7a7c2dafe..151393c804b4 100644
--- a/pkgs/applications/misc/nimbo/default.nix
+++ b/pkgs/applications/misc/nimbo/default.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nimbo-sh";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "YC5T02Sw22Uczufbyts8l99oCQW4lPq0gPMRXCoKsvw=";
   };
 
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix
index 43779a594b9b..9014f2f32344 100644
--- a/pkgs/applications/misc/nixnote2/default.nix
+++ b/pkgs/applications/misc/nixnote2/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baumgarr";
     repo = "nixnote2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr";
   };
 
diff --git a/pkgs/applications/misc/openambit/default.nix b/pkgs/applications/misc/openambit/default.nix
index 5dc499a6c132..9f80b8ee3168 100644
--- a/pkgs/applications/misc/openambit/default.nix
+++ b/pkgs/applications/misc/openambit/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openambitproject";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1074kvkamwnlkwdajsw1799wddcfkjh2ay6l842r0s4cvrxrai85";
   };
 
diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix
index ae2cca2da7da..c7680b8f2dfb 100644
--- a/pkgs/applications/misc/osmscout-server/default.nix
+++ b/pkgs/applications/misc/osmscout-server/default.nix
@@ -35,7 +35,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rinigus";
     repo = "osmscout-server";
-    tag = version;
+    rev = version;
     hash = "sha256-GqUXHn3ZK8gdDlm3TitEp/jhBpQoVeQZUCfAyiyrDEg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix
index b7c09814c6c6..3265a1b61299 100644
--- a/pkgs/applications/misc/pastel/default.nix
+++ b/pkgs/applications/misc/pastel/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0=";
   };
 
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 78666225049a..661117bcaace 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "pdfpc";
     owner = "pdfpc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5HFmbVsNajMwo+lBe9kJcJyQGe61N6Oy2CI/WJwmSE4=";
   };
 
diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix
index 56c7b343242a..c85fc3f9403b 100644
--- a/pkgs/applications/misc/pe-bear/default.nix
+++ b/pkgs/applications/misc/pe-bear/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hasherezade";
     repo = "pe-bear";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jHFH1GAbAtOzUh+Gma89YCU5r/yuwekv/bqiyy8VmRk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/peaclock/default.nix b/pkgs/applications/misc/peaclock/default.nix
index 7f42e136c5fe..7b495ed4dc30 100644
--- a/pkgs/applications/misc/peaclock/default.nix
+++ b/pkgs/applications/misc/peaclock/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "octobanana";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1582vgslhpgbvcd7ipgf1d1razrvgpq1f93q069yr2bbk6xn8i16";
   };
 
diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
index 877567562d01..884acd7aaa77 100644
--- a/pkgs/applications/misc/pgmodeler/default.nix
+++ b/pkgs/applications/misc/pgmodeler/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pgmodeler";
     repo = "pgmodeler";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZoWCXCRaFQMf/RbcgXZQiF4+TDogdMOtccxOTk1c7Jw=";
   };
 
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
index 6df5a16bae45..cba463516a68 100644
--- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
+++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Zren";
     repo = "plasma-applet-volumewin7mixer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VMOUNtAURTHDuJBOGz2N0+3VzxBmVNC1O8dVuyUZAa4=";
   };
 
diff --git a/pkgs/applications/misc/plasma-theme-switcher/default.nix b/pkgs/applications/misc/plasma-theme-switcher/default.nix
index 208c8a6b9914..324cca93099f 100644
--- a/pkgs/applications/misc/plasma-theme-switcher/default.nix
+++ b/pkgs/applications/misc/plasma-theme-switcher/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maldoinc";
     repo = "plasma-theme-switcher";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sdcJ6K5QmglJEDIEl4sd8x7DuCPCqMHRxdYbcToM46Q=";
   };
 
diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 335bfa55bb45..24c14969970f 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -29,7 +29,7 @@
       src = fetchFromGitHub {
         owner = "openstenoproject";
         repo = "plover";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = "sha256-oJ7+R3ZWhUbNTTAw1AfMg2ur8vW1XEbsa5FgSTam1Ns=";
       };
 
diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix
index a0496ac34049..0e7114cc787f 100644
--- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix
+++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix
@@ -53,7 +53,7 @@ let
         owner = "supermerill";
         repo = "SuperSlicer";
         inherit hash;
-        tag = version;
+        rev = version;
         fetchSubmodules = true;
       };
 
diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix
index 818449ac026a..8a3717a8eefc 100644
--- a/pkgs/applications/misc/pueue/default.nix
+++ b/pkgs/applications/misc/pueue/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Nukesor";
     repo = "pueue";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TDxTj7VGzJzd6RWyVbe2ubpVS57bqq7OVvi23ZHmYDM=";
   };
 
diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix
index d96ba9df7cbf..f93c1e6cd853 100644
--- a/pkgs/applications/misc/pure-maps/default.nix
+++ b/pkgs/applications/misc/pure-maps/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rinigus";
     repo = "pure-maps";
-    tag = version;
+    rev = version;
     hash = "sha256-3XghdDwzt0r8Qi8W3ZMwar2aaqTNGiGsM27BHVr5C2E=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix
index a5662809616a..b3cbb9572923 100644
--- a/pkgs/applications/misc/q4wine/default.nix
+++ b/pkgs/applications/misc/q4wine/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brezerk";
     repo = "q4wine";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "04gw5y3dxdpivm2xqacqq85fdzx7xkl0c3h3hdazljb0c3cxxs6h";
   };
 
diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix
index a6d249ed6faa..069e5ae7b48a 100644
--- a/pkgs/applications/misc/qMasterPassword/default.nix
+++ b/pkgs/applications/misc/qMasterPassword/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bkueng";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4qxPjrf6r2S0l/hcs6bqfJm56jdDz+0a0xEkqGBYGBs=";
   };
 
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index ac4495e7c1c3..699afb8a6a5f 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     name = "qcad-${version}-src";
     owner = "qcad";
     repo = "qcad";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3P6iudD/swpNDPL4G8isJI6zxqc6/rmHAMpPnEwnuiM=";
   };
 
diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix
index b6419ec56b5c..d379b95eb2bb 100644
--- a/pkgs/applications/misc/qsudo/default.nix
+++ b/pkgs/applications/misc/qsudo/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "project-trident";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "06kg057vwkvafnk69m9rar4wih3vq4h36wbzwbfc2kndsnn47lfl";
   };
 
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 6589d3491667..523a91b92f4f 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -21,7 +21,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sieren";
     repo = "QSyncthingTray";
-    tag = version;
+    rev = version;
     sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w";
   };
 
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 9b5397646199..56a43e10e360 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IJHack";
     repo = "QtPass";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI=";
   };
 
diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix
index ce5a424a2212..435da18f8abe 100644
--- a/pkgs/applications/misc/reddsaver/default.nix
+++ b/pkgs/applications/misc/reddsaver/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "manojkarthick";
     repo = "reddsaver";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf";
   };
 
diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 5b05f6c7d349..8a198a702eaa 100644
--- a/pkgs/applications/misc/redshift-plasma-applet/default.nix
+++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kotelnik";
     repo = "plasma-applet-redshift-control";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "122nnbafa596rxdxlfshxk45lzch8c9342bzj7kzrsjkjg0xr9pq";
   };
 
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 505f6bab0781..31e866d0e7c5 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -156,7 +156,7 @@ rec {
     src = fetchFromGitHub {
       owner = "jonls";
       repo = "redshift";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6";
     };
 
@@ -185,7 +185,7 @@ rec {
     src = fetchFromGitLab {
       owner = "chinstrap";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU=";
     };
 
diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix
index 75a699e3a1ba..78c810c3dff6 100644
--- a/pkgs/applications/misc/resp-app/default.nix
+++ b/pkgs/applications/misc/resp-app/default.nix
@@ -38,7 +38,7 @@ mkDerivation rec {
     owner = "RedisInsight";
     repo = "RedisDesktopManager";
     fetchSubmodules = true;
-    tag = version;
+    rev = version;
     hash = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4=";
   };
 
diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix
index a249356388e9..a8a83fcfe863 100644
--- a/pkgs/applications/misc/rofi-emoji/default.nix
+++ b/pkgs/applications/misc/rofi-emoji/default.nix
@@ -33,7 +33,7 @@ import ./versions.nix (
     src = fetchFromGitHub {
       owner = "Mange";
       repo = "rofi-emoji";
-      tag = "v${version}";
+      rev = "v${version}";
       inherit hash;
     };
 
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 3ba6ef4280ac..95597a6ee411 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "davatorium";
     repo = "rofi";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-TEn3LoTUc5mxYcVkckIFTfkqQ9cUJxkXyg/5TFv5TZ0=";
   };
diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix
index 481c3e11d9af..a28d6f1027fe 100644
--- a/pkgs/applications/misc/rofi/wayland.nix
+++ b/pkgs/applications/misc/rofi/wayland.nix
@@ -15,7 +15,7 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec {
   src = fetchFromGitHub {
     owner = "lbonn";
     repo = "rofi";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-6hQfy0c73z1Oi2mGjuhKLZQIBpG1u06v40dmlc5fL/w=";
   };
diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix
index 13b25023b6c4..090c0454def1 100644
--- a/pkgs/applications/misc/slstatus/default.nix
+++ b/pkgs/applications/misc/slstatus/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.suckless.org/slstatus";
-    tag = version;
+    rev = version;
     hash = "sha256-cFah6EgApslLSlJaOy/5W9ZV9Z1lzfKye/rRh9Om3T4=";
   };
 
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix
index ecd20697bd7b..e00289353842 100644
--- a/pkgs/applications/misc/stog/default.nix
+++ b/pkgs/applications/misc/stog/default.nix
@@ -28,7 +28,7 @@ buildDunePackage rec {
     domain = "framagit.org";
     owner = "zoggy";
     repo = "stog";
-    tag = version;
+    rev = version;
     hash = "sha256-hMb6D6VSq2o2NjycwxZt3mZKy1FR+3afEwbOmTc991g=";
   };
 
diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix
index ab9f3682bd91..24e160ab3a62 100644
--- a/pkgs/applications/misc/stork/default.nix
+++ b/pkgs/applications/misc/stork/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jameslittle230";
     repo = "stork";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw=";
   };
 
diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix
index 75d69854cbf1..848e73ff2df3 100644
--- a/pkgs/applications/misc/swappy/default.nix
+++ b/pkgs/applications/misc/swappy/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jtheoof";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo=";
   };
 
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index a9083fa79d8c..df841710a11c 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "symless";
     repo = "synergy-core";
-    tag = version;
+    rev = version;
     hash = "sha256-0QqklfSsvcXh7I2jaHk82k0nY8gQOj9haA4WOjGqBqY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix
index 1b46b550ba39..76013b492330 100644
--- a/pkgs/applications/misc/terminal-typeracer/default.nix
+++ b/pkgs/applications/misc/terminal-typeracer/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "ttyperacer";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-S3OW6KihRd6ReTWUXRb1OWC7+YoxehjFRBxcnJVgImU=";
   };
 
diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix
index 81b29acba80c..29f1591b9fc8 100644
--- a/pkgs/applications/misc/tipp10/default.nix
+++ b/pkgs/applications/misc/tipp10/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "tipp10";
     repo = "tipp10";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-e0sWH4pT7ej9XGK/Sg9XMX2bMqcXqtSaYI7KBZTXvp4=";
   };
 
diff --git a/pkgs/applications/misc/tuxclocker/default.nix b/pkgs/applications/misc/tuxclocker/default.nix
index 76a24891ce9f..42f02f2ab223 100644
--- a/pkgs/applications/misc/tuxclocker/default.nix
+++ b/pkgs/applications/misc/tuxclocker/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Lurkki14";
     repo = "tuxclocker";
     fetchSubmodules = true;
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-QLKLqTCpVMWxlDINa8Bo1vgCDcjwovoaXUs/PdMnxv0=";
   };
 
diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix
index 6abe7cfbe806..e3b42c54a198 100644
--- a/pkgs/applications/misc/twitch-chat-downloader/default.nix
+++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "TheDrHax";
     repo = "twitch-chat-downloader";
-    tag = version;
+    rev = version;
     hash = "sha256-mV60ygrtQa9ZkJ2CImhAV59ckCJ7vJSA9cWkYE2xo1M=";
   };
 
diff --git a/pkgs/applications/misc/ubpm/default.nix b/pkgs/applications/misc/ubpm/default.nix
index 1b7ea446d737..013d31b9d57f 100644
--- a/pkgs/applications/misc/ubpm/default.nix
+++ b/pkgs/applications/misc/ubpm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "LazyT";
     repo = "ubpm";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-BUUn1WyLT7nm4I+2SpO1ZtIf8isGDy8Za15SiO7sXL8=";
   };
 
diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix
index 9728fb4ecb59..746fd8aaad50 100644
--- a/pkgs/applications/misc/valentina/default.nix
+++ b/pkgs/applications/misc/valentina/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "smart-pattern";
     repo = "valentina";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vIlqrK7wyFaXKfvcJ3FtkAwUt6Xb/47qxcDGy1Ty2uk=";
   };
 
diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index 5881b9a17998..7bb38e8b0d1b 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -56,7 +56,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "saulpw";
     repo = "visidata";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ICEYC9QjYrB+oTzakfjgyg4DigzDOtYnqHRTaqF7Gw0=";
   };
 
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index 08347da83a2c..64f8f2cbac36 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ids1024";
     repo = "wikicurses";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm";
   };
 
diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix
index e63a5db55daf..6d57f49a6a30 100644
--- a/pkgs/applications/misc/xsw/default.nix
+++ b/pkgs/applications/misc/xsw/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrenho";
     repo = "xsw";
-    tag = version;
+    rev = version;
     sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g";
   };
 
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index bcdcefe19855..7bececfc29de 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rkd77";
     repo = "elinks";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TTb/v24gIWKiCQCESHo0Pz6rvRtw5anoXK0b35dzfLM=";
   };
 
diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix
index c7bd8b893e19..3e266f5f8712 100644
--- a/pkgs/applications/networking/browsers/qtchan/default.nix
+++ b/pkgs/applications/networking/browsers/qtchan/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "siavash119";
     repo = "qtchan";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll";
   };
 
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 475419d09a45..2e8e52b3efe4 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   # tarball is missing file common.h
   src = fetchgit {
     url = "git://git.suckless.org/surf";
-    tag = version;
+    rev = version;
     sha256 = "1v926hiayddylq79n8l7dy51bm0dsa9n18nx9bkhg666cx973x4z";
   };
 
diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix
index ea394696c2fe..fbec74002d1f 100644
--- a/pkgs/applications/networking/browsers/webmacs/default.nix
+++ b/pkgs/applications/networking/browsers/webmacs/default.nix
@@ -18,7 +18,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "parkouss";
     repo = "webmacs";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     sha256 = "1hzb9341hybgrqcy1w20hshm6xaiby4wbjpjkigf4zq389407368";
   };
diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix
index abfb386800ec..4da964a3c7bf 100644
--- a/pkgs/applications/networking/cluster/calico/default.nix
+++ b/pkgs/applications/networking/cluster/calico/default.nix
@@ -19,7 +19,7 @@ builtins.mapAttrs
       src = fetchFromGitHub {
         owner = "projectcalico";
         repo = "calico";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-JK/iKVLXT8h+xZpkjVBEI8vfgRuoTHwWaoKikjBsJgI=";
       };
 
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index 7a53156b0a6c..be96dfdbe562 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ocSc1fhbBB8YRxVVOvYMombOOkLMdfv9V4GYbf8kwIE=";
   };
 
diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index f68119ad4687..085d688e51bd 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = "plugins";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-thtN7po5SToM0ZFYIbycaPJTafLvk9hFV4XFGOpWmpg=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix
index 3905431718d4..825b8e1f7780 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chartmuseum";
     repo = "helm-push";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YnhI1/BDk9swr3YFm5ajGf4LLgPty7blA2tlsMH0erY=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
index e6b055d9b7e9..2f9545fbdc6c 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "databus23";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vRngZigXOyxdx9bG2uWpeQ0ASTW+4tKuQWZ1Vm47Y+k=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
index 48847a42e755..12724709f993 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aslafy-z";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-o9y1C4O1uG2Z7f3kCEoK1tSmSuQh1zJxB/CZBv/GPus=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
index 5bd64544b37f..47aa83ee9653 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm-mapkubeapis";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0DIBdSi/WIHVF8O7OtJOaFnIfpObsUXzgpj25kJuS6E=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
index c28bd33b414e..22ef1697a6a8 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hypnoglow";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WiK2kZWik81HYZVVmzdqdqIE+jnAcYyu536NbdYWYxk=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
index dfc5f030f852..90253a131ffe 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jkroepke";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5vsUyeQH/kCaHo7aze1xA1NVLXrxpFB19P708ikKTpg=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
index 05e2eb615848..ff8a20376d53 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RWucFZlyVYV5pHFGP7x5I+SILAJ9k12R7l5o7WKGS/c=";
   };
 
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index f4ccba3f87a0..e7e7bdc155a2 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "helmfile";
     repo = "helmfile";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zZt0YxGbDqIhg2tXjQo5QnD09ASOUgFyQ1uWbGcujkc=";
   };
 
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index 5ddde86c41d4..285b6c4e4c17 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -188,7 +188,7 @@ let
       src = fetchFromGitHub {
         owner = "rancher";
         repo = "plugins";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = k3sCNISha256;
       };
 
diff --git a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix
index e8e67204bf8f..83f3e752a021 100644
--- a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rajatjindal";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Z1NIueonjyO2GHulBbXbsQtX7V/Z95GUoZv9AqjLIR0=";
   };
 
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index fd3bfed7ef31..541bf4d25e01 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kF3Oo+YETnsrFPWBO5b7nH2A2eONIOkE84+u6vOSrpE=";
   };
 
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index f3d620115435..f9209c858ebc 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "instrumenta";
     repo = "kubeval";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg=";
   };
 
diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix
index 438459d5611d..045210950a4f 100644
--- a/pkgs/applications/networking/cluster/kuma/default.nix
+++ b/pkgs/applications/networking/cluster/kuma/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kumahq";
     repo = "kuma";
-    tag = version;
+    rev = version;
     hash = "sha256-7vRz2B1aSxpQrV7Om8Zs4o1kJgSVd9rMsOagQZyWMLI=";
   };
 
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index e41f8acc8bc6..438fb2cfde49 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "minikube";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Z7x3MOQUF3a19X4SSiIUfSJ3xl3482eKH700m/9pqcU=";
   };
   postPatch =
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index 3f7cd98fbd6f..c48a154d39e0 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -36,7 +36,7 @@ let
         src = fetchFromGitHub {
           owner = "hashicorp";
           repo = pname;
-          tag = "v${version}";
+          rev = "v${version}";
           inherit sha256;
         };
 
diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix
index 20d30b74b7ff..e10ba0c7e28f 100644
--- a/pkgs/applications/networking/cluster/roxctl/default.nix
+++ b/pkgs/applications/networking/cluster/roxctl/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = "stackrox";
-    tag = version;
+    rev = version;
     sha256 = "sha256-AQaMWpI7kFFotEQa536dqKxuP/mHuzNm75RPqUWw1VY=";
   };
 
diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix
index 12df142271ad..bfe9d0a89835 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "sonobuoy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YFItnwU08g4pVo4OOHscRmPRVXyr+R9YWYTxhSzd7iI=";
   };
 
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 80f1fbccef7d..ae80dab1db21 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -35,7 +35,7 @@ let
         src = fetchFromGitHub {
           owner = "hashicorp";
           repo = "terraform";
-          tag = "v${version}";
+          rev = "v${version}";
           inherit hash;
         };
 
diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix
index 25b85cebf2be..75977b38cdaa 100644
--- a/pkgs/applications/networking/cluster/timoni/default.nix
+++ b/pkgs/applications/networking/cluster/timoni/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stefanprodan";
     repo = "timoni";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nI0yy/zhsJUvisHo+C+/uNRF96ZQ1Ve8VWpE8ZvUeJc=";
   };
 
diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index 2b53534dceca..f729420cee65 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dns-stats";
     repo = "compactor";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4=";
   };
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index feaa77d326fc..bc358bc4d036 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "firehol";
     repo = "firehol";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6O3AoQs7Qzcin8VXQgJfCVsNOI74H6fE1DgqdY+e4bA=";
   };
 
diff --git a/pkgs/applications/networking/ftp/gftp/default.nix b/pkgs/applications/networking/ftp/gftp/default.nix
index 2adf5e3de602..361abf88c2d8 100644
--- a/pkgs/applications/networking/ftp/gftp/default.nix
+++ b/pkgs/applications/networking/ftp/gftp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "masneyb";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-0zdv2oYl24BXh61IGCWby/2CCkzNjLpDrAFc0J89Pw4=";
   };
 
diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix
index aedb52d28126..3a8082687666 100644
--- a/pkgs/applications/networking/geph/default.nix
+++ b/pkgs/applications/networking/geph/default.nix
@@ -34,7 +34,7 @@ in
     src = fetchFromGitHub {
       owner = "geph-official";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-6YWPsSRIZpvVCIGZ1z7srobDvVzLr0o2jBcB/7kbK7I=";
     };
 
@@ -101,7 +101,7 @@ in
                 src = fetchFromGitHub {
                   owner = "evanw";
                   repo = "esbuild";
-                  tag = "v${version}";
+                  rev = "v${version}";
                   hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk=";
                 };
                 vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index 55044bcc0d99..48af19cc590f 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "astrada";
     repo = "google-drive-ocamlfuse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AWr1tcium70rXFKMTv6xcWxndOJua3UXG8Q04TN1Siw=";
   };
 
diff --git a/pkgs/applications/networking/icemon/default.nix b/pkgs/applications/networking/icemon/default.nix
index a0bfe6088170..43e9c2b8ebba 100644
--- a/pkgs/applications/networking/icemon/default.nix
+++ b/pkgs/applications/networking/icemon/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "icecc";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09jnipr67dhawbxfn69yh7mmjrkylgiqmd0gmc2limd3z15d7pgc";
   };
 
diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix
index 21c926a6210d..bd2591019582 100644
--- a/pkgs/applications/networking/ids/zeek/broker/default.nix
+++ b/pkgs/applications/networking/ids/zeek/broker/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeek";
     repo = "broker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SG5TzozKvYc7qcEPJgiEtsxgzdZbbJt90lmuUbCPyv0=";
   };
   postUnpack = ''
diff --git a/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix b/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix
index 60c7b57cb415..cf8eab529474 100644
--- a/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maltejur";
     repo = "discord-screenaudio";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+F+XRBQn4AVDVARdM2XtBDE7c6tMPZTR3cntDL8aenw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix
index 9c49b436d2e6..ba1c6d69c01c 100644
--- a/pkgs/applications/networking/instant-messengers/jami/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jami/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     src = fetchFromGitHub {
       owner = "savoirfairelinux";
       repo = "pjproject";
-      tag = version;
+      rev = version;
       hash = "sha256-uA6ZJYUgAu3cK4CKCGtqaI0KPM/0szExPS2pCOflz5A=";
     };
 
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index 88434c4cb353..84bc3da601e6 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -42,7 +42,7 @@ mkDerivation rec {
     owner = "public";
     group = "BC";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Pu2tGKe3C1uR4lzXkC5sJFu8iJBqF76UfWJXYjPwBkc=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
index 4ffcc3e631e0..2ed07af8eeb3 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
@@ -23,7 +23,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "8go";
     repo = "matrix-commander";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JZcdAo6d7huwDQ9hJE8oT5FH0ZQjg0DhoglOkhOyk1o=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
index 99f6d3440323..35e438c6a61f 100644
--- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "pantalaimon";
-    tag = version;
+    rev = version;
     hash = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
index e55c66363a9f..6333693e946d 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gkdr";
     repo = "carbons";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qiyIvmJbRmCrAi/93UxDVtO76nSdtzUVfT/sZGxxAh8=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix
index 3b7e993de647..1d50370c4be7 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "felipec";
     repo = "msn-pecan";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0133rpiy4ik6rx9qn8m38vp7w505hnycggr53g3a2hfpk5xj03zh";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
index fe451bf5f139..35002f0b5773 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "philipl";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix
index e1153d500360..3e2231c887d3 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EionRobb";
     repo = "pidgin-opensteamworks";
-    tag = version;
+    rev = version;
     sha256 = "sha256-VWsoyFG+Ro+Y6ngSTMQ7yBYf6awCMNOc6U0WqNeg/jU=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
index ad6465a9a544..6c14b86281a1 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EionRobb";
     repo = "skype4pidgin";
-    tag = version;
+    rev = version;
     sha256 = "11snyrjhm58gjvdmr5h5ajii3ah4a7c8zw3cavjv9xnnwrpfm5rb";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix
index d991973de8a3..4f29ebdf3bb6 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gkdr";
     repo = "lurch";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yyzotKL1Z4B2BxloJndJKemONMPLG9pVDVe2K5AL05g=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix
index 97e98998f3cf..ed295055c2be 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hoehermann";
     repo = "libpurple-signald";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix
index 02a06d4faa16..1e8bf780dceb 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ars3niy";
     repo = "tdlib-purple";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mrowzTtNLyMc2WwLVIop8Mg2DbyiQs0OPXmJuM9QUnM=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 66533dea36bd..fa4ca8190625 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "profanity-im";
     repo = "profanity";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-3TmnbTnL8SPSd3seThavOOJVELi8kWLSlZlAub24KZ4=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 8385fb10f2a6..95d847a77b9f 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -50,7 +50,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
-    tag = version;
+    rev = version;
     sha256 = "sha256-RlZwMBWjhCTEEV08UHbf8NvuqmuihXwR1aA/vMmD1BM=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 5b4153b78c17..0f386c884cc8 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psi-im";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 750a697e1749..af2c5434bd68 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "quotient-im";
     repo = "Quaternion";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-lRCSEb/ldVnEv6z0moU4P5rf0ssKb9Bw+4QEssLjuwI=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix
index abed32f5f665..efa7dffdae71 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "paul-nameless";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-apHd26XnOz5nak+Kz8PJPsonQfTWDyPz7Mi/tWf7zwM=";
   };
 
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index cd8bf42e3185..0807b51f6fca 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -52,7 +52,7 @@ in
   src = fetchFromGitHub {
     owner = "quassel";
     repo = "quassel";
-    tag = version;
+    rev = version;
     sha256 = "sha256-eulhNcyCmy9ryietOhT2yVJeJH+MMZRbTUo2XuTy9qU=";
   };
 
diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix
index 0576ea2a913a..30023e00057d 100644
--- a/pkgs/applications/networking/irc/tiny/default.nix
+++ b/pkgs/applications/networking/irc/tiny/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "osa1";
     repo = "tiny";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-phjEae2SS3zkSpuhhE4iscUM8ij8DT47YLIMATMG/+Q=";
   };
 
diff --git a/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix b/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix
index e2dcc7b90441..b89971bc0686 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "keith";
     repo = "edit-weechat";
-    tag = version;
+    rev = version;
     sha256 = "1s42r0l0xkhlp6rbc23cm4vlda91il6cg53w33hqfhd2wz91s66w";
   };
 
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index 8d44d1433d5d..443738ff08a1 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "wee-slack";
     owner = "wee-slack";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xQO/yi4pJSnO/ldzVQkC7UhAfpy57xzO58NV7KZm4E8=";
   };
 
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index a3242a0207dd..0a9765549b63 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "poljar";
     repo = "weechat-matrix";
-    tag = version;
+    rev = version;
     hash = "sha256-o4kgneszVLENG167nWnk2FxM+PsMzi+PSyMUMIktZcc=";
   };
 
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
index 5dda8c5cc5c6..5aebaf7c82cf 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "s3rvac";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7uw0IdRSxhPrLqdgECKB9eOrtFj+2HTILBhakKiRuNQ=";
   };
 
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
index 7aef4e27831d..e38f41555898 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "mmb";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1lngv98y6883vk8z2628cl4d5y8jxy39w8245gjdvshl8g18k5s2";
   };
 
diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix
index 42606e8780d4..d08ad5686990 100644
--- a/pkgs/applications/networking/ktailctl/default.nix
+++ b/pkgs/applications/networking/ktailctl/default.nix
@@ -31,7 +31,7 @@ let
   src = fetchFromGitHub {
     owner = "f-koehler";
     repo = "KTailctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BgxWsT/s5Hv5cvzcSjfrgAmZhcoquaydSZKdPmld4Rg=";
   };
 
diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix
index bd1b039219be..bef56def692c 100644
--- a/pkgs/applications/networking/libcoap/default.nix
+++ b/pkgs/applications/networking/libcoap/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "libcoap";
     owner = "obgm";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-QNrsR6VarZ2favvTZ9pMhVafwF2fOjYLKcyNqZyUl6s=";
   };
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index bd4fb4f405cb..365aefcc4543 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "astroidmail";
     repo = "astroid";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6xQniOLNUk8tDkooDN3Tp6sb43GqoynO6+fN9yhNqZ4=";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 9e2a2220209d..77aa89e029a1 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pulb";
     repo = "mailnag";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0m1cyzwzm7z4p2v31dx098a1iar7dbilwyjcxiqnjx05nlmiqvgf";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix
index 2686ad6499ff..3b32debe0f14 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pulb";
     repo = "mailnag-goa-plugin";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0bij6cy96nhq7xzslx0fnhmiac629h0x4wgy67k4i4npwqw10680";
   };
 
diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix
index 2e06e4b51de3..aade921aa809 100644
--- a/pkgs/applications/networking/mhost/default.nix
+++ b/pkgs/applications/networking/mhost/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lukaspustina";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6jn9jOCh96d9y2l1OZ5hgxg7sYXPUFzJiiT95OR7lD0=";
   };
 
diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix
index ea1bf729fe3f..a37177426b10 100644
--- a/pkgs/applications/networking/mujmap/default.nix
+++ b/pkgs/applications/networking/mujmap/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "elizagamedev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E=";
   };
 
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 5618f9a08c25..3205630ce61c 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -176,7 +176,7 @@ let
     src = fetchFromGitHub {
       owner = "mumble-voip";
       repo = "mumble";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-JRnGgxkf5ct6P71bYgLbCEUmotDLS2Evy6t8R7ac7D4=";
       fetchSubmodules = true;
     };
diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix
index 83f4c0deafba..1b6d530016b2 100644
--- a/pkgs/applications/networking/netmaker/default.nix
+++ b/pkgs/applications/networking/netmaker/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gravitl";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/7tj3SuTa2lSMgN4f2/OutzoPvAN7ARK1RKTLlMw13Y=";
   };
 
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 5a8383c38fdb..1adc5d981b87 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "QuiteRSS";
     repo = "quiterss";
-    tag = version;
+    rev = version;
     sha256 = "1cgvl67vhn5y7bj5gbjbgk26bhb0196bgrgsp3r5fmrislarj8s6";
   };
 
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index 1adb08533f1b..5ae05c37776e 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -24,7 +24,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pstavirs";
     repo = "ostinato";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo=";
   };
 
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index 2b2bed14ca70..5b122cc3fe55 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eiskaltdcpp";
     repo = "eiskaltdcpp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JmAopXFS6MkxW0wDQ1bC/ibRmWgOpzU0971hcqAehLU=";
   };
 
diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
index 5e4438c47aa4..78f804fc6bce 100644
--- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
+++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "rtorrent";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k=";
   };
 
diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix
index 1afa4e25d968..50d250e7efe3 100644
--- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix
+++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "libtorrent";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jC/hgGSi2qy+ToZgdxl1PhASLYbUL0O8trX0th2v5H0=";
   };
 
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 071e3e112a0e..1bc2b7db19c7 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -28,7 +28,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RetroShare";
     repo = "RetroShare";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1A1YvOWIiWlP1JPUTg5Z/lxVGCBv4tCPf5sZdPogitU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix
index 0c458c41b217..45dcb717f2b8 100644
--- a/pkgs/applications/networking/p2p/transmission/4.nix
+++ b/pkgs/applications/networking/p2p/transmission/4.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "transmission";
     repo = "transmission";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-KBXvBFgrJ3njIoXrxHbHHLsiocwfd7Eba/GNI8uZA38=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix
index 57ce1f8a1e20..c25585d74701 100644
--- a/pkgs/applications/networking/rymdport/default.nix
+++ b/pkgs/applications/networking/rymdport/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Jacalz";
     repo = "rymdport";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WWLs0gzFo1+scG+2JfNMd28jIP1BMMJOK4fhQ726mHY=";
   };
 
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 9e95cf07a208..94495361d60c 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9ng8TsT211jAt2Vhv8fEIQGCtbQ6LQ6pCVFToVaK8LY=";
   };
 
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 577d9bd86127..d613cc647432 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     repo = "wireshark";
     owner = "wireshark";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NO8tc5Av5Gl3yzkxK9KJAZwIjkrXEnIGmbLBPYKRm0E=";
   };
 
diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix
index 74ada3f71a61..f782cc9937b4 100644
--- a/pkgs/applications/networking/sync/acd_cli/default.nix
+++ b/pkgs/applications/networking/sync/acd_cli/default.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yadayada";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp";
   };
 
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index 4e9e3e9e54b9..8bc4f5f856ee 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bit-team";
     repo = "backintime";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QTUezD3OdOMqrxOCrdPFI8fB5XDhNVo9XpLgi7Y2aRg=";
   };
 
diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix
index 00a2cf937b0a..272445a04753 100644
--- a/pkgs/applications/networking/sync/rclone/browser.nix
+++ b/pkgs/applications/networking/sync/rclone/browser.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kapitainsky";
     repo = "RcloneBrowser";
-    tag = version;
+    rev = version;
     sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33";
   };
 
diff --git a/pkgs/applications/networking/wgnord/default.nix b/pkgs/applications/networking/wgnord/default.nix
index 614efc203208..7f146995abde 100644
--- a/pkgs/applications/networking/wgnord/default.nix
+++ b/pkgs/applications/networking/wgnord/default.nix
@@ -19,7 +19,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phirecc";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-26cfYXtZVQ7kIRxY6oNGCqIjdw/hjwXhVKimVgolLgk=";
   };
 
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 97d64ca1e228..cde866ff60fe 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -145,7 +145,7 @@ in
     src = fetchFromGitHub {
       owner = "cocodelabs";
       repo = "znc-palaver";
-      tag = version;
+      rev = version;
       hash = "sha256-8W3uF1PrLQiEZm7JaFrpqmJLSFioa4F4qlM1J6Zua8U=";
     };
 
diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix
index 2a60ec170845..fc2d43bb2fb2 100644
--- a/pkgs/applications/office/PageEdit/default.nix
+++ b/pkgs/applications/office/PageEdit/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Sigil-Ebook";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-zwOSt1eyvuuqfQ1G2bCB4yj6GgixFRc2FLOgcCrdg3Q=";
   };
 
diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix
index d2d91be35fa9..1287c4c3ccc4 100644
--- a/pkgs/applications/office/activitywatch/default.nix
+++ b/pkgs/applications/office/activitywatch/default.nix
@@ -24,7 +24,7 @@ let
   sources = fetchFromGitHub {
     owner = "ActivityWatch";
     repo = "activitywatch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Z3WAg3b1zN0nS00u0zIose55JXRzQ7X7qy39XMY7Snk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix
index f78df780a2f7..887ded477918 100644
--- a/pkgs/applications/office/beamerpresenter/default.nix
+++ b/pkgs/applications/office/beamerpresenter/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stiglers-eponym";
     repo = "BeamerPresenter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sPeWlPkWOPfLAoAC/+T7nyhPqvoaZg6aMOIVLjMqd2k=";
   };
 
diff --git a/pkgs/applications/office/beancount/beancount-ing-diba.nix b/pkgs/applications/office/beancount/beancount-ing-diba.nix
index 59176757e58a..84e905353740 100644
--- a/pkgs/applications/office/beancount/beancount-ing-diba.nix
+++ b/pkgs/applications/office/beancount/beancount-ing-diba.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "siddhantgoel";
     repo = "beancount-ing-diba";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1cdXqdeTz38n0g13EXJ1/IF/gJJCe1uL/Z5NJz4DL+E=";
   };
 
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index 85829e8fe0e4..f5c58890e6d0 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JabRef";
     repo = "jabref";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-inE2FXAaEEiq7343KwtjEiTEHLtn01AzP0foTpsLoAw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/office/pdfmixtool/default.nix b/pkgs/applications/office/pdfmixtool/default.nix
index 5ddb17009ed1..61443dddcde0 100644
--- a/pkgs/applications/office/pdfmixtool/default.nix
+++ b/pkgs/applications/office/pdfmixtool/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "scarpetta";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fgtRKUG6J/CM6cXUTHWAPemqL8loWZT3wZmGdRHldq8=";
   };
 
diff --git a/pkgs/applications/radio/cqrlog/default.nix b/pkgs/applications/radio/cqrlog/default.nix
index d37903174670..b2bcc7829414 100644
--- a/pkgs/applications/radio/cqrlog/default.nix
+++ b/pkgs/applications/radio/cqrlog/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ok2cqr";
     repo = "cqrlog";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0zzcg0bl6mq4wfifj998x9x09w8sigbh46synpqx034fpr0swyhb";
   };
 
diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix
index 1e25e24b6897..a6608f926967 100644
--- a/pkgs/applications/radio/cubicsdr/default.nix
+++ b/pkgs/applications/radio/cubicsdr/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cjcliffe";
     repo = "CubicSDR";
-    tag = version;
+    rev = version;
     sha256 = "0cyv1vk97x4i3h3hhh7dx8mv6d1ad0fypdbx5fl26bz661sr8j2n";
   };
 
diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix
index b6d310b7b23f..f35f66ecc2a4 100644
--- a/pkgs/applications/radio/direwolf/default.nix
+++ b/pkgs/applications/radio/direwolf/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wb2osz";
     repo = "direwolf";
-    tag = version;
+    rev = version;
     hash = "sha256-Vbxc6a6CK+wrBfs15dtjfRa1LJDKKyHMrg8tqsF7EX4=";
   };
 
diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix
index de1a3fcf8da4..ef1b5feb6a8d 100644
--- a/pkgs/applications/radio/gnuradio/shared.nix
+++ b/pkgs/applications/radio/gnuradio/shared.nix
@@ -33,7 +33,7 @@ in
       fetchFromGitHub {
         repo = "gnuradio";
         owner = "gnuradio";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = sourceSha256;
       };
   nativeBuildInputs =
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index 89595a4beaf3..2bb626cc324a 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -36,7 +36,7 @@ gnuradioMinimal.pkgs.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gqrx-sdr";
     repo = "gqrx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/ykKcwOotu8kn+EpJI+EUeqSkHZ2IrSh+o7lBGeHrZ0=";
   };
 
diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/applications/radio/guglielmo/default.nix
index 9fb895be7532..9836d03ee851 100644
--- a/pkgs/applications/radio/guglielmo/default.nix
+++ b/pkgs/applications/radio/guglielmo/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "marcogrecopriolo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM=";
   };
 
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index 45b980cde1fa..2679132bdb8f 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "myriadrf";
     repo = "LimeSuite";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-f1cXrkVCIc1MqTvlCUBFqzHLhIVueybVxipNZRlF2gE=";
   };
 
diff --git a/pkgs/applications/radio/openwebrx/default.nix b/pkgs/applications/radio/openwebrx/default.nix
index 18dccbb10b48..e4fd91c1ca64 100644
--- a/pkgs/applications/radio/openwebrx/default.nix
+++ b/pkgs/applications/radio/openwebrx/default.nix
@@ -29,7 +29,7 @@ let
     src = fetchFromGitHub {
       owner = "jketterl";
       repo = pname;
-      tag = version;
+      rev = version;
       sha256 = "1j80zclg1cl5clqd00qqa16prz7cyc32bvxqz2mh540cirygq24w";
     };
 
@@ -53,7 +53,7 @@ let
     src = fetchFromGitHub {
       owner = "jketterl";
       repo = pname;
-      tag = version;
+      rev = version;
       sha256 = "sha256-1H0TJ8QN3b6Lof5TWvyokhCeN+dN7ITwzRvEo2X8OWc=";
     };
 
@@ -87,7 +87,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jketterl";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-i3Znp5Sxs/KtJazHh2v9/2P+3cEocWB5wIpF7E4pK9s=";
   };
 
diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix
index 5e91d3e45513..6e023899d639 100644
--- a/pkgs/applications/radio/qdmr/default.nix
+++ b/pkgs/applications/radio/qdmr/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hmatuschek";
     repo = "qdmr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6eg2w2h1ot7Cklt5UAiaFqJZjC6EM1VtEAwy3HgH4CE=";
   };
 
diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix
index 4060fb97c897..309ca8bf0f6a 100644
--- a/pkgs/applications/radio/qlog/default.nix
+++ b/pkgs/applications/radio/qlog/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "foldynl";
     repo = "QLog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gCXLZ00klyjisLxSvs4wKD0Sg8CFvF0xR+eHpc1D0Jc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix
index 332d14fdb2c9..9697488a7b7d 100644
--- a/pkgs/applications/radio/rtl-sdr/default.nix
+++ b/pkgs/applications/radio/rtl-sdr/default.nix
@@ -76,7 +76,7 @@ in
     src = fetchFromGitHub {
       owner = "librtlsdr";
       repo = "librtlsdr";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-I1rbywQ0ZBw26wZdtMBkfpj7+kv09XKrrcoDuhIkRmw=";
     };
     meta = {
@@ -95,7 +95,7 @@ in
     src = fetchFromGitHub {
       owner = "rtlsdrblog";
       repo = "rtl-sdr-blog";
-      tag = version;
+      rev = version;
       hash = "sha256-7FpT+BoQ2U8KiKwX4NfEwrO3lMBti7RX8uKtT5dFH8M=";
     };
     meta = {
diff --git a/pkgs/applications/radio/sigdigger/default.nix b/pkgs/applications/radio/sigdigger/default.nix
index 2d442c8c20b4..6e344c84d625 100644
--- a/pkgs/applications/radio/sigdigger/default.nix
+++ b/pkgs/applications/radio/sigdigger/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BatchDrake";
     repo = "SigDigger";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE=";
   };
 
diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix
index e28bbc5af47c..6f3e82e93022 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/applications/radio/welle-io/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AlbrechtL";
     repo = "welle.io";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sSknzZiD9/MLyO+gAYopogOQu5HRcqaRcfqwq4Rld7A=";
   };
 
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index 6b094483f68b..43b7b27ce71e 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CelestiaProject";
     repo = "Celestia";
-    tag = version;
+    rev = version;
     sha256 = "sha256-MkElGo1ZR0ImW/526QlDE1ePd+VOQxwkX7l+0WyZ6Vs=";
   };
 
diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix
index 424484ab214d..7f0e0836d9ca 100644
--- a/pkgs/applications/science/astronomy/gpredict/default.nix
+++ b/pkgs/applications/science/astronomy/gpredict/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "csete";
     repo = "gpredict";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+hgjImfT3nWMBYwde7+KC/hzd84pwQbpoJvaJSNG4E8=";
   };
 
diff --git a/pkgs/applications/science/biology/hh-suite/default.nix b/pkgs/applications/science/biology/hh-suite/default.nix
index 80409df0a198..51f12d9ae6ea 100644
--- a/pkgs/applications/science/biology/hh-suite/default.nix
+++ b/pkgs/applications/science/biology/hh-suite/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "soedinglab";
     repo = "hh-suite";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kjNqJddioCZoh/cZL3YNplweIGopWIGzCYQOnKDqZmw=";
   };
 
diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index 60689e5b777a..9ba81327710d 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "kallisto";
     owner = "pachterlab";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hfdeztEyHvuOnLS71oSv8sPqFe2UCX5KlANqrT/Gfx8=";
   };
 
diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix
index 88e99cd123d1..3026ac9ce885 100644
--- a/pkgs/applications/science/biology/nest/default.nix
+++ b/pkgs/applications/science/biology/nest/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nest";
     repo = "nest-simulator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hysOe1ZZpCClVOGo0+UeCP7imAakXrZlnJ4V95zfiyA=";
   };
 
diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix
index e715dfef0515..51fd73ea2493 100644
--- a/pkgs/applications/science/biology/truvari/default.nix
+++ b/pkgs/applications/science/biology/truvari/default.nix
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ACEnglish";
     repo = "truvari";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SFBVatcVavBfQtFbBcXifBX3YnKsxJS669vCcyjsBA4=";
   };
 
diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix
index d8d3db81398a..601e8053b6b6 100644
--- a/pkgs/applications/science/chemistry/avogadro2/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro2/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadroapp";
-    tag = version;
+    rev = version;
     hash = "sha256-NSozi6oElNTIFTdRW32ZcNm8Ae311xk6kN1wtrEqjaU=";
   };
 
diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix
index 02c0da8e6499..627773ef7b9a 100644
--- a/pkgs/applications/science/computer-architecture/timeloop/default.nix
+++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NVlabs";
     repo = "timeloop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CGPhrBNzFdERAA/Eym2v0+FvFUe+VkBLnwYEqEMHE9k=";
   };
 
diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index 40d4a1f6acd2..b99c2201ec09 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Caneda";
     repo = "Caneda";
-    tag = version;
+    rev = version;
     sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
   };
 
diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
index 8aad9b3367fc..cfb13ffab886 100644
--- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
+++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emsec";
     repo = "hal";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8kmYeqsmqR7tY044rZb3KuEAVGv37IObX6k1qjXWG0A=";
   };
 
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index b2a0bf33e1e0..ef645d36b079 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-/Hw7ZTv2CbDcKuyI27wC46IxCcTnrXDS/Mf7csUTc7w=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix
index a8c6e746446e..f251bd34c54b 100644
--- a/pkgs/applications/science/electronics/openems/default.nix
+++ b/pkgs/applications/science/electronics/openems/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "openEMS";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wdH+Zw7G2ZigzBMX8p3GKdFVx/AhbTNL+P3w+YjI/dc=";
   };
 
diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix
index b1c4476d4963..9aab0615d9fc 100644
--- a/pkgs/applications/science/electronics/openhantek6022/default.nix
+++ b/pkgs/applications/science/electronics/openhantek6022/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenHantek";
     repo = "OpenHantek6022";
-    tag = version;
+    rev = version;
     sha256 = "sha256-FT+DyfD5WHBblRXWXFnyB2xwoIgoh84oB+QN32wx78c=";
   };
 
diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix
index ab1880ffb8c1..aa41e3185c03 100644
--- a/pkgs/applications/science/electronics/qucs-s/default.nix
+++ b/pkgs/applications/science/electronics/qucs-s/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ra3xdh";
     repo = "qucs_s";
-    tag = version;
+    rev = version;
     hash = "sha256-H/iLCCX1fMozs/G8erX7cia7wRLjvLxofuiu6pGVJ58=";
   };
 
diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix
index 1781d29705d5..2e15890aa30c 100644
--- a/pkgs/applications/science/logic/cedille/default.nix
+++ b/pkgs/applications/science/logic/cedille/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cedille";
     repo = "cedille";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1j745q9sd32fhcb96wjq6xvyqq1k6imppjnya6x0n99fyfnqzvg9";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix
index 36e5a5b1b44d..fd618fec2026 100644
--- a/pkgs/applications/science/logic/klee/default.nix
+++ b/pkgs/applications/science/logic/klee/default.nix
@@ -65,7 +65,7 @@ llvmPackages.stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "klee";
     repo = "klee";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5js1N8qVF0lCkahSU3ojT7+p/a9IaUpPWhIyFHEzqto=";
   };
 
diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix
index 7286dc862d15..33521fc0248d 100644
--- a/pkgs/applications/science/logic/potassco/clingcon.nix
+++ b/pkgs/applications/science/logic/potassco/clingcon.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "potassco";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-R2kgcw8VUwhOdvPXnsahT5gnoUd5DXLqfdH++8rFoAA=";
   };
 
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index c4a830a17f3b..bc799bf8ba04 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "potassco";
     repo = "clingo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VhfWGAcrq4aN5Tgz84v7vLOWexsA89vRaang58SXVyI=";
   };
 
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index fa67a1a6d093..2dac1f012c9e 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -17,7 +17,7 @@ let
   src = fetchFromGitHub {
     owner = "tamarin-prover";
     repo = "tamarin-prover";
-    tag = version;
+    rev = version;
     hash = "sha256-v1BruU2p/Sg/g7b9a+QRza46bD7PkMtsGq82qFaNhpI=";
   };
 
diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
index 1894b8a215e6..ec1e20a91329 100644
--- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
+++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "finalfusion";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE=";
   };
 
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index 01ba5aabe395..4b9bd9e6fdcc 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BVLC";
     repo = "caffe";
-    tag = version;
+    rev = version;
     sha256 = "104jp3cm823i3cdph7hgsnj6l77ygbwsy35mdmzhmsi4jxprd9j3";
   };
 
diff --git a/pkgs/applications/science/math/engauge-digitizer/default.nix b/pkgs/applications/science/math/engauge-digitizer/default.nix
index 3c1bfe5a7ae6..f2f87a42ab8a 100644
--- a/pkgs/applications/science/math/engauge-digitizer/default.nix
+++ b/pkgs/applications/science/math/engauge-digitizer/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "markummitchell";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Wj9o3wWbtHsEi6LFH4xDpwVR9BwcWc472jJ/QFDQZvY=";
   };
 
diff --git a/pkgs/applications/science/math/mpsolve/default.nix b/pkgs/applications/science/math/mpsolve/default.nix
index 7895352f37e2..b5b0b2c9823a 100644
--- a/pkgs/applications/science/math/mpsolve/default.nix
+++ b/pkgs/applications/science/math/mpsolve/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "robol";
     repo = "MPSolve";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-7lYwInodKj02G76xqhp/6e9MCzPY80gsAW3vTMNsfdA=";
   };
 
diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix
index 1c80ba995e7b..26744a19f86f 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/applications/science/math/yacas/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grzegorzmazur";
     repo = "yacas";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0dqgqvsb6ggr8jb3ngf0jwfkn6xwj2knhmvqyzx3amc74yd3ckqx";
   };
 
diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix
index 4b79533bd77b..6566d38b4ef7 100644
--- a/pkgs/applications/science/misc/colmap/default.nix
+++ b/pkgs/applications/science/misc/colmap/default.nix
@@ -39,7 +39,7 @@ stdenv'.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "colmap";
     repo = "colmap";
-    tag = version;
+    rev = version;
     hash = "sha256-Xb4JOttCMERwPYs5DyGKHw+f9Wik1/rdJQKbgVuygH8=";
   };
 
diff --git a/pkgs/applications/science/misc/convertall/default.nix b/pkgs/applications/science/misc/convertall/default.nix
index 29b3268ca8af..703bb5b3221e 100644
--- a/pkgs/applications/science/misc/convertall/default.nix
+++ b/pkgs/applications/science/misc/convertall/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "doug-101";
     repo = "ConvertAll";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "02xxasgbjbivsbhyfpn3cpv52lscdx5kc95s6ns1dvnmdg0fpng0";
   };
 
diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix
index 5f935bafd4ad..24de920d1ddc 100644
--- a/pkgs/applications/science/misc/foldingathome/client.nix
+++ b/pkgs/applications/science/misc/foldingathome/client.nix
@@ -30,7 +30,7 @@ let
     src = fetchFromGitHub {
       owner = "FoldingAtHome";
       repo = "fah-client-bastet";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-lqpC1fAMFb8iX02daVre/pE0c7DkwswlFigJS3ZGEjM=";
     };
 
diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix
index 0c90fab73f7f..fcfd76ab24a9 100644
--- a/pkgs/applications/science/misc/graphia/default.nix
+++ b/pkgs/applications/science/misc/graphia/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "graphia-app";
     repo = "graphia";
-    tag = version;
+    rev = version;
     sha256 = "sha256-tS5oqpwpqvWGu67s8OuA4uQR3Zb5VzHTY/GnfVQki6k=";
   };
 
diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
index 9c20227a3a42..caacdd108819 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openmvg";
     repo = "openmvg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vG+tW9Gl/DAUL8DeY+rJVDJH/oMPH3XyZMUgzjtwFv0=";
   };
 
diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index 85805dd5b277..4ee25e9739e2 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cdcseacave";
     repo = "openmvs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix
index fa884b06e4fe..b934320025a5 100644
--- a/pkgs/applications/science/misc/openrefine/default.nix
+++ b/pkgs/applications/science/misc/openrefine/default.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "openrefine";
     repo = "openrefine";
-    tag = version;
+    rev = version;
     hash = "sha256-Z52YfS+caNe7N3xMv85eoBes6TwkSsGk5/rGaQd/6ds=";
   };
 
diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index e9380c9f2f77..dfa7fbf8daf4 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tiffany352";
     repo = "rink-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2+ZkyWhEnnO/QgCzWscbMr0u5kwdv2HqPLjtiXDfv/o=";
   };
 
diff --git a/pkgs/applications/science/molecular-dynamics/raspa/default.nix b/pkgs/applications/science/molecular-dynamics/raspa/default.nix
index bfc7bba1d2f8..088bc1ef4840 100644
--- a/pkgs/applications/science/molecular-dynamics/raspa/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/raspa/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iRASPA";
     repo = "RASPA2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-i8Y+pejiOuyPNJto+/0CmRoAnMljCrnDFx8qDh4I/68=";
   };
 
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
index 76a265930e43..e606edb0fe0e 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/pkgs/applications/science/robotics/apmplanner2/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ArduPilot";
     repo = "apm_planner";
-    tag = version;
+    rev = version;
     sha256 = "0wvbfjnnf7sh6fpgw8gimh5hgzywj3nwrgr80r782f5gayd3v2l1";
   };
 
diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
index 2e3ad9c5829c..226d83b6beda 100644
--- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix
+++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "robokoding";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "07snhwmqqp52vdgr66vx50zxx0nmpmns5cdjgh50hzlhji2z1fl9";
   };
 
diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix
index 323f4eb56aa9..635aa584371d 100644
--- a/pkgs/applications/system/monitor/default.nix
+++ b/pkgs/applications/system/monitor/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stsdc";
     repo = "monitor";
-    tag = version;
+    rev = version;
     hash = "sha256-Kk3L4hfHon0B6Y6vU7en1UFpg221+EiVCxMX9mvu7pU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix
index 8a2e47e8713b..972f688d9596 100644
--- a/pkgs/applications/system/qjournalctl/default.nix
+++ b/pkgs/applications/system/qjournalctl/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pentix";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-anNNzqjbIaQI+MAwwMwzy6v4SKqi4u9F5IbFBErm4q8=";
   };
 
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
index 98580f6ef69f..192b98d32a49 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Vifon";
     repo = "autocomplete-ALL-the-things";
-    tag = version;
+    rev = version;
     sha256 = "06xd59c6gd9rglwq4km93n2p078k7v4x300lqrg1f32vvnjvs7sr";
   };
 
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
index 45fcc450ddd0..9a32da5427e7 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "majutsushi";
     repo = "urxvt-font-size";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1526ap161cp3378f4ijd09nmsh71ld7bkxxhp8p6razdi2v8r16h";
   };
 
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
index 4a5d71b2c816..1055f7ba19c8 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "muennich";
     repo = "urxvt-perls";
-    tag = version;
+    rev = version;
     sha256 = "0xvwfw7965ghhd9g6rl6y6fgpd444l46rjqmlgg0rfjypbh6c0p1";
   };
 
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
index 8707a6b69282..0c9eec816abb 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mina86";
     repo = "urxvt-tabbedex";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "06msd156h6r8ss7qg66sjz5jz8613qfq2yvp0pc24i6mxzj8vl77";
   };
 
diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix
index 7b62de5e49ed..904f939c6b8e 100644
--- a/pkgs/applications/terminal-emulators/st/xst.nix
+++ b/pkgs/applications/terminal-emulators/st/xst.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gnotclub";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-2pXR9U2tTBd0lyeQ3BjnXW+Ne9aUQg/+rnpmYPPG06A=";
   };
 
diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix
index 3186a67e135a..9e03345a63a9 100644
--- a/pkgs/applications/terminal-emulators/termite/default.nix
+++ b/pkgs/applications/terminal-emulators/termite/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thestinger";
     repo = "termite";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0hp1x6lj098m3jgna274wv5dv60lnzg22297di68g4hw9djjyd2k";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix
index a4fb9166bf3b..80f4858aa5f4 100644
--- a/pkgs/applications/version-management/blackbox/default.nix
+++ b/pkgs/applications/version-management/blackbox/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stackexchange";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g0oNV7Nj7ZMmsVQFVTDwbKtF4a/Fb3WDB+NRx9IGSWA=";
   };
 
diff --git a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
index ab4679dfb7c6..08f8e17eae1f 100644
--- a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
+++ b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "alpernebbi";
     repo = "git-annex-metadata-gui";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "03kch67k0q9lcs817906g864wwabkn208aiqvbiyqp1qbg99skam";
   };
 
diff --git a/pkgs/applications/version-management/git-archive-all/default.nix b/pkgs/applications/version-management/git-archive-all/default.nix
index 3e1a0bdf1d6e..d43c2359e377 100644
--- a/pkgs/applications/version-management/git-archive-all/default.nix
+++ b/pkgs/applications/version-management/git-archive-all/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Kentzo";
     repo = "git-archive-all";
-    tag = version;
+    rev = version;
     hash = "sha256-fIPjggOx+CEorj1bazz8s81ZdppkTL0OlA5tRqCYZyc=";
   };
 
diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix
index 1afa23257f95..00d840c7f064 100644
--- a/pkgs/applications/version-management/git-credential-manager/default.nix
+++ b/pkgs/applications/version-management/git-credential-manager/default.nix
@@ -20,7 +20,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "git-ecosystem";
     repo = "git-credential-manager";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fzcGAcKOAEnBiAEYYyxKJ71xnixb5cz7FzR28/cKIFg=";
   };
 
diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix
index 1c0ee9407cd0..3ec812bc8219 100644
--- a/pkgs/applications/version-management/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-machete/default.nix
@@ -16,7 +16,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "virtuslab";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2Or4L3wrvqW7bvrJcgvK7rGqjqiob6k8CZc/XauguLo=";
   };
 
diff --git a/pkgs/applications/version-management/git-publish/default.nix b/pkgs/applications/version-management/git-publish/default.nix
index aae2f147f671..6596fbeddf3e 100644
--- a/pkgs/applications/version-management/git-publish/default.nix
+++ b/pkgs/applications/version-management/git-publish/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stefanha";
     repo = "git-publish";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jjpbr+ZqG4U8/z0PurnXR+IUKQkG3QB8YqhDkH8uu2Y=";
   };
 
diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix
index 13bb8cf0eac7..8c4f1c79b585 100644
--- a/pkgs/applications/version-management/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-recent/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-recent";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KPM24DVwvLdHeOkq77fz1TJ6NxJ2h21bP0TrItCPamo=";
   };
 
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index cf1b2e0e81b7..ac6d7879e2bf 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
     domain = "opendev.org";
     owner = "opendev";
     repo = "git-review";
-    tag = version;
+    rev = version;
     hash = "sha256-UfYc662NqnQt0+CKc+18jXnNTOcZv8urCNBsWd6x0VQ=";
   };
 
diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix
index 13a2e1abbf48..5107fef5426f 100644
--- a/pkgs/applications/version-management/git-stack/default.nix
+++ b/pkgs/applications/version-management/git-stack/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gitext-rs";
     repo = "git-stack";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iFoxYq4NHC/K0ruPDXHfayZDglebBJE00V57HUH9Y84=";
   };
 
diff --git a/pkgs/applications/version-management/gita/default.nix b/pkgs/applications/version-management/gita/default.nix
index 0ef871f63321..433ebcb1a384 100644
--- a/pkgs/applications/version-management/gita/default.nix
+++ b/pkgs/applications/version-management/gita/default.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     sha256 = "sha256-kPyk13yd4rc63Nh73opuHsCTj4DgYAVfro8To96tteA=";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "gita";
     owner = "nosarthur";
   };
diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix
index 038d8cef0102..f396dfeed177 100644
--- a/pkgs/applications/version-management/gitqlient/default.nix
+++ b/pkgs/applications/version-management/gitqlient/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "francescmm";
     repo = "gitqlient";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-gfWky5KTSj+5FC++QIVTJbrDOYi/dirTzs6LvTnO74A=";
   };
diff --git a/pkgs/applications/version-management/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix
index 5464ac733d0d..3b5c389e70ed 100644
--- a/pkgs/applications/version-management/lucky-commit/default.nix
+++ b/pkgs/applications/version-management/lucky-commit/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "not-an-aardvark";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-57eOhlOkRU1sz0y/sfEyEFXQJx165qehBTP8iWiEGx8=";
   };
 
diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix
index 261b146be5bb..06725dae6884 100644
--- a/pkgs/applications/version-management/nitpick/default.nix
+++ b/pkgs/applications/version-management/nitpick/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "travisb-ca";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "11gn6nc6ypwivy20bx1r0rm2giblwx6jv485zk875a9pdbcwbrf6";
   };
 
diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix
index 94ec67513972..535abf792679 100644
--- a/pkgs/applications/version-management/sapling/default.nix
+++ b/pkgs/applications/version-management/sapling/default.nix
@@ -47,7 +47,7 @@ let
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "sapling";
-    tag = version;
+    rev = version;
     hash = "sha256-4pOpJ91esTSH90MvvMu74CnlLULLUawqxcniUeqnLwA=";
   };
 
diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/applications/version-management/silver-platter/default.nix
index c7e2f789def2..8c585b7e6f8e 100644
--- a/pkgs/applications/version-management/silver-platter/default.nix
+++ b/pkgs/applications/version-management/silver-platter/default.nix
@@ -26,7 +26,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jelmer";
     repo = "silver-platter";
-    tag = version;
+    rev = version;
     hash = "sha256-k+C4jrC4FO/yy9Eb6x4lv1zyyp/eGkpMcDqZ0KoxfBs=";
   };
 
diff --git a/pkgs/applications/version-management/svn-all-fast-export/default.nix b/pkgs/applications/version-management/svn-all-fast-export/default.nix
index fc1368558aab..6b2628f3a4f1 100644
--- a/pkgs/applications/version-management/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/svn-all-fast-export/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "svn-all-fast-export";
     repo = "svn2git";
-    tag = version;
+    rev = version;
     sha256 = "1b5yx2316hbyvw3v30vn1ljma9yd21nd59wis1gi34g92lgvqcd6";
   };
 
diff --git a/pkgs/applications/version-management/svn2git/default.nix b/pkgs/applications/version-management/svn2git/default.nix
index 5e28c13261fa..c839b01239c0 100644
--- a/pkgs/applications/version-management/svn2git/default.nix
+++ b/pkgs/applications/version-management/svn2git/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nirvdrum";
     repo = "svn2git";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-w649l/WO68vYYxZOBKzI8XhGFkaSwWx/O3oVOtnGg6w=";
   };
 
diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix
index bbe1c80b6d4c..4b7f152ab5c3 100644
--- a/pkgs/applications/video/anilibria-winmaclinux/default.nix
+++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix
@@ -26,7 +26,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "anilibria";
     repo = "anilibria-winmaclinux";
-    tag = version;
+    rev = version;
     hash = "sha256-F+5R1nSmZuHKUe9bAEVwOru07SVs8tIQlbDC6Ip+zy4=";
   };
 
diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix
index afad04b64ec7..94c4b9342fcd 100644
--- a/pkgs/applications/video/haruna/default.nix
+++ b/pkgs/applications/video/haruna/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "multimedia";
     repo = "haruna";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EoB8qoCiB6jvHqfhkGHhiq9/79MBLt6GguvRIwY90B0=";
     domain = "invent.kde.org";
   };
diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix
index 531d21843e03..f803f0f694de 100644
--- a/pkgs/applications/video/hyperion-ng/default.nix
+++ b/pkgs/applications/video/hyperion-ng/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hyperion-project";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-nQPtJw9DOKMPGI5trxZxpP+z2PYsbRKqOQEyaGzvmmA=";
     # needed for `dependencies/external/`:
     # * rpi_ws281x` - not possible to use as a "system" lib
diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix
index 2ac02f35b213..cf660186976d 100644
--- a/pkgs/applications/video/jellyfin-media-player/default.nix
+++ b/pkgs/applications/video/jellyfin-media-player/default.nix
@@ -33,7 +33,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-media-player";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-IXinyenadnW+a+anQ9e61h+N8vG2r77JPboHm5dN4Iw=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/archive_tool/default.nix b/pkgs/applications/video/kodi/addons/archive_tool/default.nix
index 376f1b54f9dd..0b90ee1cd5a3 100644
--- a/pkgs/applications/video/kodi/addons/archive_tool/default.nix
+++ b/pkgs/applications/video/kodi/addons/archive_tool/default.nix
@@ -12,7 +12,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "zach-morris";
     repo = "script.module.archive_tool";
-    tag = version;
+    rev = version;
     sha256 = "0hbkyk59xxfjv6vzfjplahmqxi5564qjlwyq6k8ijy6jjcwnd3p7";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
index 2172bb738f0e..33ab01e94c6b 100644
--- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
+++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
@@ -13,7 +13,7 @@ let
     src = fetchFromGitHub {
       owner = "kodi-game";
       repo = "controller-topology-project";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-pbYFNCDhKhYKREffWbMbcd9xBL4ZiKWR7hMZUCTUHRg=";
     };
 
diff --git a/pkgs/applications/video/kodi/addons/iagl/default.nix b/pkgs/applications/video/kodi/addons/iagl/default.nix
index 0f79ff392325..ae8ff5dc19aa 100644
--- a/pkgs/applications/video/kodi/addons/iagl/default.nix
+++ b/pkgs/applications/video/kodi/addons/iagl/default.nix
@@ -19,7 +19,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "zach-morris";
     repo = "plugin.program.iagl";
-    tag = version;
+    rev = version;
     sha256 = "sha256-b8nO3D/xTnj/5UDshGlIJdiHd75VhIlkrGUi0vkZqG4=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/infotagger/default.nix b/pkgs/applications/video/kodi/addons/infotagger/default.nix
index 4d823984b4b1..40b0399ca3b2 100644
--- a/pkgs/applications/video/kodi/addons/infotagger/default.nix
+++ b/pkgs/applications/video/kodi/addons/infotagger/default.nix
@@ -12,7 +12,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "jurialmunkey";
     repo = namespace;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ns1OjrYLKz4znXRxqUErDLcmC0HBjBFVYI9GFqDVurY=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix
index 556a42e56bf7..221c450be543 100644
--- a/pkgs/applications/video/kodi/addons/jellycon/default.nix
+++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix
@@ -22,7 +22,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dCPbPuUtiMhcECd3Aebs3ZGIM6jn6mmCd0rXS+1TQLs=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
index a0ffecf8d837..037612982d34 100644
--- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix
+++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
@@ -22,7 +22,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-kodi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7PgE1KrKmSBWzzi6tZp1Pou/82P1mPX8iE/IQlBi1Cc=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix
index a6115bc4b66b..f40dc45da27e 100644
--- a/pkgs/applications/video/kodi/addons/netflix/default.nix
+++ b/pkgs/applications/video/kodi/addons/netflix/default.nix
@@ -17,7 +17,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "CastagnaIT";
     repo = namespace;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tve7E7dK60BIHETdwt9hD3/5eEdJB6c6rhw4oDoLAKM=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/orftvthek/default.nix b/pkgs/applications/video/kodi/addons/orftvthek/default.nix
index a77065d51bfc..f1e202f7ced0 100644
--- a/pkgs/applications/video/kodi/addons/orftvthek/default.nix
+++ b/pkgs/applications/video/kodi/addons/orftvthek/default.nix
@@ -15,7 +15,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "s0faking";
     repo = namespace;
-    tag = version;
+    rev = version;
     sha256 = "sha256-bCVsR7lH0REJmG3OKU8mRRvw/PhSrLfhufmVBmw05+k=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/pdfreader/default.nix b/pkgs/applications/video/kodi/addons/pdfreader/default.nix
index 6d6a9511ea7d..49783ffef23f 100644
--- a/pkgs/applications/video/kodi/addons/pdfreader/default.nix
+++ b/pkgs/applications/video/kodi/addons/pdfreader/default.nix
@@ -11,7 +11,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "i96751414";
     repo = "plugin.image.pdfreader";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-J93poR5VO9fAgNCEGftJVYnpXOsJSxnhHI6TAJZ2LeI=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
index f972c5efa4c9..dba58914feb1 100644
--- a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
+++ b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix
@@ -14,7 +14,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "firsttris";
     repo = "plugin.video.sendtokodi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ga+9Q7x8+sEmQmteHbSyCahZ/T/l28BAEM84w7bf7z8=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/sponsorblock/default.nix b/pkgs/applications/video/kodi/addons/sponsorblock/default.nix
index 4fec6ec8d9c0..fb9e9cdd6e6f 100644
--- a/pkgs/applications/video/kodi/addons/sponsorblock/default.nix
+++ b/pkgs/applications/video/kodi/addons/sponsorblock/default.nix
@@ -13,7 +13,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "siku2";
     repo = namespace;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IBgh2kdPgCy+HHrR7UZxTgjF1LR77ABGlUp3PgaobNM=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/steam-library/default.nix b/pkgs/applications/video/kodi/addons/steam-library/default.nix
index d7133f387fed..e4434813c37c 100644
--- a/pkgs/applications/video/kodi/addons/steam-library/default.nix
+++ b/pkgs/applications/video/kodi/addons/steam-library/default.nix
@@ -15,7 +15,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "aanderse";
     repo = namespace;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LVdFih0n/lkjyaYf8jw0IFlcDiXXOtUH2N9OduV1H9Q=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/svtplay/default.nix b/pkgs/applications/video/kodi/addons/svtplay/default.nix
index 2dab1babf068..c301234682a4 100644
--- a/pkgs/applications/video/kodi/addons/svtplay/default.nix
+++ b/pkgs/applications/video/kodi/addons/svtplay/default.nix
@@ -11,7 +11,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "nilzen";
     repo = "xbmc-" + pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CZtBUqFaKtMmKcpfBQp0Mb8sVvpCTkqcpfdYe41YSJs=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix b/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix
index 88351ce21062..bb9e68130c7a 100644
--- a/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix
+++ b/pkgs/applications/video/kodi/addons/xbmcswift2/default.nix
@@ -12,7 +12,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "XBMC-Addons";
     repo = namespace;
-    tag = version;
+    rev = version;
     sha256 = "sha256-Z+rHz3wncoNvV1pwhRzJFB/X0H6wdfwg88otVh27wg8=";
   };
 
diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix
index b89df984e86e..fb4e6ebd7304 100644
--- a/pkgs/applications/video/kodi/addons/youtube/default.nix
+++ b/pkgs/applications/video/kodi/addons/youtube/default.nix
@@ -15,7 +15,7 @@ buildKodiAddon rec {
   src = fetchFromGitHub {
     owner = "anxdpanic";
     repo = "plugin.video.youtube";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fcr7FDTaStr9EaEaC3QG3uJQav0YuEITa62Y1kW1vlM=";
   };
 
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index 333c02133a5e..0147a07b45ec 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mapmapteam";
     repo = "mapmap";
-    tag = version;
+    rev = version;
     sha256 = "1pyb3vz19lbfz2hrfqm9a29vnajw1bigdrblbmcy32imkf4isfvm";
   };
 
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index fc4ebb22bd34..66dc8891988e 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -21,7 +21,7 @@ mkDerivation rec {
 
   src = fetchFromGitHub {
     hash = "sha256-ROqROQsV8ddrxYT5mMdkf6rCgCoGr1jpxQ1ohcoEaQs=";
-    tag = version;
+    rev = version;
     repo = "minitube";
     owner = "flaviotordini";
     fetchSubmodules = true;
diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index 5dcc0f178de3..7868257ffda7 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mpc-qt";
     repo = "mpc-qt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gn94kVs3Lbd+ggj4jTacHpmnVO2lH/QDhFk+hJC1N/c=";
   };
 
diff --git a/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix b/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix
index fdb1faeda2a5..02a54a2cf475 100644
--- a/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix
+++ b/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Guldoman";
     repo = "mpv_inhibit_gnome";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LSGg5gAQE2JpepBqhz6D6d3NlqYaU4bjvYf1F+oLphQ=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix
index c02b1a3e16d6..e59fce3b9cec 100644
--- a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix
+++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix
@@ -13,7 +13,7 @@ buildLua (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zydezu";
     repo = "ModernX";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-tm1vsHEFX2YnQ1w3DcLd/zHASetkqQ4wYcYT9w8HVok=";
   };
 
diff --git a/pkgs/applications/video/mpv/scripts/modernx.nix b/pkgs/applications/video/mpv/scripts/modernx.nix
index 04621e2d2ec2..28a50e15d5d8 100644
--- a/pkgs/applications/video/mpv/scripts/modernx.nix
+++ b/pkgs/applications/video/mpv/scripts/modernx.nix
@@ -13,7 +13,7 @@ buildLua (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cyl0";
     repo = "ModernX";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-q7DwyfmOIM7K1L7vvCpq1EM0RVpt9E/drhAa9rLYb1k=";
   };
 
diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix
index 71b7272828ef..fbb1a8f68583 100644
--- a/pkgs/applications/video/mpv/scripts/mpris.nix
+++ b/pkgs/applications/video/mpv/scripts/mpris.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hoyon";
     repo = "mpv-mpris";
-    tag = version;
+    rev = version;
     hash = "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0=";
   };
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/applications/video/mpv/scripts/mpv-discord.nix b/pkgs/applications/video/mpv/scripts/mpv-discord.nix
index 92007c960b0b..58d4940f548b 100644
--- a/pkgs/applications/video/mpv/scripts/mpv-discord.nix
+++ b/pkgs/applications/video/mpv/scripts/mpv-discord.nix
@@ -10,7 +10,7 @@ let
   src = fetchFromGitHub {
     owner = "tnychn";
     repo = "mpv-discord";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P1UaXGboOiqrXapfLzJI6IT3esNtflkQkcNXt4Umukc=";
   };
 
diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix
index 2a95b323012f..a6a00283129e 100644
--- a/pkgs/applications/video/mpv/scripts/mpvacious.nix
+++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix
@@ -15,7 +15,7 @@ buildLua rec {
   src = fetchFromGitHub {
     owner = "Ajatt-Tools";
     repo = "mpvacious";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8E/EGIePK5siCchZPL81XMgspvNaRunqiLVU/J3nsmI=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/applications/video/mpv/scripts/quality-menu.nix b/pkgs/applications/video/mpv/scripts/quality-menu.nix
index 61351048a63d..8cee576a5792 100644
--- a/pkgs/applications/video/mpv/scripts/quality-menu.nix
+++ b/pkgs/applications/video/mpv/scripts/quality-menu.nix
@@ -13,7 +13,7 @@ buildLua rec {
   src = fetchFromGitHub {
     owner = "christoph-heinrich";
     repo = "mpv-quality-menu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uaU4W72P7zhHzxmfr59icCAl1mJ3ycLGzkGcYasHllI=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix
index dd7a2bed2e58..f36bce3cb200 100644
--- a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix
+++ b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix
@@ -11,7 +11,7 @@ buildLua rec {
   src = fetchFromGitHub {
     owner = "open-dynaMIX";
     repo = "simple-mpv-webui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-I8lwpo3Hfpy3UnPMmHEJCdArVQnNL245NkxsYVmnMF0=";
     sparseCheckout = [
       "main.lua"
diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix
index 5543ab85921b..fc37b1a50dea 100644
--- a/pkgs/applications/video/mpv/scripts/thumbnail.nix
+++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix
@@ -13,7 +13,7 @@ buildLua rec {
   src = fetchFromGitHub {
     owner = "marzzzello";
     repo = "mpv_thumbnail_script";
-    tag = version;
+    rev = version;
     sha256 = "sha256-nflavx25skLj9kitneL6Uz3zI2DyMMhQC595npofzbQ=";
   };
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix
index b74812ed73ce..2838dd5e4942 100644
--- a/pkgs/applications/video/mpv/scripts/uosc.nix
+++ b/pkgs/applications/video/mpv/scripts/uosc.nix
@@ -15,7 +15,7 @@ buildLua (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tomasklaen";
     repo = "uosc";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-UbSEJGlLSX5wZpfj+Cb3LfWw17pnjxIJUNtP8dclKoU=";
   };
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/applications/video/mpv/scripts/vr-reversal.nix b/pkgs/applications/video/mpv/scripts/vr-reversal.nix
index 1a143e6997e1..6fb91e9ad780 100644
--- a/pkgs/applications/video/mpv/scripts/vr-reversal.nix
+++ b/pkgs/applications/video/mpv/scripts/vr-reversal.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dfaker";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1wn2ngcvn7wcsl3kmj782x5q9130qw951lj6ilrkafp6q6zscpqr";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix
index 04e4cef89dfe..daa2ed947ae0 100644
--- a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix
+++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix
@@ -73,7 +73,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mrxdst";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qFeQBVPZZFKkxz1fhK3+ah3TPDovklhhQwtv09TiSqo=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/applications/video/mpv/scripts/youtube-upnext.nix b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix
index 8dcc6f77f95d..ecd71353d6a3 100644
--- a/pkgs/applications/video/mpv/scripts/youtube-upnext.nix
+++ b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix
@@ -13,7 +13,7 @@ buildLua rec {
   src = fetchFromGitHub {
     owner = "cvzi";
     repo = "mpv-youtube-upnext";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-x9mfyc8JIlOpbSfGEwxXoUtsH0A+K3JPwT/8MHq7ks4=";
   };
 
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 79de30006b59..98ddc17e5589 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -48,7 +48,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MythTV";
     repo = "mythtv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZhVlDX5I6SJEntVg30Iy/XxgsorDjFycAt2uksJMJps=";
   };
 
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index 6cb451d3c7b1..6d11f5aa5f7e 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "NatronGitHub";
     repo = "Natron";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-dgScbfyulZPlrngqSw7xwipldoRd8uFO8VP9mlJyhQ8=";
   };
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index ec2b36e7246c..62e02381c134 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-studio";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-i1wkGlafPvfMTsQr5Ww5iwmUu+23cr0YmN10llJfohA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index b0c68447e654..871b0921ee47 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WarmUpTill";
     repo = "SceneSwitcher";
-    tag = version;
+    rev = version;
     hash = "sha256-1U5quhfdhEBcCbEzW0uEpimYgvdbsIwaL2EdQ4cLF/M=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix
index e1ed494185bc..0a80098f5d1b 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-3d-effect";
-    tag = version;
+    rev = version;
     sha256 = "sha256-SgxrBhuO3IaqINwjwdtn31cIcu3hXiPZyVMZJiNsO+s=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
index 005bd8c8914e..408e2bb709cc 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "occ-ai";
     repo = "obs-backgroundremoval";
-    tag = version;
+    rev = version;
     hash = "sha256-QoC9/HkwOXMoFNvcOxQkGCLLAJmsja801LKCNT9O9T0=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix
index 102e1a51a8da..56236261483a 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-command-source";
-    tag = version;
+    rev = version;
     sha256 = "sha256-yrzY4pHSupkkdRlx725oSVtQTH1Ci9zFolHN3i2Vm28=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix
index e2decbd41467..af2afe2cbdc6 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-freeze-filter";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-fVrfGqwce4oFYdWGElXMsXHO1AzQ/mhfBmZL1mPdT3I=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix
index 421b7665e82d..23a3c3e41d42 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-gradient-source";
-    tag = version;
+    rev = version;
     sha256 = "sha256-5pll84UZYOTESrid2UuC1aWlaLrWf1LpXqlV09XKLug=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix
index 205bc83900f8..6ac26bf599ab 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fzwoch";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-23LyxN1Vgol9uA7rDdfZXcmfhG4l0RfMYGbofbhObBE=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
index d93c06fc433c..ee34343c275f 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hyperion-project";
     repo = "hyperion-obs-plugin";
-    tag = version;
+    rev = version;
     sha256 = "sha256-UAfjafoZhhhHRSo+eUBLhHaCmn2GYFcYyRb9wHIp/9I=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
index df8beed42be4..22e963b1d8e1 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LiveSplit";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3B3P1PlzIlpVqHJMKWpEnWXGgD/IaiWM1FVKn0BtRj0=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
index 9435a4e73a1b..9e542067069d 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-move-transition";
-    tag = version;
+    rev = version;
     sha256 = "sha256-BCivYK18T4b+lRo6Qf9qFwmjAyjCPZDekQVi03QBLHc=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
index 87392b1ca49a..b16e35f53151 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sorayuki";
     repo = "obs-multi-rtmp";
-    tag = version;
+    rev = version;
     sha256 = "sha256-MRBQY9m6rj8HVdn58mK/Vh07FSm0EglRUaP20P3FFO4=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix
index 2593bbbc993d..b235ca6fb20b 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-mute-filter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-UVYN9R7TnwD3a+KIYTXvxOQWfNUtR8cSWUoKZuNoBJc=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix
index 169706a7afe7..e7b2784fff6e 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Palakis";
     repo = "obs-ndi";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ex/fZmZpFM6GTKNBQClzSf6Ns0Yts5+0PAmf5mIQCwc=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix
index 2f3cb5a40315..f1120c7c255e 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "fzwoch";
     repo = "obs-nvfbc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AJ3K0O1vrixskn+/Tpg7LsgRO8N4sgDo1Y6gg3CwGVo=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
index c4f1ff345f03..fefdefc8eb4f 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dimtpap";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-nkd/AoMsEUUxQQH5CjbnPbNwAwkd1y6j2nCa1GIAFPs=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels-filter.nix
index 8979fc0cf9db..f51d7963089a 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels-filter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels-filter.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wimpysworld";
     repo = "obs-rgb-levels-filter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-QREwK9nBhjCBFslXUj9bGUGPgfEns8QqlgP5e2O/0oU=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
index 3ee958a190aa..6c2074bd7f7e 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-shaderfilter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-J4g8PTPtVkKNkUTb0Ntz+HT4AaNCtqt58KfZOMS6llE=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix
index e963245289af..20b0fc3d2084 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-source-record";
-    tag = version;
+    rev = version;
     sha256 = "sha256-wh5BVWKHelw/ry6algST4EFGmmqsKs+phmVacS77dqM=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix
index 331f6d07614a..06fa3481c0c2 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fzwoch";
     repo = "obs-teleport";
-    tag = version;
+    rev = version;
     sha256 = "sha256-mHHPlmUyR9NDdQHqw1YNgThGl/8DH/aiCE9rdZhrIK4=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
index 96520f18b32d..8a6e77b51f87 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-text-pthread";
-    tag = version;
+    rev = version;
     sha256 = "sha256-zrgxKs3jmrwQJiEgKfZz1BOVToTLauQXtFYcuFlV71o=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
index b55415cf04bf..31241c74f119 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fzwoch";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-ykiLsHL3hoe0ibxMxp4zrqeSeQfgnJfNg7Yb5i9HDJQ=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
index 400f8f96a40a..41f1b34f6daf 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Aitum";
     repo = "obs-vertical-canvas";
-    tag = version;
+    rev = version;
     sha256 = "sha256-0XfJ8q8n2ANO0oDtLZhZjRunZ5S1EouQ6Ak/pxEQYOQ=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix
index a0d8c724df96..9a8967d67df8 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cg2121";
     repo = "obs-vintage-filter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-K7AxvwVLe4G+75aY430lygSRB7rMtsGi17pGzdygEac=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
index 326d5ff024bd..a3198dba06d6 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-websocket";
-    tag = version;
+    rev = version;
     sha256 = "sha256-cHsJxoQjwbWLxiHgIa3Es0mu62vyLCAd1wULeZqZsJM=";
   };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix
index eaab88ffe498..1c432de77d5e 100644
--- a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
     owner = "phandasm";
     repo = "waveform";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Bg1n1yV4JzNFEXFNayNa1exsSZhmRJ0RLHDjLWmqGZE=";
   };
 
diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix
index 3436eb60a269..2c9c1d9b47fd 100644
--- a/pkgs/applications/video/pipe-viewer/default.nix
+++ b/pkgs/applications/video/pipe-viewer/default.nix
@@ -48,7 +48,7 @@ buildPerlModule rec {
   src = fetchFromGitHub {
     owner = "trizen";
     repo = "pipe-viewer";
-    tag = version;
+    rev = version;
     hash = "sha256-NVUZn02rBhOQyIfBp/BArbL2YY19TuDTwfiQH2pEWzk=";
   };
 
diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix
index 3ce474f6cc69..4c532f86b141 100644
--- a/pkgs/applications/video/qmediathekview/default.nix
+++ b/pkgs/applications/video/qmediathekview/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "adamreichold";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6";
   };
 
diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix
index c80a38c0e022..0b80ad8186b2 100644
--- a/pkgs/applications/video/vdr/default.nix
+++ b/pkgs/applications/video/vdr/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.tvdr.de/vdr.git";
-    tag = version;
+    rev = version;
     hash = "sha256-0Metur3+fQhomf+ClY9zXijNsr5wWkaqnzjUNXjsjss=";
   };
 
diff --git a/pkgs/applications/video/vdr/epgsearch/default.nix b/pkgs/applications/video/vdr/epgsearch/default.nix
index dc29d45ea66b..208ce7fb953f 100644
--- a/pkgs/applications/video/vdr/epgsearch/default.nix
+++ b/pkgs/applications/video/vdr/epgsearch/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     repo = "vdr-plugin-epgsearch";
     owner = "vdr-projects";
     sha256 = "sha256-hOMISobeEt/jB4/18t5ZeN+EcPHhm8Jz8Kar72KYS3E=";
-    tag = "v${version}";
+    rev = "v${version}";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
index 025042873e5a..ef35f18b2f86 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -60,7 +60,7 @@ in
       repo = "vdr-plugin-femon";
       owner = "rofafor";
       sha256 = "sha256-0qBMYgNKk7N9Bj8fAoOokUo+G9gfj16N5e7dhoKRBqs=";
-      tag = "v${version}";
+      rev = "v${version}";
     };
 
     postPatch = "substituteInPlace Makefile --replace /bin/true true";
@@ -88,7 +88,7 @@ in
     src = fetchFromGitHub {
       repo = "vdr-plugin-vnsiserver";
       owner = "vdr-projects";
-      tag = version;
+      rev = version;
       sha256 = "sha256-ivHdzX90ozMXSvIc5OrKC5qHeK5W3TK8zyrN8mY3IhE=";
     };
 
@@ -148,7 +148,7 @@ in
     src = fetchFromGitHub {
       owner = "jowi24";
       repo = "vdr-fritz";
-      tag = version;
+      rev = version;
       hash = "sha256-DGD73i+ZHFgtCo+pMj5JaMovvb5vS1x20hmc5t29//o=";
       fetchSubmodules = true;
     };
diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix
index 3f67b022a5ae..814b4b5e971b 100644
--- a/pkgs/applications/video/vdr/softhddevice/default.nix
+++ b/pkgs/applications/video/vdr/softhddevice/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "ua0lnj";
     repo = "vdr-plugin-softhddevice";
     sha256 = "sha256-G5pOSlO1FU7kvHwH1yw8UBEeDwQ5aIxubdyFcWQ2Z/8=";
-    tag = "v${version}";
+    rev = "v${version}";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/video/vdr/streamdev/default.nix b/pkgs/applications/video/vdr/streamdev/default.nix
index 94e8cca6f133..e971ef130877 100644
--- a/pkgs/applications/video/vdr/streamdev/default.nix
+++ b/pkgs/applications/video/vdr/streamdev/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vdr-projects";
     repo = "vdr-plugin-streamdev";
-    tag = version;
+    rev = version;
     sha256 = "sha256-fFnRDe3n/ltanRvLhrQDB6aV0UmyuEJgNUip0gKBrBA=";
   };
 
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index 23dda789a856..b691dde96aab 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vkohaupt";
     repo = "vokoscreen";
-    tag = version;
+    rev = version;
     sha256 = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan";
   };
 
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index a92217ffb99a..fc57f0cf270d 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EIJT/LwxRZUYvbH0EFYSeZpGgFOywI6jpfmFO3g8cps=";
   };
   vendorHash = null;
diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 7dd9d3f3877c..4135f7a0938a 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4IToXaOEMfgEh9mXuN7nRn+8l8T6+mzVWYvfsYN4ZIM=";
   };
 
diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index 5460bc218461..7d133751e713 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "docker";
     repo = "compose";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AoYm2gRqNgXTc7ksQeSPVo+gTkxaFwhfLhue3Z8a4Wo=";
   };
 
diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix
index 754d1d4827b0..8d100b93d439 100644
--- a/pkgs/applications/virtualization/krunvm/default.nix
+++ b/pkgs/applications/virtualization/krunvm/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IXofYsOmbrjq8Zq9+a6pvBYsvZFcKzN5IvCuHaxwazI=";
   };
 
diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix
index f4338b02b3ed..6365ef7d44c8 100644
--- a/pkgs/applications/virtualization/lima/default.nix
+++ b/pkgs/applications/virtualization/lima/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lima-vm";
     repo = "lima";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pwSLQlYPJNzvXuW6KLmQoaafQyf3o6fjVAfKe9RJ3UE=";
   };
 
diff --git a/pkgs/applications/virtualization/sail-riscv/default.nix b/pkgs/applications/virtualization/sail-riscv/default.nix
index 95236369d939..cb288daf8598 100644
--- a/pkgs/applications/virtualization/sail-riscv/default.nix
+++ b/pkgs/applications/virtualization/sail-riscv/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "riscv";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Keu96+yHWUEFO3rRLvF7rzcJmF3y/V/uyK7TIFj0Xw0=";
   };
 
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index a78769b9f174..593cd4d63c78 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KtB2VspkA/vFu7I8y6M8WfAoZglxmCeb4Z3OzdsGuvk=";
   };
 
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 233d18de0758..c05dbb1444c3 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -28,7 +28,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "F1ash";
     repo = "qt-virt-manager";
-    tag = version;
+    rev = version;
     hash = "sha256-1aXlGlK+YPOe2X51xycWvSu8YC9uCywyL6ItiScFA04=";
   };
 
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index 5fdb138c7e54..4ed3054a42e7 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "venam";
     repo = "2bwm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xwib612ahv4rg9yl5injck89dlpyp5475xqgag0ydfd0r4sfld7";
   };
 
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index df5b49ffd729..2e60bcf41e68 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awesomewm";
     repo = "awesome";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1i7ajmgbsax4lzpgnmkyv35x8vxqi0j84a14k6zys4blx94m9yjf";
   };
 
diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix
index 97c2fc66319a..93aa7f55d087 100644
--- a/pkgs/applications/window-managers/cagebreak/default.nix
+++ b/pkgs/applications/window-managers/cagebreak/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "project-repo";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-GAANZIEUtuONPBpk0E3fErgOZtm3wB+gWJNwfO6VOTo=";
   };
 
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 16ae17aa6c4f..3019ab156fb1 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Gerschtli";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-OFwI4evwbXLO4ufjrh5SZia79bwbAKVoSm/IPCDku68=";
   };
 
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
index 02db511f6511..38bcd12a7ffa 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
@@ -14,7 +14,7 @@ mkHyprlandPlugin hyprland rec {
   src = fetchFromGitHub {
     owner = "DreamMaoMao";
     repo = "hycov";
-    tag = version;
+    rev = version;
     hash = "sha256-NRnxbkuiq1rQ+uauo7D+CEe73iGqxsWxTQa+1SEPnXQ=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix
index c0332e9d97bf..7e789586cda9 100644
--- a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix
+++ b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix
@@ -26,7 +26,7 @@ python.pkgs.buildPythonPackage {
   src = fetchFromGitHub {
     owner = "tobi-wan-kenobi";
     repo = "bumblebee-status";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+RCg2XZv0AJnexi7vnQhEXB1qSoKBN1yKWm3etdys1s=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
index daef4df091e3..325e47c1b0d5 100644
--- a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
+++ b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "333fred";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3";
   };
 
diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
index 7d5fd1f69c39..753cb3b4eb9e 100644
--- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix
+++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "i3ipc-glib";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "01fzvrbnzcwx0vxw29igfpza9zwzp2s7msmzb92v01z0rz0y5m0p";
   };
 
diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix
index 4da56cb8d10d..68471ad4bc0d 100644
--- a/pkgs/applications/window-managers/i3/lock-blur.nix
+++ b/pkgs/applications/window-managers/i3/lock-blur.nix
@@ -14,7 +14,7 @@ i3lock-color.overrideAttrs (oldAttrs: rec {
   src = fetchFromGitHub {
     owner = "karulont";
     repo = "i3lock-blur";
-    tag = version;
+    rev = version;
     sha256 = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index fef12c476827..cea706f8e84f 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PandorasFox";
     repo = "i3lock-color";
-    tag = version;
+    rev = version;
     sha256 = "sha256-fuLeglRif2bruyQRqiL3nm3q6qxoHcPdVdL+QjGBR/k=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index a7e5065a3b7b..7eb1bfe94713 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "i3";
     repo = "i3lock";
-    tag = version;
+    rev = version;
     sha256 = "sha256-OyV6GSLnNV3GUqrfs3OBnIaBvicH2PXgeY4acOk5dR4=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix
index bb8585772975..c0e04baeda08 100644
--- a/pkgs/applications/window-managers/i3/wmfocus.nix
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-94MgE2j8HaS8IyzHEDtoqTls2A8xD96v2iAFx9XfMcw=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix
index 9bcae9649c69..dd2efb0a022c 100644
--- a/pkgs/applications/window-managers/i3/wsr.nix
+++ b/pkgs/applications/window-managers/i3/wsr.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "roosta";
     repo = "i3wsr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RTJ+up3mt6KuMkTBCXDUmztxwEQCeyAjuhhOUrdIfTo=";
   };
 
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 8c68d0d5e82d..a307f359dd94 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-odGqHdm8xnjEcXmpKMy51HEhbjcROLL3hRSdlbmTr2g=";
   };
 
diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix
index e28e268e1fc3..f157eee58114 100644
--- a/pkgs/applications/window-managers/lemonbar/default.nix
+++ b/pkgs/applications/window-managers/lemonbar/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LemonBoy";
     repo = "bar";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OLhgu0kmMZhjv/VST8AXvIH+ysMq72m4TEOypdnatlU=";
   };
 
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index 49e1f3b2b853..be926cdc5a82 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "stumpwm";
     repo = "stumpwm";
-    tag = finalAttrs.version;
+    rev = "${finalAttrs.version}";
     hash = "sha256-Ba2HcAmNcZvnqU0jpLTxsBe8L+4aHbO/oM4Bp/IYEC0=";
   };
 
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 9d553dd8993f..d2c123ebc55c 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://git.suckless.org/tabbed";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-KpMWBnnoF4AGRKrG30NQsVt0CFfJXVdlXLLag0Dq0sU=";
   };
 
diff --git a/pkgs/applications/window-managers/wayfire/firedecor.nix b/pkgs/applications/window-managers/wayfire/firedecor.nix
index 285a041b3a70..573a78abb0bc 100644
--- a/pkgs/applications/window-managers/wayfire/firedecor.nix
+++ b/pkgs/applications/window-managers/wayfire/firedecor.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mntmn";
     repo = "Firedecor";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-7or8HkmIZnLpXEZzUhJ3u8SIPfIQFgn32Ju/5OzK06Y=";
   };
 
diff --git a/pkgs/build-support/dlang/builddubpackage/default.nix b/pkgs/build-support/dlang/builddubpackage/default.nix
index a835784c2ed0..31454d5cd69b 100644
--- a/pkgs/build-support/dlang/builddubpackage/default.nix
+++ b/pkgs/build-support/dlang/builddubpackage/default.nix
@@ -55,7 +55,7 @@ let
       inherit pname version;
       src = fetchgit {
         url = repository;
-        tag = version;
+        rev = version;
         inherit sha256;
       };
     };
diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix
index 44e7592823dc..e3f89bacf54c 100644
--- a/pkgs/build-support/mitm-cache/default.nix
+++ b/pkgs/build-support/mitm-cache/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chayleaf";
     repo = "mitm-cache";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eY8mgmQB8wXQ7YJbLvdjXEEgGD+/RDywjvehJYf7ckE=";
   };
 
diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix
index 59ba4349191d..197a12a90747 100644
--- a/pkgs/by-name/_1/_1fps/package.nix
+++ b/pkgs/by-name/_1/_1fps/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "1fpsvideo";
     repo = "1fps";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3uPGFxEWmKQxQWPmotZI29GykUGQDjtDjFPps4QMs0M=";
   };
 
diff --git a/pkgs/by-name/_2/_20kly/package.nix b/pkgs/by-name/_2/_20kly/package.nix
index 56cbe0f02fb9..e860a01fe15d 100644
--- a/pkgs/by-name/_2/_20kly/package.nix
+++ b/pkgs/by-name/_2/_20kly/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "20kly";
     repo = "20kly";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1zxsxg49a02k7zidx3kgk2maa0vv0n1f9wrl5vch07sq3ghvpphx";
   };
 
diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix
index 2f6fa4b5a7df..dc3fc2e45384 100644
--- a/pkgs/by-name/_2/_2ship2harkinian/package.nix
+++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix
@@ -74,7 +74,7 @@ let
     src = fetchFromGitHub {
       owner = "ladislav-zezula";
       repo = "StormLib";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc=";
     };
     nativeBuildInputs = prev.nativeBuildInputs ++ [ pkg-config ];
diff --git a/pkgs/by-name/_3/_3mux/package.nix b/pkgs/by-name/_3/_3mux/package.nix
index 57c247a4e172..f56a328ce644 100644
--- a/pkgs/by-name/_3/_3mux/package.nix
+++ b/pkgs/by-name/_3/_3mux/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aaronjanse";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QT4QXTlJf2NfTqXE4GF759EoW6Ri12lxDyodyEFc+ag=";
   };
 
diff --git a/pkgs/by-name/_3/_3proxy/package.nix b/pkgs/by-name/_3/_3proxy/package.nix
index 2403efe6b346..c85a8cb392c2 100644
--- a/pkgs/by-name/_3/_3proxy/package.nix
+++ b/pkgs/by-name/_3/_3proxy/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "3proxy";
     repo = "3proxy";
-    tag = version;
+    rev = version;
     sha256 = "sha256-uy6flZ1a7o02pr5O0pgl9zCjh8mE9W5JxotJeBMB16A=";
   };
 
diff --git a/pkgs/by-name/_6/_6tunnel/package.nix b/pkgs/by-name/_6/_6tunnel/package.nix
index d5eea8e44ece..b0f025ea297c 100644
--- a/pkgs/by-name/_6/_6tunnel/package.nix
+++ b/pkgs/by-name/_6/_6tunnel/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wojtekka";
     repo = "6tunnel";
-    tag = version;
+    rev = version;
     sha256 = "0zsx9d6xz5w8zvrqsm8r625gpbqqhjzvjdzc3z8yix668yg8ff8h";
   };
 
diff --git a/pkgs/by-name/_7/_7z2hashcat/package.nix b/pkgs/by-name/_7/_7z2hashcat/package.nix
index 64627fe036f1..7e9bfd670850 100644
--- a/pkgs/by-name/_7/_7z2hashcat/package.nix
+++ b/pkgs/by-name/_7/_7z2hashcat/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "philsmd";
     repo = "7z2hashcat";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-BmpO2VLcuUtQaN4qmLm0YQEfK5iE+2hw4k6uBbwcFS4=";
   };
 
diff --git a/pkgs/by-name/_9/_9pfs/package.nix b/pkgs/by-name/_9/_9pfs/package.nix
index 9d31973a4a52..7305505aecb2 100644
--- a/pkgs/by-name/_9/_9pfs/package.nix
+++ b/pkgs/by-name/_9/_9pfs/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ftrvxmtrx";
     repo = "9pfs";
-    tag = version;
+    rev = version;
     sha256 = "sha256-nlJ4Zh13T78r0Dn3Ky/XLhipeMbMFbn0qGCJnUCBd3Y=";
   };
 
diff --git a/pkgs/by-name/aa/aaa/package.nix b/pkgs/by-name/aa/aaa/package.nix
index ae0977521040..6a763316eca7 100644
--- a/pkgs/by-name/aa/aaa/package.nix
+++ b/pkgs/by-name/aa/aaa/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DomesticMoth";
     repo = "aaa";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix
index 024ee5066fa1..6ac9ace5603f 100644
--- a/pkgs/by-name/aa/aaaaxy/package.nix
+++ b/pkgs/by-name/aa/aaaaxy/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "divVerent";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0geit1ZDsNOPhpdmOeT1xSnQ3oitMiMY14zoGG8hsGU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
index c939b753f919..d54b303919c7 100644
--- a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
+++ b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "aarch64-esr-decoder";
-    tag = version;
+    rev = version;
     hash = "sha256-U9i5L3s4oQOIqlECSaKkHxS2Vzr6SY4tIUpvl3+oSl0=";
   };
 
diff --git a/pkgs/by-name/aa/aardvark-dns/package.nix b/pkgs/by-name/aa/aardvark-dns/package.nix
index 1bdad26ce404..f946ea4ba59f 100644
--- a/pkgs/by-name/aa/aardvark-dns/package.nix
+++ b/pkgs/by-name/aa/aardvark-dns/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "aardvark-dns";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mWaB1E/n/N2Tb5bqrMJX2XfPvZBCG+dxar3kGCHgv0I=";
   };
 
diff --git a/pkgs/by-name/aa/aaxtomp3/package.nix b/pkgs/by-name/aa/aaxtomp3/package.nix
index bdcb6f0ef709..b2ffb9bb3697 100644
--- a/pkgs/by-name/aa/aaxtomp3/package.nix
+++ b/pkgs/by-name/aa/aaxtomp3/package.nix
@@ -24,7 +24,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "krumpetpirate";
     repo = "aaxtomp3";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg=";
   };
 
diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix
index 008a1c6a7087..436e38f35b79 100644
--- a/pkgs/by-name/ab/ab-av1/package.nix
+++ b/pkgs/by-name/ab/ab-av1/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alexheretic";
     repo = "ab-av1";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dDD0hnKov5cgNoc1m/0rG/cx2ZaB7TmLfcXdm8myRUQ=";
   };
 
diff --git a/pkgs/by-name/ab/abaddon/package.nix b/pkgs/by-name/ab/abaddon/package.nix
index 5230137992ee..7df9c694be08 100644
--- a/pkgs/by-name/ab/abaddon/package.nix
+++ b/pkgs/by-name/ab/abaddon/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uowuo";
     repo = "abaddon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FPhHy+4BmaoGrHGsc5o79Au9JcH5C+iWTYQYwnTLaUY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ab/abbaye-des-morts/package.nix b/pkgs/by-name/ab/abbaye-des-morts/package.nix
index 767d187a5475..a2908ed9e502 100644
--- a/pkgs/by-name/ab/abbaye-des-morts/package.nix
+++ b/pkgs/by-name/ab/abbaye-des-morts/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nevat";
     repo = "abbayedesmorts-gpl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-IU7E1zmeif9CdoBxzmh7MG2jElGGnEZyKnK7eYFrjsQ=";
   };
 
diff --git a/pkgs/by-name/ab/abbreviate/package.nix b/pkgs/by-name/ab/abbreviate/package.nix
index fa5092e86915..400e168b1ed5 100644
--- a/pkgs/by-name/ab/abbreviate/package.nix
+++ b/pkgs/by-name/ab/abbreviate/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dnnrly";
     repo = "abbreviate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-foGg+o+BbPsfpph+XHIfyPaknQD1N1rcZW58kgZ5HYM=";
   };
 
diff --git a/pkgs/by-name/ab/abi-compliance-checker/package.nix b/pkgs/by-name/ab/abi-compliance-checker/package.nix
index f1c5556f0272..0d4f133ab16f 100644
--- a/pkgs/by-name/ab/abi-compliance-checker/package.nix
+++ b/pkgs/by-name/ab/abi-compliance-checker/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lvc";
     repo = "abi-compliance-checker";
-    tag = version;
+    rev = version;
     sha256 = "1f1f9j2nf9j83sfl2ljadch99v6ha8rq8xm7ax5akc05hjpyckij";
   };
 
diff --git a/pkgs/by-name/ab/abi-dumper/package.nix b/pkgs/by-name/ab/abi-dumper/package.nix
index f1dcf7974b3a..a681a48d28c2 100644
--- a/pkgs/by-name/ab/abi-dumper/package.nix
+++ b/pkgs/by-name/ab/abi-dumper/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lvc";
     repo = "abi-dumper";
-    tag = version;
+    rev = version;
     sha256 = "sha256-BefDMeKHx4MNU6SyX5UpQnwdI+zqap7zunsgdWG/2xc=";
   };
 
diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix
index 26eae7be938d..0258e55330d1 100644
--- a/pkgs/by-name/ab/abracadabra/package.nix
+++ b/pkgs/by-name/ab/abracadabra/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KejPi";
     repo = "AbracaDABra";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yCjMinDCoBTOC5Ks4MUd0MQeitfrIe8bI3Q4ahz36kQ=";
   };
 
diff --git a/pkgs/by-name/ab/abuild/package.nix b/pkgs/by-name/ab/abuild/package.nix
index dd37bec14b30..33d2495bbcab 100644
--- a/pkgs/by-name/ab/abuild/package.nix
+++ b/pkgs/by-name/ab/abuild/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.alpinelinux.org";
     owner = "alpine";
     repo = "abuild";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-gNmje4USaklwmsVGs4NMFoharEk2syCmDdQ/SCSMKsI=";
   };
 
diff --git a/pkgs/by-name/ac/acc/package.nix b/pkgs/by-name/ac/acc/package.nix
index 1201ce882c4f..894aa7ce588e 100644
--- a/pkgs/by-name/ac/acc/package.nix
+++ b/pkgs/by-name/ac/acc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zdoom";
     repo = "acc";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-HGF4O4LcMDY4f/ZuBbkvx5Wd86+8Ict624eKTJ88/rQ=";
   };
 
diff --git a/pkgs/by-name/ac/acr/package.nix b/pkgs/by-name/ac/acr/package.nix
index c19428f66488..5e8297c11a60 100644
--- a/pkgs/by-name/ac/acr/package.nix
+++ b/pkgs/by-name/ac/acr/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "radareorg";
     repo = "acr";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-GgF2sen7RcnuXrtLzkeGllMvY65LffR+jPPqUhbsOGk=";
   };
 
diff --git a/pkgs/by-name/ac/acsccid/package.nix b/pkgs/by-name/ac/acsccid/package.nix
index 8eb009a94651..37a49bfbabc3 100644
--- a/pkgs/by-name/ac/acsccid/package.nix
+++ b/pkgs/by-name/ac/acsccid/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acshk";
     repo = "acsccid";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3";
   };
 
diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix
index b504d51345d1..8eb5e3aaf86b 100644
--- a/pkgs/by-name/ac/action-validator/package.nix
+++ b/pkgs/by-name/ac/action-validator/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mpalmer";
     repo = "action-validator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lJHGx/GFddIwVVXRj75Z/l5CH/yuw/uIhr02Qkjruww=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ad/adapta-backgrounds/package.nix b/pkgs/by-name/ad/adapta-backgrounds/package.nix
index 4c4c0a071697..109fe4c512ca 100644
--- a/pkgs/by-name/ad/adapta-backgrounds/package.nix
+++ b/pkgs/by-name/ad/adapta-backgrounds/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-backgrounds";
-    tag = version;
+    rev = version;
     sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj";
   };
 
diff --git a/pkgs/by-name/ad/adapta-gtk-theme/package.nix b/pkgs/by-name/ad/adapta-gtk-theme/package.nix
index e2dec31b85c0..67d3ffe76968 100644
--- a/pkgs/by-name/ad/adapta-gtk-theme/package.nix
+++ b/pkgs/by-name/ad/adapta-gtk-theme/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
-    tag = version;
+    rev = version;
     sha256 = "19skrhp10xx07hbd0lr3d619vj2im35d8p9rmb4v4zacci804q04";
   };
 
diff --git a/pkgs/by-name/ad/adapta-kde-theme/package.nix b/pkgs/by-name/ad/adapta-kde-theme/package.nix
index 54c5cb2de524..67ba82d42556 100644
--- a/pkgs/by-name/ad/adapta-kde-theme/package.nix
+++ b/pkgs/by-name/ad/adapta-kde-theme/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "adapta-kde";
-    tag = version;
+    rev = version;
     sha256 = "1q85678sff8is2kwvgd703ckcns42gdga2c1rqlp61gb6bqf09j8";
   };
 
diff --git a/pkgs/by-name/ad/adbtuifm/package.nix b/pkgs/by-name/ad/adbtuifm/package.nix
index e6b6e6134df4..f92b0c16653f 100644
--- a/pkgs/by-name/ad/adbtuifm/package.nix
+++ b/pkgs/by-name/ad/adbtuifm/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "darkhz";
     repo = "adbtuifm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TK93O9XwMrsrQT3EG0969HYMtYkK0a4PzG9FSTqHxAY=";
   };
   vendorHash = "sha256-voVoowjM90OGWXF4REEevO8XEzT7azRYiDay4bnGBks=";
diff --git a/pkgs/by-name/ad/addlicense/package.nix b/pkgs/by-name/ad/addlicense/package.nix
index 528282c13828..fdff6455a630 100644
--- a/pkgs/by-name/ad/addlicense/package.nix
+++ b/pkgs/by-name/ad/addlicense/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "addlicense";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YMMHj6wctKtJi/rrcMIrLmNw/uvO6wCwokgYRQxcsFw=";
   };
 
diff --git a/pkgs/by-name/ad/adementary-theme/package.nix b/pkgs/by-name/ad/adementary-theme/package.nix
index f3602d778131..9c844a14655f 100644
--- a/pkgs/by-name/ad/adementary-theme/package.nix
+++ b/pkgs/by-name/ad/adementary-theme/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hrdwrrsk";
     repo = "adementary-theme";
-    tag = version;
+    rev = version;
     sha256 = "14y5s18g9r2c1ciw1skfksn09gvqgy8vjvwbr0z8gacf0jc2apqk";
   };
 
diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix
index bf4449b23ebf..10d98113e0c3 100644
--- a/pkgs/by-name/ad/adguardian/package.nix
+++ b/pkgs/by-name/ad/adguardian/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Lissy93";
     repo = "AdGuardian-Term";
-    tag = version;
+    rev = version;
     hash = "sha256-WxrSmCwLnXXs5g/hN3xWE66P5n0RD/L9MJpf5N2iNtY=";
   };
 
diff --git a/pkgs/by-name/ad/adif-multitool/package.nix b/pkgs/by-name/ad/adif-multitool/package.nix
index e9dcc76b0675..97c676cc805e 100644
--- a/pkgs/by-name/ad/adif-multitool/package.nix
+++ b/pkgs/by-name/ad/adif-multitool/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "flwyd";
     repo = "adif-multitool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qeAH8UTyEZn8As3wTjluONpjeT/5l9zicN5+8uwnbLo=";
   };
 
diff --git a/pkgs/by-name/ad/adrgen/package.nix b/pkgs/by-name/ad/adrgen/package.nix
index 868caf3b7526..e018fd97c083 100644
--- a/pkgs/by-name/ad/adrgen/package.nix
+++ b/pkgs/by-name/ad/adrgen/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "asiermarques";
     repo = "adrgen";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2ZE/orsfwL59Io09c4yfXt2enVmpSM/QHlUMgyd9RYQ=";
   };
 
diff --git a/pkgs/by-name/ad/adrs/package.nix b/pkgs/by-name/ad/adrs/package.nix
index 953831d6cf31..ff607c4d23b6 100644
--- a/pkgs/by-name/ad/adrs/package.nix
+++ b/pkgs/by-name/ad/adrs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "joshrotenberg";
     repo = "adrs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-C9Kg7xY3Q0xsd2DlUcc3OM+/hyzmwz55oi6Ul3K7zkM=";
   };
 
diff --git a/pkgs/by-name/ad/advancecomp/package.nix b/pkgs/by-name/ad/advancecomp/package.nix
index 21f8780a29a7..fe6d79f732ca 100644
--- a/pkgs/by-name/ad/advancecomp/package.nix
+++ b/pkgs/by-name/ad/advancecomp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amadvance";
     repo = "advancecomp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MwXdXT/ZEvTcYV4DjhCUFflrPKBFu0fk5PmaWt4MMOU=";
   };
 
diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix
index 015ff45435e7..4504ed3d2781 100644
--- a/pkgs/by-name/ae/aeron-cpp/package.nix
+++ b/pkgs/by-name/ae/aeron-cpp/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "real-logic";
     repo = "aeron";
-    tag = version;
+    rev = version;
     hash = "sha256-sROEZVOfScrlqMLbfrPtw3LQCQ5TfMcrLiP6j/Z9rSM=";
   };
 
diff --git a/pkgs/by-name/ae/aerospike/package.nix b/pkgs/by-name/ae/aerospike/package.nix
index a898c0c04ecf..5a7de5fc4b53 100644
--- a/pkgs/by-name/ae/aerospike/package.nix
+++ b/pkgs/by-name/ae/aerospike/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aerospike";
     repo = "aerospike-server";
-    tag = version;
+    rev = version;
     hash = "sha256-Ou7lSQHkudE0cuhXUtx9EI3z+udfnHI+CXdgoef2TIw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ae/aether-lv2/package.nix b/pkgs/by-name/ae/aether-lv2/package.nix
index b2b998e778c1..ac81726cbdee 100644
--- a/pkgs/by-name/ae/aether-lv2/package.nix
+++ b/pkgs/by-name/ae/aether-lv2/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Dougal-s";
     repo = "aether";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0xhih4smjxn87s0f4gaab51d8594qlp0lyypzxl5lm37j1i9zigs";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/af/afflib/package.nix b/pkgs/by-name/af/afflib/package.nix
index 416987b88fbc..2193411b6a63 100644
--- a/pkgs/by-name/af/afflib/package.nix
+++ b/pkgs/by-name/af/afflib/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sshock";
     repo = "AFFLIBv3";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CBDkeUzHnRBkLUYl0JuQcVnQWap0l7dAca1deZVoNDM=";
   };
 
diff --git a/pkgs/by-name/af/afio/package.nix b/pkgs/by-name/af/afio/package.nix
index f2421773190d..c33888ee293f 100644
--- a/pkgs/by-name/af/afio/package.nix
+++ b/pkgs/by-name/af/afio/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kholtman";
     repo = "afio";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1vbxl66r5rp5a1qssjrkfsjqjjgld1cq57c871gd0m4qiq9rmcfy";
   };
 
diff --git a/pkgs/by-name/af/afsctool/package.nix b/pkgs/by-name/af/afsctool/package.nix
index 17f9a4c3d5fa..4ebcd4e1da67 100644
--- a/pkgs/by-name/af/afsctool/package.nix
+++ b/pkgs/by-name/af/afsctool/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RJVB";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cZ0P9cygj+5GgkDRpQk7P9z8zh087fpVfrYXMRRVUAI=";
   };
 
diff --git a/pkgs/by-name/af/afterburn/package.nix b/pkgs/by-name/af/afterburn/package.nix
index 65236fc9fcdf..7d763191735f 100644
--- a/pkgs/by-name/af/afterburn/package.nix
+++ b/pkgs/by-name/af/afterburn/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "coreos";
     repo = "afterburn";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-j2eQUro0Rx1axBAaZDNICRrkygb4JAyxVAER/5BXXLY=";
   };
 
diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix
index 78b1cce6e10d..7661e5264872 100644
--- a/pkgs/by-name/af/afterstep/package.nix
+++ b/pkgs/by-name/af/afterstep/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "afterstep";
     repo = "afterstep";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-j1ADTRZ3Mxv9VNZWhWCFMnM/CJfkphdrgbw9Ca3bBw0=";
   };
 
diff --git a/pkgs/by-name/af/afuse/package.nix b/pkgs/by-name/af/afuse/package.nix
index 91d04ad73613..81b168a4712e 100644
--- a/pkgs/by-name/af/afuse/package.nix
+++ b/pkgs/by-name/af/afuse/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pcarrier";
     repo = "afuse";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KpysJRvDx+12BSl9pIGRqbJAM4W1NbzxMgDycGCr2RM=";
   };
 
diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix
index 4026aaf3272e..74146a1e546c 100644
--- a/pkgs/by-name/ag/agate/package.nix
+++ b/pkgs/by-name/ag/agate/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mbrubeck";
     repo = "agate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3IVl11eG9gSriOddgzgF0FecdldBxEOE/UXlFDKGyic=";
   };
 
diff --git a/pkgs/by-name/ag/agdsn-zsh-config/package.nix b/pkgs/by-name/ag/agdsn-zsh-config/package.nix
index f7ee3274653b..e430f3c69ccb 100644
--- a/pkgs/by-name/ag/agdsn-zsh-config/package.nix
+++ b/pkgs/by-name/ag/agdsn-zsh-config/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agdsn";
     repo = "agdsn-zsh-config";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8POQPk/hsJBMJ/ZJe9XzVj7Rd7C2+QnpzgYbUR0s3Fc=";
   };
 
diff --git a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
index 0b8b7109abf3..e5ee7c0a4040 100644
--- a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
+++ b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "olastor";
     repo = "age-plugin-fido2-hmac";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q77j+b0GDJhkCDLJYfIH2ZXqiwTC+ZM8CqXFv11UFaE=";
   };
 
diff --git a/pkgs/by-name/ag/agebox/package.nix b/pkgs/by-name/ag/agebox/package.nix
index fcabd3a3c9d5..5267e0984456 100644
--- a/pkgs/by-name/ag/agebox/package.nix
+++ b/pkgs/by-name/ag/agebox/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slok";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/FTNvGV7PsJmpSU1dI/kjfiY5G7shomvLd3bvFqORfg=";
   };
 
diff --git a/pkgs/by-name/ag/agenda/package.nix b/pkgs/by-name/ag/agenda/package.nix
index 312929935b75..ee1d83855686 100644
--- a/pkgs/by-name/ag/agenda/package.nix
+++ b/pkgs/by-name/ag/agenda/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dahenson";
     repo = "agenda";
-    tag = version;
+    rev = version;
     sha256 = "sha256-tzGcqCxIkoBNskpadEqv289Sj5bij9u+LdYySiGdop8=";
   };
 
diff --git a/pkgs/by-name/ag/agenix-cli/package.nix b/pkgs/by-name/ag/agenix-cli/package.nix
index 55d87f7a172e..9455a397cd2f 100644
--- a/pkgs/by-name/ag/agenix-cli/package.nix
+++ b/pkgs/by-name/ag/agenix-cli/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cole-h";
     repo = "agenix-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0+QVY1sDhGF4hAN6m2FdKZgm9V1cuGGjY4aitRBnvKg=";
   };
 
diff --git a/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix b/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix
index e9ff9c886a75..30ce835feda9 100644
--- a/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix
+++ b/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agkozak";
     repo = "agkozak-zsh-prompt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FC9LIZaS6fV20qq6cJC/xQvfsM3DHXatVleH7yBgoNg=";
   };
 
diff --git a/pkgs/by-name/ag/agola/package.nix b/pkgs/by-name/ag/agola/package.nix
index d7745fd80f51..65eac2d281e1 100644
--- a/pkgs/by-name/ag/agola/package.nix
+++ b/pkgs/by-name/ag/agola/package.nix
@@ -15,7 +15,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "agola-io";
     repo = "agola";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ggi0Eb4vO5zBoIrIIa3MFwOIW0IBS8yGF6eveBb+lgY=";
   };
 
diff --git a/pkgs/by-name/ah/aha/package.nix b/pkgs/by-name/ah/aha/package.nix
index 175e024e1e59..279f148e1359 100644
--- a/pkgs/by-name/ah/aha/package.nix
+++ b/pkgs/by-name/ah/aha/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "1gywad0rvvz3c5balz8cxsnx0562hj2ngzqyr8zsy2mb4pn0lpgv";
-    tag = version;
+    rev = version;
     repo = "aha";
     owner = "theZiz";
   };
diff --git a/pkgs/by-name/ah/ahoviewer/package.nix b/pkgs/by-name/ah/ahoviewer/package.nix
index 46be801c1b92..cf1f95645ffd 100644
--- a/pkgs/by-name/ah/ahoviewer/package.nix
+++ b/pkgs/by-name/ah/ahoviewer/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ahodesuka";
     repo = "ahoviewer";
-    tag = version;
+    rev = version;
     sha256 = "1avdl4qcpznvf3s2id5qi1vnzy4wgh6vxpnrz777a1s4iydxpcd8";
   };
 
diff --git a/pkgs/by-name/ai/aiac/package.nix b/pkgs/by-name/ai/aiac/package.nix
index d1d6d3268b22..82b3238ccbb8 100644
--- a/pkgs/by-name/ai/aiac/package.nix
+++ b/pkgs/by-name/ai/aiac/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gofireflyio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Lk3Bmzg1owkIWzz7jgq1YpdPyRzyZ7aNoWPIU5aWzu0=";
   };
 
diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix
index 800adcb271a4..a05dead8c537 100644
--- a/pkgs/by-name/ai/aiken/package.nix
+++ b/pkgs/by-name/ai/aiken/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aiken-lang";
     repo = "aiken";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zbtsSEWgzhMeRMLb/ocsbz28lYXbSgucnPLVB9z7iwo=";
   };
 
diff --git a/pkgs/by-name/ai/ain/package.nix b/pkgs/by-name/ai/ain/package.nix
index a8da1a0a3302..3b6d29815fc9 100644
--- a/pkgs/by-name/ai/ain/package.nix
+++ b/pkgs/by-name/ai/ain/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jonaslu";
     repo = "ain";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JEavBPnF3WW6oCZ1OC8g1dZev4qC7bi74/q2nvXK3mo=";
   };
 
diff --git a/pkgs/by-name/ai/air/package.nix b/pkgs/by-name/ai/air/package.nix
index 76e38e3db5f3..f3d47001a7b2 100644
--- a/pkgs/by-name/ai/air/package.nix
+++ b/pkgs/by-name/ai/air/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "air-verse";
     repo = "air";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+PgJR9+adeko86jUs6/mvkZLgVuIMyd6fv8xxOZB4tE=";
   };
 
diff --git a/pkgs/by-name/ai/aircrack-ng/package.nix b/pkgs/by-name/ai/aircrack-ng/package.nix
index 2aacd3d5fa91..fdc2284305e8 100644
--- a/pkgs/by-name/ai/aircrack-ng/package.nix
+++ b/pkgs/by-name/ai/aircrack-ng/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aircrack-ng";
     repo = "aircrack-ng";
-    tag = version;
+    rev = version;
     hash = "sha256-niQDwiqi5GtBW5HIn0endnqPb/MqllcjsjXw4pTyFKY=";
   };
 
diff --git a/pkgs/by-name/ai/airshipper/package.nix b/pkgs/by-name/ai/airshipper/package.nix
index 0aea3c8e65fb..20eb366cd1fa 100644
--- a/pkgs/by-name/ai/airshipper/package.nix
+++ b/pkgs/by-name/ai/airshipper/package.nix
@@ -64,7 +64,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitLab {
     owner = "Veloren";
     repo = "airshipper";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MHwyXCAqdBzdJlYzSeUXr6bJdTVHcjJ/kGcuAsZCCW8=";
   };
 
diff --git a/pkgs/by-name/ai/airspy/package.nix b/pkgs/by-name/ai/airspy/package.nix
index dcc82f1afaea..c6f19b1a47bd 100644
--- a/pkgs/by-name/ai/airspy/package.nix
+++ b/pkgs/by-name/ai/airspy/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "airspy";
     repo = "airspyone_host";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1v7sfkkxc6f8ny1p9xrax1agkl6q583mjx8k0lrrwdz31rf9qgw9";
   };
 
diff --git a/pkgs/by-name/ai/airspyhf/package.nix b/pkgs/by-name/ai/airspyhf/package.nix
index 972a80ebe038..cc545cc91c12 100644
--- a/pkgs/by-name/ai/airspyhf/package.nix
+++ b/pkgs/by-name/ai/airspyhf/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "airspy";
     repo = "airspyhf";
-    tag = version;
+    rev = version;
     hash = "sha256-RKTMEDPeKcerJZtXTn8eAShxDcZUMgeQg/+7pEpMyVg=";
   };
 
diff --git a/pkgs/by-name/ai/aixlog/package.nix b/pkgs/by-name/ai/aixlog/package.nix
index 44b76be3e101..4504e8f964f2 100644
--- a/pkgs/by-name/ai/aixlog/package.nix
+++ b/pkgs/by-name/ai/aixlog/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "badaix";
     repo = "aixlog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Xhle7SODRZlHT3798mYIzBi1Mqjz8ai74/UnbVWetiY=";
   };
 
diff --git a/pkgs/by-name/ak/akira-unstable/package.nix b/pkgs/by-name/ak/akira-unstable/package.nix
index 59ba5bfde4a2..c6b880c69e5c 100644
--- a/pkgs/by-name/ak/akira-unstable/package.nix
+++ b/pkgs/by-name/ak/akira-unstable/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "akiraux";
     repo = "Akira";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qrqmSCwA0kQVFD1gzutks9gMr7My7nw/KJs/VPisa0w=";
   };
 
diff --git a/pkgs/by-name/al/alarm-clock-applet/package.nix b/pkgs/by-name/al/alarm-clock-applet/package.nix
index 36fc05d4e453..1648badc73fd 100644
--- a/pkgs/by-name/al/alarm-clock-applet/package.nix
+++ b/pkgs/by-name/al/alarm-clock-applet/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "alarm-clock";
-    tag = version;
+    rev = version;
     hash = "sha256-10hkWWEsAUJnGeu35bR5d0RFKd9CKDZI7WGMzmEM3rI=";
   };
 
diff --git a/pkgs/by-name/al/albatross/package.nix b/pkgs/by-name/al/albatross/package.nix
index d016fc18f944..09e220a94d04 100644
--- a/pkgs/by-name/al/albatross/package.nix
+++ b/pkgs/by-name/al/albatross/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "Albatross";
     owner = "shimmerproject";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0mq87n2hxy44nzr567av24n5nqjaljhi1afxrn3mpjqdbkq7lx88";
   };
 
diff --git a/pkgs/by-name/al/alegreya-sans/package.nix b/pkgs/by-name/al/alegreya-sans/package.nix
index 72a982fa4734..13b10ac4a9d5 100644
--- a/pkgs/by-name/al/alegreya-sans/package.nix
+++ b/pkgs/by-name/al/alegreya-sans/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "huertatipografica";
     repo = "Alegreya-Sans";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0xz5lq9fh0pj02ifazhddzh792qkxkz1z6ylj26d93wshc90jl5g";
   };
 
diff --git a/pkgs/by-name/al/alegreya/package.nix b/pkgs/by-name/al/alegreya/package.nix
index 289369b8d582..b13656ef901f 100644
--- a/pkgs/by-name/al/alegreya/package.nix
+++ b/pkgs/by-name/al/alegreya/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "huertatipografica";
     repo = "Alegreya";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1m5xr95y6qxxv2ryvhfck39d6q5hxsr51f530fshg53x48l2mpwr";
   };
 
diff --git a/pkgs/by-name/al/alejandra/package.nix b/pkgs/by-name/al/alejandra/package.nix
index 352aa0ee54fc..0c39e55ecce1 100644
--- a/pkgs/by-name/al/alejandra/package.nix
+++ b/pkgs/by-name/al/alejandra/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kamadorueda";
     repo = "alejandra";
-    tag = version;
+    rev = version;
     hash = "sha256-g0SSfTWZ5mtMOpQic+eqq9sXMy1E/7yKxxfupZd9V4A=";
   };
 
diff --git a/pkgs/by-name/al/alertmanager-irc-relay/package.nix b/pkgs/by-name/al/alertmanager-irc-relay/package.nix
index 290f571b78ef..2d034dc5608c 100644
--- a/pkgs/by-name/al/alertmanager-irc-relay/package.nix
+++ b/pkgs/by-name/al/alertmanager-irc-relay/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "alertmanager-irc-relay";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Rl7o2QPa/IU1snlx/LiJxQok9pnkw9XANnJsu41vNlY=";
   };
 
diff --git a/pkgs/by-name/al/alertmanager-webhook-logger/package.nix b/pkgs/by-name/al/alertmanager-webhook-logger/package.nix
index e31c3e9b5056..b256a389ab04 100644
--- a/pkgs/by-name/al/alertmanager-webhook-logger/package.nix
+++ b/pkgs/by-name/al/alertmanager-webhook-logger/package.nix
@@ -8,7 +8,7 @@
 buildGoModule rec {
   pname = "alertmanager-webhook-logger";
   version = "1.0";
-  rev = version;
+  rev = "${version}";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix
index d6eb6b07bf9e..ff6921cb57d9 100644
--- a/pkgs/by-name/al/algia/package.nix
+++ b/pkgs/by-name/al/algia/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "algia";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-i7rSmLFtUFSA1pW5IShYnTxjtwZ5z31OP4kVcMQgMxA=";
   };
 
diff --git a/pkgs/by-name/al/algolia-cli/package.nix b/pkgs/by-name/al/algolia-cli/package.nix
index ae39b75a36c4..1f1debffbd5d 100644
--- a/pkgs/by-name/al/algolia-cli/package.nix
+++ b/pkgs/by-name/al/algolia-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "algolia";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VqY0h0Z3ocmgw0uFI4f6B5C/bTt3zoUXBlYPgOPxBo0=";
   };
 
diff --git a/pkgs/by-name/al/alice-lg/package.nix b/pkgs/by-name/al/alice-lg/package.nix
index 018d0c47c963..54dbef8f7377 100644
--- a/pkgs/by-name/al/alice-lg/package.nix
+++ b/pkgs/by-name/al/alice-lg/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alice-lg";
     repo = "alice-lg";
-    tag = version;
+    rev = version;
     hash = "sha256-BbwTLHDtpa8HCECIiy+UxyQiLf9iAD2GzE0azXk7QGU=";
   };
 
diff --git a/pkgs/by-name/al/alienarena/package.nix b/pkgs/by-name/al/alienarena/package.nix
index 4ca2ffb49534..06982ef32274 100644
--- a/pkgs/by-name/al/alienarena/package.nix
+++ b/pkgs/by-name/al/alienarena/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alienarena";
     repo = "alienarena";
-    tag = version;
+    rev = version;
     hash = "sha256-ri0p/0onI5DU7kDxwdFxRyT1LQLVe89VNEYPXPgilOs=";
   };
 
diff --git a/pkgs/by-name/al/align/package.nix b/pkgs/by-name/al/align/package.nix
index 166ee9532007..12666a286b8f 100644
--- a/pkgs/by-name/al/align/package.nix
+++ b/pkgs/by-name/al/align/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Guitarbum722";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "17gs3417633z71kc6l5zqg4b3rjhpn2v8qs8rnfrk4nbwzz4nrq3";
   };
 
diff --git a/pkgs/by-name/al/allmark/package.nix b/pkgs/by-name/al/allmark/package.nix
index 0d6ed32a322b..6f11a067b15c 100644
--- a/pkgs/by-name/al/allmark/package.nix
+++ b/pkgs/by-name/al/allmark/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "andreaskoch";
     repo = "allmark";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JfNn/e+cSq1pkeXs7A2dMsyhwOnh7x2bwm6dv6NOjLU=";
   };
 
diff --git a/pkgs/by-name/al/almonds/package.nix b/pkgs/by-name/al/almonds/package.nix
index 3b4a60db5434..d8ec911b7304 100644
--- a/pkgs/by-name/al/almonds/package.nix
+++ b/pkgs/by-name/al/almonds/package.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Tenchi2xh";
     repo = "Almonds";
-    tag = version;
+    rev = version;
     sha256 = "0j8d8jizivnfx8lpc4w6sbqj5hq35nfz0vdg7ld80sc5cs7jr3ws";
   };
 
diff --git a/pkgs/by-name/al/alp/package.nix b/pkgs/by-name/al/alp/package.nix
index 1de39c8c3fd3..e0e18e919397 100644
--- a/pkgs/by-name/al/alp/package.nix
+++ b/pkgs/by-name/al/alp/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gernotfeichter";
     repo = "alp";
-    tag = version;
+    rev = version;
     hash = "sha256-tE8qKNXLKvFcnDULVkJJ/EJyEsvATCk/3YFkZCmpHSo=";
   };
   vendorHash = "sha256-AHPVhtm6La7HWuxJfpxTsS5wFTUZUJoVyebLGYhNKTg=";
diff --git a/pkgs/by-name/al/alpaca-proxy/package.nix b/pkgs/by-name/al/alpaca-proxy/package.nix
index 072b4c8c5214..2c69ba00cd05 100644
--- a/pkgs/by-name/al/alpaca-proxy/package.nix
+++ b/pkgs/by-name/al/alpaca-proxy/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "samuong";
     repo = "alpaca";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1CMuZl1bVlofogPwA2wRuQPlXNE2EM1B8rDDDaJGq64=";
   };
 
diff --git a/pkgs/by-name/al/alpine-make-rootfs/package.nix b/pkgs/by-name/al/alpine-make-rootfs/package.nix
index a4ca51ba7495..c16f44c6ad1f 100644
--- a/pkgs/by-name/al/alpine-make-rootfs/package.nix
+++ b/pkgs/by-name/al/alpine-make-rootfs/package.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alpinelinux";
     repo = "alpine-make-rootfs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sNqaMBtbklSBcKxsc3ROI30bE1PUzJJeZqLqC9p3H+U=";
   };
 
diff --git a/pkgs/by-name/al/alpine-make-vm-image/package.nix b/pkgs/by-name/al/alpine-make-vm-image/package.nix
index 28c187d8026a..ea1270252e1a 100644
--- a/pkgs/by-name/al/alpine-make-vm-image/package.nix
+++ b/pkgs/by-name/al/alpine-make-vm-image/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alpinelinux";
     repo = "alpine-make-vm-image";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N7S9MlTpLIL5Od+buS7q64v8fmN+wbYK1FH/YW+nMP8=";
   };
 
diff --git a/pkgs/by-name/al/alpnpass/package.nix b/pkgs/by-name/al/alpnpass/package.nix
index d6a4511d628d..a8d77f9d8cbc 100644
--- a/pkgs/by-name/al/alpnpass/package.nix
+++ b/pkgs/by-name/al/alpnpass/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "VerSprite";
     repo = "alpnpass";
-    tag = version;
+    rev = version;
     hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g=";
   };
 
diff --git a/pkgs/by-name/al/alsa-scarlett-gui/package.nix b/pkgs/by-name/al/alsa-scarlett-gui/package.nix
index 8edcd60bc5e7..ca24560d3ab9 100644
--- a/pkgs/by-name/al/alsa-scarlett-gui/package.nix
+++ b/pkgs/by-name/al/alsa-scarlett-gui/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "geoffreybennett";
     repo = "alsa-scarlett-gui";
-    tag = version;
+    rev = version;
     hash = "sha256-DkfpMK0T67B4mnriignf4hx6Ifddls0rN0SxyfEsPZg=";
   };
 
diff --git a/pkgs/by-name/al/alttab/package.nix b/pkgs/by-name/al/alttab/package.nix
index 15ff4dad4d80..9a81b905f3a6 100644
--- a/pkgs/by-name/al/alttab/package.nix
+++ b/pkgs/by-name/al/alttab/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sagb";
     repo = "alttab";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1+hk0OeSriXPyefv3wOgeiW781PL4VP5Luvt+RS5jmg=";
   };
 
diff --git a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
index 8cfd4ebf5160..978b8cbb1c69 100644
--- a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
+++ b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "amazon-ecr-credential-helper";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kX1I8HsOJKFogqpfTgFBedM6BObdkpYfYwx3tS2IdMo=";
   };
 
diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix
index 20a93e05e89e..6a9ed594d886 100644
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "amber-lang";
     repo = "amber";
-    tag = version;
+    rev = version;
     hash = "sha256-N9G/2G8+vrpr1/K7XLwgW+X2oAyAaz4qvN+EbLOCU1Q=";
   };
 
diff --git a/pkgs/by-name/am/amber-secret/package.nix b/pkgs/by-name/am/amber-secret/package.nix
index d933c2136e76..c62940c467d1 100644
--- a/pkgs/by-name/am/amber-secret/package.nix
+++ b/pkgs/by-name/am/amber-secret/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fpco";
     repo = "amber";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM=";
   };
 
diff --git a/pkgs/by-name/am/amber-theme/package.nix b/pkgs/by-name/am/amber-theme/package.nix
index 5ac30cd315d2..a6396363a849 100644
--- a/pkgs/by-name/am/amber-theme/package.nix
+++ b/pkgs/by-name/am/amber-theme/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "amber-theme";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OrdBeAD+gdIu6u8ESE9PtqYadSuJ8nx1Z8fB4D9y4W4=";
   };
 
diff --git a/pkgs/by-name/am/amd-blis/package.nix b/pkgs/by-name/am/amd-blis/package.nix
index 8af040a1c1f5..9e798a882edd 100644
--- a/pkgs/by-name/am/amd-blis/package.nix
+++ b/pkgs/by-name/am/amd-blis/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amd";
     repo = "blis";
-    tag = version;
+    rev = version;
     hash = "sha256-E6JmV4W0plFJfOAPK1Vn7qkmFalwl6OjqSpxYnhAPmw=";
   };
 
diff --git a/pkgs/by-name/am/amd-libflame/package.nix b/pkgs/by-name/am/amd-libflame/package.nix
index a94b36c5583f..6022742e05fc 100644
--- a/pkgs/by-name/am/amd-libflame/package.nix
+++ b/pkgs/by-name/am/amd-libflame/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amd";
     repo = "libflame";
-    tag = version;
+    rev = version;
     hash = "sha256-Shsv5Zd59FN5tq1LY7QqPRtAHEysHIVbPeKIIZ/2eMw=";
   };
 
diff --git a/pkgs/by-name/am/amdctl/package.nix b/pkgs/by-name/am/amdctl/package.nix
index 63fe47c113b3..cdf983395bc4 100644
--- a/pkgs/by-name/am/amdctl/package.nix
+++ b/pkgs/by-name/am/amdctl/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kevinlekiller";
     repo = "amdctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2wBk/9aAD7ARMGbcVxk+CzEvUf8U4RS4ZwTCj8cHNNo=";
   };
 
diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix
index fdc343766925..a4627056ac62 100644
--- a/pkgs/by-name/am/amdgpu_top/package.nix
+++ b/pkgs/by-name/am/amdgpu_top/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Umio-Yasuno";
     repo = "amdgpu_top";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OvxrcVjngIW/fVIPX1XhbGImAeDifoLzlaZpXUYS9FA=";
   };
 
diff --git a/pkgs/by-name/am/amf-headers/package.nix b/pkgs/by-name/am/amf-headers/package.nix
index f7d25bd478f7..45ed5afaaedb 100644
--- a/pkgs/by-name/am/amf-headers/package.nix
+++ b/pkgs/by-name/am/amf-headers/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GPUOpen-LibrariesAndSDKs";
     repo = "AMF";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-u6gvdc1acemd01TO5EbuF3H7HkEJX4GUx73xCo71yPY=";
   };
 
diff --git a/pkgs/by-name/am/amfora/package.nix b/pkgs/by-name/am/amfora/package.nix
index df9f059111be..bb335a505bb2 100644
--- a/pkgs/by-name/am/amfora/package.nix
+++ b/pkgs/by-name/am/amfora/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "makeworld-the-better-one";
     repo = "amfora";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KOuKgxH3n4rdF+oj/TwEcRqX1sn4A9e23FNwQMhMVO4=";
   };
 
diff --git a/pkgs/by-name/am/aml/package.nix b/pkgs/by-name/am/aml/package.nix
index ffb1e33a9211..a901a7270de6 100644
--- a/pkgs/by-name/am/aml/package.nix
+++ b/pkgs/by-name/am/aml/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "any1";
     repo = "aml";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q=";
   };
 
diff --git a/pkgs/by-name/am/amneziawg-go/package.nix b/pkgs/by-name/am/amneziawg-go/package.nix
index 57d3994b7b53..fa5f47cffa81 100644
--- a/pkgs/by-name/am/amneziawg-go/package.nix
+++ b/pkgs/by-name/am/amneziawg-go/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amneziawg-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Xw2maGmNnx0+GO3OWS1Gu77oB9wh2dv+WobypQotUMA=";
   };
 
diff --git a/pkgs/by-name/am/amoco/package.nix b/pkgs/by-name/am/amoco/package.nix
index 89a8bd69b8bd..42e76b5bd4e1 100644
--- a/pkgs/by-name/am/amoco/package.nix
+++ b/pkgs/by-name/am/amoco/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bdcht";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3+1ssFyU7SKFJgDYBQY0kVjmTHOD71D2AjnH+4bfLXo=";
   };
 
diff --git a/pkgs/by-name/am/amphetype/package.nix b/pkgs/by-name/am/amphetype/package.nix
index 2244f68a5bfc..286a2cc162cb 100644
--- a/pkgs/by-name/am/amphetype/package.nix
+++ b/pkgs/by-name/am/amphetype/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
   src = fetchFromGitLab {
     owner = "franksh";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pve2f+XMfFokMCtW3KdeOJ9Ey330Gwv/dk1+WBtrBEQ=";
   };
 
diff --git a/pkgs/by-name/am/amqpcat/package.nix b/pkgs/by-name/am/amqpcat/package.nix
index f34e594af1c8..1f4d7d8dc1ca 100644
--- a/pkgs/by-name/am/amqpcat/package.nix
+++ b/pkgs/by-name/am/amqpcat/package.nix
@@ -14,7 +14,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "cloudamqp";
     repo = "amqpcat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QLVFAcymj7dERbUiRcseiDuuKgrQ8n4LbkdhUyXPcWw=";
   };
 
diff --git a/pkgs/by-name/am/ams-lv2/package.nix b/pkgs/by-name/am/ams-lv2/package.nix
index 7634e2efe1f8..00b4916fe55e 100644
--- a/pkgs/by-name/am/ams-lv2/package.nix
+++ b/pkgs/by-name/am/ams-lv2/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "blablack";
     repo = "ams-lv2";
-    tag = version;
+    rev = version;
     sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk";
   };
 
diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix
index 360c9ef34649..73e1ad752ec5 100644
--- a/pkgs/by-name/am/amule/package.nix
+++ b/pkgs/by-name/am/amule/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amule-project";
     repo = "amule";
-    tag = version;
+    rev = version;
     sha256 = "1nm4vxgmisn1b6l3drmz0q04x067j2i8lw5rnf0acaapwlp8qwvi";
   };
 
diff --git a/pkgs/by-name/an/analog/package.nix b/pkgs/by-name/an/analog/package.nix
index b8f0fa94aaeb..11777f147a24 100644
--- a/pkgs/by-name/an/analog/package.nix
+++ b/pkgs/by-name/an/analog/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "c-amie";
     repo = "analog-ce";
-    tag = version;
+    rev = version;
     sha256 = "sha256-NCturEibnpl6+paUZezksHzP33WtAzfIolvBLeEHXjY=";
   };
 
diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix
index 14dd97949d8f..0c497b16f119 100644
--- a/pkgs/by-name/an/anchor/package.nix
+++ b/pkgs/by-name/an/anchor/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "coral-xyz";
     repo = "anchor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rwf2PWHoUl8Rkmktb2u7veRrIcLT3syi7M2OZxdxjG4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/an/anders/package.nix b/pkgs/by-name/an/anders/package.nix
index 4c512c9629be..9943da5a735d 100644
--- a/pkgs/by-name/an/anders/package.nix
+++ b/pkgs/by-name/an/anders/package.nix
@@ -13,7 +13,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "groupoid";
     repo = "anders";
-    tag = version;
+    rev = version;
     sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4=";
   };
 
diff --git a/pkgs/by-name/an/android-udev-rules/package.nix b/pkgs/by-name/an/android-udev-rules/package.nix
index 3a3e7a0b46e2..a1dcffe21cd8 100644
--- a/pkgs/by-name/an/android-udev-rules/package.nix
+++ b/pkgs/by-name/an/android-udev-rules/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
-    tag = version;
+    rev = version;
     hash = "sha256-QADyZ3FHVuxX/PfsRt2ijwJRCksQb1Hz5lSgYJlyb1Q=";
   };
 
diff --git a/pkgs/by-name/an/anew/package.nix b/pkgs/by-name/an/anew/package.nix
index 1475a5072812..01df45bf9380 100644
--- a/pkgs/by-name/an/anew/package.nix
+++ b/pkgs/by-name/an/anew/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "anew";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NQSs99/2GPOtXkO7k+ar16G4Ecu4CPGMd/CTwEhcyto=";
   };
 
diff --git a/pkgs/by-name/an/anewer/package.nix b/pkgs/by-name/an/anewer/package.nix
index a284c68bb6f4..5541e23b86cc 100644
--- a/pkgs/by-name/an/anewer/package.nix
+++ b/pkgs/by-name/an/anewer/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ysf";
     repo = "anewer";
-    tag = version;
+    rev = version;
     sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d";
   };
 
diff --git a/pkgs/by-name/an/angband/package.nix b/pkgs/by-name/an/angband/package.nix
index e0a2ba70b245..ac2d60a74480 100644
--- a/pkgs/by-name/an/angband/package.nix
+++ b/pkgs/by-name/an/angband/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "angband";
     repo = "angband";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-XH2FUTJJaH5TqV2UD1CKKAXE4CRAb6zfg1UQ79a15k0=";
   };
 
diff --git a/pkgs/by-name/an/angle-grinder/package.nix b/pkgs/by-name/an/angle-grinder/package.nix
index 3a254e46d43a..9c9a827a01ce 100644
--- a/pkgs/by-name/an/angle-grinder/package.nix
+++ b/pkgs/by-name/an/angle-grinder/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rcoh";
     repo = "angle-grinder";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1SZho04qJcNi84ZkDmxoVkLx9VJX04QINZQ6ZEoCq+c=";
   };
 
diff --git a/pkgs/by-name/an/angsd/package.nix b/pkgs/by-name/an/angsd/package.nix
index f9c6d2775d62..3a63cced6076 100644
--- a/pkgs/by-name/an/angsd/package.nix
+++ b/pkgs/by-name/an/angsd/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "ANGSD";
     repo = "angsd";
     sha256 = "sha256-Ppxgy54pAnqJUzNX5c12NHjKTQyEEcPSpCEEVOyZ/LA=";
-    tag = version;
+    rev = version;
   };
 
   patches = [
diff --git a/pkgs/by-name/an/anime-downloader/package.nix b/pkgs/by-name/an/anime-downloader/package.nix
index aff031306455..4d8c2f932625 100644
--- a/pkgs/by-name/an/anime-downloader/package.nix
+++ b/pkgs/by-name/an/anime-downloader/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "anime-dl";
     repo = "anime-downloader";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o=";
   };
 
diff --git a/pkgs/by-name/an/anko/package.nix b/pkgs/by-name/an/anko/package.nix
index 946599af780d..ddfef902dfc8 100644
--- a/pkgs/by-name/an/anko/package.nix
+++ b/pkgs/by-name/an/anko/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "anko";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZVNkQu5IxBx3f+FkUWc36EOEcY176wQJ2ravLPQAHAA=";
   };
 
diff --git a/pkgs/by-name/an/annextimelog/package.nix b/pkgs/by-name/an/annextimelog/package.nix
index 97370f770a4c..da260dbce7ba 100644
--- a/pkgs/by-name/an/annextimelog/package.nix
+++ b/pkgs/by-name/an/annextimelog/package.nix
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "nobodyinperson";
     repo = "annextimelog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+3PkG33qKckagSVvVdqkypulO7uu5AMOv8fQiP8IUbs=";
   };
 
diff --git a/pkgs/by-name/an/annotator/package.nix b/pkgs/by-name/an/annotator/package.nix
index a6f9324a3781..2846180b1564 100644
--- a/pkgs/by-name/an/annotator/package.nix
+++ b/pkgs/by-name/an/annotator/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phase1geo";
     repo = "annotator";
-    tag = version;
+    rev = version;
     hash = "sha256-VHvznkGvrE8o9qq+ijrIStSavq46dS8BqclWEWZ8mG8=";
   };
 
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index 11ab67ad2618..1e01858c5097 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -71,7 +71,7 @@ let
     src = fetchFromGitHub {
       owner = "AOMediaCodec";
       repo = "libavif";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs=";
     };
   };
diff --git a/pkgs/by-name/an/ansible-cmdb/package.nix b/pkgs/by-name/an/ansible-cmdb/package.nix
index 99cf731a88da..d88ae7ec2f63 100644
--- a/pkgs/by-name/an/ansible-cmdb/package.nix
+++ b/pkgs/by-name/an/ansible-cmdb/package.nix
@@ -26,7 +26,7 @@ buildPythonApplication {
   src = fetchFromGitHub {
     owner = "fboender";
     repo = "ansible-cmdb";
-    tag = version;
+    rev = version;
     hash = "sha256-HOFLX8fiid+xJOVYNyVbz5FunrhteAUPlvS3ctclVHo=";
   };
 
diff --git a/pkgs/by-name/an/antibody/package.nix b/pkgs/by-name/an/antibody/package.nix
index a526eadc61ae..470716d81ce8 100644
--- a/pkgs/by-name/an/antibody/package.nix
+++ b/pkgs/by-name/an/antibody/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "getantibody";
     repo = "antibody";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-If7XAwtg1WqkDkrJ6qYED+DjwHWloPu3P7X9rUd5ikU=";
   };
 
diff --git a/pkgs/by-name/an/antora-lunr-extension/package.nix b/pkgs/by-name/an/antora-lunr-extension/package.nix
index b0ed88129957..2f6a6bef6429 100644
--- a/pkgs/by-name/an/antora-lunr-extension/package.nix
+++ b/pkgs/by-name/an/antora-lunr-extension/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitLab {
     owner = "antora";
     repo = "antora-lunr-extension";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4=";
   };
 
diff --git a/pkgs/by-name/an/antora/package.nix b/pkgs/by-name/an/antora/package.nix
index 9f40af7698a0..60a5a1dbb20f 100644
--- a/pkgs/by-name/an/antora/package.nix
+++ b/pkgs/by-name/an/antora/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitLab {
     owner = "antora";
     repo = "antora";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hkavYC2LO8NRIRwHNWIJLRDkVnhAB4Di3IqL8uGt+U8=";
   };
 
diff --git a/pkgs/by-name/an/any-nix-shell/package.nix b/pkgs/by-name/an/any-nix-shell/package.nix
index 5e746b87e7bb..3ef59864af47 100644
--- a/pkgs/by-name/an/any-nix-shell/package.nix
+++ b/pkgs/by-name/an/any-nix-shell/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "haslersn";
     repo = "any-nix-shell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-t6+LKSGWmkHQhfqw/4Ztz4QgDXQ2RZr9R/mMEEA3jlY=";
   };
 
diff --git a/pkgs/by-name/ao/aocl-utils/package.nix b/pkgs/by-name/ao/aocl-utils/package.nix
index 64b35e22a71f..1dc44ad7c08c 100644
--- a/pkgs/by-name/ao/aocl-utils/package.nix
+++ b/pkgs/by-name/ao/aocl-utils/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amd";
     repo = "aocl-utils";
-    tag = version;
+    rev = version;
     hash = "sha256-96j3Sw+Ts+CZzjPpUlt8cRYO5z0iASo+W/x1nrrAyQE=";
   };
 
diff --git a/pkgs/by-name/ap/aperture/package.nix b/pkgs/by-name/ap/aperture/package.nix
index 16ebdfd689bc..7e47e02c12ab 100644
--- a/pkgs/by-name/ap/aperture/package.nix
+++ b/pkgs/by-name/ap/aperture/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "aperture";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PsmaNJxWkXiFDA7IGhT+Kx1GUvv23c8L8Jz21/b48oo=";
   };
 
diff --git a/pkgs/by-name/ap/apfel/package.nix b/pkgs/by-name/ap/apfel/package.nix
index 5afecc9172ae..7c8ca609fd27 100644
--- a/pkgs/by-name/ap/apfel/package.nix
+++ b/pkgs/by-name/ap/apfel/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scarrazza";
     repo = "apfel";
-    tag = version;
+    rev = version;
     hash = "sha256-0Ix7KwEZUG/NmGJ380DVJbUA0PcoEJDlcGSc09l5Tbc=";
   };
 
diff --git a/pkgs/by-name/ap/apfelgrid/package.nix b/pkgs/by-name/ap/apfelgrid/package.nix
index 7ca3c7209973..45b6d88d715b 100644
--- a/pkgs/by-name/ap/apfelgrid/package.nix
+++ b/pkgs/by-name/ap/apfelgrid/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nhartland";
     repo = "APFELgrid";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0l0cyxd00kmb5aggzwsxg83ah0qiwav0shbxkxwrz3dvw78n89jk";
   };
 
diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix
index ba3e22dfdfa9..3d152b13369c 100644
--- a/pkgs/by-name/ap/api-linter/package.nix
+++ b/pkgs/by-name/ap/api-linter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "api-linter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eLs5F3wghAfPfRQgAtW220xlzs7Un8sPpRpfvzc8Jfw=";
   };
 
diff --git a/pkgs/by-name/ap/aporetic/package.nix b/pkgs/by-name/ap/aporetic/package.nix
index f47729d58a08..acfd47d95aca 100644
--- a/pkgs/by-name/ap/aporetic/package.nix
+++ b/pkgs/by-name/ap/aporetic/package.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "protesilaos";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-5lPViAo9SztOdds6HEmKJpT17tgcxmU/voXDffxTMDI=";
   };
   privateBuildPlan = src.outPath + "/private-build-plans.toml";
diff --git a/pkgs/by-name/ap/appeditor/package.nix b/pkgs/by-name/ap/appeditor/package.nix
index 1ad16c0bbbb9..989345f505cb 100644
--- a/pkgs/by-name/ap/appeditor/package.nix
+++ b/pkgs/by-name/ap/appeditor/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "donadigo";
     repo = "appeditor";
-    tag = version;
+    rev = version;
     sha256 = "sha256-A0YasHw5osGrgUPiUPuRBnv1MR/Pth6jVHGEx/klOGY=";
   };
 
diff --git a/pkgs/by-name/ap/appimageupdate/package.nix b/pkgs/by-name/ap/appimageupdate/package.nix
index 8c6dd63b4ba4..b1af05103d8a 100644
--- a/pkgs/by-name/ap/appimageupdate/package.nix
+++ b/pkgs/by-name/ap/appimageupdate/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AppImageCommunity";
     repo = "AppImageUpdate";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-b2RqSw0Ksn9OLxQV9+3reBiqrty+Kx9OwV93jlvuPnY=";
   };
 
diff --git a/pkgs/by-name/ap/appindicator-sharp/package.nix b/pkgs/by-name/ap/appindicator-sharp/package.nix
index 4f56ec5d3096..40373d4e61af 100644
--- a/pkgs/by-name/ap/appindicator-sharp/package.nix
+++ b/pkgs/by-name/ap/appindicator-sharp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stsundermann";
     repo = "appindicator-sharp";
-    tag = version;
+    rev = version;
     sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l";
   };
 
diff --git a/pkgs/by-name/ap/approxmc/package.nix b/pkgs/by-name/ap/approxmc/package.nix
index 1fd090bd7c13..20460dc5428b 100644
--- a/pkgs/by-name/ap/approxmc/package.nix
+++ b/pkgs/by-name/ap/approxmc/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "meelgroup";
     repo = "approxmc";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-rADPC7SVwzjUN5jb7Wt341oGfr6+LszIaBUe8QgmpRU=";
   };
 
diff --git a/pkgs/by-name/ap/apt-mirror/package.nix b/pkgs/by-name/ap/apt-mirror/package.nix
index dfc9031c156e..8f606e921af0 100644
--- a/pkgs/by-name/ap/apt-mirror/package.nix
+++ b/pkgs/by-name/ap/apt-mirror/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "apt-mirror";
     repo = "apt-mirror";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-GNsyXP/O56Y+8QhoSfMm+ig5lK/K3Cm085jxRt9ZRmI=";
   };
 
diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index c9636a013827..c95aea8d14ee 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "salsa.debian.org";
     owner = "apt-team";
     repo = "apt";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-B4rFOt4J94/XkFw09sdvfogdY1b5R6QYnNC3HVUV9pc=";
   };
 
diff --git a/pkgs/by-name/ap/aptdec/package.nix b/pkgs/by-name/ap/aptdec/package.nix
index ef2ce7375ac8..4645933e4c0c 100644
--- a/pkgs/by-name/ap/aptdec/package.nix
+++ b/pkgs/by-name/ap/aptdec/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Xerbo";
     repo = "aptdec";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5Pr2PlCPSEIWnThJXKcQEudmxhLJC2sVa9BfAOEKHB4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ap/aptly/package.nix b/pkgs/by-name/ap/aptly/package.nix
index 73653cd8ba9c..f04824a05fb3 100644
--- a/pkgs/by-name/ap/aptly/package.nix
+++ b/pkgs/by-name/ap/aptly/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aptly-dev";
     repo = "aptly";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LqGOLXXaGfQfoj2r+aY9SdOKUDI9+22EsHKBhHMidyk=";
   };
 
diff --git a/pkgs/by-name/ar/arangodb/package.nix b/pkgs/by-name/ar/arangodb/package.nix
index 79dcbc11e400..ae27027bd993 100644
--- a/pkgs/by-name/ar/arangodb/package.nix
+++ b/pkgs/by-name/ar/arangodb/package.nix
@@ -31,7 +31,7 @@ gcc10Stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-64iTxhG8qKTSrTlH/BWDJNnLf8VnaCteCKfQ9D2lGDQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ar/aravis/package.nix b/pkgs/by-name/ar/aravis/package.nix
index dab2cb13c444..7f2f7ce4a2f3 100644
--- a/pkgs/by-name/ar/aravis/package.nix
+++ b/pkgs/by-name/ar/aravis/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AravisProject";
     repo = "aravis";
-    tag = version;
+    rev = version;
     sha256 = "sha256-D6zcTCaFJxJ2VhhsgEFu5+3Xx1MJov4ryrtA0VkjZlY=";
   };
 
diff --git a/pkgs/by-name/ar/arc-icon-theme/package.nix b/pkgs/by-name/ar/arc-icon-theme/package.nix
index 7d17fdfc09c7..646a0d14c7da 100644
--- a/pkgs/by-name/ar/arc-icon-theme/package.nix
+++ b/pkgs/by-name/ar/arc-icon-theme/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "horst3180";
     repo = "arc-icon-theme";
-    tag = version;
+    rev = version;
     hash = "sha256-TfYtzwo69AC5hHbzEqB4r5Muqvn/eghCGSlmjMCFA7I=";
   };
 
diff --git a/pkgs/by-name/ar/arc-kde-theme/package.nix b/pkgs/by-name/ar/arc-kde-theme/package.nix
index b1cb4b83928e..2cc355efbe6d 100644
--- a/pkgs/by-name/ar/arc-kde-theme/package.nix
+++ b/pkgs/by-name/ar/arc-kde-theme/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "arc-kde";
-    tag = version;
+    rev = version;
     sha256 = "sha256-dxk8YpJB4XaZHD/O+WvQUFKJD2TE38VZyC5orn4N7BA=";
   };
 
diff --git a/pkgs/by-name/ar/arc-theme/package.nix b/pkgs/by-name/ar/arc-theme/package.nix
index 8fe22d49dfe7..8f6e90986c6f 100644
--- a/pkgs/by-name/ar/arc-theme/package.nix
+++ b/pkgs/by-name/ar/arc-theme/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jnsh";
     repo = "arc-theme";
-    tag = version;
+    rev = version;
     sha256 = "sha256-7VmqsUCeG5GwmrVdt9BJj0eZ/1v+no/05KwGFb7E9ns=";
   };
 
diff --git a/pkgs/by-name/ar/archiver/package.nix b/pkgs/by-name/ar/archiver/package.nix
index 4dff0e25adf9..ed8f4c909ccf 100644
--- a/pkgs/by-name/ar/archiver/package.nix
+++ b/pkgs/by-name/ar/archiver/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mholt";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-l9exOq8QF3WSQ/+WQr0NfPeRQ/R6VQwfT+YS76BBwd8=";
   };
 
diff --git a/pkgs/by-name/ar/ardugotools/package.nix b/pkgs/by-name/ar/ardugotools/package.nix
index 554c79d30b6a..16191343ab64 100644
--- a/pkgs/by-name/ar/ardugotools/package.nix
+++ b/pkgs/by-name/ar/ardugotools/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "randomouscrap98";
     repo = "ardugotools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SqeUcYa8XscwaJaCSIoZ9lEtRJ0hN01XJDyCJFX2dTc=";
   };
 
diff --git a/pkgs/by-name/ar/arduino-ci/package.nix b/pkgs/by-name/ar/arduino-ci/package.nix
index 31e63437b75e..af301786fee7 100644
--- a/pkgs/by-name/ar/arduino-ci/package.nix
+++ b/pkgs/by-name/ar/arduino-ci/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pololu";
     repo = "arduino-ci";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9RbBxgwsSQ7oGGKr1Vsn9Ug9AsacoRgvQgd9jbRQ034=";
   };
 
diff --git a/pkgs/by-name/ar/arduino-create-agent/package.nix b/pkgs/by-name/ar/arduino-create-agent/package.nix
index fbce7d5a62e0..093eee137e65 100644
--- a/pkgs/by-name/ar/arduino-create-agent/package.nix
+++ b/pkgs/by-name/ar/arduino-create-agent/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "arduino";
     repo = "arduino-create-agent";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-L77LDMe6KTwQ2qAx3OT1O27h4DhAjZzcs8WL/N7E8hI=";
   };
 
diff --git a/pkgs/by-name/ar/arduino-mk/package.nix b/pkgs/by-name/ar/arduino-mk/package.nix
index 9f6b8168aeb8..eb03147af25b 100644
--- a/pkgs/by-name/ar/arduino-mk/package.nix
+++ b/pkgs/by-name/ar/arduino-mk/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sudar";
     repo = "Arduino-Makefile";
-    tag = version;
+    rev = version;
     sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x";
   };
 
diff --git a/pkgs/by-name/ar/arduinoOTA/package.nix b/pkgs/by-name/ar/arduinoOTA/package.nix
index 8a72811a33b0..218b38db301d 100644
--- a/pkgs/by-name/ar/arduinoOTA/package.nix
+++ b/pkgs/by-name/ar/arduinoOTA/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "arduino";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-HaNMkeV/PDEotYp8+rUKFaBxGbZO8qA99Yp2sa6glz8=";
   };
 
diff --git a/pkgs/by-name/ar/ares-cli/package.nix b/pkgs/by-name/ar/ares-cli/package.nix
index 85ff020f5197..180507184c6f 100644
--- a/pkgs/by-name/ar/ares-cli/package.nix
+++ b/pkgs/by-name/ar/ares-cli/package.nix
@@ -10,7 +10,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "webos-tools";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tSnmIDDDEhhQBrjZ5bujmCaYpetTjpdCGUjKomue+Bc=";
   };
 
diff --git a/pkgs/by-name/ar/argagg/package.nix b/pkgs/by-name/ar/argagg/package.nix
index ed666babe0f0..b38cd986f77f 100644
--- a/pkgs/by-name/ar/argagg/package.nix
+++ b/pkgs/by-name/ar/argagg/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vietjtnguyen";
     repo = "argagg";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-G0PzoKpUyb1MaziLvHgasq98jPODUu4EgPzywRjuIN8=";
   };
 
diff --git a/pkgs/by-name/ar/argbash/package.nix b/pkgs/by-name/ar/argbash/package.nix
index 424201ab9db0..a3fe1d4026f2 100644
--- a/pkgs/by-name/ar/argbash/package.nix
+++ b/pkgs/by-name/ar/argbash/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "matejak";
     repo = "argbash";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-G739q6OhsXEldpIxiyOU51AmG4RChMqaN1t2wOy6sPU=";
   };
 
diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix
index b75f841e98fa..051d4e83e0bd 100644
--- a/pkgs/by-name/ar/argc/package.nix
+++ b/pkgs/by-name/ar/argc/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sigoden";
     repo = "argc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sviGDwxbCBsNY5viV7Qim6B/COd1Uz0Wj/6n/Ge+A50=";
   };
 
diff --git a/pkgs/by-name/ar/argo-expr/package.nix b/pkgs/by-name/ar/argo-expr/package.nix
index 178564864167..9048d604a6b2 100644
--- a/pkgs/by-name/ar/argo-expr/package.nix
+++ b/pkgs/by-name/ar/argo-expr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "blacha";
     repo = "argo-expr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XQnPFzT3PRmKeAQXLzBE5R2VvXotzxmsq+u9u5iE1QA=";
   };
 
diff --git a/pkgs/by-name/ar/argo-rollouts/package.nix b/pkgs/by-name/ar/argo-rollouts/package.nix
index ad363c122527..f4e1f3419e04 100644
--- a/pkgs/by-name/ar/argo-rollouts/package.nix
+++ b/pkgs/by-name/ar/argo-rollouts/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-rollouts";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-C2Ha3Sdq5IOHEc9S4jb4g6do6a4Gkm4E0BVFq5TnJDM=";
   };
 
diff --git a/pkgs/by-name/ar/argocd-autopilot/package.nix b/pkgs/by-name/ar/argocd-autopilot/package.nix
index a7fb62b6170a..3121f2648aa1 100644
--- a/pkgs/by-name/ar/argocd-autopilot/package.nix
+++ b/pkgs/by-name/ar/argocd-autopilot/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "argoproj-labs";
     repo = "argocd-autopilot";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZJVlmZX/eQnOM2mlAe7DOyvykjgi5DHMqHoPAHPZlXM=";
   };
 
diff --git a/pkgs/by-name/ar/argocd-vault-plugin/package.nix b/pkgs/by-name/ar/argocd-vault-plugin/package.nix
index 98cb556b44d9..e3e7496c5db2 100644
--- a/pkgs/by-name/ar/argocd-vault-plugin/package.nix
+++ b/pkgs/by-name/ar/argocd-vault-plugin/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "argoproj-labs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rWNR4GVivuEprdX/xhwk/9SReeJ19UWDWx8Bf8z6CTI=";
   };
 
diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index 6edd23f25c7f..1f03ca226775 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ilXJWPvu3qwzuUN6AsQNyzrTHdQO51IFZcvZiQ/+/tU=";
   };
 
diff --git a/pkgs/by-name/ar/argp-standalone/package.nix b/pkgs/by-name/ar/argp-standalone/package.nix
index eb566ed184b9..893aded31cff 100644
--- a/pkgs/by-name/ar/argp-standalone/package.nix
+++ b/pkgs/by-name/ar/argp-standalone/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "argp-standalone";
     repo = "argp-standalone";
-    tag = version;
+    rev = version;
     sha256 = "jWnoWVnUVDQlsC9ru7oB9PdtZuyCCNqGnMqF/f2m0ZY=";
   };
 
diff --git a/pkgs/by-name/ar/argparse/package.nix b/pkgs/by-name/ar/argparse/package.nix
index d2f6a9561ee2..fdc58a33f769 100644
--- a/pkgs/by-name/ar/argparse/package.nix
+++ b/pkgs/by-name/ar/argparse/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "p-ranav";
     repo = "argparse";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-w4IU8Yr+zPFOo7xR4YMHlqNJcEov4KU/ppDYrgsGlxM=";
   };
 
diff --git a/pkgs/by-name/ar/ariang/package.nix b/pkgs/by-name/ar/ariang/package.nix
index e71ee1ab9d2c..6636ab31cf36 100644
--- a/pkgs/by-name/ar/ariang/package.nix
+++ b/pkgs/by-name/ar/ariang/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mayswind";
     repo = "AriaNg";
-    tag = version;
+    rev = version;
     hash = "sha256-YABoDBPrxII0uw4Cyy1A4AcLQ3Uo28dJa/F4LTI7f5Y=";
   };
 
diff --git a/pkgs/by-name/ar/arjun-cnf/package.nix b/pkgs/by-name/ar/arjun-cnf/package.nix
index 0bd257eecd18..b257a607c94c 100644
--- a/pkgs/by-name/ar/arjun-cnf/package.nix
+++ b/pkgs/by-name/ar/arjun-cnf/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "meelgroup";
     repo = "arjun";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-5duc05s654HLjbf+dPgyMn6QUVvB0vLji3M4S2o/QYU=";
   };
 
diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix
index 9fb8c61a4fba..90e3c5ac8608 100644
--- a/pkgs/by-name/ar/arkade/package.nix
+++ b/pkgs/by-name/ar/arkade/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
-    tag = version;
+    rev = version;
     hash = "sha256-V6ms3Av0/g2S7Q2NLltz7CnnvE1m+cemmwoHKL1e0tM=";
   };
 
diff --git a/pkgs/by-name/ar/arp-scan/package.nix b/pkgs/by-name/ar/arp-scan/package.nix
index a1216e9d8876..3f41678c5b21 100644
--- a/pkgs/by-name/ar/arp-scan/package.nix
+++ b/pkgs/by-name/ar/arp-scan/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "royhills";
     repo = "arp-scan";
-    tag = version;
+    rev = version;
     sha256 = "sha256-BS+ItZd6cSMX92M6XGYrIeAiCB2iBdvbMvKdLfwawLQ=";
   };
 
diff --git a/pkgs/by-name/ar/arpa2cm/package.nix b/pkgs/by-name/ar/arpa2cm/package.nix
index 9505754388bc..148d4df2c397 100644
--- a/pkgs/by-name/ar/arpa2cm/package.nix
+++ b/pkgs/by-name/ar/arpa2cm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "arpa2cm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk=";
   };
 
diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix
index a6c6e492fa3f..a25e9aa232bc 100644
--- a/pkgs/by-name/ar/arsenal/package.nix
+++ b/pkgs/by-name/ar/arsenal/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Orange-Cyberdefense";
     repo = "arsenal";
-    tag = version;
+    rev = version;
     sha256 = "sha256-NbNXyR5aNKvRJU9JWGk/ndwU1bhNgDOdcRqBkAY9nPA=";
   };
 
diff --git a/pkgs/by-name/ar/artem/package.nix b/pkgs/by-name/ar/artem/package.nix
index dfa7b4497539..a04e31e6b3f5 100644
--- a/pkgs/by-name/ar/artem/package.nix
+++ b/pkgs/by-name/ar/artem/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "finefindus";
     repo = "artem";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-C3Co+hXstVN/WADIpzqr7f3muAgQL0Zbnz6VI1XNo4U=";
   };
 
diff --git a/pkgs/by-name/as/ascii-image-converter/package.nix b/pkgs/by-name/as/ascii-image-converter/package.nix
index cd36a1f0e1a8..a74990a9b548 100644
--- a/pkgs/by-name/as/ascii-image-converter/package.nix
+++ b/pkgs/by-name/as/ascii-image-converter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TheZoraiz";
     repo = "ascii-image-converter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-svM/TzGQU/QgjqHboy0470+A6p4kR76typ9gnfjfAJk=";
   };
 
diff --git a/pkgs/by-name/as/asciigraph/package.nix b/pkgs/by-name/as/asciigraph/package.nix
index c9c924048937..ec9151cd9a90 100644
--- a/pkgs/by-name/as/asciigraph/package.nix
+++ b/pkgs/by-name/as/asciigraph/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "guptarohit";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+4aGkumO42cloHWV8qEEJ5bj8TTdtfXTWGFCgCRE4Mg=";
   };
 
diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix
index d3add2fd3a72..a79fa32aae9b 100644
--- a/pkgs/by-name/as/asciinema-agg/package.nix
+++ b/pkgs/by-name/as/asciinema-agg/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "asciinema";
     repo = "agg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bCE59NeITaCwgajgyXgP6jxtV7aPihPaZ/Uzh39Po1k=";
   };
 
diff --git a/pkgs/by-name/as/asciinema-automation/package.nix b/pkgs/by-name/as/asciinema-automation/package.nix
index 780cd2c8bd69..abdaddde453d 100644
--- a/pkgs/by-name/as/asciinema-automation/package.nix
+++ b/pkgs/by-name/as/asciinema-automation/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "PierreMarchand20";
     repo = "asciinema_automation";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SjUsPrhoNz2NTPAkmUH0Csv6hbDc6nyKdckGqV5S3GY=";
   };
 
diff --git a/pkgs/by-name/as/asciinema/package.nix b/pkgs/by-name/as/asciinema/package.nix
index be38b4947869..f84c93eb3faa 100644
--- a/pkgs/by-name/as/asciinema/package.nix
+++ b/pkgs/by-name/as/asciinema/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "asciinema";
     repo = "asciinema";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UegLwpJ+uc9cW3ozLQJsQBjIGD7+vzzwzQFRV5gmDmI=";
   };
 
diff --git a/pkgs/by-name/as/asciiquarium-transparent/package.nix b/pkgs/by-name/as/asciiquarium-transparent/package.nix
index 3ee69c2233b0..e82c054b017a 100644
--- a/pkgs/by-name/as/asciiquarium-transparent/package.nix
+++ b/pkgs/by-name/as/asciiquarium-transparent/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nothub";
     repo = "asciiquarium";
-    tag = finalAttrs.version;
+    rev = "${finalAttrs.version}";
     hash = "sha256-zQyVIfwmhF3WsCeIZLwjDufvKzAfjLxaK2s7WTedqCg=";
   };
 
diff --git a/pkgs/by-name/as/asdf-vm/package.nix b/pkgs/by-name/as/asdf-vm/package.nix
index 7565da9d6045..1acbce85e93a 100644
--- a/pkgs/by-name/as/asdf-vm/package.nix
+++ b/pkgs/by-name/as/asdf-vm/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "asdf-vm";
     repo = "asdf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-quDgoYi+3hZUEAzXWTHuL5UK1T+4o7+G67w0UzZOjJA=";
   };
 
diff --git a/pkgs/by-name/as/asfa/package.nix b/pkgs/by-name/as/asfa/package.nix
index 0ff5cb4037be..1dd940c1a6fa 100644
--- a/pkgs/by-name/as/asfa/package.nix
+++ b/pkgs/by-name/as/asfa/package.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "obreitwi";
     repo = "asfa";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ARdUlACxmbjmOTuNW2oiVUcfd5agR4rcp9aMQYUAYsw=";
   };
 in
diff --git a/pkgs/by-name/as/ashuffle/package.nix b/pkgs/by-name/as/ashuffle/package.nix
index 146b55e2223d..e809869b43e6 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XnibLlwUspI2aveWfMg/TOe59vK6Z2WEnF7gafUmx6E=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix
index a9dd759706ad..45c370cd81f2 100644
--- a/pkgs/by-name/as/asm-lsp/package.nix
+++ b/pkgs/by-name/as/asm-lsp/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "bergercookie";
     repo = "asm-lsp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RAyiE+Msmr/Qt5v7rWuUTAji383XLKxeMQJove2b1NE=";
   };
 
diff --git a/pkgs/by-name/as/asmfmt/package.nix b/pkgs/by-name/as/asmfmt/package.nix
index 4f51f3700b8e..598ec7fd563d 100644
--- a/pkgs/by-name/as/asmfmt/package.nix
+++ b/pkgs/by-name/as/asmfmt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "klauspost";
     repo = "asmfmt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc=";
   };
 
diff --git a/pkgs/by-name/as/asn1editor/package.nix b/pkgs/by-name/as/asn1editor/package.nix
index ffe8ce23c6f8..fa6c1c6bee9b 100644
--- a/pkgs/by-name/as/asn1editor/package.nix
+++ b/pkgs/by-name/as/asn1editor/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Futsch1";
     repo = "asn1editor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mgluhC2DMS4OyS/BoWqBdVf7GcxquOtOKTHZ/hbiHQM=";
   };
 
diff --git a/pkgs/by-name/as/asouldocs/package.nix b/pkgs/by-name/as/asouldocs/package.nix
index f0bdd69c7f36..f5392796fdde 100644
--- a/pkgs/by-name/as/asouldocs/package.nix
+++ b/pkgs/by-name/as/asouldocs/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "asoul-sig";
     repo = "asouldocs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ctRE7aF3Qj+fI/m0CuLA6x7E+mY6s1+UfBJI5YFea4g=";
   };
 
diff --git a/pkgs/by-name/as/aspcud/package.nix b/pkgs/by-name/as/aspcud/package.nix
index 1742095c0078..4c72083c2c76 100644
--- a/pkgs/by-name/as/aspcud/package.nix
+++ b/pkgs/by-name/as/aspcud/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "potassco";
     repo = "aspcud";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PdRfpmH7zF5dn+feoijtzdSUjaYhjHwyAUfuYoWCL9E=";
   };
 
diff --git a/pkgs/by-name/as/assaultcube/package.nix b/pkgs/by-name/as/assaultcube/package.nix
index dc1f0f71b602..ec7fc9f43e2f 100644
--- a/pkgs/by-name/as/assaultcube/package.nix
+++ b/pkgs/by-name/as/assaultcube/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "assaultcube";
     repo = "AC";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0qv339zw9q5q1y7bghca03gw7z4v89sl4lbr6h3b7siy08mcwiz9";
   };
 
diff --git a/pkgs/by-name/as/assemblyscript/package.nix b/pkgs/by-name/as/assemblyscript/package.nix
index 2b4bd4e64dc4..cff941fe1413 100644
--- a/pkgs/by-name/as/assemblyscript/package.nix
+++ b/pkgs/by-name/as/assemblyscript/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "AssemblyScript";
     repo = "assemblyscript";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Wop7S7GvvXFcONER+TYIygLkAZpCdhMlPz3hhWSOZro=";
   };
 
diff --git a/pkgs/by-name/as/assetfinder/package.nix b/pkgs/by-name/as/assetfinder/package.nix
index b121093b899d..b27ecc9e1a4b 100644
--- a/pkgs/by-name/as/assetfinder/package.nix
+++ b/pkgs/by-name/as/assetfinder/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "assetfinder";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7+YF1VXBcFehKw9JzurmXNu8yeZPdqfQEuaqwtR4AuA=";
   };
 
diff --git a/pkgs/by-name/as/assh/package.nix b/pkgs/by-name/as/assh/package.nix
index c26b1b3859cd..f66cb33959d8 100644
--- a/pkgs/by-name/as/assh/package.nix
+++ b/pkgs/by-name/as/assh/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "advanced-ssh-config";
     owner = "moul";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rvJJZqVSBdaJ154NV6RaxbymsSsHbKnlJDeR6KHQE7M=";
   };
 
diff --git a/pkgs/by-name/as/assign-lb-ip/package.nix b/pkgs/by-name/as/assign-lb-ip/package.nix
index a8eb225d93b9..f3fa137a6392 100644
--- a/pkgs/by-name/as/assign-lb-ip/package.nix
+++ b/pkgs/by-name/as/assign-lb-ip/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Nordix";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Sfi58wcX61HNCmlDoparTqnfsuxu6barSnV0uYlC+ng=";
   };
 
diff --git a/pkgs/by-name/as/assimp/package.nix b/pkgs/by-name/as/assimp/package.nix
index e37ca11f9a9e..4aaa2ed60876 100644
--- a/pkgs/by-name/as/assimp/package.nix
+++ b/pkgs/by-name/as/assimp/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "assimp";
     repo = "assimp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sOYhYHBz3Tg+pi1OIJ1mGmsjEc6dPO6nFH0aolfpLRA=";
   };
 
diff --git a/pkgs/by-name/as/astartectl/package.nix b/pkgs/by-name/as/astartectl/package.nix
index 1ca3c3ea4e1b..f5c5be3aad9c 100644
--- a/pkgs/by-name/as/astartectl/package.nix
+++ b/pkgs/by-name/as/astartectl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "astarte-platform";
     repo = "astartectl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T4/lkeipE7GWq1zTxkoV3MfADlduFKtGuB/dsI4YZZw=";
   };
 
diff --git a/pkgs/by-name/as/astc-encoder/package.nix b/pkgs/by-name/as/astc-encoder/package.nix
index 33e2f4fa7764..5ea47e927550 100644
--- a/pkgs/by-name/as/astc-encoder/package.nix
+++ b/pkgs/by-name/as/astc-encoder/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ARM-software";
     repo = "astc-encoder";
-    tag = version;
+    rev = version;
     sha256 = "sha256-rCyi5Nla2IXsLD+rLMTN1h3B9umlNN0epZmPi/IFHPQ=";
   };
 
diff --git a/pkgs/by-name/as/asterisk-module-sccp/package.nix b/pkgs/by-name/as/asterisk-module-sccp/package.nix
index 8e7d51adce9b..a81ef23cca00 100644
--- a/pkgs/by-name/as/asterisk-module-sccp/package.nix
+++ b/pkgs/by-name/as/asterisk-module-sccp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chan-sccp";
     repo = "chan-sccp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Lonsh7rx3C17LU5pZpZuFxlki0iotDt+FivggFJbldU=";
   };
 
diff --git a/pkgs/by-name/as/astromenace/package.nix b/pkgs/by-name/as/astromenace/package.nix
index b9e7837ac85b..d59a9d6f0c9e 100644
--- a/pkgs/by-name/as/astromenace/package.nix
+++ b/pkgs/by-name/as/astromenace/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "viewizard";
     repo = "astromenace";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W6d+8iw7/r2qJbE75U7egxqvK2HXaKzk+GtnspZRAxk=";
   };
 
diff --git a/pkgs/by-name/as/astronomer/package.nix b/pkgs/by-name/as/astronomer/package.nix
index 2fe1cebfe134..7df5c42af4e4 100644
--- a/pkgs/by-name/as/astronomer/package.nix
+++ b/pkgs/by-name/as/astronomer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Ullaakut";
     repo = "astronomer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4hUfJI2BRZl3Trk8F2qLZAyA57kq0oW9/e13atj/BVg=";
   };
 
diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix
index 1b3cd702ff2e..e82ebcd62f22 100644
--- a/pkgs/by-name/as/async-profiler/package.nix
+++ b/pkgs/by-name/as/async-profiler/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jvm-profiling-tools";
     repo = "async-profiler";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0CCJoRjRLq4LpiRD0ibzK8So9qSQymePCTYUI60Oy2k=";
   };
 
diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix
index a51fe88db7c1..fd17a1e8b909 100644
--- a/pkgs/by-name/at/atac/package.nix
+++ b/pkgs/by-name/at/atac/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Julien-cpsn";
     repo = "ATAC";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7y4DDoGguHfU4JxnMyRmjrqJ4gg76C9WSmZ8ey+Mitg=";
   };
 
diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix
index 828cf50e22f3..f4aa1ef22121 100644
--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gomods";
     repo = "athens";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6NBdif8rQ1aj4nTYXhrWyErzRv0q8WpIheRnb2FCnkU=";
   };
 
diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix
index 5d35bde41309..170208d48855 100644
--- a/pkgs/by-name/at/atlantis/package.nix
+++ b/pkgs/by-name/at/atlantis/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "runatlantis";
     repo = "atlantis";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6/e3h4et5xzo0Eoh5I90FW9drOUSut1Wz7MgTSlVXGk=";
   };
   ldflags = [
diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix
index 32d04b18539d..e91e6feea075 100644
--- a/pkgs/by-name/at/atlas/package.nix
+++ b/pkgs/by-name/at/atlas/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ariga";
     repo = "atlas";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iM+Qy8tQAjonXpt36WWIEIAmtqnR0wWtMMxIh76Fv0U=";
   };
 
diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix
index d1748e24dd18..f4f5ac70cf52 100644
--- a/pkgs/by-name/at/atmos/package.nix
+++ b/pkgs/by-name/at/atmos/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudposse";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-shhkaPYU1N3Q7eu8CyZXYrR11kxb+r9II4lpfRWTOas=";
   };
 
diff --git a/pkgs/by-name/at/atomic-operator/package.nix b/pkgs/by-name/at/atomic-operator/package.nix
index 5e262aee43a4..89d7e6840451 100644
--- a/pkgs/by-name/at/atomic-operator/package.nix
+++ b/pkgs/by-name/at/atomic-operator/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "swimlane";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-DyNqu3vndyLkmfybCfTbgxk3t/ALg7IAkAMg4kBkH7Q=";
   };
 
diff --git a/pkgs/by-name/at/atomic-swap/package.nix b/pkgs/by-name/at/atomic-swap/package.nix
index 88af744d0647..5267433fcf69 100644
--- a/pkgs/by-name/at/atomic-swap/package.nix
+++ b/pkgs/by-name/at/atomic-swap/package.nix
@@ -17,7 +17,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "AthanorLabs";
     repo = "atomic-swap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MOylUZ6BrvlxUrsZ5gg3JzW9ROG5UXeGhq3YoPZKdHs=";
   };
 
diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index 46213e6ddc84..0de5a7b65d14 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "atuinsh";
     repo = "atuin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P/q4XYhpXo9kwiltA0F+rQNSlqI+s8TSi5v5lFJWJ/4=";
   };
 
diff --git a/pkgs/by-name/au/audio-sharing/package.nix b/pkgs/by-name/au/audio-sharing/package.nix
index a4314ba3df72..955d8ad736e3 100644
--- a/pkgs/by-name/au/audio-sharing/package.nix
+++ b/pkgs/by-name/au/audio-sharing/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "AudioSharing";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-yUMiy5DaCPfCmBIGCXpqtvSSmQl5wo6vsLdW7Tt/Wfo=";
   };
 
diff --git a/pkgs/by-name/au/audiowaveform/package.nix b/pkgs/by-name/au/audiowaveform/package.nix
index 405baa28b1c4..2d5d23cb35bb 100644
--- a/pkgs/by-name/au/audiowaveform/package.nix
+++ b/pkgs/by-name/au/audiowaveform/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bbc";
     repo = "audiowaveform";
-    tag = version;
+    rev = version;
     sha256 = "sha256-FcQq0xWs3jH2MfhFQ5r5Vaz8B3akBHBSg8Z/k9An/Wg=";
   };
 
diff --git a/pkgs/by-name/au/augustus/package.nix b/pkgs/by-name/au/augustus/package.nix
index cf054280d1e8..e2aa70b1694f 100644
--- a/pkgs/by-name/au/augustus/package.nix
+++ b/pkgs/by-name/au/augustus/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Keriew";
     repo = "augustus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UWJmxirRJJqvL4ZSjBvFepeKVvL77+WMp4YdZuFNEkg=";
   };
 
diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index c0d6f2a4ba50..86c096f829ed 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -178,7 +178,7 @@ let
         src = fetchFromGitHub {
           owner = "encode";
           repo = "django-rest-framework";
-          tag = version;
+          rev = version;
           hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4=";
         };
 
diff --git a/pkgs/by-name/au/authz0/package.nix b/pkgs/by-name/au/authz0/package.nix
index e6fada631e37..fa500b9b8064 100644
--- a/pkgs/by-name/au/authz0/package.nix
+++ b/pkgs/by-name/au/authz0/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hahwul";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NrArxuhzd57NIdM4d9p/wfCB1e6l83pV+cjjCgZ9YtM=";
   };
 
diff --git a/pkgs/by-name/au/autokey/package.nix b/pkgs/by-name/au/autokey/package.nix
index 799e1542bec8..9e2b40106a22 100644
--- a/pkgs/by-name/au/autokey/package.nix
+++ b/pkgs/by-name/au/autokey/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "autokey";
     repo = "autokey";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-d1WJLqkdC7QgzuYdnxYhajD3DtCpgceWCAxGrk0KKew=";
   };
 
diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index 7a2b8f33bf71..8347e677dced 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = "automatic-timezoned";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-j7wQ7jUiXpiDdGBDSiGkIcnnrwkJZESiwB4yqxp0moU=";
   };
 
diff --git a/pkgs/by-name/au/automaticcomponenttoolkit/package.nix b/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
index fb8abce7a854..ab3dd790aa06 100644
--- a/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
+++ b/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Autodesk";
     repo = "AutomaticComponentToolkit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1r0sbw82cf9dbcj3vgnbd4sc1lklzvijic2z5wgkvs21azcm0yzh";
   };
 
diff --git a/pkgs/by-name/au/automirror/package.nix b/pkgs/by-name/au/automirror/package.nix
index f6b334fd0359..8d8376542d28 100644
--- a/pkgs/by-name/au/automirror/package.nix
+++ b/pkgs/by-name/au/automirror/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "schlomo";
     repo = "automirror";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1syyf7dcm8fbyw31cpgmacg80h7pg036dayaaf0svvdsk0hqlsch";
   };
 
diff --git a/pkgs/by-name/au/automysqlbackup/package.nix b/pkgs/by-name/au/automysqlbackup/package.nix
index da92e32ccfb2..24f8dea0e6cd 100644
--- a/pkgs/by-name/au/automysqlbackup/package.nix
+++ b/pkgs/by-name/au/automysqlbackup/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sixhop";
     repo = "automysqlbackup";
-    tag = version;
+    rev = version;
     sha256 = "sha256-C0p1AY4yIxybQ6a/HsE3ZTHumtvQw5kKM51Ap+Se0ZI=";
   };
 
diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix
index 9d5b9cbe8665..3713dd359c3d 100644
--- a/pkgs/by-name/au/autoprefixer/package.nix
+++ b/pkgs/by-name/au/autoprefixer/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "postcss";
     repo = "autoprefixer";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-25FVNUXMEuzPJtpld/GHEppspa2ns7fAuniBCltSync=";
   };
 
diff --git a/pkgs/by-name/au/autoraise/package.nix b/pkgs/by-name/au/autoraise/package.nix
index 8a31a54e7f98..9f0f1a19aa86 100644
--- a/pkgs/by-name/au/autoraise/package.nix
+++ b/pkgs/by-name/au/autoraise/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sbmpost";
     repo = "AutoRaise";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OsvmNHpQ46+cWkR4Nz/9oIgSFSWLfCwZnAnRKRiNm5E=";
   };
 
diff --git a/pkgs/by-name/au/autorestic/package.nix b/pkgs/by-name/au/autorestic/package.nix
index 31f322ef7b0e..4df100e0bfaf 100644
--- a/pkgs/by-name/au/autorestic/package.nix
+++ b/pkgs/by-name/au/autorestic/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cupcakearmy";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rladzcW6l5eR6ICj4kKd4e2R9vRIV/1enCzHLFdQDlk=";
   };
 
diff --git a/pkgs/by-name/au/autotiling-rs/package.nix b/pkgs/by-name/au/autotiling-rs/package.nix
index 8a28c960559e..93547ad1bc41 100644
--- a/pkgs/by-name/au/autotiling-rs/package.nix
+++ b/pkgs/by-name/au/autotiling-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ammgws";
     repo = "autotiling-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LQbmF2M6pWa0QEbKF770x8TFLMGrJeq5HnXHvLrDDPA=";
   };
 
diff --git a/pkgs/by-name/au/autotrace/package.nix b/pkgs/by-name/au/autotrace/package.nix
index 983a215a4697..40be3cef2fa8 100644
--- a/pkgs/by-name/au/autotrace/package.nix
+++ b/pkgs/by-name/au/autotrace/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "autotrace";
     repo = "autotrace";
-    tag = version;
+    rev = version;
     hash = "sha256-8qqB6oKmbz95dNLtdLvb69cEj/P7TzdoKEyJ8+4ITzs=";
   };
 
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 006194e38158..3bea156c1c91 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation (
       src = fetchFromGitHub {
         owner = "AvaloniaUI";
         repo = "Avalonia";
-        tag = version;
+        rev = version;
         fetchSubmodules = true;
         hash = "sha256-Du8DEsZKl7rnVH9YZKAWTCpEQ/5HrNlgacgK/46kx/o=";
       };
diff --git a/pkgs/by-name/av/aviator/package.nix b/pkgs/by-name/av/aviator/package.nix
index 12bb580c456b..17b7a7d2e7cf 100644
--- a/pkgs/by-name/av/aviator/package.nix
+++ b/pkgs/by-name/av/aviator/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "herrjulz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Oa4z8n+q7LKWMnwk+xj9UunzOa3ChaPBCTo828yYJGQ=";
   };
 
diff --git a/pkgs/by-name/av/avizo/package.nix b/pkgs/by-name/av/avizo/package.nix
index 606b0f1870d3..47a44f05aa73 100644
--- a/pkgs/by-name/av/avizo/package.nix
+++ b/pkgs/by-name/av/avizo/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "misterdanb";
     repo = "avizo";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Vj8OrNlAstl0AXTeVAPdEf5JgnAmJwl9s3Jdc0ZiYQc=";
   };
 
diff --git a/pkgs/by-name/av/avra/package.nix b/pkgs/by-name/av/avra/package.nix
index 61f106ce8517..1d7c1556380a 100644
--- a/pkgs/by-name/av/avra/package.nix
+++ b/pkgs/by-name/av/avra/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ro5bert";
     repo = "avra";
-    tag = version;
+    rev = version;
     hash = "sha256-joOj89WZ9Si5fcu1w1VHj5fOcnB9N2313Yb29A+nCCY=";
   };
 
diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix
index 29fefa700f39..5f412c36b8e6 100644
--- a/pkgs/by-name/aw/await/package.nix
+++ b/pkgs/by-name/aw/await/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "slavaGanzin";
     repo = "await";
-    tag = version;
+    rev = version;
     hash = "sha256-Yrit1WdWIfjwqbjvyjrPT3EqSSkooYX+uoOstbxy//I=";
   };
 
diff --git a/pkgs/by-name/aw/awatcher/package.nix b/pkgs/by-name/aw/awatcher/package.nix
index 3961efc6f8bc..9dd509ecdf28 100644
--- a/pkgs/by-name/aw/awatcher/package.nix
+++ b/pkgs/by-name/aw/awatcher/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "2e3s";
     repo = "awatcher";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bxFc6oM+evIQTjrsWmb7dXOUlSjurjc4CzHpxB+667c=";
   };
 
diff --git a/pkgs/by-name/aw/awf/package.nix b/pkgs/by-name/aw/awf/package.nix
index 9560ed02e71b..9423dda218c6 100644
--- a/pkgs/by-name/aw/awf/package.nix
+++ b/pkgs/by-name/aw/awf/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "valr";
     repo = "awf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-auth/package.nix b/pkgs/by-name/aw/aws-c-auth/package.nix
index 010b19a650e4..d915ec34e562 100644
--- a/pkgs/by-name/aw/aws-c-auth/package.nix
+++ b/pkgs/by-name/aw/aws-c-auth/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-auth";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-p8D79BRjaPlhzap/FWbqMlkrbVELSgeJW8CljxBAaCI=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-common/package.nix b/pkgs/by-name/aw/aws-c-common/package.nix
index 190009747a84..2c33c7f38b49 100644
--- a/pkgs/by-name/aw/aws-c-common/package.nix
+++ b/pkgs/by-name/aw/aws-c-common/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-common";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sA6CsLLHh4Ce/+ffl4OhisMSgdrD+EmXvTNGSq7/vvk=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-compression/package.nix b/pkgs/by-name/aw/aws-c-compression/package.nix
index a593fc2ef4a7..dfd3f53b2935 100644
--- a/pkgs/by-name/aw/aws-c-compression/package.nix
+++ b/pkgs/by-name/aw/aws-c-compression/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-compression";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-EjvOf2UMju6pycPdYckVxqQ34VOhrIIyvK+O3AVRED4=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-event-stream/package.nix b/pkgs/by-name/aw/aws-c-event-stream/package.nix
index 5a291f643fc5..24ad66a12d85 100644
--- a/pkgs/by-name/aw/aws-c-event-stream/package.nix
+++ b/pkgs/by-name/aw/aws-c-event-stream/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-event-stream";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lg1qS/u5Fi8nt/tv2ekd8dgQ7rlrF3DrRxqidAoEywY=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-http/package.nix b/pkgs/by-name/aw/aws-c-http/package.nix
index d0a5641a5982..37a52c7c985f 100644
--- a/pkgs/by-name/aw/aws-c-http/package.nix
+++ b/pkgs/by-name/aw/aws-c-http/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-http";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3nT64dFUcuwPfhQDwY5MTe/xPdr7XZMBpVL7V0y9tng=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-mqtt/package.nix b/pkgs/by-name/aw/aws-c-mqtt/package.nix
index ff78ffac13b6..1734aea049ad 100644
--- a/pkgs/by-name/aw/aws-c-mqtt/package.nix
+++ b/pkgs/by-name/aw/aws-c-mqtt/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-mqtt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gIoC3OG6VFzNH9/DjuC42eCIuN+w1AikaGAbx6ao8qQ=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-s3/package.nix b/pkgs/by-name/aw/aws-c-s3/package.nix
index 0faf13d738c4..0282ca459b94 100644
--- a/pkgs/by-name/aw/aws-c-s3/package.nix
+++ b/pkgs/by-name/aw/aws-c-s3/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-s3";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UE42U3UszobaUdo0ry9IlwTbSbGqmYkux19ILrVgUZY=";
   };
 
diff --git a/pkgs/by-name/aw/aws-c-sdkutils/package.nix b/pkgs/by-name/aw/aws-c-sdkutils/package.nix
index 82b39fbd5c0d..2de7db683f34 100644
--- a/pkgs/by-name/aw/aws-c-sdkutils/package.nix
+++ b/pkgs/by-name/aw/aws-c-sdkutils/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-sdkutils";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Z9c+uBiGMXW5v+khdNaElhno16ikBO4voTzwd2mP6rA=";
   };
 
diff --git a/pkgs/by-name/aw/aws-checksums/package.nix b/pkgs/by-name/aw/aws-checksums/package.nix
index ec6d606be2ad..6e1645620942 100644
--- a/pkgs/by-name/aw/aws-checksums/package.nix
+++ b/pkgs/by-name/aw/aws-checksums/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-checksums";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hiqV6FrOZ19YIxL3UKBuexLJwoC2mY7lqysnV7ze0gg=";
   };
 
diff --git a/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix b/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
index d1acec866719..423e02117daf 100644
--- a/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
+++ b/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sktan";
     repo = "aws-codeartifact-proxy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+P0AIg5m7nePy+Yd445nVfLVxya80Om9lJTPKZeTshc=";
   };
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/by-name/aw/aws-crt-cpp/package.nix b/pkgs/by-name/aw/aws-crt-cpp/package.nix
index 1404d5b2851c..3cf463a5fdf1 100644
--- a/pkgs/by-name/aw/aws-crt-cpp/package.nix
+++ b/pkgs/by-name/aw/aws-crt-cpp/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-crt-cpp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Uv1BHM39f9soq7kziedqRhHqQ/xwnqcz++1UM5nuo8g=";
   };
 
diff --git a/pkgs/by-name/aw/aws-gate/package.nix b/pkgs/by-name/aw/aws-gate/package.nix
index 51822e511954..b7282325d761 100644
--- a/pkgs/by-name/aw/aws-gate/package.nix
+++ b/pkgs/by-name/aw/aws-gate/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xen0l";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-9w2jP4s1HXf1gYiXX05Dt2iXt0bR0U48yc8h9T5M+EQ=";
   };
 
diff --git a/pkgs/by-name/aw/aws-lambda-rie/package.nix b/pkgs/by-name/aw/aws-lambda-rie/package.nix
index 028577305fcb..a259673271c9 100644
--- a/pkgs/by-name/aw/aws-lambda-rie/package.nix
+++ b/pkgs/by-name/aw/aws-lambda-rie/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-lambda-runtime-interface-emulator";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zbeaWbvWk3duBfdUb70G/O4gO20NSHiwuTUZjtGlM3Q=";
   };
 
diff --git a/pkgs/by-name/aw/aws-rotate-key/package.nix b/pkgs/by-name/aw/aws-rotate-key/package.nix
index 248fab061641..b75901f3b0dc 100644
--- a/pkgs/by-name/aw/aws-rotate-key/package.nix
+++ b/pkgs/by-name/aw/aws-rotate-key/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Fullscreen";
     repo = "aws-rotate-key";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fYpgHHOw0k/8WLGhq+uVOvoF4Wff6wzTXuN8r4D+TmU=";
   };
 
diff --git a/pkgs/by-name/aw/aws-signing-helper/package.nix b/pkgs/by-name/aw/aws-signing-helper/package.nix
index 7caa586ed600..3b9ee9e1b363 100644
--- a/pkgs/by-name/aw/aws-signing-helper/package.nix
+++ b/pkgs/by-name/aw/aws-signing-helper/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "rolesanywhere-credential-helper";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CIUhO+5gMIknB3NwYwaBbtZEkW2x/U2Bi9Qbqn9bLuc=";
   };
   vendorHash = "sha256-QKKgBIocJoGbfs78PxNBLBi4KTDPtSuhzvsb6OBhNWQ=";
diff --git a/pkgs/by-name/aw/aws-sso-cli/package.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix
index b473b3b877b4..99412edca5e0 100644
--- a/pkgs/by-name/aw/aws-sso-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sso-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "synfinatic";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VEI+vCNeNoFOE+2j/OUjRszXsUQP2E1iUdPUW9X3tHk=";
   };
   vendorHash = "sha256-a57RtK8PxwaRrSA6W6R//GacZ+pK8mBi4ZASS5NvShE=";
diff --git a/pkgs/by-name/aw/aws-sso-creds/package.nix b/pkgs/by-name/aw/aws-sso-creds/package.nix
index a4533dbc4074..3a7a5f115f67 100644
--- a/pkgs/by-name/aw/aws-sso-creds/package.nix
+++ b/pkgs/by-name/aw/aws-sso-creds/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jaxxstorm";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QYE+HvvBEWPxopVP8QMqb4lNRyAtVDewuiWzja9XdM4=";
   };
   vendorHash = "sha256-2EDpyw7Mqhvc0i6+UjWfNlvndRYJDaezRkOy9PBeD1Y=";
diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index c1c0bae1a601..bd08e2269a09 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "99designs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Qs4vxFgehWQYYECBGBSU8YI/BHLwOQUO5wBlNEUzD7c=";
   };
 
diff --git a/pkgs/by-name/aw/awsbck/package.nix b/pkgs/by-name/aw/awsbck/package.nix
index 0cd7179f7c7f..b43f46683510 100644
--- a/pkgs/by-name/aw/awsbck/package.nix
+++ b/pkgs/by-name/aw/awsbck/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "beeb";
     repo = "awsbck";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-C5QaOxZ9DQuda+slf8uqPQYVgDtS5Lhm3AFn8K2G/T4=";
   };
 
diff --git a/pkgs/by-name/aw/awslogs/package.nix b/pkgs/by-name/aw/awslogs/package.nix
index 93ba02e9f1fa..e90da6b3fee4 100644
--- a/pkgs/by-name/aw/awslogs/package.nix
+++ b/pkgs/by-name/aw/awslogs/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jorgebastida";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-o6xZqwlqAy01P+TZ0rB5rpEddWNUBzzHp7/cycpcwes=";
   };
 
diff --git a/pkgs/by-name/aw/awsls/package.nix b/pkgs/by-name/aw/awsls/package.nix
index 94ef12ea71c3..4ea289d01b55 100644
--- a/pkgs/by-name/aw/awsls/package.nix
+++ b/pkgs/by-name/aw/awsls/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jckuester";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-iy9tohmVUtNXYVfe6pZ+pbbLlcK6Fu1GgzTWMD+3xP0=";
   };
 
diff --git a/pkgs/by-name/aw/awsrm/package.nix b/pkgs/by-name/aw/awsrm/package.nix
index a9a9ffb01496..20d0e120ed43 100644
--- a/pkgs/by-name/aw/awsrm/package.nix
+++ b/pkgs/by-name/aw/awsrm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jckuester";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KAujqYDtZbCBRO5WK9b9mxqe84ZllbBoO2tLnDH/bdo=";
   };
 
diff --git a/pkgs/by-name/aw/awsweeper/package.nix b/pkgs/by-name/aw/awsweeper/package.nix
index 8e41ee296cdd..2a37ef68238e 100644
--- a/pkgs/by-name/aw/awsweeper/package.nix
+++ b/pkgs/by-name/aw/awsweeper/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jckuester";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5D/4Z8ADlA+4+2EINmP5OfX5exzhfbq2TydPRlJDA6Y=";
   };
 
diff --git a/pkgs/by-name/ax/axmldec/package.nix b/pkgs/by-name/ax/axmldec/package.nix
index 6bc4a94e4d5d..7d8fba5a6d0d 100644
--- a/pkgs/by-name/ax/axmldec/package.nix
+++ b/pkgs/by-name/ax/axmldec/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ytsutano";
     repo = "axmldec";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-LFDZZbRDa8mQmglgS4DA/OqXp0HJZ2uqg1hbStdgvUw=";
   };
diff --git a/pkgs/by-name/ay/ayatana-ido/package.nix b/pkgs/by-name/ay/ayatana-ido/package.nix
index 1639e1dbfe6e..904788c65c51 100644
--- a/pkgs/by-name/ay/ayatana-ido/package.nix
+++ b/pkgs/by-name/ay/ayatana-ido/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-ido";
-    tag = version;
+    rev = version;
     sha256 = "sha256-KeErrT2umMaIVfLDr4CcQCmFrMb8/h6pNYbunuC/JtI=";
   };
 
diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix
index 8c25649b146a..98680949229f 100644
--- a/pkgs/by-name/az/azimuth/package.nix
+++ b/pkgs/by-name/az/azimuth/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mdsteele";
     repo = "azimuth";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1znfvpmqiixd977jv748glk5zc4cmhw5813zp81waj07r9b0828r";
   };
 
diff --git a/pkgs/by-name/az/azpainter/package.nix b/pkgs/by-name/az/azpainter/package.nix
index d6191bd97634..256f18b8a7e4 100644
--- a/pkgs/by-name/az/azpainter/package.nix
+++ b/pkgs/by-name/az/azpainter/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "azelpg";
     repo = "azpainter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5rNLGF/mkW+rBH9vuIPCJHciyf4NhG17Es+X6l4xIoQ=";
   };
 
diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/package.nix b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix
index 492ae4366e17..fa7bf76cc32f 100644
--- a/pkgs/by-name/az/azure-artifacts-credprovider/package.nix
+++ b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix
@@ -11,7 +11,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "artifacts-credprovider";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JbcoDs4c/+uKIgVWZkuo4jqd1hlqe+H949jNfkDwZls=";
   };
   pname = "azure-artifacts-credprovider";
diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix
index 4defed9758d5..1e0fdda3c287 100644
--- a/pkgs/by-name/az/azurite/package.nix
+++ b/pkgs/by-name/az/azurite/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "Azurite";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aH9FAT49y4k87lzerQdgLqi+ZlucORQX4w1NBFtEfMw=";
   };
 
diff --git a/pkgs/by-name/b6/b612/package.nix b/pkgs/by-name/b6/b612/package.nix
index 77e0b38f3c1b..1fee278400e5 100644
--- a/pkgs/by-name/b6/b612/package.nix
+++ b/pkgs/by-name/b6/b612/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "polarsys";
     repo = "b612";
-    tag = version;
+    rev = version;
     hash = "sha256-uyBC8UNOwztCHXhR9XZuWDwrty0eClbo0E+gI1PmjEg=";
   };
 
diff --git a/pkgs/by-name/ba/babeltrace2/package.nix b/pkgs/by-name/ba/babeltrace2/package.nix
index be77bf5922f0..ec9f15e679f8 100644
--- a/pkgs/by-name/ba/babeltrace2/package.nix
+++ b/pkgs/by-name/ba/babeltrace2/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "efficios";
     repo = "babeltrace";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L4YTqPxvWynUBnmAQnlJ2RNbEv9MhBxQOsqbWix8ZwU=";
   };
 
diff --git a/pkgs/by-name/ba/backdown/package.nix b/pkgs/by-name/ba/backdown/package.nix
index c92de1809045..412f7eee97e8 100644
--- a/pkgs/by-name/ba/backdown/package.nix
+++ b/pkgs/by-name/ba/backdown/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "backdown";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3+XmMRZz3SHF1sL+/CUvu4uQ2scE4ACpcC0r4nWhdkM=";
   };
 
diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix
index 0cf81d84679e..1b963d940c7d 100644
--- a/pkgs/by-name/ba/backgroundremover/package.nix
+++ b/pkgs/by-name/ba/backgroundremover/package.nix
@@ -21,7 +21,7 @@ let
     src = fetchFromGitHub {
       owner = "nadermx";
       repo = "backgroundremover";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-tQ8J3xamOzPPSbFMxIDYKv1TzK1AVwF/DWXdZlrlYvM=";
     };
 
diff --git a/pkgs/by-name/ba/backlight-auto/package.nix b/pkgs/by-name/ba/backlight-auto/package.nix
index 6b77230e2a42..3d8dc7338a9c 100644
--- a/pkgs/by-name/ba/backlight-auto/package.nix
+++ b/pkgs/by-name/ba/backlight-auto/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lf94";
     repo = "backlight-auto";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-QPymwlDrgKM/SXDzJdmfzWLSLU2D7egif1OIUE+SHoI=";
   };
 
diff --git a/pkgs/by-name/ba/backward-cpp/package.nix b/pkgs/by-name/ba/backward-cpp/package.nix
index 878e8ae9304a..84e877ec9642 100644
--- a/pkgs/by-name/ba/backward-cpp/package.nix
+++ b/pkgs/by-name/ba/backward-cpp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bombela";
     repo = "backward-cpp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw=";
   };
 
diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix
index cd7975c71b9a..9dc855b9ded8 100644
--- a/pkgs/by-name/ba/badger/package.nix
+++ b/pkgs/by-name/ba/badger/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "badger";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W3vPTLGI7YT7dFklJnOcpfYqQ9aBCsel9L6q4WNincY=";
   };
 
diff --git a/pkgs/by-name/ba/badrobot/package.nix b/pkgs/by-name/ba/badrobot/package.nix
index d90d91469108..b43b46894d58 100644
--- a/pkgs/by-name/ba/badrobot/package.nix
+++ b/pkgs/by-name/ba/badrobot/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "controlplaneio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-U3b5Xw+GjnAEXteivztHdcAcXx7DYtgaUbW5oax0mIk=";
   };
   vendorHash = "sha256-oYdkCEdrw1eE5tnKveeJM3upRy8hOVc24JNN1bLX+ec=";
diff --git a/pkgs/by-name/ba/badvpn/package.nix b/pkgs/by-name/ba/badvpn/package.nix
index 9f3372510b09..d5fc259f1904 100644
--- a/pkgs/by-name/ba/badvpn/package.nix
+++ b/pkgs/by-name/ba/badvpn/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ambrop72";
     repo = "badvpn";
-    tag = version;
+    rev = version;
     sha256 = "sha256-bLTDpq3ohUP+KooPvhv1/AZfdo0HwB3g9QOuE2E/pmY=";
   };
 
diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix
index d110f779944b..02cf013e0635 100644
--- a/pkgs/by-name/ba/baidupcs-go/package.nix
+++ b/pkgs/by-name/ba/baidupcs-go/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "qjfoidnh";
     repo = "BaiduPCS-Go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-C88q2tNNuX+tIvYKHbRE76xfPe81UHqfezyRXzrxzlc=";
   };
 
diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index 25116735b3e1..2672e0fb03db 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -27,7 +27,7 @@ buildNpmPackage' rec {
   src = fetchFromGitHub {
     owner = "balena-io";
     repo = "balena-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-44r0dbcX/KRmfucNy4p/OMrKFC2J8P9eQpwTOTOmwS4=";
   };
 
diff --git a/pkgs/by-name/ba/balls/package.nix b/pkgs/by-name/ba/balls/package.nix
index 7a0cba8ff0ca..04f6d701bb0f 100644
--- a/pkgs/by-name/ba/balls/package.nix
+++ b/pkgs/by-name/ba/balls/package.nix
@@ -13,7 +13,7 @@ buildNimPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "disruptek";
     repo = "balls";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-CMYkMkekVI0C1WUds+KBbRfjMte42kBAB2ddtQp8d+k=";
   };
 
diff --git a/pkgs/by-name/ba/bam/package.nix b/pkgs/by-name/ba/bam/package.nix
index b4c0c0fc2a2d..21493a5530b1 100644
--- a/pkgs/by-name/ba/bam/package.nix
+++ b/pkgs/by-name/ba/bam/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matricks";
     repo = "bam";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6";
   };
 
diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index ac83ba7fbf2c..69290e946837 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bambulab";
     repo = "BambuStudio";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LvAi3I5lnnumhOUagyej28uVy0Lgd3e19HNQXOUWSvQ=";
   };
 
diff --git a/pkgs/by-name/ba/bamf/package.nix b/pkgs/by-name/ba/bamf/package.nix
index 9b29908bf13f..d79106094b6d 100644
--- a/pkgs/by-name/ba/bamf/package.nix
+++ b/pkgs/by-name/ba/bamf/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.launchpad.net/~unity-team/bamf";
-    tag = version;
+    rev = version;
     sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ=";
   };
 
diff --git a/pkgs/by-name/ba/bandwhich/package.nix b/pkgs/by-name/ba/bandwhich/package.nix
index 6649de803055..65a9950e3061 100644
--- a/pkgs/by-name/ba/bandwhich/package.nix
+++ b/pkgs/by-name/ba/bandwhich/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "imsnif";
     repo = "bandwhich";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gXPX5drVXsfkssPMdhqIpFsYNSbelE9mKwO+nGEy4Qs=";
   };
 
diff --git a/pkgs/by-name/ba/bankstown-lv2/package.nix b/pkgs/by-name/ba/bankstown-lv2/package.nix
index 31a320167a27..4ae21dc9ea9b 100644
--- a/pkgs/by-name/ba/bankstown-lv2/package.nix
+++ b/pkgs/by-name/ba/bankstown-lv2/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chadmed";
     repo = "bankstown";
-    tag = version;
+    rev = version;
     hash = "sha256-IThXEY+mvT2MCw0PSWU/182xbUafd6dtm6hNjieLlKg=";
   };
 
diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix
index 5cc2d39e6f06..93e6de1921e6 100644
--- a/pkgs/by-name/ba/bant/package.nix
+++ b/pkgs/by-name/ba/bant/package.nix
@@ -25,7 +25,7 @@ buildBazelPackage rec {
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "bant";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Qq35WhRFpmQwWPupcjnUo/SEFRSRynVIx+PiHEsGED8=";
   };
 
diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix
index 86b20dbc246a..b0d677f0310d 100644
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "baresip";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo=";
   };
   prePatch =
diff --git a/pkgs/by-name/ba/bartib/package.nix b/pkgs/by-name/ba/bartib/package.nix
index 5f88bf20b107..11c27676d2ba 100644
--- a/pkgs/by-name/ba/bartib/package.nix
+++ b/pkgs/by-name/ba/bartib/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nikolassv";
     repo = "bartib";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eVLacxKD8seD8mxVN1D3HhKZkIDXsEsSisZnFbmhpSk=";
   };
 
diff --git a/pkgs/by-name/ba/base16-universal-manager/package.nix b/pkgs/by-name/ba/base16-universal-manager/package.nix
index eeb5fad6d0d3..8918ddd20f31 100644
--- a/pkgs/by-name/ba/base16-universal-manager/package.nix
+++ b/pkgs/by-name/ba/base16-universal-manager/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pinpox";
     repo = "base16-universal-manager";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9KflJ863j0VeOyu6j6O28VafetRrM8FW818qCvqhaoY=";
   };
 
diff --git a/pkgs/by-name/ba/base16384/package.nix b/pkgs/by-name/ba/base16384/package.nix
index 3612ceed31ee..b5d004c7d71d 100644
--- a/pkgs/by-name/ba/base16384/package.nix
+++ b/pkgs/by-name/ba/base16384/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fumiama";
     repo = "base16384";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2HZeom+8eEH4CrphCoOV+wJbqhYKVUcAQrYLyEVACkQ=";
   };
 
diff --git a/pkgs/by-name/ba/bash-env-json/package.nix b/pkgs/by-name/ba/bash-env-json/package.nix
index ec901aea6b4f..cf1c63ad2518 100644
--- a/pkgs/by-name/ba/bash-env-json/package.nix
+++ b/pkgs/by-name/ba/bash-env-json/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tesujimath";
     repo = "bash-env-json";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-gyqj5r11DOfXd23LT7qwRLEoWvpHUbxbd28QJnlWTaQ=";
   };
 
diff --git a/pkgs/by-name/ba/bash-preexec/package.nix b/pkgs/by-name/ba/bash-preexec/package.nix
index 52a3fe370597..74c76239599d 100644
--- a/pkgs/by-name/ba/bash-preexec/package.nix
+++ b/pkgs/by-name/ba/bash-preexec/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "rcaloras";
     repo = "bash-preexec";
-    tag = version;
+    rev = version;
     sha256 = "sha256-+FU5n7EkY78X5nUiW3WN9+6Bf6oiPjsG2MSRCleooFs=";
   };
 
diff --git a/pkgs/by-name/ba/bashSnippets/package.nix b/pkgs/by-name/ba/bashSnippets/package.nix
index 1c529322e923..0dc28d54d75a 100644
--- a/pkgs/by-name/ba/bashSnippets/package.nix
+++ b/pkgs/by-name/ba/bashSnippets/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "alexanderepstein";
     repo = "Bash-Snippets";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "044nxgd3ic2qr6hgq5nymn3dyf5i4s8mv5z4az6jvwlrjnvbg8cp";
   };
 
diff --git a/pkgs/by-name/ba/bash_unit/package.nix b/pkgs/by-name/ba/bash_unit/package.nix
index b127eee37980..f50f0bc9bfa1 100644
--- a/pkgs/by-name/ba/bash_unit/package.nix
+++ b/pkgs/by-name/ba/bash_unit/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pgrange";
     repo = "bash_unit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-n5ehN7NrWID72xP7EYOk/mpnQJaDn71esIugWrLbZr0=";
   };
 
diff --git a/pkgs/by-name/ba/bashcards/package.nix b/pkgs/by-name/ba/bashcards/package.nix
index 4d6a2114d1bc..bf0f03f9a80e 100644
--- a/pkgs/by-name/ba/bashcards/package.nix
+++ b/pkgs/by-name/ba/bashcards/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rpearce";
     repo = "bashcards";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1rpqrh0022sbrjvd55a0jvpdqhhka5msf8dsz6adbbmxy3xzgdid";
   };
 
diff --git a/pkgs/by-name/ba/bashmount/package.nix b/pkgs/by-name/ba/bashmount/package.nix
index da584d14f5e0..915d09a2c5cf 100644
--- a/pkgs/by-name/ba/bashmount/package.nix
+++ b/pkgs/by-name/ba/bashmount/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jamielinux";
     repo = "bashmount";
-    tag = version;
+    rev = version;
     sha256 = "1irw47s6i1qwxd20cymzlfw5sv579cw877l27j3p66qfhgadwxrl";
   };
 
diff --git a/pkgs/by-name/ba/bastet/package.nix b/pkgs/by-name/ba/bastet/package.nix
index 593707065c44..ef77b94218b3 100644
--- a/pkgs/by-name/ba/bastet/package.nix
+++ b/pkgs/by-name/ba/bastet/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fph";
     repo = "bastet";
-    tag = version;
+    rev = version;
     sha256 = "09kamxapm9jw9przpsgjfg33n9k94bccv65w95dakj0br33a75wn";
   };
 
diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix
index d3ea84ce766a..02a542c0f0b0 100644
--- a/pkgs/by-name/ba/bat/package.nix
+++ b/pkgs/by-name/ba/bat/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "bat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-82IhLhw0TdaMh21phBxcUZ5JI5xOXb0DrwnBmPwyfAQ=";
   };
 
diff --git a/pkgs/by-name/ba/bato/package.nix b/pkgs/by-name/ba/bato/package.nix
index cee994e610d1..2c840dd1075a 100644
--- a/pkgs/by-name/ba/bato/package.nix
+++ b/pkgs/by-name/ba/bato/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "doums";
     repo = "bato";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-i2gw8vXiKutq26ACzkVXH3kED7jAngSv2mNo9P3qXnA=";
   };
 
diff --git a/pkgs/by-name/ba/bats/package.nix b/pkgs/by-name/ba/bats/package.nix
index fcfbfb2097fd..91683dc96c3f 100644
--- a/pkgs/by-name/ba/bats/package.nix
+++ b/pkgs/by-name/ba/bats/package.nix
@@ -33,7 +33,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bats-core";
     repo = "bats-core";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+qmCeLixfLak09XxgSe6ONcH1IoHGl5Au0s9JyNm95g=";
   };
 
diff --git a/pkgs/by-name/ba/batsignal/package.nix b/pkgs/by-name/ba/batsignal/package.nix
index a3b3cedf19c1..ef6e34c57e8f 100644
--- a/pkgs/by-name/ba/batsignal/package.nix
+++ b/pkgs/by-name/ba/batsignal/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "electrickite";
     repo = "batsignal";
-    tag = version;
+    rev = version;
     sha256 = "sha256-yngd2yP6XtRp8y8ZUd0NISdf8+8wJvpLogrQQMdB0lA=";
   };
 
diff --git a/pkgs/by-name/ba/bazel-buildtools/package.nix b/pkgs/by-name/ba/bazel-buildtools/package.nix
index f9286b2e2c95..4b51c84c5ab6 100644
--- a/pkgs/by-name/ba/bazel-buildtools/package.nix
+++ b/pkgs/by-name/ba/bazel-buildtools/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "buildtools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m1z3i1rddwXZK5VF4qwhaMCS5U3FZ5SawJz/IgdRgdU=";
   };
 
diff --git a/pkgs/by-name/ba/bazel-gazelle/package.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix
index 1230680ec575..5bfcb0b5ad6e 100644
--- a/pkgs/by-name/ba/bazel-gazelle/package.nix
+++ b/pkgs/by-name/ba/bazel-gazelle/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cGRE+AX62U6lZbUEid0QWb9zMTiIemop6Gqrqvz5+nk=";
   };
 
diff --git a/pkgs/by-name/ba/bazel-kazel/package.nix b/pkgs/by-name/ba/bazel-kazel/package.nix
index 2be5b089d82a..9144af8cf614 100644
--- a/pkgs/by-name/ba/bazel-kazel/package.nix
+++ b/pkgs/by-name/ba/bazel-kazel/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "repo-infra";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Y9VOlFrFmJQCQuwf3UztHGuJqmq/lSibTbI3oGjtNuE=";
   };
 
diff --git a/pkgs/by-name/ba/bazel-remote/package.nix b/pkgs/by-name/ba/bazel-remote/package.nix
index 345b4b44ba3e..bfe3fe7b9744 100644
--- a/pkgs/by-name/ba/bazel-remote/package.nix
+++ b/pkgs/by-name/ba/bazel-remote/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buchgr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vNj1w08g7364DcN2reIdamMxKNApKquf/CvFZx3Gu7A=";
   };
 
diff --git a/pkgs/by-name/ba/bazel-watcher/package.nix b/pkgs/by-name/ba/bazel-watcher/package.nix
index 5b3ace88c7dd..a53c794767a0 100644
--- a/pkgs/by-name/ba/bazel-watcher/package.nix
+++ b/pkgs/by-name/ba/bazel-watcher/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "bazel-watcher";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5cRj04e5VVG4NSe4LOLkZIrerT4laLEDeXCqTiJj6MM=";
   };
 
diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix
index 2a202d00810a..85018dfb7ce5 100644
--- a/pkgs/by-name/ba/bazelisk/package.nix
+++ b/pkgs/by-name/ba/bazelisk/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1/J/Y2NlIghxQS/5CnGX+2z+glOeOZVEgSE4KWft9Zw=";
   };
 
diff --git a/pkgs/by-name/bb/bbin/package.nix b/pkgs/by-name/bb/bbin/package.nix
index e52bbb4173ac..f4a69d09e79b 100644
--- a/pkgs/by-name/bb/bbin/package.nix
+++ b/pkgs/by-name/bb/bbin/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "babashka";
     repo = "bbin";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-26uZqHSLi+qnilyPWt/2mCr1wyu1flxNd+jq9zbumrg=";
   };
 
diff --git a/pkgs/by-name/bc/bc-ur/package.nix b/pkgs/by-name/bc/bc-ur/package.nix
index 48e5f8a85f8f..62c7cf0d8a20 100644
--- a/pkgs/by-name/bc/bc-ur/package.nix
+++ b/pkgs/by-name/bc/bc-ur/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BlockchainCommons";
     repo = "bc-ur";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-j7nmAZH1OL7R5H3jqQomg7kwPOvIHMqrfSk7mq/f7Cg=";
   };
 
diff --git a/pkgs/by-name/bc/bcache-tools/package.nix b/pkgs/by-name/bc/bcache-tools/package.nix
index 40bc2e3d2e2d..c070b5c10c94 100644
--- a/pkgs/by-name/bc/bcache-tools/package.nix
+++ b/pkgs/by-name/bc/bcache-tools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "g2p";
     repo = "bcache-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6gy0ymecMgEHXbwp/nXHlrUEeDFnmFXWZZPlzP292g4=";
   };
 
diff --git a/pkgs/by-name/bc/bcal/package.nix b/pkgs/by-name/bc/bcal/package.nix
index 7c3d4a6ed9d3..20e29c252b8c 100644
--- a/pkgs/by-name/bc/bcal/package.nix
+++ b/pkgs/by-name/bc/bcal/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "bcal";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PleWU2yyJzkUAZEvEYoCGdpEXqOgRvZK9zXTYrxRtQU=";
   };
 
diff --git a/pkgs/by-name/bc/bchoppr/package.nix b/pkgs/by-name/bc/bchoppr/package.nix
index 8faf2a6b964c..0d53aec5d6db 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";
-    tag = version;
+    rev = version;
     hash = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/bd/bdf2sfd/package.nix b/pkgs/by-name/bd/bdf2sfd/package.nix
index 6f80caafaa8e..a1aac904fa2a 100644
--- a/pkgs/by-name/bd/bdf2sfd/package.nix
+++ b/pkgs/by-name/bd/bdf2sfd/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcambus";
     repo = "bdf2sfd";
-    tag = version;
+    rev = version;
     sha256 = "sha256-L1fIPZdVP4px73VbnEA6sb28WrmsNUJ2tqLeGPpwDbA=";
   };
 
diff --git a/pkgs/by-name/bd/bdsync/package.nix b/pkgs/by-name/bd/bdsync/package.nix
index 4fd3645f49ed..009bf3b6d855 100644
--- a/pkgs/by-name/bd/bdsync/package.nix
+++ b/pkgs/by-name/bd/bdsync/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rolffokkens";
     repo = "bdsync";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-58yoF6s0WjH+1mTY7X5OX53YgcnDmGxoCR8Kvl6lP+A=";
   };
 
diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix
index 4462285b2c59..aefdee98f3f8 100644
--- a/pkgs/by-name/be/beancount-language-server/package.nix
+++ b/pkgs/by-name/be/beancount-language-server/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "polarmutex";
     repo = "beancount-language-server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aqWenvNAdDL7B7J1hvt+JXT73SJJKu9KFlpUReOp3s4=";
   };
 
diff --git a/pkgs/by-name/be/beanstalkd/package.nix b/pkgs/by-name/be/beanstalkd/package.nix
index 2404dd756fcb..f7cce03717ed 100644
--- a/pkgs/by-name/be/beanstalkd/package.nix
+++ b/pkgs/by-name/be/beanstalkd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kr";
     repo = "beanstalkd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xoudhPad4diGGE8iZaY1/4LiENlKT2dYcIR6wlQdlTU=";
   };
 
diff --git a/pkgs/by-name/be/bear/package.nix b/pkgs/by-name/be/bear/package.nix
index 21888ed4b4f3..5ace2224e728 100644
--- a/pkgs/by-name/be/bear/package.nix
+++ b/pkgs/by-name/be/bear/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rizsotto";
     repo = "bear";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-fWNMjqF5PCjGfFGReKIUiJ5lv8z6j7HeBn5hvbnV2V4=";
   };
 
diff --git a/pkgs/by-name/be/beats/package.nix b/pkgs/by-name/be/beats/package.nix
index 5eeff2287d50..2c21e45952ab 100644
--- a/pkgs/by-name/be/beats/package.nix
+++ b/pkgs/by-name/be/beats/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "j0hax";
     repo = "beats";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1rdvsqrjpily74y8vwch711401585xckb4p41cfwrmj6vf44jhif";
   };
 
diff --git a/pkgs/by-name/be/bedops/package.nix b/pkgs/by-name/be/bedops/package.nix
index 2088cfd9cd4e..70e8a99a7d7a 100644
--- a/pkgs/by-name/be/bedops/package.nix
+++ b/pkgs/by-name/be/bedops/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bedops";
     repo = "bedops";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VJBoi1+tHA4oOVOsClUfimB+mOV5ZSQsDcDq3vAZwBA=";
   };
 
diff --git a/pkgs/by-name/be/bedtools/package.nix b/pkgs/by-name/be/bedtools/package.nix
index bed7dee3e7f9..67ba0d019e47 100644
--- a/pkgs/by-name/be/bedtools/package.nix
+++ b/pkgs/by-name/be/bedtools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arq5x";
     repo = "bedtools2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rrk+FSv1bGL0D1lrIOsQu2AT7cw2T4lkDiCnzil5fpg=";
   };
 
diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix
index 532be65f9011..3ad451df6c4f 100644
--- a/pkgs/by-name/be/bee/package.nix
+++ b/pkgs/by-name/be/bee/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ethersphere";
     repo = "bee";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-44mjSeV8imatPpNkRSA5Uewunvkc5j6Eo+gKya+dqzE=";
   };
 
diff --git a/pkgs/by-name/be/beefi/package.nix b/pkgs/by-name/be/beefi/package.nix
index 5834cd848e33..1c8c084711a0 100644
--- a/pkgs/by-name/be/beefi/package.nix
+++ b/pkgs/by-name/be/beefi/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jfeick";
     repo = "beefi";
-    tag = version;
+    rev = version;
     sha256 = "1180avalbw414q1gnfqdgc9zg3k9y0401kw9qvcn51qph81d04v5";
   };
 
diff --git a/pkgs/by-name/be/beep/package.nix b/pkgs/by-name/be/beep/package.nix
index 1e061afc5ced..b1a37e5f9851 100644
--- a/pkgs/by-name/be/beep/package.nix
+++ b/pkgs/by-name/be/beep/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spkr-beep";
     repo = "beep";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gDgGI9F+wW2cN89IwP93PkMv6vixJA2JckF78nxZ+TU=";
   };
 
diff --git a/pkgs/by-name/be/bees/package.nix b/pkgs/by-name/be/bees/package.nix
index 31034551c336..8bff2ce41d70 100644
--- a/pkgs/by-name/be/bees/package.nix
+++ b/pkgs/by-name/be/bees/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Zygo";
     repo = "bees";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-f3P3BEd8uO6QOZ1/2hBzdcuOSggYvHxW3g9pGftKO8g=";
   };
 
diff --git a/pkgs/by-name/be/behdad-fonts/package.nix b/pkgs/by-name/be/behdad-fonts/package.nix
index 590d22563421..d61be9664231 100644
--- a/pkgs/by-name/be/behdad-fonts/package.nix
+++ b/pkgs/by-name/be/behdad-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "font-store";
     repo = "BehdadFont";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gKfzxo3/bCMKXl2d6SP07ahIiNrUyrk/SN5XLND2lWY=";
   };
 
diff --git a/pkgs/by-name/be/beidconnect/package.nix b/pkgs/by-name/be/beidconnect/package.nix
index 737482f22025..5acd92acefab 100644
--- a/pkgs/by-name/be/beidconnect/package.nix
+++ b/pkgs/by-name/be/beidconnect/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Fedict";
     repo = "fts-beidconnect";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-xkBldXOlgLMgrvzm7ajXzJ92mpXrxHD1RX4DeBxU3kk=";
   };
 
diff --git a/pkgs/by-name/be/bemenu/package.nix b/pkgs/by-name/be/bemenu/package.nix
index dda60cc67611..ace85ff9ec1b 100644
--- a/pkgs/by-name/be/bemenu/package.nix
+++ b/pkgs/by-name/be/bemenu/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Cloudef";
     repo = "bemenu";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-0vpqJ2jydTt6aVni0ma0g+80PFz+C4xJ5M77sMODkSg=";
   };
 
diff --git a/pkgs/by-name/be/benchexec/package.nix b/pkgs/by-name/be/benchexec/package.nix
index b992caa71598..bca21cbc4506 100644
--- a/pkgs/by-name/be/benchexec/package.nix
+++ b/pkgs/by-name/be/benchexec/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "sosy-lab";
     repo = "benchexec";
-    tag = version;
+    rev = version;
     hash = "sha256-lokz7klAQAascij0T/T43/PrbMh6ZUAvFnIqg13pVUk=";
   };
 
diff --git a/pkgs/by-name/be/bencode/package.nix b/pkgs/by-name/be/bencode/package.nix
index 9073e03a426e..776f1dcddf0d 100644
--- a/pkgs/by-name/be/bencode/package.nix
+++ b/pkgs/by-name/be/bencode/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fbdtemme";
     repo = "bencode";
-    tag = version;
+    rev = version;
     hash = "sha256-zpxvADZfYTUdlNLMZJSCanPL40EGl9BBCxR7oDhvOTw=";
   };
 
diff --git a/pkgs/by-name/be/bento4/package.nix b/pkgs/by-name/be/bento4/package.nix
index 37c3eb671ca0..2b7dc79faf2d 100644
--- a/pkgs/by-name/be/bento4/package.nix
+++ b/pkgs/by-name/be/bento4/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "axiomatic-systems";
     repo = "Bento4";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Qy8D3cbCVHmLAaXtiF64rL2oRurXNCtd5Dsgt0W7WdY=";
   };
 
diff --git a/pkgs/by-name/be/bepass/package.nix b/pkgs/by-name/be/bepass/package.nix
index 231c46769269..02d8b58a2208 100644
--- a/pkgs/by-name/be/bepass/package.nix
+++ b/pkgs/by-name/be/bepass/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bepass-org";
     repo = "bepass";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ruOhPWNs1WWM3r6X+6ch0HoDCu/a+IkBQiCr0Wh6yS8=";
   };
 
diff --git a/pkgs/by-name/be/berglas/package.nix b/pkgs/by-name/be/berglas/package.nix
index 4c0fe69484e7..d5412784ba4a 100644
--- a/pkgs/by-name/be/berglas/package.nix
+++ b/pkgs/by-name/be/berglas/package.nix
@@ -40,7 +40,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bW8D8g4FPx0i4iPP7Pvm0UpaJFNsECR3kuHEZn8NLx0=";
   };
 
diff --git a/pkgs/by-name/be/berry/package.nix b/pkgs/by-name/be/berry/package.nix
index f63ddf7304b2..0236acba7362 100644
--- a/pkgs/by-name/be/berry/package.nix
+++ b/pkgs/by-name/be/berry/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "JLErvin";
     repo = "berry";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-xMJRiLNtwVRQf9HiCF3ClLKEmdDNxcY35IYxe+L7+Hk=";
   };
 
diff --git a/pkgs/by-name/be/bettercap/package.nix b/pkgs/by-name/be/bettercap/package.nix
index 1d565afcb7cf..e0d5de396d28 100644
--- a/pkgs/by-name/be/bettercap/package.nix
+++ b/pkgs/by-name/be/bettercap/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OND8WPqU/95rKykqMAPWmDsJ+AjsjGjrncZ2/m3mpt0=";
   };
 
diff --git a/pkgs/by-name/be/betterlockscreen/package.nix b/pkgs/by-name/be/betterlockscreen/package.nix
index d2d1c0f465c8..ba1fce2551e0 100644
--- a/pkgs/by-name/be/betterlockscreen/package.nix
+++ b/pkgs/by-name/be/betterlockscreen/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "betterlockscreen";
     repo = "betterlockscreen";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-59Ct7XIfZqU3yaW9FO7UV8SSMLdcZMPRc7WJangxFPo=";
   };
 
diff --git a/pkgs/by-name/bf/bfc/package.nix b/pkgs/by-name/bf/bfc/package.nix
index 01d9b52b4116..72a38083412d 100644
--- a/pkgs/by-name/bf/bfc/package.nix
+++ b/pkgs/by-name/bf/bfc/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Wilfred";
     repo = "bfc";
-    tag = version;
+    rev = version;
     hash = "sha256-5pcvwCtXWEexvV3TS62dZ6Opg8ANP2L8B0Z8u/OQENU=";
   };
 
diff --git a/pkgs/by-name/bf/bfs/package.nix b/pkgs/by-name/bf/bfs/package.nix
index 1783ae619134..681a4db2e52d 100644
--- a/pkgs/by-name/bf/bfs/package.nix
+++ b/pkgs/by-name/bf/bfs/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
-    tag = version;
+    rev = version;
     hash = "sha256-TXnoy+VWkS5ilW6QEtE6vd80FaJ/nIWGaeBJ/cjvquM=";
   };
 
diff --git a/pkgs/by-name/bg/bgpdump/package.nix b/pkgs/by-name/bg/bgpdump/package.nix
index fe9ec551ef7c..93b5528f16ae 100644
--- a/pkgs/by-name/bg/bgpdump/package.nix
+++ b/pkgs/by-name/bg/bgpdump/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RIPE-NCC";
     repo = "bgpdump";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1HXMf9mHManR7jhonU2Agon0YFXOlM9APIN1Zm840AM=";
   };
 
diff --git a/pkgs/by-name/bg/bgpq3/package.nix b/pkgs/by-name/bg/bgpq3/package.nix
index f4e95173b8f8..de42af14b940 100644
--- a/pkgs/by-name/bg/bgpq3/package.nix
+++ b/pkgs/by-name/bg/bgpq3/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "snar";
     repo = "bgpq3";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rOpggVlXKaf3KBhfZ2lVooDaQA0iRjSbsLXF02GEyBw=";
   };
 
diff --git a/pkgs/by-name/bg/bgpq4/package.nix b/pkgs/by-name/bg/bgpq4/package.nix
index b5ff94576863..fab207596ba4 100644
--- a/pkgs/by-name/bg/bgpq4/package.nix
+++ b/pkgs/by-name/bg/bgpq4/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bgp";
     repo = "bgpq4";
-    tag = version;
+    rev = version;
     sha256 = "sha256-3mfFj9KoQbDe0gH7Le03N1Yds/bTEmY+OiXNaOtHkpY=";
   };
 
diff --git a/pkgs/by-name/bg/bgs/package.nix b/pkgs/by-name/bg/bgs/package.nix
index 05aed4d4ebbf..c37dfa311cbe 100644
--- a/pkgs/by-name/bg/bgs/package.nix
+++ b/pkgs/by-name/bg/bgs/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gottox";
     repo = "bgs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "V8GP+xLSiCvaYZt8Bi3/3KlTBaGnMYQUeNCHwH6Ejzo=";
   };
 
diff --git a/pkgs/by-name/bi/bibata-cursors/package.nix b/pkgs/by-name/bi/bibata-cursors/package.nix
index 2a32f8b5e0b1..0c0253b4ae8e 100644
--- a/pkgs/by-name/bi/bibata-cursors/package.nix
+++ b/pkgs/by-name/bi/bibata-cursors/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ful1e5";
     repo = "Bibata_Cursor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kIKidw1vditpuxO1gVuZeUPdWBzkiksO/q2R/+DUdEc=";
   };
 
diff --git a/pkgs/by-name/bi/biber-for-tectonic/package.nix b/pkgs/by-name/bi/biber-for-tectonic/package.nix
index 56d3629b9902..baa7b05aeda7 100644
--- a/pkgs/by-name/bi/biber-for-tectonic/package.nix
+++ b/pkgs/by-name/bi/biber-for-tectonic/package.nix
@@ -41,7 +41,7 @@ in
     src = fetchFromGitHub {
       owner = "plk";
       repo = "biber";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-Tt2sN2b2NGxcWyZDj5uXNGC8phJwFRiyH72n3yhFCi0=";
     };
     patches = [
diff --git a/pkgs/by-name/bi/biblatex-check/package.nix b/pkgs/by-name/bi/biblatex-check/package.nix
index 5e9a327fe7c4..79cc1264a057 100644
--- a/pkgs/by-name/bi/biblatex-check/package.nix
+++ b/pkgs/by-name/bi/biblatex-check/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Pezmc";
     repo = "BibLatex-Check";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8oHX56+kRWWl8t22DqLAFinjPngRMo3vXxXuVXBwutM=";
   };
 
diff --git a/pkgs/by-name/bi/biblesync/package.nix b/pkgs/by-name/bi/biblesync/package.nix
index 486244f71329..c3047c802326 100644
--- a/pkgs/by-name/bi/biblesync/package.nix
+++ b/pkgs/by-name/bi/biblesync/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "karlkleinpaste";
     repo = "biblesync";
-    tag = version;
+    rev = version;
     sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s";
   };
 
diff --git a/pkgs/by-name/bi/bibtex-tidy/package.nix b/pkgs/by-name/bi/bibtex-tidy/package.nix
index 419f0116f2cb..24d58f7c7299 100644
--- a/pkgs/by-name/bi/bibtex-tidy/package.nix
+++ b/pkgs/by-name/bi/bibtex-tidy/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "FlamingTempura";
     repo = "bibtex-tidy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sMgy29deEfc3DFSC0Z4JZCeNAFpBKNYj+mJnFI1pSY4=";
   };
 
diff --git a/pkgs/by-name/bi/bic/package.nix b/pkgs/by-name/bi/bic/package.nix
index f17f2ca435ef..452e14250925 100644
--- a/pkgs/by-name/bi/bic/package.nix
+++ b/pkgs/by-name/bi/bic/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hexagonal-sun";
     repo = "bic";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ws46h1ngzk14dspmsggj9535yl04v9wh8v4gb234n34rdkdsyyw";
   };
 
diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix
index f92deb956ceb..ee9dcb13c301 100644
--- a/pkgs/by-name/bi/bicep/package.nix
+++ b/pkgs/by-name/bi/bicep/package.nix
@@ -15,7 +15,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "bicep";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vyPRLPTvQkwN7unlIHs6DvpjXnXyW1PDtH9hhIOgN1A=";
   };
 
diff --git a/pkgs/by-name/bi/binbloom/package.nix b/pkgs/by-name/bi/binbloom/package.nix
index 88df0e40be08..d87670431d56 100644
--- a/pkgs/by-name/bi/binbloom/package.nix
+++ b/pkgs/by-name/bi/binbloom/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "quarkslab";
     repo = "binbloom";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ox4o9RPtqMsme//8dVatNUo+mA/6dM9eI/T5lsuSAus=";
   };
 
diff --git a/pkgs/by-name/bi/bindle/package.nix b/pkgs/by-name/bi/bindle/package.nix
index e944f0819a29..88867342500c 100644
--- a/pkgs/by-name/bi/bindle/package.nix
+++ b/pkgs/by-name/bi/bindle/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "deislabs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xehn74fqP0tEtP4Qy9TRGv+P2QoHZLxRHzGoY5cQuv0=";
   };
 
diff --git a/pkgs/by-name/bi/bingo/package.nix b/pkgs/by-name/bi/bingo/package.nix
index c359e22bd49d..10da22668ad9 100644
--- a/pkgs/by-name/bi/bingo/package.nix
+++ b/pkgs/by-name/bi/bingo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bwplotka";
     repo = "bingo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bzh6P+J8EoewjOofwWXMgtSXAhESetD3y9EiqLNOT54=";
   };
 
diff --git a/pkgs/by-name/bi/bingrep/package.nix b/pkgs/by-name/bi/bingrep/package.nix
index c29a1ba85a83..b34902338703 100644
--- a/pkgs/by-name/bi/bingrep/package.nix
+++ b/pkgs/by-name/bi/bingrep/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "m4b";
     repo = "bingrep";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bHu3/f25U1QtRZv1z5OQSDMayOpLU6tbNaV00K55ZY8=";
   };
 
diff --git a/pkgs/by-name/bi/binserve/package.nix b/pkgs/by-name/bi/binserve/package.nix
index 7c1a28f6e4fe..df1cf540b52c 100644
--- a/pkgs/by-name/bi/binserve/package.nix
+++ b/pkgs/by-name/bi/binserve/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mufeedvh";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s=";
   };
 
diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix
index 6f8080285f66..e1fdd004f087 100644
--- a/pkgs/by-name/bi/binsider/package.nix
+++ b/pkgs/by-name/bi/binsider/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "binsider";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FNaYMp+vrFIziBzZ8//+ppq7kwRjBJypqsxg42XwdEs=";
   };
 
diff --git a/pkgs/by-name/bi/biodiff/package.nix b/pkgs/by-name/bi/biodiff/package.nix
index cbbbeda77d23..db5c85034295 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZLxjOV08sC5dKICvRUyL6FLMORkxwdLgNq7L45CDwa4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/bi/biosdevname/package.nix b/pkgs/by-name/bi/biosdevname/package.nix
index 1bbb0c158d2f..c1085956f00b 100644
--- a/pkgs/by-name/bi/biosdevname/package.nix
+++ b/pkgs/by-name/bi/biosdevname/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dell";
     repo = "biosdevname";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "19wbb79x9h79k55sgd4dylvdbhhrvfaiaknbw9s1wvfmirkxa1dz";
   };
 
diff --git a/pkgs/by-name/bi/bird-lg/package.nix b/pkgs/by-name/bi/bird-lg/package.nix
index 581a61b28200..8bb1180a8fa2 100644
--- a/pkgs/by-name/bi/bird-lg/package.nix
+++ b/pkgs/by-name/bi/bird-lg/package.nix
@@ -14,7 +14,7 @@ let
       src = fetchFromGitHub {
         owner = "xddxdd";
         repo = "bird-lg-go";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-j81cfHqXNsTM93ofxXz+smkjN8OdJXxtm9z5LdzC+r8=";
       };
 
diff --git a/pkgs/by-name/bi/birdwatcher/package.nix b/pkgs/by-name/bi/birdwatcher/package.nix
index cb27663b59ee..21b1212c4216 100644
--- a/pkgs/by-name/bi/birdwatcher/package.nix
+++ b/pkgs/by-name/bi/birdwatcher/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alice-lg";
     repo = "birdwatcher";
-    tag = version;
+    rev = version;
     hash = "sha256-TTU5TYWD/KSh/orDdQnNrQJ/G7z5suBu7psF9V6AAIw=";
   };
 
diff --git a/pkgs/by-name/bi/biscuit-cli/package.nix b/pkgs/by-name/bi/biscuit-cli/package.nix
index 40e63f06c162..676c2008d152 100644
--- a/pkgs/by-name/bi/biscuit-cli/package.nix
+++ b/pkgs/by-name/bi/biscuit-cli/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "biscuit-auth";
     repo = "biscuit-cli";
-    tag = version;
+    rev = version;
     sha256 = "sha256-BLDJ4Rzu48sAklbv021XSzmATRd+D01yGHqJt6kvjGw=";
   };
 
diff --git a/pkgs/by-name/bi/bit/package.nix b/pkgs/by-name/bi/bit/package.nix
index f9941e4677c6..38750cf58f87 100644
--- a/pkgs/by-name/bi/bit/package.nix
+++ b/pkgs/by-name/bi/bit/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chriswalz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-18R0JGbG5QBDghF4SyhXaKe9UY5UzF7Ap0Y061Z1SZ8=";
   };
 
diff --git a/pkgs/by-name/bi/bitbake-language-server/package.nix b/pkgs/by-name/bi/bitbake-language-server/package.nix
index c51ca3feba81..d0f441fad9dc 100644
--- a/pkgs/by-name/bi/bitbake-language-server/package.nix
+++ b/pkgs/by-name/bi/bitbake-language-server/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Freed-Wu";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-NLDQ2P5peweugkoNYskpCyCEgBwVFA7RTs8+NvH8fj8=";
   };
 
diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix
index be7d2818e179..cb040646f516 100644
--- a/pkgs/by-name/bi/bitbox/package.nix
+++ b/pkgs/by-name/bi/bitbox/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BitBoxSwiss";
     repo = "bitbox-wallet-app";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-2oGVQ022NGOHLo7TBdeXG3ng1nYW8fyLwSV0hJdAl9I=";
   };
diff --git a/pkgs/by-name/bi/bitbucket-cli/package.nix b/pkgs/by-name/bi/bitbucket-cli/package.nix
index 80e52bcb40ee..f5927ec44de5 100644
--- a/pkgs/by-name/bi/bitbucket-cli/package.nix
+++ b/pkgs/by-name/bi/bitbucket-cli/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "swisscom";
     repo = "bitbucket-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8Qvlv/S5IkRk+2D/Pnb0+FP7ryHh1kSRJCiUjSO0OtI=";
   };
 
diff --git a/pkgs/by-name/bi/bitlbee-discord/package.nix b/pkgs/by-name/bi/bitlbee-discord/package.nix
index e3356027cef5..4be2d69cf9f0 100644
--- a/pkgs/by-name/bi/bitlbee-discord/package.nix
+++ b/pkgs/by-name/bi/bitlbee-discord/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "0.4.3";
 
   src = fetchFromGitHub {
-    tag = version;
+    rev = version;
     owner = "sm00th";
     repo = "bitlbee-discord";
     sha256 = "00qgdvrp7hv02n0ns685igp810zxmv3adsama8601122al6x041n";
diff --git a/pkgs/by-name/bi/bitlbee-facebook/package.nix b/pkgs/by-name/bi/bitlbee-facebook/package.nix
index 0e653390601b..086675c4f043 100644
--- a/pkgs/by-name/bi/bitlbee-facebook/package.nix
+++ b/pkgs/by-name/bi/bitlbee-facebook/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "1.2.2";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "bitlbee";
     repo = "bitlbee-facebook";
     sha256 = "1qiiiq17ybylbhwgbwsvmshb517589r8yy5rsh1rfaylmlcxyy7z";
diff --git a/pkgs/by-name/bi/bitlbee-steam/package.nix b/pkgs/by-name/bi/bitlbee-steam/package.nix
index 5ae5af68163b..02e6f5468c9d 100644
--- a/pkgs/by-name/bi/bitlbee-steam/package.nix
+++ b/pkgs/by-name/bi/bitlbee-steam/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   pname = "bitlbee-steam";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "bitlbee";
     repo = "bitlbee-steam";
     sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq";
diff --git a/pkgs/by-name/bi/bitmagnet/package.nix b/pkgs/by-name/bi/bitmagnet/package.nix
index 0c17df59ac8a..74dce225c498 100644
--- a/pkgs/by-name/bi/bitmagnet/package.nix
+++ b/pkgs/by-name/bi/bitmagnet/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bitmagnet-io";
     repo = "bitmagnet";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KgpKpnOVtS3VoIqKhIzDvbdR54M014tQj2/ufhWMZDo=";
   };
 
diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix
index 9cdfc862d079..cd04a4cde2b5 100644
--- a/pkgs/by-name/bi/bitrise/package.nix
+++ b/pkgs/by-name/bi/bitrise/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bitrise-io";
     repo = "bitrise";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j7Gbr+j/5RnM7S6eRZZkmlXgY+vBgfTJ5ZaLz8o7pww=";
   };
 
diff --git a/pkgs/by-name/bi/bitwise/package.nix b/pkgs/by-name/bi/bitwise/package.nix
index ec47e39ea5bf..44744927c45b 100644
--- a/pkgs/by-name/bi/bitwise/package.nix
+++ b/pkgs/by-name/bi/bitwise/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mellowcandle";
     repo = "bitwise";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-x+ky1X0c0bQZnkNvNNuXN2BoMDtDSCt/8dBAG92jCCQ=";
   };
 
diff --git a/pkgs/by-name/bi/bitwuzla/package.nix b/pkgs/by-name/bi/bitwuzla/package.nix
index a560268b22cd..4fb78ff4e646 100644
--- a/pkgs/by-name/bi/bitwuzla/package.nix
+++ b/pkgs/by-name/bi/bitwuzla/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bitwuzla";
     repo = "bitwuzla";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-S8CtK8WEehUdOoqOmu5KnoqHFpCGrYWjZKv1st4M7bo=";
   };
 
diff --git a/pkgs/by-name/bj/bjumblr/package.nix b/pkgs/by-name/bj/bjumblr/package.nix
index e5c590cf0e04..af4c7d0d6407 100644
--- a/pkgs/by-name/bj/bjumblr/package.nix
+++ b/pkgs/by-name/bj/bjumblr/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BJumblr";
-    tag = version;
+    rev = version;
     sha256 = "sha256-qSoGmWUGaMjx/bkiCJ/qb4LBbuFPXXlJ0e9hrFBXzwE=";
   };
 
diff --git a/pkgs/by-name/bk/bkt/package.nix b/pkgs/by-name/bk/bkt/package.nix
index 6d660815afe9..b425f55b1c5c 100644
--- a/pkgs/by-name/bk/bkt/package.nix
+++ b/pkgs/by-name/bk/bkt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dimo414";
     repo = "bkt";
-    tag = version;
+    rev = version;
     sha256 = "sha256-XQK7oZfutqCvFoGzMH5G5zoGvqB8YaXSdrwjS/SVTNU=";
   };
 
diff --git a/pkgs/by-name/bl/blahaj/package.nix b/pkgs/by-name/bl/blahaj/package.nix
index b82d7275aabf..258da854cfb8 100644
--- a/pkgs/by-name/bl/blahaj/package.nix
+++ b/pkgs/by-name/bl/blahaj/package.nix
@@ -15,7 +15,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "BLAHAJ";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CmMF9jDKUo+c8dYc2UEHKdBDE4dgwExcRS5sSUsUJik=";
   };
 
diff --git a/pkgs/by-name/bl/blahtexml/package.nix b/pkgs/by-name/bl/blahtexml/package.nix
index 32dcc8f59bf4..bc451c32034e 100644
--- a/pkgs/by-name/bl/blahtexml/package.nix
+++ b/pkgs/by-name/bl/blahtexml/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gvanas";
     repo = "blahtexml";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DL5DyfARHHbwWBVHSa/VwHzNaAx/v7EDdnw1GLOk+y0=";
   };
 
diff --git a/pkgs/by-name/bl/blanket/package.nix b/pkgs/by-name/bl/blanket/package.nix
index 01fa8b368f6c..631bc5062921 100644
--- a/pkgs/by-name/bl/blanket/package.nix
+++ b/pkgs/by-name/bl/blanket/package.nix
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rafaelmardojai";
     repo = "blanket";
-    tag = version;
+    rev = version;
     hash = "sha256-mY7c5i0me7mMbD8c6eGJeaZpR8XI5QVL4n3M+j15Z1c=";
   };
 
diff --git a/pkgs/by-name/bl/blasfeo/package.nix b/pkgs/by-name/bl/blasfeo/package.nix
index 854927fd73c7..8053b628b59f 100644
--- a/pkgs/by-name/bl/blasfeo/package.nix
+++ b/pkgs/by-name/bl/blasfeo/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "giaf";
     repo = "blasfeo";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-p1pxqJ38h6RKXMg1t+2RHlfmRKPuM18pbUarUx/w9lw=";
   };
 
diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix
index 9f0fdd79267f..ca4e9e144231 100644
--- a/pkgs/by-name/bl/blendfarm/package.nix
+++ b/pkgs/by-name/bl/blendfarm/package.nix
@@ -50,7 +50,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "LogicReinc";
     repo = "LogicReinc.BlendFarm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2w2tdl5n0IFTuthY97NYMeyRe2r72jaKFfoNSjWQMM4=";
   };
 
diff --git a/pkgs/by-name/bl/blflash/package.nix b/pkgs/by-name/bl/blflash/package.nix
index 3459c1af2731..3371f727a374 100644
--- a/pkgs/by-name/bl/blflash/package.nix
+++ b/pkgs/by-name/bl/blflash/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "spacemeowx2";
     repo = "blflash";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lv5bUbq5AnZVeR8V0A4pamY9ZIQAhLmvZEr+CRMPcj0=";
   };
 
diff --git a/pkgs/by-name/bl/blink1-tool/package.nix b/pkgs/by-name/bl/blink1-tool/package.nix
index 5ab2630cb58c..0d52efe9ba11 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-xuCjPSQUQ/KOcdsie/ndecUiEt+t46m4eI33PXJoAAY=";
   };
diff --git a/pkgs/by-name/bl/blis/package.nix b/pkgs/by-name/bl/blis/package.nix
index 40ffe614694d..4e69653da83b 100644
--- a/pkgs/by-name/bl/blis/package.nix
+++ b/pkgs/by-name/bl/blis/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flame";
     repo = "blis";
-    tag = version;
+    rev = version;
     sha256 = "sha256-joOTyHT87PelKNhL9+1lLqMz22WsENa+Rom41grBb0Y=";
   };
 
diff --git a/pkgs/by-name/bl/blitz/package.nix b/pkgs/by-name/bl/blitz/package.nix
index e5e44fddc2f2..f54c1861deba 100644
--- a/pkgs/by-name/bl/blitz/package.nix
+++ b/pkgs/by-name/bl/blitz/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "blitzpp";
     repo = "blitz";
-    tag = version;
+    rev = version;
     hash = "sha256-wZDg+4lCd9iHvxuQQE/qs58NorkxZ0+mf+8PKQ57CDE=";
   };
 
diff --git a/pkgs/by-name/bl/blockbook/package.nix b/pkgs/by-name/bl/blockbook/package.nix
index 990ac40bb7ca..b246fc368970 100644
--- a/pkgs/by-name/bl/blockbook/package.nix
+++ b/pkgs/by-name/bl/blockbook/package.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trezor";
     repo = "blockbook";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-98tp3QYaHfhVIiJ4xkA3bUanXwK1q05t+YNroFtBUxE=";
   };
 
diff --git a/pkgs/by-name/bl/blockhash/package.nix b/pkgs/by-name/bl/blockhash/package.nix
index d668bc3ea2e8..aa956b0360fa 100644
--- a/pkgs/by-name/bl/blockhash/package.nix
+++ b/pkgs/by-name/bl/blockhash/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "commonsmachinery";
     repo = "blockhash";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QoqFTCfWtXIrFF3Yx4NfOa9cSjHtCSKz3k3i0u9Qx9M=";
   };
 
diff --git a/pkgs/by-name/bl/blocky/package.nix b/pkgs/by-name/bl/blocky/package.nix
index c0b53c9ee9b2..e2a39acd6905 100644
--- a/pkgs/by-name/bl/blocky/package.nix
+++ b/pkgs/by-name/bl/blocky/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "0xERR0R";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yd9qncTuzf7p1hIYHzzXyxAx1C1QiuQAIYSKcjCiF0E=";
   };
 
diff --git a/pkgs/by-name/bl/blogc/package.nix b/pkgs/by-name/bl/blogc/package.nix
index 48d20f5382b9..a90f54da0bd0 100644
--- a/pkgs/by-name/bl/blogc/package.nix
+++ b/pkgs/by-name/bl/blogc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "blogc";
     repo = "blogc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YAwGgV5Vllz8JlIASbGIkdRzpciQbgPiXl5DjiSEJyE=";
   };
 
diff --git a/pkgs/by-name/bl/blueberry/package.nix b/pkgs/by-name/bl/blueberry/package.nix
index 8c57e161a1ba..1bcd602ccac5 100644
--- a/pkgs/by-name/bl/blueberry/package.nix
+++ b/pkgs/by-name/bl/blueberry/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-MyIjcTyKn1aC2th6fCOw4cIqrRKatk2s4QD5R9cm83A=";
   };
 
diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix
index b5eb85dfdda9..5f9fd46c3aa0 100644
--- a/pkgs/by-name/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "B-Lang-org";
     repo = "bsc";
-    tag = version;
+    rev = version;
     sha256 = "sha256-gA/vfAkkM2cuArN99JZVYEWTIJqg82HlC+BHNVS5Ot0=";
   };
 
diff --git a/pkgs/by-name/bl/bluetui/package.nix b/pkgs/by-name/bl/bluetui/package.nix
index 35a2700fda54..4fd147ff5699 100644
--- a/pkgs/by-name/bl/bluetui/package.nix
+++ b/pkgs/by-name/bl/bluetui/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pythops";
     repo = "bluetui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JgxzpFpz/fyFZwyxTtAkG9XB5qkxj46lUnZ3mM44dHk=";
   };
 
diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix
index d252e459d47c..3d6e2cc30e1a 100644
--- a/pkgs/by-name/bl/bluetuith/package.nix
+++ b/pkgs/by-name/bl/bluetuith/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "darkhz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yXH/koNT4ec/SOZhSU01iPNAfD1MdMjM2+wNmjXWsrk=";
   };
 
diff --git a/pkgs/by-name/bl/bluewalker/package.nix b/pkgs/by-name/bl/bluewalker/package.nix
index 4d4e4d5c6508..8f2872f6045b 100644
--- a/pkgs/by-name/bl/bluewalker/package.nix
+++ b/pkgs/by-name/bl/bluewalker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "jtaimisto";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wAzBlCczsLfHboGYIsyN7dGwz52CMw+L3XQ0njfLVR0=";
   };
 
diff --git a/pkgs/by-name/bl/blugon/package.nix b/pkgs/by-name/bl/blugon/package.nix
index eb9f6bb543b1..f580ffd9d774 100644
--- a/pkgs/by-name/bl/blugon/package.nix
+++ b/pkgs/by-name/bl/blugon/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jumper149";
     repo = "blugon";
-    tag = version;
+    rev = version;
     sha256 = "1i67v8jxvavgax3dwvns200iwwdcvgki04liq0x64q52lg0vrh7m";
   };
 
diff --git a/pkgs/by-name/bl/blur-effect/package.nix b/pkgs/by-name/bl/blur-effect/package.nix
index b194a7884134..cfc183ff1517 100644
--- a/pkgs/by-name/bl/blur-effect/package.nix
+++ b/pkgs/by-name/bl/blur-effect/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sonald";
     repo = "blur-effect";
-    tag = version;
+    rev = version;
     sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj";
   };
 
diff --git a/pkgs/by-name/bm/bmaptool/package.nix b/pkgs/by-name/bm/bmaptool/package.nix
index 839042264058..c97b13d26a38 100644
--- a/pkgs/by-name/bm/bmaptool/package.nix
+++ b/pkgs/by-name/bm/bmaptool/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yoctoproject";
     repo = "bmaptool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YPY3sNuZ/TASNBPH94iqG6AuBRq5KjioKiuxAcu94+I=";
   };
 
diff --git a/pkgs/by-name/bm/bmon/package.nix b/pkgs/by-name/bm/bmon/package.nix
index 79e856e60c41..49dfc9e71fad 100644
--- a/pkgs/by-name/bm/bmon/package.nix
+++ b/pkgs/by-name/bm/bmon/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tgraf";
     repo = "bmon";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ilba872c09mnlvylslv4hqv6c9cz36l76q74rr99jvis1dg69gf";
   };
 
diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
index 6d2c8081c1b0..e737a3374f5f 100644
--- a/pkgs/by-name/bn/bngblaster/package.nix
+++ b/pkgs/by-name/bn/bngblaster/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "bngblaster";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-HqwyqUkLYoXTjx01pB8sL3hBXwLqe441M+LTqBhaZ58=";
   };
 
diff --git a/pkgs/by-name/bo/boa/package.nix b/pkgs/by-name/bo/boa/package.nix
index 01676a427123..e3a5a8430d3b 100644
--- a/pkgs/by-name/bo/boa/package.nix
+++ b/pkgs/by-name/bo/boa/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "boa-dev";
     repo = "boa";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ROzdOanfHNPwHXA0SzU2fpuBonbDbgDqH+ZgOjwK/tg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/bo/bob/package.nix b/pkgs/by-name/bo/bob/package.nix
index 028aab41a0e3..2b4f0769f68c 100644
--- a/pkgs/by-name/bo/bob/package.nix
+++ b/pkgs/by-name/bo/bob/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "benchkram";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-zmWfOLBb+GWw9v6LdCC7/WaP1Wz7UipPwqkmI1+rG8Q=";
   };
 
diff --git a/pkgs/by-name/bo/boca/package.nix b/pkgs/by-name/bo/boca/package.nix
index e5a570a1e506..93bde7439f40 100644
--- a/pkgs/by-name/bo/boca/package.nix
+++ b/pkgs/by-name/bo/boca/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "enzo1982";
     repo = "boca";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HIYUMFj5yiEC+liZLMXD9otPyoEb1sxHlECTYtYXc2I=";
   };
 
diff --git a/pkgs/by-name/bo/boltbrowser/package.nix b/pkgs/by-name/bo/boltbrowser/package.nix
index b8639680b273..48c6c3eb93eb 100644
--- a/pkgs/by-name/bo/boltbrowser/package.nix
+++ b/pkgs/by-name/bo/boltbrowser/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "br0xen";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-3t0U1bSJbo3RJZe+PwaUeuzSt23Gs++WRe/uehfa4cA=";
   };
 
diff --git a/pkgs/by-name/bo/bom/package.nix b/pkgs/by-name/bo/bom/package.nix
index eaf5e854eb3c..9a057938d525 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 = pname;
-    tag = "v${version}";
+    rev = "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/bo/bombadillo/package.nix b/pkgs/by-name/bo/bombadillo/package.nix
index 48c137047466..74ae65823939 100644
--- a/pkgs/by-name/bo/bombadillo/package.nix
+++ b/pkgs/by-name/bo/bombadillo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
 
   src = fetchgit {
     url = "https://tildegit.org/sloum/bombadillo.git";
-    tag = version;
+    rev = version;
     hash = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0=";
   };
 
diff --git a/pkgs/by-name/bo/bombardier/package.nix b/pkgs/by-name/bo/bombardier/package.nix
index fb61ca883eca..db1a64994eca 100644
--- a/pkgs/by-name/bo/bombardier/package.nix
+++ b/pkgs/by-name/bo/bombardier/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "codesenberg";
     repo = "bombardier";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FoaiUky0WcipkGN8KIpSd+iizinlqtHC5lskvNCnx/Y=";
   };
 
diff --git a/pkgs/by-name/bo/bomutils/package.nix b/pkgs/by-name/bo/bomutils/package.nix
index 91d835b8c3ec..3b60711df4e5 100644
--- a/pkgs/by-name/bo/bomutils/package.nix
+++ b/pkgs/by-name/bo/bomutils/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hogliux";
     repo = "bomutils";
-    tag = version;
+    rev = version;
     sha256 = "1i7nhbq1fcbrjwfg64znz8p4l7662f7qz2l6xcvwd5z93dnmgmdr";
   };
 
diff --git a/pkgs/by-name/bo/bonk/package.nix b/pkgs/by-name/bo/bonk/package.nix
index fe3411532d5d..ab6d9c7e3748 100644
--- a/pkgs/by-name/bo/bonk/package.nix
+++ b/pkgs/by-name/bo/bonk/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "elliot40404";
     repo = "bonk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sAMIteNkGRqmE7BQD/TNC01K3eQQTLKuc0jcxHxtKF8=";
   };
 
diff --git a/pkgs/by-name/bo/bonzomatic/package.nix b/pkgs/by-name/bo/bonzomatic/package.nix
index 85d329a21e42..4ca7879051e2 100644
--- a/pkgs/by-name/bo/bonzomatic/package.nix
+++ b/pkgs/by-name/bo/bonzomatic/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gargaj";
     repo = "bonzomatic";
-    tag = version;
+    rev = version;
     sha256 = "sha256-hwK3C+p1hRwnuY2/vBrA0QsJGIcJatqq+U5/hzVCXEg=";
   };
 
diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix
index 44418ba44c12..71ef9beadd79 100644
--- a/pkgs/by-name/bo/boogie/package.nix
+++ b/pkgs/by-name/bo/boogie/package.nix
@@ -13,7 +13,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "boogie-org";
     repo = "boogie";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IWtYbb1IFB6DLIYYTP+q7q+h/0aqonxr/mWwf+83aRo=";
   };
 
diff --git a/pkgs/by-name/bo/boolector/package.nix b/pkgs/by-name/bo/boolector/package.nix
index 8915bdb63f69..d9c6d5de82cc 100644
--- a/pkgs/by-name/bo/boolector/package.nix
+++ b/pkgs/by-name/bo/boolector/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "boolector";
     repo = "boolector";
-    tag = version;
+    rev = version;
     hash = "sha256-CdfpXUbU1+yEmrNyl+hvHlJfpzzzx356naim6vRafDg=";
   };
 
diff --git a/pkgs/by-name/bo/boops/package.nix b/pkgs/by-name/bo/boops/package.nix
index 2d3addead3ea..8e5cfe9865ea 100644
--- a/pkgs/by-name/bo/boops/package.nix
+++ b/pkgs/by-name/bo/boops/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BOops";
-    tag = version;
+    rev = version;
     sha256 = "0nvpawk58g189z96xnjs4pyri5az3ckdi9mhi0i9s0a7k4gdkarr";
   };
 
diff --git a/pkgs/by-name/bo/boost-sml/package.nix b/pkgs/by-name/bo/boost-sml/package.nix
index 748e50dee72f..901be3c83fb8 100644
--- a/pkgs/by-name/bo/boost-sml/package.nix
+++ b/pkgs/by-name/bo/boost-sml/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "boost-ext";
     repo = "sml";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IvZwkhZe9pcyJhZdn4VkWMRUN6Ow8qs3zB6JtWb5pKk=";
   };
 
diff --git a/pkgs/by-name/bo/booster/package.nix b/pkgs/by-name/bo/booster/package.nix
index 5fde9434a802..37e67b1215f4 100644
--- a/pkgs/by-name/bo/booster/package.nix
+++ b/pkgs/by-name/bo/booster/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "anatol";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-uHxPzuD3PxKAI2JOZd7lcLvcqYqk9gW9yeZgOS1Y7x4=";
   };
 
diff --git a/pkgs/by-name/bo/bootc/package.nix b/pkgs/by-name/bo/bootc/package.nix
index b8c417ae61a4..a2a7fa796bf3 100644
--- a/pkgs/by-name/bo/bootc/package.nix
+++ b/pkgs/by-name/bo/bootc/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "bootc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-p1+j62MllmPcvWnijieSZmlgwYy76X17fv12Haetz78=";
   };
 
diff --git a/pkgs/by-name/bo/bootiso/package.nix b/pkgs/by-name/bo/bootiso/package.nix
index beb510612ab5..c91a0db713f7 100644
--- a/pkgs/by-name/bo/bootiso/package.nix
+++ b/pkgs/by-name/bo/bootiso/package.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jsamr";
     repo = "bootiso";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1l09d543b73r0wbpsj5m6kski8nq48lbraq1myxhidkgl3mm3d5i";
   };
 
diff --git a/pkgs/by-name/bo/bootspec/package.nix b/pkgs/by-name/bo/bootspec/package.nix
index 309be29d89b1..8ba4b349371c 100644
--- a/pkgs/by-name/bo/bootspec/package.nix
+++ b/pkgs/by-name/bo/bootspec/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "bootspec";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5IGSMHeL0eKfl7teDejAckYQjc8aeLwfwIQSzQ8YaAg=";
   };
 
diff --git a/pkgs/by-name/bo/borealis-cursors/package.nix b/pkgs/by-name/bo/borealis-cursors/package.nix
index 886ae7a7e218..7d1b99953ad4 100644
--- a/pkgs/by-name/bo/borealis-cursors/package.nix
+++ b/pkgs/by-name/bo/borealis-cursors/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "alvatip";
     repo = "Borealis-cursors";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-1qgyU0Npbx/AgqGbmF/BWtlVC0KsKtgC48SL/HtkDrk=";
   };
 
diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix
index 9b6e8ba212ba..65e30e9c8014 100644
--- a/pkgs/by-name/bo/bosh-cli/package.nix
+++ b/pkgs/by-name/bo/bosh-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GTxl0lsM1BMWTUAQfNYkJupDUCnXWavTnRZrkaCRpPc=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/bo/bossa-arduino/package.nix b/pkgs/by-name/bo/bossa-arduino/package.nix
index 635840270da9..519b9820278b 100644
--- a/pkgs/by-name/bo/bossa-arduino/package.nix
+++ b/pkgs/by-name/bo/bossa-arduino/package.nix
@@ -7,7 +7,7 @@ bossa.overrideAttrs (attrs: rec {
   src = fetchFromGitHub {
     owner = "arduino";
     repo = "BOSSA";
-    tag = version;
+    rev = version;
     sha256 = "sha256-sBJ6QMd7cTClDnGCeOU0FT6IczEjqqRxCD7kef5GuY8=";
   };
 })
diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix
index 1aa463aeeebd..1a108f0a712d 100644
--- a/pkgs/by-name/bo/bossa/package.nix
+++ b/pkgs/by-name/bo/bossa/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shumatech";
     repo = "BOSSA";
-    tag = version;
+    rev = version;
     sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw=";
   };
 
diff --git a/pkgs/by-name/bo/bowtie/package.nix b/pkgs/by-name/bo/bowtie/package.nix
index 82e3ab72bf91..5f13cdb5470d 100644
--- a/pkgs/by-name/bo/bowtie/package.nix
+++ b/pkgs/by-name/bo/bowtie/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BenLangmead";
     repo = "bowtie";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mWItmrTMPst/NnzSpxxTHcBztDqHPCza9yOsZPwp7G4=";
   };
 
diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix
index 9440c861e2b0..d4e2933bc4b4 100644
--- a/pkgs/by-name/bo/boxbuddy/package.nix
+++ b/pkgs/by-name/bo/boxbuddy/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Dvlv";
     repo = "BoxBuddyRS";
-    tag = version;
+    rev = version;
     hash = "sha256-9BGgm4yRjCarJIGP/G9gPj/qsYWb96XGJmpgLj3XCdM=";
   };
 
diff --git a/pkgs/by-name/bo/boxes/package.nix b/pkgs/by-name/bo/boxes/package.nix
index 0125db7919a8..476eae96fe76 100644
--- a/pkgs/by-name/bo/boxes/package.nix
+++ b/pkgs/by-name/bo/boxes/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ascii-boxes";
     repo = "boxes";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dvhb5KWBQt7g4n0ZTQMcJQljIfavV3g8i+P3PWB6Gwk=";
   };
 
diff --git a/pkgs/by-name/bo/boxfort/package.nix b/pkgs/by-name/bo/boxfort/package.nix
index 1e3dcc08774a..65ab07307b42 100644
--- a/pkgs/by-name/bo/boxfort/package.nix
+++ b/pkgs/by-name/bo/boxfort/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Snaipe";
     repo = "BoxFort";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "jmtWTOkOlqVZ7tFya3IrQjr714Y8TzAVY5Cq+RzDuRs=";
   };
 
diff --git a/pkgs/by-name/bo/boxxy/package.nix b/pkgs/by-name/bo/boxxy/package.nix
index 90352d8436a5..a6084d3ede78 100644
--- a/pkgs/by-name/bo/boxxy/package.nix
+++ b/pkgs/by-name/bo/boxxy/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "queer";
     repo = "boxxy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6pb3yyC4/kpe8S67B3pzsSu3PfQyOWpiYi0JTBQk3lU=";
   };
 
diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix
index 97b84cd3987e..705e28a646bf 100644
--- a/pkgs/by-name/bp/bpftrace/package.nix
+++ b/pkgs/by-name/bp/bpftrace/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bpftrace";
     repo = "bpftrace";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OAT8nw5fFhKINK8Jy+RJXSvfU40G4fpR/5J1GPoyewY=";
   };
 
diff --git a/pkgs/by-name/bp/bpp-core/package.nix b/pkgs/by-name/bp/bpp-core/package.nix
index ef9e6d21455d..546270e84766 100644
--- a/pkgs/by-name/bp/bpp-core/package.nix
+++ b/pkgs/by-name/bp/bpp-core/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BioPP";
     repo = "bpp-core";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0ma2cl677l7s0n5sffh66cy9lxp5wycm50f121g8rx85p95vkgwv";
   };
 
diff --git a/pkgs/by-name/bp/bpp-phyl/package.nix b/pkgs/by-name/bp/bpp-phyl/package.nix
index 46ae8ae17d25..c119d389cd45 100644
--- a/pkgs/by-name/bp/bpp-phyl/package.nix
+++ b/pkgs/by-name/bp/bpp-phyl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BioPP";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "192zks6wyk903n06c2lbsscdhkjnfwms8p7jblsmk3lvjhdipb20";
   };
 
diff --git a/pkgs/by-name/bp/bpp-popgen/package.nix b/pkgs/by-name/bp/bpp-popgen/package.nix
index c80f4d45a438..b9bfdc311aab 100644
--- a/pkgs/by-name/bp/bpp-popgen/package.nix
+++ b/pkgs/by-name/bp/bpp-popgen/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BioPP";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0bz0fhrq3dri6a0hvfc3zlvrns8mrzzlnicw5pyfa812gc1qwfvh";
   };
 
diff --git a/pkgs/by-name/bp/bpp-seq/package.nix b/pkgs/by-name/bp/bpp-seq/package.nix
index 2017e42ea9fc..1f9955a8d8ee 100644
--- a/pkgs/by-name/bp/bpp-seq/package.nix
+++ b/pkgs/by-name/bp/bpp-seq/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BioPP";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1mc09g8jswzsa4wgrfv59jxn15ys3q8s0227p1j838wkphlwn2qk";
   };
 
diff --git a/pkgs/by-name/bp/bppsuite/package.nix b/pkgs/by-name/bp/bppsuite/package.nix
index 5134a9f797e3..cc8e94672f49 100644
--- a/pkgs/by-name/bp/bppsuite/package.nix
+++ b/pkgs/by-name/bp/bppsuite/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BioPP";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1wdwcgczqbc3m116vakvi0129wm3acln3cfc7ivqnalwvi6lrpds";
   };
 
diff --git a/pkgs/by-name/br/braincurses/package.nix b/pkgs/by-name/br/braincurses/package.nix
index 419248c40c00..2a6a67b17aed 100644
--- a/pkgs/by-name/br/braincurses/package.nix
+++ b/pkgs/by-name/br/braincurses/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bderrly";
     repo = "braincurses";
-    tag = version;
+    rev = version;
     sha256 = "0gpny9wrb0zj3lr7iarlgn9j4367awj09v3hhxz9r9a6yhk4anf5";
   };
 
diff --git a/pkgs/by-name/br/break-time/package.nix b/pkgs/by-name/br/break-time/package.nix
index 912cb5e466b6..141d8d0b2765 100644
--- a/pkgs/by-name/br/break-time/package.nix
+++ b/pkgs/by-name/br/break-time/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cdepillabout";
     repo = "break-time";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-q79JXaBwd/oKtJPvK2+72pY2YvaR3of2CMC8cF6wwQ8=";
   };
 
diff --git a/pkgs/by-name/br/brev-cli/package.nix b/pkgs/by-name/br/brev-cli/package.nix
index ee775ee8866b..f4bc9b3468ec 100644
--- a/pkgs/by-name/br/brev-cli/package.nix
+++ b/pkgs/by-name/br/brev-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "brevdev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gqx/aOTpoN7nfstlFl4EulQ9Kzm/YlYOOiyrWIoJvcU=";
   };
 
diff --git a/pkgs/by-name/br/brial/package.nix b/pkgs/by-name/br/brial/package.nix
index 0935e51ac906..d82ac052d737 100644
--- a/pkgs/by-name/br/brial/package.nix
+++ b/pkgs/by-name/br/brial/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BRiAl";
     repo = "BRiAl";
-    tag = version;
+    rev = version;
     sha256 = "sha256-y6nlqRBJRWohGDAKe/F37qBP1SgtFHR1HD+erFJReOM=";
   };
 
diff --git a/pkgs/by-name/br/brickd/package.nix b/pkgs/by-name/br/brickd/package.nix
index 609b0b7d546d..95eafd3d7a97 100644
--- a/pkgs/by-name/br/brickd/package.nix
+++ b/pkgs/by-name/br/brickd/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Tinkerforge";
     repo = "brickd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6w2Ew+dLMmdRf9CF3TdKHa0d5ZgmX5lKIR+5t3QAWFQ=";
   };
 
diff --git a/pkgs/by-name/br/brig/package.nix b/pkgs/by-name/br/brig/package.nix
index 762741eb6325..f4914eeda873 100644
--- a/pkgs/by-name/br/brig/package.nix
+++ b/pkgs/by-name/br/brig/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sahib";
     repo = "brig";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600";
   };
 
diff --git a/pkgs/by-name/br/brightnessctl/package.nix b/pkgs/by-name/br/brightnessctl/package.nix
index e8d86c5b8b33..843af6877465 100644
--- a/pkgs/by-name/br/brightnessctl/package.nix
+++ b/pkgs/by-name/br/brightnessctl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Hummer12007";
     repo = "brightnessctl";
-    tag = version;
+    rev = version;
     sha256 = "0immxc7almmpg80n3bdn834p3nrrz7bspl2syhb04s3lawa5y2lq";
   };
 
diff --git a/pkgs/by-name/br/brillo/package.nix b/pkgs/by-name/br/brillo/package.nix
index 2b15a7ac4ceb..ed67064892d4 100644
--- a/pkgs/by-name/br/brillo/package.nix
+++ b/pkgs/by-name/br/brillo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "cameronnemo";
     repo = "brillo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+BUyM3FFnsk87NFaD9FBwdLqf6wsNhX+FDB7nqhgAmM=";
   };
 
diff --git a/pkgs/by-name/br/brmodelo/package.nix b/pkgs/by-name/br/brmodelo/package.nix
index 0a35c6a623e7..bcc9e5c2df60 100644
--- a/pkgs/by-name/br/brmodelo/package.nix
+++ b/pkgs/by-name/br/brmodelo/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "chcandido";
     repo = "brmodelo";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-YJcGfrcB+Qw35bMnqVs/tBzMGVj2DmfhRZ0YsSGGGSc=";
   };
 
diff --git a/pkgs/by-name/br/brook/package.nix b/pkgs/by-name/br/brook/package.nix
index 4d88128ea0ee..19ed8ed89519 100644
--- a/pkgs/by-name/br/brook/package.nix
+++ b/pkgs/by-name/br/brook/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "txthinking";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rfCqYI0T/nbK+rlPGl5orLo3qHKITesdFNtXc/ECATA=";
   };
 
diff --git a/pkgs/by-name/br/broom/package.nix b/pkgs/by-name/br/broom/package.nix
index f58e1f83dc73..6c7d0cb264c5 100644
--- a/pkgs/by-name/br/broom/package.nix
+++ b/pkgs/by-name/br/broom/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "a-camarillo";
     repo = "broom";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-a2hUgYpiKm/dZWLRuCZKuGStmZ/7jDtLRAjd/B57Vxw=";
   };
 
diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix
index 426d3d75aa52..ad607142586c 100644
--- a/pkgs/by-name/br/broot/package.nix
+++ b/pkgs/by-name/br/broot/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "broot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xLmVqYjQqjWMBm2A5OJl2wFIvxbWviX//J10BnKgWyk=";
   };
 
diff --git a/pkgs/by-name/br/browserpass/package.nix b/pkgs/by-name/br/browserpass/package.nix
index 133f5f03c544..3c8fbaad9a7b 100644
--- a/pkgs/by-name/br/browserpass/package.nix
+++ b/pkgs/by-name/br/browserpass/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "browserpass";
     repo = "browserpass-native";
-    tag = version;
+    rev = version;
     sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U=";
   };
 
diff --git a/pkgs/by-name/br/browsh/package.nix b/pkgs/by-name/br/browsh/package.nix
index d39d27b59c1b..f14b7662e8cb 100644
--- a/pkgs/by-name/br/browsh/package.nix
+++ b/pkgs/by-name/br/browsh/package.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "browsh-org";
     repo = "browsh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KbBVcNuERBL94LuRx872zpjQTzR6c5GalsBoNR52SuQ=";
   };
 
diff --git a/pkgs/by-name/br/brunsli/package.nix b/pkgs/by-name/br/brunsli/package.nix
index 960a9ee119b7..398d7b034698 100644
--- a/pkgs/by-name/br/brunsli/package.nix
+++ b/pkgs/by-name/br/brunsli/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "brunsli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZcrRz2xSoRepgG8KZYY/JzgONerItW0e6mH1PYsko98=";
   };
 
diff --git a/pkgs/by-name/br/bruteforce-luks/package.nix b/pkgs/by-name/br/bruteforce-luks/package.nix
index 1070911a7fc4..018181123154 100644
--- a/pkgs/by-name/br/bruteforce-luks/package.nix
+++ b/pkgs/by-name/br/bruteforce-luks/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "glv2";
     repo = "bruteforce-luks";
-    tag = version;
+    rev = version;
     hash = "sha256-t07YyfCjaXQs/OMekcPNBT8DeSRtq2+8tUpsPP2pG7o=";
   };
 
diff --git a/pkgs/by-name/br/bruteforce-salted-openssl/package.nix b/pkgs/by-name/br/bruteforce-salted-openssl/package.nix
index 743f09e7d980..c7f77cf9926a 100644
--- a/pkgs/by-name/br/bruteforce-salted-openssl/package.nix
+++ b/pkgs/by-name/br/bruteforce-salted-openssl/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "glv2";
     repo = "bruteforce-salted-openssl";
-    tag = version;
+    rev = version;
     hash = "sha256-hXB4CUQ5pihKmahyK359cgQACrs6YH1gHmZJAuTXgQM=";
   };
 
diff --git a/pkgs/by-name/br/bruteforce-wallet/package.nix b/pkgs/by-name/br/bruteforce-wallet/package.nix
index ffb4b44d87a0..b97d94dd5373 100644
--- a/pkgs/by-name/br/bruteforce-wallet/package.nix
+++ b/pkgs/by-name/br/bruteforce-wallet/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "glv2";
     repo = "bruteforce-wallet";
-    tag = version;
+    rev = version;
     hash = "sha256-ngzG39c/bWv++PHVgce9r1PXElFhpgYoAepbqD/1Dq0=";
   };
 
diff --git a/pkgs/by-name/bs/bs2b-lv2/package.nix b/pkgs/by-name/bs/bs2b-lv2/package.nix
index 7bc5d979aae9..161522ef32f1 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-dOcDPtiKN9Kfs2cdaeDO/GkWrh5tfJSHfiHPBtxJXvc=";
   };
diff --git a/pkgs/by-name/bs/bschaffl/package.nix b/pkgs/by-name/bs/bschaffl/package.nix
index d99738ef42a7..e79c070e35d3 100644
--- a/pkgs/by-name/bs/bschaffl/package.nix
+++ b/pkgs/by-name/bs/bschaffl/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "bschaffl";
-    tag = version;
+    rev = version;
     sha256 = "sha256-zfhPYH4eUNWHV27ZtX2IIvobyPdKs5yGr/ryJRQa6as=";
   };
 
diff --git a/pkgs/by-name/bs/bsequencer/package.nix b/pkgs/by-name/bs/bsequencer/package.nix
index 9752f02a5574..965195fe0360 100644
--- a/pkgs/by-name/bs/bsequencer/package.nix
+++ b/pkgs/by-name/bs/bsequencer/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BSEQuencer";
-    tag = version;
+    rev = version;
     sha256 = "sha256-1PSICm5mw37nO3gkHA9MNUH+CFULeOZURjimYEA/dXA=";
   };
 
diff --git a/pkgs/by-name/bs/bshapr/package.nix b/pkgs/by-name/bs/bshapr/package.nix
index 3dd4ff96c482..884ae2cb47bd 100644
--- a/pkgs/by-name/bs/bshapr/package.nix
+++ b/pkgs/by-name/bs/bshapr/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BShapr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9I4DPRl6i/VL8Etw3qLGZkP45BGsbxFxNOvRy3B3I+M=";
   };
 
diff --git a/pkgs/by-name/bs/bslizr/package.nix b/pkgs/by-name/bs/bslizr/package.nix
index 67bc8b89c7cf..ecd0622094cd 100644
--- a/pkgs/by-name/bs/bslizr/package.nix
+++ b/pkgs/by-name/bs/bslizr/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BSlizr";
-    tag = version;
+    rev = version;
     sha256 = "sha256-5DvVkTz79CLvZMZ3XnI0COIfxnhERDSvzbVoJAcqNRI=";
   };
 
diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index 421cb9737670..83aa6961c2ff 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "bspwm";
-    tag = version;
+    rev = version;
     sha256 = "0qlv7b4c2mmjfd65y100d11x8iqyg5f6lfiws3cgmpjidhdygnxc";
   };
 
diff --git a/pkgs/by-name/bt/btc-rpc-explorer/package.nix b/pkgs/by-name/bt/btc-rpc-explorer/package.nix
index 09ed71b77ba7..912c34f69ed8 100644
--- a/pkgs/by-name/bt/btc-rpc-explorer/package.nix
+++ b/pkgs/by-name/bt/btc-rpc-explorer/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "janoside";
     repo = "btc-rpc-explorer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZGg3jwSl1XyzS9hMa2YqwExhHSNgrsUmSscZtfF2h54=";
   };
 
diff --git a/pkgs/by-name/bt/btcd/package.nix b/pkgs/by-name/bt/btcd/package.nix
index a40f7f3ea534..3ea386726b76 100644
--- a/pkgs/by-name/bt/btcd/package.nix
+++ b/pkgs/by-name/bt/btcd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "btcsuite";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-83eiVYXpyiGgLmYxj3rFk4CHG7F9UQ3vk1ZHm64Cm4A=";
   };
 
diff --git a/pkgs/by-name/bt/btdu/package.nix b/pkgs/by-name/bt/btdu/package.nix
index 7f3dfd80eff0..6612306aa49e 100644
--- a/pkgs/by-name/bt/btdu/package.nix
+++ b/pkgs/by-name/bt/btdu/package.nix
@@ -13,7 +13,7 @@ buildDubPackage rec {
   src = fetchFromGitHub {
     owner = "CyberShadow";
     repo = "btdu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B8ojxdXibeNEZay9S5lzpB6bTKNB2ZI6AQ3XKUHioE0=";
   };
 
diff --git a/pkgs/by-name/bt/btfs/package.nix b/pkgs/by-name/bt/btfs/package.nix
index 8dfdb2bdbb57..b24519e5b0f2 100644
--- a/pkgs/by-name/bt/btfs/package.nix
+++ b/pkgs/by-name/bt/btfs/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "johang";
     repo = "btfs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fkS0U/MqFRQNi+n7NE4e1cnNICvfST2IQ9FMoJUyj6w=";
   };
 
diff --git a/pkgs/by-name/bt/btrfs-assistant/package.nix b/pkgs/by-name/bt/btrfs-assistant/package.nix
index f16d1d96da80..fce0bd8fc6eb 100644
--- a/pkgs/by-name/bt/btrfs-assistant/package.nix
+++ b/pkgs/by-name/bt/btrfs-assistant/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "btrfs-assistant";
     repo = "btrfs-assistant";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-I4nbQmHwk84qN1SngKzKnPtQN5Dz1QSSEpHJxV8wkJw=";
   };
 
diff --git a/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix b/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix
index 1c482c2d1c05..e11e98f74c84 100644
--- a/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix
+++ b/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hunleyd";
     repo = "btrfs-auto-snapshot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QpuwkGaYAkpu5hYyb360Mr5tHsZc2LzMlKtpS8CyyhI=";
   };
 
diff --git a/pkgs/by-name/bt/btrfs-heatmap/package.nix b/pkgs/by-name/bt/btrfs-heatmap/package.nix
index 055a860cc4a7..ff7bc2a9462d 100644
--- a/pkgs/by-name/bt/btrfs-heatmap/package.nix
+++ b/pkgs/by-name/bt/btrfs-heatmap/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "knorrie";
     repo = "btrfs-heatmap";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yCkuZqWwxrs2eS7EXY6pAOVVVSq7dAMxJtf581gX8vg=";
   };
 
diff --git a/pkgs/by-name/bt/btrfs-snap/package.nix b/pkgs/by-name/bt/btrfs-snap/package.nix
index bbf9db4e99c7..862acb1495c0 100644
--- a/pkgs/by-name/bt/btrfs-snap/package.nix
+++ b/pkgs/by-name/bt/btrfs-snap/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jf647";
     repo = "btrfs-snap";
-    tag = version;
+    rev = version;
     sha256 = "sha256-SDzLjgNRuR9XpmcYCD9T10MLS+//+pWFGDiTAb8NiLQ=";
   };
   buildInputs = [ bash ];
diff --git a/pkgs/by-name/bu/bubblewrap/package.nix b/pkgs/by-name/bu/bubblewrap/package.nix
index c8f50b3474c4..eba4f666e176 100644
--- a/pkgs/by-name/bu/bubblewrap/package.nix
+++ b/pkgs/by-name/bu/bubblewrap/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "bubblewrap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8IDMLQPeO576N1lizVudXUmTV6hNOiowjzRpEWBsZ+U=";
   };
 
diff --git a/pkgs/by-name/bu/buckle/package.nix b/pkgs/by-name/bu/buckle/package.nix
index 58214e87c9b4..dba26f270221 100644
--- a/pkgs/by-name/bu/buckle/package.nix
+++ b/pkgs/by-name/bu/buckle/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "benbrittain";
     repo = "buckle";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eWhcDzw+6I5N0dse5avwhcQ/y6YZ6b3QKyBwWBrA/xo=";
   };
 
diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix
index 41820f077550..ba104a09d707 100644
--- a/pkgs/by-name/bu/buf/package.nix
+++ b/pkgs/by-name/bu/buf/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/6SDsIVyorDWjOkdUB1t0vAA2VLy6MiGyiFo+2rUfEU=";
   };
 
diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix
index 8995a240865e..1482119defbf 100644
--- a/pkgs/by-name/bu/buffer/package.nix
+++ b/pkgs/by-name/bu/buffer/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "cheywood";
     repo = "buffer";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-W6LTTQvIMAB99q2W11EBlBknJnOuv4ptgf5SSM422Cg=";
   };
 
diff --git a/pkgs/by-name/bu/bufisk/package.nix b/pkgs/by-name/bu/bufisk/package.nix
index 05f11b86a277..05ec70526546 100644
--- a/pkgs/by-name/bu/bufisk/package.nix
+++ b/pkgs/by-name/bu/bufisk/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "bufisk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pVnqvQn7jwpx6T3sS4eA29JeJdh0GrPVm0J8n2UjJTw=";
   };
 
diff --git a/pkgs/by-name/bu/bugstalker/package.nix b/pkgs/by-name/bu/bugstalker/package.nix
index 8633f397e695..b1393ba65ae9 100644
--- a/pkgs/by-name/bu/bugstalker/package.nix
+++ b/pkgs/by-name/bu/bugstalker/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "godzie44";
     repo = "BugStalker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JacRt+zNwL7hdpdh5h9Mxztqi47f5eUbcZyx6ct/5Bc=";
   };
 
diff --git a/pkgs/by-name/bu/buildkit-nix/package.nix b/pkgs/by-name/bu/buildkit-nix/package.nix
index 4167bd74fb23..99431c4beaa6 100644
--- a/pkgs/by-name/bu/buildkit-nix/package.nix
+++ b/pkgs/by-name/bu/buildkit-nix/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "reproducible-containers";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-i8KQLLL36iP26jIj10fZLtYpS57Xni4eIQEJG4ixWy8=";
   };
 
diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix
index e02e0c6f856d..210e4d6f61cb 100644
--- a/pkgs/by-name/bu/buildkit/package.nix
+++ b/pkgs/by-name/bu/buildkit/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2zLXkiouPLmjxveoggsr+WUmdcZEN+FzeiVR1Dk6EA8=";
   };
 
diff --git a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
index 939dd40e3914..5cc2d5900e33 100644
--- a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
+++ b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "buildkite-agent-metrics";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AVFQ3GP4YDQ6d9NSeol3Eobxzmoa9bRyCAKTsDbyZyQ=";
   };
 
diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix
index 69c39c6802e0..4af365c8d316 100644
--- a/pkgs/by-name/bu/buildkite-agent/package.nix
+++ b/pkgs/by-name/bu/buildkite-agent/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "agent";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5COo5vXecXLhYAy3bcaYvmluFdfEKGgiTbhat8T3AV8=";
   };
 
diff --git a/pkgs/by-name/bu/buildkite-cli/package.nix b/pkgs/by-name/bu/buildkite-cli/package.nix
index 0bdad092f45b..7e57c0f790d5 100644
--- a/pkgs/by-name/bu/buildkite-cli/package.nix
+++ b/pkgs/by-name/bu/buildkite-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zRACKFs4AZkWg2OqFIyiLuM1V6GyIPmtyxSOjfHkL6U=";
   };
 
diff --git a/pkgs/by-name/bu/buku/package.nix b/pkgs/by-name/bu/buku/package.nix
index c62752958cef..edd09870b813 100644
--- a/pkgs/by-name/bu/buku/package.nix
+++ b/pkgs/by-name/bu/buku/package.nix
@@ -30,7 +30,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kPVlfTYUusf5CZnKB53WZcCHo3MEnA2bLUHTRPGPn+8=";
   };
 
diff --git a/pkgs/by-name/bu/bukubrow/package.nix b/pkgs/by-name/bu/bukubrow/package.nix
index 43b8ebf36a2c..746ef775921f 100644
--- a/pkgs/by-name/bu/bukubrow/package.nix
+++ b/pkgs/by-name/bu/bukubrow/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SamHH";
     repo = "bukubrow-host";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xz5Agsm+ATQXXgpPGN4EQ00i1t8qUlrviNHauVdCu4U=";
   };
 
diff --git a/pkgs/by-name/bu/bulky/package.nix b/pkgs/by-name/bu/bulky/package.nix
index 375a065143b4..0312d2565b6c 100644
--- a/pkgs/by-name/bu/bulky/package.nix
+++ b/pkgs/by-name/bu/bulky/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "bulky";
-    tag = version;
+    rev = version;
     hash = "sha256-+mA8b1PEfp151hks4T/I+dMYlJa6yYz1wWnafe+w9y8=";
   };
 
diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix
index d6cf50c94bf2..8319b0115871 100644
--- a/pkgs/by-name/bu/bulloak/package.nix
+++ b/pkgs/by-name/bu/bulloak/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alexfertel";
     repo = "bulloak";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OAjy8SXaD+2/C5jLNIezv/KdrPHlwJC5L1LwGhqBWQs=";
   };
 
diff --git a/pkgs/by-name/bu/bully/package.nix b/pkgs/by-name/bu/bully/package.nix
index a49c7559b328..91cf6c834dfb 100644
--- a/pkgs/by-name/bu/bully/package.nix
+++ b/pkgs/by-name/bu/bully/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kimocoder";
     repo = "bully";
-    tag = version;
+    rev = version;
     sha256 = "1n2754a5z44g414a0hj3cmi9q5lwnzyvmvzskrj2nci8c8m2kgnf";
   };
 
diff --git a/pkgs/by-name/bu/bump/package.nix b/pkgs/by-name/bu/bump/package.nix
index 4be37c59cc76..e2ae2ebaaf65 100644
--- a/pkgs/by-name/bu/bump/package.nix
+++ b/pkgs/by-name/bu/bump/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mroth";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-a+vmpmWb/jICNdErkvCQKNIdaKtSrIJZ3BApLvKG/hg=";
   };
 
diff --git a/pkgs/by-name/bu/bundix/package.nix b/pkgs/by-name/bu/bundix/package.nix
index 5be47b5a0fb0..7a79eae438d5 100644
--- a/pkgs/by-name/bu/bundix/package.nix
+++ b/pkgs/by-name/bu/bundix/package.nix
@@ -18,7 +18,7 @@ buildRubyGem rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "bundix";
-    tag = version;
+    rev = version;
     hash = "sha256-QnNdseCSwQYhO/ybzWsflMEk68TMgPU3HqXJ7av3SHE=";
   };
 
diff --git a/pkgs/by-name/bu/bunnyfetch/package.nix b/pkgs/by-name/bu/bunnyfetch/package.nix
index b4b3ac1f83ad..f4cc317f6010 100644
--- a/pkgs/by-name/bu/bunnyfetch/package.nix
+++ b/pkgs/by-name/bu/bunnyfetch/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Rosettea";
     repo = "bunnyfetch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6MnjCXc9/8twdf8PHKsVJY1yWYwUf5R01vtQFJbyy7M=";
   };
 
diff --git a/pkgs/by-name/bu/bunyan-rs/package.nix b/pkgs/by-name/bu/bunyan-rs/package.nix
index 296621fa6aec..0b7f2a6f57a1 100644
--- a/pkgs/by-name/bu/bunyan-rs/package.nix
+++ b/pkgs/by-name/bu/bunyan-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LukeMathWalker";
     repo = "bunyan";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA=";
   };
 
diff --git a/pkgs/by-name/bu/bup/package.nix b/pkgs/by-name/bu/bup/package.nix
index 7c94db0336e6..a6f00096dafb 100644
--- a/pkgs/by-name/bu/bup/package.nix
+++ b/pkgs/by-name/bu/bup/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     repo = "bup";
     owner = "bup";
-    tag = version;
+    rev = version;
     hash = "sha256-tuOUml4gF4i7bE2xtjJJol1gRAfYv73RghUYwIDsGyM=";
   };
 
diff --git a/pkgs/by-name/bu/burp/package.nix b/pkgs/by-name/bu/burp/package.nix
index 896fab40e2ba..6479c15eeb76 100644
--- a/pkgs/by-name/bu/burp/package.nix
+++ b/pkgs/by-name/bu/burp/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grke";
     repo = "burp";
-    tag = version;
+    rev = version;
     sha256 = "sha256-y6kRd1jD6t+Q6d5t7W9MDuk+m2Iq1THQkP50PJwI7Nc=";
   };
 
diff --git a/pkgs/by-name/bu/bustools/package.nix b/pkgs/by-name/bu/bustools/package.nix
index be05c010f5db..2ed9fb52bad9 100644
--- a/pkgs/by-name/bu/bustools/package.nix
+++ b/pkgs/by-name/bu/bustools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BUStools";
     repo = "bustools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0Y+9T9V+l20hqxpKbSWsEB0tt8A/ctYcoPN2n/roxvg=";
   };
 
diff --git a/pkgs/by-name/bu/butane/package.nix b/pkgs/by-name/bu/butane/package.nix
index c979592fa90e..ddd3d18e237d 100644
--- a/pkgs/by-name/bu/butane/package.nix
+++ b/pkgs/by-name/bu/butane/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "coreos";
     repo = "butane";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UJRHqvfCeKxbE+SRQZEm797WqwGpwjlqol8z36l3nS4=";
   };
 
diff --git a/pkgs/by-name/bu/buttermanager/package.nix b/pkgs/by-name/bu/buttermanager/package.nix
index 179f91e7fd87..7c15ca68290a 100644
--- a/pkgs/by-name/bu/buttermanager/package.nix
+++ b/pkgs/by-name/bu/buttermanager/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "egara";
     repo = "buttermanager";
-    tag = version;
+    rev = version;
     hash = "sha256-/U5IVJvYCw/YzBWjQ949YP9uoxsTNRJ5FO7rrI6Cvhs=";
   };
 
diff --git a/pkgs/by-name/by/byobu/package.nix b/pkgs/by-name/by/byobu/package.nix
index 3dc68f50d381..42dbc0613f90 100644
--- a/pkgs/by-name/by/byobu/package.nix
+++ b/pkgs/by-name/by/byobu/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "dustinkirkland";
     repo = "byobu";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-h+3BEMfBRozmpqFNRyfKzjKgevaYm8v7DsJMwkhiCQ4=";
   };
 
diff --git a/pkgs/by-name/by/bytecode-viewer/package.nix b/pkgs/by-name/by/bytecode-viewer/package.nix
index 01039341a708..13aa8359eb69 100644
--- a/pkgs/by-name/by/bytecode-viewer/package.nix
+++ b/pkgs/by-name/by/bytecode-viewer/package.nix
@@ -16,7 +16,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "Konloch";
     repo = "bytecode-viewer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-opAUmkEcWPOrcxAL+I1rBQXwHmvzbu0+InTnsg9r+z8=";
   };
 
diff --git a/pkgs/by-name/c-/c-for-go/package.nix b/pkgs/by-name/c-/c-for-go/package.nix
index 29208d128657..32026dbc053e 100644
--- a/pkgs/by-name/c-/c-for-go/package.nix
+++ b/pkgs/by-name/c-/c-for-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xlab";
     repo = "c-for-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XU+gmQBhQjoiKINfgPQ6bVvslPEFOvF3ZbRaWZE/ZzA=";
   };
 
diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix
index 477c8cb5ac8e..941dde968ba1 100644
--- a/pkgs/by-name/c2/c2fmzq/package.nix
+++ b/pkgs/by-name/c2/c2fmzq/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "c2FmZQ";
     repo = "c2FmZQ";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2Hdsakol6uHOITg8qgMTXZMtgvExKUrThxr/J93vInc=";
   };
 
diff --git a/pkgs/by-name/c2/c2nim/package.nix b/pkgs/by-name/c2/c2nim/package.nix
index dec295a2b1c8..7aeee7f65058 100644
--- a/pkgs/by-name/c2/c2nim/package.nix
+++ b/pkgs/by-name/c2/c2nim/package.nix
@@ -10,7 +10,7 @@ buildNimPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nim-lang";
     repo = "c2nim";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-E8sAhTFIWAnlfWyuvqK8h8g7Puf5ejLEqgLNb5N17os=";
   };
   meta = finalAttrs.src.meta // {
diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix
index d69f604e24f0..6122da0739a9 100644
--- a/pkgs/by-name/c2/c2patool/package.nix
+++ b/pkgs/by-name/c2/c2patool/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "contentauth";
     repo = "c2patool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3OaCsy6xt2Pc/Cqm3qbbpr7kiQiA2BM/LqIQnuw73MY=";
   };
 
diff --git a/pkgs/by-name/c3/c3-lsp/package.nix b/pkgs/by-name/c3/c3-lsp/package.nix
index 6becc1d62f16..9bd26fde545e 100644
--- a/pkgs/by-name/c3/c3-lsp/package.nix
+++ b/pkgs/by-name/c3/c3-lsp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pherrymason";
     repo = "c3-lsp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MScpFh4J4jVJI5WtW4tfNB18YDpxs+ass1HmXyOO5VM=";
   };
 
diff --git a/pkgs/by-name/ca/cabal-cli/package.nix b/pkgs/by-name/ca/cabal-cli/package.nix
index 270834241ffa..11cb241ad18f 100644
--- a/pkgs/by-name/ca/cabal-cli/package.nix
+++ b/pkgs/by-name/ca/cabal-cli/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "cabal-club";
     repo = "cabal-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DZ+F+pgPc8WuiBhLgxNO5es5lA996fJdvZyg6QjfrHg=";
   };
 
diff --git a/pkgs/by-name/ca/cadvisor/package.nix b/pkgs/by-name/ca/cadvisor/package.nix
index b90da320c92e..450bb669c9d2 100644
--- a/pkgs/by-name/ca/cadvisor/package.nix
+++ b/pkgs/by-name/ca/cadvisor/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EXhKX4Za+fdJcSrrbH1te533jyEVLmhgd3I9LcOCz2Q=";
   };
 
diff --git a/pkgs/by-name/ca/cadzinho/package.nix b/pkgs/by-name/ca/cadzinho/package.nix
index a9280b1ef470..4c20b1e545e0 100644
--- a/pkgs/by-name/ca/cadzinho/package.nix
+++ b/pkgs/by-name/ca/cadzinho/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zecruel";
     repo = "CadZinho";
-    tag = version;
+    rev = version;
     hash = "sha256-AHojy6lYLEyeBaYiIzo6MdQCM3jX5ENNTKgU+PGSD00=";
   };
 
diff --git a/pkgs/by-name/ca/caf/package.nix b/pkgs/by-name/ca/caf/package.nix
index e2299157d2b0..3731792b8b48 100644
--- a/pkgs/by-name/ca/caf/package.nix
+++ b/pkgs/by-name/ca/caf/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "actor-framework";
     repo = "actor-framework";
-    tag = version;
+    rev = version;
     hash = "sha256-1DJ8VYBTC4Kd6IQZoj4AjP3CoHhb+bmtBEozc5T0R/0=";
   };
 
diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix
index 13fac0e664d4..8b279efeed57 100644
--- a/pkgs/by-name/ca/cairo-lang/package.nix
+++ b/pkgs/by-name/ca/cairo-lang/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "starkware-libs";
     repo = "cairo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VOyqKeiPJ3/VOqcdQXC/rZnTriC2ScmAQ4IlouHjvpI=";
   };
 
diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/package.nix b/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
index 6cbec1a6c08e..c55a3a214f1f 100644
--- a/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
+++ b/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "calamares-nixos-extensions";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Tmp/sWQmhiZe2dmA+msCMPwPlBd1Oa3q5X+QP+CoAWI=";
   };
 
diff --git a/pkgs/by-name/ca/calendar-cli/package.nix b/pkgs/by-name/ca/calendar-cli/package.nix
index 7004262bb0f3..38c5e282c063 100644
--- a/pkgs/by-name/ca/calendar-cli/package.nix
+++ b/pkgs/by-name/ca/calendar-cli/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tobixen";
     repo = "calendar-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-w35ySLnfxXZR/a7BrPLYqXs2kqkuYhh5PcgNxJqjDtE=";
   };
 
diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix
index 6f219e32909d..5cb58eb82b24 100644
--- a/pkgs/by-name/ca/caligula/package.nix
+++ b/pkgs/by-name/ca/caligula/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ifd3f";
     repo = "caligula";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VwbVDfiGiVFefsxoQ1FBDHyYLp0sOKnnVZctklyO+Tw=";
   };
 
diff --git a/pkgs/by-name/ca/cameractrls/package.nix b/pkgs/by-name/ca/cameractrls/package.nix
index 4c7042ba5eba..d56b75124ddc 100644
--- a/pkgs/by-name/ca/cameractrls/package.nix
+++ b/pkgs/by-name/ca/cameractrls/package.nix
@@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "soyersoyer";
     repo = "cameractrls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MM+Py8tHtqJWIGmGg3RaIhJa0E1zM3hXOnTOqXPuejw=";
   };
 
diff --git a/pkgs/by-name/ca/cameradar/package.nix b/pkgs/by-name/ca/cameradar/package.nix
index 082ec3745581..329a41babd1a 100644
--- a/pkgs/by-name/ca/cameradar/package.nix
+++ b/pkgs/by-name/ca/cameradar/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Ullaakut";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GOqmz/aiOLGMfs9rQBIEQSgBycPzhu8BohcAc2U+gBw=";
   };
 
diff --git a/pkgs/by-name/ca/can-utils/package.nix b/pkgs/by-name/ca/can-utils/package.nix
index 86704aea674a..8d377fdb3997 100644
--- a/pkgs/by-name/ca/can-utils/package.nix
+++ b/pkgs/by-name/ca/can-utils/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-can";
     repo = "can-utils";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wum0hqPj3rCHHubNsOnj89tvrRQxoXrGQvZFcMKAGME=";
   };
 
diff --git a/pkgs/by-name/ca/canta-theme/package.nix b/pkgs/by-name/ca/canta-theme/package.nix
index c664a2177125..4f327102f1bf 100644
--- a/pkgs/by-name/ca/canta-theme/package.nix
+++ b/pkgs/by-name/ca/canta-theme/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "canta-theme";
-    tag = version;
+    rev = version;
     sha256 = "05h42nrggb6znzjcbh4lqqfcm41h4r85n3vwimp3l4lq5p90igr2";
   };
 
diff --git a/pkgs/by-name/ca/canto-curses/package.nix b/pkgs/by-name/ca/canto-curses/package.nix
index e49e77010e57..78be4ecaeb2d 100644
--- a/pkgs/by-name/ca/canto-curses/package.nix
+++ b/pkgs/by-name/ca/canto-curses/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "themoken";
     repo = "canto-curses";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1vzb9n1j4gxigzll6654ln79lzbrrm6yy0lyazd9kldyl349b8sr";
   };
 
diff --git a/pkgs/by-name/ca/canto-daemon/package.nix b/pkgs/by-name/ca/canto-daemon/package.nix
index d2c57ee39ad1..1a26d98de253 100644
--- a/pkgs/by-name/ca/canto-daemon/package.nix
+++ b/pkgs/by-name/ca/canto-daemon/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "themoken";
     repo = "canto-next";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0fmsdn28z09bvivdkqcla5bnalky7k744iir25z70bv4pz1jcvnk";
   };
 
diff --git a/pkgs/by-name/ca/cantoolz/package.nix b/pkgs/by-name/ca/cantoolz/package.nix
index 7e757fd145c0..7d2d8d9c8c83 100644
--- a/pkgs/by-name/ca/cantoolz/package.nix
+++ b/pkgs/by-name/ca/cantoolz/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CANToolz";
     repo = "CANToolz";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0ROWx1CsKtjxmbCgPYZpvr37VKsEsWCwMehf0/0/cnY=";
   };
 
diff --git a/pkgs/by-name/ca/caper/package.nix b/pkgs/by-name/ca/caper/package.nix
index 24288a87f0d8..f7dc73b829de 100644
--- a/pkgs/by-name/ca/caper/package.nix
+++ b/pkgs/by-name/ca/caper/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "niksu";
     repo = "caper";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TSryjz0NrGdkc+6vmfBqsuVpV3N9FvteTFsVqpUcm0w=";
   };
 
diff --git a/pkgs/by-name/ca/capnproto-java/package.nix b/pkgs/by-name/ca/capnproto-java/package.nix
index f97673ec1d32..e960dc968bda 100644
--- a/pkgs/by-name/ca/capnproto-java/package.nix
+++ b/pkgs/by-name/ca/capnproto-java/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "capnproto";
     repo = "capnproto-java";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7uYtRHKsJvbE1b0HbNXGbRXpkUHHLjMDIWLlOUcQWDk=";
   };
 
diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix
index 7a73bdf8ff6f..9334d336e364 100644
--- a/pkgs/by-name/ca/capnproto/package.nix
+++ b/pkgs/by-name/ca/capnproto/package.nix
@@ -36,7 +36,7 @@ clangStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "capnproto";
     repo = "capnproto";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gxkko7LFyJNlxpTS+CWOd/p9x/778/kNIXfpDGiKM2A=";
   };
 
diff --git a/pkgs/by-name/ca/caprice32/package.nix b/pkgs/by-name/ca/caprice32/package.nix
index 5411bfd404c3..0b173cbe4af3 100644
--- a/pkgs/by-name/ca/caprice32/package.nix
+++ b/pkgs/by-name/ca/caprice32/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     repo = "caprice32";
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "ColinPitrat";
     sha256 = "0hng5krwgc1h9bz1xlkp2hwnvas965nd7sb3z9mb2m6x9ghxlacz";
   };
diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix
index 199ac3a43ee3..17d78ba28d9b 100644
--- a/pkgs/by-name/ca/caprine/package.nix
+++ b/pkgs/by-name/ca/caprine/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "sindresorhus";
     repo = "caprine";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yfCilJ62m7nKe8B+4puwAbNgr2g1P7HaKIhFINdv0/k=";
   };
 
diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix
index 1c9d9ecc4e27..5deac4688fef 100644
--- a/pkgs/by-name/ca/capslock/package.nix
+++ b/pkgs/by-name/ca/capslock/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "capslock";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kRuEcrx9LBzCpXFWlc9bSsgZt84T8R8VFdbAWAseSPQ=";
   };
 
diff --git a/pkgs/by-name/ca/capypdf/package.nix b/pkgs/by-name/ca/capypdf/package.nix
index 5ece5c85e42b..3ada4db8cd48 100644
--- a/pkgs/by-name/ca/capypdf/package.nix
+++ b/pkgs/by-name/ca/capypdf/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jpakkane";
     repo = "capypdf";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-aaZHIBXOdKysxAk/011b9Di/QHH5vgF+/g3tWPn6d/k=";
   };
 
diff --git a/pkgs/by-name/ca/carbon-now-cli/package.nix b/pkgs/by-name/ca/carbon-now-cli/package.nix
index dbc70fc11523..d391128c56b2 100644
--- a/pkgs/by-name/ca/carbon-now-cli/package.nix
+++ b/pkgs/by-name/ca/carbon-now-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mixn";
     repo = "carbon-now-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-J7H1oofgosFGxoHzcx+UxaRbqGwqrmk6MYmMISpNB6w=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix
index add501d496ea..6495652b190b 100644
--- a/pkgs/by-name/ca/cargo-about/package.nix
+++ b/pkgs/by-name/ca/cargo-about/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-about";
-    tag = version;
+    rev = version;
     sha256 = "sha256-h5+Fp6+yGa1quJENsCv6WE4NC2A+ceIGMXVWyeTPPLQ=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-autoinherit/package.nix b/pkgs/by-name/ca/cargo-autoinherit/package.nix
index 075f5e1ca916..f444b846eb5f 100644
--- a/pkgs/by-name/ca/cargo-autoinherit/package.nix
+++ b/pkgs/by-name/ca/cargo-autoinherit/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mainmatter";
     repo = "cargo-autoinherit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A4Ooqt/Cb8yyc4Y9DKZuFEVUux1ot+IVkPsSDylM6G4=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix
index acd75880ba6a..98607fe755ff 100644
--- a/pkgs/by-name/ca/cargo-benchcmp/package.nix
+++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "cargo-benchcmp";
-    tag = version;
+    rev = version;
     hash = "sha256-J8KFI0V/mOhUlYtVnFAQgPIpXL9/dLhOFxSly4bR00I=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index 0794ff09ee61..e82557f33b24 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cargo-bins";
     repo = "cargo-binstall";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mGb6ZHi6XGYiVe0NHcBx7MWtcSDK2/wXpM4j0GiczEk=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
index fab41bf8377f..3a4c056117ba 100644
--- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
+++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "cargo-bisect-rustc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7HiM1oRuLSfRaum66duag/w8ncFdxRLF0yeSGlIey0Y=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bitbake/package.nix b/pkgs/by-name/ca/cargo-bitbake/package.nix
index 6495780b181c..d2aa69377924 100644
--- a/pkgs/by-name/ca/cargo-bitbake/package.nix
+++ b/pkgs/by-name/ca/cargo-bitbake/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "meta-rust";
     repo = "cargo-bitbake";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+ovC4nZwHzf9hjfv2LcnTztM2m++tpC3mUSS/I0l6Ck=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bloat/package.nix b/pkgs/by-name/ca/cargo-bloat/package.nix
index cda683a061c2..fc82a2f38e47 100644
--- a/pkgs/by-name/ca/cargo-bloat/package.nix
+++ b/pkgs/by-name/ca/cargo-bloat/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "RazrFalcon";
     repo = "cargo-bloat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B71VX7cJe1giOLmk3cQE8Zxr7fKGyQkoXRuM+NzBcb8=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bootimage/package.nix b/pkgs/by-name/ca/cargo-bootimage/package.nix
index 9d45a5304d81..346c408d7021 100644
--- a/pkgs/by-name/ca/cargo-bootimage/package.nix
+++ b/pkgs/by-name/ca/cargo-bootimage/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-osdev";
     repo = "bootimage";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "12p18mk3l473is3ydv3zmn6s7ck8wgjwavllimcpja3yjilxm3zg";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix
index 2c2a4528b44f..af31e5f60aab 100644
--- a/pkgs/by-name/ca/cargo-bump/package.nix
+++ b/pkgs/by-name/ca/cargo-bump/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rustadopt";
     repo = "cargo-bump";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PhA7uC2gJcBnUQPWgZC51p/KTSxSGld3m+dd6BhW6q8=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
index bc53cb5c6bea..d56c65f42581 100644
--- a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = "cargo-bundle-licenses";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pTxZ9s8ZccylMfEiifYmJuBB+riZ37QJSAMpVuSgLzs=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-cache/package.nix b/pkgs/by-name/ca/cargo-cache/package.nix
index 83ad6074e2e0..90fd9685b3d7 100644
--- a/pkgs/by-name/ca/cargo-cache/package.nix
+++ b/pkgs/by-name/ca/cargo-cache/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "matthiaskrgr";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-q9tYKXK8RqiqbDZ/lTxUI1Dm/h28/yZR8rTQuq+roZs=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-careful/package.nix b/pkgs/by-name/ca/cargo-careful/package.nix
index aade7b851e06..849ec6df3eb3 100644
--- a/pkgs/by-name/ca/cargo-careful/package.nix
+++ b/pkgs/by-name/ca/cargo-careful/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "RalfJung";
     repo = "cargo-careful";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pYfyqsS+bGwSP6YZAtI+8iMXdID/hrCiX+cuYoYiZmc=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix
index f1a79f85946b..9d052d9df626 100644
--- a/pkgs/by-name/ca/cargo-component/package.nix
+++ b/pkgs/by-name/ca/cargo-component/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "cargo-component";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pW3hhcsMzKSWmUX8HwAtZCB+v9B4qXw6WUGODhPtW+Q=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-cranky/package.nix b/pkgs/by-name/ca/cargo-cranky/package.nix
index 0597103120ed..d99831848cb4 100644
--- a/pkgs/by-name/ca/cargo-cranky/package.nix
+++ b/pkgs/by-name/ca/cargo-cranky/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ericseppanen";
     repo = "cargo-cranky";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3ARl3z+2nz05UaKf8ChN6mvPY2qMjUNxGnGJ1P0xkas=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-criterion/package.nix b/pkgs/by-name/ca/cargo-criterion/package.nix
index 64acf7763c02..5a33f8caacf7 100644
--- a/pkgs/by-name/ca/cargo-criterion/package.nix
+++ b/pkgs/by-name/ca/cargo-criterion/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bheisler";
     repo = "cargo-criterion";
-    tag = version;
+    rev = version;
     sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix
index b68693b2fe0e..56d9951cb20a 100644
--- a/pkgs/by-name/ca/cargo-deadlinks/package.nix
+++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "deadlinks";
     repo = "cargo-deadlinks";
-    tag = version;
+    rev = version;
     sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh";
   };
 
diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix
index 45ac3e65c1bd..f54a2c67e987 100644
--- a/pkgs/by-name/ca/cargo-deb/package.nix
+++ b/pkgs/by-name/ca/cargo-deb/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = "cargo-deb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-E0PU0j0n1ITP65D+p1upn3cBFBKkoCbyHe6S5XxDAyU=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index 1f18bcaee54b..61bfb416f9af 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-deny";
-    tag = version;
+    rev = version;
     hash = "sha256-u93x0w6gSPxDCrp9bNJDCxLBZfh8EhXU4qvhklI4GKY=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-dephell/package.nix b/pkgs/by-name/ca/cargo-dephell/package.nix
index 00ea26c923c0..d0fbd26e846e 100644
--- a/pkgs/by-name/ca/cargo-dephell/package.nix
+++ b/pkgs/by-name/ca/cargo-dephell/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mimoo";
     repo = "cargo-dephell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NOjkKttA+mwPCpl4uiRIYD58DlMomVFpwnM9KGfWd+w=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix
index 2ed74c228386..a8310189dc1e 100644
--- a/pkgs/by-name/ca/cargo-diet/package.nix
+++ b/pkgs/by-name/ca/cargo-diet/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "the-lean-crate";
     repo = "cargo-diet";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SuJ1H/2YfSVVigdgLUd9veMClI7ZT7xkkyQ4PfXoQdQ=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix
index 1c5beeac3d2a..d97e19fb6a5e 100644
--- a/pkgs/by-name/ca/cargo-dist/package.nix
+++ b/pkgs/by-name/ca/cargo-dist/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "axodotdev";
     repo = "cargo-dist";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0mKCwb7nvl8BRtQyweItkMT0PrKRGTvpB9Acgro7QSM=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-docset/package.nix b/pkgs/by-name/ca/cargo-docset/package.nix
index 9537e60967b7..ac2195ee3cb0 100644
--- a/pkgs/by-name/ca/cargo-docset/package.nix
+++ b/pkgs/by-name/ca/cargo-docset/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Robzz";
     repo = "cargo-docset";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o2CSQiU9fEoS3eRmwphtYGZTwn3mstRm2Tlvval83+U=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-duplicates/package.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix
index 7b8f28de0b49..8ab9656c8c22 100644
--- a/pkgs/by-name/ca/cargo-duplicates/package.nix
+++ b/pkgs/by-name/ca/cargo-duplicates/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Keruspe";
     repo = "cargo-duplicates";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JzS1+BHSCEcZM5MokbQsck/AGJ7EeSwbzjNz0uLQsgE=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-espmonitor/package.nix b/pkgs/by-name/ca/cargo-espmonitor/package.nix
index 8e9f46e4346b..d0d356bd47f5 100644
--- a/pkgs/by-name/ca/cargo-espmonitor/package.nix
+++ b/pkgs/by-name/ca/cargo-espmonitor/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espmonitor";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "hWFdim84L2FfG6p9sEf+G5Uq4yhp5kv1ZMdk4sMHa+4=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index ca7ad9c39df7..bdf13f371b85 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cargo-expand";
-    tag = version;
+    rev = version;
     hash = "sha256-PSiuTw3H3vl4Tnts5eOTd1v8SLPvYZCkuQ/pTSa3O18=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-feature/package.nix b/pkgs/by-name/ca/cargo-feature/package.nix
index 875d3ff48d69..ca7a1c465d42 100644
--- a/pkgs/by-name/ca/cargo-feature/package.nix
+++ b/pkgs/by-name/ca/cargo-feature/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Riey";
     repo = "cargo-feature";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UPpqkz/PwoMaJan9itfldjyTmZmiMb6PzCyu9Vtjj1s=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-features-manager/package.nix b/pkgs/by-name/ca/cargo-features-manager/package.nix
index 49150057b63c..6a6b75b46561 100644
--- a/pkgs/by-name/ca/cargo-features-manager/package.nix
+++ b/pkgs/by-name/ca/cargo-features-manager/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ToBinio";
     repo = "cargo-features-manager";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NjXJCrLsX52M7CBg8wdgwlK3gaGiznfdRGz7BAbVVPk=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-fuzz/package.nix b/pkgs/by-name/ca/cargo-fuzz/package.nix
index 16ad0196d593..b238b5f05e47 100644
--- a/pkgs/by-name/ca/cargo-fuzz/package.nix
+++ b/pkgs/by-name/ca/cargo-fuzz/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-fuzz";
     repo = "cargo-fuzz";
-    tag = version;
+    rev = version;
     hash = "sha256-PC36O5+eB+yVLpz+EywBDGcMAtHl79FYwUo/l/JL8hM=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix
index ea8933ee8e7c..3c4d01d28f37 100644
--- a/pkgs/by-name/ca/cargo-generate/package.nix
+++ b/pkgs/by-name/ca/cargo-generate/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cargo-generate";
     repo = "cargo-generate";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-iOZCSd6jF1OF7ScjpsMlvMjsFHyg6QJJ6qk0OxrARho=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-i18n/package.nix b/pkgs/by-name/ca/cargo-i18n/package.nix
index 2a705c2322a6..bf367aee4074 100644
--- a/pkgs/by-name/ca/cargo-i18n/package.nix
+++ b/pkgs/by-name/ca/cargo-i18n/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kellpossible";
     repo = "cargo-i18n";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-azwQlXsoCgNB/TjSBBE+taUR1POBJXaPnS5Sr+HVR90=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix
index e3f1e1893c27..51dde7bc7058 100644
--- a/pkgs/by-name/ca/cargo-leptos/package.nix
+++ b/pkgs/by-name/ca/cargo-leptos/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "leptos-rs";
     repo = "cargo-leptos";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SjpfM963Zux+H5QhK8prvDLuI56fP5PqX5gcVbthRx4=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-limit/package.nix b/pkgs/by-name/ca/cargo-limit/package.nix
index b3774bc233de..b977ddefb39e 100644
--- a/pkgs/by-name/ca/cargo-limit/package.nix
+++ b/pkgs/by-name/ca/cargo-limit/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alopatindev";
     repo = "cargo-limit";
-    tag = version;
+    rev = version;
     sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
index 3cee860e2671..1ad5df27c772 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     inherit owner;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-iJrnNDSMich5OzEbPgnQWLVz6Zj/MUIzEsaBzqVdoDg=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
index d357ae3ae026..027ff4b7c512 100644
--- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cargo-llvm-lines";
-    tag = version;
+    rev = version;
     hash = "sha256-qKdxnISussiyp1ylahS7qOdMfOGwJnlbWrgEHf/L2y0=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix
index 59175916ab3c..33851806f7ea 100644
--- a/pkgs/by-name/ca/cargo-local-registry/package.nix
+++ b/pkgs/by-name/ca/cargo-local-registry/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dhovart";
     repo = "cargo-local-registry";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hG6OSi0I7Y6KZacGR9MCC+e7YcDcvaVfR3LSOjqz23A=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-machete/package.nix b/pkgs/by-name/ca/cargo-machete/package.nix
index ff65b177e3a5..4f4a47448051 100644
--- a/pkgs/by-name/ca/cargo-machete/package.nix
+++ b/pkgs/by-name/ca/cargo-machete/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bnjbvr";
     repo = "cargo-machete";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0vlau3leAAonV5E9NAtSqw45eKoZBzHx0BmoEY86Eq8=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix
index c5a754bc1a8f..5581bad62b2a 100644
--- a/pkgs/by-name/ca/cargo-make/package.nix
+++ b/pkgs/by-name/ca/cargo-make/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sagiegurari";
     repo = "cargo-make";
-    tag = version;
+    rev = version;
     hash = "sha256-hrUd4J15cDyd78BVVzi8jiDqJI1dE35WUdOo6Tq8gH8=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix
index e2ce9dfc00cd..f97aa1bdf8a7 100644
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sourcefrog";
     repo = "cargo-mutants";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aTGuCkPk1GYUlRXCdNIy94d5zHxUPpNNFN4aapf8s0U=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-outdated/package.nix b/pkgs/by-name/ca/cargo-outdated/package.nix
index 98bee3a81a79..d76f344a63a6 100644
--- a/pkgs/by-name/ca/cargo-outdated/package.nix
+++ b/pkgs/by-name/ca/cargo-outdated/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kbknapp";
     repo = "cargo-outdated";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ey11ANSflWGnCsn6M9GupgC4DE5mWww6vw5pK0CFdLo=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-pgo/package.nix b/pkgs/by-name/ca/cargo-pgo/package.nix
index a8b908427a0e..d4a837ba2b16 100644
--- a/pkgs/by-name/ca/cargo-pgo/package.nix
+++ b/pkgs/by-name/ca/cargo-pgo/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kobzol";
     repo = "cargo-pgo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FmZllibhesZY/8kIMnx4VfQrYF6+/cai7Gozda/3bMY=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix
index c57317fd21b0..83a620f87305 100644
--- a/pkgs/by-name/ca/cargo-play/package.nix
+++ b/pkgs/by-name/ca/cargo-play/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fanzeyi";
     repo = "cargo-play";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-raze/package.nix b/pkgs/by-name/ca/cargo-raze/package.nix
index c3ce7c8488ce..b3e40543ed3f 100644
--- a/pkgs/by-name/ca/cargo-raze/package.nix
+++ b/pkgs/by-name/ca/cargo-raze/package.nix
@@ -14,7 +14,7 @@ let
   src = fetchFromGitHub {
     owner = "google";
     repo = "cargo-raze";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dn1MrF+FYBG+vD5AfXCwmzskmKK/TXArnMWW2BAfFFQ=";
   };
 in
diff --git a/pkgs/by-name/ca/cargo-readme/package.nix b/pkgs/by-name/ca/cargo-readme/package.nix
index 504b21085766..bb50a2f5d795 100644
--- a/pkgs/by-name/ca/cargo-readme/package.nix
+++ b/pkgs/by-name/ca/cargo-readme/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "webern";
     repo = "cargo-readme";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-rr/package.nix b/pkgs/by-name/ca/cargo-rr/package.nix
index 387a66e53676..87d3490e6cec 100644
--- a/pkgs/by-name/ca/cargo-rr/package.nix
+++ b/pkgs/by-name/ca/cargo-rr/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "danielzfranklin";
     repo = "cargo-rr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index bca7894d4e19..f35310fe2f32 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "Boshen";
     repo = "cargo-shear";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FvZJ0RFa5b9BQuZ1fmkvJhZj59yAsKSkKoTE0Emzdos=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix
index 2287b7b59972..157a1f175e8c 100644
--- a/pkgs/by-name/ca/cargo-shuttle/package.nix
+++ b/pkgs/by-name/ca/cargo-shuttle/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shuttle-hq";
     repo = "shuttle";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RXt9qcLepJJA+MMFm26UMLuwgh8V13DoBueY1Z+W63w=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-sort/package.nix b/pkgs/by-name/ca/cargo-sort/package.nix
index 6e09b98b180f..75e32f0aa49e 100644
--- a/pkgs/by-name/ca/cargo-sort/package.nix
+++ b/pkgs/by-name/ca/cargo-sort/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "devinr528";
     repo = "cargo-sort";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-supply-chain/package.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix
index ec62f3a0da86..95431b78947f 100644
--- a/pkgs/by-name/ca/cargo-supply-chain/package.nix
+++ b/pkgs/by-name/ca/cargo-supply-chain/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-secure-code";
     repo = "cargo-supply-chain";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KjeYB9TFbuJ2KPaObeM0ADs5F8uJJ6/czMPQjBUgIk8=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-sweep/package.nix b/pkgs/by-name/ca/cargo-sweep/package.nix
index 27291cb4418e..da258b64fcfa 100644
--- a/pkgs/by-name/ca/cargo-sweep/package.nix
+++ b/pkgs/by-name/ca/cargo-sweep/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "holmgr";
     repo = "cargo-sweep";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix
index d3abe519950b..a2ebd230797f 100644
--- a/pkgs/by-name/ca/cargo-swift/package.nix
+++ b/pkgs/by-name/ca/cargo-swift/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "antoniusnaumann";
     repo = "cargo-swift";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T8cIZJwnA3bFMIEezMrh5LRXV1SRCAVLanQm7rmc0sU=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-sync-readme/package.nix b/pkgs/by-name/ca/cargo-sync-readme/package.nix
index 11ff34bae613..f80d99c916e6 100644
--- a/pkgs/by-name/ca/cargo-sync-readme/package.nix
+++ b/pkgs/by-name/ca/cargo-sync-readme/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "phaazon";
     repo = "cargo-sync-readme";
-    tag = version;
+    rev = version;
     sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix
index 5bec28db8c98..c1efbb8ca254 100644
--- a/pkgs/by-name/ca/cargo-temp/package.nix
+++ b/pkgs/by-name/ca/cargo-temp/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yozhgoor";
     repo = "cargo-temp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-71kAlZKSBnROZ8wXe4kQa8nNug5/hk6NKsqHoQU5pWc=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix
index 2c0b3efec85a..60d3394df4e6 100644
--- a/pkgs/by-name/ca/cargo-typify/package.nix
+++ b/pkgs/by-name/ca/cargo-typify/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "oxidecomputer";
     repo = "typify";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vokhWIY5iikTyADrqxp6DIq+tJ+xdFPebDFTddJnstA=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-wipe/package.nix b/pkgs/by-name/ca/cargo-wipe/package.nix
index e37d662a4476..fe6a8704c5c9 100644
--- a/pkgs/by-name/ca/cargo-wipe/package.nix
+++ b/pkgs/by-name/ca/cargo-wipe/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mihai-dinculescu";
     repo = "cargo-wipe";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xMYpZ6a8HdULblkfEqnqLjX8OVFJWx8MHDGNhuFzdTc=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-wizard/package.nix b/pkgs/by-name/ca/cargo-wizard/package.nix
index 7b9ba2177acb..1096c2324439 100644
--- a/pkgs/by-name/ca/cargo-wizard/package.nix
+++ b/pkgs/by-name/ca/cargo-wizard/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kobzol";
     repo = "cargo-wizard";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oFPSgjXZ+Kq59tV/7s6WPF6FHXENoZv8D245yyT0E9E=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-xbuild/package.nix b/pkgs/by-name/ca/cargo-xbuild/package.nix
index 97f2d8035398..973edf44d469 100644
--- a/pkgs/by-name/ca/cargo-xbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-xbuild/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-osdev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-29rCjmzxxIjR5nBN2J3xxP+r8NnPIJV90FkSQQEBbo4=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index 73776b9579eb..5cdbbea67be7 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-cross";
     repo = "cargo-xwin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bzyEIBOa0yqjAYjWGw4Fbb8Cv3yCCfJ4vV0q600Rwyk=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index ce109f0577eb..8ecc440197a6 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "messense";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-S/Xx487z8LFjCSrB9tQTJy4+AQial2Dptg5xZqzPkVE=";
   };
 
diff --git a/pkgs/by-name/ca/carl/package.nix b/pkgs/by-name/ca/carl/package.nix
index e2b1560cf50e..c0e5ead27701 100644
--- a/pkgs/by-name/ca/carl/package.nix
+++ b/pkgs/by-name/ca/carl/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "b1rger";
     repo = "carl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+l11eP+1qKrWbZhyUJgQ8FgQ+2rncx778F5RPzCfvV4=";
   };
 
diff --git a/pkgs/by-name/ca/caroline/package.nix b/pkgs/by-name/ca/caroline/package.nix
index 98bec7df49ee..3ef2e4b35251 100644
--- a/pkgs/by-name/ca/caroline/package.nix
+++ b/pkgs/by-name/ca/caroline/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dcharles525";
     repo = "caroline";
-    tag = version;
+    rev = version;
     hash = "sha256-v423h9EC/h6B9VABhkvmYcyYXKPpvqhI8O7ZjbO637k";
   };
 
diff --git a/pkgs/by-name/ca/carp/package.nix b/pkgs/by-name/ca/carp/package.nix
index 83583cb78c22..5325019c7785 100644
--- a/pkgs/by-name/ca/carp/package.nix
+++ b/pkgs/by-name/ca/carp/package.nix
@@ -14,7 +14,7 @@ haskellPackages.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "carp-lang";
     repo = "Carp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-B7SBzjegFzL2gGivIJE6BZcLD3f0Bsh8yndjScG2TZI=";
   };
 
diff --git a/pkgs/by-name/ca/carto/package.nix b/pkgs/by-name/ca/carto/package.nix
index 79973de850b2..1183c7bdd983 100644
--- a/pkgs/by-name/ca/carto/package.nix
+++ b/pkgs/by-name/ca/carto/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "carto";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TylMgb2EI52uFmVeMJiQltgNCSh6MutFwUjsYC7gfEA=";
   };
 
diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix
index cbc1b277c448..8cf856a27a8f 100644
--- a/pkgs/by-name/ca/casadi/package.nix
+++ b/pkgs/by-name/ca/casadi/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "casadi";
     repo = "casadi";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-WumXAWO65XnNQqHMqAwfj2Y+KGOVTWx95qIuyE1M9us=";
   };
 
diff --git a/pkgs/by-name/ca/cassette/package.nix b/pkgs/by-name/ca/cassette/package.nix
index aca0e7e91d2b..7dfe2e770e06 100644
--- a/pkgs/by-name/ca/cassette/package.nix
+++ b/pkgs/by-name/ca/cassette/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Rirusha";
     repo = "Cassette";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DXCOrCntOgUPYMVRqC4jDNTFgUjShCBoYQgLtSnuz6U=";
   };
 
diff --git a/pkgs/by-name/ca/cassowary/package.nix b/pkgs/by-name/ca/cassowary/package.nix
index 2aca23d73ee0..f2f255e7ac5c 100644
--- a/pkgs/by-name/ca/cassowary/package.nix
+++ b/pkgs/by-name/ca/cassowary/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rogerwelin";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zaG4HrdTGXTalMFz/huRW32RZBQx55AvUi29tz6vFD8=";
   };
 
diff --git a/pkgs/by-name/ca/castero/package.nix b/pkgs/by-name/ca/castero/package.nix
index bf079dbf17c7..bc1d84690fb0 100644
--- a/pkgs/by-name/ca/castero/package.nix
+++ b/pkgs/by-name/ca/castero/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xgi";
     repo = "castero";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6/7oCKBMEcQeJ8PaFP15Xef9sQRYCpigtzINv2M6GUY=";
   };
 
diff --git a/pkgs/by-name/ca/castnow/package.nix b/pkgs/by-name/ca/castnow/package.nix
index 1423f61502f7..cff938b11551 100644
--- a/pkgs/by-name/ca/castnow/package.nix
+++ b/pkgs/by-name/ca/castnow/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "xat";
     repo = "castnow";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vAjeDPH+Lu/vj3GhwytXqpbSkg5hKpXsMRNV+8TUeio=";
   };
 
diff --git a/pkgs/by-name/ca/catatonit/package.nix b/pkgs/by-name/ca/catatonit/package.nix
index 1360d783b92e..1844d936d6b5 100644
--- a/pkgs/by-name/ca/catatonit/package.nix
+++ b/pkgs/by-name/ca/catatonit/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sc/T4WjCPFfwUWxlBx07mQTmcOApblHygfVT824HcJM=";
   };
 
diff --git a/pkgs/by-name/ca/catch/package.nix b/pkgs/by-name/ca/catch/package.nix
index 6e071cce8b52..96bb28887d19 100644
--- a/pkgs/by-name/ca/catch/package.nix
+++ b/pkgs/by-name/ca/catch/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1gdp5wm8khn02g2miz381llw3191k7309qj8s3jd6sasj01rhf23";
   };
 
diff --git a/pkgs/by-name/ca/catimg/package.nix b/pkgs/by-name/ca/catimg/package.nix
index 56e05248870e..9b2df1c394ec 100644
--- a/pkgs/by-name/ca/catimg/package.nix
+++ b/pkgs/by-name/ca/catimg/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "posva";
     repo = "catimg";
-    tag = version;
+    rev = version;
     sha256 = "0a2dswbv4xddb2l2d55hc43lzvjwrjs5z9am7v6i0p0mi2fmc89s";
   };
 
diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix
index 4fb0032958fb..7687535405e8 100644
--- a/pkgs/by-name/ca/catnip/package.nix
+++ b/pkgs/by-name/ca/catnip/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "noriah";
     repo = "catnip";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9gneteQIzbMNjg/08uq+pCbs2a32He2gL+hovxcJFzE=";
   };
 
diff --git a/pkgs/by-name/ca/catppuccin-cursors/package.nix b/pkgs/by-name/ca/catppuccin-cursors/package.nix
index 13c39d2149db..6bd4bfc0a378 100644
--- a/pkgs/by-name/ca/catppuccin-cursors/package.nix
+++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "cursors";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qis6p+/m7+DdRDYzLq9yB2eZGpfZe5z5xRsa/1HoIG4=";
   };
 
diff --git a/pkgs/by-name/ca/catppuccin-grub/package.nix b/pkgs/by-name/ca/catppuccin-grub/package.nix
index 73a52f84f652..7472007f0220 100644
--- a/pkgs/by-name/ca/catppuccin-grub/package.nix
+++ b/pkgs/by-name/ca/catppuccin-grub/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "grub";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0=";
   };
 
diff --git a/pkgs/by-name/ca/catppuccin-gtk/package.nix b/pkgs/by-name/ca/catppuccin-gtk/package.nix
index 922f6973e979..f2a30186c456 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";
-      tag = "v${version}";
+      rev = "v${version}";
       fetchSubmodules = true;
       hash = "sha256-q5/VcFsm3vNEw55zq/vcM11eo456SYE5TQA3g2VQjGc=";
     };
diff --git a/pkgs/by-name/ca/catppuccin-kde/package.nix b/pkgs/by-name/ca/catppuccin-kde/package.nix
index 0414d49960ed..7569d0f253d1 100644
--- a/pkgs/by-name/ca/catppuccin-kde/package.nix
+++ b/pkgs/by-name/ca/catppuccin-kde/package.nix
@@ -58,7 +58,7 @@ lib.checkListOfEnum "Invalid accent, valid accents are ${toString validAccents}"
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "kde";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-pfG0L4eSXLYLZM8Mhla4yalpEro74S9kc0sOmQtnG3w=";
     };
 
diff --git a/pkgs/by-name/ca/catppuccin-sddm/package.nix b/pkgs/by-name/ca/catppuccin-sddm/package.nix
index 5a1b9fb5c155..1de2521a5f42 100644
--- a/pkgs/by-name/ca/catppuccin-sddm/package.nix
+++ b/pkgs/by-name/ca/catppuccin-sddm/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "sddm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SdpkuonPLgCgajW99AzJaR8uvdCPi4MdIxS5eB+Q9WQ=";
   };
 
diff --git a/pkgs/by-name/ca/catppuccinifier-cli/package.nix b/pkgs/by-name/ca/catppuccinifier-cli/package.nix
index f29ca2ceec1c..eff6c9216011 100644
--- a/pkgs/by-name/ca/catppuccinifier-cli/package.nix
+++ b/pkgs/by-name/ca/catppuccinifier-cli/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lighttigerXIV";
     repo = "catppuccinifier";
-    tag = version;
+    rev = version;
     hash = "sha256-CEjdCr7QgyQw+1VmeEyt95R0HKE0lAKZHrwahaxgJoU=";
   };
 
diff --git a/pkgs/by-name/ca/cava/package.nix b/pkgs/by-name/ca/cava/package.nix
index 98be634953f0..8deb020998ad 100644
--- a/pkgs/by-name/ca/cava/package.nix
+++ b/pkgs/by-name/ca/cava/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "karlstav";
     repo = "cava";
-    tag = version;
+    rev = version;
     hash = "sha256-oKEUddzg7Gt3uu6x9D65JX0PvuC59r7Psb9VZz3+nCc=";
   };
 
diff --git a/pkgs/by-name/ca/cayley/package.nix b/pkgs/by-name/ca/cayley/package.nix
index a0a29947113b..f6afb01a2e42 100644
--- a/pkgs/by-name/ca/cayley/package.nix
+++ b/pkgs/by-name/ca/cayley/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cayleygraph";
     repo = "cayley";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jIX0v6ujiQvEAb/mKkrpNgsY0YLkJYHy2sUfQnooE48=";
   };
 
diff --git a/pkgs/by-name/cb/cbatticon/package.nix b/pkgs/by-name/cb/cbatticon/package.nix
index 9e0e4b9d7b7a..f5050e42624f 100644
--- a/pkgs/by-name/cb/cbatticon/package.nix
+++ b/pkgs/by-name/cb/cbatticon/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "valr";
     repo = "cbatticon";
-    tag = version;
+    rev = version;
     sha256 = "sha256-VQjJujF9lnVvQxV+0YqodLgnI9F90JKDAGBu5nM/Q/c=";
   };
 
diff --git a/pkgs/by-name/cb/cbconvert/package.nix b/pkgs/by-name/cb/cbconvert/package.nix
index 4c49410f1fc7..1b0c195df670 100644
--- a/pkgs/by-name/cb/cbconvert/package.nix
+++ b/pkgs/by-name/cb/cbconvert/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gen2brain";
     repo = "cbconvert";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-C2Eox6fpKS0fPB7KFgBn62HKbWYacSVMJK0CkT6+FBU=";
   };
 
diff --git a/pkgs/by-name/cb/cbfmt/package.nix b/pkgs/by-name/cb/cbfmt/package.nix
index 1d44be612872..1486293f4f6b 100644
--- a/pkgs/by-name/cb/cbfmt/package.nix
+++ b/pkgs/by-name/cb/cbfmt/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lukas-reineke";
     repo = "cbfmt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/ZvL1ZHXcmE1n+hHvJeSqmnI9nSHJ+zM9lLNx0VQfIE=";
   };
 
diff --git a/pkgs/by-name/cb/cbmp/package.nix b/pkgs/by-name/cb/cbmp/package.nix
index 1eba5d150d4f..402c3233529d 100644
--- a/pkgs/by-name/cb/cbmp/package.nix
+++ b/pkgs/by-name/cb/cbmp/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "ful1e5";
     repo = "cbmp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vOEz2KGJLCiiX+Or9y0JE9UF7sYbwaSCVm5iBv4jIdI=";
   };
 
diff --git a/pkgs/by-name/cb/cbonsai/package.nix b/pkgs/by-name/cb/cbonsai/package.nix
index 6c1d58dc46d8..9feb1f3ba012 100644
--- a/pkgs/by-name/cb/cbonsai/package.nix
+++ b/pkgs/by-name/cb/cbonsai/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "jallbrit";
     repo = "cbonsai";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XFK6DiIb8CzVubTnEMkqRW8xZkX/SWjUsrfS+I7LOs8=";
   };
 
diff --git a/pkgs/by-name/cc/ccls/package.nix b/pkgs/by-name/cc/ccls/package.nix
index 89230db86a85..5e40d5fc0f40 100644
--- a/pkgs/by-name/cc/ccls/package.nix
+++ b/pkgs/by-name/cc/ccls/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MaskRay";
     repo = "ccls";
-    tag = version;
+    rev = version;
     sha256 = "sha256-0hZ4VnscnKYBrXy58IjeoeDxja1oNq0mNaQGPmej5BA=";
   };
 
diff --git a/pkgs/by-name/cc/cconv/package.nix b/pkgs/by-name/cc/cconv/package.nix
index cc01f902b705..cc739c86ce3b 100644
--- a/pkgs/by-name/cc/cconv/package.nix
+++ b/pkgs/by-name/cc/cconv/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xiaoyjy";
     repo = "cconv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "RAFl/+I+usUfeG/l17F3ltThK7G4+TekyQGwzQIgeH8=";
   };
 
diff --git a/pkgs/by-name/cd/cddlib/package.nix b/pkgs/by-name/cd/cddlib/package.nix
index 6df087acd07c..a745c3a5b42e 100644
--- a/pkgs/by-name/cd/cddlib/package.nix
+++ b/pkgs/by-name/cd/cddlib/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cddlib";
     repo = "cddlib";
-    tag = version;
+    rev = version;
     sha256 = "09s8323h5w9j6mpl1yc6lm770dkskfxd2ayyafkcjllmnncxzfa0";
   };
   buildInputs = [ gmp ];
diff --git a/pkgs/by-name/cd/cde/package.nix b/pkgs/by-name/cd/cde/package.nix
index fb2e9c92b47d..d61c888d482b 100644
--- a/pkgs/by-name/cd/cde/package.nix
+++ b/pkgs/by-name/cd/cde/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "usnistgov";
     repo = "corr-CDE";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-s375gtqBWx0GGXALXR+fN4bb3tmpvPNu/3bNz+75UWU=";
   };
 
diff --git a/pkgs/by-name/cd/cdogs-sdl/package.nix b/pkgs/by-name/cd/cdogs-sdl/package.nix
index 3690a0a47f04..0fe49ca587a6 100644
--- a/pkgs/by-name/cd/cdogs-sdl/package.nix
+++ b/pkgs/by-name/cd/cdogs-sdl/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "cdogs-sdl";
     owner = "cxong";
-    tag = version;
+    rev = version;
     sha256 = "sha256-I4v13CPdA2KYwhlIJjz+qgKe2EoXUtV6iWeadrg4Usc=";
   };
 
diff --git a/pkgs/by-name/cd/cdwe/package.nix b/pkgs/by-name/cd/cdwe/package.nix
index 5ceca51cfb60..39c8935faedc 100644
--- a/pkgs/by-name/cd/cdwe/package.nix
+++ b/pkgs/by-name/cd/cdwe/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "synoet";
     repo = "cdwe";
-    tag = version;
+    rev = version;
     hash = "sha256-6NWhx82BXhWhbI18k5gE3vEkw9v5gstE8ICJhtq68rM=";
   };
 
diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix
index 5b475ab7d9c8..e4c1fdaba998 100644
--- a/pkgs/by-name/ce/cel-go/package.nix
+++ b/pkgs/by-name/ce/cel-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "cel-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-t451e3Pkkt4pmBvS0DBSHOVg7P8ipJd28XyiQ6P/QIQ=";
   };
 
diff --git a/pkgs/by-name/ce/celeste/package.nix b/pkgs/by-name/ce/celeste/package.nix
index 68f6f1a3e39e..48ef60083dde 100644
--- a/pkgs/by-name/ce/celeste/package.nix
+++ b/pkgs/by-name/ce/celeste/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hwittenborn";
     repo = "celeste";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Yj2PvAlAkwLaSE27KnzEmiRAD5K/YVGbF4+N3uhDVT8=";
   };
 
diff --git a/pkgs/by-name/ce/celeste64/package.nix b/pkgs/by-name/ce/celeste64/package.nix
index 8e61492852ff..e24921723e4b 100644
--- a/pkgs/by-name/ce/celeste64/package.nix
+++ b/pkgs/by-name/ce/celeste64/package.nix
@@ -25,7 +25,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     repo = "Celeste64";
     owner = "ExOK";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XRAjDYIqYaQYCWNNT7UuLDKDBgq3vqxtCzay7pGICtA=";
   };
   projectFile = "Celeste64.csproj";
diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix
index 7b7f0407f3e6..28c90ea1d828 100644
--- a/pkgs/by-name/ce/cemu/package.nix
+++ b/pkgs/by-name/ce/cemu/package.nix
@@ -45,7 +45,7 @@ let
     src = fetchFromGitHub {
       owner = "ocornut";
       repo = "imgui";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-J4gz4rnydu8JlzqNC/OIoVoRcgeFd6B1Qboxu5drOKY=";
     };
   };
diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix
index 1726946979ba..7e11eefbca64 100644
--- a/pkgs/by-name/ce/centerpiece/package.nix
+++ b/pkgs/by-name/ce/centerpiece/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "friedow";
     repo = "centerpiece";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tZNwMPL1ITWVvoywojsd5j0GIVQt6pOKFLwi7jwqLKg=";
   };
 
diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix
index 17a373172c93..e96f82a984b6 100644
--- a/pkgs/by-name/ce/centrifugo/package.nix
+++ b/pkgs/by-name/ce/centrifugo/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "centrifugal";
     repo = "centrifugo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FDtAkoN1bdqVUEP0obbXBfQfVRpZN5YXbU1KT1yXWuI=";
   };
 
diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix
index 56948961c43a..8db4efbf105c 100644
--- a/pkgs/by-name/ce/ceph-csi/package.nix
+++ b/pkgs/by-name/ce/ceph-csi/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ceph";
     repo = "ceph-csi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Wa5elZbQotgeb4pH9DIZd48CQyBJ0O5y1SidIb/iyGY=";
   };
 
diff --git a/pkgs/by-name/ce/cero/package.nix b/pkgs/by-name/ce/cero/package.nix
index 6785ff9a523c..77c88389a9c2 100644
--- a/pkgs/by-name/ce/cero/package.nix
+++ b/pkgs/by-name/ce/cero/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "glebarez";
     repo = "cero";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-t2u6Q8CatUIQKk146uor367vr85O6KU8Gf8LZFZTESU=";
   };
 
diff --git a/pkgs/by-name/ce/certgraph/package.nix b/pkgs/by-name/ce/certgraph/package.nix
index 99b4adc87283..7f5eac96c4e5 100644
--- a/pkgs/by-name/ce/certgraph/package.nix
+++ b/pkgs/by-name/ce/certgraph/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lanrat";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-7tvPiJHZE9X7I79DFNF1ZAQiaAkrtrXiD2fY7AkbWMk=";
   };
 
diff --git a/pkgs/by-name/ce/certigo/package.nix b/pkgs/by-name/ce/certigo/package.nix
index 01491cb6729f..bf5286c1a693 100644
--- a/pkgs/by-name/ce/certigo/package.nix
+++ b/pkgs/by-name/ce/certigo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "square";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+j1NeQJPDwQxXVYnHNmL49Li2IMH+9ehS0HSM3kqyxU=";
   };
 
diff --git a/pkgs/by-name/ce/certinfo/package.nix b/pkgs/by-name/ce/certinfo/package.nix
index 51df4b5fb636..073c6ce3ed9c 100644
--- a/pkgs/by-name/ce/certinfo/package.nix
+++ b/pkgs/by-name/ce/certinfo/package.nix
@@ -14,7 +14,7 @@ buildGo123Module rec {
   src = fetchFromGitHub {
     owner = "pete911";
     repo = "certinfo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BI5gYWKGMU0wLvnArG41bLWj+9ipe/GARKRX0fwz4ag=";
   };
 
diff --git a/pkgs/by-name/ce/certmgr/package.nix b/pkgs/by-name/ce/certmgr/package.nix
index 8341404c3701..6a81e0952791 100644
--- a/pkgs/by-name/ce/certmgr/package.nix
+++ b/pkgs/by-name/ce/certmgr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "certmgr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MgNPU06bv31tdfUnigcmct8UTVztNLXcmTg3H/J7mic=";
   };
 
diff --git a/pkgs/by-name/ce/certspotter/package.nix b/pkgs/by-name/ce/certspotter/package.nix
index 3c3ac8a256fb..51993f07cd4e 100644
--- a/pkgs/by-name/ce/certspotter/package.nix
+++ b/pkgs/by-name/ce/certspotter/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SSLMate";
     repo = "certspotter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nyeqpDMRZRuHjfl3cI/I00KpVg3udjr0B8MEBZcF7nY=";
   };
 
diff --git a/pkgs/by-name/ce/certstrap/package.nix b/pkgs/by-name/ce/certstrap/package.nix
index a4e9a8d3c5b4..3cc981bf68a6 100644
--- a/pkgs/by-name/ce/certstrap/package.nix
+++ b/pkgs/by-name/ce/certstrap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "square";
     repo = "certstrap";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mbZtomR8nnawXr3nGVSEuVObe79M1CqTlYN/aEpKmcU=";
   };
 
diff --git a/pkgs/by-name/ce/cewl/package.nix b/pkgs/by-name/ce/cewl/package.nix
index 46b1b5df963d..e415a1bdc950 100644
--- a/pkgs/by-name/ce/cewl/package.nix
+++ b/pkgs/by-name/ce/cewl/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "digininja";
     repo = "CeWL";
-    tag = version;
+    rev = version;
     sha256 = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc=";
   };
 
diff --git a/pkgs/by-name/ce/cewler/package.nix b/pkgs/by-name/ce/cewler/package.nix
index a3e88538e29b..a146ef653f64 100644
--- a/pkgs/by-name/ce/cewler/package.nix
+++ b/pkgs/by-name/ce/cewler/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "roys";
     repo = "cewler";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lVI3p6YMugQ3yKHFNxISmUY7XZMuX/TXvVUoZfIeJog=";
   };
 
diff --git a/pkgs/by-name/cf/cf-terraforming/package.nix b/pkgs/by-name/cf/cf-terraforming/package.nix
index e69bcd5dbe75..2bbcce278f66 100644
--- a/pkgs/by-name/cf/cf-terraforming/package.nix
+++ b/pkgs/by-name/cf/cf-terraforming/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cf-terraforming";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-iv4vQRQNYBl2v2TAK11VJbVCQB1jw51NjGJ80aIGPbQ=";
   };
 
diff --git a/pkgs/by-name/cf/cf-tool/package.nix b/pkgs/by-name/cf/cf-tool/package.nix
index ae2c9384c5e5..044a7f7e602b 100644
--- a/pkgs/by-name/cf/cf-tool/package.nix
+++ b/pkgs/by-name/cf/cf-tool/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sempr";
     repo = "cf-tool";
-    tag = version;
+    rev = version;
     hash = "sha256-D+mJJw1+ImCrFpsv8HmaAwWqjYvUWouh8mgQ7hJxMrc=";
   };
 
diff --git a/pkgs/by-name/cf/cf-vault/package.nix b/pkgs/by-name/cf/cf-vault/package.nix
index ec1dd2b9dcf6..47f49ab1b817 100644
--- a/pkgs/by-name/cf/cf-vault/package.nix
+++ b/pkgs/by-name/cf/cf-vault/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jacobbednarz";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-vp9ufjNZabY/ck2lIT+QpD6IgaVj1BkBRTjPxkb6IjQ=";
   };
 
diff --git a/pkgs/by-name/cf/cfdyndns/package.nix b/pkgs/by-name/cf/cfdyndns/package.nix
index 924f00bd3fd5..66bf5369ce27 100644
--- a/pkgs/by-name/cf/cfdyndns/package.nix
+++ b/pkgs/by-name/cf/cfdyndns/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nrdxp";
     repo = "cfdyndns";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OV1YRcZDzYy1FP1Bqp9m+Jxgu6Vc0aWpbAffNcdIW/4=";
   };
 
diff --git a/pkgs/by-name/cf/cfm/package.nix b/pkgs/by-name/cf/cfm/package.nix
index e68b7501a5f6..119fe1d8c79e 100644
--- a/pkgs/by-name/cf/cfm/package.nix
+++ b/pkgs/by-name/cf/cfm/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "willeccles";
     repo = "cfm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-uXL0RO9P+NYSZ0xCv91KzjHOJJI500YUT8IJkFS86pE=";
   };
 
diff --git a/pkgs/by-name/cf/cfs-zen-tweaks/package.nix b/pkgs/by-name/cf/cfs-zen-tweaks/package.nix
index 8e30e69ed758..509978486d46 100644
--- a/pkgs/by-name/cf/cfs-zen-tweaks/package.nix
+++ b/pkgs/by-name/cf/cfs-zen-tweaks/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "igo95862";
     repo = "cfs-zen-tweaks";
-    tag = version;
+    rev = version;
     hash = "sha256-E3sNWWXm0NEqLCzFccd/nfYby+/b/MVjIHeGlDxV1W4=";
   };
 
diff --git a/pkgs/by-name/cf/cfssl/package.nix b/pkgs/by-name/cf/cfssl/package.nix
index f8d33f8127d8..8d18fe922bd3 100644
--- a/pkgs/by-name/cf/cfssl/package.nix
+++ b/pkgs/by-name/cf/cfssl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cfssl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Xczpv6tLJiy2dXoGJ0QUmXwOn0p6S+lm2oz61oytQec=";
   };
 
diff --git a/pkgs/by-name/cg/cg3/package.nix b/pkgs/by-name/cg/cg3/package.nix
index b225085af77f..e4e142d641ee 100644
--- a/pkgs/by-name/cg/cg3/package.nix
+++ b/pkgs/by-name/cg/cg3/package.nix
@@ -17,7 +17,7 @@ let
     src = fetchFromGitHub {
       owner = "GrammarSoft";
       repo = "cg3";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-TiEhhk90w5GibGZ4yalIf+4qLA8NoU6+GIPN6QNTz2A=";
     };
 
diff --git a/pkgs/by-name/cg/cglm/package.nix b/pkgs/by-name/cg/cglm/package.nix
index 46a95c5d97fc..2a5272dd06d2 100644
--- a/pkgs/by-name/cg/cglm/package.nix
+++ b/pkgs/by-name/cg/cglm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "recp";
     repo = "cglm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-caDw9Sqf4hS2JNbNxG/xaFIvO6oIlvT+hZQhdX37BKw=";
   };
 
diff --git a/pkgs/by-name/cg/cgminer/package.nix b/pkgs/by-name/cg/cgminer/package.nix
index 9121ddc9b488..2104e05a834b 100644
--- a/pkgs/by-name/cg/cgminer/package.nix
+++ b/pkgs/by-name/cg/cgminer/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ckolivas";
     repo = "cgminer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5";
   };
 
diff --git a/pkgs/by-name/cg/cgreen/package.nix b/pkgs/by-name/cg/cgreen/package.nix
index 46f8941d8e99..e3c557fc9ce7 100644
--- a/pkgs/by-name/cg/cgreen/package.nix
+++ b/pkgs/by-name/cg/cgreen/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cgreen-devs";
     repo = "cgreen";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-W4MdB3acZcxavjRupJa4eXAv9g4QgYXFAQWOLoHrQZ8=";
   };
 
diff --git a/pkgs/by-name/cg/cgt-calc/package.nix b/pkgs/by-name/cg/cgt-calc/package.nix
index 830252977582..23a33881ab63 100644
--- a/pkgs/by-name/cg/cgt-calc/package.nix
+++ b/pkgs/by-name/cg/cgt-calc/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "KapJI";
     repo = "capital-gains-calculator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-y/Y05wG89nccXyxfjqazyPJhd8dOkfwRJre+Rzx97Hw=";
   };
 
diff --git a/pkgs/by-name/ch/chain-bench/package.nix b/pkgs/by-name/ch/chain-bench/package.nix
index 9e12f3432407..4fde0f9ce10c 100644
--- a/pkgs/by-name/ch/chain-bench/package.nix
+++ b/pkgs/by-name/ch/chain-bench/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5+jSbXbT1UwHMVeZ07qcY8Is88ddHdr7QlgcbQK+8FA=";
   };
   vendorHash = "sha256-uN4TSAxb229NhcWmiQmWBajla9XKnpiZrXOWJxt/mic=";
diff --git a/pkgs/by-name/ch/chamber/package.nix b/pkgs/by-name/ch/chamber/package.nix
index 7914b1cb64ff..4f6dd8670f67 100644
--- a/pkgs/by-name/ch/chamber/package.nix
+++ b/pkgs/by-name/ch/chamber/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "segmentio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1ySOlP0sFk3+IRt/zstZK6lEE2pzoVSiZz3wFxdesgc=";
   };
 
diff --git a/pkgs/by-name/ch/changelogger/package.nix b/pkgs/by-name/ch/changelogger/package.nix
index 89a432c23f53..f0b911d15c18 100644
--- a/pkgs/by-name/ch/changelogger/package.nix
+++ b/pkgs/by-name/ch/changelogger/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MarkusFreitag";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-XDiO8r1HpdsfBKzFLnsWdxte2EqL1blPH21137fNm5M=";
   };
 
diff --git a/pkgs/by-name/ch/changetower/package.nix b/pkgs/by-name/ch/changetower/package.nix
index ce24680b622a..e3496e4fe279 100644
--- a/pkgs/by-name/ch/changetower/package.nix
+++ b/pkgs/by-name/ch/changetower/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Dc4ts";
     repo = "ChangeTower";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P20kzsFTR6kVWUD6mt3T3sge/ioIYgeREfy40oxlDBU=";
   };
 
diff --git a/pkgs/by-name/ch/changie/package.nix b/pkgs/by-name/ch/changie/package.nix
index e1801e4c2b6e..7be69fdfbdf4 100644
--- a/pkgs/by-name/ch/changie/package.nix
+++ b/pkgs/by-name/ch/changie/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "miniscruff";
     repo = "changie";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zLRMH5TxEz/fspMOPAMTEqO19fj9PZsRh6zddbTqSXM=";
   };
 
diff --git a/pkgs/by-name/ch/charasay/package.nix b/pkgs/by-name/ch/charasay/package.nix
index 694c577637ae..8b4c188a9d6d 100644
--- a/pkgs/by-name/ch/charasay/package.nix
+++ b/pkgs/by-name/ch/charasay/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "latipun7";
     repo = "charasay";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NB2GDDFH9IW/c0acMojYHuzPrx0J3tjlDqjQa6ZRbN4=";
   };
 
diff --git a/pkgs/by-name/ch/charliecloud/package.nix b/pkgs/by-name/ch/charliecloud/package.nix
index eeb308201717..dd831bd34ebd 100644
--- a/pkgs/by-name/ch/charliecloud/package.nix
+++ b/pkgs/by-name/ch/charliecloud/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hpc";
     repo = "charliecloud";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kdaVlwE3vdCxsmJTOUwx8J+9UcBuXbKDwS2MHX2ZPPM=";
   };
 
diff --git a/pkgs/by-name/ch/charm-freeze/package.nix b/pkgs/by-name/ch/charm-freeze/package.nix
index 1dcad10c1a93..d5da8ac2253c 100644
--- a/pkgs/by-name/ch/charm-freeze/package.nix
+++ b/pkgs/by-name/ch/charm-freeze/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "freeze";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1zc62m1uS8Bl6x54SG2///PWfiKbZood6VBibbsFX7I=";
   };
 
diff --git a/pkgs/by-name/ch/charm/package.nix b/pkgs/by-name/ch/charm/package.nix
index 0275938800f0..908df7793a2d 100644
--- a/pkgs/by-name/ch/charm/package.nix
+++ b/pkgs/by-name/ch/charm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "charm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-RtUHJIMbodICEDIhjH/QZlAS7dxBsL/uNYA2IoObAg0=";
   };
 
diff --git a/pkgs/by-name/ch/chart-testing/package.nix b/pkgs/by-name/ch/chart-testing/package.nix
index 37c3b46b14f2..bc580ea44807 100644
--- a/pkgs/by-name/ch/chart-testing/package.nix
+++ b/pkgs/by-name/ch/chart-testing/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "helm";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q56ZM+YzL7RRC3RD3xO3K0hIDomKun5xmSKuiDTq1cU=";
   };
 
diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix
index d912272c6fb3..fa8b090c740c 100644
--- a/pkgs/by-name/ch/chatd/package.nix
+++ b/pkgs/by-name/ch/chatd/package.nix
@@ -19,7 +19,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "BruceMacD";
     repo = "chatd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6z5QoJk81NEP115uW+2ah7vxpDz8XQUmMLESPsZT9uU=";
   };
 
diff --git a/pkgs/by-name/ch/chatgpt-cli/package.nix b/pkgs/by-name/ch/chatgpt-cli/package.nix
index 6bce713b72d0..61982d798fdb 100644
--- a/pkgs/by-name/ch/chatgpt-cli/package.nix
+++ b/pkgs/by-name/ch/chatgpt-cli/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "j178";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+U5fDG/t1x7F4h+D3rVdgvYICoQDH7dd5GUNOCkXw/Q=";
   };
 
diff --git a/pkgs/by-name/ch/chatgpt-shell-cli/package.nix b/pkgs/by-name/ch/chatgpt-shell-cli/package.nix
index 33ef1f643032..f18028cac42a 100644
--- a/pkgs/by-name/ch/chatgpt-shell-cli/package.nix
+++ b/pkgs/by-name/ch/chatgpt-shell-cli/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "0xacx";
     repo = "chatgpt-shell-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-hYLrUya4UCsIB1J/n+jp1jFRCEqnGFJOr3ATxm0zwdY=";
   };
 
diff --git a/pkgs/by-name/ch/cheat/package.nix b/pkgs/by-name/ch/cheat/package.nix
index 6caa772fef06..6d964df186b1 100644
--- a/pkgs/by-name/ch/cheat/package.nix
+++ b/pkgs/by-name/ch/cheat/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cheat";
     repo = "cheat";
-    tag = version;
+    rev = version;
     sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE=";
   };
 
diff --git a/pkgs/by-name/ch/checkmake/package.nix b/pkgs/by-name/ch/checkmake/package.nix
index 11647cfeb4eb..400552061f8b 100644
--- a/pkgs/by-name/ch/checkmake/package.nix
+++ b/pkgs/by-name/ch/checkmake/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mrtazz";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Ql8XSQA/w7wT9GbmYOM2vG15GVqj9LxOGIu8Wqp9Wao=";
   };
 
diff --git a/pkgs/by-name/ch/checkmate/package.nix b/pkgs/by-name/ch/checkmate/package.nix
index abcbacb7ab5f..64b8bf9b2fd6 100644
--- a/pkgs/by-name/ch/checkmate/package.nix
+++ b/pkgs/by-name/ch/checkmate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adedayo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XzzN4oIG6E4NsMGl4HzFlgAGhkRieRn+jyA0bT8fcrg=";
   };
 
diff --git a/pkgs/by-name/ch/checksec/package.nix b/pkgs/by-name/ch/checksec/package.nix
index db61cfffa46f..c479c7f14510 100644
--- a/pkgs/by-name/ch/checksec/package.nix
+++ b/pkgs/by-name/ch/checksec/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "slimm609";
     repo = "checksec.sh";
-    tag = version;
+    rev = version;
     hash = "sha256-BWtchWXukIDSLJkFX8M/NZBvfi7vUE2j4yFfS0KEZDo=";
   };
 
diff --git a/pkgs/by-name/ch/chelf/package.nix b/pkgs/by-name/ch/chelf/package.nix
index b6f4f82f4e3c..940a74cfb2de 100644
--- a/pkgs/by-name/ch/chelf/package.nix
+++ b/pkgs/by-name/ch/chelf/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gottox";
     repo = "chelf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0xwd84aynyqsi2kcndbff176vmhrak3jmn3lfcwya59653pppjr6";
   };
 
diff --git a/pkgs/by-name/ch/cherry/package.nix b/pkgs/by-name/ch/cherry/package.nix
index d9554124b5d6..727601743e0c 100644
--- a/pkgs/by-name/ch/cherry/package.nix
+++ b/pkgs/by-name/ch/cherry/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "turquoise-hexagon";
     repo = "cherry";
-    tag = version;
+    rev = version;
     sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586";
   };
 
diff --git a/pkgs/by-name/ch/chess-tui/package.nix b/pkgs/by-name/ch/chess-tui/package.nix
index 6bda89faa126..e914e3c88cbc 100644
--- a/pkgs/by-name/ch/chess-tui/package.nix
+++ b/pkgs/by-name/ch/chess-tui/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "thomas-mauran";
     repo = "chess-tui";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-LtxaZ/7p/lqStoUmckVVaegQp02Ci3L46fMFEgledj4=";
   };
 
diff --git a/pkgs/by-name/ch/chez-matchable/package.nix b/pkgs/by-name/ch/chez-matchable/package.nix
index 80a38ed0c4b4..1b595f432ce5 100644
--- a/pkgs/by-name/ch/chez-matchable/package.nix
+++ b/pkgs/by-name/ch/chez-matchable/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fedeinthemix";
     repo = "chez-matchable";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UYoT8Kp1FTfiL22ntrFXFcAB1HGVrJ6p9JgvhUKi+Yo=";
   };
 
diff --git a/pkgs/by-name/ch/chez-mit/package.nix b/pkgs/by-name/ch/chez-mit/package.nix
index d7a8b88dee0e..a12f7a7a06d8 100644
--- a/pkgs/by-name/ch/chez-mit/package.nix
+++ b/pkgs/by-name/ch/chez-mit/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fedeinthemix";
     repo = "chez-mit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TmoLA0zLETKE+PsrGS5dce9xLQUIKwSNixRSVjbrOlk=";
   };
 
diff --git a/pkgs/by-name/ch/chez-scmutils/package.nix b/pkgs/by-name/ch/chez-scmutils/package.nix
index 6ccbc597b013..853a4aa1a72d 100644
--- a/pkgs/by-name/ch/chez-scmutils/package.nix
+++ b/pkgs/by-name/ch/chez-scmutils/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fedeinthemix";
     repo = "chez-scmutils";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-y2ug7GfmkJC6jddgB8YllsumjmGxFJxTGTpPf1Vcs/s=";
   };
 
diff --git a/pkgs/by-name/ch/chez-srfi/package.nix b/pkgs/by-name/ch/chez-srfi/package.nix
index a0c5d541f543..5b1e72851ba6 100644
--- a/pkgs/by-name/ch/chez-srfi/package.nix
+++ b/pkgs/by-name/ch/chez-srfi/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fedeinthemix";
     repo = "chez-srfi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yBhRNfoEt1LOn3/zd/yOWwfErN/qG/tQZnDRqEf8j/0=";
   };
 
diff --git a/pkgs/by-name/ch/chibi/package.nix b/pkgs/by-name/ch/chibi/package.nix
index ea363e1e9d3c..5108d2c707f2 100644
--- a/pkgs/by-name/ch/chibi/package.nix
+++ b/pkgs/by-name/ch/chibi/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ashinn";
     repo = "chibi-scheme";
-    tag = version;
+    rev = version;
     sha256 = "sha256-i+xiaYwM7a+0T824VSuh7UUNI6HV9KpqzQPE1WAZ+As=";
   };
 
diff --git a/pkgs/by-name/ch/chirpstack-concentratord/package.nix b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
index 8f1841848b94..f01d68e48672 100644
--- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix
+++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-concentratord";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RFjBeFGK0HzRPeCCU5Un3c3XSg8hmXo+7DWP6tfsDgw=";
   };
 
diff --git a/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix b/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix
index 2b835acf1342..b5ca232a7822 100644
--- a/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix
+++ b/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-gateway-bridge";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nVrYyvoN6jayXAwivwxhijNeLEcGICTWJ4T9EBs5uaI=";
   };
 
diff --git a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
index b1241b331806..16f2cf22ffa7 100644
--- a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
+++ b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-mqtt-forwarder";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jbu8O1Wag6KpN49VyXsYO8os95ctZjzuxKXoDMLyiKU=";
   };
 
diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix
index aee84c72223b..7abde58978fe 100644
--- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix
+++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-rest-api";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yYuSciMsQudGqBPNqj28TZgCGtZb9j7mtEkBR8tbEm4=";
   };
 
diff --git a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
index 876d4c2d17a7..6c07e39e421a 100644
--- a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
+++ b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-udp-forwarder";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Snj5nKyFsq8WJJNw1d8O/YX/dZ/tCTVBw5R8kXJvsa4=";
   };
 
diff --git a/pkgs/by-name/ch/chit/package.nix b/pkgs/by-name/ch/chit/package.nix
index 8d8057faccef..dc9fa955817f 100644
--- a/pkgs/by-name/ch/chit/package.nix
+++ b/pkgs/by-name/ch/chit/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "peterheesterman";
     repo = "chit";
-    tag = version;
+    rev = version;
     sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz";
   };
 
diff --git a/pkgs/by-name/ch/cholmod-extra/package.nix b/pkgs/by-name/ch/cholmod-extra/package.nix
index ba149490eba9..cbc6669c4c9e 100644
--- a/pkgs/by-name/ch/cholmod-extra/package.nix
+++ b/pkgs/by-name/ch/cholmod-extra/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "cholmod-extra";
     owner = "jluttine";
-    tag = version;
+    rev = version;
     sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg";
   };
 
diff --git a/pkgs/by-name/ch/choose-gui/package.nix b/pkgs/by-name/ch/choose-gui/package.nix
index fe953146855c..da7d1e6e7be9 100644
--- a/pkgs/by-name/ch/choose-gui/package.nix
+++ b/pkgs/by-name/ch/choose-gui/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chipsenkbeil";
     repo = "choose";
-    tag = version;
+    rev = version;
     hash = "sha256-oR0GgMinKcBHaZWdE7O+mdbiLKKjkweECKbi80bjW+c=";
   };
 
diff --git a/pkgs/by-name/ch/choose/package.nix b/pkgs/by-name/ch/choose/package.nix
index c3fa9264366a..a56d726f4a60 100644
--- a/pkgs/by-name/ch/choose/package.nix
+++ b/pkgs/by-name/ch/choose/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "theryangeary";
     repo = "choose";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ojmib9yri/Yj1VSwwssbXv+ThnZjUXLTmOpfPGdGFaU=";
   };
 
diff --git a/pkgs/by-name/ch/chopchop/package.nix b/pkgs/by-name/ch/chopchop/package.nix
index 001580863eb9..5d75efb611d8 100644
--- a/pkgs/by-name/ch/chopchop/package.nix
+++ b/pkgs/by-name/ch/chopchop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "michelin";
     repo = "ChopChop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qSBQdcS6d0tctSHRbkY4T7s6Zj7xI2abaPUvNKh1M2E=";
   };
 
diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix
index 956bd8e25e2c..20c100d07f31 100644
--- a/pkgs/by-name/ch/chroma/package.nix
+++ b/pkgs/by-name/ch/chroma/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alecthomas";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     inherit (srcInfo) sha256;
   };
 
diff --git a/pkgs/by-name/ch/chrome-export/package.nix b/pkgs/by-name/ch/chrome-export/package.nix
index 15987751547c..ce8e8acf606c 100644
--- a/pkgs/by-name/ch/chrome-export/package.nix
+++ b/pkgs/by-name/ch/chrome-export/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bdesham";
     repo = "chrome-export";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0p1914wfjggjavw7a0dh2nb7z97z3wrkwrpwxkdc2pj5w5lv405m";
   };
 
diff --git a/pkgs/by-name/ch/chruby-fish/package.nix b/pkgs/by-name/ch/chruby-fish/package.nix
index 98c1c11982b0..620a63c1fa52 100644
--- a/pkgs/by-name/ch/chruby-fish/package.nix
+++ b/pkgs/by-name/ch/chruby-fish/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JeanMertz";
     repo = "chruby-fish";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "15q0ywsn9pcypbpvlq0wb41x4igxm9bsvhg9a05dqw1n437qjhyb";
   };
 
diff --git a/pkgs/by-name/ci/ciano/package.nix b/pkgs/by-name/ci/ciano/package.nix
index 40a3f8257859..650526eec16f 100644
--- a/pkgs/by-name/ci/ciano/package.nix
+++ b/pkgs/by-name/ci/ciano/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "robertsanseries";
     repo = "ciano";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-nubm6vBWwsHrrmvFAL/cIzYPxg9B1EhnpC79IJMNuFY=";
   };
 
diff --git a/pkgs/by-name/ci/ciao/package.nix b/pkgs/by-name/ci/ciao/package.nix
index f7cfb23efdc1..025ec757b86b 100644
--- a/pkgs/by-name/ci/ciao/package.nix
+++ b/pkgs/by-name/ci/ciao/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ciao-lang";
     repo = "ciao";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vjDiYL6yVfLo7NrVKdYRxMUrg7aqQHTezqNoDJcsEuI=";
   };
 
diff --git a/pkgs/by-name/ci/cicero-tui/package.nix b/pkgs/by-name/ci/cicero-tui/package.nix
index c29c63dea3ec..c78751b54c1c 100644
--- a/pkgs/by-name/ci/cicero-tui/package.nix
+++ b/pkgs/by-name/ci/cicero-tui/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "eyeplum";
     repo = "cicero-tui";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-2raSkIycXCdT/TSlaQviI6Eql7DONgRVsPP2B2YuW8U=";
   };
 
diff --git a/pkgs/by-name/ci/cidr-merger/package.nix b/pkgs/by-name/ci/cidr-merger/package.nix
index be4758c60d31..5626be5d1d91 100644
--- a/pkgs/by-name/ci/cidr-merger/package.nix
+++ b/pkgs/by-name/ci/cidr-merger/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zhanhb";
     repo = "cidr-merger";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Kb+89VP7JhBrTE4MM3H/dqoIBgDLnVhKqkgHdymYCgk=";
   };
 
diff --git a/pkgs/by-name/ci/cie-middleware-linux/package.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix
index c69749a4364a..7647f20c69a7 100644
--- a/pkgs/by-name/ci/cie-middleware-linux/package.nix
+++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix
@@ -26,7 +26,7 @@ let
   src = fetchFromGitHub {
     owner = "M0rf30";
     repo = "cie-middleware-linux";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2P/1hQTmeQ6qE7RgAeLOZTszcLcIpa2XX1S2ahXRHcc=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix
index 39ff7569f0be..1252761cc1bb 100644
--- a/pkgs/by-name/ci/cinnamon-common/package.nix
+++ b/pkgs/by-name/ci/cinnamon-common/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon";
-    tag = version;
+    rev = version;
     hash = "sha256-WBdzlourYf2oEXUMbzNcNNsc8lBo6ujAy/K1Y6nGOjU=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix
index e3403a526ebf..1b87565edaf5 100644
--- a/pkgs/by-name/ci/cinnamon-control-center/package.nix
+++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-control-center";
-    tag = version;
+    rev = version;
     hash = "sha256-1Z+kXvBmENNXIqdZgPDx7ZSwJMFAm2oMih6eFFAsA/A=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix
index 8b97ffa2d020..1016119236ba 100644
--- a/pkgs/by-name/ci/cinnamon-desktop/package.nix
+++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-desktop";
-    tag = version;
+    rev = version;
     hash = "sha256-YKGVuT28MLcLO9T8ZJqbHqMN0SAn1P1l8JTDBo4n838=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-menus/package.nix b/pkgs/by-name/ci/cinnamon-menus/package.nix
index 3205d2aef554..4c423800bcdb 100644
--- a/pkgs/by-name/ci/cinnamon-menus/package.nix
+++ b/pkgs/by-name/ci/cinnamon-menus/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-menus";
-    tag = version;
+    rev = version;
     hash = "sha256-ug1RSP2TBrypi0aGhF05k39koY3rGgJi0LuWyuuICd0=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
index e1e5de06b8f8..83f1072f95e6 100644
--- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix
+++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-screensaver";
-    tag = version;
+    rev = version;
     hash = "sha256-XlEu/aBwNeu+CC6IRnFTF6LUnb7VY2+OOGsdCvQYweA=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix
index 48cefb82fc88..45dd7591357d 100644
--- a/pkgs/by-name/ci/cinnamon-session/package.nix
+++ b/pkgs/by-name/ci/cinnamon-session/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-session";
-    tag = version;
+    rev = version;
     hash = "sha256-4uTKcmwfEytoAy4CFiOedYJqmPtBFBHk0P1gEGgm6pU=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
index 65f79a3ae575..76a2b434c81e 100644
--- a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
+++ b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-settings-daemon";
-    tag = version;
+    rev = version;
     hash = "sha256-L7+OgymYoYBdprw66RW8tiGA7XGWjTBpDpXhli8Fjoo=";
   };
 
diff --git a/pkgs/by-name/ci/cinnamon-translations/package.nix b/pkgs/by-name/ci/cinnamon-translations/package.nix
index 04799ec56dce..b75620366732 100644
--- a/pkgs/by-name/ci/cinnamon-translations/package.nix
+++ b/pkgs/by-name/ci/cinnamon-translations/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-translations";
-    tag = version;
+    rev = version;
     hash = "sha256-By09Y4iHZz3XR7tRd5MyXK5BKOr01yJzTTLQHEZ00q0=";
   };
 
diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index 35dcd5d30e57..c8a1b5da5b19 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -18,7 +18,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MyVKRWhLXxz4h2/2OtpmYrLYiZeNOMEetHwl4NklkOA=";
   };
 
diff --git a/pkgs/by-name/ci/cipher/package.nix b/pkgs/by-name/ci/cipher/package.nix
index 35b8d36e09ef..b93049e9d4d2 100644
--- a/pkgs/by-name/ci/cipher/package.nix
+++ b/pkgs/by-name/ci/cipher/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arshubham";
     repo = "cipher";
-    tag = version;
+    rev = version;
     sha256 = "00azc5ck17zkdypfza6x1viknwhimd9fqgk2ybff3mx6aphmla7a";
   };
 
diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix
index bdad718e9e2f..93f2e791c8c2 100644
--- a/pkgs/by-name/ci/circleci-cli/package.nix
+++ b/pkgs/by-name/ci/circleci-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0hikYA7oU3tTHZdEcxDzMXCg13+muk6V7MyqJwExm0A=";
   };
 
diff --git a/pkgs/by-name/ci/circom/package.nix b/pkgs/by-name/ci/circom/package.nix
index d3daafe836c0..d74ae936bd3c 100644
--- a/pkgs/by-name/ci/circom/package.nix
+++ b/pkgs/by-name/ci/circom/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "iden3";
     repo = "circom";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BSInX4owuamRWnlKL1yJJOyzRIiE55TIzCk2TdX7aOQ=";
   };
 
diff --git a/pkgs/by-name/ci/circumflex/package.nix b/pkgs/by-name/ci/circumflex/package.nix
index 204c267bb7d3..b2d65ddb6479 100644
--- a/pkgs/by-name/ci/circumflex/package.nix
+++ b/pkgs/by-name/ci/circumflex/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bensadeh";
     repo = "circumflex";
-    tag = version;
+    rev = version;
     hash = "sha256-qponQtfpAXQxpAhkXaylgzpsvbccTIz9kmhdI4tPuNQ=";
   };
 
diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix
index 2e19baedd6af..6bdb50af35dc 100644
--- a/pkgs/by-name/ci/cirrus-cli/package.nix
+++ b/pkgs/by-name/ci/cirrus-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = "cirrus-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nh6nvH26mYPHmjixTk3sn65JXVT5QSj7cX8yfEYaoD4=";
   };
 
diff --git a/pkgs/by-name/ci/cirrusgo/package.nix b/pkgs/by-name/ci/cirrusgo/package.nix
index 4d235d1a0318..27b88bc477df 100644
--- a/pkgs/by-name/ci/cirrusgo/package.nix
+++ b/pkgs/by-name/ci/cirrusgo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Ph33rr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FYI/Ldu91YB/4wCiVADeYxYQOeBGro1msY5VXsnixw4=";
   };
 
diff --git a/pkgs/by-name/ci/cista/package.nix b/pkgs/by-name/ci/cista/package.nix
index 6cf28e4a4c58..b1822ae7bbd0 100644
--- a/pkgs/by-name/ci/cista/package.nix
+++ b/pkgs/by-name/ci/cista/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "felixguendling";
     repo = "cista";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+DcxnckoXVSc+gXt21fxKkx4J1khLsQPuxYH9CBRrfE=";
   };
 
diff --git a/pkgs/by-name/ci/citations/package.nix b/pkgs/by-name/ci/citations/package.nix
index 3a902b39d630..7fc6357ac63b 100644
--- a/pkgs/by-name/ci/citations/package.nix
+++ b/pkgs/by-name/ci/citations/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "citations";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-aJp9UrfRXAsnHFGgMTHGRgCvlPEa62r9/0hEp5YKRzE=";
   };
 
diff --git a/pkgs/by-name/ci/civetweb/package.nix b/pkgs/by-name/ci/civetweb/package.nix
index 5855577e9ff1..5691d1af3233 100644
--- a/pkgs/by-name/ci/civetweb/package.nix
+++ b/pkgs/by-name/ci/civetweb/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "civetweb";
     repo = "civetweb";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4=";
   };
 
diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix
index d1841ea70a94..7aac936bfe5a 100644
--- a/pkgs/by-name/ci/civo/package.nix
+++ b/pkgs/by-name/ci/civo/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "civo";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-30uv9vVjfjZWsUhwrgY7TYs8cAkv+v/TdsSW+VmupJM=";
   };
 
diff --git a/pkgs/by-name/cj/cjose/package.nix b/pkgs/by-name/cj/cjose/package.nix
index 54718e090068..53785ab7cec0 100644
--- a/pkgs/by-name/cj/cjose/package.nix
+++ b/pkgs/by-name/cj/cjose/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zmartzone";
     repo = "cjose";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk=";
   };
 
diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix
index 4f7d727c5cfd..0c9fce38f415 100644
--- a/pkgs/by-name/cj/cjs/package.nix
+++ b/pkgs/by-name/cj/cjs/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cjs";
-    tag = version;
+    rev = version;
     hash = "sha256-2lkIWroOo3hxu9/L/Ty7CADzVrZ0ohyHVmm65NoNlD4=";
   };
 
diff --git a/pkgs/by-name/cj/cjson/package.nix b/pkgs/by-name/cj/cjson/package.nix
index 3c5c37416ece..7f1eac88571a 100644
--- a/pkgs/by-name/cj/cjson/package.nix
+++ b/pkgs/by-name/cj/cjson/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DaveGamble";
     repo = "cJSON";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UgUWc/+Zie2QNijxKK5GFe4Ypk97EidG8nTiiHhn5Ys=";
   };
 
diff --git a/pkgs/by-name/cl/cl-wordle/package.nix b/pkgs/by-name/cl/cl-wordle/package.nix
index 153aa7958bc8..80ec161a6ad6 100644
--- a/pkgs/by-name/cl/cl-wordle/package.nix
+++ b/pkgs/by-name/cl/cl-wordle/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "conradludgate";
     repo = "wordle";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wFTvzAzboUFQg3fauIwIdRChK7rmLES92jK+8ff1D3s=";
   };
 
diff --git a/pkgs/by-name/cl/clair/package.nix b/pkgs/by-name/cl/clair/package.nix
index 126c61c38570..c0f1450e05c1 100644
--- a/pkgs/by-name/cl/clair/package.nix
+++ b/pkgs/by-name/cl/clair/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "quay";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-itIjDdTKQ0PCfOkefXxqu6MpdWK3F1j6ArvaInQd/hc=";
   };
 
diff --git a/pkgs/by-name/cl/clairvoyant/package.nix b/pkgs/by-name/cl/clairvoyant/package.nix
index 84277744b4b3..6c95b62474db 100644
--- a/pkgs/by-name/cl/clairvoyant/package.nix
+++ b/pkgs/by-name/cl/clairvoyant/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "clairvoyant";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-CSORiNPqzliIpslV28NRPs/+bc9iblsLTPOm1WxxTjc=";
   };
 
diff --git a/pkgs/by-name/cl/clamtk/package.nix b/pkgs/by-name/cl/clamtk/package.nix
index 2cce11d44beb..d9f7821bad0b 100644
--- a/pkgs/by-name/cl/clamtk/package.nix
+++ b/pkgs/by-name/cl/clamtk/package.nix
@@ -15,7 +15,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "dave-theunsub";
     repo = "clamtk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ClBsBXbGj67zgrkA9EjgK7s3OmXOJA+xV5xLGOcMsbI=";
   };
 
diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix
index edc303b9742b..2a119ac37b8e 100644
--- a/pkgs/by-name/cl/clang-uml/package.nix
+++ b/pkgs/by-name/cl/clang-uml/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bkryza";
     repo = "clang-uml";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-mY6kJnwWLgCeKXSquNTxsnr4S3bKwedgiRixzyLWTK8=";
   };
 
diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix
index e3241ff1f3ed..d7366c96a0a0 100644
--- a/pkgs/by-name/cl/clap/package.nix
+++ b/pkgs/by-name/cl/clap/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "free-audio";
     repo = "clap";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-QyIuuiwFg5DP2Ao/LOKYiBXxKHQ0FbFhssIIUnEQz+c=";
   };
 
diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix
index 2596c1adfd89..b264ae2d0138 100644
--- a/pkgs/by-name/cl/clapboard/package.nix
+++ b/pkgs/by-name/cl/clapboard/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bjesus";
     repo = "clapboard";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TM07BcluIh+MEcVg1ApZu85rj36ZBUfn125A0eALNMo=";
   };
 
diff --git a/pkgs/by-name/cl/classicube/package.nix b/pkgs/by-name/cl/classicube/package.nix
index 5cd74c1d8e24..dd5beefbafe6 100644
--- a/pkgs/by-name/cl/classicube/package.nix
+++ b/pkgs/by-name/cl/classicube/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "UnknownShadow200";
     repo = "ClassiCube";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ZITyfxkQB4Jpm2ZsQyM+ouPLqCVmGB7UZRXDSU/BX0k=";
   };
 
diff --git a/pkgs/by-name/cl/claws/package.nix b/pkgs/by-name/cl/claws/package.nix
index 7d6f7707d8d8..d189fa3690c0 100644
--- a/pkgs/by-name/cl/claws/package.nix
+++ b/pkgs/by-name/cl/claws/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.4.1";
 
   src = fetchFromGitHub {
-    tag = version;
+    rev = version;
     owner = "thehowl";
     repo = pname;
     hash = "sha256-3zzUBeYfu9x3vRGX1DionLnAs1e44tFj8Z1dpVwjdCg=";
diff --git a/pkgs/by-name/cl/clblast/package.nix b/pkgs/by-name/cl/clblast/package.nix
index a62d5dd46520..8f93b2d236a5 100644
--- a/pkgs/by-name/cl/clblast/package.nix
+++ b/pkgs/by-name/cl/clblast/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CNugteren";
     repo = "CLBlast";
-    tag = version;
+    rev = version;
     hash = "sha256-fzenYFCAQ0B2NQgh5OaErv/yNEzjznB6ogRapqfL6P4=";
   };
 
diff --git a/pkgs/by-name/cl/clean-css-cli/package.nix b/pkgs/by-name/cl/clean-css-cli/package.nix
index 4bcfbde05c60..195aa7537d1b 100644
--- a/pkgs/by-name/cl/clean-css-cli/package.nix
+++ b/pkgs/by-name/cl/clean-css-cli/package.nix
@@ -9,7 +9,7 @@ let
   src = fetchFromGitHub {
     owner = "clean-css";
     repo = "clean-css-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tsFNcQg55uY2gL5xLLLS6INLlYzbsU6M3hnsYeOFGEw=";
   };
 in
diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index 667ac0b2981a..4c2b76aa1ca3 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -18,7 +18,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "CleverCloud";
     repo = "clever-tools";
-    tag = version;
+    rev = version;
     hash = "sha256-n4rmgOeooLPGLkgBjSBKkevbDPujAORc2i63LiINpcU=";
   };
 
diff --git a/pkgs/by-name/cl/clfft/package.nix b/pkgs/by-name/cl/clfft/package.nix
index f601b07b52fc..a7eedd645738 100644
--- a/pkgs/by-name/cl/clfft/package.nix
+++ b/pkgs/by-name/cl/clfft/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "clMathLibraries";
     repo = "clFFT";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w=";
   };
 
diff --git a/pkgs/by-name/cl/cli-visualizer/package.nix b/pkgs/by-name/cl/cli-visualizer/package.nix
index 24495967eefa..5fa6cd2f5143 100644
--- a/pkgs/by-name/cl/cli-visualizer/package.nix
+++ b/pkgs/by-name/cl/cli-visualizer/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dpayne";
     repo = "cli-visualizer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "003mbbwsz43mg3d7llphpypqa9g7rs1p1cdbqi1mbc2bfrc1gcq2";
   };
 
diff --git a/pkgs/by-name/cl/cli53/package.nix b/pkgs/by-name/cl/cli53/package.nix
index 035fb0bed495..14508c89ca6d 100644
--- a/pkgs/by-name/cl/cli53/package.nix
+++ b/pkgs/by-name/cl/cli53/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "barnybug";
     repo = "cli53";
-    tag = version;
+    rev = version;
     sha256 = "sha256-wfb3lK/WB/B8gd4BOqh+Ol10cNZdsoCoQ+hM33+goM8=";
   };
 
diff --git a/pkgs/by-name/cl/cliam/package.nix b/pkgs/by-name/cl/cliam/package.nix
index 4c39f8a78339..c1084bf82620 100644
--- a/pkgs/by-name/cl/cliam/package.nix
+++ b/pkgs/by-name/cl/cliam/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "securisec";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-59nPoH0+k1umMwFg95hQHOr/SRGKqr1URFG7xtVRiTs=";
   };
 
diff --git a/pkgs/by-name/cl/clib/package.nix b/pkgs/by-name/cl/clib/package.nix
index 808d7184be38..37c0841d75b4 100644
--- a/pkgs/by-name/cl/clib/package.nix
+++ b/pkgs/by-name/cl/clib/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   pname = "clib";
 
   src = fetchFromGitHub {
-    tag = version;
+    rev = version;
     owner = "clibs";
     repo = "clib";
     sha256 = "sha256-uL8prMk2DrYLjCmZW8DdbCg5FJ5uksT3vIATyOW2ZzY=";
diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix
index 2bc18d08bf88..e1bd2d3d888a 100644
--- a/pkgs/by-name/cl/click/package.nix
+++ b/pkgs/by-name/cl/click/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "click";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tYSbyDipZg6Qj/CWk1QVUT5AG8ncTt+5V1+ekpmsKXA=";
   };
 
diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix
index 98feb9ae9bec..741103455c39 100644
--- a/pkgs/by-name/cl/clickable/package.nix
+++ b/pkgs/by-name/cl/clickable/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "clickable";
     repo = "clickable";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5fymmsZUYwB+wc1X7Y1HwwJbGRjQPwkk9JLTxnfH8fo=";
   };
 
diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix
index 25907a0ea288..5ffa4cf9151c 100644
--- a/pkgs/by-name/cl/clickhouse-backup/package.nix
+++ b/pkgs/by-name/cl/clickhouse-backup/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Altinity";
     repo = "clickhouse-backup";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8yvhDpSOklkWIi10o0QBd8bUB9qOF+nDhgaOD8G5FqU=";
   };
 
diff --git a/pkgs/by-name/cl/clifm/package.nix b/pkgs/by-name/cl/clifm/package.nix
index 7fbd770c52dc..9adfe65a1401 100644
--- a/pkgs/by-name/cl/clifm/package.nix
+++ b/pkgs/by-name/cl/clifm/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leo-arch";
     repo = "clifm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RAxhjDNaNkMSIJaca1NNiMQNaEZ3WDAvaWzN3u/PceA=";
   };
 
diff --git a/pkgs/by-name/cl/clima/package.nix b/pkgs/by-name/cl/clima/package.nix
index a541443116d1..1e73159f8062 100644
--- a/pkgs/by-name/cl/clima/package.nix
+++ b/pkgs/by-name/cl/clima/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "clima";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CRnAxhkuCTyHR4uQofA51Dm3+YKqm3iwBkFNkbLTv1A=";
   };
 
diff --git a/pkgs/by-name/cl/cling/package.nix b/pkgs/by-name/cl/cling/package.nix
index b4177c87b984..63b4a681745c 100644
--- a/pkgs/by-name/cl/cling/package.nix
+++ b/pkgs/by-name/cl/cling/package.nix
@@ -54,7 +54,7 @@ let
     clingSrc = fetchFromGitHub {
       owner = "root-project";
       repo = "cling";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-Ye8EINzt+dyNvUIRydACXzb/xEPLm0YSkz08Xxw3xp4=";
     };
 
diff --git a/pkgs/by-name/cl/clipboard-jh/package.nix b/pkgs/by-name/cl/clipboard-jh/package.nix
index b816d9b464dc..d2d0651f5123 100644
--- a/pkgs/by-name/cl/clipboard-jh/package.nix
+++ b/pkgs/by-name/cl/clipboard-jh/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Slackadays";
     repo = "clipboard";
-    tag = version;
+    rev = version;
     hash = "sha256-3SloqijgbX3XIwdO2VBOd61or7tnByi7w45dCBKTkm8=";
   };
 
diff --git a/pkgs/by-name/cl/clipman/package.nix b/pkgs/by-name/cl/clipman/package.nix
index d88c24d4fc9e..2db613c3fb10 100644
--- a/pkgs/by-name/cl/clipman/package.nix
+++ b/pkgs/by-name/cl/clipman/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kuW74iUVLfIUWf3gaKM7IuMU1nfpU9SbSsfeZDbYGhY=";
   };
 
diff --git a/pkgs/by-name/cl/clipmenu/package.nix b/pkgs/by-name/cl/clipmenu/package.nix
index b39af3742463..bf2c414a61df 100644
--- a/pkgs/by-name/cl/clipmenu/package.nix
+++ b/pkgs/by-name/cl/clipmenu/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cdown";
     repo = "clipmenu";
-    tag = version;
+    rev = version;
     sha256 = "sha256-nvctEwyho6kl4+NXi76jT2kG7nchmI2a7mgxlgjXA5A=";
   };
 
diff --git a/pkgs/by-name/cl/clipp/package.nix b/pkgs/by-name/cl/clipp/package.nix
index d5c46b3481a5..f2965a422e72 100644
--- a/pkgs/by-name/cl/clipp/package.nix
+++ b/pkgs/by-name/cl/clipp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "muellan";
     repo = "clipp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0rq80ba2krwzvcg4r2g1al88453c7lz6ziri2s1ygv8inp9r775s";
   };
 
diff --git a/pkgs/by-name/cl/clipqr/package.nix b/pkgs/by-name/cl/clipqr/package.nix
index 4eb7db3e08af..22c6bd779f8d 100644
--- a/pkgs/by-name/cl/clipqr/package.nix
+++ b/pkgs/by-name/cl/clipqr/package.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "imatt-foss";
     repo = "clipqr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iuA6RqclMm1CWaiM1kpOpgfYvKaYGOIwFQkLr/nCL5M=";
   };
 
diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix
index a4df123670a9..5cda92da7892 100644
--- a/pkgs/by-name/cl/clipse/package.nix
+++ b/pkgs/by-name/cl/clipse/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "savedra1";
     repo = "clipse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yUkHT7SZT7Eudvk1n43V+WGWqUKtXaV+p4ySMK/XzQw=";
   };
 
diff --git a/pkgs/by-name/cl/clipster/package.nix b/pkgs/by-name/cl/clipster/package.nix
index 7b5699f43aac..f73265d4fccf 100644
--- a/pkgs/by-name/cl/clipster/package.nix
+++ b/pkgs/by-name/cl/clipster/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mrichar1";
     repo = "clipster";
-    tag = version;
+    rev = version;
     sha256 = "sha256-MLLkFsBBQtb7RFQN+uoEmuCn5bnbkYsqoyWGZtTCI2U=";
   };
 
diff --git a/pkgs/by-name/cl/cliquer/package.nix b/pkgs/by-name/cl/cliquer/package.nix
index 465be3038833..33d9c0704a98 100644
--- a/pkgs/by-name/cl/cliquer/package.nix
+++ b/pkgs/by-name/cl/cliquer/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dimpase";
     repo = "autocliquer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "00gcmrhi2fjn8b246w5a3b0pl7p6haxy5wjvd9kcqib1xanz59z4";
   };
 
diff --git a/pkgs/by-name/cl/cloak-pt/package.nix b/pkgs/by-name/cl/cloak-pt/package.nix
index 88b1bd0e67b5..bcd3441bb43f 100644
--- a/pkgs/by-name/cl/cloak-pt/package.nix
+++ b/pkgs/by-name/cl/cloak-pt/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "cbeuw";
     repo = "Cloak";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JbwjsLVOxQc6v47+6rG2f1JLS8ieZI6jYV/twtaVx9M=";
   };
 
diff --git a/pkgs/by-name/cl/cloc/package.nix b/pkgs/by-name/cl/cloc/package.nix
index dd2756c2487e..ab6d1639a9ca 100644
--- a/pkgs/by-name/cl/cloc/package.nix
+++ b/pkgs/by-name/cl/cloc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "AlDanial";
     repo = "cloc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-x02TEm+VYSqj0gSF/Eg+4LkSd2/LapHHSBlZziTKBDQ=";
   };
 
diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix
index 890046c3a09a..e9ed88881c7b 100644
--- a/pkgs/by-name/cl/clojure-lsp/package.nix
+++ b/pkgs/by-name/cl/clojure-lsp/package.nix
@@ -15,7 +15,7 @@ buildGraalvmNativeImage rec {
   src = fetchFromGitHub {
     owner = "clojure-lsp";
     repo = "clojure-lsp";
-    tag = version;
+    rev = version;
     hash = "sha256-3CKY3t2NWGAQNWYhmyiq3IJDMp81Q0LDCrS23XJeIys=";
   };
 
diff --git a/pkgs/by-name/cl/clolcat/package.nix b/pkgs/by-name/cl/clolcat/package.nix
index 161f715ec689..328fd8c27779 100644
--- a/pkgs/by-name/cl/clolcat/package.nix
+++ b/pkgs/by-name/cl/clolcat/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IchMageBaume";
     repo = "clolcat";
-    tag = version;
+    rev = version;
     sha256 = "sha256-fLa239dwEXe4Jyy5ntgfU9V0h5wrBsvq6/s2HCis7Sc=";
   };
 
diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix
index dc128fcb9369..bfaf3e536471 100644
--- a/pkgs/by-name/cl/cloud-hypervisor/package.nix
+++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cloud-hypervisor";
     repo = "cloud-hypervisor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PmgHO3gRE/LfLiRC+sAQXKUeclweVUNJV2ihpkvx0Wg=";
   };
 
diff --git a/pkgs/by-name/cl/cloudbrute/package.nix b/pkgs/by-name/cl/cloudbrute/package.nix
index 8ec708fd2327..b3695975e9c9 100644
--- a/pkgs/by-name/cl/cloudbrute/package.nix
+++ b/pkgs/by-name/cl/cloudbrute/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "0xsha";
     repo = "CloudBrute";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L233VdQolSPDPDXQALLvF5seb3peHiLRiZuj2RqdaRU=";
   };
 
diff --git a/pkgs/by-name/cl/cloudflare-dyndns/package.nix b/pkgs/by-name/cl/cloudflare-dyndns/package.nix
index 4102b5081aaa..cf013c5d69ac 100644
--- a/pkgs/by-name/cl/cloudflare-dyndns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-dyndns/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kissgyorgy";
     repo = "cloudflare-dyndns";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tI6qdNxIMEuAR+BcqsRi2EBXTQnfdDLKW7Y+fbcmlao=";
   };
 
diff --git a/pkgs/by-name/cl/cloudflare-utils/package.nix b/pkgs/by-name/cl/cloudflare-utils/package.nix
index 7b444d00a133..d1f35537098c 100644
--- a/pkgs/by-name/cl/cloudflare-utils/package.nix
+++ b/pkgs/by-name/cl/cloudflare-utils/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Cyb3r-Jak3";
     repo = "cloudflare-utils";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LbqH48ysOp2s+e+52doHIyaxUbzzCdJqhdvLuIJ3CCc=";
   };
 
diff --git a/pkgs/by-name/cl/cloudfoundry-cli/package.nix b/pkgs/by-name/cl/cloudfoundry-cli/package.nix
index 15341c651b3c..90db90e6abed 100644
--- a/pkgs/by-name/cl/cloudfoundry-cli/package.nix
+++ b/pkgs/by-name/cl/cloudfoundry-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-W9hshsq02AiDVNFYMoIWCei04b7pPTmIP2+fMyLgcDY=";
   };
   vendorHash = "sha256-6pAcDdCCp64o6VuSSLyLtnLPD5OxSt4o3eUpRhJzXTI=";
diff --git a/pkgs/by-name/cl/cloudlens/package.nix b/pkgs/by-name/cl/cloudlens/package.nix
index 99dd0d6a4b31..c36a5a50a131 100644
--- a/pkgs/by-name/cl/cloudlens/package.nix
+++ b/pkgs/by-name/cl/cloudlens/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "one2nc";
     repo = "cloudlens";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-b0i9xaIm42RKWzzZdSAmapbmZDmTpCa4IxVsM9eSMqM=";
   };
 
diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix
index 282725857292..9ad4f6940528 100644
--- a/pkgs/by-name/cl/cloudlog/package.nix
+++ b/pkgs/by-name/cl/cloudlog/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
-    tag = version;
+    rev = version;
     hash = "sha256-SW9ZW6IcxG+KonfgRHnCRo7P9KqfDCrS5MjnRKHvN1k=";
   };
 
diff --git a/pkgs/by-name/cl/cloudmonkey/package.nix b/pkgs/by-name/cl/cloudmonkey/package.nix
index f4ff5e1cdc08..8505984541db 100644
--- a/pkgs/by-name/cl/cloudmonkey/package.nix
+++ b/pkgs/by-name/cl/cloudmonkey/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "cloudstack-cloudmonkey";
-    tag = version;
+    rev = version;
     sha256 = "sha256-mkEGOZw7GDIFnYUpgvCetA4dU9R1m4q6MOUDG0TWN64=";
   };
 
diff --git a/pkgs/by-name/cl/clpeak/package.nix b/pkgs/by-name/cl/clpeak/package.nix
index a9a0a5c4ee6b..bf8285ca8969 100644
--- a/pkgs/by-name/cl/clpeak/package.nix
+++ b/pkgs/by-name/cl/clpeak/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "krrishnarraj";
     repo = "clpeak";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     sha256 = "1wkjpvn4r89c3y06rv7gfpwpqw6ljmqwz0w0mljl9y5hn1r4pkx2";
   };
diff --git a/pkgs/by-name/cl/clubhouse-cli/package.nix b/pkgs/by-name/cl/clubhouse-cli/package.nix
index 4df52ed5d5fb..f77b9419988b 100644
--- a/pkgs/by-name/cl/clubhouse-cli/package.nix
+++ b/pkgs/by-name/cl/clubhouse-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "andjosh";
     repo = "clubhouse-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OGUEPWKL3GBIQHEDljX1gXMRDEztIrJT5ivAIcyW91k=";
   };
 
diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix
index 129df0715f36..ac81adcf2569 100644
--- a/pkgs/by-name/cl/clusterctl/package.nix
+++ b/pkgs/by-name/cl/clusterctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cluster-api";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XXtVGIpoR2JfkR7urfHuh6xKoIvsF42NV+4yjxb8nls=";
   };
 
diff --git a/pkgs/by-name/cm/cm256cc/package.nix b/pkgs/by-name/cm/cm256cc/package.nix
index c1e373ab97a0..a608a421eda1 100644
--- a/pkgs/by-name/cm/cm256cc/package.nix
+++ b/pkgs/by-name/cm/cm256cc/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "cm256cc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-T7ZUVVYGdzAialse//MoqWCVNBpbZvzWMAKc0cw7O9k=";
   };
 
diff --git a/pkgs/by-name/cm/cmakerc/package.nix b/pkgs/by-name/cm/cmakerc/package.nix
index eeaeae660612..d7635c735f14 100644
--- a/pkgs/by-name/cm/cmakerc/package.nix
+++ b/pkgs/by-name/cm/cmakerc/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vector-of-bool";
     repo = "cmrc";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-++16WAs2K9BKk8384yaSI/YD1CdtdyXVBIjGhqi4JIk=";
   };
 
diff --git a/pkgs/by-name/cm/cmark-gfm/package.nix b/pkgs/by-name/cm/cmark-gfm/package.nix
index ebb05bcf15ab..48c1b6ec8b3b 100644
--- a/pkgs/by-name/cm/cmark-gfm/package.nix
+++ b/pkgs/by-name/cm/cmark-gfm/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "github";
     repo = "cmark-gfm";
-    tag = version;
+    rev = version;
     sha256 = "sha256-HiSGtRsSbW03R6aKoMVVFOLrwP5aXtpeXUC/bE5M/qo=";
   };
 
diff --git a/pkgs/by-name/cm/cmark/package.nix b/pkgs/by-name/cm/cmark/package.nix
index 29e659338491..690f3cbe3aaf 100644
--- a/pkgs/by-name/cm/cmark/package.nix
+++ b/pkgs/by-name/cm/cmark/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "commonmark";
     repo = "cmark";
-    tag = version;
+    rev = version;
     sha256 = "sha256-+JLw7zCjjozjq1RhRQGFqHj/MTUTq3t7A0V3T2U2PQk=";
   };
 
diff --git a/pkgs/by-name/cm/cmatrix/package.nix b/pkgs/by-name/cm/cmatrix/package.nix
index c712b873c6a5..756cc96e8987 100644
--- a/pkgs/by-name/cm/cmatrix/package.nix
+++ b/pkgs/by-name/cm/cmatrix/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "abishekvashok";
     repo = "cmatrix";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1h9jz4m4s5l8c3figaq46ja0km1gimrkfxm4dg7mf4s84icmasbm";
   };
 
diff --git a/pkgs/by-name/cm/cmctl/package.nix b/pkgs/by-name/cm/cmctl/package.nix
index 78b8b4116244..7f72b847e4d8 100644
--- a/pkgs/by-name/cm/cmctl/package.nix
+++ b/pkgs/by-name/cm/cmctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cert-manager";
     repo = "cert-manager";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZvrR8k1jiyAMUKM9VA6vKH2uhMKnd22OQe08CIlxXjs=";
   };
 
diff --git a/pkgs/by-name/cm/cmd-wrapped/package.nix b/pkgs/by-name/cm/cmd-wrapped/package.nix
index 499147aa1ad1..41d40eb271be 100644
--- a/pkgs/by-name/cm/cmd-wrapped/package.nix
+++ b/pkgs/by-name/cm/cmd-wrapped/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "YiNNx";
     repo = "cmd-wrapped";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tIvwJo33Jz9cPq6o4Ytc3VqkxEaxt0W9Fd8CNp+7vAE=";
   };
 
diff --git a/pkgs/by-name/cm/cmdstan/package.nix b/pkgs/by-name/cm/cmdstan/package.nix
index 7c962fd1e37b..7be852409821 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-9Dan86C0nxxxkIXaOSKExY0hngAgWTpL4RlI3rTnBZo=";
   };
diff --git a/pkgs/by-name/cm/cminpack/package.nix b/pkgs/by-name/cm/cminpack/package.nix
index 26d322efbce8..08f5ea016148 100644
--- a/pkgs/by-name/cm/cminpack/package.nix
+++ b/pkgs/by-name/cm/cminpack/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "devernay";
     repo = "cminpack";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eFJ43cHbSbWld+gPpMaNiBy1X5TIcN9aVxjh8PxvVDU=";
   };
 
diff --git a/pkgs/by-name/cm/cmrt/package.nix b/pkgs/by-name/cm/cmrt/package.nix
index c2d12ddc7554..60d17e593c6b 100644
--- a/pkgs/by-name/cm/cmrt/package.nix
+++ b/pkgs/by-name/cm/cmrt/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "cmrt";
-    tag = version;
+    rev = version;
     sha256 = "sha256-W6MQI41J9CKeM1eILCkvmW34cbCC8YeEF2mE+Ci8o7s=";
   };
 
diff --git a/pkgs/by-name/cm/cmusfm/package.nix b/pkgs/by-name/cm/cmusfm/package.nix
index 895907e8c78a..996103874d1f 100644
--- a/pkgs/by-name/cm/cmusfm/package.nix
+++ b/pkgs/by-name/cm/cmusfm/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Arkq";
     repo = "cmusfm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CA585ZpkxMMLgzv81QB2kKMFg5R5CwKS9xAYrU+pAxs=";
   };
 
diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix
index d28217a4f8d4..2058ba3fc98f 100644
--- a/pkgs/by-name/cn/cntb/package.nix
+++ b/pkgs/by-name/cn/cntb/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "contabo";
     repo = "cntb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4QS1fkXVcGxhZDPRLDc0xKl4jr8W4og/Qf591i3gzxk=";
     # docs contains two files with the same name but different cases,
     # this leads to a different hash on case insensitive filesystems (e.g. darwin)
diff --git a/pkgs/by-name/cn/cntr/package.nix b/pkgs/by-name/cn/cntr/package.nix
index d6e1333f6a31..3810e450a1d8 100644
--- a/pkgs/by-name/cn/cntr/package.nix
+++ b/pkgs/by-name/cn/cntr/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "cntr";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2tqPxbi8sKoEPq0/zQFsOrStEmQGlU8s81ohTfKeOmE=";
   };
 
diff --git a/pkgs/by-name/co/cobra-cli/package.nix b/pkgs/by-name/co/cobra-cli/package.nix
index c28e509c66fa..c0883a60c71b 100644
--- a/pkgs/by-name/co/cobra-cli/package.nix
+++ b/pkgs/by-name/co/cobra-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "spf13";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-E0I/Pxw4biOv7aGVzGlQOFXnxkc+zZaEoX1JmyMh6UE=";
   };
 
diff --git a/pkgs/by-name/co/coc-css/package.nix b/pkgs/by-name/co/coc-css/package.nix
index 644b6a3e8f4b..bf595960b7e8 100644
--- a/pkgs/by-name/co/coc-css/package.nix
+++ b/pkgs/by-name/co/coc-css/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "neoclide";
     repo = "coc-css";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ASFg5LM1NbpK+Df1TPs+O13WmZktw+BtfsCJagF5nUc=";
   };
 
diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix
index 6f5f9dfc93c2..8511e41249a3 100644
--- a/pkgs/by-name/co/cocogitto/package.nix
+++ b/pkgs/by-name/co/cocogitto/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "oknozor";
     repo = "cocogitto";
-    tag = version;
+    rev = version;
     hash = "sha256-ij5vpIpqCYGNPNWPY47rWmMLEgBh+wtVmLRt11S14rE=";
   };
 
diff --git a/pkgs/by-name/co/cod/package.nix b/pkgs/by-name/co/cod/package.nix
index ba01827d7dda..6dd5ef4d82a5 100644
--- a/pkgs/by-name/co/cod/package.nix
+++ b/pkgs/by-name/co/cod/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dim-an";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mT7OkR8fXXTE3TPx9AmH6ehKGLk4CP9euBPs2zVAJnI=";
   };
 
diff --git a/pkgs/by-name/co/code-minimap/package.nix b/pkgs/by-name/co/code-minimap/package.nix
index 420a1bc5c07d..5d6806d3fa4a 100644
--- a/pkgs/by-name/co/code-minimap/package.nix
+++ b/pkgs/by-name/co/code-minimap/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "code-minimap";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-unf7gFc/tQiUw3VqQ0KC96Srxn1E27WsmJviSggaCF4=";
   };
 
diff --git a/pkgs/by-name/co/code2prompt/package.nix b/pkgs/by-name/co/code2prompt/package.nix
index 469710160bf3..03c5e6e7b0a8 100644
--- a/pkgs/by-name/co/code2prompt/package.nix
+++ b/pkgs/by-name/co/code2prompt/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mufeedvh";
     repo = "code2prompt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KZqh0Vq4Mn56PhUO1JUzVpNBAGOZqUAsj31Cj5K+Lyk=";
   };
 
diff --git a/pkgs/by-name/co/codebraid/package.nix b/pkgs/by-name/co/codebraid/package.nix
index 43c3fe897519..9c31dc624501 100644
--- a/pkgs/by-name/co/codebraid/package.nix
+++ b/pkgs/by-name/co/codebraid/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gpoore";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-E9vzGK9ZEVwF+UBpSkdM+hm6vINen/A+LgnnPpc77QQ=";
   };
 
diff --git a/pkgs/by-name/co/codec2/package.nix b/pkgs/by-name/co/codec2/package.nix
index 15c983dac7ad..23e4896dbeca 100644
--- a/pkgs/by-name/co/codec2/package.nix
+++ b/pkgs/by-name/co/codec2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "drowe67";
     repo = "codec2";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-69Mp4o3MgV98Fqfai4txv5jQw2WpoPuoWcwHsNAFPQM=";
   };
 
diff --git a/pkgs/by-name/co/codecrafters-cli/package.nix b/pkgs/by-name/co/codecrafters-cli/package.nix
index 79c283a1c540..8662580a829f 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";
-    tag = "v${version}";
+    rev = "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/codeowners/package.nix b/pkgs/by-name/co/codeowners/package.nix
index e2f82d0b2c0d..067870f13b79 100644
--- a/pkgs/by-name/co/codeowners/package.nix
+++ b/pkgs/by-name/co/codeowners/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hmarr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PMT3ihxCD4TNgTZOD4KB9Od1djIhnlMa8zuD6t1OieU=";
   };
 
diff --git a/pkgs/by-name/co/codesearch/package.nix b/pkgs/by-name/co/codesearch/package.nix
index 39dfb05e4f48..fb93208c1020 100644
--- a/pkgs/by-name/co/codesearch/package.nix
+++ b/pkgs/by-name/co/codesearch/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "codesearch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-i03w8PZ31j5EutUZaamZsHz+z4qgX4prePbj5DLA78s=";
   };
 
diff --git a/pkgs/by-name/co/codespelunker/package.nix b/pkgs/by-name/co/codespelunker/package.nix
index a1f2105df58a..a0c6ea798703 100644
--- a/pkgs/by-name/co/codespelunker/package.nix
+++ b/pkgs/by-name/co/codespelunker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "boyter";
     repo = "cs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FZf3aRozpXWTRDrNDRxb1dGBXiLVEYOUd8a/hqzThps=";
   };
 
diff --git a/pkgs/by-name/co/codevis/package.nix b/pkgs/by-name/co/codevis/package.nix
index 29531d004f95..9e910dfe4ab3 100644
--- a/pkgs/by-name/co/codevis/package.nix
+++ b/pkgs/by-name/co/codevis/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sloganking";
     repo = "codevis";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LZ6NsoyEPUvgcVdbG7U2Vzuz/TLLraScvW97PocUNpU=";
   };
 
diff --git a/pkgs/by-name/co/coffeescript/package.nix b/pkgs/by-name/co/coffeescript/package.nix
index 9cf6b39511d7..0153c233d76a 100644
--- a/pkgs/by-name/co/coffeescript/package.nix
+++ b/pkgs/by-name/co/coffeescript/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jashkenas";
     repo = "coffeescript";
-    tag = version;
+    rev = version;
     hash = "sha256-vr46LKICX61rFPCkZ3G+8gJykg+MO43YRJnZGM3RoY0=";
   };
 
diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix
index 96cf41ed9889..1dcef0357088 100644
--- a/pkgs/by-name/co/cog/package.nix
+++ b/pkgs/by-name/co/cog/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "igalia";
     repo = "cog";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eF7rvOjZntcMmn622342yqfp4ksZ6R/FFBT36bYCViE=";
   };
 
diff --git a/pkgs/by-name/co/cointop/package.nix b/pkgs/by-name/co/cointop/package.nix
index c767e01fb0ca..14f2c8a17c60 100644
--- a/pkgs/by-name/co/cointop/package.nix
+++ b/pkgs/by-name/co/cointop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "miguelmota";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-NAw1uoBL/FnNLJ86L9aBCOY65aJn1DDGK0Cd0IO2kr0=";
   };
 
diff --git a/pkgs/by-name/co/coldsnap/package.nix b/pkgs/by-name/co/coldsnap/package.nix
index 5403ccfa5360..c669088be099 100644
--- a/pkgs/by-name/co/coldsnap/package.nix
+++ b/pkgs/by-name/co/coldsnap/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "coldsnap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tlQ4PDrYnnbsxXRbrIoF08aSy7VP+iXgTKf0A8MITpo=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/co/colima/package.nix b/pkgs/by-name/co/colima/package.nix
index c804964e2929..5337a0c85cde 100644
--- a/pkgs/by-name/co/colima/package.nix
+++ b/pkgs/by-name/co/colima/package.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "abiosoft";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RQnHqEabxyoAKr8BfmVhk8z+l5oy8pa5JPTWk/0FV5g=";
     # We need the git revision
     leaveDotGit = true;
diff --git a/pkgs/by-name/co/colloid-gtk-theme/package.nix b/pkgs/by-name/co/colloid-gtk-theme/package.nix
index 58d6ecb39269..de4cdee70ffe 100644
--- a/pkgs/by-name/co/colloid-gtk-theme/package.nix
+++ b/pkgs/by-name/co/colloid-gtk-theme/package.nix
@@ -62,7 +62,7 @@ lib.checkListOfEnum "${pname}: theme variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      tag = version;
+      rev = version;
       hash = "sha256-70HDn87acG0me+zbXk6AoGmakY6VLuawq1ubgGcRZVk=";
     };
 
diff --git a/pkgs/by-name/co/colloid-icon-theme/package.nix b/pkgs/by-name/co/colloid-icon-theme/package.nix
index 3ab0ab69ded9..03b93d6848cd 100644
--- a/pkgs/by-name/co/colloid-icon-theme/package.nix
+++ b/pkgs/by-name/co/colloid-icon-theme/package.nix
@@ -49,7 +49,7 @@ lib.checkListOfEnum "${pname}: scheme variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      tag = version;
+      rev = version;
       hash = "sha256-x2SSaIkKm1415avO7R6TPkpghM30HmMdjMFUUyPWZsk=";
     };
 
diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix
index a4926ad7cb1f..b888cf190d47 100644
--- a/pkgs/by-name/co/colmena/package.nix
+++ b/pkgs/by-name/co/colmena/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zhaofengli";
     repo = "colmena";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ=";
   };
 
diff --git a/pkgs/by-name/co/coloquinte/package.nix b/pkgs/by-name/co/coloquinte/package.nix
index 011bb03e2ef4..8a326beca66b 100644
--- a/pkgs/by-name/co/coloquinte/package.nix
+++ b/pkgs/by-name/co/coloquinte/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "coloquinte";
     repo = "PlaceRoute";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-bPDXaNZCNBM0qiu+46cL/zH/41lwqHPqfqTzJaERgVQ=";
   };
 
diff --git a/pkgs/by-name/co/colordiff/package.nix b/pkgs/by-name/co/colordiff/package.nix
index 6cdaa7128c17..11b906b06f3b 100644
--- a/pkgs/by-name/co/colordiff/package.nix
+++ b/pkgs/by-name/co/colordiff/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "daveewart";
     repo = "colordiff";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TNOw6dqsT0dOIddRoGwEF85CaQF8ICMFUi+GiG5WWpk=";
   };
 
diff --git a/pkgs/by-name/co/colstr/package.nix b/pkgs/by-name/co/colstr/package.nix
index 6aaec623692b..8e0185c10281 100644
--- a/pkgs/by-name/co/colstr/package.nix
+++ b/pkgs/by-name/co/colstr/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "git.sleeping.town";
     owner = "wonder";
     repo = "colstr";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-0V2S/yYu5L7qxkT4Zf18x9+cHoPMztFmgSywpxF8QqA=";
   };
 
diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix
index 1f9d61f027b4..572d67065d2c 100644
--- a/pkgs/by-name/co/comma/package.nix
+++ b/pkgs/by-name/co/comma/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "comma";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XXe0SSdH2JZLx0o+vHDtdlDRtVn7nouIngipbXhmhiQ=";
   };
 
diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix
index 105b8daa28ea..297d36ddb179 100644
--- a/pkgs/by-name/co/commafeed/package.nix
+++ b/pkgs/by-name/co/commafeed/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "Athou";
     repo = "commafeed";
-    tag = version;
+    rev = version;
     hash = "sha256-Qc2l/CSVK+8k7b3RZA8hQsGTq29OvkDMbMzHcnPm/yE=";
   };
 
diff --git a/pkgs/by-name/co/commandergenius/package.nix b/pkgs/by-name/co/commandergenius/package.nix
index 9b2690964b94..a9b0afe5d19d 100644
--- a/pkgs/by-name/co/commandergenius/package.nix
+++ b/pkgs/by-name/co/commandergenius/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "Dringgstein";
     repo = "Commander-Genius";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4WfHdgn8frcDVa3Va6vo/jZihf09vIs+bNdAxScgovE=";
   };
 
diff --git a/pkgs/by-name/co/commit-formatter/package.nix b/pkgs/by-name/co/commit-formatter/package.nix
index 373a1cdbac85..624ffd71879d 100644
--- a/pkgs/by-name/co/commit-formatter/package.nix
+++ b/pkgs/by-name/co/commit-formatter/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Eliot00";
     repo = "commit-formatter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "EYzhb9jJ4MzHxIbaTb1MxeXUgoxTwcnq5JdxAv2uNcA=";
   };
 
diff --git a/pkgs/by-name/co/commitizen-go/package.nix b/pkgs/by-name/co/commitizen-go/package.nix
index 60e6c0b2d49c..103249165d5b 100644
--- a/pkgs/by-name/co/commitizen-go/package.nix
+++ b/pkgs/by-name/co/commitizen-go/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lintingzhen";
     repo = "commitizen-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pAWdIQ3icXEv79s+sUVhQclsNcZg+PTZZ6I6JPo7pNg=";
   };
 
diff --git a/pkgs/by-name/co/commitmsgfmt/package.nix b/pkgs/by-name/co/commitmsgfmt/package.nix
index 53901db6102e..45ca63918896 100644
--- a/pkgs/by-name/co/commitmsgfmt/package.nix
+++ b/pkgs/by-name/co/commitmsgfmt/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "mkjeldsen";
     repo = "commitmsgfmt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HEkPnTO1HeJg8gpHFSUTkEVBPWJ0OdfUhNn9iGfaDD4=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/co/comodoro/package.nix b/pkgs/by-name/co/comodoro/package.nix
index 9cd97cc5c909..3b2ce0093d42 100644
--- a/pkgs/by-name/co/comodoro/package.nix
+++ b/pkgs/by-name/co/comodoro/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "soywod";
     repo = "comodoro";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Y9SuxqI8wvoF0+X6CLNDlSFCwlSU8R73NYF/LjACP18=";
   };
 
diff --git a/pkgs/by-name/co/compdb/package.nix b/pkgs/by-name/co/compdb/package.nix
index a261e204f37e..c840cd85b1fd 100644
--- a/pkgs/by-name/co/compdb/package.nix
+++ b/pkgs/by-name/co/compdb/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Sarcasm";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-nFAgTrup6V5oE+LP4UWDOCgTVCv2v9HbQbkGW+oDnTg=";
   };
 
diff --git a/pkgs/by-name/co/compile-daemon/package.nix b/pkgs/by-name/co/compile-daemon/package.nix
index 5950d3558948..d348a82e7f21 100644
--- a/pkgs/by-name/co/compile-daemon/package.nix
+++ b/pkgs/by-name/co/compile-daemon/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "githubnemo";
     repo = "CompileDaemon";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gpyXy7FO7ZVXJrkzcKHFez4S/dGiijXfZ9eSJtNlm58=";
   };
 
diff --git a/pkgs/by-name/co/complete-alias/package.nix b/pkgs/by-name/co/complete-alias/package.nix
index 0c3dd2867498..fb51e7c99fa7 100644
--- a/pkgs/by-name/co/complete-alias/package.nix
+++ b/pkgs/by-name/co/complete-alias/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cykerway";
     repo = "complete-alias";
-    tag = version;
+    rev = version;
     sha256 = "18lmdb3inphxyjv08ing5wckqnjq0m5zfl0f15mqzlvf2ypar63x";
   };
 
diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index 725bfe8b0a13..0965a7b60436 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "adaszko";
     repo = "complgen";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-spyRH3zzuuGZeQ8iFTa+hc/b4nYSiNIMOEWmc8+jJO0=";
   };
 
diff --git a/pkgs/by-name/co/compose2nix/package.nix b/pkgs/by-name/co/compose2nix/package.nix
index cd4d6089f2ee..550eb49b1271 100644
--- a/pkgs/by-name/co/compose2nix/package.nix
+++ b/pkgs/by-name/co/compose2nix/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aksiksi";
     repo = "compose2nix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rFnnbRVVv/N5021Al3vmjFAui1cTp8NBZDBNQo8CsXM=";
   };
 
diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix
index 2e7225f4e4dd..5543a40bf771 100644
--- a/pkgs/by-name/co/compsize/package.nix
+++ b/pkgs/by-name/co/compsize/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kilobyte";
     repo = "compsize";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8=";
   };
 
diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index 6a4fc7d94818..6f9de3711b87 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kivikakk";
     repo = "comrak";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-chgg/6BJlCTOWPQ0jnE4l5O/lk0iA4xSwdWURKMF+f8=";
   };
 
diff --git a/pkgs/by-name/co/conceal/package.nix b/pkgs/by-name/co/conceal/package.nix
index 7be9bbc76525..37c276d22096 100644
--- a/pkgs/by-name/co/conceal/package.nix
+++ b/pkgs/by-name/co/conceal/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "TD-Sky";
     repo = "conceal";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BYLDSRgBba6SoGsL/NTV/OTG1/V9RSr8lisj42JqBRM=";
   };
 
diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix
index 7e11061e5cd5..89af36894092 100644
--- a/pkgs/by-name/co/conduwuit/package.nix
+++ b/pkgs/by-name/co/conduwuit/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "girlbossceo";
     repo = "conduwuit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE=";
   };
 
diff --git a/pkgs/by-name/co/configurable-http-proxy/package.nix b/pkgs/by-name/co/configurable-http-proxy/package.nix
index 16cca147f0d9..cf8d346d85ff 100644
--- a/pkgs/by-name/co/configurable-http-proxy/package.nix
+++ b/pkgs/by-name/co/configurable-http-proxy/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jupyterhub";
     repo = "configurable-http-proxy";
-    tag = version;
+    rev = version;
     hash = "sha256-nj6+GmBw5YSQs23rWVh3qU4jdzRdbPyx43QmZ3LRwn4=";
   };
 
diff --git a/pkgs/by-name/co/confluencepot/package.nix b/pkgs/by-name/co/confluencepot/package.nix
index fef98c2274e9..1bbcd0d4b3bd 100644
--- a/pkgs/by-name/co/confluencepot/package.nix
+++ b/pkgs/by-name/co/confluencepot/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SIFalcon";
     repo = "confluencePot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jIbL6prOUII8o9FghIYa80BytJ9SSuyj/TZmAxwAbJk=";
   };
 
diff --git a/pkgs/by-name/co/conform/package.nix b/pkgs/by-name/co/conform/package.nix
index 1951ad732818..771368833456 100644
--- a/pkgs/by-name/co/conform/package.nix
+++ b/pkgs/by-name/co/conform/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "conform";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5knN+lTedUdgWG8rb3zuJAxx9N0lt7LjJvmSJhdTSgw=";
   };
 
diff --git a/pkgs/by-name/co/conjure/package.nix b/pkgs/by-name/co/conjure/package.nix
index 09ab8e693b0b..5a8ea6082a41 100644
--- a/pkgs/by-name/co/conjure/package.nix
+++ b/pkgs/by-name/co/conjure/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nate-xyz";
     repo = "conjure";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qWeqUQxTTnmJt40Jm1qDTGGuSQikkurzOux8sZsmDQk=";
   };
 
diff --git a/pkgs/by-name/co/conmon-rs/package.nix b/pkgs/by-name/co/conmon-rs/package.nix
index d9d6f254bc38..6d2014c86b0c 100644
--- a/pkgs/by-name/co/conmon-rs/package.nix
+++ b/pkgs/by-name/co/conmon-rs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "conmon-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1kGAUAmiPI9zE8LE7G2r0Gy0YM+BUy2MxY7IQOu2ZDQ=";
   };
 
diff --git a/pkgs/by-name/co/conmon/package.nix b/pkgs/by-name/co/conmon/package.nix
index d534fd46bb54..3d6910ec56cb 100644
--- a/pkgs/by-name/co/conmon/package.nix
+++ b/pkgs/by-name/co/conmon/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "conmon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XsVWcJsUc0Fkn7qGRJDG5xrQAsJr6KN7zMy3AtPuMTo=";
   };
 
diff --git a/pkgs/by-name/co/connman-gtk/package.nix b/pkgs/by-name/co/connman-gtk/package.nix
index 9786cc1202a1..fb784c8aae7a 100644
--- a/pkgs/by-name/co/connman-gtk/package.nix
+++ b/pkgs/by-name/co/connman-gtk/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jgke";
     repo = "connman-gtk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2bfoGXzy4wXRALLXEEa7vPWbsBNUhE31nn7dDkuHYCY=";
   };
 
diff --git a/pkgs/by-name/co/conserve/package.nix b/pkgs/by-name/co/conserve/package.nix
index caa71d872f22..2095e4091881 100644
--- a/pkgs/by-name/co/conserve/package.nix
+++ b/pkgs/by-name/co/conserve/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sourcefrog";
     repo = "conserve";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rdZTx0wFFtWt3EcpvWHY6m+8TEHEj53vhVpdRp5wbos=";
   };
 
diff --git a/pkgs/by-name/co/conserver/package.nix b/pkgs/by-name/co/conserver/package.nix
index 40bc1c771e40..cb741ecc4590 100644
--- a/pkgs/by-name/co/conserver/package.nix
+++ b/pkgs/by-name/co/conserver/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bstansell";
     repo = "conserver";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LiCknqitBoa8E8rNMVgp1004CwkW8G4O5XGKe4NfZI8=";
   };
 
diff --git a/pkgs/by-name/co/console-bridge/package.nix b/pkgs/by-name/co/console-bridge/package.nix
index 755ed01cd02d..384f305977c9 100644
--- a/pkgs/by-name/co/console-bridge/package.nix
+++ b/pkgs/by-name/co/console-bridge/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ros";
     repo = "console_bridge";
-    tag = version;
+    rev = version;
     sha256 = "sha256-M3GocT0hodw3Sc2NHcFDiPVZ1XN7BqIUuYLW8OaXMqM=";
   };
 
diff --git a/pkgs/by-name/co/construct/package.nix b/pkgs/by-name/co/construct/package.nix
index a30b08b9f8cb..1869e1acd7ad 100644
--- a/pkgs/by-name/co/construct/package.nix
+++ b/pkgs/by-name/co/construct/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Thomas-de-Bock";
     repo = "construct";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ENso0y7yEaXzGXzZOnlZ1L7+j/qayJL+f55/NYLz2ew=";
   };
 
diff --git a/pkgs/by-name/co/consul-alerts/package.nix b/pkgs/by-name/co/consul-alerts/package.nix
index 541364d98701..5cf18d05c0b1 100644
--- a/pkgs/by-name/co/consul-alerts/package.nix
+++ b/pkgs/by-name/co/consul-alerts/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.6.0";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "AcalephStorage";
     repo = "consul-alerts";
     sha256 = "0836zicv76sd6ljhbbii1mrzh65pch10w3gfa128iynaviksbgn5";
diff --git a/pkgs/by-name/co/consul-template/package.nix b/pkgs/by-name/co/consul-template/package.nix
index 30f8c45f19f0..ca14013c21b2 100644
--- a/pkgs/by-name/co/consul-template/package.nix
+++ b/pkgs/by-name/co/consul-template/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "consul-template";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iqBcY7FYCO4qqQRAHxA2sxTnyL5c0vLVWKuhqvX0oJE=";
   };
 
diff --git a/pkgs/by-name/co/container-structure-test/package.nix b/pkgs/by-name/co/container-structure-test/package.nix
index 86b18a02d41e..c640369c381d 100644
--- a/pkgs/by-name/co/container-structure-test/package.nix
+++ b/pkgs/by-name/co/container-structure-test/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = "container-structure-test";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KLLACXUn6dtVCI+gCMHU9hoAJBOAVyhfwxtzsopWS4U=";
   };
   vendorHash = "sha256-pBq76HJ+nluOMOs9nqBKp1mr1LuX2NERXo48g8ezE9k=";
diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix
index 90b3c244cc5a..8e80f0f9ed14 100644
--- a/pkgs/by-name/co/containerlab/package.nix
+++ b/pkgs/by-name/co/containerlab/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "srl-labs";
     repo = "containerlab";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wTVGvaosHhQleRDytCdA1R4YKlzgGN4nWRZx6Ok+O3U=";
   };
 
diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix
index 321daaa2e5c1..2a56fd2830a7 100644
--- a/pkgs/by-name/co/convco/package.nix
+++ b/pkgs/by-name/co/convco/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "convco";
     repo = "convco";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-s0rcSekJLe99oxi6JD8VL1S6nqQTUFTn5pdgxnknbaY=";
   };
 
diff --git a/pkgs/by-name/co/convimg/package.nix b/pkgs/by-name/co/convimg/package.nix
index 9318e298a9f2..202cc987b1f4 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5insJ391Usef8GF3Yh74PEqE534zitQg9udFRPcz69g=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/co/convos/package.nix b/pkgs/by-name/co/convos/package.nix
index 4fbafa6c4db0..f71868f38886 100644
--- a/pkgs/by-name/co/convos/package.nix
+++ b/pkgs/by-name/co/convos/package.nix
@@ -17,7 +17,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "convos-chat";
     repo = "convos";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dBvXo8y4OMKcb0imgnnzoklnPN3YePHDvy5rIBOkTfs=";
   };
 
diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix
index a155eeebe5c7..a45cbf962503 100644
--- a/pkgs/by-name/co/cook-cli/package.nix
+++ b/pkgs/by-name/co/cook-cli/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cooklang";
     repo = "cookcli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1m2+etJG+33fPTxBF8qT/U9WiZGcSn9r0WlK5PDL6/Q=";
   };
 
diff --git a/pkgs/by-name/co/copilot-cli/package.nix b/pkgs/by-name/co/copilot-cli/package.nix
index ae391655309a..a04f46bf5f42 100644
--- a/pkgs/by-name/co/copilot-cli/package.nix
+++ b/pkgs/by-name/co/copilot-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iipDvjPCNtk6wHjukgtnWzz0qwAJOU9DpolesNM2ELo=";
   };
 
diff --git a/pkgs/by-name/co/copilot-node-server/package.nix b/pkgs/by-name/co/copilot-node-server/package.nix
index 002398ba3915..9dac4e80164b 100644
--- a/pkgs/by-name/co/copilot-node-server/package.nix
+++ b/pkgs/by-name/co/copilot-node-server/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jfcherng";
     repo = "copilot-node-server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yOqA2Xo4c7u0g6RQYt9joQk8mI9KE0xTAnLjln9atmg=";
   };
 
diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix
index 6a8daf2a6c7c..c11f14947429 100644
--- a/pkgs/by-name/co/coppwr/package.nix
+++ b/pkgs/by-name/co/coppwr/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dimtpap";
     repo = "coppwr";
-    tag = version;
+    rev = version;
     hash = "sha256-5TgK/0UN05P3WENch4sBo/Sy9FaMmyH/gZ+6qUyM1z0=";
   };
 
diff --git a/pkgs/by-name/co/coq2html/package.nix b/pkgs/by-name/co/coq2html/package.nix
index cf4603085a93..5768962265cd 100644
--- a/pkgs/by-name/co/coq2html/package.nix
+++ b/pkgs/by-name/co/coq2html/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xavierleroy";
     repo = "coq2html";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dBXYeRwBhBWXJfdULLzfgZU+WD6WC6R8wV2eS1zAkq8=";
   };
 
diff --git a/pkgs/by-name/co/cordless/package.nix b/pkgs/by-name/co/cordless/package.nix
index dc937f1260af..f58b6752ea63 100644
--- a/pkgs/by-name/co/cordless/package.nix
+++ b/pkgs/by-name/co/cordless/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Bios-Marcel";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-nOHLI0N4d8aC7KaWdLezSpVU1DS1fkfW5UO7cVYCbis=";
   };
 
diff --git a/pkgs/by-name/co/cordova/package.nix b/pkgs/by-name/co/cordova/package.nix
index 568566383c11..394fc87059ac 100644
--- a/pkgs/by-name/co/cordova/package.nix
+++ b/pkgs/by-name/co/cordova/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "cordova-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-fEV7NlRcRpyeRplsdXHI2U4/89DsvKQpVwHD5juiNPo=";
   };
 
diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix
index 452dfd9777c7..c0c8d6d97acc 100644
--- a/pkgs/by-name/co/coredns/package.nix
+++ b/pkgs/by-name/co/coredns/package.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "coredns";
     repo = "coredns";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8LZMS1rAqEZ8k1IWSRkQ2O650oqHLP0P31T8oUeE4fw=";
   };
 
diff --git a/pkgs/by-name/co/corerad/package.nix b/pkgs/by-name/co/corerad/package.nix
index ce659722f2db..462cd493e830 100644
--- a/pkgs/by-name/co/corerad/package.nix
+++ b/pkgs/by-name/co/corerad/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "corerad";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tVK4chDV26vpuTaqVWe498j8ijZN2OOhe97LLE+xK9Y=";
   };
 
diff --git a/pkgs/by-name/co/coreth/package.nix b/pkgs/by-name/co/coreth/package.nix
index d0f9e448d123..e17c06da1a5d 100644
--- a/pkgs/by-name/co/coreth/package.nix
+++ b/pkgs/by-name/co/coreth/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ava-labs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YUqrbTjye0eNNuf9hGQXtMidRq6y3m3pSKzIRVECy9E=";
   };
 
diff --git a/pkgs/by-name/co/corkscrew/package.nix b/pkgs/by-name/co/corkscrew/package.nix
index 284072403972..00a1f54697f3 100644
--- a/pkgs/by-name/co/corkscrew/package.nix
+++ b/pkgs/by-name/co/corkscrew/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bryanpkc";
     repo = "corkscrew";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JiddvTbuOysenrVWGUEyKSzpCF1PJaYWQUdz3FuLCdw=";
   };
 
diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix
index 8d605d967b00..b6ff5c566804 100644
--- a/pkgs/by-name/co/coroot-node-agent/package.nix
+++ b/pkgs/by-name/co/coroot-node-agent/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot-node-agent";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3rr8LWaEhhAvzJisVj2uLK3O5us5/XEOpl7RFL2GBxw=";
   };
 
diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix
index 34c1c2a8f9a3..05c5a5dc8f81 100644
--- a/pkgs/by-name/co/coroot/package.nix
+++ b/pkgs/by-name/co/coroot/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pGNlXXggy32vnbbjGNCev8HzUltls1ElGVULPhOwoRQ=";
   };
 
diff --git a/pkgs/by-name/co/corrosion/package.nix b/pkgs/by-name/co/corrosion/package.nix
index ec09b7710ddf..cdd2debdaa61 100644
--- a/pkgs/by-name/co/corrosion/package.nix
+++ b/pkgs/by-name/co/corrosion/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "corrosion-rs";
     repo = "corrosion";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/Xq0SKaKuOgrMXbgw+Aa59NEnU1mPQhARoh7EqV01K8=";
   };
 
diff --git a/pkgs/by-name/co/cosmopolitan/package.nix b/pkgs/by-name/co/cosmopolitan/package.nix
index 4dc2981d2e39..fd8821dd8a1a 100644
--- a/pkgs/by-name/co/cosmopolitan/package.nix
+++ b/pkgs/by-name/co/cosmopolitan/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jart";
     repo = "cosmopolitan";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-DTL1dXH+LhaxWpiCrsNjV74Bw5+kPbhEAA2Z1NKiPDk=";
   };
 
diff --git a/pkgs/by-name/co/costa/package.nix b/pkgs/by-name/co/costa/package.nix
index 6cdf8c88dfe3..0c39de81e3be 100644
--- a/pkgs/by-name/co/costa/package.nix
+++ b/pkgs/by-name/co/costa/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eth-cscs";
     repo = "COSTA";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jiAyZXC7wiuEnOLsQFFLxhN3AsGXN09q/gHC2Hrb2gg=";
   };
 
diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix
index 50416348d116..69535aef9427 100644
--- a/pkgs/by-name/co/cotp/package.nix
+++ b/pkgs/by-name/co/cotp/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "replydev";
     repo = "cotp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5wVIjh16AYwrzjbPgvjsQhihu/vwdQfzU2kZS6eSTWs=";
   };
 
diff --git a/pkgs/by-name/co/couchbase-shell/package.nix b/pkgs/by-name/co/couchbase-shell/package.nix
index b74f103cc28e..d765aeeea45c 100644
--- a/pkgs/by-name/co/couchbase-shell/package.nix
+++ b/pkgs/by-name/co/couchbase-shell/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "couchbaselabs";
     repo = "couchbase-shell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wqOU94rPqIO128uL9iyVzWcAgqnDUPUy1+Qq1hSkvHA=";
   };
 
diff --git a/pkgs/by-name/co/coulr/package.nix b/pkgs/by-name/co/coulr/package.nix
index ba9cdc61901e..c7db6a671b15 100644
--- a/pkgs/by-name/co/coulr/package.nix
+++ b/pkgs/by-name/co/coulr/package.nix
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Huluti";
     repo = "Coulr";
-    tag = version;
+    rev = version;
     hash = "sha256-1xnL5AWl/rLQu3i9m6uxbS4QT+690hmEW8kYTwkg7Gw=";
   };
 
diff --git a/pkgs/by-name/co/cowpatty/package.nix b/pkgs/by-name/co/cowpatty/package.nix
index 735de69c250b..f264c18c0c56 100644
--- a/pkgs/by-name/co/cowpatty/package.nix
+++ b/pkgs/by-name/co/cowpatty/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "joswr1ght";
     repo = "cowpatty";
-    tag = version;
+    rev = version;
     sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s";
   };
 
diff --git a/pkgs/by-name/co/coz/package.nix b/pkgs/by-name/co/coz/package.nix
index 715d22aae4ae..90e08f176aaf 100644
--- a/pkgs/by-name/co/coz/package.nix
+++ b/pkgs/by-name/co/coz/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "plasma-umass";
     repo = "coz";
-    tag = version;
+    rev = version;
     hash = "sha256-tvFXInxjodB0jEgEKgnOGapiVPomBG1hvrhYtG2X5jI=";
   };
 
diff --git a/pkgs/by-name/co/coze/package.nix b/pkgs/by-name/co/coze/package.nix
index 208f4f3bc6d5..2149283645f6 100644
--- a/pkgs/by-name/co/coze/package.nix
+++ b/pkgs/by-name/co/coze/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Cyphrme";
     repo = "Coze_cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/Cznx5Q0a9vVrC4oAoBmAkejT1505AQzzCW/wi3itv4=";
   };
 
diff --git a/pkgs/by-name/co/cozy/package.nix b/pkgs/by-name/co/cozy/package.nix
index 809ade74697b..d0182f75792a 100644
--- a/pkgs/by-name/co/cozy/package.nix
+++ b/pkgs/by-name/co/cozy/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "geigi";
     repo = "cozy";
-    tag = version;
+    rev = version;
     hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw";
   };
 
diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix
index be6a03efd462..64673800373e 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-04AFiEuv+EYubZVoYErQDdr9zipKlF7Gqy8DrUaYUMk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cp/cp437/package.nix b/pkgs/by-name/cp/cp437/package.nix
index 12a3952127f9..e5cae69edd0e 100644
--- a/pkgs/by-name/cp/cp437/package.nix
+++ b/pkgs/by-name/cp/cp437/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "keaston";
     repo = "cp437";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "18f4mnfnyviqclbhmbhix80k823481ypkwbp26qfvhnxdgzbggcc";
   };
 
diff --git a/pkgs/by-name/cp/cpcfs/package.nix b/pkgs/by-name/cp/cpcfs/package.nix
index 66bd97912eb4..b726e17a1f66 100644
--- a/pkgs/by-name/cp/cpcfs/package.nix
+++ b/pkgs/by-name/cp/cpcfs/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "derikz";
     repo = "cpcfs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0rfbry0qy8mv746mzk9zdfffkdgq4w7invgb5cszjma2cp83q3i2";
   };
 
diff --git a/pkgs/by-name/cp/cplay-ng/package.nix b/pkgs/by-name/cp/cplay-ng/package.nix
index 7bed3b0532b8..82b331616607 100644
--- a/pkgs/by-name/cp/cplay-ng/package.nix
+++ b/pkgs/by-name/cp/cplay-ng/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xi";
     repo = "cplay-ng";
-    tag = version;
+    rev = version;
     hash = "sha256-6mphhoLDkGZ2r+elzLlPl3B8fNz3loqrQB8x8276AHI=";
   };
 
diff --git a/pkgs/by-name/cp/cpp-hocon/package.nix b/pkgs/by-name/cp/cpp-hocon/package.nix
index f4547d399ec0..7d6a65aa61c9 100644
--- a/pkgs/by-name/cp/cpp-hocon/package.nix
+++ b/pkgs/by-name/cp/cpp-hocon/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "0b24anpwkmvbsn5klnr58vxksw00ci9pjhwzx7a61kplyhsaiydw";
-    tag = version;
+    rev = version;
     repo = "cpp-hocon";
     owner = "puppetlabs";
   };
diff --git a/pkgs/by-name/cp/cpp-jwt/package.nix b/pkgs/by-name/cp/cpp-jwt/package.nix
index d090735225d7..838916f65566 100644
--- a/pkgs/by-name/cp/cpp-jwt/package.nix
+++ b/pkgs/by-name/cp/cpp-jwt/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arun11299";
     repo = "cpp-jwt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5hVsFanTCT/uLLXrnb2kMvmL6qs9RXVkvxdWaT6m4mk=";
   };
 
diff --git a/pkgs/by-name/cp/cpp-redis/package.nix b/pkgs/by-name/cp/cpp-redis/package.nix
index 0d99b8069179..6fc1e5b7c1e3 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";
-    tag = version;
+    rev = version;
     hash = "sha256-dLAnxgldylWWKO3WIyx+F7ylOpRH+0nD7NZjWSOxuwQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cp/cppclean/package.nix b/pkgs/by-name/cp/cppclean/package.nix
index 7cf3aad5af16..c260929b2d9e 100644
--- a/pkgs/by-name/cp/cppclean/package.nix
+++ b/pkgs/by-name/cp/cppclean/package.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "myint";
     repo = "cppclean";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "081bw7kkl7mh3vwyrmdfrk3fgq8k5laacx7hz8fjpchrvdrkqph0";
   };
 
diff --git a/pkgs/by-name/cp/cppe/package.nix b/pkgs/by-name/cp/cppe/package.nix
index fb65e208780a..ff4757daab1a 100644
--- a/pkgs/by-name/cp/cppe/package.nix
+++ b/pkgs/by-name/cp/cppe/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maxscheurer";
     repo = "cppe";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw=";
   };
 
diff --git a/pkgs/by-name/cp/cppzmq/package.nix b/pkgs/by-name/cp/cppzmq/package.nix
index afb7b9b574f0..a100bbdb9bc8 100644
--- a/pkgs/by-name/cp/cppzmq/package.nix
+++ b/pkgs/by-name/cp/cppzmq/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "cppzmq";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HTdaV1cLbwGYuikS9EAVvAOdLmCoWlvVXlpYsUwY5IA=";
   };
 
diff --git a/pkgs/by-name/cp/cpu-energy-meter/package.nix b/pkgs/by-name/cp/cpu-energy-meter/package.nix
index 9b2cba67a502..42d496badab3 100644
--- a/pkgs/by-name/cp/cpu-energy-meter/package.nix
+++ b/pkgs/by-name/cp/cpu-energy-meter/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sosy-lab";
     repo = "cpu-energy-meter";
-    tag = version;
+    rev = version;
     hash = "sha256-QW65Z8mRYLHcyLeOtNAHjwPNWAUP214wqIYclK+whFw=";
   };
 
diff --git a/pkgs/by-name/cp/cpu_features/package.nix b/pkgs/by-name/cp/cpu_features/package.nix
index 27ad09456a04..2e0c26314192 100644
--- a/pkgs/by-name/cp/cpu_features/package.nix
+++ b/pkgs/by-name/cp/cpu_features/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "cpu_features";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uXN5crzgobNGlLpbpuOxR+9QVtZKrWhxC/UjQEakJwk=";
   };
 
diff --git a/pkgs/by-name/cp/cpufetch/package.nix b/pkgs/by-name/cp/cpufetch/package.nix
index 65bd2066b5d7..cc3d961d8149 100644
--- a/pkgs/by-name/cp/cpufetch/package.nix
+++ b/pkgs/by-name/cp/cpufetch/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Dr-Noob";
     repo = "cpufetch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sE3i2rw8W362BExFEImjw/t17qX8D4/0Ty8jG63bjbk=";
   };
 
diff --git a/pkgs/by-name/cp/cpulimit/package.nix b/pkgs/by-name/cp/cpulimit/package.nix
index 8f639461f234..3e143ac49887 100644
--- a/pkgs/by-name/cp/cpulimit/package.nix
+++ b/pkgs/by-name/cp/cpulimit/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opsengine";
     repo = "cpulimit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1dz045yhcsw1rdamzpz4bk8mw888in7fyqk1q1b3m1yk4pd1ahkh";
   };
 
diff --git a/pkgs/by-name/cp/cpuminer/package.nix b/pkgs/by-name/cp/cpuminer/package.nix
index 4ba26ea0e394..eb8be6375be6 100644
--- a/pkgs/by-name/cp/cpuminer/package.nix
+++ b/pkgs/by-name/cp/cpuminer/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pooler";
     repo = "cpuminer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0f44i0z8rid20c2hiyp92xq0q0mjj537r05sa6vdbc0nl0a5q40i";
   };
 
diff --git a/pkgs/by-name/cp/cpuset/package.nix b/pkgs/by-name/cp/cpuset/package.nix
index d953a4e82035..f9af9b8893b6 100644
--- a/pkgs/by-name/cp/cpuset/package.nix
+++ b/pkgs/by-name/cp/cpuset/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lpechacek";
     repo = "cpuset";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fW0SXNI10pb6FTn/2TOqxP9qlys0KL/H9m//NjslUaY=";
   };
 
diff --git a/pkgs/by-name/cq/cq/package.nix b/pkgs/by-name/cq/cq/package.nix
index 7fb8048a2596..59b7637022f7 100644
--- a/pkgs/by-name/cq/cq/package.nix
+++ b/pkgs/by-name/cq/cq/package.nix
@@ -20,7 +20,7 @@ buildGraalvmNativeImage rec {
   build-src = fetchFromGitHub {
     owner = "markus-wa";
     repo = "cq";
-    tag = version;
+    rev = version;
     hash = "sha256-yjAC2obipdmh+JlHzVUTMtTXN2VKe4WKkyJyu2Q93c8=";
   };
 
diff --git a/pkgs/by-name/cr/crabz/package.nix b/pkgs/by-name/cr/crabz/package.nix
index 6031cef4066b..5a8c587433fc 100644
--- a/pkgs/by-name/cr/crabz/package.nix
+++ b/pkgs/by-name/cr/crabz/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = "crabz";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GJHxo4WD/XMudwxOHdNwY1M+b/DFJMpU0uD3sOvO5YU=";
   };
 
diff --git a/pkgs/by-name/cr/crackxls/package.nix b/pkgs/by-name/cr/crackxls/package.nix
index 30754237a5f2..b14153eb44bc 100644
--- a/pkgs/by-name/cr/crackxls/package.nix
+++ b/pkgs/by-name/cr/crackxls/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GavinSmith0123";
     repo = "crackxls2003";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz";
   };
 
diff --git a/pkgs/by-name/cr/craftos-pc/package.nix b/pkgs/by-name/cr/craftos-pc/package.nix
index da22b32a360d..24ea3494efcf 100644
--- a/pkgs/by-name/cr/craftos-pc/package.nix
+++ b/pkgs/by-name/cr/craftos-pc/package.nix
@@ -20,13 +20,13 @@ let
   craftos2-lua = fetchFromGitHub {
     owner = "MCJack123";
     repo = "craftos2-lua";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OCHN/ef83X4r5hZcPfFFvNJHjINCTiK+COf369/WPsA=";
   };
   craftos2-rom = fetchFromGitHub {
     owner = "McJack123";
     repo = "craftos2-rom";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YidLt/JLwBMW0LMo5Q5PV6wGhF0J72FGX+iWYn6v0Z4=";
   };
 in
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MCJack123";
     repo = "craftos2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DbxAsXxpsa42dF6DaLmgIa+Hs/PPqJ4dE97PoKxG2Ig=";
   };
 
diff --git a/pkgs/by-name/cr/crate2nix/package.nix b/pkgs/by-name/cr/crate2nix/package.nix
index fc9b160be790..a03e6acf44bb 100644
--- a/pkgs/by-name/cr/crate2nix/package.nix
+++ b/pkgs/by-name/cr/crate2nix/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "crate2nix";
-    tag = version;
+    rev = version;
     hash = "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE=";
   };
 
diff --git a/pkgs/by-name/cr/crawley/package.nix b/pkgs/by-name/cr/crawley/package.nix
index 698ea7d1763a..fa0e0b0fc9fa 100644
--- a/pkgs/by-name/cr/crawley/package.nix
+++ b/pkgs/by-name/cr/crawley/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "s0rg";
     repo = "crawley";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vc3HHkX0BFVSJi1Ll9T8IgYh5P6rzi4FowE7Jdy/tO8=";
   };
 
diff --git a/pkgs/by-name/cr/crc/package.nix b/pkgs/by-name/cr/crc/package.nix
index 6bf1b969eb67..f94350a168f6 100644
--- a/pkgs/by-name/cr/crc/package.nix
+++ b/pkgs/by-name/cr/crc/package.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "crc-org";
     repo = "crc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = gitHash;
   };
 
diff --git a/pkgs/by-name/cr/crc32c/package.nix b/pkgs/by-name/cr/crc32c/package.nix
index fa2dd97b7a14..e1f510216857 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";
-    tag = version;
+    rev = version;
     sha256 = "0c383p7vkfq9rblww6mqxz8sygycyl27rr0j3bzb8l8ga71710ii";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cr/crd2pulumi/package.nix b/pkgs/by-name/cr/crd2pulumi/package.nix
index f103e713825f..f14c9851b715 100644
--- a/pkgs/by-name/cr/crd2pulumi/package.nix
+++ b/pkgs/by-name/cr/crd2pulumi/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "crd2pulumi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PqEQrmSfcPH+GSGnuv6xpAm/2gAyTmLf81C+e25Un4s=";
   };
 
diff --git a/pkgs/by-name/cr/cre2/package.nix b/pkgs/by-name/cr/cre2/package.nix
index af0ffe28b910..fff9b4ddbf94 100644
--- a/pkgs/by-name/cr/cre2/package.nix
+++ b/pkgs/by-name/cr/cre2/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "marcomaggi";
     repo = "cre2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q";
   };
 
diff --git a/pkgs/by-name/cr/create-react-app/package.nix b/pkgs/by-name/cr/create-react-app/package.nix
index 6d84d1128a02..2a2d2172d9f4 100644
--- a/pkgs/by-name/cr/create-react-app/package.nix
+++ b/pkgs/by-name/cr/create-react-app/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "create-react-app";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nUvJRxBZ98ogSkbw8ciFYtZRQNFD6pLThoEjeDMcGm0=";
   };
 
diff --git a/pkgs/by-name/cr/credential-detector/package.nix b/pkgs/by-name/cr/credential-detector/package.nix
index c8fef2331019..145f12910e82 100644
--- a/pkgs/by-name/cr/credential-detector/package.nix
+++ b/pkgs/by-name/cr/credential-detector/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ynori7";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-20ySTLpjTc1X0iJsbzbeLmWF0xYzzREGOqEWrB2X1GQ=";
   };
 
diff --git a/pkgs/by-name/cr/credhub-cli/package.nix b/pkgs/by-name/cr/credhub-cli/package.nix
index fb37b7dbb9d2..8a918197881f 100644
--- a/pkgs/by-name/cr/credhub-cli/package.nix
+++ b/pkgs/by-name/cr/credhub-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudfoundry-incubator";
     repo = "credhub-cli";
-    tag = version;
+    rev = version;
     sha256 = "sha256-5963iZ7fDNs+J96+GSoGcjKLCqu8u3obAWE9+9oEBGU=";
   };
 
diff --git a/pkgs/by-name/cr/creep/package.nix b/pkgs/by-name/cr/creep/package.nix
index d3a1123d4ad9..844754b80eeb 100644
--- a/pkgs/by-name/cr/creep/package.nix
+++ b/pkgs/by-name/cr/creep/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "romeovs";
     repo = "creep";
-    tag = version;
+    rev = version;
     sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n";
   };
 
diff --git a/pkgs/by-name/cr/crex/package.nix b/pkgs/by-name/cr/crex/package.nix
index c597425c16fe..3958fd61d1e1 100644
--- a/pkgs/by-name/cr/crex/package.nix
+++ b/pkgs/by-name/cr/crex/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "octobanana";
     repo = "crex";
-    tag = version;
+    rev = version;
     sha256 = "086rvwl494z48acgsq3yq11qh1nxm8kbf11adn16aszai4d4ipr3";
   };
 
diff --git a/pkgs/by-name/cr/cri-tools/package.nix b/pkgs/by-name/cr/cri-tools/package.nix
index 975fa44e2780..c0da20906e86 100644
--- a/pkgs/by-name/cr/cri-tools/package.nix
+++ b/pkgs/by-name/cr/cri-tools/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wdtsx5DIg+65VRRUPai5d8Tk/zQ4MhVjXNFKK4NCBFs=";
   };
 
diff --git a/pkgs/by-name/cr/critcmp/package.nix b/pkgs/by-name/cr/critcmp/package.nix
index e9a50c43a0e2..5c85eaa6b4ee 100644
--- a/pkgs/by-name/cr/critcmp/package.nix
+++ b/pkgs/by-name/cr/critcmp/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "critcmp";
-    tag = version;
+    rev = version;
     hash = "sha256-cf78R9siH0RFbx+vXTs71VblpsQokL6Uo32N3X4lV2I=";
   };
 
diff --git a/pkgs/by-name/cr/criterion/package.nix b/pkgs/by-name/cr/criterion/package.nix
index 611aff9167d5..958a9a7c89ed 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-5GH7AYjrnBnqiSmp28BoaM1Xmy8sPs1atfqJkGy3Yf0=";
   };
diff --git a/pkgs/by-name/cr/criu/package.nix b/pkgs/by-name/cr/criu/package.nix
index 0ecdc6a976ff..728a1ad28939 100644
--- a/pkgs/by-name/cr/criu/package.nix
+++ b/pkgs/by-name/cr/criu/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "checkpoint-restore";
     repo = "criu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Z4prbaPYRdN/fPdBwDz7D3/gKybh2ulA3UM1LZGeAK0=";
   };
 
diff --git a/pkgs/by-name/cr/crlfuzz/package.nix b/pkgs/by-name/cr/crlfuzz/package.nix
index 0b71af9f4747..f9b750da7642 100644
--- a/pkgs/by-name/cr/crlfuzz/package.nix
+++ b/pkgs/by-name/cr/crlfuzz/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dwisiswant0";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rqhdxOQmZCRtq+IZygKLleb5GoKP2akyEc3rbGcnZmw=";
   };
 
diff --git a/pkgs/by-name/cr/croaring/package.nix b/pkgs/by-name/cr/croaring/package.nix
index eb8c497c2cdd..70d6a6884709 100644
--- a/pkgs/by-name/cr/croaring/package.nix
+++ b/pkgs/by-name/cr/croaring/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RoaringBitmap";
     repo = "CRoaring";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WaFyJ/6zstJ05e3vfrwhaZKQsjRAEvVTs688Hw0fr94=";
   };
 
diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix
index a5a20f4e6b49..8493b0ed7279 100644
--- a/pkgs/by-name/cr/croc/package.nix
+++ b/pkgs/by-name/cr/croc/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "schollz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tRWkokgs2SZglkgzK+UxwzbTk99GcPgDBcgJkMURNJ8=";
   };
 
diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix
index b3e2aa60405a..7b812d84ebb1 100644
--- a/pkgs/by-name/cr/crossplane-cli/package.nix
+++ b/pkgs/by-name/cr/crossplane-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "crossplane";
     repo = "crossplane";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pQIiVdDWy3+PrqhvVHDwgGHHCQCYWtWt9ympc8QbBcE=";
   };
 
diff --git a/pkgs/by-name/cr/crudini/package.nix b/pkgs/by-name/cr/crudini/package.nix
index db5ed5f2e519..ae8387c374b3 100644
--- a/pkgs/by-name/cr/crudini/package.nix
+++ b/pkgs/by-name/cr/crudini/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pixelb";
     repo = "crudini";
-    tag = version;
+    rev = version;
     hash = "sha256-BU4u7uBsNyDOwWUjOIlBWcf1AeUXXZ+johAe+bjws1U=";
   };
 
diff --git a/pkgs/by-name/cr/crumbs/package.nix b/pkgs/by-name/cr/crumbs/package.nix
index fdf14674ddd4..cc0a7aab71e7 100644
--- a/pkgs/by-name/cr/crumbs/package.nix
+++ b/pkgs/by-name/cr/crumbs/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fasseg";
     repo = "crumbs";
-    tag = version;
+    rev = version;
     sha256 = "0jjvydn4i4n9xv8vsal2jxpa95mk2lw6myv0gx9wih242k9vy0l7";
   };
 
diff --git a/pkgs/by-name/cr/crun/package.nix b/pkgs/by-name/cr/crun/package.nix
index 901a6532d27d..05c6cd7168af 100644
--- a/pkgs/by-name/cr/crun/package.nix
+++ b/pkgs/by-name/cr/crun/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "crun";
-    tag = version;
+    rev = version;
     hash = "sha256-uAB/IJ1psGKvOTVhj00VlNadxSKTXvg1eU97bngVblw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cr/cryfs/package.nix b/pkgs/by-name/cr/cryfs/package.nix
index 8e850e03e2dd..b6563a677939 100644
--- a/pkgs/by-name/cr/cryfs/package.nix
+++ b/pkgs/by-name/cr/cryfs/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cryfs";
     repo = "cryfs";
-    tag = version;
+    rev = version;
     hash = "sha256-OkJhLg+YzS3kDhlpUQe9A+OiVBPG/iKs6OU7aKFJ5wY=";
   };
 
diff --git a/pkgs/by-name/cr/crypto-tracker/package.nix b/pkgs/by-name/cr/crypto-tracker/package.nix
index b56118a5dbf8..34c3c6340959 100644
--- a/pkgs/by-name/cr/crypto-tracker/package.nix
+++ b/pkgs/by-name/cr/crypto-tracker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Nox04";
     repo = "crypto-tracker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8tTaXpHZWcDq0Jfa9Hf258VYwfimLhYjCAzD4X/Ow0s=";
   };
 
diff --git a/pkgs/by-name/cr/cryptominisat/package.nix b/pkgs/by-name/cr/cryptominisat/package.nix
index c97351bbee69..9c99d0c0555f 100644
--- a/pkgs/by-name/cr/cryptominisat/package.nix
+++ b/pkgs/by-name/cr/cryptominisat/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "msoos";
     repo = "cryptominisat";
-    tag = version;
+    rev = version;
     hash = "sha256-8oH9moMjQEWnQXKmKcqmXuXcYkEyvr4hwC1bC4l26mo=";
   };
 
diff --git a/pkgs/by-name/cr/cryptpad/package.nix b/pkgs/by-name/cr/cryptpad/package.nix
index b149dc131857..94087f88b86b 100644
--- a/pkgs/by-name/cr/cryptpad/package.nix
+++ b/pkgs/by-name/cr/cryptpad/package.nix
@@ -82,7 +82,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "cryptpad";
     repo = "cryptpad";
-    tag = version;
+    rev = version;
     hash = "sha256-oSrDajaCEc7I2AsDzKoO34ffd4OeXDwFDGm45yQDSvE=";
   };
 
diff --git a/pkgs/by-name/cr/crystal2nix/package.nix b/pkgs/by-name/cr/crystal2nix/package.nix
index 006e9ed0fb82..8232e8e42d7e 100644
--- a/pkgs/by-name/cr/crystal2nix/package.nix
+++ b/pkgs/by-name/cr/crystal2nix/package.nix
@@ -13,7 +13,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "peterhoeg";
     repo = "crystal2nix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gb2vgKWVXwYWfUUcFvOLFF0qB4CTBekEllpyKduU1Mo=";
   };
 
diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix
index 8cc8fe053a6b..0771b7942c79 100644
--- a/pkgs/by-name/cs/csdr/package.nix
+++ b/pkgs/by-name/cs/csdr/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jketterl";
     repo = "csdr";
-    tag = version;
+    rev = version;
     sha256 = "sha256-LdVzeTTIvDQIXRdcz/vpQu/fUgtE8nx1kIEfoiwxrUg=";
   };
 
diff --git a/pkgs/by-name/cs/cshatag/package.nix b/pkgs/by-name/cs/cshatag/package.nix
index a1e2dcaef455..16dedcf39cff 100644
--- a/pkgs/by-name/cs/cshatag/package.nix
+++ b/pkgs/by-name/cs/cshatag/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-RqQPbqfliKg7XPA/C9D7Aq1SsN+tAW44tAFHt9p8Py0=";
   };
 
diff --git a/pkgs/by-name/cs/csound-manual/package.nix b/pkgs/by-name/cs/csound-manual/package.nix
index 4da103f2a6a2..7cfdd0a1fdcc 100644
--- a/pkgs/by-name/cs/csound-manual/package.nix
+++ b/pkgs/by-name/cs/csound-manual/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "csound";
     repo = "manual";
-    tag = version;
+    rev = version;
     sha256 = "sha256-W8MghqUBr3V7LPgNwU6Ugw16wdK3G37zAPuasMlZ2+I=";
   };
 
diff --git a/pkgs/by-name/cs/css-checker/package.nix b/pkgs/by-name/cs/css-checker/package.nix
index 1e39bb37dcd9..ef5038ec9cb7 100644
--- a/pkgs/by-name/cs/css-checker/package.nix
+++ b/pkgs/by-name/cs/css-checker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ruilisi";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lD2uF8zhJG8pVepqxyKKj4GZNB883uDV/9dCMFYJbRs=";
   };
 
diff --git a/pkgs/by-name/cs/csv-tui/package.nix b/pkgs/by-name/cs/csv-tui/package.nix
index f4eb3ed9ad6f..d851ee8aed69 100644
--- a/pkgs/by-name/cs/csv-tui/package.nix
+++ b/pkgs/by-name/cs/csv-tui/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nathangavin";
     repo = "csv-tui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T8T9fW4E/wigktSomoc+xPkVqX5T3OnTmL4XIT5YXe8=";
   };
 
diff --git a/pkgs/by-name/cs/csv2parquet/package.nix b/pkgs/by-name/cs/csv2parquet/package.nix
index f642904256df..9701b177393b 100644
--- a/pkgs/by-name/cs/csv2parquet/package.nix
+++ b/pkgs/by-name/cs/csv2parquet/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "domoritz";
     repo = "csv2parquet";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-499DC0kLvvP5Oq2WYRb9BIppTdfm41u8hwrPU8b66Zw=";
   };
 
diff --git a/pkgs/by-name/cs/csvdiff/package.nix b/pkgs/by-name/cs/csvdiff/package.nix
index 67e3eb3cc852..7653b8479c8a 100644
--- a/pkgs/by-name/cs/csvdiff/package.nix
+++ b/pkgs/by-name/cs/csvdiff/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aswinkarthik";
     repo = "csvdiff";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-66R5XxrNQ1YMMQicw0VCF/XzRo//5Gqdjlher/uMoTE=";
   };
 
diff --git a/pkgs/by-name/cs/csview/package.nix b/pkgs/by-name/cs/csview/package.nix
index 99c77070e083..c23c56c8f2f4 100644
--- a/pkgs/by-name/cs/csview/package.nix
+++ b/pkgs/by-name/cs/csview/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "csview";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JFuqaGwCSfEIncBgLu6gGaOvAC5vojKFjruWcuSghS0=";
   };
 
diff --git a/pkgs/by-name/cs/csvq/package.nix b/pkgs/by-name/cs/csvq/package.nix
index b02c21369459..fa1b244dec0f 100644
--- a/pkgs/by-name/cs/csvq/package.nix
+++ b/pkgs/by-name/cs/csvq/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mithrandie";
     repo = "csvq";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1UK+LSMKryoUf2UWbGt8MU3zs5hH2WdpA2v/jBaIHYE=";
   };
 
diff --git a/pkgs/by-name/cs/csvquote/package.nix b/pkgs/by-name/cs/csvquote/package.nix
index 3efefd92ced4..7a3b1c8bab15 100644
--- a/pkgs/by-name/cs/csvquote/package.nix
+++ b/pkgs/by-name/cs/csvquote/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dbro";
     repo = "csvquote";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-847JAoDEfA9K4LB8z9cqSw+GTImqmITBylB/4odLDb0=";
   };
 
diff --git a/pkgs/by-name/cs/csvs-to-sqlite/package.nix b/pkgs/by-name/cs/csvs-to-sqlite/package.nix
index d68f0efdf2df..171c2c418d67 100644
--- a/pkgs/by-name/cs/csvs-to-sqlite/package.nix
+++ b/pkgs/by-name/cs/csvs-to-sqlite/package.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "simonw";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-wV6htULG3lg2IhG2bXmc/9vjcK8/+WA7jm3iJu4ZoOE=";
   };
 
diff --git a/pkgs/by-name/cs/csxcad/package.nix b/pkgs/by-name/cs/csxcad/package.nix
index 019e21638cce..5482166b4d76 100644
--- a/pkgs/by-name/cs/csxcad/package.nix
+++ b/pkgs/by-name/cs/csxcad/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "CSXCAD";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-SSV5ulx3rCJg99I/oOQbqe+gOSs+BfcCo6UkWHVhnSs=";
   };
 
diff --git a/pkgs/by-name/ct/ctlptl/package.nix b/pkgs/by-name/ct/ctlptl/package.nix
index 873995b57bb0..c2f832e33062 100644
--- a/pkgs/by-name/ct/ctlptl/package.nix
+++ b/pkgs/by-name/ct/ctlptl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tilt-dev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-O6oAkYzkBUecwAcLjPIR7D/k4REWND8TWdstPNVJ0MU=";
   };
 
diff --git a/pkgs/by-name/ct/ctodo/package.nix b/pkgs/by-name/ct/ctodo/package.nix
index 43fd1ffa10e8..c70ac00b5b4a 100644
--- a/pkgs/by-name/ct/ctodo/package.nix
+++ b/pkgs/by-name/ct/ctodo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Acolarh";
     repo = "ctodo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0mqy5b35cbdwfpbs91ilsgz3wc4cky38xfz9pnr4q88q1vybigna";
   };
 
diff --git a/pkgs/by-name/ct/ctop/package.nix b/pkgs/by-name/ct/ctop/package.nix
index 7e0475f17f8a..1af537b225d2 100644
--- a/pkgs/by-name/ct/ctop/package.nix
+++ b/pkgs/by-name/ct/ctop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bcicen";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-tojSzgpoGQg6MwV/MVpQpCA5w6bZO+9IOvfkw0Ydr6c=";
   };
 
diff --git a/pkgs/by-name/ct/ctpv/package.nix b/pkgs/by-name/ct/ctpv/package.nix
index 46be87fb1b0f..aeac6bdee939 100644
--- a/pkgs/by-name/ct/ctpv/package.nix
+++ b/pkgs/by-name/ct/ctpv/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NikitaIvanovV";
     repo = "ctpv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3BQi4m44hBmPkJBFNCg6d9YKRbDZwLxdzBb/NDWTQP4=";
   };
 
diff --git a/pkgs/by-name/ct/ctre/package.nix b/pkgs/by-name/ct/ctre/package.nix
index 6aeff7cce6b2..f0418ae956e8 100644
--- a/pkgs/by-name/ct/ctre/package.nix
+++ b/pkgs/by-name/ct/ctre/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hanickadot";
     repo = "compile-time-regular-expressions";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Fmx8eKo4UHSYQa5RL70VmaogQj+ILVA1gfpaVE8+MlQ=";
   };
 
diff --git a/pkgs/by-name/ct/ctypes_sh/package.nix b/pkgs/by-name/ct/ctypes_sh/package.nix
index f4ab54e6984f..4d0c3e13bae7 100644
--- a/pkgs/by-name/ct/ctypes_sh/package.nix
+++ b/pkgs/by-name/ct/ctypes_sh/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "taviso";
     repo = "ctypes.sh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4";
   };
 
diff --git a/pkgs/by-name/cu/cuelsp/package.nix b/pkgs/by-name/cu/cuelsp/package.nix
index 8ae7de09887f..948478fc0806 100644
--- a/pkgs/by-name/cu/cuelsp/package.nix
+++ b/pkgs/by-name/cu/cuelsp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dagger";
     repo = "cuelsp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+E49TR2D26HSTwgwO1XFkIwXr5lmvv9l3KtR8dVT/cQ=";
   };
 
diff --git a/pkgs/by-name/cu/cuetools/package.nix b/pkgs/by-name/cu/cuetools/package.nix
index df3fccf8d505..2bd13b7a6b55 100644
--- a/pkgs/by-name/cu/cuetools/package.nix
+++ b/pkgs/by-name/cu/cuetools/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "svend";
     repo = "cuetools";
-    tag = version;
+    rev = version;
     sha256 = "02ksv1ahf1v4cr2xbclsfv5x17m9ivzbssb5r8xjm97yh8a7spa3";
   };
 
diff --git a/pkgs/by-name/cu/cuetsy/package.nix b/pkgs/by-name/cu/cuetsy/package.nix
index 4fadb72cefe9..e7afa8b140ad 100644
--- a/pkgs/by-name/cu/cuetsy/package.nix
+++ b/pkgs/by-name/cu/cuetsy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "cuetsy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dirzVR4j5K1+EHbeRi4rHwRxkyveySoM7qJzvOlGp+0=";
   };
 
diff --git a/pkgs/by-name/cu/cunicu/package.nix b/pkgs/by-name/cu/cunicu/package.nix
index 85f03a9801b4..ea6e16c32300 100644
--- a/pkgs/by-name/cu/cunicu/package.nix
+++ b/pkgs/by-name/cu/cunicu/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cunicu";
     repo = "cunicu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1y9olRSPu2akvE728oXBr70Pt03xj65R2GaOlZ/7RTg=";
   };
 
diff --git a/pkgs/by-name/cu/cups-browsed/package.nix b/pkgs/by-name/cu/cups-browsed/package.nix
index 8e8810d1b068..169bfda6e3bc 100644
--- a/pkgs/by-name/cu/cups-browsed/package.nix
+++ b/pkgs/by-name/cu/cups-browsed/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenPrinting";
     repo = "cups-browsed";
-    tag = version;
+    rev = version;
     hash = "sha256-Cfk28rxxgzzQs7B+tNmeUzDYL1eCx9zYwRsS/J6QX9s=";
   };
 
diff --git a/pkgs/by-name/cu/curlie/package.nix b/pkgs/by-name/cu/curlie/package.nix
index 7a31d02aec1e..b215a3dfb105 100644
--- a/pkgs/by-name/cu/curlie/package.nix
+++ b/pkgs/by-name/cu/curlie/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YOsq3cB+Pn2eC1Dky3fobBRR7GMxcf/tvWr6i3Vq/BE=";
   };
 
diff --git a/pkgs/by-name/cu/curlpp/package.nix b/pkgs/by-name/cu/curlpp/package.nix
index 58264f1c9d92..eb2c8f8f95e6 100644
--- a/pkgs/by-name/cu/curlpp/package.nix
+++ b/pkgs/by-name/cu/curlpp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jpbarrette";
     repo = "curlpp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1b0ylnnrhdax4kwjq64r1fk0i24n5ss6zfzf4hxwgslny01xiwrk";
   };
 
diff --git a/pkgs/by-name/cu/cursewords/package.nix b/pkgs/by-name/cu/cursewords/package.nix
index dba1285b4189..f4f3d808cab3 100644
--- a/pkgs/by-name/cu/cursewords/package.nix
+++ b/pkgs/by-name/cu/cursewords/package.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "thisisparker";
     repo = "cursewords";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ssr15kSdWmyMFFG5uCregrpGQ3rI2cMXqY9+/a3gs84=";
   };
 
diff --git a/pkgs/by-name/cv/cvc4/package.nix b/pkgs/by-name/cv/cvc4/package.nix
index 55f9774806a1..62fc9a50e06f 100644
--- a/pkgs/by-name/cv/cvc4/package.nix
+++ b/pkgs/by-name/cv/cvc4/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cvc4";
     repo = "cvc4";
-    tag = version;
+    rev = version;
     sha256 = "1rhs4pvzaa1wk00czrczp58b2cxfghpsnq534m0l3snnya2958jp";
   };
 
diff --git a/pkgs/by-name/cw/cw/package.nix b/pkgs/by-name/cw/cw/package.nix
index 85ab0a4ca712..8e3da631217e 100644
--- a/pkgs/by-name/cw/cw/package.nix
+++ b/pkgs/by-name/cw/cw/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lucagrulla";
     repo = "cw";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JsWwvVEr7kSjUy0S6wVcn24Xyo4OHr5/uqmnjw6v+RI=";
   };
 
diff --git a/pkgs/by-name/cw/cwe-client-cli/package.nix b/pkgs/by-name/cw/cwe-client-cli/package.nix
index 2dbe9e1bac5e..19bed845691f 100644
--- a/pkgs/by-name/cw/cwe-client-cli/package.nix
+++ b/pkgs/by-name/cw/cwe-client-cli/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NotBalds";
     repo = "cwe-client-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7zzmYwuQ+Sg8hf1zuKtKUMgk0Is1YJB4WdOKdxtWRA0=";
   };
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/cw/cwm/package.nix b/pkgs/by-name/cw/cwm/package.nix
index 2998d54bd797..e68e8b2aef33 100644
--- a/pkgs/by-name/cw/cwm/package.nix
+++ b/pkgs/by-name/cw/cwm/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "cwm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L3u4mH2UH2pTHhSPVr5dUi94b9DheslkIWL6EgQ05yA=";
   };
 
diff --git a/pkgs/by-name/cx/cxx-rs/package.nix b/pkgs/by-name/cx/cxx-rs/package.nix
index 9b4051998d5b..88d0bf8d6637 100644
--- a/pkgs/by-name/cx/cxx-rs/package.nix
+++ b/pkgs/by-name/cx/cxx-rs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cxx";
-    tag = version;
+    rev = version;
     sha256 = "sha256-KQlbJvULdc94SM0sx6JtukZPpaX4Gojc6Qgr20V3/VI=";
   };
 
diff --git a/pkgs/by-name/cx/cxxopts/package.nix b/pkgs/by-name/cx/cxxopts/package.nix
index 7b2b0ece9066..667a6450d1ed 100644
--- a/pkgs/by-name/cx/cxxopts/package.nix
+++ b/pkgs/by-name/cx/cxxopts/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jarro2783";
     repo = "cxxopts";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-aOF3owz7SIV4trJY0PnMtIcwqoUpDbB3tNxZcsl9dzM=";
   };
 
diff --git a/pkgs/by-name/cy/cyan/package.nix b/pkgs/by-name/cy/cyan/package.nix
index 3a582fafa45b..327994945850 100644
--- a/pkgs/by-name/cy/cyan/package.nix
+++ b/pkgs/by-name/cy/cyan/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rodlie";
     repo = "cyan";
-    tag = version;
+    rev = version;
     hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94=";
   };
 
diff --git a/pkgs/by-name/cy/cyclone-scheme/package.nix b/pkgs/by-name/cy/cyclone-scheme/package.nix
index 6c51f2bf7748..178c427c63ae 100644
--- a/pkgs/by-name/cy/cyclone-scheme/package.nix
+++ b/pkgs/by-name/cy/cyclone-scheme/package.nix
@@ -15,7 +15,7 @@ let
     src = fetchFromGitHub {
       owner = "justinethier";
       repo = "cyclone-bootstrap";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-kJBPb0Ej32HveY/vdGpH2gyxSwq8Xq7muneFIw3Y7hM=";
     };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "justinethier";
     repo = "cyclone";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-4U/uOTbFpPTC9BmO6Wkhy4PY8UCFVt5eHSGqrOlKT/U=";
   };
 
diff --git a/pkgs/by-name/cy/cyclonedds-cxx/package.nix b/pkgs/by-name/cy/cyclonedds-cxx/package.nix
index 2415281edaa3..4e556d718c26 100644
--- a/pkgs/by-name/cy/cyclonedds-cxx/package.nix
+++ b/pkgs/by-name/cy/cyclonedds-cxx/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eclipse-cyclonedds";
     repo = "cyclonedds-cxx";
-    tag = version;
+    rev = version;
     hash = "sha256-whFVEQec/Ca+dr6R7z9mMrNg315z3oIWchVT+vQ36So=";
   };
 
diff --git a/pkgs/by-name/cy/cyclonedds/package.nix b/pkgs/by-name/cy/cyclonedds/package.nix
index fe1eea2ec06c..dca6111c6cc5 100644
--- a/pkgs/by-name/cy/cyclonedds/package.nix
+++ b/pkgs/by-name/cy/cyclonedds/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eclipse-cyclonedds";
     repo = "cyclonedds";
-    tag = version;
+    rev = version;
     sha256 = "sha256-MQVUZ7PkxauoPpfxlhhAtsKztMe9tcZOpOzshuz/eb8=";
   };
 
diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix
index 997f74716193..e231f25a9f01 100644
--- a/pkgs/by-name/cy/cyme/package.nix
+++ b/pkgs/by-name/cy/cyme/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tuna-f1sh";
     repo = "cyme";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KAHCeM1rAPGi98PrcVJtzkhTWGWFwf37VuSQTjqXSEg=";
   };
 
diff --git a/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix b/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix
index 68b90dc7120b..922d38422877 100644
--- a/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix
+++ b/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moriyoshi";
     repo = "cyrus-sasl-xoauth2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lI8uKtVxrziQ8q/Ss+QTgg1xTObZUTAzjL3MYmtwyd8=";
   };
 
diff --git a/pkgs/by-name/d-/d-seams/package.nix b/pkgs/by-name/d-/d-seams/package.nix
index bca65b751ad1..2ac502514a8a 100644
--- a/pkgs/by-name/d-/d-seams/package.nix
+++ b/pkgs/by-name/d-/d-seams/package.nix
@@ -24,7 +24,7 @@ clangStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "d-SEAMS";
     repo = "seams-core";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i";
   };
 
diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix
index 7faecf85dcc9..a86a6d505721 100644
--- a/pkgs/by-name/da/dablin/package.nix
+++ b/pkgs/by-name/da/dablin/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Opendigitalradio";
     repo = "dablin";
-    tag = version;
+    rev = version;
     sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc=";
   };
 
diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix
index b9bf28bc94ef..fb13ce6b10c3 100644
--- a/pkgs/by-name/da/dae/package.nix
+++ b/pkgs/by-name/da/dae/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "daeuniverse";
     repo = "dae";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yW3GDflTd9I4RreWtLQE92aP7BnswJHx44jmTZ81kP8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/da/daktilo/package.nix b/pkgs/by-name/da/daktilo/package.nix
index b323712612ae..dde3104c7622 100644
--- a/pkgs/by-name/da/daktilo/package.nix
+++ b/pkgs/by-name/da/daktilo/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "daktilo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gIBWonJGX6IpxyBeMulcfQEExsG1GrBVQLZbBBA1ruc=";
   };
 
diff --git a/pkgs/by-name/da/dapper/package.nix b/pkgs/by-name/da/dapper/package.nix
index b28d85236c0d..f367aae65d9f 100644
--- a/pkgs/by-name/da/dapper/package.nix
+++ b/pkgs/by-name/da/dapper/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "dapper";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-V+lHnOmIWjI1qmoJ7+pp+cGmJAtSeY+r2I9zykswQzM=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix
index 3d0b084c7444..22bea35fd699 100644
--- a/pkgs/by-name/da/dapr-cli/package.nix
+++ b/pkgs/by-name/da/dapr-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dapr";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ex6H5N5h5ScacyakgFDh8/xJMfS6Q6d2FmfcBXiCl+4=";
   };
 
diff --git a/pkgs/by-name/da/darkhttpd/package.nix b/pkgs/by-name/da/darkhttpd/package.nix
index 3dc1aebf898c..5adf1b1be34e 100644
--- a/pkgs/by-name/da/darkhttpd/package.nix
+++ b/pkgs/by-name/da/darkhttpd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emikulic";
     repo = "darkhttpd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dcNoGU08tu950PlwSghoZwGSaSbP8NJ5qhWUi3bAtZY=";
   };
 
diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix
index 4d8ea5b85411..29e620568ab5 100644
--- a/pkgs/by-name/da/darklua/package.nix
+++ b/pkgs/by-name/da/darklua/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "seaofvoices";
     repo = "darklua";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-D83cLJ6voLvgZ51qLoCUzBG83VFB3Y7HxuaZHpaiOn4=";
   };
 
diff --git a/pkgs/by-name/da/darkman/package.nix b/pkgs/by-name/da/darkman/package.nix
index d68d7a0ccfb8..34c4748a3743 100644
--- a/pkgs/by-name/da/darkman/package.nix
+++ b/pkgs/by-name/da/darkman/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "WhyNotHugo";
     repo = "darkman";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o=";
   };
 
diff --git a/pkgs/by-name/da/darktile/package.nix b/pkgs/by-name/da/darktile/package.nix
index 5a3bfdfef170..c2e7928fbdad 100644
--- a/pkgs/by-name/da/darktile/package.nix
+++ b/pkgs/by-name/da/darktile/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = "darktile";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-M3vySAyYwqscR9n0GGXp1ttO/mhdSCponZNYJRBBI18=";
   };
 
diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix
index f5a2f841666b..d8247bf18f97 100644
--- a/pkgs/by-name/da/dart-sass/package.nix
+++ b/pkgs/by-name/da/dart-sass/package.nix
@@ -27,7 +27,7 @@ buildDartApplication rec {
   src = fetchFromGitHub {
     owner = "sass";
     repo = "dart-sass";
-    tag = version;
+    rev = version;
     hash = "sha256-HYuKSZLLL3Eg1FPrHK25H1GLuyC/xL9i0DM9eQ6Ry9U=";
   };
 
diff --git a/pkgs/by-name/da/dasel/package.nix b/pkgs/by-name/da/dasel/package.nix
index b613c3f1365c..efdc7eaa41e9 100644
--- a/pkgs/by-name/da/dasel/package.nix
+++ b/pkgs/by-name/da/dasel/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TomWright";
     repo = "dasel";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vq4lRCsqD2hmQw0yH84Wji5LeJ/aiMGJJIyCDvATA+I=";
   };
 
diff --git a/pkgs/by-name/da/dashing/package.nix b/pkgs/by-name/da/dashing/package.nix
index 95d72db7020c..58fb7f68b1ba 100644
--- a/pkgs/by-name/da/dashing/package.nix
+++ b/pkgs/by-name/da/dashing/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "technosophos";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-CcEgGPnJGrTXrgo82u5dxQTB/YjFBhHdsv7uggsHG1Y=";
   };
 
diff --git a/pkgs/by-name/da/dasht/package.nix b/pkgs/by-name/da/dasht/package.nix
index 641aa94a5a75..a40c25b85b2f 100644
--- a/pkgs/by-name/da/dasht/package.nix
+++ b/pkgs/by-name/da/dasht/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sunaku";
     repo = "dasht";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "08wssmifxi7pnvn9gqrvpzpkc2qpkfbzbhxh0dk1gff2y2211qqk";
   };
 
diff --git a/pkgs/by-name/da/dasm/package.nix b/pkgs/by-name/da/dasm/package.nix
index 40d53fe36b13..578d49a7639f 100644
--- a/pkgs/by-name/da/dasm/package.nix
+++ b/pkgs/by-name/da/dasm/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dasm-assembler";
     repo = "dasm";
-    tag = version;
+    rev = version;
     sha256 = "1bna0bj503xyn5inwzzsrsgi9qg8p20by4dfk7azj91ynw56pl41";
   };
 
diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix
index d3fc57c52a7f..3b1d7284116f 100644
--- a/pkgs/by-name/da/datafusion-cli/package.nix
+++ b/pkgs/by-name/da/datafusion-cli/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     name = "datafusion-cli-source";
     owner = "apache";
     repo = "arrow-datafusion";
-    tag = version;
+    rev = version;
     sha256 = "sha256-XIxUp4i68psNtKoFR/uVJHCToz681m2q8qUhtMQKCLo=";
   };
 
diff --git a/pkgs/by-name/da/dav1d/package.nix b/pkgs/by-name/da/dav1d/package.nix
index ba2e4e71ac4d..cbd651e68ee7 100644
--- a/pkgs/by-name/da/dav1d/package.nix
+++ b/pkgs/by-name/da/dav1d/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "videolan";
     repo = "dav1d";
-    tag = version;
+    rev = version;
     hash = "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g=";
   };
 
diff --git a/pkgs/by-name/db/db-rest/package.nix b/pkgs/by-name/db/db-rest/package.nix
index 00272e77f95f..6aa4e722d169 100644
--- a/pkgs/by-name/db/db-rest/package.nix
+++ b/pkgs/by-name/db/db-rest/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "derhuerst";
     repo = "db-rest";
-    tag = version;
+    rev = version;
     hash = "sha256-1iJ26l6C6GevNkoDVMztPHiH3YsutJa3xWAsfYvgR9U=";
   };
 
diff --git a/pkgs/by-name/db/dbcsr/package.nix b/pkgs/by-name/db/dbcsr/package.nix
index 7d536b1cfa17..0fdcc217eb6d 100644
--- a/pkgs/by-name/db/dbcsr/package.nix
+++ b/pkgs/by-name/db/dbcsr/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cp2k";
     repo = "dbcsr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YXySNw3+DiY7E57W1ypeWLyawwcWVGlmTM4Kgj7Nnmo=";
   };
 
diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix
index 7015e403746b..703ab3dcfb90 100644
--- a/pkgs/by-name/db/dblab/package.nix
+++ b/pkgs/by-name/db/dblab/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "danvergara";
     repo = "dblab";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-a0452fNr78FDhVoBF8RkKbtamvc5e6gEbTOeRdgGQs4=";
   };
 
diff --git a/pkgs/by-name/db/dbqn/package.nix b/pkgs/by-name/db/dbqn/package.nix
index 5755b5c6d43f..81be3e7141ff 100644
--- a/pkgs/by-name/db/dbqn/package.nix
+++ b/pkgs/by-name/db/dbqn/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dzaima";
     repo = "BQN";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AUfT7l7zr/pyG63wX8FMej8RUg7tXC1aroCrunjyw/8=";
   };
 
diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix
index 46630b9e2b9a..b9ab77c35dd5 100644
--- a/pkgs/by-name/db/dbus-cpp/package.nix
+++ b/pkgs/by-name/db/dbus-cpp/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/dbus-cpp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-t8SzPRUuKeEchT8vAsITf8MwbgHA+mR5C9CnkdVyX7s=";
   };
 
diff --git a/pkgs/by-name/dc/dcap/package.nix b/pkgs/by-name/dc/dcap/package.nix
index e93dde53ed24..1a1014d8e88b 100644
--- a/pkgs/by-name/dc/dcap/package.nix
+++ b/pkgs/by-name/dc/dcap/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dCache";
     repo = "dcap";
-    tag = version;
+    rev = version;
     sha256 = "sha256-hn4nkFTIbSUUhvf9UfsEqVhphAdNWmATaCrv8jOuC0Y=";
   };
 
diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix
index aea0db99e1fd..e1604260e3c5 100644
--- a/pkgs/by-name/dd/ddccontrol-db/package.nix
+++ b/pkgs/by-name/dd/ddccontrol-db/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ddccontrol";
     repo = "ddccontrol-db";
-    tag = version;
+    rev = version;
     sha256 = "sha256-KhZp0gGGK27hAtfAwuff7VI9Z3D4MtMxkNW6l6B56Xw=";
   };
 
diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix
index c7c58987c53a..864381aa4d47 100644
--- a/pkgs/by-name/dd/ddccontrol/package.nix
+++ b/pkgs/by-name/dd/ddccontrol/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ddccontrol";
     repo = "ddccontrol";
-    tag = version;
+    rev = version;
     sha256 = "sha256-qyD6i44yH3EufIW+LA/LBMW20Tejb49zvsDfv6YFD6c=";
   };
 
diff --git a/pkgs/by-name/dd/ddclient/package.nix b/pkgs/by-name/dd/ddclient/package.nix
index 7f2585054510..ff13221d3202 100644
--- a/pkgs/by-name/dd/ddclient/package.nix
+++ b/pkgs/by-name/dd/ddclient/package.nix
@@ -19,7 +19,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "ddclient";
     repo = "ddclient";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-RCE24RKcW4EhicOTwgz5UE/gzqLxw+UNNk960vFx5Gs=";
   };
 
diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix
index 359af3200b45..353905fa0979 100644
--- a/pkgs/by-name/dd/ddev/package.nix
+++ b/pkgs/by-name/dd/ddev/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ddev";
     repo = "ddev";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sd8Ux3zkKd9L2phv0dovWHSIpLS/OXCNwxTGGcvBQ3c=";
   };
 
diff --git a/pkgs/by-name/dd/ddgr/package.nix b/pkgs/by-name/dd/ddgr/package.nix
index 814a303cbd4a..01a331802e5d 100644
--- a/pkgs/by-name/dd/ddgr/package.nix
+++ b/pkgs/by-name/dd/ddgr/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "ddgr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-88cCQm3eViy0OwSyCTlnW7uuiFwz2/6Wz45QzxCgXxg=";
   };
 
diff --git a/pkgs/by-name/dd/ddh/package.nix b/pkgs/by-name/dd/ddh/package.nix
index 294eb19e82bb..1f8c86ee663a 100644
--- a/pkgs/by-name/dd/ddh/package.nix
+++ b/pkgs/by-name/dd/ddh/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "darakian";
     repo = "ddh";
-    tag = version;
+    rev = version;
     sha256 = "XFfTpX4c821pcTAJZFUjdqM940fRoBwkJC6KTknXtCw=";
   };
 
diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix
index 3f32ae4b003a..378c3ddfe77a 100644
--- a/pkgs/by-name/dd/ddns-go/package.nix
+++ b/pkgs/by-name/dd/ddns-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jeessy2";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QGvXUYeT01+P843gBX+IJWTyPg0cPI9jZWh3tAcmEqE=";
   };
 
diff --git a/pkgs/by-name/dd/ddns-updater/package.nix b/pkgs/by-name/dd/ddns-updater/package.nix
index 2df254d93e29..1d3364428a5b 100644
--- a/pkgs/by-name/dd/ddns-updater/package.nix
+++ b/pkgs/by-name/dd/ddns-updater/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "qdm12";
     repo = "ddns-updater";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Vvk3owtSpwstmC5UaVyUEY+FW25KA+nYp2dOqiP4HTs=";
   };
 
diff --git a/pkgs/by-name/dd/dduper/package.nix b/pkgs/by-name/dd/dduper/package.nix
index 83274d8fc7f6..34bf7fc39d97 100644
--- a/pkgs/by-name/dd/dduper/package.nix
+++ b/pkgs/by-name/dd/dduper/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lakshmipathi";
     repo = "dduper";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09ncdawxkffldadqhfblqlkdl05q2qmywxyg6p61fv3dr2f2v5wm";
   };
 
diff --git a/pkgs/by-name/de/deadnix/package.nix b/pkgs/by-name/de/deadnix/package.nix
index 952a0a9da729..3382c7264172 100644
--- a/pkgs/by-name/de/deadnix/package.nix
+++ b/pkgs/by-name/de/deadnix/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "astro";
     repo = "deadnix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xaaXGzTd+t1GjD2KpiS/c8acv6bXufv/lTN+ACRGVJw=";
   };
 
diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix
index 768d50d5778b..55aa9d8a918a 100644
--- a/pkgs/by-name/de/decker/package.nix
+++ b/pkgs/by-name/de/decker/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JohnEarnest";
     repo = "Decker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6rKfIMEWMig1LAaLk1eSUHnc2104FuN5wTVpf1SgCtg=";
   };
 
diff --git a/pkgs/by-name/de/decktape/package.nix b/pkgs/by-name/de/decktape/package.nix
index 3efb31d4f1e9..7f5a1bf304e0 100644
--- a/pkgs/by-name/de/decktape/package.nix
+++ b/pkgs/by-name/de/decktape/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "astefanutti";
     repo = "decktape";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-V7JoYtwP7iQYFi/WhFpkELs7mNKF6CqrMyjWhxLkcTA=";
   };
 
diff --git a/pkgs/by-name/de/deepfilternet/package.nix b/pkgs/by-name/de/deepfilternet/package.nix
index 03938824436a..71d0e0c9f645 100644
--- a/pkgs/by-name/de/deepfilternet/package.nix
+++ b/pkgs/by-name/de/deepfilternet/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Rikorose";
     repo = "DeepFilterNet";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5bYbfO1kmduNm9YV5niaaPvRIDRmPt4QOX7eKpK+sWY=";
   };
 
diff --git a/pkgs/by-name/de/deepsea/package.nix b/pkgs/by-name/de/deepsea/package.nix
index 6e00bdb75766..5fb90e4ab991 100644
--- a/pkgs/by-name/de/deepsea/package.nix
+++ b/pkgs/by-name/de/deepsea/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dsnezhkov";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "02s03sha8vwp7dsaw3z446pskhb6wmy0hyj0mhpbx58sf147rkig";
   };
 
diff --git a/pkgs/by-name/de/deepsource/package.nix b/pkgs/by-name/de/deepsource/package.nix
index 28397bfc732a..191076648a5a 100644
--- a/pkgs/by-name/de/deepsource/package.nix
+++ b/pkgs/by-name/de/deepsource/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DeepSourceCorp";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6uNb4cQVerrlW/eUkjmlO1i1YKYX3qaVdo0i5cczt+I=";
   };
 
diff --git a/pkgs/by-name/de/deer/package.nix b/pkgs/by-name/de/deer/package.nix
index 431be4955aa4..9cee98d1ff4c 100644
--- a/pkgs/by-name/de/deer/package.nix
+++ b/pkgs/by-name/de/deer/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Vifon";
     repo = "deer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xnbnbi0zk2xsyn8dqsmyxqlfnl36pb1wwibnlp0dxixw6sfymyl";
   };
 
diff --git a/pkgs/by-name/de/degit/package.nix b/pkgs/by-name/de/degit/package.nix
index 693b2fc08eb5..8d044a9e2f2a 100644
--- a/pkgs/by-name/de/degit/package.nix
+++ b/pkgs/by-name/de/degit/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Rich-Harris";
     repo = "degit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Vw/gtmKywi5faSCs7Wek80nmnqcPHXlQarD5qMwlsQE=";
   };
 
diff --git a/pkgs/by-name/de/dehydrated/package.nix b/pkgs/by-name/de/dehydrated/package.nix
index 2111e311414b..236b71c8c29a 100644
--- a/pkgs/by-name/de/dehydrated/package.nix
+++ b/pkgs/by-name/de/dehydrated/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lukas2511";
     repo = "dehydrated";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-K08eeruyT5vKzK3PzfCkubZiHbf9Yq7wzD1z69MeDtY=";
   };
 
diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix
index 3ab3a8581310..0c7d6883db31 100644
--- a/pkgs/by-name/de/deja-dup/package.nix
+++ b/pkgs/by-name/de/deja-dup/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "deja-dup";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-MjZ+NkNAzwEnC9R48Q5Cb3+c5jM7ooOv7+5TQ6Xo4LM=";
   };
 
diff --git a/pkgs/by-name/de/dejsonlz4/package.nix b/pkgs/by-name/de/dejsonlz4/package.nix
index 1d79525965db..b59e0fdffd3f 100644
--- a/pkgs/by-name/de/dejsonlz4/package.nix
+++ b/pkgs/by-name/de/dejsonlz4/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "avih";
     repo = "dejsonlz4";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh";
   };
 
diff --git a/pkgs/by-name/de/delve/package.nix b/pkgs/by-name/de/delve/package.nix
index 7b62ed9f3fe6..686df217888b 100644
--- a/pkgs/by-name/de/delve/package.nix
+++ b/pkgs/by-name/de/delve/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-delve";
     repo = "delve";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QAFCJ5oQYHDXrNLptRdAWzzbX6J9XVgnmsB3eZ3Lko8=";
   };
 
diff --git a/pkgs/by-name/de/demoit/package.nix b/pkgs/by-name/de/demoit/package.nix
index b87c8d7554ad..a67e01f24239 100644
--- a/pkgs/by-name/de/demoit/package.nix
+++ b/pkgs/by-name/de/demoit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dgageot";
     repo = "demoit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3g0k2Oau0d9tXYDtxHpUKvAQ1FnGhjRP05YVTlmgLhM=";
   };
 
diff --git a/pkgs/by-name/de/denaro/package.nix b/pkgs/by-name/de/denaro/package.nix
index 809a7e88b42c..c1a1e6cdc10d 100644
--- a/pkgs/by-name/de/denaro/package.nix
+++ b/pkgs/by-name/de/denaro/package.nix
@@ -20,7 +20,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "NickvisionApps";
     repo = "Denaro";
-    tag = version;
+    rev = version;
     hash = "sha256-fEhwup8SiYvKH2FtzruEFsj8axG5g3YJ917aqc8dn/8=";
   };
 
diff --git a/pkgs/by-name/de/dendrite/package.nix b/pkgs/by-name/de/dendrite/package.nix
index 595dcd4aad6e..b7c61341a7b3 100644
--- a/pkgs/by-name/de/dendrite/package.nix
+++ b/pkgs/by-name/de/dendrite/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "dendrite";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-b/kybHF9WcP88kQuG7LB0/pgflYUeWNqEHfUyKfUCIU=";
   };
 
diff --git a/pkgs/by-name/de/dep-tree/package.nix b/pkgs/by-name/de/dep-tree/package.nix
index b1b27b164348..3b63c653b10e 100644
--- a/pkgs/by-name/de/dep-tree/package.nix
+++ b/pkgs/by-name/de/dep-tree/package.nix
@@ -40,7 +40,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "gabotechs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m+afcnwVvPrD+S7c/kfE8mqlD7kO+VPI6sSXCCjXWZM=";
   };
 
diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index 5988a2ed7d79..9ad93c9d4cfa 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -44,7 +44,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "dependabot";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BD95YCPKoU/crlBPWYejI6kydpXhmYNAgtMEGi+iRsY=";
   };
 
diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix
index a82dcf2e4ab9..b710995a1173 100644
--- a/pkgs/by-name/de/dependency-track/package.nix
+++ b/pkgs/by-name/de/dependency-track/package.nix
@@ -24,7 +24,7 @@ let
     src = fetchFromGitHub {
       owner = "DependencyTrack";
       repo = "frontend";
-      tag = version;
+      rev = version;
       hash = "sha256-JuZM/IJd+6xtiC2Tq4ecArmT24D1m8J719UZG+iP2s0=";
     };
 
@@ -49,7 +49,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "DependencyTrack";
     repo = "dependency-track";
-    tag = version;
+    rev = version;
     hash = "sha256-GcA6Vv3H0gujkRYxipLg9ydk/HorNzwWkEAjKnMrHro=";
   };
 
diff --git a/pkgs/by-name/de/der-ascii/package.nix b/pkgs/by-name/de/der-ascii/package.nix
index 170252620987..90c4651363c9 100644
--- a/pkgs/by-name/de/der-ascii/package.nix
+++ b/pkgs/by-name/de/der-ascii/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xGzxq5AHvzLUOp9VUcI9JMwrCpVIrpDvenWUOEBP6pA=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/de/design/package.nix b/pkgs/by-name/de/design/package.nix
index 8c4d84aaa45c..bdafc2d99ec7 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-Q4R/Ztu4w8IRvq15xNXN/iP/6hIHe/W+me1jROGpYc8=";
   };
diff --git a/pkgs/by-name/de/deskew/package.nix b/pkgs/by-name/de/deskew/package.nix
index 4cdffcfef4d2..e5c699d11b1d 100644
--- a/pkgs/by-name/de/deskew/package.nix
+++ b/pkgs/by-name/de/deskew/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "galfar";
     repo = "deskew";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xghVOEMkQ/mXpOzJqMaT3SII7xneMNoFqRlqjtzmDnA=";
   };
 
diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix
index 2dcf0f84c140..0aa7d96ce5f7 100644
--- a/pkgs/by-name/de/desktop-postflop/package.nix
+++ b/pkgs/by-name/de/desktop-postflop/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "b-inary";
     repo = "desktop-postflop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pOPxNHM4mseIuyyWNoU0l+dGvfURH0+9+rmzRIF0I5s=";
   };
 
diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix
index ac33498581fd..df1eeece456a 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";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-yHgxYig5myY2nExweUk2muKbJTKN3SiwOLgQcMIY/BQ=";
   };
diff --git a/pkgs/by-name/de/detox/package.nix b/pkgs/by-name/de/detox/package.nix
index 2f43f63f22e6..8ce5c3496ccb 100644
--- a/pkgs/by-name/de/detox/package.nix
+++ b/pkgs/by-name/de/detox/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dharple";
     repo = "detox";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cTuK5EIimRVZ1nfuTa1ds6xrawYIAbwNNIkNONd9y4Q=";
   };
 
diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index 4e475a5caa54..d3ebaef3882a 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "cachix";
     repo = "devenv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OjdnHKQ+eWA8YvPUpl3xxyaNK91c9sMebqXgVdN8Lm4=";
   };
 
diff --git a/pkgs/by-name/de/devour/package.nix b/pkgs/by-name/de/devour/package.nix
index 12283aea3444..3550652c54b5 100644
--- a/pkgs/by-name/de/devour/package.nix
+++ b/pkgs/by-name/de/devour/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "salman-abedin";
     repo = "devour";
-    tag = version;
+    rev = version;
     sha256 = "1qq5l6d0fn8azg7sj7a4m2jsmhlpswl5793clcxs1p34vy4wb2lp";
   };
 
diff --git a/pkgs/by-name/de/devspace/package.nix b/pkgs/by-name/de/devspace/package.nix
index c2894cea1ecb..6b14032d6476 100644
--- a/pkgs/by-name/de/devspace/package.nix
+++ b/pkgs/by-name/de/devspace/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "devspace-sh";
     repo = "devspace";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aD7A9GGFnX1w5MehmhqYE+wEREASyKFxusE5GFFgwbs=";
   };
 
diff --git a/pkgs/by-name/de/dex-oidc/package.nix b/pkgs/by-name/de/dex-oidc/package.nix
index 9aaf22def210..1cfde8295079 100644
--- a/pkgs/by-name/de/dex-oidc/package.nix
+++ b/pkgs/by-name/de/dex-oidc/package.nix
@@ -14,7 +14,7 @@ buildGo124Module rec {
   src = fetchFromGitHub {
     owner = "dexidp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FbjNOyECgf26+Z48YwF9uMN8C3zMRshD3VOjoRbA0ys=";
   };
 
diff --git a/pkgs/by-name/de/dex/package.nix b/pkgs/by-name/de/dex/package.nix
index c0cdf5f05772..a353f1525284 100644
--- a/pkgs/by-name/de/dex/package.nix
+++ b/pkgs/by-name/de/dex/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jceb";
     repo = "dex";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1fgSz4f6W+Dr3mo4vQY8buD2dNC8RBMGrwCTOIzH7rQ=";
   };
 
diff --git a/pkgs/by-name/df/dfrs/package.nix b/pkgs/by-name/df/dfrs/package.nix
index b305747cd55f..a7ec54118952 100644
--- a/pkgs/by-name/df/dfrs/package.nix
+++ b/pkgs/by-name/df/dfrs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "anthraxx";
     repo = "dfrs";
-    tag = version;
+    rev = version;
     sha256 = "01h00328kbw83q11yrsvcly69p0hql3kw49b4jx6gwkrdm8c2amk";
   };
 
diff --git a/pkgs/by-name/df/dftd4/package.nix b/pkgs/by-name/df/dftd4/package.nix
index 0a303aad8eb7..e3e54eba9c6b 100644
--- a/pkgs/by-name/df/dftd4/package.nix
+++ b/pkgs/by-name/df/dftd4/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dftd4";
     repo = "dftd4";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dixPCLH5dWkE2/7ghGEXJmX2/g1DN30dB4jX2d7fmio=";
   };
 
diff --git a/pkgs/by-name/dg/dgraph/package.nix b/pkgs/by-name/dg/dgraph/package.nix
index 2db642a60e58..631ee7a1293f 100644
--- a/pkgs/by-name/dg/dgraph/package.nix
+++ b/pkgs/by-name/dg/dgraph/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "dgraph";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WAjoAbd8tGpianZXfrvRbRCdbkVP/gO/ekotT5KyrG8=";
   };
 
diff --git a/pkgs/by-name/dh/dhcpcd/package.nix b/pkgs/by-name/dh/dhcpcd/package.nix
index fc339560ed48..7394fea8f83f 100644
--- a/pkgs/by-name/dh/dhcpcd/package.nix
+++ b/pkgs/by-name/dh/dhcpcd/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NetworkConfiguration";
     repo = "dhcpcd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Qtg9jOFMR/9oWJDmoNNcEAMxG6G1F187HF4MMBJIoTw=";
   };
 
diff --git a/pkgs/by-name/dh/dhewm3/package.nix b/pkgs/by-name/dh/dhewm3/package.nix
index c1447f78e89f..fe6d3059c172 100644
--- a/pkgs/by-name/dh/dhewm3/package.nix
+++ b/pkgs/by-name/dh/dhewm3/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dhewm";
     repo = "dhewm3";
-    tag = version;
+    rev = version;
     sha256 = "sha256-losqnxnjRPOczjrRPyyOxCeg9TNScXLcXADgo9Bxm5k=";
   };
 
diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix
index cc940001b65f..439237d27497 100644
--- a/pkgs/by-name/di/di-tui/package.nix
+++ b/pkgs/by-name/di/di-tui/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "acaloiaro";
     repo = "di-tui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jX+2wdnkJPEtCWoMNbwgn3c+LsEktYa5lIfSXY0Wsew=";
   };
 
diff --git a/pkgs/by-name/di/diamond/package.nix b/pkgs/by-name/di/diamond/package.nix
index 54f253aae6d8..a0104ed26108 100644
--- a/pkgs/by-name/di/diamond/package.nix
+++ b/pkgs/by-name/di/diamond/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bbuchfink";
     repo = "diamond";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-X/6sOClMFGBYksMrVfM1Y7MM3NmBEiRpmLg4Rbatc+w=";
   };
 
diff --git a/pkgs/by-name/di/dictu/package.nix b/pkgs/by-name/di/dictu/package.nix
index d40b8af11e21..c2a051c00895 100644
--- a/pkgs/by-name/di/dictu/package.nix
+++ b/pkgs/by-name/di/dictu/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dictu-lang";
     repo = "dictu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Tahi2K8Q/KPc9MN7yWhkqp/MzXfzJzrGSsvnTCyI03U=";
   };
 
diff --git a/pkgs/by-name/di/didder/package.nix b/pkgs/by-name/di/didder/package.nix
index cf0e54151e77..bb58cde741aa 100644
--- a/pkgs/by-name/di/didder/package.nix
+++ b/pkgs/by-name/di/didder/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "makew0rld";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wYAudEyOLxbNfk4M720absGkuWXcaBPyBAcmBNBaaWU=";
   };
 
diff --git a/pkgs/by-name/di/didyoumean/package.nix b/pkgs/by-name/di/didyoumean/package.nix
index eeebf52f766d..6af7fdffe2d0 100644
--- a/pkgs/by-name/di/didyoumean/package.nix
+++ b/pkgs/by-name/di/didyoumean/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hisbaan";
     repo = "didyoumean";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PSEoh1OMElFJ8m4er1vBMkQak3JvLjd+oWNWA46cows=";
   };
 
diff --git a/pkgs/by-name/di/diff-so-fancy/package.nix b/pkgs/by-name/di/diff-so-fancy/package.nix
index d86cbc0ff9db..8fdb73636830 100644
--- a/pkgs/by-name/di/diff-so-fancy/package.nix
+++ b/pkgs/by-name/di/diff-so-fancy/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "so-fancy";
     repo = "diff-so-fancy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yF+LI1lsE1qwOc3u7mtc+uu0N/8m4bZD5qP+xFraaTI=";
   };
 
diff --git a/pkgs/by-name/di/diffoci/package.nix b/pkgs/by-name/di/diffoci/package.nix
index e4ea6b2de3cf..7f3a5aa322e6 100644
--- a/pkgs/by-name/di/diffoci/package.nix
+++ b/pkgs/by-name/di/diffoci/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "reproducible-containers";
     repo = "diffoci";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rCSLHlHUWS0wEnN8R2v1h+kQ7K62VQPfZmySHGSFZlQ=";
   };
 
diff --git a/pkgs/by-name/di/diffsitter/package.nix b/pkgs/by-name/di/diffsitter/package.nix
index 1dbb07be43fb..8af332254fbb 100644
--- a/pkgs/by-name/di/diffsitter/package.nix
+++ b/pkgs/by-name/di/diffsitter/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "afnanenayet";
     repo = "diffsitter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ta7JcSPEgpJwieYvtZnNMFvsYvz4FuxthhmKMYe2XUE=";
     fetchSubmodules = false;
   };
diff --git a/pkgs/by-name/di/diffuse/package.nix b/pkgs/by-name/di/diffuse/package.nix
index 2feb03b2ff41..41f5c6ba08da 100644
--- a/pkgs/by-name/di/diffuse/package.nix
+++ b/pkgs/by-name/di/diffuse/package.nix
@@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "MightyCreak";
     repo = "diffuse";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "6GdUtdVhhIQL1cD9/e7Byv37PVKXmzVWhJC6GROK7OA=";
   };
 
diff --git a/pkgs/by-name/di/digital/package.nix b/pkgs/by-name/di/digital/package.nix
index 3a2e31169e6d..2925915ea9bf 100644
--- a/pkgs/by-name/di/digital/package.nix
+++ b/pkgs/by-name/di/digital/package.nix
@@ -47,7 +47,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "hneemann";
     repo = "Digital";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6XaM3U1x/yvoCrkJ2nMtBmj972gCFlWn3F4DM7TLWgw=";
   };
 
diff --git a/pkgs/by-name/di/digitemp/package.nix b/pkgs/by-name/di/digitemp/package.nix
index 72785f43d421..f42c44fbcf5a 100644
--- a/pkgs/by-name/di/digitemp/package.nix
+++ b/pkgs/by-name/di/digitemp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bcl";
     repo = "digitemp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "19zka5fcdxhhginaspak76l984iqq9v2j6qrwvi5mvca7bcj8f72";
   };
 
diff --git a/pkgs/by-name/di/dinit/package.nix b/pkgs/by-name/di/dinit/package.nix
index bbab1f4ef23f..0aa23f46e645 100644
--- a/pkgs/by-name/di/dinit/package.nix
+++ b/pkgs/by-name/di/dinit/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "davmac314";
     repo = "dinit";
-    tag = "v${version}";
+    rev = "v${version}";
     # fix for case-insensitive filesystems
     postFetch = ''
       [ -f "$out/BUILD" ] && rm "$out/BUILD"
diff --git a/pkgs/by-name/di/diopser/package.nix b/pkgs/by-name/di/diopser/package.nix
index 34a03e03eb5a..4ff1fe3a1cdc 100644
--- a/pkgs/by-name/di/diopser/package.nix
+++ b/pkgs/by-name/di/diopser/package.nix
@@ -23,7 +23,7 @@ let
     src = fetchFromGitHub {
       owner = "Naios";
       repo = "function2";
-      tag = version;
+      rev = version;
       hash = "sha256-JceZU8ZvtYhFheh8BjMvjjZty4hcYxHEK+IIo5X4eSk=";
     };
   };
diff --git a/pkgs/by-name/di/dippi/package.nix b/pkgs/by-name/di/dippi/package.nix
index a68bb308e70c..14865ba980ec 100644
--- a/pkgs/by-name/di/dippi/package.nix
+++ b/pkgs/by-name/di/dippi/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "dippi";
-    tag = version;
+    rev = version;
     hash = "sha256-BYI3WqMDxzERlqtq7ISQ+U1FTrpKh5OJBMo/AsdmdlQ=";
   };
 
diff --git a/pkgs/by-name/di/directx-headers/package.nix b/pkgs/by-name/di/directx-headers/package.nix
index 3f8ac0d26993..2c8773045ab5 100644
--- a/pkgs/by-name/di/directx-headers/package.nix
+++ b/pkgs/by-name/di/directx-headers/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "DirectX-Headers";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1s/lrvUUOBGVAtfyAG2b/9raQVj2Hcjw9/RtqBO7ENA=";
   };
 
diff --git a/pkgs/by-name/di/direnv/package.nix b/pkgs/by-name/di/direnv/package.nix
index 39c556b6bd61..b2ef901d02b0 100644
--- a/pkgs/by-name/di/direnv/package.nix
+++ b/pkgs/by-name/di/direnv/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-C4FkBS+2MZGGlpWb7ng4Aa9IvqEuY716M5h2W3b8N1E=";
   };
 
diff --git a/pkgs/by-name/di/dirstalk/package.nix b/pkgs/by-name/di/dirstalk/package.nix
index a6e46db53908..a1bc915da1d5 100644
--- a/pkgs/by-name/di/dirstalk/package.nix
+++ b/pkgs/by-name/di/dirstalk/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stefanoj3";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-gSMkTGzMDI+scG3FQ0u0liUDL4qOPPW2UWLlAQcmmaA=";
   };
 
diff --git a/pkgs/by-name/di/discocss/package.nix b/pkgs/by-name/di/discocss/package.nix
index 27cde2616d4b..353b9b7a798d 100644
--- a/pkgs/by-name/di/discocss/package.nix
+++ b/pkgs/by-name/di/discocss/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mlvzk";
     repo = "discocss";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-of7OMgbuwebnFmbefGD1/dOhyTX1Hy7TccnWSRCweW0=";
   };
 
diff --git a/pkgs/by-name/di/discord-sh/package.nix b/pkgs/by-name/di/discord-sh/package.nix
index c6379b297e62..7276a9529d3b 100644
--- a/pkgs/by-name/di/discord-sh/package.nix
+++ b/pkgs/by-name/di/discord-sh/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ChaoticWeg";
     repo = "discord.sh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZOGhwR9xFzkm+q0Gm8mSXZ9toXG4xGPNwBQMCVanCbY=";
   };
 
diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix
index 86ee9d00c70a..985fd506bd60 100644
--- a/pkgs/by-name/di/discordchatexporter-cli/package.nix
+++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "tyrrrz";
     repo = "discordchatexporter";
-    tag = version;
+    rev = version;
     hash = "sha256-r9bvTgqKQY605BoUlysSz4WJMxn2ibNh3EhoMYCfV3c=";
   };
 
diff --git a/pkgs/by-name/di/discordchatexporter-desktop/package.nix b/pkgs/by-name/di/discordchatexporter-desktop/package.nix
index 4bd52b917ca1..ad643bceca4d 100644
--- a/pkgs/by-name/di/discordchatexporter-desktop/package.nix
+++ b/pkgs/by-name/di/discordchatexporter-desktop/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "tyrrrz";
     repo = "discordchatexporter";
-    tag = version;
+    rev = version;
     hash = "sha256-Dc6OSWUTFftP2tyRFoxHm+TsnSMDfx627DhmYnPie9w=";
   };
 
diff --git a/pkgs/by-name/di/discount/package.nix b/pkgs/by-name/di/discount/package.nix
index 3f94e6cbef01..e7eac8e0a91c 100644
--- a/pkgs/by-name/di/discount/package.nix
+++ b/pkgs/by-name/di/discount/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Orc";
     repo = "discount";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fFSlW9qnH3NL9civ793LrScOJSuRe9i377BgpNzOXa0=";
   };
 
diff --git a/pkgs/by-name/di/discourse-mail-receiver/package.nix b/pkgs/by-name/di/discourse-mail-receiver/package.nix
index 95a93e976136..40fa65bdb5b4 100644
--- a/pkgs/by-name/di/discourse-mail-receiver/package.nix
+++ b/pkgs/by-name/di/discourse-mail-receiver/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "mail-receiver";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ob4Hb88odlFf5vSC9qhikhJowo4C5LksVmMuJRMNoI4=";
   };
 
diff --git a/pkgs/by-name/di/disfetch/package.nix b/pkgs/by-name/di/disfetch/package.nix
index 451bfb9d182a..a1ebd5275efe 100644
--- a/pkgs/by-name/di/disfetch/package.nix
+++ b/pkgs/by-name/di/disfetch/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "q60";
     repo = "disfetch";
-    tag = version;
+    rev = version;
     sha256 = "sha256-xzOE+Pnx0qb3B9vWWrF5Q0nhUo0QYBUO6j6al8N3deY=";
   };
 
diff --git a/pkgs/by-name/di/diskrsync/package.nix b/pkgs/by-name/di/diskrsync/package.nix
index 79172655e421..94b2c5a0f495 100644
--- a/pkgs/by-name/di/diskrsync/package.nix
+++ b/pkgs/by-name/di/diskrsync/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dop251";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hM70WD+M3jwze0IG84WTFf1caOUk2s9DQ7pR+KNIt1M=";
   };
 
diff --git a/pkgs/by-name/di/diskscan/package.nix b/pkgs/by-name/di/diskscan/package.nix
index 880445dfd0e4..bbb737a7d498 100644
--- a/pkgs/by-name/di/diskscan/package.nix
+++ b/pkgs/by-name/di/diskscan/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baruch";
     repo = "diskscan";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2y1ncPg9OKxqImBN5O5kXrTsuwZ/Cg/8exS7lWyZY1c=";
   };
 
diff --git a/pkgs/by-name/di/dislocker/package.nix b/pkgs/by-name/di/dislocker/package.nix
index fc28e67284eb..d84ae19dbb0d 100644
--- a/pkgs/by-name/di/dislocker/package.nix
+++ b/pkgs/by-name/di/dislocker/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aorimn";
     repo = "dislocker";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ak68s1v5dwh8y2dy5zjybmrh0pnqralmyqzis67y21m87g47h2k";
   };
 
diff --git a/pkgs/by-name/di/dismap/package.nix b/pkgs/by-name/di/dismap/package.nix
index 01ccd1770cd7..4d84aed8961d 100644
--- a/pkgs/by-name/di/dismap/package.nix
+++ b/pkgs/by-name/di/dismap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zhzyker";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YjjiS6iLIQvrPS378v2nyrgwWBJ9YtDeNTPz0ze05mU=";
   };
 
diff --git a/pkgs/by-name/di/dispad/package.nix b/pkgs/by-name/di/dispad/package.nix
index 2ad65333d7bd..c74e108ded06 100644
--- a/pkgs/by-name/di/dispad/package.nix
+++ b/pkgs/by-name/di/dispad/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BlueDragonX";
     repo = "dispad";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PtwvaNtnCm3Y+6vlxPDc21RyIA2v3vkMOHpoGFxNFng=";
   };
 
diff --git a/pkgs/by-name/di/distrobox-tui/package.nix b/pkgs/by-name/di/distrobox-tui/package.nix
index 56ceafcfd142..e61cd34e9fd5 100644
--- a/pkgs/by-name/di/distrobox-tui/package.nix
+++ b/pkgs/by-name/di/distrobox-tui/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "phanirithvij";
     repo = "distrobox-tui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uOeJ9f2yXszGUYTxMLwvXCRkmT9Uo7mkZVhpf5HVhbg=";
   };
 
diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix
index ee4fe066cfc9..c7970e436c50 100644
--- a/pkgs/by-name/di/distrobox/package.nix
+++ b/pkgs/by-name/di/distrobox/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "89luca89";
     repo = "distrobox";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-wTu+8SQZaf8TKkjyvKqTvIWnCZTiPnozybTu5uKXEJk=";
   };
 
diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix
index 0cb4811124cd..5d491178bd3b 100644
--- a/pkgs/by-name/di/diswall/package.nix
+++ b/pkgs/by-name/di/diswall/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dis-works";
     repo = "diswall-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-t2ZBi3ab6OUWzc0L0Hq/ay+s3KNDMeu6mkYxti48BuE=";
   };
 
diff --git a/pkgs/by-name/di/dive/package.nix b/pkgs/by-name/di/dive/package.nix
index 7da6bc623ce5..1feb042f3e59 100644
--- a/pkgs/by-name/di/dive/package.nix
+++ b/pkgs/by-name/di/dive/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wagoodman";
     repo = "dive";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PXimdEgcPS1QQbhkaI2a55EIyWMIZTwRWj0Wx81nqcQ=";
   };
 
diff --git a/pkgs/by-name/dj/djenrandom/package.nix b/pkgs/by-name/dj/djenrandom/package.nix
index 4f2ff9daf1f7..5a88117159ca 100644
--- a/pkgs/by-name/dj/djenrandom/package.nix
+++ b/pkgs/by-name/dj/djenrandom/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dj-on-github";
     repo = "djenrandom";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-r5UT8z8vvFZDffsl6CqBXuvBaZ/sl1WLxJi26CxkpAw=";
   };
 
diff --git a/pkgs/by-name/dj/djent/package.nix b/pkgs/by-name/dj/djent/package.nix
index 26cf5aa44893..a5d0d45313a7 100644
--- a/pkgs/by-name/dj/djent/package.nix
+++ b/pkgs/by-name/dj/djent/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dj-on-github";
     repo = "djent";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-inMh7l/6LlrVnIin+L+fj+4Lchk0Xvt09ngVrCuvphE=";
   };
 
diff --git a/pkgs/by-name/dk/dkh/package.nix b/pkgs/by-name/dk/dkh/package.nix
index 750ed11d9267..038d51583f01 100644
--- a/pkgs/by-name/dk/dkh/package.nix
+++ b/pkgs/by-name/dk/dkh/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psi4";
     repo = "dkh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1wb4qmb9f8rnrwnnw1gdhzx1fmhy628bxfrg56khxy3j5ljxkhck";
   };
 
diff --git a/pkgs/by-name/dl/dl-librescore/package.nix b/pkgs/by-name/dl/dl-librescore/package.nix
index da75fc8869ad..31051981140d 100644
--- a/pkgs/by-name/dl/dl-librescore/package.nix
+++ b/pkgs/by-name/dl/dl-librescore/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "LibreScore";
     repo = "dl-librescore";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DwDlGTFdqAAsEWrhnieuaeYQ0N8COB/7b49xPJackJQ=";
   };
 
diff --git a/pkgs/by-name/dl/dleyna-connector-dbus/package.nix b/pkgs/by-name/dl/dleyna-connector-dbus/package.nix
index b93b6e6c8364..f0b64e2f6361 100644
--- a/pkgs/by-name/dl/dleyna-connector-dbus/package.nix
+++ b/pkgs/by-name/dl/dleyna-connector-dbus/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phako";
     repo = "dleyna-connector-dbus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "WDmymia9MD3BRU6BOCzCIMrz9V0ACRzmEGqjbbuUmlA=";
   };
 
diff --git a/pkgs/by-name/dl/dleyna-core/package.nix b/pkgs/by-name/dl/dleyna-core/package.nix
index a24db43e4814..92f021ae594a 100644
--- a/pkgs/by-name/dl/dleyna-core/package.nix
+++ b/pkgs/by-name/dl/dleyna-core/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phako";
     repo = "dleyna-core";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "i4L9+iyAdBNtgImbD54jkjYL5hvzeZ2OaAyFrcFmuG0=";
   };
 
diff --git a/pkgs/by-name/dl/dleyna-renderer/package.nix b/pkgs/by-name/dl/dleyna-renderer/package.nix
index 70d684087a1b..d4d0adb60244 100644
--- a/pkgs/by-name/dl/dleyna-renderer/package.nix
+++ b/pkgs/by-name/dl/dleyna-renderer/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phako";
     repo = "dleyna-renderer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bGasT3XCa7QHV3D7z59TSHoqWksNSIgaO0z9zYfHHuw=";
   };
 
diff --git a/pkgs/by-name/dl/dleyna-server/package.nix b/pkgs/by-name/dl/dleyna-server/package.nix
index 070b0ea15242..6850d3d8200c 100644
--- a/pkgs/by-name/dl/dleyna-server/package.nix
+++ b/pkgs/by-name/dl/dleyna-server/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phako";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jlF9Lr/NG+Fsy/bB7aLb7xOLqel8GueJK5luo9rsDME=";
   };
 
diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix
index 821391a29974..507fbe4a4300 100644
--- a/pkgs/by-name/dm/dmarc-report-converter/package.nix
+++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tierpod";
     repo = "dmarc-report-converter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j1uFPCyxLqO3BMxl/02wILj5HGag9qjxCTB8ZxZHEGo=";
   };
 
diff --git a/pkgs/by-name/dm/dmrconfig/package.nix b/pkgs/by-name/dm/dmrconfig/package.nix
index 4951438eafb7..2821b9996c46 100644
--- a/pkgs/by-name/dm/dmrconfig/package.nix
+++ b/pkgs/by-name/dm/dmrconfig/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sergev";
     repo = "dmrconfig";
-    tag = version;
+    rev = version;
     sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab";
   };
 
diff --git a/pkgs/by-name/dn/dnadd/package.nix b/pkgs/by-name/dn/dnadd/package.nix
index 92eae364af7c..566f034174c9 100644
--- a/pkgs/by-name/dn/dnadd/package.nix
+++ b/pkgs/by-name/dn/dnadd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JoeLancaster";
     repo = "dnadd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1vzbgz8y9gj4lszsx4iczfbrj373sl4wi43j7rp46zfcbw323d4r";
   };
 
diff --git a/pkgs/by-name/dn/dnglab/package.nix b/pkgs/by-name/dn/dnglab/package.nix
index da7ce56bc124..f7e023281c3e 100644
--- a/pkgs/by-name/dn/dnglab/package.nix
+++ b/pkgs/by-name/dn/dnglab/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dnglab";
     repo = "dnglab";
-    tag = "v${version}";
+    rev = "v${version}";
     # darwin/linux hash mismatch
     postFetch = ''
       rm -rf "$out"/rawler/data/testdata/cameras/Canon/{"EOS REBEL T7i","EOS Rebel T7i"}
diff --git a/pkgs/by-name/dn/dnscrypt-proxy/package.nix b/pkgs/by-name/dn/dnscrypt-proxy/package.nix
index 7214a6aaa4c6..0084aa0c5120 100644
--- a/pkgs/by-name/dn/dnscrypt-proxy/package.nix
+++ b/pkgs/by-name/dn/dnscrypt-proxy/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DNSCrypt";
     repo = "dnscrypt-proxy";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/D5RE8AbI9i9TVdFQCYW8OLPU4TgIIDRsZfWEyXo92g=";
   };
 
diff --git a/pkgs/by-name/dn/dnsdbq/package.nix b/pkgs/by-name/dn/dnsdbq/package.nix
index 6f4584c84724..9070dd89767e 100644
--- a/pkgs/by-name/dn/dnsdbq/package.nix
+++ b/pkgs/by-name/dn/dnsdbq/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dnsdb";
     repo = "dnsdbq";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5Pi8xFZXnU3abIsH9m6xqrQ6NnEtAbhMU6HXsOYP0gg=";
   };
 
diff --git a/pkgs/by-name/dn/dnsenum/package.nix b/pkgs/by-name/dn/dnsenum/package.nix
index 77c958f9b74b..74ad415f9358 100644
--- a/pkgs/by-name/dn/dnsenum/package.nix
+++ b/pkgs/by-name/dn/dnsenum/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fwaeytens";
     repo = "dnsenum";
-    tag = version;
+    rev = version;
     sha256 = "1bg1ljv6klic13wq4r53bg6inhc74kqwm3w210865b1v1n8wj60v";
   };
 
diff --git a/pkgs/by-name/dn/dnsname-cni/package.nix b/pkgs/by-name/dn/dnsname-cni/package.nix
index 25a69c9b3168..c147822b43b5 100644
--- a/pkgs/by-name/dn/dnsname-cni/package.nix
+++ b/pkgs/by-name/dn/dnsname-cni/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "dnsname";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kebN1OLMOrBKBz4aBV0VYm+LmLm6S0mKnVgG2u5I+d4=";
   };
 
diff --git a/pkgs/by-name/dn/dnspeep/package.nix b/pkgs/by-name/dn/dnspeep/package.nix
index 7a45b2bda26e..091b0cfb36e8 100644
--- a/pkgs/by-name/dn/dnspeep/package.nix
+++ b/pkgs/by-name/dn/dnspeep/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jvns";
     repo = "dnspeep";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QpUbHiMDQFRCTVyjrO9lfQQ62Z3qanv0j+8eEXjE3n4=";
   };
 
diff --git a/pkgs/by-name/dn/dnsperf/package.nix b/pkgs/by-name/dn/dnsperf/package.nix
index d4a73d028c0f..6c6abd4db0b7 100644
--- a/pkgs/by-name/dn/dnsperf/package.nix
+++ b/pkgs/by-name/dn/dnsperf/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DNS-OARC";
     repo = "dnsperf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eDDVNFMjj+0wEBe1qO6r4Bai554Sp+EmP86reJ/VXGk=";
   };
 
diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix
index b88a5db5bdb7..724c016a474d 100644
--- a/pkgs/by-name/dn/dnsproxy/package.nix
+++ b/pkgs/by-name/dn/dnsproxy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = "dnsproxy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lxrb6DIYompvLX3R7HI63C7ZbNW76J28Xnt7AHTVwmQ=";
   };
 
diff --git a/pkgs/by-name/dn/dnstake/package.nix b/pkgs/by-name/dn/dnstake/package.nix
index 0164a0d8bf93..21d922961273 100644
--- a/pkgs/by-name/dn/dnstake/package.nix
+++ b/pkgs/by-name/dn/dnstake/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pwnesia";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM=";
   };
 
diff --git a/pkgs/by-name/do/do-agent/package.nix b/pkgs/by-name/do/do-agent/package.nix
index 6371bd17ef5d..b22911ed1b7f 100644
--- a/pkgs/by-name/do/do-agent/package.nix
+++ b/pkgs/by-name/do/do-agent/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "do-agent";
-    tag = version;
+    rev = version;
     sha256 = "sha256-XzZ9UmEA45ipVU0AHLZ+HeW/rmlBtgLXgyyGF1O1nqE=";
   };
 
diff --git a/pkgs/by-name/do/doas-sudo-shim/package.nix b/pkgs/by-name/do/doas-sudo-shim/package.nix
index c3c33a0b0c29..22536ae6d0b0 100644
--- a/pkgs/by-name/do/doas-sudo-shim/package.nix
+++ b/pkgs/by-name/do/doas-sudo-shim/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jirutka";
     repo = "doas-sudo-shim";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jgakKxglJi4LcxXsSE4mEdY/44kPxVb/jF7CgX7dllA=";
   };
 
diff --git a/pkgs/by-name/do/doas/package.nix b/pkgs/by-name/do/doas/package.nix
index 0e90ffb01439..7da262cacbae 100644
--- a/pkgs/by-name/do/doas/package.nix
+++ b/pkgs/by-name/do/doas/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Duncaen";
     repo = "OpenDoas";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "9uOQ2Ta5HzEpbCz2vbqZEEksPuIjL8lvmfmynfqxMeM=";
   };
 
diff --git a/pkgs/by-name/do/doc2go/package.nix b/pkgs/by-name/do/doc2go/package.nix
index 3b165fa31d2d..e2b3d2edc3e7 100644
--- a/pkgs/by-name/do/doc2go/package.nix
+++ b/pkgs/by-name/do/doc2go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "doc2go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-b4L20/9jm+bFGdNsHmcwSnzcmr3Il9XoV20284Ba8PU=";
   };
   vendorHash = "sha256-d5ZRMFi7GIfDHsYRNvMnDdfnGhTM1sA0WDYD2aDoEd0=";
diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix
index b4daa870965a..7038b1d52e1a 100644
--- a/pkgs/by-name/do/docfd/package.nix
+++ b/pkgs/by-name/do/docfd/package.nix
@@ -28,7 +28,7 @@ buildDunePackage' rec {
   src = fetchFromGitHub {
     owner = "darrenldl";
     repo = "docfd";
-    tag = version;
+    rev = version;
     hash = "sha256-ZD1nKl/hfidlTGdBnNINt2EmlUmFWaJjSvY3wkyJJcg=";
   };
 
diff --git a/pkgs/by-name/do/dockbarx/package.nix b/pkgs/by-name/do/dockbarx/package.nix
index 51f0b47840c7..3b478a8606f7 100644
--- a/pkgs/by-name/do/dockbarx/package.nix
+++ b/pkgs/by-name/do/dockbarx/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xuzhen";
     repo = "dockbarx";
-    tag = version;
+    rev = version;
     sha256 = "sha256-J/5KpHptGzgRF1qIGrgjkRR3in5pE0ffkiYVTR3iZKY=";
   };
 
diff --git a/pkgs/by-name/do/docker-compose-language-service/package.nix b/pkgs/by-name/do/docker-compose-language-service/package.nix
index 637c5d4d9a97..412836babbbd 100644
--- a/pkgs/by-name/do/docker-compose-language-service/package.nix
+++ b/pkgs/by-name/do/docker-compose-language-service/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "compose-language-service";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UBnABi7DMKrAFkRA8H6us/Oq4yM0mJ+kwOm0Rt8XnGw=";
   };
 
diff --git a/pkgs/by-name/do/docker-credential-helpers/package.nix b/pkgs/by-name/do/docker-credential-helpers/package.nix
index 221e2447f66c..a11cd5fb1a20 100644
--- a/pkgs/by-name/do/docker-credential-helpers/package.nix
+++ b/pkgs/by-name/do/docker-credential-helpers/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "docker";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5KrBiihpWY04PjI9M7NRS5fRu+ochzqRLvX+ZBj/wq8=";
   };
 
diff --git a/pkgs/by-name/do/docker-ls/package.nix b/pkgs/by-name/do/docker-ls/package.nix
index 6b272d73b552..bde78aad278f 100644
--- a/pkgs/by-name/do/docker-ls/package.nix
+++ b/pkgs/by-name/do/docker-ls/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mayflower";
     repo = "docker-ls";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-4+REt0NH4S367qFsyJncVedUrC4t1zw5o0CLTiQfIz8=";
   };
 
diff --git a/pkgs/by-name/do/docker-slim/package.nix b/pkgs/by-name/do/docker-slim/package.nix
index 56cd14147703..b0e24cdf81f7 100644
--- a/pkgs/by-name/do/docker-slim/package.nix
+++ b/pkgs/by-name/do/docker-slim/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slimtoolkit";
     repo = "slim";
-    tag = version;
+    rev = version;
     hash = "sha256-X+1euWp4W53axbiBpL82bUPfod/JNhGVGWgOqKyhz6A=";
   };
 
diff --git a/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix b/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix
index f64f0f3889fb..e4e481b9e988 100644
--- a/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix
+++ b/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "rcjsuen";
     repo = "dockerfile-language-server-nodejs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xhb540hXATfSo+O+BAYt4VWOa6QHLzKHoi0qKrdBVjw=";
   };
 
diff --git a/pkgs/by-name/do/dockle/package.nix b/pkgs/by-name/do/dockle/package.nix
index f62f138a9246..80f84ffd58e4 100644
--- a/pkgs/by-name/do/dockle/package.nix
+++ b/pkgs/by-name/do/dockle/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goodwithtech";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YoDgTKhXpN4UVF/+NDFxaEFwMj81RJaqfjr29t1UdLY=";
   };
 
diff --git a/pkgs/by-name/do/dockutil/package.nix b/pkgs/by-name/do/dockutil/package.nix
index ef45a363ae12..264523e970fd 100644
--- a/pkgs/by-name/do/dockutil/package.nix
+++ b/pkgs/by-name/do/dockutil/package.nix
@@ -37,7 +37,7 @@ let
     src = fetchFromGitHub {
       owner = "kcrawford";
       repo = "dockutil";
-      tag = finalAttrs.version;
+      rev = finalAttrs.version;
       hash = "sha256-mmk4vVZhq4kt05nI/dDM1676FDWyf4wTSwY2YzqKsLU=";
     };
 
diff --git a/pkgs/by-name/do/docopt_cpp/package.nix b/pkgs/by-name/do/docopt_cpp/package.nix
index 7f170040d4e1..2b45d2e9c15d 100644
--- a/pkgs/by-name/do/docopt_cpp/package.nix
+++ b/pkgs/by-name/do/docopt_cpp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "docopt";
     repo = "docopt.cpp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";
   };
 
diff --git a/pkgs/by-name/do/doctave/package.nix b/pkgs/by-name/do/doctave/package.nix
index a59582cff7f8..854a56de0709 100644
--- a/pkgs/by-name/do/doctave/package.nix
+++ b/pkgs/by-name/do/doctave/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "doctave";
     repo = "doctave";
-    tag = version;
+    rev = version;
     hash = "sha256-8mGSFQozyLoGua9mwyqfDcYNMtbeWp9Phb0vaje+AJ0=";
   };
 
diff --git a/pkgs/by-name/do/doctest/package.nix b/pkgs/by-name/do/doctest/package.nix
index 36ca68bde32b..793a4af00f58 100644
--- a/pkgs/by-name/do/doctest/package.nix
+++ b/pkgs/by-name/do/doctest/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "doctest";
     repo = "doctest";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hotO6QVpPn8unYTaQHFgi40A3oLUd++I3aTe293e4Aw=";
   };
 
diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix
index 681036ddce23..50dc42dc2eac 100644
--- a/pkgs/by-name/do/doctl/package.nix
+++ b/pkgs/by-name/do/doctl/package.nix
@@ -41,7 +41,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "doctl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-B3qozldNmCYLCuBoWMHycf9gNKbvUvPHK2CDOvMYEt8=";
   };
 
diff --git a/pkgs/by-name/do/doctoc/package.nix b/pkgs/by-name/do/doctoc/package.nix
index 4ad3f5001889..faded51f4431 100644
--- a/pkgs/by-name/do/doctoc/package.nix
+++ b/pkgs/by-name/do/doctoc/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "thlorenz";
     repo = "doctoc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LYVxW8bZ4M87CmBvPyp4y0IeL9UFawwAKnUWHEWB5Gs=";
   };
 
diff --git a/pkgs/by-name/do/docui/package.nix b/pkgs/by-name/do/docui/package.nix
index bfddee135d37..5c8c5302f5c3 100644
--- a/pkgs/by-name/do/docui/package.nix
+++ b/pkgs/by-name/do/docui/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "skanehira";
     repo = "docui";
-    tag = version;
+    rev = version;
     hash = "sha256-tHv1caNGiWC9Dc/qR4ij9xGM1lotT0KyrpJpdBsHyks=";
   };
 
diff --git a/pkgs/by-name/do/documenso/package.nix b/pkgs/by-name/do/documenso/package.nix
index 78e29db16233..71b15e2b29b8 100644
--- a/pkgs/by-name/do/documenso/package.nix
+++ b/pkgs/by-name/do/documenso/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "documenso";
     repo = "documenso";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uKOJVZ0GRHo/CYvd/Ix/tq1WDhutRji1tSGdcITsNlo=";
   };
 
diff --git a/pkgs/by-name/do/documize-community/package.nix b/pkgs/by-name/do/documize-community/package.nix
index 8596ebc17955..842428c79914 100644
--- a/pkgs/by-name/do/documize-community/package.nix
+++ b/pkgs/by-name/do/documize-community/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "documize";
     repo = "community";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Kv4BsFB08rkGRkePFIkjjuhK1TnLPS4m+PUlgKG5cTQ=";
   };
 
diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix
index 5248f37ca7dd..1ce408dfdabc 100644
--- a/pkgs/by-name/do/docuum/package.nix
+++ b/pkgs/by-name/do/docuum/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "stepchowfun";
     repo = "docuum";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nWd6h39jU1eZWPFMxhxActsmrs9k0TDMlealuzTa+o0=";
   };
 
diff --git a/pkgs/by-name/do/doge/package.nix b/pkgs/by-name/do/doge/package.nix
index 5d1e29d913a1..c12e8345abf8 100644
--- a/pkgs/by-name/do/doge/package.nix
+++ b/pkgs/by-name/do/doge/package.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Olivia5k";
     repo = "doge";
-    tag = version;
+    rev = version;
     hash = "sha256-CZw9Pz9YPVmDMOfDp5yIp/yStOvXEzAgb/HvKpxhQ8I=";
   };
 
diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix
index 11afcc923173..0a6a950e93f1 100644
--- a/pkgs/by-name/do/dogedns/package.nix
+++ b/pkgs/by-name/do/dogedns/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Dj-Codeman";
     repo = "doge";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3wOka+MKSy2x3100eF0d9A5Jc0qFSNCiLsisHO1Uldc=";
   };
 
diff --git a/pkgs/by-name/do/doggo/package.nix b/pkgs/by-name/do/doggo/package.nix
index 771fb5b1ca1f..27fee11d3874 100644
--- a/pkgs/by-name/do/doggo/package.nix
+++ b/pkgs/by-name/do/doggo/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mr-karan";
     repo = "doggo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SbTwVvE699MCgfUXifnJ1oMNN8TdLg8P03Xx5hrQxF8=";
   };
 
diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index 9f3768cc0190..d97f45c3a14b 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-d4n4Cz4FvSMznTqHs5cD18Y1xE6p8umGr7PqtI5k6Zg=";
   };
 
diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix
index aa5670b4be21..7b4398e1e2bb 100644
--- a/pkgs/by-name/do/done/package.nix
+++ b/pkgs/by-name/do/done/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "done-devs";
     repo = "done";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SbeP7PnJd7jjdXa9uDIAlMAJLOrYHqNP5p9gQclb6RU=";
   };
 
diff --git a/pkgs/by-name/do/dool/package.nix b/pkgs/by-name/do/dool/package.nix
index d03154a9dcee..1be266859149 100644
--- a/pkgs/by-name/do/dool/package.nix
+++ b/pkgs/by-name/do/dool/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scottchiefbaker";
     repo = "dool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eyWt8gWPGiU8YavX8KT018upSB6xg8eAyRZ84snrvoY=";
   };
 
diff --git a/pkgs/by-name/do/door-knocker/package.nix b/pkgs/by-name/do/door-knocker/package.nix
index 6baedaa57b4d..37429ed2f5cd 100644
--- a/pkgs/by-name/do/door-knocker/package.nix
+++ b/pkgs/by-name/do/door-knocker/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "tytan652";
     repo = "door-knocker";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-6QHjmjR2ioR0I6JXtJ0Q+9Dl1fcTnQCGgWlcyFt9WoA=";
   };
 
diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix
index 5abf6dc49a48..c1e5796fb5d0 100644
--- a/pkgs/by-name/do/doppler/package.nix
+++ b/pkgs/by-name/do/doppler/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dopplerhq";
     repo = "cli";
-    tag = version;
+    rev = version;
     hash = "sha256-CHPaY8Z8ov+loIViQceD4ZW26MtXN1hpkY00p3Yy1n4=";
   };
 
diff --git a/pkgs/by-name/do/dorkscout/package.nix b/pkgs/by-name/do/dorkscout/package.nix
index c32690ecfb5f..28991f77b5f2 100644
--- a/pkgs/by-name/do/dorkscout/package.nix
+++ b/pkgs/by-name/do/dorkscout/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "R4yGM";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-v0OgEfl6L92ux+2GbSPHEgkmA/ZobQHB66O2LlEhVUA=";
   };
 
diff --git a/pkgs/by-name/do/dosfstools/package.nix b/pkgs/by-name/do/dosfstools/package.nix
index 20a665ac85b7..9446485273d3 100644
--- a/pkgs/by-name/do/dosfstools/package.nix
+++ b/pkgs/by-name/do/dosfstools/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dosfstools";
     repo = "dosfstools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-2gxB0lQixiHOHw8uTetHekaM57fvUd9zOzSxWnvUz/c=";
   };
 
diff --git a/pkgs/by-name/do/dot-language-server/package.nix b/pkgs/by-name/do/dot-language-server/package.nix
index 4d78d42b5d92..cb94613eb588 100644
--- a/pkgs/by-name/do/dot-language-server/package.nix
+++ b/pkgs/by-name/do/dot-language-server/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "nikeee";
     repo = "dot-language-server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NGkobMZrvWlW/jteFowZgGUVQiNm3bS5gv5tN2485VA=";
   };
 
diff --git a/pkgs/by-name/do/dotconf/package.nix b/pkgs/by-name/do/dotconf/package.nix
index b537cd2e9d9e..02d999ce46d5 100644
--- a/pkgs/by-name/do/dotconf/package.nix
+++ b/pkgs/by-name/do/dotconf/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "williamh";
     repo = "dotconf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6Du26Ffz08DLGg6uIiPi8Sgjf691MM2kn0qXe3oFeTw=";
   };
 
diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix
index e681917413c8..5db7d841e907 100644
--- a/pkgs/by-name/do/dotenv-cli/package.nix
+++ b/pkgs/by-name/do/dotenv-cli/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "entropitor";
     repo = "dotenv-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cqJGw6z0m1ImFEmG2jfcYjaKVhrGyM4hbOAHC7xNAFY=";
   };
 
diff --git a/pkgs/by-name/do/dotnet-outdated/package.nix b/pkgs/by-name/do/dotnet-outdated/package.nix
index 14fd3ae82a6f..83ae0d4b0037 100644
--- a/pkgs/by-name/do/dotnet-outdated/package.nix
+++ b/pkgs/by-name/do/dotnet-outdated/package.nix
@@ -11,7 +11,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "dotnet-outdated";
     repo = "dotnet-outdated";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ah5VOCIkSRkeDWk/KYHIc/OELo0T/HuJl0LEUiumlu0=";
   };
 
diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix
index 3c74d93bef8b..87339d21f6f9 100644
--- a/pkgs/by-name/do/dotter/package.nix
+++ b/pkgs/by-name/do/dotter/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SuperCuber";
     repo = "dotter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7YExvmuliTL9oagXNUtZ7ZOPyELcS+igK1tXdhG0kQk=";
   };
 
diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix
index e6a9f91851d9..508a6d576cb2 100644
--- a/pkgs/by-name/do/double-conversion/package.nix
+++ b/pkgs/by-name/do/double-conversion/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "double-conversion";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM=";
   };
 
diff --git a/pkgs/by-name/do/double-entry-generator/package.nix b/pkgs/by-name/do/double-entry-generator/package.nix
index 00bd6e347a27..f57f8b185b9d 100644
--- a/pkgs/by-name/do/double-entry-generator/package.nix
+++ b/pkgs/by-name/do/double-entry-generator/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner = "deb-sig";
     repo = "double-entry-generator";
     hash = "sha256-2Y8Spj1LAVZsUgChDYDCZ63pTH+nqs2ff9xcmC+gr0c=";
-    tag = "v${version}";
+    rev = "v${version}";
   };
 
   vendorHash = "sha256-Xedva9oGteOnv3rP4Wo3sOHIPyuy2TYwkZV2BAuxY4M=";
diff --git a/pkgs/by-name/do/dovecot_fts_xapian/package.nix b/pkgs/by-name/do/dovecot_fts_xapian/package.nix
index a49b69065f27..6b0f6e5afbd7 100644
--- a/pkgs/by-name/do/dovecot_fts_xapian/package.nix
+++ b/pkgs/by-name/do/dovecot_fts_xapian/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grosjo";
     repo = "fts-xapian";
-    tag = version;
+    rev = version;
     hash = "sha256-jHXeCJVdRWGdLMooh5cq5ZeZPM5fDo1lO6U5VMcwf3g=";
   };
 
diff --git a/pkgs/by-name/dp/dpt-rp1-py/package.nix b/pkgs/by-name/dp/dpt-rp1-py/package.nix
index 6d92a2f3cc86..27be986648ef 100644
--- a/pkgs/by-name/dp/dpt-rp1-py/package.nix
+++ b/pkgs/by-name/dp/dpt-rp1-py/package.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "janten";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0zvf09b9rzpx5b0w81ziqd7v321hfhgsgvshdx23karj2hf75bvj";
   };
 
diff --git a/pkgs/by-name/dr/dr14_tmeter/package.nix b/pkgs/by-name/dr/dr14_tmeter/package.nix
index 97b0cb0565e4..fe141c096fb1 100644
--- a/pkgs/by-name/dr/dr14_tmeter/package.nix
+++ b/pkgs/by-name/dr/dr14_tmeter/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "simon-r";
     repo = "dr14_t.meter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1nfsasi7kx0myxkahbd7rz8796mcf5nsadrsjjpx2kgaaw5nkv1m";
   };
 
diff --git a/pkgs/by-name/dr/dracut/package.nix b/pkgs/by-name/dr/dracut/package.nix
index 5f69a03679de..071a70095adf 100644
--- a/pkgs/by-name/dr/dracut/package.nix
+++ b/pkgs/by-name/dr/dracut/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dracutdevs";
     repo = "dracut";
-    tag = version;
+    rev = version;
     hash = "sha256-zSyC2SnSQkmS/mDpBXG2DtVVanRRI9COKQJqYZZCPJM=";
   };
 
diff --git a/pkgs/by-name/dr/dragmap/package.nix b/pkgs/by-name/dr/dragmap/package.nix
index 08d2654119a1..2408b01be91d 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";
-    tag = finalAttrs.version;
+    rev = 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 c4715ff54f51..f741bcb7c02c 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";
-    tag = version;
+    rev = 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 18ffa5379a97..5a38c54c07e7 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P6WMW/n+VezWDXGagT4B+ZYyCp8oufDV6MTrpKpLZcs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/dr/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix
index a77cf0154f69..21622ff9aefb 100644
--- a/pkgs/by-name/dr/dreamchess/package.nix
+++ b/pkgs/by-name/dr/dreamchess/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "dreamchess";
     repo = "dreamchess";
-    tag = finalAttrs.version;
+    rev = "${finalAttrs.version}";
     hash = "sha256-qus/RjwdAl9SuDXfLVKTPImqrvPF3xSDVlbXYLM3JNE=";
   };
 
diff --git a/pkgs/by-name/dr/driftctl/package.nix b/pkgs/by-name/dr/driftctl/package.nix
index b6d33cafea2f..9a95d19f4e4f 100644
--- a/pkgs/by-name/dr/driftctl/package.nix
+++ b/pkgs/by-name/dr/driftctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "snyk";
     repo = "driftctl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-IDKfW0NCEsgKXpHA7SwkHjMeoGAIYITlDVR/vI/b9hk=";
   };
 
diff --git a/pkgs/by-name/dr/drip/package.nix b/pkgs/by-name/dr/drip/package.nix
index 9ee7ffacb3dc..9e7de6a3bb0f 100644
--- a/pkgs/by-name/dr/drip/package.nix
+++ b/pkgs/by-name/dr/drip/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "drip";
     owner = "ninjudd";
-    tag = version;
+    rev = version;
     sha256 = "1zl62wdwfak6z725asq5lcqb506la1aavj7ag78lvp155wyh8aq1";
   };
 
diff --git a/pkgs/by-name/dr/drive/package.nix b/pkgs/by-name/dr/drive/package.nix
index 5e74bc141d2f..7eb4412744ee 100644
--- a/pkgs/by-name/dr/drive/package.nix
+++ b/pkgs/by-name/dr/drive/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "odeke-em";
     repo = "drive";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mNOeOB0Tn5eqULFJZuE18PvLoHtnspv4AElmgEQKXcU=";
   };
 
diff --git a/pkgs/by-name/dr/droidcam/package.nix b/pkgs/by-name/dr/droidcam/package.nix
index 4d331fe9f110..b7f9ce79874a 100644
--- a/pkgs/by-name/dr/droidcam/package.nix
+++ b/pkgs/by-name/dr/droidcam/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aramg";
     repo = "droidcam";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Pwq7PDj+MH1wzrUyfva2F2+oELm4Sb1EJPUUCsHYb7k=";
   };
 
diff --git a/pkgs/by-name/dr/drone-scp/package.nix b/pkgs/by-name/dr/drone-scp/package.nix
index 626385c33a8d..07d38d2e6623 100644
--- a/pkgs/by-name/dr/drone-scp/package.nix
+++ b/pkgs/by-name/dr/drone-scp/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "appleboy";
     repo = "drone-scp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cVgKWdhmCdjEHGazZ1FMAOJMVyU5pl8aIgwFMhxlhzg=";
   };
 
diff --git a/pkgs/by-name/dr/dropwatch/package.nix b/pkgs/by-name/dr/dropwatch/package.nix
index 4480df877891..0fbf7865dd63 100644
--- a/pkgs/by-name/dr/dropwatch/package.nix
+++ b/pkgs/by-name/dr/dropwatch/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nhorman";
     repo = "dropwatch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TbhgcX5WzuigP5/Mj5JuK7O/UKcu70D7dcOcvo4fxeQ=";
   };
 
diff --git a/pkgs/by-name/dr/dry/package.nix b/pkgs/by-name/dr/dry/package.nix
index 63b76a1a74b1..d92189012dc1 100644
--- a/pkgs/by-name/dr/dry/package.nix
+++ b/pkgs/by-name/dr/dry/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "moncho";
     repo = "dry";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JGtPX6BrB3q2EQyF6x2A5Wsn5DudOSVt3IxBAjjwlC8=";
   };
 
diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix
index 1ee33025df14..96f619706a79 100644
--- a/pkgs/by-name/ds/dsda-doom/package.nix
+++ b/pkgs/by-name/ds/dsda-doom/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kraflab";
     repo = "dsda-doom";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-66o/k5DvyKxwa0sZPCfSycVRxEhrRhUJXJVz2p817OE=";
   };
 
diff --git a/pkgs/by-name/ds/dsq/package.nix b/pkgs/by-name/ds/dsq/package.nix
index 3b77a1133ba4..b32ca150c12f 100644
--- a/pkgs/by-name/ds/dsq/package.nix
+++ b/pkgs/by-name/ds/dsq/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "multiprocessio";
     repo = "dsq";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FZBJe+2y4HV3Pgeap4yvD0a8M/j+6pAJEFpoQVVE1ec=";
   };
 
diff --git a/pkgs/by-name/ds/dstask/package.nix b/pkgs/by-name/ds/dstask/package.nix
index e01ca34d09d6..54e8a95355b7 100644
--- a/pkgs/by-name/ds/dstask/package.nix
+++ b/pkgs/by-name/ds/dstask/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "naggie";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xZFQQDK+yGAv4IbuNe2dvNa3GDASeJY2mOYw94goAIM=";
   };
 
diff --git a/pkgs/by-name/ds/dstep/package.nix b/pkgs/by-name/ds/dstep/package.nix
index 57f1e747f6a3..14a3c3b7cd58 100644
--- a/pkgs/by-name/ds/dstep/package.nix
+++ b/pkgs/by-name/ds/dstep/package.nix
@@ -13,7 +13,7 @@ buildDubPackage rec {
   src = fetchFromGitHub {
     owner = "jacob-carlborg";
     repo = "dstep";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZFz2+GtBk3StqXo/9x47xrDFdz5XujHR62hj0p3AjcY=";
   };
 
diff --git a/pkgs/by-name/ds/dstp/package.nix b/pkgs/by-name/ds/dstp/package.nix
index a8ad7eda817b..c06a34434a56 100644
--- a/pkgs/by-name/ds/dstp/package.nix
+++ b/pkgs/by-name/ds/dstp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ycd";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QODp9IbIc2Z7N/xfRd0UV9r8t6RndOjdGe9hQXJyiN0=";
   };
 
diff --git a/pkgs/by-name/ds/dsvpn/package.nix b/pkgs/by-name/ds/dsvpn/package.nix
index f9723ad152b6..23f640d149a0 100644
--- a/pkgs/by-name/ds/dsvpn/package.nix
+++ b/pkgs/by-name/ds/dsvpn/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = "dsvpn";
-    tag = version;
+    rev = version;
     sha256 = "1gbj3slwmq990qxsbsaxasi98alnnzv3adp6f8w8sxd4gi6qxhdh";
   };
 
diff --git a/pkgs/by-name/dt/dtcmp/package.nix b/pkgs/by-name/dt/dtcmp/package.nix
index 433d8107d274..abf24f17ec90 100644
--- a/pkgs/by-name/dt/dtcmp/package.nix
+++ b/pkgs/by-name/dt/dtcmp/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LLNL";
     repo = "dtcmp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Dc+c8JCc5D23CtpwiWkHCqngywEZXw7cYsRiSYiQdWk=";
   };
 
diff --git a/pkgs/by-name/dt/dtool/package.nix b/pkgs/by-name/dt/dtool/package.nix
index 0a4c6071797a..3d154e94567f 100644
--- a/pkgs/by-name/dt/dtool/package.nix
+++ b/pkgs/by-name/dt/dtool/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "guoxbin";
     repo = "dtool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m4H+ANwEbK6vGW3oIVZqnqvMiAKxNJf2TLIGh/G6AU4=";
   };
 
diff --git a/pkgs/by-name/dt/dtrx/package.nix b/pkgs/by-name/dt/dtrx/package.nix
index e3abff42ca19..837f434fb981 100644
--- a/pkgs/by-name/dt/dtrx/package.nix
+++ b/pkgs/by-name/dt/dtrx/package.nix
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dtrx-py";
     repo = "dtrx";
-    tag = version;
+    rev = version;
     sha256 = "sha256-LB3F6jcqQPRsjFO4L2fPAPnacDAdtcaadgGbwXA9LAw=";
   };
 
diff --git a/pkgs/by-name/du/duc/package.nix b/pkgs/by-name/du/duc/package.nix
index 214c3b6ff6c3..ad33cea6cae2 100644
--- a/pkgs/by-name/du/duc/package.nix
+++ b/pkgs/by-name/du/duc/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zevv";
     repo = "duc";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ZLNsyp82UnsveEfDKzH8WfRh/Y/PQlXq8Ma+jIZl9Gk=";
   };
 
diff --git a/pkgs/by-name/du/duf/package.nix b/pkgs/by-name/du/duf/package.nix
index 87ab46f39d2b..dce3c1588834 100644
--- a/pkgs/by-name/du/duf/package.nix
+++ b/pkgs/by-name/du/duf/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "muesli";
     repo = "duf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bVuqX88KY+ky+fd1FU9GWP78jQc4fRDk9yRSeIesHyI=";
   };
 
diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix
index e51049d63b91..b62086b95b52 100644
--- a/pkgs/by-name/du/dufs/package.nix
+++ b/pkgs/by-name/du/dufs/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sigoden";
     repo = "dufs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KkuP9UE9VT9aJ50QH1Y/2f+t0tLOMyNovxCaLq0Jz0s=";
   };
 
diff --git a/pkgs/by-name/du/dum/package.nix b/pkgs/by-name/du/dum/package.nix
index 2f4ac2dde888..928ccc53afe6 100644
--- a/pkgs/by-name/du/dum/package.nix
+++ b/pkgs/by-name/du/dum/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "egoist";
     repo = "dum";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rkdQb4TI7lfWE4REJYsIJwMcmM/78jjgQrd0ZvKJxk8=";
   };
 
diff --git a/pkgs/by-name/du/dumb-init/package.nix b/pkgs/by-name/du/dumb-init/package.nix
index 4a4f073302cc..50ab44df870a 100644
--- a/pkgs/by-name/du/dumb-init/package.nix
+++ b/pkgs/by-name/du/dumb-init/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = "dumb-init";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-aRh0xfmp+ToXIYjYaducTpZUHndZ5HlFZpFhzJ3yKgs=";
   };
 
diff --git a/pkgs/by-name/du/dumb/package.nix b/pkgs/by-name/du/dumb/package.nix
index 03ffd43ef905..48d25f2601fd 100644
--- a/pkgs/by-name/du/dumb/package.nix
+++ b/pkgs/by-name/du/dumb/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kode54";
     repo = "dumb";
-    tag = version;
+    rev = version;
     sha256 = "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6";
   };
 
diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix
index 0da62b306e36..a1176888b5a0 100644
--- a/pkgs/by-name/du/dumbpipe/package.nix
+++ b/pkgs/by-name/du/dumbpipe/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "dumbpipe";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xQHVEJ+EgsrboXbPg7pGXXMjyedSLooqkTt/yYZACSo=";
   };
 
diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix
index 370c0c39d5ce..f07a24780f5c 100644
--- a/pkgs/by-name/du/dummyhttp/package.nix
+++ b/pkgs/by-name/du/dummyhttp/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "dummyhttp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LgOIL4kg3cH0Eo+Z+RGwxZTPzCNSGAdKT7N8tZWHSQQ=";
   };
 
diff --git a/pkgs/by-name/du/dump1090/package.nix b/pkgs/by-name/du/dump1090/package.nix
index 44cbe813d7fa..d61dbe92411e 100644
--- a/pkgs/by-name/du/dump1090/package.nix
+++ b/pkgs/by-name/du/dump1090/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flightaware";
     repo = "dump1090";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rc4mg+Px+0p2r38wxIah/rHqWjHSU0+KCPgqj/Gl3oo=";
   };
 
diff --git a/pkgs/by-name/du/dupd/package.nix b/pkgs/by-name/du/dupd/package.nix
index 1495e626aaf7..71cd9e53c194 100644
--- a/pkgs/by-name/du/dupd/package.nix
+++ b/pkgs/by-name/du/dupd/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jvirkki";
     repo = "dupd";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ZiQroJ5fjBCIjU+M8KRA0N3Mrg9h0NVtfYUIS4cYyhw=";
   };
 
diff --git a/pkgs/by-name/du/dupe-krill/package.nix b/pkgs/by-name/du/dupe-krill/package.nix
index 7b76a1fd9741..a641d7045033 100644
--- a/pkgs/by-name/du/dupe-krill/package.nix
+++ b/pkgs/by-name/du/dupe-krill/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = "dupe-krill";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ze9OQHNtujzn2rY24bmFUkz5AYsjoMrwqm4jyQoF53Y=";
   };
 
diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index 151458a05591..89e2eb0b9235 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "markfasheh";
     repo = "duperemove";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T17XkR6AUvOerg9FN4SxTfoMavVXnxujtrA4p4GEnFE=";
   };
 
diff --git a/pkgs/by-name/du/duplicacy/package.nix b/pkgs/by-name/du/duplicacy/package.nix
index 1e8257433ade..d1a4ea570da7 100644
--- a/pkgs/by-name/du/duplicacy/package.nix
+++ b/pkgs/by-name/du/duplicacy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gilbertchen";
     repo = "duplicacy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JxBS40g97GPTzKXW+k0RrwLBuK4ItLvnVHzBZRSOEIM=";
   };
 
diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index d2ef83496158..720bfee00efd 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MmlCTF7tZBBOCnyhUjTatDjajFMGd+Nk2kYyxjzZc04=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
diff --git a/pkgs/by-name/du/dutree/package.nix b/pkgs/by-name/du/dutree/package.nix
index 57d8c3202389..d6f1d42a4b8c 100644
--- a/pkgs/by-name/du/dutree/package.nix
+++ b/pkgs/by-name/du/dutree/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nachoparker";
     repo = "dutree";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "17lm8jd07bi499mywg2iq669im34j4x4yhc8a3adxn12f8j0dfg7";
     # test directory has files with unicode names which causes hash mismatches
     # It is also not used by any tests or parts of build process
diff --git a/pkgs/by-name/dy/dyff/package.nix b/pkgs/by-name/dy/dyff/package.nix
index 70232d946023..9c2e026bfa1d 100644
--- a/pkgs/by-name/dy/dyff/package.nix
+++ b/pkgs/by-name/dy/dyff/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "homeport";
     repo = "dyff";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dioahL3dWK+rNAcThv2vYyoGaIIFhcd5li9gtwjtGzM=";
   };
 
diff --git a/pkgs/by-name/dy/dynamic-colors/package.nix b/pkgs/by-name/dy/dynamic-colors/package.nix
index 38f6c7b4c5b6..b59e413cf87a 100644
--- a/pkgs/by-name/dy/dynamic-colors/package.nix
+++ b/pkgs/by-name/dy/dynamic-colors/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "peterhoeg";
     repo = "dynamic-colors";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jSdwq9WwYZP8MK6z7zJa0q93xfanr6iuvAt8YQkQxxE=";
   };
 
diff --git a/pkgs/by-name/dy/dynamic-wallpaper/package.nix b/pkgs/by-name/dy/dynamic-wallpaper/package.nix
index 6985d9e88381..786db004d7a3 100644
--- a/pkgs/by-name/dy/dynamic-wallpaper/package.nix
+++ b/pkgs/by-name/dy/dynamic-wallpaper/package.nix
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dusansimic";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-DAdx34EYO8ysQzbWrAIPoghhibwFtoqCi8oyDVyO5lk=";
   };
 
diff --git a/pkgs/by-name/dy/dynein/package.nix b/pkgs/by-name/dy/dynein/package.nix
index e04eeefe245b..75fcbb6ffe83 100644
--- a/pkgs/by-name/dy/dynein/package.nix
+++ b/pkgs/by-name/dy/dynein/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "dynein";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GU/zZ7IJPfpRbrWjrVwPDSFjFfMLoG/c8DDWlN6nZ94=";
   };
 
diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix
index cccfad948a9c..4425ee65be01 100644
--- a/pkgs/by-name/dy/dysk/package.nix
+++ b/pkgs/by-name/dy/dysk/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "dysk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VJFcdxwj+038d9oj178e0uGQQyKF9JbDytxDmit2tiA=";
   };
 
diff --git a/pkgs/by-name/ea/ea/package.nix b/pkgs/by-name/ea/ea/package.nix
index 3e18fe6e5f67..7c4a649f2ab9 100644
--- a/pkgs/by-name/ea/ea/package.nix
+++ b/pkgs/by-name/ea/ea/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dduan";
     repo = "ea";
-    tag = version;
+    rev = version;
     hash = "sha256-VXSSe5d7VO3LfjumzN9a7rrKRedOtOzTdLVQWgV1ED8=";
   };
 
diff --git a/pkgs/by-name/ea/each/package.nix b/pkgs/by-name/ea/each/package.nix
index 6f01f5170598..27ae4b17e104 100644
--- a/pkgs/by-name/ea/each/package.nix
+++ b/pkgs/by-name/ea/each/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "arraypad";
     repo = "each";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5Aa/uHWrU4bpWd28Uddnuhmi6guHy09W9AU8sAfea6I=";
   };
 
diff --git a/pkgs/by-name/ea/earlybird/package.nix b/pkgs/by-name/ea/earlybird/package.nix
index f39281d89769..336082800ba4 100644
--- a/pkgs/by-name/ea/earlybird/package.nix
+++ b/pkgs/by-name/ea/earlybird/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "americanexpress";
     repo = "earlybird";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-guSm/ha4ICaOcoynvAwFeojE6ikaCykMcdfskD/ehTw=";
   };
 
diff --git a/pkgs/by-name/ea/earthly/package.nix b/pkgs/by-name/ea/earthly/package.nix
index 99d81d663604..193cf4991cc9 100644
--- a/pkgs/by-name/ea/earthly/package.nix
+++ b/pkgs/by-name/ea/earthly/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "earthly";
     repo = "earthly";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7yw2SmwWsPBCH0LOaZSruYeZ5qL+njGuExy8+11Ni78=";
   };
 
diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix
index acab9100ea23..274c71c9d748 100644
--- a/pkgs/by-name/ea/earthlyls/package.nix
+++ b/pkgs/by-name/ea/earthlyls/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "glehmann";
     repo = "earthlyls";
-    tag = version;
+    rev = version;
     hash = "sha256-GnFzfCjT4kjb9WViKIFDkIU7zVpiI6HDuUeddgHGQuc=";
   };
 
diff --git a/pkgs/by-name/ea/easeprobe/package.nix b/pkgs/by-name/ea/easeprobe/package.nix
index b6a54b208563..e52927a00dfd 100644
--- a/pkgs/by-name/ea/easeprobe/package.nix
+++ b/pkgs/by-name/ea/easeprobe/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "megaease";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-XPbRtW3UIc6N1D1LKDYxgTHGVmiGDnam+r5Eg4uBa7w=";
   };
 
diff --git a/pkgs/by-name/ea/eask-cli/package.nix b/pkgs/by-name/ea/eask-cli/package.nix
index 9554b57607d8..1e826d8cf3f0 100644
--- a/pkgs/by-name/ea/eask-cli/package.nix
+++ b/pkgs/by-name/ea/eask-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "emacs-eask";
     repo = "cli";
-    tag = version;
+    rev = version;
     hash = "sha256-xMay2HGw5vGvGIrbjCk0LNn5bvSiHbnpjfdGdO7BpQ4=";
   };
 
diff --git a/pkgs/by-name/ea/easyjson/package.nix b/pkgs/by-name/ea/easyjson/package.nix
index 2733a213de0d..97d6ddd6f845 100644
--- a/pkgs/by-name/ea/easyjson/package.nix
+++ b/pkgs/by-name/ea/easyjson/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mailru";
     repo = "easyjson";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m2WZwi6TM6hiBlCQOe+rxF5z3vvnYqtHQX8d7y5NLgI=";
   };
   vendorHash = "sha256-BsksTYmfPQezbWfIWX0NhuMbH4VvktrEx06C2Nb/FYE=";
diff --git a/pkgs/by-name/ea/easyloggingpp/package.nix b/pkgs/by-name/ea/easyloggingpp/package.nix
index 82b002aca893..8aa369284f6f 100644
--- a/pkgs/by-name/ea/easyloggingpp/package.nix
+++ b/pkgs/by-name/ea/easyloggingpp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amrayn";
     repo = "easyloggingpp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-R4NdwsUywgJoK5E/OdZXFds6iBKOsMa0E+2PDdQbV6E=";
   };
 
diff --git a/pkgs/by-name/ea/easypdkprog/package.nix b/pkgs/by-name/ea/easypdkprog/package.nix
index b14d4075d084..b4c86551e142 100644
--- a/pkgs/by-name/ea/easypdkprog/package.nix
+++ b/pkgs/by-name/ea/easypdkprog/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "free-pdk";
     repo = "easy-pdk-programmer-software";
-    tag = version;
+    rev = version;
     sha256 = "0hc3gdmn6l01z63hzzwdhbdyy288gh5v219bsfm8fb1498vpnd6f";
   };
 
diff --git a/pkgs/by-name/ea/easyrsa/package.nix b/pkgs/by-name/ea/easyrsa/package.nix
index cdb0e40c8e91..96d3a0fe49dd 100644
--- a/pkgs/by-name/ea/easyrsa/package.nix
+++ b/pkgs/by-name/ea/easyrsa/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "easy-rsa";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gNuVijMAHVKEHU0Z6INKUZt68qSg5ssxSaXOH/+MU1I=";
   };
 
diff --git a/pkgs/by-name/eb/ebusd/package.nix b/pkgs/by-name/eb/ebusd/package.nix
index a003f64f06ad..d0549942bcc9 100644
--- a/pkgs/by-name/eb/ebusd/package.nix
+++ b/pkgs/by-name/eb/ebusd/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "john30";
     repo = "ebusd";
-    tag = version;
+    rev = version;
     sha256 = "sha256-+3QOB7/yCgR4j2UGfhWQ5s5sldoNfWSzX7qa//FHeJ4=";
   };
 
diff --git a/pkgs/by-name/ec/ec2-metadata-mock/package.nix b/pkgs/by-name/ec/ec2-metadata-mock/package.nix
index b0986ca13ac1..d8a00b226135 100644
--- a/pkgs/by-name/ec/ec2-metadata-mock/package.nix
+++ b/pkgs/by-name/ec/ec2-metadata-mock/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-ec2-metadata-mock";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8X6LBGo496fG0Chhvg3jAaUF6mp8psCzHd+Es75z27Y=";
   };
 
diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix
index d71a6bf65a4e..147d3944581f 100644
--- a/pkgs/by-name/ec/ecc/package.nix
+++ b/pkgs/by-name/ec/ecc/package.nix
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "eunomia-bpf";
     repo = "eunomia-bpf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KfYCC+TJbmjHrV46LoshD+uXcaBVMKk6+cN7TZKKYp4=";
   };
 
diff --git a/pkgs/by-name/ec/ecdsautils/package.nix b/pkgs/by-name/ec/ecdsautils/package.nix
index 9aafd283e36b..6b7dec6e11e6 100644
--- a/pkgs/by-name/ec/ecdsautils/package.nix
+++ b/pkgs/by-name/ec/ecdsautils/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = pkgs.fetchFromGitHub {
     owner = "freifunk-gluon";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vGHLAX/XOtePvdT/rljCOdlILHVO20mCt6p+MUi13dg=";
   };
 
diff --git a/pkgs/by-name/ec/eclint/package.nix b/pkgs/by-name/ec/eclint/package.nix
index 5db7f350c351..3928cb5ef5b9 100644
--- a/pkgs/by-name/ec/eclint/package.nix
+++ b/pkgs/by-name/ec/eclint/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "greut";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XY+D0bRIgWTm2VH+uDVodYeyGeu+8Xyyq4xDvTDLii4=";
   };
 
diff --git a/pkgs/by-name/ec/ecos/package.nix b/pkgs/by-name/ec/ecos/package.nix
index 952a5340be31..ed8104e73a59 100644
--- a/pkgs/by-name/ec/ecos/package.nix
+++ b/pkgs/by-name/ec/ecos/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "embotech";
     repo = "ecos";
-    tag = version;
+    rev = version;
     sha256 = "1hsndim5kjvcwk5svqa4igawzahj982180xj1d7yd0dbjlgxc7w7";
   };
 
diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix
index 7b82b21ee9e5..b3096e533c7a 100644
--- a/pkgs/by-name/ec/ecs-agent/package.nix
+++ b/pkgs/by-name/ec/ecs-agent/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "1.91.2";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "aws";
     repo = pname;
     hash = "sha256-7f1qJ9dgouhj+DGikdIzUREPraAA/1y/5lYA8fbIoJo=";
diff --git a/pkgs/by-name/ed/edge-runtime/package.nix b/pkgs/by-name/ed/edge-runtime/package.nix
index 3c4985e47b1e..e6133bf1389e 100644
--- a/pkgs/by-name/ed/edge-runtime/package.nix
+++ b/pkgs/by-name/ed/edge-runtime/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "supabase";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-w0iSKHT6aIixKh1bHg1lOQNEw/emKK7R2iLzWjb2Pnk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ed/editline/package.nix b/pkgs/by-name/ed/editline/package.nix
index 23e022338f40..7df7fe83936e 100644
--- a/pkgs/by-name/ed/editline/package.nix
+++ b/pkgs/by-name/ed/editline/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "editline";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-0FeDUVCUahbweH24nfaZwa7j7lSfZh1TnQK7KYqO+3g=";
   };
 
diff --git a/pkgs/by-name/ed/editorconfig-checker/package.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix
index 18d67de47875..b9cda0e91a62 100644
--- a/pkgs/by-name/ed/editorconfig-checker/package.nix
+++ b/pkgs/by-name/ed/editorconfig-checker/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "editorconfig-checker";
     repo = "editorconfig-checker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LoOuP98vRj/kzyWKKsXNPfE+9IELrKBtdSZvP7GtMew=";
   };
 
diff --git a/pkgs/by-name/ed/edwood/package.nix b/pkgs/by-name/ed/edwood/package.nix
index f8c5914ed7d2..04fc2084ffb1 100644
--- a/pkgs/by-name/ed/edwood/package.nix
+++ b/pkgs/by-name/ed/edwood/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rjkroege";
     repo = "edwood";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jKDwNq/iMFqVpPq14kZa+T5fES54f4BAujXUwGlbiTE=";
   };
 
diff --git a/pkgs/by-name/ef/eff/package.nix b/pkgs/by-name/ef/eff/package.nix
index 5d5532c6461f..95e041383fdf 100644
--- a/pkgs/by-name/ef/eff/package.nix
+++ b/pkgs/by-name/ef/eff/package.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "matijapretnar";
     repo = "eff";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0U61y41CA0YaoNk9Hsj7j6eb2V6Ku3MAjW9lMEimiC0=";
   };
 
diff --git a/pkgs/by-name/ef/efficient-compression-tool/package.nix b/pkgs/by-name/ef/efficient-compression-tool/package.nix
index 48bc4b6e9d86..7b01069437d9 100644
--- a/pkgs/by-name/ef/efficient-compression-tool/package.nix
+++ b/pkgs/by-name/ef/efficient-compression-tool/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fhanau";
     repo = "Efficient-Compression-Tool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TSV5QXf6GuHAwQrde3Zo9MA1rtpAhtRg0UTzMkBnHB8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ef/effitask/package.nix b/pkgs/by-name/ef/effitask/package.nix
index 73bb0f4db3fe..636e39c75117 100644
--- a/pkgs/by-name/ef/effitask/package.nix
+++ b/pkgs/by-name/ef/effitask/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sanpii";
     repo = "effitask";
-    tag = version;
+    rev = version;
     sha256 = "sha256-6BA/TCCqVh5rtgGkUgk8nIqUzozipC5rrkbXMDWYpdQ=";
   };
 
diff --git a/pkgs/by-name/ef/efivar/package.nix b/pkgs/by-name/ef/efivar/package.nix
index c51f9d702729..40a964bfc72c 100644
--- a/pkgs/by-name/ef/efivar/package.nix
+++ b/pkgs/by-name/ef/efivar/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rhboot";
     repo = "efivar";
-    tag = version;
+    rev = version;
     hash = "sha256-s/1k5a3n33iLmSpKQT5u08xoj8ypjf2Vzln88OBrqf0=";
   };
 
diff --git a/pkgs/by-name/ef/efm-langserver/package.nix b/pkgs/by-name/ef/efm-langserver/package.nix
index 93a3396b5315..d87544198d27 100644
--- a/pkgs/by-name/ef/efm-langserver/package.nix
+++ b/pkgs/by-name/ef/efm-langserver/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "efm-langserver";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3ZrWc8/4aC5TOoL9vybkMZC9HkIL43TokebFcJYyrcI=";
   };
 
diff --git a/pkgs/by-name/ef/efmt/package.nix b/pkgs/by-name/ef/efmt/package.nix
index 615ac8c3024c..4210168ee020 100644
--- a/pkgs/by-name/ef/efmt/package.nix
+++ b/pkgs/by-name/ef/efmt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sile";
     repo = "efmt";
-    tag = version;
+    rev = version;
     hash = "sha256-l+DiOMUTEF6btsgkfgDtY45fH6GyqKBqHjuTfCF/ybA=";
   };
 
diff --git a/pkgs/by-name/eg/eg25-manager/package.nix b/pkgs/by-name/eg/eg25-manager/package.nix
index 405d9fa36161..f76b07173fc9 100644
--- a/pkgs/by-name/eg/eg25-manager/package.nix
+++ b/pkgs/by-name/eg/eg25-manager/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "mobian1";
     repo = "eg25-manager";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Zna+JplmYrxPYsXToJ3vKOPzPMZYB3bEdfT8GIAHATs=";
   };
 
diff --git a/pkgs/by-name/eg/eget/package.nix b/pkgs/by-name/eg/eget/package.nix
index 09dcf3557b56..401795ba0e4f 100644
--- a/pkgs/by-name/eg/eget/package.nix
+++ b/pkgs/by-name/eg/eget/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zyedidia";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jhVUYyp6t5LleVotQQme07IJVdVnIOVFFtKEmzt8e2k=";
   };
 
diff --git a/pkgs/by-name/eg/egglog/package.nix b/pkgs/by-name/eg/egglog/package.nix
index 85d5df3d9abc..1a46064ac5bd 100644
--- a/pkgs/by-name/eg/egglog/package.nix
+++ b/pkgs/by-name/eg/egglog/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "egraphs-good";
     repo = "egglog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j+3qknmezKqHVxvfmG9oPFtWOzJsimGXYe5PWX694mI=";
   };
 
diff --git a/pkgs/by-name/eg/egl-wayland/package.nix b/pkgs/by-name/eg/egl-wayland/package.nix
index e9ca994cf333..2756fdc2ceb9 100644
--- a/pkgs/by-name/eg/egl-wayland/package.nix
+++ b/pkgs/by-name/eg/egl-wayland/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nvidia";
     repo = "egl-wayland";
-    tag = version;
+    rev = version;
     hash = "sha256-Vu0XPcFKQJ+nypNMX1tw17whVWceZ0YlqvEEmEbTQaU=";
   };
 
diff --git a/pkgs/by-name/eg/eglexternalplatform/package.nix b/pkgs/by-name/eg/eglexternalplatform/package.nix
index 795d1b214336..d07a0c48a017 100644
--- a/pkgs/by-name/eg/eglexternalplatform/package.nix
+++ b/pkgs/by-name/eg/eglexternalplatform/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nvidia";
     repo = "eglexternalplatform";
-    tag = version;
+    rev = version;
     hash = "sha256-tDKh1oSnOSG/XztHHYCwg1tDB7M6olOtJ8te+uan9ko=";
   };
 
diff --git a/pkgs/by-name/eg/ego/package.nix b/pkgs/by-name/eg/ego/package.nix
index b61eb33ba71c..f9fd2574c322 100644
--- a/pkgs/by-name/eg/ego/package.nix
+++ b/pkgs/by-name/eg/ego/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "intgr";
     repo = "ego";
-    tag = version;
+    rev = version;
     hash = "sha256-613RM7Ldye0wHAH3VMhzhyT5WVTybph3gS/WNMrsgGI=";
   };
 
diff --git a/pkgs/by-name/ei/eiciel/package.nix b/pkgs/by-name/ei/eiciel/package.nix
index 628cc2d79e2b..0866b0070c32 100644
--- a/pkgs/by-name/ei/eiciel/package.nix
+++ b/pkgs/by-name/ei/eiciel/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rofirrim";
     repo = "eiciel";
-    tag = version;
+    rev = version;
     sha256 = "sha256-gpuxx1Ts9HCO+3C+Z3k1tVA+1Mip8/Bd+FvWisVdsVY=";
   };
 
diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix
index 534a361dbd05..31582364cbeb 100644
--- a/pkgs/by-name/ei/eigenlayer/package.nix
+++ b/pkgs/by-name/ei/eigenlayer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Layr-Labs";
     repo = "eigenlayer-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5JOI1JBHiM9gPuBQv/7lWtfpAEdPLueVaSDnN8G4llA=";
   };
 
diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix
index 1846f50301e2..91c06efbb0d1 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";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-rmkXR4RZbtD6lh8cGrHLWVGTw4fQqP9+Z9qaftG1ld0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ej/ejs/package.nix b/pkgs/by-name/ej/ejs/package.nix
index c53c8b21e6d8..90934f9002ec 100644
--- a/pkgs/by-name/ej/ejs/package.nix
+++ b/pkgs/by-name/ej/ejs/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "mde";
     repo = "ejs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3Rq+7oiYJlIY7sGPasx728sz2zj0ndAvKpHGsQX4tlc=";
   };
 
diff --git a/pkgs/by-name/ej/ejson/package.nix b/pkgs/by-name/ej/ejson/package.nix
index 4329ffdc202b..90553d5aec95 100644
--- a/pkgs/by-name/ej/ejson/package.nix
+++ b/pkgs/by-name/ej/ejson/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "ejson";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-s/VeBajNZI0XNs1PwWMpHAF0Wrh1/ZQUvUZBnUCoPBM=";
   };
 
diff --git a/pkgs/by-name/ej/ejson2env/package.nix b/pkgs/by-name/ej/ejson2env/package.nix
index f806dd862c58..9e34d3ea335c 100644
--- a/pkgs/by-name/ej/ejson2env/package.nix
+++ b/pkgs/by-name/ej/ejson2env/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9i84nHIuAR7PG6/v8O5GEi6xToJk0c+knpVPOPx+1b8=";
   };
 
diff --git a/pkgs/by-name/ej/ejsonkms/package.nix b/pkgs/by-name/ej/ejsonkms/package.nix
index 9f128c1b1be7..5a2f549fc85d 100644
--- a/pkgs/by-name/ej/ejsonkms/package.nix
+++ b/pkgs/by-name/ej/ejsonkms/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "envato";
     repo = "ejsonkms";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kk/+EOZ1g6SiIajcKXf6lVnll/NRWgwbFO2j07HERBI=";
   };
 
diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index 13e40d0a29ab..f0f14cadd358 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-USWeMzJ1k+sJx2p3FzFhbO48m61WUuCvp7Juwa9jtus=";
   };
 
diff --git a/pkgs/by-name/el/elan/package.nix b/pkgs/by-name/el/elan/package.nix
index 8aa6434554a2..db820df47826 100644
--- a/pkgs/by-name/el/elan/package.nix
+++ b/pkgs/by-name/el/elan/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "leanprover";
     repo = "elan";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6/5yIIO0Avf6YpD7+7B30bnwtcPXi2k4RqWFO8hBaII=";
   };
 
diff --git a/pkgs/by-name/el/elektroid/package.nix b/pkgs/by-name/el/elektroid/package.nix
index da3bd78a405f..cc4f8202ba04 100644
--- a/pkgs/by-name/el/elektroid/package.nix
+++ b/pkgs/by-name/el/elektroid/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "dagargo";
     repo = "elektroid";
-    tag = version;
+    rev = version;
     hash = "sha256-YJcvJlnRUhwjQ6P3jgjyDtoJhuije1uY77mGNGZure0=";
   };
 
diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix
index 32516b7558ae..a6548b041c25 100644
--- a/pkgs/by-name/el/element-desktop/keytar/default.nix
+++ b/pkgs/by-name/el/element-desktop/keytar/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shiftkey";
     repo = "node-keytar";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = pinData.srcHash;
   };
 
diff --git a/pkgs/by-name/el/element-desktop/seshat/default.nix b/pkgs/by-name/el/element-desktop/seshat/default.nix
index 00fdc97d3cf3..cafc33f1eaf8 100644
--- a/pkgs/by-name/el/element-desktop/seshat/default.nix
+++ b/pkgs/by-name/el/element-desktop/seshat/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "seshat";
-    tag = version;
+    rev = version;
     hash = pinData.srcHash;
   };
 
diff --git a/pkgs/by-name/el/element/package.nix b/pkgs/by-name/el/element/package.nix
index ea5e14d1b87d..1645db9ce4ff 100644
--- a/pkgs/by-name/el/element/package.nix
+++ b/pkgs/by-name/el/element/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-06RDZnie0Lv7i95AwnBGl6PPucuj8pIT6DHW3e3mu1o=";
   };
 
diff --git a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix
index 5555406204fc..d798058ac647 100644
--- a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix
+++ b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "elementary-xfce";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ncPL76HCC9n4wTciGeqb+YAUcCE9EeOpWGM5DRYUCYg=";
   };
 
diff --git a/pkgs/by-name/el/elf-info/package.nix b/pkgs/by-name/el/elf-info/package.nix
index e67c66f670f9..776a386483f6 100644
--- a/pkgs/by-name/el/elf-info/package.nix
+++ b/pkgs/by-name/el/elf-info/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kevin-lesenechal";
     repo = "elf-info";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wbFVuoarOoxV9FqmuHJ9eZlG4rRqy1rsnuqbGorC2Rk=";
   };
 
diff --git a/pkgs/by-name/el/elf2nucleus/package.nix b/pkgs/by-name/el/elf2nucleus/package.nix
index 9b79da5a17e2..d7387ee55958 100644
--- a/pkgs/by-name/el/elf2nucleus/package.nix
+++ b/pkgs/by-name/el/elf2nucleus/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "elf2nucleus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FAIOtGfGow+0DrPPEBEfvaiinNZLQlGWKJ4DkMj63OA=";
   };
 
diff --git a/pkgs/by-name/el/elfcat/package.nix b/pkgs/by-name/el/elfcat/package.nix
index 0ce2a94190fd..b0c5dc1265e4 100644
--- a/pkgs/by-name/el/elfcat/package.nix
+++ b/pkgs/by-name/el/elfcat/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ruslashev";
     repo = "elfcat";
-    tag = version;
+    rev = version;
     sha256 = "sha256-lmoOwxRGXcInoFb2YDawLKaebkcUftzpPZ1iTXbl++c=";
   };
 
diff --git a/pkgs/by-name/el/elfinfo/package.nix b/pkgs/by-name/el/elfinfo/package.nix
index 8d09b41b1b7f..7f34cccaa11b 100644
--- a/pkgs/by-name/el/elfinfo/package.nix
+++ b/pkgs/by-name/el/elfinfo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "elfinfo";
-    tag = version;
+    rev = version;
     sha256 = "sha256-HnjHOjanStqmDXnc6Z9w0beCMJFf/ndWbYxoDEaOws4=";
   };
 
diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix
index 28232b9a74d2..c5a1475eaaae 100644
--- a/pkgs/by-name/el/ell/package.nix
+++ b/pkgs/by-name/el/ell/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
-    tag = version;
+    rev = version;
     hash = "sha256-nbfWjV0zPPx2kcnD/aRaWSXUGIqrUX7Z4U45ASk5Ric=";
   };
 
diff --git a/pkgs/by-name/el/elm-land/package.nix b/pkgs/by-name/el/elm-land/package.nix
index a98da2a2cc59..efd66003ec97 100644
--- a/pkgs/by-name/el/elm-land/package.nix
+++ b/pkgs/by-name/el/elm-land/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "elm-land";
     repo = "elm-land";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PFyiVTH2Cek377YZwaCmvDToQCaxWQvJrQkRhyNI2Wg=";
   };
 
diff --git a/pkgs/by-name/el/elogind/package.nix b/pkgs/by-name/el/elogind/package.nix
index a906217d096e..ed9345d5fbf7 100644
--- a/pkgs/by-name/el/elogind/package.nix
+++ b/pkgs/by-name/el/elogind/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elogind";
     repo = "elogind";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4KZr/NiiGVwzdDROhiX3GEQTUyIGva6ezb+xC2U3bkg=";
   };
 
diff --git a/pkgs/by-name/el/eludris/package.nix b/pkgs/by-name/el/eludris/package.nix
index 57eacb3a1b9e..f91938cb3ccd 100644
--- a/pkgs/by-name/el/eludris/package.nix
+++ b/pkgs/by-name/el/eludris/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "eludris";
     repo = "eludris";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TVYgimkGUSITB3IaMlMd10PWomqyJRvONvJwiW85U4M=";
   };
 
diff --git a/pkgs/by-name/el/elvish/package.nix b/pkgs/by-name/el/elvish/package.nix
index b1506f715f1f..b321018b3c31 100644
--- a/pkgs/by-name/el/elvish/package.nix
+++ b/pkgs/by-name/el/elvish/package.nix
@@ -15,7 +15,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "elves";
     repo = "elvish";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+qkr0ziHWs3MVhBoqAxrwwbsQVvmGHRKrlqiujqBKvs=";
   };
 
diff --git a/pkgs/by-name/em/emacs-lsp-booster/package.nix b/pkgs/by-name/em/emacs-lsp-booster/package.nix
index 635d9d7d212a..f81a4fcfc8c2 100644
--- a/pkgs/by-name/em/emacs-lsp-booster/package.nix
+++ b/pkgs/by-name/em/emacs-lsp-booster/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "blahgeek";
     repo = "emacs-lsp-booster";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uP/xJfXQtk8oaG5Zk+dw+C2fVFdjpUZTDASFuj1+eYs=";
   };
 
diff --git a/pkgs/by-name/em/emacspeak/package.nix b/pkgs/by-name/em/emacspeak/package.nix
index 0797b4722b71..6be5907fe188 100644
--- a/pkgs/by-name/em/emacspeak/package.nix
+++ b/pkgs/by-name/em/emacspeak/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tvraman";
     repo = "emacspeak";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-npS/wlqI7nBde/2S/rzp79jdfYXIIhgsVs5VizxEDAQ=";
   };
 
diff --git a/pkgs/by-name/em/emmet-ls/package.nix b/pkgs/by-name/em/emmet-ls/package.nix
index 7cd04b10ee52..fa988b483e71 100644
--- a/pkgs/by-name/em/emmet-ls/package.nix
+++ b/pkgs/by-name/em/emmet-ls/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "aca";
     repo = "emmet-ls";
-    tag = version;
+    rev = version;
     hash = "sha256-TmsJpVLF9FZf/6uOM9LZBKC6S3bMPjA3QMiRMPaY9Dg=";
   };
 
diff --git a/pkgs/by-name/em/emoji-picker/package.nix b/pkgs/by-name/em/emoji-picker/package.nix
index 42e21831ad06..76a5c8edda73 100644
--- a/pkgs/by-name/em/emoji-picker/package.nix
+++ b/pkgs/by-name/em/emoji-picker/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bcongdon";
     repo = "ep";
-    tag = version;
+    rev = version;
     hash = "sha256-ElUsmuJ43kOsu4cGvNytM+xHTfuzMo0jcG8Z1cIeHJs=";
   };
 
diff --git a/pkgs/by-name/em/emojify/package.nix b/pkgs/by-name/em/emojify/package.nix
index 69045b04ff62..f812a206920a 100644
--- a/pkgs/by-name/em/emojify/package.nix
+++ b/pkgs/by-name/em/emojify/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mrowa44";
     repo = "emojify";
-    tag = version;
+    rev = version;
     hash = "sha256-6cV+S8wTqJxPGsxiJ3hP6/CYPMWdF3qnz4ddL+F/oJU=";
   };
 
diff --git a/pkgs/by-name/em/emote/package.nix b/pkgs/by-name/em/emote/package.nix
index 8ac75fc0d2f8..1854bc1b1bcc 100644
--- a/pkgs/by-name/em/emote/package.nix
+++ b/pkgs/by-name/em/emote/package.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tom-james-watson";
     repo = "Emote";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-c5EY1Cc3oD8EG1oTChbl10jJlNeAETQbAFGoA9Lw5PY=";
   };
 
diff --git a/pkgs/by-name/em/emptty/package.nix b/pkgs/by-name/em/emptty/package.nix
index 6c935791bf82..c87ea85fe6b2 100644
--- a/pkgs/by-name/em/emptty/package.nix
+++ b/pkgs/by-name/em/emptty/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tvrzna";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xZfR4sn20fDaTNAxuxVflpr+8AFg5Z7vesO7P8Jxw6A=";
   };
 
diff --git a/pkgs/by-name/em/emulsion-palette/package.nix b/pkgs/by-name/em/emulsion-palette/package.nix
index d64840f53252..a55fde901ff6 100644
--- a/pkgs/by-name/em/emulsion-palette/package.nix
+++ b/pkgs/by-name/em/emulsion-palette/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = "emulsion";
-    tag = version;
+    rev = version;
     sha256 = "sha256-xG7yZKbbNao/pzFhdTMof/lw9K12NKZi47YRaEd65ok=";
   };
 
diff --git a/pkgs/by-name/en/enc/package.nix b/pkgs/by-name/en/enc/package.nix
index 9318f6bd8771..eab08379eb98 100644
--- a/pkgs/by-name/en/enc/package.nix
+++ b/pkgs/by-name/en/enc/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "life4";
     repo = "enc";
-    tag = version;
+    rev = version;
     hash = "sha256-6CUSJCE37R6nypqxTEs4tk/Eqg7+ZNGKPit38Zz3r84=";
   };
 
diff --git a/pkgs/by-name/en/enchive/package.nix b/pkgs/by-name/en/enchive/package.nix
index 5bb683f2028a..51f7113b09dd 100644
--- a/pkgs/by-name/en/enchive/package.nix
+++ b/pkgs/by-name/en/enchive/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skeeto";
     repo = "enchive";
-    tag = version;
+    rev = version;
     sha256 = "0fdrfc5l42lj2bvmv9dmkmhmm7qiszwk7cmdvnqad3fs7652g0qa";
   };
 
diff --git a/pkgs/by-name/en/encpipe/package.nix b/pkgs/by-name/en/encpipe/package.nix
index a36ae92e953f..6d9f09b9c74f 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";
-    tag = version;
+    rev = version;
     hash = "sha256-YlEKSWzZuQyDi0mbwJh9Dfn4gKiOeqihSHPt4yY6YdY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/en/endgame-singularity/package.nix b/pkgs/by-name/en/endgame-singularity/package.nix
index 8c85558439c4..38b8a4fcab45 100644
--- a/pkgs/by-name/en/endgame-singularity/package.nix
+++ b/pkgs/by-name/en/endgame-singularity/package.nix
@@ -14,7 +14,7 @@ let
   main_src = fetchFromGitHub {
     owner = "singularity";
     repo = "singularity";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl";
   };
 
diff --git a/pkgs/by-name/en/endlessh-go/package.nix b/pkgs/by-name/en/endlessh-go/package.nix
index 2b1327fa113b..59ef7f8b973d 100644
--- a/pkgs/by-name/en/endlessh-go/package.nix
+++ b/pkgs/by-name/en/endlessh-go/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shizunge";
     repo = "endlessh-go";
-    tag = version;
+    rev = version;
     hash = "sha256-CLmlcuRb5dt1oPNdBfx0ql1Zmn/HahcmhVA0k50i6yA=";
   };
 
diff --git a/pkgs/by-name/en/endlessh/package.nix b/pkgs/by-name/en/endlessh/package.nix
index 78f9211031f7..6a95fe42d23b 100644
--- a/pkgs/by-name/en/endlessh/package.nix
+++ b/pkgs/by-name/en/endlessh/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skeeto";
     repo = "endlessh";
-    tag = version;
+    rev = version;
     hash = "sha256-yHQzDrjZycDL/2oSQCJjxbZQJ30FoixVG1dnFyTKPH4=";
   };
 
diff --git a/pkgs/by-name/en/endlines/package.nix b/pkgs/by-name/en/endlines/package.nix
index 40985cd39267..b03a0d733535 100644
--- a/pkgs/by-name/en/endlines/package.nix
+++ b/pkgs/by-name/en/endlines/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mdolidon";
     repo = "endlines";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-M0IyY/WXR8qv9/qx5G0pG3EKqMoZAP3fJTZ6sSSMMyQ=";
   };
 
diff --git a/pkgs/by-name/en/enjarify/package.nix b/pkgs/by-name/en/enjarify/package.nix
index a5fc914a5b7c..743daf548346 100644
--- a/pkgs/by-name/en/enjarify/package.nix
+++ b/pkgs/by-name/en/enjarify/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "enjarify";
-    tag = version;
+    rev = version;
     sha256 = "sha256-VDBC5n2jWLNJsilX+PV1smL5JeBDj23jYFRwdObXwYs=";
   };
 
diff --git a/pkgs/by-name/en/enkei/package.nix b/pkgs/by-name/en/enkei/package.nix
index 75728a1a8cec..c6a7fd761164 100644
--- a/pkgs/by-name/en/enkei/package.nix
+++ b/pkgs/by-name/en/enkei/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fia0";
     repo = "enkei";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-COU2JtiJcPRA3Jno0qLEIVgimYBWfn5Pgc1OMImsJtI=";
   };
 
diff --git a/pkgs/by-name/en/ent-go/package.nix b/pkgs/by-name/en/ent-go/package.nix
index 3c8d06593715..91991af8ec2e 100644
--- a/pkgs/by-name/en/ent-go/package.nix
+++ b/pkgs/by-name/en/ent-go/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ent";
     repo = "ent";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rKGzYOdNaSbFyHIuytuppYjpiTz1/tcvXel1SjtwEhA=";
   };
 
diff --git a/pkgs/by-name/en/entropy/package.nix b/pkgs/by-name/en/entropy/package.nix
index 0b8db154b5ab..8d2315b565ad 100644
--- a/pkgs/by-name/en/entropy/package.nix
+++ b/pkgs/by-name/en/entropy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "EwenQuim";
     repo = "entropy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Wj+WSJ2dt4mE0yoMSYIQVNVklBxaTXwP2XND4+76VCI=";
   };
 
diff --git a/pkgs/by-name/en/entt/package.nix b/pkgs/by-name/en/entt/package.nix
index 0c5270d8d89c..c871e15d0469 100644
--- a/pkgs/by-name/en/entt/package.nix
+++ b/pkgs/by-name/en/entt/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skypjack";
     repo = "entt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IPAM7fr/tvSOMKWUbXbloNAnlp5t7J0ynSsTMZ2jKYs=";
   };
 
diff --git a/pkgs/by-name/en/entwine/package.nix b/pkgs/by-name/en/entwine/package.nix
index 2c092aeae8e0..6331900b107c 100644
--- a/pkgs/by-name/en/entwine/package.nix
+++ b/pkgs/by-name/en/entwine/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "connormanning";
     repo = "entwine";
-    tag = version;
+    rev = version;
     sha256 = "sha256-1dy5NafKX0E4MwFIggnr7bQIeB1KvqnNaQQUUAs6Bq8=";
   };
 
diff --git a/pkgs/by-name/en/enum4linux/package.nix b/pkgs/by-name/en/enum4linux/package.nix
index dcccd00b3921..524bb58d436f 100644
--- a/pkgs/by-name/en/enum4linux/package.nix
+++ b/pkgs/by-name/en/enum4linux/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CiscoCXSecurity";
     repo = "enum4linux";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/R0P4Ft9Y0LZwKwhDGAe36UKviih6CNbJbj1lcNKEkM=";
   };
 
diff --git a/pkgs/by-name/en/envconsul/package.nix b/pkgs/by-name/en/envconsul/package.nix
index 17fed9b0c87d..a7144c07e7a1 100644
--- a/pkgs/by-name/en/envconsul/package.nix
+++ b/pkgs/by-name/en/envconsul/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "envconsul";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hPq+r4DOMu2elOpaT0xDQoelUb1D/zYM/a6fZZdu/AY=";
   };
 
diff --git a/pkgs/by-name/en/envfs/package.nix b/pkgs/by-name/en/envfs/package.nix
index 486b0a2e4496..6dd4a3472547 100644
--- a/pkgs/by-name/en/envfs/package.nix
+++ b/pkgs/by-name/en/envfs/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "envfs";
-    tag = version;
+    rev = version;
     hash = "sha256-kOfnKguvJQHW/AfQOetxVefjoEj7ec5ew6fumhOwP08=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix
index be10fe499243..d54fb62c911c 100644
--- a/pkgs/by-name/en/envio/package.nix
+++ b/pkgs/by-name/en/envio/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "envio-cli";
     repo = "envio";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-je0DBoBIayFK//Aija5bnO/2z+hxNWgVkwOgxMyq5s4=";
   };
 
diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix
index eb43ca9d5845..25e8ddf3dbe3 100644
--- a/pkgs/by-name/en/envision-unwrapped/package.nix
+++ b/pkgs/by-name/en/envision-unwrapped/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "gabmus";
     repo = "envision";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-J1zctfFOyu+uLpctTiAe5OWBM7nXanzQocTGs1ToUMA=";
   };
 
diff --git a/pkgs/by-name/en/envsubst/package.nix b/pkgs/by-name/en/envsubst/package.nix
index e272c49614e1..d439da5e3437 100644
--- a/pkgs/by-name/en/envsubst/package.nix
+++ b/pkgs/by-name/en/envsubst/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "a8m";
     repo = "envsubst";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eByxrLf/F8Ih8v+0TunghF4m42TLPeRRFnqN3Ib6e14=";
   };
 
diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index 3c3b708cb830..7155cda71398 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -12,7 +12,7 @@ llvmPackages.stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Yyn0yWcOWb379rzaA+KW0KiLVg0nbIwJJQ8NhQAsuN8=";
   };
 
diff --git a/pkgs/by-name/ep/epeg/package.nix b/pkgs/by-name/ep/epeg/package.nix
index 8c74cc340c1d..6f02069ab731 100644
--- a/pkgs/by-name/ep/epeg/package.nix
+++ b/pkgs/by-name/ep/epeg/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mattes";
     repo = "epeg";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lttqarR8gScNIlSrc5uU3FLfvwxxJ2A1S4oESUW7oIw=";
   };
 
diff --git a/pkgs/by-name/ep/epgstation/package.nix b/pkgs/by-name/ep/epgstation/package.nix
index e4e3ca55e2d1..5d71ece6e0cc 100644
--- a/pkgs/by-name/ep/epgstation/package.nix
+++ b/pkgs/by-name/ep/epgstation/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "l3tnun";
     repo = "EPGStation";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig=";
   };
 
diff --git a/pkgs/by-name/ep/ephemeral/package.nix b/pkgs/by-name/ep/ephemeral/package.nix
index d65d6eba23da..2d755b3ee371 100644
--- a/pkgs/by-name/ep/ephemeral/package.nix
+++ b/pkgs/by-name/ep/ephemeral/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ephemeral";
-    tag = version;
+    rev = version;
     sha256 = "sha256-07HO8nC2Pwz2EAea4ZzmqyMfQdgX8FVqDepdA6j/NT8=";
   };
 
diff --git a/pkgs/by-name/ep/epilys-bb/package.nix b/pkgs/by-name/ep/epilys-bb/package.nix
index 13eb1cf9d8bd..3fb42e80a170 100644
--- a/pkgs/by-name/ep/epilys-bb/package.nix
+++ b/pkgs/by-name/ep/epilys-bb/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "epilys";
     repo = "bb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-szeEBiolg2rVD2XZoNrncUYnA8KPhWwhQPYsjuxp904=";
   };
 
diff --git a/pkgs/by-name/ep/epm/package.nix b/pkgs/by-name/ep/epm/package.nix
index 0f4246a473eb..0d3e05c6c781 100644
--- a/pkgs/by-name/ep/epm/package.nix
+++ b/pkgs/by-name/ep/epm/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jimjag";
     repo = "epm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o4B5lWBeve+U70FDgF1DrtNrXxaEY4etkPpwbqF7fmc=";
   };
 
diff --git a/pkgs/by-name/ep/epr/package.nix b/pkgs/by-name/ep/epr/package.nix
index a8b6937d85d8..0cdda2e45535 100644
--- a/pkgs/by-name/ep/epr/package.nix
+++ b/pkgs/by-name/ep/epr/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "wustho";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1qsqYlqGlCRhl7HINrcTDt5bGlb7g5PmaERylT+UvEg=";
   };
 
diff --git a/pkgs/by-name/er/er-patcher/package.nix b/pkgs/by-name/er/er-patcher/package.nix
index 6d57794f84ab..e9d3c56a1c04 100644
--- a/pkgs/by-name/er/er-patcher/package.nix
+++ b/pkgs/by-name/er/er-patcher/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gurrgur";
     repo = "er-patcher";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-D+XYZI3kmK5sb+i8RxtODTvbTgzhpDzwB/JM61ddcTA=";
   };
 
diff --git a/pkgs/by-name/er/erdtree/package.nix b/pkgs/by-name/er/erdtree/package.nix
index 6b4f5d600fee..685ebdad70e9 100644
--- a/pkgs/by-name/er/erdtree/package.nix
+++ b/pkgs/by-name/er/erdtree/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "solidiquis";
     repo = "erdtree";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rm3j1exvdlJtMXgFeRmzr3YU/sLpQFL3PCa8kLVlinM=";
   };
 
diff --git a/pkgs/by-name/er/eresi/package.nix b/pkgs/by-name/er/eresi/package.nix
index 0cb76a2e79b4..817cd76ef664 100644
--- a/pkgs/by-name/er/eresi/package.nix
+++ b/pkgs/by-name/er/eresi/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thorkill";
     repo = "eresi";
-    tag = version;
+    rev = version;
     sha256 = "0a5a7mh2zw9lcdrl8n1mqccrc0xcgj7743l7l4kslkh722fxv625";
   };
 
diff --git a/pkgs/by-name/er/erg/package.nix b/pkgs/by-name/er/erg/package.nix
index 37ae53e67612..0c3b0e3836d3 100644
--- a/pkgs/by-name/er/erg/package.nix
+++ b/pkgs/by-name/er/erg/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "erg-lang";
     repo = "erg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P59PUdwSGZHiQltyMhL683pt8mM96cDko9zfaep9lYU=";
   };
 
diff --git a/pkgs/by-name/er/ergochat/package.nix b/pkgs/by-name/er/ergochat/package.nix
index 51c24f215449..3a0de73fdf32 100644
--- a/pkgs/by-name/er/ergochat/package.nix
+++ b/pkgs/by-name/er/ergochat/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ergochat";
     repo = "ergo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8qZ5pnbCYN/j8B5cS456HVK2hDGqJwrPo1k4oagJrqU=";
   };
 
diff --git a/pkgs/by-name/er/ericw-tools/package.nix b/pkgs/by-name/er/ericw-tools/package.nix
index d4b5e82f1c88..dba4b02f9de7 100644
--- a/pkgs/by-name/er/ericw-tools/package.nix
+++ b/pkgs/by-name/er/ericw-tools/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ericwa";
     repo = "ericw-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "11sap7qv0rlhw8q25azvhgjcwiql3zam09q0gim3i04cg6fkh0vp";
   };
   postUnpack = ''
diff --git a/pkgs/by-name/er/erigon/package.nix b/pkgs/by-name/er/erigon/package.nix
index 7f8ab5a5caf3..afc0879a9631 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 = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-63wh9D5D9qzABEvKCBxBRHYuGBnlX+hrme56STkyoQU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/er/eris-go/package.nix b/pkgs/by-name/er/eris-go/package.nix
index 7c4d369af8fb..10c1444b79ae 100644
--- a/pkgs/by-name/er/eris-go/package.nix
+++ b/pkgs/by-name/er/eris-go/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
     domain = "codeberg.org";
     owner = "eris";
     repo = "eris-go";
-    tag = version;
+    rev = version;
     hash = "sha256-v4pN+fVwYoir3GLneWhg/azsg7ifvcKAksoqDkkQGwk=";
   };
 
diff --git a/pkgs/by-name/er/errbot/package.nix b/pkgs/by-name/er/errbot/package.nix
index 0f24494ba3a4..8ff4c4cf431a 100644
--- a/pkgs/by-name/er/errbot/package.nix
+++ b/pkgs/by-name/er/errbot/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "errbotio";
     repo = "errbot";
-    tag = version;
+    rev = version;
     hash = "sha256-UdqzBrlcb9NkuVo8ChADJmaKevadoGLyZUrckStb5ko=";
   };
 
diff --git a/pkgs/by-name/er/errcheck/package.nix b/pkgs/by-name/er/errcheck/package.nix
index 005665607a27..fd0a880cce74 100644
--- a/pkgs/by-name/er/errcheck/package.nix
+++ b/pkgs/by-name/er/errcheck/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kisielk";
     repo = "errcheck";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DhOoJL4InJHl4ImIrhV086a++srC5E4LF2VQb838+L8=";
   };
 
diff --git a/pkgs/by-name/es/esbuild-config/package.nix b/pkgs/by-name/es/esbuild-config/package.nix
index 2fd26d4aa08d..2edcf890a7af 100644
--- a/pkgs/by-name/es/esbuild-config/package.nix
+++ b/pkgs/by-name/es/esbuild-config/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bpierre";
     repo = "esbuild-config";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-u3LgecKfgPSN5xMyqBjeAn4/XswM3iEGbZ+JGrVF1Co=";
   };
 
diff --git a/pkgs/by-name/es/escambo/package.nix b/pkgs/by-name/es/escambo/package.nix
index f45dd11d58fb..24341716dd78 100644
--- a/pkgs/by-name/es/escambo/package.nix
+++ b/pkgs/by-name/es/escambo/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CleoMenezesJr";
     repo = "escambo";
-    tag = version;
+    rev = version;
     hash = "sha256-jMlix8nlCaVLZEhqzb6LRNrD3DUZMTIjqrRKo6nFbQA=";
   };
 
diff --git a/pkgs/by-name/es/esdm/package.nix b/pkgs/by-name/es/esdm/package.nix
index f1b8cc91137a..176bdf1a07fc 100644
--- a/pkgs/by-name/es/esdm/package.nix
+++ b/pkgs/by-name/es/esdm/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "esdm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5XctrI02pfCgK1P76AaSkMjiQqav6LX3SMjKr4F44sw=";
   };
 
diff --git a/pkgs/by-name/es/esh/package.nix b/pkgs/by-name/es/esh/package.nix
index 9358a40b0643..1dbd3ea54e27 100644
--- a/pkgs/by-name/es/esh/package.nix
+++ b/pkgs/by-name/es/esh/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jirutka";
     repo = "esh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ddaji5nplf1dyvgkrhqjy8m5djaycqcfhjv30yprj1avjymlj6w";
   };
 
diff --git a/pkgs/by-name/es/eslint_d/package.nix b/pkgs/by-name/es/eslint_d/package.nix
index 50f48a1b46d8..58d8f25d491a 100644
--- a/pkgs/by-name/es/eslint_d/package.nix
+++ b/pkgs/by-name/es/eslint_d/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mantoni";
     repo = "eslint_d.js";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Mu3dSgRIC2L9IImKixJfaUsltlajY0cYdXOSikNQuPo=";
   };
 
diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix
index 26ae2ffb0a40..b335ff256c18 100644
--- a/pkgs/by-name/es/esp-generate/package.nix
+++ b/pkgs/by-name/es/esp-generate/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "esp-generate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yk7iv5nq2b/1OY77818I7mXW96YxjwwJS3iiv1KXVHs=";
   };
 
diff --git a/pkgs/by-name/es/espeakup/package.nix b/pkgs/by-name/es/espeakup/package.nix
index 8c1e0258ca00..cf440d4b6d80 100644
--- a/pkgs/by-name/es/espeakup/package.nix
+++ b/pkgs/by-name/es/espeakup/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-speakup";
     repo = "espeakup";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Qjdg1kParsnpb8Lv51wXLdrLufxtbBTsP8B3t53islI=";
   };
 
diff --git a/pkgs/by-name/es/espresso/package.nix b/pkgs/by-name/es/espresso/package.nix
index 480825a07110..9e44a32cf0de 100644
--- a/pkgs/by-name/es/espresso/package.nix
+++ b/pkgs/by-name/es/espresso/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chipsalliance";
     repo = "espresso";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-z5By57VbmIt4sgRgvECnLbZklnDDWUA6fyvWVyXUzsI=";
   };
 
diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix
index 596ab5074921..cc0916d2f808 100644
--- a/pkgs/by-name/es/espup/package.nix
+++ b/pkgs/by-name/es/espup/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espup";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sPWGpQi9JrkdaPV2jvwaY9zjb8urK+ibhvxw/CC2UOQ=";
   };
 
diff --git a/pkgs/by-name/et/et/package.nix b/pkgs/by-name/et/et/package.nix
index 9510624fcd00..cc73253dd6ea 100644
--- a/pkgs/by-name/et/et/package.nix
+++ b/pkgs/by-name/et/et/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oxzi";
     repo = "et";
-    tag = version;
+    rev = version;
     sha256 = "0i0lgmnly8n7y4y6pb10pxgxyz8s5zk26k8z1g1578v1wan01lnq";
   };
 
diff --git a/pkgs/by-name/et/eternity/package.nix b/pkgs/by-name/et/eternity/package.nix
index 94f93d167746..0e04df9a5a7e 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";
-    tag = version;
+    rev = version;
     sha256 = "0dlz7axbiw003bgwk2hl43w8r2bwnxhi042i1xwdiwaja0cpnf5y";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/et/ethash/package.nix b/pkgs/by-name/et/ethash/package.nix
index bb9d22eb4287..d3338399f103 100644
--- a/pkgs/by-name/et/ethash/package.nix
+++ b/pkgs/by-name/et/ethash/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chfast";
     repo = "ethash";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sLa+lXC+UvqFEoC/ZfoRlotkNhUaqhLtDKHtbH2xa/k=";
   };
 
diff --git a/pkgs/by-name/et/etherguard/package.nix b/pkgs/by-name/et/etherguard/package.nix
index 320e0c3a3139..fc0d0d3b8dc1 100644
--- a/pkgs/by-name/et/etherguard/package.nix
+++ b/pkgs/by-name/et/etherguard/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "KusakabeShi";
     repo = "EtherGuard-VPN";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-67ocXHf+AN3nyPt4636ZJHGRqWSjkpTiDvU5243urBw=";
   };
 
diff --git a/pkgs/by-name/et/ets/package.nix b/pkgs/by-name/et/ets/package.nix
index 05f8c274f330..66ed5045dd61 100644
--- a/pkgs/by-name/et/ets/package.nix
+++ b/pkgs/by-name/et/ets/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gdubicki";
     repo = "ets";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LnNd4rAMJliWKbL4uVl11BAa9FPUcLwVSWnFe1vEk7g=";
   };
 
diff --git a/pkgs/by-name/et/ettercap/package.nix b/pkgs/by-name/et/ettercap/package.nix
index 40ac2a5760bf..29d558b35896 100644
--- a/pkgs/by-name/et/ettercap/package.nix
+++ b/pkgs/by-name/et/ettercap/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ettercap";
     repo = "ettercap";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1sdf1ssa81ib6k0mc5m2jzbjl4jd1yv6ahv5dwx2x9w4b2pyqg1c";
   };
 
diff --git a/pkgs/by-name/ev/evans/package.nix b/pkgs/by-name/ev/evans/package.nix
index 1133e061fb7d..8deac905eff6 100644
--- a/pkgs/by-name/ev/evans/package.nix
+++ b/pkgs/by-name/ev/evans/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ktr0731";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-V5M7vXlBSQFX2YZ+Vjt63hLziWy0yuAbCMmSZFEO0OA=";
   };
 
diff --git a/pkgs/by-name/ev/evebox/package.nix b/pkgs/by-name/ev/evebox/package.nix
index 4a296b18b563..1e01e425b73e 100644
--- a/pkgs/by-name/ev/evebox/package.nix
+++ b/pkgs/by-name/ev/evebox/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jasonish";
     repo = "evebox";
-    tag = version;
+    rev = version;
     hash = "sha256-vakCBDyL/Su55tkn/SJ5ShZcYC8l+p2acpve/fTN0uI=";
   };
 
diff --git a/pkgs/by-name/ev/evscript/package.nix b/pkgs/by-name/ev/evscript/package.nix
index 8306df43e517..0043bb0eb3c4 100644
--- a/pkgs/by-name/ev/evscript/package.nix
+++ b/pkgs/by-name/ev/evscript/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "valpackett";
     repo = "evscript";
-    tag = version;
+    rev = version;
     hash = "sha256-lCXDDLovUb5aSOPTyVJL25v1JT1BGrrUlUR0Mu0XX4Q=";
   };
 
diff --git a/pkgs/by-name/ev/evsieve/package.nix b/pkgs/by-name/ev/evsieve/package.nix
index 6d2b91f42a2a..ca2324cbfc7a 100644
--- a/pkgs/by-name/ev/evsieve/package.nix
+++ b/pkgs/by-name/ev/evsieve/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "KarsMulder";
     repo = "evsieve";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UV5m8DmFtkCU/DoBJNBCdvhU/jYtU5+WnnhKwxZNl9g=";
   };
 
diff --git a/pkgs/by-name/ex/exaile/package.nix b/pkgs/by-name/ex/exaile/package.nix
index 327199ea4793..8668a70dbed3 100644
--- a/pkgs/by-name/ex/exaile/package.nix
+++ b/pkgs/by-name/ex/exaile/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exaile";
     repo = "exaile";
-    tag = version;
+    rev = version;
     sha256 = "sha256-9SK0nvGdz2j6qp1JTmSuLezxX/kB93CZReSfAnfKZzg=";
   };
 
diff --git a/pkgs/by-name/ex/exfat/package.nix b/pkgs/by-name/ex/exfat/package.nix
index 70ab6db3c3b4..3d7d66648a40 100644
--- a/pkgs/by-name/ex/exfat/package.nix
+++ b/pkgs/by-name/ex/exfat/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "relan";
     repo = "exfat";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5m8fiItEOO6piR132Gxq6SHOPN1rAFTuTVE+UI0V00k=";
   };
 
diff --git a/pkgs/by-name/ex/exfatprogs/package.nix b/pkgs/by-name/ex/exfatprogs/package.nix
index 4ff3b8bb62e7..c0c14768eeac 100644
--- a/pkgs/by-name/ex/exfatprogs/package.nix
+++ b/pkgs/by-name/ex/exfatprogs/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exfatprogs";
     repo = "exfatprogs";
-    tag = version;
+    rev = version;
     sha256 = "sha256-lPPUjSc6ti/CqSChWrsBLWCtASN95Cnj+O6FbVvFeDA=";
   };
 
diff --git a/pkgs/by-name/ex/exhaustive/package.nix b/pkgs/by-name/ex/exhaustive/package.nix
index c4ebe1923fad..d322c54b1f8e 100644
--- a/pkgs/by-name/ex/exhaustive/package.nix
+++ b/pkgs/by-name/ex/exhaustive/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nishanths";
     repo = "exhaustive";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OLIdtKzCqnBkzdUSIl+UlENeMl3zrBE47pLWPg+6qXw=";
   };
 
diff --git a/pkgs/by-name/ex/exhibit/package.nix b/pkgs/by-name/ex/exhibit/package.nix
index 757500740ec1..73fe81102632 100644
--- a/pkgs/by-name/ex/exhibit/package.nix
+++ b/pkgs/by-name/ex/exhibit/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Nokse22";
     repo = "Exhibit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yNS6q7XbWda2+so9QRS/c4uYaVPo7b4JCite5nzc3Eo=";
   };
 
diff --git a/pkgs/by-name/ex/exiflooter/package.nix b/pkgs/by-name/ex/exiflooter/package.nix
index 3ad0aec78074..68eb8d9cab4f 100644
--- a/pkgs/by-name/ex/exiflooter/package.nix
+++ b/pkgs/by-name/ex/exiflooter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aydinnyunus";
     repo = "exiflooter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-E7fxV+w8N9xi8UuaKBTZBzPjIHJt9/U+oVIu2+Ond+Y=";
   };
 
diff --git a/pkgs/by-name/ex/exiv2/package.nix b/pkgs/by-name/ex/exiv2/package.nix
index 9183340f0363..f86a8cacab9d 100644
--- a/pkgs/by-name/ex/exiv2/package.nix
+++ b/pkgs/by-name/ex/exiv2/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exiv2";
     repo = "exiv2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+Fe0+wkWWtM3MNgY6qp34/kC8jkOjOLusnd9WquYpA8=";
   };
 
diff --git a/pkgs/by-name/ex/exoscale-cli/package.nix b/pkgs/by-name/ex/exoscale-cli/package.nix
index c670e01f3fda..f5370d1d1ab9 100644
--- a/pkgs/by-name/ex/exoscale-cli/package.nix
+++ b/pkgs/by-name/ex/exoscale-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "exoscale";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PO6LIp5eortBEygdIRf2LpPJalSEMGosW8KtqBV/MlM=";
   };
 
diff --git a/pkgs/by-name/ex/expected-lite/package.nix b/pkgs/by-name/ex/expected-lite/package.nix
index 821dad4397a8..80e94ff8815d 100644
--- a/pkgs/by-name/ex/expected-lite/package.nix
+++ b/pkgs/by-name/ex/expected-lite/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martinmoene";
     repo = "expected-lite";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8Lf+R7wC7f2YliXqhR6pwVVSLZ6qheu7YOV5jHc0Cjc=";
   };
 
diff --git a/pkgs/by-name/ex/expenses/package.nix b/pkgs/by-name/ex/expenses/package.nix
index a59d71775f5b..a2a71735ed03 100644
--- a/pkgs/by-name/ex/expenses/package.nix
+++ b/pkgs/by-name/ex/expenses/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "manojkarthick";
     repo = "expenses";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sqsogF2swMvYZL7Kj+ealrB1AAgIe7ZXXDLRdHL6Q+0=";
   };
 
diff --git a/pkgs/by-name/ex/exportarr/package.nix b/pkgs/by-name/ex/exportarr/package.nix
index e5027a392383..329fa3b7aa90 100644
--- a/pkgs/by-name/ex/exportarr/package.nix
+++ b/pkgs/by-name/ex/exportarr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "onedr0p";
     repo = "exportarr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iNcdD2zigBZ2phtCkHRV0GZPrEjopV0K+vin1Zkb3Oo=";
   };
 
diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix
index 7f6ea93dd41a..e39d8754bdfc 100644
--- a/pkgs/by-name/ex/expr/package.nix
+++ b/pkgs/by-name/ex/expr/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "expr-lang";
     repo = "expr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-teP/14czczNiz0kxoLNmZQg/AvcDuB8K4jdQpJf5JLQ=";
   };
 
diff --git a/pkgs/by-name/ex/exprtk/package.nix b/pkgs/by-name/ex/exprtk/package.nix
index b943d12fea64..814caaed2566 100644
--- a/pkgs/by-name/ex/exprtk/package.nix
+++ b/pkgs/by-name/ex/exprtk/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ArashPartow";
     repo = "exprtk";
-    tag = version;
+    rev = version;
     hash = "sha256-A4UzNYZZGgTJOw9G4Jg1wJZhxguFRohNEcwmwUOAX18=";
   };
 
diff --git a/pkgs/by-name/ex/extest/package.nix b/pkgs/by-name/ex/extest/package.nix
index f8e832778306..229cd97a66e3 100644
--- a/pkgs/by-name/ex/extest/package.nix
+++ b/pkgs/by-name/ex/extest/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Supreeeme";
     repo = "extest";
-    tag = version;
+    rev = version;
     hash = "sha256-qdTF4n3uhkl3WFT+7bAlwCjxBx3ggTN6i3WzFg+8Jrw=";
   };
 
diff --git a/pkgs/by-name/ex/extra-container/package.nix b/pkgs/by-name/ex/extra-container/package.nix
index fe3f0a4415df..b38cd67ee42c 100644
--- a/pkgs/by-name/ex/extra-container/package.nix
+++ b/pkgs/by-name/ex/extra-container/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "erikarvstedt";
     repo = "extra-container";
-    tag = version;
+    rev = version;
     hash = "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU=";
   };
 
diff --git a/pkgs/by-name/ex/extrace/package.nix b/pkgs/by-name/ex/extrace/package.nix
index 73ccc92fa13c..6d2491acfa85 100644
--- a/pkgs/by-name/ex/extrace/package.nix
+++ b/pkgs/by-name/ex/extrace/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "extrace";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Jy/Ac3NcqBkW0kHyypMAVUGAQ41qWM96BbLAym06ogM=";
   };
 
diff --git a/pkgs/by-name/ex/extract_url/package.nix b/pkgs/by-name/ex/extract_url/package.nix
index 0c1cb6b23325..b7b8e4824f75 100644
--- a/pkgs/by-name/ex/extract_url/package.nix
+++ b/pkgs/by-name/ex/extract_url/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "m3m0ryh0l3";
     repo = "extracturl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "05589lp15jmcpbj4y9a3hmf6n2gsqrm4ybcyh3hd4j6pc7hmnhny";
   };
 
diff --git a/pkgs/by-name/ex/extractpdfmark/package.nix b/pkgs/by-name/ex/extractpdfmark/package.nix
index 52385682d835..8594820134f3 100644
--- a/pkgs/by-name/ex/extractpdfmark/package.nix
+++ b/pkgs/by-name/ex/extractpdfmark/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trueroad";
     repo = "extractpdfmark";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pNc/SWAtQWMbB2+lIQkJdBYSZ97iJXK71mS59qQa7Hs=";
   };
 
diff --git a/pkgs/by-name/ex/extrude/package.nix b/pkgs/by-name/ex/extrude/package.nix
index 3a2a889d7c2d..469678b7ec55 100644
--- a/pkgs/by-name/ex/extrude/package.nix
+++ b/pkgs/by-name/ex/extrude/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7gCEBhnNU5CqC5n0KP4Dd/fmddPRwNqyMFXTrRrJjfU=";
   };
 
diff --git a/pkgs/by-name/ey/eyedropper/package.nix b/pkgs/by-name/ey/eyedropper/package.nix
index d4eddfb82975..65c800acdf51 100644
--- a/pkgs/by-name/ey/eyedropper/package.nix
+++ b/pkgs/by-name/ey/eyedropper/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FineFindus";
     repo = "eyedropper";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FyGj0180Wn8iIDTdDqnNEvFYegwdWCsCq+hmyTTUIo4=";
   };
 
diff --git a/pkgs/by-name/ey/eyewitness/package.nix b/pkgs/by-name/ey/eyewitness/package.nix
index d5eb4221418f..1daaa89dc0c6 100644
--- a/pkgs/by-name/ey/eyewitness/package.nix
+++ b/pkgs/by-name/ey/eyewitness/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "redsiege";
     repo = "EyeWitness";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nSPpPbwqagc5EadQ4AHgLhjQ0kDjmbdcwE/PL5FDL4I=";
   };
 
diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix
index 7170bfd1d0d1..8e09f58bf632 100644
--- a/pkgs/by-name/ez/ezquake/package.nix
+++ b/pkgs/by-name/ez/ezquake/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "QW-Group";
     repo = pname + "-source";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-ThrsJfj+eP7Lv2ZSNLO6/b98VHrL6/rhwf2p0qMvTF8=";
   };
diff --git a/pkgs/by-name/f1/f1viewer/package.nix b/pkgs/by-name/f1/f1viewer/package.nix
index fa5e5b0873ba..363d914548ef 100644
--- a/pkgs/by-name/f1/f1viewer/package.nix
+++ b/pkgs/by-name/f1/f1viewer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SoMuchForSubtlety";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jXC2dENXuqicNQqTHyZKsjibDvjta/npQmf3+uivjX0=";
   };
 
diff --git a/pkgs/by-name/f2/f2/package.nix b/pkgs/by-name/f2/f2/package.nix
index 28383e316a90..8980fa1f554e 100644
--- a/pkgs/by-name/f2/f2/package.nix
+++ b/pkgs/by-name/f2/f2/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ayoisaiah";
     repo = "f2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-AjuWaSEP2X3URZBPD05laV32ms/pULooSQKXUz8sqsU=";
   };
 
diff --git a/pkgs/by-name/f3/f3/package.nix b/pkgs/by-name/f3/f3/package.nix
index 4a56146ea24d..5526cedf27e6 100644
--- a/pkgs/by-name/f3/f3/package.nix
+++ b/pkgs/by-name/f3/f3/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AltraMayor";
     repo = "f3";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZajlFGXJcYUVe/wUFfdPYVW8stOo1Aqe8uD2Bm9KIk0=";
   };
 
diff --git a/pkgs/by-name/fa/faad2/package.nix b/pkgs/by-name/fa/faad2/package.nix
index 6ab41f536afc..d4fa16c7f68c 100644
--- a/pkgs/by-name/fa/faad2/package.nix
+++ b/pkgs/by-name/fa/faad2/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "knik0";
     repo = "faad2";
-    tag = version;
+    rev = version;
     hash = "sha256-JvmblrmE3doUMUwObBN2b+Ej+CDBWNemBsyYSCXGwo8=";
   };
 
diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix
index 3347015141ad..990fe98ba67c 100644
--- a/pkgs/by-name/fa/faas-cli/package.nix
+++ b/pkgs/by-name/fa/faas-cli/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openfaas";
     repo = "faas-cli";
-    tag = version;
+    rev = version;
     sha256 = "sha256-pCzYfsL4ZQOyxEpg//Edh+dengXkx6G+OWMNPfIPM+o=";
   };
 
diff --git a/pkgs/by-name/fa/faba-icon-theme/package.nix b/pkgs/by-name/fa/faba-icon-theme/package.nix
index 81f757ce658c..e110514e72f9 100644
--- a/pkgs/by-name/fa/faba-icon-theme/package.nix
+++ b/pkgs/by-name/fa/faba-icon-theme/package.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moka-project";
     repo = "faba-icon-theme";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";
   };
 
diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index b8986eff2e40..02a3c2b0b8b9 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wFVb2IdYB1T7wozQcjxLE7uVRsIFkPL5rS/8V0LnRcg=";
   };
 
diff --git a/pkgs/by-name/fa/fabs/package.nix b/pkgs/by-name/fa/fabs/package.nix
index 2cdf6639534e..69bcd4c13797 100644
--- a/pkgs/by-name/fa/fabs/package.nix
+++ b/pkgs/by-name/fa/fabs/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "openafs-contrib";
     repo = "fabs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ejAcCwrOWGX0zsMw224f9GTWlozNYC0gU6LdTk0XqH0=";
   };
 
diff --git a/pkgs/by-name/fa/facedetect/package.nix b/pkgs/by-name/fa/facedetect/package.nix
index 2653ffff7542..ecb532bb710f 100644
--- a/pkgs/by-name/fa/facedetect/package.nix
+++ b/pkgs/by-name/fa/facedetect/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wavexx";
     repo = "facedetect";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0mddh71cjbsngpvjli406ndi2x613y39ydgb8bi4z1jp063865sd";
   };
 
diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix
index b37b98df35ea..720ff17dac1a 100644
--- a/pkgs/by-name/fa/fail2ban/package.nix
+++ b/pkgs/by-name/fa/fail2ban/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fail2ban";
     repo = "fail2ban";
-    tag = version;
+    rev = version;
     hash = "sha256-0xPNhbu6/p/cbHOr5Y+PXbMbt5q/S13S5100ZZSdylE=";
   };
 
diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix
index 363026114afc..b8217680fd93 100644
--- a/pkgs/by-name/fa/faircamp/package.nix
+++ b/pkgs/by-name/fa/faircamp/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "simonrepp";
     repo = "faircamp";
-    tag = version;
+    rev = version;
     hash = "sha256-InBPQk8dIwsCfvo24/0ggK/tipHaC0owPbZtrrIT/FY=";
   };
 
diff --git a/pkgs/by-name/fa/fakechroot/package.nix b/pkgs/by-name/fa/fakechroot/package.nix
index ec9febb51df0..d73c6355dd61 100644
--- a/pkgs/by-name/fa/fakechroot/package.nix
+++ b/pkgs/by-name/fa/fakechroot/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dex4er";
     repo = "fakechroot";
-    tag = version;
+    rev = version;
     sha256 = "0xgnwazrmrg4gm30xjxdn6sx3lhqvxahrh6gmy3yfswxc30pmg86";
   };
 
diff --git a/pkgs/by-name/fa/falcoctl/package.nix b/pkgs/by-name/fa/falcoctl/package.nix
index 12144dd9c2c2..0734f0a91b6b 100644
--- a/pkgs/by-name/fa/falcoctl/package.nix
+++ b/pkgs/by-name/fa/falcoctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "falcosecurity";
     repo = "falcoctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-X4fZBTEbOIQbfmuxDODEkYW43ntVIkwFDULYq+ps+9s=";
   };
 
diff --git a/pkgs/by-name/fa/fan2go/package.nix b/pkgs/by-name/fa/fan2go/package.nix
index 1d28eeeca9c4..579b516b06b0 100644
--- a/pkgs/by-name/fa/fan2go/package.nix
+++ b/pkgs/by-name/fa/fan2go/package.nix
@@ -12,7 +12,7 @@ buildGo123Module rec {
   src = fetchFromGitHub {
     owner = "markusressel";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-eSHeHBzDvzsDAck0zexwR8drasisvlQNTeowv92E2uc=";
   };
 
diff --git a/pkgs/by-name/fa/fanbox-dl/package.nix b/pkgs/by-name/fa/fanbox-dl/package.nix
index 6e1af3fadcdc..d3d0e7050960 100644
--- a/pkgs/by-name/fa/fanbox-dl/package.nix
+++ b/pkgs/by-name/fa/fanbox-dl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hareku";
     repo = "fanbox-dl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-el9+pusnqui7G+x05lJsLjnZ4OymvBVSCa7ReJTgqLw=";
   };
 
diff --git a/pkgs/by-name/fa/fanctl/package.nix b/pkgs/by-name/fa/fanctl/package.nix
index e0e9c5398c8b..eafe3ec82a4d 100644
--- a/pkgs/by-name/fa/fanctl/package.nix
+++ b/pkgs/by-name/fa/fanctl/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "mcoffin";
     repo = "fanctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw=";
   };
 
diff --git a/pkgs/by-name/fa/faraday/package.nix b/pkgs/by-name/fa/faraday/package.nix
index c2ce1b7e50f3..3aa54ddbcd2e 100644
--- a/pkgs/by-name/fa/faraday/package.nix
+++ b/pkgs/by-name/fa/faraday/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "faraday";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KiGj24sBeClmzW60lRrvXwgXf3My7jhHTY+VhIMMp0k=";
   };
 
diff --git a/pkgs/by-name/fa/fasole/package.nix b/pkgs/by-name/fa/fasole/package.nix
index 653351a5279a..48c59b4c667f 100644
--- a/pkgs/by-name/fa/fasole/package.nix
+++ b/pkgs/by-name/fa/fasole/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ProggerX";
     repo = "fasole";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qcCJgz/YXfd8+9ST1U4YFxLLd25D8HrfZzsDGpKgCdM=";
   };
 
diff --git a/pkgs/by-name/fa/fastd/package.nix b/pkgs/by-name/fa/fastd/package.nix
index ae0c3dd05532..bb883d23549e 100644
--- a/pkgs/by-name/fa/fastd/package.nix
+++ b/pkgs/by-name/fa/fastd/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "neocturne";
     repo = "fastd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Sz6VEjKziL/w2a4VWFfMPDYvm7UZh5A/NmzP10rJ2r8=";
   };
 
diff --git a/pkgs/by-name/fa/fastddsgen/package.nix b/pkgs/by-name/fa/fastddsgen/package.nix
index cbf8a10d5dce..3ac2a2b050ec 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-5M1N0f1kVaIC5dkLb5ft0Da8CqzVRQlyr1otQdMvtow=";
   };
diff --git a/pkgs/by-name/fa/fastp/package.nix b/pkgs/by-name/fa/fastp/package.nix
index 412d0cde9f75..89ae4a59486d 100644
--- a/pkgs/by-name/fa/fastp/package.nix
+++ b/pkgs/by-name/fa/fastp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenGene";
     repo = "fastp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Jl2Os/6yLWXTDv6irInYlUHpz6QTw8CEMVGFXblAay0=";
   };
 
diff --git a/pkgs/by-name/fa/fastpbkdf2/package.nix b/pkgs/by-name/fa/fastpbkdf2/package.nix
index 3bf566396403..7ce1605a5f1b 100644
--- a/pkgs/by-name/fa/fastpbkdf2/package.nix
+++ b/pkgs/by-name/fa/fastpbkdf2/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ctz";
     repo = "fastpbkdf2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2";
   };
 
diff --git a/pkgs/by-name/fa/fatcat/package.nix b/pkgs/by-name/fa/fatcat/package.nix
index 0ab0f2eb4652..aa75ed92f1c5 100644
--- a/pkgs/by-name/fa/fatcat/package.nix
+++ b/pkgs/by-name/fa/fatcat/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gregwar";
     repo = "fatcat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/iGNVP7Bz/UZAR+dFxAKMKM9jm07h0x0F3VGpdxlHdk=";
   };
 
diff --git a/pkgs/by-name/fa/fatrace/package.nix b/pkgs/by-name/fa/fatrace/package.nix
index 3b9bc9c45f15..d8c6ce4bd191 100644
--- a/pkgs/by-name/fa/fatrace/package.nix
+++ b/pkgs/by-name/fa/fatrace/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martinpitt";
     repo = "fatrace";
-    tag = version;
+    rev = version;
     sha256 = "sha256-QkavhxORENQSLUg4tq+W1WB7zSYYinWOOYPqNbv+pEI=";
   };
 
diff --git a/pkgs/by-name/fa/fatresize/package.nix b/pkgs/by-name/fa/fatresize/package.nix
index 60de2e0ed9db..e6ac6c06236e 100644
--- a/pkgs/by-name/fa/fatresize/package.nix
+++ b/pkgs/by-name/fa/fatresize/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ya-mouse";
     repo = "fatresize";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1vhz84kxfyl0q7mkqn68nvzzly0a4xgzv76m6db0bk7xyczv1qr2";
   };
 
diff --git a/pkgs/by-name/fa/faudio/package.nix b/pkgs/by-name/fa/faudio/package.nix
index 6143b45ecacc..64b8c69ca56e 100644
--- a/pkgs/by-name/fa/faudio/package.nix
+++ b/pkgs/by-name/fa/faudio/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FAudio";
-    tag = version;
+    rev = version;
     sha256 = "sha256-nPU225LLQYN0D1LUsp9XGm2bCcB5WLpD3TcGDiWCe0c=";
   };
 
diff --git a/pkgs/by-name/fa/faustPhysicalModeling/package.nix b/pkgs/by-name/fa/faustPhysicalModeling/package.nix
index 93676d555d76..a2e928592842 100644
--- a/pkgs/by-name/fa/faustPhysicalModeling/package.nix
+++ b/pkgs/by-name/fa/faustPhysicalModeling/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
-    tag = version;
+    rev = version;
     sha256 = "sha256-j5ADlKZriwLARpEJ/4xgvyAhF5ld9Hl2gXZS3NPJJj8=";
   };
 
diff --git a/pkgs/by-name/fb/fbcat/package.nix b/pkgs/by-name/fb/fbcat/package.nix
index a8e2dea1d9cd..60eaa92533bf 100644
--- a/pkgs/by-name/fb/fbcat/package.nix
+++ b/pkgs/by-name/fb/fbcat/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jwilk";
     repo = "fbcat";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ORzcd8XGy2BfwuPK5UX+K5Z+FYkb+tdg/gHl3zHjvbk=";
   };
 
diff --git a/pkgs/by-name/fb/fbjni/package.nix b/pkgs/by-name/fb/fbjni/package.nix
index 978c71098296..991e9531b7c5 100644
--- a/pkgs/by-name/fb/fbjni/package.nix
+++ b/pkgs/by-name/fb/fbjni/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "fbjni";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-97KqfFWtR3VJe2s0D60L3dsIDm4kMa0hpkKoZSAEoVY=";
   };
 
diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix
index d237a513f0d6..2c015d35e8c3 100644
--- a/pkgs/by-name/fb/fblog/package.nix
+++ b/pkgs/by-name/fb/fblog/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "brocode";
     repo = "fblog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YOHLw8YCgOGB1Nn2tD+EnicKd/tiMk07OWv+49btbpw=";
   };
 
diff --git a/pkgs/by-name/fb/fbmark/package.nix b/pkgs/by-name/fb/fbmark/package.nix
index 15943ab5c47d..b6215b96ddf3 100644
--- a/pkgs/by-name/fb/fbmark/package.nix
+++ b/pkgs/by-name/fb/fbmark/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "caramelli";
     repo = "fbmark";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0n2czl2sy1k6r5ri0hp7jgq84xcwrx4x43bqvw1b4na99mqhyahn";
   };
 
diff --git a/pkgs/by-name/fb/fbmenugen/package.nix b/pkgs/by-name/fb/fbmenugen/package.nix
index 37e6e629691b..f2152a5115f4 100644
--- a/pkgs/by-name/fb/fbmenugen/package.nix
+++ b/pkgs/by-name/fb/fbmenugen/package.nix
@@ -18,7 +18,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "trizen";
     repo = "fbmenugen";
-    tag = version;
+    rev = version;
     sha256 = "A0yhoK/cPp3JlNZacgLaDhaU838PpFna7luQKNDvyOg=";
   };
 
diff --git a/pkgs/by-name/fc/fcft/package.nix b/pkgs/by-name/fc/fcft/package.nix
index 16b6a58616e4..be0327dcc688 100644
--- a/pkgs/by-name/fc/fcft/package.nix
+++ b/pkgs/by-name/fc/fcft/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "fcft";
-    tag = version;
+    rev = version;
     hash = "sha256:08fr6zcqk4qp1k3r0di6v60qfyd3q5k9jnxzlsx2p1lh0nils0xa";
   };
 
diff --git a/pkgs/by-name/fc/fcgi/package.nix b/pkgs/by-name/fc/fcgi/package.nix
index d2b59d7988f4..08e34c4b5914 100644
--- a/pkgs/by-name/fc/fcgi/package.nix
+++ b/pkgs/by-name/fc/fcgi/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FastCGI-Archives";
     repo = "fcgi2";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-GI2RL0djfCej7bBhxR6cK/FrTbDYEl75SEfQFgl0ctA=";
   };
 
diff --git a/pkgs/by-name/fc/fcgiwrap/package.nix b/pkgs/by-name/fc/fcgiwrap/package.nix
index 63f967eb3deb..a40a60ca4723 100644
--- a/pkgs/by-name/fc/fcgiwrap/package.nix
+++ b/pkgs/by-name/fc/fcgiwrap/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gnosek";
     repo = "fcgiwrap";
-    tag = version;
+    rev = version;
     hash = "sha256-znAsZk+aB2XO2NK8Mjc+DLwykYKHolnVQPErlaAx3Oc=";
   };
 
diff --git a/pkgs/by-name/fc/fcitx5-material-color/package.nix b/pkgs/by-name/fc/fcitx5-material-color/package.nix
index 2307e28492c1..8b5147df9b82 100644
--- a/pkgs/by-name/fc/fcitx5-material-color/package.nix
+++ b/pkgs/by-name/fc/fcitx5-material-color/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hosxy";
     repo = "Fcitx5-Material-Color";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-i9JHIJ+cHLTBZUNzj9Ujl3LIdkCllTWpO1Ta4OT1LTc=";
   };
 
diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
index 33cd60dcf121..6a3a7f36396b 100644
--- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
+++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openvanilla";
     repo = "fcitx5-mcbopomofo";
-    tag = version;
+    rev = version;
     hash = "sha256-fHDNhZhSVgVuZLfRA3eJErm1gwhUZJw+emCXfeO5HVo=";
   };
 
diff --git a/pkgs/by-name/fc/fcl/package.nix b/pkgs/by-name/fc/fcl/package.nix
index 034bd2724a0c..194056f635eb 100644
--- a/pkgs/by-name/fc/fcl/package.nix
+++ b/pkgs/by-name/fc/fcl/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flexible-collision-library";
     repo = "fcl";
-    tag = version;
+    rev = version;
     sha256 = "0f5lhg6f9np7w16s6wz4mb349bycil1irk8z8ylfjwllxi4n6x7a";
   };
 
diff --git a/pkgs/by-name/fc/fcppt/package.nix b/pkgs/by-name/fc/fcppt/package.nix
index 7a8bb2013e0f..ac0fd7582900 100644
--- a/pkgs/by-name/fc/fcppt/package.nix
+++ b/pkgs/by-name/fc/fcppt/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "freundlich";
     repo = "fcppt";
-    tag = version;
+    rev = version;
     sha256 = "1pcmi2ck12nanw1rnwf8lmyx85iq20897k6daxx3hw5f23j1kxv6";
   };
 
diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix
index cd8c86b386ab..13c16bcff36a 100644
--- a/pkgs/by-name/fd/fd/package.nix
+++ b/pkgs/by-name/fd/fd/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B+lOohoPH7UkRxRNTzSVt0SDrqEwh4hIvBF3uWliDEI=";
   };
 
diff --git a/pkgs/by-name/fd/fdk-aac-encoder/package.nix b/pkgs/by-name/fd/fdk-aac-encoder/package.nix
index 144dcb5477e1..706f3e37c06d 100644
--- a/pkgs/by-name/fd/fdk-aac-encoder/package.nix
+++ b/pkgs/by-name/fd/fdk-aac-encoder/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nu774";
     repo = "fdkaac";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nVVeYk7t4+n/BsOKs744stsvgJd+zNnbASk3bAgFTpk=";
   };
 
diff --git a/pkgs/by-name/fd/fdm/package.nix b/pkgs/by-name/fd/fdm/package.nix
index 8447fb523281..80aa96a507ca 100644
--- a/pkgs/by-name/fd/fdm/package.nix
+++ b/pkgs/by-name/fd/fdm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nicm";
     repo = "fdm";
-    tag = version;
+    rev = version;
     hash = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0=";
   };
 
diff --git a/pkgs/by-name/fd/fdupes/package.nix b/pkgs/by-name/fd/fdupes/package.nix
index e4997886ea0d..83e336b07d8f 100644
--- a/pkgs/by-name/fd/fdupes/package.nix
+++ b/pkgs/by-name/fd/fdupes/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "adrianlopezroche";
     repo = "fdupes";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-epregz+i2mML5zCQErQDJFUFUxnUoqcBlUPGPJ4tcmc=";
   };
 
diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix
index 5517d949e090..06527893d2cf 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";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-c7qa6MmENCEjZz8b/xyCcCO2+iI5dI8hJynBW3haSWE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix
index e34c64a411c6..5332b713891e 100644
--- a/pkgs/by-name/fe/fedimint/package.nix
+++ b/pkgs/by-name/fe/fedimint/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fedimint";
     repo = "fedimint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dhZYOfXepOnt1lQEgrM/y++5V58weiiTMAyMKl2t37Q=";
   };
 
diff --git a/pkgs/by-name/fe/feed2imap-go/package.nix b/pkgs/by-name/fe/feed2imap-go/package.nix
index 6d50862fdc67..f2696e33799b 100644
--- a/pkgs/by-name/fe/feed2imap-go/package.nix
+++ b/pkgs/by-name/fe/feed2imap-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Necoro";
     repo = "feed2imap-go";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LMtuGrNRVG3/2cgZFS7YlVmassbWDhH/nQgPh08NmpA=";
   };
 
diff --git a/pkgs/by-name/fe/feedgnuplot/package.nix b/pkgs/by-name/fe/feedgnuplot/package.nix
index 2f1ded654dea..9d1590ba947b 100644
--- a/pkgs/by-name/fe/feedgnuplot/package.nix
+++ b/pkgs/by-name/fe/feedgnuplot/package.nix
@@ -25,7 +25,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "dkogan";
     repo = "feedgnuplot";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-r5rszxr65lSozkUNaqfBn4I4XjLtvQ6T/BG366JXLRM=";
   };
 
diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index e28d50c4c10f..b54d3be19c72 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -16,7 +16,7 @@ let
   src = fetchFromGitHub {
     owner = "jeffvli";
     repo = "feishin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Tjh68b+41YrMNB14AZ3jXqBXDOmaaOYQKXJOyTUF474=";
   };
 
diff --git a/pkgs/by-name/fe/fend/package.nix b/pkgs/by-name/fe/fend/package.nix
index 0923fb335208..f27ea5128db4 100644
--- a/pkgs/by-name/fe/fend/package.nix
+++ b/pkgs/by-name/fe/fend/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "printfn";
     repo = "fend";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FaPP7344rb5789CeDv9L4lysiTrK+7UoEbH8IK/6N3k=";
   };
 
diff --git a/pkgs/by-name/fe/ferretdb/package.nix b/pkgs/by-name/fe/ferretdb/package.nix
index 3adf25ddb4bd..438365de4091 100644
--- a/pkgs/by-name/fe/ferretdb/package.nix
+++ b/pkgs/by-name/fe/ferretdb/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FerretDB";
     repo = "FerretDB";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WMejspnk2PvJhvNGi4h+DF+fzipuOMcS1QWim5DnAhQ=";
   };
 
diff --git a/pkgs/by-name/fe/fet-sh/package.nix b/pkgs/by-name/fe/fet-sh/package.nix
index 5fef51e228d5..d0fd407cf57e 100644
--- a/pkgs/by-name/fe/fet-sh/package.nix
+++ b/pkgs/by-name/fe/fet-sh/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "6gk";
     repo = "fet.sh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xhX2nVteC3T3IjQh++mYlm0btDJQbyQa6b8sGualV0E=";
   };
 
diff --git a/pkgs/by-name/fe/fetch-scm/package.nix b/pkgs/by-name/fe/fetch-scm/package.nix
index 13bf35051de1..9ea2f12fa208 100644
--- a/pkgs/by-name/fe/fetch-scm/package.nix
+++ b/pkgs/by-name/fe/fetch-scm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KikyTokamuro";
     repo = "fetch.scm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WdYi8EVxQ6xPtld8JyZlUmgpxroevBehtkRANovMh2E=";
   };
 
diff --git a/pkgs/by-name/fe/fetchit/package.nix b/pkgs/by-name/fe/fetchit/package.nix
index d7e7d0710ae9..9e77a9154615 100644
--- a/pkgs/by-name/fe/fetchit/package.nix
+++ b/pkgs/by-name/fe/fetchit/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "fetchit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hxS/+/fbYOpMJ5VfvvG5l7wWKBUUR22rYn9X79DzUUk=";
   };
 
diff --git a/pkgs/by-name/ff/ff2mpv-rust/package.nix b/pkgs/by-name/ff/ff2mpv-rust/package.nix
index d6eafe03e95d..3f7ac2a3e56f 100644
--- a/pkgs/by-name/ff/ff2mpv-rust/package.nix
+++ b/pkgs/by-name/ff/ff2mpv-rust/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ryze312";
     repo = "ff2mpv-rust";
-    tag = version;
+    rev = version;
     hash = "sha256-3ZKVa1pRorzTM6jCXak/aTq9iyDGT7fWLOcCotLYlkc=";
   };
 
diff --git a/pkgs/by-name/ff/ff2mpv/package.nix b/pkgs/by-name/ff/ff2mpv/package.nix
index 835d7f241c50..f9f865675b50 100644
--- a/pkgs/by-name/ff/ff2mpv/package.nix
+++ b/pkgs/by-name/ff/ff2mpv/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "woodruffw";
     repo = "ff2mpv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Xx18EX/MxLrnwZGwMFZJxJURUpjU2P01CQue5XbZ3fw=";
   };
 
diff --git a/pkgs/by-name/ff/ffcast/package.nix b/pkgs/by-name/ff/ffcast/package.nix
index 5d592779d390..68aab967e3c4 100644
--- a/pkgs/by-name/ff/ffcast/package.nix
+++ b/pkgs/by-name/ff/ffcast/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ropery";
     repo = "FFcast";
-    tag = version;
+    rev = version;
     sha256 = "sha256-kxqwDGEguFTFHkQzXctXqxslt0+bYnfUdQ8C/8+eTXo=";
   };
 
diff --git a/pkgs/by-name/ff/fff/package.nix b/pkgs/by-name/ff/fff/package.nix
index 7b6894bd0d52..3ffc8ac9f6e7 100644
--- a/pkgs/by-name/ff/fff/package.nix
+++ b/pkgs/by-name/ff/fff/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "fff";
-    tag = version;
+    rev = version;
     sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg";
   };
 
diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix
index d34fa570b7c4..81edec825164 100644
--- a/pkgs/by-name/ff/ffizer/package.nix
+++ b/pkgs/by-name/ff/ffizer/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ffizer";
     repo = "ffizer";
-    tag = version;
+    rev = version;
     hash = "sha256-ZX6Zv6ioAO33Cc5WCVBgJWlOmNvbVgckMylRnphpOdw=";
   };
 
diff --git a/pkgs/by-name/ff/fflas-ffpack/package.nix b/pkgs/by-name/ff/fflas-ffpack/package.nix
index 71e897433298..3b07162240d2 100644
--- a/pkgs/by-name/ff/fflas-ffpack/package.nix
+++ b/pkgs/by-name/ff/fflas-ffpack/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linbox-team";
     repo = "fflas-ffpack";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Eztc2jUyKRVUiZkYEh+IFHkDuPIy+Gx3ZW/MsuOVaMc=";
   };
 
diff --git a/pkgs/by-name/ff/ffms/package.nix b/pkgs/by-name/ff/ffms/package.nix
index a7dd689abe4e..61db0ad742ed 100644
--- a/pkgs/by-name/ff/ffms/package.nix
+++ b/pkgs/by-name/ff/ffms/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FFMS";
     repo = "ffms2";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Ildl8hbKSFGh4MUBK+k8uYMDrOZD9NSMdPAWIIaGy4E=";
   };
 
diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix
index 6001fbfc7713..d8126f791aa7 100644
--- a/pkgs/by-name/fh/fh/package.nix
+++ b/pkgs/by-name/fh/fh/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "fh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yOqXcn/OMfC97t002V8yzZn1PhuV8lIp5szPA7eys1Q=";
   };
 
diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix
index 2e127c4189dd..dbe215a34360 100644
--- a/pkgs/by-name/fh/fheroes2/package.nix
+++ b/pkgs/by-name/fh/fheroes2/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ihhub";
     repo = "fheroes2";
-    tag = version;
+    rev = version;
     hash = "sha256-CowCP+gZuGSXWbALYBkmyn+RlDgOGho/Px34GutrBX0=";
   };
 
diff --git a/pkgs/by-name/fi/fiano/package.nix b/pkgs/by-name/fi/fiano/package.nix
index 8bf0677d5d05..3f09e5af9c40 100644
--- a/pkgs/by-name/fi/fiano/package.nix
+++ b/pkgs/by-name/fi/fiano/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxboot";
     repo = "fiano";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QX0XMec99YbYWyfRThhwDaNjKstkUEz6wsisBynprmg=";
   };
 
diff --git a/pkgs/by-name/fi/fiche/package.nix b/pkgs/by-name/fi/fiche/package.nix
index e79613644f00..4361019d55f7 100644
--- a/pkgs/by-name/fi/fiche/package.nix
+++ b/pkgs/by-name/fi/fiche/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "solusipse";
     repo = "fiche";
-    tag = version;
+    rev = version;
     sha256 = "1102r39xw17kip7mjp987jy8na333gw9vxv31f7v8q05cr7d7kfb";
   };
 
diff --git a/pkgs/by-name/fi/fido2luks/package.nix b/pkgs/by-name/fi/fido2luks/package.nix
index ca4c8de5b497..1580090c1ae3 100644
--- a/pkgs/by-name/fi/fido2luks/package.nix
+++ b/pkgs/by-name/fi/fido2luks/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shimunn";
     repo = "fido2luks";
-    tag = version;
+    rev = version;
     hash = "sha256-bXwaFiRHURvS5KtTqIj+3GlGNbEulDgMDP51ZiO1w9o=";
   };
 
diff --git a/pkgs/by-name/fi/figurine/package.nix b/pkgs/by-name/fi/figurine/package.nix
index 5f3ff724fde1..88bb4ff21b8f 100644
--- a/pkgs/by-name/fi/figurine/package.nix
+++ b/pkgs/by-name/fi/figurine/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "arsham";
     repo = "figurine";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1q6Y7oEntd823nWosMcKXi6c3iWsBTxPnSH4tR6+XYs=";
   };
 
diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index d4b8802d8426..af275fdd7531 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -11,7 +11,7 @@ let
   src = fetchFromGitHub {
     owner = "filebrowser";
     repo = "filebrowser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zLM1fLrucIhzGdTTDu81ZnTIipK+iRnPhgfMiT1P+yg=";
   };
 
diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index ff1d3f72f8e9..114f38ce4453 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-96DSnobVyG50iS6NyCMpZ74KWEtkCyNdFyGXLwrSZxo=";
   };
 
diff --git a/pkgs/by-name/fi/fileshelter/package.nix b/pkgs/by-name/fi/fileshelter/package.nix
index 127fd4676444..093348d39de2 100644
--- a/pkgs/by-name/fi/fileshelter/package.nix
+++ b/pkgs/by-name/fi/fileshelter/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "epoupon";
     repo = "fileshelter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "07n70wwqj7lqdxs3wya1m8bwg8l6lgmmlfpwyv3r3s4dfzb1b3ka";
   };
 
diff --git a/pkgs/by-name/fi/filter-audio/package.nix b/pkgs/by-name/fi/filter-audio/package.nix
index 9c7f56587fc2..ae1d63a1e1de 100644
--- a/pkgs/by-name/fi/filter-audio/package.nix
+++ b/pkgs/by-name/fi/filter-audio/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "irungentoo";
     repo = "filter_audio";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1dv4pram317c1w97cjsv9f6r8cdxhgri7ib0v364z08pk7r2avfn";
   };
 
diff --git a/pkgs/by-name/fi/filterpath/package.nix b/pkgs/by-name/fi/filterpath/package.nix
index 014b08205893..68f5132e4ab0 100644
--- a/pkgs/by-name/fi/filterpath/package.nix
+++ b/pkgs/by-name/fi/filterpath/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Sigmanificient";
     repo = "filterpath";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-9rHooXgpvfNNeWxS8UF6hmb8vCz+xKABrJNd+AgKFJs=";
   };
 
diff --git a/pkgs/by-name/fi/filtron/package.nix b/pkgs/by-name/fi/filtron/package.nix
index 3522b82a49a8..f4083022478a 100644
--- a/pkgs/by-name/fi/filtron/package.nix
+++ b/pkgs/by-name/fi/filtron/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = "filtron";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RihxlJvbHq5PaJz89NHl/wyXrKjSiC4XYAs7LSKAo6E=";
   };
 
diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index 6d03dcb27ec6..02c93f920022 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -16,7 +16,7 @@ flutter327.buildFlutterApplication {
   src = fetchFromGitHub {
     owner = "jmshrv";
     repo = "finamp";
-    tag = version;
+    rev = version;
     hash = "sha256-SDzKB5KLHkJ3xcJY67TNBXDiDlBOApKrh4x0OZR/K/M=";
   };
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/fi/find-cursor/package.nix b/pkgs/by-name/fi/find-cursor/package.nix
index c6d4977ff661..5e385d8fd94b 100644
--- a/pkgs/by-name/fi/find-cursor/package.nix
+++ b/pkgs/by-name/fi/find-cursor/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arp242";
     repo = "find-cursor";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/Dw4bOTCnpCbeI0YJ5DJ9Q2AGBognylUk7xYGn0KIA8=";
   };
 
diff --git a/pkgs/by-name/fi/findex/package.nix b/pkgs/by-name/fi/findex/package.nix
index 1c7cbdec1213..11da0a804933 100644
--- a/pkgs/by-name/fi/findex/package.nix
+++ b/pkgs/by-name/fi/findex/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mdgaziur";
     repo = "findex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IpgmeH5oREstud0nw4i2xYeZcJYG6eCWyw3hhid/DfU=";
   };
 
diff --git a/pkgs/by-name/fi/fioctl/package.nix b/pkgs/by-name/fi/fioctl/package.nix
index 1d72f7f535ce..26d5ba7b9f89 100644
--- a/pkgs/by-name/fi/fioctl/package.nix
+++ b/pkgs/by-name/fi/fioctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "foundriesio";
     repo = "fioctl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hZ8jkIbNY2z4M7sHCYq6vVacetThcoYPJjkr8PFQmQA=";
   };
 
diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix
index bea6339e8529..30016c7bc11f 100644
--- a/pkgs/by-name/fi/firecracker/package.nix
+++ b/pkgs/by-name/fi/firecracker/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "firecracker-microvm";
     repo = "firecracker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Iqhj4BteFTBhhgQmyJVNdRHrXd/kaMRbOJ3eRKilYpw=";
   };
 
diff --git a/pkgs/by-name/fi/firectl/package.nix b/pkgs/by-name/fi/firectl/package.nix
index 94e7ccb0edd7..ec6e30949ae9 100644
--- a/pkgs/by-name/fi/firectl/package.nix
+++ b/pkgs/by-name/fi/firectl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "firecracker-microvm";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3MNNgFRq4goWdHFyqWNMAl2K0eKfd03BF05i82FIzNE=";
   };
 
diff --git a/pkgs/by-name/fi/firefox-sync-client/package.nix b/pkgs/by-name/fi/firefox-sync-client/package.nix
index 62164a1bf197..a82b8adf701c 100644
--- a/pkgs/by-name/fi/firefox-sync-client/package.nix
+++ b/pkgs/by-name/fi/firefox-sync-client/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Mikescher";
     repo = "firefox-sync-client";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ax+v4a8bVuym1bp9dliXX85PXJk2Qlik3ME+adGiL1s=";
   };
 
diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix
index ed7972d3069a..5e1818a36630 100644
--- a/pkgs/by-name/fi/firefoxpwa/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "filips123";
     repo = "PWAsForFirefox";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-u6zKB5+P/f3qM5Sqmhk2ts1AhgRN8Oq877uKQuJ6Uao=";
   };
 
diff --git a/pkgs/by-name/fi/firejail/package.nix b/pkgs/by-name/fi/firejail/package.nix
index c939e8187be2..dcf9348383c4 100644
--- a/pkgs/by-name/fi/firejail/package.nix
+++ b/pkgs/by-name/fi/firejail/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "netblue30";
     repo = "firejail";
-    tag = version;
+    rev = version;
     sha256 = "sha256-BKEW2IWatzePGREAA479eaP6bJb1i2fRs/GZcyLinrM=";
   };
 
diff --git a/pkgs/by-name/fi/firestarter/package.nix b/pkgs/by-name/fi/firestarter/package.nix
index 9c354df8d55e..748f2b44e726 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ik6j1lw5nldj4i3lllrywqg54m9i2vxkxsb2zr4q0d2rfywhn23";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix
index 946efaa69413..5fe266ea17e3 100644
--- a/pkgs/by-name/fi/firewalld/package.nix
+++ b/pkgs/by-name/fi/firewalld/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "firewalld";
     repo = "firewalld";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ubE1zMIOcdg2+mgXsk6brCZxS1XkvJYwVY3E+UXIIiU=";
   };
 
diff --git a/pkgs/by-name/fi/firmware-manager/package.nix b/pkgs/by-name/fi/firmware-manager/package.nix
index 50d2e5b3bb60..534c18095aa0 100644
--- a/pkgs/by-name/fi/firmware-manager/package.nix
+++ b/pkgs/by-name/fi/firmware-manager/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "firmware-manager";
-    tag = version;
+    rev = version;
     hash = "sha256-Q+LJJ4xK583fAcwuOFykt6GKT0rVJgmTt+zUX4o4Tm4=";
   };
 
diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index c9c8f8364dae..8fd0f00138a2 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lichess-org";
     repo = "fishnet";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JhllThFiHeC/5AAFwwZQ0mgbENIWP1cA7aD01DeDVL8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fi/fission/package.nix b/pkgs/by-name/fi/fission/package.nix
index 1da3ecd8b7eb..e9e046e9cb47 100644
--- a/pkgs/by-name/fi/fission/package.nix
+++ b/pkgs/by-name/fi/fission/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fission";
     repo = "fission";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Tl7aKibVbNAKOa1tycKtEzdJ8rJHBMa8PTUm0i7DKA4=";
   };
 
diff --git a/pkgs/by-name/fi/fits-cloudctl/package.nix b/pkgs/by-name/fi/fits-cloudctl/package.nix
index ee648063f4d1..95a0461cdcc8 100644
--- a/pkgs/by-name/fi/fits-cloudctl/package.nix
+++ b/pkgs/by-name/fi/fits-cloudctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fi-ts";
     repo = "cloudctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-O3wX7IW2puMg0xhOf9BUfxzCMCKHxtPJxOCpc+wY0Ao=";
   };
 
diff --git a/pkgs/by-name/fi/fityk/package.nix b/pkgs/by-name/fi/fityk/package.nix
index 0dbea200605b..b20eb0ea4a3e 100644
--- a/pkgs/by-name/fi/fityk/package.nix
+++ b/pkgs/by-name/fi/fityk/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wojdyr";
     repo = "fityk";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-m2RaZMYT6JGwa3sOUVsBIzCdZetTbiygaInQWoJ4m1o=";
   };
 
diff --git a/pkgs/by-name/fl/flaca/package.nix b/pkgs/by-name/fl/flaca/package.nix
index f5f2416b1ba3..9fa928f5d300 100644
--- a/pkgs/by-name/fl/flaca/package.nix
+++ b/pkgs/by-name/fl/flaca/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
       source = fetchFromGitHub {
         owner = "Blobfolio";
         repo = "flaca";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-GpxOTu7yjJ9IFMKVkgjLeKGNEUiKw0ZeWQorfhaOTsg=";
       };
       lockFile = fetchurl {
diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix
index d97d9060e3a2..0155d14ea793 100644
--- a/pkgs/by-name/fl/flake-checker/package.nix
+++ b/pkgs/by-name/fl/flake-checker/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "flake-checker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-K5E1sarWIUl4QavHBoS8sPr5Cp8ZndWjLYDLm++d7v0=";
   };
 
diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix
index 72c06bc5be19..b54936e1a895 100644
--- a/pkgs/by-name/fl/flake-edit/package.nix
+++ b/pkgs/by-name/fl/flake-edit/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "a-kenji";
     repo = "flake-edit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7n8WANm9AijZYI5nlnevLI+aZtV55teroeQIEld7tkE=";
   };
 
diff --git a/pkgs/by-name/fl/flamerobin/package.nix b/pkgs/by-name/fl/flamerobin/package.nix
index 83dec165c614..a49ed58d3859 100644
--- a/pkgs/by-name/fl/flamerobin/package.nix
+++ b/pkgs/by-name/fl/flamerobin/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mariuz";
     repo = "flamerobin";
-    tag = version;
+    rev = version;
     sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA=";
   };
 
diff --git a/pkgs/by-name/fl/flann/package.nix b/pkgs/by-name/fl/flann/package.nix
index 206120d09e36..d68def287d01 100644
--- a/pkgs/by-name/fl/flann/package.nix
+++ b/pkgs/by-name/fl/flann/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flann-lib";
     repo = "flann";
-    tag = version;
+    rev = version;
     sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
   };
 
diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix
index 0ee4c34d3212..c2087c612665 100644
--- a/pkgs/by-name/fl/flare-signal/package.nix
+++ b/pkgs/by-name/fl/flare-signal/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.com";
     owner = "schmiddi-on-mobile";
     repo = "flare";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-qj34x/e5Nc3wPdFaHFZHQ8uCMHIlxfVNyvlp7eb3tSo=";
   };
 
diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix
index bcb447778538..1d50138ea3c4 100644
--- a/pkgs/by-name/fl/flarectl/package.nix
+++ b/pkgs/by-name/fl/flarectl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflare-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2LdsqCqRTruTHYPwuI9Gm07cpvQNOrZvIl6rjZU+0aU=";
   };
 
diff --git a/pkgs/by-name/fl/flat-remix-gnome/package.nix b/pkgs/by-name/fl/flat-remix-gnome/package.nix
index b66c71bb3754..2be7cc4aeb98 100644
--- a/pkgs/by-name/fl/flat-remix-gnome/package.nix
+++ b/pkgs/by-name/fl/flat-remix-gnome/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = "flat-remix-gnome";
-    tag = version;
+    rev = version;
     hash = "sha256-Ho2tqJgitSdk/i2jH5jhD3XLyy6BXUhyhb6UV7g1waM=";
   };
 
diff --git a/pkgs/by-name/fl/flat-remix-gtk/package.nix b/pkgs/by-name/fl/flat-remix-gtk/package.nix
index fa544fa8ab16..5d112edd2051 100644
--- a/pkgs/by-name/fl/flat-remix-gtk/package.nix
+++ b/pkgs/by-name/fl/flat-remix-gtk/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = "flat-remix-gtk";
-    tag = version;
+    rev = version;
     sha256 = "sha256-EWe84bLG14RkCNbHp0S5FbUQ5/Ye/KbCk3gPTsGg9oQ=";
   };
 
diff --git a/pkgs/by-name/fl/flatcc/package.nix b/pkgs/by-name/fl/flatcc/package.nix
index a4f8d6e6742f..7c13f453f423 100644
--- a/pkgs/by-name/fl/flatcc/package.nix
+++ b/pkgs/by-name/fl/flatcc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dvidelabs";
     repo = "flatcc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0/IZ7eX6b4PTnlSSdoOH0FsORGK9hrLr1zlr/IHsJFQ=";
   };
 
diff --git a/pkgs/by-name/fl/flavours/package.nix b/pkgs/by-name/fl/flavours/package.nix
index c0b9637b5b06..2abafb852874 100644
--- a/pkgs/by-name/fl/flavours/package.nix
+++ b/pkgs/by-name/fl/flavours/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Misterio77";
     repo = "flavours";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SOsHvcfDdUpb0x5VZ1vZJnGaIiWWOPgnAwKYNXzfUfI=";
   };
 
diff --git a/pkgs/by-name/fl/flawz/package.nix b/pkgs/by-name/fl/flawz/package.nix
index f13a595271b2..3e7ffcc60516 100644
--- a/pkgs/by-name/fl/flawz/package.nix
+++ b/pkgs/by-name/fl/flawz/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "flawz";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7p/BUXrElJutUcRMu+LxdsMxA6lCDnaci0fDaKGsawI=";
   };
 
diff --git a/pkgs/by-name/fl/flex-ncat/package.nix b/pkgs/by-name/fl/flex-ncat/package.nix
index b5660c8d2705..7e6abf1edeb2 100644
--- a/pkgs/by-name/fl/flex-ncat/package.nix
+++ b/pkgs/by-name/fl/flex-ncat/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kc2g-flex-tools";
     repo = "nCAT";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hbsrs9lgpxNqG8mmXsft01LmpX4dBpl1ncpdTWBgrUQ=";
   };
 
diff --git a/pkgs/by-name/fl/flex-ndax/package.nix b/pkgs/by-name/fl/flex-ndax/package.nix
index 892e5e441eb7..abc0e79ff7cc 100644
--- a/pkgs/by-name/fl/flex-ndax/package.nix
+++ b/pkgs/by-name/fl/flex-ndax/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kc2g-flex-tools";
     repo = "nDAX";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FCF22apO6uAc24H36SkvfKEKdyqY4l+j7ABdOnhZP6M=";
   };
 
diff --git a/pkgs/by-name/fl/flexcpp/package.nix b/pkgs/by-name/fl/flexcpp/package.nix
index 7049096c6f38..fe1938d6cd0d 100644
--- a/pkgs/by-name/fl/flexcpp/package.nix
+++ b/pkgs/by-name/fl/flexcpp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "0s25d9jsfsqvm34rwf48cxwz23aq1zja3cqlzfz3z33p29wwazwz";
-    tag = version;
+    rev = version;
     repo = "flexcpp";
     owner = "fbb-git";
   };
diff --git a/pkgs/by-name/fl/flintlock/package.nix b/pkgs/by-name/fl/flintlock/package.nix
index ae4b5ecf6b83..dccfa5f33a5d 100644
--- a/pkgs/by-name/fl/flintlock/package.nix
+++ b/pkgs/by-name/fl/flintlock/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = "flintlock";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Kbk94sqj0aPsVonPsiu8kbjhIOURB1kX9Lt3NURL+jk=";
   };
 
diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix
index bb0c1edf3340..adc4dea819d1 100644
--- a/pkgs/by-name/fl/flip-link/package.nix
+++ b/pkgs/by-name/fl/flip-link/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "knurling-rs";
     repo = "flip-link";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Nw43I8EIlNGPptsLVxFBapFp6qdFoUOEicHc9FTcm2g=";
   };
 
diff --git a/pkgs/by-name/fl/flitter/package.nix b/pkgs/by-name/fl/flitter/package.nix
index 2b9e26ab3a68..05dee0723c00 100644
--- a/pkgs/by-name/fl/flitter/package.nix
+++ b/pkgs/by-name/fl/flitter/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alexozer";
     repo = "flitter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8e13kSQEjzzf+j4uTrocVioZjJ6lAz+80dLfWwjPb9o=";
   };
 
diff --git a/pkgs/by-name/fl/flock/package.nix b/pkgs/by-name/fl/flock/package.nix
index 6acd402641e1..c571f076bb16 100644
--- a/pkgs/by-name/fl/flock/package.nix
+++ b/pkgs/by-name/fl/flock/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "discoteq";
     repo = "flock";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cCpckORtogs6Nt7c5q2+z0acXAnALdLV6uzxa5ng3s4=";
   };
 
diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix
index 9ad923c6fde8..083d79d9861b 100644
--- a/pkgs/by-name/fl/flood/package.nix
+++ b/pkgs/by-name/fl/flood/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "flood";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sIwXx9DA+vRW4pf6jyqcsla0khh8fdpvVTZ5pLrUhhc=";
   };
 
diff --git a/pkgs/by-name/fl/flottbot/package.nix b/pkgs/by-name/fl/flottbot/package.nix
index b61a7cbb66a6..7cb26990622e 100644
--- a/pkgs/by-name/fl/flottbot/package.nix
+++ b/pkgs/by-name/fl/flottbot/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "target";
     repo = "flottbot";
-    tag = version;
+    rev = version;
     hash = "sha256-Z17CkJhxIwoF3Fa0doDfE6N2eUtiBeEEhDwDUoWCCQ8=";
   };
 
diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix
index 8b40d3cb066c..f7e539bae1bc 100644
--- a/pkgs/by-name/fl/flowblade/package.nix
+++ b/pkgs/by-name/fl/flowblade/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jliljebl";
     repo = "flowblade";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5w8mGFPOawbUwinzVLSCUZWGxuyxhi1/3tOrmQyfUUg=";
   };
 
diff --git a/pkgs/by-name/fl/flowtime/package.nix b/pkgs/by-name/fl/flowtime/package.nix
index a3e0b18b491d..534c57904241 100644
--- a/pkgs/by-name/fl/flowtime/package.nix
+++ b/pkgs/by-name/fl/flowtime/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Diego-Ivan";
     repo = "Flowtime";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-J0Pscv0ZOpA/LV2mPTLOmDPQpfZhizTghatGnrJHToE=";
   };
 
diff --git a/pkgs/by-name/fl/fluent-gtk-theme/package.nix b/pkgs/by-name/fl/fluent-gtk-theme/package.nix
index 792a21001cd4..137f8a92dd1b 100644
--- a/pkgs/by-name/fl/fluent-gtk-theme/package.nix
+++ b/pkgs/by-name/fl/fluent-gtk-theme/package.nix
@@ -65,7 +65,7 @@ lib.checkListOfEnum "${pname}: theme variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = "fluent-gtk-theme";
-      tag = finalAttrs.version;
+      rev = finalAttrs.version;
       hash = "sha256-ONhW68UUrFiv5hxkR7XI8U/5+qM+tYLIS2OM05pqJi0=";
     };
 
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 d6febebb3dad..9897087b6870 100644
--- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
+++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fzyzcjy";
     repo = "flutter_rust_bridge";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pvKCiv7hUgetTXXp+NCs04Qo9xWaLUE2T1yHENhTGl4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index fc65c532abe5..ee82e71dbcf9 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fluxcd";
     repo = "flux2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = srcHash;
   };
 
diff --git a/pkgs/by-name/fl/fluxctl/package.nix b/pkgs/by-name/fl/fluxctl/package.nix
index 50e3f84d4136..5e2ed5b0f53e 100644
--- a/pkgs/by-name/fl/fluxctl/package.nix
+++ b/pkgs/by-name/fl/fluxctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = "flux";
-    tag = version;
+    rev = version;
     sha256 = "sha256-rKZ0fI9UN4oq6gfDMNR2+kCazlDexE1+UVzQ3xgkSA8=";
   };
 
diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix
index 8225833588a8..c915657f0c08 100644
--- a/pkgs/by-name/fl/fly/package.nix
+++ b/pkgs/by-name/fl/fly/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-myvYACdTqnEb8aBpBeCA1qvcnF0lwYbSo6kMgSz7iiA=";
   };
 
diff --git a/pkgs/by-name/fl/flycast/package.nix b/pkgs/by-name/fl/flycast/package.nix
index d8155edf93b8..9753ca8e4978 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1Rso7/S95+8KPoKa+3oFPJBWE+YGw4Qqo3Hn+crxNio=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index 355aceec4315..35b6127ae73b 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eCAnOoP5YQL/UCKex/lGiY28JswJTBmg+AIRrrDaAmc=";
   };
 
diff --git a/pkgs/by-name/fm/fm-tune/package.nix b/pkgs/by-name/fm/fm-tune/package.nix
index 2c3716cfc07c..8240b2d652f1 100644
--- a/pkgs/by-name/fm/fm-tune/package.nix
+++ b/pkgs/by-name/fm/fm-tune/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "viraptor";
     repo = "fm_tune";
-    tag = version;
+    rev = version;
     hash = "sha256-pwL2G1Ni1Ixw/N0diSoGGIoVrtmF92mWZ5i57OOvkX4=";
   };
 
diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix
index d620b9e09ec4..2ecde032d33a 100644
--- a/pkgs/by-name/fn/fn-cli/package.nix
+++ b/pkgs/by-name/fn/fn-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fnproject";
     repo = "cli";
-    tag = version;
+    rev = version;
     hash = "sha256-myLoLpEiyVTDsFx97AFiS9KNAOQd7NU+W8PJl95a7k0=";
   };
 
diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix
index 289e16d671c5..08862d304a6f 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";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-0rRwIbOciPepo+ApvJiK5IyhMdq/4jsMlCSv0UeDETs=";
   };
diff --git a/pkgs/by-name/fn/fnm/package.nix b/pkgs/by-name/fn/fnm/package.nix
index 0f855d5a8615..43905399e693 100644
--- a/pkgs/by-name/fn/fnm/package.nix
+++ b/pkgs/by-name/fn/fnm/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Schniz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WW+jWaClDn78Fw/xj6WvnEUlBI99HA5hQFUpwsYKmbI=";
   };
 
diff --git a/pkgs/by-name/fn/fnott/package.nix b/pkgs/by-name/fn/fnott/package.nix
index 2208418f4f64..77d998ea5929 100644
--- a/pkgs/by-name/fn/fnott/package.nix
+++ b/pkgs/by-name/fn/fnott/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "fnott";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-C0GvpjOrcelk/KNNDQ7/02Ai7xy8FVzmLcuC2je5wYA=";
   };
 
diff --git a/pkgs/by-name/fo/focus-stack/package.nix b/pkgs/by-name/fo/focus-stack/package.nix
index b456fef60015..683a42192274 100644
--- a/pkgs/by-name/fo/focus-stack/package.nix
+++ b/pkgs/by-name/fo/focus-stack/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PetteriAimonen";
     repo = "focus-stack";
-    tag = version;
+    rev = version;
     hash = "sha256-SoECgBMjWI+n7H6p3hf8J5E9UCLHGiiz5WAsEEioJsU=";
   };
 
diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix
index 8de99716e60f..c942a2e62d71 100644
--- a/pkgs/by-name/fo/follow/package.nix
+++ b/pkgs/by-name/fo/follow/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RSSNext";
     repo = "Follow";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TPzrQo6214fXQmF45p5agQ1zqLYzpmMpYb89ASPsWio=";
   };
 
diff --git a/pkgs/by-name/fo/fondo/package.nix b/pkgs/by-name/fo/fondo/package.nix
index d7d9ee28069f..51eafc5f8450 100644
--- a/pkgs/by-name/fo/fondo/package.nix
+++ b/pkgs/by-name/fo/fondo/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "calo001";
     repo = "fondo";
-    tag = version;
+    rev = version;
     sha256 = "sha256-JiDbkVs+EZRWRohSiuh8xFFgEhbnMYZfnZtz5Z4Wdb0=";
   };
 
diff --git a/pkgs/by-name/fo/font-config-info/package.nix b/pkgs/by-name/fo/font-config-info/package.nix
index d3146b430e8f..db25a630cbaa 100644
--- a/pkgs/by-name/fo/font-config-info/package.nix
+++ b/pkgs/by-name/fo/font-config-info/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "derat";
     repo = "font-config-info";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "14z7hg9c7q8wliyqv68kp080mmk2rh6kpww6pn87hy7lwq20l2b7";
   };
 
diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix
index ae512ee612b2..243c36a26c87 100644
--- a/pkgs/by-name/fo/font-manager/package.nix
+++ b/pkgs/by-name/fo/font-manager/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FontManager";
     repo = "font-manager";
-    tag = version;
+    rev = version;
     hash = "sha256-x7ZRC/xwF6Y2BhbtApVZ4hPZGNGaJiilqpxLyax9r2g=";
   };
 
diff --git a/pkgs/by-name/fo/fontfinder/package.nix b/pkgs/by-name/fo/fontfinder/package.nix
index 0cfc389d8295..bde673c84a56 100644
--- a/pkgs/by-name/fo/fontfinder/package.nix
+++ b/pkgs/by-name/fo/fontfinder/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mmstick";
     repo = "fontfinder";
-    tag = version;
+    rev = version;
     hash = "sha256-C4KqEdqToVnPXFPWvNkl/md9L2W4NxRd5jvZ4E7CtfA=";
   };
 
diff --git a/pkgs/by-name/fo/fontfor/package.nix b/pkgs/by-name/fo/fontfor/package.nix
index 5317d97916c7..165b36aab0a5 100644
--- a/pkgs/by-name/fo/fontfor/package.nix
+++ b/pkgs/by-name/fo/fontfor/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "7sDream";
     repo = "fontfor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gJl9SPL/KeYFzKIjwWPVR1iVy6h/W7OP7xE7krhYaY8=";
   };
 
diff --git a/pkgs/by-name/fo/fontforge/package.nix b/pkgs/by-name/fo/fontforge/package.nix
index 6837d6ec53d3..86d50584db48 100644
--- a/pkgs/by-name/fo/fontforge/package.nix
+++ b/pkgs/by-name/fo/fontforge/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fontforge";
     repo = "fontforge";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/RYhvL+Z4n4hJ8dmm+jbA1Ful23ni2DbCRZC5A3+pP0=";
   };
 
diff --git a/pkgs/by-name/fo/fontpreview/package.nix b/pkgs/by-name/fo/fontpreview/package.nix
index ca3be8f702c8..5ec5203c870c 100644
--- a/pkgs/by-name/fo/fontpreview/package.nix
+++ b/pkgs/by-name/fo/fontpreview/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sdushantha";
     repo = "fontpreview";
-    tag = version;
+    rev = version;
     sha256 = "0g3i2k6n2yhp88rrcf0hp6ils7836db7hx73hw9qnpcbmckz0i4w";
   };
 
diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix
index 5615fb1efe89..b667d212b46b 100644
--- a/pkgs/by-name/fo/foot/package.nix
+++ b/pkgs/by-name/fo/foot/package.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "foot";
-    tag = version;
+    rev = version;
     hash = "sha256:19hkw4g2l00wasmk5dn34rf3bhqh6zbwwhvz98bdcv90p761jws4";
   };
 
diff --git a/pkgs/by-name/fo/forge-sparks/package.nix b/pkgs/by-name/fo/forge-sparks/package.nix
index b28a8d5eb7db..64f78c60b953 100644
--- a/pkgs/by-name/fo/forge-sparks/package.nix
+++ b/pkgs/by-name/fo/forge-sparks/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rafaelmardojai";
     repo = "forge-sparks";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-H607u/VBuzzoYrYZc8fLqCQMZ+jRJOVZ34U8yKHfmYk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fo/fork-cleaner/package.nix b/pkgs/by-name/fo/fork-cleaner/package.nix
index f2fcd76e0166..3ccc31f2d3e7 100644
--- a/pkgs/by-name/fo/fork-cleaner/package.nix
+++ b/pkgs/by-name/fo/fork-cleaner/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "fork-cleaner";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JNmpcDwmxR+s4regOWz8FAJllBNRfOCmVwkDs7tlChA=";
   };
 
diff --git a/pkgs/by-name/fo/formatter/package.nix b/pkgs/by-name/fo/formatter/package.nix
index 6367ebbf05ab..634ca15c9c3e 100644
--- a/pkgs/by-name/fo/formatter/package.nix
+++ b/pkgs/by-name/fo/formatter/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Djaler";
     repo = "Formatter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-8lZ0jUwHuc3Kntz73Btj6dJvkW2bvShu2KWTSQszbJo=";
   };
 
diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix
index 46219e06f887..1469d6233642 100644
--- a/pkgs/by-name/fo/fortune-kind/package.nix
+++ b/pkgs/by-name/fo/fortune-kind/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cafkafk";
     repo = "fortune-kind";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Tpg0Jq2EhkwQuz5ZOtv6Rb5YESSlmzLoJPTxYJNNgac=";
   };
 
diff --git a/pkgs/by-name/fo/foxmarks/package.nix b/pkgs/by-name/fo/foxmarks/package.nix
index 1c5aa6e55c92..984239dfb0b9 100644
--- a/pkgs/by-name/fo/foxmarks/package.nix
+++ b/pkgs/by-name/fo/foxmarks/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zer0-x";
     repo = "foxmarks";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6lJ9acVo444RMxc3wUakBz4zT74oNUpwoP69rdf2mmE=";
   };
 
diff --git a/pkgs/by-name/fp/fpp/package.nix b/pkgs/by-name/fp/fpp/package.nix
index 8b62c31cdfe7..c065782c33ea 100644
--- a/pkgs/by-name/fp/fpp/package.nix
+++ b/pkgs/by-name/fp/fpp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "PathPicker";
-    tag = version;
+    rev = version;
     sha256 = "sha256-4BkdGvG/RyF3JBnd/X5r5nboEHG4aqahcYHDunMv2zU=";
   };
 
diff --git a/pkgs/by-name/fp/fprettify/package.nix b/pkgs/by-name/fp/fprettify/package.nix
index 6cc173ed96d0..5443dcf9647f 100644
--- a/pkgs/by-name/fp/fprettify/package.nix
+++ b/pkgs/by-name/fp/fprettify/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pseewald";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "17v52rylmsy3m3j5fcb972flazykz2rvczqfh8mxvikvd6454zyj";
   };
 
diff --git a/pkgs/by-name/fq/fq/package.nix b/pkgs/by-name/fq/fq/package.nix
index 16bb24005826..b388edd34a3f 100644
--- a/pkgs/by-name/fq/fq/package.nix
+++ b/pkgs/by-name/fq/fq/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wader";
     repo = "fq";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-I3mVAPNWjRHG0td1ulzGOthiNybfWLx1HgwPjFfBHCo=";
   };
 
diff --git a/pkgs/by-name/fr/frangipanni/package.nix b/pkgs/by-name/fr/frangipanni/package.nix
index 1efcd7843a5f..1a0711f1bf6c 100644
--- a/pkgs/by-name/fr/frangipanni/package.nix
+++ b/pkgs/by-name/fr/frangipanni/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "birchb1024";
     repo = "frangipanni";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jIXyqwZWfCBSDTTodHTct4V5rjYv7h4Vcw7cXOFk17w=";
   };
 
diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix
index 3d5bf88b17cc..ddf57d3fd792 100644
--- a/pkgs/by-name/fr/fre/package.nix
+++ b/pkgs/by-name/fr/fre/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "camdencheek";
     repo = "fre";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cYqEPohqUmewvBUoGJQfa4ATxw2uny5+nUKtNzrxK38=";
   };
 
diff --git a/pkgs/by-name/fr/freac/package.nix b/pkgs/by-name/fr/freac/package.nix
index fa485d9da1a2..15f374baf8bb 100644
--- a/pkgs/by-name/fr/freac/package.nix
+++ b/pkgs/by-name/fr/freac/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "enzo1982";
     repo = "freac";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bHoRxxhSM7ipRkiBG7hEa1Iw8Z3tOHQ/atngC/3X1a4=";
   };
 
diff --git a/pkgs/by-name/fr/frece/package.nix b/pkgs/by-name/fr/frece/package.nix
index 396d00d98aaa..806c1496418b 100644
--- a/pkgs/by-name/fr/frece/package.nix
+++ b/pkgs/by-name/fr/frece/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "YodaEmbedding";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CAiIqT5KuzrqbV9FVK3nZUe8MDs2KDdsKplJMI7rN9w=";
   };
 
diff --git a/pkgs/by-name/fr/freebayes/package.nix b/pkgs/by-name/fr/freebayes/package.nix
index cdbde42007e9..8d8b832d5a47 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";
-    tag = "v${version}";
+    rev = "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 d967d7d3183e..642c2fdf55a4 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -68,7 +68,7 @@ freecad-utils.makeCustomizable (
     src = fetchFromGitHub {
       owner = "FreeCAD";
       repo = "FreeCAD";
-      tag = finalAttrs.version;
+      rev = finalAttrs.version;
       hash = "sha256-u7RYSImUMAgKaAQSAGCFha++RufpZ/QuHAirbSFOUCI=";
       fetchSubmodules = true;
     };
diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index fa516f1bc602..91b50105ce87 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FreeRDP";
     repo = "FreeRDP";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-3hBssoD6l0d1DC5SRhE7HQlcoxNPjz3G8jbQx2rzp60=";
   };
 
diff --git a/pkgs/by-name/fr/freewheeling/package.nix b/pkgs/by-name/fr/freewheeling/package.nix
index 5198de376ded..039604733b56 100644
--- a/pkgs/by-name/fr/freewheeling/package.nix
+++ b/pkgs/by-name/fr/freewheeling/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "free-wheeling";
     repo = "freewheeling";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4";
   };
 
diff --git a/pkgs/by-name/fr/freeze/package.nix b/pkgs/by-name/fr/freeze/package.nix
index cdaf8540e0e9..38846028c086 100644
--- a/pkgs/by-name/fr/freeze/package.nix
+++ b/pkgs/by-name/fr/freeze/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "optiv";
     repo = "Freeze";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BE5MvCU+NfEccauOdWNty/FwMiWwLttPh7eE9+UzEMY=";
   };
 
diff --git a/pkgs/by-name/fr/frei/package.nix b/pkgs/by-name/fr/frei/package.nix
index b33a3a93a44e..8ad8cf1a7f5c 100644
--- a/pkgs/by-name/fr/frei/package.nix
+++ b/pkgs/by-name/fr/frei/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alexcoder04";
     repo = "frei";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jCUr3fREawA0J8Q0U07wCpBQrjPyH0l/6tih6C9kJWc=";
   };
 
diff --git a/pkgs/by-name/fr/frei0r/package.nix b/pkgs/by-name/fr/frei0r/package.nix
index d2a4e6992135..77df045e964d 100644
--- a/pkgs/by-name/fr/frei0r/package.nix
+++ b/pkgs/by-name/fr/frei0r/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dyne";
     repo = "frei0r";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uKYCJD88TnrJTTnzCCietNt01QPeFW+hhnjcBNKUWsY=";
   };
 
diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix
index d4db49794a86..126e6526f6a1 100644
--- a/pkgs/by-name/fr/fricas/package.nix
+++ b/pkgs/by-name/fr/fricas/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fricas";
     repo = "fricas";
-    tag = version;
+    rev = version;
     sha256 = "sha256-EX/boSs6rK4RrJ5W6Rd0TSHsbQsNiFI1evFuNPBMeu8=";
   };
 
diff --git a/pkgs/by-name/fr/friture/package.nix b/pkgs/by-name/fr/friture/package.nix
index f3c1202ed7f5..9f729bda96f3 100644
--- a/pkgs/by-name/fr/friture/package.nix
+++ b/pkgs/by-name/fr/friture/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tlecomte";
     repo = "friture";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1Swkk7bhQTSo17Gj0i1VNiIt+fSXgDIeWfJ9LpoUEHg=";
   };
 
diff --git a/pkgs/by-name/fr/frogmouth/package.nix b/pkgs/by-name/fr/frogmouth/package.nix
index 38a07d0fc6fb..29680ad507a5 100644
--- a/pkgs/by-name/fr/frogmouth/package.nix
+++ b/pkgs/by-name/fr/frogmouth/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "frogmouth";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0fcCON/M9JklE7X9aRfzTkEFG4ckJqLoQlYCSrWHHGQ=";
   };
 
diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix
index 55f587818824..09708fd6130a 100644
--- a/pkgs/by-name/fr/frp/package.nix
+++ b/pkgs/by-name/fr/frp/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fatedier";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-speKU15zsg7jpPP3X6/QovHWtQxzHbVMWz4YLsZhE8A=";
   };
 
diff --git a/pkgs/by-name/fr/frugal/package.nix b/pkgs/by-name/fr/frugal/package.nix
index 4ea3018b8a48..2380581c5e7a 100644
--- a/pkgs/by-name/fr/frugal/package.nix
+++ b/pkgs/by-name/fr/frugal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Workiva";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-giPlv3pf0hz2zlQ/9o12SGfwFLCtpN96tfQwP9AaPNo=";
   };
 
diff --git a/pkgs/by-name/fs/fsarchiver/package.nix b/pkgs/by-name/fs/fsarchiver/package.nix
index efa3d315cd18..90068d7cfcbf 100644
--- a/pkgs/by-name/fs/fsarchiver/package.nix
+++ b/pkgs/by-name/fs/fsarchiver/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "fdupoux";
     repo = "fsarchiver";
-    tag = version;
+    rev = version;
     sha256 = "sha256-bEwNqPQRpjfOVTUog9wsZfS5yQ7Z21pHolPRLlbzHAA=";
   };
 
diff --git a/pkgs/by-name/fs/fscan/package.nix b/pkgs/by-name/fs/fscan/package.nix
index 1ee3daeed709..857539e1077f 100644
--- a/pkgs/by-name/fs/fscan/package.nix
+++ b/pkgs/by-name/fs/fscan/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shadow1ng";
     repo = "fscan";
-    tag = version;
+    rev = version;
     hash = "sha256-paW48xpxl/d3abDsBCPwbmSZ8yoFhlTU+VPg/Egq0eY=";
   };
 
diff --git a/pkgs/by-name/fs/fscrypt-experimental/package.nix b/pkgs/by-name/fs/fscrypt-experimental/package.nix
index 7dcf19d13430..71f1f63a0773 100644
--- a/pkgs/by-name/fs/fscrypt-experimental/package.nix
+++ b/pkgs/by-name/fs/fscrypt-experimental/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscrypt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-US1jw0XK1BcP037XPhttzBloDU62m4BVSIbsGs9LaJU=";
   };
 
diff --git a/pkgs/by-name/fs/fsearch/package.nix b/pkgs/by-name/fs/fsearch/package.nix
index 88f384acfe79..6d32a282d7c1 100644
--- a/pkgs/by-name/fs/fsearch/package.nix
+++ b/pkgs/by-name/fs/fsearch/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cboxdoerfer";
     repo = "fsearch";
-    tag = version;
+    rev = version;
     hash = "sha256-VBcoDxh4ip2zLBcXVHDe9s1lVRQF4bZJKsGUt6sPcos=";
   };
 
diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix
index c729d1707b17..78d06b0c0f9a 100644
--- a/pkgs/by-name/fs/fselect/package.nix
+++ b/pkgs/by-name/fs/fselect/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jhspetersson";
     repo = "fselect";
-    tag = version;
+    rev = version;
     sha256 = "sha256-S7SFcOhFl5dVgUl2qlsE/Bizq8v0NPKPqBggzPGoOu8=";
   };
 
diff --git a/pkgs/by-name/fs/fsharp/package.nix b/pkgs/by-name/fs/fsharp/package.nix
index b382dd7ff90b..716d637a84e8 100644
--- a/pkgs/by-name/fs/fsharp/package.nix
+++ b/pkgs/by-name/fs/fsharp/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "fsharp";
-    tag = version;
+    rev = version;
     sha256 = "sha256-dgTEM2aL8lVjVMuW0+HLc+TUA39IiuBv/RfHYNURh5s=";
   };
 
diff --git a/pkgs/by-name/fs/fsql/package.nix b/pkgs/by-name/fs/fsql/package.nix
index b4c25d9bc8d3..56b9215027f6 100644
--- a/pkgs/by-name/fs/fsql/package.nix
+++ b/pkgs/by-name/fs/fsql/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kshvmdn";
     repo = "fsql";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-U6TPszqsZvoz+9GIB0wNYMRJqIDLOp/BZO3/k8FC0Gs=";
   };
 
diff --git a/pkgs/by-name/fs/fsrx/package.nix b/pkgs/by-name/fs/fsrx/package.nix
index 9b52dd5b9c09..b917a5454cbd 100644
--- a/pkgs/by-name/fs/fsrx/package.nix
+++ b/pkgs/by-name/fs/fsrx/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "thatvegandev";
     repo = "fsrx";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA=";
   };
 
diff --git a/pkgs/by-name/fs/fstrm/package.nix b/pkgs/by-name/fs/fstrm/package.nix
index 4c0edeedd12d..899ee38533a0 100644
--- a/pkgs/by-name/fs/fstrm/package.nix
+++ b/pkgs/by-name/fs/fstrm/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "farsightsec";
     repo = "fstrm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/WFP2g3Vuf/qaY8pprY8XFAlpEE+0SJUlFNWfa+7ZlE=";
   };
 
diff --git a/pkgs/by-name/ft/ftgl/package.nix b/pkgs/by-name/ft/ftgl/package.nix
index 2068a7c4c328..6de0411e833c 100644
--- a/pkgs/by-name/ft/ftgl/package.nix
+++ b/pkgs/by-name/ft/ftgl/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "frankheckenbach";
     repo = "ftgl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6TDNGoMeBLnucmHRgEDIVWcjlJb7N0sTluqBwRMMWn4=";
   };
 
diff --git a/pkgs/by-name/fu/fuc/package.nix b/pkgs/by-name/fu/fuc/package.nix
index f7fed7307c76..8783a634fc47 100644
--- a/pkgs/by-name/fu/fuc/package.nix
+++ b/pkgs/by-name/fu/fuc/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SUPERCILEX";
     repo = "fuc";
-    tag = version;
+    rev = version;
     hash = "sha256-ZEiMyX85woPOKaMtw8qqrUXUhY8Ewm71I25inUMH1GQ=";
   };
 
diff --git a/pkgs/by-name/fu/fuchsia-cursor/package.nix b/pkgs/by-name/fu/fuchsia-cursor/package.nix
index ef6b5713c31a..2d567fd33410 100644
--- a/pkgs/by-name/fu/fuchsia-cursor/package.nix
+++ b/pkgs/by-name/fu/fuchsia-cursor/package.nix
@@ -31,7 +31,7 @@ lib.checkListOfEnum "${pname}: theme variants" [ "Fuchsia" "Fuchsia-Pop" "Fuchsi
     src = fetchFromGitHub {
       owner = "ful1e5";
       repo = "fuchsia-cursor";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-WnDtUsjRXT7bMppgwU5BIDqphP69DmPzQM/0qXES5tM=";
     };
 
diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix
index 724543b86928..2b375496b83e 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 = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CfkHGHxeDUxHWX98FgmA4RNCVlgi9XA9eYkb+G5cZTA=";
     # 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/fu/function-runner/package.nix b/pkgs/by-name/fu/function-runner/package.nix
index 115e00d39c06..a64b9788accb 100644
--- a/pkgs/by-name/fu/function-runner/package.nix
+++ b/pkgs/by-name/fu/function-runner/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "function-runner";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-i1RxK5NlKNV0mVm4vio557pM2claBTHTo8vmaNQPEvw=";
   };
 
diff --git a/pkgs/by-name/fu/functionalplus/package.nix b/pkgs/by-name/fu/functionalplus/package.nix
index faf25febb74a..e86e15666de8 100644
--- a/pkgs/by-name/fu/functionalplus/package.nix
+++ b/pkgs/by-name/fu/functionalplus/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Dobiasd";
     repo = "FunctionalPlus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eKCOi5g8YdKgxaI/mLlqB2m1zwrU9DOSrQF+PW2DBBQ=";
   };
 
diff --git a/pkgs/by-name/fu/fundoc/package.nix b/pkgs/by-name/fu/fundoc/package.nix
index 8ca8ab852970..fb1dfc72d2ae 100644
--- a/pkgs/by-name/fu/fundoc/package.nix
+++ b/pkgs/by-name/fu/fundoc/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "daynin";
     repo = "fundoc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8WWaYgfqGWrTV2EEeSPz1BN2ur7gsxFiHeDNMJdVDcw=";
   };
 
diff --git a/pkgs/by-name/fu/funzzy/package.nix b/pkgs/by-name/fu/funzzy/package.nix
index 7d6c1523ecc3..64b5ae43073b 100644
--- a/pkgs/by-name/fu/funzzy/package.nix
+++ b/pkgs/by-name/fu/funzzy/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cristianoliveira";
     repo = "funzzy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3EHZvgHlM3ldX6SEyqGf6MZIrDFOLXbKTZnJNczT570=";
   };
 
diff --git a/pkgs/by-name/fu/fuse-overlayfs/package.nix b/pkgs/by-name/fu/fuse-overlayfs/package.nix
index 9832c83f4e3b..dccfb4c24a64 100644
--- a/pkgs/by-name/fu/fuse-overlayfs/package.nix
+++ b/pkgs/by-name/fu/fuse-overlayfs/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "fuse-overlayfs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A70AxYPKph/5zRNFRDWrwl8Csc8Vf1gmOLJ39ixJgL0=";
   };
 
diff --git a/pkgs/by-name/fu/fusionInventory/package.nix b/pkgs/by-name/fu/fusionInventory/package.nix
index 6b69cf90da78..4c73b269217c 100644
--- a/pkgs/by-name/fu/fusionInventory/package.nix
+++ b/pkgs/by-name/fu/fusionInventory/package.nix
@@ -18,7 +18,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "fusioninventory";
     repo = "fusioninventory-agent";
-    tag = version;
+    rev = version;
     sha256 = "1hbp5a9m03n6a80xc8z640zs71qhqk4ifafr6fp0vvzzvq097ip2";
   };
 
diff --git a/pkgs/by-name/fu/fuzzel/package.nix b/pkgs/by-name/fu/fuzzel/package.nix
index 309541dc88a4..beb5d346dbcb 100644
--- a/pkgs/by-name/fu/fuzzel/package.nix
+++ b/pkgs/by-name/fu/fuzzel/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "fuzzel";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-FM5HvPfLVmuKpS3/0m2QM/lSRcWsVpnwtJ++L3Uo5Dc=";
   };
 
diff --git a/pkgs/by-name/fu/fuzzylite/package.nix b/pkgs/by-name/fu/fuzzylite/package.nix
index 75a851a6550f..3bdc571d12c5 100644
--- a/pkgs/by-name/fu/fuzzylite/package.nix
+++ b/pkgs/by-name/fu/fuzzylite/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fuzzylite";
     repo = "fuzzylite";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-i1txeUE/ZSRggwLDtpS8dd4uuZfHX9w3zRH0gBgGXnk=";
   };
   sourceRoot = "${src.name}/fuzzylite";
diff --git a/pkgs/by-name/fv/fvwm2/package.nix b/pkgs/by-name/fv/fvwm2/package.nix
index e235a950caf7..52b9f2059022 100644
--- a/pkgs/by-name/fv/fvwm2/package.nix
+++ b/pkgs/by-name/fv/fvwm2/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fvwmorg";
     repo = "fvwm";
-    tag = version;
+    rev = version;
     hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg=";
   };
 
diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix
index de6c8704c15d..6ab018ebb4c0 100644
--- a/pkgs/by-name/fv/fvwm3/package.nix
+++ b/pkgs/by-name/fv/fvwm3/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fvwmorg";
     repo = "fvwm3";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-y1buTWO1vHzloh2e4EK1dkD0uQa7lIFUbNMkEe5x6Vo=";
   };
 
diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix
index a268832a3e98..5bc5eb315ebd 100644
--- a/pkgs/by-name/fw/fw/package.nix
+++ b/pkgs/by-name/fw/fw/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "brocode";
     repo = "fw";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bq8N49qArdF0EFIGiK4lCsC0CZxwmeo0R8OiehrifTg=";
   };
 
diff --git a/pkgs/by-name/fw/fwanalyzer/package.nix b/pkgs/by-name/fw/fwanalyzer/package.nix
index f5617c719132..667c558f9693 100644
--- a/pkgs/by-name/fw/fwanalyzer/package.nix
+++ b/pkgs/by-name/fw/fwanalyzer/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cruise-automation";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-fcqtyfpxdjD+1GsYl05RSJaFDoLSYQDdWcQV6a+vNGA=";
   };
 
diff --git a/pkgs/by-name/fx/fx-cast-bridge/package.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix
index 253add9458b8..99e7e80a9431 100644
--- a/pkgs/by-name/fx/fx-cast-bridge/package.nix
+++ b/pkgs/by-name/fx/fx-cast-bridge/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "hensm";
     repo = "fx_cast";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg=";
   };
   sourceRoot = "${src.name}/app";
diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix
index a83d7d58b881..85130c463ffa 100644
--- a/pkgs/by-name/fx/fx/package.nix
+++ b/pkgs/by-name/fx/fx/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "antonmedv";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-EirlA/gcW77UP9I4pVCjjG3pSYnCPw+idX9YS1izEpY=";
   };
 
diff --git a/pkgs/by-name/fy/fyi/package.nix b/pkgs/by-name/fy/fyi/package.nix
index 5dd2ba51e6e4..cf6cc59ddc40 100644
--- a/pkgs/by-name/fy/fyi/package.nix
+++ b/pkgs/by-name/fy/fyi/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "fyi";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-UGkShHziREQTkQUlbFXT1144BiBApFVbCvu5A1DuoMI=";
   };
 
diff --git a/pkgs/by-name/fy/fypp/package.nix b/pkgs/by-name/fy/fypp/package.nix
index 20e9f6611db8..391b1f4db6ea 100644
--- a/pkgs/by-name/fy/fypp/package.nix
+++ b/pkgs/by-name/fy/fypp/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "aradi";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-MgGVlOqOIrIVoDfBMVpFLT26mhYndxans2hfo/+jdoA=";
   };
 
diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix
index 2d48082e2997..4be376fac6d2 100644
--- a/pkgs/by-name/fz/fzf-make/package.nix
+++ b/pkgs/by-name/fz/fzf-make/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kyu08";
     repo = "fzf-make";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OioPl2uJVepMsR1PYHpASj3yQ10bCaGFxI1wQR61EsA=";
   };
 
diff --git a/pkgs/by-name/fz/fzf-obc/package.nix b/pkgs/by-name/fz/fzf-obc/package.nix
index f4433da724d3..eaecae3adce8 100644
--- a/pkgs/by-name/fz/fzf-obc/package.nix
+++ b/pkgs/by-name/fz/fzf-obc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rockandska";
     repo = "fzf-obc";
-    tag = version;
+    rev = version;
     sha256 = "sha256-KIAlDpt1Udl+RLp3728utgQ9FCjZz/OyoG92MOJmgPI=";
   };
 
diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix
index a9a8cdbaf9f6..5ca024df633f 100644
--- a/pkgs/by-name/fz/fzf/package.nix
+++ b/pkgs/by-name/fz/fzf/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PKfVG2eYsg3J1OixDzXsmxCtsuFhdEGyxuYtwPEdVi8=";
   };
 
diff --git a/pkgs/by-name/fz/fzy/package.nix b/pkgs/by-name/fz/fzy/package.nix
index cd44741397ce..98842aa0cb97 100644
--- a/pkgs/by-name/fz/fzy/package.nix
+++ b/pkgs/by-name/fz/fzy/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jhawthorn";
     repo = "fzy";
-    tag = version;
+    rev = version;
     sha256 = "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k";
   };
 
diff --git a/pkgs/by-name/g3/g3kb-switch/package.nix b/pkgs/by-name/g3/g3kb-switch/package.nix
index 8095ddf8730b..d6851ceb9004 100644
--- a/pkgs/by-name/g3/g3kb-switch/package.nix
+++ b/pkgs/by-name/g3/g3kb-switch/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lyokha";
     repo = "g3kb-switch";
-    tag = version;
+    rev = version;
     hash = "sha256-kTJfV0xQmWuxibUlfC1qJX2J2nrZ4wimdf/nGciQq0Y=";
   };
 
diff --git a/pkgs/by-name/ga/gabutdm/package.nix b/pkgs/by-name/ga/gabutdm/package.nix
index e6eb8cb6a72e..1744c4f01aa5 100644
--- a/pkgs/by-name/ga/gabutdm/package.nix
+++ b/pkgs/by-name/ga/gabutdm/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gabutakut";
     repo = "gabutdm";
-    tag = version;
+    rev = version;
     hash = "sha256-FKOgoJ0QreYk3PgvUoQMczC3tXkthw86/Y3pnm6tTQk=";
   };
 
diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix
index bb9e94679ac1..b8266e9baf36 100644
--- a/pkgs/by-name/ga/galaxis/package.nix
+++ b/pkgs/by-name/ga/galaxis/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "esr";
     repo = "galaxis";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-fSzifGoSdWyFGt99slzAsqCMDoeLbBqQGXujX8QAfGc=";
   };
 
diff --git a/pkgs/by-name/ga/galerio/package.nix b/pkgs/by-name/ga/galerio/package.nix
index 6329866d51b3..eab5e1f4ba95 100644
--- a/pkgs/by-name/ga/galerio/package.nix
+++ b/pkgs/by-name/ga/galerio/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dbrgn";
     repo = "galerio";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JR/YfMUs5IHBRr3uYqHXLNcr23YHyDvgH2y/1ip+2Y8=";
   };
 
diff --git a/pkgs/by-name/ga/gambit-chess/package.nix b/pkgs/by-name/ga/gambit-chess/package.nix
index 54b7e4243b90..8a3485276625 100644
--- a/pkgs/by-name/ga/gambit-chess/package.nix
+++ b/pkgs/by-name/ga/gambit-chess/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maaslalani";
     repo = "gambit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RLbD9JK1yJn30WWg7KWDjJoj4WXIoy3Kb8t2F8rFPuk=";
   };
 
diff --git a/pkgs/by-name/ga/game-devices-udev-rules/package.nix b/pkgs/by-name/ga/game-devices-udev-rules/package.nix
index 7aed2d543895..f4b50120ef20 100644
--- a/pkgs/by-name/ga/game-devices-udev-rules/package.nix
+++ b/pkgs/by-name/ga/game-devices-udev-rules/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "fabiscafe";
     repo = "game-devices-udev";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-dWWo3qXnxdLP68NuFKM4/Cw5yE6uAsWzj0vZa9UTT0U=";
   };
 
diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix
index 74b04c4e3df8..2c22af0be73b 100644
--- a/pkgs/by-name/ga/game-rs/package.nix
+++ b/pkgs/by-name/ga/game-rs/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "amanse";
     repo = "game-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FuZl2yNre5jNSfHqF3tjiGwg5mRKbYer2FOPpLy0OrA=";
   };
 
diff --git a/pkgs/by-name/ga/gamecube-tools/package.nix b/pkgs/by-name/ga/gamecube-tools/package.nix
index 9adb34d8b7cd..edf3e5b21684 100644
--- a/pkgs/by-name/ga/gamecube-tools/package.nix
+++ b/pkgs/by-name/ga/gamecube-tools/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "devkitPro";
     repo = "gamecube-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GsTmwyxBc36Qg+UGy+cRAjGW1eh1XxV0s94B14ZJAjU=";
   };
 
diff --git a/pkgs/by-name/ga/gammu/package.nix b/pkgs/by-name/ga/gammu/package.nix
index fc6efc78a11f..e914f59357e4 100644
--- a/pkgs/by-name/ga/gammu/package.nix
+++ b/pkgs/by-name/ga/gammu/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gammu";
     repo = "gammu";
-    tag = version;
+    rev = version;
     sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I=";
   };
 
diff --git a/pkgs/by-name/ga/gandom-fonts/package.nix b/pkgs/by-name/ga/gandom-fonts/package.nix
index e3fd8efceeb1..13c9fe1b40ab 100644
--- a/pkgs/by-name/ga/gandom-fonts/package.nix
+++ b/pkgs/by-name/ga/gandom-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "gandom-font";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nez8T0TtRLyXxIIR69LrVGde5ThCvA0fLXkYLyYQRV8=";
   };
 
diff --git a/pkgs/by-name/ga/gargoyle/package.nix b/pkgs/by-name/ga/gargoyle/package.nix
index ea046cd6a955..7fb5dd5eb010 100644
--- a/pkgs/by-name/ga/gargoyle/package.nix
+++ b/pkgs/by-name/ga/gargoyle/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "garglk";
     repo = "garglk";
-    tag = version;
+    rev = version;
     sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz";
   };
 
diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index c60367a698b5..050d1db2b80c 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/YOC13ut1k48vx/LapcShNfi83LxbC62yxKuanlUI9k=";
   };
 
diff --git a/pkgs/by-name/ga/gavin-bc/package.nix b/pkgs/by-name/ga/gavin-bc/package.nix
index 63a3226f4fef..5cb9eaf1d887 100644
--- a/pkgs/by-name/ga/gavin-bc/package.nix
+++ b/pkgs/by-name/ga/gavin-bc/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "git.gavinhoward.com";
     owner = "gavin";
     repo = "bc";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-V0L5OmpcI0Zu5JvESjuhp4wEs5Bu/CvjF6B5WllTEqo=";
   };
 
diff --git a/pkgs/by-name/gb/gbenchmark/package.nix b/pkgs/by-name/gb/gbenchmark/package.nix
index 7c93d9dd19e8..10bcbd52c866 100644
--- a/pkgs/by-name/gb/gbenchmark/package.nix
+++ b/pkgs/by-name/gb/gbenchmark/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "benchmark";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5xDg1duixLoWIuy59WT0r5ZBAvTR6RPP7YrhBYkMxc8=";
   };
 
diff --git a/pkgs/by-name/gb/gbsplay/package.nix b/pkgs/by-name/gb/gbsplay/package.nix
index e0638fcf1efb..cf77782b3646 100644
--- a/pkgs/by-name/gb/gbsplay/package.nix
+++ b/pkgs/by-name/gb/gbsplay/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mmitch";
     repo = "gbsplay";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-I2T77HGuzp6IYQOd8RSaWYCXy8fwz7PtMxtO5IoAzdw=";
   };
 
diff --git a/pkgs/by-name/gc/gci/package.nix b/pkgs/by-name/gc/gci/package.nix
index fe50e58b37eb..a4a587971c0e 100644
--- a/pkgs/by-name/gc/gci/package.nix
+++ b/pkgs/by-name/gc/gci/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "daixiang0";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BlR7lQnp9WMjSN5IJOK2HIKXIAkn5Pemf8qbMm83+/w=";
   };
 
diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix
index b2e13a74ca4d..135790f60afc 100644
--- a/pkgs/by-name/gc/gcli/package.nix
+++ b/pkgs/by-name/gc/gcli/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "herrhotzenplotz";
     repo = "gcli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N5dzGhyXPDWcm/cNUSUQt4rR+PzaD1OUssRO3Sdfmoo=";
   };
 
diff --git a/pkgs/by-name/gc/gcov2lcov/package.nix b/pkgs/by-name/gc/gcov2lcov/package.nix
index 6d0c0dd2dc43..63c98769567b 100644
--- a/pkgs/by-name/gc/gcov2lcov/package.nix
+++ b/pkgs/by-name/gc/gcov2lcov/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jandelgado";
     repo = "gcov2lcov";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ifXpT5jGNaStqvzP5Rq6Hf6PFhpiKMRC+eSYOZfzt+s=";
   };
 
diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index cdf88354c95f..f7ddc88d40b4 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SWbIfAE/pmokhJO0rimfHqxqOH23HrJRTJHDikNC7TI=";
   };
 
diff --git a/pkgs/by-name/gc/gcstar/package.nix b/pkgs/by-name/gc/gcstar/package.nix
index eb89036fb65b..b9638506c33c 100644
--- a/pkgs/by-name/gc/gcstar/package.nix
+++ b/pkgs/by-name/gc/gcstar/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "Kerenoc";
     repo = "GCstar";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg=";
   };
 
diff --git a/pkgs/by-name/gd/gdlv/package.nix b/pkgs/by-name/gd/gdlv/package.nix
index 80faa829e3bf..87858f7a6752 100644
--- a/pkgs/by-name/gd/gdlv/package.nix
+++ b/pkgs/by-name/gd/gdlv/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aarzilli";
     repo = "gdlv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6NU7bhURdXM4EjVnsXVf9XFOUgHyVEI0kr15q9OnUTQ=";
   };
 
diff --git a/pkgs/by-name/gd/gdrive/package.nix b/pkgs/by-name/gd/gdrive/package.nix
index 699f36f71454..79da48c59a9c 100644
--- a/pkgs/by-name/gd/gdrive/package.nix
+++ b/pkgs/by-name/gd/gdrive/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prasmussen";
     repo = "gdrive";
-    tag = version;
+    rev = version;
     hash = "sha256-2dJmGFHfGSroucn4WgiV2NExBs5wtMDe2kX1jDBwbRs=";
   };
 
diff --git a/pkgs/by-name/gd/gdrive3/package.nix b/pkgs/by-name/gd/gdrive3/package.nix
index 3d4078bdd048..07dd3f449d13 100644
--- a/pkgs/by-name/gd/gdrive3/package.nix
+++ b/pkgs/by-name/gd/gdrive3/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "glotlabs";
     repo = "gdrive";
-    tag = version;
+    rev = version;
     hash = "sha256-1yJg+rEhKTGXC7mlHxnWGUuAm9/RwhD6/Xg/GBKyQMw=";
   };
 
diff --git a/pkgs/by-name/gd/gdtoolkit_3/package.nix b/pkgs/by-name/gd/gdtoolkit_3/package.nix
index d5ec6fd8a01d..8469a1a647d7 100644
--- a/pkgs/by-name/gd/gdtoolkit_3/package.nix
+++ b/pkgs/by-name/gd/gdtoolkit_3/package.nix
@@ -16,7 +16,7 @@ let
         src = fetchFromGitHub {
           owner = "lark-parser";
           repo = "lark";
-          tag = version;
+          rev = version;
           hash = "sha256-KN9buVlH8hJ8t0ZP5yefeYM5vH5Gg7a7TEDGKJYpozs=";
           fetchSubmodules = true;
         };
diff --git a/pkgs/by-name/gd/gdtoolkit_4/package.nix b/pkgs/by-name/gd/gdtoolkit_4/package.nix
index 6a54331f67fb..2c44701b0a67 100644
--- a/pkgs/by-name/gd/gdtoolkit_4/package.nix
+++ b/pkgs/by-name/gd/gdtoolkit_4/package.nix
@@ -16,7 +16,7 @@ let
         src = fetchFromGitHub {
           owner = "lark-parser";
           repo = "lark";
-          tag = version;
+          rev = version;
           hash = "sha256-Dc7wbMBY8CSeP4JE3hBk5m1lwzmCnNTkVoLdIukRw1Q=";
           fetchSubmodules = true;
         };
diff --git a/pkgs/by-name/ge/gebaar-libinput/package.nix b/pkgs/by-name/ge/gebaar-libinput/package.nix
index d207c03598e1..cba94577b938 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1kqcgwkia1p195xr082838dvj1gqif9d63i8a52jb0lc32zzizh6";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ge/geek-life/package.nix b/pkgs/by-name/ge/geek-life/package.nix
index ab1416569fd0..b84c87fe18e0 100644
--- a/pkgs/by-name/ge/geek-life/package.nix
+++ b/pkgs/by-name/ge/geek-life/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ajaxray";
     repo = "geek-life";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7B/4pDOVXef2MaWKvzkUZH0/KM/O1gJjI3xPjEXqc/E=";
   };
 
diff --git a/pkgs/by-name/ge/geeqie/package.nix b/pkgs/by-name/ge/geeqie/package.nix
index 28d8431412a8..34acd23d3e58 100644
--- a/pkgs/by-name/ge/geeqie/package.nix
+++ b/pkgs/by-name/ge/geeqie/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BestImageViewer";
     repo = "geeqie";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-k2FXj2ZKZzB5XpCcWzEv7Q1ozATfU3221XKcOFdWOGU=";
   };
 
diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix
index 34b8fb11733f..fe8db0de28c1 100644
--- a/pkgs/by-name/ge/geesefs/package.nix
+++ b/pkgs/by-name/ge/geesefs/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "yandex-cloud";
     repo = "geesefs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KkKdqSev6xpYfEjDSLVs/gKc3NCvLrzukNEQT2Wuk+A=";
   };
 
diff --git a/pkgs/by-name/ge/gef/package.nix b/pkgs/by-name/ge/gef/package.nix
index 1af39c799a84..8100e46bc53c 100644
--- a/pkgs/by-name/ge/gef/package.nix
+++ b/pkgs/by-name/ge/gef/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hugsy";
     repo = "gef";
-    tag = version;
+    rev = version;
     sha256 = "sha256-JM9zH1wWEdjpBafnxMIFtePjXWf3UOXhBSWZCXEOzKw=";
   };
 
diff --git a/pkgs/by-name/ge/gemget/package.nix b/pkgs/by-name/ge/gemget/package.nix
index ae36348694dd..96326b5fdbb1 100644
--- a/pkgs/by-name/ge/gemget/package.nix
+++ b/pkgs/by-name/ge/gemget/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "makeworld-the-better-one";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-P5+yRaf2HioKOclJMMm8bJ8/BtBbNEeYU57TceZVqQ8=";
   };
 
diff --git a/pkgs/by-name/ge/gemrb/package.nix b/pkgs/by-name/ge/gemrb/package.nix
index b8e496c63eea..69d139328916 100644
--- a/pkgs/by-name/ge/gemrb/package.nix
+++ b/pkgs/by-name/ge/gemrb/package.nix
@@ -33,7 +33,7 @@ let
   src = fetchFromGitHub {
     owner = "gemrb";
     repo = "gemrb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+aPnOJQGRblqcrblVU5ZwA8CZqeT19rxEtn3GLuofYU=";
   };
 
diff --git a/pkgs/by-name/ge/gen-license/package.nix b/pkgs/by-name/ge/gen-license/package.nix
index b63124cea6c6..d55dda6ebc21 100644
--- a/pkgs/by-name/ge/gen-license/package.nix
+++ b/pkgs/by-name/ge/gen-license/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nexxeln";
     repo = "license-generator";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-VOmt8JXd2+ykhkhupv/I4RfXz9P0eEesW3JGAoXStUI=";
   };
 
diff --git a/pkgs/by-name/ge/gen-oath-safe/package.nix b/pkgs/by-name/ge/gen-oath-safe/package.nix
index 70c379156bdb..170f154959bd 100644
--- a/pkgs/by-name/ge/gen-oath-safe/package.nix
+++ b/pkgs/by-name/ge/gen-oath-safe/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mcepl";
     repo = "gen-oath-safe";
-    tag = version;
+    rev = version;
     sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp";
   };
 
diff --git a/pkgs/by-name/ge/genact/package.nix b/pkgs/by-name/ge/genact/package.nix
index 05f4c30c4d44..00ecfe4e5c55 100644
--- a/pkgs/by-name/ge/genact/package.nix
+++ b/pkgs/by-name/ge/genact/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "genact";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Rn9kJWutWKPj9cLu2ZJKITmC+I8/ikhCAoIp00Yg6ZA=";
   };
 
diff --git a/pkgs/by-name/ge/genann/package.nix b/pkgs/by-name/ge/genann/package.nix
index 6fa6b175ff76..ccccceee85ff 100644
--- a/pkgs/by-name/ge/genann/package.nix
+++ b/pkgs/by-name/ge/genann/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "codeplea";
     repo = "genann";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0z45ndpd4a64i6jayr4yxfcr5h87bsmhm7lfgnbp35pnfywiclmq";
   };
 
diff --git a/pkgs/by-name/ge/genext2fs/package.nix b/pkgs/by-name/ge/genext2fs/package.nix
index be529fcea240..0a3fcaaa023b 100644
--- a/pkgs/by-name/ge/genext2fs/package.nix
+++ b/pkgs/by-name/ge/genext2fs/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bestouff";
     repo = "genext2fs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9LAU5XuCwwEhU985MzZ2X+YYibvyECULQSn9X2jdj5I=";
   };
 
diff --git a/pkgs/by-name/ge/genxword/package.nix b/pkgs/by-name/ge/genxword/package.nix
index 0cdca0d1a57f..a71628c42146 100644
--- a/pkgs/by-name/ge/genxword/package.nix
+++ b/pkgs/by-name/ge/genxword/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "riverrun";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "17h8saja45bv612yk0pra9ncbp2mjnx5n10q25nqhl765ks4bmb5";
   };
 
diff --git a/pkgs/by-name/ge/geo/package.nix b/pkgs/by-name/ge/geo/package.nix
index d18ecb19cb2d..2edea658c43d 100644
--- a/pkgs/by-name/ge/geo/package.nix
+++ b/pkgs/by-name/ge/geo/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "geo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lwFBevf3iP90LgnfUqweCjPBJPr2vMFtRqQXXUC+cRA=";
   };
 
diff --git a/pkgs/by-name/ge/geoipupdate/package.nix b/pkgs/by-name/ge/geoipupdate/package.nix
index 3cfc95d4b5b1..45a37d824c21 100644
--- a/pkgs/by-name/ge/geoipupdate/package.nix
+++ b/pkgs/by-name/ge/geoipupdate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maxmind";
     repo = "geoipupdate";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-XfQ5W2JbPBIAh5iF4jj9UJ4eLhhRHRwFPs0VWrBQVNA=";
   };
 
diff --git a/pkgs/by-name/ge/geonkick/package.nix b/pkgs/by-name/ge/geonkick/package.nix
index 4ec1f4e133e9..d54b9797d59c 100644
--- a/pkgs/by-name/ge/geonkick/package.nix
+++ b/pkgs/by-name/ge/geonkick/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "Geonkick-Synthesizer";
     repo = "geonkick";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QtBzrYW/yYnWSXyHV63gKzgdAR5kamij9Z0g+15CTPg=";
   };
 
diff --git a/pkgs/by-name/ge/gephi/package.nix b/pkgs/by-name/ge/gephi/package.nix
index 67f9ae4c06a3..731177a07cac 100644
--- a/pkgs/by-name/ge/gephi/package.nix
+++ b/pkgs/by-name/ge/gephi/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "gephi";
     repo = "gephi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZNSEaiD32zFfF2ISKa1CmcT9Nq6r5i2rNHooQAcVbn4=";
   };
 
diff --git a/pkgs/by-name/ge/gerbera/package.nix b/pkgs/by-name/ge/gerbera/package.nix
index a265cf9cbad2..f24956165ee8 100644
--- a/pkgs/by-name/ge/gerbera/package.nix
+++ b/pkgs/by-name/ge/gerbera/package.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "gerbera";
     owner = "gerbera";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3X8/8ewqXy9tvy4S9frmPENhsYTwaW6SydtJeiyVH1I=";
   };
 
diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix
index 297f11f438d9..d8910592aed6 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bisLln3Y239HuJt0MkrCU+6vLLbEDxfTjEJMkcbE/wE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ge/gerrit-queue/package.nix b/pkgs/by-name/ge/gerrit-queue/package.nix
index 7c44ec2573f7..f0558a1b55a5 100644
--- a/pkgs/by-name/ge/gerrit-queue/package.nix
+++ b/pkgs/by-name/ge/gerrit-queue/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "flokli";
     repo = "gerrit-queue";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JkAYqqet6y89RTBU9FuxkMwJiGM6opL0reXbojSal3Y=";
   };
   vendorHash = "sha256-+Ig4D46NphzpWKXO23Haea9EqVtpda8v9zLPJkbe3bQ=";
diff --git a/pkgs/by-name/ge/get_iplayer/package.nix b/pkgs/by-name/ge/get_iplayer/package.nix
index 71d49a2782cd..649acec9aa34 100644
--- a/pkgs/by-name/ge/get_iplayer/package.nix
+++ b/pkgs/by-name/ge/get_iplayer/package.nix
@@ -17,7 +17,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "get-iplayer";
     repo = "get_iplayer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fqzrgmtqy7dlmGEaTXAqpdt9HqZCVooJ0Vf6/JUKihw=";
   };
 
diff --git a/pkgs/by-name/ge/getdata/package.nix b/pkgs/by-name/ge/getdata/package.nix
index 43ccda1aec83..aef0692613c2 100644
--- a/pkgs/by-name/ge/getdata/package.nix
+++ b/pkgs/by-name/ge/getdata/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ketiltrout";
     repo = "getdata";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fuFakbkxDwDp6Z9VITPIB8NiYRSp98Ub1y5SC6W5S1E=";
   };
 
diff --git a/pkgs/by-name/ge/getoptions/package.nix b/pkgs/by-name/ge/getoptions/package.nix
index c7816bb19fa6..344658b1962a 100644
--- a/pkgs/by-name/ge/getoptions/package.nix
+++ b/pkgs/by-name/ge/getoptions/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ko1nksm";
     repo = "getoptions";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hapOGPibqt2Mm6k73v63gHxrX+lifZ8xcwzj8vWbtgo=";
   };
 
diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix
index cd1119805df4..53a20c7308a3 100644
--- a/pkgs/by-name/ge/gex/package.nix
+++ b/pkgs/by-name/ge/gex/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Piturnah";
     repo = "gex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Xer7a3UtFIv3idchI7DfZ5u6qgDW/XFWi5ihtcREXqo=";
   };
 
diff --git a/pkgs/by-name/gf/gflags/package.nix b/pkgs/by-name/gf/gflags/package.nix
index c87006e1783c..b01b862804e3 100644
--- a/pkgs/by-name/gf/gflags/package.nix
+++ b/pkgs/by-name/gf/gflags/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gflags";
     repo = "gflags";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0";
   };
 
diff --git a/pkgs/by-name/gf/gfold/package.nix b/pkgs/by-name/gf/gfold/package.nix
index 67896c95d620..9bd3a11726e9 100644
--- a/pkgs/by-name/gf/gfold/package.nix
+++ b/pkgs/by-name/gf/gfold/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "nickgerace";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-7PnqhS80Ozh5ZQNQ8iYgCiFT0JDLzhA09NV1HgrCOww=";
   };
 
diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix
index 1aa687da39b1..ac3834f5ad3f 100644
--- a/pkgs/by-name/gf/gforth/package.nix
+++ b/pkgs/by-name/gf/gforth/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "forthy42";
     repo = "gforth";
-    tag = version;
+    rev = version;
     hash = "sha256-rXtmmENBt9RMdLPq8GDyndh4+CYnCmz6NYpe3kH5OwU=";
   };
 
diff --git a/pkgs/by-name/gf/gfshare/package.nix b/pkgs/by-name/gf/gfshare/package.nix
index 77f30ea22186..98f402081649 100644
--- a/pkgs/by-name/gf/gfshare/package.nix
+++ b/pkgs/by-name/gf/gfshare/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.gitano.org.uk/libgfshare.git";
-    tag = version;
+    rev = version;
     sha256 = "0s37xn9pr5p820hd40489xwra7kg3gzqrxhc2j9rnxnd489hl0pr";
   };
 
diff --git a/pkgs/by-name/gf/gfxreconstruct/package.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix
index 6f2314b228a7..5c52ad7f60e4 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MuCdJoBFxKwDCOCltlU3oBS9elFS6F251dHjHcIb4Jg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gg/gg-scm/package.nix b/pkgs/by-name/gg/gg-scm/package.nix
index 498c8f177b6b..e3794f8bd258 100644
--- a/pkgs/by-name/gg/gg-scm/package.nix
+++ b/pkgs/by-name/gg/gg-scm/package.nix
@@ -21,7 +21,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "gg-scm";
     repo = "gg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qw0KWhCkJVYRhDBNtiNactWGGMHjBwdQ1Po4lQQbaj4=";
   };
   postPatch = ''
diff --git a/pkgs/by-name/gh/gh-actions-cache/package.nix b/pkgs/by-name/gh/gh-actions-cache/package.nix
index e3e574bd2489..0d48923a2874 100644
--- a/pkgs/by-name/gh/gh-actions-cache/package.nix
+++ b/pkgs/by-name/gh/gh-actions-cache/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "actions";
     repo = "gh-actions-cache";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GVha3xxLTBTiKfAjGb2q9btsGYzWQivGLyZ4Gg0s/N0=";
   };
 
diff --git a/pkgs/by-name/gh/gh-contribs/package.nix b/pkgs/by-name/gh/gh-contribs/package.nix
index 1881c9aa4fcb..46d11241d4f9 100644
--- a/pkgs/by-name/gh/gh-contribs/package.nix
+++ b/pkgs/by-name/gh/gh-contribs/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MintArchit";
     repo = "gh-contribs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fqyxq/lpMcLXOYY0MNI5uv8Go2erpg7dEIsEI+ExSVI=";
   };
 
diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix
index a0e2d2cfa554..b739d8d357ce 100644
--- a/pkgs/by-name/gh/gh-dash/package.nix
+++ b/pkgs/by-name/gh/gh-dash/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dlvhdr";
     repo = "gh-dash";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qtSJbp9BGX4669fl/B1Z6rGG3432Nj1IQ+aYfIE9W50=";
   };
 
diff --git a/pkgs/by-name/gh/gh-f/package.nix b/pkgs/by-name/gh/gh-f/package.nix
index 761eb0420d70..c479a1f875d5 100644
--- a/pkgs/by-name/gh/gh-f/package.nix
+++ b/pkgs/by-name/gh/gh-f/package.nix
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = "gh-f";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-62FVFW2KLdH0uonIf3OVBFMGLcCteMjydaLAjWtxwUo=";
   };
 
diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix
index 5f420072aea4..2cd13236cea1 100644
--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@@ -12,7 +12,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-gei";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-orDjHgyqwBo/LOuujCp/6p4G0SWDA/ZDWvtTfH1ofrU=";
   };
 
diff --git a/pkgs/by-name/gh/gh-i/package.nix b/pkgs/by-name/gh/gh-i/package.nix
index e5cc1e2f45fd..c4dbf1ba6aef 100644
--- a/pkgs/by-name/gh/gh-i/package.nix
+++ b/pkgs/by-name/gh/gh-i/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = "gh-i";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-k1xfQxRh8T0SINtbFlIVNFEODYU0RhBAkjudOv1bLvw=";
   };
 
diff --git a/pkgs/by-name/gh/gh-markdown-preview/package.nix b/pkgs/by-name/gh/gh-markdown-preview/package.nix
index 4b4f890695e1..65191d3e44c6 100644
--- a/pkgs/by-name/gh/gh-markdown-preview/package.nix
+++ b/pkgs/by-name/gh/gh-markdown-preview/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yusukebe";
     repo = "gh-markdown-preview";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5jxGFZqYkhFQ4Rx4jbI+fes9ezsuXa+VZowk5Jzhi3I=";
   };
 
diff --git a/pkgs/by-name/gh/gh-ost/package.nix b/pkgs/by-name/gh/gh-ost/package.nix
index c370b8bbad6c..29b0e58ef0f3 100644
--- a/pkgs/by-name/gh/gh-ost/package.nix
+++ b/pkgs/by-name/gh/gh-ost/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-ost";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TTc69dWasqMVwwJNo+M9seMKEWgerZ2ZR7dwDfM1gWI=";
   };
 
diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix
index ad0661681729..c032eaf3c222 100644
--- a/pkgs/by-name/gh/gh-poi/package.nix
+++ b/pkgs/by-name/gh/gh-poi/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "seachicken";
     repo = "gh-poi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-foUv6+QIfPlYwgTwxFvEgGeOw/mpC80+ntHo29LQbB8=";
   };
 
diff --git a/pkgs/by-name/gh/gh-s/package.nix b/pkgs/by-name/gh/gh-s/package.nix
index 7e2573eb29e8..93ca5454b29b 100644
--- a/pkgs/by-name/gh/gh-s/package.nix
+++ b/pkgs/by-name/gh/gh-s/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = "gh-s";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hLfaAtWiJHCJ7MFz8dg4SJJB2cNY1gKUEwMAdRB4lr8=";
   };
 
diff --git a/pkgs/by-name/gh/gh-screensaver/package.nix b/pkgs/by-name/gh/gh-screensaver/package.nix
index 43564e4f53c4..2481b2688281 100644
--- a/pkgs/by-name/gh/gh-screensaver/package.nix
+++ b/pkgs/by-name/gh/gh-screensaver/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vilmibm";
     repo = "gh-screensaver";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MqwaqXGP4E+46vpgftZ9bttmMyENuojBnS6bWacmYLE=";
   };
 
diff --git a/pkgs/by-name/gh/ghbackup/package.nix b/pkgs/by-name/gh/ghbackup/package.nix
index 476440cd18d2..4bdacd3044eb 100644
--- a/pkgs/by-name/gh/ghbackup/package.nix
+++ b/pkgs/by-name/gh/ghbackup/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "qvl";
     repo = "ghbackup";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3LSe805VrbUGjqjnhTJD2KBVZ4rq+4Z3l4d0I1MrBMA=";
   };
 
diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix
index 73b443ac28bf..0da0ca63a6d9 100644
--- a/pkgs/by-name/gh/ghciwatch/package.nix
+++ b/pkgs/by-name/gh/ghciwatch/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MercuryTechnologies";
     repo = "ghciwatch";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-K7BNGRilzi01loE0yS4CZFDNz8TQ9Z+fELO5HUvGObE=";
   };
 
diff --git a/pkgs/by-name/gh/ghfetch/package.nix b/pkgs/by-name/gh/ghfetch/package.nix
index 1bd7bb3aab2a..86784b083ea6 100644
--- a/pkgs/by-name/gh/ghfetch/package.nix
+++ b/pkgs/by-name/gh/ghfetch/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "orangekame3";
     repo = "ghfetch";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Cmyd/wrobHPyG9ExUSfSsTwFUfbo9iuvmAr0uqunWWw=";
   };
 
diff --git a/pkgs/by-name/gh/ghorg/package.nix b/pkgs/by-name/gh/ghorg/package.nix
index 981e1300ca3f..ad35083adb0d 100644
--- a/pkgs/by-name/gh/ghorg/package.nix
+++ b/pkgs/by-name/gh/ghorg/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gabrie30";
     repo = "ghorg";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-tsR7cBpDa311rLI1CTXD2LLl3j2PxkBeQsjkUP99iIo=";
   };
 
diff --git a/pkgs/by-name/gh/ghost/package.nix b/pkgs/by-name/gh/ghost/package.nix
index 360d47cd2fb1..9750eb5f94a1 100644
--- a/pkgs/by-name/gh/ghost/package.nix
+++ b/pkgs/by-name/gh/ghost/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "EntySec";
     repo = "Ghost";
-    tag = version;
+    rev = version;
     sha256 = "13p3inw7v55na8438awr692v9vb7zgf5ggxpha9r3m8vfm3sb4iz";
   };
 
diff --git a/pkgs/by-name/gh/ghostie/package.nix b/pkgs/by-name/gh/ghostie/package.nix
index 32ca8ce5a934..1737072421f6 100644
--- a/pkgs/by-name/gh/ghostie/package.nix
+++ b/pkgs/by-name/gh/ghostie/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "attriaayush";
     repo = "ghostie";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lEjJLmBA3dlIVxc8E+UvR7u154QGeCfEbxdgUxAS3Cw=";
   };
 
diff --git a/pkgs/by-name/gh/ghosttohugo/package.nix b/pkgs/by-name/gh/ghosttohugo/package.nix
index 390555cb67ba..58cde575b477 100644
--- a/pkgs/by-name/gh/ghosttohugo/package.nix
+++ b/pkgs/by-name/gh/ghosttohugo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jbarone";
     repo = "ghostToHugo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lYqjwLPvSX9/HaFvSwtkvxbCToTwfDPeVivNfazZwQA=";
   };
 
diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix
index f14d0c03243d..2a3221b08c9e 100644
--- a/pkgs/by-name/gh/ghostunnel/package.nix
+++ b/pkgs/by-name/gh/ghostunnel/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ghostunnel";
     repo = "ghostunnel";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NnRm1HEdfK6WI5ntilLSwdR2B5czG5CIcMFzl2TzEds=";
   };
 
diff --git a/pkgs/by-name/gh/ghr/package.nix b/pkgs/by-name/gh/ghr/package.nix
index cbf9dea362fb..389df793a491 100644
--- a/pkgs/by-name/gh/ghr/package.nix
+++ b/pkgs/by-name/gh/ghr/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tcnksm";
     repo = "ghr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Is0D8tElv86s++NV6upu8RXvce65uPWQGIOl0Ftxf/M=";
   };
 
diff --git a/pkgs/by-name/gh/ghz/package.nix b/pkgs/by-name/gh/ghz/package.nix
index 6751417c0e55..a5d37a552d22 100644
--- a/pkgs/by-name/gh/ghz/package.nix
+++ b/pkgs/by-name/gh/ghz/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bojand";
     repo = "ghz";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-EzyQbMoR4veHbc9VaNfiXMi18wXbTbDPfDxo5NCk7CE=";
   };
 
diff --git a/pkgs/by-name/gi/gImageReader/package.nix b/pkgs/by-name/gi/gImageReader/package.nix
index 52aaef317cbd..dee339979213 100644
--- a/pkgs/by-name/gi/gImageReader/package.nix
+++ b/pkgs/by-name/gi/gImageReader/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "manisandro";
     repo = "gImageReader";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yBkVeufRRoSAc20/8mV39widBPloHFz12K7B4Y9xiWg=";
   };
 
diff --git a/pkgs/by-name/gi/gi-crystal/package.nix b/pkgs/by-name/gi/gi-crystal/package.nix
index d2d39fdd673d..a783ece5d4ad 100644
--- a/pkgs/by-name/gi/gi-crystal/package.nix
+++ b/pkgs/by-name/gi/gi-crystal/package.nix
@@ -12,7 +12,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "hugopl";
     repo = "gi-crystal";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0LsYREn4zWLQYUTpNWJhLLHWmg7UQzxOoQiAMmw3ZXQ=";
   };
 
diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix
index 2cd77fe9ff1c..fc875f7685dc 100644
--- a/pkgs/by-name/gi/giada/package.nix
+++ b/pkgs/by-name/gi/giada/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "monocasual";
     repo = "giada";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-vTOUS9mI4B3yRNnM2dNCH7jgMuD3ztdhe1FMgXUIt58=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gi/gibo/package.nix b/pkgs/by-name/gi/gibo/package.nix
index 46a2ff4f0c07..9663311e6812 100644
--- a/pkgs/by-name/gi/gibo/package.nix
+++ b/pkgs/by-name/gi/gibo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simonwhitaker";
     repo = "gibo";
-    tag = version;
+    rev = version;
     sha256 = "07j3sv9ar9l074krajw8nfmsfmdp836irsbd053dbqk2v880gfm6";
   };
 
diff --git a/pkgs/by-name/gi/gifgen/package.nix b/pkgs/by-name/gi/gifgen/package.nix
index 373912e41be8..896d1a71a543 100644
--- a/pkgs/by-name/gi/gifgen/package.nix
+++ b/pkgs/by-name/gi/gifgen/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lukechilds";
     repo = "gifgen";
-    tag = version;
+    rev = version;
     hash = "sha256-ni9RL4LyMejmu8vm5HC8WSTqAPQMBQNRDOZ4ZfvrkSU=";
   };
 
diff --git a/pkgs/by-name/gi/gifski/package.nix b/pkgs/by-name/gi/gifski/package.nix
index ba42096ef2ae..eb0ee73c73a9 100644
--- a/pkgs/by-name/gi/gifski/package.nix
+++ b/pkgs/by-name/gi/gifski/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "gifski";
-    tag = version;
+    rev = version;
     hash = "sha256-IjQ2PqjXhNvXknVxfphSSwQEWBuTkSxMFrbwd2trlVI=";
   };
 
diff --git a/pkgs/by-name/gi/gimme-aws-creds/package.nix b/pkgs/by-name/gi/gimme-aws-creds/package.nix
index e3dfb8cfca57..ade8ddb80cce 100644
--- a/pkgs/by-name/gi/gimme-aws-creds/package.nix
+++ b/pkgs/by-name/gi/gimme-aws-creds/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Nike-Inc";
     repo = "gimme-aws-creds";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fsFYcfbLeYV6tpOGgNrFmYjcUAmdsx5zwUbvcctwFVs=";
   };
 
diff --git a/pkgs/by-name/gi/gimoji/package.nix b/pkgs/by-name/gi/gimoji/package.nix
index 663e6a994388..ea4c142d369e 100644
--- a/pkgs/by-name/gi/gimoji/package.nix
+++ b/pkgs/by-name/gi/gimoji/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zeenix";
     repo = "gimoji";
-    tag = version;
+    rev = version;
     hash = "sha256-X1IiDnnRXiZBL/JBDfioKc/724TnVKaEjZLrNwX5SoA=";
   };
 
diff --git a/pkgs/by-name/gi/gimx/package.nix b/pkgs/by-name/gi/gimx/package.nix
index 0df3a8cae97f..b2e1372fc35f 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-BcFLdQgEAi6Sxyb5/P9YAIkmeXNZXrKcOa/6g817xQg=";
   };
diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix
index 715f86999adf..0e852265f0db 100644
--- a/pkgs/by-name/gi/ginkgo/package.nix
+++ b/pkgs/by-name/gi/ginkgo/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "onsi";
     repo = "ginkgo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lDSw4BPYZ5wOuaoUtSSkdbcOpKAEuLsSwldrASpM6mA=";
   };
   vendorHash = "sha256-uqpib3k5PtQOsndic0GV1rYBeVlY5Tpg931yHfU6dWI=";
diff --git a/pkgs/by-name/gi/gio-sharp/package.nix b/pkgs/by-name/gi/gio-sharp/package.nix
index 7919ed6489db..67047b2e4fed 100644
--- a/pkgs/by-name/gi/gio-sharp/package.nix
+++ b/pkgs/by-name/gi/gio-sharp/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "gio-sharp";
 
-    tag = version;
+    rev = version;
     sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig";
   };
 
diff --git a/pkgs/by-name/gi/giph/package.nix b/pkgs/by-name/gi/giph/package.nix
index 8480d811c33b..a31e134dac57 100644
--- a/pkgs/by-name/gi/giph/package.nix
+++ b/pkgs/by-name/gi/giph/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phisch";
     repo = "giph";
-    tag = version;
+    rev = version;
     sha256 = "19l46m1f32b3bagzrhaqsfnl5n3wbrmg3sdy6fdss4y1yf6nqayk";
   };
 
diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix
index d724320ec660..3b1bb6f0a6a4 100644
--- a/pkgs/by-name/gi/gir-rs/package.nix
+++ b/pkgs/by-name/gi/gir-rs/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "gtk-rs";
     repo = "gir";
-    tag = version;
+    rev = version;
     sha256 = "sha256-GAAK4ej16e5/sjnPOVWs4ul1H9sqa+tDE8ky9tbB9No=";
   };
 
diff --git a/pkgs/by-name/gi/girouette/package.nix b/pkgs/by-name/gi/girouette/package.nix
index 38f838f68425..36092e7bb808 100644
--- a/pkgs/by-name/gi/girouette/package.nix
+++ b/pkgs/by-name/gi/girouette/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gourlaysama";
     repo = "girouette";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CROd44lCCXlWF8X/9HyjtTjSlCUFkyke+BjkD4uUqXo=";
   };
 
diff --git a/pkgs/by-name/gi/git-annex-remote-rclone/package.nix b/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
index 7fc05f6458df..903c0286020b 100644
--- a/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
+++ b/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DanielDent";
     repo = "git-annex-remote-rclone";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-B6x67XXE4BHd3x7a8pQlqPPmpy0c62ziDAldB4QpqQ4=";
   };
 
diff --git a/pkgs/by-name/gi/git-autoshare/package.nix b/pkgs/by-name/gi/git-autoshare/package.nix
index 69aa41cbd298..a685f182ef9b 100644
--- a/pkgs/by-name/gi/git-autoshare/package.nix
+++ b/pkgs/by-name/gi/git-autoshare/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "acsone";
     repo = "git-autoshare";
-    tag = version;
+    rev = version;
     hash = "sha256-F8wcAayIR6MH8e0cQSwFJn/AVSLG3tVil80APjcFG/0=";
   };
 
diff --git a/pkgs/by-name/gi/git-backup-go/package.nix b/pkgs/by-name/gi/git-backup-go/package.nix
index ce4653ef6677..41fa743ccc5d 100644
--- a/pkgs/by-name/gi/git-backup-go/package.nix
+++ b/pkgs/by-name/gi/git-backup-go/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ChappIO";
     repo = "git-backup";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Z32ThzmGkF89wsYqJnP/Koz4/2mulkrvvnUKHE6Crks=";
   };
 
diff --git a/pkgs/by-name/gi/git-branchless/package.nix b/pkgs/by-name/gi/git-branchless/package.nix
index 156b38f65dce..acfa061a27fc 100644
--- a/pkgs/by-name/gi/git-branchless/package.nix
+++ b/pkgs/by-name/gi/git-branchless/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "arxanas";
     repo = "git-branchless";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8uv+sZRr06K42hmxgjrKk6FDEngUhN/9epixRYKwE3U=";
   };
 
diff --git a/pkgs/by-name/gi/git-bug-migration/package.nix b/pkgs/by-name/gi/git-bug-migration/package.nix
index 2427f6f052a5..9bc2f1b30f41 100644
--- a/pkgs/by-name/gi/git-bug-migration/package.nix
+++ b/pkgs/by-name/gi/git-bug-migration/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MichaelMure";
     repo = "git-bug-migration";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ=";
   };
 
diff --git a/pkgs/by-name/gi/git-bug/package.nix b/pkgs/by-name/gi/git-bug/package.nix
index 9138cd22d2b5..5423593e92de 100644
--- a/pkgs/by-name/gi/git-bug/package.nix
+++ b/pkgs/by-name/gi/git-bug/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "git-bug";
     repo = "git-bug";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8";
   };
 
diff --git a/pkgs/by-name/gi/git-chglog/package.nix b/pkgs/by-name/gi/git-chglog/package.nix
index 07e14686aa3b..26b05361c7fc 100644
--- a/pkgs/by-name/gi/git-chglog/package.nix
+++ b/pkgs/by-name/gi/git-chglog/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "git-chglog";
     repo = "git-chglog";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rTJn2vUrEnmG2japqCxHv3BR9MpmMfpMLO2FBP6ONbw=";
   };
 
diff --git a/pkgs/by-name/gi/git-cliff/package.nix b/pkgs/by-name/gi/git-cliff/package.nix
index cac5fd34353f..880c9c899594 100644
--- a/pkgs/by-name/gi/git-cliff/package.nix
+++ b/pkgs/by-name/gi/git-cliff/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "git-cliff";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B421xXt7TrBJVwi04vygnw9t5o7/KLVpuItQtwV4E24=";
   };
 
diff --git a/pkgs/by-name/gi/git-codereview/package.nix b/pkgs/by-name/gi/git-codereview/package.nix
index 41986048b7bc..a732301b1f43 100644
--- a/pkgs/by-name/gi/git-codereview/package.nix
+++ b/pkgs/by-name/gi/git-codereview/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "golang";
     repo = "review";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZKu/roqkTIJWwvgKWrrDN5UL53n7QVsUqpqtXnunwiQ=";
   };
 
diff --git a/pkgs/by-name/gi/git-credential-keepassxc/package.nix b/pkgs/by-name/gi/git-credential-keepassxc/package.nix
index 4d906d9cbbd8..fec95af3a761 100644
--- a/pkgs/by-name/gi/git-credential-keepassxc/package.nix
+++ b/pkgs/by-name/gi/git-credential-keepassxc/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Frederick888";
     repo = "git-credential-keepassxc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qxNzWuuIoK9BJLVcWtrER+MyA5cyd03xAwGljh8DZC4=";
   };
 
diff --git a/pkgs/by-name/gi/git-credential-oauth/package.nix b/pkgs/by-name/gi/git-credential-oauth/package.nix
index 6f2d8ab31c40..008deae36e63 100644
--- a/pkgs/by-name/gi/git-credential-oauth/package.nix
+++ b/pkgs/by-name/gi/git-credential-oauth/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hickford";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-u5lTl0vZLf8P6k/W4I4qhiUPrIEsynEP0rbQt8pIEWM=";
   };
 
diff --git a/pkgs/by-name/gi/git-crypt/package.nix b/pkgs/by-name/gi/git-crypt/package.nix
index 2dfeb8922012..e83dbe7e7adb 100644
--- a/pkgs/by-name/gi/git-crypt/package.nix
+++ b/pkgs/by-name/gi/git-crypt/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AGWA";
     repo = "git-crypt";
-    tag = version;
+    rev = version;
     sha256 = "sha256-GcGCX6hoKL+sNLAeGEzZpaM+cdFjcNlwYExfOFEPi0I=";
   };
 
diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix
index c0a082fc6644..f98afaf57f86 100644
--- a/pkgs/by-name/gi/git-dive/package.nix
+++ b/pkgs/by-name/gi/git-dive/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gitext-rs";
     repo = "git-dive";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sy2qNFn8JLE173HVWfFXBx21jcx4kpFMwi9a0m38lso=";
   };
 
diff --git a/pkgs/by-name/gi/git-extras/package.nix b/pkgs/by-name/gi/git-extras/package.nix
index 18d3b5e82581..630542f0e4e0 100644
--- a/pkgs/by-name/gi/git-extras/package.nix
+++ b/pkgs/by-name/gi/git-extras/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tj";
     repo = "git-extras";
-    tag = version;
+    rev = version;
     sha256 = "sha256-0XZwEhDjh+rL6ZEWb60+GUw7hFOS3Xr32hgPNJcOL9I=";
   };
 
diff --git a/pkgs/by-name/gi/git-ftp/package.nix b/pkgs/by-name/gi/git-ftp/package.nix
index d485a8a04333..85e56bb310ba 100644
--- a/pkgs/by-name/gi/git-ftp/package.nix
+++ b/pkgs/by-name/gi/git-ftp/package.nix
@@ -23,7 +23,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "git-ftp";
     repo = "git-ftp";
-    tag = version;
+    rev = version;
     sha256 = "1hxkqf7jbrx24q18yxpnd3dxzh4xk6asymwkylp1x7zg6mcci87d";
   };
 
diff --git a/pkgs/by-name/gi/git-get/package.nix b/pkgs/by-name/gi/git-get/package.nix
index 3471ea548f0c..ccdfbf5e67f2 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 = pname;
-    tag = "v${version}";
+    rev = "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/git-hound/package.nix b/pkgs/by-name/gi/git-hound/package.nix
index a2117fb5fd6e..67431b03b747 100644
--- a/pkgs/by-name/gi/git-hound/package.nix
+++ b/pkgs/by-name/gi/git-hound/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tillson";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W+rYDyRIw4jWWO4UZkUHFq/D/7ZXM+y5vdbclk6S0ro=";
   };
 
diff --git a/pkgs/by-name/gi/git-hub/package.nix b/pkgs/by-name/gi/git-hub/package.nix
index 891f50e3c24b..33f3ea47d452 100644
--- a/pkgs/by-name/gi/git-hub/package.nix
+++ b/pkgs/by-name/gi/git-hub/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sociomantic-tsunami";
     repo = "git-hub";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fb/WDmBx1Vayu4fLeG+D1nmHJJawgIAAXcQsABsenBo=";
   };
 
diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix
index 344a233ff51c..e8937ae98db9 100644
--- a/pkgs/by-name/gi/git-igitt/package.nix
+++ b/pkgs/by-name/gi/git-igitt/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "mlange-42";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-JXEWnekL9Mtw0S3rI5aeO1HB9kJ7bRJDJ6EJ4ATlFeQ=";
   };
 
diff --git a/pkgs/by-name/gi/git-ignore/package.nix b/pkgs/by-name/gi/git-ignore/package.nix
index c0cb55f03f29..992c25b89a3c 100644
--- a/pkgs/by-name/gi/git-ignore/package.nix
+++ b/pkgs/by-name/gi/git-ignore/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sondr3";
     repo = "git-ignore";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KIdhsbD9v2kCM2C/kSJCleyniEz4Bw7UxBsF762fnJs=";
   };
 
diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix
index 240b2f6c46c5..240927c7a8c0 100644
--- a/pkgs/by-name/gi/git-instafix/package.nix
+++ b/pkgs/by-name/gi/git-instafix/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "quodlibetor";
     repo = "git-instafix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Uz+KQ8cQT3v97EtmbAv2II30dUrFD0hMo/GhnqcdBOs=";
   };
 
diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
index d29c9aafb425..729f87171641 100644
--- a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
+++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MitMaro";
     repo = "git-interactive-rebase-tool";
-    tag = version;
+    rev = version;
     hash = "sha256-NlnESZua4OP7rhMoER/VgBST9THqISQ0LCG1ZakNTqs=";
   };
 
diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix
index 15aa1b1c96e3..d0ca3b0f5c00 100644
--- a/pkgs/by-name/gi/git-mit/package.nix
+++ b/pkgs/by-name/gi/git-mit/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "PurpleBooth";
     repo = "git-mit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+7rl4wxVQq4bLBsnLSeJD+1kkRuf7FCi81pXGrNNOPI=";
   };
 
diff --git a/pkgs/by-name/gi/git-my/package.nix b/pkgs/by-name/gi/git-my/package.nix
index 16a3689b6922..7ad13dda2f6e 100644
--- a/pkgs/by-name/gi/git-my/package.nix
+++ b/pkgs/by-name/gi/git-my/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "davidosomething";
     repo = "git-my";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-GzBNtsCrs2M0UBc1FVE+4yUNLpjDGUfekc/LIvgvUUo=";
   };
 
diff --git a/pkgs/by-name/gi/git-nomad/package.nix b/pkgs/by-name/gi/git-nomad/package.nix
index b88581530354..296bac2ec541 100644
--- a/pkgs/by-name/gi/git-nomad/package.nix
+++ b/pkgs/by-name/gi/git-nomad/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rraval";
     repo = "git-nomad";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-G/i+mCKZSe8tPMuCLzymkU9SGyFNHY74cGhcC4ru0/k=";
   };
 
diff --git a/pkgs/by-name/gi/git-octopus/package.nix b/pkgs/by-name/gi/git-octopus/package.nix
index 5846d919abbc..3fae553d19e6 100644
--- a/pkgs/by-name/gi/git-octopus/package.nix
+++ b/pkgs/by-name/gi/git-octopus/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lesfurets";
     repo = "git-octopus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "14p61xk7jankp6gc26xciag9fnvm7r9vcbhclcy23f4ghf4q4sj1";
   };
 
diff --git a/pkgs/by-name/gi/git-open/package.nix b/pkgs/by-name/gi/git-open/package.nix
index 75bb834a66de..61dbfbd172d4 100644
--- a/pkgs/by-name/gi/git-open/package.nix
+++ b/pkgs/by-name/gi/git-open/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-open";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bZOknoRMkPqm1pFFFbvrHrSi90ANLEE5fLcABYHov6Q=";
   };
 
diff --git a/pkgs/by-name/gi/git-pr/package.nix b/pkgs/by-name/gi/git-pr/package.nix
index 07ec5aac695c..2edcddc5acf8 100644
--- a/pkgs/by-name/gi/git-pr/package.nix
+++ b/pkgs/by-name/gi/git-pr/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "picosh";
     repo = "git-pr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2A2rP7yr8faVoIYAWprr+t7MwDPerhsuOjWWEl1mhXw=";
   };
 
diff --git a/pkgs/by-name/gi/git-privacy/package.nix b/pkgs/by-name/gi/git-privacy/package.nix
index 570133f9c573..e058e8d5ced3 100644
--- a/pkgs/by-name/gi/git-privacy/package.nix
+++ b/pkgs/by-name/gi/git-privacy/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "EMPRI-DEVOPS";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-b2RkRL8/mZwqc3xCs+oltzualhQtp/7F9POlLlT3UUU=";
   };
 
diff --git a/pkgs/by-name/gi/git-quick-stats/package.nix b/pkgs/by-name/gi/git-quick-stats/package.nix
index f6c41cfc2230..9088148dd9ea 100644
--- a/pkgs/by-name/gi/git-quick-stats/package.nix
+++ b/pkgs/by-name/gi/git-quick-stats/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "git-quick-stats";
     owner = "arzzen";
-    tag = version;
+    rev = version;
     sha256 = "sha256-k8JydRHjEJ4z5uJXCijF7DB9hULbLQ6YfJgFJLX4Ug4=";
   };
 
diff --git a/pkgs/by-name/gi/git-quickfix/package.nix b/pkgs/by-name/gi/git-quickfix/package.nix
index c1b0b59cd4b2..3649ffb7d400 100644
--- a/pkgs/by-name/gi/git-quickfix/package.nix
+++ b/pkgs/by-name/gi/git-quickfix/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "siedentop";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-IAjet/bDG/Hf/whS+yrEQSquj8s5DEmFis+5ysLLuxs=";
   };
 
diff --git a/pkgs/by-name/gi/git-radar/package.nix b/pkgs/by-name/gi/git-radar/package.nix
index 455b739b6aa8..6b53ea4e067b 100644
--- a/pkgs/by-name/gi/git-radar/package.nix
+++ b/pkgs/by-name/gi/git-radar/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaeldfallen";
     repo = "git-radar";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0c3zp8s4w7m4s71qgwk1jyfc8yzw34f2hi43x1w437ypgabwg81j";
   };
 
diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix
index ce0c1ff392a6..28766f08da6a 100644
--- a/pkgs/by-name/gi/git-repo/package.nix
+++ b/pkgs/by-name/gi/git-repo/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mPmOnq9j9vnfTynGbOoChLslpyTpIzH6+B2fv5PTHZY=";
   };
 
diff --git a/pkgs/by-name/gi/git-run/package.nix b/pkgs/by-name/gi/git-run/package.nix
index a8a4374f2dbd..a50242ccef3a 100644
--- a/pkgs/by-name/gi/git-run/package.nix
+++ b/pkgs/by-name/gi/git-run/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mixu";
     repo = "gr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WPnar87p0GYf6ehhVEUeZd2pTjS95Zl6NpiJuIOQ5Tc=";
   };
 
diff --git a/pkgs/by-name/gi/git-secrets/package.nix b/pkgs/by-name/gi/git-secrets/package.nix
index fe58996cded6..314bdecb74d7 100644
--- a/pkgs/by-name/gi/git-secrets/package.nix
+++ b/pkgs/by-name/gi/git-secrets/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "git-secrets";
-    tag = version;
+    rev = version;
     sha256 = "10lnxg0q855zi3d6804ivlrn6dc817kilzdh05mmz8a0ccvm2qc7";
   };
 
diff --git a/pkgs/by-name/gi/git-sim/package.nix b/pkgs/by-name/gi/git-sim/package.nix
index c58d73380995..093a54006f7a 100644
--- a/pkgs/by-name/gi/git-sim/package.nix
+++ b/pkgs/by-name/gi/git-sim/package.nix
@@ -44,7 +44,7 @@ buildPythonApplication {
   src = fetchFromGitHub {
     owner = "initialcommit-com";
     repo = "git-sim";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4jHkAlF2SAzHjBi8pmAJ0TKkcLxw+6EdGsXnHZUMILw=";
   };
 
diff --git a/pkgs/by-name/gi/git-sizer/package.nix b/pkgs/by-name/gi/git-sizer/package.nix
index b17bc572c3aa..df6e00c22da5 100644
--- a/pkgs/by-name/gi/git-sizer/package.nix
+++ b/pkgs/by-name/gi/git-sizer/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "github";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-On7QBTzKfnuuzwMQ8m1odxGqfIKL+EDg5V05Kxuhmqw=";
   };
 
diff --git a/pkgs/by-name/gi/git-standup/package.nix b/pkgs/by-name/gi/git-standup/package.nix
index 1b25ff935304..ce0acd7f4f40 100644
--- a/pkgs/by-name/gi/git-standup/package.nix
+++ b/pkgs/by-name/gi/git-standup/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kamranahmedse";
     repo = "git-standup";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-x7Z4w4UzshXYc25ag6HopRrKbP+/ELkFPdsUBaUE1vY=";
   };
 
diff --git a/pkgs/by-name/gi/git-subrepo/package.nix b/pkgs/by-name/gi/git-subrepo/package.nix
index 47b4bd5f99f4..1d3a84f12436 100644
--- a/pkgs/by-name/gi/git-subrepo/package.nix
+++ b/pkgs/by-name/gi/git-subrepo/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ingydotnet";
     repo = "git-subrepo";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Fwh4haGXVDsLexe/1kjUhY4lF6u5cTrAwivZiOkPig0=";
   };
 
diff --git a/pkgs/by-name/gi/git-subtrac/package.nix b/pkgs/by-name/gi/git-subtrac/package.nix
index 1dfa6fa665e6..9a454cad5af6 100644
--- a/pkgs/by-name/gi/git-subtrac/package.nix
+++ b/pkgs/by-name/gi/git-subtrac/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "apenwarr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3Z1AbPPsTBa3rqfvNAMBz7CIRq/zc9q5/TcLJWYSNlw=";
   };
 
diff --git a/pkgs/by-name/gi/git-team/package.nix b/pkgs/by-name/gi/git-team/package.nix
index 1cd32659809c..081c8dc5e71d 100644
--- a/pkgs/by-name/gi/git-team/package.nix
+++ b/pkgs/by-name/gi/git-team/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hekmekk";
     repo = "git-team";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+j5d1tImVHaTx63uzLdh2YNCFa1ErAVv4OMwxOutBQ4=";
   };
 
diff --git a/pkgs/by-name/gi/git-test/package.nix b/pkgs/by-name/gi/git-test/package.nix
index 23b04d944ffc..388be610c084 100644
--- a/pkgs/by-name/gi/git-test/package.nix
+++ b/pkgs/by-name/gi/git-test/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spotify";
     repo = "git-test";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "01h3f0andv1p7pwir3k6n01v92hgr5zbjadfwl144yjw9x37fm2f";
   };
 
diff --git a/pkgs/by-name/gi/git-trim/package.nix b/pkgs/by-name/gi/git-trim/package.nix
index 8480e828d373..1c4019f3c5a3 100644
--- a/pkgs/by-name/gi/git-trim/package.nix
+++ b/pkgs/by-name/gi/git-trim/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "foriequal0";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM=";
   };
 
diff --git a/pkgs/by-name/gi/git-vendor/package.nix b/pkgs/by-name/gi/git-vendor/package.nix
index bec7095f54d4..b8132fc6cdb2 100644
--- a/pkgs/by-name/gi/git-vendor/package.nix
+++ b/pkgs/by-name/gi/git-vendor/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "brettlangdon";
     repo = "git-vendor";
-    tag = "v${version}";
+    rev = "v${version}";
     inherit sha256;
   };
 
diff --git a/pkgs/by-name/gi/git-when-merged/package.nix b/pkgs/by-name/gi/git-when-merged/package.nix
index c608d34db3bc..d4df916a75c6 100644
--- a/pkgs/by-name/gi/git-when-merged/package.nix
+++ b/pkgs/by-name/gi/git-when-merged/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mhagger";
     repo = "git-when-merged";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Yp/GNzD+7EPlk/kzZnT1eiSNsSxpYEiZezRbUU3HfLc=";
   };
 
diff --git a/pkgs/by-name/gi/git-who/package.nix b/pkgs/by-name/gi/git-who/package.nix
index d0e7adab1b0f..bc646ec29ff6 100644
--- a/pkgs/by-name/gi/git-who/package.nix
+++ b/pkgs/by-name/gi/git-who/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sinclairtarget";
     repo = "git-who";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-64Hb2+ZCXJis19V0WDyZ0SHZX99Dqxr3UGQTQZSCAp8=";
   };
 
diff --git a/pkgs/by-name/gi/git2-cpp/package.nix b/pkgs/by-name/gi/git2-cpp/package.nix
index 974b07bd2c59..18d50cc242a8 100644
--- a/pkgs/by-name/gi/git2-cpp/package.nix
+++ b/pkgs/by-name/gi/git2-cpp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ken-matsui";
     repo = "git2-cpp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-2jKSQW6dUCIKtl33paSTuZdYAaYdFnILx/Gxv/ghFiI=";
   };
 
diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix
index 681cfaaf8e16..03f5377faced 100644
--- a/pkgs/by-name/gi/gitaly/git.nix
+++ b/pkgs/by-name/gi/gitaly/git.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "git";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6KI8V6TDh8DYizvHFeaXBz5HlEPLNQzEZAEplVsvZUc=";
   };
 
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index ec306192b3d6..59a5dfa0729b 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitaly";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-uyXxNuHQUlXCNQcrEIoaJXpatfM5fcIk5MCNYt8QW9A=";
     };
 
diff --git a/pkgs/by-name/gi/gitbatch/package.nix b/pkgs/by-name/gi/gitbatch/package.nix
index aecb6865550e..f00fc4d95be1 100644
--- a/pkgs/by-name/gi/gitbatch/package.nix
+++ b/pkgs/by-name/gi/gitbatch/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "isacikgoz";
     repo = "gitbatch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ovmdbyPRSebwmW6AW55jBgBKaNdY6w5/wrpUF2cMKw8=";
   };
 
diff --git a/pkgs/by-name/gi/gitcs/package.nix b/pkgs/by-name/gi/gitcs/package.nix
index 89a8b94403f6..eec5ebc7203b 100644
--- a/pkgs/by-name/gi/gitcs/package.nix
+++ b/pkgs/by-name/gi/gitcs/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knbr13";
     repo = "gitcs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IyhVVRTKftZIzqMH5pBUMLPIk8bk0rVAxPKD6bABP68=";
   };
 
diff --git a/pkgs/by-name/gi/gitflow/package.nix b/pkgs/by-name/gi/gitflow/package.nix
index 7a55f8211e31..d25041e1bf6d 100644
--- a/pkgs/by-name/gi/gitflow/package.nix
+++ b/pkgs/by-name/gi/gitflow/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "petervanderdoes";
     repo = "gitflow";
-    tag = version;
+    rev = version;
     sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8=";
   };
 
diff --git a/pkgs/by-name/gi/gitfs/package.nix b/pkgs/by-name/gi/gitfs/package.nix
index fdba510b0cc3..3b9cf7cfe17b 100644
--- a/pkgs/by-name/gi/gitfs/package.nix
+++ b/pkgs/by-name/gi/gitfs/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "PressLabs";
     repo = "gitfs";
-    tag = version;
+    rev = version;
     sha256 = "1jzwdwan8ndvp2lw6j7zbvg5k9rgf2d8dcxjrwc6bwyk59xdxn4p";
   };
 
diff --git a/pkgs/by-name/gi/githooks/package.nix b/pkgs/by-name/gi/githooks/package.nix
index 794cfa39069b..262c17e334f6 100644
--- a/pkgs/by-name/gi/githooks/package.nix
+++ b/pkgs/by-name/gi/githooks/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gabyx";
     repo = "githooks";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pTSC8ruNiPzQO1C6j+G+WFX3pz/mWPukuWkKUSYdfHw=";
   };
 
diff --git a/pkgs/by-name/gi/github-commenter/package.nix b/pkgs/by-name/gi/github-commenter/package.nix
index 5151253dd79c..1bf88c51cebd 100644
--- a/pkgs/by-name/gi/github-commenter/package.nix
+++ b/pkgs/by-name/gi/github-commenter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudposse";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-x3/ae22ub9Us3mvSmvq9ohlkujvZCUfSrmZeQNvIWzE=";
   };
 
diff --git a/pkgs/by-name/gi/github-markdown-toc-go/package.nix b/pkgs/by-name/gi/github-markdown-toc-go/package.nix
index 2159148c408d..a80ac4af93b6 100644
--- a/pkgs/by-name/gi/github-markdown-toc-go/package.nix
+++ b/pkgs/by-name/gi/github-markdown-toc-go/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ekalinin";
     repo = "github-markdown-toc.go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tZGAvbC9lrNhtRubCJUkQShRsfCsaAeI6XHhSp4FkS0=";
   };
 
diff --git a/pkgs/by-name/gi/gitjacker/package.nix b/pkgs/by-name/gi/gitjacker/package.nix
index 281f06006bae..a438550c4a5c 100644
--- a/pkgs/by-name/gi/gitjacker/package.nix
+++ b/pkgs/by-name/gi/gitjacker/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = "gitjacker";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rEn9FpcRfEt2yGepIPEAO9m8JeVb+nMhYMBWhC/barc=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix
index fb797e394fbf..1dc740ba16f2 100644
--- a/pkgs/by-name/gi/gitlab-ci-local/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "firecow";
     repo = "gitlab-ci-local";
-    tag = version;
+    rev = version;
     hash = "sha256-4Hn/I0PJ5w+Wb3tI8szy4I/vHso85GTFyT2Ek+WbYxs=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
index fb33c4bb8410..83ef36cce08d 100644
--- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alesbrelih";
     repo = "gitlab-ci-ls";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-SVsQnY/TrFQXgvT5goXQqb5MYxU7untDq361EY7KRDQ=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
index 1a37fc998a76..744fc4dd5361 100644
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-elasticsearch-indexer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jrUNOxqc/k4a/34nHEatGnBorTlh/EuHnEs/GfFRUcI=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 0c6a1629c225..7edd5a1c238e 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B/v0jj5hoNmF9cygvi9eLQ4pLuZ1+wIyNnJN2uCAXdE=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-release-cli/package.nix b/pkgs/by-name/gi/gitlab-release-cli/package.nix
index 887ddc2afe34..7e827c7d3c38 100644
--- a/pkgs/by-name/gi/gitlab-release-cli/package.nix
+++ b/pkgs/by-name/gi/gitlab-release-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "release-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-J+9BbzZYLR4Ie01NtjZRCcL/HtR78BiTEqFimfni/ps=";
   };
 
diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix
index 0a2b33ee2edc..c6b1e749983a 100644
--- a/pkgs/by-name/gi/gitlab-shell/package.nix
+++ b/pkgs/by-name/gi/gitlab-shell/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6bRiw8TC7E/eUc0Zwp46kLbe5QzZ+nXL6YY2u+mjFRw=";
   };
 
diff --git a/pkgs/by-name/gi/gitless/package.nix b/pkgs/by-name/gi/gitless/package.nix
index 91f84f950925..3a571c13da3f 100644
--- a/pkgs/by-name/gi/gitless/package.nix
+++ b/pkgs/by-name/gi/gitless/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "goldstar611";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-XDB1i2b1reMCM6i1uK3IzTnsoLXO7jldYtNlYUo1AoQ=";
   };
 
diff --git a/pkgs/by-name/gi/gitls/package.nix b/pkgs/by-name/gi/gitls/package.nix
index d6fd755d98cf..e03454b74a14 100644
--- a/pkgs/by-name/gi/gitls/package.nix
+++ b/pkgs/by-name/gi/gitls/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hahwul";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kLkH/nNidd1QNPKvo7fxZwMhTgd4AVB8Ofw0Wo0z6c0=";
   };
 
diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix
index 8dd46958a57b..867bc19a9bd8 100644
--- a/pkgs/by-name/gi/gitnr/package.nix
+++ b/pkgs/by-name/gi/gitnr/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "reemus-dev";
     repo = "gitnr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9vx+bGfYuJuafZUY2ZT4SAgrNcSXuMe1kHH/lrpItvM=";
   };
 
diff --git a/pkgs/by-name/gi/gitolite/package.nix b/pkgs/by-name/gi/gitolite/package.nix
index 139041388817..0a4b4b9a2df6 100644
--- a/pkgs/by-name/gi/gitolite/package.nix
+++ b/pkgs/by-name/gi/gitolite/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sitaramc";
     repo = "gitolite";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/VBu+aepIrxWc2padPa/WoXbIdKfIwqmA/M8d1GE5FI=";
   };
 
diff --git a/pkgs/by-name/gi/gitopper/package.nix b/pkgs/by-name/gi/gitopper/package.nix
index 0e23be0be50b..e1b5d8b9674f 100644
--- a/pkgs/by-name/gi/gitopper/package.nix
+++ b/pkgs/by-name/gi/gitopper/package.nix
@@ -15,7 +15,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "miekg";
     repo = "gitopper";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-y0gzoXSIQDQ6TMVsAijPaN0sRqFEtTKyd297YxXAukM=";
   };
 
diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix
index 348039a3b94f..3a3c636ba646 100644
--- a/pkgs/by-name/gi/gitoxide/package.nix
+++ b/pkgs/by-name/gi/gitoxide/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "GitoxideLabs";
     repo = "gitoxide";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hrCWt4cCnlH3NKH5Uugf/rvVN+YpbeZgZ/lhnQGZ2I0=";
   };
 
diff --git a/pkgs/by-name/gi/gitprompt-rs/package.nix b/pkgs/by-name/gi/gitprompt-rs/package.nix
index f47603f9ac12..888167b3b2bd 100644
--- a/pkgs/by-name/gi/gitprompt-rs/package.nix
+++ b/pkgs/by-name/gi/gitprompt-rs/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "9ary";
     repo = "gitprompt-rs";
-    tag = version;
+    rev = version;
     hash = "sha256-U0ylhgD86lbXvt6jMLaEQdL/zbcbXnfrA72FMEzBkN0=";
   };
 
diff --git a/pkgs/by-name/gi/gitrs/package.nix b/pkgs/by-name/gi/gitrs/package.nix
index b0d3507dd46e..d6a3942e7320 100644
--- a/pkgs/by-name/gi/gitrs/package.nix
+++ b/pkgs/by-name/gi/gitrs/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mccurdyc";
     repo = "gitrs";
-    tag = version;
+    rev = version;
     hash = "sha256-+43XJroPNWmdUC6FDL84rZWrJm5fzuUXfpDkAMyVQQg=";
   };
 
diff --git a/pkgs/by-name/gi/gitsign/package.nix b/pkgs/by-name/gi/gitsign/package.nix
index 6ea33d91d5cc..3fc0d48b32d7 100644
--- a/pkgs/by-name/gi/gitsign/package.nix
+++ b/pkgs/by-name/gi/gitsign/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MOj3bpVgeZlsvJqPD5mAud7jSHsRPCKvYAe2aQ4rWcw=";
   };
   vendorHash = "sha256-POB8mSGyW45RSbNq9Vp/LW3jEtnHi7zufihXFTnWEfw=";
diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix
index 43d2a262081f..6be2cb9f6f0f 100644
--- a/pkgs/by-name/gi/gitstatus/package.nix
+++ b/pkgs/by-name/gi/gitstatus/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "gitstatus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-b+9bwJ87VV6rbOPobkwMkDXGH34STjYPlt8wCRR5tEc=";
   };
 
diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix
index ba76edf32c8d..de8ebf6d45df 100644
--- a/pkgs/by-name/gi/gittuf/package.nix
+++ b/pkgs/by-name/gi/gittuf/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gittuf";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gvRr+Q5XCfhtIOdxQdDwLXvo/+GHDuxaEcEpctevWew=";
   };
 
diff --git a/pkgs/by-name/gi/gitty/package.nix b/pkgs/by-name/gi/gitty/package.nix
index c5838f67df5d..f077396684d6 100644
--- a/pkgs/by-name/gi/gitty/package.nix
+++ b/pkgs/by-name/gi/gitty/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "muesli";
     repo = "gitty";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-g0D6nJiHY7cz72DSmdQZsj9Vgv/VOp0exTcLsaypGiU=";
   };
 
diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix
index 1856579890b7..240fe153c07f 100644
--- a/pkgs/by-name/gi/gitu/package.nix
+++ b/pkgs/by-name/gi/gitu/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "altsem";
     repo = "gitu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-c2YVcE+a/9Z6qTLEbcSFE6393SEeudyvdbzCRJfszcc=";
   };
 
diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix
index b6361fdf3a2a..f1db72724190 100644
--- a/pkgs/by-name/gi/gitui/package.nix
+++ b/pkgs/by-name/gi/gitui/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "extrawurst";
     repo = "gitui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jKJ1XnF6S7clyFGN2o3bHnYpC4ckl/lNXscmf6GRLbI=";
   };
 
diff --git a/pkgs/by-name/gi/gitwatch/package.nix b/pkgs/by-name/gi/gitwatch/package.nix
index 3e34b48f2b8a..468618c604d9 100644
--- a/pkgs/by-name/gi/gitwatch/package.nix
+++ b/pkgs/by-name/gi/gitwatch/package.nix
@@ -17,7 +17,7 @@ runCommand "gitwatch"
     src = fetchFromGitHub {
       owner = "gitwatch";
       repo = "gitwatch";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-KuWD2FAMi2vZ/7e4fIg97DGuAPEV9b9iOuF8NIGFVpE=";
     };
     nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/gi/gixy/package.nix b/pkgs/by-name/gi/gixy/package.nix
index 2cb1d7a27886..5d1bfb65d4c2 100644
--- a/pkgs/by-name/gi/gixy/package.nix
+++ b/pkgs/by-name/gi/gixy/package.nix
@@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yandex";
     repo = "gixy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "14arz3fjidb8z37m08xcpih1391varj8s0v3gri79z3qb4zq5k6b";
   };
 
diff --git a/pkgs/by-name/gj/gjo/package.nix b/pkgs/by-name/gj/gjo/package.nix
index 2bf11e1269a6..cdb84410bf18 100644
--- a/pkgs/by-name/gj/gjo/package.nix
+++ b/pkgs/by-name/gj/gjo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "skanehira";
     repo = "gjo";
-    tag = version;
+    rev = version;
     hash = "sha256-vEk5MZqwAMgqMLjwRJwnbx8nVyF3U2iUz0S3L0GmCh4=";
   };
 
diff --git a/pkgs/by-name/gl/glas/package.nix b/pkgs/by-name/gl/glas/package.nix
index 1c76688287c0..45f7ae6715ff 100644
--- a/pkgs/by-name/gl/glas/package.nix
+++ b/pkgs/by-name/gl/glas/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "maurobalbi";
     repo = "glas";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jMpFxzosaCedwsJ8URlR3Gd/mnlgSBEfA3oIymmEPFU=";
   };
 
diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix
index 806ff04c9057..845080180656 100644
--- a/pkgs/by-name/gl/glauth/package.nix
+++ b/pkgs/by-name/gl/glauth/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "glauth";
     repo = "glauth";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FOhtL8nIm5kuKRxFtkrDyUU2z1K22ZdHaes3GY0KmfQ=";
   };
 
diff --git a/pkgs/by-name/gl/glava/package.nix b/pkgs/by-name/gl/glava/package.nix
index 8d7a6b9767c5..742fbe2a72d0 100644
--- a/pkgs/by-name/gl/glava/package.nix
+++ b/pkgs/by-name/gl/glava/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wacossusca34";
     repo = "glava";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0kqkjxmpqkmgby05lsf6c6iwm45n33jk5qy6gi3zvjx4q4yzal1i";
   };
 
diff --git a/pkgs/by-name/gl/glbinding/package.nix b/pkgs/by-name/gl/glbinding/package.nix
index c9caa096a188..91d92fa27d7c 100644
--- a/pkgs/by-name/gl/glbinding/package.nix
+++ b/pkgs/by-name/gl/glbinding/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cginternals";
     repo = "glbinding";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-EHvudihHL/MEVo0lbSqxrgc6TJnPH8Ia6bCJK0yNCbg=";
   };
 
diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix
index d05cd69a781d..fa740ddbaccf 100644
--- a/pkgs/by-name/gl/glfw3/package.nix
+++ b/pkgs/by-name/gl/glfw3/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "glfw";
     repo = "GLFW";
-    tag = version;
+    rev = version;
     hash = "sha256-FcnQPDeNHgov1Z07gjFze0VMz2diOrpbKZCsI96ngz0=";
   };
 
diff --git a/pkgs/by-name/gl/glicol-cli/package.nix b/pkgs/by-name/gl/glicol-cli/package.nix
index b8763263a64f..3bb374b47600 100644
--- a/pkgs/by-name/gl/glicol-cli/package.nix
+++ b/pkgs/by-name/gl/glicol-cli/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "glicol";
     repo = "glicol-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-v90FfF4vP5UPy8VnQFvYMKiCrledgNMpWbJR59Cv6a0=";
   };
 
diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix
index d5919e99e1d2..3df8b59ba5a4 100644
--- a/pkgs/by-name/gl/glide-media-player/package.nix
+++ b/pkgs/by-name/gl/glide-media-player/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "philn";
     repo = "glide";
-    tag = version;
+    rev = version;
     hash = "sha256-gmBXUj6LxC7VDH/ni8neYivysagqcbI/UCUq9Ly3D24=";
   };
 
diff --git a/pkgs/by-name/gl/glider/package.nix b/pkgs/by-name/gl/glider/package.nix
index d7aac90e46c4..86d33e603021 100644
--- a/pkgs/by-name/gl/glider/package.nix
+++ b/pkgs/by-name/gl/glider/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nadoo";
     repo = "glider";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LrIHdI1/55llENjDgFJxh2KKsJf/tLT3P9L9jhLhfS0=";
   };
 
diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix
index e151ea000fab..c7f5633a021b 100644
--- a/pkgs/by-name/gl/glitter/package.nix
+++ b/pkgs/by-name/gl/glitter/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "milo123459";
     repo = "glitter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dImQLC7owPf2EB5COO5vjN3a6k7gJ88D2hMSUW2/wn4=";
   };
 
diff --git a/pkgs/by-name/gl/glm/package.nix b/pkgs/by-name/gl/glm/package.nix
index 9e16c220827d..1cda3e6bf26b 100644
--- a/pkgs/by-name/gl/glm/package.nix
+++ b/pkgs/by-name/gl/glm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "g-truc";
     repo = "glm";
-    tag = version;
+    rev = version;
     sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE=";
   };
 
diff --git a/pkgs/by-name/gl/glmark2/package.nix b/pkgs/by-name/gl/glmark2/package.nix
index ea3be247c405..1ba60f3588c4 100644
--- a/pkgs/by-name/gl/glmark2/package.nix
+++ b/pkgs/by-name/gl/glmark2/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "glmark2";
     repo = "glmark2";
-    tag = version;
+    rev = version;
     sha256 = "sha256-WCvc5GqrAdpIKQ4LVqwO6ZGbzBgLCl49NxiGJynIjSQ=";
   };
 
diff --git a/pkgs/by-name/gl/global-platform-pro/package.nix b/pkgs/by-name/gl/global-platform-pro/package.nix
index d193f4071de4..4c16e4a67f3e 100644
--- a/pkgs/by-name/gl/global-platform-pro/package.nix
+++ b/pkgs/by-name/gl/global-platform-pro/package.nix
@@ -31,7 +31,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "martinpaljak";
     repo = "GlobalPlatformPro";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yy2WOLDetBrbNRf6HvvPdNPD51ujXomI2a2Hj6eVx1Q=";
   };
 
diff --git a/pkgs/by-name/gl/globalarrays/package.nix b/pkgs/by-name/gl/globalarrays/package.nix
index d24937bbb886..c0fafce47561 100644
--- a/pkgs/by-name/gl/globalarrays/package.nix
+++ b/pkgs/by-name/gl/globalarrays/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GlobalArrays";
     repo = "ga";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bMX538yen9cINPCtgf7SUGGsNRJugMrveqXtChHzPkk=";
   };
 
diff --git a/pkgs/by-name/gl/globalping-cli/package.nix b/pkgs/by-name/gl/globalping-cli/package.nix
index b1281d987b62..255ee632f171 100644
--- a/pkgs/by-name/gl/globalping-cli/package.nix
+++ b/pkgs/by-name/gl/globalping-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jsdelivr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UB2vYdyJ2+H8rFyJn1KBNnWoGUlRjwYorWXqoB9WDu0=";
   };
 
diff --git a/pkgs/by-name/gl/glog/package.nix b/pkgs/by-name/gl/glog/package.nix
index f00913dd9a43..58246c2f059f 100644
--- a/pkgs/by-name/gl/glog/package.nix
+++ b/pkgs/by-name/gl/glog/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "glog";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4=";
   };
 
diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index 37ecc7d14e64..3886d04d19c8 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qn4hQKl3E36q7HsgOVWz+eRceKGysyy5rHXzQnOc7JY=";
   };
 
diff --git a/pkgs/by-name/gl/glow/package.nix b/pkgs/by-name/gl/glow/package.nix
index a28005a589f7..63922ea660e7 100644
--- a/pkgs/by-name/gl/glow/package.nix
+++ b/pkgs/by-name/gl/glow/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "glow";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pYXzm6HEqxJRPDdiUb+yij3iA2FhFYZOdRvQ69grcuU=";
   };
 
diff --git a/pkgs/by-name/gl/glowing-bear/package.nix b/pkgs/by-name/gl/glowing-bear/package.nix
index cd822ad87d24..f1a352c8e773 100644
--- a/pkgs/by-name/gl/glowing-bear/package.nix
+++ b/pkgs/by-name/gl/glowing-bear/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "0.9.0";
 
   src = fetchFromGitHub {
-    tag = version;
+    rev = version;
     owner = "glowing-bear";
     repo = "glowing-bear";
     sha256 = "0lf0j72m6rwlgqssdxf0m9si99lah08lww7q7i08p5i5lpv6zh2s";
diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix
index dad097648cf9..fc2de8e52d78 100644
--- a/pkgs/by-name/gl/glrnvim/package.nix
+++ b/pkgs/by-name/gl/glrnvim/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "beeender";
     repo = "glrnvim";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-n3t3s3fzmBGXRDydYxNJ13itKul8dyLNW6HP8Di4hY0=";
   };
 
diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix
index 74d6811d2cb5..6feecafc1612 100644
--- a/pkgs/by-name/gl/glslang/package.nix
+++ b/pkgs/by-name/gl/glslang/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
-    tag = version;
+    rev = version;
     hash = "sha256-E1Zenf7XSGoozx4hxdOlMu+XZ6mJROSu7jIVYPWe3go=";
   };
 
diff --git a/pkgs/by-name/gl/glslls/package.nix b/pkgs/by-name/gl/glslls/package.nix
index d88a188d3628..c23047cf027d 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";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-wi1QiqaWRh1DmIhwmu94lL/4uuMv6DnB+whM61Jg1Zs=";
   };
diff --git a/pkgs/by-name/gl/gluesql/package.nix b/pkgs/by-name/gl/gluesql/package.nix
index 4b4f5e146b4c..b619ebd527ae 100644
--- a/pkgs/by-name/gl/gluesql/package.nix
+++ b/pkgs/by-name/gl/gluesql/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "gluesql";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-z2fpyPJfyPtO13Ly7XRmMW3rp6G3jNLsMMFz83Wmr0E=";
   };
 
diff --git a/pkgs/by-name/gl/glui/package.nix b/pkgs/by-name/gl/glui/package.nix
index 15b0786f13ed..a703550a7ded 100644
--- a/pkgs/by-name/gl/glui/package.nix
+++ b/pkgs/by-name/gl/glui/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libglui";
     repo = "glui";
-    tag = version;
+    rev = version;
     sha256 = "0qg2y8w95s03zay1qsqs8pqxxlg6l9kwm7rrs1qmx0h22sxb360i";
   };
 
diff --git a/pkgs/by-name/gl/glusterfs/package.nix b/pkgs/by-name/gl/glusterfs/package.nix
index 24f1b8f84784..efe75a0f89cc 100644
--- a/pkgs/by-name/gl/glusterfs/package.nix
+++ b/pkgs/by-name/gl/glusterfs/package.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gluster";
     repo = "glusterfs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZClMfozeFO3266fkuCSV04QwpZaYa8B0uq2lTPEN2rQ=";
   };
   inherit buildInputs propagatedBuildInputs;
diff --git a/pkgs/by-name/gl/glyr/package.nix b/pkgs/by-name/gl/glyr/package.nix
index b1f6ac3ade7b..9303d4c9e7d5 100644
--- a/pkgs/by-name/gl/glyr/package.nix
+++ b/pkgs/by-name/gl/glyr/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sahib";
     repo = "glyr";
-    tag = version;
+    rev = version;
     sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr";
   };
 
diff --git a/pkgs/by-name/gm/gmailctl/package.nix b/pkgs/by-name/gm/gmailctl/package.nix
index f33d5be8a3ef..900157a20cce 100644
--- a/pkgs/by-name/gm/gmailctl/package.nix
+++ b/pkgs/by-name/gm/gmailctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mbrt";
     repo = "gmailctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-euYl7GKidkOFsSxrEnSBIdBNZOKuBBaS3LNQOZy9R9g=";
   };
 
diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix
index 428ab0bfb521..28b52a9eae45 100644
--- a/pkgs/by-name/gm/gmid/package.nix
+++ b/pkgs/by-name/gm/gmid/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "omar-polo";
     repo = "gmid";
-    tag = version;
+    rev = version;
     hash = "sha256-JyiGkVF9aRJXgWAwZEnGgaD+IiH3UzamfTAcWyN0now=";
   };
 
diff --git a/pkgs/by-name/gn/gnirehtet/package.nix b/pkgs/by-name/gn/gnirehtet/package.nix
index e9ed7f711e62..15024ae92ece 100644
--- a/pkgs/by-name/gn/gnirehtet/package.nix
+++ b/pkgs/by-name/gn/gnirehtet/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Genymobile";
     repo = "gnirehtet";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ewLYCZgkjbh6lR9e4iTddCIrB+5dxyviIXhOqlZsLqc=";
   };
   passthru = {
diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix
index ed67be3e6fbd..73fe10e42abe 100644
--- a/pkgs/by-name/gn/gnmic/package.nix
+++ b/pkgs/by-name/gn/gnmic/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openconfig";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rdT1gCALEsPiyN+4RKmJ36CUkYmbkIyi56JjVkzzkp8=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-extension-manager/package.nix b/pkgs/by-name/gn/gnome-extension-manager/package.nix
index e25c15d95375..bdc7a3f91992 100644
--- a/pkgs/by-name/gn/gnome-extension-manager/package.nix
+++ b/pkgs/by-name/gn/gnome-extension-manager/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mjakeman";
     repo = "extension-manager";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0AK7wU04gQCS/3FvoAwAEmaP/jC23EduOSRncLjt4l8=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-firmware/package.nix b/pkgs/by-name/gn/gnome-firmware/package.nix
index 64ea09068784..dc736a30ef2e 100644
--- a/pkgs/by-name/gn/gnome-firmware/package.nix
+++ b/pkgs/by-name/gn/gnome-firmware/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "gnome-firmware";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-dI9tE/I+14IhYZ+IDLErPunlT4L29AudbZXh0at4jKQ=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix
index 90fbfc3d5b62..d252c33ce474 100644
--- a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix
+++ b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xapp-project";
     repo = "gnome-online-accounts-gtk";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-/d6ezujW/yeZV95zv/12ttUEUliZARtEGFoCXe6Dp/I=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-pass-search-provider/package.nix b/pkgs/by-name/gn/gnome-pass-search-provider/package.nix
index 8063b937af20..69e06977c9c2 100644
--- a/pkgs/by-name/gn/gnome-pass-search-provider/package.nix
+++ b/pkgs/by-name/gn/gnome-pass-search-provider/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jle64";
     repo = "gnome-pass-search-provider";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-PDR8fbDoT8IkHiTopQp0zd4DQg7JlacA6NdKYKYmrWw=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix
index 763ef8bd4e86..738aff462e90 100644
--- a/pkgs/by-name/gn/gnome-pomodoro/package.nix
+++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-ZdTMaCzjA7tsXmnlHGl8MFGGViVPwMZuiu91q5v/v9U=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix
index e9451606da2f..10eae3e97d68 100644
--- a/pkgs/by-name/gn/gnome-session/ctl.nix
+++ b/pkgs/by-name/gn/gnome-session/ctl.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-RY0+iIwwjd7268m3EYrZ1yUBLHXmaWddtSxqgUUH6qQ=";
   };
 
diff --git a/pkgs/by-name/gn/gnostic/package.nix b/pkgs/by-name/gn/gnostic/package.nix
index c10c759bd342..44ea7bf06a62 100644
--- a/pkgs/by-name/gn/gnostic/package.nix
+++ b/pkgs/by-name/gn/gnostic/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Wpe+rK4XMfMZYhR1xTEr0nsEjRGkSDA7aiLeBbGcRpA=";
   };
 
diff --git a/pkgs/by-name/gn/gnss-sdr/package.nix b/pkgs/by-name/gn/gnss-sdr/package.nix
index d90e2d668b45..e3a242b42d53 100644
--- a/pkgs/by-name/gn/gnss-sdr/package.nix
+++ b/pkgs/by-name/gn/gnss-sdr/package.nix
@@ -28,7 +28,7 @@ gnuradio.pkgs.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gnss-sdr";
     repo = "gnss-sdr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-IbkYdw1pwI+FMnZMChsxMz241Kv4EzMcBb0mm6/jq1k=";
   };
 
diff --git a/pkgs/by-name/gn/gnss-share/package.nix b/pkgs/by-name/gn/gnss-share/package.nix
index 179a7464ceb1..4c99144b05ff 100644
--- a/pkgs/by-name/gn/gnss-share/package.nix
+++ b/pkgs/by-name/gn/gnss-share/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "postmarketOS";
     repo = "gnss-share";
-    tag = version;
+    rev = version;
     hash = "sha256-4X1oiQWn2oZPw/14hNyZ0a6FEwoykotBisY6lk6lj2k=";
   };
   vendorHash = "sha256-dmE6hfKUqEr7BMNi/HMUOk4jDB0dPXEMkWQyWj6XpY4=";
diff --git a/pkgs/by-name/gn/gnu-efi_3/package.nix b/pkgs/by-name/gn/gnu-efi_3/package.nix
index bb3982b5cbba..ad04a677616e 100644
--- a/pkgs/by-name/gn/gnu-efi_3/package.nix
+++ b/pkgs/by-name/gn/gnu-efi_3/package.nix
@@ -10,7 +10,7 @@ gnu-efi.overrideAttrs (
     src = fetchFromGitHub {
       owner = "ncroxon";
       repo = "gnu-efi";
-      tag = finalAttrs.version;
+      rev = finalAttrs.version;
       hash = "sha256-xtiKglLXm9m4li/8tqbOsyM6ThwGhyu/g4kw5sC4URY=";
     };
     passthru.tests = {
diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix
index 1a5d5db37261..3d9cc47f9bb9 100644
--- a/pkgs/by-name/gn/gnucash/package.nix
+++ b/pkgs/by-name/gn/gnucash/package.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
     src = fetchFromGitHub {
       owner = "Gnucash";
       repo = "gnucash-docs";
-      tag = version;
+      rev = version;
       hash = "sha256-uXpIAsucVUaAlqYTKfrfBg04Kb5Mza67l0ZU6fxkSUY=";
     };
 
diff --git a/pkgs/by-name/go/go-2fa/package.nix b/pkgs/by-name/go/go-2fa/package.nix
index 6506e62b55d5..55d777523dd2 100644
--- a/pkgs/by-name/go/go-2fa/package.nix
+++ b/pkgs/by-name/go/go-2fa/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rsc";
     repo = "2fa";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cB5iADZwvJQwwK1GockE2uicFlqFMEAY6xyeXF5lnUY=";
   };
 
diff --git a/pkgs/by-name/go/go-audit/package.nix b/pkgs/by-name/go/go-audit/package.nix
index 70d26390d05b..f562f8fb8c51 100644
--- a/pkgs/by-name/go/go-audit/package.nix
+++ b/pkgs/by-name/go/go-audit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slackhq";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Li/bMgl/wj9bHpXW5gwWvb7BvyBPzeLCP979J2kyRCM=";
   };
 
diff --git a/pkgs/by-name/go/go-bindata/package.nix b/pkgs/by-name/go/go-bindata/package.nix
index 62b9fd51d856..d3f48c5bdd34 100644
--- a/pkgs/by-name/go/go-bindata/package.nix
+++ b/pkgs/by-name/go/go-bindata/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kevinburke";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3/1RqJrv1fsPKsZpurp2dHsMg8FJBcFlI/pwwCf5H6E=";
   };
 
diff --git a/pkgs/by-name/go/go-blueprint/package.nix b/pkgs/by-name/go/go-blueprint/package.nix
index ef6c8c9ba257..87019c44fe02 100644
--- a/pkgs/by-name/go/go-blueprint/package.nix
+++ b/pkgs/by-name/go/go-blueprint/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Melkeydev";
     repo = "go-blueprint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8J+PxFHrNkX2McBn1tO7Q1X4tWtMWDIRsxzKtRhM/Jk=";
   };
 
diff --git a/pkgs/by-name/go/go-callvis/package.nix b/pkgs/by-name/go/go-callvis/package.nix
index 11133a33cf35..4a06f4d363a8 100644
--- a/pkgs/by-name/go/go-callvis/package.nix
+++ b/pkgs/by-name/go/go-callvis/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ofabry";
     repo = "go-callvis";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gCQjxJH03QAg6MZx5NJUJR6tKP02ThIa5BGN6A/0ejM=";
   };
 
diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix
index fd3e8b9a78b4..80939ef6e3dd 100644
--- a/pkgs/by-name/go/go-camo/package.nix
+++ b/pkgs/by-name/go/go-camo/package.nix
@@ -13,7 +13,7 @@ buildGo124Module rec {
   src = fetchFromGitHub {
     owner = "cactus";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uf/r+QDukuFbbsFQal0mfZaGHZYk1fGn8Kt1ipFD/vI=";
   };
 
diff --git a/pkgs/by-name/go/go-containerregistry/package.nix b/pkgs/by-name/go/go-containerregistry/package.nix
index 7e9c99ee91a8..bd307c577a14 100644
--- a/pkgs/by-name/go/go-containerregistry/package.nix
+++ b/pkgs/by-name/go/go-containerregistry/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HiksVzVuY4uub7Lwfyh3GN8wpH2MgIjKSO4mQJZeNvs=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/go/go-cover-treemap/package.nix b/pkgs/by-name/go/go-cover-treemap/package.nix
index f152c3e80940..de358e4c8428 100644
--- a/pkgs/by-name/go/go-cover-treemap/package.nix
+++ b/pkgs/by-name/go/go-cover-treemap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nikolaydubina";
     repo = "go-cover-treemap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MSkPot8uYcr8pxsIkJh2FThVK9xpzkN9Y69KeiQnQlA=";
   };
 
diff --git a/pkgs/by-name/go/go-cqhttp/package.nix b/pkgs/by-name/go/go-cqhttp/package.nix
index a1134f7c154f..5fb59710c74e 100644
--- a/pkgs/by-name/go/go-cqhttp/package.nix
+++ b/pkgs/by-name/go/go-cqhttp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Mrs4s";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mKenmsGdVg60zjVMTfbEtqtPcJdJo60Nz6IUQ9RB7j0=";
   };
 
diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix
index cbfd1da56625..767e4e85b136 100644
--- a/pkgs/by-name/go/go-critic/package.nix
+++ b/pkgs/by-name/go/go-critic/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-critic";
     repo = "go-critic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0AOhq7OhSHub4I6XXL018hg6i2ERkIbZCrO9osNjvHw=";
   };
 
diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix
index 1276aa3f6e70..8f5eb3c77d01 100644
--- a/pkgs/by-name/go/go-dnscollector/package.nix
+++ b/pkgs/by-name/go/go-dnscollector/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dmachard";
     repo = "go-dnscollector";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rJHU/hDmnANziJj/K2FGccZjWFe8eyggtjIc2nt0pgo=";
   };
 
diff --git a/pkgs/by-name/go/go-errorlint/package.nix b/pkgs/by-name/go/go-errorlint/package.nix
index 5c179ce0d572..d0bfac3a4cef 100644
--- a/pkgs/by-name/go/go-errorlint/package.nix
+++ b/pkgs/by-name/go/go-errorlint/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "polyfloyd";
     repo = "go-errorlint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xO9AC1z3JNTRVEpM/FF8x+AMfmspU64kUywvpMb2yxM=";
   };
 
diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix
index 472a885dd4a4..5c6035799e8d 100644
--- a/pkgs/by-name/go/go-ethereum/package.nix
+++ b/pkgs/by-name/go/go-ethereum/package.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BdNv0rx+9/F0leNj2AAej8psy8X8HysDrIXheVOOkSo=";
   };
 
diff --git a/pkgs/by-name/go/go-graft/package.nix b/pkgs/by-name/go/go-graft/package.nix
index 358e6249b014..5f7d2d339cb2 100644
--- a/pkgs/by-name/go/go-graft/package.nix
+++ b/pkgs/by-name/go/go-graft/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mzz2017";
     repo = "gg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU=";
   };
 
diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix
index cbcd09de8a08..df58a2f56ae3 100644
--- a/pkgs/by-name/go/go-ios/package.nix
+++ b/pkgs/by-name/go/go-ios/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "danielpaulus";
     repo = "go-ios";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YThPGxKtGEv/jTlvtWvdJFjk+1+GLuKAtH0ivNlmr6A=";
   };
 
diff --git a/pkgs/by-name/go/go-jet/package.nix b/pkgs/by-name/go/go-jet/package.nix
index f9867650da20..e4e3e054ab96 100644
--- a/pkgs/by-name/go/go-jet/package.nix
+++ b/pkgs/by-name/go/go-jet/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "jet";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-abk/mcukxIgAD9Oxh3H4+xrSoY30aW7EXZxEXXlriHA=";
   };
 
diff --git a/pkgs/by-name/go/go-jira/package.nix b/pkgs/by-name/go/go-jira/package.nix
index 6639ec2fc76d..35ad78247600 100644
--- a/pkgs/by-name/go/go-jira/package.nix
+++ b/pkgs/by-name/go/go-jira/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "1.0.28";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "go-jira";
     repo = "jira";
     sha256 = "sha256-h/x77xGqdOxPBxdchElZU9GFgjnNo89o9gx4fYM5dME=";
diff --git a/pkgs/by-name/go/go-jsonnet/package.nix b/pkgs/by-name/go/go-jsonnet/package.nix
index d4b8060a3cfb..9e00f8d68cf1 100644
--- a/pkgs/by-name/go/go-jsonnet/package.nix
+++ b/pkgs/by-name/go/go-jsonnet/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P69tguBrFF/CSCOfHjCfBT5710oJdhZDh3kMCbc32eE=";
   };
 
diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix
index 57cf7f12b3af..c94afc6622b9 100644
--- a/pkgs/by-name/go/go-judge/package.nix
+++ b/pkgs/by-name/go/go-judge/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "criyle";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AmbhfCKUpvZt/me73EhBQqw8yDnItn1zKiemf/JRz24=";
   };
 
diff --git a/pkgs/by-name/go/go-junit-report/package.nix b/pkgs/by-name/go/go-junit-report/package.nix
index fe5e2f7e73cf..a6eabc0b573f 100644
--- a/pkgs/by-name/go/go-junit-report/package.nix
+++ b/pkgs/by-name/go/go-junit-report/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jstemmer";
     repo = "go-junit-report";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-s4XVjACmpd10C5k+P3vtcS/aWxI6UkSUPyxzLhD2vRI=";
   };
 
diff --git a/pkgs/by-name/go/go-libp2p-daemon/package.nix b/pkgs/by-name/go/go-libp2p-daemon/package.nix
index f6d0a1f031a4..0f9c7e06dc5a 100644
--- a/pkgs/by-name/go/go-libp2p-daemon/package.nix
+++ b/pkgs/by-name/go/go-libp2p-daemon/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "libp2p";
     repo = "go-libp2p-daemon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N/5V03HQTr7dIvMpIVRlIhEaV2f+aDF36esWMjT96HA=";
   };
 
diff --git a/pkgs/by-name/go/go-licence-detector/package.nix b/pkgs/by-name/go/go-licence-detector/package.nix
index 5db590b65ded..dd08b14598d4 100644
--- a/pkgs/by-name/go/go-licence-detector/package.nix
+++ b/pkgs/by-name/go/go-licence-detector/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "go-licence-detector";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-43MyzEF7BZ7pcgzDvXx9SjXGHaLozmWkGWUO/yf6K98=";
   };
 
diff --git a/pkgs/by-name/go/go-license-detector/package.nix b/pkgs/by-name/go/go-license-detector/package.nix
index 1a1fdfd55600..2b5be457f252 100644
--- a/pkgs/by-name/go/go-license-detector/package.nix
+++ b/pkgs/by-name/go/go-license-detector/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-enry";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-S9LKXjn5dL5FETOOAk+bs7bIVdu2x7MIhfjpZuXzuLo=";
   };
 
diff --git a/pkgs/by-name/go/go-md2man/package.nix b/pkgs/by-name/go/go-md2man/package.nix
index cbf04849842b..f06d54a10974 100644
--- a/pkgs/by-name/go/go-md2man/package.nix
+++ b/pkgs/by-name/go/go-md2man/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   vendorHash = "sha256-aMLL/tmRLyGze3RSB9dKnoTv5ZK1eRtgV8fkajWEbU0=";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "cpuguy83";
     repo = "go-md2man";
     sha256 = "sha256-wJnHgp+NPchXkR71ARLMjo4VryzgGkz2tYWPsC+3eFo=";
diff --git a/pkgs/by-name/go/go-migrate/package.nix b/pkgs/by-name/go/go-migrate/package.nix
index c77b11992fd5..f5857b03ad37 100644
--- a/pkgs/by-name/go/go-migrate/package.nix
+++ b/pkgs/by-name/go/go-migrate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "golang-migrate";
     repo = "migrate";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DRWJ5USabSQtNkyDjz8P7eOS2QBE1KaD8K8XYORBVGo=";
   };
 
diff --git a/pkgs/by-name/go/go-minimock/package.nix b/pkgs/by-name/go/go-minimock/package.nix
index c80e62053365..5b1440b0752b 100644
--- a/pkgs/by-name/go/go-minimock/package.nix
+++ b/pkgs/by-name/go/go-minimock/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gojuno";
     repo = "minimock";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-D5U1KfWXe9qtcFQKDoISC6Hq5axMO37WsyFjpPOyyo4=";
   };
 
diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix
index c906d27c5474..99cd99afeaaa 100644
--- a/pkgs/by-name/go/go-mockery/package.nix
+++ b/pkgs/by-name/go/go-mockery/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vektra";
     repo = "mockery";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-X0cHpv4o6pzgjg7+ULCuFkspeff95WFtJbVHqy4LxAg=";
   };
 
diff --git a/pkgs/by-name/go/go-mod-graph-chart/package.nix b/pkgs/by-name/go/go-mod-graph-chart/package.nix
index a2ba1866abb5..9a435833bba9 100644
--- a/pkgs/by-name/go/go-mod-graph-chart/package.nix
+++ b/pkgs/by-name/go/go-mod-graph-chart/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "PaulXu-cn";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vitUZXQyAj72ed9Gukr/sAT/iWWMhwsxjZhf2a9CM7I=";
   };
 
diff --git a/pkgs/by-name/go/go-motion/package.nix b/pkgs/by-name/go/go-motion/package.nix
index 95062c6acc3a..9a950ac86407 100644
--- a/pkgs/by-name/go/go-motion/package.nix
+++ b/pkgs/by-name/go/go-motion/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fatih";
     repo = "motion";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7vkMhjO4JUAf0sUcKiMjqJ5GzLb//QoHd7Cagerx4/s=";
   };
 
diff --git a/pkgs/by-name/go/go-mtpfs/package.nix b/pkgs/by-name/go/go-mtpfs/package.nix
index 874aaf0447ef..f6e6e667cc59 100644
--- a/pkgs/by-name/go/go-mtpfs/package.nix
+++ b/pkgs/by-name/go/go-mtpfs/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hanwen";
     repo = "go-mtpfs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HVfB8/MImgZZLx4tcrlYOfQjpAdHMHshEaSsd+n758w=";
   };
 
diff --git a/pkgs/by-name/go/go-musicfox/package.nix b/pkgs/by-name/go/go-musicfox/package.nix
index f91cb9f0791c..1125622d4752 100644
--- a/pkgs/by-name/go/go-musicfox/package.nix
+++ b/pkgs/by-name/go/go-musicfox/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-musicfox";
     repo = "go-musicfox";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pzB57XeDD8lfJMkP9/k1rrszYXYYzQt2UekH2Atiqjw=";
   };
 
diff --git a/pkgs/by-name/go/go-org/package.nix b/pkgs/by-name/go/go-org/package.nix
index 1079bde007d8..dabed8503e25 100644
--- a/pkgs/by-name/go/go-org/package.nix
+++ b/pkgs/by-name/go/go-org/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "niklasfasching";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BPCQxl0aJ9PrEC5o5dc5uBbX8eYAxqB+qMLXo1LwCoA=";
   };
 
diff --git a/pkgs/by-name/go/go-passbolt-cli/package.nix b/pkgs/by-name/go/go-passbolt-cli/package.nix
index abdd01b59bdd..d2c4341d90cb 100644
--- a/pkgs/by-name/go/go-passbolt-cli/package.nix
+++ b/pkgs/by-name/go/go-passbolt-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "passbolt";
     repo = "go-passbolt-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BtMPOmp9dbi/HoNigEeGWIYXRh1/gorV8ycrtWw9I8s=";
   };
 
diff --git a/pkgs/by-name/go/go-protobuf/package.nix b/pkgs/by-name/go/go-protobuf/package.nix
index 90fc3137cdd9..b55e3b15a3eb 100644
--- a/pkgs/by-name/go/go-protobuf/package.nix
+++ b/pkgs/by-name/go/go-protobuf/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "golang";
     repo = "protobuf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-AfyZ6xlqmrsVqtoKV1XMEo/Vba9Kpu1EgwfF6pPSZ64=";
   };
 
diff --git a/pkgs/by-name/go/go-rice/package.nix b/pkgs/by-name/go/go-rice/package.nix
index 371d981aacc5..85127bc363d3 100644
--- a/pkgs/by-name/go/go-rice/package.nix
+++ b/pkgs/by-name/go/go-rice/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GeertJohan";
     repo = "go.rice";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jO4otde/m52L2NrE88aXRjdGDBNxnbP1Zt+5fEqfNIc=";
   };
 
diff --git a/pkgs/by-name/go/go-shadowsocks2/package.nix b/pkgs/by-name/go/go-shadowsocks2/package.nix
index 9e06f5b2e5a8..d3398e2d7c7c 100644
--- a/pkgs/by-name/go/go-shadowsocks2/package.nix
+++ b/pkgs/by-name/go/go-shadowsocks2/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shadowsocks";
     repo = "go-shadowsocks2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-z2+5q8XlxMN7x86IOMJ0qbrW4Wrm1gp8GWew51yBRFg=";
   };
 
diff --git a/pkgs/by-name/go/go-swag/package.nix b/pkgs/by-name/go/go-swag/package.nix
index 41677b996b29..7193d56ba312 100644
--- a/pkgs/by-name/go/go-swag/package.nix
+++ b/pkgs/by-name/go/go-swag/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "swaggo";
     repo = "swag";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wqBT7uan5XL51HHDGINRH9NTb1tybF44d/rWRxl6Lak=";
   };
 
diff --git a/pkgs/by-name/go/go-symbols/package.nix b/pkgs/by-name/go/go-symbols/package.nix
index 6ddad0fe28f9..786e9d93a700 100644
--- a/pkgs/by-name/go/go-symbols/package.nix
+++ b/pkgs/by-name/go/go-symbols/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "acroca";
     repo = "go-symbols";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P2N4Hqrazu02CWOfAu7/KGlpjzjN65hkyWI1S5nh33s=";
   };
 
diff --git a/pkgs/by-name/go/go-toml/package.nix b/pkgs/by-name/go/go-toml/package.nix
index e93fd5e1e9f6..d22898102778 100644
--- a/pkgs/by-name/go/go-toml/package.nix
+++ b/pkgs/by-name/go/go-toml/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "pelletier";
     repo = "go-toml";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+l89SvJ/4SxVItys1ROLOv2hZ5euU1MF21Yn0siQHUM=";
   };
 
diff --git a/pkgs/by-name/go/go-tools/package.nix b/pkgs/by-name/go/go-tools/package.nix
index f61085c886ad..27feb8aeeec3 100644
--- a/pkgs/by-name/go/go-tools/package.nix
+++ b/pkgs/by-name/go/go-tools/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dominikh";
     repo = "go-tools";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ekSOXaVSFdzM76tcj1hbtzhYw4fnFX3VkTnsGtJanXg=";
   };
 
diff --git a/pkgs/by-name/go/goa/package.nix b/pkgs/by-name/go/goa/package.nix
index 5df7eb8cdb34..b97d284f4e37 100644
--- a/pkgs/by-name/go/goa/package.nix
+++ b/pkgs/by-name/go/goa/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goadesign";
     repo = "goa";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+MAK/qRvwMfjifeXmBjDWKmQ75LAbIUjZ6rvqw1Xv3I=";
   };
   vendorHash = "sha256-/5tcIvJpJPVMOL6XBAjXbiHeCwpB0YOLv5hRhd5zG7Q=";
diff --git a/pkgs/by-name/go/goat-cli/package.nix b/pkgs/by-name/go/goat-cli/package.nix
index 848c5b7388e3..58d12c4f5b83 100644
--- a/pkgs/by-name/go/goat-cli/package.nix
+++ b/pkgs/by-name/go/goat-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "goat";
     owner = "studio-b12";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7inoRBVR7zmt0jUFAGYjoYT2cdda0qgzyXLL+GiBFMg=";
   };
 
diff --git a/pkgs/by-name/go/goatcounter/package.nix b/pkgs/by-name/go/goatcounter/package.nix
index 67758185717a..a19bf73d3100 100644
--- a/pkgs/by-name/go/goatcounter/package.nix
+++ b/pkgs/by-name/go/goatcounter/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "arp242";
     repo = "goatcounter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lwiLk/YYxX4QwSDjpU/mAikumGXYMzleRzmPjZGruZU=";
   };
 
diff --git a/pkgs/by-name/go/goawk/package.nix b/pkgs/by-name/go/goawk/package.nix
index 633789f0f1bb..36f1382ce6db 100644
--- a/pkgs/by-name/go/goawk/package.nix
+++ b/pkgs/by-name/go/goawk/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "benhoyt";
     repo = "goawk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PQtayS2403ldNiE/xMQ/Oy+BsZB1ixDALuZcjhRyxLY=";
   };
 
diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix
index f78da1468568..12f6e8f38c7e 100644
--- a/pkgs/by-name/go/gobang/package.nix
+++ b/pkgs/by-name/go/gobang/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "tako8ki";
     repo = "gobang";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RinfQhG7iCp0Xcs9kLs3I2/wjkJEgCjFYe3mS+FY9Ak=";
   };
 
diff --git a/pkgs/by-name/go/gobble/package.nix b/pkgs/by-name/go/gobble/package.nix
index a39bf2ec302b..5f4b46d036b4 100644
--- a/pkgs/by-name/go/gobble/package.nix
+++ b/pkgs/by-name/go/gobble/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "EmperorPenguin18";
     repo = "gobble";
-    tag = version;
+    rev = version;
     hash = "sha256-g4154Axvjp9jbE0lvMeNGM+v2UxkAsZqt9kPv5bhVK8=";
   };
 
diff --git a/pkgs/by-name/go/gobby/package.nix b/pkgs/by-name/go/gobby/package.nix
index b30bdf06ab12..18f48b758d68 100644
--- a/pkgs/by-name/go/gobby/package.nix
+++ b/pkgs/by-name/go/gobby/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gobby";
     repo = "gobby";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "06cbc2y4xkw89jaa0ayhgh7fxr5p2nv3jjs8h2xcbbbgwaw08lk0";
   };
 
diff --git a/pkgs/by-name/go/gobetween/package.nix b/pkgs/by-name/go/gobetween/package.nix
index 36a5a3314ecf..ca795661eeee 100644
--- a/pkgs/by-name/go/gobetween/package.nix
+++ b/pkgs/by-name/go/gobetween/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yyyar";
     repo = "gobetween";
-    tag = version;
+    rev = version;
     sha256 = "0bxf89l53sqan9qq23rwawjkcanv9p61sw56zjqhyx78f0bh0zbc";
   };
 
diff --git a/pkgs/by-name/go/gobgp/package.nix b/pkgs/by-name/go/gobgp/package.nix
index 40d1dc4c07e6..9572b5677212 100644
--- a/pkgs/by-name/go/gobgp/package.nix
+++ b/pkgs/by-name/go/gobgp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "osrg";
     repo = "gobgp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vyMC3FcfMHVsRosLkTYgCawiTIcJs0R5GgSZERRPHnE=";
   };
 
diff --git a/pkgs/by-name/go/gocode-gomod/package.nix b/pkgs/by-name/go/gocode-gomod/package.nix
index 33868a7a1b0a..9aec956c578e 100644
--- a/pkgs/by-name/go/gocode-gomod/package.nix
+++ b/pkgs/by-name/go/gocode-gomod/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stamblerre";
     repo = "gocode";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "YAOYrPPKgnjCErq8+iW0Le51clGBv0MJy2Nnn7UVo/s=";
   };
 
diff --git a/pkgs/by-name/go/goconst/package.nix b/pkgs/by-name/go/goconst/package.nix
index 670085c1d0c6..6d1546d69f42 100644
--- a/pkgs/by-name/go/goconst/package.nix
+++ b/pkgs/by-name/go/goconst/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jgautheron";
     repo = "goconst";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GpOZJ5/5aNw1o8fk2RSAx200v6AZ+pbNu/25i8OSS1Y=";
   };
 
diff --git a/pkgs/by-name/go/gocover-cobertura/package.nix b/pkgs/by-name/go/gocover-cobertura/package.nix
index 5a7694ce2faf..a301d7d2551a 100644
--- a/pkgs/by-name/go/gocover-cobertura/package.nix
+++ b/pkgs/by-name/go/gocover-cobertura/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "boumenot";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Cxv1iuCYHSI0BFR1OLbeDIQfVLlMDxlTgU7ljpXWHjU=";
   };
 
diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix
index 9609ebf284e6..d894040fd55b 100644
--- a/pkgs/by-name/go/gocryptfs/package.nix
+++ b/pkgs/by-name/go/gocryptfs/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0iCCIAOAzLIeZ+eZYJTVXgOyKIsQnKe/XazFVECZDTM=";
   };
 
diff --git a/pkgs/by-name/go/gocyclo/package.nix b/pkgs/by-name/go/gocyclo/package.nix
index c6a1b10ccbb9..cd5447ef9c8e 100644
--- a/pkgs/by-name/go/gocyclo/package.nix
+++ b/pkgs/by-name/go/gocyclo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fzipp";
     repo = "gocyclo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1IwtGUqshpLDyxH5NNkGUads1TKLs48eslNnFylGUPA=";
   };
 
diff --git a/pkgs/by-name/go/goda/package.nix b/pkgs/by-name/go/goda/package.nix
index aa7ba4c964c7..64249f441c92 100644
--- a/pkgs/by-name/go/goda/package.nix
+++ b/pkgs/by-name/go/goda/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "loov";
     repo = "goda";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g/sScj5VDQjpWmZN+1YqKJHixGwSBJi6v6YiGklSsjw=";
   };
 
diff --git a/pkgs/by-name/go/godu/package.nix b/pkgs/by-name/go/godu/package.nix
index 4ed9e07e8b07..e034badc0ae7 100644
--- a/pkgs/by-name/go/godu/package.nix
+++ b/pkgs/by-name/go/godu/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "viktomas";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-z1LCPweaf8e/HWkSrRCiMYZl4F4dKo4/wDkWgY+eTvk=";
   };
 
diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix
index d8d3845f1150..e3f3f337892d 100644
--- a/pkgs/by-name/go/goeland/package.nix
+++ b/pkgs/by-name/go/goeland/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slurdge";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-4xhw6L6CuwW2MepwGvpVLVafMcU/g0bn/2M/8ZSRF/U=";
   };
 
diff --git a/pkgs/by-name/go/gof5/package.nix b/pkgs/by-name/go/gof5/package.nix
index 361ae0695670..82047971cd3b 100644
--- a/pkgs/by-name/go/gof5/package.nix
+++ b/pkgs/by-name/go/gof5/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kayrus";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "10qh7rj8s540ghjdvymly53vny3n0qd0z0ixy24n026jjhgjvnpl";
   };
 
diff --git a/pkgs/by-name/go/goflow/package.nix b/pkgs/by-name/go/goflow/package.nix
index 65fa88d4390f..fa1ffe01aeb2 100644
--- a/pkgs/by-name/go/goflow/package.nix
+++ b/pkgs/by-name/go/goflow/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dNu/z48wzUExGsfpKSWmLwhtqbs/Xi+4PFKRjTxt9DI=";
   };
 
diff --git a/pkgs/by-name/go/goflow2/package.nix b/pkgs/by-name/go/goflow2/package.nix
index 00957c6008d5..61ae91512caf 100644
--- a/pkgs/by-name/go/goflow2/package.nix
+++ b/pkgs/by-name/go/goflow2/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "netsampler";
     repo = "goflow2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-H+YeW1FOx4hE8ad8sEWFQPxl8IOZ+xIaiSk1a5w+0+Y=";
   };
 
diff --git a/pkgs/by-name/go/gofumpt/package.nix b/pkgs/by-name/go/gofumpt/package.nix
index b3275b146dea..12435ba1918d 100644
--- a/pkgs/by-name/go/gofumpt/package.nix
+++ b/pkgs/by-name/go/gofumpt/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mJM0uKztX0OUQvynnxeKL9yft7X/Eh28ERg8SbZC5Ws=";
   };
 
diff --git a/pkgs/by-name/go/gogup/package.nix b/pkgs/by-name/go/gogup/package.nix
index 3f38285cc59d..6d2d7d63e9c6 100644
--- a/pkgs/by-name/go/gogup/package.nix
+++ b/pkgs/by-name/go/gogup/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nao1215";
     repo = "gup";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5ZeiW8WPpfQfLe02lXRIOvQ9T9yslmYuYLt7ftqHfqc=";
   };
 
diff --git a/pkgs/by-name/go/goimports-reviser/package.nix b/pkgs/by-name/go/goimports-reviser/package.nix
index 3d11f6cb91ee..de3539d7c7a8 100644
--- a/pkgs/by-name/go/goimports-reviser/package.nix
+++ b/pkgs/by-name/go/goimports-reviser/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "incu6us";
     repo = "goimports-reviser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MMF5gzUbL8j9NTGKT1Xz177Z0SqdeKObBa6TEguK5aI=";
   };
   vendorHash = "sha256-BAV7vMWRgBZaL2Pya4QiVcY54VIiHT++Dz4ZZ92FGgM=";
diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix
index 346fdb20073d..365b7bc336c0 100644
--- a/pkgs/by-name/go/gojq/package.nix
+++ b/pkgs/by-name/go/gojq/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "itchyny";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zJkeghN3btF/fZZeuClHV1ndB/2tTTMljEukMYe7UWU=";
   };
 
diff --git a/pkgs/by-name/go/gojsontoyaml/package.nix b/pkgs/by-name/go/gojsontoyaml/package.nix
index 5d4be494d666..3057639d858d 100644
--- a/pkgs/by-name/go/gojsontoyaml/package.nix
+++ b/pkgs/by-name/go/gojsontoyaml/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "brancz";
     repo = "gojsontoyaml";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ebxz2uTH7XwD3j6JnsfET6aCGYjvsCjow/sU9pagg50=";
   };
 
diff --git a/pkgs/by-name/go/gokart/package.nix b/pkgs/by-name/go/gokart/package.nix
index d05cbb6f528d..aa3b53fb0e3b 100644
--- a/pkgs/by-name/go/gokart/package.nix
+++ b/pkgs/by-name/go/gokart/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-G1IjlJ/rmviFWy6RFfLtP+bhfYcDuB97leimU39YCoQ=";
   };
 
diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index bf4965300347..4d1517f03fc9 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -12,7 +12,7 @@ buildGo124Module rec {
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+IndC9znKgVGiFWW0aCNjhxPwX1kDFnfG2+SKEQ15Rc=";
   };
 
diff --git a/pkgs/by-name/go/goldwarden/package.nix b/pkgs/by-name/go/goldwarden/package.nix
index 6366249bd31e..eddf57bfbbfa 100644
--- a/pkgs/by-name/go/goldwarden/package.nix
+++ b/pkgs/by-name/go/goldwarden/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "quexten";
     repo = "goldwarden";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wAQFx0DKLLKztETAz1eM+eBFiAkSCgd8qqRtLV1Kz9g=";
   };
 
diff --git a/pkgs/by-name/go/golex/package.nix b/pkgs/by-name/go/golex/package.nix
index d94606af065e..99884d4d2d02 100644
--- a/pkgs/by-name/go/golex/package.nix
+++ b/pkgs/by-name/go/golex/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "cznic";
     repo = "golex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0Z2oE00vGnH2BBNmKAjRhy//fEbT5AQ+CKLIUr+NPwY=";
   };
 
diff --git a/pkgs/by-name/go/golines/package.nix b/pkgs/by-name/go/golines/package.nix
index d0b8ee391cf9..2d341924e80b 100644
--- a/pkgs/by-name/go/golines/package.nix
+++ b/pkgs/by-name/go/golines/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "segmentio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-D0gI9BA0vgM1DBqwolNTfPsTCWuOGrcu5gAVFEdyVGg=";
   };
 
diff --git a/pkgs/by-name/go/gomapenum/package.nix b/pkgs/by-name/go/gomapenum/package.nix
index d88363fdad05..5153e358cf37 100644
--- a/pkgs/by-name/go/gomapenum/package.nix
+++ b/pkgs/by-name/go/gomapenum/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nodauf";
     repo = "GoMapEnum";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-a0JpHk5pUe+MkcmJl871JwkOfFDg3S4yOzFIeXCReLE=";
   };
 
diff --git a/pkgs/by-name/go/gomarkdoc/package.nix b/pkgs/by-name/go/gomarkdoc/package.nix
index 457d8b50a04d..f4c7bb49a5fd 100644
--- a/pkgs/by-name/go/gomarkdoc/package.nix
+++ b/pkgs/by-name/go/gomarkdoc/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "princjef";
     repo = "gomarkdoc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eMH+F1ZXAKHqnrvOJvCETm2NiDwY03IFHrDNYr3jaW8=";
   };
 
diff --git a/pkgs/by-name/go/gomatrix/package.nix b/pkgs/by-name/go/gomatrix/package.nix
index b77d85c97617..387b0ed1063a 100644
--- a/pkgs/by-name/go/gomatrix/package.nix
+++ b/pkgs/by-name/go/gomatrix/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GeertJohan";
     repo = "gomatrix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VeRHVR8InfU+vEw2F/w3KFbNVSKS8ziRlQ98f3cuBfM=";
   };
 
diff --git a/pkgs/by-name/go/gomodifytags/package.nix b/pkgs/by-name/go/gomodifytags/package.nix
index 2bfd00ceea7a..567499f9e6d3 100644
--- a/pkgs/by-name/go/gomodifytags/package.nix
+++ b/pkgs/by-name/go/gomodifytags/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fatih";
     repo = "gomodifytags";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-XVjSRW7FzXbGmGT+xH4tNg9PVXvgmhQXTIrYYZ346/M=";
   };
 
diff --git a/pkgs/by-name/go/gomtree/package.nix b/pkgs/by-name/go/gomtree/package.nix
index 0627c5b4ed4d..3e06b58fad51 100644
--- a/pkgs/by-name/go/gomtree/package.nix
+++ b/pkgs/by-name/go/gomtree/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vbatts";
     repo = "go-mtree";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MDX16z4H1fyuV5atEsZHReJyvC+MRdeA54DORCFtpqI=";
   };
 
diff --git a/pkgs/by-name/go/gomuks/package.nix b/pkgs/by-name/go/gomuks/package.nix
index 92267590af2f..3dc22caaa00a 100644
--- a/pkgs/by-name/go/gomuks/package.nix
+++ b/pkgs/by-name/go/gomuks/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tulir";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bDJXo8d9K5UO599HDaABpfwc9/dJJy+9d24KMVZHyvI=";
   };
 
diff --git a/pkgs/by-name/go/gonic/package.nix b/pkgs/by-name/go/gonic/package.nix
index 1fa12c7a3dfa..d8b28ba56194 100644
--- a/pkgs/by-name/go/gonic/package.nix
+++ b/pkgs/by-name/go/gonic/package.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sentriz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+8rKODoADU2k1quKvbijjs/6S/hpkegHhG7Si0LSE0k=";
   };
 
diff --git a/pkgs/by-name/go/goodhosts/package.nix b/pkgs/by-name/go/goodhosts/package.nix
index eda8929ddc0b..dfb80b8a902a 100644
--- a/pkgs/by-name/go/goodhosts/package.nix
+++ b/pkgs/by-name/go/goodhosts/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goodhosts";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZasS7AYGYPV+nzp9JbJC5pD0yQ+ik+QnuL+3qC1uqFk=";
   };
 
diff --git a/pkgs/by-name/go/goodvibes/package.nix b/pkgs/by-name/go/goodvibes/package.nix
index 4e721a94bf85..653f3cf1ed9a 100644
--- a/pkgs/by-name/go/goodvibes/package.nix
+++ b/pkgs/by-name/go/goodvibes/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "goodvibes";
     repo = "goodvibes";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AHw8KlU1lmgH837GOpxGBgngwRIs5XV3+TvH4MuCx54=";
   };
 
diff --git a/pkgs/by-name/go/google-authenticator/package.nix b/pkgs/by-name/go/google-authenticator/package.nix
index 4218bdc18868..3eacb27aabee 100644
--- a/pkgs/by-name/go/google-authenticator/package.nix
+++ b/pkgs/by-name/go/google-authenticator/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "google-authenticator-libpam";
-    tag = version;
+    rev = version;
     hash = "sha256-cLMX5SdKvyQr3annc/Hhhz6XgY+BypRHASKRh6xTdmo=";
   };
 
diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix
index 32890336d9f8..3b8a0fe9f0f4 100644
--- a/pkgs/by-name/go/google-cloud-cpp/package.nix
+++ b/pkgs/by-name/go/google-cloud-cpp/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-cpp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gCq8Uc+s/rnJWsGlI7f+tvAZHH8K69+H/leUOKE2GCY=";
   };
 
diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
index 3542fc166aee..1a5ad6bd543c 100644
--- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
+++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "cloud-sql-proxy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IZSWJhA3M+d16KKOY6MULibvTNrf7InuNR/ahYznQHY=";
   };
 
diff --git a/pkgs/by-name/go/google-guest-configs/package.nix b/pkgs/by-name/go/google-guest-configs/package.nix
index 6c155fbaeba5..5a3bf68579a9 100644
--- a/pkgs/by-name/go/google-guest-configs/package.nix
+++ b/pkgs/by-name/go/google-guest-configs/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "guest-configs";
-    tag = version;
+    rev = version;
     sha256 = "sha256-0SRu6p/DsHNNI20mkXJitt/Ee5S2ooiy5hNmD+ndecM=";
   };
 
diff --git a/pkgs/by-name/go/google-guest-oslogin/package.nix b/pkgs/by-name/go/google-guest-oslogin/package.nix
index 373aebdcfd2c..cf963b728d6f 100644
--- a/pkgs/by-name/go/google-guest-oslogin/package.nix
+++ b/pkgs/by-name/go/google-guest-oslogin/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "guest-oslogin";
-    tag = version;
+    rev = version;
     sha256 = "sha256-9QCB94HVbeLjioJuSN1Aa+EqFncojPoWFxw5mS9bDGw=";
   };
 
diff --git a/pkgs/by-name/go/google-play/package.nix b/pkgs/by-name/go/google-play/package.nix
index c4754e81f38b..c404013adc2d 100644
--- a/pkgs/by-name/go/google-play/package.nix
+++ b/pkgs/by-name/go/google-play/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "3052";
     repo = "google";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Wf7k76TXBr10FIclo/Ny8MLDDSNXu54JTDS0vfw4UXA=";
   };
 
diff --git a/pkgs/by-name/go/goose-lang/package.nix b/pkgs/by-name/go/goose-lang/package.nix
index 5760441de163..5cacc12e5943 100644
--- a/pkgs/by-name/go/goose-lang/package.nix
+++ b/pkgs/by-name/go/goose-lang/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goose-lang";
     repo = "goose";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LAuWd/KeVdvPY45wL8g0MBTMrRCHcu/Ti3+IUvtcFUY=";
   };
 
diff --git a/pkgs/by-name/go/goose/package.nix b/pkgs/by-name/go/goose/package.nix
index 86557b7f9f6c..adcd30979bc1 100644
--- a/pkgs/by-name/go/goose/package.nix
+++ b/pkgs/by-name/go/goose/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pressly";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-C/FeXsmKmSA8unpqT5TcNOsSaQNzc4JTv5hkfeb760E=";
   };
 
diff --git a/pkgs/by-name/go/gopacked/package.nix b/pkgs/by-name/go/gopacked/package.nix
index 336d00ba78c7..9c482c172bc6 100644
--- a/pkgs/by-name/go/gopacked/package.nix
+++ b/pkgs/by-name/go/gopacked/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tulir";
     repo = "gopacked";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PpOLLqgUQf09grZlJ7bXTxAowzDusmVN8PHfaGlGGQ8=";
   };
 
diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix
index bd6a01f9e097..c8ac712834e1 100644
--- a/pkgs/by-name/go/gopass-jsonapi/package.nix
+++ b/pkgs/by-name/go/gopass-jsonapi/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-jsonapi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nayg7NTJH6bAPiguyuN37JivfWkpOUX/xI/+PHDi3UI=";
   };
 
diff --git a/pkgs/by-name/go/gopatch/package.nix b/pkgs/by-name/go/gopatch/package.nix
index 269ede71e6f2..ad7a50f3d82e 100644
--- a/pkgs/by-name/go/gopatch/package.nix
+++ b/pkgs/by-name/go/gopatch/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "uber-go";
     repo = "gopatch";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zP5zC71icrVvzKzBBlxfX9h5JlKd89cf32Q6eZatX44=";
   };
 
diff --git a/pkgs/by-name/go/gophernotes/package.nix b/pkgs/by-name/go/gophernotes/package.nix
index e4d24195efd9..f4829ba509a3 100644
--- a/pkgs/by-name/go/gophernotes/package.nix
+++ b/pkgs/by-name/go/gophernotes/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopherdata";
     repo = "gophernotes";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cGlYgay/t6XIl0U9XvrHkqNxZ6BXtXi0TIANY1WdZ3Y=";
   };
 
diff --git a/pkgs/by-name/go/gophish/package.nix b/pkgs/by-name/go/gophish/package.nix
index 20112f3382c4..04c4e53425cf 100644
--- a/pkgs/by-name/go/gophish/package.nix
+++ b/pkgs/by-name/go/gophish/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gophish";
     repo = "gophish";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6OUhRB2d8k7h9tI3IPKy9f1KoEx1mvGbxQZF1sCngqs=";
   };
 
diff --git a/pkgs/by-name/go/gopkgs/package.nix b/pkgs/by-name/go/gopkgs/package.nix
index 5f575192945d..f4b8c3a86cb2 100644
--- a/pkgs/by-name/go/gopkgs/package.nix
+++ b/pkgs/by-name/go/gopkgs/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "2.1.2";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "uudashr";
     repo = "gopkgs";
     hash = "sha256-ll5fhwzzCNL0UtMLNSGOY6Yyy0EqI8OZ1iqWad4KU8k=";
diff --git a/pkgs/by-name/go/gopro/package.nix b/pkgs/by-name/go/gopro/package.nix
index 59eb6ced2cff..296a25f045ff 100644
--- a/pkgs/by-name/go/gopro/package.nix
+++ b/pkgs/by-name/go/gopro/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KonradIT";
     repo = "gopro-linux";
-    tag = version;
+    rev = version;
     sha256 = "0sb9vpiadrq8g4ag828h8mvq01fg0306j0wjwkxdmwfqync1128l";
   };
 
diff --git a/pkgs/by-name/go/gops/package.nix b/pkgs/by-name/go/gops/package.nix
index f1cb2e72c0be..2aeb490fa3f6 100644
--- a/pkgs/by-name/go/gops/package.nix
+++ b/pkgs/by-name/go/gops/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "gops";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HNM487WSfNWNF31ccDIdotsEG8Mj2C7V85UI47a9drU=";
   };
 
diff --git a/pkgs/by-name/go/gopsuinfo/package.nix b/pkgs/by-name/go/gopsuinfo/package.nix
index 66d34bdbf953..37b1d4123c22 100644
--- a/pkgs/by-name/go/gopsuinfo/package.nix
+++ b/pkgs/by-name/go/gopsuinfo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "gopsuinfo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-h+CdiQh7IguCduIMCCI/UPIUAdXlNSHdkz6hrG10h3c=";
   };
 
diff --git a/pkgs/by-name/go/gore/package.nix b/pkgs/by-name/go/gore/package.nix
index ae69c32ae84e..35609e4655bb 100644
--- a/pkgs/by-name/go/gore/package.nix
+++ b/pkgs/by-name/go/gore/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "motemen";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7mhfegSSRE9FnKz+tWYMEtEKc+hayPQE8EEOEu33CjU=";
   };
 
diff --git a/pkgs/by-name/go/goread/package.nix b/pkgs/by-name/go/goread/package.nix
index 51aad410be5a..380d7937ab68 100644
--- a/pkgs/by-name/go/goread/package.nix
+++ b/pkgs/by-name/go/goread/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TypicalAM";
     repo = "goread";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2C/PejWCwLdWu9n2hpbm3u/UrD56JCJqG+A7xnn/bP4=";
   };
 
diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index 874f881f44fd..d1c06ea578ad 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-F9gUntTqllTYrRTuUj4tWMrHArM8BflCROPBsOdIsFA=";
   };
 
diff --git a/pkgs/by-name/go/goreman/package.nix b/pkgs/by-name/go/goreman/package.nix
index cdc89f97194a..9a572a8a41b8 100644
--- a/pkgs/by-name/go/goreman/package.nix
+++ b/pkgs/by-name/go/goreman/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "goreman";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hOFnLxHsrauOrsbJYKNrwFFT5yYX/rdZUVjscBIGDLo=";
   };
 
diff --git a/pkgs/by-name/go/goreplay/package.nix b/pkgs/by-name/go/goreplay/package.nix
index 3ce175ff1c0a..bea28693a6df 100644
--- a/pkgs/by-name/go/goreplay/package.nix
+++ b/pkgs/by-name/go/goreplay/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buger";
     repo = "goreplay";
-    tag = version;
+    rev = version;
     sha256 = "sha256-FiY9e5FgpPu+K8eoO8TsU3xSaSoPPDxYEu0oi/S8Q1w=";
   };
 
diff --git a/pkgs/by-name/go/goresym/package.nix b/pkgs/by-name/go/goresym/package.nix
index 348c9d2ac4de..e498701b9707 100644
--- a/pkgs/by-name/go/goresym/package.nix
+++ b/pkgs/by-name/go/goresym/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mandiant";
     repo = "goresym";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tt13vHe6wE27kv+1HVXytY1hKmOt6rWJaMBgLRCvO2E=";
   };
 
diff --git a/pkgs/by-name/go/gorilla-cli/package.nix b/pkgs/by-name/go/gorilla-cli/package.nix
index 9f845de1f4aa..58d362fe9351 100644
--- a/pkgs/by-name/go/gorilla-cli/package.nix
+++ b/pkgs/by-name/go/gorilla-cli/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gorilla-llm";
     repo = "gorilla-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-3h3QtBDKswTDL7zNM2C4VWiGCqknm/bxhP9sw4ieIcQ=";
   };
 
diff --git a/pkgs/by-name/go/gortr/package.nix b/pkgs/by-name/go/gortr/package.nix
index de90887c57ff..79c8c4175993 100644
--- a/pkgs/by-name/go/gortr/package.nix
+++ b/pkgs/by-name/go/gortr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W6+zCLPcORGcRJF0F6/LRPap4SNVn/oKGs21T4nSNO0=";
   };
 
diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix
index cfa30b2bb121..79b2d9bfd682 100644
--- a/pkgs/by-name/go/gosec/package.nix
+++ b/pkgs/by-name/go/gosec/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "securego";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MQ/dDK2t9H7bSsr5MMtlKySLAJIDimRbpATHyOYxrBo=";
   };
 
diff --git a/pkgs/by-name/go/gosimports/package.nix b/pkgs/by-name/go/gosimports/package.nix
index 57076d914405..72826ccc9da8 100644
--- a/pkgs/by-name/go/gosimports/package.nix
+++ b/pkgs/by-name/go/gosimports/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rinchsan";
     repo = "gosimports";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xM1CGW8UB+VHN+2Rm6cF/1bOBVDeUG+6kxUxUcvP7FM=";
   };
 
diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix
index f5640de41aa9..f64a23db5df7 100644
--- a/pkgs/by-name/go/gosmee/package.nix
+++ b/pkgs/by-name/go/gosmee/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "gosmee";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B+0Qod9U7bTQKXkbZJ0eQ6DkPdq56EI2tf/3i8wP/TI=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/go/gospider/package.nix b/pkgs/by-name/go/gospider/package.nix
index 9e0da71a7c45..6b3f226106c2 100644
--- a/pkgs/by-name/go/gospider/package.nix
+++ b/pkgs/by-name/go/gospider/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jaeles-project";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1EnKheHaS1kxw0cjxCahT3rUWBXiqxjKefrDBI2xIvY=";
   };
 
diff --git a/pkgs/by-name/go/gossa/package.nix b/pkgs/by-name/go/gossa/package.nix
index 4bd1fe57970f..bce4c6bf0577 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-FGlUj0BJ8KeCfvdN9+NG4rqtaUIxgpqQ+09Ie1/TpAQ=";
   };
diff --git a/pkgs/by-name/go/gostatic/package.nix b/pkgs/by-name/go/gostatic/package.nix
index 0a6363181316..6b0ce598ca88 100644
--- a/pkgs/by-name/go/gostatic/package.nix
+++ b/pkgs/by-name/go/gostatic/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "piranha";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-pxk9tauB7u0oe6g4maHh+dREZXKwMz44v3KB43yYW6c=";
   };
 
diff --git a/pkgs/by-name/go/gosu/package.nix b/pkgs/by-name/go/gosu/package.nix
index 99a877a63809..d2213d926c5e 100644
--- a/pkgs/by-name/go/gosu/package.nix
+++ b/pkgs/by-name/go/gosu/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tianon";
     repo = "gosu";
-    tag = version;
+    rev = version;
     hash = "sha256-ziviUXqCpCGECewyZNLDKSjnpmz/3i5DKrIKZlLwl4o=";
   };
 
diff --git a/pkgs/by-name/go/gotest/package.nix b/pkgs/by-name/go/gotest/package.nix
index 54c9efa0b34d..4c565840fee6 100644
--- a/pkgs/by-name/go/gotest/package.nix
+++ b/pkgs/by-name/go/gotest/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rakyll";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1v11ccrjghq7nsz0f91r17di14yixsw28vs0m3dwzwqkh1a20img";
   };
 
diff --git a/pkgs/by-name/go/gotestdox/package.nix b/pkgs/by-name/go/gotestdox/package.nix
index 3eb24d354ded..c9a0c55ccf92 100644
--- a/pkgs/by-name/go/gotestdox/package.nix
+++ b/pkgs/by-name/go/gotestdox/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bitfield";
     repo = "gotestdox";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AZDXMwADOjcaMiofMWoHp+eSnD3a8iFtwpWDKl9Ess8=";
   };
 
diff --git a/pkgs/by-name/go/gotestfmt/package.nix b/pkgs/by-name/go/gotestfmt/package.nix
index b9d876dd1aea..f0b7babdde9c 100644
--- a/pkgs/by-name/go/gotestfmt/package.nix
+++ b/pkgs/by-name/go/gotestfmt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gotesttools";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7mLn2axlHoXau9JtLhk1zwzhxkFGHgYPo7igI+IAsP4=";
   };
 
diff --git a/pkgs/by-name/go/gotests/package.nix b/pkgs/by-name/go/gotests/package.nix
index 5afbeaa81628..d0ad80fbb9da 100644
--- a/pkgs/by-name/go/gotests/package.nix
+++ b/pkgs/by-name/go/gotests/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cweill";
     repo = "gotests";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6IzUpAsFUgF2FwiC17OfDn1M+8WYFQPpRyXbkpHIztw=";
   };
 
diff --git a/pkgs/by-name/go/gotify-cli/package.nix b/pkgs/by-name/go/gotify-cli/package.nix
index 2b70e2f5e262..9dc87997cc37 100644
--- a/pkgs/by-name/go/gotify-cli/package.nix
+++ b/pkgs/by-name/go/gotify-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gotify";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GwPIGWEpj5GjGV9bz3LctZctHQe+Vywoc1piNb9vAAw=";
   };
 
diff --git a/pkgs/by-name/go/gotify-desktop/package.nix b/pkgs/by-name/go/gotify-desktop/package.nix
index 99da97b9dbde..6ebaeef8d379 100644
--- a/pkgs/by-name/go/gotify-desktop/package.nix
+++ b/pkgs/by-name/go/gotify-desktop/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "gotify-desktop";
-    tag = version;
+    rev = version;
     sha256 = "sha256-P6zZAd3381/JamrEdbZRVFouhDsPNy1cNAjy4K3jGro=";
   };
 
diff --git a/pkgs/by-name/go/gotify-server/package.nix b/pkgs/by-name/go/gotify-server/package.nix
index 37dd1a36c70a..3946198e2fbc 100644
--- a/pkgs/by-name/go/gotify-server/package.nix
+++ b/pkgs/by-name/go/gotify-server/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gotify";
     repo = "server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6PmJnRBovyufrSB+uMbU+bqhZb1bEs39MxBVMnnE6f8=";
   };
 
diff --git a/pkgs/by-name/go/gotools/package.nix b/pkgs/by-name/go/gotools/package.nix
index 5d167d7834d8..ab00c3f10ef6 100644
--- a/pkgs/by-name/go/gotools/package.nix
+++ b/pkgs/by-name/go/gotools/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "golang";
     repo = "tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yUkdZSe/GV0w1qK8aQjcFE4tNKYC8f4JeFgPiv8GlQc=";
   };
 
diff --git a/pkgs/by-name/go/gotraceui/package.nix b/pkgs/by-name/go/gotraceui/package.nix
index dece0b1c089a..9730a2e6df91 100644
--- a/pkgs/by-name/go/gotraceui/package.nix
+++ b/pkgs/by-name/go/gotraceui/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dominikh";
     repo = "gotraceui";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Rforuh9YlTv/mTpQm0+BaY+Ssc4DAiDCzVkIerP5Uz0=";
   };
 
diff --git a/pkgs/by-name/go/gotree/package.nix b/pkgs/by-name/go/gotree/package.nix
index 4c304ab500c3..bdefbb5badb5 100644
--- a/pkgs/by-name/go/gotree/package.nix
+++ b/pkgs/by-name/go/gotree/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "elbachir-one";
     repo = "gt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sWKqfDWwMfj4shg/MxHu7Zr4WE5pxAzHHmsjU3jQY10=";
   };
 
diff --git a/pkgs/by-name/go/gotty/package.nix b/pkgs/by-name/go/gotty/package.nix
index f7853d8264b4..38f040f0bb52 100644
--- a/pkgs/by-name/go/gotty/package.nix
+++ b/pkgs/by-name/go/gotty/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sorenisanerd";
     repo = "gotty";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VSu0ASnLmRzOGOEKqb/zB43+HxEwMpKLpbdbWY5QrEk=";
   };
 
diff --git a/pkgs/by-name/go/gotypist/package.nix b/pkgs/by-name/go/gotypist/package.nix
index ee5d70c02f8d..5806a6cded23 100644
--- a/pkgs/by-name/go/gotypist/package.nix
+++ b/pkgs/by-name/go/gotypist/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pb-";
     repo = "gotypist";
-    tag = version;
+    rev = version;
     sha256 = "0khl2f6bl121slw9mlf4qzsdarpk1v3vry11f3dvz7pb1q6zjj11";
   };
 
diff --git a/pkgs/by-name/go/govc/package.nix b/pkgs/by-name/go/govc/package.nix
index 4b238a5eddbe..f9caec412a5b 100644
--- a/pkgs/by-name/go/govc/package.nix
+++ b/pkgs/by-name/go/govc/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   subPackages = [ "govc" ];
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "vmware";
     repo = "govmomi";
     sha256 = "sha256-vwvhVC+Avi55uenlW68tWGREEHRZw8RUjgiC0r7BgQ4=";
diff --git a/pkgs/by-name/go/govee2mqtt/package.nix b/pkgs/by-name/go/govee2mqtt/package.nix
index 9604abfe0cc3..82f8151452d5 100644
--- a/pkgs/by-name/go/govee2mqtt/package.nix
+++ b/pkgs/by-name/go/govee2mqtt/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wez";
     repo = "govee2mqtt";
-    tag = version;
+    rev = version;
     hash = "sha256-iGOj0a4+wLd8QlM1tr+NYfd2tuwgHV+u5dt0zf+WscY=";
   };
 
diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix
index 9647af6bb3b5..a41a636445c4 100644
--- a/pkgs/by-name/go/goverlay/package.nix
+++ b/pkgs/by-name/go/goverlay/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "benjamimgois";
     repo = "goverlay";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Vxmmsf/l3OK1Q6UKdhCWvU4WPJkdQG2Hn+s9tS+D5KM=";
   };
 
diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix
index d1435ce5ef4c..581840505d15 100644
--- a/pkgs/by-name/go/gowall/package.nix
+++ b/pkgs/by-name/go/gowall/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Achno";
     repo = "gowall";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QKukWA8TB0FoNHu0Wyco55x4oBY+E33qdoT/SaXW6DE=";
   };
 
diff --git a/pkgs/by-name/go/gox/package.nix b/pkgs/by-name/go/gox/package.nix
index 60237500c1e2..8ff5fda50bf1 100644
--- a/pkgs/by-name/go/gox/package.nix
+++ b/pkgs/by-name/go/gox/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mitchellh";
     repo = "gox";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7";
   };
 
diff --git a/pkgs/by-name/go/goxlr-utility/package.nix b/pkgs/by-name/go/goxlr-utility/package.nix
index 0a420a5a1468..d38d7c6be0a1 100644
--- a/pkgs/by-name/go/goxlr-utility/package.nix
+++ b/pkgs/by-name/go/goxlr-utility/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "GoXLR-on-Linux";
     repo = "goxlr-utility";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aThIu+3eNHCKS6lsio7cLZeIMg0509qkE0YQ6M6vPAI=";
   };
 
diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index abc436fd55a6..3bbb52e5fb7a 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gpac";
     repo = "gpac";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM=";
   };
 
diff --git a/pkgs/by-name/gp/gpart/package.nix b/pkgs/by-name/gp/gpart/package.nix
index 83fd9ce584b2..7fa84d64e956 100644
--- a/pkgs/by-name/gp/gpart/package.nix
+++ b/pkgs/by-name/gp/gpart/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   # GitHub repository 'collating patches for gpart from all distributions':
   src = fetchFromGitHub {
     sha256 = "1lsd9k876p944k9s6sxqk5yh9yr7m42nbw9vlsllin7pd4djl4ya";
-    tag = version;
+    rev = version;
     repo = "gpart";
     owner = "baruch";
   };
diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix
index b6562c60d7c0..2fd26d1dd832 100644
--- a/pkgs/by-name/gp/gpauth/package.nix
+++ b/pkgs/by-name/gp/gpauth/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yuezk";
     repo = "GlobalProtect-openconnect";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MY4JvftrC6sR8M0dFvnGZOkvHIhPRcyct9AG/8527gw=";
   };
 
diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix
index 8df390b6700d..f6d62b87eb20 100644
--- a/pkgs/by-name/gp/gpclient/package.nix
+++ b/pkgs/by-name/gp/gpclient/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yuezk";
     repo = "GlobalProtect-openconnect";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MY4JvftrC6sR8M0dFvnGZOkvHIhPRcyct9AG/8527gw=";
   };
 
diff --git a/pkgs/by-name/gp/gphotos-sync/package.nix b/pkgs/by-name/gp/gphotos-sync/package.nix
index 25bf5b45d33b..9b89e9c53b5e 100644
--- a/pkgs/by-name/gp/gphotos-sync/package.nix
+++ b/pkgs/by-name/gp/gphotos-sync/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gilesknap";
     repo = "gphotos-sync";
-    tag = version;
+    rev = version;
     hash = "sha256-iTqD/oUQqC7Fju8SEPkSZX7FC9tE4eRCewiJR8STmEw=";
   };
 
diff --git a/pkgs/by-name/gp/gpick/package.nix b/pkgs/by-name/gp/gpick/package.nix
index 9f4ea8346b2a..8a895b34e9c2 100644
--- a/pkgs/by-name/gp/gpick/package.nix
+++ b/pkgs/by-name/gp/gpick/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thezbyg";
     repo = "gpick";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Z17YpdAAr2wvDFkrAosyCN6Y/wsFVkiB9IDvXuP9lYo=";
   };
 
diff --git a/pkgs/by-name/gp/gpodder/package.nix b/pkgs/by-name/gp/gpodder/package.nix
index 522ded5a6cc3..738983a6322f 100644
--- a/pkgs/by-name/gp/gpodder/package.nix
+++ b/pkgs/by-name/gp/gpodder/package.nix
@@ -19,7 +19,7 @@ python311Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "kEhyV1o8VSQW9qMx6m5avj6LnJuVTONDd6msRuc8t/4=";
   };
 
diff --git a/pkgs/by-name/gp/gptman/package.nix b/pkgs/by-name/gp/gptman/package.nix
index e094ce90dcb4..96f6b2009688 100644
--- a/pkgs/by-name/gp/gptman/package.nix
+++ b/pkgs/by-name/gp/gptman/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-disk-partition-management";
     repo = "gptman";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ebV61EilGggix6JSN/MW4Ka0itkSpvikLDSO005TTYY=";
   };
 
diff --git a/pkgs/by-name/gp/gpustat/package.nix b/pkgs/by-name/gp/gpustat/package.nix
index 5fbc5f5dcf4f..40e8417b2d58 100644
--- a/pkgs/by-name/gp/gpustat/package.nix
+++ b/pkgs/by-name/gp/gpustat/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "arduano";
     repo = "gpustat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg=";
   };
 
diff --git a/pkgs/by-name/gp/gpuvis/package.nix b/pkgs/by-name/gp/gpuvis/package.nix
index 76b946f58c9f..f8c14cca6961 100644
--- a/pkgs/by-name/gp/gpuvis/package.nix
+++ b/pkgs/by-name/gp/gpuvis/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mikesart";
     repo = "gpuvis";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-a9eAYDsiwyzZc4FAPo0wANysisIT4qCHLh2PrYswJtw=";
   };
 
diff --git a/pkgs/by-name/gp/gpx-viewer/package.nix b/pkgs/by-name/gp/gpx-viewer/package.nix
index 1510cc520b85..12a2d49c10ba 100644
--- a/pkgs/by-name/gp/gpx-viewer/package.nix
+++ b/pkgs/by-name/gp/gpx-viewer/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DaveDavenport";
     repo = "gpx-viewer";
-    tag = version;
+    rev = version;
     hash = "sha256-6AChX0UEIrQExaq3oo9Be5Sr13+POHFph7pZegqcjio=";
   };
 
diff --git a/pkgs/by-name/gp/gpx/package.nix b/pkgs/by-name/gp/gpx/package.nix
index 164501595035..bc1113b99b20 100644
--- a/pkgs/by-name/gp/gpx/package.nix
+++ b/pkgs/by-name/gp/gpx/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "markwal";
     repo = "GPX";
-    tag = version;
+    rev = version;
     sha256 = "1izs8s5npkbfrsyk17429hyl1vyrbj9dp6vmdlbb2vh6mfgl54h8";
   };
 
diff --git a/pkgs/by-name/gp/gpxlab/package.nix b/pkgs/by-name/gp/gpxlab/package.nix
index 0e3f45f8594e..07d09dd0edad 100644
--- a/pkgs/by-name/gp/gpxlab/package.nix
+++ b/pkgs/by-name/gp/gpxlab/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BourgeoisLab";
     repo = "GPXLab";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84";
   };
 
diff --git a/pkgs/by-name/gp/gpython/package.nix b/pkgs/by-name/gp/gpython/package.nix
index 5c73d12b9a18..2891dd308d86 100644
--- a/pkgs/by-name/gp/gpython/package.nix
+++ b/pkgs/by-name/gp/gpython/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-python";
     repo = "gpython";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xqwq27u41Jgoh7t9UDyatuBQswr+h3xio5AV/npncHc=";
   };
 
diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix
index 1b40db51d0cb..1891f035c073 100644
--- a/pkgs/by-name/gq/gql/package.nix
+++ b/pkgs/by-name/gq/gql/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AmrDeveloper";
     repo = "GQL";
-    tag = version;
+    rev = version;
     hash = "sha256-5n95+BcdjdjZyT3fvRv8acPV3jK9IppsKklI0zuA5mw=";
   };
 
diff --git a/pkgs/by-name/gq/gqlgenc/package.nix b/pkgs/by-name/gq/gqlgenc/package.nix
index b72bf8e4b3bb..760f744e5d55 100644
--- a/pkgs/by-name/gq/gqlgenc/package.nix
+++ b/pkgs/by-name/gq/gqlgenc/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yamashou";
     repo = "gqlgenc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-RGHfDrFr2HO4i+YQeNzYrEcU+Xe286f3f5g/yUmpxpA=";
   };
 
diff --git a/pkgs/by-name/gq/gqlint/package.nix b/pkgs/by-name/gq/gqlint/package.nix
index 9b5dbcd38453..c0d955d7d072 100644
--- a/pkgs/by-name/gq/gqlint/package.nix
+++ b/pkgs/by-name/gq/gqlint/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "happylinks";
     repo = "gqlint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m/Y7i3+93UdPnKQlZUHgtRbfSmJ1xYjao+bU+zxMgHw=";
   };
 
diff --git a/pkgs/by-name/gr/gr-framework/package.nix b/pkgs/by-name/gr/gr-framework/package.nix
index 7b6b9da48a49..51d63e78d187 100644
--- a/pkgs/by-name/gr/gr-framework/package.nix
+++ b/pkgs/by-name/gr/gr-framework/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sciapp";
     repo = "gr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vCcXWgoaWcaNRgIk9CrXp8eTII/CBOHR1iDncC/Cd4k=";
   };
 
diff --git a/pkgs/by-name/gr/grabserial/package.nix b/pkgs/by-name/gr/grabserial/package.nix
index 2ed684044b0b..72ccf1499dbb 100644
--- a/pkgs/by-name/gr/grabserial/package.nix
+++ b/pkgs/by-name/gr/grabserial/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tbird20d";
     repo = "grabserial";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0ryk4w8q6zfmia71nwnk5b7xaxw0sf45dw9q50xp7k76i3k5f9f3";
   };
 
diff --git a/pkgs/by-name/gr/gradescope-submit/package.nix b/pkgs/by-name/gr/gradescope-submit/package.nix
index 1cda10224e07..8cd424e93907 100644
--- a/pkgs/by-name/gr/gradescope-submit/package.nix
+++ b/pkgs/by-name/gr/gradescope-submit/package.nix
@@ -11,7 +11,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "nmittu";
     repo = "gradescope-submit";
-    tag = version;
+    rev = version;
     hash = "sha256-BVNXipgw0wz3PRGYvur8jrXZw/6i0fZ+MOZHzXzlFOk=";
   };
 
diff --git a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
index ba0ca1a2536a..cd40c8407763 100644
--- a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
+++ b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.7.2";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "esnet";
     repo = "gdg";
     sha256 = "sha256-0F4kdyQ4TXV2vb2IkPx7CisTmJAQjlSRtOAFhmZqaD8=";
diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix
index 238d3c70b819..ff8edbff0abd 100644
--- a/pkgs/by-name/gr/grafana-image-renderer/package.nix
+++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix
@@ -19,7 +19,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana-image-renderer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-twB2V5iecLEMTrp+prFmDoJvcGLVQlLJ+DTSl/9V8S8=";
   };
 
diff --git a/pkgs/by-name/gr/grafana-kiosk/package.nix b/pkgs/by-name/gr/grafana-kiosk/package.nix
index df6a2166e056..7ae16243d7f9 100644
--- a/pkgs/by-name/gr/grafana-kiosk/package.nix
+++ b/pkgs/by-name/gr/grafana-kiosk/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana-kiosk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kh62qGMVHNTssQMEBwLaEW0tRtP3iWMrxXeQU+fe+44=";
   };
 
diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index 764c674980fd..69f76cdf2946 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1tI9X2eIKuWEWJBbN4UAw8yeRrjgfqcenJyTNMk5rqU=";
   };
 
diff --git a/pkgs/by-name/gr/grafana-reporter/package.nix b/pkgs/by-name/gr/grafana-reporter/package.nix
index edbfbbb20d6c..04a740d1bddb 100644
--- a/pkgs/by-name/gr/grafana-reporter/package.nix
+++ b/pkgs/by-name/gr/grafana-reporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   version = "2.3.1";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "IzakMarais";
     repo = "reporter";
     hash = "sha256-lsraJwx56I2Gn8CePWUlQu1qdMp78P4xwPzLxetYUcw=";
diff --git a/pkgs/by-name/gr/grafterm/package.nix b/pkgs/by-name/gr/grafterm/package.nix
index b47011ab09d3..f0b698397e95 100644
--- a/pkgs/by-name/gr/grafterm/package.nix
+++ b/pkgs/by-name/gr/grafterm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slok";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0pM36rAmwx/P1KAlmVaGoSj8eb9JucYycNC2R867dVo=";
   };
 
diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 8072763eb13c..510d676a1549 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "common-fate";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xHpYtHG0fJ/VvJ/4lJ90ept3yGzJRnmtFQFbYxJtxwY=";
   };
 
diff --git a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix
index 93946c9ce504..2c0701e56b6c 100644
--- a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix
+++ b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "GrapheneOS";
     repo = "hardened_malloc";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-8EIdJmnPdJgES+8QwWzL1oKVqO62CQdtjyMgFw+P0+g=";
   };
 
diff --git a/pkgs/by-name/gr/graphene/package.nix b/pkgs/by-name/gr/graphene/package.nix
index 25b3bdbea5de..20ad68fb42b3 100644
--- a/pkgs/by-name/gr/graphene/package.nix
+++ b/pkgs/by-name/gr/graphene/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ebassi";
     repo = "graphene";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "P6JQhSktzvyMHatP/iojNGXPmcsxsFxdYerXzS23ojI=";
   };
 
diff --git a/pkgs/by-name/gr/graphite-cursors/package.nix b/pkgs/by-name/gr/graphite-cursors/package.nix
index d83a00212639..306a35d767c4 100644
--- a/pkgs/by-name/gr/graphite-cursors/package.nix
+++ b/pkgs/by-name/gr/graphite-cursors/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "graphite-cursors";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Kopl2NweYrq9rhw+0EUMhY/pfGo4g387927TZAhI5/A=";
   };
 
diff --git a/pkgs/by-name/gr/graphite-gtk-theme/package.nix b/pkgs/by-name/gr/graphite-gtk-theme/package.nix
index feb27ca7c485..1cfef4fcfaaf 100644
--- a/pkgs/by-name/gr/graphite-gtk-theme/package.nix
+++ b/pkgs/by-name/gr/graphite-gtk-theme/package.nix
@@ -67,7 +67,7 @@ lib.checkListOfEnum "${pname}: theme variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      tag = version;
+      rev = version;
       hash = "sha256-k93l/7DF0HSKPfiIxzBLz0mBflgbdYJyGLEmWZx3q7o=";
     };
 
diff --git a/pkgs/by-name/gr/graphqurl/package.nix b/pkgs/by-name/gr/graphqurl/package.nix
index 08e82e906eb5..779f8b3c3f8a 100644
--- a/pkgs/by-name/gr/graphqurl/package.nix
+++ b/pkgs/by-name/gr/graphqurl/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "hasura";
     repo = "graphqurl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q46DX/luUwBoVskKy9+hXOkpGmlh+lNRvwfcTn6DPN8=";
   };
 
diff --git a/pkgs/by-name/gr/graphwar/package.nix b/pkgs/by-name/gr/graphwar/package.nix
index 8b8dcd649e4d..97481a1dab3c 100644
--- a/pkgs/by-name/gr/graphwar/package.nix
+++ b/pkgs/by-name/gr/graphwar/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "catabriga";
     repo = "graphwar";
-    tag = version;
+    rev = version;
     sha256 = "sha256-t3Y576dXWp2Mj6OSQN5cm9FuNBWNqKq6xxkVRbjIBgE=";
   };
 
diff --git a/pkgs/by-name/gr/gravit/package.nix b/pkgs/by-name/gr/gravit/package.nix
index 993e9ae43d49..53b92adac0c4 100644
--- a/pkgs/by-name/gr/gravit/package.nix
+++ b/pkgs/by-name/gr/gravit/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gak";
     repo = "gravit";
-    tag = version;
+    rev = version;
     hash = "sha256-JuqnLLD5+Ec8kQI0SK98V1O6TTbGM6+yKn5KCHe85eM=";
   };
 
diff --git a/pkgs/by-name/gr/greybird/package.nix b/pkgs/by-name/gr/greybird/package.nix
index 3da2f5f05925..49cb7ea1ea55 100644
--- a/pkgs/by-name/gr/greybird/package.nix
+++ b/pkgs/by-name/gr/greybird/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "greybird";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-De8y+LRQ26UKrUECLCcbCg7p9Z+aRssQ/7YzegAUPw4=";
   };
 
diff --git a/pkgs/by-name/gr/gridtracker/package.nix b/pkgs/by-name/gr/gridtracker/package.nix
index 084643246b1d..16788295631c 100644
--- a/pkgs/by-name/gr/gridtracker/package.nix
+++ b/pkgs/by-name/gr/gridtracker/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "gridtracker.org";
     repo = "gridtracker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6WgP13JVOzYnYtCDH3qCQXT70X9j4yqlUb18FFf1aSY=";
   };
 
diff --git a/pkgs/by-name/gr/grip-search/package.nix b/pkgs/by-name/gr/grip-search/package.nix
index 0789def61679..5b9b622d929a 100644
--- a/pkgs/by-name/gr/grip-search/package.nix
+++ b/pkgs/by-name/gr/grip-search/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sc0ty";
     repo = "grip";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0bkqarylgzhis6fpj48qbifcd6a26cgnq8784hgnm707rq9kb0rx";
   };
 
diff --git a/pkgs/by-name/gr/grit/package.nix b/pkgs/by-name/gr/grit/package.nix
index ee0d2bf0e811..cdf1aca545f1 100644
--- a/pkgs/by-name/gr/grit/package.nix
+++ b/pkgs/by-name/gr/grit/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "climech";
     repo = "grit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-c8wBwmXFjpst6UxL5zmTxMR4bhzpHYljQHiJFKiNDms=";
   };
 
diff --git a/pkgs/by-name/gr/grive2/package.nix b/pkgs/by-name/gr/grive2/package.nix
index ab2592df1d0f..c5e2b90c4390 100644
--- a/pkgs/by-name/gr/grive2/package.nix
+++ b/pkgs/by-name/gr/grive2/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vitalif";
     repo = "grive2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-P6gitA5cXfNbNDy4ohRLyXj/5dUXkCkOdE/9rJPzNCg=";
   };
 
diff --git a/pkgs/by-name/gr/grizzly/package.nix b/pkgs/by-name/gr/grizzly/package.nix
index 83e397335378..ad46068b7a30 100644
--- a/pkgs/by-name/gr/grizzly/package.nix
+++ b/pkgs/by-name/gr/grizzly/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1caG2QIBfbCgg9TLsW4XB0w+4dqUkQEsdWwRazbWeQA=";
   };
 
diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix
index d38f76600ab9..b3ba15f3e364 100644
--- a/pkgs/by-name/gr/grml-zsh-config/package.nix
+++ b/pkgs/by-name/gr/grml-zsh-config/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grml";
     repo = "grml-etc-core";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7UiP6CUP/qArOfcrFtpiNUBBwkcCSrvsPb29SSqSkmg=";
   };
 
diff --git a/pkgs/by-name/gr/grmon/package.nix b/pkgs/by-name/gr/grmon/package.nix
index f07f44723848..df610dec3ecb 100644
--- a/pkgs/by-name/gr/grmon/package.nix
+++ b/pkgs/by-name/gr/grmon/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bcicen";
     repo = "grmon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0J7f4DMADUut3Da0F1eTDsT1Hlk0rfInwzbcVcQNzg8=";
   };
 
diff --git a/pkgs/by-name/gr/grobi/package.nix b/pkgs/by-name/gr/grobi/package.nix
index 862dc676cd17..5841700709ad 100644
--- a/pkgs/by-name/gr/grobi/package.nix
+++ b/pkgs/by-name/gr/grobi/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   pname = "grobi";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "fd0";
     repo = "grobi";
     hash = "sha256-evgDY+OjfQ0ngf4j/D4yOeITHQXmBmw8KiJhLKjdVAw=";
diff --git a/pkgs/by-name/gr/gron/package.nix b/pkgs/by-name/gr/gron/package.nix
index 4f6572085c3d..8290fd91eb4f 100644
--- a/pkgs/by-name/gr/gron/package.nix
+++ b/pkgs/by-name/gr/gron/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "gron";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZkAfAQsaFX7npyDcBDFS4Xa8kOMVH6yGfxGD7c0iQ+o=";
   };
 
diff --git a/pkgs/by-name/gr/grpc-client-cli/package.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix
index 22a84d80dfaf..c1a9082d3262 100644
--- a/pkgs/by-name/gr/grpc-client-cli/package.nix
+++ b/pkgs/by-name/gr/grpc-client-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vadimi";
     repo = "grpc-client-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+Njo3cqqWhQMYsO7VLScPemmBMCf55khzLqBmODqEng=";
   };
 
diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index 9c20dcb1a2a9..c46f56491ac1 100644
--- a/pkgs/by-name/gr/grpc/package.nix
+++ b/pkgs/by-name/gr/grpc/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kJhGAhqu25Q2g6BWkVGp6nGYrWdBnMhoMu6e7ifNbgk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix
index 88b651526203..b42c9c89e35e 100644
--- a/pkgs/by-name/gr/grpc_cli/package.nix
+++ b/pkgs/by-name/gr/grpc_cli/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QKSdMpfl0pdKy/r4z8VKcGN0gsQmx9lBRHlCjaaF5Sg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gr/grpcui/package.nix b/pkgs/by-name/gr/grpcui/package.nix
index c8dc6d4c74d5..979a97ca1e83 100644
--- a/pkgs/by-name/gr/grpcui/package.nix
+++ b/pkgs/by-name/gr/grpcui/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fullstorydev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Tmema+cMPDGuX6Y8atow58GdGMj7croHyj8oiDXSEYk=";
   };
 
diff --git a/pkgs/by-name/gr/grpcurl/package.nix b/pkgs/by-name/gr/grpcurl/package.nix
index 4803fc008d58..7fc0556564bb 100644
--- a/pkgs/by-name/gr/grpcurl/package.nix
+++ b/pkgs/by-name/gr/grpcurl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fullstorydev";
     repo = "grpcurl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bgjlCK3sTRrz1FhAs7mQbaea2gMS7liLXU6z02FPTfg=";
   };
 
diff --git a/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix b/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix
index 16c02eda1dd0..13fbef973cdb 100644
--- a/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix
+++ b/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jmattheis";
     repo = "gruvbox-dark-gtk";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-C681o89MTGNp1l3DLQsRpH9HQdmdCXZzk0F0rNhcyL4=";
   };
 
diff --git a/pkgs/by-name/gs/gsctl/package.nix b/pkgs/by-name/gs/gsctl/package.nix
index d3e98ab83c0c..bdab9d5b6cbc 100644
--- a/pkgs/by-name/gs/gsctl/package.nix
+++ b/pkgs/by-name/gs/gsctl/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "giantswarm";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-eemPsrSFwgUR1Jz7283jjwMkoJR38QiaiilI9G0IQuo=";
   };
 
diff --git a/pkgs/by-name/gs/gsimplecal/package.nix b/pkgs/by-name/gs/gsimplecal/package.nix
index 9d9bc153400d..3ed9edbfae05 100644
--- a/pkgs/by-name/gs/gsimplecal/package.nix
+++ b/pkgs/by-name/gs/gsimplecal/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dmedvinsky";
     repo = "gsimplecal";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Q8vK+rIRr+Tzwq0Xw5a1pYoLkSwF6PEdqc3/Dk01++o=";
   };
 
diff --git a/pkgs/by-name/gs/gsocket/package.nix b/pkgs/by-name/gs/gsocket/package.nix
index d124b42980c9..02f50b5c024c 100644
--- a/pkgs/by-name/gs/gsocket/package.nix
+++ b/pkgs/by-name/gs/gsocket/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hackerschoice";
     repo = "gsocket";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7ph7YaY8rbfzvEh1ABgl3Jg15d6WBP4pywFn/nXjPKY=";
   };
 
diff --git a/pkgs/by-name/gs/gspeech/package.nix b/pkgs/by-name/gs/gspeech/package.nix
index 52f8e9af5605..f4e133064e79 100644
--- a/pkgs/by-name/gs/gspeech/package.nix
+++ b/pkgs/by-name/gs/gspeech/package.nix
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mothsart";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0z11yxvgi8m2xjmmf56zla91jpmf0a4imwi9qqz6bp51pw4sk8gp";
   };
 
diff --git a/pkgs/by-name/gs/gst/package.nix b/pkgs/by-name/gs/gst/package.nix
index 1c72e148c53b..e0411e873b4c 100644
--- a/pkgs/by-name/gs/gst/package.nix
+++ b/pkgs/by-name/gs/gst/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "uetchy";
     repo = "gst";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NhbGHTYucfqCloVirkaDlAtQfhWP2cw4I+t/ysvvkR0=";
   };
 
diff --git a/pkgs/by-name/gs/gst123/package.nix b/pkgs/by-name/gs/gst123/package.nix
index c7f1e2557b59..46b2fa3008f7 100644
--- a/pkgs/by-name/gs/gst123/package.nix
+++ b/pkgs/by-name/gs/gst123/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "swesterfeld";
     repo = "gst123";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-7qS7JJ7EY1uFGX3FxBxgH6LzK4XUoTPHR0QVwUWRz+g=";
   };
 
diff --git a/pkgs/by-name/gt/gtest/package.nix b/pkgs/by-name/gt/gtest/package.nix
index 9191aca181f9..2678e192a375 100644
--- a/pkgs/by-name/gt/gtest/package.nix
+++ b/pkgs/by-name/gt/gtest/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "googletest";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-01PK9LxqHno89gypd7ze5gDP4V3en2J5g6JZRqohDB0=";
   };
 
diff --git a/pkgs/by-name/gt/gtg/package.nix b/pkgs/by-name/gt/gtg/package.nix
index 07770443c91f..ea9a67cfd284 100644
--- a/pkgs/by-name/gt/gtg/package.nix
+++ b/pkgs/by-name/gt/gtg/package.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "getting-things-gnome";
     repo = "gtg";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-O8qBD92P2g8QrBdMXa6j0Ozk+W80Ny5yk0KNTy7ekfE=";
   };
 
diff --git a/pkgs/by-name/gt/gthree/package.nix b/pkgs/by-name/gt/gthree/package.nix
index 288fe3d6ff10..f4fb6033ddd4 100644
--- a/pkgs/by-name/gt/gthree/package.nix
+++ b/pkgs/by-name/gt/gthree/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexlarsson";
     repo = "gthree";
-    tag = version;
+    rev = version;
     sha256 = "09fcnjc3j21lh5fjf067wm35sb4qni4vgzing61kixnn2shy79iy";
   };
 
diff --git a/pkgs/by-name/gt/gti/package.nix b/pkgs/by-name/gt/gti/package.nix
index e1e6624c4608..faf0dcfc8468 100644
--- a/pkgs/by-name/gt/gti/package.nix
+++ b/pkgs/by-name/gt/gti/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rwos";
     repo = "gti";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DUDCFcaB38Xkp3lLfEhjGC0j430dphXFBVhGzm7/Bp0=";
   };
 
diff --git a/pkgs/by-name/gt/gtk-sharp-beans/package.nix b/pkgs/by-name/gt/gtk-sharp-beans/package.nix
index ca5cc914f7a9..c01f39ef028c 100644
--- a/pkgs/by-name/gt/gtk-sharp-beans/package.nix
+++ b/pkgs/by-name/gt/gtk-sharp-beans/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "gtk-sharp-beans";
 
-    tag = version;
+    rev = version;
     sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1";
   };
 
diff --git a/pkgs/by-name/gt/gtkclipblock/package.nix b/pkgs/by-name/gt/gtkclipblock/package.nix
index f7763d0c3de7..c6cce92c1fa3 100644
--- a/pkgs/by-name/gt/gtkclipblock/package.nix
+++ b/pkgs/by-name/gt/gtkclipblock/package.nix
@@ -24,7 +24,7 @@ let
   src = fetchFromGitHub {
     owner = "notpeelz";
     repo = "gtkclipblock";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ok/D7M0KekN8zf8AzhcOLtedbYVRHHv3m9zEHsJfcPM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/gt/gtkhash/package.nix b/pkgs/by-name/gt/gtkhash/package.nix
index 582f3a317498..e28674b5cd70 100644
--- a/pkgs/by-name/gt/gtkhash/package.nix
+++ b/pkgs/by-name/gt/gtkhash/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "gtkhash";
     owner = "gtkhash";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XpgTolpTSsW3i0xk19tt4cn9qANoeiq7YnBBR6g8ioU=";
   };
 
diff --git a/pkgs/by-name/gt/gtkterm/package.nix b/pkgs/by-name/gt/gtkterm/package.nix
index e7808eaeb374..0b11db2e5566 100644
--- a/pkgs/by-name/gt/gtkterm/package.nix
+++ b/pkgs/by-name/gt/gtkterm/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wvdakker";
     repo = "gtkterm";
-    tag = version;
+    rev = version;
     sha256 = "sha256-oGqOXIu5P3KfdV6Unm7Nz+BRhb5Z6rne0+e0wZ2EcAI=";
   };
 
diff --git a/pkgs/by-name/gt/gtop/package.nix b/pkgs/by-name/gt/gtop/package.nix
index 845297dc5337..331c95b9b98f 100644
--- a/pkgs/by-name/gt/gtop/package.nix
+++ b/pkgs/by-name/gt/gtop/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "aksakalli";
     repo = "gtop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FKbaUV28d0JH9tmTSJBFYQrM5iensnIpcXUFFvXDMe4=";
   };
 
diff --git a/pkgs/by-name/gt/gtrash/package.nix b/pkgs/by-name/gt/gtrash/package.nix
index da4945b20090..c1e1bd8d9297 100644
--- a/pkgs/by-name/gt/gtrash/package.nix
+++ b/pkgs/by-name/gt/gtrash/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "umlx5h";
     repo = "gtrash";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-odvj0YY18aishVWz5jWcLDvkYJLQ97ZSGpumxvxui4Y=";
   };
 
diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix
index 035057ea4879..c3425c3bfd1c 100644
--- a/pkgs/by-name/gt/gtree/package.nix
+++ b/pkgs/by-name/gt/gtree/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ddddddO";
     repo = "gtree";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-d+cFESWQyu2laj1pLepEWoHnFHaSKytfWkmD4yuFf78=";
   };
 
diff --git a/pkgs/by-name/gt/gtt/package.nix b/pkgs/by-name/gt/gtt/package.nix
index 09b4a25e91a7..56b69c97ea06 100644
--- a/pkgs/by-name/gt/gtt/package.nix
+++ b/pkgs/by-name/gt/gtt/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "eeeXun";
     repo = "gtt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ghdf8UQA+SfsBiD5bPrNZM8sPE+Xhbhn18iNl3xLh8c=";
   };
 
diff --git a/pkgs/by-name/gu/guacamole-server/package.nix b/pkgs/by-name/gu/guacamole-server/package.nix
index ae255aa65604..a146225be312 100644
--- a/pkgs/by-name/gu/guacamole-server/package.nix
+++ b/pkgs/by-name/gu/guacamole-server/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "guacamole-server";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ZrUaoWkZ3I/LxE7csDXXeUZ92jZDhkZ1c8EQU0gI1yY=";
   };
 
diff --git a/pkgs/by-name/gu/gubbi-font/package.nix b/pkgs/by-name/gu/gubbi-font/package.nix
index f253ed576fed..dbc5109a318e 100644
--- a/pkgs/by-name/gu/gubbi-font/package.nix
+++ b/pkgs/by-name/gu/gubbi-font/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aravindavk";
     repo = "gubbi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "10w9i3pmjvs1b3xclrgn4q5a95ss4ipldbxbqrys2dmfivx7i994";
   };
 
diff --git a/pkgs/by-name/gu/gucharmap/package.nix b/pkgs/by-name/gu/gucharmap/package.nix
index 0803cb1196ce..fc1db49d5c8c 100644
--- a/pkgs/by-name/gu/gucharmap/package.nix
+++ b/pkgs/by-name/gu/gucharmap/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "gucharmap";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-UaXgQIhAoI27iYWgZuZeO7Lv6J9pj06HPp0SZs/5abM=";
   };
 
diff --git a/pkgs/by-name/gu/guetzli/package.nix b/pkgs/by-name/gu/guetzli/package.nix
index ac88df8e2515..2ecb32068b3e 100644
--- a/pkgs/by-name/gu/guetzli/package.nix
+++ b/pkgs/by-name/gu/guetzli/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "google";
     repo = "guetzli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1wy9wfvyradp0aigfv8yijvj0dgb5kpq2yf2xki15f605jc1r5dm";
   };
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gu/guff/package.nix b/pkgs/by-name/gu/guff/package.nix
index ca07e19402dd..17be43aba7bd 100644
--- a/pkgs/by-name/gu/guff/package.nix
+++ b/pkgs/by-name/gu/guff/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "silentbicycle";
     repo = "guff";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0n8mc9j3044j4b3vgc94ryd2j9ik6g73fqja54yxfdfrks4ksyds";
   };
 
diff --git a/pkgs/by-name/gu/guile-aspell/package.nix b/pkgs/by-name/gu/guile-aspell/package.nix
index d8631aea7469..dbb87edb5d03 100644
--- a/pkgs/by-name/gu/guile-aspell/package.nix
+++ b/pkgs/by-name/gu/guile-aspell/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "spk121";
     repo = "guile-aspell";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-CvLECZLwf4MujAQCL3I81O5xFvq6ezVhV0BjbqI3mR0=";
   };
 
diff --git a/pkgs/by-name/gu/guile-fibers/package.nix b/pkgs/by-name/gu/guile-fibers/package.nix
index 759f4889047d..a2a6468941dd 100644
--- a/pkgs/by-name/gu/guile-fibers/package.nix
+++ b/pkgs/by-name/gu/guile-fibers/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wingo";
     repo = "fibers";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jJKA5JEHsmqQ/IKb1aNmOtoVaGKNjcgTKyo5VCiJbXM=";
   };
 
diff --git a/pkgs/by-name/gu/guile-git/package.nix b/pkgs/by-name/gu/guile-git/package.nix
index d13c44ab5bff..cf9c2cc02654 100644
--- a/pkgs/by-name/gu/guile-git/package.nix
+++ b/pkgs/by-name/gu/guile-git/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "guile-git";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lFBoA1VBJRHcZkP3h2gnlXQrMjDFWS4jl9RlF8VVf/Q=";
   };
 
diff --git a/pkgs/by-name/gu/guile-hoot/package.nix b/pkgs/by-name/gu/guile-hoot/package.nix
index 95c1fc2b5933..76213c206727 100644
--- a/pkgs/by-name/gu/guile-hoot/package.nix
+++ b/pkgs/by-name/gu/guile-hoot/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "spritely";
     repo = "guile-hoot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xPU4uLyh3gd2ubyGednCqB3uzKrabhXQhs6vBc8z0ps=";
   };
 
diff --git a/pkgs/by-name/gu/guilt/package.nix b/pkgs/by-name/gu/guilt/package.nix
index 890f4e0a596e..77152b5930bc 100644
--- a/pkgs/by-name/gu/guilt/package.nix
+++ b/pkgs/by-name/gu/guilt/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeffpc";
     repo = "guilt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7OgRbMGYWtGvrZxKfJe0CkpmU3AUkPebF5NyTsfXeGA=";
   };
 
diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix
index 30953ad2ecec..e242ac853313 100644
--- a/pkgs/by-name/gu/gum/package.nix
+++ b/pkgs/by-name/gu/gum/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-77102I7pOGfpPBSGelsA/9GJYos05akF0kdmr522RC0=";
   };
 
diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix
index 37069b02ab73..571fd8408252 100644
--- a/pkgs/by-name/gu/gumbo/package.nix
+++ b/pkgs/by-name/gu/gumbo/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "gumbo-parser";
     repo = "gumbo-parser";
-    tag = version;
+    rev = version;
     hash = "sha256-QpGOBKNPBryCXZKKEQMv9TXJiNyXESBFiR4wM0lmjiI=";
   };
 
diff --git a/pkgs/by-name/gu/gummi/package.nix b/pkgs/by-name/gu/gummi/package.nix
index bba2b4ea1f64..8c7af62fde9f 100644
--- a/pkgs/by-name/gu/gummi/package.nix
+++ b/pkgs/by-name/gu/gummi/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = pkgs.fetchFromGitHub {
     owner = "alexandervdm";
     repo = "gummi";
-    tag = version;
+    rev = version;
     sha256 = "sha256-71n71KjLmICp4gznd27NlbyA3kayje3hYk/cwkOXEO0=";
   };
 
diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix
index 2003a8dd8755..e43ac701772a 100644
--- a/pkgs/by-name/gu/gummy/package.nix
+++ b/pkgs/by-name/gu/gummy/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "fusco";
     repo = "gummy";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ic+kTBoirMX6g79NdNoeFbNNo1LYg/z+nlt/GAB6UyQ=";
   };
 
diff --git a/pkgs/by-name/gu/gungnir/package.nix b/pkgs/by-name/gu/gungnir/package.nix
index f064524a9f15..dee944503a40 100644
--- a/pkgs/by-name/gu/gungnir/package.nix
+++ b/pkgs/by-name/gu/gungnir/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "g0ldencybersec";
     repo = "gungnir";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-42qaVLEFAV6/6xMVM+mLi0Acp26AKOHvs4EUK2y09as=";
   };
 
diff --git a/pkgs/by-name/gu/gut/package.nix b/pkgs/by-name/gu/gut/package.nix
index 371e5b8dd6b5..4d854f5d43d4 100644
--- a/pkgs/by-name/gu/gut/package.nix
+++ b/pkgs/by-name/gu/gut/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "julien040";
     repo = "gut";
-    tag = version;
+    rev = version;
     hash = "sha256-3A6CwGIZGnTFkMRxDdDg/WpUQezNmGjjSz4Rj/6t1GI=";
   };
 
diff --git a/pkgs/by-name/gv/gvproxy/package.nix b/pkgs/by-name/gv/gvproxy/package.nix
index 96bb2f374bbe..154d385cbba3 100644
--- a/pkgs/by-name/gv/gvproxy/package.nix
+++ b/pkgs/by-name/gv/gvproxy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "gvisor-tap-vsock";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rWZYwQ/wWYAbM0RRNcNboWzKUuNNPDigIFFbFdXDNuo=";
   };
 
diff --git a/pkgs/by-name/gw/gwc/package.nix b/pkgs/by-name/gw/gwc/package.nix
index ced4f0860841..ee0c97523fcd 100644
--- a/pkgs/by-name/gw/gwc/package.nix
+++ b/pkgs/by-name/gw/gwc/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AlisterH";
     repo = "gwc";
-    tag = version;
+    rev = version;
     sha256 = "sha256-hRwy++gZiW/olIIeiVTpdIjPLIHgvgVUGEaUX9tpFbY=";
   };
 
diff --git a/pkgs/by-name/gx/gx/package.nix b/pkgs/by-name/gx/gx/package.nix
index f6e2cbc0c2ba..d78c07643b60 100644
--- a/pkgs/by-name/gx/gx/package.nix
+++ b/pkgs/by-name/gx/gx/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "whyrusleeping";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jGtUsb2gm8dN45wniD+PYoUlk8m1ssrfj1a7PPYEYuo=";
   };
 
diff --git a/pkgs/by-name/gx/gxkb/package.nix b/pkgs/by-name/gx/gxkb/package.nix
index 295c0750b21b..2692a6523926 100644
--- a/pkgs/by-name/gx/gxkb/package.nix
+++ b/pkgs/by-name/gx/gxkb/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zen-tools";
     repo = "gxkb";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oBIBIkj4p6HlF0PRQtI/K5dhLs7pbPxN7Cgr/YZaI1s=";
   };
 
diff --git a/pkgs/by-name/gx/gxml/package.nix b/pkgs/by-name/gx/gxml/package.nix
index b490e71255f3..771c4f6039ea 100644
--- a/pkgs/by-name/gx/gxml/package.nix
+++ b/pkgs/by-name/gx/gxml/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "gxml";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-/gaWuUytBsvAsC95ee6MtTW6g3ltGbkD+JWqrAjJLDc=";
   };
 
diff --git a/pkgs/by-name/gx/gxplugins-lv2/package.nix b/pkgs/by-name/gx/gxplugins-lv2/package.nix
index e819e752119c..7ed2538bc6ac 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ha/habitat/package.nix b/pkgs/by-name/ha/habitat/package.nix
index eea463412353..e33b1c62e48e 100644
--- a/pkgs/by-name/ha/habitat/package.nix
+++ b/pkgs/by-name/ha/habitat/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "habitat-sh";
     repo = "habitat";
-    tag = version;
+    rev = version;
     hash = "sha256-+5If4veDOGTTIhYxhAiq1cC4Sy6vAmjX5hrmUmpGlFU=";
   };
 
diff --git a/pkgs/by-name/ha/hackedbox/package.nix b/pkgs/by-name/ha/hackedbox/package.nix
index 008602d4dddc..6a4bcff5915c 100644
--- a/pkgs/by-name/ha/hackedbox/package.nix
+++ b/pkgs/by-name/ha/hackedbox/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "hackedbox";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-hxfbEj7UxQ19xhetmdi0iyK6ceLUfUvAAyyTbNivlLQ=";
   };
 
diff --git a/pkgs/by-name/ha/hackrf/package.nix b/pkgs/by-name/ha/hackrf/package.nix
index 5e341c524326..999353e527bd 100644
--- a/pkgs/by-name/ha/hackrf/package.nix
+++ b/pkgs/by-name/ha/hackrf/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "hackrf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-b3nGrk2P6ZLYBSCSD7c0aIApCh3ZoVDcFftybqm4vx0=";
   };
 
diff --git a/pkgs/by-name/ha/hacompanion/package.nix b/pkgs/by-name/ha/hacompanion/package.nix
index 01d69223bb9f..327d54960ba0 100644
--- a/pkgs/by-name/ha/hacompanion/package.nix
+++ b/pkgs/by-name/ha/hacompanion/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tobias-kuendig";
     repo = "hacompanion";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6fj9Gs/ezISx5Llele5mrTFR0IiQzzm1wWcAywTaFPk=";
   };
 
diff --git a/pkgs/by-name/ha/hacpack/package.nix b/pkgs/by-name/ha/hacpack/package.nix
index 1344411adcd9..d6d4ea59a104 100644
--- a/pkgs/by-name/ha/hacpack/package.nix
+++ b/pkgs/by-name/ha/hacpack/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "The-4n";
     repo = "hacpack";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0d846l36w1n9rxv79fbyhl2zdbqhlgrvk21b9vzr9x77yki89ygs";
   };
 
diff --git a/pkgs/by-name/ha/hactool/package.nix b/pkgs/by-name/ha/hactool/package.nix
index 442e6a3bc83a..8bc55829d8a5 100644
--- a/pkgs/by-name/ha/hactool/package.nix
+++ b/pkgs/by-name/ha/hactool/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SciresM";
     repo = "hactool";
-    tag = version;
+    rev = version;
     sha256 = "0305ngsnwm8npzgyhyifasi4l802xnfz19r0kbzzniirmcn4082d";
   };
 
diff --git a/pkgs/by-name/ha/hakrawler/package.nix b/pkgs/by-name/ha/hakrawler/package.nix
index ef94f2bf94ce..61ba00d2c06b 100644
--- a/pkgs/by-name/ha/hakrawler/package.nix
+++ b/pkgs/by-name/ha/hakrawler/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hakluke";
     repo = "hakrawler";
-    tag = version;
+    rev = version;
     hash = "sha256-ZJG5KlIlzaztG27NoSlILj0I94cm2xZq28qx1ebrSmc=";
   };
 
diff --git a/pkgs/by-name/ha/halfempty/package.nix b/pkgs/by-name/ha/halfempty/package.nix
index 42b3feb262f4..2647a889a2b1 100644
--- a/pkgs/by-name/ha/halfempty/package.nix
+++ b/pkgs/by-name/ha/halfempty/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "googleprojectzero";
     repo = "halfempty";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YGq6fneAMo2jCpLPrjzRJ0eeOsStKaK5L+lwQfqcfpY=";
   };
 
diff --git a/pkgs/by-name/ha/halp/package.nix b/pkgs/by-name/ha/halp/package.nix
index f88039440167..d90f793c3a7f 100644
--- a/pkgs/by-name/ha/halp/package.nix
+++ b/pkgs/by-name/ha/halp/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "halp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SeBponGeQWKjbiS4GL8YA7y92BqLL+ja6ZSKAI3CeRM=";
   };
 
diff --git a/pkgs/by-name/ha/handlr-regex/package.nix b/pkgs/by-name/ha/handlr-regex/package.nix
index 423bf6e261e4..9d125e0d7c9d 100644
--- a/pkgs/by-name/ha/handlr-regex/package.nix
+++ b/pkgs/by-name/ha/handlr-regex/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Anomalocaridid";
     repo = "handlr-regex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZQAUqR0u+2kBLGyeT7qTcfwF87LY2qRClZ0T3WH78+w=";
   };
 
diff --git a/pkgs/by-name/ha/hans/package.nix b/pkgs/by-name/ha/hans/package.nix
index 8f59ae45d158..8314ef012ef2 100644
--- a/pkgs/by-name/ha/hans/package.nix
+++ b/pkgs/by-name/ha/hans/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "sha256-r6IDs8Seys94LBNnedcfVX5aW8x//ZN0Yh/DGTg8niA=";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "hans";
     owner = "friedrich";
   };
diff --git a/pkgs/by-name/ha/hap-py/package.nix b/pkgs/by-name/ha/hap-py/package.nix
index 82093f800006..e86245297da3 100644
--- a/pkgs/by-name/ha/hap-py/package.nix
+++ b/pkgs/by-name/ha/hap-py/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Illumina";
     repo = "hap.py";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-K8XXhioMGMHw56MKvp0Eo8S6R36JczBzGRaBz035zRQ=";
   };
   # For illumina script
diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix
index aaca11d0ef7b..2c5ec6ee66f2 100644
--- a/pkgs/by-name/ha/harbor-cli/package.nix
+++ b/pkgs/by-name/ha/harbor-cli/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Vfr7e5UQ34TkirywuYJPrkxRA6yJp3/ivfCJOnh34MY=";
   };
 
diff --git a/pkgs/by-name/ha/harminv/package.nix b/pkgs/by-name/ha/harminv/package.nix
index a7b03925ec0d..bf266a20af75 100644
--- a/pkgs/by-name/ha/harminv/package.nix
+++ b/pkgs/by-name/ha/harminv/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = "harminv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HV8xylK2IOvbONYGgyaqAabp6xA7/uvN4DU7upIlZh0=";
   };
 
diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index cb81ade12047..2f6765b866ab 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g+noAc+vKli2T8C2EAK4ejw/2DWZPhtKbezyt53iHYg=";
   };
 
diff --git a/pkgs/by-name/ha/harsh/package.nix b/pkgs/by-name/ha/harsh/package.nix
index a4e5fca8e92d..b38bfcafd9bc 100644
--- a/pkgs/by-name/ha/harsh/package.nix
+++ b/pkgs/by-name/ha/harsh/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wakatara";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-M19JX+a1dFq05UZmPJyhkhxDwNBRQTPE8mdKbCER+4M=";
   };
 
diff --git a/pkgs/by-name/ha/hash-slinger/package.nix b/pkgs/by-name/ha/hash-slinger/package.nix
index 2d78003835e9..c6a9ecd04be3 100644
--- a/pkgs/by-name/ha/hash-slinger/package.nix
+++ b/pkgs/by-name/ha/hash-slinger/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "letoams";
     repo = "hash-slinger";
-    tag = version;
+    rev = version;
     sha256 = "sha256-c6IZHUFuhcccUWZYSOUGFbKpTtwMclIvEvDX8gE5d8o=";
   };
 
diff --git a/pkgs/by-name/ha/hashcat-utils/package.nix b/pkgs/by-name/ha/hashcat-utils/package.nix
index d327885aedf9..826792c26ecb 100644
--- a/pkgs/by-name/ha/hashcat-utils/package.nix
+++ b/pkgs/by-name/ha/hashcat-utils/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hashcat";
     repo = "hashcat-utils";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0wgc6wv7i6cs95rgzzx3zqm14xxbjyajvcqylz8w97d8kk4x4wjr";
   };
 
diff --git a/pkgs/by-name/ha/hashi-up/package.nix b/pkgs/by-name/ha/hashi-up/package.nix
index 8e467d35519b..29f0e3875c7b 100644
--- a/pkgs/by-name/ha/hashi-up/package.nix
+++ b/pkgs/by-name/ha/hashi-up/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jsiebens";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PdZ8X2pJ5TfT0bJ4/P/XbMTv+yyL5/1AxIFHnL/qNcg=";
   };
 
diff --git a/pkgs/by-name/ha/hashit/package.nix b/pkgs/by-name/ha/hashit/package.nix
index b1157a1de96f..16530905c333 100644
--- a/pkgs/by-name/ha/hashit/package.nix
+++ b/pkgs/by-name/ha/hashit/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "artemanufrij";
     repo = "hashit";
-    tag = version;
+    rev = version;
     sha256 = "1s8fbzg1z2ypn55xg1pfm5xh15waq55fkp49j8rsqiq8flvg6ybf";
   };
 
diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix
index 953e95175f92..a7821df0c014 100644
--- a/pkgs/by-name/ha/hashlink/package.nix
+++ b/pkgs/by-name/ha/hashlink/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "HaxeFoundation";
     repo = "hashlink";
-    tag = version;
+    rev = version;
     sha256 = "sha256-nVr+fDdna8EEHvIiXsccWFRTYzXfb4GG1zrfL+O6zLA=";
   };
 
diff --git a/pkgs/by-name/ha/haveged/package.nix b/pkgs/by-name/ha/haveged/package.nix
index 27eff231f06f..266c31d2fe4f 100644
--- a/pkgs/by-name/ha/haveged/package.nix
+++ b/pkgs/by-name/ha/haveged/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jirka-h";
     repo = "haveged";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tq4OXLlyC6exJEZ80H1gQQRBgYGbu+3kGz99RxsyauI=";
   };
 
diff --git a/pkgs/by-name/ha/havoc/package.nix b/pkgs/by-name/ha/havoc/package.nix
index 2948a29abf0f..9abe79999b43 100644
--- a/pkgs/by-name/ha/havoc/package.nix
+++ b/pkgs/by-name/ha/havoc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ii8";
     repo = "havoc";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-YCZdAlIDptVLMUko40gfp2BCAbhGNsYyVTDB14VTNSE=";
   };
 
diff --git a/pkgs/by-name/hb/hblock/package.nix b/pkgs/by-name/hb/hblock/package.nix
index 39b9f5f4b16a..44cb953f09c2 100644
--- a/pkgs/by-name/hb/hblock/package.nix
+++ b/pkgs/by-name/hb/hblock/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hectorm";
     repo = "hblock";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cke3MppQm8p8B9+5IcvCplw6CtyRbgq46wHqli7U77I=";
   };
 
diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix
index 220184b0e3fa..906370d04b4b 100644
--- a/pkgs/by-name/hc/hck/package.nix
+++ b/pkgs/by-name/hc/hck/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = "hck";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XnkLKslZY2nvjO5ZeTIBJ0Y47/JPhfIS/F5KKqm5iwI=";
   };
 
diff --git a/pkgs/by-name/hc/hcl2json/package.nix b/pkgs/by-name/hc/hcl2json/package.nix
index 3a55a03e34fd..103f8b4a143e 100644
--- a/pkgs/by-name/hc/hcl2json/package.nix
+++ b/pkgs/by-name/hc/hcl2json/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tmccombs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fgRrIJnl7lV3a2+d9/F141xCAKOj0WmeNlrtEwdl1qA=";
   };
 
diff --git a/pkgs/by-name/hc/hcledit/package.nix b/pkgs/by-name/hc/hcledit/package.nix
index 291d6ae7012f..3a1a5cdc25d6 100644
--- a/pkgs/by-name/hc/hcledit/package.nix
+++ b/pkgs/by-name/hc/hcledit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "minamijoyo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4PBEcOK16YXQhrQ6Yrtcb6vTE6h6sSY3Ymuxi+mEUt8=";
   };
 
diff --git a/pkgs/by-name/hc/hclfmt/package.nix b/pkgs/by-name/hc/hclfmt/package.nix
index ad5dfa78ded3..a5770aef2aea 100644
--- a/pkgs/by-name/hc/hclfmt/package.nix
+++ b/pkgs/by-name/hc/hclfmt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "hcl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0RRvkOBPVrdbZo9zbVgZletKNXPBsN7pa7fsyfI9hXg=";
   };
 
diff --git a/pkgs/by-name/hc/hcxdumptool/package.nix b/pkgs/by-name/hc/hcxdumptool/package.nix
index 54c795e85993..9072ec49a6c7 100644
--- a/pkgs/by-name/hc/hcxdumptool/package.nix
+++ b/pkgs/by-name/hc/hcxdumptool/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ZerBea";
     repo = "hcxdumptool";
-    tag = version;
+    rev = version;
     sha256 = "sha256-InMyDUEH135Y1RYJ3z1+RQxPMi7+QMf670S/S2ZL9vg=";
   };
 
diff --git a/pkgs/by-name/hc/hcxtools/package.nix b/pkgs/by-name/hc/hcxtools/package.nix
index 2851e62902b9..76fda256617d 100644
--- a/pkgs/by-name/hc/hcxtools/package.nix
+++ b/pkgs/by-name/hc/hcxtools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ZerBea";
     repo = "hcxtools";
-    tag = version;
+    rev = version;
     sha256 = "sha256-8VfGiIXl/F2wgCMuS3+lt9sT/re9YgoRKwzgSHCir04=";
   };
 
diff --git a/pkgs/by-name/hd/hd-idle/package.nix b/pkgs/by-name/hd/hd-idle/package.nix
index c91e0d8e351e..c87179f74c1a 100644
--- a/pkgs/by-name/hd/hd-idle/package.nix
+++ b/pkgs/by-name/hd/hd-idle/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adelolmo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WHJcysTN9LHI1WnDuFGTyTirxXirpLpJIeNDj4sZGY0=";
   };
 
diff --git a/pkgs/by-name/hd/hdaps-gl/package.nix b/pkgs/by-name/hd/hdaps-gl/package.nix
index 09a873ea208f..0152919e9b17 100644
--- a/pkgs/by-name/hd/hdaps-gl/package.nix
+++ b/pkgs/by-name/hd/hdaps-gl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-thinkpad";
     repo = "hdaps-gl";
-    tag = version;
+    rev = version;
     sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh";
   };
 
diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix
index 091e2232473a..1a0eaea6c2f6 100644
--- a/pkgs/by-name/hd/hdf5-blosc/package.nix
+++ b/pkgs/by-name/hd/hdf5-blosc/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "hdf5-blosc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1nj2bm1v6ymm3fmyvhbn6ih5fgdiapavlfghh1pvbmhw71cysyqs";
   };
 
diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix
index 6a5d0f202efc..9de71c9ec74f 100644
--- a/pkgs/by-name/hd/hdrop/package.nix
+++ b/pkgs/by-name/hd/hdrop/package.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Schweber";
     repo = "hdrop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T+hyC3YfTMn5txFlFbm/+wKWj21vuwIN5lfe+iiAm8c=";
   };
 
diff --git a/pkgs/by-name/hd/hdt/package.nix b/pkgs/by-name/hd/hdt/package.nix
index 17ab425d73e3..179054dcab06 100644
--- a/pkgs/by-name/hd/hdt/package.nix
+++ b/pkgs/by-name/hd/hdt/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rdfhdt";
     repo = "hdt-cpp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1vsq80jnix6cy78ayag7v8ajyw7h8dqyad1q6xkf2hzz3skvr34z";
   };
 
diff --git a/pkgs/by-name/he/headache/package.nix b/pkgs/by-name/he/headache/package.nix
index 8e45fba5fc40..bb4747960b83 100644
--- a/pkgs/by-name/he/headache/package.nix
+++ b/pkgs/by-name/he/headache/package.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "frama-c";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UXQIIsCyJZN4qos7Si7LLm9vQueOduUmLeYHuyT2GZo=";
   };
 
diff --git a/pkgs/by-name/he/headphones/package.nix b/pkgs/by-name/he/headphones/package.nix
index 2b9c6a543c06..816dee0e0d1a 100644
--- a/pkgs/by-name/he/headphones/package.nix
+++ b/pkgs/by-name/he/headphones/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rembo10";
     repo = "headphones";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "195v0ylhqd49bqq3dpig5nh0kivmwgmn0977fknix9j14jpvmd3b";
   };
 
diff --git a/pkgs/by-name/he/headsetcontrol/package.nix b/pkgs/by-name/he/headsetcontrol/package.nix
index e39f41ab7b22..4ca12f94739d 100644
--- a/pkgs/by-name/he/headsetcontrol/package.nix
+++ b/pkgs/by-name/he/headsetcontrol/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Sapd";
     repo = "HeadsetControl";
-    tag = version;
+    rev = version;
     sha256 = "sha256-N1c94iAJgCPhGNDCGjMINg0AL2wPX5gVIsJ+pzn/l9Y=";
   };
 
diff --git a/pkgs/by-name/he/heatseeker/package.nix b/pkgs/by-name/he/heatseeker/package.nix
index 241f05150600..7843e5f8660e 100644
--- a/pkgs/by-name/he/heatseeker/package.nix
+++ b/pkgs/by-name/he/heatseeker/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rschmitt";
     repo = "heatseeker";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-SU5HLAFA7IHnVhsmVtxskteeKKIEvvVSqHIeEk5BkfA=";
   };
 
diff --git a/pkgs/by-name/he/hebcal/package.nix b/pkgs/by-name/he/hebcal/package.nix
index fa4aff64352f..c21900545a89 100644
--- a/pkgs/by-name/he/hebcal/package.nix
+++ b/pkgs/by-name/he/hebcal/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hebcal";
     repo = "hebcal";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-iWp2S3s8z/y4dZ66Ogqu7Yf4gTUvSS1J5F7d0ifRbcY=";
   };
 
diff --git a/pkgs/by-name/he/hedgedoc-cli/package.nix b/pkgs/by-name/he/hedgedoc-cli/package.nix
index 672a3c1192be..78eb00563a88 100644
--- a/pkgs/by-name/he/hedgedoc-cli/package.nix
+++ b/pkgs/by-name/he/hedgedoc-cli/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "hedgedoc";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "uz+lkRRUTRr8WR295esNEbgjlZ/Em7mBk6Nx0BWLfg4=";
   };
 
diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix
index 382c60153a14..b2c50a52c8ce 100644
--- a/pkgs/by-name/he/heh/package.nix
+++ b/pkgs/by-name/he/heh/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ndd7xv";
     repo = "heh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w=";
   };
 
diff --git a/pkgs/by-name/he/helio-workstation/package.nix b/pkgs/by-name/he/helio-workstation/package.nix
index d1b48f00cc33..198a5a67a60f 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";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-o8vMHt6ypHY7HOHnhMifQphxGb5MjSg3hREVOnIdqfc=";
   };
diff --git a/pkgs/by-name/he/heliocron/package.nix b/pkgs/by-name/he/heliocron/package.nix
index d4b9fd18fa8a..f0bf7a9e693f 100644
--- a/pkgs/by-name/he/heliocron/package.nix
+++ b/pkgs/by-name/he/heliocron/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mfreeborn";
     repo = "heliocron";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5rzFz29Bpy2GR6bEt2DdCq9RtpdcY3SK/KnZrBrHUvk=";
   };
 
diff --git a/pkgs/by-name/he/helm-dashboard/package.nix b/pkgs/by-name/he/helm-dashboard/package.nix
index cc3b5f61aae0..e3ebea92a4ce 100644
--- a/pkgs/by-name/he/helm-dashboard/package.nix
+++ b/pkgs/by-name/he/helm-dashboard/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "komodorio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hjIo2AEXNcFK0z4op59NnC2R8GspF5t808DZ72AxgMw=";
   };
 
diff --git a/pkgs/by-name/he/helm-docs/package.nix b/pkgs/by-name/he/helm-docs/package.nix
index 49cd304d73e2..bcc89207c394 100644
--- a/pkgs/by-name/he/helm-docs/package.nix
+++ b/pkgs/by-name/he/helm-docs/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "norwoodj";
     repo = "helm-docs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-a7alzjh+vjJPw/g9yaYkOUvwpgiqCrtKTBkV1EuGYtk=";
   };
 
diff --git a/pkgs/by-name/he/helm-ls/package.nix b/pkgs/by-name/he/helm-ls/package.nix
index 3ca337b87852..3ffedc478a9c 100644
--- a/pkgs/by-name/he/helm-ls/package.nix
+++ b/pkgs/by-name/he/helm-ls/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mrjosh";
     repo = "helm-ls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-k/JJoLRykIY/ZmjqG+ZzXuMPQRcoumqisPKrD9PPyd0=";
   };
 
diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix
index 141ec152dc32..f97fdd7c6192 100644
--- a/pkgs/by-name/he/helmsman/package.nix
+++ b/pkgs/by-name/he/helmsman/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Praqma";
     repo = "helmsman";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-k/rgQttCA4Ahip9zV+z9zbVSy8NKUTIR4/pluqpP/1c=";
   };
 
diff --git a/pkgs/by-name/he/herbe/package.nix b/pkgs/by-name/he/herbe/package.nix
index 64121e31ea64..a3759ebfd978 100644
--- a/pkgs/by-name/he/herbe/package.nix
+++ b/pkgs/by-name/he/herbe/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dudik";
     repo = "herbe";
-    tag = version;
+    rev = version;
     sha256 = "0358i5jmmlsvy2j85ij7m1k4ar2jr5lsv7y1c58dlf9710h186cv";
   };
 
diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix
index 26616cc38ff4..0495cd4f62cc 100644
--- a/pkgs/by-name/he/hermitcli/package.nix
+++ b/pkgs/by-name/he/hermitcli/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.44.4";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "cashapp";
     repo = "hermit";
     hash = "sha256-fmIFonhzhLHzcRWWC4l3wDHmoXUy3vm//tA497rI0LE=";
diff --git a/pkgs/by-name/he/hetzner-kube/package.nix b/pkgs/by-name/he/hetzner-kube/package.nix
index 5e21009e2de6..beb912964904 100644
--- a/pkgs/by-name/he/hetzner-kube/package.nix
+++ b/pkgs/by-name/he/hetzner-kube/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xetys";
     repo = "hetzner-kube";
-    tag = version;
+    rev = version;
     hash = "sha256-XHvR+31yq0o3txMBHh2rCh2peDlG5Kh3hdl0LGm9D8c=";
   };
 
diff --git a/pkgs/by-name/he/hex/package.nix b/pkgs/by-name/he/hex/package.nix
index 8e401268a8fb..b85d1d3836e8 100644
--- a/pkgs/by-name/he/hex/package.nix
+++ b/pkgs/by-name/he/hex/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sitkevij";
     repo = "hex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YctXDhCMJvDQLPsuhzdyYDUIlFE2vKltNtrFFeE7YE8=";
   };
 
diff --git a/pkgs/by-name/he/hexbinhex/package.nix b/pkgs/by-name/he/hexbinhex/package.nix
index be0f164dfd8b..a4a012bdad74 100644
--- a/pkgs/by-name/he/hexbinhex/package.nix
+++ b/pkgs/by-name/he/hexbinhex/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dj-on-github";
     repo = "hexbinhex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nfOmiF+t5QtAl1I7CSz26C9SGo7ZkdSziO2eiHbk6pA=";
   };
 
diff --git a/pkgs/by-name/he/hexchat/package.nix b/pkgs/by-name/he/hexchat/package.nix
index e239f3720369..1834fceda867 100644
--- a/pkgs/by-name/he/hexchat/package.nix
+++ b/pkgs/by-name/he/hexchat/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hexchat";
     repo = "hexchat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rgaXqXbBWlfSyz+CT0jRLyfGOR1cYYnRhEAu7AsaWus=";
   };
 
diff --git a/pkgs/by-name/he/hexcurse/package.nix b/pkgs/by-name/he/hexcurse/package.nix
index c0f10df93824..f5f7350792e2 100644
--- a/pkgs/by-name/he/hexcurse/package.nix
+++ b/pkgs/by-name/he/hexcurse/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LonnyGomes";
     repo = "hexcurse";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk";
   };
   buildInputs = [ ncurses ];
diff --git a/pkgs/by-name/he/hexd/package.nix b/pkgs/by-name/he/hexd/package.nix
index e106450931a3..5893d1cf9ed0 100644
--- a/pkgs/by-name/he/hexd/package.nix
+++ b/pkgs/by-name/he/hexd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FireyFly";
     repo = "hexd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-b/dROBQVPEiMBTcu4MTi6Lf6ChkFZqZrJ1V0j54rrFY=";
   };
 
diff --git a/pkgs/by-name/he/hexdino/package.nix b/pkgs/by-name/he/hexdino/package.nix
index 01453cb914b7..73d8627ef2ca 100644
--- a/pkgs/by-name/he/hexdino/package.nix
+++ b/pkgs/by-name/he/hexdino/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Luz";
     repo = "hexdino";
-    tag = version;
+    rev = version;
     hash = "sha256-glbyftCJiP0/5trW7DOcVCU2q4ZH3zFK96eyGuYR8eY=";
   };
 
diff --git a/pkgs/by-name/he/hexedit/package.nix b/pkgs/by-name/he/hexedit/package.nix
index fc6c05449a9b..e592d6633b6c 100644
--- a/pkgs/by-name/he/hexedit/package.nix
+++ b/pkgs/by-name/he/hexedit/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pixel";
     repo = "hexedit";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI=";
   };
 
diff --git a/pkgs/by-name/he/hexo-cli/package.nix b/pkgs/by-name/he/hexo-cli/package.nix
index 1edc31ee12e5..fcce2db7eacf 100644
--- a/pkgs/by-name/he/hexo-cli/package.nix
+++ b/pkgs/by-name/he/hexo-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "hexojs";
     repo = "hexo-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mtbg9Fa9LBqG/aNfm4yEo4ymuaxuqhymkO1q6mYA2Fs=";
   };
 
diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix
index 0bd9abf411d5..54d2d39dba45 100644
--- a/pkgs/by-name/he/hextazy/package.nix
+++ b/pkgs/by-name/he/hextazy/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "0xfalafel";
     repo = "hextazy";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-j8KY8OTYG+Hl86OppbMyAFBSA89TO7hc8mcNgTGTlgM=";
   };
 
diff --git a/pkgs/by-name/he/hey/package.nix b/pkgs/by-name/he/hey/package.nix
index 5324bc2b5203..08735573fb5a 100644
--- a/pkgs/by-name/he/hey/package.nix
+++ b/pkgs/by-name/he/hey/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rakyll";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0gsdksrzlwpba14a43ayyy41l1hxpw4ayjpvqyd4ycakddlkvgzb";
   };
 
diff --git a/pkgs/by-name/he/heygpt/package.nix b/pkgs/by-name/he/heygpt/package.nix
index fd053c05bb4f..fce8cc8469f4 100644
--- a/pkgs/by-name/he/heygpt/package.nix
+++ b/pkgs/by-name/he/heygpt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fuyufjh";
     repo = "heygpt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oP0yIdYytXSsbZ2pNaZ8Rrak1qJsudTe/oP6dGncGUM=";
   };
 
diff --git a/pkgs/by-name/hh/hhpc/package.nix b/pkgs/by-name/hh/hhpc/package.nix
index c739c25af2dc..048490fbe9c2 100644
--- a/pkgs/by-name/hh/hhpc/package.nix
+++ b/pkgs/by-name/hh/hhpc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aktau";
     repo = "hhpc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1djsw1r38mh6zx0rbyn2cfa931hyddib4fl3i27c4z7xinl709ss";
   };
 
diff --git a/pkgs/by-name/hi/hidviz/package.nix b/pkgs/by-name/hi/hidviz/package.nix
index e6e9bee3a496..e3f154965be8 100644
--- a/pkgs/by-name/hi/hidviz/package.nix
+++ b/pkgs/by-name/hi/hidviz/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hidviz";
     repo = "hidviz";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9crHFYVNNxJjwJojwqB8qdAGyr1Ieux9qC3m3rpIJw0=";
   };
 
diff --git a/pkgs/by-name/hi/highfive/package.nix b/pkgs/by-name/hi/highfive/package.nix
index db9390cb1f3e..db3e6a19f6c8 100644
--- a/pkgs/by-name/hi/highfive/package.nix
+++ b/pkgs/by-name/hi/highfive/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BlueBrain";
     repo = "HighFive";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Nv+nbel/xGlGTB8sKF0EM1xwz/ZEri5uGB7ma6Ba6fo=";
   };
 
diff --git a/pkgs/by-name/hi/highlight-assertions/package.nix b/pkgs/by-name/hi/highlight-assertions/package.nix
index 2b2bb315a17d..3d5be23b51f1 100644
--- a/pkgs/by-name/hi/highlight-assertions/package.nix
+++ b/pkgs/by-name/hi/highlight-assertions/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "thehamsta";
     repo = "highlight-assertions";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg=";
   };
 
diff --git a/pkgs/by-name/hi/himalaya/package.nix b/pkgs/by-name/hi/himalaya/package.nix
index 58e5f42c8deb..404813aa2de7 100644
--- a/pkgs/by-name/hi/himalaya/package.nix
+++ b/pkgs/by-name/hi/himalaya/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage {
     inherit hash;
     owner = "pimalaya";
     repo = "himalaya";
-    tag = "v${version}";
+    rev = "v${version}";
   };
 
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/hi/hime/package.nix b/pkgs/by-name/hi/hime/package.nix
index 0b9845eb08d4..c6e35809dbcd 100644
--- a/pkgs/by-name/hi/hime/package.nix
+++ b/pkgs/by-name/hi/hime/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "hime";
     owner = "hime-ime";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fCqet+foQjI+LpTQ/6Egup1GzXELlL2hgbh0dCKLwPI=";
   };
 
diff --git a/pkgs/by-name/hi/hiraeth/package.nix b/pkgs/by-name/hi/hiraeth/package.nix
index 126d64509eec..c69ec6ac34fa 100644
--- a/pkgs/by-name/hi/hiraeth/package.nix
+++ b/pkgs/by-name/hi/hiraeth/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lukaswrz";
     repo = "hiraeth";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GPDGwrYVy9utp5u4iyf0PqIAlI/izcwAsj4yFStYmTE=";
   };
 
diff --git a/pkgs/by-name/hi/hiredis/package.nix b/pkgs/by-name/hi/hiredis/package.nix
index e244b45b23bc..b4b2304da600 100644
--- a/pkgs/by-name/hi/hiredis/package.nix
+++ b/pkgs/by-name/hi/hiredis/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "redis";
     repo = "hiredis";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZxUITm3OcbERcvaNqGQU46bEfV+jN6safPalG0TVfBg=";
   };
 
diff --git a/pkgs/by-name/hi/hisat2/package.nix b/pkgs/by-name/hi/hisat2/package.nix
index 2532ceeb169e..3feeb435579d 100644
--- a/pkgs/by-name/hi/hisat2/package.nix
+++ b/pkgs/by-name/hi/hisat2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DaehwanKimLab";
     repo = "hisat2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0lmzdhzjkvxw7n5w40pbv5fgzd4cz0f9pxczswn3d4cr0k10k754";
   };
 
diff --git a/pkgs/by-name/hi/hishtory/package.nix b/pkgs/by-name/hi/hishtory/package.nix
index ece3658b32b5..9ea3a3cfa6bb 100644
--- a/pkgs/by-name/hi/hishtory/package.nix
+++ b/pkgs/by-name/hi/hishtory/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ddworken";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nh3dNm+5h+3moeO1PUS6tPkftojMSSWSr0m/5n2iO2w=";
   };
 
diff --git a/pkgs/by-name/hi/hivemind/package.nix b/pkgs/by-name/hi/hivemind/package.nix
index 5fda5385fe7a..0e01aa8aa42b 100644
--- a/pkgs/by-name/hi/hivemind/package.nix
+++ b/pkgs/by-name/hi/hivemind/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DarthSim";
     repo = "hivemind";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YUR9OwRuH1xSPs8iTsSIjLCt2TyYH357IAYULGTyYUc=";
   };
 
diff --git a/pkgs/by-name/hj/hjson-go/package.nix b/pkgs/by-name/hj/hjson-go/package.nix
index 1d21e353244b..f0b906ad0808 100644
--- a/pkgs/by-name/hj/hjson-go/package.nix
+++ b/pkgs/by-name/hj/hjson-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hjson";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fonPxk/9ue8LzHTdKpuHJcucQoMl4P6gq+tbjS8Ui7Q=";
   };
 
diff --git a/pkgs/by-name/hn/hn-text/package.nix b/pkgs/by-name/hn/hn-text/package.nix
index 41d6a2ac9412..e07f31a34230 100644
--- a/pkgs/by-name/hn/hn-text/package.nix
+++ b/pkgs/by-name/hn/hn-text/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "piqoni";
     repo = "hn-text";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YoPdYuNlWrLITyd2XeCOeGy70Ews1rvtOQzYZAQTI+Y=";
   };
 
diff --git a/pkgs/by-name/ho/hoard/package.nix b/pkgs/by-name/ho/hoard/package.nix
index 5e44bb1d2d17..52d8badc95fb 100644
--- a/pkgs/by-name/ho/hoard/package.nix
+++ b/pkgs/by-name/ho/hoard/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Hyde46";
     repo = "hoard";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-c9iSbxkHwLOeATkO7kzTyLD0VAwZUzCvw5c4FyuR5/E=";
   };
 
diff --git a/pkgs/by-name/ho/hof/package.nix b/pkgs/by-name/ho/hof/package.nix
index 78abe71e2475..f7866ddc15e8 100644
--- a/pkgs/by-name/ho/hof/package.nix
+++ b/pkgs/by-name/ho/hof/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hofstadter-io";
     repo = "hof";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-okc11mXqB/PaXd0vsRuIIL70qWSFprvsZJtE6PvCaIg=";
   };
 
diff --git a/pkgs/by-name/ho/holo-build/package.nix b/pkgs/by-name/ho/holo-build/package.nix
index 9746b39608c7..0ed9d9232b56 100644
--- a/pkgs/by-name/ho/holo-build/package.nix
+++ b/pkgs/by-name/ho/holo-build/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "holocm";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0lypbgf96bcc4m3968xa4il1zwprsdyc0pw6pl9mqq7djxabikd0";
   };
 
diff --git a/pkgs/by-name/ho/hologram/package.nix b/pkgs/by-name/ho/hologram/package.nix
index 7cd4fada0abb..705e6d87af6c 100644
--- a/pkgs/by-name/ho/hologram/package.nix
+++ b/pkgs/by-name/ho/hologram/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "AdRoll";
     repo = "hologram";
-    tag = version;
+    rev = version;
     hash = "sha256-b65mplfDuwk8lEfJLKBY7BF0yGRksxHjwbEW6A7moo4=";
   };
 
diff --git a/pkgs/by-name/ho/holos/package.nix b/pkgs/by-name/ho/holos/package.nix
index 5526f0e33909..df879231f1b9 100644
--- a/pkgs/by-name/ho/holos/package.nix
+++ b/pkgs/by-name/ho/holos/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "holos-run";
     repo = "holos";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4LCNKPf+b7O9DHCmOzaI8clCbmikyAAG+6C3I0aQdMg=";
   };
 
diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix
index bdd87400eb47..5df79e2f4928 100644
--- a/pkgs/by-name/ho/homebox/package.nix
+++ b/pkgs/by-name/ho/homebox/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "sysadminsmedia";
     repo = "homebox";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6iNlx0lBVU/awUZHqRYFKe84D86EJNFF7Nm1XChs75w=";
   };
 in
diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index 662eca86e72a..eaad9c42bd8f 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bastienwirtz";
     repo = "homer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Fh6qV2eU7VRskbPun7OcJmqgjILVE8w5lV70xH6znmc=";
   };
 
diff --git a/pkgs/by-name/ho/honcho/package.nix b/pkgs/by-name/ho/honcho/package.nix
index 57665c79847e..d60201187883 100644
--- a/pkgs/by-name/ho/honcho/package.nix
+++ b/pkgs/by-name/ho/honcho/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nickstenning";
     repo = "honcho";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1y0r8dw4pqcq7r4n58ixjdg1iy60lp0gxsd7d2jmhals16ij71rj";
   };
 
diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix
index 8a01b645c5c7..690636870e80 100644
--- a/pkgs/by-name/ho/honeycomb-refinery/package.nix
+++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "honeycombio";
     repo = "refinery";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SU9JbyUuBMqPw4XcoF5s8CgBn7+V/rHBAwpXJk373jg=";
   };
 
diff --git a/pkgs/by-name/ho/honggfuzz/package.nix b/pkgs/by-name/ho/honggfuzz/package.nix
index fcbc8bbf10fd..945020445950 100644
--- a/pkgs/by-name/ho/honggfuzz/package.nix
+++ b/pkgs/by-name/ho/honggfuzz/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-/ra6g0qjjC8Lo8/n2XEbwnZ95yDHcGhYd5+TTvQ6FAc=";
   };
 
diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
index 5ac52d1e1594..31c980998aa4 100644
--- a/pkgs/by-name/ho/horizon-eda/base.nix
+++ b/pkgs/by-name/ho/horizon-eda/base.nix
@@ -29,7 +29,7 @@ rec {
   src = fetchFromGitHub {
     owner = "horizon-eda";
     repo = "horizon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0ikCR10r/WPb+H+Ut2GO6y4A/9bctJLanL/RR4r9GWs=";
   };
 
diff --git a/pkgs/by-name/ho/horst/package.nix b/pkgs/by-name/ho/horst/package.nix
index 5c437b40c204..cb9d6492ad61 100644
--- a/pkgs/by-name/ho/horst/package.nix
+++ b/pkgs/by-name/ho/horst/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "br101";
     repo = "horst";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a";
   };
 
diff --git a/pkgs/by-name/ho/host-spawn/package.nix b/pkgs/by-name/ho/host-spawn/package.nix
index 1ed16566353d..95b06655d7d8 100644
--- a/pkgs/by-name/ho/host-spawn/package.nix
+++ b/pkgs/by-name/ho/host-spawn/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "1player";
     repo = "host-spawn";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-V8WI0TyJw+dkCyG8huIrg6VDFI2Kmak7bI/GXU8RI/w=";
   };
 
diff --git a/pkgs/by-name/ho/hostapd-mana/package.nix b/pkgs/by-name/ho/hostapd-mana/package.nix
index 63da70138fc2..8da50a57c6b6 100644
--- a/pkgs/by-name/ho/hostapd-mana/package.nix
+++ b/pkgs/by-name/ho/hostapd-mana/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sensepost";
     repo = "hostapd-mana";
-    tag = version;
+    rev = version;
     hash = "sha256-co5LMJAUYSdcvhLv1gfjDvdVqdSXgjtFoiQ7+KxR07M=";
   };
 
diff --git a/pkgs/by-name/ho/hostctl/package.nix b/pkgs/by-name/ho/hostctl/package.nix
index 5c9ce5fd9960..a5838703674c 100644
--- a/pkgs/by-name/ho/hostctl/package.nix
+++ b/pkgs/by-name/ho/hostctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "guumaster";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9BbPHqAZKw8Rpjpdd/e9ip3V0Eh06tEFt/skQ97ij4g=";
   };
 
diff --git a/pkgs/by-name/ho/hostess/package.nix b/pkgs/by-name/ho/hostess/package.nix
index 3dc73e08d357..28ab7185d9df 100644
--- a/pkgs/by-name/ho/hostess/package.nix
+++ b/pkgs/by-name/ho/hostess/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cbednarski";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1izszf60nsa6pyxx3kd8qdrz3h47ylm17r9hzh9wk37f61pmm42j";
   };
 
diff --git a/pkgs/by-name/ho/hostmux/package.nix b/pkgs/by-name/ho/hostmux/package.nix
index dfab97320719..cc3dcf8339bb 100644
--- a/pkgs/by-name/ho/hostmux/package.nix
+++ b/pkgs/by-name/ho/hostmux/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hukl";
     repo = "hostmux";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Rh8eyKoUydixj+X7muWleZW9u8djCQAyexIfRWIOr0o=";
   };
 
diff --git a/pkgs/by-name/ho/hound/package.nix b/pkgs/by-name/ho/hound/package.nix
index 5641c225b674..2c3b99633932 100644
--- a/pkgs/by-name/ho/hound/package.nix
+++ b/pkgs/by-name/ho/hound/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hound-search";
     repo = "hound";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Qdk57zLjTXLdDEmB6K+sZAym5s0BekJJa/CpYeOBOcY=";
   };
 
diff --git a/pkgs/by-name/ho/hover/package.nix b/pkgs/by-name/ho/hover/package.nix
index 866f764149ed..140be9ca8ddf 100644
--- a/pkgs/by-name/ho/hover/package.nix
+++ b/pkgs/by-name/ho/hover/package.nix
@@ -49,7 +49,7 @@ let
     vendorHash = "sha256-GDoX5d2aDfaAx9JsKuS4r8137t3swT6rgcCghmaThSM=";
 
     src = fetchFromGitHub {
-      tag = "v${version}";
+      rev = "v${version}";
       owner = "go-flutter-desktop";
       repo = pname;
       sha256 = "sha256-ch59Wx4g72u7x99807ppURI4I+5aJ/W8Zr35q8X68v4=";
diff --git a/pkgs/by-name/ho/howard-hinnant-date/package.nix b/pkgs/by-name/ho/howard-hinnant-date/package.nix
index 4ef9c03bc200..757131dc83c2 100644
--- a/pkgs/by-name/ho/howard-hinnant-date/package.nix
+++ b/pkgs/by-name/ho/howard-hinnant-date/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "HowardHinnant";
     repo = "date";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qfrmH3NRyrDVmHRmmWzM5Zz37E7RFXJqaV1Rq2E59qs=";
   };
 
diff --git a/pkgs/by-name/hp/hpe-ltfs/package.nix b/pkgs/by-name/hp/hpe-ltfs/package.nix
index 3a316cd97f10..b17c45e8c56f 100644
--- a/pkgs/by-name/hp/hpe-ltfs/package.nix
+++ b/pkgs/by-name/hp/hpe-ltfs/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   pname = "hpe-ltfs";
 
   src = fetchFromGitHub {
-    tag = version;
+    rev = version;
     owner = "nix-community";
     repo = "hpe-ltfs";
     sha256 = "193593hsc8nf5dn1fkxhzs1z4fpjh64hdkc8q6n9fgplrpxdlr4s";
diff --git a/pkgs/by-name/hp/hpx/package.nix b/pkgs/by-name/hp/hpx/package.nix
index 1296d4d6beb4..2e13c016433e 100644
--- a/pkgs/by-name/hp/hpx/package.nix
+++ b/pkgs/by-name/hp/hpx/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "STEllAR-GROUP";
     repo = "hpx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yrKG0n5BhrUNXjFWZRpb38/GYQlvMr0PSqUbhmZlgm0=";
   };
 
diff --git a/pkgs/by-name/hr/hr/package.nix b/pkgs/by-name/hr/hr/package.nix
index 4f8f4af360de..3a995fc06115 100644
--- a/pkgs/by-name/hr/hr/package.nix
+++ b/pkgs/by-name/hr/hr/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LuRsT";
     repo = "hr";
-    tag = version;
+    rev = version;
     sha256 = "sha256-05num4v8C3n+uieKQJVLOzu9OOMBsUMPqq08Ou6gmYQ=";
   };
 
diff --git a/pkgs/by-name/hr/hred/package.nix b/pkgs/by-name/hr/hred/package.nix
index af78fa19604c..d946f8665b07 100644
--- a/pkgs/by-name/hr/hred/package.nix
+++ b/pkgs/by-name/hr/hred/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "danburzo";
     repo = "hred";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+0+WQRI8rdIMbPN0eBUdsWUMWDCxZhTRLiFo1WRd2xc=";
   };
 
diff --git a/pkgs/by-name/hs/hsd/package.nix b/pkgs/by-name/hs/hsd/package.nix
index ef384fda26a3..d259a7bf851d 100644
--- a/pkgs/by-name/hs/hsd/package.nix
+++ b/pkgs/by-name/hs/hsd/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "handshake-org";
     repo = "hsd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bmvoykpaYQDWLYKOwgKZ1V6ivzDJFM1Yo+ATkzKTP2s=";
   };
 
diff --git a/pkgs/by-name/hs/hsetroot/package.nix b/pkgs/by-name/hs/hsetroot/package.nix
index d926b341eecb..48a281f3bc90 100644
--- a/pkgs/by-name/hs/hsetroot/package.nix
+++ b/pkgs/by-name/hs/hsetroot/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "himdel";
     repo = "hsetroot";
-    tag = version;
+    rev = version;
     sha256 = "1jbk5hlxm48zmjzkaq5946s58rqwg1v1ds2sdyd2ba029hmvr722";
   };
 
diff --git a/pkgs/by-name/hs/hstr/package.nix b/pkgs/by-name/hs/hstr/package.nix
index 5fa385c5d91f..a92128622780 100644
--- a/pkgs/by-name/hs/hstr/package.nix
+++ b/pkgs/by-name/hs/hstr/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dvorka";
     repo = "hstr";
-    tag = version;
+    rev = version;
     hash = "sha256-OuLy1aiEwUJDGy3+UXYF1Vx1nNXic46WIZEM1xrIPfA=";
   };
 
diff --git a/pkgs/by-name/ht/htcondor/package.nix b/pkgs/by-name/ht/htcondor/package.nix
index c1aeb40d6161..64cfb8bb516e 100644
--- a/pkgs/by-name/ht/htcondor/package.nix
+++ b/pkgs/by-name/ht/htcondor/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "htcondor";
     repo = "htcondor";
 
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-F8uI8Stvao7VKULTcOjv/nFUhFHxqd00gRNe6tkKgPE=";
   };
 
diff --git a/pkgs/by-name/ht/html-minifier/package.nix b/pkgs/by-name/ht/html-minifier/package.nix
index 64bb00f8e8f0..81bf3e65fdf8 100644
--- a/pkgs/by-name/ht/html-minifier/package.nix
+++ b/pkgs/by-name/ht/html-minifier/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "kangax";
     repo = "html-minifier";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OAykAqBxgr7tbeXXfSH23DALf7Eoh3VjDKNKWGAL3+A=";
   };
 
diff --git a/pkgs/by-name/ht/html-tidy/package.nix b/pkgs/by-name/ht/html-tidy/package.nix
index 8bffd1a235ea..00fa778dd53a 100644
--- a/pkgs/by-name/ht/html-tidy/package.nix
+++ b/pkgs/by-name/ht/html-tidy/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "htacg";
     repo = "tidy-html5";
-    tag = version;
+    rev = version;
     hash = "sha256-vzVWQodwzi3GvC9IcSQniYBsbkJV20iZanF33A0Gpe0=";
   };
 
diff --git a/pkgs/by-name/ht/html2text/package.nix b/pkgs/by-name/ht/html2text/package.nix
index a7db7f51b545..7e6e46d6033f 100644
--- a/pkgs/by-name/ht/html2text/package.nix
+++ b/pkgs/by-name/ht/html2text/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "grobian";
     repo = "html2text";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7Ch51nJ5BeRqs4PEIPnjCGk+Nm2ydgJQCtkcpihXun8=";
   };
 
diff --git a/pkgs/by-name/ht/htmlhint/package.nix b/pkgs/by-name/ht/htmlhint/package.nix
index c496f3be7885..2c7f09ee60db 100644
--- a/pkgs/by-name/ht/htmlhint/package.nix
+++ b/pkgs/by-name/ht/htmlhint/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "htmlhint";
     repo = "HTMLHint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6R+/uwqWpuTjUnFeUFMzZBzhlFBxYceYZfLLuaYhc6k=";
   };
 
diff --git a/pkgs/by-name/ht/htmltest/package.nix b/pkgs/by-name/ht/htmltest/package.nix
index 70e02c56e107..9eed514e874d 100644
--- a/pkgs/by-name/ht/htmltest/package.nix
+++ b/pkgs/by-name/ht/htmltest/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wjdp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8tkk476kGEfHo3XGu3/0r6fhX1c4vkYiUACpw0uEu2g=";
   };
 
diff --git a/pkgs/by-name/ht/htmx-lsp/package.nix b/pkgs/by-name/ht/htmx-lsp/package.nix
index 3d7ba84f8444..74e67231ee8e 100644
--- a/pkgs/by-name/ht/htmx-lsp/package.nix
+++ b/pkgs/by-name/ht/htmx-lsp/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ThePrimeagen";
     repo = "htmx-lsp";
-    tag = version;
+    rev = version;
     hash = "sha256-CvQ+vgo3+qUOj0SS6/NrapzXkP98tpiZbGhRHJxEqeo=";
   };
 
diff --git a/pkgs/by-name/ht/htop-vim/package.nix b/pkgs/by-name/ht/htop-vim/package.nix
index 6f6e6f604183..937d212c37eb 100644
--- a/pkgs/by-name/ht/htop-vim/package.nix
+++ b/pkgs/by-name/ht/htop-vim/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "htop-dev";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-4M2Kzy/tTpIZzpyubnXWywQh7Np5InT4sYkVG2v6wWs";
   };
 
diff --git a/pkgs/by-name/ht/htpdate/package.nix b/pkgs/by-name/ht/htpdate/package.nix
index a97ef2b77f9d..46eb31755623 100644
--- a/pkgs/by-name/ht/htpdate/package.nix
+++ b/pkgs/by-name/ht/htpdate/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "twekkel";
     repo = "htpdate";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-X7r95Uc4oGB0eVum5D7pC4tebZIyyz73g6Q/D0cjuFM=";
   };
 
diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix
index 88c2cef103bd..c1458d5b16b9 100644
--- a/pkgs/by-name/ht/httm/package.nix
+++ b/pkgs/by-name/ht/httm/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = "httm";
-    tag = version;
+    rev = version;
     hash = "sha256-QMw5FrI5GCaUrUPaxqGDBtz7RPcCFQn+jntmyertzhM=";
   };
 
diff --git a/pkgs/by-name/ht/http-parser/package.nix b/pkgs/by-name/ht/http-parser/package.nix
index 6cdc9f4e5906..30e33e13130a 100644
--- a/pkgs/by-name/ht/http-parser/package.nix
+++ b/pkgs/by-name/ht/http-parser/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "http-parser";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c";
   };
 
diff --git a/pkgs/by-name/ht/http-server/package.nix b/pkgs/by-name/ht/http-server/package.nix
index c76d8b3455cc..015a50bcbd62 100644
--- a/pkgs/by-name/ht/http-server/package.nix
+++ b/pkgs/by-name/ht/http-server/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "http-party";
     repo = "http-server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-M/YC721QWJfz5sYX6RHm1U9WPHVRBD0ZL2/ceYItnhs=";
   };
 
diff --git a/pkgs/by-name/ht/httplab/package.nix b/pkgs/by-name/ht/httplab/package.nix
index c4688aa67807..fd2257ef8f90 100644
--- a/pkgs/by-name/ht/httplab/package.nix
+++ b/pkgs/by-name/ht/httplab/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "qustavo";
     repo = "httplab";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UL1i8JpgofXUB+jtW2EtSR1pM/Fdqnbg2EXPJAjc0H0=";
   };
 
diff --git a/pkgs/by-name/ht/httpref/package.nix b/pkgs/by-name/ht/httpref/package.nix
index 8c299c873380..fb04d45c3d51 100644
--- a/pkgs/by-name/ht/httpref/package.nix
+++ b/pkgs/by-name/ht/httpref/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dnnrly";
     repo = "httpref";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T5fR9cyqsM6Kw6kFqZedoSxyvFkkxNpuErscwiUTMa0=";
   };
 
diff --git a/pkgs/by-name/ht/httprobe/package.nix b/pkgs/by-name/ht/httprobe/package.nix
index a4d5a4665ba4..a1c2b4da34dc 100644
--- a/pkgs/by-name/ht/httprobe/package.nix
+++ b/pkgs/by-name/ht/httprobe/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "httprobe";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-k/Ev+zpYF+DcnQvMbbRzoJ4co83q3pi/D9T4DhtGR/I=";
   };
 
diff --git a/pkgs/by-name/ht/httpstat/package.nix b/pkgs/by-name/ht/httpstat/package.nix
index 606f622b0fa1..a267bbaf4d5b 100644
--- a/pkgs/by-name/ht/httpstat/package.nix
+++ b/pkgs/by-name/ht/httpstat/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "reorx";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-zUdis41sQpJ1E3LdNwaCVj6gexi/Rk21IBUgoFISiDM=";
   };
   doCheck = false; # No tests
diff --git a/pkgs/by-name/hu/hubicfuse/package.nix b/pkgs/by-name/hu/hubicfuse/package.nix
index d88d055f2ce5..1cf774bc0b9b 100644
--- a/pkgs/by-name/hu/hubicfuse/package.nix
+++ b/pkgs/by-name/hu/hubicfuse/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TurboGit";
     repo = "hubicfuse";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1x988hfffxgvqxh083pv3lj5031fz03sbgiiwrjpaiywfbhm8ffr";
   };
 
diff --git a/pkgs/by-name/hu/hueadm/package.nix b/pkgs/by-name/hu/hueadm/package.nix
index 93087a75dce7..51986732b1d5 100644
--- a/pkgs/by-name/hu/hueadm/package.nix
+++ b/pkgs/by-name/hu/hueadm/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "bahamas10";
     repo = "hueadm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QNjkfE8V/lUkYP8NAf11liKXILBk3wSNm3NSrgaH+nc=";
   };
 
diff --git a/pkgs/by-name/hu/humioctl/package.nix b/pkgs/by-name/hu/humioctl/package.nix
index e91b06362aec..34fc374f4f54 100644
--- a/pkgs/by-name/hu/humioctl/package.nix
+++ b/pkgs/by-name/hu/humioctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "humio";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2vkzde4l6GIIBzzNSewCtaVlBqkqpZQGXjw7VdJFPaE=";
   };
 
diff --git a/pkgs/by-name/hu/hunt/package.nix b/pkgs/by-name/hu/hunt/package.nix
index a9f5f714c23e..6c4c255ea472 100644
--- a/pkgs/by-name/hu/hunt/package.nix
+++ b/pkgs/by-name/hu/hunt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LyonSyonII";
     repo = "hunt-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-aNU4Ik033+kl9ZPHFzaAXZ6Hs+b7m5s0lpr1oovmWm0=";
   };
 
diff --git a/pkgs/by-name/hu/husky/package.nix b/pkgs/by-name/hu/husky/package.nix
index f6b410813fdc..e749644bc33c 100644
--- a/pkgs/by-name/hu/husky/package.nix
+++ b/pkgs/by-name/hu/husky/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "typicode";
     repo = "husky";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KoF2+vikgFyCGjfKeaqkC720UVMuvCIn9ApDPKbudsA=";
   };
 
diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix
index 5892c95468ea..6edf714d2919 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RDp5NY9VYD0gylvzYpg9BytfRdQ6dim1jJtv32yeF3k=";
   };
 
diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix
index f588804d1b61..9e6da40732ba 100644
--- a/pkgs/by-name/hw/hwinfo/package.nix
+++ b/pkgs/by-name/hw/hwinfo/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-mTkDyfdAwjJwBEp/bOYRz0zfzPSzOUEI5hp+mridZsA=";
   };
 
diff --git a/pkgs/by-name/hy/hydroxide/package.nix b/pkgs/by-name/hy/hydroxide/package.nix
index 21a3449ecc59..34decc37b134 100644
--- a/pkgs/by-name/hy/hydroxide/package.nix
+++ b/pkgs/by-name/hy/hydroxide/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "emersion";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VAbMcON75dTS+1lUqmveN2WruQCCmK3kB86e+vKM64U=";
   };
 
diff --git a/pkgs/by-name/hy/hyp2mat/package.nix b/pkgs/by-name/hy/hyp2mat/package.nix
index 4f4c1f2a8b22..5e92f8b4eee6 100644
--- a/pkgs/by-name/hy/hyp2mat/package.nix
+++ b/pkgs/by-name/hy/hyp2mat/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "koendv";
     repo = "hyp2mat";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "03ibk51swxfl7pfrhcrfiffdi4mnf8kla0g1xj1lsrvrjwapfx03";
   };
 
diff --git a/pkgs/by-name/hy/hyperbeam/package.nix b/pkgs/by-name/hy/hyperbeam/package.nix
index c801e33d9e93..883c65e0c0c9 100644
--- a/pkgs/by-name/hy/hyperbeam/package.nix
+++ b/pkgs/by-name/hy/hyperbeam/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "holepunchto";
     repo = "hyperbeam";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g3eGuol3g1yfGHDSzI1wQXMxJudGCt4PHHdmtiRQS/Q=";
   };
 
diff --git a/pkgs/by-name/hy/hyperledger-fabric/package.nix b/pkgs/by-name/hy/hyperledger-fabric/package.nix
index 9aab44c7902f..f86e6e83012c 100644
--- a/pkgs/by-name/hy/hyperledger-fabric/package.nix
+++ b/pkgs/by-name/hy/hyperledger-fabric/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hyperledger";
     repo = "fabric";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ev9a+d15kr6apKyGR5xTa/2I3cByyPSTW2Y+HAQk9GU=";
   };
 
diff --git a/pkgs/by-name/hy/hyperlink/package.nix b/pkgs/by-name/hy/hyperlink/package.nix
index e1583a5035ca..602d34cf8465 100644
--- a/pkgs/by-name/hy/hyperlink/package.nix
+++ b/pkgs/by-name/hy/hyperlink/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "untitaker";
     repo = "hyperlink";
-    tag = version;
+    rev = version;
     hash = "sha256-sx1OW056s40uhwwgGtNKiPkKSUy7/ZzSYGnjc0UKh/E=";
   };
 
diff --git a/pkgs/by-name/hy/hyperpotamus/package.nix b/pkgs/by-name/hy/hyperpotamus/package.nix
index 812645a52bd2..d0c293fff008 100644
--- a/pkgs/by-name/hy/hyperpotamus/package.nix
+++ b/pkgs/by-name/hy/hyperpotamus/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "pmarkert";
     repo = "hyperpotamus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dExkvObz+PNjqAZnigZHs/DCSHq31jDg9pgFmmtPmWk=";
   };
 
diff --git a/pkgs/by-name/hy/hypershell/package.nix b/pkgs/by-name/hy/hypershell/package.nix
index 06611de63f9a..32a394eb7780 100644
--- a/pkgs/by-name/hy/hypershell/package.nix
+++ b/pkgs/by-name/hy/hypershell/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "holepunchto";
     repo = "hypershell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UWXlcY65elw+xKLte5KE5eyFLDZmEVQBSwsSpv9G7ng=";
   };
 
diff --git a/pkgs/by-name/hy/hypnotix/package.nix b/pkgs/by-name/hy/hypnotix/package.nix
index e4ac8888ff53..739a6f5531e1 100644
--- a/pkgs/by-name/hy/hypnotix/package.nix
+++ b/pkgs/by-name/hy/hypnotix/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "hypnotix";
-    tag = version;
+    rev = version;
     hash = "sha256-mM6NeDtRoPUSQ/smtvpYJ3qqeqiPHquP96ChJgSJWL0=";
   };
 
diff --git a/pkgs/by-name/hy/hyprdim/package.nix b/pkgs/by-name/hy/hyprdim/package.nix
index 369cfb69ee3c..895d25fbfe9a 100644
--- a/pkgs/by-name/hy/hyprdim/package.nix
+++ b/pkgs/by-name/hy/hyprdim/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "donovanglover";
     repo = "hyprdim";
-    tag = version;
+    rev = version;
     hash = "sha256-o06HnN/E8QWRFOqd9Sxolm4g/fI5+6hYITptnRNAFag=";
   };
 
diff --git a/pkgs/by-name/hy/hyprkeys/package.nix b/pkgs/by-name/hy/hyprkeys/package.nix
index 87c17ddc6bb9..672f98e764c7 100644
--- a/pkgs/by-name/hy/hyprkeys/package.nix
+++ b/pkgs/by-name/hy/hyprkeys/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "Hyprkeys";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-u2NTSth9gminIEcbxgGm/2HHyzuwf/YPNQV4VzR14Kk=";
   };
 
diff --git a/pkgs/by-name/hy/hyprland-activewindow/package.nix b/pkgs/by-name/hy/hyprland-activewindow/package.nix
index 940bb3dbdf6d..cd501f14cedb 100644
--- a/pkgs/by-name/hy/hyprland-activewindow/package.nix
+++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "FieldOfClay";
     repo = "hyprland-activewindow";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oH3BsS0KqnNdYe7HWHlfRSiUJx+vC3IveN+mcEgwZLs=";
   };
 
diff --git a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
index d5fcbee70f2f..c53b6987794f 100644
--- a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
+++ b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "hyprland-autoname-workspaces";
-    tag = version;
+    rev = version;
     hash = "sha256-M/3mqO7G2E5NW2uE+X8P4UhEl0r1fPXuxyb1NowJQnY=";
   };
 
diff --git a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix
index d2e7e3383a6d..6e3c3426903b 100644
--- a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix
+++ b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "coffebar";
     repo = "hyprland-monitor-attached";
-    tag = version;
+    rev = version;
     hash = "sha256-+bgOOm1B513COcWdUIJ/+GREQH5CR8/RNOcZVkjO2hI=";
   };
 
diff --git a/pkgs/by-name/hy/hyprland-per-window-layout/package.nix b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
index 2cbde7a73c41..f4df99e3e114 100644
--- a/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
+++ b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "coffebar";
     repo = "hyprland-per-window-layout";
-    tag = version;
+    rev = version;
     hash = "sha256-Bwdh+Cy5LTRSBDfk4r28FmPRUEHYI++nKRhS9eSSbyg=";
   };
 
diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix
index 263d2a5cfbbb..7a4b12d06f41 100644
--- a/pkgs/by-name/hy/hyprland-workspaces/package.nix
+++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "FieldofClay";
     repo = "hyprland-workspaces";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-a5P99aSqhlZqClXAoaUNv/jmuM5duLDf+OzMeKGwDVI=";
   };
 
diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix
index 978af5f2962e..ac7f9b559992 100644
--- a/pkgs/by-name/hy/hyprls/package.nix
+++ b/pkgs/by-name/hy/hyprls/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "hyprls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4PtoZWESEkRaZ4HOgXLWXRPhG1+JlWuMiYZtjbbLcz4=";
   };
 
diff --git a/pkgs/by-name/hy/hyprnome/package.nix b/pkgs/by-name/hy/hyprnome/package.nix
index 21d82326c7e5..e9027f1bea35 100644
--- a/pkgs/by-name/hy/hyprnome/package.nix
+++ b/pkgs/by-name/hy/hyprnome/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "donovanglover";
     repo = "hyprnome";
-    tag = version;
+    rev = version;
     hash = "sha256-GZn7qS1J6QSanWdy17sMBbwJ77iMij2jKRgPdrjt6tM=";
   };
 
diff --git a/pkgs/by-name/hy/hyprnotify/package.nix b/pkgs/by-name/hy/hyprnotify/package.nix
index c60610a6b1d8..d89277c5cda1 100644
--- a/pkgs/by-name/hy/hyprnotify/package.nix
+++ b/pkgs/by-name/hy/hyprnotify/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "codelif";
     repo = "hyprnotify";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+vBOHXaCWEoQ/Lk9VwP55XqlhSzSS9hoVg4FQOj8dIU=";
   };
 
diff --git a/pkgs/by-name/hy/hyprshot/package.nix b/pkgs/by-name/hy/hyprshot/package.nix
index 0b4126c0a0bc..98666e17b84e 100644
--- a/pkgs/by-name/hy/hyprshot/package.nix
+++ b/pkgs/by-name/hy/hyprshot/package.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Gustash";
     repo = "hyprshot";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-9taTmV357cWglMGuN3NLq3bfNneFthwV6y+Ml4qEeHA=";
   };
 
diff --git a/pkgs/by-name/i3/i3-volume/package.nix b/pkgs/by-name/i3/i3-volume/package.nix
index c48665f1e062..b91e64e7e78d 100644
--- a/pkgs/by-name/i3/i3-volume/package.nix
+++ b/pkgs/by-name/i3/i3-volume/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hastinbe";
     repo = "i3-volume";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vmyfEXJ/5TRWIJQCblYcy8owI03F+ARNAEd0ni5ublM=";
   };
 
diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix
index 00e602024660..b43e766ee9f6 100644
--- a/pkgs/by-name/i3/i3bar-river/package.nix
+++ b/pkgs/by-name/i3/i3bar-river/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MaxVerevkin";
     repo = "i3bar-river";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0ux0woVp9HVCJf/oND2AKHj30eNC/w1WDnlPafLTgxM=";
   };
 
diff --git a/pkgs/by-name/i3/i3minator/package.nix b/pkgs/by-name/i3/i3minator/package.nix
index 1adff48ea3f9..2c56f1d521f2 100644
--- a/pkgs/by-name/i3/i3minator/package.nix
+++ b/pkgs/by-name/i3/i3minator/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "carlesso";
     repo = "i3minator";
-    tag = version;
+    rev = version;
     sha256 = "07dic5d2m0zw0psginpl43xn0mpxw7wilj49d02knz69f7c416lm";
   };
 
diff --git a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
index ab5e80023a13..9d33fa0d6440 100644
--- a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
+++ b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "flosell";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-xIhe+Mnvog+xRu1qMA7yxS1pCs91cr5EcaJroO+0zJ8=";
   };
 
diff --git a/pkgs/by-name/ia/iamy/package.nix b/pkgs/by-name/ia/iamy/package.nix
index e11c51783562..5d8e7afa92f2 100644
--- a/pkgs/by-name/ia/iamy/package.nix
+++ b/pkgs/by-name/ia/iamy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "99designs";
     repo = "iamy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oH3ijZaWXI0TdVQN9gzp5ypWzY7OqSxDh7VBoZo42Cs=";
   };
 
diff --git a/pkgs/by-name/ia/ianny/package.nix b/pkgs/by-name/ia/ianny/package.nix
index 152ed107e686..27d4899ee101 100644
--- a/pkgs/by-name/ia/ianny/package.nix
+++ b/pkgs/by-name/ia/ianny/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zefr0x";
     repo = "ianny";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-F8Uc2BsQ5f7yaUXXDhLvyyYKUDAuvP9cCR2h3vblr0g=";
   };
 
diff --git a/pkgs/by-name/ib/ibus-theme-tools/package.nix b/pkgs/by-name/ib/ibus-theme-tools/package.nix
index 2e549e180975..414f5d134c2c 100644
--- a/pkgs/by-name/ib/ibus-theme-tools/package.nix
+++ b/pkgs/by-name/ib/ibus-theme-tools/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "IBus-Theme-Tools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0i8vwnikwd1bfpv4xlgzc51gn6s18q58nqhvcdiyjzcmy3z344c2";
   };
 
diff --git a/pkgs/by-name/ic/ic-keysmith/package.nix b/pkgs/by-name/ic/ic-keysmith/package.nix
index 44433dc1922d..560e36b32e09 100644
--- a/pkgs/by-name/ic/ic-keysmith/package.nix
+++ b/pkgs/by-name/ic/ic-keysmith/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dfinity";
     repo = "keysmith";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+wYWIoPYc7qpTRS4Zlxp50Up8obZOmfQpiT0SWwVJE0=";
   };
 
diff --git a/pkgs/by-name/ic/ical2orgpy/package.nix b/pkgs/by-name/ic/ical2orgpy/package.nix
index 4402f5436340..0ca92ac24413 100644
--- a/pkgs/by-name/ic/ical2orgpy/package.nix
+++ b/pkgs/by-name/ic/ical2orgpy/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ical2org-py";
     repo = "ical2org.py";
-    tag = version;
+    rev = version;
     hash = "sha256-vBi1WYXMuDFS/PnwFQ/fqN5+gIvtylXidfZklyd6LcI=";
   };
 
diff --git a/pkgs/by-name/ic/icecream/package.nix b/pkgs/by-name/ic/icecream/package.nix
index 79d07cbb2871..719d8ddd1a7f 100644
--- a/pkgs/by-name/ic/icecream/package.nix
+++ b/pkgs/by-name/ic/icecream/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "icecc";
     repo = "icecream";
-    tag = version;
+    rev = version;
     sha256 = "sha256-nBdUbWNmTxKpkgFM3qbooNQISItt5eNKtnnzpBGVbd4=";
   };
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index cfa97638698e..397fb528ddd3 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ice-wm";
     repo = "icewm";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-4JF2ZAp8dx2fpSYRUz4I8US3oIZrSS90oljuxQDm38A=";
   };
 
diff --git a/pkgs/by-name/ic/icnsify/package.nix b/pkgs/by-name/ic/icnsify/package.nix
index 8dba40f7d274..0b8b94925133 100644
--- a/pkgs/by-name/ic/icnsify/package.nix
+++ b/pkgs/by-name/ic/icnsify/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "uncenter";
     repo = "icnsify";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-v8jwN29S6ZTt2XkPpZM+lJugbP9ClzPhqu52mdwdP00=";
   };
 
diff --git a/pkgs/by-name/ic/icoextract/package.nix b/pkgs/by-name/ic/icoextract/package.nix
index 945e828e6348..8565bff672fd 100644
--- a/pkgs/by-name/ic/icoextract/package.nix
+++ b/pkgs/by-name/ic/icoextract/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jlu5";
     repo = "icoextract";
-    tag = version;
+    rev = version;
     hash = "sha256-McVG8966NCEpzc9biawLvUgbQUtterkIud/9GwOeltI=";
   };
 
diff --git a/pkgs/by-name/ic/iconpack-jade/package.nix b/pkgs/by-name/ic/iconpack-jade/package.nix
index 4b4749afc60f..ee7090ab5fd1 100644
--- a/pkgs/by-name/ic/iconpack-jade/package.nix
+++ b/pkgs/by-name/ic/iconpack-jade/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = "iconpack-jade";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0pwz3l5i93s84iwkn1jq8a150ma96788a0n41xq2cgy00j8h8xh0";
   };
 
diff --git a/pkgs/by-name/ic/iconpack-obsidian/package.nix b/pkgs/by-name/ic/iconpack-obsidian/package.nix
index 87124d7b7883..e349b8f291c5 100644
--- a/pkgs/by-name/ic/iconpack-obsidian/package.nix
+++ b/pkgs/by-name/ic/iconpack-obsidian/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = "iconpack-obsidian";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1f32isq1xyn9b6p1nx5rssqgg9gw0jp9ld19860xk29fspmlfb8n";
   };
 
diff --git a/pkgs/by-name/ic/icr/package.nix b/pkgs/by-name/ic/icr/package.nix
index 6e058c0699de..22468e862816 100644
--- a/pkgs/by-name/ic/icr/package.nix
+++ b/pkgs/by-name/ic/icr/package.nix
@@ -19,7 +19,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "crystal-community";
     repo = "icr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-29B/i8oEjwNOYjnc78QcYTl6fC/M9VfAVCCBjLBKp0Q=";
   };
 
diff --git a/pkgs/by-name/ic/ictree/package.nix b/pkgs/by-name/ic/ictree/package.nix
index 24f24cbae4e7..674563cb39ed 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-77Wo6jN8VUGTXBuGL0a9kvSIixdyEQoxqqNsHq9jcWw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/id/id3/package.nix b/pkgs/by-name/id/id3/package.nix
index 53e0e654d0c5..e0cd063141c5 100644
--- a/pkgs/by-name/id/id3/package.nix
+++ b/pkgs/by-name/id/id3/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "squell";
     repo = "id3";
-    tag = version;
+    rev = version;
     hash = "sha256-+h1wwgTB7CpbjyUAK+9BNRhmy83D+1I+cZ70E1m3ENk=";
   };
 
diff --git a/pkgs/by-name/id/ideogram/package.nix b/pkgs/by-name/id/ideogram/package.nix
index e6b555f8cfd6..9d9c2bbff5d9 100644
--- a/pkgs/by-name/id/ideogram/package.nix
+++ b/pkgs/by-name/id/ideogram/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ideogram";
-    tag = version;
+    rev = version;
     sha256 = "1zkr7x022khn5g3sq2dkxzy1hiiz66vl81s3i5sb9qr88znh79p1";
   };
 
diff --git a/pkgs/by-name/id/idsk/package.nix b/pkgs/by-name/id/idsk/package.nix
index 1ba0d439238f..22e69135e55e 100644
--- a/pkgs/by-name/id/idsk/package.nix
+++ b/pkgs/by-name/id/idsk/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cpcsdk";
     repo = "idsk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rYClWq1Nl3COoG+eOJyFDTvBSzpHpGminU4bndZs6xc=";
   };
 
diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix
index 3de8f6e6c714..566a66f016d7 100644
--- a/pkgs/by-name/ie/ieda/package.nix
+++ b/pkgs/by-name/ie/ieda/package.nix
@@ -29,7 +29,7 @@ let
     src = fetchFromGitHub {
       owner = "google";
       repo = "glog";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-xqRp9vaauBkKz2CXbh/Z4TWqhaUtqfbsSlbYZR/kW9s=";
     };
   });
diff --git a/pkgs/by-name/if/ifrextractor-rs/package.nix b/pkgs/by-name/if/ifrextractor-rs/package.nix
index ede6cfad8f5f..cf0772806659 100644
--- a/pkgs/by-name/if/ifrextractor-rs/package.nix
+++ b/pkgs/by-name/if/ifrextractor-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LongSoft";
     repo = "ifrextractor-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zpoOThjkL2Hu/ytxdqWcr2GXzN4Cm8hph7PJhSF5BlU=";
   };
 
diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix
index 8954a7da8ac1..38bf62bf443c 100644
--- a/pkgs/by-name/ig/igir/package.nix
+++ b/pkgs/by-name/ig/igir/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "emmercm";
     repo = "igir";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NG0ZP8LOm7fZVecErTuLOfbp1yvXwHnwPkWTBzUJXWE=";
   };
 
diff --git a/pkgs/by-name/ig/igmpproxy/package.nix b/pkgs/by-name/ig/igmpproxy/package.nix
index 8b54d30bcf12..b3c6b196f617 100644
--- a/pkgs/by-name/ig/igmpproxy/package.nix
+++ b/pkgs/by-name/ig/igmpproxy/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pali";
     repo = "igmpproxy";
-    tag = version;
+    rev = version;
     sha256 = "sha256-kv8XtZ/z8zPHYSZ4k4arn2Y+L2xegr2DwhvlguJV820=";
   };
 
diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix
index 42bb0e431e6b..8f66cb6b0e99 100644
--- a/pkgs/by-name/ig/ignite-cli/package.nix
+++ b/pkgs/by-name/ig/ignite-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "cli";
     owner = "ignite";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-d7+T0VlmKQgmAJ8eyDg8JDL9HHJbU+nOTvJP0GTuIRY=";
   };
 
diff --git a/pkgs/by-name/ig/igprof/package.nix b/pkgs/by-name/ig/igprof/package.nix
index 52fe99e3905f..2b5d3cf946a0 100644
--- a/pkgs/by-name/ig/igprof/package.nix
+++ b/pkgs/by-name/ig/igprof/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "igprof";
     repo = "igprof";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw=";
   };
 
diff --git a/pkgs/by-name/ig/igraph/package.nix b/pkgs/by-name/ig/igraph/package.nix
index 274b1f6fad20..de3fc033f947 100644
--- a/pkgs/by-name/ig/igraph/package.nix
+++ b/pkgs/by-name/ig/igraph/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "igraph";
     repo = "igraph";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-TSAVRLeOWh3IQ9X0Zr4CQS+h1vTeUZnzMp/IYujGMn0=";
   };
 
diff --git a/pkgs/by-name/ih/ihp-new/package.nix b/pkgs/by-name/ih/ihp-new/package.nix
index 025c6a840856..1d2914f4af7d 100644
--- a/pkgs/by-name/ih/ihp-new/package.nix
+++ b/pkgs/by-name/ih/ihp-new/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "digitallyinduced";
     repo = "ihp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DmaIr9kF+TG24wVNPVufxC74TYMCLziLYS9hCZHBDTc=";
   };
 
diff --git a/pkgs/by-name/ii/iir1/package.nix b/pkgs/by-name/ii/iir1/package.nix
index a01e9f71ffef..a0e6ffd1bccd 100644
--- a/pkgs/by-name/ii/iir1/package.nix
+++ b/pkgs/by-name/ii/iir1/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "berndporr";
     repo = "iir1";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-8u+V3+p/nVfl1Izht27OE6D1kkA6all6aUEL9APwXmk=";
   };
 
diff --git a/pkgs/by-name/ik/ike-scan/package.nix b/pkgs/by-name/ik/ike-scan/package.nix
index 78809b62924d..754ab2afa6c5 100644
--- a/pkgs/by-name/ik/ike-scan/package.nix
+++ b/pkgs/by-name/ik/ike-scan/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "royhills";
     repo = "ike-scan";
-    tag = version;
+    rev = version;
     sha256 = "sha256-mbfg8p3y4aKoXpmLuF9GXAMPEqV5CsvetwGCRDJ9UNY=";
   };
 
diff --git a/pkgs/by-name/ik/ikill/package.nix b/pkgs/by-name/ik/ikill/package.nix
index bbaaa215ffea..5399dce37303 100644
--- a/pkgs/by-name/ik/ikill/package.nix
+++ b/pkgs/by-name/ik/ikill/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pjmp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hOQBBwxkVnTkAZJi84qArwAo54fMC0zS+IeYMV04kUs=";
   };
 
diff --git a/pkgs/by-name/il/illum/package.nix b/pkgs/by-name/il/illum/package.nix
index 3c0bacbb2fed..57e0d2568a17 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "S4lUBeRnZlRUpIxFdN/bh979xvdS7roF6/6Dk0ZUrnM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/im/image-roll/package.nix b/pkgs/by-name/im/image-roll/package.nix
index 76e557316e3d..8698289f3fef 100644
--- a/pkgs/by-name/im/image-roll/package.nix
+++ b/pkgs/by-name/im/image-roll/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "weclaw1";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-CC40TU38bJFnbJl2EHqeB9RBvbVUrBmRdZVS2GxqGu4=";
   };
 
diff --git a/pkgs/by-name/im/imagelol/package.nix b/pkgs/by-name/im/imagelol/package.nix
index 96db303444ab..fadf9b716226 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0978zdrfj41jsqm78afyyd1l64iki9nwjvhd8ynii1b553nn4dmd";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/im/imageworsener/package.nix b/pkgs/by-name/im/imageworsener/package.nix
index 9146b5e5246f..7c108002c217 100644
--- a/pkgs/by-name/im/imageworsener/package.nix
+++ b/pkgs/by-name/im/imageworsener/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jsummers";
     repo = "imageworsener";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-1f5x8Ph994Kkjo38NudXL+UF0fpR8BmZfaGPxc8RENU=";
   };
 
diff --git a/pkgs/by-name/im/imaginary/package.nix b/pkgs/by-name/im/imaginary/package.nix
index 57f29436bca5..dfe07024292e 100644
--- a/pkgs/by-name/im/imaginary/package.nix
+++ b/pkgs/by-name/im/imaginary/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "h2non";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oEkFoZMaNNJPMisqpIneeLK/sA23gaTWJ4nqtDHkrwA=";
   };
 
diff --git a/pkgs/by-name/im/imaginer/package.nix b/pkgs/by-name/im/imaginer/package.nix
index 8eaef667c92c..598d6fb2b93c 100644
--- a/pkgs/by-name/im/imaginer/package.nix
+++ b/pkgs/by-name/im/imaginer/package.nix
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ImaginerApp";
     repo = "Imaginer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-x1ZnmfaMfxnITiuFDlMPfTU8KZbd1ME9jDevnlsrbJs=";
   };
 
diff --git a/pkgs/by-name/im/imath/package.nix b/pkgs/by-name/im/imath/package.nix
index 06e0cfc5bcba..9a3ddc0a1a5b 100644
--- a/pkgs/by-name/im/imath/package.nix
+++ b/pkgs/by-name/im/imath/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "imath";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-r4FNyNsWdmpZrHOpSvaSUWRYhAU+qnW4lE5uYPKn7Mw=";
   };
 
diff --git a/pkgs/by-name/im/img-cat/package.nix b/pkgs/by-name/im/img-cat/package.nix
index e43c835b3baa..ef8493e75740 100644
--- a/pkgs/by-name/im/img-cat/package.nix
+++ b/pkgs/by-name/im/img-cat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trashhalo";
     repo = "imgcat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L2Yvp+UR6q45ctKsi0v45lKkSE7eJsUPvG7lpX8M6nQ=";
   };
 
diff --git a/pkgs/by-name/im/img/package.nix b/pkgs/by-name/im/img/package.nix
index d6211b72a267..71fd68fb0fae 100644
--- a/pkgs/by-name/im/img/package.nix
+++ b/pkgs/by-name/im/img/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "genuinetools";
     repo = "img";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0r5hihzp2679ki9hr3p0f085rafy2hc8kpkdhnd4m5k4iibqib08";
   };
 
diff --git a/pkgs/by-name/im/imgcat/package.nix b/pkgs/by-name/im/imgcat/package.nix
index 68f798f67501..aaaa5b0bc065 100644
--- a/pkgs/by-name/im/imgcat/package.nix
+++ b/pkgs/by-name/im/imgcat/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eddieantonio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-miFjlahTI0GDpgsjnA/K1R4R5654M8AoK78CycoLTqA=";
   };
 
diff --git a/pkgs/by-name/im/imgcrypt/package.nix b/pkgs/by-name/im/imgcrypt/package.nix
index 0faeb995e93a..6b30c5b5d2b4 100644
--- a/pkgs/by-name/im/imgcrypt/package.nix
+++ b/pkgs/by-name/im/imgcrypt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containerd";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-81jfoWHYYenGQFcQI9kk8uPnv6FcyOtcJjpo1ykdtOI=";
   };
 
diff --git a/pkgs/by-name/im/imgpatchtools/package.nix b/pkgs/by-name/im/imgpatchtools/package.nix
index 2739b0bb51e2..ddb57ba74c8f 100644
--- a/pkgs/by-name/im/imgpatchtools/package.nix
+++ b/pkgs/by-name/im/imgpatchtools/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "erfanoabdi";
     repo = "imgpatchtools";
-    tag = version;
+    rev = version;
     sha256 = "sha256-7TOkqaXPui14VcSmMmYJ1Wg+s85wrgp+E0XcCB0Ml7M=";
   };
 
diff --git a/pkgs/by-name/im/imgpkg/package.nix b/pkgs/by-name/im/imgpkg/package.nix
index 9f2607f71aa1..b6286b1fbc51 100644
--- a/pkgs/by-name/im/imgpkg/package.nix
+++ b/pkgs/by-name/im/imgpkg/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "imgpkg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DuLxNH0fcVPvZYG4AYtaT8kJysTLRNX2tB6UBhQoP9Q=";
   };
 
diff --git a/pkgs/by-name/im/imgproxy/package.nix b/pkgs/by-name/im/imgproxy/package.nix
index 31e6951b78ba..77375d6c3725 100644
--- a/pkgs/by-name/im/imgproxy/package.nix
+++ b/pkgs/by-name/im/imgproxy/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
     owner = pname;
     repo = pname;
     hash = "sha256-aI+rWXt+tioHFGBJk/RkYeo7JaV+10jurx7YKX448Yk=";
-    tag = "v${version}";
+    rev = "v${version}";
   };
 
   vendorHash = "sha256-L18vxiFXBlKeipMm1N/c+F+zHDQYN5CHjYwa4xi9I3s=";
diff --git a/pkgs/by-name/im/imgur-screenshot/package.nix b/pkgs/by-name/im/imgur-screenshot/package.nix
index 496551f5ab5b..c9d29bfe92c6 100644
--- a/pkgs/by-name/im/imgur-screenshot/package.nix
+++ b/pkgs/by-name/im/imgur-screenshot/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jomo";
     repo = "imgur-screenshot";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0fkhvfraijbrw806pgij41bn1hc3r7l7l3snkicmshxj83lmsd5k";
   };
 
diff --git a/pkgs/by-name/im/imgurbash2/package.nix b/pkgs/by-name/im/imgurbash2/package.nix
index 49ef9a5e6de8..10bb01e7690f 100644
--- a/pkgs/by-name/im/imgurbash2/package.nix
+++ b/pkgs/by-name/im/imgurbash2/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ram-on";
     repo = "imgurbash2";
-    tag = version;
+    rev = version;
     sha256 = "sha256-7J3LquzcYX0wBR6kshz7VuPv/TftTzKFdWcgsML2DnI=";
   };
 
diff --git a/pkgs/by-name/im/immudb/package.nix b/pkgs/by-name/im/immudb/package.nix
index 130c462ba3f3..7bf5429977ef 100644
--- a/pkgs/by-name/im/immudb/package.nix
+++ b/pkgs/by-name/im/immudb/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "codenotary";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sQLxHHaKdqocjJVXuuuQqx+BNubl6bjVcp50r4kPQEs=";
   };
 
diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix
index 29394c8f4a3f..e18039349a03 100644
--- a/pkgs/by-name/im/impala/package.nix
+++ b/pkgs/by-name/im/impala/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pythops";
     repo = "impala";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NPNzvqnuYXrHCOLN0kZwtzPiKVdl6UFnb/S/XtG+sEY=";
   };
 
diff --git a/pkgs/by-name/im/impl/package.nix b/pkgs/by-name/im/impl/package.nix
index 1692246f975a..3f08de58dd9a 100644
--- a/pkgs/by-name/im/impl/package.nix
+++ b/pkgs/by-name/im/impl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "josharian";
     repo = "impl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0TSyg7YEPur+h0tkDxI3twr2PzT7tmo3shKgmSSJ6qk=";
   };
 
diff --git a/pkgs/by-name/im/implot/package.nix b/pkgs/by-name/im/implot/package.nix
index fe75d96e6c5c..541e85c73f58 100644
--- a/pkgs/by-name/im/implot/package.nix
+++ b/pkgs/by-name/im/implot/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "epezent";
     repo = "implot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/wkVsgz3wiUVZBCgRl2iDD6GWb+AoHN+u0aeqHHgem0=";
   };
 
diff --git a/pkgs/by-name/im/imtui/package.nix b/pkgs/by-name/im/imtui/package.nix
index 3ada44d24b05..4bb5187ab518 100644
--- a/pkgs/by-name/im/imtui/package.nix
+++ b/pkgs/by-name/im/imtui/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ggerganov";
     repo = "imtui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eHQPDEfxKGLdiOi0lUUgqJcmme1XJLSPAafT223YK+U=";
   };
 
diff --git a/pkgs/by-name/in/inadyn/package.nix b/pkgs/by-name/in/inadyn/package.nix
index e7ac6084151c..09963d89646e 100644
--- a/pkgs/by-name/in/inadyn/package.nix
+++ b/pkgs/by-name/in/inadyn/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "inadyn";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-aQHJtnMDaHF1XY9lwQVR6f78Zk2UI7OC3Oxt1r1KMak=";
   };
 
diff --git a/pkgs/by-name/in/infamousPlugins/package.nix b/pkgs/by-name/in/infamousPlugins/package.nix
index e2322b5b1f89..29df008ab9da 100644
--- a/pkgs/by-name/in/infamousPlugins/package.nix
+++ b/pkgs/by-name/in/infamousPlugins/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ssj71";
     repo = "infamousPlugins";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-AhW4hLmCxz7yHMdxM6kOvtCXk1jEg/XtyPgt4yk1xqs=";
   };
 
diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix
index 2161a1d27dab..27bc9f6a4419 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NDxgWHTMyntNtUb/+7bvrR64PNRPcovQd/IIgcLo5JQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/in/inflow/package.nix b/pkgs/by-name/in/inflow/package.nix
index e734b15c46e3..32416963105d 100644
--- a/pkgs/by-name/in/inflow/package.nix
+++ b/pkgs/by-name/in/inflow/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stephen-huan";
     repo = "inflow";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xKUqkrPwITai8g6U1NiNieAip/AzISgFfFtvR30hLNk=";
   };
 
diff --git a/pkgs/by-name/in/infra-arcana/package.nix b/pkgs/by-name/in/infra-arcana/package.nix
index a139d0f73ae3..bbe5e0f262b9 100644
--- a/pkgs/by-name/in/infra-arcana/package.nix
+++ b/pkgs/by-name/in/infra-arcana/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "martin-tornqvist";
     repo = "ia";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MI+wH0+1f41JYXT2hzDs3RrrR3eTfOzgtCa5T6m8oQc=";
   };
 
diff --git a/pkgs/by-name/in/infra/package.nix b/pkgs/by-name/in/infra/package.nix
index 11bd0f3ff7eb..e42727704b2d 100644
--- a/pkgs/by-name/in/infra/package.nix
+++ b/pkgs/by-name/in/infra/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "infrahq";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-uz4wimhOfeHSL949m+biIhjfDwwEGnTiJWaz/r3Rsko=";
   };
 
diff --git a/pkgs/by-name/in/infracost/package.nix b/pkgs/by-name/in/infracost/package.nix
index 5504c5fa90aa..ab848711f600 100644
--- a/pkgs/by-name/in/infracost/package.nix
+++ b/pkgs/by-name/in/infracost/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "infracost";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "infracost";
     sha256 = "sha256-cnZ7ASYm1IhlqskWMEWzaAG6XKEex7P3akjmYUjHSzc=";
   };
diff --git a/pkgs/by-name/in/inframap/package.nix b/pkgs/by-name/in/inframap/package.nix
index a725f96ec49f..ddfe0ce63dcd 100644
--- a/pkgs/by-name/in/inframap/package.nix
+++ b/pkgs/by-name/in/inframap/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cycloidio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jV9mMJNSsRWdbvHr7OvF1cF2KVqxUEjlM9AaVMxNqBI=";
   };
 
diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix
index 57455c3be283..426a1a79e0e4 100644
--- a/pkgs/by-name/in/infrastructure-agent/package.nix
+++ b/pkgs/by-name/in/infrastructure-agent/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "newrelic";
     repo = "infrastructure-agent";
-    tag = version;
+    rev = version;
     hash = "sha256-odB40XRZyFuHX82RzxIvW3SAwglOyYRiApWUfRhOEmk=";
   };
 
diff --git a/pkgs/by-name/in/ingress2gateway/package.nix b/pkgs/by-name/in/ingress2gateway/package.nix
index 620efa509772..33ac44c47dc3 100644
--- a/pkgs/by-name/in/ingress2gateway/package.nix
+++ b/pkgs/by-name/in/ingress2gateway/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0w2ZM1g2rr46bN8BNgrkmb3tOQw0FZTMLp/koW01c5I=";
   };
 
diff --git a/pkgs/by-name/in/inhibridge/package.nix b/pkgs/by-name/in/inhibridge/package.nix
index 097dd15a32a5..bc38f63fa349 100644
--- a/pkgs/by-name/in/inhibridge/package.nix
+++ b/pkgs/by-name/in/inhibridge/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "Scrumplex";
     repo = "inhibridge";
-    tag = version;
+    rev = version;
     hash = "sha256-cKVw3Gd4Ml8BeXjZqTN6ToeRzO9PI+Sn45gpltlRuWM=";
   };
 
diff --git a/pkgs/by-name/in/initool/package.nix b/pkgs/by-name/in/initool/package.nix
index b455f199d0ed..12c7a2409453 100644
--- a/pkgs/by-name/in/initool/package.nix
+++ b/pkgs/by-name/in/initool/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dbohdan";
     repo = "initool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PROsyYw8xdnn0PX+3OyUPaybQbTmO88G2koeZhBfwjg=";
   };
 
diff --git a/pkgs/by-name/in/inklecate/package.nix b/pkgs/by-name/in/inklecate/package.nix
index b7a0402e661e..3c635a6060c1 100644
--- a/pkgs/by-name/in/inklecate/package.nix
+++ b/pkgs/by-name/in/inklecate/package.nix
@@ -13,7 +13,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "inkle";
     repo = "ink";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
   };
 
diff --git a/pkgs/by-name/in/inotify-tools/package.nix b/pkgs/by-name/in/inotify-tools/package.nix
index 9e8eed5a0c27..10c48bffe7c0 100644
--- a/pkgs/by-name/in/inotify-tools/package.nix
+++ b/pkgs/by-name/in/inotify-tools/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     repo = "inotify-tools";
     owner = "inotify-tools";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-6kM2JzxRcwUjUmbUWGnQ+gAvZcn7C32/enRwiYiuQGU=";
   };
 
diff --git a/pkgs/by-name/in/inputmodule-control/package.nix b/pkgs/by-name/in/inputmodule-control/package.nix
index 6c135f5f673b..0133a868ad8b 100644
--- a/pkgs/by-name/in/inputmodule-control/package.nix
+++ b/pkgs/by-name/in/inputmodule-control/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "FrameworkComputer";
     repo = "inputmodule-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5sqTkaGqmKDDH7byDZ84rzB3FTu9AKsWxA6EIvUrLCU=";
   };
 
diff --git a/pkgs/by-name/in/inriafonts/package.nix b/pkgs/by-name/in/inriafonts/package.nix
index 251b1a217d3a..4504c41967b6 100644
--- a/pkgs/by-name/in/inriafonts/package.nix
+++ b/pkgs/by-name/in/inriafonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BlackFoundry";
     repo = "InriaFonts";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CMKkwGuUEVYavnFi15FCk7Xloyk97w+LhAZ6mpIv5xg=";
   };
 
diff --git a/pkgs/by-name/in/inspector/package.nix b/pkgs/by-name/in/inspector/package.nix
index f0e21059c9bf..c9d0957f7225 100644
--- a/pkgs/by-name/in/inspector/package.nix
+++ b/pkgs/by-name/in/inspector/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Nokse22";
     repo = "inspector";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tjQCF2Tyv7/NWgrwHu+JPpnLECfDmQS77EVLBt+cRTs=";
   };
 
diff --git a/pkgs/by-name/in/inspectrum/package.nix b/pkgs/by-name/in/inspectrum/package.nix
index 01fa9475825f..06647204ef6e 100644
--- a/pkgs/by-name/in/inspectrum/package.nix
+++ b/pkgs/by-name/in/inspectrum/package.nix
@@ -17,7 +17,7 @@ gnuradioMinimal.pkgs.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "miek";
     repo = "inspectrum";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yY2W2hQpj8TIxiQBSbQHq0J16n74OfIwMDxFt3mLZYc=";
   };
 
diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index 8f3ca7786e98..1d2d2fc87ed8 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -156,7 +156,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "inspircd";
     repo = "inspircd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Aulhg2CbtcpsxkH5kXkp4EoZF5/F9pOXJc1S08S5P08=";
   };
 
diff --git a/pkgs/by-name/in/insulator2/package.nix b/pkgs/by-name/in/insulator2/package.nix
index efcde6bbb4a5..9e5d2c2eac0f 100644
--- a/pkgs/by-name/in/insulator2/package.nix
+++ b/pkgs/by-name/in/insulator2/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrewinci";
     repo = "insulator2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-34JRIB7/x7miReWOxR/m+atjfUiE3XGyh9OBSbMg3m4=";
   };
 
diff --git a/pkgs/by-name/in/integresql/package.nix b/pkgs/by-name/in/integresql/package.nix
index f5a2524d56ba..da724b573cdd 100644
--- a/pkgs/by-name/in/integresql/package.nix
+++ b/pkgs/by-name/in/integresql/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "allaboutapps";
     repo = "integresql";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-heRa1H4ZSCZzSMCejhakBpJfnEnGQLmNFERKqMxbC04=";
   };
 
diff --git a/pkgs/by-name/in/intel-cmt-cat/package.nix b/pkgs/by-name/in/intel-cmt-cat/package.nix
index d690840a5dc5..0b356aa6d4c7 100644
--- a/pkgs/by-name/in/intel-cmt-cat/package.nix
+++ b/pkgs/by-name/in/intel-cmt-cat/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "intel-cmt-cat";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-e4sbQNpUCZaZDhLLRVDXHXsEelZaZIdc8n3ksUnAkKQ=";
   };
 
diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
index dccc3a7bfc94..a4640733e400 100644
--- a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
-    tag = version;
+    rev = version;
     hash = "sha256-POImMopbrhVXuSx2MQ9mwPNKQx7BljyikKhu6M4hZME=";
   };
 
diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix
index 5b5fd02569c7..e2fec783cb76 100644
--- a/pkgs/by-name/in/intelli-shell/package.nix
+++ b/pkgs/by-name/in/intelli-shell/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lasantosr";
     repo = "intelli-shell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-D7hB1vKi54L7hU3TqTvzxXIr6XohfYLUTidR6wFJmfo=";
   };
 
diff --git a/pkgs/by-name/in/interlock/package.nix b/pkgs/by-name/in/interlock/package.nix
index 4433785d8b43..be844503163c 100644
--- a/pkgs/by-name/in/interlock/package.nix
+++ b/pkgs/by-name/in/interlock/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "usbarmory";
     repo = "interlock";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YXa4vErt3YnomTKAXCv8yUVhcc0ST47n9waW5E8QZzY=";
   };
 
diff --git a/pkgs/by-name/in/intermodal/package.nix b/pkgs/by-name/in/intermodal/package.nix
index 82caf01cf318..6bea24f23585 100644
--- a/pkgs/by-name/in/intermodal/package.nix
+++ b/pkgs/by-name/in/intermodal/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "casey";
     repo = "intermodal";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N3TumAwHcHDuVyY4t6FPNOO28D7xX5jheCTodfn71/Q=";
   };
 
diff --git a/pkgs/by-name/in/invoice/package.nix b/pkgs/by-name/in/invoice/package.nix
index d51363530ead..fa1851636dc1 100644
--- a/pkgs/by-name/in/invoice/package.nix
+++ b/pkgs/by-name/in/invoice/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maaslalani";
     repo = "invoice";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WtQ4nF31uIoplY18GZNs41ZOCxmbIu71YpEGk8aTGww=";
   };
 
diff --git a/pkgs/by-name/in/invoice2data/package.nix b/pkgs/by-name/in/invoice2data/package.nix
index 41eb3220416d..e6871a503bba 100644
--- a/pkgs/by-name/in/invoice2data/package.nix
+++ b/pkgs/by-name/in/invoice2data/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "invoice-x";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pAvkp8xkHYi/7ymbxaT7/Jhu44j2P8emm8GyXC6IBnI=";
   };
 
diff --git a/pkgs/by-name/in/inxi/package.nix b/pkgs/by-name/in/inxi/package.nix
index fe79a99b5680..72ac2b9aaa72 100644
--- a/pkgs/by-name/in/inxi/package.nix
+++ b/pkgs/by-name/in/inxi/package.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "smxi";
     repo = "inxi";
-    tag = version;
+    rev = version;
     hash = "sha256-LyIKjXdfE2sK81zFpXPneaFyfKqa4tU4GfXtt89TZOg=";
   };
 
diff --git a/pkgs/by-name/io/ioccheck/package.nix b/pkgs/by-name/io/ioccheck/package.nix
index 5bac36b6d306..1cc7b79667ce 100644
--- a/pkgs/by-name/io/ioccheck/package.nix
+++ b/pkgs/by-name/io/ioccheck/package.nix
@@ -14,7 +14,7 @@ let
         src = fetchFromGitHub {
           owner = "carpedm20";
           repo = "emoji";
-          tag = "v${version}";
+          rev = "v${version}";
           hash = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I=";
         };
       };
@@ -27,7 +27,7 @@ let
         src = fetchFromGitHub {
           owner = "tweepy";
           repo = "tweepy";
-          tag = "v${version}";
+          rev = "v${version}";
           hash = "sha256-3BbQeCaAhlz9h5GnhficNubJHu4kTpnCDM4oKzlti0w=";
         };
         doCheck = false;
diff --git a/pkgs/by-name/io/ioping/package.nix b/pkgs/by-name/io/ioping/package.nix
index fa13dd304ff7..a228153ae4ef 100644
--- a/pkgs/by-name/io/ioping/package.nix
+++ b/pkgs/by-name/io/ioping/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "koct9i";
     repo = "ioping";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "10bv36bqga8sdifxzywzzpjil7vmy62psirz7jbvlsq1bw71aiid";
   };
 
diff --git a/pkgs/by-name/io/ior/package.nix b/pkgs/by-name/io/ior/package.nix
index b00255cd6226..d0c018ebdcaf 100644
--- a/pkgs/by-name/io/ior/package.nix
+++ b/pkgs/by-name/io/ior/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hpc";
     repo = "ior";
-    tag = version;
+    rev = version;
     sha256 = "sha256-pSjptDfiPlaToXe1yHyk9MQMC9PqcVSjqAmWLD11iOM=";
   };
 
diff --git a/pkgs/by-name/io/ios-deploy/package.nix b/pkgs/by-name/io/ios-deploy/package.nix
index d4cc4162bda8..21b6fc5b4f9c 100644
--- a/pkgs/by-name/io/ios-deploy/package.nix
+++ b/pkgs/by-name/io/ios-deploy/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ios-control";
     repo = "ios-deploy";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-TVGC+f+1ow3b93CK3PhIL70le5SZxxb2ug5OkIg8XCA=";
   };
 
diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 5b73abb84aab..006137bbc3db 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -61,7 +61,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Yosl6dqbYLsX1whkSazHHlbZ4zhJ5jSZmrdi22BLBJM=";
   };
 
diff --git a/pkgs/by-name/io/iotop-c/package.nix b/pkgs/by-name/io/iotop-c/package.nix
index cafc1019cd24..4cd9f5a47049 100644
--- a/pkgs/by-name/io/iotop-c/package.nix
+++ b/pkgs/by-name/io/iotop-c/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Tomas-M";
     repo = "iotop";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-o8OJnZjrDbzzhwfzRWmyCmhBWxMVKRDeDWWBCXy3C90=";
   };
 
diff --git a/pkgs/by-name/io/ioztat/package.nix b/pkgs/by-name/io/ioztat/package.nix
index e1c87bfcfd65..7d1b1dd4a623 100644
--- a/pkgs/by-name/io/ioztat/package.nix
+++ b/pkgs/by-name/io/ioztat/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jimsalterjrs";
     repo = "ioztat";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8svMijgVxSuquPFO2Q2HeqGLdMkwhiujS1DSxC/LRRk=";
   };
 
diff --git a/pkgs/by-name/ip/ip2location-c/package.nix b/pkgs/by-name/ip/ip2location-c/package.nix
index 0d9f0ba3b618..929e5772b572 100644
--- a/pkgs/by-name/ip/ip2location-c/package.nix
+++ b/pkgs/by-name/ip/ip2location-c/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chrislim2888";
     repo = "IP2Location-C-Library";
-    tag = version;
+    rev = version;
     sha256 = "sha256-3/cLoGV7go4S1ew73IJzJEMTlLnvM3adl+/Sb7mPrZY=";
   };
 
diff --git a/pkgs/by-name/ip/ip2unix/package.nix b/pkgs/by-name/ip/ip2unix/package.nix
index e6588c57b5b0..c134eedcdeda 100644
--- a/pkgs/by-name/ip/ip2unix/package.nix
+++ b/pkgs/by-name/ip/ip2unix/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nixcloud";
     repo = "ip2unix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+p5wQbX35LAjZ4vIE4AhI4M6gQ7gVviqf9jJDAr9xg8";
   };
 
diff --git a/pkgs/by-name/ip/ipatool/package.nix b/pkgs/by-name/ip/ipatool/package.nix
index 369f49d4cb5b..91610e91f4e3 100644
--- a/pkgs/by-name/ip/ipatool/package.nix
+++ b/pkgs/by-name/ip/ipatool/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "majd";
     repo = "ipatool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NdxYrTy8SzPmy3C9wOQYMdzKKumDMeYe+k8Nu2ku/RY=";
   };
 
diff --git a/pkgs/by-name/ip/iperf3d/package.nix b/pkgs/by-name/ip/iperf3d/package.nix
index 832d3fa11546..326d9d19dc7e 100644
--- a/pkgs/by-name/ip/iperf3d/package.nix
+++ b/pkgs/by-name/ip/iperf3d/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wobcom";
     repo = "iperf3d";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pMwGoBgFRVY+H51k+YCamzHgBoaJVwEVqY0CvMPvE0w=";
   };
 
diff --git a/pkgs/by-name/ip/ipfs-cluster/package.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix
index 1ce4ea5d705d..813f40030fa4 100644
--- a/pkgs/by-name/ip/ipfs-cluster/package.nix
+++ b/pkgs/by-name/ip/ipfs-cluster/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ipfs-cluster";
     repo = "ipfs-cluster";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CpMnhqRlikKdPT3/tsLpKdKm6icePDsmqEnUEBwvCT0=";
   };
 
diff --git a/pkgs/by-name/ip/ipfs-upload-client/package.nix b/pkgs/by-name/ip/ipfs-upload-client/package.nix
index 171781a389cd..cde82f861487 100644
--- a/pkgs/by-name/ip/ipfs-upload-client/package.nix
+++ b/pkgs/by-name/ip/ipfs-upload-client/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "infura";
     repo = "ipfs-upload-client";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BT/LC+PKzAjxM7P2Iis28OlJmrZRbCwfd6kPEL3oaaI=";
   };
 
diff --git a/pkgs/by-name/ip/ipget/package.nix b/pkgs/by-name/ip/ipget/package.nix
index fd640012eba1..93af9fef9526 100644
--- a/pkgs/by-name/ip/ipget/package.nix
+++ b/pkgs/by-name/ip/ipget/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "ipget";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0dly7XbTNGyfvZd6wYn7Nz3CVRGaZvc4LIuHvX5Asbg=";
   };
 
diff --git a/pkgs/by-name/ip/ipgrep/package.nix b/pkgs/by-name/ip/ipgrep/package.nix
index 7cbde6aa1639..42e8a9305614 100644
--- a/pkgs/by-name/ip/ipgrep/package.nix
+++ b/pkgs/by-name/ip/ipgrep/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-NrhcUFQM+L66KaDRRpAoC+z5s54a+1fqEepTRXVZ5Qs=";
   };
 
diff --git a/pkgs/by-name/ip/iplan/package.nix b/pkgs/by-name/ip/iplan/package.nix
index 820035626462..9bce3b9683bc 100644
--- a/pkgs/by-name/ip/iplan/package.nix
+++ b/pkgs/by-name/ip/iplan/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iman-salmani";
     repo = "iplan";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BIoxaE8c3HmvPjgj4wcZK9YFTZ0wr9338AIdYEoAiqs=";
   };
 
diff --git a/pkgs/by-name/ip/ipp-usb/package.nix b/pkgs/by-name/ip/ipp-usb/package.nix
index 2ef20ce673e8..76fa581d83d0 100644
--- a/pkgs/by-name/ip/ipp-usb/package.nix
+++ b/pkgs/by-name/ip/ipp-usb/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openprinting";
     repo = "ipp-usb";
-    tag = version;
+    rev = version;
     sha256 = "sha256-LcThjiN/MRk4ISWWRT4g/eLvuhzM8pIDAcSlM5us3nQ=";
   };
 
diff --git a/pkgs/by-name/ip/iptraf-ng/package.nix b/pkgs/by-name/ip/iptraf-ng/package.nix
index 1ff9e8d5fcef..6a60973477b2 100644
--- a/pkgs/by-name/ip/iptraf-ng/package.nix
+++ b/pkgs/by-name/ip/iptraf-ng/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iptraf-ng";
     repo = "iptraf-ng";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-SM1cJYNnZlGl3eWaYd8DlPrV4AL9nck1tjdOn0CHVUw=";
   };
 
diff --git a/pkgs/by-name/ip/ipv6calc/package.nix b/pkgs/by-name/ip/ipv6calc/package.nix
index 742a48a50d3e..53059e5567be 100644
--- a/pkgs/by-name/ip/ipv6calc/package.nix
+++ b/pkgs/by-name/ip/ipv6calc/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pbiering";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-ObJn7T7dGp6HjICWHWAbJjgHM08FrJx31AxIMmIexuQ=";
   };
 
diff --git a/pkgs/by-name/iq/iqtree/package.nix b/pkgs/by-name/iq/iqtree/package.nix
index 39db76a94519..67fb7b145025 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8d5zqZIevv3bnq7z7Iyo/x8i445y1RAFtRMeK8s/ieQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ir/ir-standard-fonts/package.nix b/pkgs/by-name/ir/ir-standard-fonts/package.nix
index 7fb0ebac1900..7bb101e09bf8 100644
--- a/pkgs/by-name/ir/ir-standard-fonts/package.nix
+++ b/pkgs/by-name/ir/ir-standard-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "molaeiali";
     repo = "ir-standard-fonts";
-    tag = version;
+    rev = version;
     hash = "sha256-o1d8SBX3nf7g6Gh4OP+JRS+LNrHTQOIiHhW3VNCkDV0=";
   };
 
diff --git a/pkgs/by-name/ir/irccat/package.nix b/pkgs/by-name/ir/irccat/package.nix
index 77284e46904c..e1851f473d18 100644
--- a/pkgs/by-name/ir/irccat/package.nix
+++ b/pkgs/by-name/ir/irccat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "irccloud";
     repo = "irccat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts=";
   };
 
diff --git a/pkgs/by-name/ir/iredis/package.nix b/pkgs/by-name/ir/iredis/package.nix
index a4b3e7c8d25e..ee9636a700e1 100644
--- a/pkgs/by-name/ir/iredis/package.nix
+++ b/pkgs/by-name/ir/iredis/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "laixintao";
     repo = "iredis";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wfjr/FVmKgkP8FMKxw6e8U+lfZQZ2q52REC0mU8Xp7Q=";
   };
 
diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix
index f9af82b0434d..e230987a0e9e 100644
--- a/pkgs/by-name/ir/iroh/package.nix
+++ b/pkgs/by-name/ir/iroh/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "iroh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uavWluu7rVY2lZXDRsKApcZMB7TJsGuhJzieZPMXdvE=";
   };
 
diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix
index 74310b62985a..076c44fcb4f1 100644
--- a/pkgs/by-name/ir/ironbar/package.nix
+++ b/pkgs/by-name/ir/ironbar/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = "ironbar";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UtBO1XaghmzKv9qfhfoLi4ke+mf+Mtgh4f4UpCeEVDg=";
   };
 
diff --git a/pkgs/by-name/ir/irqbalance/package.nix b/pkgs/by-name/ir/irqbalance/package.nix
index 9e6992a368d7..3b62b7f45950 100644
--- a/pkgs/by-name/ir/irqbalance/package.nix
+++ b/pkgs/by-name/ir/irqbalance/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "irqbalance";
     repo = "irqbalance";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7es7wwsPnDSF37uL5SCgAQB+u+qGWmWDHOh3JkHuXMs=";
   };
 
diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix
index 06a275186832..06d70daee3cc 100644
--- a/pkgs/by-name/ir/irrd/package.nix
+++ b/pkgs/by-name/ir/irrd/package.nix
@@ -58,7 +58,7 @@ py.pkgs.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "irrdnet";
     repo = "irrd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UIOKXU92JEOeVdpYLNmDBtLn0u3LMdKItcn9bFd9u8g=";
   };
 
diff --git a/pkgs/by-name/ir/irssi/package.nix b/pkgs/by-name/ir/irssi/package.nix
index 9fbeb937e44c..4c4a1ccb04df 100644
--- a/pkgs/by-name/ir/irssi/package.nix
+++ b/pkgs/by-name/ir/irssi/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "irssi";
     repo = "irssi";
-    tag = version;
+    rev = version;
     hash = "sha256-D+KMjkweStMqVhoQoiJPFt/G0vdf7x2FjYCvqGS8UqY=";
   };
 
diff --git a/pkgs/by-name/is/isolate/package.nix b/pkgs/by-name/is/isolate/package.nix
index b256f86ff334..18eef4c57a74 100644
--- a/pkgs/by-name/is/isolate/package.nix
+++ b/pkgs/by-name/is/isolate/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ioi";
     repo = "isolate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kKXkXPVB9ojyIERvEdkHkXC//Agin8FPcpTBmTxh/ZE=";
   };
 
diff --git a/pkgs/by-name/is/isomd5sum/package.nix b/pkgs/by-name/is/isomd5sum/package.nix
index ecb58ef55a38..78d6a34b7c81 100644
--- a/pkgs/by-name/is/isomd5sum/package.nix
+++ b/pkgs/by-name/is/isomd5sum/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rhinstaller";
     repo = "isomd5sum";
-    tag = version;
+    rev = version;
     sha256 = "sha256-c/4CQtAzatfG1Z3SfyB2OZmfJRMnyrZZTqSApsK7R+Q=";
   };
 
diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix
index 963b7848311e..cdfdeb0a6bc6 100644
--- a/pkgs/by-name/is/ispc/package.nix
+++ b/pkgs/by-name/is/ispc/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-T8tFJaHkb6XpKA2s9tlNfJE7n0YJx30KTBIng+dmQ2c=";
   };
 
diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix
index c525b31a1d9b..1a4b2f80e207 100644
--- a/pkgs/by-name/is/istioctl/package.nix
+++ b/pkgs/by-name/is/istioctl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
-    tag = version;
+    rev = version;
     hash = "sha256-DAr7JHZsop1+BuPKC5mD+9pL4JFEp6jjjeSvX+I9uH0=";
   };
   vendorHash = "sha256-dhAJEjKq1wfti2j2xt3NoQUoVRgowIKJhUfJxsFG5yw=";
diff --git a/pkgs/by-name/it/it-tools/package.nix b/pkgs/by-name/it/it-tools/package.nix
index 039fa3130343..75bba8012aaa 100644
--- a/pkgs/by-name/it/it-tools/package.nix
+++ b/pkgs/by-name/it/it-tools/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CorentinTh";
     repo = "it-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SQAZv+9tINRH10lewcuv8G2qwfulLOP8sGjX47LxeUk=";
   };
 
diff --git a/pkgs/by-name/it/itch/package.nix b/pkgs/by-name/it/itch/package.nix
index d6235fbb52fe..5ce46f34f1d8 100644
--- a/pkgs/by-name/it/itch/package.nix
+++ b/pkgs/by-name/it/itch/package.nix
@@ -25,7 +25,7 @@ let
     fetchFromGitHub {
       owner = "itchio";
       repo = "itch";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-jugg+hdP0y0OkFhdQuEI9neWDuNf2p3+DQuwxe09Zck=";
       sparseCheckout = [ sparseCheckout ];
     }
diff --git a/pkgs/by-name/it/itchiodl/package.nix b/pkgs/by-name/it/itchiodl/package.nix
index b538c3366a92..a5e1e3e1f055 100644
--- a/pkgs/by-name/it/itchiodl/package.nix
+++ b/pkgs/by-name/it/itchiodl/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Emersont1";
     repo = "itchio";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XuNkqTAT9LlSwruchGQbombAKHZvKhpnqLfvJdDcrj0=";
   };
 
diff --git a/pkgs/by-name/it/ite-backlight/package.nix b/pkgs/by-name/it/ite-backlight/package.nix
index d4349ab09e57..6e4a73d35521 100644
--- a/pkgs/by-name/it/ite-backlight/package.nix
+++ b/pkgs/by-name/it/ite-backlight/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hexagonal-sun";
     repo = "ite-backlight";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1hany4bn93mac9qyz97r1l858d48zdvvmn3mabzr3441ivqr9j0a";
   };
 
diff --git a/pkgs/by-name/it/itools/package.nix b/pkgs/by-name/it/itools/package.nix
index 100102bf10f2..6a54e031b05c 100644
--- a/pkgs/by-name/it/itools/package.nix
+++ b/pkgs/by-name/it/itools/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "arabeyes-org";
     repo = "itools";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-DxTZaq2SlEmy9k7iAdjctpPkk+2rIaF+xEcfXj/ERWw=";
   };
 
diff --git a/pkgs/by-name/iu/iucode-tool/package.nix b/pkgs/by-name/iu/iucode-tool/package.nix
index fee67da98637..fc92bb67e6c4 100644
--- a/pkgs/by-name/iu/iucode-tool/package.nix
+++ b/pkgs/by-name/iu/iucode-tool/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "iucode-tool";
     repo = "iucode-tool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ajDpywgyerbvgern0b8T4jJUWisMzwrhwKO1g7iOtBE=";
   };
 
diff --git a/pkgs/by-name/iv/ivan/package.nix b/pkgs/by-name/iv/ivan/package.nix
index 2406e8c0fc69..e681b7dfb47b 100644
--- a/pkgs/by-name/iv/ivan/package.nix
+++ b/pkgs/by-name/iv/ivan/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Attnam";
     repo = "ivan";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5Ijy28LLx1TGnZE6ZNQXPYfvW2KprF+91fKx2MzLEms=";
   };
 
diff --git a/pkgs/by-name/iv/ivy/package.nix b/pkgs/by-name/iv/ivy/package.nix
index 42febb739b75..e3a552bd6e4d 100644
--- a/pkgs/by-name/iv/ivy/package.nix
+++ b/pkgs/by-name/iv/ivy/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.3.4";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "robpike";
     repo = "ivy";
     hash = "sha256-/Q929ZXv3F6MZ+FdWKfbThNDT3JpvQw7WLGnbmitdOg=";
diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix
index 51d98db84b74..86b4dd7f86de 100644
--- a/pkgs/by-name/iw/iwd/package.nix
+++ b/pkgs/by-name/iw/iwd/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
-    tag = version;
+    rev = version;
     hash = "sha256-+CoXoTlQu7ofXPueia1t1vpeH092fYBxLYB+xV4WNEs=";
   };
 
diff --git a/pkgs/by-name/iw/iwgtk/package.nix b/pkgs/by-name/iw/iwgtk/package.nix
index 5b95eb9d32eb..e080ce417423 100644
--- a/pkgs/by-name/iw/iwgtk/package.nix
+++ b/pkgs/by-name/iw/iwgtk/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "j-lentz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/Nxti4PfYVLnIiBgtAuR3KGI8dULszuSdTp+2DzBfbs=";
   };
 
diff --git a/pkgs/by-name/j/j/package.nix b/pkgs/by-name/j/j/package.nix
index b4354a1626ce..53d18a9254c1 100644
--- a/pkgs/by-name/j/j/package.nix
+++ b/pkgs/by-name/j/j/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jsoftware";
     repo = "jsource";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-Afa2QzzgJYijcavurgGH/qwyofNn4rtFMIHzlqJwFGU=";
   };
 
diff --git a/pkgs/by-name/ja/jake/package.nix b/pkgs/by-name/ja/jake/package.nix
index 6a959390af52..6de177080419 100644
--- a/pkgs/by-name/ja/jake/package.nix
+++ b/pkgs/by-name/ja/jake/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jakejs";
     repo = "jake";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rYWr/ACr14/WE88Gk6Kpyl2pq1XRHSfZGXHrwbGC8hQ=";
   };
 
diff --git a/pkgs/by-name/ja/janus-gateway/package.nix b/pkgs/by-name/ja/janus-gateway/package.nix
index 38e883c54d25..fe9f92b04d68 100644
--- a/pkgs/by-name/ja/janus-gateway/package.nix
+++ b/pkgs/by-name/ja/janus-gateway/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "meetecho";
     repo = "janus-gateway";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Y4MdbB706aziKPxM9y/3uCKpc60dMDlV0xgugDjfa7A=";
   };
 
diff --git a/pkgs/by-name/ja/jarowinkler-cpp/package.nix b/pkgs/by-name/ja/jarowinkler-cpp/package.nix
index f27c84ff3246..80333b4dd390 100644
--- a/pkgs/by-name/ja/jarowinkler-cpp/package.nix
+++ b/pkgs/by-name/ja/jarowinkler-cpp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "jarowinkler-cpp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GuwDSCYTfSwqTnzZSft3ufVSKL7255lVvbJhBxKxjJw=";
   };
 
diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix
index ab6bdbd6268a..2fb25136e503 100644
--- a/pkgs/by-name/ja/jasp-desktop/package.nix
+++ b/pkgs/by-name/ja/jasp-desktop/package.nix
@@ -23,7 +23,7 @@ let
   src = fetchFromGitHub {
     owner = "jasp-stats";
     repo = "jasp-desktop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SACGyNVxa6rFjloRQrEVtUgujEEF7WYL8Qhw6ZqLwdQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ja/javascript-typescript-langserver/package.nix b/pkgs/by-name/ja/javascript-typescript-langserver/package.nix
index 958e86c247b5..a68a6761872d 100644
--- a/pkgs/by-name/ja/javascript-typescript-langserver/package.nix
+++ b/pkgs/by-name/ja/javascript-typescript-langserver/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "javascript-typescript-langserver";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vd7Hj0jPFgK0u3CBlMfOFERmW+w9CnKIY9nvs48KqsI=";
   };
 
diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix
index 506f84f7c66d..e40d01930184 100644
--- a/pkgs/by-name/ja/jay/package.nix
+++ b/pkgs/by-name/ja/jay/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mahkoh";
     repo = "jay";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dUp3QYno2rB3wuJmSvBpCqowSpfMQIJqUYc0lDVqVPA=";
   };
 
diff --git a/pkgs/by-name/jb/jbig2enc/package.nix b/pkgs/by-name/jb/jbig2enc/package.nix
index d498fe8cb0f6..95b38a0a905a 100644
--- a/pkgs/by-name/jb/jbig2enc/package.nix
+++ b/pkgs/by-name/jb/jbig2enc/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agl";
     repo = "jbig2enc";
-    tag = version;
+    rev = version;
     hash = "sha256-B19l2NdMq+wWKQ5f/y5aoPiBtQnn6sqpaIoyIq+ugTg=";
   };
 
diff --git a/pkgs/by-name/jb/jbofihe/package.nix b/pkgs/by-name/jb/jbofihe/package.nix
index 08562f5c9302..199ee632c19c 100644
--- a/pkgs/by-name/jb/jbofihe/package.nix
+++ b/pkgs/by-name/jb/jbofihe/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lojban";
     repo = "jbofihe";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xx7x1256sjncyzx656jl6jl546vn8zz0siymqalz6v9yf341p98";
   };
 
diff --git a/pkgs/by-name/jc/jcal/package.nix b/pkgs/by-name/jc/jcal/package.nix
index 0cda16bdf298..7bcfdfa47387 100644
--- a/pkgs/by-name/jc/jcal/package.nix
+++ b/pkgs/by-name/jc/jcal/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fzerorubigd";
     repo = "jcal";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vJc5uijZlvohEtiS03LYlqtswVE38S9/ejlHrmZ0wqA=";
   };
 
diff --git a/pkgs/by-name/jd/jd-diff-patch/package.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix
index 61b07de93e1c..873e8510e699 100644
--- a/pkgs/by-name/jd/jd-diff-patch/package.nix
+++ b/pkgs/by-name/jd/jd-diff-patch/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "josephburnett";
     repo = "jd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-chCxbbRZEE29KVnTQWID889kJ2H4qJGVL+vsxzr6VtA=";
   };
 
diff --git a/pkgs/by-name/je/jefferson/package.nix b/pkgs/by-name/je/jefferson/package.nix
index 45917a7171e4..d1b95dd2df0a 100644
--- a/pkgs/by-name/je/jefferson/package.nix
+++ b/pkgs/by-name/je/jefferson/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "onekey-sec";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6eh4i9N3aArU8+W8K341pp9J0QYEojDiMrEc8yax4SY=";
   };
 
diff --git a/pkgs/by-name/je/jellycli/package.nix b/pkgs/by-name/je/jellycli/package.nix
index 38893c35a56c..94d83f6f7f82 100644
--- a/pkgs/by-name/je/jellycli/package.nix
+++ b/pkgs/by-name/je/jellycli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tryffel";
     repo = "jellycli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1awzcxnf175a794rhzbmqxxjss77mfa1yrr0wgdxaivrlkibxjys";
   };
 
diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
index ab46a7b31c65..005a35d26f03 100644
--- a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
+++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
@@ -13,7 +13,7 @@ in
   source = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-ffmpeg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zaBu/hhFIMjneb7yUzToaJJAaSptxLld8zOvfGckHLY=";
   };
 }).overrideAttrs
diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index 9b30a6abe3c3..c9d29fb19d82 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -20,7 +20,7 @@ buildNpmPackage rec {
     fetchFromGitHub {
       owner = "jellyfin";
       repo = "jellyfin-web";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-jX9Qut8YsJRyKI2L7Aww4+6G8z741WzN37CUx3KWQfY=";
     };
 
diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix
index d593597e6cd5..8c241d5f237a 100644
--- a/pkgs/by-name/je/jellyfin/package.nix
+++ b/pkgs/by-name/je/jellyfin/package.nix
@@ -18,7 +18,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GWpzX8DvCafHb5V9it0ZPTXKm+NbLS7Oepe/CcMiFuI=";
   };
 
diff --git a/pkgs/by-name/je/jetbrains-runner/package.nix b/pkgs/by-name/je/jetbrains-runner/package.nix
index eae81f1f1278..fcb91662e252 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";
-    tag = version;
+    rev = version;
     hash = "sha256-fzGwwvBgvUVU6Ra66KrIAqRjWWR6pWYbWVkOk2tDwkc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/jf/jf/package.nix b/pkgs/by-name/jf/jf/package.nix
index 1537cea3b8b7..067d548d06f6 100644
--- a/pkgs/by-name/jf/jf/package.nix
+++ b/pkgs/by-name/jf/jf/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sayanarijit";
     repo = "jf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A29OvGdG6PyeKMf5RarEOrfnNSmXhXri0AlECHWep6M=";
   };
 
diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix
index ac6baa4fa7e5..e440594a62cb 100644
--- a/pkgs/by-name/jf/jfmt/package.nix
+++ b/pkgs/by-name/jf/jfmt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "scruffystuffs";
     repo = "${pname}.rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80=";
   };
 
diff --git a/pkgs/by-name/jf/jftui/package.nix b/pkgs/by-name/jf/jftui/package.nix
index c2612a63ee03..7bc4cbb10639 100644
--- a/pkgs/by-name/jf/jftui/package.nix
+++ b/pkgs/by-name/jf/jftui/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Aanok";
     repo = "jftui";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-w5DK9B3D3/9VExAQktigVPim33VfpoQPHUZefAS3pWQ=";
   };
 
diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix
index 8f3dbd091e5b..9c0821ae38a7 100644
--- a/pkgs/by-name/jg/jgmenu/package.nix
+++ b/pkgs/by-name/jg/jgmenu/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "johanmalm";
     repo = "jgmenu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vuSpiZZYe0l5va9dHM54gaoI9x8qXH1gJORUS5489jQ=";
   };
 
diff --git a/pkgs/by-name/jh/jhead/package.nix b/pkgs/by-name/jh/jhead/package.nix
index aa0f6af61253..7e85789f4f21 100644
--- a/pkgs/by-name/jh/jhead/package.nix
+++ b/pkgs/by-name/jh/jhead/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Matthias-Wandel";
     repo = "jhead";
-    tag = version;
+    rev = version;
     hash = "sha256-d1cuy4kkwY/21UcpNN6judrFxGVyEH+b+0TaZw9hP2E=";
   };
 
diff --git a/pkgs/by-name/ji/jid/package.nix b/pkgs/by-name/ji/jid/package.nix
index ce41ae56984c..f7af65b01f42 100644
--- a/pkgs/by-name/ji/jid/package.nix
+++ b/pkgs/by-name/ji/jid/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "simeji";
     repo = "jid";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fZzEbVNGsDNQ/FhII+meQvKeyrgxn3wtFW8VfNmJz5U=";
   };
 
diff --git a/pkgs/by-name/ji/jikken/package.nix b/pkgs/by-name/ji/jikken/package.nix
index a04766386252..c75aaddbe037 100644
--- a/pkgs/by-name/ji/jikken/package.nix
+++ b/pkgs/by-name/ji/jikken/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jikkenio";
     repo = "jikken";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WJxrCCDe39RYwHb+zbr7ugFsFsP5Uc/arw3s6USQoN4=";
   };
 
diff --git a/pkgs/by-name/ji/jimtcl/package.nix b/pkgs/by-name/ji/jimtcl/package.nix
index 93fa1f6237b4..13181a2c0e5c 100644
--- a/pkgs/by-name/ji/jimtcl/package.nix
+++ b/pkgs/by-name/ji/jimtcl/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "msteveb";
     repo = "jimtcl";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY=";
   };
 
diff --git a/pkgs/by-name/ji/jinja2-cli/package.nix b/pkgs/by-name/ji/jinja2-cli/package.nix
index 8c9800e319fc..2b1392b4ecde 100644
--- a/pkgs/by-name/ji/jinja2-cli/package.nix
+++ b/pkgs/by-name/ji/jinja2-cli/package.nix
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mattrobenolt";
     repo = "jinja2-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-67gYt0nZX+VTVaoSxVXGzbRiXD7EMsVBFWC8wHo+Vw0=";
   };
 
diff --git a/pkgs/by-name/ji/jiq/package.nix b/pkgs/by-name/ji/jiq/package.nix
index e188bdf0c2e7..4123eed59212 100644
--- a/pkgs/by-name/ji/jiq/package.nix
+++ b/pkgs/by-name/ji/jiq/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fiatjaf";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-txhttYngN+dofA3Yp3gZUZPRRZWGug9ysXq1Q0RP7ig=";
   };
 
diff --git a/pkgs/by-name/ji/jiten/package.nix b/pkgs/by-name/ji/jiten/package.nix
index ce6ba26dae25..000c25ec2a1d 100644
--- a/pkgs/by-name/ji/jiten/package.nix
+++ b/pkgs/by-name/ji/jiten/package.nix
@@ -17,14 +17,14 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "obfusk";
     repo = "jiten";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "13bdx136sirbhxdhvpq5kf0r6q1xvm5zyzp454z51gy0v6rn0qrp";
   };
 
   nonFreeData = fetchFromGitHub {
     owner = "obfusk";
     repo = "jiten-nonfree-data";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "16sz8i0sw7ggy6kijcx4qyl2zr6xj789x4iav0yyllx12dfgp5b1";
   };
 
diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
index 725a9390f365..0be61315c429 100644
--- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix
+++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
@@ -30,7 +30,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jitsi";
     repo = "jitsi-meet-electron";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Pk62BpfXblRph3ktxy8eF9umRmPRZbZGjRWduy+3z+s=";
   };
 
diff --git a/pkgs/by-name/ji/jitterentropy-rngd/package.nix b/pkgs/by-name/ji/jitterentropy-rngd/package.nix
index 35758fac7e1d..184688d8972d 100644
--- a/pkgs/by-name/ji/jitterentropy-rngd/package.nix
+++ b/pkgs/by-name/ji/jitterentropy-rngd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "jitterentropy-rngd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LDym636ss3B1G/vrqatu9g5vbVEeDX0JQcxZ/IxGeY0=";
   };
 
diff --git a/pkgs/by-name/ji/jitterentropy/package.nix b/pkgs/by-name/ji/jitterentropy/package.nix
index ac06ebc746f7..c86203432849 100644
--- a/pkgs/by-name/ji/jitterentropy/package.nix
+++ b/pkgs/by-name/ji/jitterentropy/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "jitterentropy-library";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A1Y+7CqzoQ6xoTwWU8gfq+dYJ+PiIpqtOOZSL0uVby4=";
   };
 
diff --git a/pkgs/by-name/jj/jj/package.nix b/pkgs/by-name/jj/jj/package.nix
index 3039d285f28f..a9def5cf35d5 100644
--- a/pkgs/by-name/jj/jj/package.nix
+++ b/pkgs/by-name/jj/jj/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tidwall";
     repo = "jj";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Yijap5ZghTBe1ahkQgjjxuo++SriJWXgRqrNXIVQ0os=";
   };
 
diff --git a/pkgs/by-name/jm/jmc2obj/package.nix b/pkgs/by-name/jm/jmc2obj/package.nix
index c6f7a54cf201..b4abf1aff21c 100644
--- a/pkgs/by-name/jm/jmc2obj/package.nix
+++ b/pkgs/by-name/jm/jmc2obj/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "jmc2obj";
     repo = "j-mc-2-obj";
-    tag = version;
+    rev = version;
     hash = "sha256-c0qLryv9Gx9BlKXmwSKkK5/v3Wypny841htNfsNNxpg=";
   };
 
diff --git a/pkgs/by-name/jm/jmespath/package.nix b/pkgs/by-name/jm/jmespath/package.nix
index 880688453565..eb3c8fbe5901 100644
--- a/pkgs/by-name/jm/jmespath/package.nix
+++ b/pkgs/by-name/jm/jmespath/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jmespath";
     repo = "go-jmespath";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-djA/7TCmAqCsht28b1itoiWd8Mtdsn/5uLxyT23K/qM=";
   };
 
diff --git a/pkgs/by-name/jm/jmtpfs/package.nix b/pkgs/by-name/jm/jmtpfs/package.nix
index 3793fc6c2efa..5c0540193ba6 100644
--- a/pkgs/by-name/jm/jmtpfs/package.nix
+++ b/pkgs/by-name/jm/jmtpfs/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "jmtpfs";
     owner = "JasonFerrara";
   };
diff --git a/pkgs/by-name/jn/jna/package.nix b/pkgs/by-name/jn/jna/package.nix
index 0892e06727a8..7e88631425f7 100644
--- a/pkgs/by-name/jn/jna/package.nix
+++ b/pkgs/by-name/jn/jna/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "java-native-access";
     repo = "jna";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-4i7iQaxH4wS35cIvMfcNf4kUGI+uIoHNpZkQrs4oAyk=";
   };
 
diff --git a/pkgs/by-name/jo/jo/package.nix b/pkgs/by-name/jo/jo/package.nix
index ab4b4650671e..1c9bb4365a9e 100644
--- a/pkgs/by-name/jo/jo/package.nix
+++ b/pkgs/by-name/jo/jo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jpmens";
     repo = "jo";
-    tag = version;
+    rev = version;
     sha256 = "sha256-1q4/RpxfoAdtY3m8bBuj7bhD17V+4dYo3Vb8zMbI1YU=";
   };
 
diff --git a/pkgs/by-name/jo/jobber/package.nix b/pkgs/by-name/jo/jobber/package.nix
index 5f53063b1d7c..bd8a5967a4a4 100644
--- a/pkgs/by-name/jo/jobber/package.nix
+++ b/pkgs/by-name/jo/jobber/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dshearer";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mLYyrscvT/VK9ehwkPUq4RbwHb+6Wjvt7ZXk/fI0HT4=";
   };
 
diff --git a/pkgs/by-name/jo/johnny/package.nix b/pkgs/by-name/jo/johnny/package.nix
index 21afe4315a34..77d69c1b4e94 100644
--- a/pkgs/by-name/jo/johnny/package.nix
+++ b/pkgs/by-name/jo/johnny/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openwall";
     repo = "johnny";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fwRvyQbRO63iVt9AHlfl+Cv4NRFQmyVsZUQLxmzGjAY=";
   };
 
diff --git a/pkgs/by-name/jo/joker/package.nix b/pkgs/by-name/jo/joker/package.nix
index 2371067c4d0e..a6f72ab65ce8 100644
--- a/pkgs/by-name/jo/joker/package.nix
+++ b/pkgs/by-name/jo/joker/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "1.4.1";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "candid82";
     repo = "joker";
     sha256 = "sha256-Hylb7yTc7ocmm1fnTkwYTt/GwudXLZSRTh9p+38Euqk=";
diff --git a/pkgs/by-name/jo/jose/package.nix b/pkgs/by-name/jo/jose/package.nix
index 79d94b921baf..ce721eaa9a41 100644
--- a/pkgs/by-name/jo/jose/package.nix
+++ b/pkgs/by-name/jo/jose/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "latchset";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rMNPJaCtVpbwIkMQzBNpmRct6S/NelTwjmsuB0RP6R8=";
   };
 
diff --git a/pkgs/by-name/jo/jot/package.nix b/pkgs/by-name/jo/jot/package.nix
index b2a1d772efa5..bb0312f0208c 100644
--- a/pkgs/by-name/jo/jot/package.nix
+++ b/pkgs/by-name/jo/jot/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shashwatah";
     repo = "jot";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM=";
   };
 
diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix
index 7c24b137f145..7f9579cf8578 100644
--- a/pkgs/by-name/jo/jotdown/package.nix
+++ b/pkgs/by-name/jo/jotdown/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hellux";
     repo = "jotdown";
-    tag = version;
+    rev = version;
     hash = "sha256-1s0J6TF/iDSqKUF4/sgq2irSPENjinftPFZnMgE8Dn8=";
   };
 
diff --git a/pkgs/by-name/jo/joularjx/package.nix b/pkgs/by-name/jo/joularjx/package.nix
index e7ceb483755b..80a8d568c119 100644
--- a/pkgs/by-name/jo/joularjx/package.nix
+++ b/pkgs/by-name/jo/joularjx/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "joular";
     repo = "joularjx";
-    tag = version;
+    rev = version;
     hash = "sha256-/Drv6PVMmz3QNEu8zMokTKBZeYWMjuKczu18qKqNAx4=";
   };
 
diff --git a/pkgs/by-name/jo/jove/package.nix b/pkgs/by-name/jo/jove/package.nix
index 2d24fb97d704..e2af8e44261e 100644
--- a/pkgs/by-name/jo/jove/package.nix
+++ b/pkgs/by-name/jo/jove/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jonmacs";
     repo = "jove";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ZBq2zCml637p9VgedpOrUn2jSc5L0pthdgRS7YsB3zs=";
   };
 
diff --git a/pkgs/by-name/jp/jp/package.nix b/pkgs/by-name/jp/jp/package.nix
index fb926cf96b27..bdba45d5e83f 100644
--- a/pkgs/by-name/jp/jp/package.nix
+++ b/pkgs/by-name/jp/jp/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.2.1";
 
   src = fetchFromGitHub {
-    tag = version;
+    rev = version;
     owner = "jmespath";
     repo = "jp";
     hash = "sha256-a3WvLAdUZk+Y+L+opPDMBvdN5x5B6nAi/lL8JHJG/gY=";
diff --git a/pkgs/by-name/jp/jp2a/package.nix b/pkgs/by-name/jp/jp2a/package.nix
index d28e8a1d5409..7c004b5d5eb4 100644
--- a/pkgs/by-name/jp/jp2a/package.nix
+++ b/pkgs/by-name/jp/jp2a/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Talinx";
     repo = "jp2a";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TyXEaHemKfCMyGwK6P2vVL9gPWRLbkaNP0g+/UYGSVc=";
   };
 
diff --git a/pkgs/by-name/jp/jpegoptim/package.nix b/pkgs/by-name/jp/jpegoptim/package.nix
index e7b98368b06a..c842b9217123 100644
--- a/pkgs/by-name/jp/jpegoptim/package.nix
+++ b/pkgs/by-name/jp/jpegoptim/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tjko";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3p3kcUur1u09ROdKXG5H8eilu463Rzbn2yfYo5o6+KM=";
   };
 
diff --git a/pkgs/by-name/jq/jqp/package.nix b/pkgs/by-name/jq/jqp/package.nix
index 19cdaa1fa1cf..eb4fe385a9cb 100644
--- a/pkgs/by-name/jq/jqp/package.nix
+++ b/pkgs/by-name/jq/jqp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "noahgorstein";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-i22qALVa8EUaTwgN6DocGJArNyOvkQbFuH++EQKBuIc=";
   };
 
diff --git a/pkgs/by-name/jr/jrsonnet/package.nix b/pkgs/by-name/jr/jrsonnet/package.nix
index e2642cc11e39..4c646a9bac5f 100644
--- a/pkgs/by-name/jr/jrsonnet/package.nix
+++ b/pkgs/by-name/jr/jrsonnet/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.4.2";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "CertainLach";
     repo = "jrsonnet";
     sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A=";
diff --git a/pkgs/by-name/js/json-fortran/package.nix b/pkgs/by-name/js/json-fortran/package.nix
index ecbffb43cc48..924a018c3344 100644
--- a/pkgs/by-name/js/json-fortran/package.nix
+++ b/pkgs/by-name/js/json-fortran/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jacobwilliams";
     repo = "json-fortran";
-    tag = version;
+    rev = version;
     hash = "sha256-MMHMyEPZYz7dkYX1OA9D1kgRCTpzTVussJbh4rWHlyU=";
   };
 
diff --git a/pkgs/by-name/js/json-plot/package.nix b/pkgs/by-name/js/json-plot/package.nix
index 84eb16433231..7b0f08c523ad 100644
--- a/pkgs/by-name/js/json-plot/package.nix
+++ b/pkgs/by-name/js/json-plot/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sgreben";
     repo = "jp";
-    tag = version;
+    rev = version;
     hash = "sha256-WWARAh/CF3lGli3VLRzAGaCA8xQyryPi8WcuwvdInjk=";
   };
 
diff --git a/pkgs/by-name/js/json2hcl/package.nix b/pkgs/by-name/js/json2hcl/package.nix
index ed97a6496ba2..8c4883faa1ef 100644
--- a/pkgs/by-name/js/json2hcl/package.nix
+++ b/pkgs/by-name/js/json2hcl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kvz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-h7DudYVWvDRCbjoIgOoCIudf7ZfUfWXp5OJ4ni0nm6c=";
   };
 
diff --git a/pkgs/by-name/js/jsoncpp/package.nix b/pkgs/by-name/js/jsoncpp/package.nix
index 76a567595dbd..0ca65befe5f8 100644
--- a/pkgs/by-name/js/jsoncpp/package.nix
+++ b/pkgs/by-name/js/jsoncpp/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "open-source-parsers";
     repo = "jsoncpp";
-    tag = version;
+    rev = version;
     sha256 = "sha256-3msc3B8NyF8PUlNaAHdUDfCpcUmz8JVW2X58USJ5HRw=";
   };
 
diff --git a/pkgs/by-name/js/jsonfmt/package.nix b/pkgs/by-name/js/jsonfmt/package.nix
index d3733b2a7fcb..0c4e5e716d0e 100644
--- a/pkgs/by-name/js/jsonfmt/package.nix
+++ b/pkgs/by-name/js/jsonfmt/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "jsonfmt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4SNpW/+4S4sEwjM7b9ClqKqwqFFVbCVv5VnftGIHtjo=";
   };
 
diff --git a/pkgs/by-name/js/jsonld-cli/package.nix b/pkgs/by-name/js/jsonld-cli/package.nix
index 91f5068b592e..d65ca60a30d9 100644
--- a/pkgs/by-name/js/jsonld-cli/package.nix
+++ b/pkgs/by-name/js/jsonld-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "digitalbazaar";
     repo = "jsonld-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GandTCcRYd0c0SlSdsCAcaTKfwD4g1cwHuoxA62aD74=";
   };
 
diff --git a/pkgs/by-name/js/jsonnet-bundler/package.nix b/pkgs/by-name/js/jsonnet-bundler/package.nix
index 6373070ee78e..4750a17cd0cf 100644
--- a/pkgs/by-name/js/jsonnet-bundler/package.nix
+++ b/pkgs/by-name/js/jsonnet-bundler/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jsonnet-bundler";
     repo = "jsonnet-bundler";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VaYfjDSDst1joN2MnDVdz9SGGMamhYxfNM/a2mJf8Lo=";
   };
 
diff --git a/pkgs/by-name/js/jsonnet/package.nix b/pkgs/by-name/js/jsonnet/package.nix
index d19a142c321a..498cf26dadf2 100644
--- a/pkgs/by-name/js/jsonnet/package.nix
+++ b/pkgs/by-name/js/jsonnet/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "google";
     repo = "jsonnet";
     sha256 = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y=";
diff --git a/pkgs/by-name/jt/jtag-remote-server/package.nix b/pkgs/by-name/jt/jtag-remote-server/package.nix
index 883ecf307034..62ec3bea3033 100644
--- a/pkgs/by-name/jt/jtag-remote-server/package.nix
+++ b/pkgs/by-name/jt/jtag-remote-server/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jiegec";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qtgO0BO2hvWi/E2RzGTTuQynKbh7/OLeoLcm60dqro8=";
   };
 
diff --git a/pkgs/by-name/jt/jtbl/package.nix b/pkgs/by-name/jt/jtbl/package.nix
index d67da85780ac..ff5d4e1d4ad8 100644
--- a/pkgs/by-name/jt/jtbl/package.nix
+++ b/pkgs/by-name/jt/jtbl/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kellyjonbrazil";
     repo = "jtbl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ILQwUpjNueaYR5hxOWd5kZSPhVoFnnS2FcttyKSTPr8=";
   };
 
diff --git a/pkgs/by-name/jt/jtc/package.nix b/pkgs/by-name/jt/jtc/package.nix
index b8f0d66e63c6..2200ea54331e 100644
--- a/pkgs/by-name/jt/jtc/package.nix
+++ b/pkgs/by-name/jt/jtc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ldn-softdev";
     repo = "jtc";
-    tag = version;
+    rev = version;
     sha256 = "sha256-VATRlOOV4wBInLOm9J0Dp2vhtL5mb0Yxdl/ya0JiqEU=";
   };
 
diff --git a/pkgs/by-name/ju/jugglinglab/package.nix b/pkgs/by-name/ju/jugglinglab/package.nix
index 6d8d5c62a8d2..a391cac9205b 100644
--- a/pkgs/by-name/ju/jugglinglab/package.nix
+++ b/pkgs/by-name/ju/jugglinglab/package.nix
@@ -25,7 +25,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "jkboyce";
     repo = "jugglinglab";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Y87uHFpVs4A/wErNO2ZF6Su0v4LEvaE9nIysrqFoY8w=";
   };
 
diff --git a/pkgs/by-name/ju/juicefs/package.nix b/pkgs/by-name/ju/juicefs/package.nix
index c2f2fed873ce..ed05bc42ad40 100644
--- a/pkgs/by-name/ju/juicefs/package.nix
+++ b/pkgs/by-name/ju/juicefs/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "juicedata";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qe8uhSSLeOsr0FmgoOVeZeIpP4Bv5/Viz5N90PGdc9o=";
   };
 
diff --git a/pkgs/by-name/ju/juicity/package.nix b/pkgs/by-name/ju/juicity/package.nix
index 692de2a3696f..55311296d837 100644
--- a/pkgs/by-name/ju/juicity/package.nix
+++ b/pkgs/by-name/ju/juicity/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "juicity";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4sej/nb7d58+hSCaD6KIfDsqiGmgECPIbRKR65TbMBM=";
   };
 
diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix
index fa567c4c1e4c..0398dc0346f8 100644
--- a/pkgs/by-name/ju/juju/package.nix
+++ b/pkgs/by-name/ju/juju/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "juju";
     repo = "juju";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kXSqOifUkx6ReXBrB19Zx6TbiloaG+G90cIo/+ysIHk=";
   };
 
diff --git a/pkgs/by-name/ju/julius/package.nix b/pkgs/by-name/ju/julius/package.nix
index 661d18699374..2d9cec42ba95 100644
--- a/pkgs/by-name/ju/julius/package.nix
+++ b/pkgs/by-name/ju/julius/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bvschaik";
     repo = "julius";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-I5GTaVWzz0ryGLDSS3rzxp+XFVXZa9hZmgwon/6r83A=";
   };
 
diff --git a/pkgs/by-name/ju/jump/package.nix b/pkgs/by-name/ju/jump/package.nix
index 5338804e21ef..02b97d03a839 100644
--- a/pkgs/by-name/ju/jump/package.nix
+++ b/pkgs/by-name/ju/jump/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gsamokovarov";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nlCuotEiAX2+xx7T8jWZo2p4LNLhWXDdcU6DxJprgx0=";
   };
 
diff --git a/pkgs/by-name/ju/jumpapp/package.nix b/pkgs/by-name/ju/jumpapp/package.nix
index a893c2cb3480..fd6a3b8c7276 100644
--- a/pkgs/by-name/ju/jumpapp/package.nix
+++ b/pkgs/by-name/ju/jumpapp/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mkropat";
     repo = "jumpapp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9sh0+zpDxwqRGC1jUgGTDdSDRdAFsL12mQ/Opwh/UBc=";
   };
 
diff --git a/pkgs/by-name/ju/jumppad/package.nix b/pkgs/by-name/ju/jumppad/package.nix
index 1c1bf061709e..7fb20e5a272a 100644
--- a/pkgs/by-name/ju/jumppad/package.nix
+++ b/pkgs/by-name/ju/jumppad/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jumppad-labs";
     repo = "jumppad";
-    tag = version;
+    rev = version;
     hash = "sha256-V+FDPNNNP7HMg0Somoj3EhGuhhq/Du8JcCBE/Ut2V1s=";
   };
   vendorHash = "sha256-BuXbizA/OJiP11kSIO476tWPYPzGTKmzPHeyIqs8pWc=";
diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix
index 65b4d660f9b0..a3839536694b 100644
--- a/pkgs/by-name/ju/jumpy/package.nix
+++ b/pkgs/by-name/ju/jumpy/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fishfolk";
     repo = "jumpy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ggePJH2kKJ17aOWRKUnLyolIdSzlc6Axf5Iw74iFfek=";
   };
 
diff --git a/pkgs/by-name/ju/junction/package.nix b/pkgs/by-name/ju/junction/package.nix
index 78046c550f39..23f0887f7c23 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0zY6Dp0aKHtBHSTiGbI5o6876BsARbo8/BbArl0RaMY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ju/junkie/package.nix b/pkgs/by-name/ju/junkie/package.nix
index 6f123dae26d6..cd4e0af4de58 100644
--- a/pkgs/by-name/ju/junkie/package.nix
+++ b/pkgs/by-name/ju/junkie/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rixed";
     repo = "junkie";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0kfdjgch667gfb3qpiadd2dj3fxc7r19nr620gffb1ahca02wq31";
   };
 
diff --git a/pkgs/by-name/jw/jwtinfo/package.nix b/pkgs/by-name/jw/jwtinfo/package.nix
index 6cc107ea0922..75de488a9ef7 100644
--- a/pkgs/by-name/jw/jwtinfo/package.nix
+++ b/pkgs/by-name/jw/jwtinfo/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "lmammino";
     repo = "jwtinfo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FDN9K7KnMro2BluHB7I0HTDdT9YXxi8UcOoBhKx/5dA=";
   };
 
diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix
index 9583ce92bfe1..2350f9673073 100644
--- a/pkgs/by-name/jw/jwx/package.nix
+++ b/pkgs/by-name/jw/jwx/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lestrrat-go";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UXiF3X1jLk4dCGKmZlx9V08hzNJV+s/K2Wei9i+A6dg=";
   };
 
diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix
index 0ac7c87a115c..f234e0eba9ee 100644
--- a/pkgs/by-name/jx/jx/package.nix
+++ b/pkgs/by-name/jx/jx/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eEvQ7kZRY6gxunb8wDETXvZ6PYmLktDISMZoQFZEUmM=";
   };
 
diff --git a/pkgs/by-name/k2/k2tf/package.nix b/pkgs/by-name/k2/k2tf/package.nix
index fe52751c9ed5..1bf631353dcb 100644
--- a/pkgs/by-name/k2/k2tf/package.nix
+++ b/pkgs/by-name/k2/k2tf/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sl1pm4t";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zkkRzCTZCvbwBj4oIhTo5d3PvqLMJPzT3zV9jU3PEJs=";
   };
 
diff --git a/pkgs/by-name/k3/k3sup/package.nix b/pkgs/by-name/k3/k3sup/package.nix
index 031a87506e3a..95da794a686d 100644
--- a/pkgs/by-name/k3/k3sup/package.nix
+++ b/pkgs/by-name/k3/k3sup/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "k3sup";
-    tag = version;
+    rev = version;
     sha256 = "sha256-WmvCmG/wk63VnfJTFk3HhiaLzCe9O6kdUc7GpYNAwP4=";
   };
 
diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix
index 01d89c3ba741..14c95944d2c5 100644
--- a/pkgs/by-name/k6/k6/package.nix
+++ b/pkgs/by-name/k6/k6/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wU/Kelv/5N86xHJT6E5dfdzBgSYiTYZJ8rkjLyU7RAo=";
   };
 
diff --git a/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix
index decf8d0e5228..17c12ad9e415 100644
--- a/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix
+++ b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BDBkPXDg9DruIt5f7RrpStFeuTGiOOpsb6JiKaCTOOk=";
   };
 
diff --git a/pkgs/by-name/k8/k8sgpt/package.nix b/pkgs/by-name/k8/k8sgpt/package.nix
index 84b5f8680e4d..325fea286a53 100644
--- a/pkgs/by-name/k8/k8sgpt/package.nix
+++ b/pkgs/by-name/k8/k8sgpt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "k8sgpt-ai";
     repo = "k8sgpt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GKRI5qry2eYPP3/BTjS7qnIp7lX/uAR0s40y/oECaeY=";
   };
 
diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 5ed4ae5855fb..20677c9c43be 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "derailed";
     repo = "k9s";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QGymGiTHT3Qnf9l/hhE3lgJ7TBBjKMe2k1aJ32khU0E=";
   };
 
diff --git a/pkgs/by-name/ka/kaf/package.nix b/pkgs/by-name/ka/kaf/package.nix
index 733a9cbc2ff3..697d6ca51305 100644
--- a/pkgs/by-name/ka/kaf/package.nix
+++ b/pkgs/by-name/ka/kaf/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "birdayz";
     repo = "kaf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SKQg3BCwvVwjZUkTjrMlSrfa8tu2VC8+ckMZpBJhnZE=";
   };
 
diff --git a/pkgs/by-name/ka/kail/package.nix b/pkgs/by-name/ka/kail/package.nix
index f83c8f2e9378..c25223395763 100644
--- a/pkgs/by-name/ka/kail/package.nix
+++ b/pkgs/by-name/ka/kail/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "boz";
     repo = "kail";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-G8U7UEYhgkcFbKeHOjbpf9AY6NW0hBgv6aARuzapE3M=";
   };
 
diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix
index 3c4bc6e6f4ac..80e0c4b31c74 100644
--- a/pkgs/by-name/ka/kakoune-lsp/package.nix
+++ b/pkgs/by-name/ka/kakoune-lsp/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kakoune-lsp";
     repo = "kakoune-lsp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2jD0meehUNGvmywOY4D9CwP1qswD7QCPlctLBjngzvE=";
   };
 
diff --git a/pkgs/by-name/ka/kalamine/package.nix b/pkgs/by-name/ka/kalamine/package.nix
index db69d895b531..0d379dd1d126 100644
--- a/pkgs/by-name/ka/kalamine/package.nix
+++ b/pkgs/by-name/ka/kalamine/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "OneDeadKey";
     repo = "kalamine";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eDOwoI7S0l48oOWWDaBbDlC0A8RtPEA+FDCHpPur0OQ=";
   };
 
diff --git a/pkgs/by-name/ka/kalker/package.nix b/pkgs/by-name/ka/kalker/package.nix
index 2fd479caad58..62d73f96b129 100644
--- a/pkgs/by-name/ka/kalker/package.nix
+++ b/pkgs/by-name/ka/kalker/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PaddiM8";
     repo = "kalker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fFeHL+Q1Y0J3rOgbFA952rjae/OQgHTznDI0Kya1KMQ=";
   };
 
diff --git a/pkgs/by-name/ka/kamp/package.nix b/pkgs/by-name/ka/kamp/package.nix
index fa691314358f..f20546aaf340 100644
--- a/pkgs/by-name/ka/kamp/package.nix
+++ b/pkgs/by-name/ka/kamp/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vbauerster";
     repo = "kamp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-coBKVqSqYBpf0PdWKIODnbfQxbOyp5Di45+O66ZGK1Q=";
   };
 
diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix
index 0d29831bb8f1..1b949d4efc1d 100644
--- a/pkgs/by-name/ka/kanata/package.nix
+++ b/pkgs/by-name/ka/kanata/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jtroo";
     repo = "kanata";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-w/PeSqj51gJOWmAV5UPMprntdzinX/IL49D2ZUMfeSM=";
   };
 
diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix
index 5f7ee87bc6f6..1169e8b9bbeb 100644
--- a/pkgs/by-name/ka/kanidm-provision/package.nix
+++ b/pkgs/by-name/ka/kanidm-provision/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "oddlama";
     repo = "kanidm-provision";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pgPjkj0nMb5j3EvyJTTDpfmh0WigAcMzoleF5EOqBAM=";
   };
 
diff --git a/pkgs/by-name/ka/kaniko/package.nix b/pkgs/by-name/ka/kaniko/package.nix
index 6abb8e2056fa..901b047bf963 100644
--- a/pkgs/by-name/ka/kaniko/package.nix
+++ b/pkgs/by-name/ka/kaniko/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = "kaniko";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8SLE9s+P6Xh4PzrvTwUtIAtkG9Gor/fGBwrqq/fz0UM=";
   };
 
diff --git a/pkgs/by-name/ka/kanjidraw/package.nix b/pkgs/by-name/ka/kanjidraw/package.nix
index 2d99d39ac566..14a90b18723b 100644
--- a/pkgs/by-name/ka/kanjidraw/package.nix
+++ b/pkgs/by-name/ka/kanjidraw/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "obfusk";
     repo = "kanjidraw";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "03ag8vkbf85qww857ii8hcnn8bh5qa7rsmhka0v9vfxk272ifbyq";
   };
 
diff --git a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
index 496fd562ca8c..a7586ec00d2d 100644
--- a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
+++ b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "olegkapitonov";
     repo = "kapitonov-plugins-pack";
-    tag = version;
+    rev = version;
     sha256 = "1mxi7b1vrzg25x85lqk8c77iziqrqyz18mqkfjlz09sxp5wfs9w4";
   };
 
diff --git a/pkgs/by-name/ka/kapowbang/package.nix b/pkgs/by-name/ka/kapowbang/package.nix
index 85a9f2499190..d4e8e9cdd66c 100644
--- a/pkgs/by-name/ka/kapowbang/package.nix
+++ b/pkgs/by-name/ka/kapowbang/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "BBVA";
     repo = "kapow";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HUZ1Uf8Z2YbYvqKEUHckKAZ5q+C83zafi3UjemqHFM4=";
   };
 
diff --git a/pkgs/by-name/ka/kapp/package.nix b/pkgs/by-name/ka/kapp/package.nix
index bdd6cf948fb5..cefc16d1036f 100644
--- a/pkgs/by-name/ka/kapp/package.nix
+++ b/pkgs/by-name/ka/kapp/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "kapp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vgb4VtMKYncO4TPlMj2HrgZvjoOsOc2cYy+EBDKnGcM=";
   };
 
diff --git a/pkgs/by-name/ka/kappanhang/package.nix b/pkgs/by-name/ka/kappanhang/package.nix
index 956e9176d2ff..62e76c912db0 100644
--- a/pkgs/by-name/ka/kappanhang/package.nix
+++ b/pkgs/by-name/ka/kappanhang/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nonoo";
     repo = "kappanhang";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-l0V2NVzLsnpPe5EJcr5i9U7OGaYzNRDd1f/ogrdCnvk=";
   };
 
diff --git a/pkgs/by-name/ka/karlender/package.nix b/pkgs/by-name/ka/karlender/package.nix
index 1743e18ca9c3..b293bcbb1133 100644
--- a/pkgs/by-name/ka/karlender/package.nix
+++ b/pkgs/by-name/ka/karlender/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "floers";
     repo = "karlender";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PwXSJq4uBtgIA2aQ5AZawEMmHoVS2Z9haVHyJ2oyXUs=";
   };
 
diff --git a/pkgs/by-name/ka/karma-runner/package.nix b/pkgs/by-name/ka/karma-runner/package.nix
index ea0f32394006..594267f143ca 100644
--- a/pkgs/by-name/ka/karma-runner/package.nix
+++ b/pkgs/by-name/ka/karma-runner/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "karma-runner";
     repo = "karma";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-v6IiLz65NS8GwM/FPqRxR5qcFDDu7EqloR0SIensdDI=";
   };
 
diff --git a/pkgs/by-name/ka/karma/package.nix b/pkgs/by-name/ka/karma/package.nix
index bd224b86f233..c4c6822eea05 100644
--- a/pkgs/by-name/ka/karma/package.nix
+++ b/pkgs/by-name/ka/karma/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prymitive";
     repo = "karma";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SW/nmJcSk/LmoKLuD5stsSaRGaJctl6hVSODNCT9i64=";
   };
 
diff --git a/pkgs/by-name/ka/karmor/package.nix b/pkgs/by-name/ka/karmor/package.nix
index b79d333e83cd..20737002e2af 100644
--- a/pkgs/by-name/ka/karmor/package.nix
+++ b/pkgs/by-name/ka/karmor/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubearmor";
     repo = "kubearmor-client";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3WPelRhvK/9LY+TFDExcltszE1wVRr1MMY9Xjijj0so=";
   };
 
diff --git a/pkgs/by-name/ka/kata-runtime/package.nix b/pkgs/by-name/ka/kata-runtime/package.nix
index f0582e682bcb..fa06ba0ea733 100644
--- a/pkgs/by-name/ka/kata-runtime/package.nix
+++ b/pkgs/by-name/ka/kata-runtime/package.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kata-containers";
     repo = "kata-containers";
-    tag = version;
+    rev = version;
     hash = "sha256-Ir+/ZZJHm6E+044wczU3UvL+Py9Wprgw2QKJaYyDrKU=";
   };
 
diff --git a/pkgs/by-name/ka/katago/package.nix b/pkgs/by-name/ka/katago/package.nix
index 4d9da62e9de9..f4b32cdeae8e 100644
--- a/pkgs/by-name/ka/katago/package.nix
+++ b/pkgs/by-name/ka/katago/package.nix
@@ -52,7 +52,7 @@ stdenv'.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lightvector";
     repo = "katago";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hZc8LlOxnVqJqyqOSIWKv3550QOaGr79xgqsAQ8B8SM=";
   };
 
diff --git a/pkgs/by-name/ka/kaufkauflist/package.nix b/pkgs/by-name/ka/kaufkauflist/package.nix
index cfe240684959..8fb3073405a4 100644
--- a/pkgs/by-name/ka/kaufkauflist/package.nix
+++ b/pkgs/by-name/ka/kaufkauflist/package.nix
@@ -18,7 +18,7 @@ let
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
-            tag = "v${version}";
+            rev = "v${version}";
             hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/by-name/kb/kb/package.nix b/pkgs/by-name/kb/kb/package.nix
index 047678c6a484..f05cf7e325b6 100644
--- a/pkgs/by-name/kb/kb/package.nix
+++ b/pkgs/by-name/kb/kb/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gnebbia";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-K8EAqZbl2e0h03fFwaKIclZTZARDQp1tRo44znxwW0I=";
   };
 
diff --git a/pkgs/by-name/kb/kbdlight/package.nix b/pkgs/by-name/kb/kbdlight/package.nix
index 0ca47b264764..efb971d634fc 100644
--- a/pkgs/by-name/kb/kbdlight/package.nix
+++ b/pkgs/by-name/kb/kbdlight/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hobarrera";
     repo = "kbdlight";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1f08aid1xrbl4sb5447gkip9lnvkia1c4ap0v8zih5s9w8v72bny";
   };
 
diff --git a/pkgs/by-name/kb/kbld/package.nix b/pkgs/by-name/kb/kbld/package.nix
index d1efdd54bf67..dac56864246e 100644
--- a/pkgs/by-name/kb/kbld/package.nix
+++ b/pkgs/by-name/kb/kbld/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "kbld";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ikrxgukixnUCwwEt5FBzTmpjpjkjgtYTjr/AwNZ9kiI=";
   };
 
diff --git a/pkgs/by-name/kb/kbst/package.nix b/pkgs/by-name/kb/kbst/package.nix
index 9694229fe6e6..93fa27fc26ca 100644
--- a/pkgs/by-name/kb/kbst/package.nix
+++ b/pkgs/by-name/kb/kbst/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kbst";
     repo = "kbst";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tbSYNJp/gzEz+wEAe3bvIiZL5axZvW+bxqTOBkYSpMY=";
   };
 
diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix
index 5ebc15d93996..d100621bff69 100644
--- a/pkgs/by-name/kb/kbt/package.nix
+++ b/pkgs/by-name/kb/kbt/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bloznelis";
     repo = "kbt";
-    tag = version;
+    rev = version;
     hash = "sha256-ROCZDa5eyGF9yE+zdZ4snzdz8+jk+H6ZnqsnCe8JtJw=";
   };
 
diff --git a/pkgs/by-name/kc/kcat/package.nix b/pkgs/by-name/kc/kcat/package.nix
index 7dc2045c65be..22d64830edb9 100644
--- a/pkgs/by-name/kc/kcat/package.nix
+++ b/pkgs/by-name/kc/kcat/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "edenhill";
     repo = "kcat";
-    tag = version;
+    rev = version;
     sha256 = "sha256-pCIYNx0GYPGDYzTLq9h/LbOrJjhKWLAV4gq07Ikl5O4=";
   };
 
diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix
index c9a605fc4e11..2a4abe1194ce 100644
--- a/pkgs/by-name/kc/kcl/package.nix
+++ b/pkgs/by-name/kc/kcl/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ron+8pK/1VYwL0HO97QvBpWhKeAlhM+sVi1Djc++4n4=";
   };
 
diff --git a/pkgs/by-name/kc/kcli/package.nix b/pkgs/by-name/kc/kcli/package.nix
index 1c295f5acbf5..ab609f2d8752 100644
--- a/pkgs/by-name/kc/kcli/package.nix
+++ b/pkgs/by-name/kc/kcli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cswank";
     repo = "kcli";
-    tag = version;
+    rev = version;
     sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls";
   };
 
diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix
index 6ac95fbd4041..aaa3a3cca342 100644
--- a/pkgs/by-name/kc/kclvm/package.nix
+++ b/pkgs/by-name/kc/kclvm/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "kcl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OMPo2cT0ngwHuGghVSfGoDgf+FThj2GsZ3Myb1wSxQM=";
   };
 
diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix
index e71dee4949f0..4d350cebdf48 100644
--- a/pkgs/by-name/kc/kclvm_cli/package.nix
+++ b/pkgs/by-name/kc/kclvm_cli/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "kcl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wRmLXR1r/FtZVfc6jifEj0jS0U0HIgJzBtuuzLQchjo=";
   };
 
diff --git a/pkgs/by-name/kc/kconf/package.nix b/pkgs/by-name/kc/kconf/package.nix
index 10203309632f..52ed756298ca 100644
--- a/pkgs/by-name/kc/kconf/package.nix
+++ b/pkgs/by-name/kc/kconf/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "particledecay";
     repo = "kconf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bLyLXkXOZRFaplv5sY0TgFffvbA3RUwz6b+7h3MN7kA=";
   };
 
diff --git a/pkgs/by-name/kc/kcov/package.nix b/pkgs/by-name/kc/kcov/package.nix
index 1745d83e4b75..cab93025030b 100644
--- a/pkgs/by-name/kc/kcov/package.nix
+++ b/pkgs/by-name/kc/kcov/package.nix
@@ -22,7 +22,7 @@ let
     src = fetchFromGitHub {
       owner = "SimonKagstrom";
       repo = "kcov";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-hRJYuHNSXyRoUDBF/yIPXPcBBxZoTO5cgoB2tBhKPwY=";
     };
 
diff --git a/pkgs/by-name/kc/kcp/package.nix b/pkgs/by-name/kc/kcp/package.nix
index fe01141b0c2e..b939e335718e 100644
--- a/pkgs/by-name/kc/kcp/package.nix
+++ b/pkgs/by-name/kc/kcp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skywind3000";
     repo = "kcp";
-    tag = version;
+    rev = version;
     hash = "sha256-yW40x4T++4rB7hoabGN8qiSN7octyoUYEfE9oDlLxjU=";
   };
 
diff --git a/pkgs/by-name/kd/kdigger/package.nix b/pkgs/by-name/kd/kdigger/package.nix
index b65dc518b8f6..db021362c0fa 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 = pname;
-    tag = "v${version}";
+    rev = "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/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix
index 96760fd1a5c0..9dd569ba0296 100644
--- a/pkgs/by-name/kd/kdlfmt/package.nix
+++ b/pkgs/by-name/kd/kdlfmt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hougesen";
     repo = "kdlfmt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nnr3QXEXQGbJKjVvQXqhJ+iFBgI++AKK3wKMt2OqIYc=";
   };
 
diff --git a/pkgs/by-name/kd/kdocker/package.nix b/pkgs/by-name/kd/kdocker/package.nix
index 6b696dbb519f..b02db7ebe101 100644
--- a/pkgs/by-name/kd/kdocker/package.nix
+++ b/pkgs/by-name/kd/kdocker/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "user-none";
     repo = "KDocker";
-    tag = finalAttrs.version;
+    rev = "${finalAttrs.version}";
     hash = "sha256-ckTi/w2Yynsl3aJzV9Uxfc7WxJtcCt44glJyqEEZrig=";
   };
 
diff --git a/pkgs/by-name/kd/kdotool/package.nix b/pkgs/by-name/kd/kdotool/package.nix
index 0047e0e05436..f63b96ef0898 100644
--- a/pkgs/by-name/kd/kdotool/package.nix
+++ b/pkgs/by-name/kd/kdotool/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jinliu";
     repo = "kdotool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qx4bWAFQcoLM/r4aNzmoZdjclw8ccAW8lKLda6ON1aQ=";
   };
 
diff --git a/pkgs/by-name/ke/keepalived/package.nix b/pkgs/by-name/ke/keepalived/package.nix
index 1096978976cc..f7cc87b06e14 100644
--- a/pkgs/by-name/ke/keepalived/package.nix
+++ b/pkgs/by-name/ke/keepalived/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acassen";
     repo = "keepalived";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+IwV8ifQ8gWN4eR9Fgvw3HV3WJDmy3urEQDLngoMdm8=";
   };
 
diff --git a/pkgs/by-name/ke/keepass-keepasshttp/package.nix b/pkgs/by-name/ke/keepass-keepasshttp/package.nix
index 7f4c10bb479e..e63a771b8cfc 100644
--- a/pkgs/by-name/ke/keepass-keepasshttp/package.nix
+++ b/pkgs/by-name/ke/keepass-keepasshttp/package.nix
@@ -14,7 +14,7 @@ let
     src = fetchFromGitHub {
       owner = "pfn";
       repo = "keepasshttp";
-      # tag = version;
+      # rev = version;
       # for 1.8.4.2 the tag is at the wrong commit (they fixed stuff
       # afterwards and didn't move the tag), hence reference by commitid
       rev = "c2c4eb5388a02169400cba7a67be325caabdcc37";
diff --git a/pkgs/by-name/ke/keepassxc-go/package.nix b/pkgs/by-name/ke/keepassxc-go/package.nix
index f9210338298a..1e6cf584d6d2 100644
--- a/pkgs/by-name/ke/keepassxc-go/package.nix
+++ b/pkgs/by-name/ke/keepassxc-go/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MarkusFreitag";
     repo = "keepassxc-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-seCeHNEj5GxAI7BVMPzh+YuoxivmTwvhVCqY5LKHpQk=";
   };
 
diff --git a/pkgs/by-name/ke/keeperrl/package.nix b/pkgs/by-name/ke/keeperrl/package.nix
index 749e60683d4e..ea8c74e92d14 100644
--- a/pkgs/by-name/ke/keeperrl/package.nix
+++ b/pkgs/by-name/ke/keeperrl/package.nix
@@ -22,7 +22,7 @@ let
   free_src = fetchFromGitHub {
     owner = "miki151";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-0sww+ppctXvxMouclG3OdXpcNgrrOZJw9z8s2GhJ+IE=";
   };
 
diff --git a/pkgs/by-name/ke/keepmenu/package.nix b/pkgs/by-name/ke/keepmenu/package.nix
index 0cf4865fe1d1..c584834311cc 100644
--- a/pkgs/by-name/ke/keepmenu/package.nix
+++ b/pkgs/by-name/ke/keepmenu/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "keepmenu";
-    tag = version;
+    rev = version;
     hash = "sha256-Kzt2RqyYvOWnbkflwTHzlnpUaruVQvdGys57DDpH9o8=";
   };
 
diff --git a/pkgs/by-name/ke/kepubify/package.nix b/pkgs/by-name/ke/kepubify/package.nix
index acb5b78655e2..901cd6cba8b0 100644
--- a/pkgs/by-name/ke/kepubify/package.nix
+++ b/pkgs/by-name/ke/kepubify/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pgaskin";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-H6W+C5twXit7Z9hLIJKAftbnvYDA9HAb9tR6yeQGRKI=";
   };
 
diff --git a/pkgs/by-name/ke/kermit-terminal/package.nix b/pkgs/by-name/ke/kermit-terminal/package.nix
index 135f43e1bec8..c19cae129bd1 100644
--- a/pkgs/by-name/ke/kermit-terminal/package.nix
+++ b/pkgs/by-name/ke/kermit-terminal/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "kermit";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-rhlUnRfyd7PmtMSyP+tiu+TxZNb/YyS0Yc5IkWft7/4=";
   };
 
diff --git a/pkgs/by-name/ke/kernel-hardening-checker/package.nix b/pkgs/by-name/ke/kernel-hardening-checker/package.nix
index 3dce8a607041..05a25f28ad7c 100644
--- a/pkgs/by-name/ke/kernel-hardening-checker/package.nix
+++ b/pkgs/by-name/ke/kernel-hardening-checker/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "a13xp0p0v";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gxDaOb14jFezxe/qHZF3e52o7obVL0WMIKxwIj3j5QY=";
   };
 
diff --git a/pkgs/by-name/ke/kestrel/package.nix b/pkgs/by-name/ke/kestrel/package.nix
index 47a1743d89b5..85ee8fbd1a9b 100644
--- a/pkgs/by-name/ke/kestrel/package.nix
+++ b/pkgs/by-name/ke/kestrel/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "finfet";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bKQBOk9yUqgnufRyyqXatsRHpesbM49rAkz0dD5XE80=";
   };
 
diff --git a/pkgs/by-name/ke/keto/package.nix b/pkgs/by-name/ke/keto/package.nix
index 3837f2ec0fd0..4913a13a6d28 100644
--- a/pkgs/by-name/ke/keto/package.nix
+++ b/pkgs/by-name/ke/keto/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "ory";
     repo = "keto";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DQiE7PvRnOzdRITRl7LgUDmCJO5/aUzbFdEIyiofZfU=";
   };
 
diff --git a/pkgs/by-name/ke/key-rack/package.nix b/pkgs/by-name/ke/key-rack/package.nix
index e677294b8df7..2f5b9bc356c6 100644
--- a/pkgs/by-name/ke/key-rack/package.nix
+++ b/pkgs/by-name/ke/key-rack/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "sophie-h";
     repo = "key-rack";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-mthXtTlyrIChaKKwKosTsV1hK9OQ/zLScjrq6D3CRsg=";
   };
 
diff --git a/pkgs/by-name/ke/keycard-cli/package.nix b/pkgs/by-name/ke/keycard-cli/package.nix
index 1dd78e90ff31..d30150600405 100644
--- a/pkgs/by-name/ke/keycard-cli/package.nix
+++ b/pkgs/by-name/ke/keycard-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "status-im";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-K2XxajprpPjfIs8rrnf2coIEQjPnir9/U0fTvqV2++g=";
   };
 
diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix
index 0d21650182d1..eb63215f9162 100644
--- a/pkgs/by-name/ke/keychain/package.nix
+++ b/pkgs/by-name/ke/keychain/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "funtoo";
     repo = "keychain";
-    tag = version;
+    rev = version;
     sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj";
   };
 
diff --git a/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix b/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
index a5cbd85f3780..35b6a01ded3f 100644
--- a/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
+++ b/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
@@ -11,7 +11,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "sventorben";
     repo = "keycloak-restrict-client-auth";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Pk0tj8cTHSBwVIzINE7GLA5b/eI97wuOTvO7UoXBStM=";
   };
 
diff --git a/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix b/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix
index 62dc5aa96de0..4bc5a3f5141d 100644
--- a/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix
+++ b/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix
@@ -11,7 +11,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "Captain-P-Goldfish";
     repo = "scim-for-keycloak";
-    tag = version;
+    rev = version;
     hash = "sha256-kHjCVkcD8C0tIaMExDlyQmcWMhypisR1nyG93laB8WU=";
   };
 
diff --git a/pkgs/by-name/ke/keyfinder-cli/package.nix b/pkgs/by-name/ke/keyfinder-cli/package.nix
index f79d755dd427..c4b708918c85 100644
--- a/pkgs/by-name/ke/keyfinder-cli/package.nix
+++ b/pkgs/by-name/ke/keyfinder-cli/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "keyfinder-cli";
     owner = "EvanPurkhiser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA=";
   };
 
diff --git a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
index 737d16cb09fb..daf7309de2b3 100644
--- a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
+++ b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mschneider82";
     repo = "keylight-control";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xC/JRM8vyqAsxPpf37P3pZv6i73s+CLQt6Sh4nMxwzM=";
   };
 
diff --git a/pkgs/by-name/ke/keymapviz/package.nix b/pkgs/by-name/ke/keymapviz/package.nix
index e646d490f50b..1188ce02597b 100644
--- a/pkgs/by-name/ke/keymapviz/package.nix
+++ b/pkgs/by-name/ke/keymapviz/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yskoht";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-eCvwgco22uPEDDsT8FfTRon1xCGy5p1PBp0pDfNprMs=";
   };
 
diff --git a/pkgs/by-name/ke/keystone/package.nix b/pkgs/by-name/ke/keystone/package.nix
index 235cfd6544c6..efa845b4e7b7 100644
--- a/pkgs/by-name/ke/keystone/package.nix
+++ b/pkgs/by-name/ke/keystone/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "keystone-engine";
     repo = "keystone";
-    tag = version;
+    rev = version;
     sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa";
   };
 
diff --git a/pkgs/by-name/kf/kfilt/package.nix b/pkgs/by-name/kf/kfilt/package.nix
index 817b1cdf18e2..fe6f315e8fe2 100644
--- a/pkgs/by-name/kf/kfilt/package.nix
+++ b/pkgs/by-name/kf/kfilt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ryane";
     repo = "kfilt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TUhZKf4fJyJF/qDmvs4jqAMVTXN4MXE+YLc4FcOVlwo=";
   };
 
diff --git a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
index bcdf72c93fd0..60fb02025d95 100644
--- a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
+++ b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-ICD-Loader";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A+Rd/3LyBoUW2MrRDMOcwsTqTADuNxSQdF1HHgfq3mY=";
   };
 
diff --git a/pkgs/by-name/kh/khronos/package.nix b/pkgs/by-name/kh/khronos/package.nix
index d501dcea3823..167403b1cf2e 100644
--- a/pkgs/by-name/kh/khronos/package.nix
+++ b/pkgs/by-name/kh/khronos/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = "khronos";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2mO2ZMDxZ7sx2EVTN0tsAv8MisGxlK/1h61N+hOqyGI=";
   };
 
diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix
index 6d1d8901252a..0f88f8f83657 100644
--- a/pkgs/by-name/ki/kibi/package.nix
+++ b/pkgs/by-name/ki/kibi/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ilai-deutel";
     repo = "kibi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ox1qKWxJlUIFzEqeyzG2kqZix3AHnOKFrlpf6O5QM+k=";
   };
 
diff --git a/pkgs/by-name/ki/kickoff/package.nix b/pkgs/by-name/ki/kickoff/package.nix
index 2e62f74176c4..2935b823d656 100644
--- a/pkgs/by-name/ki/kickoff/package.nix
+++ b/pkgs/by-name/ki/kickoff/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "j0ru";
     repo = "kickoff";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q/+Ik8L58LxOllpEosYyvD38RJb+NIQHslYpgGSwjKc=";
   };
 
diff --git a/pkgs/by-name/ki/kickstart/package.nix b/pkgs/by-name/ki/kickstart/package.nix
index a51561cca024..464de7d1ec80 100644
--- a/pkgs/by-name/ki/kickstart/package.nix
+++ b/pkgs/by-name/ki/kickstart/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Keats";
     repo = "kickstart";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4POxv6fIrp+wKb9V+6Y2YPx3FXp3hpnkq+62H9TwGII=";
   };
 
diff --git a/pkgs/by-name/ki/kicli/package.nix b/pkgs/by-name/ki/kicli/package.nix
index a06da4af68b5..3c1769bdd2ea 100644
--- a/pkgs/by-name/ki/kicli/package.nix
+++ b/pkgs/by-name/ki/kicli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "anned20";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Mt1lHOC8gBcLQ6kArUvlPrH+Y/63mIQTCsUY2UTJE2c=";
   };
 
diff --git a/pkgs/by-name/ki/kikoplay/package.nix b/pkgs/by-name/ki/kikoplay/package.nix
index 1fadb89ce22a..d56f8004a0bd 100644
--- a/pkgs/by-name/ki/kikoplay/package.nix
+++ b/pkgs/by-name/ki/kikoplay/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KikoPlayProject";
     repo = "KikoPlay";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-y+sT0aHDvKFNaJIxnGxDXZXUiCzuXVF7FPc8t//RMW4=";
   };
 
diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix
index 19cea7779c15..9cbad3d0c47a 100644
--- a/pkgs/by-name/ki/kind/package.nix
+++ b/pkgs/by-name/ki/kind/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   version = "0.27.0";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "kubernetes-sigs";
     repo = "kind";
     hash = "sha256-J0M/enjufNmEMm43zo5fi5hL1LfaemNwR6nCClVCJNA=";
diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix
index e59803ddd97c..e485a958fee4 100644
--- a/pkgs/by-name/ki/kine/package.nix
+++ b/pkgs/by-name/ki/kine/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "k3s-io";
     repo = "kine";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Fb73warUgPX/FQT/zDnn3r7SP2tw142Npg2rhK8BEqI=";
   };
 
diff --git a/pkgs/by-name/ki/kirc/package.nix b/pkgs/by-name/ki/kirc/package.nix
index 83d94169098e..fe686ff30cb4 100644
--- a/pkgs/by-name/ki/kirc/package.nix
+++ b/pkgs/by-name/ki/kirc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mcpcpc";
     repo = "kirc";
-    tag = version;
+    rev = version;
     hash = "sha256-LiJZnFQMnyBEqeyyyqM56XXoYjbZPCWLfLX9OB/f+YM=";
   };
 
diff --git a/pkgs/by-name/ki/kissfft/package.nix b/pkgs/by-name/ki/kissfft/package.nix
index cdef56fe24b3..03d0e7d04584 100644
--- a/pkgs/by-name/ki/kissfft/package.nix
+++ b/pkgs/by-name/ki/kissfft/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mborgerding";
     repo = "kissfft";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ukikTVnmKomKXTo6zc+PhpZzEkzXN2imFwZOYlfR3Pk=";
   };
 
diff --git a/pkgs/by-name/ki/kiterunner/package.nix b/pkgs/by-name/ki/kiterunner/package.nix
index 2e469aa390a6..8ac6052fa452 100644
--- a/pkgs/by-name/ki/kiterunner/package.nix
+++ b/pkgs/by-name/ki/kiterunner/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "assetnote";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vIYPpkbqyk0zH10DGp2FF0aI4lFpsZavulBIiR/3kiA=";
   };
 
diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix
index 61f84af77d50..cc60333b66b2 100644
--- a/pkgs/by-name/ki/kitex/package.nix
+++ b/pkgs/by-name/ki/kitex/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudwego";
     repo = "kitex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1dgQgc9XljawyH+MIDPNqcwHMH0yW2BMY8TZnc+P13I=";
   };
 
diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix
index 2a24a55da363..448f01e1cd55 100644
--- a/pkgs/by-name/ki/kitsas/package.nix
+++ b/pkgs/by-name/ki/kitsas/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "artoh";
     repo = "kitupiikki";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4FCfpUFfi+N207SEAKz8nLpVS8MxfmDwM6r6i5pyqEM=";
   };
 
diff --git a/pkgs/by-name/ki/kittysay/package.nix b/pkgs/by-name/ki/kittysay/package.nix
index aa325061d325..7ab11b806168 100644
--- a/pkgs/by-name/ki/kittysay/package.nix
+++ b/pkgs/by-name/ki/kittysay/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "uncenter";
     repo = "kittysay";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZYHrDBJ8cTqJAh2KUGSCsS1bY/emHRodPxZX2vxAhDs=";
   };
 
diff --git a/pkgs/by-name/kl/klick/package.nix b/pkgs/by-name/kl/klick/package.nix
index a58858ec98f1..2326a26acf8c 100644
--- a/pkgs/by-name/kl/klick/package.nix
+++ b/pkgs/by-name/kl/klick/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Allfifthstuning";
     repo = "klick";
-    tag = version;
+    rev = version;
     hash = "sha256-jHyeVCmyy9ipbVaF7GSW19DOVpU9EQJoLcGq9uos+eY=";
   };
 
diff --git a/pkgs/by-name/kl/klipperscreen/package.nix b/pkgs/by-name/kl/klipperscreen/package.nix
index 18459a1bdc2f..3a242ab34729 100644
--- a/pkgs/by-name/kl/klipperscreen/package.nix
+++ b/pkgs/by-name/kl/klipperscreen/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "KlipperScreen";
     repo = "KlipperScreen";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MxuUmkuEnfFC0iPwNUc0Wh8bIEl1J1FMgGEYMjHePZ8=";
   };
 
diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix
index d94522fe0124..9c0e15bce9d4 100644
--- a/pkgs/by-name/kl/klog-rs/package.nix
+++ b/pkgs/by-name/kl/klog-rs/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tobifroe";
     repo = "klog";
-    tag = version;
+    rev = version;
     hash = "sha256-t53HC5eBC587jyvJKxlG3B3Im7RM6bDcZfUO4npgGfM=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/kl/klog-time-tracker/package.nix b/pkgs/by-name/kl/klog-time-tracker/package.nix
index 842267ace2a4..9805ecb6c983 100644
--- a/pkgs/by-name/kl/klog-time-tracker/package.nix
+++ b/pkgs/by-name/kl/klog-time-tracker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jotaen";
     repo = "klog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xwVbI4rXtcZrnTvp0vdHMbYRoWCsxIuGZF922eC/sfw=";
   };
 
diff --git a/pkgs/by-name/kl/kluctl/package.nix b/pkgs/by-name/kl/kluctl/package.nix
index 5d5473119847..743672a9a276 100644
--- a/pkgs/by-name/kl/kluctl/package.nix
+++ b/pkgs/by-name/kl/kluctl/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kluctl";
     repo = "kluctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qtntImc+fiRPMUHVM4A8d2e17zklV47CJ10M9A8oa7k=";
   };
 
diff --git a/pkgs/by-name/kl/klystrack/package.nix b/pkgs/by-name/kl/klystrack/package.nix
index 3b6f7c6674ad..2992ca3f5a90 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";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     sha256 = "1h99sm2ddaq483hhk2s3z4bjbgn0d2h7qna7l7qq98wvhqix8iyz";
   };
diff --git a/pkgs/by-name/km/kmon/package.nix b/pkgs/by-name/km/kmon/package.nix
index 9a9b0a387c78..6222a438ad23 100644
--- a/pkgs/by-name/km/kmon/package.nix
+++ b/pkgs/by-name/km/kmon/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "kmon";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DzbbeVZifuxgmIu3yNv6EI7Jyh8MA0/oSaR5IEPNUN8=";
   };
 
diff --git a/pkgs/by-name/km/kmsvnc/package.nix b/pkgs/by-name/km/kmsvnc/package.nix
index 264f2af76c5b..238ea9ba372d 100644
--- a/pkgs/by-name/km/kmsvnc/package.nix
+++ b/pkgs/by-name/km/kmsvnc/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "isjerryxiao";
     repo = "kmsvnc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fOryY9pkeRXjfOq4ZcUKBrBDMWEljLChwXSAbeMNXhw=";
   };
 
diff --git a/pkgs/by-name/kn/knightos-genkfs/package.nix b/pkgs/by-name/kn/knightos-genkfs/package.nix
index 459bea995690..b91d29537a6f 100644
--- a/pkgs/by-name/kn/knightos-genkfs/package.nix
+++ b/pkgs/by-name/kn/knightos-genkfs/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "genkfs";
-    tag = version;
+    rev = version;
     sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp";
   };
 
diff --git a/pkgs/by-name/kn/knightos-kcc/package.nix b/pkgs/by-name/kn/knightos-kcc/package.nix
index 7d521e58049d..e43d2cd29a33 100644
--- a/pkgs/by-name/kn/knightos-kcc/package.nix
+++ b/pkgs/by-name/kn/knightos-kcc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "kcc";
-    tag = version;
+    rev = version;
     sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp";
   };
 
diff --git a/pkgs/by-name/kn/knightos-kimg/package.nix b/pkgs/by-name/kn/knightos-kimg/package.nix
index 2dda3add9043..732fc6f8e2b4 100644
--- a/pkgs/by-name/kn/knightos-kimg/package.nix
+++ b/pkgs/by-name/kn/knightos-kimg/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "kimg";
-    tag = version;
+    rev = version;
     sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3";
   };
 
diff --git a/pkgs/by-name/kn/knightos-kpack/package.nix b/pkgs/by-name/kn/knightos-kpack/package.nix
index 8c55ee62c207..3d4cc0595fea 100644
--- a/pkgs/by-name/kn/knightos-kpack/package.nix
+++ b/pkgs/by-name/kn/knightos-kpack/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "kpack";
-    tag = version;
+    rev = version;
     sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8";
   };
 
diff --git a/pkgs/by-name/kn/knightos-mkrom/package.nix b/pkgs/by-name/kn/knightos-mkrom/package.nix
index 83361371094c..100da9137d29 100644
--- a/pkgs/by-name/kn/knightos-mkrom/package.nix
+++ b/pkgs/by-name/kn/knightos-mkrom/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "mkrom";
-    tag = version;
+    rev = version;
     sha256 = "sha256-YFrh0tOGiM90uvU9ZWopW1+9buHDQtetuOtPDSYYaXw=";
   };
 
diff --git a/pkgs/by-name/kn/knightos-mktiupgrade/package.nix b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
index f3394d828901..850a35df20d2 100644
--- a/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
+++ b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "mktiupgrade";
-    tag = version;
+    rev = version;
     sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm";
   };
 
diff --git a/pkgs/by-name/kn/knightos-patchrom/package.nix b/pkgs/by-name/kn/knightos-patchrom/package.nix
index 9b4938632385..097fffc85698 100644
--- a/pkgs/by-name/kn/knightos-patchrom/package.nix
+++ b/pkgs/by-name/kn/knightos-patchrom/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "patchrom";
-    tag = version;
+    rev = version;
     sha256 = "0yc4q7n3k7k6rx3cxq5ddd5r0la8gw1287a74kql6gwkxjq0jmcv";
   };
 
diff --git a/pkgs/by-name/kn/knightos-scas/package.nix b/pkgs/by-name/kn/knightos-scas/package.nix
index 8bfa98f04a6e..a04b03e6d10f 100644
--- a/pkgs/by-name/kn/knightos-scas/package.nix
+++ b/pkgs/by-name/kn/knightos-scas/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "scas";
-    tag = version;
+    rev = version;
     sha256 = "sha256-JGQE+orVDKKJsTt8sIjPX+3yhpZkujISroQ6g19+MzU=";
   };
 
diff --git a/pkgs/by-name/kn/knightos-z80e/package.nix b/pkgs/by-name/kn/knightos-z80e/package.nix
index 28b670e3295b..0b39ebfa0999 100644
--- a/pkgs/by-name/kn/knightos-z80e/package.nix
+++ b/pkgs/by-name/kn/knightos-z80e/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "z80e";
-    tag = version;
+    rev = version;
     sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc=";
   };
 
diff --git a/pkgs/by-name/kn/knit/package.nix b/pkgs/by-name/kn/knit/package.nix
index 7b43c3dc9ae9..82d1a2fe8982 100644
--- a/pkgs/by-name/kn/knit/package.nix
+++ b/pkgs/by-name/kn/knit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zyedidia";
     repo = "knit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zxwEJnQZpOEJhV7jx2ClS3XmMfGBiq8AHR26TOIBJVw=";
   };
 
diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix
index 049c4badec4a..a29b3135c981 100644
--- a/pkgs/by-name/kn/knossosnet/package.nix
+++ b/pkgs/by-name/kn/knossosnet/package.nix
@@ -13,7 +13,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "KnossosNET";
     repo = "Knossos.NET";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vlSiM6kskV4wfBZF7Rv5ICyqKG0Zhz/iU8kflYOaf0U=";
   };
 
diff --git a/pkgs/by-name/ko/kodi-cli/package.nix b/pkgs/by-name/ko/kodi-cli/package.nix
index 438fc6edc4c3..8c49c224fd80 100644
--- a/pkgs/by-name/ko/kodi-cli/package.nix
+++ b/pkgs/by-name/ko/kodi-cli/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nawar";
     repo = "kodi-cli";
-    tag = version;
+    rev = version;
     sha256 = "0f9wdq2fg8hlpk3qbjfkb3imprxkvdrhxfkcvr3dwfma0j2yfwam";
   };
 
diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix
index 2446befbff99..6f4c6761cdcb 100644
--- a/pkgs/by-name/ko/kokkos/package.nix
+++ b/pkgs/by-name/ko/kokkos/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kokkos";
     repo = "kokkos";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-4Or6Z/ZXH/WmA8GW6/Odn9+w7E/jdBDMCkWSpMf5Zoc=";
   };
 
diff --git a/pkgs/by-name/ko/kolla/package.nix b/pkgs/by-name/ko/kolla/package.nix
index f8f292216921..678366edb305 100644
--- a/pkgs/by-name/ko/kolla/package.nix
+++ b/pkgs/by-name/ko/kolla/package.nix
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
     owner = "openstack";
     repo = "kolla";
     hash = "sha256-jLD6ILihymQlWkkpGYC4OX8BKLpQurAK6Y5Xpju+QAI=";
-    tag = version;
+    rev = version;
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ko/kompose/package.nix b/pkgs/by-name/ko/kompose/package.nix
index 4bbceae87c29..bad37825a1f4 100644
--- a/pkgs/by-name/ko/kompose/package.nix
+++ b/pkgs/by-name/ko/kompose/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kompose";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-M1d1pSIMRIlLKob9D8MzrUuPm+h9C5sSC8L+uIdU1Ic=";
   };
 
diff --git a/pkgs/by-name/ko/konbucase/package.nix b/pkgs/by-name/ko/konbucase/package.nix
index ed66a328c6dc..905f63f5aa51 100644
--- a/pkgs/by-name/ko/konbucase/package.nix
+++ b/pkgs/by-name/ko/konbucase/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ryonakano";
     repo = "konbucase";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-md7drxg1JuW6TRJauKOk4Aqjx/V1RVZ+POa5v6DtKwk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ko/kondo/package.nix b/pkgs/by-name/ko/kondo/package.nix
index 92f4975974cc..051dc8236e2b 100644
--- a/pkgs/by-name/ko/kondo/package.nix
+++ b/pkgs/by-name/ko/kondo/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tbillington";
     repo = "kondo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OqOmOujnyLTqwzNvLWudQi+xa5v37JTtyUXaItnpnfs=";
   };
 
diff --git a/pkgs/by-name/ko/konf/package.nix b/pkgs/by-name/ko/konf/package.nix
index d39bc674ce34..90ee378839ed 100644
--- a/pkgs/by-name/ko/konf/package.nix
+++ b/pkgs/by-name/ko/konf/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SimonTheLeg";
     repo = "konf-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GSrR2uLeGodmE1egRtvTyWhJckYUnI97n7dnmjPvu3k=";
   };
 
diff --git a/pkgs/by-name/ko/konstraint/package.nix b/pkgs/by-name/ko/konstraint/package.nix
index f18fd1282f0d..dc23321f593f 100644
--- a/pkgs/by-name/ko/konstraint/package.nix
+++ b/pkgs/by-name/ko/konstraint/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "plexsystems";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-45zCzjzbKYLsLxmo7yGbbyeYP1WyULD9d+nnNLP9Zzo=";
   };
   vendorHash = "sha256-ZPK3+x0GOMs2RXxIs90BvEg25lb/j11J9zECaMHg4zY=";
diff --git a/pkgs/by-name/ko/kontroll/package.nix b/pkgs/by-name/ko/kontroll/package.nix
index 245a01ee2a47..a2113c918648 100644
--- a/pkgs/by-name/ko/kontroll/package.nix
+++ b/pkgs/by-name/ko/kontroll/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zsa";
     repo = "kontroll";
-    tag = version;
+    rev = version;
     hash = "sha256-k7Twbjl8umk3PeIv3ivCLdhZFgTTV8WdfIAoGAD/pEk=";
   };
 
diff --git a/pkgs/by-name/ko/kooha/package.nix b/pkgs/by-name/ko/kooha/package.nix
index 466494ae3cb7..c466270cac12 100644
--- a/pkgs/by-name/ko/kooha/package.nix
+++ b/pkgs/by-name/ko/kooha/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SeaDve";
     repo = "Kooha";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Z+PMSV6fipfHBrqGS24SOgGJS173Vct12sVzCGZL0IA=";
   };
 
diff --git a/pkgs/by-name/ko/kool/package.nix b/pkgs/by-name/ko/kool/package.nix
index cca84cc59a0a..5a419b22c44f 100644
--- a/pkgs/by-name/ko/kool/package.nix
+++ b/pkgs/by-name/ko/kool/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kool-dev";
     repo = "kool";
-    tag = version;
+    rev = version;
     hash = "sha256-UVdkymG9Ni83NhGRAXalJiLbpn3xzNl0quew+vDfyec=";
   };
 
diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix
index 87463c030d95..af32830388e7 100644
--- a/pkgs/by-name/ko/kor/package.nix
+++ b/pkgs/by-name/ko/kor/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yonahd";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VK5G8J851rsIEt2ljrTWFPCxhIBTgLkMlEMVb9kJcOs=";
   };
 
diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix
index b83bb39abc92..d1b830abf4aa 100644
--- a/pkgs/by-name/ko/kord/package.nix
+++ b/pkgs/by-name/ko/kord/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "twitchax";
     repo = "kord";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CeMh6yB4fGoxtGLbkQe4OMMvBM0jesyP+8JtU5kCP84=";
   };
 
diff --git a/pkgs/by-name/ko/kore/package.nix b/pkgs/by-name/ko/kore/package.nix
index e8ce7e40370d..34b5612d9b1f 100644
--- a/pkgs/by-name/ko/kore/package.nix
+++ b/pkgs/by-name/ko/kore/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jorisvink";
     repo = "kore";
-    tag = version;
+    rev = version;
     sha256 = "sha256-p0M2P02xwww5EnT28VnEtj5b+/jkPW3YkJMuK79vp4k=";
   };
 
diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix
index 2df720694dc4..bb1969b3ac19 100644
--- a/pkgs/by-name/ko/koreader/package.nix
+++ b/pkgs/by-name/ko/koreader/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src_repo = fetchFromGitHub {
     repo = "koreader";
     owner = "koreader";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     sha256 = "sha256-EI8UOQuwhJqcAp8QnLYhI0K+uV/7ZqxdHNk8mPkDWA0=";
   };
diff --git a/pkgs/by-name/ko/koruri/package.nix b/pkgs/by-name/ko/koruri/package.nix
index d93e93a5c446..412b4a0fa152 100644
--- a/pkgs/by-name/ko/koruri/package.nix
+++ b/pkgs/by-name/ko/koruri/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Koruri";
     repo = "Koruri";
-    tag = version;
+    rev = version;
     hash = "sha256-zL9UtT15mWvsXgGJqbTs6cOsQaoh/0AIAyQ5z7JpTXk=";
   };
 
diff --git a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix
index 4e051c4a94f4..8ee1ed750260 100644
--- a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix
+++ b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "Kotlin";
     repo = "kotlin-interactive-shell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3DTyo7rPswpEVzFkcprT6FD+ITGJ+qCXFKXEGoCK+oE=";
   };
 
diff --git a/pkgs/by-name/kp/kpt/package.nix b/pkgs/by-name/kp/kpt/package.nix
index 93e0c43fc15a..9c6de4cb3b80 100644
--- a/pkgs/by-name/kp/kpt/package.nix
+++ b/pkgs/by-name/kp/kpt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kptdev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MVrJUsMpt1L56ezy2b2G6Aac9kpe4QgfSosR+PeTuBQ=";
   };
 
diff --git a/pkgs/by-name/kr/kraft/package.nix b/pkgs/by-name/kr/kraft/package.nix
index c4f2bc962fa2..04718b428d44 100644
--- a/pkgs/by-name/kr/kraft/package.nix
+++ b/pkgs/by-name/kr/kraft/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "unikraft";
     repo = "kraftkit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rwowlwP56IAdogEL6/SBGDtvOW7FhO4+2vTWI755HXI=";
   };
 
diff --git a/pkgs/by-name/kr/krankerl/package.nix b/pkgs/by-name/kr/krankerl/package.nix
index bf81b38c60a7..03a78ec3eb71 100644
--- a/pkgs/by-name/kr/krankerl/package.nix
+++ b/pkgs/by-name/kr/krankerl/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ChristophWurst";
     repo = "krankerl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fFtjQFkNB5vn9nlFJI6nRdqxB9PmOGl3ySZ5LG2tgPg=";
   };
 
diff --git a/pkgs/by-name/kr/krapslog/package.nix b/pkgs/by-name/kr/krapslog/package.nix
index 2b5d89523179..ceef566a4169 100644
--- a/pkgs/by-name/kr/krapslog/package.nix
+++ b/pkgs/by-name/kr/krapslog/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "acj";
     repo = "krapslog-rs";
-    tag = version;
+    rev = version;
     sha256 = "sha256-wRziLNMwLZBCn330FNC9x6loCCyuC+31Kh51ZI/j1Cc=";
   };
 
diff --git a/pkgs/by-name/kr/kratos/package.nix b/pkgs/by-name/kr/kratos/package.nix
index 8df35ba76b22..9da5b1e6e129 100644
--- a/pkgs/by-name/kr/kratos/package.nix
+++ b/pkgs/by-name/kr/kratos/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "ory";
     repo = "kratos";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FJrBwjWBYwoiy8rWXn+jaVc1b35So1Rb9SjkUlNwAqE=";
   };
 
diff --git a/pkgs/by-name/kr/krelay/package.nix b/pkgs/by-name/kr/krelay/package.nix
index 591f29e05240..6390e08d1f54 100644
--- a/pkgs/by-name/kr/krelay/package.nix
+++ b/pkgs/by-name/kr/krelay/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knight42";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TonkGh4j+xLGgSpspCedg6c2NpIZIzp5pv8VtWFssPk=";
   };
 
diff --git a/pkgs/by-name/kr/krew/package.nix b/pkgs/by-name/kr/krew/package.nix
index 6b407f08cee6..2fc475b41e9b 100644
--- a/pkgs/by-name/kr/krew/package.nix
+++ b/pkgs/by-name/kr/krew/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "krew";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3GoC2HEp9XJe853/JYvX9kAAcFf7XxglVEeU9oQ/5Ms=";
   };
 
diff --git a/pkgs/by-name/kr/kronosnet/package.nix b/pkgs/by-name/kr/kronosnet/package.nix
index 1b2feef3e204..dfaf1379c679 100644
--- a/pkgs/by-name/kr/kronosnet/package.nix
+++ b/pkgs/by-name/kr/kronosnet/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kronosnet";
     repo = "kronosnet";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Ydu7qS2Wuy5c5pCv1X8SdEIx8sTvfGusCJwltkb3YXQ=";
   };
 
diff --git a/pkgs/by-name/kr/krop/package.nix b/pkgs/by-name/kr/krop/package.nix
index 4aabe5a93ca5..889cd4317e04 100644
--- a/pkgs/by-name/kr/krop/package.nix
+++ b/pkgs/by-name/kr/krop/package.nix
@@ -33,7 +33,7 @@ py.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "arminstraub";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ygzc7vlwszqmsd3v1dsqp1dpsn6inx7g8gck63alvf88dbn8m3s";
   };
 
diff --git a/pkgs/by-name/kr/krunner-vscodeprojects/package.nix b/pkgs/by-name/kr/krunner-vscodeprojects/package.nix
index c266c013075f..07316f77b59e 100644
--- a/pkgs/by-name/kr/krunner-vscodeprojects/package.nix
+++ b/pkgs/by-name/kr/krunner-vscodeprojects/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alex1701c";
     repo = "krunner-vscodeprojects";
-    tag = version;
+    rev = version;
     hash = "sha256-a24MFSXYFR4VVUVMOAY0n0sKqY0L9lUhnpgSeDFtceI=";
   };
 
diff --git a/pkgs/by-name/ks/ks/package.nix b/pkgs/by-name/ks/ks/package.nix
index 71ba2286a0aa..73fe7a1b8d7e 100644
--- a/pkgs/by-name/ks/ks/package.nix
+++ b/pkgs/by-name/ks/ks/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "loteoo";
     repo = "ks";
-    tag = finalAttrs.version;
+    rev = "${finalAttrs.version}";
     hash = "sha256-v05wqlG7Utq1b7ctvDY9MCdjHVVZZNNzuHaIBwuRjEE=";
   };
 
diff --git a/pkgs/by-name/ks/ksmbd-tools/package.nix b/pkgs/by-name/ks/ksmbd-tools/package.nix
index 7e234b52a35e..0a13560f08bd 100644
--- a/pkgs/by-name/ks/ksmbd-tools/package.nix
+++ b/pkgs/by-name/ks/ksmbd-tools/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cifsd-team";
     repo = "ksmbd-tools";
-    tag = version;
+    rev = version;
     sha256 = "sha256-f2B+24AboAWLIrtuHWn8YMEPzWahIafc3kfx0zKyz8g=";
   };
 
diff --git a/pkgs/by-name/ks/ksuperkey/package.nix b/pkgs/by-name/ks/ksuperkey/package.nix
index 10c68e672c7e..44afd8773aef 100644
--- a/pkgs/by-name/ks/ksuperkey/package.nix
+++ b/pkgs/by-name/ks/ksuperkey/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hanschen";
     repo = "ksuperkey";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1dvgf356fihfav8pjzww1q6vgd96c5h18dh8vpv022g9iipiwq8a";
   };
 
diff --git a/pkgs/by-name/kt/kt/package.nix b/pkgs/by-name/kt/kt/package.nix
index 2eafd19ff10b..8070bd50d09c 100644
--- a/pkgs/by-name/kt/kt/package.nix
+++ b/pkgs/by-name/kt/kt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fgeller";
     repo = "kt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1UGsiMMmAyIQZ62hNIi0uzyX2uNL03EWupIazjznqDc=";
   };
 
diff --git a/pkgs/by-name/kt/ktop/package.nix b/pkgs/by-name/kt/ktop/package.nix
index f5b60308742a..964a44fffe1d 100644
--- a/pkgs/by-name/kt/ktop/package.nix
+++ b/pkgs/by-name/kt/ktop/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vladimirvivien";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oxyEkDY53HjBgjWRajlcg+8Kx092lyLkPgOJleioO7o=";
   };
 
diff --git a/pkgs/by-name/kt/ktunnel/package.nix b/pkgs/by-name/kt/ktunnel/package.nix
index 4eadd6676b12..66fcee188903 100644
--- a/pkgs/by-name/kt/ktunnel/package.nix
+++ b/pkgs/by-name/kt/ktunnel/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "omrikiei";
     repo = "ktunnel";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rcUCIUIyBCSuMly7y0GUNQCdJUgsj7Oi6Hpz23uXoJw=";
   };
 
diff --git a/pkgs/by-name/kt/ktx-tools/package.nix b/pkgs/by-name/kt/ktx-tools/package.nix
index ad3ce863a79d..7c4da8a5c2fe 100644
--- a/pkgs/by-name/kt/ktx-tools/package.nix
+++ b/pkgs/by-name/kt/ktx-tools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "KTX-Software";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bDdRdVFbVmN8fEGRLnPLOXsV6lfYU9Lg4nW0GuCj6AU=";
   };
 
diff --git a/pkgs/by-name/ku/kube-capacity/package.nix b/pkgs/by-name/ku/kube-capacity/package.nix
index 82cc34c40e99..aad7b224c8dc 100644
--- a/pkgs/by-name/ku/kube-capacity/package.nix
+++ b/pkgs/by-name/ku/kube-capacity/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.8.0";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "robscott";
     repo = pname;
     sha256 = "sha256-zAwCz4Qs1OF/CdSmy9p4X9hL9iNkAH/EeSU2GgekzV8=";
diff --git a/pkgs/by-name/ku/kube-linter/package.nix b/pkgs/by-name/ku/kube-linter/package.nix
index d0e9493e9031..e71fc89c0ff9 100644
--- a/pkgs/by-name/ku/kube-linter/package.nix
+++ b/pkgs/by-name/ku/kube-linter/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-abfNzf+84BWHpvLQZKyzl7WBt7UHj2zqzKq3VCqAwwY=";
   };
 
diff --git a/pkgs/by-name/ku/kube-prompt/package.nix b/pkgs/by-name/ku/kube-prompt/package.nix
index 2b7a0ab6ed0c..8ce8a8960840 100644
--- a/pkgs/by-name/ku/kube-prompt/package.nix
+++ b/pkgs/by-name/ku/kube-prompt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "c-bata";
     repo = "kube-prompt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9OWsITbC7YO51QzsRwDWvojU54DiuGJhkSGwmesEj9w=";
   };
 
diff --git a/pkgs/by-name/ku/kube-router/package.nix b/pkgs/by-name/ku/kube-router/package.nix
index e8d02ff181a7..ceec86cf0626 100644
--- a/pkgs/by-name/ku/kube-router/package.nix
+++ b/pkgs/by-name/ku/kube-router/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudnativelabs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bt7BnMIq/tkRL8d1pf/gG5qBq/1yiMqXDpBrIICo780=";
   };
 
diff --git a/pkgs/by-name/ku/kube-score/package.nix b/pkgs/by-name/ku/kube-score/package.nix
index 3dd86804516a..95000b724f82 100644
--- a/pkgs/by-name/ku/kube-score/package.nix
+++ b/pkgs/by-name/ku/kube-score/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zegl";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YsbefR6WkFef5nhbD9ACQ7Xx572RsHlL2zY78RtTtsQ=";
   };
 
diff --git a/pkgs/by-name/ku/kube-state-metrics/package.nix b/pkgs/by-name/ku/kube-state-metrics/package.nix
index 26448c4ea442..9ece423c3f0d 100644
--- a/pkgs/by-name/ku/kube-state-metrics/package.nix
+++ b/pkgs/by-name/ku/kube-state-metrics/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kube-state-metrics";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-s46K5V7lwqeQ4qjaCPAoMoKLikezT+Ik5bJAkkJ5Q40=";
   };
 
diff --git a/pkgs/by-name/ku/kubebuilder/package.nix b/pkgs/by-name/ku/kubebuilder/package.nix
index beb33bf31adc..ac165c9c7a5d 100644
--- a/pkgs/by-name/ku/kubebuilder/package.nix
+++ b/pkgs/by-name/ku/kubebuilder/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "kubebuilder";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KXT7rW4HH9sSidqofp86tHClfpRQPnMo1K1LzfDyL3I=";
   };
 
diff --git a/pkgs/by-name/ku/kubecfg/package.nix b/pkgs/by-name/ku/kubecfg/package.nix
index f298c358062e..721f31daac8f 100644
--- a/pkgs/by-name/ku/kubecfg/package.nix
+++ b/pkgs/by-name/ku/kubecfg/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubecfg";
     repo = "kubecfg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-27xek+rLJK7jbqi9QDuWdA9KrO5QXUPAj9IRXVxiS8Q=";
   };
 
diff --git a/pkgs/by-name/ku/kubecm/package.nix b/pkgs/by-name/ku/kubecm/package.nix
index e9b483de0e1a..476ed8e114f2 100644
--- a/pkgs/by-name/ku/kubecm/package.nix
+++ b/pkgs/by-name/ku/kubecm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sunny0826";
     repo = "kubecm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-z0uQhAfyrK2LKs4hwnHGE7hKQwhLGCmp7yN58ehDn/w=";
   };
 
diff --git a/pkgs/by-name/ku/kubecolor/package.nix b/pkgs/by-name/ku/kubecolor/package.nix
index e2a99c6bfe88..56f75358792d 100644
--- a/pkgs/by-name/ku/kubecolor/package.nix
+++ b/pkgs/by-name/ku/kubecolor/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubecolor";
     repo = "kubecolor";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Q3Bl1ejuSpiMpQgiqKa2x/g02hNx326GM2MIDoi7q7o=";
   };
 
diff --git a/pkgs/by-name/ku/kubeconform/package.nix b/pkgs/by-name/ku/kubeconform/package.nix
index 11c4f1d5fc5f..dfef2b5a74b3 100644
--- a/pkgs/by-name/ku/kubeconform/package.nix
+++ b/pkgs/by-name/ku/kubeconform/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yannh";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Yq9lJ3rSG8v/PeofkZrnO2nzEgtyB5vtNafKabp8hnQ=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix
index 317c9ed981ec..5db7f96f0baa 100644
--- a/pkgs/by-name/ku/kubectl-cnpg/package.nix
+++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudnative-pg";
     repo = "cloudnative-pg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lAcCOHYtEO2v08REvJXvx+S6YzOsh6EcSUTmOXcpks8=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-df-pv/package.nix b/pkgs/by-name/ku/kubectl-df-pv/package.nix
index 3d33633508ea..5160659ce06a 100644
--- a/pkgs/by-name/ku/kubectl-df-pv/package.nix
+++ b/pkgs/by-name/ku/kubectl-df-pv/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yashbhutwala";
     repo = "kubectl-df-pv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FxKqkxLMNfCXuahKTMod6kWKZ/ucYeIEFcS8BmpbLWg=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-doctor/package.nix b/pkgs/by-name/ku/kubectl-doctor/package.nix
index 591cfe40226d..c8a6ac0b0a42 100644
--- a/pkgs/by-name/ku/kubectl-doctor/package.nix
+++ b/pkgs/by-name/ku/kubectl-doctor/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "emirozer";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-example/package.nix b/pkgs/by-name/ku/kubectl-example/package.nix
index a23915161fb6..981fb6e3afcd 100644
--- a/pkgs/by-name/ku/kubectl-example/package.nix
+++ b/pkgs/by-name/ku/kubectl-example/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "seredot";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YvB4l+7GLSyYWX2Fbk4gT2WLaQpNxeV0aHY3Pg+9LCM=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-explore/package.nix b/pkgs/by-name/ku/kubectl-explore/package.nix
index b67c116b4ea5..0d524a891b74 100644
--- a/pkgs/by-name/ku/kubectl-explore/package.nix
+++ b/pkgs/by-name/ku/kubectl-explore/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "keisku";
     repo = "kubectl-explore";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RCLOqe4Ptac2YVDjWYG5H5geUMUsmh6klQfk92XvjI4=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix
index 5251465a9e45..408e688a0844 100644
--- a/pkgs/by-name/ku/kubectl-gadget/package.nix
+++ b/pkgs/by-name/ku/kubectl-gadget/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "inspektor-gadget";
     repo = "inspektor-gadget";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zAFDbSbNvFtQeJhyeG1tgFwwFgluiX1Y5BmSUsE4z3c=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-graph/package.nix b/pkgs/by-name/ku/kubectl-graph/package.nix
index 2bb60891aebb..f0bbb4906e91 100644
--- a/pkgs/by-name/ku/kubectl-graph/package.nix
+++ b/pkgs/by-name/ku/kubectl-graph/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "steveteuber";
     repo = "kubectl-graph";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5N1eC8J0nHEgFUCHEn5b3kUDj6MWejouQBKkdJKsaAo=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-images/package.nix b/pkgs/by-name/ku/kubectl-images/package.nix
index 76b547d11084..aac821504bd8 100644
--- a/pkgs/by-name/ku/kubectl-images/package.nix
+++ b/pkgs/by-name/ku/kubectl-images/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chenjiandongx";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FHfj2qRypqQA0Vj9Hq7wuYd0xmpD+IZj3MkwKljQio0=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-klock/package.nix b/pkgs/by-name/ku/kubectl-klock/package.nix
index 405974494f6b..aae2d47da28d 100644
--- a/pkgs/by-name/ku/kubectl-klock/package.nix
+++ b/pkgs/by-name/ku/kubectl-klock/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "applejag";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-S7cpVRVboLkU+GgvwozJmfFAO29tKpPlk+r9mbVLxF8=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-ktop/package.nix b/pkgs/by-name/ku/kubectl-ktop/package.nix
index fa4db97e0563..bfcedb7a34e6 100644
--- a/pkgs/by-name/ku/kubectl-ktop/package.nix
+++ b/pkgs/by-name/ku/kubectl-ktop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vladimirvivien";
     repo = "ktop";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oxyEkDY53HjBgjWRajlcg+8Kx092lyLkPgOJleioO7o=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-neat/package.nix b/pkgs/by-name/ku/kubectl-neat/package.nix
index d51f038eaf72..0514ef5c6df5 100644
--- a/pkgs/by-name/ku/kubectl-neat/package.nix
+++ b/pkgs/by-name/ku/kubectl-neat/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "itaysk";
     repo = "kubectl-neat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j8v0zJDBqHzmLamIZPW9UvMe9bv/m3JUQKY+wsgMTFk=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-node-shell/package.nix b/pkgs/by-name/ku/kubectl-node-shell/package.nix
index 3c1a869102c1..8b1afed54972 100644
--- a/pkgs/by-name/ku/kubectl-node-shell/package.nix
+++ b/pkgs/by-name/ku/kubectl-node-shell/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kvaps";
     repo = "kubectl-node-shell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jLwnWp/XS4SOyf5v46DPy2Nc6LatF6AzNvHiGVNpsto=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-tree/package.nix b/pkgs/by-name/ku/kubectl-tree/package.nix
index 05f48419d64b..46b9f9674a7e 100644
--- a/pkgs/by-name/ku/kubectl-tree/package.nix
+++ b/pkgs/by-name/ku/kubectl-tree/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ahmetb";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-J4/fiTECcTE0N2E+MPrQKE9Msvvm8DLdvLbnDUnUo74=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-validate/package.nix b/pkgs/by-name/ku/kubectl-validate/package.nix
index ad3f86e9efdd..25209129c5d2 100644
--- a/pkgs/by-name/ku/kubectl-validate/package.nix
+++ b/pkgs/by-name/ku/kubectl-validate/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "kubectl-validate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0r3ffrZSRtSe5CgvocRhoJz0zqUsx9vtABP2h1o9vCw=";
   };
 
diff --git a/pkgs/by-name/ku/kubectl-view-secret/package.nix b/pkgs/by-name/ku/kubectl-view-secret/package.nix
index 7f6d5dead07b..63df059f6cb3 100644
--- a/pkgs/by-name/ku/kubectl-view-secret/package.nix
+++ b/pkgs/by-name/ku/kubectl-view-secret/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "elsesiy";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-l7pyS3eQDETrGCN7+Q0xhm+9Ocpk+qxTNMu4SMq+IDU=";
   };
 
diff --git a/pkgs/by-name/ku/kubectx/package.nix b/pkgs/by-name/ku/kubectx/package.nix
index 66c955e6e283..1cfcb192b3d1 100644
--- a/pkgs/by-name/ku/kubectx/package.nix
+++ b/pkgs/by-name/ku/kubectx/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ahmetb";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HVmtUhdMjbkyMpTgbsr5Mm286F9Q7zbc5rOxi7OBZEg=";
   };
 
diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix
index 562c9825f801..68a4dcce1135 100644
--- a/pkgs/by-name/ku/kubedock/package.nix
+++ b/pkgs/by-name/ku/kubedock/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "joyrex2001";
     repo = "kubedock";
-    tag = version;
+    rev = version;
     hash = "sha256-O8heDxfYmBV4sSdBZOQri+FMHJMrRW9+kai1S62ffQY=";
   };
 
diff --git a/pkgs/by-name/ku/kubedog/package.nix b/pkgs/by-name/ku/kubedog/package.nix
index bc91f260448c..25367f1a6d08 100644
--- a/pkgs/by-name/ku/kubedog/package.nix
+++ b/pkgs/by-name/ku/kubedog/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "werf";
     repo = "kubedog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xBTz1Ux2W0A0leOPNu0yONiz55LiYcYiviKEi8xsUTU=";
   };
 
diff --git a/pkgs/by-name/ku/kubefetch/package.nix b/pkgs/by-name/ku/kubefetch/package.nix
index 6f81c9636e6c..4a771efc824a 100644
--- a/pkgs/by-name/ku/kubefetch/package.nix
+++ b/pkgs/by-name/ku/kubefetch/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jkulzer";
     repo = "kubefetch";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-1NbbQ9f81DbfvpGayhMYdOTOZrDg2hdZi+qUOr2mntY=";
   };
 
diff --git a/pkgs/by-name/ku/kubefwd/package.nix b/pkgs/by-name/ku/kubefwd/package.nix
index 72c03033e8b6..de0b6d9003e0 100644
--- a/pkgs/by-name/ku/kubefwd/package.nix
+++ b/pkgs/by-name/ku/kubefwd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "txn2";
     repo = "kubefwd";
-    tag = version;
+    rev = version;
     hash = "sha256-xTd/1h9fW2GbZ2u3RsExbQouRZot9CUDuqNLItRySxM=";
   };
 
diff --git a/pkgs/by-name/ku/kubelogin/package.nix b/pkgs/by-name/ku/kubelogin/package.nix
index 818951642aff..eb184bcb2cb1 100644
--- a/pkgs/by-name/ku/kubelogin/package.nix
+++ b/pkgs/by-name/ku/kubelogin/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-upToPltob3P8EwDUbl9F3COGCxnz6NZNrZ/wxv5pBQU=";
   };
 
diff --git a/pkgs/by-name/ku/kubemq-community/package.nix b/pkgs/by-name/ku/kubemq-community/package.nix
index 7fad5995a02e..b531534b03b5 100644
--- a/pkgs/by-name/ku/kubemq-community/package.nix
+++ b/pkgs/by-name/ku/kubemq-community/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubemq-io";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oAo/O3T3wtfCumT2kjoyXKfCFHijVzSmxhslaKaeF3Y=";
   };
 
diff --git a/pkgs/by-name/ku/kubemqctl/package.nix b/pkgs/by-name/ku/kubemqctl/package.nix
index 2470651d8bc1..f8d0960db38d 100644
--- a/pkgs/by-name/ku/kubemqctl/package.nix
+++ b/pkgs/by-name/ku/kubemqctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubemq-io";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PaB5+Sy2ccEQz+wuz88w/M4NXayKA41/ugSPJdtjfiE=";
   };
 
diff --git a/pkgs/by-name/ku/kubent/package.nix b/pkgs/by-name/ku/kubent/package.nix
index f2e88651de77..c49a00940220 100644
--- a/pkgs/by-name/ku/kubent/package.nix
+++ b/pkgs/by-name/ku/kubent/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "doitintl";
     repo = "kube-no-trouble";
-    tag = version;
+    rev = version;
     hash = "sha256-7bn7DxbZ/Nqob7ZEWRy1UVg97FiJN5JWEgpH1CDz6jQ=";
   };
 
diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix
index 0068b7fe7990..8b4f4e9c1b9e 100644
--- a/pkgs/by-name/ku/kubeone/package.nix
+++ b/pkgs/by-name/ku/kubeone/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubermatic";
     repo = "kubeone";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pMY86Ucp5nuH63YgAh60l3WZYDPvM8LcTaV9QS2BzAA=";
   };
 
diff --git a/pkgs/by-name/ku/kubeprompt/package.nix b/pkgs/by-name/ku/kubeprompt/package.nix
index 76a942089db6..4b2488f07a4a 100644
--- a/pkgs/by-name/ku/kubeprompt/package.nix
+++ b/pkgs/by-name/ku/kubeprompt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jlesquembre";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-is6Rz0tw/g4HyGJMTHj+r390HZAytVhfGVRzZ5wKZkU=";
   };
 
diff --git a/pkgs/by-name/ku/kubepug/package.nix b/pkgs/by-name/ku/kubepug/package.nix
index 4bcecba841eb..339039be21b4 100644
--- a/pkgs/by-name/ku/kubepug/package.nix
+++ b/pkgs/by-name/ku/kubepug/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubepug";
     repo = "kubepug";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VNxaYQy81U0JWd6KS0jCvMexpyWL4v1cKpjxLRkxBLE=";
   };
 
diff --git a/pkgs/by-name/ku/kubergrunt/package.nix b/pkgs/by-name/ku/kubergrunt/package.nix
index b52cbfa8489b..e5900a7132c1 100644
--- a/pkgs/by-name/ku/kubergrunt/package.nix
+++ b/pkgs/by-name/ku/kubergrunt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "kubergrunt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ros126t4QEhWnItScaY1ntcGI/YMpeC2f2yQrzSZ7w4=";
   };
 
diff --git a/pkgs/by-name/ku/kubernetes-code-generator/package.nix b/pkgs/by-name/ku/kubernetes-code-generator/package.nix
index f03b5b9bee16..006a7ace7cac 100644
--- a/pkgs/by-name/ku/kubernetes-code-generator/package.nix
+++ b/pkgs/by-name/ku/kubernetes-code-generator/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GKF6DXvyZujInOZbV0ePUu71BEl1s/chNTN1PucdIYw=";
   };
 
diff --git a/pkgs/by-name/ku/kubernetes-metrics-server/package.nix b/pkgs/by-name/ku/kubernetes-metrics-server/package.nix
index 946d334d7b72..9264facf3ae3 100644
--- a/pkgs/by-name/ku/kubernetes-metrics-server/package.nix
+++ b/pkgs/by-name/ku/kubernetes-metrics-server/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "metrics-server";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-e9iFOe2iZaKbYNUk0vuyzcGDCNxot34kRH06L5UQs4I=";
   };
 
diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix
index bac6519c034b..27027d2bbefd 100644
--- a/pkgs/by-name/ku/kubernetes-polaris/package.nix
+++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "polaris";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/pj52K33IimsnrSoSRhHy+WgzzRwGZQiBsNf1+L1B3c=";
   };
 
diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix
index 00a223f705b6..ae7316ffe7be 100644
--- a/pkgs/by-name/ku/kubernix/package.nix
+++ b/pkgs/by-name/ku/kubernix/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "saschagrunert";
     repo = "kubernix";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "04dzfdzjwcwwaw9min322g30q0saxpq5kqzld4f22fmk820ki6gp";
   };
 
diff --git a/pkgs/by-name/ku/kubeseal/package.nix b/pkgs/by-name/ku/kubeseal/package.nix
index 141c62f5f008..8855283133c2 100644
--- a/pkgs/by-name/ku/kubeseal/package.nix
+++ b/pkgs/by-name/ku/kubeseal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bitnami-labs";
     repo = "sealed-secrets";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-unPqjheT8/2gVQAwvzOvHtG4qTqggf9o0M5iLwl1eh4=";
   };
 
diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix
index ccb00b2c3f9c..8a1ad1760eba 100644
--- a/pkgs/by-name/ku/kubeshark/package.nix
+++ b/pkgs/by-name/ku/kubeshark/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubeshark";
     repo = "kubeshark";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Mxj42D+MxYn0/csI/ZsMdU8xOz8P/IzsHr7vtmlQPa0=";
   };
 
diff --git a/pkgs/by-name/ku/kubespy/package.nix b/pkgs/by-name/ku/kubespy/package.nix
index f686a43ffb87..6a28cc19c305 100644
--- a/pkgs/by-name/ku/kubespy/package.nix
+++ b/pkgs/by-name/ku/kubespy/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   version = "0.6.3";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "pulumi";
     repo = "kubespy";
     sha256 = "sha256-l/vOIFvCQHq+gOr38SpVZ8ShZdI1bP4G5PY4hKhkCU0=";
diff --git a/pkgs/by-name/ku/kubeswitch/package.nix b/pkgs/by-name/ku/kubeswitch/package.nix
index a5ee795151f2..e87c44dbc967 100644
--- a/pkgs/by-name/ku/kubeswitch/package.nix
+++ b/pkgs/by-name/ku/kubeswitch/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "danielfoehrKn";
     repo = "kubeswitch";
-    tag = version;
+    rev = version;
     hash = "sha256-899hHqXxx2OuWII4ego6F62EnFIszaYqTTcU9wO2csw=";
   };
 
diff --git a/pkgs/by-name/ku/kubetail/package.nix b/pkgs/by-name/ku/kubetail/package.nix
index 714bbd5bb6c6..dd34d5042548 100644
--- a/pkgs/by-name/ku/kubetail/package.nix
+++ b/pkgs/by-name/ku/kubetail/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "johanhaleby";
     repo = "kubetail";
-    tag = version;
+    rev = version;
     sha256 = "sha256-RbbZHKXRtbs42cCbw+xb8TLul6ebUeCiNclMFF39c3M=";
   };
 
diff --git a/pkgs/by-name/ku/kubevela/package.nix b/pkgs/by-name/ku/kubevela/package.nix
index 6049eb6f4363..7c794db80f55 100644
--- a/pkgs/by-name/ku/kubevela/package.nix
+++ b/pkgs/by-name/ku/kubevela/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubevela";
     repo = "kubevela";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YfIYQSJynI4Ou4oiq7yxZlfdCnpuwsuUUPYKDmFdIKg=";
   };
 
diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix
index da319e4fbb27..ba8da889fd96 100644
--- a/pkgs/by-name/ku/kubevirt/package.nix
+++ b/pkgs/by-name/ku/kubevirt/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubevirt";
     repo = "kubevirt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Hjqk3A/GtpcT++GyiYBL24X99IrwXzQMXRqTKgOD6Ak=";
   };
 
diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix
index 1c84b703cdcf..dda318d49bd0 100644
--- a/pkgs/by-name/ku/kubevpn/package.nix
+++ b/pkgs/by-name/ku/kubevpn/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "KubeNetworks";
     repo = "kubevpn";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-E/1MV/EjG9MU2xiCFC0jAvIwSAfyNCrhKcfedH5DPN0=";
   };
 
diff --git a/pkgs/by-name/ku/kubexit/package.nix b/pkgs/by-name/ku/kubexit/package.nix
index 73b420638502..477e380c956c 100644
--- a/pkgs/by-name/ku/kubexit/package.nix
+++ b/pkgs/by-name/ku/kubexit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "karlkfi";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Kzom+/Xad6SI9czw4xvmTbJ+bNB9mF2oSq37IFn384U=";
   };
 
diff --git a/pkgs/by-name/ku/kulala-fmt/package.nix b/pkgs/by-name/ku/kulala-fmt/package.nix
index fe58134ba8fd..1644e7900e98 100644
--- a/pkgs/by-name/ku/kulala-fmt/package.nix
+++ b/pkgs/by-name/ku/kulala-fmt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mistweaverco";
     repo = "kulala-fmt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yq7DMrt+g5wM/tynI7Cf6MBJs/d+fP3IppndKnTJMTw=";
   };
 
diff --git a/pkgs/by-name/ku/kuro/package.nix b/pkgs/by-name/ku/kuro/package.nix
index 8094bd67d14c..5fb26933e51e 100644
--- a/pkgs/by-name/ku/kuro/package.nix
+++ b/pkgs/by-name/ku/kuro/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "davidsmorais";
     repo = "kuro";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9Z/r5T5ZI5aBghHmwiJcft/x/wTRzDlbIupujN2RFfU=";
   };
 
diff --git a/pkgs/by-name/ku/kuttl/package.nix b/pkgs/by-name/ku/kuttl/package.nix
index e35a73eaae12..a2c44232cc1b 100644
--- a/pkgs/by-name/ku/kuttl/package.nix
+++ b/pkgs/by-name/ku/kuttl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kudobuilder";
     repo = "kuttl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-M9sZNrze7v1dj0j+hOo30kB87YKxFF/hZJ7R2C/Pzwg=";
   };
 
diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix
index 20c2a78d6ad7..7ab72bcd1d9d 100644
--- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix
+++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kyverno";
     repo = "chainsaw";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BxSJu71/KhVtWEOw2V+nteZnvyyoGvrbWQmHGqDtLa0=";
   };
 
diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix
index 8f6295174dce..d11556754e3b 100644
--- a/pkgs/by-name/ky/kyverno/package.nix
+++ b/pkgs/by-name/ky/kyverno/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kyverno";
     repo = "kyverno";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XkFxgBn4x/2H7j0nZufzmfGltY9ROOjEWqxmQrO7RNw=";
   };
 
diff --git a/pkgs/by-name/la/LAStools/package.nix b/pkgs/by-name/la/LAStools/package.nix
index 469b59e0c6a5..e91b8b224de7 100644
--- a/pkgs/by-name/la/LAStools/package.nix
+++ b/pkgs/by-name/la/LAStools/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LAStools";
     repo = "LAStools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-IyZjM8YvIVB0VPNuEhmHHw7EuKw5RanB2qhCnBD1fRY=";
   };
 
diff --git a/pkgs/by-name/la/lab/package.nix b/pkgs/by-name/la/lab/package.nix
index 7d413ddec614..6d3b4cc4b53d 100644
--- a/pkgs/by-name/la/lab/package.nix
+++ b/pkgs/by-name/la/lab/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zaquestion";
     repo = "lab";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VCvjP/bSd/0ywvNWPsseXn/SPkdp+BsXc/jTvB11EOk=";
   };
 
diff --git a/pkgs/by-name/la/labelImg/package.nix b/pkgs/by-name/la/labelImg/package.nix
index a8f617face4d..b61092095590 100644
--- a/pkgs/by-name/la/labelImg/package.nix
+++ b/pkgs/by-name/la/labelImg/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tzutalin";
     repo = "labelImg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU=";
   };
   nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix
index 1c914efc6c57..85a5c338e4c9 100644
--- a/pkgs/by-name/la/lact/package.nix
+++ b/pkgs/by-name/la/lact/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ilya-zlobintsev";
     repo = "LACT";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-goNwLtVjNY3O/BhFrCcM3X11dtM34XgfHL6bh+YFoIY=";
   };
 
diff --git a/pkgs/by-name/la/lalrpop/package.nix b/pkgs/by-name/la/lalrpop/package.nix
index 100f7129bbae..35c040efdf89 100644
--- a/pkgs/by-name/la/lalrpop/package.nix
+++ b/pkgs/by-name/la/lalrpop/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lalrpop";
     repo = "lalrpop";
-    tag = version;
+    rev = version;
     hash = "sha256-cFwBck+bdOjhF6rQQj03MOO+XCsrII5c4Xvhsw12ETA=";
   };
 
diff --git a/pkgs/by-name/la/lambda-delta/package.nix b/pkgs/by-name/la/lambda-delta/package.nix
index f35060da4121..79cad5959801 100644
--- a/pkgs/by-name/la/lambda-delta/package.nix
+++ b/pkgs/by-name/la/lambda-delta/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dseagrav";
     repo = "ld";
-    tag = version;
+    rev = version;
     sha256 = "02m43fj9dzc1i1jl01qwnhjiq1rh03jw1xq59sx2h3bhn7dk941x";
   };
 
diff --git a/pkgs/by-name/la/laminar/package.nix b/pkgs/by-name/la/laminar/package.nix
index 62af738e4a0a..9d5a1d2f7e9b 100644
--- a/pkgs/by-name/la/laminar/package.nix
+++ b/pkgs/by-name/la/laminar/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ohwgiles";
     repo = "laminar";
-    tag = version;
+    rev = version;
     hash = "sha256-eo5WzvmjBEe0LAfZdQ/U0XepEE2kdWKKiyE4HOi3RXk=";
   };
   patches = [ ./patches/no-network.patch ];
diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix
index bcc3ec21e6ca..a32cc9cc4956 100644
--- a/pkgs/by-name/la/lan-mouse/package.nix
+++ b/pkgs/by-name/la/lan-mouse/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "feschber";
     repo = "lan-mouse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ofiNgJbmf35pfRvZB3ZmMkCJuM7yYgNL+Dd5mZZqyNk=";
   };
 
diff --git a/pkgs/by-name/la/lanzaboote-tool/package.nix b/pkgs/by-name/la/lanzaboote-tool/package.nix
index e40a5f2ee3ca..e6883bb8a15e 100644
--- a/pkgs/by-name/la/lanzaboote-tool/package.nix
+++ b/pkgs/by-name/la/lanzaboote-tool/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "lanzaboote";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=";
   };
 
diff --git a/pkgs/by-name/la/lastpass-cli/package.nix b/pkgs/by-name/la/lastpass-cli/package.nix
index 2284cb85bf58..6fb4c732c92a 100644
--- a/pkgs/by-name/la/lastpass-cli/package.nix
+++ b/pkgs/by-name/la/lastpass-cli/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lastpass";
     repo = "lastpass-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Q0ZG5Ehg29STLeAerMoLfzjaH9JyPk7269RgiPmDJV8=";
   };
 
diff --git a/pkgs/by-name/la/laszip/package.nix b/pkgs/by-name/la/laszip/package.nix
index 495a194f99c2..270d715db99e 100644
--- a/pkgs/by-name/la/laszip/package.nix
+++ b/pkgs/by-name/la/laszip/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "LASzip";
     repo = "LASzip";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-9fzal54YaocONtguOCxnP7h1LejQPQ0dKFiCzfvTjCY=";
   };
 
diff --git a/pkgs/by-name/la/latex2html/package.nix b/pkgs/by-name/la/latex2html/package.nix
index 07362c435595..73d2ab3f4238 100644
--- a/pkgs/by-name/la/latex2html/package.nix
+++ b/pkgs/by-name/la/latex2html/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xylIU2GY/1t9mA8zJzEjHwAIlvVxZmUAUdQ/IXEy+Wg=";
   };
 
diff --git a/pkgs/by-name/la/lavanda-gtk-theme/package.nix b/pkgs/by-name/la/lavanda-gtk-theme/package.nix
index e6b9f590640b..3a77a82fc7d1 100644
--- a/pkgs/by-name/la/lavanda-gtk-theme/package.nix
+++ b/pkgs/by-name/la/lavanda-gtk-theme/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "Lavanda-gtk-theme";
-    tag = version;
+    rev = version;
     hash = "sha256-2ryhdgLHSNXdV9QesdB0rpXkr3i2vVqXWDDC5fNuL1c=";
   };
 
diff --git a/pkgs/by-name/la/lavat/package.nix b/pkgs/by-name/la/lavat/package.nix
index 07aacbf3967e..12beae650e52 100644
--- a/pkgs/by-name/la/lavat/package.nix
+++ b/pkgs/by-name/la/lavat/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "AngelJumbo";
     repo = "lavat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wGtuYgZS03gXYgdNdugGu/UlROQTrQ3C1inJ/aTUBKk=";
   };
 
diff --git a/pkgs/by-name/la/layan-gtk-theme/package.nix b/pkgs/by-name/la/layan-gtk-theme/package.nix
index f4cae56bb072..aea277dcadf0 100644
--- a/pkgs/by-name/la/layan-gtk-theme/package.nix
+++ b/pkgs/by-name/la/layan-gtk-theme/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "layan-gtk-theme";
-    tag = version;
+    rev = version;
     sha256 = "sha256-R8QxDMOXzDIfioAvvescLAu6NjJQ9zhf/niQTXZr+yA=";
   };
 
diff --git a/pkgs/by-name/la/lazycli/package.nix b/pkgs/by-name/la/lazycli/package.nix
index e3d867328dc8..8352f93ccfeb 100644
--- a/pkgs/by-name/la/lazycli/package.nix
+++ b/pkgs/by-name/la/lazycli/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazycli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1qq167hc7pp9l0m40ysphfljakmm8hjjnhpldvb0kbc825h0z8z5";
   };
 
diff --git a/pkgs/by-name/la/lazydocker/package.nix b/pkgs/by-name/la/lazydocker/package.nix
index 5d4b3553fccd..d3b35e970731 100644
--- a/pkgs/by-name/la/lazydocker/package.nix
+++ b/pkgs/by-name/la/lazydocker/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazydocker";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cVjDdrxmGt+hj/WWP9B3BT739k9SSr4ryye5qWb3XNM=";
   };
 
diff --git a/pkgs/by-name/la/lazyjj/package.nix b/pkgs/by-name/la/lazyjj/package.nix
index d1ab22328f14..894d869c7958 100644
--- a/pkgs/by-name/la/lazyjj/package.nix
+++ b/pkgs/by-name/la/lazyjj/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Cretezy";
     repo = "lazyjj";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Pz2q+uyr8r5G5Zs5mC/nvHdK6hTpiLBzjgUmvd5dwZw=";
   };
 
diff --git a/pkgs/by-name/la/lazymc/package.nix b/pkgs/by-name/la/lazymc/package.nix
index bb90466cdb4a..d598a4ca7c07 100644
--- a/pkgs/by-name/la/lazymc/package.nix
+++ b/pkgs/by-name/la/lazymc/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "timvisee";
     repo = "lazymc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uMjM3w78qWnB/sNXRcxl30KJRm0I3BPEOr5IRU8FI0s=";
   };
 
diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix
index 9d05b6540300..9ca3eb727e77 100644
--- a/pkgs/by-name/la/lazysql/package.nix
+++ b/pkgs/by-name/la/lazysql/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jorgerojas26";
     repo = "lazysql";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fpzcCCLkUJGuTfQiADwLL2238LP0TJJMYAXUwCfPkFM=";
   };
 
diff --git a/pkgs/by-name/lb/lbzip2/package.nix b/pkgs/by-name/lb/lbzip2/package.nix
index 3b544a0e5664..b08fa3c46516 100644
--- a/pkgs/by-name/lb/lbzip2/package.nix
+++ b/pkgs/by-name/lb/lbzip2/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kjn";
     repo = "lbzip2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8";
   };
 
diff --git a/pkgs/by-name/lc/lcdf-typetools/package.nix b/pkgs/by-name/lc/lcdf-typetools/package.nix
index cd4aaf01053b..4cac4a5b3e09 100644
--- a/pkgs/by-name/lc/lcdf-typetools/package.nix
+++ b/pkgs/by-name/lc/lcdf-typetools/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kohler";
     repo = "lcdf-typetools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hoILYYCef2R1v6aN9V+FoYnXYaKsnGN2jlpb/QFAN/w=";
   };
 
diff --git a/pkgs/by-name/lc/lcdproc/package.nix b/pkgs/by-name/lc/lcdproc/package.nix
index 91ff86e4e062..81c2971b9103 100644
--- a/pkgs/by-name/lc/lcdproc/package.nix
+++ b/pkgs/by-name/lc/lcdproc/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lcdproc";
     repo = "lcdproc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1r885zv1gsh88j43x6fvzbdgfkh712a227d369h4fdcbnnfd0kpm";
   };
 
diff --git a/pkgs/by-name/lc/lcm/package.nix b/pkgs/by-name/lc/lcm/package.nix
index 66c5d8409a2c..dd2c4df711f6 100644
--- a/pkgs/by-name/lc/lcm/package.nix
+++ b/pkgs/by-name/lc/lcm/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lcm-proj";
     repo = "lcm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-043AJzalfx+qcCoxQgPU4T/DcUH0pXOE4v1aJaW3aXs=";
   };
 
diff --git a/pkgs/by-name/lc/lcov/package.nix b/pkgs/by-name/lc/lcov/package.nix
index 49fbaa9205f0..bde039d51a66 100644
--- a/pkgs/by-name/lc/lcov/package.nix
+++ b/pkgs/by-name/lc/lcov/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-test-project";
     repo = "lcov";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-31318or9AQ7iyu9DNQEvf5jaDzrneOOqOXu0HF1eag4=";
   };
 
diff --git a/pkgs/by-name/ld/ldacbt/package.nix b/pkgs/by-name/ld/ldacbt/package.nix
index f92c1f564af8..a4aa2b645198 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09dalysx4fgrgpfdm9a51x6slnf4iik1sqba4xjgabpvq91bnb63";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ld/ldproxy/package.nix b/pkgs/by-name/ld/ldproxy/package.nix
index 5f88b255bf57..a1816eccef18 100644
--- a/pkgs/by-name/ld/ldproxy/package.nix
+++ b/pkgs/by-name/ld/ldproxy/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "embuild";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YH2CPb3uBlPncd+KkP25xhCVvDB7HDxJuSqWOJ1LT3k=";
   };
 
diff --git a/pkgs/by-name/le/leaf/package.nix b/pkgs/by-name/le/leaf/package.nix
index c7db20645ffa..31cac3531b68 100644
--- a/pkgs/by-name/le/leaf/package.nix
+++ b/pkgs/by-name/le/leaf/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "IogaMaster";
     repo = "leaf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-y0NO9YcOO7T7Cqc+/WeactwBAkeUqdCca87afOlO1Bk=";
   };
 
diff --git a/pkgs/by-name/le/leaps/package.nix b/pkgs/by-name/le/leaps/package.nix
index b3c58dafafa6..6c053c8343c2 100644
--- a/pkgs/by-name/le/leaps/package.nix
+++ b/pkgs/by-name/le/leaps/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Jeffail";
     repo = "leaps";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9AYE8+K6B6/odwNR+UhTTqmJ1RD6HhKvtC3WibWUZic=";
   };
 
diff --git a/pkgs/by-name/le/leatherman/package.nix b/pkgs/by-name/le/leatherman/package.nix
index 19bc24ffbffe..b73192f0b788 100644
--- a/pkgs/by-name/le/leatherman/package.nix
+++ b/pkgs/by-name/le/leatherman/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "sha256-rfh4JLnLekx9UhyLH6eDJUeItPROmY/Lc6mcWpbGb3s=";
-    tag = version;
+    rev = version;
     repo = "leatherman";
     owner = "puppetlabs";
   };
diff --git a/pkgs/by-name/le/ledger-autosync/package.nix b/pkgs/by-name/le/ledger-autosync/package.nix
index 58c1b1d84d11..16c273f75a78 100644
--- a/pkgs/by-name/le/ledger-autosync/package.nix
+++ b/pkgs/by-name/le/ledger-autosync/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "egh";
     repo = "ledger-autosync";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bbFjDdxYr85OPjdvY3JYtCe/8Epwi+8JN60PKVKbqe0=";
   };
 
diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix
index 2807230604b5..ab0bac61435d 100644
--- a/pkgs/by-name/le/ledger/package.nix
+++ b/pkgs/by-name/le/ledger/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ledger";
     repo = "ledger";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Uym4s8EyzXHlISZqThcb6P1H5bdgD9vmdIOLkk5ikG0=";
   };
 
diff --git a/pkgs/by-name/le/ledger2beancount/package.nix b/pkgs/by-name/le/ledger2beancount/package.nix
index 9932a0ba4e65..ee6c17494df0 100644
--- a/pkgs/by-name/le/ledger2beancount/package.nix
+++ b/pkgs/by-name/le/ledger2beancount/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "beancount";
     repo = "ledger2beancount";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2LIP3ljK1HMAwjk2ueIf9pFL+UUnGDgx9GYNtRztdFY=";
   };
 
diff --git a/pkgs/by-name/le/ledmon/package.nix b/pkgs/by-name/le/ledmon/package.nix
index a377b2ab0856..767467c7ffec 100644
--- a/pkgs/by-name/le/ledmon/package.nix
+++ b/pkgs/by-name/le/ledmon/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "ledmon";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1lz59606vf2sws5xwijxyffm8kxcf8p9qbdpczsq1b5mm3dk6lvp";
   };
 
diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix
index b4b641e371af..8293ff5bd89a 100644
--- a/pkgs/by-name/le/leetgo/package.nix
+++ b/pkgs/by-name/le/leetgo/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "j178";
     repo = "leetgo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KEfRsaBsMCKO66HW71gNzHzZkun1yo6a05YqAvafomM=";
   };
 
diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index 5857eddff7c5..cfdd201fcd93 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -15,7 +15,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "evilmartians";
     repo = "lefthook";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JBDEVgMUVZceXSppq26xJcsKRlHmIBK5UN5uehmG/VU=";
   };
 
diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix
index bef9442cc1f5..99e1862dd5f9 100644
--- a/pkgs/by-name/le/legba/package.nix
+++ b/pkgs/by-name/le/legba/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "legba";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ioH/dy+d20p81iLLIcer+1fVib60TJ5Ezr6UlsL+F9g=";
   };
 
diff --git a/pkgs/by-name/le/legendary-heroic/package.nix b/pkgs/by-name/le/legendary-heroic/package.nix
index e7eddad54a40..c0fbd88df158 100644
--- a/pkgs/by-name/le/legendary-heroic/package.nix
+++ b/pkgs/by-name/le/legendary-heroic/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "legendary";
-    tag = version;
+    rev = version;
     sha256 = "sha256-+aywgd5RZfkmVuA0MaF2/Ie4a5If/zQxvVCcTfGpQpE=";
   };
 
diff --git a/pkgs/by-name/le/legit-web/package.nix b/pkgs/by-name/le/legit-web/package.nix
index f436b61d7c30..e39960f67ef2 100644
--- a/pkgs/by-name/le/legit-web/package.nix
+++ b/pkgs/by-name/le/legit-web/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "legit";
     owner = "icyphox";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2XeIAeneSKf8TSWOunvRJ7N+3IrmOUjS79ZubsGne9E=";
   };
 
diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix
index e1ce477d849b..3ad399a88725 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";
-    tag = version;
+    rev = version;
     hash = "sha256-xGC3ZGQ1dA0485/IPHsmX2NO1QOPp/nHMLBZvcC4Om8=";
     # Lemminx reads this git information at runtime from a git.properties
     # file on the classpath
diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix
index 61c75c07319d..5e4d0d09e11e 100644
--- a/pkgs/by-name/le/lemmy-help/package.nix
+++ b/pkgs/by-name/le/lemmy-help/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "numToStr";
     repo = "lemmy-help";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HcIvHuuzQj4HsRJyn1A9nXiGDGAcz1nqTsC7sROt7OI=";
   };
 
diff --git a/pkgs/by-name/le/lensfun/package.nix b/pkgs/by-name/le/lensfun/package.nix
index 3c9a70703927..c6d058c55b67 100644
--- a/pkgs/by-name/le/lensfun/package.nix
+++ b/pkgs/by-name/le/lensfun/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "lensfun";
     repo = "lensfun";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FyYilIz9ssSHG6S02Z2bXy7fjSY51+SWW3v8bm7sLvY=";
   };
 
diff --git a/pkgs/by-name/le/leptonica/package.nix b/pkgs/by-name/le/leptonica/package.nix
index b8570d136b5f..c9950cba2174 100644
--- a/pkgs/by-name/le/leptonica/package.nix
+++ b/pkgs/by-name/le/leptonica/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DanBloomBerg";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-meiSi0qL4i/KCMe5wsRK1/mbuRLHUb55DDOnxkrXZSs=";
   };
 
diff --git a/pkgs/by-name/le/leptosfmt/package.nix b/pkgs/by-name/le/leptosfmt/package.nix
index 48d9b4344838..99e546aa1600 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";
-    tag = version;
+    rev = version;
     hash = "sha256-+trLQFU8oP45xHQ3DsEESQzQX2WpvQcfpgGC9o5ITcY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/le/lessc/package.nix b/pkgs/by-name/le/lessc/package.nix
index 082f6d6d96ff..ae8dd4d91fc1 100644
--- a/pkgs/by-name/le/lessc/package.nix
+++ b/pkgs/by-name/le/lessc/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "less";
     repo = "less.js";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vO/1laFb1yC+OESXTx9KuGdwSNC9Iv49F3V7kfXnyJU=";
   };
   sourceRoot = "${src.name}/packages/less";
diff --git a/pkgs/by-name/le/lesspass-cli/package.nix b/pkgs/by-name/le/lesspass-cli/package.nix
index b435a9fe7a82..5ef005aec7e8 100644
--- a/pkgs/by-name/le/lesspass-cli/package.nix
+++ b/pkgs/by-name/le/lesspass-cli/package.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = repo;
     repo = repo;
-    tag = version;
+    rev = version;
     sha256 = "126zk248s9r72qk9b8j27yvb8gglw49kazwz0sd69b5kkxvhz2dh";
   };
   sourceRoot = "${src.name}/cli";
diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix
index 6dc1e9236ef7..862d3119052b 100644
--- a/pkgs/by-name/le/lesspipe/package.nix
+++ b/pkgs/by-name/le/lesspipe/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wofr06";
     repo = "lesspipe";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GCtcIXGrMH6LOKxjnB2SkUSChQnMj5d939i2atvqK+Q=";
   };
 
diff --git a/pkgs/by-name/le/levant/package.nix b/pkgs/by-name/le/levant/package.nix
index 6fafe83d858d..b998742f1c45 100644
--- a/pkgs/by-name/le/levant/package.nix
+++ b/pkgs/by-name/le/levant/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "levant";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pinrBLzBMptqzMMiQmZob6B5rNNyQsaEkuECFFyTkrw=";
   };
 
diff --git a/pkgs/by-name/le/leveldb/package.nix b/pkgs/by-name/le/leveldb/package.nix
index de005198555a..899135413fbc 100644
--- a/pkgs/by-name/le/leveldb/package.nix
+++ b/pkgs/by-name/le/leveldb/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "leveldb";
-    tag = version;
+    rev = version;
     sha256 = "sha256-RL+dfSFZZzWvUobSqiPbuC4nDiGzjIIukbVJZRacHbI=";
   };
 
diff --git a/pkgs/by-name/le/lexido/package.nix b/pkgs/by-name/le/lexido/package.nix
index 1435d0c4b67f..103d44b4763d 100644
--- a/pkgs/by-name/le/lexido/package.nix
+++ b/pkgs/by-name/le/lexido/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "micr0-dev";
     repo = "lexido";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zJP14dbC/Oz15CA3PRD0RfEYOrfulL2fWYHwFxhLKO4=";
   };
 
diff --git a/pkgs/by-name/li/lianad/package.nix b/pkgs/by-name/li/lianad/package.nix
index d9fee6484568..a22b73bb4982 100644
--- a/pkgs/by-name/li/lianad/package.nix
+++ b/pkgs/by-name/li/lianad/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wizardsardine";
     repo = "liana";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nuwbJxpcapk01qwGAZ2z9nKjHNqE1BMikz3hWrCAGsA=";
   };
 
diff --git a/pkgs/by-name/li/lib3270/package.nix b/pkgs/by-name/li/lib3270/package.nix
index a5d29a19a49f..62fc3147541d 100644
--- a/pkgs/by-name/li/lib3270/package.nix
+++ b/pkgs/by-name/li/lib3270/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PerryWerneck";
     repo = "lib3270";
-    tag = version;
+    rev = version;
     hash = "sha256-w6Bg+TvSDAuZwtu/nyAIuq6pgheM5nXtfuryECfnKng=";
   };
 
diff --git a/pkgs/by-name/li/libGDSII/package.nix b/pkgs/by-name/li/libGDSII/package.nix
index 3daee22fa242..bbf2e36a86be 100644
--- a/pkgs/by-name/li/libGDSII/package.nix
+++ b/pkgs/by-name/li/libGDSII/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "HomerReid";
     repo = "libGDSII";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EXEt7l69etcBdDdEDlD1ODOdhTBZCVjgY1jhRUDd/W0=";
   };
 
diff --git a/pkgs/by-name/li/libad9361/package.nix b/pkgs/by-name/li/libad9361/package.nix
index 968891b4491e..6b0e62dcd159 100644
--- a/pkgs/by-name/li/libad9361/package.nix
+++ b/pkgs/by-name/li/libad9361/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "analogdevicesinc";
     repo = "libad9361-iio";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9e66qSrKpczatZY9lPAzi/6f7lHChnl2+Pih53oa28Y=";
   };
 
diff --git a/pkgs/by-name/li/libaosd/package.nix b/pkgs/by-name/li/libaosd/package.nix
index 06de075d0ebb..bc6aa9c97dd7 100644
--- a/pkgs/by-name/li/libaosd/package.nix
+++ b/pkgs/by-name/li/libaosd/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "atheme-legacy";
     repo = "libaosd";
-    tag = version;
+    rev = version;
     sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a";
   };
 
diff --git a/pkgs/by-name/li/libappimage/package.nix b/pkgs/by-name/li/libappimage/package.nix
index 08e9e563fe9f..8d2a1013aff8 100644
--- a/pkgs/by-name/li/libappimage/package.nix
+++ b/pkgs/by-name/li/libappimage/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AppImageCommunity";
     repo = "libappimage";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-V9Ilo0zFo9Urke+jCA4CSQB5tpzLC/S5jmon+bA+TEU=";
   };
 
diff --git a/pkgs/by-name/li/libargon2/package.nix b/pkgs/by-name/li/libargon2/package.nix
index fcd9545f54ad..0dbedc23577c 100644
--- a/pkgs/by-name/li/libargon2/package.nix
+++ b/pkgs/by-name/li/libargon2/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "P-H-C";
     repo = "phc-winner-argon2";
-    tag = version;
+    rev = version;
     sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i";
   };
 
diff --git a/pkgs/by-name/li/libargs/package.nix b/pkgs/by-name/li/libargs/package.nix
index 38ea107d88f0..a6841f541bf7 100644
--- a/pkgs/by-name/li/libargs/package.nix
+++ b/pkgs/by-name/li/libargs/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Taywee";
     repo = "args";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2gH3h3QAl0+XVULt/fR2UUGKNIxTUmnRRdxPOFdpVy4=";
   };
 
diff --git a/pkgs/by-name/li/libaribcaption/package.nix b/pkgs/by-name/li/libaribcaption/package.nix
index 454049fe1274..353f31c0e128 100644
--- a/pkgs/by-name/li/libaribcaption/package.nix
+++ b/pkgs/by-name/li/libaribcaption/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xqq";
     repo = "libaribcaption";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-x6l0ZrTktSsqfDLVRXpQtUOruhfc8RF3yT991UVZiKA=";
   };
 
diff --git a/pkgs/by-name/li/libast/package.nix b/pkgs/by-name/li/libast/package.nix
index 4e0015d8b52b..c7bbce07f119 100644
--- a/pkgs/by-name/li/libast/package.nix
+++ b/pkgs/by-name/li/libast/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mej";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-rnqToFi+d6D6O+JDHQxkVjTc/0RBag6Jqv4uDcE4PNc=";
   };
 
diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix
index 53563268a58a..131574187409 100644
--- a/pkgs/by-name/li/libation/package.nix
+++ b/pkgs/by-name/li/libation/package.nix
@@ -17,7 +17,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "rmcrackan";
     repo = "Libation";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FD3f2Cba1xN15BloyRQ/m/vDovhN8x0AlfeJk+LGVV4=";
   };
 
diff --git a/pkgs/by-name/li/libaudec/package.nix b/pkgs/by-name/li/libaudec/package.nix
index b804dcc12ec0..073191c7a9d3 100644
--- a/pkgs/by-name/li/libaudec/package.nix
+++ b/pkgs/by-name/li/libaudec/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zrythm";
     repo = "libaudec";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8morbrq8zG+2N3ruMeJa85ci9P0wPQOfZ5H56diFEAo=";
   };
 
diff --git a/pkgs/by-name/li/libavif/package.nix b/pkgs/by-name/li/libavif/package.nix
index 0f4c5304cb3c..ab244bcc28ba 100644
--- a/pkgs/by-name/li/libavif/package.nix
+++ b/pkgs/by-name/li/libavif/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AOMediaCodec";
     repo = "libavif";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kop1S4A/+hP2YdgoMXP7OMVPc2eoRnHpoBrPnW6KWyM=";
   };
 
diff --git a/pkgs/by-name/li/libayatana-appindicator/package.nix b/pkgs/by-name/li/libayatana-appindicator/package.nix
index 52aa0a365a07..86eb9214c197 100644
--- a/pkgs/by-name/li/libayatana-appindicator/package.nix
+++ b/pkgs/by-name/li/libayatana-appindicator/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "libayatana-appindicator";
-    tag = version;
+    rev = version;
     sha256 = "sha256-NzaWQBb2Ez1ik23wCgW1ZQh1/rY7GcPlLvaSgV7uXrA=";
   };
 
diff --git a/pkgs/by-name/li/libayatana-indicator/package.nix b/pkgs/by-name/li/libayatana-indicator/package.nix
index 402ca77c49b4..852c61d3ea13 100644
--- a/pkgs/by-name/li/libayatana-indicator/package.nix
+++ b/pkgs/by-name/li/libayatana-indicator/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "libayatana-indicator";
-    tag = version;
+    rev = version;
     sha256 = "sha256-OsguZ+jl274uPSCTFHq/ZwUE3yHR7MlUPHCpfmn1F7A=";
   };
 
diff --git a/pkgs/by-name/li/libb64/package.nix b/pkgs/by-name/li/libb64/package.nix
index 5786052163ec..2f73c45d0d9e 100644
--- a/pkgs/by-name/li/libb64/package.nix
+++ b/pkgs/by-name/li/libb64/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libb64";
     repo = "libb64";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9loDftr769qnIi00MueO86kjha2EiG9pnCLogp0Iq3c=";
   };
 
diff --git a/pkgs/by-name/li/libbase58/package.nix b/pkgs/by-name/li/libbase58/package.nix
index 427c009af46a..94f7c4ec8bc7 100644
--- a/pkgs/by-name/li/libbase58/package.nix
+++ b/pkgs/by-name/li/libbase58/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bitcoin";
     repo = "libbase58";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CU55V89GbcYnrhwTPFMd13EGeCk/x9nQswUZ2JsYsUU=";
   };
 
diff --git a/pkgs/by-name/li/libbaseencode/package.nix b/pkgs/by-name/li/libbaseencode/package.nix
index 32aa0466fd97..d37276b64c2a 100644
--- a/pkgs/by-name/li/libbaseencode/package.nix
+++ b/pkgs/by-name/li/libbaseencode/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "paolostivanin";
     repo = "libbaseencode";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WiE+ZMX4oZieER1pu43aSWytkxfkQdX+S3JI98XPpL4=";
   };
 
diff --git a/pkgs/by-name/li/libblockdev/package.nix b/pkgs/by-name/li/libblockdev/package.nix
index 2b03aa45a844..c44e74aa0e59 100644
--- a/pkgs/by-name/li/libblockdev/package.nix
+++ b/pkgs/by-name/li/libblockdev/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "libblockdev";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Q7610i+2PQi+Oza3c2SwPneljrb+1cuFA4K4DQTpt8A=";
   };
 
diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix
index b3268c19459c..08f53f158f14 100644
--- a/pkgs/by-name/li/libbytesize/package.nix
+++ b/pkgs/by-name/li/libbytesize/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "libbytesize";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-scOnucn7xp6KKEtkpwfyrdzcntJF2l0h0fsQotcceLc=";
   };
 
diff --git a/pkgs/by-name/li/libcaca/package.nix b/pkgs/by-name/li/libcaca/package.nix
index 024579e10370..d72b124854f0 100644
--- a/pkgs/by-name/li/libcaca/package.nix
+++ b/pkgs/by-name/li/libcaca/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cacalabs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw=";
   };
 
diff --git a/pkgs/by-name/li/libcaption/package.nix b/pkgs/by-name/li/libcaption/package.nix
index adcf4f7f22c2..8218389e4304 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";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libccd/package.nix b/pkgs/by-name/li/libccd/package.nix
index c1b9b9fae779..8040dd7adcd6 100644
--- a/pkgs/by-name/li/libccd/package.nix
+++ b/pkgs/by-name/li/libccd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "danfis";
     repo = "libccd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0sfmn5pd7k5kyhbxnd689xmsa5v843r7sska96dlysqpljd691jc";
   };
 
diff --git a/pkgs/by-name/li/libcdada/package.nix b/pkgs/by-name/li/libcdada/package.nix
index c03efc84939b..e944a448710e 100644
--- a/pkgs/by-name/li/libcdada/package.nix
+++ b/pkgs/by-name/li/libcdada/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "msune";
     repo = "libcdada";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-x//22FvgxIGL9H2whMAVCTyI9gAjlMWkEmpOAcoeOgE=";
   };
 
diff --git a/pkgs/by-name/li/libcgroup/package.nix b/pkgs/by-name/li/libcgroup/package.nix
index 75c8f08c1d19..a796c9f5b9f0 100644
--- a/pkgs/by-name/li/libcgroup/package.nix
+++ b/pkgs/by-name/li/libcgroup/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libcgroup";
     repo = "libcgroup";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-CnejQcOyW3QzHuvsAdKe4M4XgmG9ufRaEBdO48+8ZqQ=";
   };
diff --git a/pkgs/by-name/li/libchardet/package.nix b/pkgs/by-name/li/libchardet/package.nix
index 49face3750cd..ba922c6f98cf 100644
--- a/pkgs/by-name/li/libchardet/package.nix
+++ b/pkgs/by-name/li/libchardet/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Joungkyun";
     repo = "libchardet";
-    tag = version;
+    rev = version;
     sha256 = "sha256-JhEiWM3q8X+eEBHxv8k9yYOaTGoJOzI+/iFYC0gZJJs=";
   };
 
diff --git a/pkgs/by-name/li/libcint/package.nix b/pkgs/by-name/li/libcint/package.nix
index 15dd86cbbb6e..a8460668b908 100644
--- a/pkgs/by-name/li/libcint/package.nix
+++ b/pkgs/by-name/li/libcint/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sunqm";
     repo = "libcint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-URJcC0ib87ejrTCglCjhC2tQHNc5TRvo4CQ52N58n+4=";
   };
 
diff --git a/pkgs/by-name/li/libcircle/package.nix b/pkgs/by-name/li/libcircle/package.nix
index 5330271b5c4c..fc59d955226c 100644
--- a/pkgs/by-name/li/libcircle/package.nix
+++ b/pkgs/by-name/li/libcircle/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hpc";
     repo = "libcircle";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EfnoNL6wo6qQES6XzMtpTpYcsJ8V2gy32i26wiTldH0=";
   };
 
diff --git a/pkgs/by-name/li/libck/package.nix b/pkgs/by-name/li/libck/package.nix
index dfd95d5ab0fe..13963ef721c1 100644
--- a/pkgs/by-name/li/libck/package.nix
+++ b/pkgs/by-name/li/libck/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "concurrencykit";
     repo = "ck";
-    tag = version;
+    rev = version;
     sha256 = "sha256-lxJ8WsZ3pBGf4sFYj5+tR37EYDZqpksaoohiIKA4pRI=";
   };
 
diff --git a/pkgs/by-name/li/libcmis/package.nix b/pkgs/by-name/li/libcmis/package.nix
index 17694faf89b5..6eb64381b979 100644
--- a/pkgs/by-name/li/libcmis/package.nix
+++ b/pkgs/by-name/li/libcmis/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tdf";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw=";
   };
 
diff --git a/pkgs/by-name/li/libconfuse/package.nix b/pkgs/by-name/li/libconfuse/package.nix
index 7075ad658963..3a13c2a67780 100644
--- a/pkgs/by-name/li/libconfuse/package.nix
+++ b/pkgs/by-name/li/libconfuse/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "1npfk5jv59kk4n8pkyx89fn9s6p8x3gbffs42jaw24frgxfgp8ca";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "libconfuse";
     owner = "martinh";
   };
diff --git a/pkgs/by-name/li/libcork/package.nix b/pkgs/by-name/li/libcork/package.nix
index 1d0d8bb3a12d..ffcf1683533b 100644
--- a/pkgs/by-name/li/libcork/package.nix
+++ b/pkgs/by-name/li/libcork/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dcreager";
     repo = "libcork";
-    tag = version;
+    rev = version;
     sha256 = "152gqnmr6wfmflf5l6447am4clmg3p69pvy3iw7yhaawjqa797sk";
   };
 
diff --git a/pkgs/by-name/li/libcotp/package.nix b/pkgs/by-name/li/libcotp/package.nix
index 5fa5b4149837..176ecf3f699d 100644
--- a/pkgs/by-name/li/libcotp/package.nix
+++ b/pkgs/by-name/li/libcotp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "paolostivanin";
     repo = "libcotp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Ol/vWaXcbDcy+d8V//fK4SYUpnYmwuYJxkO3/+kqgdM=";
   };
 
diff --git a/pkgs/by-name/li/libcouchbase/package.nix b/pkgs/by-name/li/libcouchbase/package.nix
index 75539f7d07c4..295bab16ea77 100644
--- a/pkgs/by-name/li/libcouchbase/package.nix
+++ b/pkgs/by-name/li/libcouchbase/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
-    tag = version;
+    rev = version;
     sha256 = "sha256-dvXRbAdgb1WmKLijYkx6+js60ZxK1Tl2aTFSF7EpN74=";
   };
 
diff --git a/pkgs/by-name/li/libcpr/package.nix b/pkgs/by-name/li/libcpr/package.nix
index 8b3c7fa4870c..7c917f58ea67 100644
--- a/pkgs/by-name/li/libcpr/package.nix
+++ b/pkgs/by-name/li/libcpr/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "libcpr";
     repo = "cpr";
-    tag = version;
+    rev = version;
     hash = "sha256-nKX9AYVC4e3B+vOzXWZu8S4I5BNpKnqkFJ2e8bVAUE4=";
   };
 
diff --git a/pkgs/by-name/li/libcpr_1_10_5/package.nix b/pkgs/by-name/li/libcpr_1_10_5/package.nix
index ec7a1181e132..2164dcce331a 100644
--- a/pkgs/by-name/li/libcpr_1_10_5/package.nix
+++ b/pkgs/by-name/li/libcpr_1_10_5/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "libcpr";
     repo = "cpr";
-    tag = version;
+    rev = version;
     hash = "sha256-mAuU2uF8d+aHvCmotgIrBi/pUp1jkP6G0f98M76zjOw=";
   };
 
diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix
index ac1cb93104e5..f7240bdabf54 100644
--- a/pkgs/by-name/li/libcpuid/package.nix
+++ b/pkgs/by-name/li/libcpuid/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "anrieff";
     repo = "libcpuid";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/28yo1V4/xYMirt2bNTB/l9Xl8NgRmxTitOW21TY8gE=";
   };
 
diff --git a/pkgs/by-name/li/libcsptr/package.nix b/pkgs/by-name/li/libcsptr/package.nix
index 81db33a90b1a..d055ec74479f 100644
--- a/pkgs/by-name/li/libcsptr/package.nix
+++ b/pkgs/by-name/li/libcsptr/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Snaipe";
     repo = "libcsptr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0i1498h2i6zq3fn3zf3iw7glv6brn597165hnibgwccqa8sh3ich";
   };
 
diff --git a/pkgs/by-name/li/libctl/package.nix b/pkgs/by-name/li/libctl/package.nix
index 77d9a9a0cfd4..0ae65471c74c 100644
--- a/pkgs/by-name/li/libctl/package.nix
+++ b/pkgs/by-name/li/libctl/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = "libctl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "uOydBWYPXSBUi+4MM6FNx6B5l2to7Ny9Uc1MMTV9bGA=";
   };
 
diff --git a/pkgs/by-name/li/libcue/package.nix b/pkgs/by-name/li/libcue/package.nix
index 1a38630a2900..e21cbea72161 100644
--- a/pkgs/by-name/li/libcue/package.nix
+++ b/pkgs/by-name/li/libcue/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lipnitsk";
     repo = "libcue";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZMUUa8CmpFNparPsM/P2yvRto9E85EdTxpID5sKQbNI=";
   };
 
diff --git a/pkgs/by-name/li/libcyaml/package.nix b/pkgs/by-name/li/libcyaml/package.nix
index ef41d42ba829..beb458f400fc 100644
--- a/pkgs/by-name/li/libcyaml/package.nix
+++ b/pkgs/by-name/li/libcyaml/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tlsa";
     repo = "libcyaml";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JIN/cvh9PRl4/K0Z3WZtSCA3casBxyaxNxjXZZdQRWQ=";
   };
 
diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix
index af8dd198ef1a..d90b6e0faef7 100644
--- a/pkgs/by-name/li/libdatachannel/package.nix
+++ b/pkgs/by-name/li/libdatachannel/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "paullouisageneau";
     repo = "libdatachannel";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Xn2RfPFvCIx7gTFqxXbFVJZDkphZR94SAHJ+0ombf+8=";
   };
 
diff --git a/pkgs/by-name/li/libdict/package.nix b/pkgs/by-name/li/libdict/package.nix
index 5debdbb59383..3548d65073ef 100644
--- a/pkgs/by-name/li/libdict/package.nix
+++ b/pkgs/by-name/li/libdict/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "libdict";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-GFK2yjtxAwwstoJQGCXxwNKxn3LL74FBxad7JdOn0pU=";
   };
 
diff --git a/pkgs/by-name/li/libdivsufsort/package.nix b/pkgs/by-name/li/libdivsufsort/package.nix
index 12c2c5650039..9a229a015875 100644
--- a/pkgs/by-name/li/libdivsufsort/package.nix
+++ b/pkgs/by-name/li/libdivsufsort/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "y-256";
     repo = "libdivsufsort";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-4p+L1bq9SBgWSHXx+WYWAe60V2g1AN+zlJvC+F367Tk=";
   };
 
diff --git a/pkgs/by-name/li/libdmtx/package.nix b/pkgs/by-name/li/libdmtx/package.nix
index b551b59bf1dd..62d1c3e05b44 100644
--- a/pkgs/by-name/li/libdmtx/package.nix
+++ b/pkgs/by-name/li/libdmtx/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dmtx";
     repo = "libdmtx";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/sV+t7RAr5dTwfUsGz0KEZYgm0DzQWRdiwrbbEbC1OY=";
   };
 
diff --git a/pkgs/by-name/li/libdynd/package.nix b/pkgs/by-name/li/libdynd/package.nix
index 70301b274777..8bfc3412e341 100644
--- a/pkgs/by-name/li/libdynd/package.nix
+++ b/pkgs/by-name/li/libdynd/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libdynd";
     repo = "libdynd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0fkd5rawqni1cq51fmr76iw7ll4fmbahfwv4rglnsabbkylf73pr";
   };
 
diff --git a/pkgs/by-name/li/libebur128/package.nix b/pkgs/by-name/li/libebur128/package.nix
index ab9d2c2dcd8e..c99256063037 100644
--- a/pkgs/by-name/li/libebur128/package.nix
+++ b/pkgs/by-name/li/libebur128/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jiixyj";
     repo = "libebur128";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y=";
   };
 
diff --git a/pkgs/by-name/li/libedgetpu/package.nix b/pkgs/by-name/li/libedgetpu/package.nix
index 04c3f7654b10..563e4d56dda1 100644
--- a/pkgs/by-name/li/libedgetpu/package.nix
+++ b/pkgs/by-name/li/libedgetpu/package.nix
@@ -19,7 +19,7 @@ let
     src = fetchFromGitHub {
       owner = "google";
       repo = "flatbuffers";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE=";
     };
   });
diff --git a/pkgs/by-name/li/libemf2svg/package.nix b/pkgs/by-name/li/libemf2svg/package.nix
index 1196a01a3f5d..fcddf49be644 100644
--- a/pkgs/by-name/li/libemf2svg/package.nix
+++ b/pkgs/by-name/li/libemf2svg/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kakwa";
     repo = "libemf2svg";
-    tag = version;
+    rev = version;
     sha256 = "04g6dp5xadszqjyjl162x26mfhhwinia65hbkl3mv70bs4an9898";
   };
 
diff --git a/pkgs/by-name/li/liberation-sans-narrow/package.nix b/pkgs/by-name/li/liberation-sans-narrow/package.nix
index bec055c12b3b..d984362686ce 100644
--- a/pkgs/by-name/li/liberation-sans-narrow/package.nix
+++ b/pkgs/by-name/li/liberation-sans-narrow/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "liberationfonts";
     repo = "liberation-sans-narrow";
-    tag = version;
+    rev = version;
     sha256 = "1qw554jbdnqkg6pjjl4cqkgsalq3398kzvww2naw30vykcz752bm";
   };
 
diff --git a/pkgs/by-name/li/liberfa/package.nix b/pkgs/by-name/li/liberfa/package.nix
index 21441ee0416e..7a31b881b1e2 100644
--- a/pkgs/by-name/li/liberfa/package.nix
+++ b/pkgs/by-name/li/liberfa/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "liberfa";
     repo = "erfa";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-NtHYgiN5mo3kWC2H+5TUDbU1nFrwuhNyOIhg2jZbssM=";
   };
 
diff --git a/pkgs/by-name/li/libesmtp/package.nix b/pkgs/by-name/li/libesmtp/package.nix
index 02f7993d03c0..981521b177c4 100644
--- a/pkgs/by-name/li/libesmtp/package.nix
+++ b/pkgs/by-name/li/libesmtp/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libesmtp";
     repo = "libESMTP";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1bhh8hlsl9597x0bnfl563k2c09b61qnkb9mfyqcmzlq63m1zw5y";
   };
 
diff --git a/pkgs/by-name/li/libetebase/package.nix b/pkgs/by-name/li/libetebase/package.nix
index ec67e4071d91..7e96c533262a 100644
--- a/pkgs/by-name/li/libetebase/package.nix
+++ b/pkgs/by-name/li/libetebase/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "etesync";
     repo = "libetebase";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sqvfzXHqVeiw+VKWPtCYv0USNpbfBE7ILUiqXZtLmgI=";
   };
 
diff --git a/pkgs/by-name/li/libetpan/package.nix b/pkgs/by-name/li/libetpan/package.nix
index 7f96bbd18e0f..e1612b75b231 100644
--- a/pkgs/by-name/li/libetpan/package.nix
+++ b/pkgs/by-name/li/libetpan/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dinhviethoa";
     repo = "libetpan";
-    tag = version;
+    rev = version;
     hash = "sha256-lukeWURNsRPTuFk2q2XVnwkKz5Y+PRiPba5GPQCw6jw=";
   };
 
diff --git a/pkgs/by-name/li/libevdevc/package.nix b/pkgs/by-name/li/libevdevc/package.nix
index 63ca82465383..0eb423dd6720 100644
--- a/pkgs/by-name/li/libevdevc/package.nix
+++ b/pkgs/by-name/li/libevdevc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hugegreenbug";
     repo = "libevdevc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0ry30krfizh87yckmmv8n082ad91mqhhbbynx1lfidqzb6gdy2dd";
   };
 
diff --git a/pkgs/by-name/li/libexsid/package.nix b/pkgs/by-name/li/libexsid/package.nix
index 17896f9c71dd..e6bd0eb7997f 100644
--- a/pkgs/by-name/li/libexsid/package.nix
+++ b/pkgs/by-name/li/libexsid/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "exsid-driver";
-    tag = version;
+    rev = version;
     sha256 = "1qbiri549fma8c72nmj3cpz3sn1vc256kfafnygkmkzg7wdmgi7r";
   };
 
diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix
index 7632da882e43..a9bec3b1ecc7 100644
--- a/pkgs/by-name/li/libfabric/package.nix
+++ b/pkgs/by-name/li/libfabric/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ofiwg";
     repo = "libfabric";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TK45SCPyFIMhliBYBEMPSKX/UtHGPj075SlTNB92O0Y=";
   };
 
diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix
index 75b8a608cbbf..9eba7b189c1f 100644
--- a/pkgs/by-name/li/libfaketime/package.nix
+++ b/pkgs/by-name/li/libfaketime/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wolfcw";
     repo = "libfaketime";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ=";
   };
 
diff --git a/pkgs/by-name/li/libfann/package.nix b/pkgs/by-name/li/libfann/package.nix
index 5075b71fc489..2cccdac05c1d 100644
--- a/pkgs/by-name/li/libfann/package.nix
+++ b/pkgs/by-name/li/libfann/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libfann";
     repo = "fann";
-    tag = version;
+    rev = version;
     sha256 = "0awbs0vjsrdglqiaybb0ln13ciizmyrw9ahllahvgbq4nr0nvf6y";
   };
 
diff --git a/pkgs/by-name/li/libff/package.nix b/pkgs/by-name/li/libff/package.nix
index 77984c840e90..3a48a3145a44 100644
--- a/pkgs/by-name/li/libff/package.nix
+++ b/pkgs/by-name/li/libff/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scipr-lab";
     repo = "libff";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0dczi829497vqlmn6n4fgi89bc2h9f13gx30av5z2h6ikik7crgn";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libfixposix/package.nix b/pkgs/by-name/li/libfixposix/package.nix
index 19fcb24f7cd5..db66032af7e8 100644
--- a/pkgs/by-name/li/libfixposix/package.nix
+++ b/pkgs/by-name/li/libfixposix/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sionescu";
     repo = "libfixposix";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5qA6ytbqE+/05XQGxP9/4vEs9gFcuI3k7eJJYucW7fM=";
   };
 
diff --git a/pkgs/by-name/li/libfreeaptx/package.nix b/pkgs/by-name/li/libfreeaptx/package.nix
index 8f1e445a21bb..3c7291f060e7 100644
--- a/pkgs/by-name/li/libfreeaptx/package.nix
+++ b/pkgs/by-name/li/libfreeaptx/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iamthehorker";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo=";
   };
 
diff --git a/pkgs/by-name/li/libgadu/package.nix b/pkgs/by-name/li/libgadu/package.nix
index f0ba8e09d4c5..32cb229b441b 100644
--- a/pkgs/by-name/li/libgadu/package.nix
+++ b/pkgs/by-name/li/libgadu/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wojtekka";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1s16cripy5w9k12534qb012iwc5m9qcjyrywgsziyn3kl3i0aa8h";
   };
 
diff --git a/pkgs/by-name/li/libgbinder/package.nix b/pkgs/by-name/li/libgbinder/package.nix
index 2f2a3bbf6f13..e7c1458e8fc4 100644
--- a/pkgs/by-name/li/libgbinder/package.nix
+++ b/pkgs/by-name/li/libgbinder/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mer-hybris";
     repo = "libgbinder";
-    tag = version;
+    rev = version;
     sha256 = "sha256-f5yfAmCpjI4T0XKBiGPQ3JWLuYg+SlrQwYeY/HIrycY=";
   };
 
diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix
index c04f5abe8ba5..e1572fed66a0 100644
--- a/pkgs/by-name/li/libgedit-gfls/package.nix
+++ b/pkgs/by-name/li/libgedit-gfls/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     group = "World";
     owner = "gedit";
     repo = "libgedit-gfls";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-kMkqEly8RDc5eKqUupQD4tkVIXxL1rt4e/OCAPoutIg=";
   };
 
diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix
index a493901b5ee5..124201c92962 100644
--- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix
+++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     group = "World";
     owner = "gedit";
     repo = "libgedit-gtksourceview";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-3HnlYLa1Zy1GRpX5fjEoXUzfB9X6nydpVjZTzJyhvIs=";
   };
 
diff --git a/pkgs/by-name/li/libgen-cli/package.nix b/pkgs/by-name/li/libgen-cli/package.nix
index dd6abc08d7e1..b296e9e140a2 100644
--- a/pkgs/by-name/li/libgen-cli/package.nix
+++ b/pkgs/by-name/li/libgen-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ciehanski";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-EicXsxAvVe/umpcOn4dVlTexaAol1qYPg/h5MU5dysM=";
   };
 
diff --git a/pkgs/by-name/li/libgeotiff/package.nix b/pkgs/by-name/li/libgeotiff/package.nix
index 3dff45fdf5bc..c591b0cb7c1e 100644
--- a/pkgs/by-name/li/libgeotiff/package.nix
+++ b/pkgs/by-name/li/libgeotiff/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "libgeotiff";
-    tag = version;
+    rev = version;
     hash = "sha256-oiuooLejCRI1DFTjhgYoePtKS+OAGnW6OBzgITcY500=";
   };
 
diff --git a/pkgs/by-name/li/libgestures/package.nix b/pkgs/by-name/li/libgestures/package.nix
index 1dccf87f9b22..144a457c1987 100644
--- a/pkgs/by-name/li/libgestures/package.nix
+++ b/pkgs/by-name/li/libgestures/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hugegreenbug";
     repo = "libgestures";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0dfvads2adzx4k8cqc1rbwrk1jm2wn9wl2jk51m26xxpmh1g0zab";
   };
   patches = [ ./include-fix.patch ];
diff --git a/pkgs/by-name/li/libglibutil/package.nix b/pkgs/by-name/li/libglibutil/package.nix
index 29f64f23e318..132106b30250 100644
--- a/pkgs/by-name/li/libglibutil/package.nix
+++ b/pkgs/by-name/li/libglibutil/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sailfishos";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-UJsKjvigZuwDL4DyjUE6fXEecgoHrTE+5pO0hVyCwP4=";
   };
 
diff --git a/pkgs/by-name/li/libharu/package.nix b/pkgs/by-name/li/libharu/package.nix
index fd77c8a63213..78402032198a 100644
--- a/pkgs/by-name/li/libharu/package.nix
+++ b/pkgs/by-name/li/libharu/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libharu";
     repo = "libharu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-v2vudB95OdYPiLxS9Al5lsAInsvmharhPWdnUmCl+Bs=";
   };
 
diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix
index 0468afa67705..a076ecc234f2 100644
--- a/pkgs/by-name/li/libheif/package.nix
+++ b/pkgs/by-name/li/libheif/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "strukturag";
     repo = "libheif";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Z21E2b4E9jGtwR1RpFMAbGsWFw6jXn++WexlzdoyZzE=";
   };
 
diff --git a/pkgs/by-name/li/libhomfly/package.nix b/pkgs/by-name/li/libhomfly/package.nix
index 81653b4843d4..9cae6196d83c 100644
--- a/pkgs/by-name/li/libhomfly/package.nix
+++ b/pkgs/by-name/li/libhomfly/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "miguelmarco";
     repo = "libhomfly";
-    tag = version;
+    rev = version;
     sha256 = "sha256-s1Hgy6S9+uREKsgjOVQdQfnds6oSLo5UWTrt5DJnY2s=";
   };
 
diff --git a/pkgs/by-name/li/libhttpserver/package.nix b/pkgs/by-name/li/libhttpserver/package.nix
index faaeec00352f..3bf538dfbdeb 100644
--- a/pkgs/by-name/li/libhttpserver/package.nix
+++ b/pkgs/by-name/li/libhttpserver/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "etr";
     repo = "libhttpserver";
-    tag = version;
+    rev = version;
     hash = "sha256-Pc3Fvd8D4Ymp7dG9YgU58mDceOqNfhWE1JtnpVaNx/Y=";
   };
 
diff --git a/pkgs/by-name/li/libhwy/package.nix b/pkgs/by-name/li/libhwy/package.nix
index e0c848afffe4..c282d8420a34 100644
--- a/pkgs/by-name/li/libhwy/package.nix
+++ b/pkgs/by-name/li/libhwy/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "highway";
-    tag = version;
+    rev = version;
     hash = "sha256-Z+mAR9nSAbCskUvo6oK79Yd85bu0HtI2aR5THS1EozM=";
   };
 
diff --git a/pkgs/by-name/li/libical/package.nix b/pkgs/by-name/li/libical/package.nix
index d74bb6ad0b57..b3f5a63ab6f1 100644
--- a/pkgs/by-name/li/libical/package.nix
+++ b/pkgs/by-name/li/libical/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libical";
     repo = "libical";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZJXxi1LOZyEpgdcmoK0pe5IA3+l9WY0zLu6Ttzy1QSc=";
   };
 
diff --git a/pkgs/by-name/li/libid3tag/package.nix b/pkgs/by-name/li/libid3tag/package.nix
index 93f090299b8d..e287ee6cdcd2 100644
--- a/pkgs/by-name/li/libid3tag/package.nix
+++ b/pkgs/by-name/li/libid3tag/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "tenacityteam";
     repo = "libid3tag";
-    tag = version;
+    rev = version;
     hash = "sha256-6/49rk7pmIpJRj32WmxC171NtdIOaMNhX8RD7o6Jbzs=";
   };
 
diff --git a/pkgs/by-name/li/libimagequant/package.nix b/pkgs/by-name/li/libimagequant/package.nix
index b357c6b8cb45..b9a4acaf44fe 100644
--- a/pkgs/by-name/li/libimagequant/package.nix
+++ b/pkgs/by-name/li/libimagequant/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "libimagequant";
-    tag = version;
+    rev = version;
     hash = "sha256-2P8FiRfOuCHxJrB+rnDDOFsrFjPv5GMBK/5sq7eb32w=";
   };
 
diff --git a/pkgs/by-name/li/libime/package.nix b/pkgs/by-name/li/libime/package.nix
index 2f0413b43198..073c3f603628 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";
-    tag = version;
+    rev = version;
     hash = "sha256-liVJEBUYcVYjjJCMW68xXbEHKQpAgTLCPm2yIdWG3IQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libimobiledevice-glue/package.nix b/pkgs/by-name/li/libimobiledevice-glue/package.nix
index 29a00599af87..01a0ea4f8494 100644
--- a/pkgs/by-name/li/libimobiledevice-glue/package.nix
+++ b/pkgs/by-name/li/libimobiledevice-glue/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Fu0zQIryESRaTGzDlAaewX9Yo2nPEeUxmcb3yPJLuSI=";
   };
 
diff --git a/pkgs/by-name/li/libinotify-kqueue/package.nix b/pkgs/by-name/li/libinotify-kqueue/package.nix
index 649fe1b9c024..130a3e803382 100644
--- a/pkgs/by-name/li/libinotify-kqueue/package.nix
+++ b/pkgs/by-name/li/libinotify-kqueue/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libinotify-kqueue";
     repo = "libinotify-kqueue";
-    tag = version;
+    rev = version;
     sha256 = "sha256-m59GWrx5C+JXDbhVdKx+SNSn8wwIKyW+KlXabNi17A0=";
   };
 
diff --git a/pkgs/by-name/li/libinstpatch/package.nix b/pkgs/by-name/li/libinstpatch/package.nix
index 43a98dd968a3..c9a82bd33613 100644
--- a/pkgs/by-name/li/libinstpatch/package.nix
+++ b/pkgs/by-name/li/libinstpatch/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swami";
     repo = "libinstpatch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OU6/slrPDgzn9tvXZJKSWbcFbpS/EAsOi52FtjeYdvA=";
   };
 
diff --git a/pkgs/by-name/li/libipt/package.nix b/pkgs/by-name/li/libipt/package.nix
index 834efe0eedc0..33e01b9d7a83 100644
--- a/pkgs/by-name/li/libipt/package.nix
+++ b/pkgs/by-name/li/libipt/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "libipt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rO2Mf2/BfKlPh1wHe0qTuyQAyqpSB/j3Q+JWpNDyNm0=";
   };
 
diff --git a/pkgs/by-name/li/libirecovery/package.nix b/pkgs/by-name/li/libirecovery/package.nix
index 7391fcaea365..f9be0ab0146b 100644
--- a/pkgs/by-name/li/libirecovery/package.nix
+++ b/pkgs/by-name/li/libirecovery/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-R+oBC7F4op0qoIk3d/WqS4MwzZY3WMAMIqlJfJb188Q=";
   };
 
diff --git a/pkgs/by-name/li/libiscsi/package.nix b/pkgs/by-name/li/libiscsi/package.nix
index 309fb9f7a1bd..6067083ef57a 100644
--- a/pkgs/by-name/li/libiscsi/package.nix
+++ b/pkgs/by-name/li/libiscsi/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sahlberg";
     repo = "libiscsi";
-    tag = version;
+    rev = version;
     sha256 = "sha256-idiK9JowKhGAk5F5qJ57X14Q2Y0TbIKRI02onzLPkas=";
   };
 
diff --git a/pkgs/by-name/li/libite/package.nix b/pkgs/by-name/li/libite/package.nix
index 63433b69937c..74dffc4d6450 100644
--- a/pkgs/by-name/li/libite/package.nix
+++ b/pkgs/by-name/li/libite/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "libite";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-q1NoHSiPmFPwkTJqg3L5fEBXF/JjRWvA9e4d532ILE8=";
   };
 
diff --git a/pkgs/by-name/li/libjcat/package.nix b/pkgs/by-name/li/libjcat/package.nix
index f042ef55c83d..ed834efe1f29 100644
--- a/pkgs/by-name/li/libjcat/package.nix
+++ b/pkgs/by-name/li/libjcat/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "libjcat";
-    tag = version;
+    rev = version;
     sha256 = "sha256-3Ttk5nwVLB/Ll4Xz25JODOKHsGrOxKeSF2f+6QhDI2Q=";
   };
 
diff --git a/pkgs/by-name/li/libjpeg_turbo/package.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix
index 20b8b7df2b14..26baf7f7ed5c 100644
--- a/pkgs/by-name/li/libjpeg_turbo/package.nix
+++ b/pkgs/by-name/li/libjpeg_turbo/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libjpeg-turbo";
     repo = "libjpeg-turbo";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ZNqhOfZtWcMv10VWIUxn7MSy4KhW/jBrgC1tUFKczqs=";
   };
 
diff --git a/pkgs/by-name/li/libjson-rpc-cpp/package.nix b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
index 559f4889ed93..b2e3417c0920 100644
--- a/pkgs/by-name/li/libjson-rpc-cpp/package.nix
+++ b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "cinemast";
     repo = "libjson-rpc-cpp";
     sha256 = "sha256-YCCZN4y88AixQeo24pk6YHfSCsJz8jJ97Dg40KM08cQ=";
-    tag = "v${version}";
+    rev = "v${version}";
   };
 
   env.NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2";
diff --git a/pkgs/by-name/li/libjwt/package.nix b/pkgs/by-name/li/libjwt/package.nix
index 18a5460b98f0..d4ebba5f1842 100644
--- a/pkgs/by-name/li/libjwt/package.nix
+++ b/pkgs/by-name/li/libjwt/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "benmcollins";
     repo = "libjwt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0gFMeSW4gfbI6MUctcN8UuKhMDswaT8BzHTV2VuwZzc=";
   };
 
diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix
index 1bdd82b4f4a3..e9860f5867f2 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ORwhKOp5Nog366UkLbuWpjz/6sJhxUO6+SkoJGH+3fE=";
     # There are various submodules in `third_party/`.
     fetchSubmodules = true;
diff --git a/pkgs/by-name/li/libkcapi/package.nix b/pkgs/by-name/li/libkcapi/package.nix
index 1f08c5f0655c..97009bbe40f9 100644
--- a/pkgs/by-name/li/libkcapi/package.nix
+++ b/pkgs/by-name/li/libkcapi/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "libkcapi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xOI29cjhUGUeHLaYIrPA5ZwwCE9lBdZG6kaW0lo1uL8=";
   };
 
diff --git a/pkgs/by-name/li/libkeyfinder/package.nix b/pkgs/by-name/li/libkeyfinder/package.nix
index c20402a3ead8..f25158df9913 100644
--- a/pkgs/by-name/li/libkeyfinder/package.nix
+++ b/pkgs/by-name/li/libkeyfinder/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mixxxdj";
     repo = "libkeyfinder";
-    tag = version;
+    rev = version;
     hash = "sha256-Et8u5j/ke9u2bwHFriPCCBiXkPel37gwx+kwuViAr4o=";
   };
 
diff --git a/pkgs/by-name/li/libkqueue/package.nix b/pkgs/by-name/li/libkqueue/package.nix
index c3191c57cbef..cfb21e6906b7 100644
--- a/pkgs/by-name/li/libkqueue/package.nix
+++ b/pkgs/by-name/li/libkqueue/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mheily";
     repo = "libkqueue";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5Zds9sqHkFldJf3ThTPOiaGKohmFcIzY0ARDA0iswVk=";
   };
 
diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix
index 5547b2418f53..a83011a56fa1 100644
--- a/pkgs/by-name/li/libks/package.nix
+++ b/pkgs/by-name/li/libks/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = "libks";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zKL+ukAdKiCC4wh55hnZpebFraIdKWDFsRfhVzhUNj0=";
   };
 
diff --git a/pkgs/by-name/li/libksi/package.nix b/pkgs/by-name/li/libksi/package.nix
index da7c2221c50c..49fd7cd3d09f 100644
--- a/pkgs/by-name/li/libksi/package.nix
+++ b/pkgs/by-name/li/libksi/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Guardtime";
     repo = "libksi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zEWxJpv0MeGUq/xkM26tDoauFyw53enGyWVhlX0jlYI=";
   };
 
diff --git a/pkgs/by-name/li/liblaxjson/package.nix b/pkgs/by-name/li/liblaxjson/package.nix
index 8898da8d81ac..905cc1cb9a16 100644
--- a/pkgs/by-name/li/liblaxjson/package.nix
+++ b/pkgs/by-name/li/liblaxjson/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrewrk";
     repo = "liblaxjson";
-    tag = version;
+    rev = version;
     sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s";
   };
 
diff --git a/pkgs/by-name/li/liblc3/package.nix b/pkgs/by-name/li/liblc3/package.nix
index 9e437d416684..4428d1e5220b 100644
--- a/pkgs/by-name/li/liblc3/package.nix
+++ b/pkgs/by-name/li/liblc3/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "google";
     repo = "liblc3";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-4KsvCQ1JZaj0yCT7En7ZcNk0rA8LyDwwcSga2IoVd6A=";
   };
 
diff --git a/pkgs/by-name/li/liblcf/package.nix b/pkgs/by-name/li/liblcf/package.nix
index f6f1ecdf210d..71e4fb69a3b9 100644
--- a/pkgs/by-name/li/liblcf/package.nix
+++ b/pkgs/by-name/li/liblcf/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EasyRPG";
     repo = "liblcf";
-    tag = version;
+    rev = version;
     hash = "sha256-jJGIsNw7wplTL5FBWGL8osb9255o9ZaWgl77R+RLDMM=";
   };
 
diff --git a/pkgs/by-name/li/liblsl/package.nix b/pkgs/by-name/li/liblsl/package.nix
index 154d57cd2367..b923bb0b4c22 100644
--- a/pkgs/by-name/li/liblsl/package.nix
+++ b/pkgs/by-name/li/liblsl/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sccn";
     repo = "liblsl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-nmu7Kxk4U5sGO8Od9JR4id4V4mjeibj4AHjUYhpGPeo=";
   };
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/li/libmbd/package.nix b/pkgs/by-name/li/libmbd/package.nix
index 3faccd790bd9..ce975085ab8f 100644
--- a/pkgs/by-name/li/libmbd/package.nix
+++ b/pkgs/by-name/li/libmbd/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libmbd";
     repo = "libMBD";
-    tag = version;
+    rev = version;
     hash = "sha256-ctUaBLPaZHoV1rU3u1idvPLGbvC9Z17YBxYKCaL7EMk=";
   };
 
diff --git a/pkgs/by-name/li/libmesode/package.nix b/pkgs/by-name/li/libmesode/package.nix
index 483066129aa8..3633b47d1593 100644
--- a/pkgs/by-name/li/libmesode/package.nix
+++ b/pkgs/by-name/li/libmesode/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "profanity-im";
     repo = "libmesode";
-    tag = version;
+    rev = version;
     sha256 = "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654";
   };
 
diff --git a/pkgs/by-name/li/libmicrodns/package.nix b/pkgs/by-name/li/libmicrodns/package.nix
index 0f64b01cca5d..0d60242be1bc 100644
--- a/pkgs/by-name/li/libmicrodns/package.nix
+++ b/pkgs/by-name/li/libmicrodns/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "videolabs";
     repo = "libmicrodns";
-    tag = version;
+    rev = version;
     sha256 = "05vgka45c1frnv4q7pbz0bggsn5xaykh4xpklh9yb6d6qj7dbx0b";
   };
 
diff --git a/pkgs/by-name/li/libmodbus/package.nix b/pkgs/by-name/li/libmodbus/package.nix
index b3053a9c4dfd..96e7b0d2b46b 100644
--- a/pkgs/by-name/li/libmodbus/package.nix
+++ b/pkgs/by-name/li/libmodbus/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stephane";
     repo = "libmodbus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-d/diR9yeV0WY0C6wqxYZfOjEKFeWTvN73MxcWtXPOJc=";
   };
 
diff --git a/pkgs/by-name/li/libmodule/package.nix b/pkgs/by-name/li/libmodule/package.nix
index 204685a26075..dbb2505e5c18 100644
--- a/pkgs/by-name/li/libmodule/package.nix
+++ b/pkgs/by-name/li/libmodule/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedeDP";
     repo = "libmodule";
-    tag = version;
+    rev = version;
     sha256 = "sha256-wkRiDWO9wUyxkAeqvm99u22Jq4xnQJx6zS7Sb+R8iMg=";
   };
 
diff --git a/pkgs/by-name/li/libmongocrypt/package.nix b/pkgs/by-name/li/libmongocrypt/package.nix
index 38d160b0733a..fe97c5de7a1c 100644
--- a/pkgs/by-name/li/libmongocrypt/package.nix
+++ b/pkgs/by-name/li/libmongocrypt/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "libmongocrypt";
-    tag = version;
+    rev = version;
     hash = "sha256-I4KG2BHAovin9EaF8lNzJzucARvi0Qptz5Y9gTt3WkE=";
   };
 
diff --git a/pkgs/by-name/li/libmowgli/package.nix b/pkgs/by-name/li/libmowgli/package.nix
index dce02a004e32..2f2575a3a183 100644
--- a/pkgs/by-name/li/libmowgli/package.nix
+++ b/pkgs/by-name/li/libmowgli/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "atheme";
     repo = "libmowgli-2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jlw6ixMoIdIjmQ86N+KN+Gez218sw894POkcCYnT0s0=";
   };
 
diff --git a/pkgs/by-name/li/libmpack/package.nix b/pkgs/by-name/li/libmpack/package.nix
index 2a8abe625c99..00b8d72d28b6 100644
--- a/pkgs/by-name/li/libmpack/package.nix
+++ b/pkgs/by-name/li/libmpack/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libmpack";
     repo = "libmpack";
-    tag = version;
+    rev = version;
     sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2";
   };
 
diff --git a/pkgs/by-name/li/libmsym/package.nix b/pkgs/by-name/li/libmsym/package.nix
index f2c936410898..5f47cca2f08b 100644
--- a/pkgs/by-name/li/libmsym/package.nix
+++ b/pkgs/by-name/li/libmsym/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mcodev31";
     repo = "libmsym";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "k+OEwrA/saupP/wX6Ii5My0vffiJ0X9xMCTrliMSMik=";
   };
 
diff --git a/pkgs/by-name/li/libmypaint/package.nix b/pkgs/by-name/li/libmypaint/package.nix
index 7958cdddd3eb..76a98bb5f219 100644
--- a/pkgs/by-name/li/libmypaint/package.nix
+++ b/pkgs/by-name/li/libmypaint/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mypaint";
     repo = "libmypaint";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ppgpmnhph9h8ayx9776f79a0bxbdszfw9c6bw7c3ffy2yk40178";
   };
 
diff --git a/pkgs/by-name/li/libmysofa/package.nix b/pkgs/by-name/li/libmysofa/package.nix
index bba36cd18c16..67961dc1cf6c 100644
--- a/pkgs/by-name/li/libmysofa/package.nix
+++ b/pkgs/by-name/li/libmysofa/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hoene";
     repo = "libmysofa";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jvib1hGPJEY2w/KjlD7iTtRy1s8LFG+Qhb2d6xdpUyc=";
   };
 
diff --git a/pkgs/by-name/li/libnabo/package.nix b/pkgs/by-name/li/libnabo/package.nix
index 03b647fb5f47..58bec38657e4 100644
--- a/pkgs/by-name/li/libnabo/package.nix
+++ b/pkgs/by-name/li/libnabo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ethz-asl";
     repo = "libnabo";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/XXRwiLLaEvp+Q+c6lBiuWBb9by6o0pDf8wFtBNp7o8=";
   };
 
diff --git a/pkgs/by-name/li/libnats-c/package.nix b/pkgs/by-name/li/libnats-c/package.nix
index 5dd433a0e861..9dce5480e0f3 100644
--- a/pkgs/by-name/li/libnats-c/package.nix
+++ b/pkgs/by-name/li/libnats-c/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "nats.c";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hPudV1d+6QkHJzs7Mk47v8LVBfR3UTES/UyhdtMkNJA=";
   };
 
diff --git a/pkgs/by-name/li/libndctl/package.nix b/pkgs/by-name/li/libndctl/package.nix
index 4c4a09a097ef..d2ccec80a570 100644
--- a/pkgs/by-name/li/libndctl/package.nix
+++ b/pkgs/by-name/li/libndctl/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pmem";
     repo = "ndctl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gG1Rz5AtDLzikGFr8A3l25ypd+VoLw2oWjszy9ogDLk=";
   };
 
diff --git a/pkgs/by-name/li/libnet/package.nix b/pkgs/by-name/li/libnet/package.nix
index 325dbc4b1356..c8a6c712c1d6 100644
--- a/pkgs/by-name/li/libnet/package.nix
+++ b/pkgs/by-name/li/libnet/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sam-github";
     repo = "libnet";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P3LaDMMNPyEnA8nO1Bm7H0mW/hVBr0cFdg+p2JmWcGI=";
   };
 
diff --git a/pkgs/by-name/li/libnsl/package.nix b/pkgs/by-name/li/libnsl/package.nix
index 54b3657ce70a..d03bc44888de 100644
--- a/pkgs/by-name/li/libnsl/package.nix
+++ b/pkgs/by-name/li/libnsl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thkukuk";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bCToqXVE4RZcoZ2eTNZcVHyzKlWyIpSAssQCOZcfmEA=";
   };
 
diff --git a/pkgs/by-name/li/libnss-mysql/package.nix b/pkgs/by-name/li/libnss-mysql/package.nix
index 91ffccf18426..432f75bdd0a6 100644
--- a/pkgs/by-name/li/libnss-mysql/package.nix
+++ b/pkgs/by-name/li/libnss-mysql/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "saknopper";
     repo = "libnss-mysql";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1fhsswa3h2nkhjkyjxxqnj07rlx6bmfvd8j521snimx2jba8h0d6";
   };
 
diff --git a/pkgs/by-name/li/libnss_nis/package.nix b/pkgs/by-name/li/libnss_nis/package.nix
index 1ff37f49ae8d..7ac586d41aec 100644
--- a/pkgs/by-name/li/libnss_nis/package.nix
+++ b/pkgs/by-name/li/libnss_nis/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thkukuk";
     repo = "libnss_nis";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dt5wL+v98Heg6395BOwNssXLXmoOKFnRXGqlOknYYPs=";
   };
 
diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix
index 499f67244aa7..f3d4764bed74 100644
--- a/pkgs/by-name/li/libnvidia-container/package.nix
+++ b/pkgs/by-name/li/libnvidia-container/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "libnvidia-container";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JmJKvAOEPyjVx2Frd0tAMBjnAUTMpMh1KBt6wr5RRmk=";
   };
 
@@ -65,13 +65,13 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i \
-      -e 's/^REVISION ?=.*/REVISION = ${src.tag}/' \
+      -e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \
       -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
       mk/common.mk
 
     sed -i \
       -e 's/^GIT_TAG ?=.*/GIT_TAG = ${version}/' \
-      -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${src.tag}/' \
+      -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${src.rev}/' \
       versions.mk
 
     mkdir -p deps/src/nvidia-modprobe-${modprobeVersion}
diff --git a/pkgs/by-name/li/libofx/package.nix b/pkgs/by-name/li/libofx/package.nix
index 06fd89964700..e305e6e66a32 100644
--- a/pkgs/by-name/li/libofx/package.nix
+++ b/pkgs/by-name/li/libofx/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LibOFX";
     repo = "libofx";
-    tag = version;
+    rev = version;
     sha256 = "sha256-KOQrEAt1jHrOpPQ7QbGUADe0i7sQXNH2fblPRzT0EIg=";
   };
 
diff --git a/pkgs/by-name/li/libomemo-c/package.nix b/pkgs/by-name/li/libomemo-c/package.nix
index 79a259995bd8..e1f87d39b180 100644
--- a/pkgs/by-name/li/libomemo-c/package.nix
+++ b/pkgs/by-name/li/libomemo-c/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dino";
     repo = "libomemo-c";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GvHMp0FWoApbYLMhKfNxSBel1xxWWF3TZ4lnkLvu2s4=";
   };
 
diff --git a/pkgs/by-name/li/libopenaptx/package.nix b/pkgs/by-name/li/libopenaptx/package.nix
index cb9c1d9ddd42..a4abae533817 100644
--- a/pkgs/by-name/li/libopenaptx/package.nix
+++ b/pkgs/by-name/li/libopenaptx/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pali";
     repo = "libopenaptx";
-    tag = version;
+    rev = version;
     sha256 = "sha256-4FYKxw1U+efCfzKOPSDJH8a/dG0KV+anJDgxjqzD80k=";
   };
 
diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix
index 4c66dcf4e2ca..09722df40864 100644
--- a/pkgs/by-name/li/liboqs/package.nix
+++ b/pkgs/by-name/li/liboqs/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "open-quantum-safe";
     repo = "liboqs";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ngjN1JdmnvMn+UXJeCiBwF1Uf7kTOjHVBL99xzoZVFY=";
   };
 
diff --git a/pkgs/by-name/li/libosmo-netif/package.nix b/pkgs/by-name/li/libosmo-netif/package.nix
index bce5e26f86ed..4dcca92df361 100644
--- a/pkgs/by-name/li/libosmo-netif/package.nix
+++ b/pkgs/by-name/li/libosmo-netif/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmo-netif";
-    tag = version;
+    rev = version;
     hash = "sha256-X2sRjhlB63ffkLB4c/M11iFpprG0DUzq2NL6mRN9H+c=";
   };
 
diff --git a/pkgs/by-name/li/libosmo-sigtran/package.nix b/pkgs/by-name/li/libosmo-sigtran/package.nix
index eafc8076fa83..dee2431912a7 100644
--- a/pkgs/by-name/li/libosmo-sigtran/package.nix
+++ b/pkgs/by-name/li/libosmo-sigtran/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   # fetchFromGitea hangs
   src = fetchgit {
     url = "https://gitea.osmocom.org/osmocom/libosmo-sigtran.git";
-    tag = version;
+    rev = version;
     hash = "sha256-/MUFTo5Uo60CZV0ZTDVLVgEXrNw9kX5gafq7rJb82Do=";
   };
 
diff --git a/pkgs/by-name/li/libosmoabis/package.nix b/pkgs/by-name/li/libosmoabis/package.nix
index 7aefbec3b3e1..0fb61587d710 100644
--- a/pkgs/by-name/li/libosmoabis/package.nix
+++ b/pkgs/by-name/li/libosmoabis/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmo-abis";
-    tag = version;
+    rev = version;
     hash = "sha256-TxK+r+GhqPjvFYA3AX3JXjRwhEyjoLcPTR1lpkgSlUo=";
   };
 
diff --git a/pkgs/by-name/li/libosmocore/package.nix b/pkgs/by-name/li/libosmocore/package.nix
index 66d4d9fc4a53..368853d48455 100644
--- a/pkgs/by-name/li/libosmocore/package.nix
+++ b/pkgs/by-name/li/libosmocore/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmocore";
-    tag = version;
+    rev = version;
     hash = "sha256-W5XLiIgevGtHRjrRTx/7rnPYacOAW9QJW0rocyWgFt4=";
   };
 
diff --git a/pkgs/by-name/li/libow/package.nix b/pkgs/by-name/li/libow/package.nix
index bc913777d1ec..b8b86b0321b3 100644
--- a/pkgs/by-name/li/libow/package.nix
+++ b/pkgs/by-name/li/libow/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "owfs";
     repo = "owfs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s";
   };
 
diff --git a/pkgs/by-name/li/libowlevelzs/package.nix b/pkgs/by-name/li/libowlevelzs/package.nix
index e8a9dd1ab5c6..6bc0c5fa5371 100644
--- a/pkgs/by-name/li/libowlevelzs/package.nix
+++ b/pkgs/by-name/li/libowlevelzs/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fogti";
     repo = "libowlevelzs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY=";
   };
 
diff --git a/pkgs/by-name/li/libplist/package.nix b/pkgs/by-name/li/libplist/package.nix
index ee4ecf44c3bb..ad66cd6baebe 100644
--- a/pkgs/by-name/li/libplist/package.nix
+++ b/pkgs/by-name/li/libplist/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = "libplist";
-    tag = version;
+    rev = version;
     hash = "sha256-hitRcOjbF+L9Og9/qajqFqOhKfRn9+iWLoCKmS9dT80=";
   };
 
diff --git a/pkgs/by-name/li/libpointmatcher/package.nix b/pkgs/by-name/li/libpointmatcher/package.nix
index 95b0a4c8dbb2..8b19232f1fe7 100644
--- a/pkgs/by-name/li/libpointmatcher/package.nix
+++ b/pkgs/by-name/li/libpointmatcher/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "norlab-ulaval";
     repo = "libpointmatcher";
-    tag = version;
+    rev = version;
     hash = "sha256-OkfWdim0JDKiBx5spYpkMyFrLQP3AMWBVDpzmFwqNFM=";
   };
 
diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix
index 3e58f2bcbcc9..d796d55cf600 100644
--- a/pkgs/by-name/li/libportal/package.nix
+++ b/pkgs/by-name/li/libportal/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flatpak";
     repo = "libportal";
-    tag = version;
+    rev = version;
     sha256 = "sha256-CXI4rBr9wxLUX537d6SNNf8YFR/J6YdeROlFt3edeOU=";
   };
 
diff --git a/pkgs/by-name/li/libppd/package.nix b/pkgs/by-name/li/libppd/package.nix
index 5b4b2d1a3165..c268cd552028 100644
--- a/pkgs/by-name/li/libppd/package.nix
+++ b/pkgs/by-name/li/libppd/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenPrinting";
     repo = "libppd";
-    tag = version;
+    rev = version;
     hash = "sha256-8ofCv+tKgBk9GoGD4lmBPB/S4ABZ6cWGOk/KqDsEzNk=";
   };
 
diff --git a/pkgs/by-name/li/libpqxx/package.nix b/pkgs/by-name/li/libpqxx/package.nix
index 58f0e71a43be..0e1dc11f2e90 100644
--- a/pkgs/by-name/li/libpqxx/package.nix
+++ b/pkgs/by-name/li/libpqxx/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jtv";
     repo = "libpqxx";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-llsnd1bxAyiEgo9PfWYdQp1RPPk1oF/02IgMvPhodZ0=";
   };
 
diff --git a/pkgs/by-name/li/libproxy/package.nix b/pkgs/by-name/li/libproxy/package.nix
index c6f4463de9d4..67ccc456dc74 100644
--- a/pkgs/by-name/li/libproxy/package.nix
+++ b/pkgs/by-name/li/libproxy/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libproxy";
     repo = "libproxy";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Z70TjLk5zulyYMAK+uMDhpsdvLa6m25pY8jahUA6ASE=";
   };
 
diff --git a/pkgs/by-name/li/libqb/package.nix b/pkgs/by-name/li/libqb/package.nix
index aa60833e5815..094a1c53790f 100644
--- a/pkgs/by-name/li/libqb/package.nix
+++ b/pkgs/by-name/li/libqb/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ClusterLabs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZjxC7W4U8T68mZy/OvWj/e4W9pJIj2lVDoEjxXYr/G8=";
   };
 
diff --git a/pkgs/by-name/li/libr3/package.nix b/pkgs/by-name/li/libr3/package.nix
index 4fe8f083dfdb..046547fdd053 100644
--- a/pkgs/by-name/li/libr3/package.nix
+++ b/pkgs/by-name/li/libr3/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "c9s";
     repo = "r3";
-    tag = version;
+    rev = version;
     sha256 = "09cixbms817p6nb77wz3rxp0znnac8ybycvsrrzgwlbfn58a3zwl";
   };
 
diff --git a/pkgs/by-name/li/libraqm/package.nix b/pkgs/by-name/li/libraqm/package.nix
index 11349d3d4bd9..9df38707bcb3 100644
--- a/pkgs/by-name/li/libraqm/package.nix
+++ b/pkgs/by-name/li/libraqm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "HOST-Oman";
     repo = "libraqm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KhGE66GS5rIieVXJUFA3jSsXEpbdnzN0VIAF/zOelU4=";
   };
 
diff --git a/pkgs/by-name/li/libratbag/package.nix b/pkgs/by-name/li/libratbag/package.nix
index a65ac3e04871..8cd47c2fa0e1 100644
--- a/pkgs/by-name/li/libratbag/package.nix
+++ b/pkgs/by-name/li/libratbag/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libratbag";
     repo = "libratbag";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc=";
   };
 
diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix
index 5fcebc97e649..b16a69fea358 100644
--- a/pkgs/by-name/li/libraw/package.nix
+++ b/pkgs/by-name/li/libraw/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LibRaw";
     repo = "LibRaw";
-    tag = version;
+    rev = version;
     hash = "sha256-QFyRQ0V7din/rnkRvEWf521kSzN7HwJ3kZiQ43PAmVI=";
   };
 
diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix
index 26e2121f3eeb..eb6f10ea8a74 100644
--- a/pkgs/by-name/li/librearp/package.nix
+++ b/pkgs/by-name/li/librearp/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "LibreArp";
     repo = "LibreArp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-jEpES68NuHhelUq/L46CxEeadk3LbuPZ72JaGDbw8fg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libredwg/package.nix b/pkgs/by-name/li/libredwg/package.nix
index ec618aeb6e8e..ce2cd032d0c7 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";
-    tag = version;
+    rev = version;
     hash = "sha256-FlBHwNsqVSBE8dTDewoKkCbs8Jd/4d69MPpEFzg6Ruc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libreelec-dvb-firmware/package.nix b/pkgs/by-name/li/libreelec-dvb-firmware/package.nix
index 51d88c0d4394..6841383511f2 100644
--- a/pkgs/by-name/li/libreelec-dvb-firmware/package.nix
+++ b/pkgs/by-name/li/libreelec-dvb-firmware/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "dvb-firmware";
     owner = "LibreElec";
-    tag = version;
+    rev = version;
     sha256 = "sha256-uEobcv5kqGxIOfSVVKH+iT7DHPF13OFiRF7c1GIUqtU=";
   };
 
diff --git a/pkgs/by-name/li/librelp/package.nix b/pkgs/by-name/li/librelp/package.nix
index 063ad76f703a..00e8ef09be0a 100644
--- a/pkgs/by-name/li/librelp/package.nix
+++ b/pkgs/by-name/li/librelp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rsyslog";
     repo = "librelp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VJlvFiOsIyiu0kBU8NkObtt9j2ElrSzJtvE8wtSlOus=";
   };
 
diff --git a/pkgs/by-name/li/librem/package.nix b/pkgs/by-name/li/librem/package.nix
index 6fd0bad9bc8e..8d75bb111661 100644
--- a/pkgs/by-name/li/librem/package.nix
+++ b/pkgs/by-name/li/librem/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "rem";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-MsXSUxFH89EqxMe4285xFV1Tsqmv2l5RnEeli48O3XQ=";
   };
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/li/librespeed-cli/package.nix b/pkgs/by-name/li/librespeed-cli/package.nix
index 106e5583e1f5..627686d58d1b 100644
--- a/pkgs/by-name/li/librespeed-cli/package.nix
+++ b/pkgs/by-name/li/librespeed-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "librespeed";
     repo = "speedtest-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8=";
   };
 
diff --git a/pkgs/by-name/li/libretro-core-info/package.nix b/pkgs/by-name/li/libretro-core-info/package.nix
index a908f6b4225e..bbb65756751b 100644
--- a/pkgs/by-name/li/libretro-core-info/package.nix
+++ b/pkgs/by-name/li/libretro-core-info/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-core-info";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T/La/Y9txRX8SHAyOi45KcQA8zb3puXdfTKlPSm42+U=";
   };
 
diff --git a/pkgs/by-name/li/librime/package.nix b/pkgs/by-name/li/librime/package.nix
index d366a69aadbc..e219a6c5c10c 100644
--- a/pkgs/by-name/li/librime/package.nix
+++ b/pkgs/by-name/li/librime/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rime";
     repo = "librime";
-    tag = version;
+    rev = version;
     sha256 = "sha256-pv1I/YFzPLOmBDcT4HcrJWSikPEErEB5UzGrGqfJBvg=";
   };
 
diff --git a/pkgs/by-name/li/librsync/package.nix b/pkgs/by-name/li/librsync/package.nix
index 11bb5835f9e6..02efdd531fa1 100644
--- a/pkgs/by-name/li/librsync/package.nix
+++ b/pkgs/by-name/li/librsync/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "librsync";
     repo = "librsync";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fiOby8tOhv0KJ+ZwAWfh/ynqHlYC9kNqKfxNl3IhzR8=";
   };
 
diff --git a/pkgs/by-name/li/librtprocess/package.nix b/pkgs/by-name/li/librtprocess/package.nix
index 64f4493ddf20..8796373c6776 100644
--- a/pkgs/by-name/li/librtprocess/package.nix
+++ b/pkgs/by-name/li/librtprocess/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CarVac";
     repo = "librtprocess";
-    tag = version;
+    rev = version;
     hash = "sha256-/1o6SWUor+ZBQ6RsK2PoDRu03jcVRG58PNYFttriH2w=";
   };
 
diff --git a/pkgs/by-name/li/libsass/package.nix b/pkgs/by-name/li/libsass/package.nix
index 75b273e96d73..0dd16c7535ed 100644
--- a/pkgs/by-name/li/libsass/package.nix
+++ b/pkgs/by-name/li/libsass/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sass";
     repo = "libsass";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-FkLL3OAJXDptRQY6ZkYbss2pcc40f/wasIvEIyHRQFo=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
diff --git a/pkgs/by-name/li/libscrypt/package.nix b/pkgs/by-name/li/libscrypt/package.nix
index 5ad907efd2b1..33ed0870466c 100644
--- a/pkgs/by-name/li/libscrypt/package.nix
+++ b/pkgs/by-name/li/libscrypt/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "technion";
     repo = "libscrypt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QWWqC10bENemG5FYEog87tT7IxDaBJUDqu6j/sO3sYE=";
   };
 
diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix
index 5e08c79f504f..deceacddcdce 100644
--- a/pkgs/by-name/li/libserdes/package.nix
+++ b/pkgs/by-name/li/libserdes/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "confluentinc";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rg4SWa9nIDT6JrnnCDwdiFE1cvpUn0HWHn+bPkXMHQ4=";
   };
 
diff --git a/pkgs/by-name/li/libsignal-protocol-c/package.nix b/pkgs/by-name/li/libsignal-protocol-c/package.nix
index 6b3e01227bc5..7cfa79b425aa 100644
--- a/pkgs/by-name/li/libsignal-protocol-c/package.nix
+++ b/pkgs/by-name/li/libsignal-protocol-c/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal-protocol-c";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0z5p03vk15i6h870azfjgyfgxhv31q2vq6rfhnybrnkxq2wqzwhk";
   };
 
diff --git a/pkgs/by-name/li/libsmartcols/package.nix b/pkgs/by-name/li/libsmartcols/package.nix
index a0b5cb05e1bd..ad6378cb1a3f 100644
--- a/pkgs/by-name/li/libsmartcols/package.nix
+++ b/pkgs/by-name/li/libsmartcols/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "karelzak";
     repo = "util-linux";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-X39os2iHqSrrYP6HVHPOkuTfc6vNB3pmsOP3VjW50fI=";
   };
 
diff --git a/pkgs/by-name/li/libsmbios/package.nix b/pkgs/by-name/li/libsmbios/package.nix
index e9b81c35b806..a878b9d154d6 100644
--- a/pkgs/by-name/li/libsmbios/package.nix
+++ b/pkgs/by-name/li/libsmbios/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dell";
     repo = "libsmbios";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i";
   };
 
diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix
index a7f55c086dfc..d332ebfc0358 100644
--- a/pkgs/by-name/li/libsolv/package.nix
+++ b/pkgs/by-name/li/libsolv/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "libsolv";
-    tag = version;
+    rev = version;
     hash = "sha256-3HOW3bip+0LKegwO773upeKKLiLv7JWUGEJcFiH0lcw=";
   };
 
diff --git a/pkgs/by-name/li/libspatialaudio/package.nix b/pkgs/by-name/li/libspatialaudio/package.nix
index 9d552c013b06..ef7275e2076e 100644
--- a/pkgs/by-name/li/libspatialaudio/package.nix
+++ b/pkgs/by-name/li/libspatialaudio/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "videolabs";
     repo = "libspatialaudio";
-    tag = version;
+    rev = version;
     hash = "sha256-sPnQPD41AceXM4uGqWXMYhuQv0TUkA6TZP8ChxUFIoI=";
   };
 
diff --git a/pkgs/by-name/li/libspatialindex/package.nix b/pkgs/by-name/li/libspatialindex/package.nix
index 31d055a9ca68..ad39600beb19 100644
--- a/pkgs/by-name/li/libspatialindex/package.nix
+++ b/pkgs/by-name/li/libspatialindex/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libspatialindex";
     repo = "libspatialindex";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-a2CzRLHdQMnVhHZhwYsye4X644r8gp1m6vU2CJpSRpU=";
   };
 
diff --git a/pkgs/by-name/li/libspecbleach/package.nix b/pkgs/by-name/li/libspecbleach/package.nix
index 29a1e2a67f54..7a6957958b79 100644
--- a/pkgs/by-name/li/libspecbleach/package.nix
+++ b/pkgs/by-name/li/libspecbleach/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lucianodato";
     repo = "libspecbleach";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Tw5nrGVAeoiMH00efJwcU+QLmKDZZTXHQPSV9x789TM=";
   };
 
diff --git a/pkgs/by-name/li/libspf2/package.nix b/pkgs/by-name/li/libspf2/package.nix
index a3e398d4b1b2..b606ab7fef62 100644
--- a/pkgs/by-name/li/libspf2/package.nix
+++ b/pkgs/by-name/li/libspf2/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "helsinki-systems";
     repo = "libspf2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tkCHP3B1sBb0+scHBjX5lCvaeSrZryfaGKye02LFlYs=";
   };
 
diff --git a/pkgs/by-name/li/libspiro/package.nix b/pkgs/by-name/li/libspiro/package.nix
index fd50d83e7401..e3f37999e53b 100644
--- a/pkgs/by-name/li/libspiro/package.nix
+++ b/pkgs/by-name/li/libspiro/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fontforge";
     repo = "libspiro";
-    tag = version;
+    rev = version;
     sha256 = "sha256-psEF1SWkire6ngEUcMU0xnGYaT8ktqDCBlBckToGUMg=";
   };
 
diff --git a/pkgs/by-name/li/libspng/package.nix b/pkgs/by-name/li/libspng/package.nix
index 077d19916ef1..15d8d7cf2a64 100644
--- a/pkgs/by-name/li/libspng/package.nix
+++ b/pkgs/by-name/li/libspng/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "randy408";
     repo = "libspng";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BiRuPQEKVJYYgfUsglIuxrBoJBFiQ0ygQmAFrVvCz4Q=";
   };
 
diff --git a/pkgs/by-name/li/libstemmer/package.nix b/pkgs/by-name/li/libstemmer/package.nix
index 804007c9b042..2df64013e2b6 100644
--- a/pkgs/by-name/li/libstemmer/package.nix
+++ b/pkgs/by-name/li/libstemmer/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "snowballstem";
     repo = "snowball";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qXrypwv/I+5npvGHGsHveijoui0ZnoGYhskCfLkewVE=";
   };
 
diff --git a/pkgs/by-name/li/libstrophe/package.nix b/pkgs/by-name/li/libstrophe/package.nix
index 216f50dda81e..25b10bf1a78e 100644
--- a/pkgs/by-name/li/libstrophe/package.nix
+++ b/pkgs/by-name/li/libstrophe/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "strophe";
     repo = "libstrophe";
-    tag = version;
+    rev = version;
     hash = "sha256-53O8hHyw9y0Bzs+BpGouAxuSGJxh6NSNNWZqi7RHAsY=";
   };
 
diff --git a/pkgs/by-name/li/libsurvive/package.nix b/pkgs/by-name/li/libsurvive/package.nix
index 0e2de3df085d..f51a47ba2c98 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";
-    tag = "v${version}";
+    rev = "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/libsv/package.nix b/pkgs/by-name/li/libsv/package.nix
index da3e1a92907e..4136c6471407 100644
--- a/pkgs/by-name/li/libsv/package.nix
+++ b/pkgs/by-name/li/libsv/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uael";
     repo = "sv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sc7WTRY8XTm5+J+zlS7tGa2f+2d7apj+XHyBafZXXeE=";
   };
 
diff --git a/pkgs/by-name/li/libtickit/package.nix b/pkgs/by-name/li/libtickit/package.nix
index a096406292a3..b0ae23194ccf 100644
--- a/pkgs/by-name/li/libtickit/package.nix
+++ b/pkgs/by-name/li/libtickit/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "leonerd";
     repo = "libtickit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q8JMNFxmnyOiUso4nXLZjJIBFYR/EF6g45lxVeY0f1s=";
   };
 
diff --git a/pkgs/by-name/li/libtins/package.nix b/pkgs/by-name/li/libtins/package.nix
index 539aaa0fded8..20a14280cb7b 100644
--- a/pkgs/by-name/li/libtins/package.nix
+++ b/pkgs/by-name/li/libtins/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mfontanini";
     repo = "libtins";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zL4C2Cgs9Y3NebL8MPQBO5j8Bm6xhl8ZggQBPJLRn0o=";
   };
 
diff --git a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix
index e4130aac20c2..9d3c64255893 100644
--- a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix
+++ b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "arvidn";
     repo = "libtorrent";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HkpaOCBL+0Kc7M9DmnW2dUGC+b60a7n5n3i1SyRfkb4=";
   };
 
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 9577469107ff..b544b1c6f77e 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
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "arvidn";
     repo = "libtorrent";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iph42iFEwP+lCWNPiOJJOejISFF6iwkGLY9Qg8J4tyo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix
index 78e1157c8c96..1b5ff8e0c9d3 100644
--- a/pkgs/by-name/li/libtorrent/package.nix
+++ b/pkgs/by-name/li/libtorrent/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "libtorrent";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ejDne7vaV+GYP6M0n3VAEva4UHuxRGwfc2rgxf7U/EM=";
   };
 
diff --git a/pkgs/by-name/li/libtpms/package.nix b/pkgs/by-name/li/libtpms/package.nix
index 0aadae0c65f7..4deb7b7e261e 100644
--- a/pkgs/by-name/li/libtpms/package.nix
+++ b/pkgs/by-name/li/libtpms/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stefanberger";
     repo = "libtpms";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YKs/XYJ8UItOtSinl28/G9XFVzobFd4ZDKtClQDLXFk=";
   };
 
diff --git a/pkgs/by-name/li/libucl/package.nix b/pkgs/by-name/li/libucl/package.nix
index 094ca57a20a4..620b933898b8 100644
--- a/pkgs/by-name/li/libucl/package.nix
+++ b/pkgs/by-name/li/libucl/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "libucl";
-    tag = version;
+    rev = version;
     sha256 = "sha256-esNEVBa660rl3Oo2SLaLrFThFkjbqtZ1r0tjMq3h6cM=";
   };
 
diff --git a/pkgs/by-name/li/libucontext/package.nix b/pkgs/by-name/li/libucontext/package.nix
index 7e1347d67d4e..375fc20164ac 100644
--- a/pkgs/by-name/li/libucontext/package.nix
+++ b/pkgs/by-name/li/libucontext/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kaniini";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fk3ZKkp3dsyeF6SOWSccr5MkKEwS4AAuosD/h+6wjSw=";
   };
 
diff --git a/pkgs/by-name/li/libudev-zero/package.nix b/pkgs/by-name/li/libudev-zero/package.nix
index f2802d68db87..104c80c498f9 100644
--- a/pkgs/by-name/li/libudev-zero/package.nix
+++ b/pkgs/by-name/li/libudev-zero/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "illiliti";
     repo = "libudev-zero";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-NXDof1tfr66ywYhCBDlPa+8DUfFj6YH0dvSaxHFqsXI=";
   };
 
diff --git a/pkgs/by-name/li/libudev0-shim/package.nix b/pkgs/by-name/li/libudev0-shim/package.nix
index b74b60e808d8..55f51b8b412d 100644
--- a/pkgs/by-name/li/libudev0-shim/package.nix
+++ b/pkgs/by-name/li/libudev0-shim/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "archlinux";
     repo = "libudev0-shim";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1460qm6rp1cqnns39lj24z7191m8sbpvbjabqbzb55dkdd2kw50z";
   };
 
diff --git a/pkgs/by-name/li/libuev/package.nix b/pkgs/by-name/li/libuev/package.nix
index 44cb398349d5..430eb6a0fc21 100644
--- a/pkgs/by-name/li/libuev/package.nix
+++ b/pkgs/by-name/li/libuev/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "libuev";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-x1Sk7IuhlBQPFL7Rq4tmEanBxI/WaQ2L5fpUyEWOoi8=";
   };
 
diff --git a/pkgs/by-name/li/libuldaq/package.nix b/pkgs/by-name/li/libuldaq/package.nix
index 7e571e337685..cb5adc4c4560 100644
--- a/pkgs/by-name/li/libuldaq/package.nix
+++ b/pkgs/by-name/li/libuldaq/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mccdaq";
     repo = "uldaq";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DA1mxu94z5xDpGK9OBwD02HXlOATv/slqZ4lz5GM7QM=";
   };
 
diff --git a/pkgs/by-name/li/libuninameslist/package.nix b/pkgs/by-name/li/libuninameslist/package.nix
index ac65843ed894..a1df422c7183 100644
--- a/pkgs/by-name/li/libuninameslist/package.nix
+++ b/pkgs/by-name/li/libuninameslist/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fontforge";
     repo = "libuninameslist";
-    tag = version;
+    rev = version;
     hash = "sha256-Pi30c3To57AzY59i39JVG2IUkGnq7CEAQkqJ1f5AZhw=";
   };
 
diff --git a/pkgs/by-name/li/libusbmuxd/package.nix b/pkgs/by-name/li/libusbmuxd/package.nix
index a3b0603b5f7d..cb77300acec0 100644
--- a/pkgs/by-name/li/libusbmuxd/package.nix
+++ b/pkgs/by-name/li/libusbmuxd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-coQqNGPsqrOYbBjO0eQZQNK8ZTB+ZzfMWvQ6Z1by9PY=";
   };
 
diff --git a/pkgs/by-name/li/libusbp/package.nix b/pkgs/by-name/li/libusbp/package.nix
index 623f1b076946..7e6a921d3aea 100644
--- a/pkgs/by-name/li/libusbp/package.nix
+++ b/pkgs/by-name/li/libusbp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pololu";
     repo = "libusbp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-hFvQceUapzlD021KIOJbSXX7qv1IQMuEudRHYeCkbS8=";
   };
 
diff --git a/pkgs/by-name/li/libv3270/package.nix b/pkgs/by-name/li/libv3270/package.nix
index 3afc5bccdc75..8f5e3a8b4808 100644
--- a/pkgs/by-name/li/libv3270/package.nix
+++ b/pkgs/by-name/li/libv3270/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PerryWerneck";
     repo = "libv3270";
-    tag = version;
+    rev = version;
     hash = "sha256-Z3FvxPa1pfeECxfB5ZL6gwhkbTKFpfO3D/zLVLF+uiI=";
   };
 
diff --git a/pkgs/by-name/li/libvarlink/package.nix b/pkgs/by-name/li/libvarlink/package.nix
index a32d87951aee..ac1f4c26fe1a 100644
--- a/pkgs/by-name/li/libvarlink/package.nix
+++ b/pkgs/by-name/li/libvarlink/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "varlink";
     repo = "libvarlink";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-/BWbbDFLxa1da5ewrt3DG/+096dZ+s6p8VdcRGDiEiU=";
   };
 
diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix
index 24f05186e2ff..0f035821e476 100644
--- a/pkgs/by-name/li/libvdpau-va-gl/package.nix
+++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "i-rinat";
     repo = "libvdpau-va-gl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld";
   };
 
diff --git a/pkgs/by-name/li/libversion/package.nix b/pkgs/by-name/li/libversion/package.nix
index 0a6131259869..c1f1af764b0d 100644
--- a/pkgs/by-name/li/libversion/package.nix
+++ b/pkgs/by-name/li/libversion/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "repology";
     repo = "libversion";
-    tag = version;
+    rev = version;
     hash = "sha256-REmXD0NFd7Af01EU/f2IGoTKiju6ErTI7WUinvrAzaA=";
   };
 
diff --git a/pkgs/by-name/li/libverto/package.nix b/pkgs/by-name/li/libverto/package.nix
index f8f2d091fcde..7d148878bdf4 100644
--- a/pkgs/by-name/li/libverto/package.nix
+++ b/pkgs/by-name/li/libverto/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "libverto";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-csoJ0WdKyrza8kBSMKoaItKvcbijI6Wl8nWCbywPScQ=";
   };
 
diff --git a/pkgs/by-name/li/libvibrant/package.nix b/pkgs/by-name/li/libvibrant/package.nix
index cb4681fecac4..c6dab911b41e 100644
--- a/pkgs/by-name/li/libvibrant/package.nix
+++ b/pkgs/by-name/li/libvibrant/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libvibrant";
     repo = "libvibrant";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-APja211+U0WVuCRz8f3VIAQLF4oPhh0CJ3Y5EgSJnh0=";
   };
 
diff --git a/pkgs/by-name/li/libvisio2svg/package.nix b/pkgs/by-name/li/libvisio2svg/package.nix
index 79d1973f25bd..b82a14cc5319 100644
--- a/pkgs/by-name/li/libvisio2svg/package.nix
+++ b/pkgs/by-name/li/libvisio2svg/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kakwa";
     repo = "libvisio2svg";
-    tag = version;
+    rev = version;
     sha256 = "14m37mmib1596c76j9w178jqhwxyih2sy5w5q9xglh8cmlfn1hfx";
   };
 
diff --git a/pkgs/by-name/li/libvpx/package.nix b/pkgs/by-name/li/libvpx/package.nix
index 005edeca8969..41cc90a17954 100644
--- a/pkgs/by-name/li/libvpx/package.nix
+++ b/pkgs/by-name/li/libvpx/package.nix
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "webmproject";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ewkx1okhpa05jn4DyN8pkl6UJoz4Ymw4jRe6GN1lWuA=";
   };
 
diff --git a/pkgs/by-name/li/libwebp/package.nix b/pkgs/by-name/li/libwebp/package.nix
index 01d36c9accc3..c47827091eba 100644
--- a/pkgs/by-name/li/libwebp/package.nix
+++ b/pkgs/by-name/li/libwebp/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "webmproject";
     repo = "libwebp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DMHP7DVWXrTsqU0m9tc783E6dNO0EQoSXZTn5kZOtTg=";
   };
 
diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix
index 80481be98442..84e55117c74b 100644
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "warmcat";
     repo = "libwebsockets";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KOAhIVn4G5u0A1TE75Xv7iYO3/i8foqWYecH0kJHdBM=";
   };
 
diff --git a/pkgs/by-name/li/libwhereami/package.nix b/pkgs/by-name/li/libwhereami/package.nix
index a21d126632ed..f21551ca0242 100644
--- a/pkgs/by-name/li/libwhereami/package.nix
+++ b/pkgs/by-name/li/libwhereami/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "05fc28dri2h858kxbvldk5b6wd5is3fjcdsiqj3nxf95i66bb3xp";
-    tag = version;
+    rev = version;
     repo = "libwhereami";
     owner = "puppetlabs";
   };
diff --git a/pkgs/by-name/li/libwhich/package.nix b/pkgs/by-name/li/libwhich/package.nix
index b104b67c1b2c..4dc97d33a7e7 100644
--- a/pkgs/by-name/li/libwhich/package.nix
+++ b/pkgs/by-name/li/libwhich/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vtjnash";
     repo = "libwhich";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JNIWdI12sL3TZqVA3GeH0KbgqFDbMsEdecea3392Goc=";
   };
 
diff --git a/pkgs/by-name/li/libwmf/package.nix b/pkgs/by-name/li/libwmf/package.nix
index 1aa01987815f..7e55740b0376 100644
--- a/pkgs/by-name/li/libwmf/package.nix
+++ b/pkgs/by-name/li/libwmf/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "caolanm";
     repo = "libwmf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vffohx57OvQKu8DfNXNBm9bPsA8KgkQWs/3mmFn7L6M=";
   };
 
diff --git a/pkgs/by-name/li/libx86emu/package.nix b/pkgs/by-name/li/libx86emu/package.nix
index 38b5dd4a8ba9..6449b67a7600 100644
--- a/pkgs/by-name/li/libx86emu/package.nix
+++ b/pkgs/by-name/li/libx86emu/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wfeldt";
     repo = "libx86emu";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ilAmGlkMeuG0FlygMdE3NreFPJJF6g/26C8C5grvjrk=";
   };
 
diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix
index b64fb634b36b..55c58f9518a6 100644
--- a/pkgs/by-name/li/libxls/package.nix
+++ b/pkgs/by-name/li/libxls/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libxls";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KbITHQ9s2RUeo8zR53R9s4WUM6z8zzddz1k47So0Mlw=";
   };
 
diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix
index 6d56d01f027a..d814ee010450 100644
--- a/pkgs/by-name/li/libxmlb/package.nix
+++ b/pkgs/by-name/li/libxmlb/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "libxmlb";
-    tag = version;
+    rev = version;
     hash = "sha256-+gs1GqDVnt0uf/0vjUj+c9CRnUtaYfngBsjSs4ZwVXs=";
   };
 
diff --git a/pkgs/by-name/li/libxo/package.nix b/pkgs/by-name/li/libxo/package.nix
index 2db30f3b8817..f8747a754e0e 100644
--- a/pkgs/by-name/li/libxo/package.nix
+++ b/pkgs/by-name/li/libxo/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Juniper";
     repo = "libxo";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ElSxegY2ejw7IuIMznfVpl29Wyvpx9k1BdXregzYsoQ=";
   };
 
diff --git a/pkgs/by-name/li/libxsmm/package.nix b/pkgs/by-name/li/libxsmm/package.nix
index e7dd1cccb253..fcb99e8c346c 100644
--- a/pkgs/by-name/li/libxsmm/package.nix
+++ b/pkgs/by-name/li/libxsmm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libxsmm";
     repo = "libxsmm";
-    tag = version;
+    rev = version;
     sha256 = "sha256-s/NEFU4IwQPLyPLwMmrrpMDd73q22Sk2BNid/kedawY=";
   };
 
diff --git a/pkgs/by-name/li/libyaml/package.nix b/pkgs/by-name/li/libyaml/package.nix
index e722475782d3..9ab641e5543d 100644
--- a/pkgs/by-name/li/libyaml/package.nix
+++ b/pkgs/by-name/li/libyaml/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yaml";
     repo = "libyaml";
-    tag = version;
+    rev = version;
     sha256 = "18zsnsxc53pans4a01cs4401a2cjk3qi098hi440pj4zijifgcsb";
   };
 
diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix
index 4cb3b025dd0b..ca097a219486 100644
--- a/pkgs/by-name/li/libyang/package.nix
+++ b/pkgs/by-name/li/libyang/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CESNET";
     repo = "libyang";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5oJV8gr2rwvSdpX5w3gmIw/LTrWtXVnl6oLr/soNTDk=";
   };
 
diff --git a/pkgs/by-name/li/libytnef/package.nix b/pkgs/by-name/li/libytnef/package.nix
index efee9e6000c7..9b3bf8c5e3fe 100644
--- a/pkgs/by-name/li/libytnef/package.nix
+++ b/pkgs/by-name/li/libytnef/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Yeraze";
     repo = "ytnef";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kQb45Da0T7wWi1IivA8Whk+ECL2nyFf7Gc0gK1HKj2c=";
   };
 
diff --git a/pkgs/by-name/li/libzbc/package.nix b/pkgs/by-name/li/libzbc/package.nix
index ccb8c58cd5d0..d7c00b7b296e 100644
--- a/pkgs/by-name/li/libzbc/package.nix
+++ b/pkgs/by-name/li/libzbc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "westerndigitalcorporation";
     repo = "libzbc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8+HF5Wf6lQHbi8Vp2tpom1FO56lQ5RyYsgs8ii+2RD0=";
   };
 
diff --git a/pkgs/by-name/li/libzbd/package.nix b/pkgs/by-name/li/libzbd/package.nix
index a27c8cbd12d8..2276e1dfc4d5 100644
--- a/pkgs/by-name/li/libzbd/package.nix
+++ b/pkgs/by-name/li/libzbd/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "westerndigitalcorporation";
     repo = "libzbd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-iMQjOWsgsS+uI8mqoOXHRAV1+SIu1McUAcrsY+/zcu8=";
   };
 
diff --git a/pkgs/by-name/li/license-go/package.nix b/pkgs/by-name/li/license-go/package.nix
index 474e85daafcd..17491272b426 100644
--- a/pkgs/by-name/li/license-go/package.nix
+++ b/pkgs/by-name/li/license-go/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "nishanths";
     repo = "license";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Rz/eIGa3xLjirPMOs4otfmwy4OzJgopKPbka2OKt8Fo=";
   };
 
diff --git a/pkgs/by-name/li/licenseclassifier/package.nix b/pkgs/by-name/li/licenseclassifier/package.nix
index 513438ea1761..ad12323a4ecc 100644
--- a/pkgs/by-name/li/licenseclassifier/package.nix
+++ b/pkgs/by-name/li/licenseclassifier/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "licenseclassifier";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j+8hX8W0VD0h09Qmu7POnHT8f8+SeG5Si1fI0CDIwuo=";
   };
 
diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix
index b1265a6f5a74..a5a4ac228048 100644
--- a/pkgs/by-name/li/licensure/package.nix
+++ b/pkgs/by-name/li/licensure/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chasinglogic";
     repo = "licensure";
-    tag = version;
+    rev = version;
     hash = "sha256-3kZzYDKMLRdYzxa9+wVeTFJk186MJZfGfzRXgY9tI4Y=";
   };
 
diff --git a/pkgs/by-name/li/lifecycled/package.nix b/pkgs/by-name/li/lifecycled/package.nix
index 4f9f3711a9c3..8605f701fe1b 100644
--- a/pkgs/by-name/li/lifecycled/package.nix
+++ b/pkgs/by-name/li/lifecycled/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "lifecycled";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zskN2T0+1xZPjppggeGpPFuQ8/AgPNyN77F33rDoghc=";
   };
 
diff --git a/pkgs/by-name/li/lightdm-mini-greeter/package.nix b/pkgs/by-name/li/lightdm-mini-greeter/package.nix
index 19cd73498b47..632e471c9203 100644
--- a/pkgs/by-name/li/lightdm-mini-greeter/package.nix
+++ b/pkgs/by-name/li/lightdm-mini-greeter/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "prikhi";
     repo = "lightdm-mini-greeter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Pm7ExfusFIPktX2C4UE07qgOVhcWhVxnaD3QARpmu7Y=";
   };
 
diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix
index ccc8e9b727ed..67cd39a37d71 100644
--- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix
+++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "slick-greeter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-YSSAFH6azXVk527CmZ6RM2hBdzziTdXeOmYZKusF/DQ=";
   };
 
diff --git a/pkgs/by-name/li/lightdm-tiny-greeter/package.nix b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix
index 1cd478f8cd6f..46a5ff29365c 100644
--- a/pkgs/by-name/li/lightdm-tiny-greeter/package.nix
+++ b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "off-world";
     repo = "lightdm-tiny-greeter";
-    tag = version;
+    rev = version;
     sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6";
   };
 
diff --git a/pkgs/by-name/li/lightlocker/package.nix b/pkgs/by-name/li/lightlocker/package.nix
index ca916c54cdce..efcee4bdeea1 100644
--- a/pkgs/by-name/li/lightlocker/package.nix
+++ b/pkgs/by-name/li/lightlocker/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "the-cavalry";
     repo = "light-locker";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1z5lcd02gqax65qc14hj5khifg7gr53zy3s5i6apba50lbdlfk46";
   };
 
diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix
index b37d35905ae1..c68648a0ee3d 100644
--- a/pkgs/by-name/li/lightning-loop/package.nix
+++ b/pkgs/by-name/li/lightning-loop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "loop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zgKKYHDRYXPslPHay/V2DAL1jQfeX5qPWUQQtuvp1M0=";
   };
 
diff --git a/pkgs/by-name/li/lightning-pool/package.nix b/pkgs/by-name/li/lightning-pool/package.nix
index 1d9c9aca2752..af93ba7c1e83 100644
--- a/pkgs/by-name/li/lightning-pool/package.nix
+++ b/pkgs/by-name/li/lightning-pool/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "pool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lSc/zOZ5VpmaZ7jrlGvSaczrgOtAMS9tDUxcMoFdBmQ=";
   };
 
diff --git a/pkgs/by-name/li/lightspark/package.nix b/pkgs/by-name/li/lightspark/package.nix
index 61b286bd37d9..89d6900fba94 100644
--- a/pkgs/by-name/li/lightspark/package.nix
+++ b/pkgs/by-name/li/lightspark/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lightspark";
     repo = "lightspark";
-    tag = version;
+    rev = version;
     hash = "sha256-2+Kmwj2keCMR7UbKbY6UvrkX4CnW61elres8ltiZuUg=";
   };
 
diff --git a/pkgs/by-name/li/lightwalletd/package.nix b/pkgs/by-name/li/lightwalletd/package.nix
index d7cacbdde911..2f3779f337b9 100644
--- a/pkgs/by-name/li/lightwalletd/package.nix
+++ b/pkgs/by-name/li/lightwalletd/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zcash";
     repo = "lightwalletd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-M9xfV2T8L+nssrJj29QmPiErNMpfpT8BY/30Vj8wPjY=";
   };
 
diff --git a/pkgs/by-name/li/lilipod/package.nix b/pkgs/by-name/li/lilipod/package.nix
index 61511892d3c4..9d26c94d7bda 100644
--- a/pkgs/by-name/li/lilipod/package.nix
+++ b/pkgs/by-name/li/lilipod/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "89luca89";
     repo = "lilipod";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PqeYNLr4uXe+H+DLENlUpl1H2wV6VJvDoA+MVP3SRqY=";
   };
 
diff --git a/pkgs/by-name/li/limesurvey/package.nix b/pkgs/by-name/li/limesurvey/package.nix
index c0a88bdcf8f8..d8b44edb8470 100644
--- a/pkgs/by-name/li/limesurvey/package.nix
+++ b/pkgs/by-name/li/limesurvey/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LimeSurvey";
     repo = "LimeSurvey";
-    tag = version;
+    rev = version;
     hash = "sha256-2ZRN2zbrrGWTXgsPeRWsQbg1qw2vVIAwzUI0LWgCL9g=";
   };
 
diff --git a/pkgs/by-name/li/linbox/package.nix b/pkgs/by-name/li/linbox/package.nix
index ef08f86fcf1f..b1fa335a04a7 100644
--- a/pkgs/by-name/li/linbox/package.nix
+++ b/pkgs/by-name/li/linbox/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linbox-team";
     repo = "linbox";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mW84a98KPLqcHMjX3LIYTmVe0ngUdz6RJLpoDaAqKU8=";
   };
 
diff --git a/pkgs/by-name/li/linenoise-ng/package.nix b/pkgs/by-name/li/linenoise-ng/package.nix
index 6c4dcb1f329f..1b9ad3f243c4 100644
--- a/pkgs/by-name/li/linenoise-ng/package.nix
+++ b/pkgs/by-name/li/linenoise-ng/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arangodb";
     repo = "linenoise-ng";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "176iz0kj0p8d8i3jqps4z8xkxwl3f1986q88i9xg5fvqgpzsxp20";
   };
 
diff --git a/pkgs/by-name/li/lineselect/package.nix b/pkgs/by-name/li/lineselect/package.nix
index 53260101d2dd..5386172232ea 100644
--- a/pkgs/by-name/li/lineselect/package.nix
+++ b/pkgs/by-name/li/lineselect/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "chfritz";
     repo = "lineselect";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dCmLD4Wjsdlta2xsFCMj1zWQr4HWCfcWsKVmrTND4Yw=";
   };
 
diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix
index 3a4b62863930..493ce3831e51 100644
--- a/pkgs/by-name/li/lint-staged/package.nix
+++ b/pkgs/by-name/li/lint-staged/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "okonet";
     repo = "lint-staged";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xZ4fKwryGHVD1AhSKJVvBGIDJin10YejKxDp1yMi8Pg=";
   };
 
diff --git a/pkgs/by-name/li/linux_logo/package.nix b/pkgs/by-name/li/linux_logo/package.nix
index 17c8c6c4b51a..85da3509bd6c 100644
--- a/pkgs/by-name/li/linux_logo/package.nix
+++ b/pkgs/by-name/li/linux_logo/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "deater";
     repo = "linux_logo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yBAxPwgKyFFIX0wuG7oG+FbEDpA5cPwyyJgWrFErJ7I=";
   };
 
diff --git a/pkgs/by-name/li/linuxptp/package.nix b/pkgs/by-name/li/linuxptp/package.nix
index d0ccefb2d163..3b02c68f1221 100644
--- a/pkgs/by-name/li/linuxptp/package.nix
+++ b/pkgs/by-name/li/linuxptp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nwtime";
     repo = "linuxptp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-w1buo+D8Mnd6ytMhQYhvCDqt+RejlNSN/iVjrDR+Khk=";
   };
 
diff --git a/pkgs/by-name/li/liquidprompt/package.nix b/pkgs/by-name/li/liquidprompt/package.nix
index 117af914d304..45ea18b01f37 100644
--- a/pkgs/by-name/li/liquidprompt/package.nix
+++ b/pkgs/by-name/li/liquidprompt/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "liquidprompt";
     repo = "liquidprompt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZVzFGe3ItWsN23iyGpxZEN2KtviYKI8x/sDa2MRio/Y=";
   };
 
diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix
index a36c2abb67d6..ba73f3ceb1f7 100644
--- a/pkgs/by-name/li/listmonk/package.nix
+++ b/pkgs/by-name/li/listmonk/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knadh";
     repo = "listmonk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eNX+2ens+mz2V8ZBHtFFHDVbi64AAiiREElMjh67Dd8=";
   };
 
diff --git a/pkgs/by-name/li/listmonk/stuffbin.nix b/pkgs/by-name/li/listmonk/stuffbin.nix
index b4e69db01b89..44234a418076 100644
--- a/pkgs/by-name/li/listmonk/stuffbin.nix
+++ b/pkgs/by-name/li/listmonk/stuffbin.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knadh";
     repo = "stuffbin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-M72xNh7bKUMLzA+M8bJB++kJ5KCrkboQm1v8BasP3Yo=";
   };
 
diff --git a/pkgs/by-name/li/lite/package.nix b/pkgs/by-name/li/lite/package.nix
index 96ce93552663..fd19d3bd1f83 100644
--- a/pkgs/by-name/li/lite/package.nix
+++ b/pkgs/by-name/li/lite/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rxi";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0wxqfb4ly8g7w5qph76xys95b55ackkags8jgd1nasmiyi8gcd5a";
   };
 
diff --git a/pkgs/by-name/li/litecli/package.nix b/pkgs/by-name/li/litecli/package.nix
index 99e6ca14a7c3..cece9764e1b5 100644
--- a/pkgs/by-name/li/litecli/package.nix
+++ b/pkgs/by-name/li/litecli/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dbcli";
     repo = "litecli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TPwzXfb4n6wTe6raQ5IowKdhGkKrf2pmSS2+Q03NKYk=";
   };
 
diff --git a/pkgs/by-name/li/litefs/package.nix b/pkgs/by-name/li/litefs/package.nix
index 92bb4e8e3478..5277cda5c178 100644
--- a/pkgs/by-name/li/litefs/package.nix
+++ b/pkgs/by-name/li/litefs/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "superfly";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-I12bKImZkvAMyfwb6r/NxE+BcUk+SalN+cIDXP0q4xA=";
   };
 
diff --git a/pkgs/by-name/li/litestream/package.nix b/pkgs/by-name/li/litestream/package.nix
index 13b904dcb737..fdb205a271ed 100644
--- a/pkgs/by-name/li/litestream/package.nix
+++ b/pkgs/by-name/li/litestream/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "benbjohnson";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-p858gK+ICKDQ+/LUiBaxF/kfrZzQAXnYMZDFU8kNCJ4=";
   };
 
diff --git a/pkgs/by-name/li/litmus/package.nix b/pkgs/by-name/li/litmus/package.nix
index b6cf2f524600..2741576e5a0c 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";
-    tag = version;
+    rev = version;
     # Required for neon m4 macros, bundled neon not used
     fetchSubmodules = true;
     hash = "sha256-jWz0cnytgn7px3vvB9/ilWBNALQiW5/QvgguM27I3yQ=";
diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix
index 28d939d04f9c..4cbb41fec40d 100644
--- a/pkgs/by-name/li/litmusctl/package.nix
+++ b/pkgs/by-name/li/litmusctl/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "litmuschaos";
     repo = "litmusctl";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-Saj5sx5YkcKsnMrnIzPcLok+mgEZSh9p8rnfQbJhAeU=";
   };
 
diff --git a/pkgs/by-name/li/little_boxes/package.nix b/pkgs/by-name/li/little_boxes/package.nix
index 12ac0edbfb59..7d9178af1469 100644
--- a/pkgs/by-name/li/little_boxes/package.nix
+++ b/pkgs/by-name/li/little_boxes/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "giodamelio";
     repo = "little_boxes";
-    tag = version;
+    rev = version;
     hash = "sha256-Quh09K5meiA39ih/orJWF2WfkuZdymxub1dZvns/q3E=";
   };
 
diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix
index 8777d1bf8570..93f03ec7a786 100644
--- a/pkgs/by-name/li/littlefs-fuse/package.nix
+++ b/pkgs/by-name/li/littlefs-fuse/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "littlefs-project";
     repo = "littlefs-fuse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RZpGLFVNo3WEXVU7V2tFjRs8iYN1Ge6AN4Bcq3d6mtc=";
   };
   buildInputs = [ fuse ];
diff --git a/pkgs/by-name/li/live-chart/package.nix b/pkgs/by-name/li/live-chart/package.nix
index 49d917e7062c..942fe3545562 100644
--- a/pkgs/by-name/li/live-chart/package.nix
+++ b/pkgs/by-name/li/live-chart/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lcallarec";
     repo = "live-chart";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-SOZJ9sVrmsZybs5BVXWmqBJ/P7SZI/X8TGWHXGvXAU8=";
   };
 
diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index 15d877a2d421..66ede7d221c3 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lomirus";
     repo = "live-server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8NM3XJ7RC7cUNKN1DPW2huvkx7tfA8zDrETkwDMbaT8=";
   };
 
diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix
index 80e0dfa8ccf7..ea9716c6fd70 100644
--- a/pkgs/by-name/li/livekit-cli/package.nix
+++ b/pkgs/by-name/li/livekit-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-J5tg3nm2pEemEZcIpObcxH+G4ByzvUtoSyy92CcWr6M=";
   };
 
diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index 17681088d3be..4f023ced0b09 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j8alEPvSMdYpQLdWwaoSG5ZYgO17O1BMa71omeCb2Ug=";
   };
 
diff --git a/pkgs/by-name/li/lizardfs/package.nix b/pkgs/by-name/li/lizardfs/package.nix
index d0c5d2079d74..a7aead761da0 100644
--- a/pkgs/by-name/li/lizardfs/package.nix
+++ b/pkgs/by-name/li/lizardfs/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lizardfs";
     repo = "lizardfs";
-    tag = version;
+    rev = version;
     sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q=";
   };
 
diff --git a/pkgs/by-name/lk/lksctp-tools/package.nix b/pkgs/by-name/lk/lksctp-tools/package.nix
index 11bf2429d538..8958dff70378 100644
--- a/pkgs/by-name/lk/lksctp-tools/package.nix
+++ b/pkgs/by-name/lk/lksctp-tools/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sctp";
     repo = "lksctp-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+vbdNvHuJLYp901QgtBzMejlbzMyr9Z1eXxR3Zy7eAE=";
   };
 
diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix
index 1adec65f2cdd..6931256080b2 100644
--- a/pkgs/by-name/ll/lldap/package.nix
+++ b/pkgs/by-name/ll/lldap/package.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitHub {
       owner = "lldap";
       repo = "lldap";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-iQ+Vv9kx/pWHoa/WZChBK+FD2r1avzWWz57bnnzRjUg=";
     };
 
diff --git a/pkgs/by-name/ll/llpp/package.nix b/pkgs/by-name/ll/llpp/package.nix
index 713f2aa52d7c..686831fd92dc 100644
--- a/pkgs/by-name/ll/llpp/package.nix
+++ b/pkgs/by-name/ll/llpp/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "criticic";
     repo = "llpp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B/jKvBtBwMOErUVmGFGXXIT8FzMl1DFidfDCHIH41TU=";
   };
 
diff --git a/pkgs/by-name/lm/lmdbxx/package.nix b/pkgs/by-name/lm/lmdbxx/package.nix
index 46b4a9cefc6d..f36619273025 100644
--- a/pkgs/by-name/lm/lmdbxx/package.nix
+++ b/pkgs/by-name/lm/lmdbxx/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hoytech";
     repo = "lmdbxx";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-7CxQZdgHVvmof6wVR9Mzic6tg89XJT3Z1ICGRs7PZYo=";
   };
 
diff --git a/pkgs/by-name/lm/lmp/package.nix b/pkgs/by-name/lm/lmp/package.nix
index 77a6e7786f27..f651b1d9046e 100644
--- a/pkgs/by-name/lm/lmp/package.nix
+++ b/pkgs/by-name/lm/lmp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "0xInfection";
     repo = "LogMePwn";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VL/Hp7YaXNcV9JPb3kgRHcdhJJ5p3KHUf3hHbT3gKVk=";
   };
 
diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix
index 3904867ed63c..8cec68695abd 100644
--- a/pkgs/by-name/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "epoupon";
     repo = "lms";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-H+ibj7eroIWti2Mxa+V5pzE1NE7b3H3/ThVIDqweWf8=";
   };
 
diff --git a/pkgs/by-name/ln/lnd/package.nix b/pkgs/by-name/ln/lnd/package.nix
index 5cac89fedd99..ec161dd4219f 100644
--- a/pkgs/by-name/ln/lnd/package.nix
+++ b/pkgs/by-name/ln/lnd/package.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightningnetwork";
     repo = "lnd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7Y1GcZoj7Uk0PGd0B0J4hXpb5voqmM2f/Ie4FRHI3iQ=";
   };
 
diff --git a/pkgs/by-name/ln/lndconnect/package.nix b/pkgs/by-name/ln/lndconnect/package.nix
index 51d71addad7a..d5105e6fc1c0 100644
--- a/pkgs/by-name/ln/lndconnect/package.nix
+++ b/pkgs/by-name/ln/lndconnect/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "LN-Zap";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cuZkVeFUQq7+kQo/YjXCMPANUL5QooAWgegcoWo3M0c=";
   };
 
diff --git a/pkgs/by-name/ln/lndhub-go/package.nix b/pkgs/by-name/ln/lndhub-go/package.nix
index 99db6d50d586..a8be86ad8a03 100644
--- a/pkgs/by-name/ln/lndhub-go/package.nix
+++ b/pkgs/by-name/ln/lndhub-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "getAlby";
     repo = "lndhub.go";
-    tag = version;
+    rev = version;
     sha256 = "sha256-17vvC6J0VdXouGfX4k1kCVRlkXbNSX3AT8QIY8uKDUE=";
   };
 
diff --git a/pkgs/by-name/ln/lndinit/package.nix b/pkgs/by-name/ln/lndinit/package.nix
index e45ec2ce600e..183465512d6f 100644
--- a/pkgs/by-name/ln/lndinit/package.nix
+++ b/pkgs/by-name/ln/lndinit/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "lndinit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KXCObRUhXTEeb48hnQYrnb55g+nJomr52IIVpFDn+nY=";
   };
 
diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix
index e98685b45a9b..14832660a7a9 100644
--- a/pkgs/by-name/lo/local-ai/package.nix
+++ b/pkgs/by-name/lo/local-ai/package.nix
@@ -335,7 +335,7 @@ let
   src = fetchFromGitHub {
     owner = "go-skynet";
     repo = "LocalAI";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eHylgEbPNQ8CVLlstkeQH6jqYOKfvel1uU5ro8DkLJs=";
   };
 
diff --git a/pkgs/by-name/lo/locate-dominating-file/package.nix b/pkgs/by-name/lo/locate-dominating-file/package.nix
index b996694afc03..ece548fc56c7 100644
--- a/pkgs/by-name/lo/locate-dominating-file/package.nix
+++ b/pkgs/by-name/lo/locate-dominating-file/package.nix
@@ -16,7 +16,7 @@ resholve.mkDerivation {
   src = fetchFromGitHub {
     owner = "roman";
     repo = "locate-dominating-file";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gwh6fAw7BV7VFIkQN02QIhK47uxpYheMk64UeLyp2IY=";
   };
 
diff --git a/pkgs/by-name/lo/log4j-sniffer/package.nix b/pkgs/by-name/lo/log4j-sniffer/package.nix
index 1311087cbbf0..4e5102574abb 100644
--- a/pkgs/by-name/lo/log4j-sniffer/package.nix
+++ b/pkgs/by-name/lo/log4j-sniffer/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "palantir";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pO6difzNvQvKQtRLyksXmExtQHlnnwyF3iNEmSBgUmU=";
   };
 
diff --git a/pkgs/by-name/lo/log4j-vuln-scanner/package.nix b/pkgs/by-name/lo/log4j-vuln-scanner/package.nix
index e9380f333b2c..784a3db24ec9 100644
--- a/pkgs/by-name/lo/log4j-vuln-scanner/package.nix
+++ b/pkgs/by-name/lo/log4j-vuln-scanner/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hillu";
     repo = "local-log4j-vuln-scanner";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YMD2233EdrrF1SLjwiRcNr53b7Rf5Tu8CZC43QhSY7c=";
   };
 
diff --git a/pkgs/by-name/lo/logiops_0_2_3/package.nix b/pkgs/by-name/lo/logiops_0_2_3/package.nix
index 0ddf9681e9fd..99c8415134cc 100644
--- a/pkgs/by-name/lo/logiops_0_2_3/package.nix
+++ b/pkgs/by-name/lo/logiops_0_2_3/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pixlone";
     repo = "logiops";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1v728hbIM2ODtB+r6SYzItczRJCsbuTvhYD2OUM1+/E=";
   };
 
diff --git a/pkgs/by-name/lo/logrotate/package.nix b/pkgs/by-name/lo/logrotate/package.nix
index ff1810247e81..3f454af211ab 100644
--- a/pkgs/by-name/lo/logrotate/package.nix
+++ b/pkgs/by-name/lo/logrotate/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "logrotate";
     repo = "logrotate";
-    tag = version;
+    rev = version;
     sha256 = "sha256-D7E2mpC7v2kbsb1EyhR6hLvGbnIvGB2MK1n1gptYyKI=";
   };
 
diff --git a/pkgs/by-name/lo/lokalise2-cli/package.nix b/pkgs/by-name/lo/lokalise2-cli/package.nix
index 9912f7422ea8..32cfb4202228 100644
--- a/pkgs/by-name/lo/lokalise2-cli/package.nix
+++ b/pkgs/by-name/lo/lokalise2-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lokalise";
     repo = "lokalise-cli-2-go";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-R8vzHuWkNznq/eeXUVHm9SJJmRV2B2WXKQFEHil+HiY=";
   };
 
diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix
index 7acc4ede9527..45ea60a7ea13 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";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-R9yLrXzXeu7gUoV+CDOAu89p2YmPP0ImAWq2fod722c=";
   };
diff --git a/pkgs/by-name/lo/lolcode/package.nix b/pkgs/by-name/lo/lolcode/package.nix
index 3b84753802b0..ff96112289c1 100644
--- a/pkgs/by-name/lo/lolcode/package.nix
+++ b/pkgs/by-name/lo/lolcode/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "justinmeza";
     repo = "lci";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VMBW3/sw+1kI6iuOckSPU1TIeY6QORcSfFLFkRYw3Gs=";
   };
 
diff --git a/pkgs/by-name/lo/longview/package.nix b/pkgs/by-name/lo/longview/package.nix
index a0a18a6c653a..d35bd0592ea6 100644
--- a/pkgs/by-name/lo/longview/package.nix
+++ b/pkgs/by-name/lo/longview/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linode";
     repo = "longview";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1i9lli8iw8sb1bd633i82fzhx5gz85ma9d1hra41pkv2p3h823pa";
   };
 
diff --git a/pkgs/by-name/lo/looking-glass-client/package.nix b/pkgs/by-name/lo/looking-glass-client/package.nix
index 4b21f6c252f7..5e8ee0d2a684 100644
--- a/pkgs/by-name/lo/looking-glass-client/package.nix
+++ b/pkgs/by-name/lo/looking-glass-client/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gnif";
     repo = "LookingGlass";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-I84oVLeS63mnR19vTalgvLvA5RzCPTXV+tSsw+ImDwQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/lo/lorem/package.nix b/pkgs/by-name/lo/lorem/package.nix
index 5690ca2aa440..ed6bb0111784 100644
--- a/pkgs/by-name/lo/lorem/package.nix
+++ b/pkgs/by-name/lo/lorem/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "World/design";
     repo = "lorem";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-q6gpxxNebf2G/lT5wWXT/lVp3zR8QLWB8/sdK+wLTJ8=";
   };
 
diff --git a/pkgs/by-name/lo/lorien/package.nix b/pkgs/by-name/lo/lorien/package.nix
index 37e8de25239f..345be9574959 100644
--- a/pkgs/by-name/lo/lorien/package.nix
+++ b/pkgs/by-name/lo/lorien/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mbrlabs";
     repo = "Lorien";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mPv/3hyLGF3IUy6cKfGoABidIsyw4UfmhfhS4AD72K8=";
   };
 
diff --git a/pkgs/by-name/lo/loudgain/package.nix b/pkgs/by-name/lo/loudgain/package.nix
index 2524d255e80b..0a29ea0e7e3d 100644
--- a/pkgs/by-name/lo/loudgain/package.nix
+++ b/pkgs/by-name/lo/loudgain/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Moonbase59";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XLj+n0GlY/GAkJlW2JVMd0jxMzgdv/YeSTuF6QUIGwU=";
   };
 
diff --git a/pkgs/by-name/lo/lounge-gtk-theme/package.nix b/pkgs/by-name/lo/lounge-gtk-theme/package.nix
index 1b6d367a48a6..aec0a74eaf18 100644
--- a/pkgs/by-name/lo/lounge-gtk-theme/package.nix
+++ b/pkgs/by-name/lo/lounge-gtk-theme/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "monday15";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0ima0aa5j296xn4y0d1zj6vcdrdpnihqdidj7bncxzgbnli1vazs";
   };
 
diff --git a/pkgs/by-name/lo/lout/package.nix b/pkgs/by-name/lo/lout/package.nix
index f7785f3bee3b..44b01867093c 100644
--- a/pkgs/by-name/lo/lout/package.nix
+++ b/pkgs/by-name/lo/lout/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "william8000";
     repo = "lout";
-    tag = version;
+    rev = version;
     hash = "sha256-bXLhkJqhv8pftDZYv6vn9ycy5u3vde+m3gCPvWJz2M8=";
   };
 
diff --git a/pkgs/by-name/lp/lparchive2epub/package.nix b/pkgs/by-name/lp/lparchive2epub/package.nix
index 7faeeec370c1..e7024017bacc 100644
--- a/pkgs/by-name/lp/lparchive2epub/package.nix
+++ b/pkgs/by-name/lp/lparchive2epub/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Arwalk";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-z8/cIevqPKo7Eukk4WVxgSjzO1EYUYWD8orAdUKR8z8=";
   };
 
diff --git a/pkgs/by-name/lp/lprint/package.nix b/pkgs/by-name/lp/lprint/package.nix
index fad268369203..e2aca674b63f 100644
--- a/pkgs/by-name/lp/lprint/package.nix
+++ b/pkgs/by-name/lp/lprint/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = "lprint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1OOLGQ8S4oRNSJanX/AzJ+g5F+jYnE/+o+ie5ucY22U=";
   };
 
diff --git a/pkgs/by-name/lr/lr/package.nix b/pkgs/by-name/lr/lr/package.nix
index f70a1eda2ae3..b4b2807f3f50 100644
--- a/pkgs/by-name/lr/lr/package.nix
+++ b/pkgs/by-name/lr/lr/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chneukirchen";
     repo = "lr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TcP0jLFemdmWzGa4/RX7N6xUUTgKsI7IEOD7GfuuPWI=";
   };
 
diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix
index ee9cea863987..1bf3282df317 100644
--- a/pkgs/by-name/lr/lrcget/package.nix
+++ b/pkgs/by-name/lr/lrcget/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tranxuanthang";
     repo = "lrcget";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-3dBjQ1fO1q8JCQFvvV8LWBCD8cKFkFmm8ufC/Xihmj4=";
   };
 
diff --git a/pkgs/by-name/lr/lrdf/package.nix b/pkgs/by-name/lr/lrdf/package.nix
index b58838e3c87f..4c11211c1a19 100644
--- a/pkgs/by-name/lr/lrdf/package.nix
+++ b/pkgs/by-name/lr/lrdf/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swh";
     repo = "LRDF";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4";
   };
 
diff --git a/pkgs/by-name/lr/lrzip/package.nix b/pkgs/by-name/lr/lrzip/package.nix
index 56b4bfb70bcd..e1b257fcd09a 100644
--- a/pkgs/by-name/lr/lrzip/package.nix
+++ b/pkgs/by-name/lr/lrzip/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ckolivas";
     repo = "lrzip";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Mb324ojtLV0S10KhL7Vjf3DhSOtCy1pFMTzvLkTnpXM=";
   };
 
diff --git a/pkgs/by-name/ls/ls-lint/package.nix b/pkgs/by-name/ls/ls-lint/package.nix
index 41c3e2c8a2c9..2d6627d132b2 100644
--- a/pkgs/by-name/ls/ls-lint/package.nix
+++ b/pkgs/by-name/ls/ls-lint/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "loeffel-io";
     repo = "ls-lint";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QAUmQAa1gNS2LLyFmOsydOVKZoZMWzu9y7SgbIq1ESk=";
   };
 
diff --git a/pkgs/by-name/ls/lsd/package.nix b/pkgs/by-name/ls/lsd/package.nix
index dd9c6bb6dd39..e3602446f902 100644
--- a/pkgs/by-name/ls/lsd/package.nix
+++ b/pkgs/by-name/ls/lsd/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lsd-rs";
     repo = "lsd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LlMcBMb40yN+rlvGVsh7JaC3j9sF60YxitQQXe1q/oI=";
   };
 
diff --git a/pkgs/by-name/ls/lsd2dsl/package.nix b/pkgs/by-name/ls/lsd2dsl/package.nix
index c981016a2756..73ad7e21a23e 100644
--- a/pkgs/by-name/ls/lsd2dsl/package.nix
+++ b/pkgs/by-name/ls/lsd2dsl/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nongeneric";
     repo = "lsd2dsl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0UsxDNpuWpBrfjh4q3JhZnOyXhHatSa3t/cApiG2JzM=";
   };
 
diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix
index 7fb1fb0194b8..bfa38767ab47 100644
--- a/pkgs/by-name/ls/lsh/package.nix
+++ b/pkgs/by-name/ls/lsh/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "latitudesh";
     repo = "lsh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0YpjG4u+wb4LRWzfTddKFwut0MBzEch+HZijmZiVXpE=";
   };
   vendorHash = "sha256-ogdyzfayleka4Y8x74ZtttD7MaeCl1qP/rQi9x0tMto=";
diff --git a/pkgs/by-name/ls/lsix/package.nix b/pkgs/by-name/ls/lsix/package.nix
index 8c6a0469e656..9f6a7c26bd8f 100644
--- a/pkgs/by-name/ls/lsix/package.nix
+++ b/pkgs/by-name/ls/lsix/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hackerb9";
     repo = "lsix";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-msTG7otjzksg/2XyPDy31LEb7uGXSgB8fzfHvad9nPA=";
   };
 
diff --git a/pkgs/by-name/ls/lsof/package.nix b/pkgs/by-name/ls/lsof/package.nix
index 69edb88f1f3f..617fca8861d3 100644
--- a/pkgs/by-name/ls/lsof/package.nix
+++ b/pkgs/by-name/ls/lsof/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lsof-org";
     repo = "lsof";
-    tag = version;
+    rev = version;
     hash = "sha256-JyvQV/JOMaL/3jUr6O0YIzJU/JcXVR65CJf5ip7334w=";
   };
 
diff --git a/pkgs/by-name/lt/ltc-tools/package.nix b/pkgs/by-name/lt/ltc-tools/package.nix
index ec3eed049a96..926b212b3a95 100644
--- a/pkgs/by-name/lt/ltc-tools/package.nix
+++ b/pkgs/by-name/lt/ltc-tools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "x42";
     repo = "ltc-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al";
   };
 
diff --git a/pkgs/by-name/lt/ltunify/package.nix b/pkgs/by-name/lt/ltunify/package.nix
index 5b4e7d767506..14b54abeb52b 100644
--- a/pkgs/by-name/lt/ltunify/package.nix
+++ b/pkgs/by-name/lt/ltunify/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Lekensteyn";
     repo = "ltunify";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9avri/2H0zv65tkBsIi9yVxx3eVS9oCkVCCFdjXqSgI=";
   };
 
diff --git a/pkgs/by-name/lu/luabridge/package.nix b/pkgs/by-name/lu/luabridge/package.nix
index 07d43b4ce0c2..4dd60b10cba5 100644
--- a/pkgs/by-name/lu/luabridge/package.nix
+++ b/pkgs/by-name/lu/luabridge/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinniefalco";
     repo = "LuaBridge";
-    tag = version;
+    rev = version;
     sha256 = "sha256-gXrBNzE41SH98Xz480+uHQlxHjMHzs23AImxil5LZ0g=";
   };
 
diff --git a/pkgs/by-name/lu/luaformatter/package.nix b/pkgs/by-name/lu/luaformatter/package.nix
index df0ef7898076..06bded91452f 100644
--- a/pkgs/by-name/lu/luaformatter/package.nix
+++ b/pkgs/by-name/lu/luaformatter/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Koihik";
     repo = "LuaFormatter";
-    tag = version;
+    rev = version;
     sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0";
   };
 
diff --git a/pkgs/by-name/lu/luakit/package.nix b/pkgs/by-name/lu/luakit/package.nix
index 45cac55871ab..7222f712b1dd 100644
--- a/pkgs/by-name/lu/luakit/package.nix
+++ b/pkgs/by-name/lu/luakit/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "luakit";
     repo = "luakit";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo=";
   };
 
diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix
index 190a94192e31..62c7ca64567d 100644
--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
-    tag = version;
+    rev = version;
     hash = "sha256-AEPUdqQ+uIWxSTOwwbZ8tWSz3VKKHa1D08o6oeEREkg=";
   };
 
diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix
index e3aa999054a0..a1adfb2babbe 100644
--- a/pkgs/by-name/lu/lubelogger/package.nix
+++ b/pkgs/by-name/lu/lubelogger/package.nix
@@ -12,7 +12,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "hargata";
     repo = "lubelog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZlB9lyfC4xrLWAb+Jbo6eI/LuYjvgMEauQeLxGCqy88=";
   };
 
diff --git a/pkgs/by-name/lu/lucky-cli/package.nix b/pkgs/by-name/lu/lucky-cli/package.nix
index e51ac7069987..6ee31e492fa0 100644
--- a/pkgs/by-name/lu/lucky-cli/package.nix
+++ b/pkgs/by-name/lu/lucky-cli/package.nix
@@ -13,7 +13,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "luckyframework";
     repo = "lucky_cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mDUx9cQoYpU9kSAls36kzNVYZ8a4aqHEMIWfzS41NBk=";
   };
 
diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix
index 8302205f1fea..b3ebe3f092e0 100644
--- a/pkgs/by-name/lu/ludtwig/package.nix
+++ b/pkgs/by-name/lu/ludtwig/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MalteJanz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3E1W6AlGQ9AhMzLvTV5KBjlKiWXyi7rFwHOdU3CIp60=";
   };
 
diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix
index 19225fbb7305..c616f6c4dce7 100644
--- a/pkgs/by-name/lu/ludusavi/package.nix
+++ b/pkgs/by-name/lu/ludusavi/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mtkennerly";
     repo = "ludusavi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N2dDi47Z2PifMNlYE6Lk1nHxfpvwoL6h2QkUPthlh4A=";
   };
 
diff --git a/pkgs/by-name/lu/luminous-ttv/package.nix b/pkgs/by-name/lu/luminous-ttv/package.nix
index c9787b4528bc..9d1fe61b0449 100644
--- a/pkgs/by-name/lu/luminous-ttv/package.nix
+++ b/pkgs/by-name/lu/luminous-ttv/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AlyoshaVasilieva";
     repo = "luminous-ttv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pT+hiREKdzw9MKv28QpLK6LmHvnRci26f0DlcXns2rA=";
   };
 
diff --git a/pkgs/by-name/lu/lunatic/package.nix b/pkgs/by-name/lu/lunatic/package.nix
index 64d4b0cb175b..ac508ee88afc 100644
--- a/pkgs/by-name/lu/lunatic/package.nix
+++ b/pkgs/by-name/lu/lunatic/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lunatic-solutions";
     repo = "lunatic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uMMssZaPDZn3bOtQIho+GvUCPmzRllv7eJ+SJuKaYtg=";
   };
 
diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix
index 533423438817..bf7c742bdd28 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KZt3w+nhJjz3ZLtLzJz0zpFTwQ28OmFWnCsLbo36Ryc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/lu/luneta/package.nix b/pkgs/by-name/lu/luneta/package.nix
index 3b1cdd9afc55..698e8b84a328 100644
--- a/pkgs/by-name/lu/luneta/package.nix
+++ b/pkgs/by-name/lu/luneta/package.nix
@@ -12,7 +12,7 @@ buildDubPackage rec {
   src = fetchFromGitHub {
     owner = "fbeline";
     repo = "luneta";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pYE8hccXT87JIMh71PtXzVQBegTzU7bdpVEaV2VkaEk=";
   };
 
diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix
index 6347e98a957e..4d096143fbfc 100644
--- a/pkgs/by-name/lu/lutgen/package.nix
+++ b/pkgs/by-name/lu/lutgen/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ozwaldorf";
     repo = "lutgen-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jmMVeDDVb/TuxulDYj+8y4Kl42EJTAWb3tAsanfWduE=";
   };
 
diff --git a/pkgs/by-name/lu/lux/package.nix b/pkgs/by-name/lu/lux/package.nix
index 36c86a545d70..6510caf5e25e 100644
--- a/pkgs/by-name/lu/lux/package.nix
+++ b/pkgs/by-name/lu/lux/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "iawia002";
     repo = "lux";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3d8EQ7GzufZvMfjHbVMdpuGE+vPdSir4diSnB29v0sw=";
   };
 
diff --git a/pkgs/by-name/lv/lv2bm/package.nix b/pkgs/by-name/lv/lv2bm/package.nix
index ee39fca6ce7f..bbf1ab10b2f8 100644
--- a/pkgs/by-name/lv/lv2bm/package.nix
+++ b/pkgs/by-name/lv/lv2bm/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moddevices";
     repo = "lv2bm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0vlppxfb9zbmffazs1kiyb79py66s8x9hihj36m2vz86zsq7ybl0";
   };
 
diff --git a/pkgs/by-name/lv/lv_font_conv/package.nix b/pkgs/by-name/lv/lv_font_conv/package.nix
index ccc5eec31167..132adafe343a 100644
--- a/pkgs/by-name/lv/lv_font_conv/package.nix
+++ b/pkgs/by-name/lv/lv_font_conv/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "lvgl";
     repo = "lv_font_conv";
-    tag = version;
+    rev = version;
     hash = "sha256-tm6xPOW0pOO02M10O1H7ww+yXWq/DJtbDmlfrJ6Lp4Y=";
   };
 
diff --git a/pkgs/by-name/lw/lwan/package.nix b/pkgs/by-name/lw/lwan/package.nix
index af72fde12894..2034caffd516 100644
--- a/pkgs/by-name/lw/lwan/package.nix
+++ b/pkgs/by-name/lw/lwan/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lpereira";
     repo = "lwan";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-otiPH+e+auMCyeOTq4LJYaBNv+I91kOCww7DCepQTAQ=";
   };
 
diff --git a/pkgs/by-name/lw/lwgrp/package.nix b/pkgs/by-name/lw/lwgrp/package.nix
index f2ac9e8b2712..a043c27d8512 100644
--- a/pkgs/by-name/lw/lwgrp/package.nix
+++ b/pkgs/by-name/lw/lwgrp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LLNL";
     repo = "lwgrp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZpxxcCqK+qdvnCvobeBV6htRF8wThiQgVFYgEigqmIE=";
   };
 
diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix
index 3e3f5aa0a8a2..966d93df2ac8 100644
--- a/pkgs/by-name/lx/lxcfs/package.nix
+++ b/pkgs/by-name/lx/lxcfs/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+Xlx1E6ggB/Vx3yOJGgh4UfEvaVyT7uOttaxelDA7Iw=";
   };
 
diff --git a/pkgs/by-name/lx/lxd-image-server/package.nix b/pkgs/by-name/lx/lxd-image-server/package.nix
index 34119bddb457..cc17908a5da1 100644
--- a/pkgs/by-name/lx/lxd-image-server/package.nix
+++ b/pkgs/by-name/lx/lxd-image-server/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Avature";
     repo = "lxd-image-server";
-    tag = version;
+    rev = version;
     sha256 = "yx8aUmMfSzyWaM6M7+WcL6ouuWwOpqLzODWSdNgwCwo=";
   };
 
diff --git a/pkgs/by-name/lx/lxgw-fusionkai/package.nix b/pkgs/by-name/lx/lxgw-fusionkai/package.nix
index bedce52adb5f..99c7a8e3e37f 100644
--- a/pkgs/by-name/lx/lxgw-fusionkai/package.nix
+++ b/pkgs/by-name/lx/lxgw-fusionkai/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxgw";
     repo = "FusionKai";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pEISoFEsv8SJOGa2ud/nV1yvl8T9kakfKENu3mfYA5A=";
   };
 
diff --git a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
index 3665421da49b..0587b72220cf 100644
--- a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
+++ b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "MrReplikant";
     repo = "lxqt-panel-profiles";
-    tag = version;
+    rev = version;
     hash = "sha256-YGjgTLodVTtDzP/SOEg+Ehf1LYggTnG1H1rN5m1jaNM=";
   };
 
diff --git a/pkgs/by-name/ly/lynis/package.nix b/pkgs/by-name/ly/lynis/package.nix
index e51927003265..30584284c6c8 100644
--- a/pkgs/by-name/ly/lynis/package.nix
+++ b/pkgs/by-name/ly/lynis/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-OnEEdJGU7ma6f7aA6ihgixHWZGZDmx7nzqmJH3p+ijk=";
   };
 
diff --git a/pkgs/by-name/ly/lyra/package.nix b/pkgs/by-name/ly/lyra/package.nix
index b1a54fc812fd..a52e8896e9e4 100644
--- a/pkgs/by-name/ly/lyra/package.nix
+++ b/pkgs/by-name/ly/lyra/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bfgroup";
     repo = "lyra";
-    tag = version;
+    rev = version;
     sha256 = "sha256-tS2SPLiKaL8C35AmOXyJPstFUfynkE/A53rurqiySbI=";
   };
 
diff --git a/pkgs/by-name/lz/lzbench/package.nix b/pkgs/by-name/lz/lzbench/package.nix
index 59e72da67398..a2256ac206fe 100644
--- a/pkgs/by-name/lz/lzbench/package.nix
+++ b/pkgs/by-name/lz/lzbench/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "inikep";
     repo = "lzbench";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-946AcnD9z60Oihm2pseS8D5j6pGdYeCxmhTLNcW9Mmc=";
   };
 
diff --git a/pkgs/by-name/lz/lzsa/package.nix b/pkgs/by-name/lz/lzsa/package.nix
index 6e9fa15b93fb..85866a2243c2 100644
--- a/pkgs/by-name/lz/lzsa/package.nix
+++ b/pkgs/by-name/lz/lzsa/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "emmanuel-marty";
     repo = "lzsa";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-XaPtMW9INv/wzMXvlyXgE3VfFJCY/5R/HFGhV3ZKvGs=";
   };
 
diff --git a/pkgs/by-name/m-/m-cli/package.nix b/pkgs/by-name/m-/m-cli/package.nix
index b54db2ea9a42..4faa5c6dc184 100644
--- a/pkgs/by-name/m-/m-cli/package.nix
+++ b/pkgs/by-name/m-/m-cli/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rgcr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KzlE1DdVMLnGmcOS1a2HK4pASofD1EHpdqbzVVIxeb4=";
   };
 
diff --git a/pkgs/by-name/m1/m17-cxx-demod/package.nix b/pkgs/by-name/m1/m17-cxx-demod/package.nix
index fa127c91937f..d5d391ecc17e 100644
--- a/pkgs/by-name/m1/m17-cxx-demod/package.nix
+++ b/pkgs/by-name/m1/m17-cxx-demod/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mobilinkd";
     repo = "m17-cxx-demod";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mvppkFBmmPVqvlqIqrbwGrOBih5zS5sZrV/usEhHiws=";
   };
 
diff --git a/pkgs/by-name/m4/m4acut/package.nix b/pkgs/by-name/m4/m4acut/package.nix
index 994a81780586..22b7fa486048 100644
--- a/pkgs/by-name/m4/m4acut/package.nix
+++ b/pkgs/by-name/m4/m4acut/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nu774";
     repo = "m4acut";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1hzf9f1fzmlpnxjaxhs2w22wzb28vd87ycaddnix1mmhvh3nvzkd";
   };
 
diff --git a/pkgs/by-name/m4/m4ri/package.nix b/pkgs/by-name/m4/m4ri/package.nix
index 0ff87c813391..a7d750da16e6 100644
--- a/pkgs/by-name/m4/m4ri/package.nix
+++ b/pkgs/by-name/m4/m4ri/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "malb";
     repo = "m4ri";
-    tag = version;
+    rev = version;
     hash = "sha256-YoCTI4dLy95xuRJyNugIzGxE40B9pCWxRQtsyS/1Pds=";
   };
 
diff --git a/pkgs/by-name/m4/m4rie/package.nix b/pkgs/by-name/m4/m4rie/package.nix
index d5b55e0e5f39..270638f4d730 100644
--- a/pkgs/by-name/m4/m4rie/package.nix
+++ b/pkgs/by-name/m4/m4rie/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "malb";
     repo = "m4rie";
-    tag = version;
+    rev = version;
     hash = "sha256-tw6ZX8hKfr9wQLF2nuO1dSkkTYZX6pzNWMlWfzLqQNE=";
   };
 
diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix
index c054c78c09f8..bf74f70ffd5a 100644
--- a/pkgs/by-name/ma/maa-cli/package.nix
+++ b/pkgs/by-name/ma/maa-cli/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MaaAssistantArknights";
     repo = "maa-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KoKMfZrI3V73hbZGm0Xx8VxL7ENicSApropLm02B098=";
   };
 
diff --git a/pkgs/by-name/ma/macchanger/package.nix b/pkgs/by-name/ma/macchanger/package.nix
index 2ea246a2b626..e65e1cca5fcb 100644
--- a/pkgs/by-name/ma/macchanger/package.nix
+++ b/pkgs/by-name/ma/macchanger/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alobbs";
     repo = "macchanger";
-    tag = version;
+    rev = version;
     sha256 = "1hypx6sxhd2b1nsxj314hpkhj7q4x9p2kfaaf20rjkkkig0nck9r";
   };
 
diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix
index 91d291541a9c..bf3e0b657d72 100644
--- a/pkgs/by-name/ma/macchina/package.nix
+++ b/pkgs/by-name/ma/macchina/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Macchina-CLI";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GZO9xGc3KGdq2WdA10m/XV8cNAlQjUZFUVu1CzidJ5c=";
   };
 
diff --git a/pkgs/by-name/ma/macdylibbundler/package.nix b/pkgs/by-name/ma/macdylibbundler/package.nix
index b6c83fe21643..3aa0b704783b 100644
--- a/pkgs/by-name/ma/macdylibbundler/package.nix
+++ b/pkgs/by-name/ma/macdylibbundler/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "auriamg";
     repo = "macdylibbundler";
-    tag = version;
+    rev = version;
     sha256 = "0j4ij48jf5izgymzxxaakf6vc50w9q0761yir6nfj1n6qlnrlidf";
   };
 
diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix
index 9e6a75191ac5..f8579fb30f36 100644
--- a/pkgs/by-name/ma/mackerel-agent/package.nix
+++ b/pkgs/by-name/ma/mackerel-agent/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mackerelio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sh5hbhWlyu70Wm2zTQeKiQr/nYi6bG4g6a/yvEnd/DU=";
   };
 
diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix
index 2438ab2c8576..63113960f5ec 100644
--- a/pkgs/by-name/ma/mackup/package.nix
+++ b/pkgs/by-name/ma/mackup/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lra";
     repo = "mackup";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-eWSBl8BTg2FLI21DQcnepBFPF08bfm0V8lYB4mMbAiw=";
   };
 
diff --git a/pkgs/by-name/ma/macmon/package.nix b/pkgs/by-name/ma/macmon/package.nix
index 156571b9f306..2123287ba177 100644
--- a/pkgs/by-name/ma/macmon/package.nix
+++ b/pkgs/by-name/ma/macmon/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vladkens";
     repo = "macmon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Uc+UjlCeG7W++l7d/3tSkIVbUi8IbNn3A5fqyshG+xE=";
   };
 
diff --git a/pkgs/by-name/ma/maddy/package.nix b/pkgs/by-name/ma/maddy/package.nix
index 2f4d0c958009..636d65e1cb36 100644
--- a/pkgs/by-name/ma/maddy/package.nix
+++ b/pkgs/by-name/ma/maddy/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "foxcpp";
     repo = "maddy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cR5qRUYQnFfm+ZOwwwNNRo1odq/ntI2QlGmhJBTjaF4=";
   };
 
diff --git a/pkgs/by-name/ma/madonctl/package.nix b/pkgs/by-name/ma/madonctl/package.nix
index 21b6ccc57971..69c60bdab649 100644
--- a/pkgs/by-name/ma/madonctl/package.nix
+++ b/pkgs/by-name/ma/madonctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "McKael";
     repo = "madonctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mo185EKjLkiujAKcAFM1XqkXWvcfYbnv+r3dF9ywaf8=";
   };
 
diff --git a/pkgs/by-name/ma/maeparser/package.nix b/pkgs/by-name/ma/maeparser/package.nix
index 5b9d9d15fc7e..96d696917834 100644
--- a/pkgs/by-name/ma/maeparser/package.nix
+++ b/pkgs/by-name/ma/maeparser/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "schrodinger";
     repo = "maeparser";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+eCTOU0rqFQC87wcxgINGLsULfbIr/wKxQTkRR59JVc=";
   };
 
diff --git a/pkgs/by-name/ma/mage/package.nix b/pkgs/by-name/ma/mage/package.nix
index 8a78079fb299..a4217149813f 100644
--- a/pkgs/by-name/ma/mage/package.nix
+++ b/pkgs/by-name/ma/mage/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "magefile";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-aZPv3+F4VMiThjR0nFP+mKQLI9zKj2jaOawClROnT34=";
   };
 
diff --git a/pkgs/by-name/ma/magic-wormhole-rs/package.nix b/pkgs/by-name/ma/magic-wormhole-rs/package.nix
index 525176911bf2..9125fe5b0378 100644
--- a/pkgs/by-name/ma/magic-wormhole-rs/package.nix
+++ b/pkgs/by-name/ma/magic-wormhole-rs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "magic-wormhole";
     repo = "magic-wormhole.rs";
-    tag = version;
+    rev = version;
     sha256 = "sha256-01u1DJNd/06q9dH/Y4E5kj5gb2CA7EKdoPtMhzCLtso=";
   };
 
diff --git a/pkgs/by-name/ma/mailhog/package.nix b/pkgs/by-name/ma/mailhog/package.nix
index cc828a96e8bd..8d73256cf5ae 100644
--- a/pkgs/by-name/ma/mailhog/package.nix
+++ b/pkgs/by-name/ma/mailhog/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mailhog";
     repo = "MailHog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-flxEp9iXLLm/FPP8udlnpbHQpGnqxAhgyOIUUJAJgog=";
   };
 
diff --git a/pkgs/by-name/ma/mailsy/package.nix b/pkgs/by-name/ma/mailsy/package.nix
index ccc01c89bc8e..7bda524ab227 100644
--- a/pkgs/by-name/ma/mailsy/package.nix
+++ b/pkgs/by-name/ma/mailsy/package.nix
@@ -10,7 +10,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "BalliAsghar";
     repo = "Mailsy";
-    tag = version;
+    rev = version;
     hash = "sha256-RnOWvu023SOcN83xEEkYFwgDasOmkMwSzJ/QYjvTBDo=";
   };
 
diff --git a/pkgs/by-name/ma/maim/package.nix b/pkgs/by-name/ma/maim/package.nix
index 6b871abe09d5..431fc3d774d0 100644
--- a/pkgs/by-name/ma/maim/package.nix
+++ b/pkgs/by-name/ma/maim/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/tZqSJnKe8GiffSz9VIFKuxMktRld+hA4ZWP4TZQrlg=";
   };
 
diff --git a/pkgs/by-name/ma/mainsail/package.nix b/pkgs/by-name/ma/mainsail/package.nix
index 5b50994ba7b4..3f0c7578f18d 100644
--- a/pkgs/by-name/ma/mainsail/package.nix
+++ b/pkgs/by-name/ma/mainsail/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mainsail-crew";
     repo = "mainsail";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rXavUkoFRw5fWCisdz/eD+wL1Sc+vExyjskVEIN4QNQ=";
   };
 
diff --git a/pkgs/by-name/ma/maizzle/package.nix b/pkgs/by-name/ma/maizzle/package.nix
index 2c3c9952692a..4ba98e8d436f 100644
--- a/pkgs/by-name/ma/maizzle/package.nix
+++ b/pkgs/by-name/ma/maizzle/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "maizzle";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Nzl4Pp1jY+LaQgLDJHjEdDA8b6MOfMXZNpvazPdmrTA=";
   };
 
diff --git a/pkgs/by-name/ma/maker-panel/package.nix b/pkgs/by-name/ma/maker-panel/package.nix
index 4155a9f6594b..2bbf17a417ca 100644
--- a/pkgs/by-name/ma/maker-panel/package.nix
+++ b/pkgs/by-name/ma/maker-panel/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "twitchyliquid64";
     repo = "maker-panel";
-    tag = version;
+    rev = version;
     sha256 = "0dlsy0c46781sb652kp80pvga7pzx6xla64axir92fcgg8k803bi";
   };
 
diff --git a/pkgs/by-name/ma/makerpm/package.nix b/pkgs/by-name/ma/makerpm/package.nix
index b433cb32f7f3..f7b0d884da7d 100644
--- a/pkgs/by-name/ma/makerpm/package.nix
+++ b/pkgs/by-name/ma/makerpm/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ivan-tkatchev";
     repo = "makerpm";
-    tag = version;
+    rev = version;
     sha256 = "089dkbh5705ppyi920rd0ksjc0143xmvnhm8qrx93rsgwc1ggi1y";
   };
 
diff --git a/pkgs/by-name/ma/makima/package.nix b/pkgs/by-name/ma/makima/package.nix
index 988d6dc6e053..9540668604be 100644
--- a/pkgs/by-name/ma/makima/package.nix
+++ b/pkgs/by-name/ma/makima/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cyber-sushi";
     repo = "makima";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kC0GJ1K7DMfkYxaYog5y1y0DMfFjZ7iD7pGQQE67N9o=";
   };
 
diff --git a/pkgs/by-name/ma/malt/package.nix b/pkgs/by-name/ma/malt/package.nix
index 36fbbc347a98..f7919e15673a 100644
--- a/pkgs/by-name/ma/malt/package.nix
+++ b/pkgs/by-name/ma/malt/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "memtt";
     repo = "malt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Hq6XDxcjH5ronprnV1CwumGqBg9RXYpJ+WANqoBA2/c=";
   };
 
diff --git a/pkgs/by-name/ma/mamba/package.nix b/pkgs/by-name/ma/mamba/package.nix
index 49a06c146c13..5c52999720cb 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-S1+nGnB1LHIUgYves0qtWh+QXYKjtKWICpOo38b3zbY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix
index 8c99050f375c..18fe73e6260c 100644
--- a/pkgs/by-name/ma/manga-tui/package.nix
+++ b/pkgs/by-name/ma/manga-tui/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "josueBarretogit";
     repo = "manga-tui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L5KZaBJDG0z6NUGPJfbOkKCp1xQEzqfJ9GREx189VqU=";
   };
 
diff --git a/pkgs/by-name/ma/mangal/package.nix b/pkgs/by-name/ma/mangal/package.nix
index 300e258f07ff..332c1d33ec25 100644
--- a/pkgs/by-name/ma/mangal/package.nix
+++ b/pkgs/by-name/ma/mangal/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "metafates";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nbJdePlzZFM2ihbvFIMKyYZ9C0uKjU3TE5VLduLvtKE=";
   };
 
diff --git a/pkgs/by-name/ma/mangareader/package.nix b/pkgs/by-name/ma/mangareader/package.nix
index 8d53cceef22e..3ef038be0e79 100644
--- a/pkgs/by-name/ma/mangareader/package.nix
+++ b/pkgs/by-name/ma/mangareader/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "g-fb";
     repo = "mangareader";
-    tag = version;
+    rev = version;
     hash = "sha256-XX0VaXVYmAs5vmgwslflKIYx1peITp4VmReLkv1nV3I=";
   };
 
diff --git a/pkgs/by-name/ma/manifest-tool/package.nix b/pkgs/by-name/ma/manifest-tool/package.nix
index fe3739c7bc9b..4880edc5d18b 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tehdgYH73tmzjhJmTQuMWvciGYIyc6VeIMS2fFO7YP4=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/ma/manix/package.nix b/pkgs/by-name/ma/manix/package.nix
index 91c542f4664d..278ddec52a45 100644
--- a/pkgs/by-name/ma/manix/package.nix
+++ b/pkgs/by-name/ma/manix/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "manix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-b/3NvY+puffiQFCQuhRMe81x2wm3vR01MR3iwe/gJkw=";
   };
 
diff --git a/pkgs/by-name/ma/manticoresearch/package.nix b/pkgs/by-name/ma/manticoresearch/package.nix
index 638621fd9efa..48c2cb16d222 100644
--- a/pkgs/by-name/ma/manticoresearch/package.nix
+++ b/pkgs/by-name/ma/manticoresearch/package.nix
@@ -23,7 +23,7 @@ let
     src = fetchFromGitHub {
       owner = "manticoresoftware";
       repo = "columnar";
-      tag = finalAttrs.version;
+      rev = finalAttrs.version;
       hash = "sha256-TGFGFfoyHnPSr2U/9dpqFLUN3Dt2jDQrTF/xxDY4pdE=";
     };
     nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ma/map-cmd/package.nix b/pkgs/by-name/ma/map-cmd/package.nix
index 37ce36a11b15..e11af51aa70f 100644
--- a/pkgs/by-name/ma/map-cmd/package.nix
+++ b/pkgs/by-name/ma/map-cmd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "soveran";
     repo = "map";
-    tag = version;
+    rev = version;
     sha256 = "sha256-yGzmhZwv1qKy0JNcSzqL996APQO8OGWQ1GBkEkKTOXA=";
   };
 
diff --git a/pkgs/by-name/ma/mapscii/package.nix b/pkgs/by-name/ma/mapscii/package.nix
index b2b940d2e431..1fb76d1b3f1c 100644
--- a/pkgs/by-name/ma/mapscii/package.nix
+++ b/pkgs/by-name/ma/mapscii/package.nix
@@ -10,7 +10,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "rastapasta";
     repo = "mapscii";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IFVX3l2b3pu0nfMZebVix0mwHUvnE2NUNrB3+jr3G2Q=";
   };
 
diff --git a/pkgs/by-name/ma/marathonctl/package.nix b/pkgs/by-name/ma/marathonctl/package.nix
index ae941c274c12..3a1f344e53af 100644
--- a/pkgs/by-name/ma/marathonctl/package.nix
+++ b/pkgs/by-name/ma/marathonctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shoenig";
     repo = "marathonctl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-MigmvOwYa0uYPexchS4MP74I1Tp6QHYuQVSOh1+FrMg=";
   };
 
diff --git a/pkgs/by-name/ma/mari0/package.nix b/pkgs/by-name/ma/mari0/package.nix
index 2619bd5a7185..deb7d959bc14 100644
--- a/pkgs/by-name/ma/mari0/package.nix
+++ b/pkgs/by-name/ma/mari0/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Stabyourself";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa";
   };
 
diff --git a/pkgs/by-name/ma/marisa/package.nix b/pkgs/by-name/ma/marisa/package.nix
index 3bd9c173a46c..2ff016940d30 100644
--- a/pkgs/by-name/ma/marisa/package.nix
+++ b/pkgs/by-name/ma/marisa/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "s-yata";
     repo = "marisa-trie";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1hy8hfksizk1af6kg8z3b9waiz6d5ggd73fiqcvmhfgra36dscyq";
   };
 
diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix
index c3ab695f2454..ebf3adf13240 100644
--- a/pkgs/by-name/ma/mark/package.nix
+++ b/pkgs/by-name/ma/mark/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kovetskiy";
     repo = "mark";
-    tag = version;
+    rev = version;
     sha256 = "sha256-t70Od27w/ZT/EHKAgjPBx39Oo4dS1aWL3up7TVlNAuI=";
   };
 
diff --git a/pkgs/by-name/ma/markdown-link-check/package.nix b/pkgs/by-name/ma/markdown-link-check/package.nix
index 7974a1c5d372..36cecc5c1ef4 100644
--- a/pkgs/by-name/ma/markdown-link-check/package.nix
+++ b/pkgs/by-name/ma/markdown-link-check/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "tcort";
     repo = "markdown-link-check";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UuzfIJL3nHIbGFQrs9ya+QiS/sM0z1GCHbJGLQBN5pE=";
   };
 
diff --git a/pkgs/by-name/ma/markdownlint-cli/package.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix
index a32717ddd5f8..a0e65f253922 100644
--- a/pkgs/by-name/ma/markdownlint-cli/package.nix
+++ b/pkgs/by-name/ma/markdownlint-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "igorshubovych";
     repo = "markdownlint-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1CQVj2iFywimK9sBJ60u9xH5qm/stEOA0yAHcUSAdY8=";
   };
 
diff --git a/pkgs/by-name/ma/marked-man/package.nix b/pkgs/by-name/ma/marked-man/package.nix
index 5a206e51632b..ffbe51602c5a 100644
--- a/pkgs/by-name/ma/marked-man/package.nix
+++ b/pkgs/by-name/ma/marked-man/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "kapouer";
     repo = "marked-man";
-    tag = version;
+    rev = version;
     hash = "sha256-RzPKahYxBdWZi1SwIv7Ju1cAQ4s0ANkCivFJItPYGCY=";
   };
 
diff --git a/pkgs/by-name/ma/marker/package.nix b/pkgs/by-name/ma/marker/package.nix
index 9b0bee306fd0..2a5165da2b3b 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";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0=";
   };
diff --git a/pkgs/by-name/ma/markets/package.nix b/pkgs/by-name/ma/markets/package.nix
index 26350640534d..b06f5fa4fd32 100644
--- a/pkgs/by-name/ma/markets/package.nix
+++ b/pkgs/by-name/ma/markets/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bitstower";
     repo = "markets";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/g/r/1i69PmPND40zIID3Nun0I4ZFT1EFoNf1qprBjI=";
   };
 
diff --git a/pkgs/by-name/ma/markscribe/package.nix b/pkgs/by-name/ma/markscribe/package.nix
index 621fce6a760f..9dac443919f3 100644
--- a/pkgs/by-name/ma/markscribe/package.nix
+++ b/pkgs/by-name/ma/markscribe/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "muesli";
     repo = "markscribe";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-I8WSG9rMqgf2QADQetlYTSUIQH1Iv8cMVw/3uIwEDPc=";
   };
 
diff --git a/pkgs/by-name/ma/marksman/package.nix b/pkgs/by-name/ma/marksman/package.nix
index fab88201dafc..444b35a6ee94 100644
--- a/pkgs/by-name/ma/marksman/package.nix
+++ b/pkgs/by-name/ma/marksman/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "artempyanykh";
     repo = "marksman";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2OisUZHmf7k8vLkBGJG1HXNxaXmRF64x//bDK57S9to=";
   };
 
diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix
index 7c3cf07ef4ee..baabb4624d87 100644
--- a/pkgs/by-name/ma/markuplinkchecker/package.nix
+++ b/pkgs/by-name/ma/markuplinkchecker/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "becheran";
     repo = "mlc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-16ZGYUP7h6WmwjadLHqOQClejZ35LwavFgjs9x3NYVo=";
   };
 
diff --git a/pkgs/by-name/ma/marp-cli/package.nix b/pkgs/by-name/ma/marp-cli/package.nix
index dd4bf17cbc8d..13b2ac65373c 100644
--- a/pkgs/by-name/ma/marp-cli/package.nix
+++ b/pkgs/by-name/ma/marp-cli/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "marp-team";
     repo = "marp-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T3VZEXk3bhr17/BWlBx9beEbNhG2y/AnNf7+a1Adi2k=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-icons/package.nix b/pkgs/by-name/ma/marwaita-icons/package.nix
index 9d7b6b232b02..531468767b44 100644
--- a/pkgs/by-name/ma/marwaita-icons/package.nix
+++ b/pkgs/by-name/ma/marwaita-icons/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-icons";
-    tag = version;
+    rev = version;
     hash = "sha256-UehujziT13kA9ltjyCvbSDTEpR8ISxoBpoLj22Zih8k=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-mint/package.nix b/pkgs/by-name/ma/marwaita-mint/package.nix
index 6c8d612ab40d..af733a08135a 100644
--- a/pkgs/by-name/ma/marwaita-mint/package.nix
+++ b/pkgs/by-name/ma/marwaita-mint/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-mint";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Bvo4IRE1yXu4SDvyDY8mrMyZivqYEVQwkdSH+UZruSI=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-orange/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix
index 4fdac8b10805..84cfff18cdc1 100644
--- a/pkgs/by-name/ma/marwaita-orange/package.nix
+++ b/pkgs/by-name/ma/marwaita-orange/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-orange";
-    tag = version;
+    rev = version;
     hash = "sha256-/F/nboht7YG9pXVv7/ZvZ4QkxfB+h201G1KZLRohM80=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-red/package.nix b/pkgs/by-name/ma/marwaita-red/package.nix
index f4475a4966f4..47022469591e 100644
--- a/pkgs/by-name/ma/marwaita-red/package.nix
+++ b/pkgs/by-name/ma/marwaita-red/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-red";
-    tag = version;
+    rev = version;
     hash = "sha256-21U3Z53v2PDJ7Io9WZypQiZPM4mjTa3z6W+vE9qNouA=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-teal/package.nix b/pkgs/by-name/ma/marwaita-teal/package.nix
index 48cdbabb4e63..76d8c73829b6 100644
--- a/pkgs/by-name/ma/marwaita-teal/package.nix
+++ b/pkgs/by-name/ma/marwaita-teal/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-teal";
-    tag = version;
+    rev = version;
     hash = "sha256-63VJrmb0TcsXT1JM77+ZxN4kOZPBlqR2ANAhY041QCA=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-x/package.nix b/pkgs/by-name/ma/marwaita-x/package.nix
index 889be4d08558..c150cfba92b3 100644
--- a/pkgs/by-name/ma/marwaita-x/package.nix
+++ b/pkgs/by-name/ma/marwaita-x/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-x";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-x5b3aaasYbxFGvdNNF6vIrF/ZZWBGbdS2kEuB1rwOlA=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita-yellow/package.nix b/pkgs/by-name/ma/marwaita-yellow/package.nix
index ef790ee467fd..2b1346214753 100644
--- a/pkgs/by-name/ma/marwaita-yellow/package.nix
+++ b/pkgs/by-name/ma/marwaita-yellow/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-yellow";
-    tag = version;
+    rev = version;
     hash = "sha256-1nGQvN6xacMoRyT7WkNC2lKX/QnXA7pCBz1kIo0aOwA=";
   };
 
diff --git a/pkgs/by-name/ma/marwaita/package.nix b/pkgs/by-name/ma/marwaita/package.nix
index 084b269818f5..7f0b14b5a310 100644
--- a/pkgs/by-name/ma/marwaita/package.nix
+++ b/pkgs/by-name/ma/marwaita/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita";
-    tag = version;
+    rev = version;
     hash = "sha256-NFXvaKASWltskCSOidXDNVZpFpdpCTnuWjpfETxiI8U=";
   };
 
diff --git a/pkgs/by-name/ma/masklint/package.nix b/pkgs/by-name/ma/masklint/package.nix
index 736711fd5d28..d950ca90fd4d 100644
--- a/pkgs/by-name/ma/masklint/package.nix
+++ b/pkgs/by-name/ma/masklint/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "brumhard";
     repo = "masklint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Dku2pDUCblopHtoj6viUqHVpVH5GDApp+QLjor38j7g=";
   };
 
diff --git a/pkgs/by-name/ma/masscan/package.nix b/pkgs/by-name/ma/masscan/package.nix
index e837be81daea..c067e1ac54dc 100644
--- a/pkgs/by-name/ma/masscan/package.nix
+++ b/pkgs/by-name/ma/masscan/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "robertdavidgraham";
     repo = "masscan";
-    tag = version;
+    rev = version;
     sha256 = "sha256-mnGC/moQANloR5ODwRjzJzBa55OEZ9QU+9WpAHxQE/g=";
   };
 
diff --git a/pkgs/by-name/ma/massdns/package.nix b/pkgs/by-name/ma/massdns/package.nix
index b96f0ec3ad40..1f6d19fcaeb2 100644
--- a/pkgs/by-name/ma/massdns/package.nix
+++ b/pkgs/by-name/ma/massdns/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "blechschmidt";
     repo = "massdns";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hrnAg5ErPt93RV4zobRGVtcKt4aM2tC52r08T7+vRGc=";
   };
 
diff --git a/pkgs/by-name/ma/massren/package.nix b/pkgs/by-name/ma/massren/package.nix
index 1b1c44a073b6..0ae0c0c33205 100644
--- a/pkgs/by-name/ma/massren/package.nix
+++ b/pkgs/by-name/ma/massren/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "laurent22";
     repo = "massren";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64=";
   };
 
diff --git a/pkgs/by-name/ma/mastodon-archive/package.nix b/pkgs/by-name/ma/mastodon-archive/package.nix
index 24106d649ffe..09bfc3c5eebd 100644
--- a/pkgs/by-name/ma/mastodon-archive/package.nix
+++ b/pkgs/by-name/ma/mastodon-archive/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kensanata";
     repo = "mastodon-backup";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-b4bYQshz7mwxEfpRYV7ze4C8hz58R9cVp58wHvGFb0A=";
   };
 
diff --git a/pkgs/by-name/ma/mastotool/package.nix b/pkgs/by-name/ma/mastotool/package.nix
index caa53d10db05..c14432ab819f 100644
--- a/pkgs/by-name/ma/mastotool/package.nix
+++ b/pkgs/by-name/ma/mastotool/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "muesli";
     repo = "mastotool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KmYUt2WXLY6i17dZ+o5HOTyMwbQnynY7IT43LIEN3B0=";
   };
 
diff --git a/pkgs/by-name/ma/matcha-gtk-theme/package.nix b/pkgs/by-name/ma/matcha-gtk-theme/package.nix
index 2efbaf43fbb2..74d5dde06f25 100644
--- a/pkgs/by-name/ma/matcha-gtk-theme/package.nix
+++ b/pkgs/by-name/ma/matcha-gtk-theme/package.nix
@@ -29,7 +29,7 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      tag = version;
+      rev = version;
       sha256 = "trQwRZ/JKIS8TcRIg0eL5GmB/yymDwqqNued0ddRuqU=";
     };
 
diff --git a/pkgs/by-name/ma/matcha-rss-digest/package.nix b/pkgs/by-name/ma/matcha-rss-digest/package.nix
index d19905ffa1d5..bdc81f69f977 100644
--- a/pkgs/by-name/ma/matcha-rss-digest/package.nix
+++ b/pkgs/by-name/ma/matcha-rss-digest/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "piqoni";
     repo = "matcha";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Zs6Och5CsqN2mpnCLgV1VkH4+CV1fklfP20A22rE5y0=";
   };
 
diff --git a/pkgs/by-name/ma/matchbox-server/package.nix b/pkgs/by-name/ma/matchbox-server/package.nix
index 694b40680b26..4967fef7851b 100644
--- a/pkgs/by-name/ma/matchbox-server/package.nix
+++ b/pkgs/by-name/ma/matchbox-server/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "poseidon";
     repo = "matchbox";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-u1VY+zEx2YToz+WxVFaUDzY7HM9OeokbR/FmzcR3UJ8=";
   };
 
diff --git a/pkgs/by-name/ma/materia-kde-theme/package.nix b/pkgs/by-name/ma/materia-kde-theme/package.nix
index 6db7298dd158..990bc77b0762 100644
--- a/pkgs/by-name/ma/materia-kde-theme/package.nix
+++ b/pkgs/by-name/ma/materia-kde-theme/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "materia-kde";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/LA+H2ekxuO1RpfaPJruRGeWPVopA0rZUxU4Mh7YQ0s=";
   };
 
diff --git a/pkgs/by-name/ma/materia-theme/package.nix b/pkgs/by-name/ma/materia-theme/package.nix
index 2615b9bde11e..24c0e7a42ebc 100644
--- a/pkgs/by-name/ma/materia-theme/package.nix
+++ b/pkgs/by-name/ma/materia-theme/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1fsicmcni70jkl4jb3fvh7yv0v9jhb8nwjzdq8vfwn256qyk0xvl";
   };
 
diff --git a/pkgs/by-name/ma/material-design-icons/package.nix b/pkgs/by-name/ma/material-design-icons/package.nix
index 449eb27f16e6..800a245b36f4 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7t3i3nPJZ/tRslLBfY+9kXH8TR145GC2hPFYJeMHRL8=";
     sparseCheckout = [ "fonts" ];
   };
diff --git a/pkgs/by-name/ma/material-icons/package.nix b/pkgs/by-name/ma/material-icons/package.nix
index a3aa128f6657..a8dfb57c9cc7 100644
--- a/pkgs/by-name/ma/material-icons/package.nix
+++ b/pkgs/by-name/ma/material-icons/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "google";
     repo = "material-design-icons";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-wX7UejIYUxXOnrH2WZYku9ljv4ZAlvgk8EEJJHOCCjE=";
   };
 
diff --git a/pkgs/by-name/ma/material-maker/package.nix b/pkgs/by-name/ma/material-maker/package.nix
index 96b8cdcf4336..8a3714fc9b94 100644
--- a/pkgs/by-name/ma/material-maker/package.nix
+++ b/pkgs/by-name/ma/material-maker/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "RodZill4";
     repo = "material-maker";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-vyagu7xL4ITt+xyoYyCcF8qq6L9sR6Ltdl6NwfrbZdA=";
   };
 
diff --git a/pkgs/by-name/ma/math-preview/package.nix b/pkgs/by-name/ma/math-preview/package.nix
index eac4456dee7b..08a577ebaac3 100644
--- a/pkgs/by-name/ma/math-preview/package.nix
+++ b/pkgs/by-name/ma/math-preview/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitLab {
     owner = "matsievskiysv";
     repo = "math-preview";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P3TZ/D6D2PvwPV6alSrDEQujzgI8DhK4VOuCC0BCIFo=";
   };
 
diff --git a/pkgs/by-name/ma/mathjax-node-cli/package.nix b/pkgs/by-name/ma/mathjax-node-cli/package.nix
index 89465e37bbda..b8c275e8c690 100644
--- a/pkgs/by-name/ma/mathjax-node-cli/package.nix
+++ b/pkgs/by-name/ma/mathjax-node-cli/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mathjax";
     repo = "mathjax-node-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-jFSn/Ftm1iNOAmMadHYfy2jm0H/+hP2XCyyNbJqfhkY=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-alertmanager/package.nix b/pkgs/by-name/ma/matrix-alertmanager/package.nix
index 2ed004ef8f2b..f528d8539862 100644
--- a/pkgs/by-name/ma/matrix-alertmanager/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jaywink";
     repo = "matrix-alertmanager";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GwASazYgZTYrMn696VL+JKEjECoCKxr2VWj2zae8U/E=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-appservice-discord/package.nix b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
index 6c085c114bc4..dcd43ba0d852 100644
--- a/pkgs/by-name/ma/matrix-appservice-discord/package.nix
+++ b/pkgs/by-name/ma/matrix-appservice-discord/package.nix
@@ -23,7 +23,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "matrix-appservice-discord";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = pin.srcHash;
   };
 
diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix
index 8cdd1db04aec..6dcea572c57f 100644
--- a/pkgs/by-name/ma/matrix-conduit/package.nix
+++ b/pkgs/by-name/ma/matrix-conduit/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "famedly";
     repo = "conduit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mQLfRAun2G/LDnw3jyFGJbOqpxh2PL8IGzFELRfAgAI=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-corporal/package.nix b/pkgs/by-name/ma/matrix-corporal/package.nix
index fc77b7817334..e15c4657a2fa 100644
--- a/pkgs/by-name/ma/matrix-corporal/package.nix
+++ b/pkgs/by-name/ma/matrix-corporal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "devture";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-KSKPTbF1hhzLyD+iL4+hW9EuV+xFYzSzHu1DSGXWm90=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-hook/package.nix b/pkgs/by-name/ma/matrix-hook/package.nix
index b9b80dfb40af..244ba93eec09 100644
--- a/pkgs/by-name/ma/matrix-hook/package.nix
+++ b/pkgs/by-name/ma/matrix-hook/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pinpox";
     repo = "matrix-hook";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YmDsibVlAWLEG5QcqDImVb6RJfrfW6zrFnOEMO3Zxcw=";
   };
   vendorHash = "sha256-185Wz9IpJRBmunl+KGj/iy37YeszbT3UYzyk9V994oQ=";
diff --git a/pkgs/by-name/ma/matrix-media-repo/package.nix b/pkgs/by-name/ma/matrix-media-repo/package.nix
index e1f5afe86dbf..f15eb89e33e8 100644
--- a/pkgs/by-name/ma/matrix-media-repo/package.nix
+++ b/pkgs/by-name/ma/matrix-media-repo/package.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "t2bot";
     repo = "matrix-media-repo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-trVn+Mn98aJLQCpQX1+qps/uuA5+8zeDoM94eauxHO8=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix
index e49baa6e07ea..a9d7ab36dd76 100644
--- a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix
+++ b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "matrix-rust-sdk-crypto-nodejs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g86RPfhF9XHpbXhHRbyhl920VazCrQyRQrYV6tVCHy4=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index c31e53e4f726..2090477f2050 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DNUKbb+d3BBp8guas6apQ4yFeXCc0Ilijtbt1hZkap4=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/pam.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/pam.nix
index 884f1e29e9f9..5f535a6be4d7 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/pam.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/pam.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "14mRh4X0r";
     repo = "matrix-synapse-pam";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0jgz49cwiyih5cg3hr4byva04zjnq8aj7rima9874la9fc5sd2wf";
   };
 
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix
index 65997d2f8323..ab4bb4aa8e78 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/rendezvous.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "rust-http-rendezvous-server";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-minwa+7HLTNSBtBtt5pnoHsFnNEh834nsVw80+FIQi8=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix
index e1419b5b0337..d2455a0009b2 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "devture";
     repo = "matrix-synapse-shared-secret-auth";
-    tag = version;
+    rev = version;
     sha256 = "sha256-qzXKwTEOMtdvsxoU3Xh3vQyhK+Q18LfkeSts7EyDIXE=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-zulip-bridge/package.nix b/pkgs/by-name/ma/matrix-zulip-bridge/package.nix
index 1cddac750415..89d577665a1a 100644
--- a/pkgs/by-name/ma/matrix-zulip-bridge/package.nix
+++ b/pkgs/by-name/ma/matrix-zulip-bridge/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "GearKite";
     repo = "MatrixZulipBridge";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5bDqZb8xx5SjThZUSmOcctwo6B15cjkIwA26QNfED2A=";
   };
 
diff --git a/pkgs/by-name/ma/matterircd/package.nix b/pkgs/by-name/ma/matterircd/package.nix
index 895f98303b29..686418886992 100644
--- a/pkgs/by-name/ma/matterircd/package.nix
+++ b/pkgs/by-name/ma/matterircd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "42wim";
     repo = "matterircd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qA07i31fGLLIfWoCBW1f5nvf4AWEIkSXZh22F6rRnpM=";
   };
 
diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index 392704f65b7e..5f8ae3cdb2d3 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-k4s0kh68kycc8MSVkD64X547mWmFW4UuToDIcZ87OSc=";
   };
 
diff --git a/pkgs/by-name/ma/maturin/pyo3-test/default.nix b/pkgs/by-name/ma/maturin/pyo3-test/default.nix
index 31d2dc32b595..8e0219d396a9 100644
--- a/pkgs/by-name/ma/maturin/pyo3-test/default.nix
+++ b/pkgs/by-name/ma/maturin/pyo3-test/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "pyo3";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA=";
   };
 
diff --git a/pkgs/by-name/ma/mautrix-discord/package.nix b/pkgs/by-name/ma/mautrix-discord/package.nix
index 71a3627ac7fb..b3943084ca55 100644
--- a/pkgs/by-name/ma/mautrix-discord/package.nix
+++ b/pkgs/by-name/ma/mautrix-discord/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "discord";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KRfbxPblOL4JznnGx9Jj5XXEWEKzan5xWvAwYmP7yGc=";
   };
 
diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix
index cc7022fc3209..928d67fbe8b7 100644
--- a/pkgs/by-name/ma/mautrix-meta/package.nix
+++ b/pkgs/by-name/ma/mautrix-meta/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "meta";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UWW5h4e6usxVkMH1TDGt62/ThlAhbeqivnYFIKPOqXE=";
   };
 
diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix
index ac3ae0cfd554..12438c912bc9 100644
--- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix
+++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "whatsapp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6Fnkw/lf64T0EXpWvSSnIRBuHJVt01Ft8Ks43/jvtZ0=";
   };
 
diff --git a/pkgs/by-name/ma/maxcso/package.nix b/pkgs/by-name/ma/maxcso/package.nix
index f9e36d2695b7..d0f670578d86 100644
--- a/pkgs/by-name/ma/maxcso/package.nix
+++ b/pkgs/by-name/ma/maxcso/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "unknownbrackets";
     repo = "maxcso";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6LjR1ZMZsi6toz9swPzNmSAlrUykwvVdYi1mR8Ctq5U=";
   };
 
diff --git a/pkgs/by-name/ma/maxflow/package.nix b/pkgs/by-name/ma/maxflow/package.nix
index ddd4f60b0776..5615fc005456 100644
--- a/pkgs/by-name/ma/maxflow/package.nix
+++ b/pkgs/by-name/ma/maxflow/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gerddie";
     repo = "maxflow";
-    tag = version;
+    rev = version;
     hash = "sha256-a84SxGMnfBEaoMEeeIFffTOtErSN5yzZBrAUDjkalGY=";
   };
 
diff --git a/pkgs/by-name/ma/maxlib/package.nix b/pkgs/by-name/ma/maxlib/package.nix
index abe1d8727266..02e78af05757 100644
--- a/pkgs/by-name/ma/maxlib/package.nix
+++ b/pkgs/by-name/ma/maxlib/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "electrickery";
     repo = "pd-maxlib";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "10w9qfgn26lj3zqjksf2r1wsjpf5xy4dx22jay9l6idy9q62mxsn";
   };
 
diff --git a/pkgs/by-name/mb/mbelib/package.nix b/pkgs/by-name/mb/mbelib/package.nix
index 563e80760300..ec79289e1d33 100644
--- a/pkgs/by-name/mb/mbelib/package.nix
+++ b/pkgs/by-name/mb/mbelib/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "szechyjs";
     repo = "mbelib";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0v6b7nf8fgxy7vzgcwffqyql5zhldrz30c88k1ylbjp78hwh4rif";
   };
 
diff --git a/pkgs/by-name/mb/mblaze/package.nix b/pkgs/by-name/mb/mblaze/package.nix
index 580d54842ece..69f19859ca11 100644
--- a/pkgs/by-name/mb/mblaze/package.nix
+++ b/pkgs/by-name/mb/mblaze/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "mblaze";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-398wiXJ/iG9ZfPGDZc57xH37lft3NpEZuLE0Qhb2GGc=";
   };
 
diff --git a/pkgs/by-name/mb/mbpfan/package.nix b/pkgs/by-name/mb/mbpfan/package.nix
index a686bbde0c8a..83bf9a2d1dc8 100644
--- a/pkgs/by-name/mb/mbpfan/package.nix
+++ b/pkgs/by-name/mb/mbpfan/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dgraziotin";
     repo = "mbpfan";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-F9IWUcILOuLn5K4zRSU5jn+1Wk1xy0CONSI6JTXU2pA=";
   };
   installPhase = ''
diff --git a/pkgs/by-name/mb/mbtileserver/package.nix b/pkgs/by-name/mb/mbtileserver/package.nix
index 20364e746455..12c64e6c9c43 100644
--- a/pkgs/by-name/mb/mbtileserver/package.nix
+++ b/pkgs/by-name/mb/mbtileserver/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "consbio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-RLaAhc24zdCFvpSN2LZXNyS1ygg9zCi4jEj8owdreWU=";
   };
 
diff --git a/pkgs/by-name/mb/mbusd/package.nix b/pkgs/by-name/mb/mbusd/package.nix
index c72c563750d2..d3331da67f47 100644
--- a/pkgs/by-name/mb/mbusd/package.nix
+++ b/pkgs/by-name/mb/mbusd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "3cky";
     repo = "mbusd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RQRSqlbPwBhw0SiNSP+euMVAwVBJo3lx0qB5gyWA+cM=";
   };
 
diff --git a/pkgs/by-name/mc/mcfly-fzf/package.nix b/pkgs/by-name/mc/mcfly-fzf/package.nix
index 2fdcc66c7a79..c7dcfc4192ac 100644
--- a/pkgs/by-name/mc/mcfly-fzf/package.nix
+++ b/pkgs/by-name/mc/mcfly-fzf/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bnprks";
     repo = "mcfly-fzf";
-    tag = version;
+    rev = version;
     hash = "sha256-ZdsbkN+/NLA0vor6/eEdAI7V5m5GEi+phcJQ89Jp4fk=";
   };
 
diff --git a/pkgs/by-name/mc/mcfly/package.nix b/pkgs/by-name/mc/mcfly/package.nix
index 4665dd1119ed..104592c80cc3 100644
--- a/pkgs/by-name/mc/mcfly/package.nix
+++ b/pkgs/by-name/mc/mcfly/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cantino";
     repo = "mcfly";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eRuMsUN5zRWsM5BqYHI9iSfoHHMu5ugZDjeDc1GGQL8=";
   };
 
diff --git a/pkgs/by-name/mc/mcontrolcenter/package.nix b/pkgs/by-name/mc/mcontrolcenter/package.nix
index 09baa2405e74..13fa0a150ea9 100644
--- a/pkgs/by-name/mc/mcontrolcenter/package.nix
+++ b/pkgs/by-name/mc/mcontrolcenter/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "dmitry-s93";
     repo = "MControlCenter";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Gl+YnbUbwtwF2WHT39bIKh48qSIMe3fpzxgdvifR4DQ=";
   };
 
diff --git a/pkgs/by-name/mc/mcpp/package.nix b/pkgs/by-name/mc/mcpp/package.nix
index 7a27a3e251da..6ca62d1fe8c7 100644
--- a/pkgs/by-name/mc/mcpp/package.nix
+++ b/pkgs/by-name/mc/mcpp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "mcpp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-T4feegblOeG+NU+c+PAobf8HT8KDSfcINkRAa1hNpkY=";
   };
 
diff --git a/pkgs/by-name/mc/mcrcon/package.nix b/pkgs/by-name/mc/mcrcon/package.nix
index d0cf49cd34cf..107674b96afd 100644
--- a/pkgs/by-name/mc/mcrcon/package.nix
+++ b/pkgs/by-name/mc/mcrcon/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Tiiffi";
     repo = "mcrcon";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cedeKsZgEyu0jqN4kBSgMJzFNUfCVXCEwH3M54miSG4=";
   };
 
diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix
index 617841bd7211..9f65bd075fe7 100644
--- a/pkgs/by-name/mc/mctc-lib/package.nix
+++ b/pkgs/by-name/mc/mctc-lib/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grimme-lab";
     repo = "mctc-lib";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zR4J9gOKwUIfDZsHMdX/t+mKdTpHKYTZQBYxQMWC8Vk=";
   };
 
diff --git a/pkgs/by-name/mc/mcumgr-client/package.nix b/pkgs/by-name/mc/mcumgr-client/package.nix
index 4aceb4b503f4..21b12fc2501b 100644
--- a/pkgs/by-name/mc/mcumgr-client/package.nix
+++ b/pkgs/by-name/mc/mcumgr-client/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vouch-opensource";
     repo = "mcumgr-client";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P5ykIVdWAxuCblMe7kzjswEca/+MsqpizCGUHIpR4qc=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-alerts/package.nix b/pkgs/by-name/md/mdbook-alerts/package.nix
index 6aca71caa273..22fde5a1ee22 100644
--- a/pkgs/by-name/md/mdbook-alerts/package.nix
+++ b/pkgs/by-name/md/mdbook-alerts/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lambdalisue";
     repo = "rs-mdbook-alerts";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MZS9TESITj3tzdaXYu5S2QUCW7cZuTpH1skFKeVi/sQ=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix
index 20a0dadb8aa6..2a0d2922dfa0 100644
--- a/pkgs/by-name/md/mdbook-d2/package.nix
+++ b/pkgs/by-name/md/mdbook-d2/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "danieleades";
     repo = "mdbook-d2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PsPCbuSK8JlNZOqFbxCK0f8h+7EC4tNFtjBfJqiPi7Q=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix
index 4a079393ac71..430e3f32f30a 100644
--- a/pkgs/by-name/md/mdbook-emojicodes/package.nix
+++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "blyxyas";
     repo = "mdbook-emojicodes";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-dlvfY2AMBvTl0j9YaT+u4CeWQGGihFD8AZaAK4/hUWU=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
index dd0b866dc73e..fd18fe07fc96 100644
--- a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
+++ b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "joelcourtney";
     repo = "mdbook-kroki-preprocessor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3BxIhJK0YWZBEbbNwMKixo1icEn+QKJwoskgIEaZcGQ=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-open-on-gh/package.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix
index bfbd562ec470..75f3ee01b38f 100644
--- a/pkgs/by-name/md/mdbook-open-on-gh/package.nix
+++ b/pkgs/by-name/md/mdbook-open-on-gh/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "badboy";
     repo = "mdbook-open-on-gh";
-    tag = version;
+    rev = version;
     hash = "sha256-73738Vei7rQ67LQIOrHPGOtsBnHClaXClRWDmA5pP58=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-pagetoc/package.nix b/pkgs/by-name/md/mdbook-pagetoc/package.nix
index 4f9c29fbc99f..8d4334615488 100644
--- a/pkgs/by-name/md/mdbook-pagetoc/package.nix
+++ b/pkgs/by-name/md/mdbook-pagetoc/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "slowsage";
     repo = "mdbook-pagetoc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A8J3cKSA//NGIVK3uE43YH3ph9DHGFlg7uOo10j2Kh8=";
   };
 
diff --git a/pkgs/by-name/md/mdbtools/package.nix b/pkgs/by-name/md/mdbtools/package.nix
index 5e6558b3ef42..381245fef2c7 100644
--- a/pkgs/by-name/md/mdbtools/package.nix
+++ b/pkgs/by-name/md/mdbtools/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mdbtools";
     repo = "mdbtools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-XWkFgQZKx9/pjVNEqfp9BwgR7w3fVxQ/bkJEYUvCXPs=";
   };
 
diff --git a/pkgs/by-name/md/mdds/package.nix b/pkgs/by-name/md/mdds/package.nix
index 5c2ded82c79d..55e2f3aa6ebe 100644
--- a/pkgs/by-name/md/mdds/package.nix
+++ b/pkgs/by-name/md/mdds/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "mdds";
     repo = "mdds";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-a412LpgDiYM8TMToaUrTlHtblYS1HehzrDOwvIAAxiA=";
   };
 
diff --git a/pkgs/by-name/md/mdhtml/package.nix b/pkgs/by-name/md/mdhtml/package.nix
index 7465d8424388..5c58990b162f 100644
--- a/pkgs/by-name/md/mdhtml/package.nix
+++ b/pkgs/by-name/md/mdhtml/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
     domain = "codeberg.org";
     owner = "Tomkoid";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Fv5XpWA2ebqXdA+46gZQouuZ3XxH4WDj/W6xJ0ETg8E=";
   };
 
diff --git a/pkgs/by-name/md/mdns/package.nix b/pkgs/by-name/md/mdns/package.nix
index bc12565a83fe..d2d47f574a8c 100644
--- a/pkgs/by-name/md/mdns/package.nix
+++ b/pkgs/by-name/md/mdns/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mjansson";
     repo = "mdns";
-    tag = version;
+    rev = version;
     hash = "sha256-2uv+Ibnbl6hsdjFqPhcHXbv+nIEIT4+tgtwGndpZCqo=";
   };
 
diff --git a/pkgs/by-name/md/mdp/package.nix b/pkgs/by-name/md/mdp/package.nix
index 05c9c9851ca8..d2b979d83f4f 100644
--- a/pkgs/by-name/md/mdp/package.nix
+++ b/pkgs/by-name/md/mdp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "visit1985";
     repo = "mdp";
-    tag = version;
+    rev = version;
     sha256 = "1m9a0vvyw2m55cn7zcq011vrjkiaj5a3g5g6f2dpq953gyi7gff9";
   };
 
diff --git a/pkgs/by-name/md/mdr/package.nix b/pkgs/by-name/md/mdr/package.nix
index beac62ebde09..f0b2d4fa9114 100644
--- a/pkgs/by-name/md/mdr/package.nix
+++ b/pkgs/by-name/md/mdr/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MichaelMure";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ibM3303pXnseAFP9qFTOzj0G/SxRPX+UeRfbJ+MCABk=";
   };
 
diff --git a/pkgs/by-name/md/mdsh/package.nix b/pkgs/by-name/md/mdsh/package.nix
index 5313c7b2f383..5333d33477db 100644
--- a/pkgs/by-name/md/mdsh/package.nix
+++ b/pkgs/by-name/md/mdsh/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zimbatm";
     repo = "mdsh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DQdm6911SNzVxUXpZ4mMumjonThhhEJnM/3GjbCjyuY=";
   };
 
diff --git a/pkgs/by-name/me/me_cleaner/package.nix b/pkgs/by-name/me/me_cleaner/package.nix
index 841d4a3baa4f..6957173c7687 100644
--- a/pkgs/by-name/me/me_cleaner/package.nix
+++ b/pkgs/by-name/me/me_cleaner/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "corna";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4";
   };
 
diff --git a/pkgs/by-name/me/measureme/package.nix b/pkgs/by-name/me/measureme/package.nix
index 06c9b77f21d0..4a0e426d3f6f 100644
--- a/pkgs/by-name/me/measureme/package.nix
+++ b/pkgs/by-name/me/measureme/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "measureme";
-    tag = version;
+    rev = version;
     hash = "sha256-Zgl8iyBDVwqZnbfqC06DMuo0S/hV6pl812hkiovmS+I=";
   };
 
diff --git a/pkgs/by-name/me/med/package.nix b/pkgs/by-name/me/med/package.nix
index 4f0dfd6b43d1..23811de16cbf 100644
--- a/pkgs/by-name/me/med/package.nix
+++ b/pkgs/by-name/me/med/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "allencch";
     repo = "med";
-    tag = version;
+    rev = version;
     hash = "sha256-m2lVRSNaklB0Xfqgtyc0lNWXfTD8wTWsE06eGv4FOBE=";
   };
 
diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix
index bb9c7587c582..18850c1bcdbb 100644
--- a/pkgs/by-name/me/media-downloader/package.nix
+++ b/pkgs/by-name/me/media-downloader/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mhogomchungu";
     repo = "media-downloader";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-rNcEPE1BoCltpV5A3ugc7NI2ASfLXuPC9NNbc4Gn8BA=";
   };
 
diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix
index 3acf79b0a66a..6d6ebbe587a0 100644
--- a/pkgs/by-name/me/mediamtx/package.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LPyyPHTdV9cUDRKSlP+XaMyb+yhSj4Jq0tnT7AnTRqw=";
   };
 
diff --git a/pkgs/by-name/me/mediasynclite/package.nix b/pkgs/by-name/me/mediasynclite/package.nix
index eba8147bb1e5..2b532d229220 100644
--- a/pkgs/by-name/me/mediasynclite/package.nix
+++ b/pkgs/by-name/me/mediasynclite/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iBroadcastMediaServices";
     repo = "MediaSyncLiteLinux";
-    tag = version;
+    rev = version;
     hash = "sha256-ToSkR6tPJMBCcj1NUBAywKjCAPlpmh+ngIopFrT2PIA=";
   };
 
diff --git a/pkgs/by-name/me/mednaffe/package.nix b/pkgs/by-name/me/mednaffe/package.nix
index c2de3b0e13a7..c21689a9be44 100644
--- a/pkgs/by-name/me/mednaffe/package.nix
+++ b/pkgs/by-name/me/mednaffe/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AmatCoder";
     repo = "mednaffe";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ZizW0EeY/Cc68m87cnbLAkx3G/ULyFT5b6Ku2ObzFRU=";
   };
 
diff --git a/pkgs/by-name/me/meg/package.nix b/pkgs/by-name/me/meg/package.nix
index 3e0713b8c87e..7a0973ff92af 100644
--- a/pkgs/by-name/me/meg/package.nix
+++ b/pkgs/by-name/me/meg/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "meg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uhfPNpvuuC9kBYUBCGE6X46TeZ5QxIcnDQ4HRrn2mT4=";
   };
 
diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix
index 9926da584de8..642af48e9099 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";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws";
   };
diff --git a/pkgs/by-name/me/megahit/package.nix b/pkgs/by-name/me/megahit/package.nix
index b6792a95ccde..84b8953a0556 100644
--- a/pkgs/by-name/me/megahit/package.nix
+++ b/pkgs/by-name/me/megahit/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "voutcn";
     repo = "megahit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1r5d9nkdmgjsbrpj43q9hy3s8jwsabaz3ji561v18hy47v58923c";
   };
 
diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix
index 634848a48143..2bc12b537c87 100644
--- a/pkgs/by-name/me/megapixels/package.nix
+++ b/pkgs/by-name/me/megapixels/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "megapixels-org";
     repo = "Megapixels";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ZXr0gmO72zKHwORn4p8zKuGcdICvb5+L/Q9d/ty8zwA=";
   };
 
diff --git a/pkgs/by-name/me/megatools/package.nix b/pkgs/by-name/me/megatools/package.nix
index d575e879b4a3..0f303363ca2f 100644
--- a/pkgs/by-name/me/megatools/package.nix
+++ b/pkgs/by-name/me/megatools/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://megous.com/git/megatools";
-    tag = version;
+    rev = version;
     sha256 = "sha256-AdvQqaRTsKTqdfNfFiWtA9mIPVGuui+Ru9TUARVG0+Q=";
   };
 
diff --git a/pkgs/by-name/me/mekuteriya/package.nix b/pkgs/by-name/me/mekuteriya/package.nix
index 98bae6881dfe..a00375d5e0a5 100644
--- a/pkgs/by-name/me/mekuteriya/package.nix
+++ b/pkgs/by-name/me/mekuteriya/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "frectonz";
     repo = "mek-ut-er-ya";
-    tag = version;
+    rev = version;
     hash = "sha256-bWp2UNrhCHY2DQWusGS9L9/jI2r23F34yLpuE6nuOD0=";
   };
 
diff --git a/pkgs/by-name/me/mela/package.nix b/pkgs/by-name/me/mela/package.nix
index 0985125db12a..1bdaf081ac3a 100644
--- a/pkgs/by-name/me/mela/package.nix
+++ b/pkgs/by-name/me/mela/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vbertone";
     repo = "MELA";
-    tag = version;
+    rev = version;
     sha256 = "01sgd4mwx4n58x95brphp4dskqkkx8434bvsr38r5drg9na5nc9y";
   };
 
diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix
index 40ff93f6934a..2504292861c9 100644
--- a/pkgs/by-name/me/melange/package.nix
+++ b/pkgs/by-name/me/melange/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3/iENeBC2kaHu3G5eWiRJgj/NbjOfj4/1LjrXQYedVo=";
     # 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/me/melt/package.nix b/pkgs/by-name/me/melt/package.nix
index aa7c660a55c6..39284acc1522 100644
--- a/pkgs/by-name/me/melt/package.nix
+++ b/pkgs/by-name/me/melt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "melt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rZJSjWmcVPri/BmGrm+fDi2WgtPReQ9lesmBhMsdddo=";
   };
 
diff --git a/pkgs/by-name/me/meme-image-generator/package.nix b/pkgs/by-name/me/meme-image-generator/package.nix
index 0876002450c1..98a643d4754a 100644
--- a/pkgs/by-name/me/meme-image-generator/package.nix
+++ b/pkgs/by-name/me/meme-image-generator/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nomad-software";
     repo = "meme";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L+JpNg9X3RSNXTozv2H1n2JiQx75i9gFGaQmDFaMIf0=";
   };
 
diff --git a/pkgs/by-name/me/memo/package.nix b/pkgs/by-name/me/memo/package.nix
index d5bbfa03d32e..5973477ffa2d 100644
--- a/pkgs/by-name/me/memo/package.nix
+++ b/pkgs/by-name/me/memo/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mrVanDalo";
     repo = "memo";
-    tag = version;
+    rev = version;
     sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp";
   };
 
diff --git a/pkgs/by-name/me/memtest_vulkan/package.nix b/pkgs/by-name/me/memtest_vulkan/package.nix
index 26c1b15106fa..2b699d306fe7 100644
--- a/pkgs/by-name/me/memtest_vulkan/package.nix
+++ b/pkgs/by-name/me/memtest_vulkan/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "GpuZelenograd";
     repo = "memtest_vulkan";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8tmQtycK7D5bol9v5VL8VkROZbSCndHo+uBvqqFTZjw=";
   };
 
diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix
index e348d031e73a..d8198f7ff418 100644
--- a/pkgs/by-name/me/meow/package.nix
+++ b/pkgs/by-name/me/meow/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PixelSergey";
     repo = "meow";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iskpT0CU/cGp+8myWaVmdw/uC0VoP8Sv+qbjpDDKS3o=";
   };
 
diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix
index dc8ec7b5ab6e..52fdad672cbe 100644
--- a/pkgs/by-name/me/mercure/package.nix
+++ b/pkgs/by-name/me/mercure/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dunglas";
     repo = "mercure";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-igPb2b3q3gGewg9DhSBVCSnFvwbGxIOQTCN1sEzdSJE=";
   };
 
diff --git a/pkgs/by-name/me/merkaartor/package.nix b/pkgs/by-name/me/merkaartor/package.nix
index 371bd48a4fb5..8d3abd715a43 100644
--- a/pkgs/by-name/me/merkaartor/package.nix
+++ b/pkgs/by-name/me/merkaartor/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openstreetmap";
     repo = "merkaartor";
-    tag = version;
+    rev = version;
     hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec=";
   };
 
diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix
index f3967c3888cc..058bf0dcde6d 100644
--- a/pkgs/by-name/me/mermaid-cli/package.nix
+++ b/pkgs/by-name/me/mermaid-cli/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "mermaid-js";
     repo = "mermaid-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-hj6pnucms6OcLuIebnlHMQj2K8zMbyuWzvVkZh029Sw=";
   };
 
diff --git a/pkgs/by-name/me/mermaid-filter/package.nix b/pkgs/by-name/me/mermaid-filter/package.nix
index c766671110c2..d34f0eb5b0b0 100644
--- a/pkgs/by-name/me/mermaid-filter/package.nix
+++ b/pkgs/by-name/me/mermaid-filter/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "raghur";
     repo = "mermaid-filter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GG2RWr5nVe6PCcTEJLmPyKL2j7ggSyNnHZAffNvPukg=";
   };
 
diff --git a/pkgs/by-name/me/meshoptimizer/package.nix b/pkgs/by-name/me/meshoptimizer/package.nix
index 44c2014571dc..25289d655e04 100644
--- a/pkgs/by-name/me/meshoptimizer/package.nix
+++ b/pkgs/by-name/me/meshoptimizer/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "meshoptimizer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vA9FXpJuLJS510MZgVZ96LAUbjXth4CFNkXMEV0DpYg=";
   };
 
diff --git a/pkgs/by-name/me/meson-tools/package.nix b/pkgs/by-name/me/meson-tools/package.nix
index 320beefc0038..714ed7f763a7 100644
--- a/pkgs/by-name/me/meson-tools/package.nix
+++ b/pkgs/by-name/me/meson-tools/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "afaerber";
     repo = "meson-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1bvshfa9pa012yzdwapi3nalpgcwmfq7d3n3w3mlr357a6kq64qk";
   };
 
diff --git a/pkgs/by-name/me/mesos-dns/package.nix b/pkgs/by-name/me/mesos-dns/package.nix
index 6ecf370bf823..1ae38d4ac4cb 100644
--- a/pkgs/by-name/me/mesos-dns/package.nix
+++ b/pkgs/by-name/me/mesos-dns/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "m3scluster";
     repo = "mesos-dns";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/zcjQ2AxZ17rAxrRmfztj5gH1pu2QswJgaCE022FieU=";
   };
 
diff --git a/pkgs/by-name/me/messer-slim/package.nix b/pkgs/by-name/me/messer-slim/package.nix
index 555554de99e1..6c90806992ed 100644
--- a/pkgs/by-name/me/messer-slim/package.nix
+++ b/pkgs/by-name/me/messer-slim/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MesserLab";
     repo = "SLiM";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Hgh1ianEdITRUIDKLiLW32kQlPlXKIfN4PSv3cOXTGI=";
   };
 
diff --git a/pkgs/by-name/me/metadata-cleaner/package.nix b/pkgs/by-name/me/metadata-cleaner/package.nix
index 3b3aede756f4..1f42f6b474f3 100644
--- a/pkgs/by-name/me/metadata-cleaner/package.nix
+++ b/pkgs/by-name/me/metadata-cleaner/package.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "rmnvgr";
     repo = "metadata-cleaner";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-J+nwgLbAFoh1gq3J4cqQEShZJCSZesyCjT9DfkCWIHs=";
   };
 
diff --git a/pkgs/by-name/me/metal-cli/package.nix b/pkgs/by-name/me/metal-cli/package.nix
index b7040f23a0cd..b13d6bb0d162 100644
--- a/pkgs/by-name/me/metal-cli/package.nix
+++ b/pkgs/by-name/me/metal-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "equinix";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+hpsGFZHuVhh+fKVcap0vhoUmRs3xPgUwW8SD56m6uI=";
   };
 
diff --git a/pkgs/by-name/me/metamath/package.nix b/pkgs/by-name/me/metamath/package.nix
index 02aa05b266fc..884aa8ab4814 100644
--- a/pkgs/by-name/me/metamath/package.nix
+++ b/pkgs/by-name/me/metamath/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "metamath";
     repo = "metamath-exe";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Cg1dgz+uphDlGhKH3mTywtAccWinC5+pwNv4TB3YAnI=";
   };
 
diff --git a/pkgs/by-name/me/metastore/package.nix b/pkgs/by-name/me/metastore/package.nix
index ae98a18ad6be..32d85ff6cc4e 100644
--- a/pkgs/by-name/me/metastore/package.nix
+++ b/pkgs/by-name/me/metastore/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "przemoc";
     repo = "metastore";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0mb10wfckswqgi0bq25ncgabnd3iwj7s7hhg3wpcyfgckdynwizv";
   };
 
diff --git a/pkgs/by-name/me/meteor-git/package.nix b/pkgs/by-name/me/meteor-git/package.nix
index 5e01ecc10926..7123b8860b73 100644
--- a/pkgs/by-name/me/meteor-git/package.nix
+++ b/pkgs/by-name/me/meteor-git/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stefanlogue";
     repo = "meteor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DWnwofNJhILdVITRDh8MNlGl6PSENCS2PkaFm1o+MW8=";
   };
 
diff --git a/pkgs/by-name/me/metersLv2/package.nix b/pkgs/by-name/me/metersLv2/package.nix
index 5d038a9539fd..beeaeb4f5ebf 100644
--- a/pkgs/by-name/me/metersLv2/package.nix
+++ b/pkgs/by-name/me/metersLv2/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "x42";
     repo = "meters.lv2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eGXTbE83bJEDqTBltL6ZX9qa/OotCFmUxpE/aLqGELU=";
   };
 
diff --git a/pkgs/by-name/me/mev-boost/package.nix b/pkgs/by-name/me/mev-boost/package.nix
index d0338c1e9071..f99e1b0ce3fb 100644
--- a/pkgs/by-name/me/mev-boost/package.nix
+++ b/pkgs/by-name/me/mev-boost/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "flashbots";
     repo = "mev-boost";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EFPVBSSIef3cTrYp3X1xCEOtYcGpuW/GZXHXX+0wGd8=";
   };
 
diff --git a/pkgs/by-name/mg/mgitstatus/package.nix b/pkgs/by-name/mg/mgitstatus/package.nix
index ef9001be3af1..da906e08f922 100644
--- a/pkgs/by-name/mg/mgitstatus/package.nix
+++ b/pkgs/by-name/mg/mgitstatus/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fboender";
     repo = "multi-git-status";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-DToyP6TD9up0k2/skMW3el6hNvKD+c8q2zWpk0QZGRA=";
   };
 
diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix
index cee54373f85a..2f5d08158f94 100644
--- a/pkgs/by-name/mi/microbin/package.nix
+++ b/pkgs/by-name/mi/microbin/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "szabodanika";
     repo = "microbin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fsRpqSYDsuV0M6Xar2GVoyTgCPT39dcKJ6eW4YXCkQ0=";
   };
 
diff --git a/pkgs/by-name/mi/microcom/package.nix b/pkgs/by-name/mi/microcom/package.nix
index a1c1f313aef7..b70adcd0ff01 100644
--- a/pkgs/by-name/mi/microcom/package.nix
+++ b/pkgs/by-name/mi/microcom/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pengutronix";
     repo = "microcom";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CT/myxOK4U3DzliGsa45WMIFcYLjcoxx6w5S1NL5c7Y=";
   };
 
diff --git a/pkgs/by-name/mi/microdnf/package.nix b/pkgs/by-name/mi/microdnf/package.nix
index 44430e70450e..db9d8910f39f 100644
--- a/pkgs/by-name/mi/microdnf/package.nix
+++ b/pkgs/by-name/mi/microdnf/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "microdnf";
-    tag = version;
+    rev = version;
     hash = "sha256-xWHE05CeX8I8YO0gqf5FDiqLexirwKdyCe4grclOVYc=";
   };
 
diff --git a/pkgs/by-name/mi/micromdm/package.nix b/pkgs/by-name/mi/micromdm/package.nix
index e7f6e305d3c2..05cb4e691b6e 100644
--- a/pkgs/by-name/mi/micromdm/package.nix
+++ b/pkgs/by-name/mi/micromdm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "micromdm";
     repo = "micromdm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o/HK1bjaUwsSQG7QbYe0gFnD/OKV00cHXLXpftNa3iY=";
   };
 
diff --git a/pkgs/by-name/mi/micronucleus/package.nix b/pkgs/by-name/mi/micronucleus/package.nix
index f4382df67dec..51369ef5a704 100644
--- a/pkgs/by-name/mi/micronucleus/package.nix
+++ b/pkgs/by-name/mi/micronucleus/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "micronucleus";
     repo = "micronucleus";
-    tag = version;
+    rev = version;
     sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in";
   };
 
diff --git a/pkgs/by-name/mi/microplane/package.nix b/pkgs/by-name/mi/microplane/package.nix
index 2b3b4b6b08e7..fcae4cf42b71 100644
--- a/pkgs/by-name/mi/microplane/package.nix
+++ b/pkgs/by-name/mi/microplane/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Clever";
     repo = "microplane";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3QPxH4ZR02bkL2uKoJpLW9e7q1LjSlWw5jo0jxegeiM=";
   };
 
diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix
index 8634a90dac48..fb75f70d01c8 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Hn5TtLBKK9kn9x3U2ZcU9O2CS272rcDD0HA+Xva3G4w=";
     fetchSubmodules = true;
 
diff --git a/pkgs/by-name/mi/microscheme/package.nix b/pkgs/by-name/mi/microscheme/package.nix
index 2e704c1fd76d..8c7841904438 100644
--- a/pkgs/by-name/mi/microscheme/package.nix
+++ b/pkgs/by-name/mi/microscheme/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ryansuchocki";
     repo = "microscheme";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "5qTWsBCfj5DCZ3f9W1bdo6WAc1DZqVxg8D7pwC95duQ=";
   };
 
diff --git a/pkgs/by-name/mi/microserver/package.nix b/pkgs/by-name/mi/microserver/package.nix
index b696239174c1..84f46fd49e25 100644
--- a/pkgs/by-name/mi/microserver/package.nix
+++ b/pkgs/by-name/mi/microserver/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "robertohuertasm";
     repo = "microserver";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VgzOdJ1JLe0acjRYvaysCPox5acFmc4VD2f6HZWxT8M=";
   };
 
diff --git a/pkgs/by-name/mi/microsocks/package.nix b/pkgs/by-name/mi/microsocks/package.nix
index ecc03c487d9e..8cd33c602e02 100644
--- a/pkgs/by-name/mi/microsocks/package.nix
+++ b/pkgs/by-name/mi/microsocks/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rofl0r";
     repo = "microsocks";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5NR2gtm+uMkjmkV/dv3DzSedfNvYpHZgFHVSrybl0Tk=";
   };
 
diff --git a/pkgs/by-name/mi/microsoft-gsl/package.nix b/pkgs/by-name/mi/microsoft-gsl/package.nix
index 9ab73ca3465f..1ababa6047a5 100644
--- a/pkgs/by-name/mi/microsoft-gsl/package.nix
+++ b/pkgs/by-name/mi/microsoft-gsl/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "GSL";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cXDFqt2KgMFGfdh6NGE+JmP4R0Wm9LNHM0eIblYe6zU=";
   };
 
diff --git a/pkgs/by-name/mi/midi-trigger/package.nix b/pkgs/by-name/mi/midi-trigger/package.nix
index 957e3ba6e18c..c05218a923bd 100644
--- a/pkgs/by-name/mi/midi-trigger/package.nix
+++ b/pkgs/by-name/mi/midi-trigger/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "unclechu";
     repo = "MIDI-Trigger";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-tMnN8mTd6Bm46ZIDy0JPSVe77xCZws2XwQLQexDWPgU=";
   };
 
diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index dee9d84a2386..eff21c563892 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Hy5Uy6lC3d8N2lsnGLrcN/D5/eiycp7X7h6V8vo3tPA=";
   };
 
diff --git a/pkgs/by-name/mi/migra/package.nix b/pkgs/by-name/mi/migra/package.nix
index a5b158b56857..48fa2a1e5c07 100644
--- a/pkgs/by-name/mi/migra/package.nix
+++ b/pkgs/by-name/mi/migra/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "djrobstep";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-LSCJA5Ym1LuV3EZl6gnl9jTHGc8A1LXmR1fj0ZZc+po=";
   };
 
diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
index 27d38e7d222b..760dd240bcf3 100644
--- a/pkgs/by-name/mi/mihomo/package.nix
+++ b/pkgs/by-name/mi/mihomo/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "mihomo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A/+BUnW7ge4y99W2rAUBAAqxO1L0M9oO0WSnLN1NnXQ=";
   };
 
diff --git a/pkgs/by-name/mi/miller/package.nix b/pkgs/by-name/mi/miller/package.nix
index 8910de89b028..9c2567906453 100644
--- a/pkgs/by-name/mi/miller/package.nix
+++ b/pkgs/by-name/mi/miller/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "johnkerl";
     repo = "miller";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eHiYIw/sQMXLow2Vy4zFTGeON28LmG0pK2Uca4ooInU=";
   };
 
diff --git a/pkgs/by-name/mi/millet/package.nix b/pkgs/by-name/mi/millet/package.nix
index e073567873a2..da0694ebe84f 100644
--- a/pkgs/by-name/mi/millet/package.nix
+++ b/pkgs/by-name/mi/millet/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "azdavis";
     repo = "millet";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ffna9qsCTRHnUstgCDZxHweHteYVA/xiAtOkzCw2ltI=";
   };
 
diff --git a/pkgs/by-name/mi/millipixels/package.nix b/pkgs/by-name/mi/millipixels/package.nix
index d0ed2e3ac1ba..2022d8e50bcc 100644
--- a/pkgs/by-name/mi/millipixels/package.nix
+++ b/pkgs/by-name/mi/millipixels/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "Librem5";
     repo = "millipixels";
-    tag = "v${version}";
+    rev = "v${version}";
     domain = "source.puri.sm";
     hash = "sha256-pRREQRYyD9+dpRvcfsNiNthFy08Yeup9xDn+x+RWDrE=";
   };
diff --git a/pkgs/by-name/mi/mimalloc/package.nix b/pkgs/by-name/mi/mimalloc/package.nix
index 2373f779c51e..b0de189bcc97 100644
--- a/pkgs/by-name/mi/mimalloc/package.nix
+++ b/pkgs/by-name/mi/mimalloc/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "mimalloc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-RjFMLInulyynrmyAg6Km/u9HGfcYeerkou0gQwCdhsA=";
   };
 
diff --git a/pkgs/by-name/mi/mimic/package.nix b/pkgs/by-name/mi/mimic/package.nix
index 0b11b60bcdcb..70a9b0e33a83 100644
--- a/pkgs/by-name/mi/mimic/package.nix
+++ b/pkgs/by-name/mi/mimic/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MycroftAI";
     repo = "mimic1";
-    tag = version;
+    rev = version;
     sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id";
   };
 
diff --git a/pkgs/by-name/mi/minder/package.nix b/pkgs/by-name/mi/minder/package.nix
index d9a3224e5c7e..33966794be80 100644
--- a/pkgs/by-name/mi/minder/package.nix
+++ b/pkgs/by-name/mi/minder/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phase1geo";
     repo = "minder";
-    tag = version;
+    rev = version;
     sha256 = "sha256-LZm2TLUugW/lSHp+y3Sz9IacQCEFQloVnZ9MoBjqHvI=";
   };
 
diff --git a/pkgs/by-name/mi/mindustry/package.nix b/pkgs/by-name/mi/mindustry/package.nix
index b3cb78086496..50c781bc3321 100644
--- a/pkgs/by-name/mi/mindustry/package.nix
+++ b/pkgs/by-name/mi/mindustry/package.nix
@@ -49,13 +49,13 @@ let
   Mindustry = fetchFromGitHub {
     owner = "Anuken";
     repo = "Mindustry";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pJAJjb8rgDL5q2hfuXH2Cyb1Szu4GixeXoLMdnIAlno=";
   };
   Arc = fetchFromGitHub {
     owner = "Anuken";
     repo = "Arc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L+5fshI1oo1lVdTMTBuPzqtEeR2dq1NORP84rZ83rT0=";
   };
   soloud = fetchFromGitHub {
diff --git a/pkgs/by-name/mi/minecraft-server-hibernation/package.nix b/pkgs/by-name/mi/minecraft-server-hibernation/package.nix
index 8773cb0942c9..e5279d2e3bf2 100644
--- a/pkgs/by-name/mi/minecraft-server-hibernation/package.nix
+++ b/pkgs/by-name/mi/minecraft-server-hibernation/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gekware";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-b6LeqjIraIasHBpaVgy8esl4NV8rdBrfO7ewgeIocS8=";
   };
 
diff --git a/pkgs/by-name/mi/minesweep-rs/package.nix b/pkgs/by-name/mi/minesweep-rs/package.nix
index 3f6af7858dd6..fb87f88b8ae9 100644
--- a/pkgs/by-name/mi/minesweep-rs/package.nix
+++ b/pkgs/by-name/mi/minesweep-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cpcloud";
     repo = "minesweep-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FzMCqsPBcbblItRzfnY43glY4We9jk0eBxjG0SZnau8=";
   };
 
diff --git a/pkgs/by-name/mi/minetest-mapserver/package.nix b/pkgs/by-name/mi/minetest-mapserver/package.nix
index 85333336b17a..9641223a8460 100644
--- a/pkgs/by-name/mi/minetest-mapserver/package.nix
+++ b/pkgs/by-name/mi/minetest-mapserver/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "minetest-mapserver";
     repo = "mapserver";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wo3/7axVkEcnqkOG29KE136EeMt/FW63q68UlpIA3z8=";
   };
 
diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix
index c55837a7e3af..44973a67f9d7 100644
--- a/pkgs/by-name/mi/mini-calc/package.nix
+++ b/pkgs/by-name/mi/mini-calc/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vanilla-extracts";
     repo = "calc";
-    tag = version;
+    rev = version;
     hash = "sha256-iLKW0ibsHZyAMYvux+CrOeJZCVMPE1HtWi0VBg96hr0=";
   };
 
diff --git a/pkgs/by-name/mi/minia/package.nix b/pkgs/by-name/mi/minia/package.nix
index 1397cc2cb286..1e76f8a62127 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0bmfrywixaaql898l0ixsfkhxjf2hb08ssnqzlzacfizxdp46siq";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mi/miniaudio/package.nix b/pkgs/by-name/mi/miniaudio/package.nix
index b7575ab9a45c..5f591c1cecba 100644
--- a/pkgs/by-name/mi/miniaudio/package.nix
+++ b/pkgs/by-name/mi/miniaudio/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mackron";
     repo = "miniaudio";
-    tag = version;
+    rev = version;
     hash = "sha256-o/7sfBcrhyXEakccOAogQqm8dO4Szj1QSpaIHg6OSt4=";
   };
 
diff --git a/pkgs/by-name/mi/minica/package.nix b/pkgs/by-name/mi/minica/package.nix
index e486f2cfee18..594725a773cd 100644
--- a/pkgs/by-name/mi/minica/package.nix
+++ b/pkgs/by-name/mi/minica/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jsha";
     repo = "minica";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YUeP3xBoZzonJYfEAOWZYCTFwOxFWySW7ezvpMLNZ1I=";
   };
 
diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix
index 0fee53f83980..1742f171ecba 100644
--- a/pkgs/by-name/mi/minify/package.nix
+++ b/pkgs/by-name/mi/minify/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tdewolff";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sN3gGxUOWNFBB+iz6i+a0SP8my+IdbMXAVd/bWzzKms=";
   };
 
diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
index 5240555e4826..3184c339168e 100644
--- a/pkgs/by-name/mi/minijinja/package.nix
+++ b/pkgs/by-name/mi/minijinja/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mitsuhiko";
     repo = "minijinja";
-    tag = version;
+    rev = version;
     hash = "sha256-WbWMssIQ8ETaVaJ9fEkUxHmnylH4hdO14XMwyB0BtFY=";
   };
 
diff --git a/pkgs/by-name/mi/minimacy/package.nix b/pkgs/by-name/mi/minimacy/package.nix
index 68fce8ff2386..a05df86a88be 100644
--- a/pkgs/by-name/mi/minimacy/package.nix
+++ b/pkgs/by-name/mi/minimacy/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ambermind";
     repo = "minimacy";
-    tag = version;
+    rev = version;
     hash = "sha256-uA+4dnhOnv7qRE7nqew8a14DGaQblsMY2uBZ+iyLtFU=";
   };
 
diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix
index d82ef8199b3d..8808db4374f7 100644
--- a/pkgs/by-name/mi/minimap2/package.nix
+++ b/pkgs/by-name/mi/minimap2/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "minimap2";
     owner = "lh3";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cBl2BKgPCP/xHZW6fTH51cY9/lV/1HVLsN7a1R1Blv4=";
   };
 
diff --git a/pkgs/by-name/mi/mininet/package.nix b/pkgs/by-name/mi/mininet/package.nix
index f0b91f00366b..8980443d16b0 100644
--- a/pkgs/by-name/mi/mininet/package.nix
+++ b/pkgs/by-name/mi/mininet/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mininet";
     repo = "mininet";
-    tag = version;
+    rev = version;
     hash = "sha256-Z7Vbfu0EJ4+rCpckXrt3hgxeB9N2nnyPIXgPBnpV4uw=";
   };
 
diff --git a/pkgs/by-name/mi/minio-certgen/package.nix b/pkgs/by-name/mi/minio-certgen/package.nix
index 4835693c1f1c..3ab53dbac9ad 100644
--- a/pkgs/by-name/mi/minio-certgen/package.nix
+++ b/pkgs/by-name/mi/minio-certgen/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "minio";
     repo = "certgen";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bYZfQeqPqroMkqJOqHri3l7xscEK9ml/oNLVPBVSDKk=";
   };
 
diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix
index d88889537301..82c3baa2e8f3 100644
--- a/pkgs/by-name/mi/minio-warp/package.nix
+++ b/pkgs/by-name/mi/minio-warp/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "minio";
     repo = "warp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zRRvY/PpLSY8cx3vqcAGfVK7FJKzFnxtghhIwrlUh+Y=";
   };
 
diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 50908207ec05..d85fd90783b0 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "miniserve";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U=";
   };
 
diff --git a/pkgs/by-name/mi/minisign/package.nix b/pkgs/by-name/mi/minisign/package.nix
index 5467fc4097a2..ebecb13ca6be 100644
--- a/pkgs/by-name/mi/minisign/package.nix
+++ b/pkgs/by-name/mi/minisign/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "minisign";
     owner = "jedisct1";
-    tag = version;
+    rev = version;
     sha256 = "sha256-qhAzhht9p4bsa2ntJwhcNurm8QgYYiKi3dA3ifpT8aw=";
   };
 
diff --git a/pkgs/by-name/mi/minivmac/package.nix b/pkgs/by-name/mi/minivmac/package.nix
index 33c72844e3e1..a143585f5280 100644
--- a/pkgs/by-name/mi/minivmac/package.nix
+++ b/pkgs/by-name/mi/minivmac/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "erichelgeson";
     repo = "minivmac";
-    tag = version;
+    rev = version;
     hash = "sha256-iiEE0ioXh3keKUPfAB+YcE1iggGLpxT9N8LSVFDhttE=";
   };
 
diff --git a/pkgs/by-name/mi/minixml/package.nix b/pkgs/by-name/mi/minixml/package.nix
index 74343c7c96e8..d978973e7e93 100644
--- a/pkgs/by-name/mi/minixml/package.nix
+++ b/pkgs/by-name/mi/minixml/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = "mxml";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-l7GUA+vlSECi/72eU3Y9COpGtLTRh3vYcHUi+uRkCn8=";
   };
 
diff --git a/pkgs/by-name/mi/miniz/package.nix b/pkgs/by-name/mi/miniz/package.nix
index e6977be769bb..c47b49755916 100644
--- a/pkgs/by-name/mi/miniz/package.nix
+++ b/pkgs/by-name/mi/miniz/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "richgel999";
     repo = "miniz";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-3J0bkr2Yk+MJXilUqOCHsWzuykySv5B1nepmucvA4hg=";
   };
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/mi/minizign/package.nix b/pkgs/by-name/mi/minizign/package.nix
index 4ca327800caa..ea85e75a5329 100644
--- a/pkgs/by-name/mi/minizign/package.nix
+++ b/pkgs/by-name/mi/minizign/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = "zig-minisign";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Su66UohRc9C4INIp+7NHiW28sUq5YBfrI0EoEbGojG0=";
   };
 
diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix
index 4ee57cee8bf1..e585035af33f 100644
--- a/pkgs/by-name/mi/minizip-ng/package.nix
+++ b/pkgs/by-name/mi/minizip-ng/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zlib-ng";
     repo = "minizip-ng";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-NFl2R+o1SBXNAt2TOMMsbIh+IHJu78p56caT4h2TDeU=";
   };
 
diff --git a/pkgs/by-name/mi/mint-l-theme/package.nix b/pkgs/by-name/mi/mint-l-theme/package.nix
index 8b7f73bbffb8..7ce18e06f8f5 100644
--- a/pkgs/by-name/mi/mint-l-theme/package.nix
+++ b/pkgs/by-name/mi/mint-l-theme/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-l-theme";
-    tag = version;
+    rev = version;
     hash = "sha256-umY14seqUjNugN6+wzMDIGbCiis/InseDwVR85PqrGs=";
   };
 
diff --git a/pkgs/by-name/mi/mint-themes/package.nix b/pkgs/by-name/mi/mint-themes/package.nix
index cb7411018188..c25ba30e6afc 100644
--- a/pkgs/by-name/mi/mint-themes/package.nix
+++ b/pkgs/by-name/mi/mint-themes/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-themes";
-    tag = version;
+    rev = version;
     hash = "sha256-QCf0hF1qtTiYo9F/M3UiCrGj6EPSrrSWZaLXqH0UNWs=";
   };
 
diff --git a/pkgs/by-name/mi/mint-x-icons/package.nix b/pkgs/by-name/mi/mint-x-icons/package.nix
index fb46e934005b..14e9500030d8 100644
--- a/pkgs/by-name/mi/mint-x-icons/package.nix
+++ b/pkgs/by-name/mi/mint-x-icons/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-x-icons";
-    tag = version;
+    rev = version;
     hash = "sha256-9oXMMLVjirzRVJ0Pmd/1LjeeNUgYMKaGeih3eQA7k5U=";
   };
 
diff --git a/pkgs/by-name/mi/mint-y-icons/package.nix b/pkgs/by-name/mi/mint-y-icons/package.nix
index f42b54a49393..74734a4da865 100644
--- a/pkgs/by-name/mi/mint-y-icons/package.nix
+++ b/pkgs/by-name/mi/mint-y-icons/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-y-icons";
-    tag = version;
+    rev = version;
     hash = "sha256-xGPihqXUraJy9lDCSVjQlNxrhETEcjBTYhyFsZGJRGo=";
   };
 
diff --git a/pkgs/by-name/mi/mint/package.nix b/pkgs/by-name/mi/mint/package.nix
index ba54c513918c..17b994f0b53e 100644
--- a/pkgs/by-name/mi/mint/package.nix
+++ b/pkgs/by-name/mi/mint/package.nix
@@ -13,7 +13,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
-    tag = version;
+    rev = version;
     hash = "sha256-cPx0/BrD2w7LlH5xO9hKlHndNmVm8jpN7cti5/eZ1m4=";
   };
 
diff --git a/pkgs/by-name/mi/mirakurun/package.nix b/pkgs/by-name/mi/mirakurun/package.nix
index 5a0ddc47cd4e..0ae8bc87856c 100644
--- a/pkgs/by-name/mi/mirakurun/package.nix
+++ b/pkgs/by-name/mi/mirakurun/package.nix
@@ -19,7 +19,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Chinachu";
     repo = "Mirakurun";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Qg+wET5H9t3Mv2Hv0iT/C85/SEaQ+BHSBL3JjMQW5+Q=";
   };
 
diff --git a/pkgs/by-name/mi/mirrorbits/package.nix b/pkgs/by-name/mi/mirrorbits/package.nix
index 77588a2764c0..a5d8bc041b7f 100644
--- a/pkgs/by-name/mi/mirrorbits/package.nix
+++ b/pkgs/by-name/mi/mirrorbits/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "etix";
     repo = "mirrorbits";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ta3+Y3P74cvx09Z4rB5ObgBZtfF4grVgyeZ57yFPlGM=";
   };
 
diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index f6e201ba8cdd..29355753f408 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-n7A6LGjcVz6LWz8fkkG5XS2WZf3FFkbidnt/S5jxy5g=";
   };
 
diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix
index 3d5f875bec6c..4949b4ea5e38 100644
--- a/pkgs/by-name/mi/mission-center/package.nix
+++ b/pkgs/by-name/mi/mission-center/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "mission-center-devs";
     repo = "mission-center";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PvHIvWyhGovlLaeHk2WMp3yRz4VxvvINzX1oqkFgVuQ=";
   };
 
diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix
index 648ad8b41c23..6fe2fe4d4be5 100644
--- a/pkgs/by-name/mi/misskey/package.nix
+++ b/pkgs/by-name/mi/misskey/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "misskey-dev";
     repo = "misskey";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-uei5Ojx39kCbS8DCjHZ5PoEAsqJ5vC6SsFqIEIJ16n8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mi/mix2nix/package.nix b/pkgs/by-name/mi/mix2nix/package.nix
index d8af1d7f4f77..a1e25f4e0a20 100644
--- a/pkgs/by-name/mi/mix2nix/package.nix
+++ b/pkgs/by-name/mi/mix2nix/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ydlr";
     repo = "mix2nix";
-    tag = version;
+    rev = version;
     hash = "sha256-hD4lpP8GPkNXuMMDOOTEmy+rOwOSCxQwR0Mjq8i4oDM=";
   };
 
diff --git a/pkgs/by-name/mk/mkcert/package.nix b/pkgs/by-name/mk/mkcert/package.nix
index 96b3ddb92fe8..b918cb4da0fd 100644
--- a/pkgs/by-name/mk/mkcert/package.nix
+++ b/pkgs/by-name/mk/mkcert/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FiloSottile";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FMAXjRL+kJ/hwGmaWBy8ecON+JCMgRytfpryeLWsSVc=";
   };
 
diff --git a/pkgs/by-name/mk/mkjson/generated.nix b/pkgs/by-name/mk/mkjson/generated.nix
index 5e8d3a51a813..1fd4090b1d0f 100644
--- a/pkgs/by-name/mk/mkjson/generated.nix
+++ b/pkgs/by-name/mk/mkjson/generated.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mfussenegger";
     repo = "mkjson";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-+NDLFtsWWxHv/6XC9hJOAHPU6YED5oHqS/j5BPwNsqA=";
   };
 
diff --git a/pkgs/by-name/mk/mkp224o/package.nix b/pkgs/by-name/mk/mkp224o/package.nix
index f5fbc437d77f..b6d12752d9ad 100644
--- a/pkgs/by-name/mk/mkp224o/package.nix
+++ b/pkgs/by-name/mk/mkp224o/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cathugger";
     repo = "mkp224o";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OL3xhoxIS1OqfVp0QboENFdNH/e1Aq1R/MFFM9LNFbQ=";
   };
 
diff --git a/pkgs/by-name/mk/mktorrent/package.nix b/pkgs/by-name/mk/mktorrent/package.nix
index 0208ff05fa36..4edbb1acab46 100644
--- a/pkgs/by-name/mk/mktorrent/package.nix
+++ b/pkgs/by-name/mk/mktorrent/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pobrn";
     repo = "mktorrent";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr";
   };
 
diff --git a/pkgs/by-name/ml/mle/package.nix b/pkgs/by-name/ml/mle/package.nix
index 35363520cd85..c11fc690e55b 100644
--- a/pkgs/by-name/ml/mle/package.nix
+++ b/pkgs/by-name/ml/mle/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "adsr";
     repo = "mle";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0rkk7mh6w5y1lrbdv7wmxdgl5cqzpzw0p26adazkqlfdyb6wbj9k";
   };
 
diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix
index eeddfd90bbd4..2d82d7ff2204 100644
--- a/pkgs/by-name/ml/mlkit/package.nix
+++ b/pkgs/by-name/ml/mlkit/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "melsman";
     repo = "mlkit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0nAQHBcQgGdcWd4SFhDon7I0zi5U+YRTdGvG78tri6A=";
   };
 
diff --git a/pkgs/by-name/ml/mlvwm/package.nix b/pkgs/by-name/ml/mlvwm/package.nix
index 7ba2ff1c9634..3ca10ed65d88 100644
--- a/pkgs/by-name/ml/mlvwm/package.nix
+++ b/pkgs/by-name/ml/mlvwm/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "morgant";
     repo = "mlvwm";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ElKmi+ANuB3LPwZTMcr5HEMESjDwENbYnNIGdRP24d0=";
   };
 
diff --git a/pkgs/by-name/mm/mmake/package.nix b/pkgs/by-name/mm/mmake/package.nix
index 5d2ea4a1f643..c882a4d027dd 100644
--- a/pkgs/by-name/mm/mmake/package.nix
+++ b/pkgs/by-name/mm/mmake/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tj";
     repo = "mmake";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JPsVfLIl06PJ8Nsfu7ogwrttB1G93HTKbZFqUTSV9O8=";
   };
 
diff --git a/pkgs/by-name/mm/mmdoc/package.nix b/pkgs/by-name/mm/mmdoc/package.nix
index 13fc0e8b2751..ca10843f3095 100644
--- a/pkgs/by-name/mm/mmdoc/package.nix
+++ b/pkgs/by-name/mm/mmdoc/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ryantm";
     repo = "mmdoc";
-    tag = version;
+    rev = version;
     hash = "sha256-NS8i5xvCwq0pSdfxnaxnpuwmDAkfH6Tkc4N2F6aGvWY=";
   };
 
diff --git a/pkgs/by-name/mm/mmex/package.nix b/pkgs/by-name/mm/mmex/package.nix
index cb9cc934bb2c..449ea009b429 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-gpDwfRKXgp6hEpitflVIAIOU/k3Fx6hKKhyzQvLlog8=";
   };
diff --git a/pkgs/by-name/mm/mmsd-tng/package.nix b/pkgs/by-name/mm/mmsd-tng/package.nix
index e133915e8e09..ae58cd813cff 100644
--- a/pkgs/by-name/mm/mmsd-tng/package.nix
+++ b/pkgs/by-name/mm/mmsd-tng/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "kop316";
     repo = "mmsd";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-kXl+T5A8Qw0PmJ47sned8dzTIYUmaWc8w6X6BLEdLIg=";
   };
 
diff --git a/pkgs/by-name/mm/mmtc/package.nix b/pkgs/by-name/mm/mmtc/package.nix
index de30dc494058..b7fbabd2f3f8 100644
--- a/pkgs/by-name/mm/mmtc/package.nix
+++ b/pkgs/by-name/mm/mmtc/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "figsoda";
     repo = "mmtc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4=";
   };
 
diff --git a/pkgs/by-name/mm/mmutils/package.nix b/pkgs/by-name/mm/mmutils/package.nix
index 9a5816f372f4..7b410dc72e17 100644
--- a/pkgs/by-name/mm/mmutils/package.nix
+++ b/pkgs/by-name/mm/mmutils/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pockata";
     repo = "mmutils";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "08wlb278m5lr218c87yqashk7farzny51ybl5h6j60i7pbpm01ml";
   };
 
diff --git a/pkgs/by-name/mm/mmv-go/package.nix b/pkgs/by-name/mm/mmv-go/package.nix
index 3dd179c3b734..fdc05fdbd68c 100644
--- a/pkgs/by-name/mm/mmv-go/package.nix
+++ b/pkgs/by-name/mm/mmv-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "itchyny";
     repo = "mmv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DNLiW0QX7WrBslwVCbvydLnE6JAcfcRALYqwsK/J5x0=";
   };
 
diff --git a/pkgs/by-name/mm/mmv/package.nix b/pkgs/by-name/mm/mmv/package.nix
index c439db1a1cb4..7016a79fd0d3 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-h+hdrIQz+7jKdMdJtWhBbZgvmNTIOr7Q38nhfAWC+G4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mn/mnemonicode/package.nix b/pkgs/by-name/mn/mnemonicode/package.nix
index 7315e0f114ee..bf8859933505 100644
--- a/pkgs/by-name/mn/mnemonicode/package.nix
+++ b/pkgs/by-name/mn/mnemonicode/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "singpolyma";
     repo = "mnemonicode";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-bGipPvLj6ig+lMLsl/Yve8PmuA93ETvhNKoMPh0JMBM=";
   };
   installPhase = ''
diff --git a/pkgs/by-name/mo/mo/package.nix b/pkgs/by-name/mo/mo/package.nix
index c584c577d527..beeb1f994bbd 100644
--- a/pkgs/by-name/mo/mo/package.nix
+++ b/pkgs/by-name/mo/mo/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tests-always-included";
     repo = "mo";
-    tag = version;
+    rev = version;
     hash = "sha256-CFAvTpziKzSkdomvCf8PPXYbYcJxjB4EValz2RdD2b0=";
   };
 
diff --git a/pkgs/by-name/mo/moar/package.nix b/pkgs/by-name/mo/moar/package.nix
index a4bfe369ea33..2a79dcb2678b 100644
--- a/pkgs/by-name/mo/moar/package.nix
+++ b/pkgs/by-name/mo/moar/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "walles";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-28rD8NYuvfNoBtegGXBuoa5qb3f1eYilkmE4ykIeHTU=";
   };
 
diff --git a/pkgs/by-name/mo/mob/package.nix b/pkgs/by-name/mo/mob/package.nix
index d6c9d92ddd6e..cef344cd13dd 100644
--- a/pkgs/by-name/mo/mob/package.nix
+++ b/pkgs/by-name/mo/mob/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "remotemobprogramming";
     repo = "mob";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OTKlasXswrZPfhdHD6tJt8z/e+BbgWa9LrKYhMbG/N4=";
   };
 
diff --git a/pkgs/by-name/mo/mockgen/package.nix b/pkgs/by-name/mo/mockgen/package.nix
index 29fda7ef568e..403f29e54f9c 100644
--- a/pkgs/by-name/mo/mockgen/package.nix
+++ b/pkgs/by-name/mo/mockgen/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "uber-go";
     repo = "mock";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1UlaM3IvKlplBW1pg5l+IXwirlierjDKqKsVwFt7EAw=";
   };
 
diff --git a/pkgs/by-name/mo/mod/package.nix b/pkgs/by-name/mo/mod/package.nix
index 20b65c64c0df..3e631c81e2b9 100644
--- a/pkgs/by-name/mo/mod/package.nix
+++ b/pkgs/by-name/mo/mod/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "marwan-at-work";
     repo = "mod";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-P0FE0Sl4IXH6DAETnlBwQ2CR0X0AP9Z0noW99By7mxU=";
   };
 
diff --git a/pkgs/by-name/mo/modern-cpp-kafka/package.nix b/pkgs/by-name/mo/modern-cpp-kafka/package.nix
index b2dd3d425962..6f1b37ed6452 100644
--- a/pkgs/by-name/mo/modern-cpp-kafka/package.nix
+++ b/pkgs/by-name/mo/modern-cpp-kafka/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "modern-cpp-kafka";
     owner = "morganstanley";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7hkwM1YbveQpDRqwMZ3MXM88LTwlAT7uB8NL0t409To=";
   };
 
diff --git a/pkgs/by-name/mo/modprobed-db/package.nix b/pkgs/by-name/mo/modprobed-db/package.nix
index 266b0cdc7078..12a799ff276b 100644
--- a/pkgs/by-name/mo/modprobed-db/package.nix
+++ b/pkgs/by-name/mo/modprobed-db/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = "modprobed-db";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rMkPBRg0QluMmSCAWSvET7rS/A2aUL6H31KKoZ6NTEs=";
   };
 
diff --git a/pkgs/by-name/mo/mods/package.nix b/pkgs/by-name/mo/mods/package.nix
index 7c9ed5415baa..cbc5d2e42032 100644
--- a/pkgs/by-name/mo/mods/package.nix
+++ b/pkgs/by-name/mo/mods/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "mods";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wzLYkcgUWPzghJEhYRh7HH19Rqov1RJAxdgp3AGnOTY=";
   };
 
diff --git a/pkgs/by-name/mo/modsecurity-crs/package.nix b/pkgs/by-name/mo/modsecurity-crs/package.nix
index a9f4db9b4771..f95bb592e459 100644
--- a/pkgs/by-name/mo/modsecurity-crs/package.nix
+++ b/pkgs/by-name/mo/modsecurity-crs/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "coreruleset";
     repo = "coreruleset";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WDJW4K85YdHrw9cys3LrnZUoTxc0WhiuCW6CiC1cAbk=";
   };
 
diff --git a/pkgs/by-name/mo/modsecurity_standalone/package.nix b/pkgs/by-name/mo/modsecurity_standalone/package.nix
index c92467d31a31..ffcefb8beb7b 100644
--- a/pkgs/by-name/mo/modsecurity_standalone/package.nix
+++ b/pkgs/by-name/mo/modsecurity_standalone/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "owasp-modsecurity";
     repo = "modsecurity";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hJ8wYeC83dl85bkUXGZKHpHzw9QRgtusj1/+Coxsx0k=";
   };
 
diff --git a/pkgs/by-name/mo/mojave-gtk-theme/package.nix b/pkgs/by-name/mo/mojave-gtk-theme/package.nix
index 0f9d246b8a84..8cf39693599f 100644
--- a/pkgs/by-name/mo/mojave-gtk-theme/package.nix
+++ b/pkgs/by-name/mo/mojave-gtk-theme/package.nix
@@ -28,7 +28,7 @@ let
   main_src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-uL4lO6aWiDfOQkhpTnr/iVx1fI7n/fx7WYr5jDWPfYM=";
   };
 
diff --git a/pkgs/by-name/mo/mokutil/package.nix b/pkgs/by-name/mo/mokutil/package.nix
index e6012443e00c..3d4c8d3bd066 100644
--- a/pkgs/by-name/mo/mokutil/package.nix
+++ b/pkgs/by-name/mo/mokutil/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lcp";
     repo = "mokutil";
-    tag = version;
+    rev = version;
     sha256 = "sha256-DO3S1O0AKoI8gssnUyBTRj5lDNs6hhisc/5dTIqmbzM=";
   };
 
diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix
index c9fdae4cc44a..125753726091 100644
--- a/pkgs/by-name/mo/mold/package.nix
+++ b/pkgs/by-name/mo/mold/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rui314";
     repo = "mold";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZGO3oT8NOOkAYTyoMUKxH3TFP4mw2z0BGdGSF2TbKaE=";
   };
 
diff --git a/pkgs/by-name/mo/mole/package.nix b/pkgs/by-name/mo/mole/package.nix
index 335a11d377d9..0665e0951c1b 100644
--- a/pkgs/by-name/mo/mole/package.nix
+++ b/pkgs/by-name/mo/mole/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "davrodpin";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JwLiuw00g2h5uqNmaqAbal0KCY6LwF2fcL2MrB1HBIc=";
   };
 
diff --git a/pkgs/by-name/mo/molot-lite/package.nix b/pkgs/by-name/mo/molot-lite/package.nix
index 6da1350183b7..5c6e4d94592e 100644
--- a/pkgs/by-name/mo/molot-lite/package.nix
+++ b/pkgs/by-name/mo/molot-lite/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "magnetophon";
     repo = "molot-lite";
-    tag = version;
+    rev = version;
     sha256 = "sha256-0tmobsdCNon6udbkbQw7+EYQKBg2oaXlHIgNEf9U3XE=";
   };
 
diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix
index 61bb9e4b3ad0..133b80438ca6 100644
--- a/pkgs/by-name/mo/mommy/package.nix
+++ b/pkgs/by-name/mo/mommy/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FWDekker";
     repo = "mommy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZxGHoBRWeGdUelykDdR51HigB85IrvNyswWjCTaOLvg=";
   };
 
diff --git a/pkgs/by-name/mo/mongoaudit/package.nix b/pkgs/by-name/mo/mongoaudit/package.nix
index c7779de52890..931e6f5d1ea7 100644
--- a/pkgs/by-name/mo/mongoaudit/package.nix
+++ b/pkgs/by-name/mo/mongoaudit/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "stampery";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "17k4vw5d3kr961axl49ywid4cf3n7zxvm885c4lv15w7s2al1425";
   };
 
diff --git a/pkgs/by-name/mo/mongodb-tools/package.nix b/pkgs/by-name/mo/mongodb-tools/package.nix
index 24a653529399..f45fbaf55695 100644
--- a/pkgs/by-name/mo/mongodb-tools/package.nix
+++ b/pkgs/by-name/mo/mongodb-tools/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-tools";
-    tag = version;
+    rev = version;
     sha256 = "sha256-9DUfPD6wrv65PLVtxAF21BZ/joWFVFk+cItt9m/1Nx8=";
   };
 
diff --git a/pkgs/by-name/mo/monitoring-plugins/package.nix b/pkgs/by-name/mo/monitoring-plugins/package.nix
index 5251f7811247..95abd51614f7 100644
--- a/pkgs/by-name/mo/monitoring-plugins/package.nix
+++ b/pkgs/by-name/mo/monitoring-plugins/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "monitoring-plugins";
     repo = "monitoring-plugins";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T37t0shhC+8k7CN/hIOxsskuuCi0LwQui8xyRTC+pjQ=";
   };
 
diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix
index 9835b2749603..2b13dd852402 100644
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "zehkira";
     repo = "monophony";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fC+XXOGBpG5pIQW1tCNtQaptBCyLM+YGgsZLjWrMoDA=";
   };
 
diff --git a/pkgs/by-name/mo/moonlight-embedded/package.nix b/pkgs/by-name/mo/moonlight-embedded/package.nix
index c794648d137e..208338644096 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Jc706BjIT3rS9zwntNOdgszP4CHuX+qxvPvWeU68Amg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix
index 128b11637c4d..37dc19b74b25 100644
--- a/pkgs/by-name/mo/moosefs/package.nix
+++ b/pkgs/by-name/mo/moosefs/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moosefs";
     repo = "moosefs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vCwRM6UIcT71e6u5QZzcTW6LK/VNlVG/19XxsHnn2a8=";
   };
 
diff --git a/pkgs/by-name/mo/mop/package.nix b/pkgs/by-name/mo/mop/package.nix
index 512eb88d3811..245abeac0f5d 100644
--- a/pkgs/by-name/mo/mop/package.nix
+++ b/pkgs/by-name/mo/mop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mop-tracker";
     repo = "mop";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oe8RG8E7xcp3ZqdDXYvpOVF3AfeSBFMherHD1YYFE/M=";
   };
 
diff --git a/pkgs/by-name/mo/mopac/package.nix b/pkgs/by-name/mo/mopac/package.nix
index 7f2f3f10fbad..0de32cae6421 100644
--- a/pkgs/by-name/mo/mopac/package.nix
+++ b/pkgs/by-name/mo/mopac/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openmopac";
     repo = "mopac";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-guMPXz7nQWxnmY4f+CGIAf3MBiV00GxSEdsZQ2fAjh4=";
   };
 
diff --git a/pkgs/by-name/mo/moproxy/package.nix b/pkgs/by-name/mo/moproxy/package.nix
index 9c3dad25aa6c..32a35d159f7d 100644
--- a/pkgs/by-name/mo/moproxy/package.nix
+++ b/pkgs/by-name/mo/moproxy/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sorz";
     repo = "moproxy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Rqno+cg44IWBJbKWUP6BnxzwCjuNhFo9nBF6u2jlyA4=";
   };
 
diff --git a/pkgs/by-name/mo/moq/package.nix b/pkgs/by-name/mo/moq/package.nix
index b06f12372e50..dcd5dfcd5266 100644
--- a/pkgs/by-name/mo/moq/package.nix
+++ b/pkgs/by-name/mo/moq/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "matryer";
     repo = "moq";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Yk0lGu6wHF5OBFx/yZPJr3h3DVMvyBV8pi5eSxl7hpw=";
   };
 
diff --git a/pkgs/by-name/mo/morph/package.nix b/pkgs/by-name/mo/morph/package.nix
index 998af1afcea2..4e3d9b410c73 100644
--- a/pkgs/by-name/mo/morph/package.nix
+++ b/pkgs/by-name/mo/morph/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dbcdk";
     repo = "morph";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IqWtVklzSq334cGgLx/13l329g391oDW50MZWyO6l08=";
   };
 
diff --git a/pkgs/by-name/mo/morsel/package.nix b/pkgs/by-name/mo/morsel/package.nix
index 533be1a972c9..b6dabc4b4029 100644
--- a/pkgs/by-name/mo/morsel/package.nix
+++ b/pkgs/by-name/mo/morsel/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SamLee514";
     repo = "morsel";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bb+88GIyd92kHJAs25mJ9vmq0Ha2q0fdHnpTXhX2BFE=";
   };
 
diff --git a/pkgs/by-name/mo/mosquitto/package.nix b/pkgs/by-name/mo/mosquitto/package.nix
index a09e37913ae4..4a1c2f6a3f17 100644
--- a/pkgs/by-name/mo/mosquitto/package.nix
+++ b/pkgs/by-name/mo/mosquitto/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "mosquitto";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-E47NqiaMk67pNgf151DMhQ4DMyLvfzrECEQtk3jASPU=";
   };
 
diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix
index 69e9c0cd1ea4..d39b685ac140 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/a9chdeijaGKJ3nDDYYZLdS9JrZiAjC8QFQ6bjdLWT8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mo/mousai/package.nix b/pkgs/by-name/mo/mousai/package.nix
index a5909a2b3079..3a45a524d8e9 100644
--- a/pkgs/by-name/mo/mousai/package.nix
+++ b/pkgs/by-name/mo/mousai/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SeaDve";
     repo = "Mousai";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lib2rPUTKudzbZQIGZxxxzvWNlbLkLdWtb9h7+C05QE=";
   };
 
diff --git a/pkgs/by-name/mo/mouse-actions/package.nix b/pkgs/by-name/mo/mouse-actions/package.nix
index bacca3545dd2..0af970b8bc82 100644
--- a/pkgs/by-name/mo/mouse-actions/package.nix
+++ b/pkgs/by-name/mo/mouse-actions/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jersou";
     repo = "mouse-actions";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg=";
   };
 
diff --git a/pkgs/by-name/mo/mozc/package.nix b/pkgs/by-name/mo/mozc/package.nix
index 25dfd42722e5..c3a13ad557a1 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";
-    tag = version;
+    rev = version;
     hash = "sha256-w0bjoMmq8gL7DSehEG7cKqp5e4kNOXnCYLW31Zl9FRs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mo/mozjpeg/package.nix b/pkgs/by-name/mo/mozjpeg/package.nix
index 40f87ecaa510..8a73827a2953 100644
--- a/pkgs/by-name/mo/mozjpeg/package.nix
+++ b/pkgs/by-name/mo/mozjpeg/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "mozjpeg";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-k8qWtU4j3ipIHvY60ae7kdNnPvWnUa0qgacqlSIJijo=";
   };
 
diff --git a/pkgs/by-name/mp/mp3blaster/package.nix b/pkgs/by-name/mp/mp3blaster/package.nix
index 3b0fda311c0d..0809970ade88 100644
--- a/pkgs/by-name/mp/mp3blaster/package.nix
+++ b/pkgs/by-name/mp/mp3blaster/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stragulus";
     repo = "mp3blaster";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs";
   };
 
diff --git a/pkgs/by-name/mp/mp3cat/package.nix b/pkgs/by-name/mp/mp3cat/package.nix
index 4f579d29be05..3ea25a67912e 100644
--- a/pkgs/by-name/mp/mp3cat/package.nix
+++ b/pkgs/by-name/mp/mp3cat/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tomclegg";
     repo = "mp3cat";
-    tag = version;
+    rev = version;
     sha256 = "0n6hjg2wgd06m561zc3ib5w2m3pwpf74njv2b2w4sqqh5md2ymfr";
   };
 
diff --git a/pkgs/by-name/mp/mp3fs/package.nix b/pkgs/by-name/mp/mp3fs/package.nix
index ee8a4ab770b1..0e9ee3fd0bac 100644
--- a/pkgs/by-name/mp/mp3fs/package.nix
+++ b/pkgs/by-name/mp/mp3fs/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "khenriks";
     repo = "mp3fs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dF+DfkNKvYOucS6KjYR1MMGxayM+1HVS8mbmaavmgKM=";
   };
 
diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix
index fc8bb5c25994..589e27d4f32b 100644
--- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix
+++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = "mpd-discord-rpc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RuXH0RaR0VVN7tja0pcc8QH826/JzH4tyVVCbrK7ldI=";
   };
 
diff --git a/pkgs/by-name/mp/mpd-mpris/package.nix b/pkgs/by-name/mp/mpd-mpris/package.nix
index e6e21231f2b1..8d7096eed503 100644
--- a/pkgs/by-name/mp/mpd-mpris/package.nix
+++ b/pkgs/by-name/mp/mpd-mpris/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "natsukagami";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QxPkGWpCWiyEbChH9SHeD+SiV8k0c/G7MG/azksP3xU=";
   };
 
diff --git a/pkgs/by-name/mp/mpd-notification/package.nix b/pkgs/by-name/mp/mpd-notification/package.nix
index 8ccf733013e2..f488d46f4e5b 100644
--- a/pkgs/by-name/mp/mpd-notification/package.nix
+++ b/pkgs/by-name/mp/mpd-notification/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eworm-de";
     repo = "mpd-notification";
-    tag = version;
+    rev = version;
     hash = "sha256-8iBG1IdbERB2gOALvVBNJ3/hhiou3D/azSRkRD+u9O8=";
   };
 
diff --git a/pkgs/by-name/mp/mpdas/package.nix b/pkgs/by-name/mp/mpdas/package.nix
index 36539464f4f2..c1e9c88bdb5d 100644
--- a/pkgs/by-name/mp/mpdas/package.nix
+++ b/pkgs/by-name/mp/mpdas/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hrkfdn";
     repo = "mpdas";
-    tag = version;
+    rev = version;
     sha256 = "0fcqc4w6iwbi1n3cllcgj0k61zffhqkbr8668myxap21m35x8y1r";
   };
 
diff --git a/pkgs/by-name/mp/mpdris2/package.nix b/pkgs/by-name/mp/mpdris2/package.nix
index a03df316446d..c9f6578efbca 100644
--- a/pkgs/by-name/mp/mpdris2/package.nix
+++ b/pkgs/by-name/mp/mpdris2/package.nix
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "eonpatapon";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-1Y6K3z8afUXeKhZzeiaEF3yqU0Ef7qdAj9vAkRlD2p8=";
   };
 
diff --git a/pkgs/by-name/mp/mpifileutils/package.nix b/pkgs/by-name/mp/mpifileutils/package.nix
index 9698d705891c..6011e6d26d3b 100644
--- a/pkgs/by-name/mp/mpifileutils/package.nix
+++ b/pkgs/by-name/mp/mpifileutils/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hpc";
     repo = "mpifileutils";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WnjStOLWP/VsZyl2wPqR1Q+YqlJQRCQ4R50uOyqkWuM=";
   };
 
diff --git a/pkgs/by-name/mp/mpris-notifier/package.nix b/pkgs/by-name/mp/mpris-notifier/package.nix
index 2d799895b608..6e52b2ecaa37 100644
--- a/pkgs/by-name/mp/mpris-notifier/package.nix
+++ b/pkgs/by-name/mp/mpris-notifier/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "l1na-forever";
     repo = "mpris-notifier";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SD37JFbfg05GemtRNQKvXkXPAyszItSW9wClzudrTS8=";
   };
 
diff --git a/pkgs/by-name/mp/mpris-scrobbler/package.nix b/pkgs/by-name/mp/mpris-scrobbler/package.nix
index ebc8c78fb984..766c27d2d940 100644
--- a/pkgs/by-name/mp/mpris-scrobbler/package.nix
+++ b/pkgs/by-name/mp/mpris-scrobbler/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mariusor";
     repo = "mpris-scrobbler";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qjd/8Ro4wERvp8RDxyZiqWqVKwA0CX1LaoZAquw9asA=";
   };
 
diff --git a/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix b/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
index bc833bab82b1..1c46eae6d6e0 100644
--- a/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
+++ b/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iwalton3";
     repo = "default-shader-pack";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BM2GvmUoWQUUMH464YIIqu5A1t1B+otbJxAGFbySuq8=";
   };
 
diff --git a/pkgs/by-name/mp/mpv-subs-popout/package.nix b/pkgs/by-name/mp/mpv-subs-popout/package.nix
index 2805d69844cc..9f1d5d11fdea 100644
--- a/pkgs/by-name/mp/mpv-subs-popout/package.nix
+++ b/pkgs/by-name/mp/mpv-subs-popout/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sdaqo";
     repo = "mpv-subs-popout";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Z8IWiYKitkbEFdjca5G6P0I6j4Fg2fIHco6fD90UoBw=";
   };
 
diff --git a/pkgs/by-name/mp/mpvpaper/package.nix b/pkgs/by-name/mp/mpvpaper/package.nix
index d13bc2652590..91d6d33634bd 100644
--- a/pkgs/by-name/mp/mpvpaper/package.nix
+++ b/pkgs/by-name/mp/mpvpaper/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GhostNaN";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-uBitJM2Z5RFH4nfgdJ6ZbqkcMumu+K+3f6S49G7nEx8=";
   };
 
diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix
index 2ac675d81868..0d8e05f9b4b0 100644
--- a/pkgs/by-name/mq/mqtt-explorer/package.nix
+++ b/pkgs/by-name/mq/mqtt-explorer/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thomasnordquist";
     repo = "MQTT-Explorer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oFS4RnuWQoicPemZbPBAp8yQjRbhAyo/jiaw8V0MBAo=";
   };
 
diff --git a/pkgs/by-name/mr/mrbayes/package.nix b/pkgs/by-name/mr/mrbayes/package.nix
index 7a24a4d7d980..b8c899d0bd3e 100644
--- a/pkgs/by-name/mr/mrbayes/package.nix
+++ b/pkgs/by-name/mr/mrbayes/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NBISweden";
     repo = "MrBayes";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pkkxZ6YHRn/I1SJpT9A+EK4S5hWGmFdcDBJS0zh5mLA=";
   };
 
diff --git a/pkgs/by-name/mr/mruby/package.nix b/pkgs/by-name/mr/mruby/package.nix
index d73f3dd69bdc..c0d78848697a 100644
--- a/pkgs/by-name/mr/mruby/package.nix
+++ b/pkgs/by-name/mr/mruby/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mruby";
     repo = "mruby";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-rCoEC1ioX6bOocPoPi+Lsn4PM8gY0DjKja1/MJvJ1n8=";
   };
 
diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
index f9171466ba2d..a73e70468cd7 100644
--- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
+++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
@@ -19,7 +19,7 @@ buildDotnetModule (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "KirillOsenkov";
     repo = "MSBuildStructuredLog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-09+Jo5nSNOFX7jTzMhetHHjTJdxlEZH4JWzv84stUDE=";
   };
 
diff --git a/pkgs/by-name/ms/mscompress/package.nix b/pkgs/by-name/ms/mscompress/package.nix
index a4ef1e44dc61..c6974027cafb 100644
--- a/pkgs/by-name/ms/mscompress/package.nix
+++ b/pkgs/by-name/ms/mscompress/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "stapelberg";
     repo = "mscompress";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Urq8CzVfO9tdEUrEya+bUzoNjZQ2TO7OB+h2MTAGwEI=";
   };
 
diff --git a/pkgs/by-name/ms/msfpc/package.nix b/pkgs/by-name/ms/msfpc/package.nix
index 4995b92805fe..5f4b614ba4c0 100644
--- a/pkgs/by-name/ms/msfpc/package.nix
+++ b/pkgs/by-name/ms/msfpc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "g0tmi1k";
     repo = "msfpc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "UIdE0oSaNu16pf+M96x8AnNju88hdzokv86wm8uBYDQ=";
   };
 
diff --git a/pkgs/by-name/ms/msgpack-tools/package.nix b/pkgs/by-name/ms/msgpack-tools/package.nix
index 943503f2d374..e62af58ae1c1 100644
--- a/pkgs/by-name/ms/msgpack-tools/package.nix
+++ b/pkgs/by-name/ms/msgpack-tools/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ludocode";
     repo = "msgpack-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5";
   };
 
diff --git a/pkgs/by-name/ms/msgpuck/package.nix b/pkgs/by-name/ms/msgpuck/package.nix
index dc9f466818e9..41fdca7052de 100644
--- a/pkgs/by-name/ms/msgpuck/package.nix
+++ b/pkgs/by-name/ms/msgpuck/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rtsisyk";
     repo = "msgpuck";
-    tag = version;
+    rev = version;
     sha256 = "0cjq86kncn3lv65vig9cqkqqv2p296ymcjjbviw0j1s85cfflps0";
   };
 
diff --git a/pkgs/by-name/ms/mstore/package.nix b/pkgs/by-name/ms/mstore/package.nix
index 8157ebcfe458..725a0a5d3cac 100644
--- a/pkgs/by-name/ms/mstore/package.nix
+++ b/pkgs/by-name/ms/mstore/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grimme-lab";
     repo = "mstore";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zfrxdrZ1Um52qTRNGJoqZNQuHhK3xM/mKfk0aBLrcjw=";
   };
 
diff --git a/pkgs/by-name/ms/mstpd/package.nix b/pkgs/by-name/ms/mstpd/package.nix
index 63cd911d7c0d..1dd6c8600653 100644
--- a/pkgs/by-name/ms/mstpd/package.nix
+++ b/pkgs/by-name/ms/mstpd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mstpd";
     repo = "mstpd";
-    tag = version;
+    rev = version;
     sha256 = "1xkfydxljdnj49p5r3mirk4k146428b6imfc9bkfps9yjn64mkgb";
   };
 
diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix
index bbd75f9c3dc9..70077d7783c9 100644
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jaqx0r";
     repo = "mtail";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B/to05/qORplhNyz0s7t/WgpmOJ6UZoKnmJfqaf6Htc=";
   };
 
diff --git a/pkgs/by-name/mt/mtm/package.nix b/pkgs/by-name/mt/mtm/package.nix
index 36b1337463ab..52ccbde12e84 100644
--- a/pkgs/by-name/mt/mtm/package.nix
+++ b/pkgs/by-name/mt/mtm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "deadpixi";
     repo = "mtm";
-    tag = version;
+    rev = version;
     sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv";
   };
 
diff --git a/pkgs/by-name/mt/mtr-exporter/package.nix b/pkgs/by-name/mt/mtr-exporter/package.nix
index 1a63d0c0e43f..3bc1d67f2f5a 100644
--- a/pkgs/by-name/mt/mtr-exporter/package.nix
+++ b/pkgs/by-name/mt/mtr-exporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mgumz";
     repo = "mtr-exporter";
-    tag = version;
+    rev = version;
     hash = "sha256-+myQg27TGclU+SfU8oO+DvXYqc/8sWE2zRK6fL2DhwM=";
   };
 
diff --git a/pkgs/by-name/mt/mtxclient/package.nix b/pkgs/by-name/mt/mtxclient/package.nix
index e4bb29372084..2d47a07b2645 100644
--- a/pkgs/by-name/mt/mtxclient/package.nix
+++ b/pkgs/by-name/mt/mtxclient/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nheko-Reborn";
     repo = "mtxclient";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-luWcbYCv5OM3aidxiO7glqD+VYnCZMElZYaPKbtvMYI=";
   };
 
diff --git a/pkgs/by-name/mu/mu/package.nix b/pkgs/by-name/mu/mu/package.nix
index 7c2f484947a8..7a3f2266d5ac 100644
--- a/pkgs/by-name/mu/mu/package.nix
+++ b/pkgs/by-name/mu/mu/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "djcb";
     repo = "mu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o6K1xHv6dvzv1oRRiAiSXAqTaC0GcPDQ+ymh5kmH98k=";
   };
 
diff --git a/pkgs/by-name/mu/mucommander/package.nix b/pkgs/by-name/mu/mucommander/package.nix
index 6797ac71ddaa..5116b5e27641 100644
--- a/pkgs/by-name/mu/mucommander/package.nix
+++ b/pkgs/by-name/mu/mucommander/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mucommander";
     repo = "mucommander";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-J1paBXlAGe2eKMg4wvaXTzMIiSMFIJ1XIAaKrfOwQLc=";
   };
 
diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix
index 379f7099fd51..ad69ddb22310 100644
--- a/pkgs/by-name/mu/muffet/package.nix
+++ b/pkgs/by-name/mu/muffet/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "raviqqe";
     repo = "muffet";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vpckg0zx8RNR7dAKjdlSHyevn7kDslrysah8jCLSaBw=";
   };
 
diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix
index 48471be7e47e..e781647b9ad7 100644
--- a/pkgs/by-name/mu/muffin/package.nix
+++ b/pkgs/by-name/mu/muffin/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-cGC1yGft3uEqefm2DvZrMaROoZKYd6LNY0IJ+58f6vs=";
   };
 
diff --git a/pkgs/by-name/mu/multicharge/package.nix b/pkgs/by-name/mu/multicharge/package.nix
index c26b038e51d2..bd06e5bdc605 100644
--- a/pkgs/by-name/mu/multicharge/package.nix
+++ b/pkgs/by-name/mu/multicharge/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grimme-lab";
     repo = "multicharge";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8qwM3dpvFoL2WrMWNf14zYtRap0ijdfZ95XaTlkHhqQ=";
   };
 
diff --git a/pkgs/by-name/mu/multilockscreen/package.nix b/pkgs/by-name/mu/multilockscreen/package.nix
index b7f58ab09791..ba3f74931018 100644
--- a/pkgs/by-name/mu/multilockscreen/package.nix
+++ b/pkgs/by-name/mu/multilockscreen/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeffmhubbard";
     repo = "multilockscreen";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1bfpbazvhaz9x356nsghz0czysh9b75g79cd9s35v0x0rrzdr9qj";
   };
 
diff --git a/pkgs/by-name/mu/multimarkdown/package.nix b/pkgs/by-name/mu/multimarkdown/package.nix
index 31a2cdbce21b..20b53464d92c 100644
--- a/pkgs/by-name/mu/multimarkdown/package.nix
+++ b/pkgs/by-name/mu/multimarkdown/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fletcher";
     repo = "MultiMarkdown-6";
-    tag = version;
+    rev = version;
     hash = "sha256-emJbY0wucoc/GdjlILoeqjwuwuPpTjXTqZN0gUKOyLg=";
   };
 
diff --git a/pkgs/by-name/mu/multimon-ng/package.nix b/pkgs/by-name/mu/multimon-ng/package.nix
index fee8e00734da..9f8dcc8dfb65 100644
--- a/pkgs/by-name/mu/multimon-ng/package.nix
+++ b/pkgs/by-name/mu/multimon-ng/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EliasOenal";
     repo = "multimon-ng";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/2NHUlAojDamNq/EVs8hoBYVikPLAFFFu/2syG4Xo4U=";
   };
 
diff --git a/pkgs/by-name/mu/multiplex/package.nix b/pkgs/by-name/mu/multiplex/package.nix
index e0f2154f460b..391f6396a6fb 100644
--- a/pkgs/by-name/mu/multiplex/package.nix
+++ b/pkgs/by-name/mu/multiplex/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pojntfx";
     repo = "multiplex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+KvFBzoIYmSbuazstJae8lC0xdPtXLhFWawlc+iGGoU=";
   };
 
diff --git a/pkgs/by-name/mu/multirun/package.nix b/pkgs/by-name/mu/multirun/package.nix
index 42b768212890..1ecc3c8f9e9e 100644
--- a/pkgs/by-name/mu/multirun/package.nix
+++ b/pkgs/by-name/mu/multirun/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nicolas-van";
     repo = "multirun";
-    tag = version;
+    rev = version;
     hash = "sha256-I95nxZD65tHiok4MzsGG7gyaxPHbqQLuRWdHUPNhLu8=";
   };
 
diff --git a/pkgs/by-name/mu/multitail/package.nix b/pkgs/by-name/mu/multitail/package.nix
index f678e1d0dd31..6338b0c7be54 100644
--- a/pkgs/by-name/mu/multitail/package.nix
+++ b/pkgs/by-name/mu/multitail/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "folkertvanheusden";
     repo = "multitail";
-    tag = version;
+    rev = version;
     hash = "sha256-c9NlQLgHngNBbADZ6/legWFaKHJAQR/LZIfh8bJoc4Y=";
   };
 
diff --git a/pkgs/by-name/mu/multus-cni/package.nix b/pkgs/by-name/mu/multus-cni/package.nix
index 40fea0e585ab..6db149fca3f7 100644
--- a/pkgs/by-name/mu/multus-cni/package.nix
+++ b/pkgs/by-name/mu/multus-cni/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "k8snetworkplumbingwg";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Q6ACXOv1E3Ouki4ksdlUZFbWcDgo9xbCiTfEiVG5l18=";
   };
 
diff --git a/pkgs/by-name/mu/munin/package.nix b/pkgs/by-name/mu/munin/package.nix
index 25d7f668eb9b..637d95af89f7 100644
--- a/pkgs/by-name/mu/munin/package.nix
+++ b/pkgs/by-name/mu/munin/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "munin-monitoring";
     repo = "munin";
-    tag = version;
+    rev = version;
     sha256 = "sha256-9PfIzUObm3Nu2k2TFjbQ3cqIDkPz07ZUczEcfm3bpDc=";
   };
 
diff --git a/pkgs/by-name/mu/muparser/package.nix b/pkgs/by-name/mu/muparser/package.nix
index b74cd15726a9..1d2ff0b6f8b4 100644
--- a/pkgs/by-name/mu/muparser/package.nix
+++ b/pkgs/by-name/mu/muparser/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "beltoforion";
     repo = "muparser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CE3xgJr2RNsNMrj8Cf6xd/pD9M1OlHEclTW6xZV5X30=";
   };
 
diff --git a/pkgs/by-name/mu/muparserx/package.nix b/pkgs/by-name/mu/muparserx/package.nix
index d69d5c5ec8b9..4c1071eb2c68 100644
--- a/pkgs/by-name/mu/muparserx/package.nix
+++ b/pkgs/by-name/mu/muparserx/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "beltoforion";
     repo = "muparserx";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rekPXmncNdVX6LvPQP1M2Pzs3pyiCCcLPLnPFiyWJ4s=";
   };
 
diff --git a/pkgs/by-name/mu/murex/package.nix b/pkgs/by-name/mu/murex/package.nix
index 3750096d9a55..9dc5478f7504 100644
--- a/pkgs/by-name/mu/murex/package.nix
+++ b/pkgs/by-name/mu/murex/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lmorg";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-czo2JCUwzENPuBBTaO4RYo7WRvepacaKElAj9DznFY0=";
   };
 
diff --git a/pkgs/by-name/mu/muscle/package.nix b/pkgs/by-name/mu/muscle/package.nix
index b32818314ab2..ef63da97cf76 100644
--- a/pkgs/by-name/mu/muscle/package.nix
+++ b/pkgs/by-name/mu/muscle/package.nix
@@ -11,7 +11,7 @@ gccStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rcedgar";
     repo = "muscle";
-    tag = version;
+    rev = version;
     hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk=";
   };
 
diff --git a/pkgs/by-name/mu/musikcube/package.nix b/pkgs/by-name/mu/musikcube/package.nix
index d984ea7695fa..8c59e9833985 100644
--- a/pkgs/by-name/mu/musikcube/package.nix
+++ b/pkgs/by-name/mu/musikcube/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "clangen";
     repo = "musikcube";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha512-ibpSrzbn2yGNgWnjAh4sG9ZRFImxjE2sq6tu9k0w1QAAr/OWSTwtaIuK71ClT6yt4HKyRk1KSaXa+/IzOHI6Kg==";
   };
 
diff --git a/pkgs/by-name/mu/musl-fts/package.nix b/pkgs/by-name/mu/musl-fts/package.nix
index fb0ac7b2569d..2e27e29a6af5 100644
--- a/pkgs/by-name/mu/musl-fts/package.nix
+++ b/pkgs/by-name/mu/musl-fts/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "musl-fts";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "Azw5qrz6OKDcpYydE6jXzVxSM5A8oYWAztrHr+O/DOE=";
   };
 
diff --git a/pkgs/by-name/mu/musl-obstack/package.nix b/pkgs/by-name/mu/musl-obstack/package.nix
index 08bd66ce5ada..edac988c36db 100644
--- a/pkgs/by-name/mu/musl-obstack/package.nix
+++ b/pkgs/by-name/mu/musl-obstack/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "musl-obstack";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oydS7FubUniMHAUWfg84OH9+CZ0JCrTXy7jzwOyJzC8=";
   };
 
diff --git a/pkgs/by-name/mu/mustache-go/package.nix b/pkgs/by-name/mu/mustache-go/package.nix
index 7e0f27be2769..573974effa3f 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-A7LIkidhpFmhIjiDu9KdmSIdqFNsV3N8J2QEo7yT+DE=";
   };
diff --git a/pkgs/by-name/mu/mustache-hpp/package.nix b/pkgs/by-name/mu/mustache-hpp/package.nix
index 02203212d480..69e533a2c7d9 100644
--- a/pkgs/by-name/mu/mustache-hpp/package.nix
+++ b/pkgs/by-name/mu/mustache-hpp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kainjow";
     repo = "Mustache";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb";
   };
 
diff --git a/pkgs/by-name/mu/mustache-spec/package.nix b/pkgs/by-name/mu/mustache-spec/package.nix
index 2267f1168b9c..ab83abc0e2ff 100644
--- a/pkgs/by-name/mu/mustache-spec/package.nix
+++ b/pkgs/by-name/mu/mustache-spec/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mustache";
     repo = "mustache";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "03xrfyjzm5ss6zkdlpl9ypwzcglspcdcnr3f94vj1rjfqm2rxcjw";
   };
 
diff --git a/pkgs/by-name/mu/mutagen-compose/package.nix b/pkgs/by-name/mu/mutagen-compose/package.nix
index d33d933ac40e..5d412f3d3c09 100644
--- a/pkgs/by-name/mu/mutagen-compose/package.nix
+++ b/pkgs/by-name/mu/mutagen-compose/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mutagen-io";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MK/icz/d7wymUm0m3aq4bBR1ZmxFngPVp+iPC9ufluU=";
   };
 
diff --git a/pkgs/by-name/mu/mutagen/package.nix b/pkgs/by-name/mu/mutagen/package.nix
index 5ebe6b02c64c..93d581bdf0f8 100644
--- a/pkgs/by-name/mu/mutagen/package.nix
+++ b/pkgs/by-name/mu/mutagen/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mutagen-io";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/UigWQMk+VDMGna/ixctU8MR7VNPpOTOGNUtuYx8DS0=";
   };
 
diff --git a/pkgs/by-name/mu/mutt-wizard/package.nix b/pkgs/by-name/mu/mutt-wizard/package.nix
index a62e5d8b02ae..cf655f0dd1d0 100644
--- a/pkgs/by-name/mu/mutt-wizard/package.nix
+++ b/pkgs/by-name/mu/mutt-wizard/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LukeSmithxyz";
     repo = "mutt-wizard";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1/+awwoAqD8Xm3hULcbpeTaLOHVuYRA4PPr3cq5Gy20=";
   };
 
diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix
index 2e5b314416f6..7e347bafcab7 100644
--- a/pkgs/by-name/mv/mvnd/package.nix
+++ b/pkgs/by-name/mv/mvnd/package.nix
@@ -28,7 +28,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "maven-mvnd";
-    tag = version;
+    rev = version;
     sha256 = "sha256-c1jD7m4cOdPWQEoaUMcNap2zvvX7H9VaWQv8JSgAnRU=";
   };
 
diff --git a/pkgs/by-name/mx/mxt-app/package.nix b/pkgs/by-name/mx/mxt-app/package.nix
index 144214a2e925..2ad09e7bd659 100644
--- a/pkgs/by-name/mx/mxt-app/package.nix
+++ b/pkgs/by-name/mx/mxt-app/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "atmel-maxtouch";
     repo = "mxt-app";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mcFkXUC7Qtajg5IPy5PAqlyvY44HDM8JL+pkkBYC0JA=";
   };
 
diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix
index 913219c77926..f947e2c1f7ad 100644
--- a/pkgs/by-name/my/mycelium/package.nix
+++ b/pkgs/by-name/my/mycelium/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "threefoldtech";
     repo = "mycelium";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PbEoM+AnZTuo9xtwcDcTH9FZAzPzfBhX41+zVVTdgRo=";
   };
 
diff --git a/pkgs/by-name/my/mycorrhiza/package.nix b/pkgs/by-name/my/mycorrhiza/package.nix
index 43e861e26ba2..9ffd22c450e6 100644
--- a/pkgs/by-name/my/mycorrhiza/package.nix
+++ b/pkgs/by-name/my/mycorrhiza/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bouncepaw";
     repo = "mycorrhiza";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Cgf2YtAatfKWxhe4xAqNRB4ktsGs3ONi5XqbjcZwzTw=";
   };
 
diff --git a/pkgs/by-name/my/mysqltuner/package.nix b/pkgs/by-name/my/mysqltuner/package.nix
index e8caa9f1fb8a..0b67c9066dff 100644
--- a/pkgs/by-name/my/mysqltuner/package.nix
+++ b/pkgs/by-name/my/mysqltuner/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "major";
     repo = "MySQLTuner-perl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JIO/auY8E6at9OCIqgKbBz9OhOeZMtQvUoUYPMEVtCg=";
   };
 
diff --git a/pkgs/by-name/my/myxer/package.nix b/pkgs/by-name/my/myxer/package.nix
index 80a87079446d..d1212b43900e 100644
--- a/pkgs/by-name/my/myxer/package.nix
+++ b/pkgs/by-name/my/myxer/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Aurailus";
     repo = "myxer";
-    tag = version;
+    rev = version;
     hash = "sha256-c5SHjnhWLp0jMdmDlupMTA0hWphub5DFY1vOI6NW8E0=";
   };
 
diff --git a/pkgs/by-name/n2/n2n/package.nix b/pkgs/by-name/n2/n2n/package.nix
index f538e7254a1f..55a7bda111b7 100644
--- a/pkgs/by-name/n2/n2n/package.nix
+++ b/pkgs/by-name/n2/n2n/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ntop";
     repo = "n2n";
-    tag = version;
+    rev = version;
     hash = "sha256-OXmcc6r+fTHs/tDNF3akSsynB/bVRKB6Fl5oYxmu+E0=";
   };
 
diff --git a/pkgs/by-name/na/naev/package.nix b/pkgs/by-name/na/naev/package.nix
index 3e1620c84e02..e94414ba8bc2 100644
--- a/pkgs/by-name/na/naev/package.nix
+++ b/pkgs/by-name/na/naev/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "naev";
     repo = "naev";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vdPkACgLGSTb9E/HZR5KoXn/fro0iHV7hX9kJim1j/M=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/na/nahid-fonts/package.nix b/pkgs/by-name/na/nahid-fonts/package.nix
index c7bfd8e710b3..b36b78d752e1 100644
--- a/pkgs/by-name/na/nahid-fonts/package.nix
+++ b/pkgs/by-name/na/nahid-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "nahid-font";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-r8/W0/pJV6OX954spIITvW7M6lIbZRpbsvEHErnXglg=";
   };
 
diff --git a/pkgs/by-name/na/nali/package.nix b/pkgs/by-name/na/nali/package.nix
index 7e46b0bfcae0..d21bb3d1a19c 100644
--- a/pkgs/by-name/na/nali/package.nix
+++ b/pkgs/by-name/na/nali/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zu1k";
     repo = "nali";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5AI8TAKYFqjgLVKob9imrf7yVmXmAPq/zHh1bDfC5r0=";
   };
 
diff --git a/pkgs/by-name/na/namaka/package.nix b/pkgs/by-name/na/namaka/package.nix
index 60dd64c83343..4fc7b64d756d 100644
--- a/pkgs/by-name/na/namaka/package.nix
+++ b/pkgs/by-name/na/namaka/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "namaka";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1ka+5B90UAt7D5kkT9dOExGLJjtLM8dqLeBdFRoeuWg=";
   };
 
diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index 05a04b8c8609..8b03013e862e 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ToAZacID91HxzsPRBKk+b8d9RHYmeDHjT0fQxOjXgRo=";
   };
 
diff --git a/pkgs/by-name/na/nanodbc/package.nix b/pkgs/by-name/na/nanodbc/package.nix
index 53989c7cc504..18691cb6fe35 100644
--- a/pkgs/by-name/na/nanodbc/package.nix
+++ b/pkgs/by-name/na/nanodbc/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nanodbc";
     repo = "nanodbc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dVUOwA7LfLqcQq2nc6OAha0krmgTy5RUHupBVrNdo4g=";
   };
 
diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix
index ee35276a1fbd..a67679dffd47 100644
--- a/pkgs/by-name/na/nanomq/package.nix
+++ b/pkgs/by-name/na/nanomq/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "emqx";
     repo = "nanomq";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-aB1gEzo2dX8NY+e0Dq4ELgkUpL/NtvvuY/l539BPIng=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/na/nanomsg/package.nix b/pkgs/by-name/na/nanomsg/package.nix
index 7e6c3ff724b9..f1487c0c0955 100644
--- a/pkgs/by-name/na/nanomsg/package.nix
+++ b/pkgs/by-name/na/nanomsg/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nanomsg";
     repo = "nanomsg";
-    tag = version;
+    rev = version;
     sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64";
   };
 
diff --git a/pkgs/by-name/na/nanovna-qt/package.nix b/pkgs/by-name/na/nanovna-qt/package.nix
index 7c59884c2da1..370e3d06fd5c 100644
--- a/pkgs/by-name/na/nanovna-qt/package.nix
+++ b/pkgs/by-name/na/nanovna-qt/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nanovna-v2";
     repo = "NanoVNA-QT";
-    tag = version;
+    rev = version;
     hash = "sha256-0nRpjLglCog9e4bSkaNSwjrwmLwut3Ykr3AaYZCaMEs=";
   };
 
diff --git a/pkgs/by-name/na/nap/package.nix b/pkgs/by-name/na/nap/package.nix
index 60ec0c194c0b..68d344d3a33f 100644
--- a/pkgs/by-name/na/nap/package.nix
+++ b/pkgs/by-name/na/nap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maaslalani";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0b3sz8zp1nwcjl02b3lli5yjc7vfay1ig6fs8bgxwz22imfx076p";
   };
 
diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix
index d9c11c14d213..591aafe787e6 100644
--- a/pkgs/by-name/na/naps2/package.nix
+++ b/pkgs/by-name/na/naps2/package.nix
@@ -18,7 +18,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "cyanfish";
     repo = "naps2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/qSfxGHcCSoNp516LFYWgEL4csf8EKgtSffBt1C02uE=";
   };
 
diff --git a/pkgs/by-name/na/nar-serve/package.nix b/pkgs/by-name/na/nar-serve/package.nix
index 007def13270b..84e91c2ae2bf 100644
--- a/pkgs/by-name/na/nar-serve/package.nix
+++ b/pkgs/by-name/na/nar-serve/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "nar-serve";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8QuMS00EutmqzAIPxyJEPxM8EHiWlSKs6E2Htoh3Kes=";
   };
 
diff --git a/pkgs/by-name/na/narrowlink/package.nix b/pkgs/by-name/na/narrowlink/package.nix
index e936f667a667..66168b2e7cd8 100644
--- a/pkgs/by-name/na/narrowlink/package.nix
+++ b/pkgs/by-name/na/narrowlink/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "narrowlink";
     repo = "narrowlink";
-    tag = version;
+    rev = version;
     hash = "sha256-O66eihqSxwvrUfJj+VMrs7Vfndz2LPKQEnH7BDljvUg=";
   };
 
diff --git a/pkgs/by-name/na/nasc/package.nix b/pkgs/by-name/na/nasc/package.nix
index b3c2bc742027..57afe669e12d 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 = pname;
-    tag = version;
+    rev = version;
     sha256 = "02b9a59a9fzsb6nn3ycwwbcbv04qfzm6x7csq2addpzx5wak6dd8";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/na/natls/package.nix b/pkgs/by-name/na/natls/package.nix
index 388f86d4a164..eb0165a542ee 100644
--- a/pkgs/by-name/na/natls/package.nix
+++ b/pkgs/by-name/na/natls/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "willdoescode";
     repo = "nat";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-4x92r6V9AvEO88gFofPTUt+mS7ZhmptDn/8O4pizSRg=";
   };
 
diff --git a/pkgs/by-name/na/nats-kafka/package.nix b/pkgs/by-name/na/nats-kafka/package.nix
index 00cc20b76e07..df63a9af602c 100644
--- a/pkgs/by-name/na/nats-kafka/package.nix
+++ b/pkgs/by-name/na/nats-kafka/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RboNlKpD+4mOx6iL6JpguR90y6Ux1x0twFcazIPj0w0=";
   };
 
diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix
index 4b6d49e64883..0531e6a0a795 100644
--- a/pkgs/by-name/na/nats-server/package.nix
+++ b/pkgs/by-name/na/nats-server/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9t5DOLZU2VcEBggirf+aLzwzsDBB+uGGXlBkIKP3HkE=";
   };
 
diff --git a/pkgs/by-name/na/nats-streaming-server/package.nix b/pkgs/by-name/na/nats-streaming-server/package.nix
index b6a9d873fee1..7431132ae47a 100644
--- a/pkgs/by-name/na/nats-streaming-server/package.nix
+++ b/pkgs/by-name/na/nats-streaming-server/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.25.6";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "nats-io";
     repo = pname;
     sha256 = "sha256-i5fNxeJQXiyy+9NOGT1X68u9Pztxvnnba64rxIgjbZc=";
diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix
index aae7ff554f39..bcba1d8a6ad0 100644
--- a/pkgs/by-name/na/navidrome/package.nix
+++ b/pkgs/by-name/na/navidrome/package.nix
@@ -23,7 +23,7 @@ buildGo123Module rec {
   src = fetchFromGitHub {
     owner = "navidrome";
     repo = "navidrome";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BkgHUX2kQ7OMnb9vOIwsQ9eNcqCzekz2IVMtG0IMUaA=";
   };
 
diff --git a/pkgs/by-name/na/navilu-font/package.nix b/pkgs/by-name/na/navilu-font/package.nix
index 331ffbc1f3be..4d9ba79067e9 100644
--- a/pkgs/by-name/na/navilu-font/package.nix
+++ b/pkgs/by-name/na/navilu-font/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aravindavk";
     repo = "Navilu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1vm6n04siaa0zf6jzp5s2gzgr2qxs3vdnmcmg4dcy07py2kd2fla";
   };
 
diff --git a/pkgs/by-name/na/nawk/package.nix b/pkgs/by-name/na/nawk/package.nix
index 85977177c01b..28a72480722f 100644
--- a/pkgs/by-name/na/nawk/package.nix
+++ b/pkgs/by-name/na/nawk/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "onetrueawk";
     repo = "awk";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-zRGMqMPkP801nZE/pG/NwsiOvv6dTQBcPtfTJCh1eiQ=";
   };
 
diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix
index 67bca0b17c63..6b5455b2e2ba 100644
--- a/pkgs/by-name/nb/nb/package.nix
+++ b/pkgs/by-name/nb/nb/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xwmx";
     repo = "nb";
-    tag = version;
+    rev = version;
     hash = "sha256-RX3DEjk+/tivTyv0+j3lZAKYgca4Zq9zQ+P1a/RXj2I=";
   };
 
diff --git a/pkgs/by-name/nb/nbfc-linux/package.nix b/pkgs/by-name/nb/nbfc-linux/package.nix
index ab78f5403726..2ae265b615db 100644
--- a/pkgs/by-name/nb/nbfc-linux/package.nix
+++ b/pkgs/by-name/nb/nbfc-linux/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nbfc-linux";
     repo = "nbfc-linux";
-    tag = finalAttrs.version;
+    rev = "${finalAttrs.version}";
     hash = "sha256-1tLW/xEh01y8BjVbgIa95DkYWf7CDVSo/lI/1U28Xs8=";
   };
 
diff --git a/pkgs/by-name/nb/nbstripout/package.nix b/pkgs/by-name/nb/nbstripout/package.nix
index ce3ff05efcd5..4978722e6382 100644
--- a/pkgs/by-name/nb/nbstripout/package.nix
+++ b/pkgs/by-name/nb/nbstripout/package.nix
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
   testAssets = fetchFromGitHub {
     owner = "kynan";
     repo = "nbstripout";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-OSJLrWkYQIhcdyofS3Bo39ppsU6K3A4546UKB8Q1GGg=";
   };
 
diff --git a/pkgs/by-name/nb/nbxplorer/package.nix b/pkgs/by-name/nb/nbxplorer/package.nix
index 72f41cdd5629..fc6ed897fdd1 100644
--- a/pkgs/by-name/nb/nbxplorer/package.nix
+++ b/pkgs/by-name/nb/nbxplorer/package.nix
@@ -12,7 +12,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "dgarage";
     repo = "NBXplorer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-T7pKIj7e4ZOX0JRawLc53eqjMrAV2CV8m6BRjukJ+t4=";
   };
 
diff --git a/pkgs/by-name/nc/ncdns/package.nix b/pkgs/by-name/nc/ncdns/package.nix
index 3e637fdb3f9f..a603b9674f02 100644
--- a/pkgs/by-name/nc/ncdns/package.nix
+++ b/pkgs/by-name/nc/ncdns/package.nix
@@ -21,7 +21,7 @@ let
     src = fetchFromGitHub {
       owner = "namecoin";
       repo = "x509-compressed";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-BmVtClZ3TsUbQrhwREXa42pUOlkBA4a2HVBzl1sdBIo=";
     };
 
diff --git a/pkgs/by-name/nc/ncgopher/package.nix b/pkgs/by-name/nc/ncgopher/package.nix
index cfdfb5e4b40d..50deded81024 100644
--- a/pkgs/by-name/nc/ncgopher/package.nix
+++ b/pkgs/by-name/nc/ncgopher/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jansc";
     repo = "ncgopher";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE=";
   };
 
diff --git a/pkgs/by-name/nc/ncnn/package.nix b/pkgs/by-name/nc/ncnn/package.nix
index b4f88b043f25..ed6f8616bafc 100644
--- a/pkgs/by-name/nc/ncnn/package.nix
+++ b/pkgs/by-name/nc/ncnn/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Tencent";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-XmIuXR/uxJbXaB0G+tS9I47Pke20qj8jI1vqnDDgrpE=";
   };
 
diff --git a/pkgs/by-name/nc/nco/package.nix b/pkgs/by-name/nc/nco/package.nix
index dc86709c0f1a..3e5470effd86 100644
--- a/pkgs/by-name/nc/nco/package.nix
+++ b/pkgs/by-name/nc/nco/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nco";
     repo = "nco";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-p7GUUgMlZFnJ5kA3x4QpcVmQUQNsjMr2Q8Mrzf6k54Q=";
   };
 
diff --git a/pkgs/by-name/nc/ncompress/package.nix b/pkgs/by-name/nc/ncompress/package.nix
index 9f8d9210c45e..4baac00754ee 100644
--- a/pkgs/by-name/nc/ncompress/package.nix
+++ b/pkgs/by-name/nc/ncompress/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vapier";
     repo = "ncompress";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Yhs3C5/kR7Ve56E84usYJprxIMAIwXVahLi1N9TIfj0=";
   };
 
diff --git a/pkgs/by-name/nc/ncrack/package.nix b/pkgs/by-name/nc/ncrack/package.nix
index 018db4de1678..2df00ec4c894 100644
--- a/pkgs/by-name/nc/ncrack/package.nix
+++ b/pkgs/by-name/nc/ncrack/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nmap";
     repo = "ncrack";
-    tag = version;
+    rev = version;
     sha256 = "1gnv5xdd7n04glcpy7q1mkb6f8gdhdrhlrh8z6k4g2pjdhxlz26g";
   };
 
diff --git a/pkgs/by-name/nd/ndppd/package.nix b/pkgs/by-name/nd/ndppd/package.nix
index 90ed753148e9..bb0fda862e98 100644
--- a/pkgs/by-name/nd/ndppd/package.nix
+++ b/pkgs/by-name/nd/ndppd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DanielAdolfsson";
     repo = "ndppd";
-    tag = version;
+    rev = version;
     sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0";
   };
 
diff --git a/pkgs/by-name/nd/ndstool/package.nix b/pkgs/by-name/nd/ndstool/package.nix
index 42362723c1e9..5c3fcf4eaeb3 100644
--- a/pkgs/by-name/nd/ndstool/package.nix
+++ b/pkgs/by-name/nd/ndstool/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "devkitPro";
     repo = "ndstool";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-121xEmbt1WBR1wi4RLw9/iLHqkpyXImXKiCNnLCYnJs=";
   };
 
diff --git a/pkgs/by-name/nd/ndstrim/package.nix b/pkgs/by-name/nd/ndstrim/package.nix
index 14086eeea62b..130f7f3dbc44 100644
--- a/pkgs/by-name/nd/ndstrim/package.nix
+++ b/pkgs/by-name/nd/ndstrim/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Nemris";
     repo = "ndstrim";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KgtejBbFg6+klc8OpCs1CIb+7uVPCtP0/EM671vxauk=";
   };
 
diff --git a/pkgs/by-name/ne/ne/package.nix b/pkgs/by-name/ne/ne/package.nix
index 34e8044dff4b..b3290e7184e2 100644
--- a/pkgs/by-name/ne/ne/package.nix
+++ b/pkgs/by-name/ne/ne/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vigna";
     repo = "ne";
-    tag = version;
+    rev = version;
     sha256 = "sha256-n8PERQD9G4jmW4avQjbFofrSapyRoSbQ2k1LzVt0i1o=";
   };
 
diff --git a/pkgs/by-name/ne/near-cli/package.nix b/pkgs/by-name/ne/near-cli/package.nix
index 2d1d00531174..dfce986e94ed 100644
--- a/pkgs/by-name/ne/near-cli/package.nix
+++ b/pkgs/by-name/ne/near-cli/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "near";
     repo = "near-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-C+viNYk+6BA11cdi5GqARU3QTTONTR2B2VEZf/SeeSQ=";
   };
 
diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix
index 3be23143ab69..97773ec7a34c 100644
--- a/pkgs/by-name/ne/neatvnc/package.nix
+++ b/pkgs/by-name/ne/neatvnc/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "any1";
     repo = "neatvnc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-D9dwD5i9mScc5vn0mUxe7+0cxMI65F7LyivXn9J0aic=";
   };
 
diff --git a/pkgs/by-name/ne/needle/package.nix b/pkgs/by-name/ne/needle/package.nix
index f75a700c52cb..3d771cd693e5 100644
--- a/pkgs/by-name/ne/needle/package.nix
+++ b/pkgs/by-name/ne/needle/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uber";
     repo = "needle";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vQlUcfIj+LHZ3R+XwSr9bBIjcZUWkW2k/wI6HF+sDPo=";
   };
 
diff --git a/pkgs/by-name/ne/neil/package.nix b/pkgs/by-name/ne/neil/package.nix
index 5c276000db02..8aa5c7b85fea 100644
--- a/pkgs/by-name/ne/neil/package.nix
+++ b/pkgs/by-name/ne/neil/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "babashka";
     repo = "neil";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ulqVrFsuYvRKxASHI6AqnHkKKdmDVgtivsRIscivcXw=";
   };
 
diff --git a/pkgs/by-name/ne/nemo-emblems/package.nix b/pkgs/by-name/ne/nemo-emblems/package.nix
index 22decbba2aa6..faa0215419b1 100644
--- a/pkgs/by-name/ne/nemo-emblems/package.nix
+++ b/pkgs/by-name/ne/nemo-emblems/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
-    tag = version;
+    rev = version;
     hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
   };
 
diff --git a/pkgs/by-name/ne/nemo-fileroller/package.nix b/pkgs/by-name/ne/nemo-fileroller/package.nix
index d19065a370b3..ae668730829e 100644
--- a/pkgs/by-name/ne/nemo-fileroller/package.nix
+++ b/pkgs/by-name/ne/nemo-fileroller/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
-    tag = version;
+    rev = version;
     hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
   };
 
diff --git a/pkgs/by-name/ne/nemo-python/package.nix b/pkgs/by-name/ne/nemo-python/package.nix
index 3e0f40ee9b9b..a80cf5e60294 100644
--- a/pkgs/by-name/ne/nemo-python/package.nix
+++ b/pkgs/by-name/ne/nemo-python/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
-    tag = version;
+    rev = version;
     hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
   };
 
diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix
index 0da0ba8296ba..5faaf68ef2b9 100644
--- a/pkgs/by-name/ne/nemo/package.nix
+++ b/pkgs/by-name/ne/nemo/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-9JfCBC5YjfQadF7KzPgZ1yPkiSjmuEO1tfMU2BmJES8=";
   };
 
diff --git a/pkgs/by-name/ne/neo-cowsay/package.nix b/pkgs/by-name/ne/neo-cowsay/package.nix
index a1e2e48a0d10..8f3f556c877c 100644
--- a/pkgs/by-name/ne/neo-cowsay/package.nix
+++ b/pkgs/by-name/ne/neo-cowsay/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Code-Hex";
     repo = "Neo-cowsay";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DmIjqBTIzwkQ8aJ6xCgIwjDtczlTH5AKbPKFUGx3qQ8=";
   };
 
diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix
index 76d72702a930..b521d70158c0 100644
--- a/pkgs/by-name/ne/neocmakelsp/package.nix
+++ b/pkgs/by-name/ne/neocmakelsp/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Decodetalkers";
     repo = "neocmakelsp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iVetPUg/eX8o2BB1y9dlijbhZUyDNMHaLrqcqTbvpQk=";
   };
 
diff --git a/pkgs/by-name/ne/neosay/package.nix b/pkgs/by-name/ne/neosay/package.nix
index f5b78afccd5d..293de7c9b0dc 100644
--- a/pkgs/by-name/ne/neosay/package.nix
+++ b/pkgs/by-name/ne/neosay/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "donuts-are-good";
     repo = "neosay";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2tFjvAobDpBh1h0ejdtqxDsC+AqyneN+xNssOJNfEbk=";
   };
 
diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix
index 85c21a479983..40e41361ab67 100644
--- a/pkgs/by-name/ne/neothesia/package.nix
+++ b/pkgs/by-name/ne/neothesia/package.nix
@@ -17,7 +17,7 @@ let
   src = fetchFromGitHub {
     owner = "PolyMeilex";
     repo = "Neothesia";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bQ2546q+oachvuNKMJHjQzF6uv06LG+f7eFQPoAn6mw=";
   };
 in
diff --git a/pkgs/by-name/ne/neovim-gtk/package.nix b/pkgs/by-name/ne/neovim-gtk/package.nix
index 8ea22032630c..44ec67d0fb25 100644
--- a/pkgs/by-name/ne/neovim-gtk/package.nix
+++ b/pkgs/by-name/ne/neovim-gtk/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Lyude";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I=";
   };
 
diff --git a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
index c913928e6e84..b4a888905608 100644
--- a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "equalsraf";
     repo = "neovim-qt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-r77tg3xVemHW/zDNA6dYerFjFaYDDeHsD68WhMfI70Q=";
   };
 
diff --git a/pkgs/by-name/ne/neovim-remote/package.nix b/pkgs/by-name/ne/neovim-remote/package.nix
index edc2097d8e6a..566f323ce2c6 100644
--- a/pkgs/by-name/ne/neovim-remote/package.nix
+++ b/pkgs/by-name/ne/neovim-remote/package.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mhinz";
     repo = "neovim-remote";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uO5KezbUQGj3rNpuw2SJOzcP86DZqX7DJFz3BxEnf1E=";
   };
 
diff --git a/pkgs/by-name/ne/nerdctl/package.nix b/pkgs/by-name/ne/nerdctl/package.nix
index f844c5b8086d..9e69d6761fb1 100644
--- a/pkgs/by-name/ne/nerdctl/package.nix
+++ b/pkgs/by-name/ne/nerdctl/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containerd";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GHFs8QvLcXu+DZ851TCLI7EVc9wMS5fRC4TYBXzyv3Q=";
   };
 
diff --git a/pkgs/by-name/ne/nerdfix/package.nix b/pkgs/by-name/ne/nerdfix/package.nix
index 51c0e636b585..e9839908d630 100644
--- a/pkgs/by-name/ne/nerdfix/package.nix
+++ b/pkgs/by-name/ne/nerdfix/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "loichyan";
     repo = "nerdfix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Mp8QFzMQXJEFIzkrmiW/wxMy/+WC4VqbPtWzE92z9Gc=";
   };
 
diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix
index 885eed565455..76c5f37fb143 100644
--- a/pkgs/by-name/ne/nest-cli/package.nix
+++ b/pkgs/by-name/ne/nest-cli/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "nestjs";
     repo = "nest-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-dko+hOC3oZToNS+EOqmm+z7DLHfqqKDeQsH2sYxburU=";
   };
 
diff --git a/pkgs/by-name/ne/nestopia-ue/package.nix b/pkgs/by-name/ne/nestopia-ue/package.nix
index b275bf95b678..d976ec8649be 100644
--- a/pkgs/by-name/ne/nestopia-ue/package.nix
+++ b/pkgs/by-name/ne/nestopia-ue/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "0ldsk00l";
     repo = "nestopia";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-6r6o/2GDp1Rcp+OWaQVgIQGC6NAxtmx4lxDWWpwv8aQ=";
   };
 
diff --git a/pkgs/by-name/ne/net-cpp/package.nix b/pkgs/by-name/ne/net-cpp/package.nix
index 0fb0c55c45ce..fedb695fc245 100644
--- a/pkgs/by-name/ne/net-cpp/package.nix
+++ b/pkgs/by-name/ne/net-cpp/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/net-cpp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-MSqdP3kGI9hDdxFv2a0yd5ZkFkf1lMurB+KDIZLR9jg=";
   };
 
diff --git a/pkgs/by-name/ne/netassert/package.nix b/pkgs/by-name/ne/netassert/package.nix
index bd7150c7e97c..a03870c42450 100644
--- a/pkgs/by-name/ne/netassert/package.nix
+++ b/pkgs/by-name/ne/netassert/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "controlplaneio";
     repo = "netassert";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mRKjo0AfnM+XTl7sQoGDyQoquXpD3xPJ6i3/3Dj2rhE=";
   };
   vendorHash = "sha256-9mvSfAd1m95eRwljGG68+tjiFObgt1EuakjwFfn9Obo=";
diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix
index 37b1a2b13b92..7734682aed95 100644
--- a/pkgs/by-name/ne/netavark/package.nix
+++ b/pkgs/by-name/ne/netavark/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "netavark";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kAJOfZ4Q1EQ+JV1izXoLe/Z/qgxbzz3WbczM4fVhxfU=";
   };
 
diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index 5c57e07728c1..0670d3333e6b 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "dashboard";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PY/jK96FK6Y0++Ie4Yg/7GrGoLtLcgCSzXIkqySxe2M=";
   };
 
diff --git a/pkgs/by-name/ne/netbox2netshot/package.nix b/pkgs/by-name/ne/netbox2netshot/package.nix
index d6d1339aeeb3..96d1bbb78e00 100644
--- a/pkgs/by-name/ne/netbox2netshot/package.nix
+++ b/pkgs/by-name/ne/netbox2netshot/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "scaleway";
     repo = "netbox2netshot";
-    tag = version;
+    rev = version;
     hash = "sha256-4Leg7MaLSos2RjmxB6yVzxGju6OzNrChXdw5htppuZU=";
   };
 
diff --git a/pkgs/by-name/ne/netcdfcxx4/package.nix b/pkgs/by-name/ne/netcdfcxx4/package.nix
index 9655b69ccce5..b96c8f89f6ed 100644
--- a/pkgs/by-name/ne/netcdfcxx4/package.nix
+++ b/pkgs/by-name/ne/netcdfcxx4/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Unidata";
     repo = "netcdf-cxx4";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY=";
   };
 
diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix
index 7637483a0495..5d2d1f5d17b2 100644
--- a/pkgs/by-name/ne/netclient/package.nix
+++ b/pkgs/by-name/ne/netclient/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gravitl";
     repo = "netclient";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/drujpz0oeAZmV24Fxy3N6aqa5z72WiVxkjccbc6xmE=";
   };
 
diff --git a/pkgs/by-name/ne/netcoredbg/package.nix b/pkgs/by-name/ne/netcoredbg/package.nix
index e8c0e1d4aaa6..f2dc49a18410 100644
--- a/pkgs/by-name/ne/netcoredbg/package.nix
+++ b/pkgs/by-name/ne/netcoredbg/package.nix
@@ -30,7 +30,7 @@ let
   src = fetchFromGitHub {
     owner = "Samsung";
     repo = pname;
-    tag = version;
+    rev = version;
     inherit hash;
   };
 
diff --git a/pkgs/by-name/ne/nethogs/package.nix b/pkgs/by-name/ne/nethogs/package.nix
index c0cace043d92..5ad1bfd5c999 100644
--- a/pkgs/by-name/ne/nethogs/package.nix
+++ b/pkgs/by-name/ne/nethogs/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "raboof";
     repo = "nethogs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+yVMyGSBIBWYjA9jaGWvrcsNPbJ6S4ax9H1BhWHYUUU=";
   };
 
diff --git a/pkgs/by-name/ne/nethoscope/package.nix b/pkgs/by-name/ne/nethoscope/package.nix
index 3d874634336a..a7bc672c2338 100644
--- a/pkgs/by-name/ne/nethoscope/package.nix
+++ b/pkgs/by-name/ne/nethoscope/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vvilhonen";
     repo = "nethoscope";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-v7GO+d4b0N3heN10+WSUJEpcShKmx4BPR1FyZoELWzc=";
   };
 
diff --git a/pkgs/by-name/ne/netmask/package.nix b/pkgs/by-name/ne/netmask/package.nix
index b2a3b298ea61..9397e44d9fd7 100644
--- a/pkgs/by-name/ne/netmask/package.nix
+++ b/pkgs/by-name/ne/netmask/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tlby";
     repo = "netmask";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1269bmdvl534wr0bamd7cqbnr76pnb14yn8ly4qsfg29kh7hrds6";
   };
 
diff --git a/pkgs/by-name/ne/netop/package.nix b/pkgs/by-name/ne/netop/package.nix
index ee3a99212c08..623d95c21be9 100644
--- a/pkgs/by-name/ne/netop/package.nix
+++ b/pkgs/by-name/ne/netop/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ZingerLittleBee";
     repo = "netop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Rnp2VNAi8BNbKqkGFoYUb4C5db5BS1P1cqpWlroTmdQ=";
   };
 
diff --git a/pkgs/by-name/ne/netplan/package.nix b/pkgs/by-name/ne/netplan/package.nix
index cb435467a070..6668eeff00f5 100644
--- a/pkgs/by-name/ne/netplan/package.nix
+++ b/pkgs/by-name/ne/netplan/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "netplan";
-    tag = version;
+    rev = version;
     hash = "sha256-wQ4gd9+9YU92WGRMjSiF/zLCGxhaSl8s22pH1jr+Mm0=";
   };
 
diff --git a/pkgs/by-name/ne/netproc/package.nix b/pkgs/by-name/ne/netproc/package.nix
index 0c90f99ec06e..eb49dcb019f5 100644
--- a/pkgs/by-name/ne/netproc/package.nix
+++ b/pkgs/by-name/ne/netproc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "berghetti";
     repo = "netproc";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-OQWlFwCga33rTseLeO8rAd+pkLHbSNf3YI5OSwrdIyk=";
   };
 
diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix
index d788de976a45..8489627e329c 100644
--- a/pkgs/by-name/ne/netsniff-ng/package.nix
+++ b/pkgs/by-name/ne/netsniff-ng/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "netsniff-ng";
     owner = "netsniff-ng";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P1xZqhZ/HJV3fAvh4xhhApZ0+FLDFqvYrZlbvb+FV7I=";
   };
 
diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
index 28edc20a4487..2f726ee47d65 100644
--- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix
+++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nm-l2tp";
     repo = "network-manager-l2tp";
-    tag = version;
+    rev = version;
     hash = "sha256-AmbDWBCUG9fvqA6iJopYtbitdRwv2faWvIeKN90p234=";
   };
 
diff --git a/pkgs/by-name/ne/networkmanager_dmenu/package.nix b/pkgs/by-name/ne/networkmanager_dmenu/package.nix
index 4d5b9e4a582c..7e39c745d1c9 100644
--- a/pkgs/by-name/ne/networkmanager_dmenu/package.nix
+++ b/pkgs/by-name/ne/networkmanager_dmenu/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "networkmanager-dmenu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Iy8Bi6aXtNXFfuQmRhLo50cs7pMx1l+OIv019Dqj6ow=";
   };
 
diff --git a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix
index d0bc1b54563b..4cc5b3146186 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";
-    tag = finalAttrs.version;
+    rev = 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 f84e5462ef32..d6b7098654bc 100644
--- a/pkgs/by-name/ne/neuron/package.nix
+++ b/pkgs/by-name/ne/neuron/package.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "neuronsimulator";
     repo = "nrn";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-xASBpsF8rIzrb5G+4Qi6rvWC2wqL7nAGlSeMsBAI6WM=";
   };
diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix
index 066a321c45b8..8a54783f91f6 100644
--- a/pkgs/by-name/ne/neverest/package.nix
+++ b/pkgs/by-name/ne/neverest/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pimalaya";
     repo = "neverest";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE=";
   };
 
diff --git a/pkgs/by-name/ne/new-session-manager/package.nix b/pkgs/by-name/ne/new-session-manager/package.nix
index baa8bae542b1..343c84db10d0 100644
--- a/pkgs/by-name/ne/new-session-manager/package.nix
+++ b/pkgs/by-name/ne/new-session-manager/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxaudio";
     repo = "new-session-manager";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5G2GlBuKjC/r1SMm78JKia7bMA97YcvUR5l6zBucemw=";
   };
 
diff --git a/pkgs/by-name/ne/newcomputermodern/package.nix b/pkgs/by-name/ne/newcomputermodern/package.nix
index ac96b0dd307c..c35f9989e50e 100644
--- a/pkgs/by-name/ne/newcomputermodern/package.nix
+++ b/pkgs/by-name/ne/newcomputermodern/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://git.gnu.org.ua/newcm.git";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-AMzEytBn9PbyYFNJ2CMPg8ejsL3eFhY+eZHXShaLG9E=";
   };
 
diff --git a/pkgs/by-name/ne/nextdns/package.nix b/pkgs/by-name/ne/nextdns/package.nix
index 2167a01b91d7..ee938b7c24f9 100644
--- a/pkgs/by-name/ne/nextdns/package.nix
+++ b/pkgs/by-name/ne/nextdns/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nextdns";
     repo = "nextdns";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CvFzDfDij4AYuytlPNrY2L0mov8MionUd06kf7aZQAo=";
   };
 
diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix
index d9a2400c261a..ca14a95e5dce 100644
--- a/pkgs/by-name/ne/nexttrace/package.nix
+++ b/pkgs/by-name/ne/nexttrace/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nxtrace";
     repo = "NTrace-core";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-32QFgmvXQ+8ix1N9I6pJaIJGWOT67/FG0VVEhftwQQw=";
   };
   vendorHash = "sha256-WRH9doQavcdH1sd2fS8QoFSmlirBMZgSzB/sj1q6cUQ=";
diff --git a/pkgs/by-name/nf/nfft/package.nix b/pkgs/by-name/nf/nfft/package.nix
index fce1cc1664d0..3d3bdb47eec6 100644
--- a/pkgs/by-name/nf/nfft/package.nix
+++ b/pkgs/by-name/nf/nfft/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "NFFT";
     repo = "nfft";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-HR8ME9PVC+RAv1GIgV2vK6eLU8Wk28+rSzbutThBv3w=";
   };
 
diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix
index 714d6e1f7668..2da3eb5e7b6a 100644
--- a/pkgs/by-name/nf/nfpm/package.nix
+++ b/pkgs/by-name/nf/nfpm/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-63vhxsoGK8YNs0wobFyViOHO9K3hSHgWJU/wbvUxJFw=";
   };
 
diff --git a/pkgs/by-name/nf/nfstrace/package.nix b/pkgs/by-name/nf/nfstrace/package.nix
index f7b366abe4f2..11edace296ef 100644
--- a/pkgs/by-name/nf/nfstrace/package.nix
+++ b/pkgs/by-name/nf/nfstrace/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "epam";
     repo = "nfstrace";
-    tag = version;
+    rev = version;
     sha256 = "1djsyn7i3xp969rnmsdaf5vwjiik9wylxxrc5nm7by00i76c1vsg";
   };
 
diff --git a/pkgs/by-name/ng/nginx-config-formatter/package.nix b/pkgs/by-name/ng/nginx-config-formatter/package.nix
index b7a2cf55dcb7..f475464bd5f4 100644
--- a/pkgs/by-name/ng/nginx-config-formatter/package.nix
+++ b/pkgs/by-name/ng/nginx-config-formatter/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "slomkowski";
     repo = "nginx-config-formatter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-nYaBdVsq7aLE9P1bQlJlQkrk/cq7C1hxM5XtCGyEzC0=";
   };
 
diff --git a/pkgs/by-name/ng/nginx-sso/package.nix b/pkgs/by-name/ng/nginx-sso/package.nix
index 79af4783b29c..c2d4a9473a20 100644
--- a/pkgs/by-name/ng/nginx-sso/package.nix
+++ b/pkgs/by-name/ng/nginx-sso/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Luzifer";
     repo = "nginx-sso";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fNMCskS8uXAykl2Zu4ZZqtIS2F5w7HV7C8hyPaWnav4=";
   };
 
diff --git a/pkgs/by-name/ng/ngrid/package.nix b/pkgs/by-name/ng/ngrid/package.nix
index 5dfc6f6530e6..193080ad3914 100644
--- a/pkgs/by-name/ng/ngrid/package.nix
+++ b/pkgs/by-name/ng/ngrid/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "twosigma";
     repo = "ngrid";
-    tag = version;
+    rev = version;
     hash = "sha256-69icp0m+bAHBsQFIDGd8NjfMsMYsB1sUfzuP/OBl5jc=";
   };
 
diff --git a/pkgs/by-name/ng/ngrrram/package.nix b/pkgs/by-name/ng/ngrrram/package.nix
index 36ff7a0b31ef..606de9acdaec 100644
--- a/pkgs/by-name/ng/ngrrram/package.nix
+++ b/pkgs/by-name/ng/ngrrram/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wintermute-cell";
     repo = "ngrrram";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-65cbNsGQZSpxKV0lq/Z7TK7CODPTqayOiPStukFbo44=";
   };
 
diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix
index 3998af984a73..005c5937388b 100644
--- a/pkgs/by-name/nh/nheko/package.nix
+++ b/pkgs/by-name/nh/nheko/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nheko-Reborn";
     repo = "nheko";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hQb+K8ogNj/s6ZO2kgS/sZZ35y4CwMeS3lVeMYNucYQ=";
   };
 
diff --git a/pkgs/by-name/nh/nhentai/package.nix b/pkgs/by-name/nh/nhentai/package.nix
index e4fa5e4c74a9..29a9498b2548 100644
--- a/pkgs/by-name/nh/nhentai/package.nix
+++ b/pkgs/by-name/nh/nhentai/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "RicterZ";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-SjWIctAyczjYGP4buXQBA/RcrdikMSuSBtfhORNmXMc=";
   };
 
diff --git a/pkgs/by-name/ni/niff/package.nix b/pkgs/by-name/ni/niff/package.nix
index 81251c22bd76..768d8b4047b7 100644
--- a/pkgs/by-name/ni/niff/package.nix
+++ b/pkgs/by-name/ni/niff/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "FRidh";
     repo = "niff";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ziv5r57jzg2qg61izvkkyq1bz4p5nb6652dzwykfj3l2r3db4bi";
   };
 
diff --git a/pkgs/by-name/ni/nifticlib/package.nix b/pkgs/by-name/ni/nifticlib/package.nix
index 64849c8314ee..9ace77562c62 100644
--- a/pkgs/by-name/ni/nifticlib/package.nix
+++ b/pkgs/by-name/ni/nifticlib/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NIFTI-Imaging";
     repo = "nifti_clib";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0hamm6nvbjdjjd5md4jahzvn5559frigxaiybnjkh59ckxwb1hy4";
   };
 
diff --git a/pkgs/by-name/ni/niftyseg/package.nix b/pkgs/by-name/ni/niftyseg/package.nix
index e351ead5aad4..1c7d59328a45 100644
--- a/pkgs/by-name/ni/niftyseg/package.nix
+++ b/pkgs/by-name/ni/niftyseg/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KCL-BMEIS";
     repo = "NiftySeg";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FDthq1ild9XOw3E3O7Lpfn6hBF1Frhv1NxfEA8500n8=";
   };
 
diff --git a/pkgs/by-name/ni/nika-fonts/package.nix b/pkgs/by-name/ni/nika-fonts/package.nix
index 7c267b146a55..165145ff295a 100644
--- a/pkgs/by-name/ni/nika-fonts/package.nix
+++ b/pkgs/by-name/ni/nika-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "font-store";
     repo = "NikaFont";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jDemm8IyjhoCOg4Bfsp0tzUR7m+JaswL5d7Kug+asJk=";
   };
 
diff --git a/pkgs/by-name/ni/nikto/package.nix b/pkgs/by-name/ni/nikto/package.nix
index fc12c9dcb89d..f82cf130f2b1 100644
--- a/pkgs/by-name/ni/nikto/package.nix
+++ b/pkgs/by-name/ni/nikto/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sullo";
     repo = "nikto";
-    tag = version;
+    rev = version;
     sha256 = "sha256-lWiDbWc2BWAUgyaIm0tvZytja02WogYRoc7na4sHiNM=";
   };
 
diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix
index 4410018c72de..2847bac37ecc 100644
--- a/pkgs/by-name/ni/nil/package.nix
+++ b/pkgs/by-name/ni/nil/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "oxalica";
     repo = "nil";
-    tag = version;
+    rev = version;
     hash = "sha256-DqsN/VkYVr4M0PVRQKXPPOTaind5miYZURIYqM4MxYM=";
   };
 
diff --git a/pkgs/by-name/ni/nilfs-utils/package.nix b/pkgs/by-name/ni/nilfs-utils/package.nix
index ea316b0c1e46..067b2f6a305a 100644
--- a/pkgs/by-name/ni/nilfs-utils/package.nix
+++ b/pkgs/by-name/ni/nilfs-utils/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nilfs-dev";
     repo = "nilfs-utils";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qvs0PBkMYzGfIQ/Z2Wz0aHe2Y2Ia6fA4pMSk5Jhejf4=";
   };
 
diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix
index 3c5a01deeaa0..0f49bc7494ba 100644
--- a/pkgs/by-name/ni/nimlangserver/package.nix
+++ b/pkgs/by-name/ni/nimlangserver/package.nix
@@ -15,7 +15,7 @@ buildNimPackage (
     src = fetchFromGitHub {
       owner = "nim-lang";
       repo = "langserver";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-CbdlDcEkX/pPXEbIsSM6S9INeBCwgjx7NxonjUJAHrk=";
     };
 
diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix
index 9790d6530fdb..b73abeae592f 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1kwp6pmnfar2ip9693gprfbcfscklgri1k1ycimxzlqr61nkd2k9";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ni/ninvaders/package.nix b/pkgs/by-name/ni/ninvaders/package.nix
index b2e2021df255..06618b34f55e 100644
--- a/pkgs/by-name/ni/ninvaders/package.nix
+++ b/pkgs/by-name/ni/ninvaders/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sf-refugees";
     repo = "ninvaders";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1wmwws1zsap4bfc2439p25vnja0hnsf57k293rdxw626gly06whi";
   };
 
diff --git a/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix b/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix
index adcc2e19fcc3..8c14178fc744 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q+kbEOLA05xR6weAWDA1hx4fVsaN9UNKiOXGxPRfXuI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ni/nix-bash-completions/package.nix b/pkgs/by-name/ni/nix-bash-completions/package.nix
index e55631acded9..71ea4e111dfc 100644
--- a/pkgs/by-name/ni/nix-bash-completions/package.nix
+++ b/pkgs/by-name/ni/nix-bash-completions/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hedning";
     repo = "nix-bash-completions";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1n5zs6xcnv4bv1hdaypmz7fv4j7dsr4a0ifah99iyj4p5j85i1bc";
   };
 
diff --git a/pkgs/by-name/ni/nix-build-uncached/package.nix b/pkgs/by-name/ni/nix-build-uncached/package.nix
index dd8c1331cde0..5bf09afad6e3 100644
--- a/pkgs/by-name/ni/nix-build-uncached/package.nix
+++ b/pkgs/by-name/ni/nix-build-uncached/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-build-uncached";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-n9Koi01Te77bpYbRX46UThyD2FhCu9OGHd/6xDQLqjQ=";
   };
 
diff --git a/pkgs/by-name/ni/nix-bundle/package.nix b/pkgs/by-name/ni/nix-bundle/package.nix
index da5c1e83a479..ecffd54eb676 100644
--- a/pkgs/by-name/ni/nix-bundle/package.nix
+++ b/pkgs/by-name/ni/nix-bundle/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matthewbauer";
     repo = "nix-bundle";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0js8spwjvw6kjxz1i072scd035fhiyazixvn84ibdnw8dx087gjv";
   };
 
diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix
index 840d1b5e9147..ff56c097c29a 100644
--- a/pkgs/by-name/ni/nix-direnv/package.nix
+++ b/pkgs/by-name/ni/nix-direnv/package.nix
@@ -16,7 +16,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-direnv";
-    tag = version;
+    rev = version;
     hash = "sha256-oNqhPqgQT92yxbKmcgX4F3e2yTUPyXYG7b2xQm3TvQw=";
   };
 
diff --git a/pkgs/by-name/ni/nix-doc/package.nix b/pkgs/by-name/ni/nix-doc/package.nix
index 5d0156e1ff1e..121bef315ea2 100644
--- a/pkgs/by-name/ni/nix-doc/package.nix
+++ b/pkgs/by-name/ni/nix-doc/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.6.5";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "lf-";
     repo = "nix-doc";
     sha256 = "sha256-9cuNzq+CBA2jz0LkZb7lh/WISIlKklfovGBAbSo1Mgk=";
diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix
index 53a6217c2a21..0f996a78bf6b 100644
--- a/pkgs/by-name/ni/nix-init/package.nix
+++ b/pkgs/by-name/ni/nix-init/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-init";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0RLEPVtYnwYH+pMnpO0/Evbp7x9d0RMobOVAqwgMJz4=";
   };
 
diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix
index b8733db7c089..b7b517f1976b 100644
--- a/pkgs/by-name/ni/nix-ld/package.nix
+++ b/pkgs/by-name/ni/nix-ld/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mic92";
     repo = "nix-ld";
-    tag = version;
+    rev = version;
     hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=";
   };
 
diff --git a/pkgs/by-name/ni/nix-melt/package.nix b/pkgs/by-name/ni/nix-melt/package.nix
index a5354f665198..667e2076cf58 100644
--- a/pkgs/by-name/ni/nix-melt/package.nix
+++ b/pkgs/by-name/ni/nix-melt/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-melt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jx7g9GOFAjOlJyNsGOUTLh2qWII9u0prOoBEvNPmdj8=";
   };
 
diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix
index 4a84fa12db67..bb0c86e7cba6 100644
--- a/pkgs/by-name/ni/nix-plugins/package.nix
+++ b/pkgs/by-name/ni/nix-plugins/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shlevy";
     repo = "nix-plugins";
-    tag = version;
+    rev = version;
     hash = "sha256-C4VqKHi6nVAHuXVhqvTRRyn0Bb619ez4LzgUWPH1cbM=";
   };
 
diff --git a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
index 247891fdeb49..230fb10f5cc2 100644
--- a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
+++ b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cdepillabout";
     repo = "nix-query-tree-viewer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Lc9hfjybnRrkd7PZMa2ojxOM04bP4GJyagkZUX2nVwY=";
   };
 
diff --git a/pkgs/by-name/ni/nix-search/package.nix b/pkgs/by-name/ni/nix-search/package.nix
index b70e0477965c..9e8342414b5b 100644
--- a/pkgs/by-name/ni/nix-search/package.nix
+++ b/pkgs/by-name/ni/nix-search/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "diamondburned";
     repo = "nix-search";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dOdcXKfSwi0THOjtgP3O/46SWoUY+T7LL9nGwOXXJfw=";
   };
 
diff --git a/pkgs/by-name/ni/nix-snapshotter/package.nix b/pkgs/by-name/ni/nix-snapshotter/package.nix
index 4d77c3e82070..e6bee45d0b3b 100644
--- a/pkgs/by-name/ni/nix-snapshotter/package.nix
+++ b/pkgs/by-name/ni/nix-snapshotter/package.nix
@@ -11,7 +11,7 @@ let
   src = fetchFromGitHub {
     owner = "pdtpartners";
     repo = "nix-snapshotter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TCZdXCmnqCPsd3PjLv/LDSKJhTspLliL0DE+c/XP9BY=";
   };
 
diff --git a/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix b/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix
index 867bca399fb4..b44227c1600c 100644
--- a/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix
+++ b/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "nix-store-gcs-proxy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ljJrBNSGPZ9cV/+XcMNfMLT5le7tvtf/O42Tfou5BCA=";
   };
 
diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
index 57d8d1f30dd2..6a92ed47aba7 100644
--- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
+++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "nix-store-veritysetup-generator";
-    tag = version;
+    rev = version;
     hash = "sha256-kQ+mFBnvxmEH2+z1sDaehGInEsBpfZu8LMAseGjZ3/I=";
   };
 
diff --git a/pkgs/by-name/ni/nix-top/package.nix b/pkgs/by-name/ni/nix-top/package.nix
index 541554998fbb..fa69693781e0 100644
--- a/pkgs/by-name/ni/nix-top/package.nix
+++ b/pkgs/by-name/ni/nix-top/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jerith666";
     repo = "nix-top";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-w/TKzbZmMt4CX2KnLwPvR1ydp5NNlp9nNx78jJvhp54=";
   };
 
diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix
index 1743f1146d06..961ea4afe735 100644
--- a/pkgs/by-name/ni/nix-weather/package.nix
+++ b/pkgs/by-name/ni/nix-weather/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cafkafk";
     repo = "nix-weather";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-15FUA4fszbAVXop3IyOHfxroyTt9/SkWZsSTUh9RtwY=";
   };
 
diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix
index f1a58fdde6b3..bda305c30d35 100644
--- a/pkgs/by-name/ni/nix-your-shell/package.nix
+++ b/pkgs/by-name/ni/nix-your-shell/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MercuryTechnologies";
     repo = "nix-your-shell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c=";
   };
 
diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix
index 873712657571..8e895030339f 100644
--- a/pkgs/by-name/ni/nixdoc/package.nix
+++ b/pkgs/by-name/ni/nixdoc/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixdoc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7UOjmW8Ef4mEvj7SINaKWh2ZuyNMVEXB82mtuZTQiPA=";
   };
 
diff --git a/pkgs/by-name/ni/nixel/package.nix b/pkgs/by-name/ni/nixel/package.nix
index 94233a06fe46..0d3eeed4b1ad 100644
--- a/pkgs/by-name/ni/nixel/package.nix
+++ b/pkgs/by-name/ni/nixel/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kamadorueda";
     repo = "nixel";
-    tag = version;
+    rev = version;
     sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A=";
   };
 
diff --git a/pkgs/by-name/ni/nixops-dns/package.nix b/pkgs/by-name/ni/nixops-dns/package.nix
index dbb49d25289f..1a3cb7797c4b 100644
--- a/pkgs/by-name/ni/nixops-dns/package.nix
+++ b/pkgs/by-name/ni/nixops-dns/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "nixops-dns";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-d3vVm6YeQTOAE5HFSKI01L9ZqfbQKrdoLsMwHP5HulE=";
   };
 
diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix
index 238e7febba9b..4a80fd1b9c9c 100644
--- a/pkgs/by-name/ni/nixos-anywhere/package.nix
+++ b/pkgs/by-name/ni/nixos-anywhere/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixos-anywhere";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-7kHxBQuzb7gcHzVmLGljJ4kF6BDDSYVCIxYFDmYPnAo=";
   };
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
index 38ed270581bd..91b9c2588009 100644
--- a/pkgs/by-name/ni/nixos-facter/package.nix
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "nixos-facter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QD9b3r91ukGbAg+ZWj9cdBsXb6pl3wlVgEY3zF+tDQI=";
   };
 
diff --git a/pkgs/by-name/ni/nixos-generators/package.nix b/pkgs/by-name/ni/nixos-generators/package.nix
index 2681af477c38..eef7650ffb92 100644
--- a/pkgs/by-name/ni/nixos-generators/package.nix
+++ b/pkgs/by-name/ni/nixos-generators/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixos-generators";
-    tag = version;
+    rev = version;
     sha256 = "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=";
   };
   strictDeps = true;
diff --git a/pkgs/by-name/ni/nixos-shell/package.nix b/pkgs/by-name/ni/nixos-shell/package.nix
index 2c76463fcb3e..b41ee3f47055 100644
--- a/pkgs/by-name/ni/nixos-shell/package.nix
+++ b/pkgs/by-name/ni/nixos-shell/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixos-shell";
-    tag = version;
+    rev = version;
     sha256 = "sha256-plRKXQqww7easx0wgGKAkOJH1TW/PeeB20dq9XUN8J4=";
   };
 
diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix
index b1c2db34530b..a003f5eb65e5 100644
--- a/pkgs/by-name/ni/nixpacks/package.nix
+++ b/pkgs/by-name/ni/nixpacks/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "nixpacks";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-G3PIQfwddATVNhe/cEZBSFESX3grFqjUQjq40DB5mH4=";
   };
 
diff --git a/pkgs/by-name/ni/nixpkgs-fmt/package.nix b/pkgs/by-name/ni/nixpkgs-fmt/package.nix
index a429dca0ef3d..d6de2cb7b1bf 100644
--- a/pkgs/by-name/ni/nixpkgs-fmt/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-fmt/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixpkgs-fmt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6Ut4/ix915EoaPCewoG3KhKBA+OaggpDqnx2nvKxEpQ=";
   };
 
diff --git a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
index e0067343b7a3..9aafd778ad9d 100644
--- a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixpkgs-lint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o1VWM46lEJ9m49s/ekZWf8DkCeeWm4J3PQtt8tVXHbg=";
   };
 
diff --git a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
index befe9c107482..10fa7221513a 100644
--- a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
+++ b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nixseparatedebuginfod";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sVQ6UgQvSTEIxXPxISeTI9tqAdJlxQpLxq1h4I31r6k=";
   };
 
diff --git a/pkgs/by-name/ni/nixtract/package.nix b/pkgs/by-name/ni/nixtract/package.nix
index 2dab74597e22..13139e54b6db 100644
--- a/pkgs/by-name/ni/nixtract/package.nix
+++ b/pkgs/by-name/ni/nixtract/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "nixtract";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-36ciPNSlB1LU+UXP8MLakrBRRqbyiVFN8Jp/JbCe1OY=";
   };
 
diff --git a/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix b/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix
index 20d4b37b5064..23498cb57ad8 100644
--- a/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix
+++ b/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pboettch";
     repo = "json-schema-validator";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Ybr5dNmjBBPTYPvgorJ6t2+zvAjxYQISWXJmgUVHBVE=";
   };
 
diff --git a/pkgs/by-name/nm/nm-file-secret-agent/package.nix b/pkgs/by-name/nm/nm-file-secret-agent/package.nix
index da6ac55caa2f..ac4993ad9af1 100644
--- a/pkgs/by-name/nm/nm-file-secret-agent/package.nix
+++ b/pkgs/by-name/nm/nm-file-secret-agent/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lilioid";
     repo = "nm-file-secret-agent";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xQWgNxrbpHOfnKXa57cV1F3JmtJcvQsqUfgwfWg5Ni4=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/nm/nmap-formatter/package.nix b/pkgs/by-name/nm/nmap-formatter/package.nix
index 9d7fce52cb85..60299fdb366a 100644
--- a/pkgs/by-name/nm/nmap-formatter/package.nix
+++ b/pkgs/by-name/nm/nmap-formatter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vdjagilev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jpgAcnDDVVboZEMkLIE9ei0oT91Y9yp8KUJkH6LQSY4=";
   };
 
diff --git a/pkgs/by-name/nm/nmapsi4/package.nix b/pkgs/by-name/nm/nmapsi4/package.nix
index 1a3b77fef29e..37287dcef021 100644
--- a/pkgs/by-name/nm/nmapsi4/package.nix
+++ b/pkgs/by-name/nm/nmapsi4/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nmapsi4";
     repo = "nmapsi4";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY=";
   };
 
diff --git a/pkgs/by-name/nm/nmrpflash/package.nix b/pkgs/by-name/nm/nmrpflash/package.nix
index bb162907f6b0..1dd0aea6359a 100644
--- a/pkgs/by-name/nm/nmrpflash/package.nix
+++ b/pkgs/by-name/nm/nmrpflash/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jclehner";
     repo = "nmrpflash";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5oj+sIrVNAbLmmKHiBSDSVdJFrobK41UfWBmU0WRG3c=";
   };
 
diff --git a/pkgs/by-name/nm/nms/package.nix b/pkgs/by-name/nm/nms/package.nix
index 8282e36ee450..f7ddc9cfb86c 100644
--- a/pkgs/by-name/nm/nms/package.nix
+++ b/pkgs/by-name/nm/nms/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bartobri";
     repo = "no-more-secrets";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QVCEpplsZCSQ+Fq1LBtCuPBvnzgLsmLcSrxR+e4nA5I=";
   };
 
diff --git a/pkgs/by-name/nn/nng/package.nix b/pkgs/by-name/nn/nng/package.nix
index d61f6a6b100b..18ee8629de75 100644
--- a/pkgs/by-name/nn/nng/package.nix
+++ b/pkgs/by-name/nn/nng/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nanomsg";
     repo = "nng";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BBYfJ2j2IQkbluR3HQjEh1zFWPgOVX6kfyI0jG741Y4=";
   };
 
diff --git a/pkgs/by-name/nn/nnpdf/package.nix b/pkgs/by-name/nn/nnpdf/package.nix
index 0ba2473d7eb2..80caef6f3ae1 100644
--- a/pkgs/by-name/nn/nnpdf/package.nix
+++ b/pkgs/by-name/nn/nnpdf/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NNPDF";
     repo = "nnpdf";
-    tag = version;
+    rev = version;
     hash = "sha256-PyhkHlOlzKfDxUX91NkeZWjdEzFR4PW0Yh5Yz6ZA27g=";
   };
 
diff --git a/pkgs/by-name/no/noaa-apt/package.nix b/pkgs/by-name/no/noaa-apt/package.nix
index 49859f976f9b..3329748531eb 100644
--- a/pkgs/by-name/no/noaa-apt/package.nix
+++ b/pkgs/by-name/no/noaa-apt/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "martinber";
     repo = "noaa-apt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wmjglF2+BFmlTfvqt90nbCxuldN8AEFXj7y9tgTvA2Y=";
   };
 
diff --git a/pkgs/by-name/no/node-glob/package.nix b/pkgs/by-name/no/node-glob/package.nix
index 3770981435d0..fb26994e1aff 100644
--- a/pkgs/by-name/no/node-glob/package.nix
+++ b/pkgs/by-name/no/node-glob/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "isaacs";
     repo = "node-glob";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oLlNhQOnu/hlKjNWa5vjqslz1EarZJOpUEXUB+vGQvc=";
   };
 
diff --git a/pkgs/by-name/no/node-manta/package.nix b/pkgs/by-name/no/node-manta/package.nix
index b27a05d478de..a096217d73de 100644
--- a/pkgs/by-name/no/node-manta/package.nix
+++ b/pkgs/by-name/no/node-manta/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "TritonDataCenter";
     repo = "node-manta";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Uj3fNzeERiO++sW2uyAbtfN/1Ed6uRVBBvCecncq/QY=";
   };
 
diff --git a/pkgs/by-name/no/node-problem-detector/package.nix b/pkgs/by-name/no/node-problem-detector/package.nix
index 39bcfac2ab7c..16e23d8310d6 100644
--- a/pkgs/by-name/no/node-problem-detector/package.nix
+++ b/pkgs/by-name/no/node-problem-detector/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Aw6TDyWczqWgUOCV7f4JSAI4eVcjWgwe2V5qSrx4TBI=";
   };
 
diff --git a/pkgs/by-name/no/nodemon/package.nix b/pkgs/by-name/no/nodemon/package.nix
index c73a3f29ed13..fa1317e6f841 100644
--- a/pkgs/by-name/no/nodemon/package.nix
+++ b/pkgs/by-name/no/nodemon/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "remy";
     repo = "nodemon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-D0trs/Il7ekXXuLIsp8b9VPxQW1qqTc7DduGymv6jyU=";
   };
 
diff --git a/pkgs/by-name/no/nodenv/package.nix b/pkgs/by-name/no/nodenv/package.nix
index 24d5d09d3ccf..89c6a6a89aa2 100644
--- a/pkgs/by-name/no/nodenv/package.nix
+++ b/pkgs/by-name/no/nodenv/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nodenv";
     repo = "nodenv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PGeZKL7qsffMAZIsCLB244Fuu48GyWw5Rh67ePu6h38=";
   };
 
diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix
index 2de2ee0b8907..5082cbe0d6d5 100644
--- a/pkgs/by-name/no/nofi/package.nix
+++ b/pkgs/by-name/no/nofi/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ellsclytn";
     repo = "nofi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hQYIcyNCxb8qVpseNsmjyPxlwbMxDpXeZ+H1vpv62rQ=";
   };
 
diff --git a/pkgs/by-name/no/noise-repellent/package.nix b/pkgs/by-name/no/noise-repellent/package.nix
index a898528dfa20..bee759acfefd 100644
--- a/pkgs/by-name/no/noise-repellent/package.nix
+++ b/pkgs/by-name/no/noise-repellent/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lucianodato";
     repo = "noise-repellent";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-d8csYC3z3vXdmN/G6mAK+H8ia0vOCsoUpoA3W8/OADc=";
   };
 
diff --git a/pkgs/by-name/no/noisetorch/package.nix b/pkgs/by-name/no/noisetorch/package.nix
index af3824a164aa..6399aa99ddb4 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-gOPSMPH99Upi/30OnAdwSb7SaMV0i/uHB051cclfz6A=";
   };
diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix
index 81f2d9d24eed..91ce841ac804 100644
--- a/pkgs/by-name/no/nomacs/package.nix
+++ b/pkgs/by-name/no/nomacs/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nomacs";
     repo = "nomacs";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     fetchSubmodules = false; # We'll use our own
     inherit (finalAttrs) hash;
   };
diff --git a/pkgs/by-name/no/nomad-autoscaler/package.nix b/pkgs/by-name/no/nomad-autoscaler/package.nix
index ea52ffd59647..e83fef2c859c 100644
--- a/pkgs/by-name/no/nomad-autoscaler/package.nix
+++ b/pkgs/by-name/no/nomad-autoscaler/package.nix
@@ -29,7 +29,7 @@ let
     src = fetchFromGitHub {
       owner = "hashicorp";
       repo = "nomad-autoscaler";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-fK5GsszNhz/WP0zVk2lOfU/gwYijdQa5qhNYO33RhXc=";
     };
 
diff --git a/pkgs/by-name/no/nomad-driver-containerd/package.nix b/pkgs/by-name/no/nomad-driver-containerd/package.nix
index 04a7781414fa..6f56e85b83f9 100644
--- a/pkgs/by-name/no/nomad-driver-containerd/package.nix
+++ b/pkgs/by-name/no/nomad-driver-containerd/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Roblox";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-11K1ACk2hhEi+sAlI932eKpyy82Md7j1edRWH2JJ8sI=";
   };
 
diff --git a/pkgs/by-name/no/nomad-driver-podman/package.nix b/pkgs/by-name/no/nomad-driver-podman/package.nix
index 89d24a3ca640..dd848e09826b 100644
--- a/pkgs/by-name/no/nomad-driver-podman/package.nix
+++ b/pkgs/by-name/no/nomad-driver-podman/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QvIc0RNQX9do6pTyGbJTTR7jANp50DVlHsl/8teiCnY=";
   };
 
diff --git a/pkgs/by-name/no/nomad-pack/package.nix b/pkgs/by-name/no/nomad-pack/package.nix
index ea9feda185cb..0e5e0c6154dc 100644
--- a/pkgs/by-name/no/nomad-pack/package.nix
+++ b/pkgs/by-name/no/nomad-pack/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "nomad-pack";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dw6sueC1qibJYc6sbZX8HJlEf9R6O8dlE1aobw70UHw=";
   };
 
diff --git a/pkgs/by-name/no/nominatim/package.nix b/pkgs/by-name/no/nominatim/package.nix
index fed819ee3218..afaf7d93b08e 100644
--- a/pkgs/by-name/no/nominatim/package.nix
+++ b/pkgs/by-name/no/nominatim/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "Nominatim";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-GPMDbvTPl9SLpZi5gyRAPQ84NSTIRoSfGJeqWs1e9Oo=";
   };
diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix
index df17a21908cb..0c2ab9a42274 100644
--- a/pkgs/by-name/no/nomino/package.nix
+++ b/pkgs/by-name/no/nomino/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yaa110";
     repo = "nomino";
-    tag = version;
+    rev = version;
     hash = "sha256-pSk1v4AyXETBJ8UupLJy8cNEqKRwkqJnqfzoHU0SdmE=";
   };
 
diff --git a/pkgs/by-name/no/nordzy-cursor-theme/package.nix b/pkgs/by-name/no/nordzy-cursor-theme/package.nix
index eeb0ea4929ed..fbbe8ceeb29c 100644
--- a/pkgs/by-name/no/nordzy-cursor-theme/package.nix
+++ b/pkgs/by-name/no/nordzy-cursor-theme/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "guillaumeboehm";
     repo = "Nordzy-cursors";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pPcdlMa3H5RtbqIxvgxDkP4tw76H2UQujXbrINc3MxE=";
   };
 
diff --git a/pkgs/by-name/no/nordzy-icon-theme/package.nix b/pkgs/by-name/no/nordzy-icon-theme/package.nix
index 46115ec8c0f4..8014d85dfcb7 100644
--- a/pkgs/by-name/no/nordzy-icon-theme/package.nix
+++ b/pkgs/by-name/no/nordzy-icon-theme/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alvatip";
     repo = "Nordzy-icon";
-    tag = version;
+    rev = version;
     sha256 = "sha256-r/WYGcHRAFX7TennestobjcJhwu3GE8aQXxnaeokQM0=";
   };
 
diff --git a/pkgs/by-name/no/norouter/package.nix b/pkgs/by-name/no/norouter/package.nix
index 356c186fb652..6cd63474af38 100644
--- a/pkgs/by-name/no/norouter/package.nix
+++ b/pkgs/by-name/no/norouter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "norouter";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-EY/Yfyaz2DeQKHJ4awpQDbrVkse9crIZlLzfviPy3Tk=";
   };
 
diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix
index 8971a176adda..95ea63774953 100644
--- a/pkgs/by-name/no/noseyparker/package.nix
+++ b/pkgs/by-name/no/noseyparker/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "noseyparker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-n+lX49BwipIPQ2ZeQT+DFO2ILHHAU2VsOnhASOGX5RE=";
   };
 
diff --git a/pkgs/by-name/no/nosqli/package.nix b/pkgs/by-name/no/nosqli/package.nix
index d995d59bc34f..7930a9626b5c 100644
--- a/pkgs/by-name/no/nosqli/package.nix
+++ b/pkgs/by-name/no/nosqli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Charlie-belmer";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CgD9b5eHDK/8QhQmrqT09Jf9snn9WItNMtTNbJFT2sI=";
   };
 
diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix
index bfd38da404e7..485cced95575 100644
--- a/pkgs/by-name/no/nostr-rs-relay/package.nix
+++ b/pkgs/by-name/no/nostr-rs-relay/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "scsibug";
     repo = "nostr-rs-relay";
-    tag = version;
+    rev = version;
     hash = "sha256-MS5jgUh9aLAFr4Nnf3Wid+ki0PTfsyob3r16/EXYZ7E=";
   };
 
diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix
index abcb1ed76e46..6c32f8c19c94 100644
--- a/pkgs/by-name/no/nostui/package.nix
+++ b/pkgs/by-name/no/nostui/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "akiomik";
     repo = "nostui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RCD11KdzM66Mkydc51r6fG+q8bmKl5eZma58YoARwPo=";
   };
 
diff --git a/pkgs/by-name/no/notation/package.nix b/pkgs/by-name/no/notation/package.nix
index 9f4b4842e48d..cbc5eaa21dc0 100644
--- a/pkgs/by-name/no/notation/package.nix
+++ b/pkgs/by-name/no/notation/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "notaryproject";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KxxksliL2ZxbvwbLKB81Lhpvjab9nm4o3QBT2CVFwDw=";
   };
 
diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix
index 58e9b2c1482b..b13ed4f005cb 100644
--- a/pkgs/by-name/no/notcurses/package.nix
+++ b/pkgs/by-name/no/notcurses/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dankamongmen";
     repo = "notcurses";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-i3UNd1y88aOGBp2r9itBFd9w+UJQhleJQHZOiK0d26w=";
   };
 
diff --git a/pkgs/by-name/no/notejot/package.nix b/pkgs/by-name/no/notejot/package.nix
index e8818bca2891..9214af6c8fa2 100644
--- a/pkgs/by-name/no/notejot/package.nix
+++ b/pkgs/by-name/no/notejot/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-p5F0OITgfZyvHwndI5r5BE524+nft7A2XfR3BJZFamU=";
   };
 
diff --git a/pkgs/by-name/no/notes-up/package.nix b/pkgs/by-name/no/notes-up/package.nix
index 0ef658c8c5f4..7e9fe5f5bf88 100644
--- a/pkgs/by-name/no/notes-up/package.nix
+++ b/pkgs/by-name/no/notes-up/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Philip-Scott";
     repo = "Notes-up";
-    tag = version;
+    rev = version;
     sha256 = "sha256-t9BCtdWd2JLrKTcmri1Lgl5RLBYD2xWCtMxoVXz0XPk=";
   };
 
diff --git a/pkgs/by-name/no/noteshrink/package.nix b/pkgs/by-name/no/noteshrink/package.nix
index e73b29aea08b..7bb3a83df099 100644
--- a/pkgs/by-name/no/noteshrink/package.nix
+++ b/pkgs/by-name/no/noteshrink/package.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mzucker";
     repo = "noteshrink";
-    tag = version;
+    rev = version;
     sha256 = "0xhrvg3d8ffnbbizsrfppcd2y98znvkgxjdmvbvin458m2rwccka";
   };
 
diff --git a/pkgs/by-name/no/notify-client/package.nix b/pkgs/by-name/no/notify-client/package.nix
index bd2bc769e81a..8e0a22416530 100644
--- a/pkgs/by-name/no/notify-client/package.nix
+++ b/pkgs/by-name/no/notify-client/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ranfdev";
     repo = "notify";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0p/XIGaawreGHbMRoHNmUEIxgwEgigtrubeJpndHsug=";
   };
 
diff --git a/pkgs/by-name/no/notify/package.nix b/pkgs/by-name/no/notify/package.nix
index 2884f39f5b21..d2a5ae5280ed 100644
--- a/pkgs/by-name/no/notify/package.nix
+++ b/pkgs/by-name/no/notify/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QXioBUCMZ4ANkF2WOXiKUlExVq4abkaVFBd3efAGXMs=";
   };
 
diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix
index da4ee6a9c717..ed09967977b0 100644
--- a/pkgs/by-name/no/notion/package.nix
+++ b/pkgs/by-name/no/notion/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "raboof";
     repo = "notion";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-u5KoTI+OcnQu9m8/Lmsmzr8lEk9tulSE7RRFhj1oXJM=";
   };
 
diff --git a/pkgs/by-name/no/notmuch-addrlookup/package.nix b/pkgs/by-name/no/notmuch-addrlookup/package.nix
index c279c82d47ed..d2f60b6ae64a 100644
--- a/pkgs/by-name/no/notmuch-addrlookup/package.nix
+++ b/pkgs/by-name/no/notmuch-addrlookup/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "aperezdc";
     repo = "notmuch-addrlookup-c";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Z59MAptJw95azdK0auOuUyxBrX4PtXwnRNPkhjgI6Ro=";
   };
 
diff --git a/pkgs/by-name/no/notmuch-bower/package.nix b/pkgs/by-name/no/notmuch-bower/package.nix
index 2ed00cbc7f7d..1bb1c050171d 100644
--- a/pkgs/by-name/no/notmuch-bower/package.nix
+++ b/pkgs/by-name/no/notmuch-bower/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wangp";
     repo = "bower";
-    tag = version;
+    rev = version;
     sha256 = "sha256-CqA9JU/ujqIn/NvtbPtSWxKDYCv4oDdLCgbf2jj9Av4=";
   };
 
diff --git a/pkgs/by-name/no/notmuch-mailmover/package.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix
index 1477e9fc816f..ba4aadcc34d9 100644
--- a/pkgs/by-name/no/notmuch-mailmover/package.nix
+++ b/pkgs/by-name/no/notmuch-mailmover/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "michaeladler";
     repo = "notmuch-mailmover";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-v70R6CgN4RzG6L8LUg3ZvW895+G4eU8HZ0TI+jRxZ10=";
   };
 
diff --git a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix
index 6e21178096a9..39862609e894 100644
--- a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix
+++ b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "noto-emoji";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-v1vLXs8peNF6S7iBLViAWQSW042lwIDqAjB270pRPF0=";
   };
 
diff --git a/pkgs/by-name/no/nova/package.nix b/pkgs/by-name/no/nova/package.nix
index 3643b7d61c78..06cade043435 100644
--- a/pkgs/by-name/no/nova/package.nix
+++ b/pkgs/by-name/no/nova/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7GAA5Kc5ximdf71Bd8Q5o2pXixLOobXykKxfI31j/4A=";
   };
 
diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix
index 0bd50066aaeb..96db76a40206 100644
--- a/pkgs/by-name/no/novelwriter/package.nix
+++ b/pkgs/by-name/no/novelwriter/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "vkbo";
     repo = "novelWriter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-262YMVqxSZv8G82amdRnHiW/5gnxkYyFSQDiS5gOdBE=";
   };
 
diff --git a/pkgs/by-name/no/novnc/package.nix b/pkgs/by-name/no/novnc/package.nix
index 0df4a7b62da1..455aba44f34c 100644
--- a/pkgs/by-name/no/novnc/package.nix
+++ b/pkgs/by-name/no/novnc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "novnc";
     repo = "noVNC";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VYG0p70ZvRzK9IeA+5J95FqF+zWgj/8EcxnVOk+YL9o=";
   };
 
diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix
index 5fa426cc5277..3c9db899f070 100644
--- a/pkgs/by-name/no/novops/package.nix
+++ b/pkgs/by-name/no/novops/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PierreBeucher";
     repo = "novops";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bpv8Ybrsb2CAV8Qxj69F2E/mekYsOuAiZWuDNHDtxw0=";
   };
 
diff --git a/pkgs/by-name/np/npkill/package.nix b/pkgs/by-name/np/npkill/package.nix
index 7ed1bb930ddc..517da4bc26c8 100644
--- a/pkgs/by-name/np/npkill/package.nix
+++ b/pkgs/by-name/np/npkill/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "voidcosmos";
     repo = "npkill";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0pouc+5kl5bjaNYz81OD5FZppYXKdyMBRvEq/DedEV4=";
   };
 
diff --git a/pkgs/by-name/np/npm-check/package.nix b/pkgs/by-name/np/npm-check/package.nix
index d461b4c4df25..2c4387a9dcd1 100644
--- a/pkgs/by-name/np/npm-check/package.nix
+++ b/pkgs/by-name/np/npm-check/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "dylang";
     repo = "npm-check";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-F7bMvGqOxJzoaw25VR6D90UNwT8HxZ4PZhhQEvQFDn4=";
   };
 
diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix
index 6fc12b1ff289..e9aae5f92a84 100644
--- a/pkgs/by-name/np/npm-lockfile-fix/package.nix
+++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jeslie0";
     repo = "npm-lockfile-fix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P93OowrVkkOfX5XKsRsg0c4dZLVn2ZOonJazPmHdD7g=";
   };
 
diff --git a/pkgs/by-name/nq/nq/package.nix b/pkgs/by-name/nq/nq/package.nix
index ec5ad294b9bd..28e2b1eefc7f 100644
--- a/pkgs/by-name/nq/nq/package.nix
+++ b/pkgs/by-name/nq/nq/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "nq";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gdVBSE2a4rq46o0uO9ICww6zicVgn6ykf4CeJ/MmiF4=";
   };
 
diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix
index a28e34a60b8c..5ee3a195490d 100644
--- a/pkgs/by-name/nr/nrr/package.nix
+++ b/pkgs/by-name/nr/nrr/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ryanccn";
     repo = "nrr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qh4YEfdfO6WofdrFHVDvkNocloK2LuWelfZPilxiKPk=";
   };
 
diff --git a/pkgs/by-name/nr/nrsc5/package.nix b/pkgs/by-name/nr/nrsc5/package.nix
index 399ff8fc35b2..d15f1ca7c413 100644
--- a/pkgs/by-name/nr/nrsc5/package.nix
+++ b/pkgs/by-name/nr/nrsc5/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "theori-io";
     repo = "nrsc5";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09zzh3h1zzf2lwrbz3i7rif2hw36d9ska8irvxaa9lz6xc1y68pg";
   };
 
diff --git a/pkgs/by-name/ns/ns-usbloader/package.nix b/pkgs/by-name/ns/ns-usbloader/package.nix
index e2e33f9dc76d..e06dd6f3b5d9 100644
--- a/pkgs/by-name/ns/ns-usbloader/package.nix
+++ b/pkgs/by-name/ns/ns-usbloader/package.nix
@@ -26,7 +26,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "developersu";
     repo = "ns-usbloader";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gSf5SCIhcUEYGsYssXVGjUweVU+guxOI+lzD3ANr96w=";
   };
 
diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix
index 8841efcc5476..c699118ca75e 100644
--- a/pkgs/by-name/ns/nsc/package.nix
+++ b/pkgs/by-name/ns/nsc/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-F/9yAF1vXG4eWMmS6l/qWqlEV8YkS7nihHN2vK3JFbE=";
   };
 
diff --git a/pkgs/by-name/ns/nsh/package.nix b/pkgs/by-name/ns/nsh/package.nix
index fe6f3210022b..1d378ac5b774 100644
--- a/pkgs/by-name/ns/nsh/package.nix
+++ b/pkgs/by-name/ns/nsh/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nuta";
     repo = "nsh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1479wv8h5l2b0cwp27vpybq50nyvszhjxmn76n2bz3fchr0lrcbp";
   };
 
diff --git a/pkgs/by-name/ns/nsnake/package.nix b/pkgs/by-name/ns/nsnake/package.nix
index 1fbf90a65b8d..78ff27090da4 100644
--- a/pkgs/by-name/ns/nsnake/package.nix
+++ b/pkgs/by-name/ns/nsnake/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexdantas";
     repo = "nSnake";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-MixwIhyymruruV8G8PjmR9EoZBpaDVBCKBccSFL0lS8=";
   };
 
diff --git a/pkgs/by-name/ns/nsncd/package.nix b/pkgs/by-name/ns/nsncd/package.nix
index 8bc9fea06132..a39f21e3d9ec 100644
--- a/pkgs/by-name/ns/nsncd/package.nix
+++ b/pkgs/by-name/ns/nsncd/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "twosigma";
     repo = "nsncd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0cFCX5pKvYv6yr4+X5kXGz8clNi/LYndFtHaxSmHN+I=";
   };
 
diff --git a/pkgs/by-name/ns/nsq/package.nix b/pkgs/by-name/ns/nsq/package.nix
index ef4d63bb74d4..f8290cf52916 100644
--- a/pkgs/by-name/ns/nsq/package.nix
+++ b/pkgs/by-name/ns/nsq/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nsqio";
     repo = "nsq";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qoAp8yAc4lJmlnHHcZskRzkleZ3Q5Gu3Lhk9u1jMR4g=";
   };
 
diff --git a/pkgs/by-name/ns/nssmdns/package.nix b/pkgs/by-name/ns/nssmdns/package.nix
index 0790c52a8825..f58f47b00b61 100644
--- a/pkgs/by-name/ns/nssmdns/package.nix
+++ b/pkgs/by-name/ns/nssmdns/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "avahi";
     repo = "nss-mdns";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iRaf9/gu9VkGi1VbGpxvC5q+0M8ivezCz/oAKEg5V1M=";
   };
 
diff --git a/pkgs/by-name/ns/nsync/package.nix b/pkgs/by-name/ns/nsync/package.nix
index 15cb0de61bf9..316775124b44 100644
--- a/pkgs/by-name/ns/nsync/package.nix
+++ b/pkgs/by-name/ns/nsync/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "nsync";
-    tag = version;
+    rev = version;
     hash = "sha256-RAwrS8Vz5fZwZRvF4OQfn8Ls11S8OIV2TmJpNrBE4MI=";
   };
 
diff --git a/pkgs/by-name/nt/ntfy/package.nix b/pkgs/by-name/nt/ntfy/package.nix
index b19e63628048..2cfbace33ecf 100644
--- a/pkgs/by-name/nt/ntfy/package.nix
+++ b/pkgs/by-name/nt/ntfy/package.nix
@@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dschep";
     repo = "ntfy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
   };
 
diff --git a/pkgs/by-name/nt/ntfy/webpush.nix b/pkgs/by-name/nt/ntfy/webpush.nix
index 1cec412e2f6a..242a45052405 100644
--- a/pkgs/by-name/nt/ntfy/webpush.nix
+++ b/pkgs/by-name/nt/ntfy/webpush.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dschep";
     repo = "ntfy-webpush";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1dxlvq3glf8yjkn1hdk89rx1s4fi9ygg46yn866a9v7a5a83zx2n";
   };
 
diff --git a/pkgs/by-name/nt/ntirpc/package.nix b/pkgs/by-name/nt/ntirpc/package.nix
index f47f4849830c..f88180473f2f 100644
--- a/pkgs/by-name/nt/ntirpc/package.nix
+++ b/pkgs/by-name/nt/ntirpc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nfs-ganesha";
     repo = "ntirpc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-e4eF09xwX2Qf/y9YfOGy7p6yhDFnKGI5cnrQy3o8c98=";
   };
 
diff --git a/pkgs/by-name/nt/ntk/package.nix b/pkgs/by-name/nt/ntk/package.nix
index 0f5c616bfa26..da570f2672ad 100644
--- a/pkgs/by-name/nt/ntk/package.nix
+++ b/pkgs/by-name/nt/ntk/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxaudio";
     repo = "ntk";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-NyEdg6e+9CI9V+TIgdpPyH1ei+Vq8pUxD3wPzWY5fEU=";
   };
 
diff --git a/pkgs/by-name/nt/ntpstat/package.nix b/pkgs/by-name/nt/ntpstat/package.nix
index da075b4486f7..7293cf6925fa 100644
--- a/pkgs/by-name/nt/ntpstat/package.nix
+++ b/pkgs/by-name/nt/ntpstat/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mlichvar";
     repo = "ntpstat";
-    tag = finalAttrs.version;
+    rev = "${finalAttrs.version}";
     hash = "sha256-dw6Pi+aB7uK65H0HL7q1vYnM5Dp0D+kG+ZIaiv8VH5I=";
   };
 
diff --git a/pkgs/by-name/nt/ntttcp/package.nix b/pkgs/by-name/nt/ntttcp/package.nix
index e79cbf287530..4ff7ddcb2825 100644
--- a/pkgs/by-name/nt/ntttcp/package.nix
+++ b/pkgs/by-name/nt/ntttcp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "ntttcp-for-linux";
-    tag = version;
+    rev = version;
     sha256 = "sha256-6O7qSrR6EFr7k9lHQHGs/scZxJJ5DBNDxlSL5hzlRf4=";
   };
 
diff --git a/pkgs/by-name/nu/nudoku/package.nix b/pkgs/by-name/nu/nudoku/package.nix
index e997d330cb15..ca038ba13fd0 100644
--- a/pkgs/by-name/nu/nudoku/package.nix
+++ b/pkgs/by-name/nu/nudoku/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jubalh";
     repo = "nudoku";
-    tag = version;
+    rev = version;
     hash = "sha256-aOtP23kNd15DdV6on7o80QnEf0CiUBubHfFE8M1mhg0=";
   };
 
diff --git a/pkgs/by-name/nu/nullidentdmod/package.nix b/pkgs/by-name/nu/nullidentdmod/package.nix
index 948d704d142f..fb7782df00ee 100644
--- a/pkgs/by-name/nu/nullidentdmod/package.nix
+++ b/pkgs/by-name/nu/nullidentdmod/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ranthrall";
     repo = "nullidentdmod";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ahwm5pyidc6m07rh5ls2lc25kafrj233nnbcybprgl7bqdq1b0k";
   };
 
diff --git a/pkgs/by-name/nu/nulloy/package.nix b/pkgs/by-name/nu/nulloy/package.nix
index 010905e00fb9..9355fcc1d24d 100644
--- a/pkgs/by-name/nu/nulloy/package.nix
+++ b/pkgs/by-name/nu/nulloy/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nulloy";
     repo = "nulloy";
-    tag = version;
+    rev = version;
     hash = "sha256-vFg789vBV7ks+4YiWWl3u0/kQjzpAiX8dMfXU0hynDM=";
   };
 
diff --git a/pkgs/by-name/nu/numactl/package.nix b/pkgs/by-name/nu/numactl/package.nix
index 2d95ce67054b..331551d4b826 100644
--- a/pkgs/by-name/nu/numactl/package.nix
+++ b/pkgs/by-name/nu/numactl/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numactl";
     repo = "numactl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ry29RUNa0Hv5gIhy2RTVT94mHhgfdIwb5aqjBycxxj0=";
   };
 
diff --git a/pkgs/by-name/nu/numatop/package.nix b/pkgs/by-name/nu/numatop/package.nix
index b059482f0029..16f5401f8838 100644
--- a/pkgs/by-name/nu/numatop/package.nix
+++ b/pkgs/by-name/nu/numatop/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "numatop";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GJvTwqgx34ZW10eIJj/xiKe3ZkAfs7GlJImz8jrnjfI=";
   };
 
diff --git a/pkgs/by-name/nu/numix-cursor-theme/package.nix b/pkgs/by-name/nu/numix-cursor-theme/package.nix
index 3032ff52c874..d7a41cc49c54 100644
--- a/pkgs/by-name/nu/numix-cursor-theme/package.nix
+++ b/pkgs/by-name/nu/numix-cursor-theme/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-cursor-theme";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1q3w5i0h3ly6i7s9pqjdrb14kp89i78s0havri7lhiqyxizjvcvh";
   };
 
diff --git a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
index 96397623bc2c..0ad1667395f3 100644
--- a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
+++ b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-icon-theme-circle";
-    tag = version;
+    rev = version;
     sha256 = "sha256-+gb4nyVNF6bjYCEiRq/L3wO4ZoUG4lt5l0vxye8inrQ=";
   };
 
diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix
index ba74d21799e5..5b04cac61faf 100644
--- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix
+++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-icon-theme-square";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ivYuY9qcJsMqIpYSVPeu067fYWE6iFGYamU9riQBF4A=";
   };
 
diff --git a/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix b/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
index 9d896f58820b..4b7d6b0c7d62 100644
--- a/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
+++ b/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ferdi265";
     repo = "numix-solarized-gtk-theme";
-    tag = version;
+    rev = version;
     sha256 = "sha256-r5xCe8Ew+/SuCUaZ0yjlumORTy/y1VwbQQjQ6uEyGsY=";
   };
 
diff --git a/pkgs/by-name/nu/numworks-epsilon/package.nix b/pkgs/by-name/nu/numworks-epsilon/package.nix
index 18d120ae7fe8..337322bfb039 100644
--- a/pkgs/by-name/nu/numworks-epsilon/package.nix
+++ b/pkgs/by-name/nu/numworks-epsilon/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numworks";
     repo = "epsilon";
-    tag = version;
+    rev = version;
     hash = "sha256-w9ddcULE1MrGnYcXA0qOg1elQv/eBhcXqhMSjWT3Bkk=";
   };
 
diff --git a/pkgs/by-name/nu/nuraft/package.nix b/pkgs/by-name/nu/nuraft/package.nix
index 748722d31910..1176313a2805 100644
--- a/pkgs/by-name/nu/nuraft/package.nix
+++ b/pkgs/by-name/nu/nuraft/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eBay";
     repo = "NuRaft";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-puO8E7tSLqB0oq/NlzEZqQgIZKm7ZUb4HhR0XuI9dco=";
   };
 
diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix
index 7fb37fe1800e..0946695d21ad 100644
--- a/pkgs/by-name/nu/nurl/package.nix
+++ b/pkgs/by-name/nu/nurl/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nurl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rVqF+16esE27G7GS55RT91tD4x/GAzfVlIR0AgSknz0=";
   };
 
diff --git a/pkgs/by-name/nu/nuv/package.nix b/pkgs/by-name/nu/nuv/package.nix
index 126a07199311..0cd295b98b9c 100644
--- a/pkgs/by-name/nu/nuv/package.nix
+++ b/pkgs/by-name/nu/nuv/package.nix
@@ -25,7 +25,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "nuvolaris";
     repo = "nuv";
-    tag = version;
+    rev = version;
     hash = "sha256-MdnBvlA4S2Mi/bcbE+O02x+wvlIrsK1Zc0dySz4FB/w=";
   };
 
diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix
index a9f4324f1a2e..aedeb2b39599 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kHzwFnN/DbpOe1sYDJkrRMxXE1bMiyuCPsbPGq07M9g=";
   };
 
diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
index d1e154e66592..aa4f28e72e83 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "nvidia";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IH2OjaLbcKSGG44aggolAOuJkjk+GaXnnTbrXfZ0lVo=";
 
   };
diff --git a/pkgs/by-name/nv/nvidia-modprobe/package.nix b/pkgs/by-name/nv/nvidia-modprobe/package.nix
index 9816cc91c59f..594e92923936 100644
--- a/pkgs/by-name/nv/nvidia-modprobe/package.nix
+++ b/pkgs/by-name/nv/nvidia-modprobe/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nvidia-modprobe";
-    tag = version;
+    rev = version;
     hash = "sha256-6/1g66Mr0Ru4V3JMTRXet1aiNa0wrTIGw84QPrCO85c=";
   };
 
diff --git a/pkgs/by-name/nv/nvimpager/package.nix b/pkgs/by-name/nv/nvimpager/package.nix
index 2a4b4928d60f..9a4b8908b2d0 100644
--- a/pkgs/by-name/nv/nvimpager/package.nix
+++ b/pkgs/by-name/nv/nvimpager/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lucc";
     repo = "nvimpager";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Au9rRZMZfU4qHi/ng6JO8FnMpySKDbKzr75SBPY3QiA=";
   };
 
diff --git a/pkgs/by-name/nv/nvme-cli/package.nix b/pkgs/by-name/nv/nvme-cli/package.nix
index 45c50f7a3de8..39f2da237ed5 100644
--- a/pkgs/by-name/nv/nvme-cli/package.nix
+++ b/pkgs/by-name/nv/nvme-cli/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-nvme";
     repo = "nvme-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LkFYkfHeBKC/0kr33DKu7oXxXrtfu1YcpuwzRRWsHpc=";
   };
 
diff --git a/pkgs/by-name/nv/nvmetcfg/package.nix b/pkgs/by-name/nv/nvmetcfg/package.nix
index 85ebb8aa9f49..3de6a040a0fc 100644
--- a/pkgs/by-name/nv/nvmetcfg/package.nix
+++ b/pkgs/by-name/nv/nvmetcfg/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vifino";
     repo = "nvmetcfg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LoQTcHM6czzQ5ZwXcklFXf/7WlRsoJTF61UhQ56aleQ=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-bar/package.nix b/pkgs/by-name/nw/nwg-bar/package.nix
index c71f1b0c1aae..17ef7dea548b 100644
--- a/pkgs/by-name/nw/nwg-bar/package.nix
+++ b/pkgs/by-name/nw/nwg-bar/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5N+WKZ+fuHQ0lVLd95/KkNAwzg/C4ImZ4DnSuKNGunk=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-dock/package.nix b/pkgs/by-name/nw/nwg-dock/package.nix
index 42ee4ab2f1e9..c3cc4c19ea72 100644
--- a/pkgs/by-name/nw/nwg-dock/package.nix
+++ b/pkgs/by-name/nw/nwg-dock/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Ymk4lpX8RAxWot7U+cFtu1eJd6VHP+JS1I2vF0V1T70=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix
index 566c31f1d2ae..f8be91ed1719 100644
--- a/pkgs/by-name/nw/nwg-drawer/package.nix
+++ b/pkgs/by-name/nw/nwg-drawer/package.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-drawer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uctM2fi3lfSrvKSinkjAXD3bLyJOVC0DTyDoAKXgB54=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-launchers/package.nix b/pkgs/by-name/nw/nwg-launchers/package.nix
index 4e7b731e2281..2c79d969f26a 100644
--- a/pkgs/by-name/nw/nwg-launchers/package.nix
+++ b/pkgs/by-name/nw/nwg-launchers/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-launchers";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+waoJHU/QrVH7o9qfwdvFTFJzTGLcV9CeYPn3XHEAkM=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-look/package.nix b/pkgs/by-name/nw/nwg-look/package.nix
index 6fb94f1f697c..ad5a42a26d99 100644
--- a/pkgs/by-name/nw/nwg-look/package.nix
+++ b/pkgs/by-name/nw/nwg-look/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-look";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oP+qcOu03ZKQRdvPKCRVL187QP3gAg2dyvRO94N7+GE=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-menu/package.nix b/pkgs/by-name/nw/nwg-menu/package.nix
index 0b438a1fa3b8..1499989b0451 100644
--- a/pkgs/by-name/nw/nwg-menu/package.nix
+++ b/pkgs/by-name/nw/nwg-menu/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-menu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pWdLSoTeRgr5FPdBWMTVdsnijuwu8fLuNkyIRZ+JEe8=";
   };
 
diff --git a/pkgs/by-name/nw/nwipe/package.nix b/pkgs/by-name/nw/nwipe/package.nix
index 14f4ce0d62ef..b610921a5471 100644
--- a/pkgs/by-name/nw/nwipe/package.nix
+++ b/pkgs/by-name/nw/nwipe/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martijnvanbrummelen";
     repo = "nwipe";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-idSIdq7DKhSwuR1xe9JEws0jIh1juCaz2eSeKvd85D4=";
   };
 
diff --git a/pkgs/by-name/nx/nx-libs/package.nix b/pkgs/by-name/nx/nx-libs/package.nix
index 372dfb9b7ccb..616ab0ee164c 100644
--- a/pkgs/by-name/nx/nx-libs/package.nix
+++ b/pkgs/by-name/nx/nx-libs/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ArcticaProject";
     repo = "nx-libs";
-    tag = version;
+    rev = version;
     sha256 = "sha256-qVOdD85sBMxKYx1cSLAGKeODsKKAm9UPBmYzPBbBOzQ=";
   };
 
diff --git a/pkgs/by-name/ny/nyancat/package.nix b/pkgs/by-name/ny/nyancat/package.nix
index 890d1f8904ad..e69cf3e6870a 100644
--- a/pkgs/by-name/ny/nyancat/package.nix
+++ b/pkgs/by-name/ny/nyancat/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "klange";
     repo = "nyancat";
-    tag = version;
+    rev = version;
     sha256 = "1mg8nm5xzcq1xr8cvx24ym2vmafkw53rijllwcdm9miiz0p5ky9k";
   };
 
diff --git a/pkgs/by-name/oa/oak/package.nix b/pkgs/by-name/oa/oak/package.nix
index 65375d44a733..3584fccfc394 100644
--- a/pkgs/by-name/oa/oak/package.nix
+++ b/pkgs/by-name/oa/oak/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "thesephist";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DK5n8xK57CQiukyBt9+CFK1j8+nphP//T2jTXq64VH8=";
   };
 
diff --git a/pkgs/by-name/oa/oathkeeper/package.nix b/pkgs/by-name/oa/oathkeeper/package.nix
index a4866a74fe58..7801017c0df9 100644
--- a/pkgs/by-name/oa/oathkeeper/package.nix
+++ b/pkgs/by-name/oa/oathkeeper/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "ory";
     repo = "oathkeeper";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-R7xKhKF7mhS/vmSpOj+QDL0OBBWnh42X2Kr3TDQxVIo=";
   };
 
diff --git a/pkgs/by-name/oa/oatpp/package.nix b/pkgs/by-name/oa/oatpp/package.nix
index 9be810131688..92c52aa4a992 100644
--- a/pkgs/by-name/oa/oatpp/package.nix
+++ b/pkgs/by-name/oa/oatpp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oatpp";
     repo = "oatpp";
-    tag = version;
+    rev = version;
     sha256 = "sha256-pTQ0DD4naE9m+6FfCVGg/i3WpNbtaR+38yyqjqN0uH0=";
   };
 
diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix
index 3056c1f6b07e..fa3492eaaf2f 100644
--- a/pkgs/by-name/oa/oauth2-proxy/package.nix
+++ b/pkgs/by-name/oa/oauth2-proxy/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
     repo = pname;
     owner = "oauth2-proxy";
     sha256 = "sha256-RT0uoNRFFZ3BNSwukGZ0P70jtDYAwUI1m+pzFyHnNjU=";
-    tag = "v${version}";
+    rev = "v${version}";
   };
 
   patches = [
diff --git a/pkgs/by-name/oa/oauth2c/package.nix b/pkgs/by-name/oa/oauth2c/package.nix
index 9deee8604e19..cb75d2fc9060 100644
--- a/pkgs/by-name/oa/oauth2c/package.nix
+++ b/pkgs/by-name/oa/oauth2c/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudentity";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-axCzPCYPn6T8AGqE92Yf/aVJ78Wl004Ts4YebSWYa6U=";
   };
 
diff --git a/pkgs/by-name/oa/oauth2l/package.nix b/pkgs/by-name/oa/oauth2l/package.nix
index bc2cba792890..692707d7c788 100644
--- a/pkgs/by-name/oa/oauth2l/package.nix
+++ b/pkgs/by-name/oa/oauth2l/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "oauth2l";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jD8VFyAq6qcQhgvMmJj3D1xWGUvq3tMISbztLf1a72I=";
   };
 
diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix
index ac1d40c7c1a0..2777931a8361 100644
--- a/pkgs/by-name/ob/obs-cmd/package.nix
+++ b/pkgs/by-name/ob/obs-cmd/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "grigio";
     repo = "obs-cmd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-plNLVBSTen11q945qtDBJaNTWKGICbuWokyvRzhu0Wg=";
   };
 
diff --git a/pkgs/by-name/ob/obsidian-export/package.nix b/pkgs/by-name/ob/obsidian-export/package.nix
index 46ffc2d12887..180a46361cb6 100644
--- a/pkgs/by-name/ob/obsidian-export/package.nix
+++ b/pkgs/by-name/ob/obsidian-export/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zoni";
     repo = "obsidian-export";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FcySNccDVeftX5BKVwYXdufsCmG8YuFBQrbSqibbVV8=";
   };
 
diff --git a/pkgs/by-name/oc/ocaml-top/package.nix b/pkgs/by-name/oc/ocaml-top/package.nix
index 09ffa6621725..dd9bed5dd17b 100644
--- a/pkgs/by-name/oc/ocaml-top/package.nix
+++ b/pkgs/by-name/oc/ocaml-top/package.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocaml-top";
-    tag = version;
+    rev = version;
     hash = "sha256-xmPGGB/zUpfeAxUIhR1PhfoESAJq7sTpqHuf++EH3Lw=";
   };
 
diff --git a/pkgs/by-name/oc/ocf-resource-agents/package.nix b/pkgs/by-name/oc/ocf-resource-agents/package.nix
index faf8db25b9ca..b16cfd631d14 100644
--- a/pkgs/by-name/oc/ocf-resource-agents/package.nix
+++ b/pkgs/by-name/oc/ocf-resource-agents/package.nix
@@ -30,7 +30,7 @@ let
     src = fetchFromGitHub {
       owner = "ClusterLabs";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "0haryi3yrszdfpqnkfnppxj1yiy6ipah6m80snvayc7v0ss0wnir";
     };
 
diff --git a/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix b/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
index a3c2f5d70e1c..7814da4e5965 100644
--- a/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
+++ b/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "oci-seccomp-bpf-hook";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1LRwbKOLNBkY/TMTLlWq2lkFzCabXqwdaMRT9HNr6HE=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/oc/ocl-icd/package.nix b/pkgs/by-name/oc/ocl-icd/package.nix
index 6c5c0c000e2b..ba360ae32f75 100644
--- a/pkgs/by-name/oc/ocl-icd/package.nix
+++ b/pkgs/by-name/oc/ocl-icd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OCL-dev";
     repo = "ocl-icd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-nx9Zz5DpS29g1HRIwPAQi6i+d7Blxd53WQ7Sb1a3FHg=";
   };
 
diff --git a/pkgs/by-name/oc/oclgrind/package.nix b/pkgs/by-name/oc/oclgrind/package.nix
index af73f223f712..4e21f36a6652 100644
--- a/pkgs/by-name/oc/oclgrind/package.nix
+++ b/pkgs/by-name/oc/oclgrind/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jrprice";
     repo = "oclgrind";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DGCF7X2rPV1w9guxg2bMylRirXQgez24sG7Unlct3ow=";
   };
 
diff --git a/pkgs/by-name/oc/ocm/package.nix b/pkgs/by-name/oc/ocm/package.nix
index e39090cb014f..f9b2fa28dbad 100644
--- a/pkgs/by-name/oc/ocm/package.nix
+++ b/pkgs/by-name/oc/ocm/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openshift-online";
     repo = "ocm-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0JCmKuSVuSOinJiLDT4dOKNON6PnICum6Smnf3syJfM=";
   };
 
diff --git a/pkgs/by-name/oc/ocproxy/package.nix b/pkgs/by-name/oc/ocproxy/package.nix
index 4a803552fd65..55f69c702696 100644
--- a/pkgs/by-name/oc/ocproxy/package.nix
+++ b/pkgs/by-name/oc/ocproxy/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cernekee";
     repo = "ocproxy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "03323nnhb4y9nzwva04mq7xg03dvdrgp689g89f69jqc261skcqx";
   };
 
diff --git a/pkgs/by-name/oc/ocrodjvu/package.nix b/pkgs/by-name/oc/ocrodjvu/package.nix
index 9db146fcf811..e42ceb81f101 100644
--- a/pkgs/by-name/oc/ocrodjvu/package.nix
+++ b/pkgs/by-name/oc/ocrodjvu/package.nix
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "FriedrichFroebel";
     repo = "ocrodjvu";
-    tag = version;
+    rev = version;
     hash = "sha256-EiMCrRFUAJbu9QLgKpFIKqigCZ77lpTDD6AvZuMbyhA=";
   };
 
diff --git a/pkgs/by-name/oc/ocsigen-i18n/package.nix b/pkgs/by-name/oc/ocsigen-i18n/package.nix
index 646bf48741c8..9ef1f8b35d54 100644
--- a/pkgs/by-name/oc/ocsigen-i18n/package.nix
+++ b/pkgs/by-name/oc/ocsigen-i18n/package.nix
@@ -13,7 +13,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "besport";
     repo = "ocsigen-i18n";
-    tag = version;
+    rev = version;
     hash = "sha256-NIl1YUTws8Ff4nrqdhU7oS/TN0lxVQgrtyEZtpS1ojM=";
   };
 
diff --git a/pkgs/by-name/oc/octomap/package.nix b/pkgs/by-name/oc/octomap/package.nix
index a0be60333f7f..433fbf92555e 100644
--- a/pkgs/by-name/oc/octomap/package.nix
+++ b/pkgs/by-name/oc/octomap/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OctoMap";
     repo = "octomap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QxQHxxFciR6cvB/b8i0mr1hqGxOXhXmB4zgdsD977Mw=";
   };
 
diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix
index e836c192dd8f..3a75f033f772 100644
--- a/pkgs/by-name/oc/octoprint/package.nix
+++ b/pkgs/by-name/oc/octoprint/package.nix
@@ -79,7 +79,7 @@ let
           src = fetchFromGitHub {
             owner = "OctoPrint";
             repo = "OctoPrint-FileCheck";
-            tag = version;
+            rev = version;
             sha256 = "sha256-Y7yvImnYahmrf5GC4c8Ki8IsOZ8r9I4uk8mYBhEQZ28=";
           };
           doCheck = false;
@@ -95,7 +95,7 @@ let
           src = fetchFromGitHub {
             owner = "OctoPrint";
             repo = "OctoPrint-FirmwareCheck";
-            tag = version;
+            rev = version;
             hash = "sha256-wqbD82bhJDrDawJ+X9kZkoA6eqGxqJc1Z5dA0EUwgEI=";
           };
           doCheck = false;
@@ -111,7 +111,7 @@ let
           src = fetchFromGitHub {
             owner = "OctoPrint";
             repo = "OctoPrint-PiSupport";
-            tag = version;
+            rev = version;
             hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew=";
           };
 
@@ -132,7 +132,7 @@ let
           src = fetchFromGitHub {
             owner = "OctoPrint";
             repo = "OctoPrint";
-            tag = version;
+            rev = version;
             hash = "sha256-BToW1/AcQ01OK7RWZrkstX2M4+uKuL/wFB6HGkVUflk=";
           };
 
diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix
index 8f027ceec5fd..c5b076bd2428 100644
--- a/pkgs/by-name/oc/octoprint/plugins.nix
+++ b/pkgs/by-name/oc/octoprint/plugins.nix
@@ -32,7 +32,7 @@ in
     src = fetchFromGitHub {
       owner = "ntoff";
       repo = "Octoprint-M84MotOff";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "1w6h4hia286lbz2gy33rslq02iypx067yqn413xcipb07ivhvdq7";
     };
 
@@ -71,7 +71,7 @@ in
     src = fetchFromGitHub {
       owner = "jneilliii";
       repo = "OctoPrint-BedLevelVisualizer";
-      tag = version;
+      rev = version;
       sha256 = "sha256-6JcYvYgEmphp5zz4xZi4G0yTo4FCIR6Yh+MXYK7H7+w=";
     };
 
@@ -90,7 +90,7 @@ in
     src = fetchFromGitHub {
       owner = "OllisGit";
       repo = "OctoPrint-CostEstimation";
-      tag = version;
+      rev = version;
       sha256 = "sha256-04OPa/RpM8WehUmOp195ocsAjAvKdVY7iD5ybzQO7Dg=";
     };
 
@@ -109,7 +109,7 @@ in
     src = fetchFromGitHub {
       owner = "OctoPrint";
       repo = "OctoPrint-CuraEngineLegacy";
-      tag = version;
+      rev = version;
       sha256 = "sha256-54siSmzgPlnCRpkpZhXU9theNQ3hqL3j+Ip4Ie2w2vA=";
     };
 
@@ -128,7 +128,7 @@ in
     src = fetchFromGitHub {
       owner = "OctoPrint";
       repo = "OctoPrint-DisplayProgress";
-      tag = version;
+      rev = version;
       sha256 = "080prvfwggl4vkzyi369vxh1n8231hrl8a44f399laqah3dn5qw4";
     };
 
@@ -147,7 +147,7 @@ in
     src = fetchFromGitHub {
       owner = "OllisGit";
       repo = "OctoPrint-DisplayLayerProgress";
-      tag = version;
+      rev = version;
       sha256 = "sha256-hhHc2SPixZCPJzCP8enMMWNYaYbNZAU0lNSx1B0d++4=";
     };
 
@@ -185,7 +185,7 @@ in
     src = fetchFromGitHub {
       owner = "OctoPrint";
       repo = "OctoPrint-FirmwareUpdater";
-      tag = version;
+      rev = version;
       sha256 = "sha256-CUNjM/IJJS/lqccZ2B0mDOzv3k8AgmDreA/X9wNJ7iY=";
     };
 
@@ -206,7 +206,7 @@ in
     src = fetchFromGitHub {
       owner = "BillyBlaze";
       repo = "OctoPrint-FullScreen";
-      tag = version;
+      rev = version;
       sha256 = "sha256-Z8twpj+gqgbiWWxNd9I9qflEAln5Obpb3cn34KwSc5A=";
     };
 
@@ -225,7 +225,7 @@ in
     src = fetchFromGitHub {
       owner = "ieatacid";
       repo = "OctoPrint-GcodeEditor";
-      tag = version;
+      rev = version;
       sha256 = "sha256-1Sk2ri3DKW8q8VJ/scFjpRsz65Pwt8OEURP1k70aydE=";
     };
 
@@ -244,7 +244,7 @@ in
     src = fetchFromGitHub {
       owner = "costas-basdekis";
       repo = "MarlinGcodeDocumentation";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-3ay6iCxZk8QkFM/2Y14VTpPoxr6NXq14BFSHofn3q7I=";
     };
 
@@ -263,7 +263,7 @@ in
     src = fetchFromGitHub {
       owner = "OctoPrint";
       repo = "OctoPrint-MQTT";
-      tag = version;
+      rev = version;
       sha256 = "sha256-K8DydzmsDzWn5GXpxPGvAHDFpgk/mbyVBflCgOoB94U=";
     };
 
@@ -284,7 +284,7 @@ in
     src = fetchFromGitHub {
       owner = "synman";
       repo = "OctoPrint-MqttChamberTemperature";
-      tag = version;
+      rev = version;
       sha256 = "sha256-CvNpi8HcBBUfCs3X8yflbhe0YCU0kW3u2ADSro/qnuI=";
     };
 
@@ -305,7 +305,7 @@ in
     src = fetchFromGitHub {
       owner = "imrahil";
       repo = "OctoPrint-NavbarTemp";
-      tag = version;
+      rev = version;
       sha256 = "sha256-ZPpTx+AadRffUb53sZbMUbCZa7xYGQW/5si7UB8mnVI=";
     };
 
@@ -324,7 +324,7 @@ in
     src = fetchFromGitHub {
       owner = "TheSpaghettiDetective";
       repo = "OctoPrint-Obico";
-      tag = version;
+      rev = version;
       sha256 = "sha256-cAUXe/lRTqYuWnrRiNDuDjcayL5yV9/PtTd9oeSC8KA=";
     };
 
@@ -350,7 +350,7 @@ in
     src = fetchFromGitHub {
       owner = "gdombiak";
       repo = "OctoPrint-OctoPod";
-      tag = version;
+      rev = version;
       sha256 = "sha256-9QKC1MsYO3XihOTAijJUv5i20iMSQHOHPfLiYPV5y8s=";
     };
 
@@ -371,7 +371,7 @@ in
     src = fetchFromGitHub {
       owner = "eyal0";
       repo = "OctoPrint-PrintTimeGenius";
-      tag = version;
+      rev = version;
       sha256 = "sha256-hqm8RShCNpsVbrVXquat5VXqcVc7q5tn5+7Ipqmaw4U=";
     };
 
@@ -401,7 +401,7 @@ in
     src = fetchFromGitHub {
       owner = "jneilliii";
       repo = "OctoPrint-PrusaSlicerThumbnails";
-      tag = version;
+      rev = version;
       sha256 = "sha256-5TUx64i3VIUXtpIf4mo3hP//kXE+LuuLaZEJYgv4hVs=";
     };
 
@@ -422,7 +422,7 @@ in
     src = fetchFromGitHub {
       owner = "kantlivelong";
       repo = "OctoPrint-PSUControl";
-      tag = version;
+      rev = version;
       sha256 = "sha256-S+lPm85+ZEO/3BXYsrxE4FU29EGWzWrSw3y1DLdByrM=";
     };
 
@@ -450,7 +450,7 @@ in
     src = fetchFromGitHub {
       owner = "Renaud11232";
       repo = "OctoPrint-Resource-Monitor";
-      tag = version;
+      rev = version;
       sha256 = "sha256-w1PBxO+Qf7cSSNocu7BiulZE7kesSa+LGV3uJlmd0ao=";
     };
 
@@ -471,7 +471,7 @@ in
     src = fetchFromGitHub {
       owner = "Sebclem";
       repo = "OctoPrint-SimpleEmergencyStop";
-      tag = version;
+      rev = version;
       sha256 = "sha256-MbP3cKa9FPElQ/M8ykYh9kVXl8hNvmGiCHDvjgWvm9k=";
     };
 
@@ -509,7 +509,7 @@ in
     src = fetchFromGitHub {
       owner = "fabianonline";
       repo = "OctoPrint-Telegram";
-      tag = version;
+      rev = version;
       sha256 = "sha256-SckJCbPNCflgGYLHFiXy0juCtpvo8YS1BQsFpc1f5rg=";
     };
 
@@ -530,7 +530,7 @@ in
     src = fetchFromGitHub {
       owner = "Birkbjo";
       repo = "Octoprint-Themeify";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-om9IUSmxU8y0x8DrodW1EU/pilAN3+PbtYck6KfROEg=";
     };
 
@@ -549,7 +549,7 @@ in
     src = fetchFromGitHub {
       owner = "jneilliii";
       repo = "OctoPrint-TimelapsePurger";
-      tag = version;
+      rev = version;
       sha256 = "sha256-XS4m4KByScGTPfVE4kuRLw829gNE2CdM0RyhRqGGxyw=";
     };
 
@@ -568,7 +568,7 @@ in
     src = fetchFromGitHub {
       owner = "MoonshineSG";
       repo = "OctoPrint-TitleStatus";
-      tag = version;
+      rev = version;
       sha256 = "10nxjrixg0i6n6x8ghc1ndshm25c97bvkcis5j9kmlkkzs36i2c6";
     };
 
@@ -587,7 +587,7 @@ in
     src = fetchFromGitHub {
       owner = "BillyBlaze";
       repo = "OctoPrint-TouchUI";
-      tag = version;
+      rev = version;
       sha256 = "sha256-PNDCjY7FhfnwK7Nd86el9ZQ00G4uMANH2Sk080iMYXw=";
     };
 
@@ -606,7 +606,7 @@ in
     src = fetchFromGitHub {
       owner = "AliceGrey";
       repo = "OctoprintKlipperPlugin";
-      tag = version;
+      rev = version;
       sha256 = "sha256-6r5jJDSR0DxlDQ/XWmQgYUgeL1otNNBnwurX7bbcThg=";
     };
 
@@ -625,7 +625,7 @@ in
     src = fetchFromGitHub {
       owner = "FormerLurker";
       repo = "Octolapse";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-QP6PkKWKUv4uIaYdqTAsZmK7DVes94Q9K/DrBYrWxzY=";
     };
 
@@ -672,7 +672,7 @@ in
     src = fetchFromGitHub {
       owner = "StefanCohen";
       repo = "OctoPrint-Dashboard";
-      tag = version;
+      rev = version;
       sha256 = "sha256-hLHT3Uze/6PlOCEICVZ2ieFTyXgcqCvgHOlIIEquujg=";
     };
 
diff --git a/pkgs/by-name/oc/octopus-caller/package.nix b/pkgs/by-name/oc/octopus-caller/package.nix
index d1ab920c971b..87fae180408f 100644
--- a/pkgs/by-name/oc/octopus-caller/package.nix
+++ b/pkgs/by-name/oc/octopus-caller/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "luntergroup";
     repo = "octopus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FAogksVxUlzMlC0BqRu22Vchj6VX+8yNlHRLyb3g1sE=";
   };
 
diff --git a/pkgs/by-name/oc/octosql/package.nix b/pkgs/by-name/oc/octosql/package.nix
index 58013f6293f6..51be01c38baf 100644
--- a/pkgs/by-name/oc/octosql/package.nix
+++ b/pkgs/by-name/oc/octosql/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cube2222";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kzbIts5d2KmFfaAnOdpIXI1fiqBYXe5t981g4Uyk/cc=";
   };
 
diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix
index 7c848e10e8f7..332329aac083 100644
--- a/pkgs/by-name/oc/oculante/package.nix
+++ b/pkgs/by-name/oc/oculante/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "woelper";
     repo = "oculante";
-    tag = version;
+    rev = version;
     hash = "sha256-3kDrsD24/TNcA7NkwwCHN4ez1bC5MP7g28H3jaO/M7E=";
   };
 
diff --git a/pkgs/by-name/od/odin2/package.nix b/pkgs/by-name/od/odin2/package.nix
index 272dddea2f06..40beb4b2a582 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY=";
   };
diff --git a/pkgs/by-name/od/odo/package.nix b/pkgs/by-name/od/odo/package.nix
index 947383659434..2ebfc08a7669 100644
--- a/pkgs/by-name/od/odo/package.nix
+++ b/pkgs/by-name/od/odo/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "odo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zEN8yfjW3JHf6OzPQC6Rg2/hJ+3d9d2nYhz60BdSK9s=";
   };
 
diff --git a/pkgs/by-name/od/odoo15/package.nix b/pkgs/by-name/od/odoo15/package.nix
index 793f44c94761..c149bf1ee2bb 100644
--- a/pkgs/by-name/od/odoo15/package.nix
+++ b/pkgs/by-name/od/odoo15/package.nix
@@ -20,7 +20,7 @@ let
         src = fetchFromGitHub {
           owner = "py-pdf";
           repo = "pypdf";
-          tag = version;
+          rev = version;
           fetchSubmodules = true;
           hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4=";
         };
diff --git a/pkgs/by-name/od/odp-dpdk/package.nix b/pkgs/by-name/od/odp-dpdk/package.nix
index 546eda3fcc0e..0c8ef1005e6f 100644
--- a/pkgs/by-name/od/odp-dpdk/package.nix
+++ b/pkgs/by-name/od/odp-dpdk/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenDataPlane";
     repo = "odp-dpdk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9stWGupRSQwUXOdPEQ9Rhkim22p5BBA5Z+2JCYS7Za0=";
   };
 
diff --git a/pkgs/by-name/od/odpic/package.nix b/pkgs/by-name/od/odpic/package.nix
index a41bcde16a7c..e4d51a46932c 100644
--- a/pkgs/by-name/od/odpic/package.nix
+++ b/pkgs/by-name/od/odpic/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "odpi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CvsQ/w5r0d/l0m6wkgZtVBkX66Hcrz4U3b8qpHM0Dm8=";
   };
 
diff --git a/pkgs/by-name/od/odyssey/package.nix b/pkgs/by-name/od/odyssey/package.nix
index e7165dc4c43c..39766cf81224 100644
--- a/pkgs/by-name/od/odyssey/package.nix
+++ b/pkgs/by-name/od/odyssey/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yandex";
     repo = "odyssey";
-    tag = version;
+    rev = version;
     sha256 = "sha256-1ALTKRjpKmmFcAuhmgpcbJBkNuUlTyau8xWDRHh7gf0=";
   };
 
diff --git a/pkgs/by-name/of/offensive-azure/package.nix b/pkgs/by-name/of/offensive-azure/package.nix
index 69b2f7744520..0243bab6a458 100644
--- a/pkgs/by-name/of/offensive-azure/package.nix
+++ b/pkgs/by-name/of/offensive-azure/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "blacklanternsecurity";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5JHix+/uGGhXM89VLimI81g4evci5ZUtNV1c1xopjuI=";
   };
 
diff --git a/pkgs/by-name/of/office-code-pro/package.nix b/pkgs/by-name/of/office-code-pro/package.nix
index baa0ba49a04e..4413664ead8f 100644
--- a/pkgs/by-name/of/office-code-pro/package.nix
+++ b/pkgs/by-name/of/office-code-pro/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nathco";
     repo = "Office-Code-Pro";
-    tag = version;
+    rev = version;
     hash = "sha256-qzKTXYswkithZUJT0a3IifCq4RJFeKciZAPhYr2U1X4=";
   };
 
diff --git a/pkgs/by-name/of/offlineimap/package.nix b/pkgs/by-name/of/offlineimap/package.nix
index 64378169c390..97cc447cedb4 100644
--- a/pkgs/by-name/of/offlineimap/package.nix
+++ b/pkgs/by-name/of/offlineimap/package.nix
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "OfflineIMAP";
     repo = "offlineimap3";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XLxKqO5OCXsFu8S3lMp2Ke5hp6uer9npZ3ujmL6Kb3g=";
   };
 
diff --git a/pkgs/by-name/oh/oh-my-git/package.nix b/pkgs/by-name/oh/oh-my-git/package.nix
index b7fdfb774699..b7f08cffd885 100644
--- a/pkgs/by-name/oh/oh-my-git/package.nix
+++ b/pkgs/by-name/oh/oh-my-git/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "git-learning-game";
     repo = "oh-my-git";
-    tag = version;
+    rev = version;
     sha256 = "sha256-XqxliMVU55D5JSt7Yo5btvZnnTlagSukyhXv6Akgklo=";
   };
 
diff --git a/pkgs/by-name/oh/oh/package.nix b/pkgs/by-name/oh/oh/package.nix
index d617a2c44064..0277d0194405 100644
--- a/pkgs/by-name/oh/oh/package.nix
+++ b/pkgs/by-name/oh/oh/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "michaelmacinnis";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ryIh6MRIOVZPm2USpJC69Z/upIXGUHgcd17eZBA9Edc=";
   };
 
diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix
index 14da79406dc8..5f2eeb6492b2 100644
--- a/pkgs/by-name/oi/oidc-agent/package.nix
+++ b/pkgs/by-name/oi/oidc-agent/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "indigo-dc";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Vj/YoZpbiV8psU70i3SIKJM/qPQYuy96ogEhT8cG7RU=";
   };
 
diff --git a/pkgs/by-name/oi/oil-buku/package.nix b/pkgs/by-name/oi/oil-buku/package.nix
index c18a082ba397..58ad6883843a 100644
--- a/pkgs/by-name/oi/oil-buku/package.nix
+++ b/pkgs/by-name/oi/oil-buku/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AndreiUlmeyda";
     repo = "oil";
-    tag = version;
+    rev = version;
     sha256 = "12g0fd7h11hh94b2pyg3pqwbf8bc7gcnrnm1qqbf18s6z02b6ixr";
   };
 
diff --git a/pkgs/by-name/oi/oink/package.nix b/pkgs/by-name/oi/oink/package.nix
index fca7afae70fb..aac1061ba60e 100644
--- a/pkgs/by-name/oi/oink/package.nix
+++ b/pkgs/by-name/oi/oink/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rlado";
     repo = "oink";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MBNEMIrpJdXzMjmNwmKXTIzPNNGalElhIxmMU4y6zXo=";
   };
 
diff --git a/pkgs/by-name/ok/okolors/package.nix b/pkgs/by-name/ok/okolors/package.nix
index 02a4794e75f6..38af371921c0 100644
--- a/pkgs/by-name/ok/okolors/package.nix
+++ b/pkgs/by-name/ok/okolors/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Ivordir";
     repo = "Okolors";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-U7rLynXZGHCeZjaXoXx2IRDgUFv7zOKfb4BPgDROzBc=";
   };
 
diff --git a/pkgs/by-name/ok/okta-aws-cli/package.nix b/pkgs/by-name/ok/okta-aws-cli/package.nix
index f3b7ec3d5767..10a9d4ea348c 100644
--- a/pkgs/by-name/ok/okta-aws-cli/package.nix
+++ b/pkgs/by-name/ok/okta-aws-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "okta";
     repo = "okta-aws-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-4S7pXPdHUgMNg+3bCsalEH9m9Hl15mX9IEl2eBqIWqA=";
   };
 
diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix
index 6726e5d529c4..487b28c0d990 100644
--- a/pkgs/by-name/ok/okteto/package.nix
+++ b/pkgs/by-name/ok/okteto/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
-    tag = version;
+    rev = version;
     hash = "sha256-vi2ow95a3btiR4yINunEa56SUGWlbgNdMdS/T747a+U=";
   };
 
diff --git a/pkgs/by-name/ol/olsrd/package.nix b/pkgs/by-name/ol/olsrd/package.nix
index 420f992fcca5..e0b709dbf816 100644
--- a/pkgs/by-name/ol/olsrd/package.nix
+++ b/pkgs/by-name/ol/olsrd/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OLSR";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xk355dm5pfjil1j4m724vkdnc178lv6hi6s1g0xgpd59avbx90j";
   };
 
diff --git a/pkgs/by-name/om/omekasy/package.nix b/pkgs/by-name/om/omekasy/package.nix
index 8ff9c5d57f22..313366cca936 100644
--- a/pkgs/by-name/om/omekasy/package.nix
+++ b/pkgs/by-name/om/omekasy/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ikanago";
     repo = "omekasy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wI+xN6pyNoP4xknjHHDydHq275Gb1nyp7YtqmABlTBA=";
   };
 
diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix
index 65906e822225..de52df25d619 100644
--- a/pkgs/by-name/om/omnictl/package.nix
+++ b/pkgs/by-name/om/omnictl/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "omni";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/hv6YNaBfECFlf1xJCiSeWg+/PqmIa+Rtip6kFuHPCM=";
   };
 
diff --git a/pkgs/by-name/om/omping/package.nix b/pkgs/by-name/om/omping/package.nix
index 214d97cdf48c..4e39e8294d83 100644
--- a/pkgs/by-name/om/omping/package.nix
+++ b/pkgs/by-name/om/omping/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "omping";
-    tag = version;
+    rev = version;
     sha256 = "1f0vsbnhxp7bbgdnfqshryx3nhz2sqdnxdj068s0nmzsh53ckbf7";
   };
 
diff --git a/pkgs/by-name/on/one-click-backup/package.nix b/pkgs/by-name/on/one-click-backup/package.nix
index 186423ca80bc..26ae411f0fed 100644
--- a/pkgs/by-name/on/one-click-backup/package.nix
+++ b/pkgs/by-name/on/one-click-backup/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "dev-nis";
     repo = "nis-one-click-backup-qt";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-F+gA+Z4gZoNJYdy28uIjqiJcwcNsyUzl6BXsiIZO0gE=";
   };
 
diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix
index f76931c620df..d03bc1e07943 100644
--- a/pkgs/by-name/on/onedrivegui/package.nix
+++ b/pkgs/by-name/on/onedrivegui/package.nix
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bpozdena";
     repo = "OneDriveGUI";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pcY1JOi74pePvkIMRuHv5mlE4F68NzuBLJTCtgjUFRw=";
   };
 
diff --git a/pkgs/by-name/on/onedriver/package.nix b/pkgs/by-name/on/onedriver/package.nix
index 1e9a2e6eb223..76c5ae58f0c3 100644
--- a/pkgs/by-name/on/onedriver/package.nix
+++ b/pkgs/by-name/on/onedriver/package.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "jstaf";
     repo = "onedriver";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mA5otgqXQAw2UYUOJaC1zyJuzEu2OS/pxmjJnWsVdxs=";
   };
 in
diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix
index 0e71e2e1ffc6..6da20b868e16 100644
--- a/pkgs/by-name/on/onefetch/package.nix
+++ b/pkgs/by-name/on/onefetch/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "o2sh";
     repo = "onefetch";
-    tag = version;
+    rev = version;
     hash = "sha256-lQxv2gwZOGtxJrXjxvjBnbl225ppSs3cVNCfePFeqEE=";
   };
 
diff --git a/pkgs/by-name/on/oneshot/package.nix b/pkgs/by-name/on/oneshot/package.nix
index 6ab40b06b56a..f7b57d070b72 100644
--- a/pkgs/by-name/on/oneshot/package.nix
+++ b/pkgs/by-name/on/oneshot/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "forestnode-io";
     repo = "oneshot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eEVjdFHZyk2bSVqrMJIsgZvvLoDOira8zTzX9oDNtHM=";
   };
 
diff --git a/pkgs/by-name/on/onetun/package.nix b/pkgs/by-name/on/onetun/package.nix
index 1b78875b26dc..000163a2fdb6 100644
--- a/pkgs/by-name/on/onetun/package.nix
+++ b/pkgs/by-name/on/onetun/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aramperes";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bggBBl2YQUncfOYIDsPgrHPwznCJQOlIOY3bbiZz7Rw=";
   };
 
diff --git a/pkgs/by-name/on/onmetal-image/package.nix b/pkgs/by-name/on/onmetal-image/package.nix
index 7a12f949058c..1ab6200b5370 100644
--- a/pkgs/by-name/on/onmetal-image/package.nix
+++ b/pkgs/by-name/on/onmetal-image/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "onmetal";
     repo = "onmetal-image";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KvOBvAIE9V2bj5prdcc8G5ifHsvybHBCYWrI4fWtdvE=";
   };
 
diff --git a/pkgs/by-name/on/onscripter-en/package.nix b/pkgs/by-name/on/onscripter-en/package.nix
index 50b2b325ac3d..e333459d8ff9 100644
--- a/pkgs/by-name/on/onscripter-en/package.nix
+++ b/pkgs/by-name/on/onscripter-en/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "onscripter-en";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Lc5ZlH2C4ER02NmQ6icfiqpzVQdVUnOmdywGjjjSYSg=";
   };
 
diff --git a/pkgs/by-name/oo/oo7/package.nix b/pkgs/by-name/oo/oo7/package.nix
index c635c09aed5a..a8423aafa988 100644
--- a/pkgs/by-name/oo/oo7/package.nix
+++ b/pkgs/by-name/oo/oo7/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bilelmoussaoui";
     repo = "oo7";
-    tag = version;
+    rev = version;
     hash = "sha256-P20hxwTT/O4o+Z1LnXJJkeEHv1IILfj4/pPMNde55mY=";
   };
 
diff --git a/pkgs/by-name/oo/oonf-olsrd2/package.nix b/pkgs/by-name/oo/oonf-olsrd2/package.nix
index f8e389c3ec9d..8f64185dd51b 100644
--- a/pkgs/by-name/oo/oonf-olsrd2/package.nix
+++ b/pkgs/by-name/oo/oonf-olsrd2/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OLSR";
     repo = "OONF";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7EH2K7gaBGD95WFlG6RRhKEWJm91Xv2GOHYQjZWuzl0=";
   };
 
diff --git a/pkgs/by-name/oo/ooniprobe-cli/package.nix b/pkgs/by-name/oo/ooniprobe-cli/package.nix
index 2232ddf7e6cf..9c14e54425d8 100644
--- a/pkgs/by-name/oo/ooniprobe-cli/package.nix
+++ b/pkgs/by-name/oo/ooniprobe-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ooni";
     repo = "probe-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jg09yIX3jHMp0PwSwy2RMwYhZm0haJFTmpwcyTc5I0A=";
   };
 
diff --git a/pkgs/by-name/op/opaline/package.nix b/pkgs/by-name/op/opaline/package.nix
index b1fca8f9e25d..f65c5cd3634d 100644
--- a/pkgs/by-name/op/opaline/package.nix
+++ b/pkgs/by-name/op/opaline/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jaapb";
     repo = "opaline";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6htaiFIcRMUYWn0U7zTNfCyDaTgDEvPch2q57qzvND4=";
   };
 
diff --git a/pkgs/by-name/op/opam-publish/package.nix b/pkgs/by-name/op/opam-publish/package.nix
index 3ac56dbcdcfa..994b7ecad4a1 100644
--- a/pkgs/by-name/op/opam-publish/package.nix
+++ b/pkgs/by-name/op/opam-publish/package.nix
@@ -24,7 +24,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-opam";
     repo = "opam-publish";
-    tag = version;
+    rev = version;
     hash = "sha256-HjMba80c4vOEm9p7r0cfFBf3y0XoFf986XjTDCPzn38=";
   };
 
diff --git a/pkgs/by-name/op/opam2json/package.nix b/pkgs/by-name/op/opam2json/package.nix
index 5f70a796520c..072042494793 100644
--- a/pkgs/by-name/op/opam2json/package.nix
+++ b/pkgs/by-name/op/opam2json/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "opam2json";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM=";
   };
 
diff --git a/pkgs/by-name/op/opcr-policy/package.nix b/pkgs/by-name/op/opcr-policy/package.nix
index 22c7f15aa054..7a9d9eb298aa 100644
--- a/pkgs/by-name/op/opcr-policy/package.nix
+++ b/pkgs/by-name/op/opcr-policy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "opcr-io";
     repo = "policy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vTUlC/LQTQEpzd1AXgcJJBZXmbSuX8JACbM60KVuT9E=";
   };
   vendorHash = "sha256-3KBHK9CKn9h45eq0wAwLivm3Lj3COGYn/zGltonLP9k=";
diff --git a/pkgs/by-name/op/opcua-commander/package.nix b/pkgs/by-name/op/opcua-commander/package.nix
index e6ecdd748523..ac137b7fe184 100644
--- a/pkgs/by-name/op/opcua-commander/package.nix
+++ b/pkgs/by-name/op/opcua-commander/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "node-opcua";
     repo = "opcua-commander";
-    tag = version;
+    rev = version;
     hash = "sha256-7KYwIdrhlvGR9RHZBfMFOcBa+opwx7Q/crCdvwZD6Y8=";
   };
 
diff --git a/pkgs/by-name/op/open-dyslexic/package.nix b/pkgs/by-name/op/open-dyslexic/package.nix
index 16fcb086062e..9df85f40a824 100644
--- a/pkgs/by-name/op/open-dyslexic/package.nix
+++ b/pkgs/by-name/op/open-dyslexic/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "antijingoist";
     repo = "opendyslexic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-a8hh8NGt5djj9EC7ChO3SnnjuYMOryzbHWTK4gC/vIw=";
   };
 
diff --git a/pkgs/by-name/op/open-fprintd/package.nix b/pkgs/by-name/op/open-fprintd/package.nix
index 6720462f6e03..1bdb2f2cade4 100644
--- a/pkgs/by-name/op/open-fprintd/package.nix
+++ b/pkgs/by-name/op/open-fprintd/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "uunicorn";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU=";
   };
 
diff --git a/pkgs/by-name/op/open-in-mpv/package.nix b/pkgs/by-name/op/open-in-mpv/package.nix
index 5e4c16deed89..175f65d615e6 100644
--- a/pkgs/by-name/op/open-in-mpv/package.nix
+++ b/pkgs/by-name/op/open-in-mpv/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Baldomo";
     repo = "open-in-mpv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mr1c2L5D1v+4VoPA4i5q7/RCdWLLZ1UfTGayiG5Nm6M=";
   };
 
diff --git a/pkgs/by-name/op/open-isns/package.nix b/pkgs/by-name/op/open-isns/package.nix
index 4ee7f33bde6d..8488668da2b2 100644
--- a/pkgs/by-name/op/open-isns/package.nix
+++ b/pkgs/by-name/op/open-isns/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "open-iscsi";
     repo = "open-isns";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-buqQMsoxRCbWiBDq0XAg93J7bjbdxeIernV8sDVxCAA=";
   };
 
diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index c40b392dce9b..517bb13383e7 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9pLySzYfLyRcbhKz+zusBFHNVnhtGyqlsrNr1AzDQx0=";
   };
 
diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix
index 098227a38607..7ae098af1898 100644
--- a/pkgs/by-name/op/open-scq30/package.nix
+++ b/pkgs/by-name/op/open-scq30/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Oppzippy";
     repo = "OpenSCQ30";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DL2hYm1j27K0nnBvE3iGnguqm0m1k56bkuG+6+u4u4c=";
   };
 
diff --git a/pkgs/by-name/op/open-stage-control/package.nix b/pkgs/by-name/op/open-stage-control/package.nix
index 1e85817b1a88..7df60380a38f 100644
--- a/pkgs/by-name/op/open-stage-control/package.nix
+++ b/pkgs/by-name/op/open-stage-control/package.nix
@@ -18,7 +18,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jean-emmanuel";
     repo = "open-stage-control";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hBQyz6VAtiC1XOADZml1MwGKtmdyiJNlRAmHRjt6QsA=";
   };
 
diff --git a/pkgs/by-name/op/openapi-changes/package.nix b/pkgs/by-name/op/openapi-changes/package.nix
index 5c4a9c9c0fb0..ad81688f85dd 100644
--- a/pkgs/by-name/op/openapi-changes/package.nix
+++ b/pkgs/by-name/op/openapi-changes/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pb33f";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Z+jFfsreJYLdvxfFjmTr8SKHOV22iNDFKYUdi9/8QRI=";
   };
 
diff --git a/pkgs/by-name/op/openapi-tui/package.nix b/pkgs/by-name/op/openapi-tui/package.nix
index 3d146b95a186..c660c55daafd 100644
--- a/pkgs/by-name/op/openapi-tui/package.nix
+++ b/pkgs/by-name/op/openapi-tui/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zaghaghi";
     repo = "openapi-tui";
-    tag = version;
+    rev = version;
     hash = "sha256-rC0lfWZpiiAAShyVDqr1gKTeWmWC+gVp4UmL96Y81mE=";
   };
 
diff --git a/pkgs/by-name/op/openbgpd/package.nix b/pkgs/by-name/op/openbgpd/package.nix
index 57eff21cf0a4..a6decdcf8ff6 100644
--- a/pkgs/by-name/op/openbgpd/package.nix
+++ b/pkgs/by-name/op/openbgpd/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openbgpd-portable";
     repo = "openbgpd-portable";
-    tag = version;
+    rev = version;
     sha256 = "sha256-TKs6tt/SCWes6kYAGIrSShZgOLf7xKh26xG3Zk7wCCw=";
   };
 
diff --git a/pkgs/by-name/op/openboardview/package.nix b/pkgs/by-name/op/openboardview/package.nix
index cac2e5b52f6b..c68764ee1f6a 100644
--- a/pkgs/by-name/op/openboardview/package.nix
+++ b/pkgs/by-name/op/openboardview/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenBoardView";
     repo = "OpenBoardView";
-    tag = version;
+    rev = version;
     hash = "sha256-sKDDOPpCagk7rBRlMlZhx+RYYbtoLzJsrnL8qKZMKW8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/op/opencbm/package.nix b/pkgs/by-name/op/opencbm/package.nix
index 9f1a1d15d440..88fc9aa8a15b 100644
--- a/pkgs/by-name/op/opencbm/package.nix
+++ b/pkgs/by-name/op/opencbm/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenCBM";
     repo = "OpenCBM";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5lj5F79Gbhrvi9dxKGobdyDyBLGcptAtxx9SANhLrKw=";
   };
 
diff --git a/pkgs/by-name/op/opencl-clhpp/package.nix b/pkgs/by-name/op/opencl-clhpp/package.nix
index d9dbcd047b11..241c80190e18 100644
--- a/pkgs/by-name/op/opencl-clhpp/package.nix
+++ b/pkgs/by-name/op/opencl-clhpp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-CLHPP";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bIm4tGqwWX0IPKH3BwLgkf0T7YFrkN6vemYvdPrqUpw=";
   };
 
diff --git a/pkgs/by-name/op/opencollada/package.nix b/pkgs/by-name/op/opencollada/package.nix
index b30c14dcc2c0..58d743702fee 100644
--- a/pkgs/by-name/op/opencollada/package.nix
+++ b/pkgs/by-name/op/opencollada/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCOLLADA";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w";
   };
 
diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix
index 8b614272063c..df42e0e4eef1 100644
--- a/pkgs/by-name/op/opencommit/package.nix
+++ b/pkgs/by-name/op/opencommit/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "di-sukharev";
     repo = "opencommit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vmVOrNwUsgB3iBvO8QhpJfI2OO0Kb9ZthcAXVaQ2cBM=";
   };
 
diff --git a/pkgs/by-name/op/opencryptoki/package.nix b/pkgs/by-name/op/opencryptoki/package.nix
index 51857c5ff15c..45e90cc1a346 100644
--- a/pkgs/by-name/op/opencryptoki/package.nix
+++ b/pkgs/by-name/op/opencryptoki/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opencryptoki";
     repo = "opencryptoki";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5FcvwGTzsL0lYrSYGlbSY89s6OKzg+2TRlwHlJjdzXo=";
   };
 
diff --git a/pkgs/by-name/op/opendune/package.nix b/pkgs/by-name/op/opendune/package.nix
index f8da063095bb..38727c388ebb 100644
--- a/pkgs/by-name/op/opendune/package.nix
+++ b/pkgs/by-name/op/opendune/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenDUNE";
     repo = "OpenDUNE";
-    tag = version;
+    rev = version;
     sha256 = "15rvrnszdy3db8s0dmb696l4isb3x2cpj7wcl4j09pdi59pc8p37";
   };
 
diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix
index aea25cb6b83a..52648b3ae2d8 100644
--- a/pkgs/by-name/op/openfga-cli/package.nix
+++ b/pkgs/by-name/op/openfga-cli/package.nix
@@ -16,7 +16,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-p68dlo6U8cgwHzY6lkukSglNOAWtjAFwX163bpXCIl0=";
   };
 
diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 917896b747cd..69c7e761b0f3 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -16,7 +16,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "openfga";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Hg6mtePtaZ2Yg3ohDVEDFsZKcBDY24K2lb+avZHfqD8=";
   };
 
diff --git a/pkgs/by-name/op/openhmd/package.nix b/pkgs/by-name/op/openhmd/package.nix
index d9f065314bab..f2d8b845d7c2 100644
--- a/pkgs/by-name/op/openhmd/package.nix
+++ b/pkgs/by-name/op/openhmd/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenHMD";
     repo = "OpenHMD";
-    tag = version;
+    rev = version;
     sha256 = "1hkpdl4zgycag5k8njvqpx01apxmm8m8pvhlsxgxpqiqy9a38ccg";
   };
 
diff --git a/pkgs/by-name/op/openiscsi/package.nix b/pkgs/by-name/op/openiscsi/package.nix
index ac88d4406d3f..bf5dede122aa 100644
--- a/pkgs/by-name/op/openiscsi/package.nix
+++ b/pkgs/by-name/op/openiscsi/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "open-iscsi";
     repo = "open-iscsi";
-    tag = version;
+    rev = version;
     hash = "sha256-Xs2EiNSkRtAQPoagCAKl07VndYKDspGLchxMvsfvTi0=";
   };
 
diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix
index e042201e1cae..8462ce052540 100644
--- a/pkgs/by-name/op/openjpeg/package.nix
+++ b/pkgs/by-name/op/openjpeg/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uclouvain";
     repo = "openjpeg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw=";
   };
 
diff --git a/pkgs/by-name/op/openjph/package.nix b/pkgs/by-name/op/openjph/package.nix
index 19d73870776e..9067323c5bb6 100644
--- a/pkgs/by-name/op/openjph/package.nix
+++ b/pkgs/by-name/op/openjph/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "aous72";
     repo = "openjph";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-pmFoaQC1WLqtxMkkC7myzkNk0zgQ90CzPFg+F1Y0a/k=";
   };
 
diff --git a/pkgs/by-name/op/openlibm/package.nix b/pkgs/by-name/op/openlibm/package.nix
index 5d3bd73b283b..be0cb6996efc 100644
--- a/pkgs/by-name/op/openlibm/package.nix
+++ b/pkgs/by-name/op/openlibm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JuliaLang";
     repo = "openlibm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HFSRrTdIhbbSyeU/FSo5e2ZI5tff2ZDEFgYcI412ATU=";
   };
 
diff --git a/pkgs/by-name/op/openlierox/package.nix b/pkgs/by-name/op/openlierox/package.nix
index accc6f1be66e..f1fa65c403de 100644
--- a/pkgs/by-name/op/openlierox/package.nix
+++ b/pkgs/by-name/op/openlierox/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "albertz";
     repo = "openlierox";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-4ofjroEHlfrQitc7M+YTNWut0LGgntgQoOeBWU8nscY=";
   };
 
diff --git a/pkgs/by-name/op/openmm/package.nix b/pkgs/by-name/op/openmm/package.nix
index c0f817c337f5..0ffc4da34d1f 100644
--- a/pkgs/by-name/op/openmm/package.nix
+++ b/pkgs/by-name/op/openmm/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openmm";
     repo = "openmm";
-    tag = version;
+    rev = version;
     hash = "sha256-p0zjr8ONqGK4Vbnhljt16DeyeZ0bR1kE+YdiIlw/1L0=";
   };
 
diff --git a/pkgs/by-name/op/openmolcas/package.nix b/pkgs/by-name/op/openmolcas/package.nix
index 736116deb25b..35d244cec9a0 100644
--- a/pkgs/by-name/op/openmolcas/package.nix
+++ b/pkgs/by-name/op/openmolcas/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "Molcas";
     repo = "OpenMolcas";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LXxr/xqBHG7a0rOBrb8IMZ4IjZak3NsBw40Qf+z1fic=";
   };
 
diff --git a/pkgs/by-name/op/openorienteering-mapper/package.nix b/pkgs/by-name/op/openorienteering-mapper/package.nix
index 7bfe0cb4d679..e13124d94dac 100644
--- a/pkgs/by-name/op/openorienteering-mapper/package.nix
+++ b/pkgs/by-name/op/openorienteering-mapper/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenOrienteering";
     repo = "mapper";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BQbryRV5diBkOtva9sYuLD8yo3IwFqrkz3qC+C6eEfE=";
   };
 
diff --git a/pkgs/by-name/op/openresolv/package.nix b/pkgs/by-name/op/openresolv/package.nix
index c9eba46b09e4..f1bbd9640491 100644
--- a/pkgs/by-name/op/openresolv/package.nix
+++ b/pkgs/by-name/op/openresolv/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NetworkConfiguration";
     repo = "openresolv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rpfzAIzuiO+QTFhN+tHND+OQOyX/GUPvLLX3CSSwqA4=";
   };
 
diff --git a/pkgs/by-name/op/openrussian-cli/package.nix b/pkgs/by-name/op/openrussian-cli/package.nix
index 32372e890509..64c15b8092b7 100644
--- a/pkgs/by-name/op/openrussian-cli/package.nix
+++ b/pkgs/by-name/op/openrussian-cli/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rhaberkorn";
     repo = "openrussian-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-lu13Dd3D4P/7Yol1ixt86BHk86y8DMsbFzfi244+KuY=";
   };
 
diff --git a/pkgs/by-name/op/opensaml-cpp/package.nix b/pkgs/by-name/op/opensaml-cpp/package.nix
index 09a73fe6f1f3..9eac6e3074da 100644
--- a/pkgs/by-name/op/opensaml-cpp/package.nix
+++ b/pkgs/by-name/op/opensaml-cpp/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.shibboleth.net/git/cpp-opensaml.git";
-    tag = version;
+    rev = version;
     sha256 = "0ms3sqmwqkrqb92d7jy2hqwnz5yd7cbrz73n321jik0jilrwl5w8";
   };
 
diff --git a/pkgs/by-name/op/openscap/package.nix b/pkgs/by-name/op/openscap/package.nix
index 2c33ccb12b81..92df65d4a402 100644
--- a/pkgs/by-name/op/openscap/package.nix
+++ b/pkgs/by-name/op/openscap/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenSCAP";
     repo = "openscap";
-    tag = version;
+    rev = version;
     hash = "sha256-omPGm3VSLmwEIzInIORLfJf7wreRyxbDOXTRl05mAz0=";
   };
 
diff --git a/pkgs/by-name/op/openseachest/package.nix b/pkgs/by-name/op/openseachest/package.nix
index fd673c9dcf5f..94b42f0f2bfe 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1vfWX6uTQcM6K6wu9Ygu2xZV4nXm6VnwNHmQ2ceh62s=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/op/opensearch-cli/package.nix b/pkgs/by-name/op/opensearch-cli/package.nix
index 5fc5e0c09b85..7a5c5d40cb7a 100644
--- a/pkgs/by-name/op/opensearch-cli/package.nix
+++ b/pkgs/by-name/op/opensearch-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "opensearch-cli";
     owner = "opensearch-project";
-    tag = version;
+    rev = version;
     hash = "sha256-Ah64a9hpc2tnIXiwxg/slE6fUTAoHv9koNmlUHrVj/s=";
   };
 
diff --git a/pkgs/by-name/op/opensm/package.nix b/pkgs/by-name/op/opensm/package.nix
index a495387d8ce8..8da103bce1d0 100644
--- a/pkgs/by-name/op/opensm/package.nix
+++ b/pkgs/by-name/op/opensm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-rdma";
     repo = "opensm";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/bqo5r9pVt7vg29xaRRO/9k21AMlmoe2327Ot5gVIwc=";
   };
 
diff --git a/pkgs/by-name/op/opensmt/package.nix b/pkgs/by-name/op/opensmt/package.nix
index 5206f64ad42e..f0cf8e61d24e 100644
--- a/pkgs/by-name/op/opensmt/package.nix
+++ b/pkgs/by-name/op/opensmt/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "usi-verification-and-security";
     repo = "opensmt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zhNNnwc41B4sNq50kPub29EYhqV+FoDKRD/CLHnVyZw=";
   };
 
diff --git a/pkgs/by-name/op/opensoundmeter/package.nix b/pkgs/by-name/op/opensoundmeter/package.nix
index 4981ced6cb87..8adcbdf70fbe 100644
--- a/pkgs/by-name/op/opensoundmeter/package.nix
+++ b/pkgs/by-name/op/opensoundmeter/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psmokotnin";
     repo = "osm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-X/edRuYtZsvbs7Bl/JpJJPIGeQDEDH+FTQCX1Zy1osE=";
   };
 
diff --git a/pkgs/by-name/op/openspecfun/package.nix b/pkgs/by-name/op/openspecfun/package.nix
index 7ccd70aff346..122fe6cd2e4a 100644
--- a/pkgs/by-name/op/openspecfun/package.nix
+++ b/pkgs/by-name/op/openspecfun/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JuliaLang";
     repo = "openspecfun";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fx9z6bbU2V4x6Pr7/vmlSxkWxZ6qTYuPxnfqKLv08CA=";
   };
 
diff --git a/pkgs/by-name/op/opensupaplex/package.nix b/pkgs/by-name/op/opensupaplex/package.nix
index 93a54facc458..66a2079282ce 100644
--- a/pkgs/by-name/op/opensupaplex/package.nix
+++ b/pkgs/by-name/op/opensupaplex/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sergiou87";
     repo = "open-supaplex";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hP8dJlLXE5J/oxPhRkrrBl1Y5e9MYbJKi8OApFM3+GU=";
   };
 
diff --git a/pkgs/by-name/op/opentracing-cpp/package.nix b/pkgs/by-name/op/opentracing-cpp/package.nix
index c18df77b1a25..8f125e2bcbf4 100644
--- a/pkgs/by-name/op/opentracing-cpp/package.nix
+++ b/pkgs/by-name/op/opentracing-cpp/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opentracing";
     repo = "opentracing-cpp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09wdwbz8gbjgyqi764cyb6aw72wng6hwk44xpl432gl7whrrysvi";
   };
 
diff --git a/pkgs/by-name/op/opentyrian/package.nix b/pkgs/by-name/op/opentyrian/package.nix
index ae12217ab481..d410694241e6 100644
--- a/pkgs/by-name/op/opentyrian/package.nix
+++ b/pkgs/by-name/op/opentyrian/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opentyrian";
     repo = "opentyrian";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fVcc8v1c9uU72X6afEo4VoMo6YuDECQSwDQ/TQjgwUY=";
   };
 
diff --git a/pkgs/by-name/op/openvi/package.nix b/pkgs/by-name/op/openvi/package.nix
index 62d154d421ff..db796fed81cc 100644
--- a/pkgs/by-name/op/openvi/package.nix
+++ b/pkgs/by-name/op/openvi/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "johnsonjh";
     repo = "OpenVi";
-    tag = version;
+    rev = version;
     hash = "sha256-RqmulYHQFZmTHQAYgZmB8tAG6mSquNODmssfKB8YqDU=";
   };
 
diff --git a/pkgs/by-name/op/openzone-cursors/package.nix b/pkgs/by-name/op/openzone-cursors/package.nix
index 278a5f9c519d..988b2115d4aa 100644
--- a/pkgs/by-name/op/openzone-cursors/package.nix
+++ b/pkgs/by-name/op/openzone-cursors/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ducakar";
     repo = "openzone-cursors";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "02c536mc17ccsrzgma366k3wlm02ivklvr30fafxl981zgghlii4";
   };
 
diff --git a/pkgs/by-name/op/oppai-ng/package.nix b/pkgs/by-name/op/oppai-ng/package.nix
index 825d67a6cb35..ef4f850f7869 100644
--- a/pkgs/by-name/op/oppai-ng/package.nix
+++ b/pkgs/by-name/op/oppai-ng/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Francesco149";
     repo = "oppai-ng";
-    tag = version;
+    rev = version;
     sha256 = "sha256-L9eraLOWm1tMImS8bLB9T4Md4VdTSxqI9Bt4r8eqxqs=";
   };
 
diff --git a/pkgs/by-name/op/ops/package.nix b/pkgs/by-name/op/ops/package.nix
index aec448db2d4a..ae0ffffecc65 100644
--- a/pkgs/by-name/op/ops/package.nix
+++ b/pkgs/by-name/op/ops/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nanovms";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-ac+17hywzyK7ChCP/nhwTP1WEIZ89+BKX9/YmsPpfg8=";
   };
 
diff --git a/pkgs/by-name/op/opustags/package.nix b/pkgs/by-name/op/opustags/package.nix
index 67d2e5a45803..3f999d9513c8 100644
--- a/pkgs/by-name/op/opustags/package.nix
+++ b/pkgs/by-name/op/opustags/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fmang";
     repo = "opustags";
-    tag = version;
+    rev = version;
     sha256 = "sha256-0lo+4VMYXGwXUuRxU1xZRxzlUQ4o4n/CDHXDM27FK44=";
   };
 
diff --git a/pkgs/by-name/oq/oq/package.nix b/pkgs/by-name/oq/oq/package.nix
index ec53d5c09762..a44e86fd5d28 100644
--- a/pkgs/by-name/oq/oq/package.nix
+++ b/pkgs/by-name/oq/oq/package.nix
@@ -15,7 +15,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "Blacksmoke16";
     repo = "oq";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-W0iGE1yVOphooiab689AFT3rhGGdXqEFyYIhrx11RTE=";
   };
 
diff --git a/pkgs/by-name/oq/oqs-provider/package.nix b/pkgs/by-name/oq/oqs-provider/package.nix
index 09b2cb89d659..09fd6c0444b3 100644
--- a/pkgs/by-name/oq/oqs-provider/package.nix
+++ b/pkgs/by-name/oq/oqs-provider/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "open-quantum-safe";
     repo = "oqs-provider";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-P3UEiWYchHVQ5s3JXHOzaDaN09K62pMYjnrW/gS5x/I=";
   };
 
diff --git a/pkgs/by-name/or/oranchelo-icon-theme/package.nix b/pkgs/by-name/or/oranchelo-icon-theme/package.nix
index fa86e14575d4..fd23ec698945 100644
--- a/pkgs/by-name/or/oranchelo-icon-theme/package.nix
+++ b/pkgs/by-name/or/oranchelo-icon-theme/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OrancheloTeam";
     repo = "oranchelo-icon-theme";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-IDsZj/X9rFSdDpa3bL6IPEPCRe5GustPteDxSbfz+SA=";
   };
 
diff --git a/pkgs/by-name/or/oranda/package.nix b/pkgs/by-name/or/oranda/package.nix
index 0aac13b872ef..5cf56cc1bf9c 100644
--- a/pkgs/by-name/or/oranda/package.nix
+++ b/pkgs/by-name/or/oranda/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "axodotdev";
     repo = "oranda";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FVd8NQVtzlZsDY40ZMJDdaX+6Q5jUxZHUq2v+kDFVOk=";
   };
 
diff --git a/pkgs/by-name/or/oras/package.nix b/pkgs/by-name/or/oras/package.nix
index beb03526fbf5..52f862548d8a 100644
--- a/pkgs/by-name/or/oras/package.nix
+++ b/pkgs/by-name/or/oras/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "oras-project";
     repo = "oras";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iSmoD2HhzVrWQBaZ7HaIjcPmybl4JTVeVVfbn29i91Q=";
   };
 
diff --git a/pkgs/by-name/or/orcania/package.nix b/pkgs/by-name/or/orcania/package.nix
index b828b156af9a..c30a72ee16df 100644
--- a/pkgs/by-name/or/orcania/package.nix
+++ b/pkgs/by-name/or/orcania/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "babelouest";
     repo = "orcania";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Cz3IE5UrfoWjMxQ/+iR1bLsYxf5DVN+7aJqLBcPjduA=";
   };
 
diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix
index 3373babecd83..3fc331e66434 100644
--- a/pkgs/by-name/or/orchard/package.nix
+++ b/pkgs/by-name/or/orchard/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-XUZq9+hO1L+VjipR5cNeA7IJXP4mg/fxnV64pcyJWU8=";
     # 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/or/orchis-theme/package.nix b/pkgs/by-name/or/orchis-theme/package.nix
index 1ad90375ce6f..fcb63679336b 100644
--- a/pkgs/by-name/or/orchis-theme/package.nix
+++ b/pkgs/by-name/or/orchis-theme/package.nix
@@ -43,7 +43,7 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks
     src = fetchFromGitHub {
       repo = "Orchis-theme";
       owner = "vinceliuice";
-      tag = version;
+      rev = version;
       hash = "sha256-K8FiS1AiFMhVaz2Jbr0pudQJGqpwBkQ/4NZdZACtM9Q=";
     };
 
diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix
index 34cf38bda85f..e6cb2d85ddfb 100644
--- a/pkgs/by-name/or/ord/package.nix
+++ b/pkgs/by-name/or/ord/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ordinals";
     repo = "ord";
-    tag = version;
+    rev = version;
     hash = "sha256-95da/aoBhrQ/GaM4fojFufs6+OI2KLF6SGsSw6qtYUc=";
   };
 
diff --git a/pkgs/by-name/or/org-stats/package.nix b/pkgs/by-name/or/org-stats/package.nix
index 35fbe670af0b..297c76095bfa 100644
--- a/pkgs/by-name/or/org-stats/package.nix
+++ b/pkgs/by-name/or/org-stats/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "org-stats";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QTjJ+4Qu5u+5ZCoIAQBxqdhjNI2CXUB8r2Zx8xfIiGw=";
   };
 
diff --git a/pkgs/by-name/or/orjail/package.nix b/pkgs/by-name/or/orjail/package.nix
index f311470c5056..52e189b131d4 100644
--- a/pkgs/by-name/or/orjail/package.nix
+++ b/pkgs/by-name/or/orjail/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "orjail";
     repo = "orjail";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "06bwqb3l7syy4c1d8xynxwakmdxvm3qfm8r834nidsknvpdckd9z";
   };
 
diff --git a/pkgs/by-name/or/orocos-kdl/package.nix b/pkgs/by-name/or/orocos-kdl/package.nix
index e2ea39a3a8eb..304f1c7de443 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";
-    tag = "v${version}";
+    rev = "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 a4cb1b9c3a2e..510b0c67dcae 100644
--- a/pkgs/by-name/or/orogene/package.nix
+++ b/pkgs/by-name/or/orogene/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orogene";
     repo = "orogene";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GMWrlvZZ2xlcvcRG3u8jS8KiewHpyX0brNe4pmCpHbM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/os/osc-cli/package.nix b/pkgs/by-name/os/osc-cli/package.nix
index db58d665a719..3a024b86657c 100644
--- a/pkgs/by-name/os/osc-cli/package.nix
+++ b/pkgs/by-name/os/osc-cli/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "outscale";
     repo = "osc-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7WXy+1NHwFvYmyi5xGfWpq/mbVGJ3WkgP5WQd5pvcC0=";
   };
 
diff --git a/pkgs/by-name/os/oscar/package.nix b/pkgs/by-name/os/oscar/package.nix
index d0185eacfa86..566a14cce6bb 100644
--- a/pkgs/by-name/os/oscar/package.nix
+++ b/pkgs/by-name/os/oscar/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "CrimsonNape";
     repo = "OSCAR-code";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1rHgajjs+Vt9lcqkqKy92pWQLjvAHE10fPUTy8hurw4=";
   };
 
diff --git a/pkgs/by-name/os/oscclip/package.nix b/pkgs/by-name/os/oscclip/package.nix
index f96ab4aeef47..349079d35329 100644
--- a/pkgs/by-name/os/oscclip/package.nix
+++ b/pkgs/by-name/os/oscclip/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rumpelsepp";
     repo = "oscclip";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WQvZn+SWamEqEXPutIZVDZTIczybtHUG9QsN8XxUeg8=";
   };
 
diff --git a/pkgs/by-name/os/osdlyrics/package.nix b/pkgs/by-name/os/osdlyrics/package.nix
index 72cfc2aa7377..d470003be751 100644
--- a/pkgs/by-name/os/osdlyrics/package.nix
+++ b/pkgs/by-name/os/osdlyrics/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osdlyrics";
     repo = "osdlyrics";
-    tag = version;
+    rev = version;
     hash = "sha256-4jEF1LdMwaLNF6zvzAuGW8Iu4dzhrFLutX69LwSjTAI=";
   };
 
diff --git a/pkgs/by-name/os/osgqt/package.nix b/pkgs/by-name/os/osgqt/package.nix
index e90b97ee7184..12e88648edd8 100644
--- a/pkgs/by-name/os/osgqt/package.nix
+++ b/pkgs/by-name/os/osgqt/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "openscenegraph";
     repo = "osgQt";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-iUeIqRDlcAHdKXWAi4WhEaOCxa7ZivQw0K5E7ccEKnM=";
   };
 
diff --git a/pkgs/by-name/os/oshka/package.nix b/pkgs/by-name/os/oshka/package.nix
index 99d5cb68e438..4727b3ab1e1e 100644
--- a/pkgs/by-name/os/oshka/package.nix
+++ b/pkgs/by-name/os/oshka/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fpWhqFK5h/U7DCC/SyhAlMyCMhjZHRLMlwakvlhOd3w=";
   };
 
diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix
index a45df6ba7493..d4fbb130bea9 100644
--- a/pkgs/by-name/os/osm2pgsql/package.nix
+++ b/pkgs/by-name/os/osm2pgsql/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "osm2pgsql-dev";
     repo = "osm2pgsql";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-+EFvYloLm/cDOflqj6ZIgjFoljKhYBVIKxD8L9j2Hj4=";
   };
 
diff --git a/pkgs/by-name/os/osm2xmap/package.nix b/pkgs/by-name/os/osm2xmap/package.nix
index 278cb4c49de5..292b4884711a 100644
--- a/pkgs/by-name/os/osm2xmap/package.nix
+++ b/pkgs/by-name/os/osm2xmap/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "1d3f18wzk240yp0q8i2vskhcfj5ar61s4hw83vgps0wr2aglph3w";
     repo = "osm2xmap";
     owner = "sembruk";
-    tag = "v${version}";
+    rev = "v${version}";
   };
 
   makeFlags = [
diff --git a/pkgs/by-name/os/osmid/package.nix b/pkgs/by-name/os/osmid/package.nix
index 9982dd6139af..57257882b810 100644
--- a/pkgs/by-name/os/osmid/package.nix
+++ b/pkgs/by-name/os/osmid/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "llloret";
     repo = "osmid";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1s1wsrp6g6wb0y61xzxvaj59mwycrgy52r4h456086zkz10ls6hw";
   };
 
diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix
index 074a982aba04..74aff521c2e0 100644
--- a/pkgs/by-name/os/osmo-bsc/package.nix
+++ b/pkgs/by-name/os/osmo-bsc/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-bsc";
-    tag = version;
+    rev = version;
     hash = "sha256-wQtGyqqaEW+mM6Eg85N+i3ZiKC/Z6wxYk2Wwvz7qOFw=";
   };
 
diff --git a/pkgs/by-name/os/osmo-bts/package.nix b/pkgs/by-name/os/osmo-bts/package.nix
index 5d0ddc4f6645..9605c11a9bb5 100644
--- a/pkgs/by-name/os/osmo-bts/package.nix
+++ b/pkgs/by-name/os/osmo-bts/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-bts";
-    tag = version;
+    rev = version;
     hash = "sha256-SvlkIvdyrXlaSJl+LbHovhIlnxsxpufJCy1wVCZbjWM=";
   };
 
diff --git a/pkgs/by-name/os/osmo-ggsn/package.nix b/pkgs/by-name/os/osmo-ggsn/package.nix
index 39c1bbec27bc..0c77a8b75f10 100644
--- a/pkgs/by-name/os/osmo-ggsn/package.nix
+++ b/pkgs/by-name/os/osmo-ggsn/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-ggsn";
-    tag = version;
+    rev = version;
     hash = "sha256-qsBjoLyMlRgUjhX1tyI/MoHGmww1XUT3OMH4dVZzLU4=";
   };
 
diff --git a/pkgs/by-name/os/osmo-hlr/package.nix b/pkgs/by-name/os/osmo-hlr/package.nix
index 74b206efbf56..b60842c69724 100644
--- a/pkgs/by-name/os/osmo-hlr/package.nix
+++ b/pkgs/by-name/os/osmo-hlr/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-hlr";
-    tag = version;
+    rev = version;
     hash = "sha256-yi4sgcX8WOWz7qw/jGvVCtIYe867uBzLps8gdG6ziOA=";
   };
 
diff --git a/pkgs/by-name/os/osmo-hnbgw/package.nix b/pkgs/by-name/os/osmo-hnbgw/package.nix
index 86d15d58f158..2713c05d0a06 100644
--- a/pkgs/by-name/os/osmo-hnbgw/package.nix
+++ b/pkgs/by-name/os/osmo-hnbgw/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-hnbgw";
-    tag = version;
+    rev = version;
     hash = "sha256-OWCAiU4mK57e5gm6QOovwmoFAaCG1d8ZYpkP4isIqvI=";
   };
 
diff --git a/pkgs/by-name/os/osmo-hnodeb/package.nix b/pkgs/by-name/os/osmo-hnodeb/package.nix
index 27b4c84a4480..751077fb85b4 100644
--- a/pkgs/by-name/os/osmo-hnodeb/package.nix
+++ b/pkgs/by-name/os/osmo-hnodeb/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-hnodeb";
-    tag = version;
+    rev = version;
     hash = "sha256-Izivyw2HqRmrM68ehGqlIkJeuZ986d1WQ0yr6NWWTdA=";
   };
 
diff --git a/pkgs/by-name/os/osmo-iuh/package.nix b/pkgs/by-name/os/osmo-iuh/package.nix
index 322f0e2f4b16..367d294feb09 100644
--- a/pkgs/by-name/os/osmo-iuh/package.nix
+++ b/pkgs/by-name/os/osmo-iuh/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-iuh";
-    tag = version;
+    rev = version;
     hash = "sha256-3ADn0GSoXPXL1gD79JjD2hXNBN/v8aaEKgf5qFNGEJs=";
   };
 
diff --git a/pkgs/by-name/os/osmo-mgw/package.nix b/pkgs/by-name/os/osmo-mgw/package.nix
index 7aba2e708b50..a25754a68783 100644
--- a/pkgs/by-name/os/osmo-mgw/package.nix
+++ b/pkgs/by-name/os/osmo-mgw/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-mgw";
-    tag = version;
+    rev = version;
     hash = "sha256-Y/98K81US6McNu+JEJtMluJTvsv0DHJiyjMPJz8/35o=";
   };
 
diff --git a/pkgs/by-name/os/osmo-msc/package.nix b/pkgs/by-name/os/osmo-msc/package.nix
index d4245c27b676..b4d65a85d73e 100644
--- a/pkgs/by-name/os/osmo-msc/package.nix
+++ b/pkgs/by-name/os/osmo-msc/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-msc";
-    tag = version;
+    rev = version;
     hash = "sha256-iS/N0+KhgMUFoJus/R/iFOLuvqCiceNtcuq3nbOvBts=";
   };
 
diff --git a/pkgs/by-name/os/osmo-pcu/package.nix b/pkgs/by-name/os/osmo-pcu/package.nix
index ee8c118646e0..20068b05ef3f 100644
--- a/pkgs/by-name/os/osmo-pcu/package.nix
+++ b/pkgs/by-name/os/osmo-pcu/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-pcu";
-    tag = version;
+    rev = version;
     hash = "sha256-UCgnBE+Sm9MTLteo/B5Ha9I64mfKxbO61B8QA4qJdLE=";
   };
 
diff --git a/pkgs/by-name/os/osmo-sgsn/package.nix b/pkgs/by-name/os/osmo-sgsn/package.nix
index a25505158dd0..96f9d7a03c10 100644
--- a/pkgs/by-name/os/osmo-sgsn/package.nix
+++ b/pkgs/by-name/os/osmo-sgsn/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-sgsn";
-    tag = version;
+    rev = version;
     hash = "sha256-ht8ejeD2whV0Ww5G3coUntLrIp2S0gZBRS6kF7w9KZY=";
   };
 
diff --git a/pkgs/by-name/os/osmo-sip-connector/package.nix b/pkgs/by-name/os/osmo-sip-connector/package.nix
index bd4c6b9b3ecb..a02714a2ef7d 100644
--- a/pkgs/by-name/os/osmo-sip-connector/package.nix
+++ b/pkgs/by-name/os/osmo-sip-connector/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-sip-connector";
-    tag = version;
+    rev = version;
     hash = "sha256-NmjaN28NnAIpMwUHCUS+7LJBwvCp48kyhmHRf6cU5WE=";
   };
 
diff --git a/pkgs/by-name/os/osmtogeojson/package.nix b/pkgs/by-name/os/osmtogeojson/package.nix
index a237a37bccdb..34a80a73b80b 100644
--- a/pkgs/by-name/os/osmtogeojson/package.nix
+++ b/pkgs/by-name/os/osmtogeojson/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "tyrasd";
     repo = "osmtogeojson";
-    tag = version;
+    rev = version;
     hash = "sha256-T6d/KQQGoXHgV0iNhOms8d9zfjYMfnBNwPLShrEkHG4=";
   };
 
diff --git a/pkgs/by-name/os/osqp/package.nix b/pkgs/by-name/os/osqp/package.nix
index da9ca6a4a140..0425777a85f8 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-enkK5EFyAeLaUnHNYS3oq43HsHY5IuSLgsYP0k/GW8c=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/os/osslsigncode/package.nix b/pkgs/by-name/os/osslsigncode/package.nix
index 56f12fc2c2d7..1193f2b0e02b 100644
--- a/pkgs/by-name/os/osslsigncode/package.nix
+++ b/pkgs/by-name/os/osslsigncode/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mtrojnar";
     repo = "osslsigncode";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ENMFhIVQhPL4FDW9Ne2YGR3sXjvW55NN1bErfr/kDZg=";
   };
 
diff --git a/pkgs/by-name/os/osv-detector/package.nix b/pkgs/by-name/os/osv-detector/package.nix
index 30ea124b9c46..470197738dcb 100644
--- a/pkgs/by-name/os/osv-detector/package.nix
+++ b/pkgs/by-name/os/osv-detector/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "G-Rath";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vIkLrKyDeMfRe/0EPhlKlHAO6XB0/OFY5mTUHeZbcg8=";
   };
 
diff --git a/pkgs/by-name/os/osxsnarf/package.nix b/pkgs/by-name/os/osxsnarf/package.nix
index a6a2e3409949..aa4f22baa43e 100644
--- a/pkgs/by-name/os/osxsnarf/package.nix
+++ b/pkgs/by-name/os/osxsnarf/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eraserhd";
     repo = "osxsnarf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1vpg39mpc5avnv1j0yfx0x2ncvv38slmm83zv6nmm7alfwfjr2ss";
   };
 
diff --git a/pkgs/by-name/ot/otadump/package.nix b/pkgs/by-name/ot/otadump/package.nix
index 97f945665db6..e1d5dcdbab23 100644
--- a/pkgs/by-name/ot/otadump/package.nix
+++ b/pkgs/by-name/ot/otadump/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "crazystylus";
     repo = "otadump";
-    tag = version;
+    rev = version;
     hash = "sha256-4zPVcTU+0otV4EPQi80uSRkpRo9XzI0V3Kr17ugXX2U=";
   };
 
diff --git a/pkgs/by-name/ot/otel-cli/package.nix b/pkgs/by-name/ot/otel-cli/package.nix
index f790501b0bdb..a3550e94225b 100644
--- a/pkgs/by-name/ot/otel-cli/package.nix
+++ b/pkgs/by-name/ot/otel-cli/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "equinix-labs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JYi9CbP4mUhX0zNjhi6QlBzLKcj2zdPwlyBSIYKp6vk=";
   };
 
diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
index 8e6ca5b15396..16dc72a29d76 100644
--- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix
+++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CtrlSpice";
     repo = "otel-desktop-viewer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kMgcco4X7X9WoCCH8iZz5qGr/1dWPSeQOpruTSUnonI=";
   };
 
diff --git a/pkgs/by-name/ot/otf2bdf/package.nix b/pkgs/by-name/ot/otf2bdf/package.nix
index 65c715b157ed..110d81383845 100644
--- a/pkgs/by-name/ot/otf2bdf/package.nix
+++ b/pkgs/by-name/ot/otf2bdf/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jirutka";
     repo = "otf2bdf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HK9ZrnwKhhYcBvSl+3RwFD7m/WSaPkGKX6utXnk5k+A=";
   };
 
diff --git a/pkgs/by-name/ot/otfcc/package.nix b/pkgs/by-name/ot/otfcc/package.nix
index b93132312d5b..820df7dac464 100644
--- a/pkgs/by-name/ot/otfcc/package.nix
+++ b/pkgs/by-name/ot/otfcc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "caryll";
     repo = "otfcc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1nrkzpqklfpqsccji4ans40rj88l80cv7dpxwx4g577xrvk13a0f";
   };
 
diff --git a/pkgs/by-name/ot/otpauth/package.nix b/pkgs/by-name/ot/otpauth/package.nix
index f11f4aa82ec0..c129eb31ee5a 100644
--- a/pkgs/by-name/ot/otpauth/package.nix
+++ b/pkgs/by-name/ot/otpauth/package.nix
@@ -11,7 +11,7 @@ buildGo124Module rec {
   src = fetchFromGitHub {
     owner = "dim13";
     repo = "otpauth";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gxFhuFOSiyE7FLWqTZzKPZzXerwK2PWy7Z0zshAJ4Yg=";
   };
 
diff --git a/pkgs/by-name/ot/otree/package.nix b/pkgs/by-name/ot/otree/package.nix
index a7d052b4a2a5..dfe72757daa4 100644
--- a/pkgs/by-name/ot/otree/package.nix
+++ b/pkgs/by-name/ot/otree/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fioncat";
     repo = "otree";
-    tag = version;
+    rev = version;
     hash = "sha256-WvoiTu6erNI5Cb9PSoHgL6+coIGWLe46pJVXBZHOLTE=";
   };
 
diff --git a/pkgs/by-name/ot/ots/package.nix b/pkgs/by-name/ot/ots/package.nix
index 10b9ce0c6273..c88430e76097 100644
--- a/pkgs/by-name/ot/ots/package.nix
+++ b/pkgs/by-name/ot/ots/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sniptt-official";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GOCuH9yiVs3N3sHCCoSGaQkaaJs4NY/klNBRWjZGLE4=";
   };
 
diff --git a/pkgs/by-name/ot/ott/package.nix b/pkgs/by-name/ot/ott/package.nix
index bceadf1bcc7f..a67c9fd0874e 100644
--- a/pkgs/by-name/ot/ott/package.nix
+++ b/pkgs/by-name/ot/ott/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ott-lang";
     repo = "ott";
-    tag = version;
+    rev = version;
     hash = "sha256-S6EMQgEBrtXB9hTM7x6irZPsI9c9JHeuCk/9pcpQMNg=";
   };
 
diff --git a/pkgs/by-name/ot/otus-lisp/package.nix b/pkgs/by-name/ot/otus-lisp/package.nix
index 45dddf8cf671..1de3f09f8f05 100644
--- a/pkgs/by-name/ot/otus-lisp/package.nix
+++ b/pkgs/by-name/ot/otus-lisp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "yuriy-chumak";
     repo = "ol";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-5ixpTTXwJbLM2mJ/nwzjz0aKG/QGVLPScY8EaG7swGU=";
   };
 
diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix
index 5961a9e2b5c2..86267edd9f50 100644
--- a/pkgs/by-name/ou/ouch/package.nix
+++ b/pkgs/by-name/ou/ouch/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ouch-org";
     repo = "ouch";
-    tag = version;
+    rev = version;
     hash = "sha256-WO1fetu39fcLGcrbzFh+toHpnyxWuDVHtmjuH203hzQ=";
   };
 
diff --git a/pkgs/by-name/ou/oui/package.nix b/pkgs/by-name/ou/oui/package.nix
index 59ec262a1605..584de64b926e 100644
--- a/pkgs/by-name/ou/oui/package.nix
+++ b/pkgs/by-name/ou/oui/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "thatmattlove";
     repo = "oui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RLm8V2fLFvOwjnnq16ZmhwVdtgXPaehan7JTX3Xz30w=";
   };
 
diff --git a/pkgs/by-name/ou/outils/package.nix b/pkgs/by-name/ou/outils/package.nix
index bdf672c1717c..416bfc9abac9 100644
--- a/pkgs/by-name/ou/outils/package.nix
+++ b/pkgs/by-name/ou/outils/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "outils";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FokJytwQsbGsryBzyglpb1Hg3wti/CPQTOfIGIz9ThA=";
   };
 
diff --git a/pkgs/by-name/ov/oven-media-engine/package.nix b/pkgs/by-name/ov/oven-media-engine/package.nix
index 026a9be6e9e4..9afc107d91fa 100644
--- a/pkgs/by-name/ov/oven-media-engine/package.nix
+++ b/pkgs/by-name/ov/oven-media-engine/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AirenSoft";
     repo = "OvenMediaEngine";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fYvP1mk32lrnYxWdpI1WqEUxAfHsQH3Ng0JLC/GbjrY=";
   };
 
diff --git a/pkgs/by-name/ov/overmind/package.nix b/pkgs/by-name/ov/overmind/package.nix
index 525131278a26..54bbc8153267 100644
--- a/pkgs/by-name/ov/overmind/package.nix
+++ b/pkgs/by-name/ov/overmind/package.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DarthSim";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wX29nFmzmbxbaXtwIWZNvueXFv9SKIOqexkc5pEITpw=";
   };
 
diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix
index 613b5563457d..7b76d5fd1630 100644
--- a/pkgs/by-name/ov/overskride/package.nix
+++ b/pkgs/by-name/ov/overskride/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     inherit owner;
     repo = name;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SqaPhub/HwZz7uBg/kevH8LvPDVLgRd/Rvi03ivNrRc=";
   };
 
diff --git a/pkgs/by-name/ov/oversteer/package.nix b/pkgs/by-name/ov/oversteer/package.nix
index a89a031e3c4c..f172c3196292 100644
--- a/pkgs/by-name/ov/oversteer/package.nix
+++ b/pkgs/by-name/ov/oversteer/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "berarma";
     repo = "oversteer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-X58U7lFH53nCaXnE7uXgV7aea6qntNfH5TIt68xSefY=";
   };
 
diff --git a/pkgs/by-name/ov/ovh-ttyrec/package.nix b/pkgs/by-name/ov/ovh-ttyrec/package.nix
index b23a771c104f..a639a90898eb 100644
--- a/pkgs/by-name/ov/ovh-ttyrec/package.nix
+++ b/pkgs/by-name/ov/ovh-ttyrec/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ovh";
     repo = "ovh-ttyrec";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VTF9WLwAIWWn+W0sLQaoFBFro+pSXKwcTO6q6MW6JD8=";
   };
 
diff --git a/pkgs/by-name/ow/owamp/package.nix b/pkgs/by-name/ow/owamp/package.nix
index be7cd034606f..36f64a1eeb8f 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "5o85XSn84nOvNjIzlaZ2R6/TSHpKbWLXTO0FmqWsNMU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ow/owl-lisp/package.nix b/pkgs/by-name/ow/owl-lisp/package.nix
index 41832e0fdf40..babd94dc0b3d 100644
--- a/pkgs/by-name/ow/owl-lisp/package.nix
+++ b/pkgs/by-name/ow/owl-lisp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "owl-lisp";
     repo = "owl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo=";
   };
 
diff --git a/pkgs/by-name/ow/owncast/package.nix b/pkgs/by-name/ow/owncast/package.nix
index ee8c99f28cba..66a2c11e9210 100644
--- a/pkgs/by-name/ow/owncast/package.nix
+++ b/pkgs/by-name/ow/owncast/package.nix
@@ -18,7 +18,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "owncast";
     repo = "owncast";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MdquhDdbOdP1shnKHBlzQrSDe41fp0qnMzgaqL89jTk=";
   };
   vendorHash = "sha256-ERilQZ8vnhGW1IEcLA4CcmozDooHKbnmASMw87tjYD4=";
diff --git a/pkgs/by-name/ow/owntracks-recorder/package.nix b/pkgs/by-name/ow/owntracks-recorder/package.nix
index 95dae27ad7c7..ae5133cb46df 100644
--- a/pkgs/by-name/ow/owntracks-recorder/package.nix
+++ b/pkgs/by-name/ow/owntracks-recorder/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "owntracks";
     repo = "recorder";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-E4hdsUAg8NHjmUrlr8cskezib4qMv+wF32cThe2/kBc=";
   };
 
diff --git a/pkgs/by-name/ox/oxefmsynth/package.nix b/pkgs/by-name/ox/oxefmsynth/package.nix
index ce12f85ce6b7..54d4ff87250c 100644
--- a/pkgs/by-name/ox/oxefmsynth/package.nix
+++ b/pkgs/by-name/ox/oxefmsynth/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oxesoft";
     repo = "oxefmsynth";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1rk71ls33a38wx8i22plsi7d89cqqxrfxknq5i4f9igsw1ipm4gn";
   };
 
diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix
index f6642cfc1a64..fc18cc37c64a 100644
--- a/pkgs/by-name/ox/oxide-rs/package.nix
+++ b/pkgs/by-name/ox/oxide-rs/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "oxidecomputer";
     repo = "oxide.rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NtTXpXDYazcXilQNW455UDkqMCFzFPvTUkbEBQsWIDo=";
     # leaveDotGit is necessary because `build.rs` expects git information which
     # is used to write a `built.rs` file which is read by the CLI application
diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix
index c00c752997c9..373e9ac77d44 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";
-    tag = version;
+    rev = version;
     hash = "sha256-2xDUvXGsF8x42uezgnvOXLVUdNNHcaE042HDDEJeplc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix
index 11b41f7390bc..16fb274d0130 100644
--- a/pkgs/by-name/p2/p2pool/package.nix
+++ b/pkgs/by-name/p2/p2pool/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+wkcTkHhGNanCznL5d9yUezi9wLIchxt6TPPpEUqgN8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/p9/p910nd/package.nix b/pkgs/by-name/p9/p910nd/package.nix
index 3d10bef1e20d..f4a329b17624 100644
--- a/pkgs/by-name/p9/p910nd/package.nix
+++ b/pkgs/by-name/p9/p910nd/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kenyapcomau";
     repo = "p910nd";
-    tag = version;
+    rev = version;
     hash = "sha256-MM4o7d3L3XIRYWJ/KPM2OltlVfVA/BgMuyhJMm/BS3c=";
   };
 
diff --git a/pkgs/by-name/pa/pachyderm/package.nix b/pkgs/by-name/pa/pachyderm/package.nix
index 04a7e699d245..bb9fe0ac5c56 100644
--- a/pkgs/by-name/pa/pachyderm/package.nix
+++ b/pkgs/by-name/pa/pachyderm/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pachyderm";
     repo = "pachyderm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-S3om62ibp/hbpoY6seJ7RaRQeAzDNsThqfGDFC0SEQM=";
   };
 
diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix
index 309184213134..9324880d9555 100644
--- a/pkgs/by-name/pa/pack/package.nix
+++ b/pkgs/by-name/pa/pack/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = "pack";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0=";
   };
 
diff --git a/pkgs/by-name/pa/packer/package.nix b/pkgs/by-name/pa/packer/package.nix
index 12ecb8a9229f..9bb7f19c98bf 100644
--- a/pkgs/by-name/pa/packer/package.nix
+++ b/pkgs/by-name/pa/packer/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "packer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-19eaQs2f4zM3lXuQrWoS2S/tXWe3HdxXesjtVG67LFE=";
   };
 
diff --git a/pkgs/by-name/pa/packet-sd/package.nix b/pkgs/by-name/pa/packet-sd/package.nix
index b9c4e36556a1..053aceffa748 100644
--- a/pkgs/by-name/pa/packet-sd/package.nix
+++ b/pkgs/by-name/pa/packet-sd/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "packethost";
     repo = "prometheus-packet-sd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2k8AsmyhQNNZCzpVt6JdgvI8IFb5pRi4ic6Yn2NqHMM=";
   };
 
diff --git a/pkgs/by-name/pa/packr/package.nix b/pkgs/by-name/pa/packr/package.nix
index 133091b4c619..1a2ea2b74a9e 100644
--- a/pkgs/by-name/pa/packr/package.nix
+++ b/pkgs/by-name/pa/packr/package.nix
@@ -15,7 +15,7 @@ let
       fetchFromGitHub {
         owner = "gobuffalo";
         repo = "packr";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ=";
       }
       + "/v2";
@@ -48,7 +48,7 @@ let
     src = fetchFromGitHub {
       owner = "gobuffalo";
       repo = "packr";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ=";
     };
 
diff --git a/pkgs/by-name/pa/paco/package.nix b/pkgs/by-name/pa/paco/package.nix
index cf2b2b748622..1aee35c2e486 100644
--- a/pkgs/by-name/pa/paco/package.nix
+++ b/pkgs/by-name/pa/paco/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pacolang";
     repo = "paco";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sCU7cjmsUTrhf/7Lm3wBPKwk80SAhCfc4lrCBggspw8=";
   };
 
diff --git a/pkgs/by-name/pa/pacparser/package.nix b/pkgs/by-name/pa/pacparser/package.nix
index d44b081a5457..b3230107a1ac 100644
--- a/pkgs/by-name/pa/pacparser/package.nix
+++ b/pkgs/by-name/pa/pacparser/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "manugarg";
     repo = "pacparser";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-X842+xPjM404aQJTc2JwqU4vq8kgyKhpnqVu70pNLks=";
   };
 
diff --git a/pkgs/by-name/pa/pacproxy/package.nix b/pkgs/by-name/pa/pacproxy/package.nix
index b922999a4e97..5bb1937f7aeb 100644
--- a/pkgs/by-name/pa/pacproxy/package.nix
+++ b/pkgs/by-name/pa/pacproxy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "williambailey";
     repo = "pacproxy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oDSptPihrDIiTCgcP4t2J3vJBNGMViyPAAmBv4ynLNU=";
   };
 
diff --git a/pkgs/by-name/pa/page/package.nix b/pkgs/by-name/pa/page/package.nix
index c0537d74e306..2ec2c312dd54 100644
--- a/pkgs/by-name/pa/page/package.nix
+++ b/pkgs/by-name/pa/page/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "I60R";
     repo = "page";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uNdtgx9/9+KOfQvHiKNrT8NFWtR2tfJuI2bMwywBC/4=";
   };
 
diff --git a/pkgs/by-name/pa/pagmo2/package.nix b/pkgs/by-name/pa/pagmo2/package.nix
index b1cefef514e6..1948ad97b4df 100644
--- a/pkgs/by-name/pa/pagmo2/package.nix
+++ b/pkgs/by-name/pa/pagmo2/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "esa";
     repo = "pagmo2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ido3e0hQLDEPT0AmsfAVTPlGbWe5QBkxgRO6Fg1wp/c=";
   };
 
diff --git a/pkgs/by-name/pa/pairdrop/package.nix b/pkgs/by-name/pa/pairdrop/package.nix
index 423cf7006547..d4b2aa08b70c 100644
--- a/pkgs/by-name/pa/pairdrop/package.nix
+++ b/pkgs/by-name/pa/pairdrop/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "schlagmichdoch";
     repo = "PairDrop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LvrBIdBjb4M2LidEJVCdK2uYydsJY+Cr5eXdfbS46dk=";
   };
 
diff --git a/pkgs/by-name/pa/paleta/package.nix b/pkgs/by-name/pa/paleta/package.nix
index de259dbb3594..072acba9cb02 100644
--- a/pkgs/by-name/pa/paleta/package.nix
+++ b/pkgs/by-name/pa/paleta/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nate-xyz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-c+X49bMywstRg7cSAbbpG/vd8OUB7RhdQVRumTIBDDk=";
   };
 
diff --git a/pkgs/by-name/pa/pam-reattach/package.nix b/pkgs/by-name/pa/pam-reattach/package.nix
index e9325da1698d..636757cec5ba 100644
--- a/pkgs/by-name/pa/pam-reattach/package.nix
+++ b/pkgs/by-name/pa/pam-reattach/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fabianishere";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1k77kxqszdwgrb50w7algj22pb4fy5b9649cjb08zq9fqrzxcbz7";
   };
 
diff --git a/pkgs/by-name/pa/pam_gnupg/package.nix b/pkgs/by-name/pa/pam_gnupg/package.nix
index 82c01c1c194c..ff5546320ec2 100644
--- a/pkgs/by-name/pa/pam_gnupg/package.nix
+++ b/pkgs/by-name/pa/pam_gnupg/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cruegge";
     repo = "pam-gnupg";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6I9a841qohA42lhOgZf/hharnjkthuB8lRptPDxUgMI=";
   };
 
diff --git a/pkgs/by-name/pa/pam_mysql/package.nix b/pkgs/by-name/pa/pam_mysql/package.nix
index 17fc09ad5277..d562b24c1200 100644
--- a/pkgs/by-name/pa/pam_mysql/package.nix
+++ b/pkgs/by-name/pa/pam_mysql/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NigelCunningham";
     repo = "pam-MySQL";
-    tag = version;
+    rev = version;
     sha256 = "07acf0hbhkd0kg49gnj4nb5ilnv3v4xx3dsggvzvjg8gi3cjmsap";
   };
 
diff --git a/pkgs/by-name/pa/pam_rssh/package.nix b/pkgs/by-name/pa/pam_rssh/package.nix
index b29e15f82b92..a3168a587419 100644
--- a/pkgs/by-name/pa/pam_rssh/package.nix
+++ b/pkgs/by-name/pa/pam_rssh/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "z4yx";
     repo = "pam_rssh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sXTSICVYSmwr12kRWuhVcag8kY6VAFdCqbe6LtYs4hU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pa/pamixer/package.nix b/pkgs/by-name/pa/pamixer/package.nix
index 06b70f9ab5ab..cab4a6e0d8af 100644
--- a/pkgs/by-name/pa/pamixer/package.nix
+++ b/pkgs/by-name/pa/pamixer/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cdemoulins";
     repo = "pamixer";
-    tag = version;
+    rev = version;
     hash = "sha256-LbRhsW2MiTYWSH6X9Pz9XdJdH9Na0QCO8CFmlzZmDjQ=";
   };
 
diff --git a/pkgs/by-name/pa/pandoc-katex/package.nix b/pkgs/by-name/pa/pandoc-katex/package.nix
index ecc6f6df41fa..a3f5b682795b 100644
--- a/pkgs/by-name/pa/pandoc-katex/package.nix
+++ b/pkgs/by-name/pa/pandoc-katex/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "xu-cheng";
     repo = "pandoc-katex";
-    tag = version;
+    rev = version;
     hash = "sha256-2a3WJTNIMqWnTlHB+2U/6ifuoecbOlTP6e7YjD/UvPM=";
   };
 
diff --git a/pkgs/by-name/pa/pandoc-lua-filters/package.nix b/pkgs/by-name/pa/pandoc-lua-filters/package.nix
index 409e6a6044fc..d44b5e94bd2e 100644
--- a/pkgs/by-name/pa/pandoc-lua-filters/package.nix
+++ b/pkgs/by-name/pa/pandoc-lua-filters/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pandoc";
     repo = "lua-filters";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Y962kdwg2bS3ZoPfsktv4Fy34HUTRhIIuSxPi5ODwWg=";
   };
 
diff --git a/pkgs/by-name/pa/panicparse/package.nix b/pkgs/by-name/pa/panicparse/package.nix
index 8da76b86668e..f0ab5e64e45e 100644
--- a/pkgs/by-name/pa/panicparse/package.nix
+++ b/pkgs/by-name/pa/panicparse/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maruel";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-EBNOHI04v47sXAWrjHsU4pixP4TPOuHy8S3YmlkiLN4=";
   };
 
diff --git a/pkgs/by-name/pa/pantheon-tweaks/package.nix b/pkgs/by-name/pa/pantheon-tweaks/package.nix
index 8f44cf7e4194..a25da6a1f4af 100644
--- a/pkgs/by-name/pa/pantheon-tweaks/package.nix
+++ b/pkgs/by-name/pa/pantheon-tweaks/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pantheon-tweaks";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-5RsNVUQ8FJmtdI7Z2le+qt9b13zHlQxiyTaUY15wSkw=";
   };
 
diff --git a/pkgs/by-name/pa/papeer/package.nix b/pkgs/by-name/pa/papeer/package.nix
index eb0013ff6307..c447075c5137 100644
--- a/pkgs/by-name/pa/papeer/package.nix
+++ b/pkgs/by-name/pa/papeer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lapwat";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dkOLlWeG6ixbqLJU/1x2R1meKpcXb63C8EXH5FlD38k=";
   };
 
diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix
index 2380eb412dcd..c1a59f48b72d 100644
--- a/pkgs/by-name/pa/paper-age/package.nix
+++ b/pkgs/by-name/pa/paper-age/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "matiaskorhonen";
     repo = "paper-age";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xoxrNNlpDFXuQwltZ52SkGe0z6+B4h1Jy4XRtvQDiAg=";
   };
 
diff --git a/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix b/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix
index d197912ecc59..5fe69a944eab 100644
--- a/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix
+++ b/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "entropia";
     repo = "paperless-asn-qr-codes";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/xCU6xDrmhkua4Iw/BCzhOuqO5GT/0rTJ+Y59wuMz6E=";
   };
 
diff --git a/pkgs/by-name/pa/papirus-folders/package.nix b/pkgs/by-name/pa/papirus-folders/package.nix
index 900d171f9206..11c08f69406a 100644
--- a/pkgs/by-name/pa/papirus-folders/package.nix
+++ b/pkgs/by-name/pa/papirus-folders/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "papirus-folders";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BY1hnAGz31Deffy/EGKy/nuPKmpAA0u8FzPYgr1Plfs=";
   };
 
diff --git a/pkgs/by-name/pa/papirus-nord/package.nix b/pkgs/by-name/pa/papirus-nord/package.nix
index 32dcad573f2e..326c9eb2ca3e 100644
--- a/pkgs/by-name/pa/papirus-nord/package.nix
+++ b/pkgs/by-name/pa/papirus-nord/package.nix
@@ -42,7 +42,7 @@ lib.checkListOfEnum "${pname}: accent colors" validAccents [ accent ]
     src = fetchFromGitHub {
       owner = "adapta-projects";
       repo = "papirus-nord";
-      tag = version;
+      rev = version;
       sha256 = "sha256-KwwTDGJQ4zN9XH/pKFQDQ+EgyuSCFhN2PQAI35G+3YM=";
     };
 
diff --git a/pkgs/by-name/pa/paps/package.nix b/pkgs/by-name/pa/paps/package.nix
index 283c2dc42b43..f99da48d4fb2 100644
--- a/pkgs/by-name/pa/paps/package.nix
+++ b/pkgs/by-name/pa/paps/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dov";
     repo = "paps";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "129wpm2ayxs6qfh2761d4x9c034ivb2bcmmcnl56qs4448qb9495";
   };
 
diff --git a/pkgs/by-name/pa/par2cmdline-turbo/package.nix b/pkgs/by-name/pa/par2cmdline-turbo/package.nix
index c0fb838d39de..202e87e2c7de 100644
--- a/pkgs/by-name/pa/par2cmdline-turbo/package.nix
+++ b/pkgs/by-name/pa/par2cmdline-turbo/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "animetosho";
     repo = "par2cmdline-turbo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GFMFqHiKoQByD8ZYgGm36ehfMP4CvC2F+u2Va20RSNI=";
   };
 
diff --git a/pkgs/by-name/pa/par2cmdline/package.nix b/pkgs/by-name/pa/par2cmdline/package.nix
index e1d5c153bc1c..6f69f0e48eed 100644
--- a/pkgs/by-name/pa/par2cmdline/package.nix
+++ b/pkgs/by-name/pa/par2cmdline/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Parchive";
     repo = "par2cmdline";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "11mx8q29cr0sryd11awab7y4mhqgbamb1ss77rffjj6in8pb4hdk";
   };
 
diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix
index f4d4ac20b2df..27bef6cd7045 100644
--- a/pkgs/by-name/pa/parallel-disk-usage/package.nix
+++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "KSXGitHub";
     repo = "parallel-disk-usage";
-    tag = version;
+    rev = version;
     hash = "sha256-0SK7v5xKMPuukyYKaGk13PE3WygHginjnyoatkA5xFQ=";
   };
 
diff --git a/pkgs/by-name/pa/paralus-cli/package.nix b/pkgs/by-name/pa/paralus-cli/package.nix
index 0b99a3bc843b..24961d715afa 100644
--- a/pkgs/by-name/pa/paralus-cli/package.nix
+++ b/pkgs/by-name/pa/paralus-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "cli";
     owner = "paralus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cVrT8wU9MJgc/hzMVe1b0lzm7f+0Prv9w1IjMOAh69E=";
   };
 
diff --git a/pkgs/by-name/pa/parastoo-fonts/package.nix b/pkgs/by-name/pa/parastoo-fonts/package.nix
index 0b64a3354a14..0d3c24cd1c6c 100644
--- a/pkgs/by-name/pa/parastoo-fonts/package.nix
+++ b/pkgs/by-name/pa/parastoo-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "parastoo-font";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-E94B9R2h227D49dscCBsprmb7w0GrQ+2tWOWRf8FH30=";
   };
 
diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index b26c2594139b..25728d4e32a3 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
-    tag = version;
+    rev = version;
     hash = "sha256-ovyfHqLCf5U3UR1HfoA+UQhqLZ6IaILcpqptPRQsb60=";
   };
 
diff --git a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix
index c78a336400e8..161ca4cd6107 100644
--- a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix
+++ b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "justinbarclay";
     repo = "parinfer-rust-emacs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JYKFfbfpkvBRxYUDw2d6DD1mO27OKzdquSOhBk0lXr0=";
   };
 
diff --git a/pkgs/by-name/pa/parlatype/package.nix b/pkgs/by-name/pa/parlatype/package.nix
index d462631c2fcd..56080d475222 100644
--- a/pkgs/by-name/pa/parlatype/package.nix
+++ b/pkgs/by-name/pa/parlatype/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gkarsay";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1wi9f23zgvsa98xcxgghm53jlafnr3pan1zl4gkn0yd8b2d6avhk";
   };
 
diff --git a/pkgs/by-name/pa/parlay/package.nix b/pkgs/by-name/pa/parlay/package.nix
index aaf03a2346c2..5f5be4bcef49 100644
--- a/pkgs/by-name/pa/parlay/package.nix
+++ b/pkgs/by-name/pa/parlay/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "snyk";
     repo = "parlay";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-i7g0l+Q4VpBINK/HgIsl3wuxT2YoSqK08AJRxeVEzyo=";
   };
 
diff --git a/pkgs/by-name/pa/parsedmarc/package.nix b/pkgs/by-name/pa/parsedmarc/package.nix
index db2f76aa5b4e..f6b38bf7d3c3 100644
--- a/pkgs/by-name/pa/parsedmarc/package.nix
+++ b/pkgs/by-name/pa/parsedmarc/package.nix
@@ -14,7 +14,7 @@ let
         src = fetchFromGitHub {
           owner = "microsoftgraph";
           repo = "msgraph-sdk-python-core";
-          tag = "v${version}";
+          rev = "v${version}";
           hash = "sha256-eRRlG3GJX3WeKTNJVWgNTTHY56qiUGOlxtvEZ2xObLA=";
         };
 
diff --git a/pkgs/by-name/pa/partclone/package.nix b/pkgs/by-name/pa/partclone/package.nix
index 2f05f4a549d0..c01867172d95 100644
--- a/pkgs/by-name/pa/partclone/package.nix
+++ b/pkgs/by-name/pa/partclone/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Thomas-Tsai";
     repo = "partclone";
-    tag = version;
+    rev = version;
     sha256 = "sha256-TZkWDs0KC2Kb7l5QFiHITJqWyq+ryj5mnhNY1wxcUyE=";
   };
 
diff --git a/pkgs/by-name/pa/particl-core/package.nix b/pkgs/by-name/pa/particl-core/package.nix
index dcdc9ddfe5f7..51204fd92634 100644
--- a/pkgs/by-name/pa/particl-core/package.nix
+++ b/pkgs/by-name/pa/particl-core/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "particl";
     repo = "particl-core";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RxkLt+7u+r5jNwEWiArTUpZ8ykYwWtvIDFXTSKhGN/w=";
   };
 
diff --git a/pkgs/by-name/pa/paru/package.nix b/pkgs/by-name/pa/paru/package.nix
index 50c2e883e7e8..52278491e4ed 100644
--- a/pkgs/by-name/pa/paru/package.nix
+++ b/pkgs/by-name/pa/paru/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Morganamilo";
     repo = "paru";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VFIeDsIuPbWGf+vio5i8qGUBB+spP/7SwYwmQkMjtL8=";
   };
 
diff --git a/pkgs/by-name/pa/passage/package.nix b/pkgs/by-name/pa/passage/package.nix
index 2ef6f92eb554..9971511b5701 100644
--- a/pkgs/by-name/pa/passage/package.nix
+++ b/pkgs/by-name/pa/passage/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FiloSottile";
     repo = "passage";
-    tag = finalAttrs.version;
+    rev = "${finalAttrs.version}";
     hash = "sha256-tGHJFzDc2K117r5EMFdKsfw/+EpdZ0qzaExt+RGI4qo=";
   };
 
diff --git a/pkgs/by-name/pa/passdetective/package.nix b/pkgs/by-name/pa/passdetective/package.nix
index 8523201456e1..842de021361f 100644
--- a/pkgs/by-name/pa/passdetective/package.nix
+++ b/pkgs/by-name/pa/passdetective/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aydinnyunus";
     repo = "PassDetective";
-    tag = version;
+    rev = version;
     hash = "sha256-ln+nKESCYNQwTB6njNQBNUGmF+NXqgzmM1sb/d6ZBcU=";
   };
 
diff --git a/pkgs/by-name/pa/passerine/package.nix b/pkgs/by-name/pa/passerine/package.nix
index 50c8056b2046..f9b14596e41e 100644
--- a/pkgs/by-name/pa/passerine/package.nix
+++ b/pkgs/by-name/pa/passerine/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vrtbl";
     repo = "passerine";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TrbcULIJ9+DgQ4QsLYD5okxHoIusGJDw1PqJQwq1zu0=";
   };
 
diff --git a/pkgs/by-name/pa/passff-host/package.nix b/pkgs/by-name/pa/passff-host/package.nix
index 13707767fd57..39260da44250 100644
--- a/pkgs/by-name/pa/passff-host/package.nix
+++ b/pkgs/by-name/pa/passff-host/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "passff";
     repo = "passff-host";
-    tag = version;
+    rev = version;
     sha256 = "sha256-P5h0B5ilwp3OVyDHIOQ23Zv4eLjN4jFkdZF293FQnNE=";
   };
 
diff --git a/pkgs/by-name/pa/passphrase2pgp/package.nix b/pkgs/by-name/pa/passphrase2pgp/package.nix
index 6cffc4011016..001eae79cbbf 100644
--- a/pkgs/by-name/pa/passphrase2pgp/package.nix
+++ b/pkgs/by-name/pa/passphrase2pgp/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "skeeto";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-it1XYzLiteL0oq4SZp5E3s6oSkFKi3ZY0Lt+P0gmNag=";
   };
 
diff --git a/pkgs/by-name/pa/pastebinit/package.nix b/pkgs/by-name/pa/pastebinit/package.nix
index 6d6caebbca2f..d798f11ece56 100644
--- a/pkgs/by-name/pa/pastebinit/package.nix
+++ b/pkgs/by-name/pa/pastebinit/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-vuAWkHlQM6QTWarThpSbY0qrxzej0GvLU0jT2JOS/qc=";
   };
 
diff --git a/pkgs/by-name/pa/pasystray/package.nix b/pkgs/by-name/pa/pasystray/package.nix
index 4464e4ea264f..b81ace79d922 100644
--- a/pkgs/by-name/pa/pasystray/package.nix
+++ b/pkgs/by-name/pa/pasystray/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "christophgysin";
     repo = "pasystray";
-    tag = version;
+    rev = version;
     sha256 = "sha256-QaTQ8yUviJaFEQaQm2vYAUngqHliKe8TDYqfWt1Nx/0=";
   };
 
diff --git a/pkgs/by-name/pa/pat/package.nix b/pkgs/by-name/pa/pat/package.nix
index c367214df21f..0352ef2c6cd9 100644
--- a/pkgs/by-name/pa/pat/package.nix
+++ b/pkgs/by-name/pa/pat/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "la5nta";
     repo = "pat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JlqYdsAXs3pS5i59tiel+gxQsTrn5mUs0qLzjHxGZU0=";
   };
 
diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix
index 05c1ecd95db4..714c3140070a 100644
--- a/pkgs/by-name/pa/patch2pr/package.nix
+++ b/pkgs/by-name/pa/patch2pr/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bluekeyes";
     repo = "patch2pr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RQg7Fo8Z0P+z6Fv6YTv/IpEErP6ncxylvBaeargTrIQ=";
   };
 
diff --git a/pkgs/by-name/pa/patchage/package.nix b/pkgs/by-name/pa/patchage/package.nix
index b309b68e997b..b8f1fccf5a76 100644
--- a/pkgs/by-name/pa/patchage/package.nix
+++ b/pkgs/by-name/pa/patchage/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "drobilla";
     repo = "patchage";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LzN6RyF/VT4LUVeR0904BnLuNMFZjFTDu9oDIKYG2Yo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pa/pathvector/package.nix b/pkgs/by-name/pa/pathvector/package.nix
index d71c3bf49cf6..3f08e6f9f5e2 100644
--- a/pkgs/by-name/pa/pathvector/package.nix
+++ b/pkgs/by-name/pa/pathvector/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "natesales";
     repo = "pathvector";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TqGasguEAcA5ET2E/uFjgIl7IHI2v9m5EaXpIMG3T8c=";
   };
 
diff --git a/pkgs/by-name/pa/patsh/package.nix b/pkgs/by-name/pa/patsh/package.nix
index 77d88aaf1901..3e850dece1b7 100644
--- a/pkgs/by-name/pa/patsh/package.nix
+++ b/pkgs/by-name/pa/patsh/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "patsh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-d2Br4RAlKO7Bpse8sFbIDCIYd2fYvby0ar9oIbQS2jc=";
   };
 
diff --git a/pkgs/by-name/pa/payme/package.nix b/pkgs/by-name/pa/payme/package.nix
index 80d4580292e6..70df0c753a3c 100644
--- a/pkgs/by-name/pa/payme/package.nix
+++ b/pkgs/by-name/pa/payme/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jovandeginste";
     repo = "payme";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jkJGR6i68kNzA60T5ZOu2u+fPvZht4ssEtr8aYocGUk=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/pa/pazi/package.nix b/pkgs/by-name/pa/pazi/package.nix
index 4505bf92b6ee..560f1e7c7a10 100644
--- a/pkgs/by-name/pa/pazi/package.nix
+++ b/pkgs/by-name/pa/pazi/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "euank";
     repo = "pazi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PDgk6VQ/J9vkFJ0N+BH9LqHOXRYM+a+WhRz8QeLZGiM=";
   };
 
diff --git a/pkgs/by-name/pb/pbgopy/package.nix b/pkgs/by-name/pb/pbgopy/package.nix
index ebd070740060..a58cce6be115 100644
--- a/pkgs/by-name/pb/pbgopy/package.nix
+++ b/pkgs/by-name/pb/pbgopy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nakabonne";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-P/MFDFMsqSTVErTM9izJJSMIbiOcbQ9Ya10/w6NRcYw=";
   };
 
diff --git a/pkgs/by-name/pb/pbpctrl/package.nix b/pkgs/by-name/pb/pbpctrl/package.nix
index bc50487df7f3..715ba55bde98 100644
--- a/pkgs/by-name/pb/pbpctrl/package.nix
+++ b/pkgs/by-name/pb/pbpctrl/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "qzed";
     repo = "pbpctrl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-u5I3Hs00JDPRBwThYTEmNiZj/zPVfHyyrt4E68d13do=";
   };
 
diff --git a/pkgs/by-name/pb/pbzx/package.nix b/pkgs/by-name/pb/pbzx/package.nix
index 46923483da16..4f96d27de10c 100644
--- a/pkgs/by-name/pb/pbzx/package.nix
+++ b/pkgs/by-name/pb/pbzx/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NiklasRosenstein";
     repo = "pbzx";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90";
   };
   patches = [ ./stdin.patch ];
diff --git a/pkgs/by-name/pc/pcapc/package.nix b/pkgs/by-name/pc/pcapc/package.nix
index 9bc032d49717..0e7d8121d9cd 100644
--- a/pkgs/by-name/pc/pcapc/package.nix
+++ b/pkgs/by-name/pc/pcapc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "post-factum";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oDg9OSvi9aQsZ2SQm02NKAcppE0w5SGZaI13gdp7gv4=";
   };
 
diff --git a/pkgs/by-name/pc/pcaudiolib/package.nix b/pkgs/by-name/pc/pcaudiolib/package.nix
index 3ba07f34725a..32f31d8fbfc0 100644
--- a/pkgs/by-name/pc/pcaudiolib/package.nix
+++ b/pkgs/by-name/pc/pcaudiolib/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "espeak-ng";
     repo = "pcaudiolib";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-bBiGvAySEwAv6Qj2iSawb9oZfMCGBDCDIP8AYdbtQQc=";
   };
 
diff --git a/pkgs/by-name/pc/pcb2gcode/package.nix b/pkgs/by-name/pc/pcb2gcode/package.nix
index 447ce68d5436..3d0cc9ef7069 100644
--- a/pkgs/by-name/pc/pcb2gcode/package.nix
+++ b/pkgs/by-name/pc/pcb2gcode/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pcb2gcode";
     repo = "pcb2gcode";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-c5YabBqZn6ilIkF3lifTsYyLZMsZN21jDj1hNu0PRAc=";
   };
 
diff --git a/pkgs/by-name/pc/pcm/package.nix b/pkgs/by-name/pc/pcm/package.nix
index bfa2aa03946a..1e2f7cd370ce 100644
--- a/pkgs/by-name/pc/pcm/package.nix
+++ b/pkgs/by-name/pc/pcm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opcm";
     repo = "pcm";
-    tag = version;
+    rev = version;
     hash = "sha256-U6V3LX+JlVL9MRFBP3xpYwPQ6Y7pnJ4F/7dpKG3Eyuw=";
   };
 
diff --git a/pkgs/by-name/pc/pcmanx-gtk2/package.nix b/pkgs/by-name/pc/pcmanx-gtk2/package.nix
index 377e0c0785ef..9e2bea957a66 100644
--- a/pkgs/by-name/pc/pcmanx-gtk2/package.nix
+++ b/pkgs/by-name/pc/pcmanx-gtk2/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pcman-bbs";
     repo = "pcmanx";
-    tag = version;
+    rev = version;
     sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc";
   };
 
diff --git a/pkgs/by-name/pc/pcmsolver/package.nix b/pkgs/by-name/pc/pcmsolver/package.nix
index 46cd978557ea..daca5a3ce17c 100644
--- a/pkgs/by-name/pc/pcmsolver/package.nix
+++ b/pkgs/by-name/pc/pcmsolver/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PCMSolver";
     repo = "pcmsolver";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0jrxr8z21hjy7ik999hna9rdqy221kbkl3qkb06xw7g80rc9x9yr";
   };
 
diff --git a/pkgs/by-name/pc/pcp/package.nix b/pkgs/by-name/pc/pcp/package.nix
index 5c7fa209d410..a8d6e1c58ba9 100644
--- a/pkgs/by-name/pc/pcp/package.nix
+++ b/pkgs/by-name/pc/pcp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dennis-tra";
     repo = "pcp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-aZO8VuOiYhOPctFKZ6a2psJB0lKHlPc+NLy2RWDU4JI=";
   };
 
diff --git a/pkgs/by-name/pc/pcstat/package.nix b/pkgs/by-name/pc/pcstat/package.nix
index c27fe1e87eee..2b9b2ddb5c2a 100644
--- a/pkgs/by-name/pc/pcstat/package.nix
+++ b/pkgs/by-name/pc/pcstat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tobert";
     repo = "pcstat";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-e8fQZEfsS5dATPgshJktfKVTdZ9CvN1CttYipMjpGNM=";
   };
 
diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix
index 0491df34d083..365dea0f8044 100644
--- a/pkgs/by-name/pd/pdal/package.nix
+++ b/pkgs/by-name/pd/pdal/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "PDAL";
     repo = "PDAL";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-52v7oDmvq820mJ91XAZI1rQEwssWcHagcd2QNVV6zPA=";
   };
 
diff --git a/pkgs/by-name/pd/pdf2djvu/package.nix b/pkgs/by-name/pd/pdf2djvu/package.nix
index a6365c202ae9..e92663ad2239 100644
--- a/pkgs/by-name/pd/pdf2djvu/package.nix
+++ b/pkgs/by-name/pd/pdf2djvu/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jwilk";
     repo = "pdf2djvu";
-    tag = version;
+    rev = version;
     sha256 = "sha256-j4mYdmLZ56qTA1KbWBjBvyTyLaeuIITKYsALRIO7lj0=";
   };
 
diff --git a/pkgs/by-name/pd/pdf2svg/package.nix b/pkgs/by-name/pd/pdf2svg/package.nix
index 3e34b505db10..86040410708c 100644
--- a/pkgs/by-name/pd/pdf2svg/package.nix
+++ b/pkgs/by-name/pd/pdf2svg/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "db9052";
     repo = "pdf2svg";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zME0U+PyENnoLyjo9W2i2MRM00wNmHkYcR2LMEtTbBY=";
   };
 
diff --git a/pkgs/by-name/pd/pdfannots/package.nix b/pkgs/by-name/pd/pdfannots/package.nix
index de8195145fd5..4cd56f2217c6 100644
--- a/pkgs/by-name/pd/pdfannots/package.nix
+++ b/pkgs/by-name/pd/pdfannots/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "0xabu";
     repo = "pdfannots";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-C0Ss6kZvPx0hHnpBKquEolxeuTfjshhSBSIDXcCKtM8=";
   };
 
diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix
index c43cc44a4f0c..438d0a12e976 100644
--- a/pkgs/by-name/pd/pdfcpu/package.nix
+++ b/pkgs/by-name/pd/pdfcpu/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PJTEaWU/erqVJakvxfB0aYRsi/tcGxYYZjCdEvThmzM=";
     # 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/pdfdiff/package.nix b/pkgs/by-name/pd/pdfdiff/package.nix
index 0f86c6607269..a24d180f6493 100644
--- a/pkgs/by-name/pd/pdfdiff/package.nix
+++ b/pkgs/by-name/pd/pdfdiff/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cascremers";
     repo = "pdfdiff";
-    tag = version;
+    rev = version;
     hash = "sha256-NPki/PFm0b71Ksak1mimR4w6J2a0jBCbQDTMQR4uZFI=";
   };
 
diff --git a/pkgs/by-name/pd/pdfslicer/package.nix b/pkgs/by-name/pd/pdfslicer/package.nix
index 9af9f541b486..34e7c61d3642 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     sha256 = "0sja0ddd9c8wjjpzk2ag8q1lxpj09adgmhd7wnsylincqnj2jyls";
   };
diff --git a/pkgs/by-name/pd/pdftag/package.nix b/pkgs/by-name/pd/pdftag/package.nix
index f89cc1716c09..f42ea7b7465c 100644
--- a/pkgs/by-name/pd/pdftag/package.nix
+++ b/pkgs/by-name/pd/pdftag/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arrufat";
     repo = "pdftag";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1paj8hs27akzsivn01a30fl3zx5gfn1h89wxg2m72fd806hk0hql";
   };
 
diff --git a/pkgs/by-name/pd/pdftk/package.nix b/pkgs/by-name/pd/pdftk/package.nix
index c22f6f58293e..d21f0b2d3117 100644
--- a/pkgs/by-name/pd/pdftk/package.nix
+++ b/pkgs/by-name/pd/pdftk/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "pdftk-java";
     repo = "pdftk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ciKotTHSEcITfQYKFZ6sY2LZnXGChBJy0+eno8B3YHY=";
   };
 
diff --git a/pkgs/by-name/pd/pdftoipe/package.nix b/pkgs/by-name/pd/pdftoipe/package.nix
index a13c9e2b9fbf..70e3fc58f3d9 100644
--- a/pkgs/by-name/pd/pdftoipe/package.nix
+++ b/pkgs/by-name/pd/pdftoipe/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "otfried";
     repo = "ipe-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k=";
   };
 
diff --git a/pkgs/by-name/pd/pdpmake/package.nix b/pkgs/by-name/pd/pdpmake/package.nix
index a2e338b37f11..59f7ecc23e48 100644
--- a/pkgs/by-name/pd/pdpmake/package.nix
+++ b/pkgs/by-name/pd/pdpmake/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rmyorston";
     repo = "pdpmake";
-    tag = version;
+    rev = version;
     hash = "sha256-6lLYtBKZTmi+fBkCyDysJS1O37/Z6ir9hU3pX4X1VHQ=";
   };
 
diff --git a/pkgs/by-name/pe/pe-parse/package.nix b/pkgs/by-name/pe/pe-parse/package.nix
index e95e23cab1bf..e259b51aa564 100644
--- a/pkgs/by-name/pe/pe-parse/package.nix
+++ b/pkgs/by-name/pe/pe-parse/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "pe-parse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XegSZWRoQg6NEWuTSFI1RMvN3GbpLDrZrloPU2XdK2M=";
   };
 
diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix
index 70c237ce4821..d22a18e43e0d 100644
--- a/pkgs/by-name/pe/peazip/package.nix
+++ b/pkgs/by-name/pe/peazip/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "peazip";
     repo = "peazip";
-    tag = version;
+    rev = version;
     hash = "sha256-rEddDg2sS/4+HK3UqPEWudWnwjMPNjA2+v4CKtFtZYM=";
   };
   sourceRoot = "${src.name}/peazip-sources";
diff --git a/pkgs/by-name/pe/pebble/package.nix b/pkgs/by-name/pe/pebble/package.nix
index a9959e370cdd..3c507c4daee7 100644
--- a/pkgs/by-name/pe/pebble/package.nix
+++ b/pkgs/by-name/pe/pebble/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "letsencrypt";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YPU/bl7h6rOWg+5ut0Thn2UupeKpJ7u4KXc2svIeZEM=";
   };
 
diff --git a/pkgs/by-name/pe/peco/package.nix b/pkgs/by-name/pe/peco/package.nix
index f3779c5625a0..0c794fb719ae 100644
--- a/pkgs/by-name/pe/peco/package.nix
+++ b/pkgs/by-name/pe/peco/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "peco";
     repo = "peco";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OVUfeNpnmuJsgD//JTn6n9n4oOBxep69LhIpHX+ru2w=";
   };
 
diff --git a/pkgs/by-name/pe/peek/package.nix b/pkgs/by-name/pe/peek/package.nix
index 1ff831693f3b..54921269b88e 100644
--- a/pkgs/by-name/pe/peek/package.nix
+++ b/pkgs/by-name/pe/peek/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phw";
     repo = "peek";
-    tag = version;
+    rev = version;
     sha256 = "1xwlfizga6hvjqq127py8vabaphsny928ar7mwqj9cyqfl6fx41x";
   };
 
diff --git a/pkgs/by-name/pe/peep/package.nix b/pkgs/by-name/pe/peep/package.nix
index d625afcd23df..d09c3c892c29 100644
--- a/pkgs/by-name/pe/peep/package.nix
+++ b/pkgs/by-name/pe/peep/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ryochack";
     repo = "peep";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6Y7ZI0kIPE7uMMOkXgm75JMEec090xZPBJFJr9DaswA=";
   };
 
diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix
index 9bf67f4aff66..904dad57b84f 100644
--- a/pkgs/by-name/pe/peergos/package.nix
+++ b/pkgs/by-name/pe/peergos/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Peergos";
     repo = "web-ui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TSvhp/9nneXGADiDPgGvA78emVcQG0UzHsFfVS9k7mo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pe/pegtl/package.nix b/pkgs/by-name/pe/pegtl/package.nix
index 3dac95db7a78..28052ee7513b 100644
--- a/pkgs/by-name/pe/pegtl/package.nix
+++ b/pkgs/by-name/pe/pegtl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "taocpp";
     repo = "PEGTL";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-nPWSO2wPl/qenUQgvQDQu7Oy1dKa/PnNFSclmkaoM8A=";
   };
 
diff --git a/pkgs/by-name/pe/perceptualdiff/package.nix b/pkgs/by-name/pe/perceptualdiff/package.nix
index 24a6f582b51f..0f2154629c3d 100644
--- a/pkgs/by-name/pe/perceptualdiff/package.nix
+++ b/pkgs/by-name/pe/perceptualdiff/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "myint";
     repo = "perceptualdiff";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "176n518xv0pczf1yyz9r5a8zw5r6sh5ym596kmvw30qznp8n4a8j";
   };
 
diff --git a/pkgs/by-name/pe/percollate/package.nix b/pkgs/by-name/pe/percollate/package.nix
index 304f92083fd9..174e4de6d5ee 100644
--- a/pkgs/by-name/pe/percollate/package.nix
+++ b/pkgs/by-name/pe/percollate/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "danburzo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JpdSEockALXtuuMMi5mgD5AXcayojyK0qMMWF+XFfZE=";
   };
 
diff --git a/pkgs/by-name/pe/perfect-hash/package.nix b/pkgs/by-name/pe/perfect-hash/package.nix
index 96d387cbfcd7..b9466c770104 100644
--- a/pkgs/by-name/pe/perfect-hash/package.nix
+++ b/pkgs/by-name/pe/perfect-hash/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ilanschnell";
     repo = "perfect-hash";
-    tag = version;
+    rev = version;
     sha256 = "0gkc3n613hl0q4jknrh2nm1n96j97p36q9jjgarb9d8yii9q7792";
   };
 
diff --git a/pkgs/by-name/pe/perl-debug-adapter/package.nix b/pkgs/by-name/pe/perl-debug-adapter/package.nix
index 5682db303c3d..7ad7d2a006e6 100644
--- a/pkgs/by-name/pe/perl-debug-adapter/package.nix
+++ b/pkgs/by-name/pe/perl-debug-adapter/package.nix
@@ -23,7 +23,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Nihilus118";
     repo = "perl-debug-adapter";
-    tag = version;
+    rev = version;
     hash = "sha256-IXXKhk4rzsWSPA0RT0L3CZuKlgTWtweZ4dQtruTigRs=";
   };
 
diff --git a/pkgs/by-name/pe/perlnavigator/package.nix b/pkgs/by-name/pe/perlnavigator/package.nix
index b5a9d4c4a59e..34f216ad4daa 100644
--- a/pkgs/by-name/pe/perlnavigator/package.nix
+++ b/pkgs/by-name/pe/perlnavigator/package.nix
@@ -9,7 +9,7 @@ let
   src = fetchFromGitHub {
     owner = "bscan";
     repo = "PerlNavigator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CNsgFf+W7YQwAR++GwfTka4Cy8woRu02BQIJRmRAxK4=";
   };
   browser-ext = buildNpmPackage {
diff --git a/pkgs/by-name/pe/persistent-cache-cpp/package.nix b/pkgs/by-name/pe/persistent-cache-cpp/package.nix
index 36aa640396c9..e1d7bb70efa4 100644
--- a/pkgs/by-name/pe/persistent-cache-cpp/package.nix
+++ b/pkgs/by-name/pe/persistent-cache-cpp/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/persistent-cache-cpp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-bOABrRSy5Mzeaqoc5ujcGXyBAaCJLv/488M7fkr0npE=";
   };
 
diff --git a/pkgs/by-name/pe/peru/package.nix b/pkgs/by-name/pe/peru/package.nix
index 445e1d3eaa6d..41e31401f4df 100644
--- a/pkgs/by-name/pe/peru/package.nix
+++ b/pkgs/by-name/pe/peru/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "buildinspace";
     repo = "peru";
-    tag = version;
+    rev = version;
     sha256 = "FCyR14jcFjI6epoFPNVyFZ4k1URZ1NraX1+ajVcCQ2A=";
   };
 
diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix
index 4f825c5a2180..a06b35650757 100644
--- a/pkgs/by-name/pe/pest-ide-tools/package.nix
+++ b/pkgs/by-name/pe/pest-ide-tools/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pest-parser";
     repo = "pest-ide-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ=";
   };
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/pe/pet/package.nix b/pkgs/by-name/pe/pet/package.nix
index 35693c77055f..f702dda7b191 100644
--- a/pkgs/by-name/pe/pet/package.nix
+++ b/pkgs/by-name/pe/pet/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knqyf263";
     repo = "pet";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-B0ilobUlp6UUXu6+lVqIHkbFnxVu33eXZFf+F7ODoQU=";
   };
 
diff --git a/pkgs/by-name/pf/pfetch-rs/package.nix b/pkgs/by-name/pf/pfetch-rs/package.nix
index 6a349fe6cad4..33ffa99ff901 100644
--- a/pkgs/by-name/pf/pfetch-rs/package.nix
+++ b/pkgs/by-name/pf/pfetch-rs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Gobidev";
     repo = "pfetch-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Kgoo8piv4pNqzw9zQSEj7POSK6l+0KMvaNbvMp+bpF8=";
   };
 
diff --git a/pkgs/by-name/pf/pfsshell/package.nix b/pkgs/by-name/pf/pfsshell/package.nix
index 07fb3200b860..5ebe0684e3c8 100644
--- a/pkgs/by-name/pf/pfsshell/package.nix
+++ b/pkgs/by-name/pf/pfsshell/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uyjulian";
     repo = "pfsshell";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0cr91al3knsbfim75rzl7rxdsglcc144x0nizn7q4jx5cad3zbn8";
   };
 
diff --git a/pkgs/by-name/pg/pg_checksums/package.nix b/pkgs/by-name/pg/pg_checksums/package.nix
index 620b441a694b..a52513a5f805 100644
--- a/pkgs/by-name/pg/pg_checksums/package.nix
+++ b/pkgs/by-name/pg/pg_checksums/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "credativ";
     repo = "pg_checksums";
-    tag = version;
+    rev = version;
     sha256 = "sha256-joGaCoRMGpEqq7pnT4Qd7XySjZ5wlZPW27WfOv1UFF4=";
   };
 
diff --git a/pkgs/by-name/pg/pg_featureserv/package.nix b/pkgs/by-name/pg/pg_featureserv/package.nix
index 74d1fff4bd53..6774bfda4e21 100644
--- a/pkgs/by-name/pg/pg_featureserv/package.nix
+++ b/pkgs/by-name/pg/pg_featureserv/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CrunchyData";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GsloUZFgrOrJc23vKv+8iSeyIEKblaukPSCpZGRtSL4=";
   };
 
diff --git a/pkgs/by-name/pg/pg_flame/package.nix b/pkgs/by-name/pg/pg_flame/package.nix
index 3dc6ef82d0d4..35f860063d1a 100644
--- a/pkgs/by-name/pg/pg_flame/package.nix
+++ b/pkgs/by-name/pg/pg_flame/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mgartner";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-glvIv9GHIbp6IZUvZo9fyvkJ6QR03nMlrAOpZ3HfA6g=";
   };
 
diff --git a/pkgs/by-name/pg/pg_tileserv/package.nix b/pkgs/by-name/pg/pg_tileserv/package.nix
index cca9ace03f35..96d5f6eb5caa 100644
--- a/pkgs/by-name/pg/pg_tileserv/package.nix
+++ b/pkgs/by-name/pg/pg_tileserv/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CrunchyData";
     repo = "pg_tileserv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xTIx39eLmHBUlaUjQy9KGpi5X4AU93DzX+Ofg5PMLWE=";
   };
 
diff --git a/pkgs/by-name/pg/pgagroal/package.nix b/pkgs/by-name/pg/pgagroal/package.nix
index 9a43e364322c..4ec8d31a2e98 100644
--- a/pkgs/by-name/pg/pgagroal/package.nix
+++ b/pkgs/by-name/pg/pgagroal/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "agroal";
     repo = "pgagroal";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-bgJvGJ35RdFopW88o+H1DLpG70anP197y6xrpRRrxUA=";
   };
 
diff --git a/pkgs/by-name/pg/pgcat/package.nix b/pkgs/by-name/pg/pgcat/package.nix
index 64ae410bdbe1..159acd4ca1e7 100644
--- a/pkgs/by-name/pg/pgcat/package.nix
+++ b/pkgs/by-name/pg/pgcat/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "postgresml";
     repo = "pgcat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DHXUhAAOmPSt4aVp93I1y69of+MEboXJBZH50mzQTm8=";
   };
 
diff --git a/pkgs/by-name/pg/pgcenter/package.nix b/pkgs/by-name/pg/pgcenter/package.nix
index 7db70ce64ce9..41025c33af03 100644
--- a/pkgs/by-name/pg/pgcenter/package.nix
+++ b/pkgs/by-name/pg/pgcenter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lesovsky";
     repo = "pgcenter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xaY01T12/5Peww9scRgfc5yHj7QA8BEwOK5l6OedziY=";
   };
 
diff --git a/pkgs/by-name/pg/pget/package.nix b/pkgs/by-name/pg/pget/package.nix
index 14109644ed19..3a7ac72df18d 100644
--- a/pkgs/by-name/pg/pget/package.nix
+++ b/pkgs/by-name/pg/pget/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Code-Hex";
     repo = "pget";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SDe9QH1iSRfMBSCfYiOJPXUbDvxH5cCCWvQq9uTWT9Y=";
   };
 
diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix
index 1670a2b016e6..0f3547ed42c7 100644
--- a/pkgs/by-name/pg/pgformatter/package.nix
+++ b/pkgs/by-name/pg/pgformatter/package.nix
@@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "darold";
     repo = "pgFormatter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4KtrsckO9Q9H0yIM0877YvWaDW02CQVAQiOKD919e9w=";
   };
 
diff --git a/pkgs/by-name/pg/pgmetrics/package.nix b/pkgs/by-name/pg/pgmetrics/package.nix
index 6b96a34df88f..d2ff1864fbff 100644
--- a/pkgs/by-name/pg/pgmetrics/package.nix
+++ b/pkgs/by-name/pg/pgmetrics/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rapidloop";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-SaJc09RRm8MR8OiBIznCRHLhpflQ4Gi8tlXQvYd/j9A=";
   };
 
diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix
index c3ff7039e383..e8c129cbcd52 100644
--- a/pkgs/by-name/pg/pgmoneta/package.nix
+++ b/pkgs/by-name/pg/pgmoneta/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pgmoneta";
     repo = "pgmoneta";
-    tag = version;
+    rev = version;
     hash = "sha256-kPQ0GCRYrxoAz4Y2uGHsvn8KxiAE2Fc6FMOJyZaWTjI=";
   };
 
diff --git a/pkgs/by-name/pg/pgo-client/package.nix b/pkgs/by-name/pg/pgo-client/package.nix
index e0b2cfc51531..cce769dee966 100644
--- a/pkgs/by-name/pg/pgo-client/package.nix
+++ b/pkgs/by-name/pg/pgo-client/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CrunchyData";
     repo = "postgres-operator";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZwKfbmKPvhxLpCGH+IlfoQjnw8go4N6mfseY2LWCktA=";
   };
 
diff --git a/pkgs/by-name/pg/pgpdump/package.nix b/pkgs/by-name/pg/pgpdump/package.nix
index 5fc33e1fabab..77eaec1928cc 100644
--- a/pkgs/by-name/pg/pgpdump/package.nix
+++ b/pkgs/by-name/pg/pgpdump/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kazu-yamamoto";
     repo = "pgpdump";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JKedgHCTDnvLyLR3nGl4XFAaxXDU1TgHrxPMlRFwtBo=";
   };
 
diff --git a/pkgs/by-name/pg/pgsrip/package.nix b/pkgs/by-name/pg/pgsrip/package.nix
index 9761da747ab1..6f85b5878b2d 100644
--- a/pkgs/by-name/pg/pgsrip/package.nix
+++ b/pkgs/by-name/pg/pgsrip/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ratoaq2";
     repo = "pgsrip";
-    tag = version;
+    rev = version;
     hash = "sha256-H9gZXge+m/bCq25Fv91oFZ8Cq2SRNrKhOaDrLZkjazg=";
   };
 
diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix
index b65d15629a5f..dc7414f1949f 100644
--- a/pkgs/by-name/pg/pgtop/package.nix
+++ b/pkgs/by-name/pg/pgtop/package.nix
@@ -13,7 +13,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "cosimo";
     repo = "pgtop";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1awyl6ddfihm7dfr5y2z15r1si5cyipnlyyj3m1l19pk98s4x66l";
   };
 
diff --git a/pkgs/by-name/pg/pgweb/package.nix b/pkgs/by-name/pg/pgweb/package.nix
index c774d931639a..7b59121c4f54 100644
--- a/pkgs/by-name/pg/pgweb/package.nix
+++ b/pkgs/by-name/pg/pgweb/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sosedoff";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gZK8+H3dBMzSVyE96E7byihKMR4+1YlVFZJtCTGUZwI=";
   };
 
diff --git a/pkgs/by-name/ph/phash/package.nix b/pkgs/by-name/ph/phash/package.nix
index 780c9f35dfef..3ad3419282a0 100644
--- a/pkgs/by-name/ph/phash/package.nix
+++ b/pkgs/by-name/ph/phash/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "clearscene";
     repo = "pHash";
-    tag = version;
+    rev = version;
     sha256 = "sha256-frISiZ89ei7XfI5F2nJJehfQZsk0Mlb4n91q/AiZ2vA=";
   };
 
diff --git a/pkgs/by-name/ph/phd2/package.nix b/pkgs/by-name/ph/phd2/package.nix
index 1294520f6d1c..96bf38706186 100644
--- a/pkgs/by-name/ph/phd2/package.nix
+++ b/pkgs/by-name/ph/phd2/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenPHDGuiding";
     repo = "phd2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GnT/tyk975caqESBSu4mdX5IWGi5O+RljLSd+CwoGWo=";
   };
 
diff --git a/pkgs/by-name/ph/phockup/package.nix b/pkgs/by-name/ph/phockup/package.nix
index 599e14ff4424..c749974ced48 100644
--- a/pkgs/by-name/ph/phockup/package.nix
+++ b/pkgs/by-name/ph/phockup/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ivandokov";
     repo = "phockup";
-    tag = version;
+    rev = version;
     sha256 = "sha256-44UjxTbC2XK+NThvesROdd7aGP7zr7g7bQiQZv2TvvM=";
   };
 
diff --git a/pkgs/by-name/ph/photocollage/package.nix b/pkgs/by-name/ph/photocollage/package.nix
index 91cb6f2f9f4e..03894fb27b0a 100644
--- a/pkgs/by-name/ph/photocollage/package.nix
+++ b/pkgs/by-name/ph/photocollage/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "adrienverge";
     repo = "PhotoCollage";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jDb2mFsok8TNi9+A/FAieqo7YbAUsmrFRBGwdGv71Xg=";
   };
 
diff --git a/pkgs/by-name/ph/photon/package.nix b/pkgs/by-name/ph/photon/package.nix
index bea5013fd789..8be4fbe6b242 100644
--- a/pkgs/by-name/ph/photon/package.nix
+++ b/pkgs/by-name/ph/photon/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "s0md3v";
     repo = "Photon";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "02z1xj72bq35dilr4b6njry4kixz6j2a3ag02nla98q0fvgmgnvy";
   };
 
diff --git a/pkgs/by-name/ph/photoprism/package.nix b/pkgs/by-name/ph/photoprism/package.nix
index d6f64533fc52..158aa87830e7 100644
--- a/pkgs/by-name/ph/photoprism/package.nix
+++ b/pkgs/by-name/ph/photoprism/package.nix
@@ -23,7 +23,7 @@ let
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-tJA1Q8kcX4UYDCV+rmHyd5gfEU8WkoaqNfx1/0Iy3l8=";
   };
 
diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix
index f6fc04bc8ec8..f1bfef2201b5 100644
--- a/pkgs/by-name/ph/phpactor/package.nix
+++ b/pkgs/by-name/ph/phpactor/package.nix
@@ -13,7 +13,7 @@ php.buildComposerProject2 (finalAttrs: {
   src = fetchFromGitHub {
     owner = "phpactor";
     repo = "phpactor";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-K3phBiu2D3DbOm7mApqqSNnVCsfYRQtN/o3bCVubN9I=";
   };
 
diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix
index c6b139a11616..01c005fb9ced 100644
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
-    tag = version;
+    rev = version;
     sha256 = "sha256-85XgRml1D6J4HkxiUk0zLlC+q0ylmN68hL0z73HG/Lk=";
   };
 
diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix
index d3845fe5cbc7..4d955ec9fa12 100644
--- a/pkgs/by-name/ph/phraze/package.nix
+++ b/pkgs/by-name/ph/phraze/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sts10";
     repo = "phraze";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4RdPN2l0tQbxgTVxwdl0APYD8h9DrF9f5MIQkcozt48=";
   };
 
diff --git a/pkgs/by-name/ph/physlock/package.nix b/pkgs/by-name/ph/physlock/package.nix
index 3868f47ca888..20cdf5c41d40 100644
--- a/pkgs/by-name/ph/physlock/package.nix
+++ b/pkgs/by-name/ph/physlock/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "muennich";
     repo = "physlock";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1mz4xxjip5ldiw9jgfq9zvqb6w10bcjfx6939w1appqg8f521a7s";
   };
 
diff --git a/pkgs/by-name/pi/piano-rs/package.nix b/pkgs/by-name/pi/piano-rs/package.nix
index 7d4f22314772..bedc763202d2 100644
--- a/pkgs/by-name/pi/piano-rs/package.nix
+++ b/pkgs/by-name/pi/piano-rs/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ritiek";
     repo = "piano-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qZeH9xXQPIOJ87mvLahnJB3DuEgLX0EAXPvECgxNlq0=";
   };
 
diff --git a/pkgs/by-name/pi/pianotrans/package.nix b/pkgs/by-name/pi/pianotrans/package.nix
index 86b0ae68141d..3d73cbf97e6c 100644
--- a/pkgs/by-name/pi/pianotrans/package.nix
+++ b/pkgs/by-name/pi/pianotrans/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "azuwis";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gRbyUQmPtGvx5QKAyrmeJl0stp7hwLBWwjSbJajihdE=";
   };
 
diff --git a/pkgs/by-name/pi/pick/package.nix b/pkgs/by-name/pi/pick/package.nix
index a26778da4c63..307cf5f58509 100644
--- a/pkgs/by-name/pi/pick/package.nix
+++ b/pkgs/by-name/pi/pick/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mptre";
     repo = "pick";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "8cgt5KpLfnLwhucn4DQYC/7ot1u24ahJxWG+/1SL584=";
   };
 
diff --git a/pkgs/by-name/pi/picocom/package.nix b/pkgs/by-name/pi/picocom/package.nix
index f8e21f5d72de..4a549e27921c 100644
--- a/pkgs/by-name/pi/picocom/package.nix
+++ b/pkgs/by-name/pi/picocom/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "wsakernel";
     repo = "picocom";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-cQoEfi75iltjeAm26NvXgfrL7d1Hm+1veQ4dVe0S1q8=";
   };
 
diff --git a/pkgs/by-name/pi/picocrypt-cli/package.nix b/pkgs/by-name/pi/picocrypt-cli/package.nix
index e2fa1f62e255..a115a2997043 100644
--- a/pkgs/by-name/pi/picocrypt-cli/package.nix
+++ b/pkgs/by-name/pi/picocrypt-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Picocrypt";
     repo = "CLI";
-    tag = version;
+    rev = version;
     hash = "sha256-a9fRbI3yv+K44/TIMqZMgZXRKN/Rh2AJyeTDhJynr4M=";
   };
 
diff --git a/pkgs/by-name/pi/pid1/package.nix b/pkgs/by-name/pi/pid1/package.nix
index 2b07d1df8116..58880b79418b 100644
--- a/pkgs/by-name/pi/pid1/package.nix
+++ b/pkgs/by-name/pi/pid1/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fpco";
     repo = "pid1-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2dnQj3AQxedyq1YvHKt+lVXNEtuB5sMRSCqX9YeifzI=";
   };
 
diff --git a/pkgs/by-name/pi/pigeon/package.nix b/pkgs/by-name/pi/pigeon/package.nix
index dd7d18a97e57..6492341b8d8b 100644
--- a/pkgs/by-name/pi/pigeon/package.nix
+++ b/pkgs/by-name/pi/pigeon/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mna";
     repo = "pigeon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0Cp/OnFvVZj9UZgl3F5MCzemBaHI4smGWU46VQnhLOg=";
   };
 
diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix
index 9c71eeda5549..b4bf6065bd9c 100644
--- a/pkgs/by-name/pi/pik/package.nix
+++ b/pkgs/by-name/pi/pik/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jacek-kurlit";
     repo = "pik";
-    tag = version;
+    rev = version;
     hash = "sha256-G4GTrS3zUQVLsdc/19qPl4GWZZe4U8jV+UOkX36fMWU=";
   };
 
diff --git a/pkgs/by-name/pi/piknik/package.nix b/pkgs/by-name/pi/piknik/package.nix
index c4817a603c5a..16d25c09f0f9 100644
--- a/pkgs/by-name/pi/piknik/package.nix
+++ b/pkgs/by-name/pi/piknik/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = "piknik";
-    tag = version;
+    rev = version;
     hash = "sha256-Kdqh3sQuO0iT0RW2hU+nrmBltxCFiqOSL00cbDHZJjc=";
   };
 
diff --git a/pkgs/by-name/pi/pinchflat/package.nix b/pkgs/by-name/pi/pinchflat/package.nix
index 27e8a5ac2b99..05f7b1070657 100644
--- a/pkgs/by-name/pi/pinchflat/package.nix
+++ b/pkgs/by-name/pi/pinchflat/package.nix
@@ -17,7 +17,7 @@ beamPackages.mixRelease rec {
   src = fetchFromGitHub {
     owner = "kieraneglin";
     repo = "pinchflat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XHYCYC3SEVyheBV6diE2pn1AJARml+aNNUjJw2tVKTk=";
   };
 
diff --git a/pkgs/by-name/pi/pinentry-bemenu/package.nix b/pkgs/by-name/pi/pinentry-bemenu/package.nix
index f1b986cf3875..6cacc5f5fb1f 100644
--- a/pkgs/by-name/pi/pinentry-bemenu/package.nix
+++ b/pkgs/by-name/pi/pinentry-bemenu/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "t-8ch";
     repo = "pinentry-bemenu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kiGUCcQIS58XjE4r0yiK4hJ85Sg5wrtBqeSYcgUKAmo=";
   };
 
diff --git a/pkgs/by-name/pi/pinentry-rofi/package.nix b/pkgs/by-name/pi/pinentry-rofi/package.nix
index 44fe2b366f0f..4e7290f5dfd5 100644
--- a/pkgs/by-name/pi/pinentry-rofi/package.nix
+++ b/pkgs/by-name/pi/pinentry-rofi/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "plattfot";
     repo = "pinentry-rofi";
-    tag = version;
+    rev = version;
     sha256 = "sha256-GHpVO8FRphVW0+In7TtB39ewwVLU1EHOeVL05pnZdFQ=";
   };
 
diff --git a/pkgs/by-name/pi/pinfo/package.nix b/pkgs/by-name/pi/pinfo/package.nix
index 480205895571..f7e46ae381f8 100644
--- a/pkgs/by-name/pi/pinfo/package.nix
+++ b/pkgs/by-name/pi/pinfo/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baszoetekouw";
     repo = "pinfo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy";
   };
 
diff --git a/pkgs/by-name/pi/pingme/package.nix b/pkgs/by-name/pi/pingme/package.nix
index e485819fd8de..c59f8e973c32 100644
--- a/pkgs/by-name/pi/pingme/package.nix
+++ b/pkgs/by-name/pi/pingme/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kha7iq";
     repo = "pingme";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-i+EZ3HfuxHSuZDe0+nfZVvoNZN5XcdQFwfgOg4OLBOs=";
   };
 
diff --git a/pkgs/by-name/pi/pingtunnel/package.nix b/pkgs/by-name/pi/pingtunnel/package.nix
index 68dc9d7fabec..4f142c97a764 100644
--- a/pkgs/by-name/pi/pingtunnel/package.nix
+++ b/pkgs/by-name/pi/pingtunnel/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "esrrhs";
     repo = "pingtunnel";
-    tag = version;
+    rev = version;
     hash = "sha256-qkIeE6gNBUUd5/IhcKhDmXZbzeSTR0r6qCAK/Nz7Kew=";
   };
 
diff --git a/pkgs/by-name/pi/pinit/package.nix b/pkgs/by-name/pi/pinit/package.nix
index e3cee920f562..b4d467c58810 100644
--- a/pkgs/by-name/pi/pinit/package.nix
+++ b/pkgs/by-name/pi/pinit/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ryonakano";
     repo = "pinit";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-unvlMytZdjVbrWlwkpw90NZoFw9A6Ga0bB2XqFEPuVE=";
   };
 
diff --git a/pkgs/by-name/pi/pinniped/package.nix b/pkgs/by-name/pi/pinniped/package.nix
index 2212c72ffdf2..4e2fda5214cd 100644
--- a/pkgs/by-name/pi/pinniped/package.nix
+++ b/pkgs/by-name/pi/pinniped/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "pinniped";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vnmH8zhjecghaNe7/oguCOs9OXmtBRGdZeH4n24oXsg=";
   };
 
diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix
index 87bc710550a5..e3704ef9ea77 100644
--- a/pkgs/by-name/pi/pinta/package.nix
+++ b/pkgs/by-name/pi/pinta/package.nix
@@ -35,7 +35,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "PintaProject";
     repo = "Pinta";
-    tag = version;
+    rev = version;
     hash = "sha256-/GMYF7G469oX5W1zjv5A9a6tcLX+4g6Sf9cDqxSjgWg=";
   };
 
diff --git a/pkgs/by-name/pi/pioasm/package.nix b/pkgs/by-name/pi/pioasm/package.nix
index cbbd7bc93d27..df372b098d48 100644
--- a/pkgs/by-name/pi/pioasm/package.nix
+++ b/pkgs/by-name/pi/pioasm/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "pico-sdk";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-epO7yw6/21/ess3vMCkXvXEqAn6/4613zmH/hbaBbUw=";
   };
   sourceRoot = "${finalAttrs.src.name}/tools/pioasm";
diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix
index ec324de26c48..8d7889e772e4 100644
--- a/pkgs/by-name/pi/pioneer/package.nix
+++ b/pkgs/by-name/pi/pioneer/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pioneerspacesim";
     repo = "pioneer";
-    tag = version;
+    rev = version;
     hash = "sha256-mPTMmCgttFEhMyhGbRFBsIqI6oU0yBQJp+m7NbeeUHA=";
   };
 
diff --git a/pkgs/by-name/pi/pipectl/package.nix b/pkgs/by-name/pi/pipectl/package.nix
index 95f3689e9502..8c3587b052c5 100644
--- a/pkgs/by-name/pi/pipectl/package.nix
+++ b/pkgs/by-name/pi/pipectl/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ferdi265";
     repo = "pipectl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pNBw1ukNaqu40qPXnORUGApYpJ/0EAO9Tq5zAbDe33I=";
   };
 
diff --git a/pkgs/by-name/pi/piper/package.nix b/pkgs/by-name/pi/piper/package.nix
index 725c49e11e1c..083ebff2d2a3 100644
--- a/pkgs/by-name/pi/piper/package.nix
+++ b/pkgs/by-name/pi/piper/package.nix
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "libratbag";
     repo = "piper";
-    tag = version;
+    rev = version;
     hash = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4=";
   };
 
diff --git a/pkgs/by-name/pi/pipes-rs/package.nix b/pkgs/by-name/pi/pipes-rs/package.nix
index 1f59861a6f88..9f1dee272b65 100644
--- a/pkgs/by-name/pi/pipes-rs/package.nix
+++ b/pkgs/by-name/pi/pipes-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lhvy";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-NrBmkA7sV1RhfG9KEqQNMR5s0l2u66b7KK0toDjQIps=";
   };
 
diff --git a/pkgs/by-name/pi/pipes/package.nix b/pkgs/by-name/pi/pipes/package.nix
index b344b7b33f0d..a2a8b951081d 100644
--- a/pkgs/by-name/pi/pipes/package.nix
+++ b/pkgs/by-name/pi/pipes/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pipeseroni";
     repo = "pipes.sh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-856OWlnNiGB20571TJg7Ayzcz4r6NqdW5DMDiim09mc=";
   };
 
diff --git a/pkgs/by-name/pi/pipet/package.nix b/pkgs/by-name/pi/pipet/package.nix
index d5700304e9f9..0fe776b6837a 100644
--- a/pkgs/by-name/pi/pipet/package.nix
+++ b/pkgs/by-name/pi/pipet/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bjesus";
     repo = "pipet";
-    tag = version;
+    rev = version;
     hash = "sha256-pu+2sHdLz9TvYHBwvGTtFr/oAD+CreOR8io82YQANxc=";
   };
 
diff --git a/pkgs/by-name/pi/pipr/package.nix b/pkgs/by-name/pi/pipr/package.nix
index 62ce40fed153..c7dd6096514f 100644
--- a/pkgs/by-name/pi/pipr/package.nix
+++ b/pkgs/by-name/pi/pipr/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ElKowar";
     repo = "pipr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8=";
   };
 
diff --git a/pkgs/by-name/pi/pistol/package.nix b/pkgs/by-name/pi/pistol/package.nix
index 8ee11f1af65c..b38a4a34e6e8 100644
--- a/pkgs/by-name/pi/pistol/package.nix
+++ b/pkgs/by-name/pi/pistol/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "doronbehar";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/w2BenBIzhD0KHtELlFy7YGv0lykHrjrROZeW75gHis=";
   };
 
diff --git a/pkgs/by-name/pi/pius/package.nix b/pkgs/by-name/pi/pius/package.nix
index 4ce40d799b0f..946d4590b6fc 100644
--- a/pkgs/by-name/pi/pius/package.nix
+++ b/pkgs/by-name/pi/pius/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "jaymzh";
     repo = "pius";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0l87dx7n6iwy8alxnhvval8h1kl4da6a59hsilbi65c6bpj4dh3y";
   };
 
diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix
index 92c898a6807a..227ff18f4b64 100644
--- a/pkgs/by-name/pi/piv-agent/package.nix
+++ b/pkgs/by-name/pi/piv-agent/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "smlx";
     repo = "piv-agent";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bfJIrWDFQIg0n1RDadARPHhQwE6i7mAMxE5GPYo4WU8=";
   };
 
diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix
index 643dff7cb4a6..761b3a6b56e8 100644
--- a/pkgs/by-name/pi/pix/package.nix
+++ b/pkgs/by-name/pi/pix/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-c/+NQHvscW/XE49Twmg1Rk1IfsjReCtRQWffobZtgTs=";
   };
 
diff --git a/pkgs/by-name/pi/pixd/package.nix b/pkgs/by-name/pi/pixd/package.nix
index d3df54540c90..57487c9f5efe 100644
--- a/pkgs/by-name/pi/pixd/package.nix
+++ b/pkgs/by-name/pi/pixd/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FireyFly";
     repo = "pixd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1vmkbs39mg5vwmkzfcrxqm6p8zr9sj4qdwng9icmyf5k34c34xdg";
   };
 
diff --git a/pkgs/by-name/pi/pixiewps/package.nix b/pkgs/by-name/pi/pixiewps/package.nix
index 067ea3c52084..d3ea7e824612 100644
--- a/pkgs/by-name/pi/pixiewps/package.nix
+++ b/pkgs/by-name/pi/pixiewps/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wiire-a";
     repo = "pixiewps";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cJ20Gp6YaSdgUXK/ckK5Yv0rGbGXuFMP5zKZG0c4oOY=";
   };
 
diff --git a/pkgs/by-name/pi/pixz/package.nix b/pkgs/by-name/pi/pixz/package.nix
index a48891e5ab4c..50c4bd695442 100644
--- a/pkgs/by-name/pi/pixz/package.nix
+++ b/pkgs/by-name/pi/pixz/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vasi";
     repo = "pixz";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "163axxs22w7pghr786hda22mnlpvmi50hzhfr9axwyyjl9n41qs2";
   };
   preConfigure = ''
diff --git a/pkgs/by-name/pi/pizarra/package.nix b/pkgs/by-name/pi/pizarra/package.nix
index f02c21083625..5cb6f80b00a8 100644
--- a/pkgs/by-name/pi/pizarra/package.nix
+++ b/pkgs/by-name/pi/pizarra/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "categulario";
     repo = "pizarra-gtk";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw=";
   };
diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix
index 22927fb98e3e..3ddc577400bb 100644
--- a/pkgs/by-name/pk/pkarr/package.nix
+++ b/pkgs/by-name/pk/pkarr/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pubky";
     repo = "pkarr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zJe/hCdGVqs2TTwxnceGVXt0ZFRheSRYzjSRHytYXks=";
   };
 
diff --git a/pkgs/by-name/pk/pkcs11-provider/package.nix b/pkgs/by-name/pk/pkcs11-provider/package.nix
index 8b5dcfe34df1..5fdac02fb126 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-Q9dmzYDBco+LLVWdORFTjRyk0RX8qhmZ1m+Kgfeyr04=";
   };
diff --git a/pkgs/by-name/pk/pkg/package.nix b/pkgs/by-name/pk/pkg/package.nix
index 9ccdb4011db5..8a3739410c4c 100644
--- a/pkgs/by-name/pk/pkg/package.nix
+++ b/pkgs/by-name/pk/pkg/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "freebsd";
     repo = "pkg";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-NTjAhqCUN2bN4ilijoeHHIkl58XXP5nSj/yLUL0N2fw=";
   };
 
diff --git a/pkgs/by-name/pk/pkgdiff/package.nix b/pkgs/by-name/pk/pkgdiff/package.nix
index 1f256fb064b2..a867c83f5eb1 100644
--- a/pkgs/by-name/pk/pkgdiff/package.nix
+++ b/pkgs/by-name/pk/pkgdiff/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lvc";
     repo = "pkgdiff";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/xhORi/ZHC4B2z6UYPOvDzfgov1DcozRjX0K1WYrqXM=";
   };
 
diff --git a/pkgs/by-name/pk/pkger/package.nix b/pkgs/by-name/pk/pkger/package.nix
index 70d082e32697..5dbad7a889ca 100644
--- a/pkgs/by-name/pk/pkger/package.nix
+++ b/pkgs/by-name/pk/pkger/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "markbates";
     repo = "pkger";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nBuOC+uVw+hYSssgTkPRJZEBkufhQgU5D6jsZZre7Is=";
   };
 
diff --git a/pkgs/by-name/pk/pkgtop/package.nix b/pkgs/by-name/pk/pkgtop/package.nix
index 3fd91577ea55..c730478d8410 100644
--- a/pkgs/by-name/pk/pkgtop/package.nix
+++ b/pkgs/by-name/pk/pkgtop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "pkgtop";
-    tag = version;
+    rev = version;
     hash = "sha256-NY8nx4BKAUq1nGBlzRzm2OH1k01TV6qs2IcoErhuxTc=";
   };
 
diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix
index b4bb700734e8..e877da17cc2d 100644
--- a/pkgs/by-name/pl/planify/package.nix
+++ b/pkgs/by-name/pl/planify/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
-    tag = version;
+    rev = version;
     hash = "sha256-YgNM+fzss1+Q6Fv9mhedhCorWFnerx5oC3iISEhs6z8=";
   };
 
diff --git a/pkgs/by-name/pl/plano-theme/package.nix b/pkgs/by-name/pl/plano-theme/package.nix
index 9a17583359f0..7bec5cabaeef 100644
--- a/pkgs/by-name/pl/plano-theme/package.nix
+++ b/pkgs/by-name/pl/plano-theme/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "plano-theme";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-slGr2nsdKng6zaVDeXWFAWKIxZbcnOLU6RH6wM0293E=";
   };
 
diff --git a/pkgs/by-name/pl/plasma-hud/package.nix b/pkgs/by-name/pl/plasma-hud/package.nix
index 924f26461642..078bda093c5b 100644
--- a/pkgs/by-name/pl/plasma-hud/package.nix
+++ b/pkgs/by-name/pl/plasma-hud/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Zren";
     repo = "plasma-hud";
-    tag = version;
+    rev = version;
     hash = "sha256-1AQtgVlrmzBkim1kVZzTAwJHq0OH3YAPr6o5aUpgdKc=";
   };
 
diff --git a/pkgs/by-name/pl/platform-folders/package.nix b/pkgs/by-name/pl/platform-folders/package.nix
index ccd61bd1a6ea..5fa41c391595 100644
--- a/pkgs/by-name/pl/platform-folders/package.nix
+++ b/pkgs/by-name/pl/platform-folders/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sago007";
     repo = "PlatformFolders";
-    tag = version;
+    rev = version;
     hash = "sha256-ruhAP9kjwm6pIFJ5a6oy6VE5W39bWQO3qSrT5IUtiwA=";
   };
 
diff --git a/pkgs/by-name/pl/platinum-searcher/package.nix b/pkgs/by-name/pl/platinum-searcher/package.nix
index 3c2bab45f985..76568d9482e0 100644
--- a/pkgs/by-name/pl/platinum-searcher/package.nix
+++ b/pkgs/by-name/pl/platinum-searcher/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "monochromegane";
     repo = "the_platinum_searcher";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FNHlALFwMbajaHWOehdSFeQmvZSuCZLdqGqLZ7DF+pI=";
   };
 
diff --git a/pkgs/by-name/pl/playerctl/package.nix b/pkgs/by-name/pl/playerctl/package.nix
index 5e853aaabf15..e4a4b10d1e6d 100644
--- a/pkgs/by-name/pl/playerctl/package.nix
+++ b/pkgs/by-name/pl/playerctl/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "playerctl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OiGKUnsKX0ihDRceZoNkcZcEAnz17h2j2QUOSVcxQEY=";
   };
 
diff --git a/pkgs/by-name/pl/please/package.nix b/pkgs/by-name/pl/please/package.nix
index f4486e749d5a..d991fee33649 100644
--- a/pkgs/by-name/pl/please/package.nix
+++ b/pkgs/by-name/pl/please/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "edneville";
     repo = "please";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bQ91uCDA2HKuiBmHZ9QP4V6tM6c7hRvECqXzfC6EEnI=";
   };
 
diff --git a/pkgs/by-name/pl/plfit/package.nix b/pkgs/by-name/pl/plfit/package.nix
index c6492d3ce66a..e9b61b9270ef 100644
--- a/pkgs/by-name/pl/plfit/package.nix
+++ b/pkgs/by-name/pl/plfit/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ntamas";
     repo = "plfit";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-0JrPAq/4yzr7XbxvcnFj8CKmMyZT05PkSdGprNdAsJA=";
   };
 
diff --git a/pkgs/by-name/pl/plink-ng/package.nix b/pkgs/by-name/pl/plink-ng/package.nix
index 5e2d34501c95..74b04c56ecce 100644
--- a/pkgs/by-name/pl/plink-ng/package.nix
+++ b/pkgs/by-name/pl/plink-ng/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chrchang";
     repo = "plink-ng";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq";
   };
 
diff --git a/pkgs/by-name/pl/plocate/package.nix b/pkgs/by-name/pl/plocate/package.nix
index 7e6cb078d64c..5a38cd82123f 100644
--- a/pkgs/by-name/pl/plocate/package.nix
+++ b/pkgs/by-name/pl/plocate/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.sesse.net/plocate";
-    tag = version;
+    rev = version;
     sha256 = "sha256-TWQ2mVzosB6sGNUXI2D9GGqgaRZcmiL9GSGrrusck5Q=";
   };
 
diff --git a/pkgs/by-name/pl/plog/package.nix b/pkgs/by-name/pl/plog/package.nix
index 2703e57db0e4..7152799ef7c7 100644
--- a/pkgs/by-name/pl/plog/package.nix
+++ b/pkgs/by-name/pl/plog/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SergiusTheBest";
     repo = "plog";
-    tag = version;
+    rev = version;
     hash = "sha256-NZphrg9OB1FTY2ifu76AXeCyGwW2a2BkxMGjZPf4uM8=";
   };
 
diff --git a/pkgs/by-name/pl/plotinus/package.nix b/pkgs/by-name/pl/plotinus/package.nix
index ee2e2a32a99c..4d66711a3220 100644
--- a/pkgs/by-name/pl/plotinus/package.nix
+++ b/pkgs/by-name/pl/plotinus/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "p-e-w";
     repo = "plotinus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "19k6f6ivg4ab57m62g6fkg85q9sv049snmzq1fyqnqijggwshxfz";
   };
 
diff --git a/pkgs/by-name/pl/plowshare/package.nix b/pkgs/by-name/pl/plowshare/package.nix
index b829a9b14106..50ccefde02a2 100644
--- a/pkgs/by-name/pl/plowshare/package.nix
+++ b/pkgs/by-name/pl/plowshare/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mcrapet";
     repo = "plowshare";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1p8s60dlzaldp006yj710s371aan915asyjhd99188vrj4jj1x79";
   };
 
diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix
index 4a4ac6c574c1..1c838f2456db 100644
--- a/pkgs/by-name/pl/plumber/package.nix
+++ b/pkgs/by-name/pl/plumber/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "streamdal";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0pyeCTkmS7gG51Xm4Gc62p+I5DRUA2F9tPHaZjO+/WE=";
   };
 
diff --git a/pkgs/by-name/pl/plumed/package.nix b/pkgs/by-name/pl/plumed/package.nix
index 0c9ac0492e22..c2d64c559678 100644
--- a/pkgs/by-name/pl/plumed/package.nix
+++ b/pkgs/by-name/pl/plumed/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "plumed";
     repo = "plumed2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KN412t64tp3QUQkhpLU3sAYDosQ3hw9HqpT1fzt5fwA=";
   };
 
diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index fa6594246d66..31782dafb32e 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/gq6BdlNG9vUazVt7Ucvv2679BytUEZrx6u8znnsxG4=";
   };
 
diff --git a/pkgs/by-name/pl/plymouth/package.nix b/pkgs/by-name/pl/plymouth/package.nix
index 4d8c27a57127..27251284df3f 100644
--- a/pkgs/by-name/pl/plymouth/package.nix
+++ b/pkgs/by-name/pl/plymouth/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "plymouth";
     repo = "plymouth";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-9JmZCm8bjteJTQrMSJeL4x2CAI6RpKowFUDSCcMS4MM=";
   };
 
diff --git a/pkgs/by-name/pm/pm2/package.nix b/pkgs/by-name/pm/pm2/package.nix
index 4f6a49e96cce..6884ea8d91eb 100644
--- a/pkgs/by-name/pm/pm2/package.nix
+++ b/pkgs/by-name/pm/pm2/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Unitech";
     repo = "pm2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8Fsh7rld7rtT55qVgj3/XbujNpZx0BfzTRcLjdPLFSA=";
   };
 
diff --git a/pkgs/by-name/pn/pn/package.nix b/pkgs/by-name/pn/pn/package.nix
index c3bae27abfb2..91adda540acf 100644
--- a/pkgs/by-name/pn/pn/package.nix
+++ b/pkgs/by-name/pn/pn/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Orange-OpenSource";
     repo = "pn";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vRF9MPcw/hCreHVLD6QB7g1r0wQiZv1xrfzIHj1Yf9M=";
   };
 
diff --git a/pkgs/by-name/pn/pngoptimizer/package.nix b/pkgs/by-name/pn/pngoptimizer/package.nix
index 3fd61ef3f7ac..d87379370d6a 100644
--- a/pkgs/by-name/pn/pngoptimizer/package.nix
+++ b/pkgs/by-name/pn/pngoptimizer/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hadrien-psydk";
     repo = "pngoptimizer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1hbgf91vzx46grslfdx86smdvm6gs6lq9hpa3bax9xfbsknxi0i7";
   };
 
diff --git a/pkgs/by-name/pn/pngquant/package.nix b/pkgs/by-name/pn/pngquant/package.nix
index 8f2b0032cb81..2c70fa3032e4 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";
-    tag = version;
+    rev = version;
     hash = "sha256-u2zEp9Llo+c/+1QGW4V4r40KQn/ATHCTEsrpy7bRf/I=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix
index fdaea285a33e..06204e425d25 100644
--- a/pkgs/by-name/pn/pnmixer/package.nix
+++ b/pkgs/by-name/pn/pnmixer/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nicklan";
     repo = "pnmixer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148";
   };
 
diff --git a/pkgs/by-name/pn/pnpm-shell-completion/package.nix b/pkgs/by-name/pn/pnpm-shell-completion/package.nix
index 427c439f3902..305abd2a1bfd 100644
--- a/pkgs/by-name/pn/pnpm-shell-completion/package.nix
+++ b/pkgs/by-name/pn/pnpm-shell-completion/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "g-plane";
     repo = "pnpm-shell-completion";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bc2ZVHQF+lSAmhy/fvdiVfg9uzPPcXYrtiNChjkjHtA=";
   };
 
diff --git a/pkgs/by-name/po/pocket-casts/package.nix b/pkgs/by-name/po/pocket-casts/package.nix
index ae20efa34407..7ff8546875e5 100644
--- a/pkgs/by-name/po/pocket-casts/package.nix
+++ b/pkgs/by-name/po/pocket-casts/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "felicianotech";
     repo = "pocket-casts-desktop-app";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5xn2uAjqIyWKQAruHLyho72HCYpbxyWlcTQ3LXXZy6M=";
   };
 
diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index 66f72e64e667..812e0270b5ff 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PDHRMCICzvb7InHSvYRvlYDaB6hkESJyL7iiz+lO6+I=";
   };
 
diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix
index a02d77de868b..15a4d6bb0c62 100644
--- a/pkgs/by-name/po/podman-tui/package.nix
+++ b/pkgs/by-name/po/podman-tui/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-tui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dtXJRoOb/FhGuCaRB43/8y2DM3ZgpYVts1ATzsVsUFE=";
   };
 
diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index eea23a833882..48565b2d64cd 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -79,7 +79,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RirMBb45KeBLdBJrRa86WxI4FiXdBar+RnVQ2ezEEYc=";
   };
 
diff --git a/pkgs/by-name/po/poetry2conda/package.nix b/pkgs/by-name/po/poetry2conda/package.nix
index 1e405c552744..ee2c500ad28d 100644
--- a/pkgs/by-name/po/poetry2conda/package.nix
+++ b/pkgs/by-name/po/poetry2conda/package.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dojeda";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UqNoEGgStvqtxhYwExk7wO4SvATaM2kGaFbB5ViJa7U=";
   };
 
diff --git a/pkgs/by-name/po/pokeget-rs/package.nix b/pkgs/by-name/po/pokeget-rs/package.nix
index 8eac2a5e143b..21d894a17250 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";
-    tag = version;
+    rev = version;
     hash = "sha256-0dss+ZJ1hhQGpWySWhyF+T1T+G3BlnKfSosgCJa8MPE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/po/pokemonsay/package.nix b/pkgs/by-name/po/pokemonsay/package.nix
index 9e85166710c6..01abfe0bfcc8 100644
--- a/pkgs/by-name/po/pokemonsay/package.nix
+++ b/pkgs/by-name/po/pokemonsay/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "HRKings";
     repo = "pokemonsay-newgenerations";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IDTAZmOzkUg0kLUM0oWuVbi8EwE4sEpLWrNAtq/he+g=";
   };
 
diff --git a/pkgs/by-name/po/polkit/package.nix b/pkgs/by-name/po/polkit/package.nix
index 5bc610eb1b94..1ecf173e5608 100644
--- a/pkgs/by-name/po/polkit/package.nix
+++ b/pkgs/by-name/po/polkit/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "polkit-org";
     repo = "polkit";
-    tag = version;
+    rev = version;
     hash = "sha256-ZSqgW//q5DFIsmY17U93mJcK/CHSCHphKTHsTxp40q8=";
   };
 
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index b4e9f4e51aa7..8e90ffa43897 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";
-    tag = finalAttrs.version;
+    rev = 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 02fc5c1b0539..a2d535413c53 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sparseCheckout = [ dirname ];
     hash = "sha256-41FgRejonvVTmE89WGm0Cqumm8lb6kkfxtkWV74UKJA=";
   };
diff --git a/pkgs/by-name/po/pomerium-cli/package.nix b/pkgs/by-name/po/pomerium-cli/package.nix
index 1e57bd72823a..6fbf07776211 100644
--- a/pkgs/by-name/po/pomerium-cli/package.nix
+++ b/pkgs/by-name/po/pomerium-cli/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CcXreKZ83+WDucV3sr62bwKzSs+S9R3e+z0JD0rR8jw=";
   };
 
diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix
index c55930d07da0..b19b8c130e3d 100644
--- a/pkgs/by-name/po/pomerium/package.nix
+++ b/pkgs/by-name/po/pomerium/package.nix
@@ -23,7 +23,7 @@ buildGo123Module rec {
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "pomerium";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Uj/mVklFRaoDNQjCFS5NW/AhSU+7V1XxPiZBAUuly7s=";
   };
 
diff --git a/pkgs/by-name/po/pommed_light/package.nix b/pkgs/by-name/po/pommed_light/package.nix
index da9ef2630186..0def37b1b7c4 100644
--- a/pkgs/by-name/po/pommed_light/package.nix
+++ b/pkgs/by-name/po/pommed_light/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bytbox";
     repo = "pommed-light";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "18fvdwwhcl6s4bpf2f2i389s71c8k4g0yb81am9rdddqmzaw27iy";
   };
 
diff --git a/pkgs/by-name/po/pomsky/package.nix b/pkgs/by-name/po/pomsky/package.nix
index 57aacdddbcff..73dbffd89916 100644
--- a/pkgs/by-name/po/pomsky/package.nix
+++ b/pkgs/by-name/po/pomsky/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pomsky-lang";
     repo = "pomsky";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BoA59P0jzV08hlFO7NPB9E+fdpYB9G50dNggFkexc/c=";
   };
 
diff --git a/pkgs/by-name/po/ponymix/package.nix b/pkgs/by-name/po/ponymix/package.nix
index ce7dfacbbb78..c3072757a57e 100644
--- a/pkgs/by-name/po/ponymix/package.nix
+++ b/pkgs/by-name/po/ponymix/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "falconindy";
     repo = "ponymix";
-    tag = version;
+    rev = version;
     sha256 = "08yp7fprmzm6px5yx2rvzri0l60bra5h59l26pn0k071a37ks1rb";
   };
 
diff --git a/pkgs/by-name/po/poop/package.nix b/pkgs/by-name/po/poop/package.nix
index 62b82bc735d1..3edae8fb889b 100644
--- a/pkgs/by-name/po/poop/package.nix
+++ b/pkgs/by-name/po/poop/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrewrk";
     repo = "poop";
-    tag = version;
+    rev = version;
     hash = "sha256-zrqR/TTELhsBIX42PysFsHPRs8Lx/zHcmi+VMDw1SdQ=";
   };
 
diff --git a/pkgs/by-name/po/pop-icon-theme/package.nix b/pkgs/by-name/po/pop-icon-theme/package.nix
index 9928cda44518..fd0a63376b7b 100644
--- a/pkgs/by-name/po/pop-icon-theme/package.nix
+++ b/pkgs/by-name/po/pop-icon-theme/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "icon-theme";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-V8xBZj6T4Ly/GHV0CVLZ1a4UZbmCkhYRe05qUfJk7Wg=";
   };
 
diff --git a/pkgs/by-name/po/pop-launcher/package.nix b/pkgs/by-name/po/pop-launcher/package.nix
index cbf5aea435d7..873bdfe7aceb 100644
--- a/pkgs/by-name/po/pop-launcher/package.nix
+++ b/pkgs/by-name/po/pop-launcher/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "launcher";
-    tag = version;
+    rev = version;
     hash = "sha256-CLpquNgdtnGMlMpGLv72WZmizalvYPfMWlE/qLprVrs=";
   };
 
diff --git a/pkgs/by-name/po/pop/package.nix b/pkgs/by-name/po/pop/package.nix
index 7f346b57287a..d320feb46e82 100644
--- a/pkgs/by-name/po/pop/package.nix
+++ b/pkgs/by-name/po/pop/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "pop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZGJkpa1EIw3tt1Ww2HFFoYsnnmnSAiv86XEB5TPf4/k=";
   };
 
diff --git a/pkgs/by-name/po/popeye/package.nix b/pkgs/by-name/po/popeye/package.nix
index 4e18a9cfddb0..01d4bbaa3125 100644
--- a/pkgs/by-name/po/popeye/package.nix
+++ b/pkgs/by-name/po/popeye/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   version = "0.22.1";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "derailed";
     repo = "popeye";
     sha256 = "sha256-CbVYQIE7kjUah+SDEjs5Qz+n4+f3HriQNxYPqDcdr/I=";
diff --git a/pkgs/by-name/po/popl/package.nix b/pkgs/by-name/po/popl/package.nix
index edc50cad62bd..023b283b670d 100644
--- a/pkgs/by-name/po/popl/package.nix
+++ b/pkgs/by-name/po/popl/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "badaix";
     repo = "popl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AkqFRPK0tVdalL+iyMou0LIUkPkFnYYdSqwEbFbgzqI=";
   };
 
diff --git a/pkgs/by-name/po/poppins/package.nix b/pkgs/by-name/po/poppins/package.nix
index a197014f0dc3..32ee21503798 100644
--- a/pkgs/by-name/po/poppins/package.nix
+++ b/pkgs/by-name/po/poppins/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "itfoundry";
     repo = "poppins";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7+RQHYxNFqOw2EeS2hgrbK/VbUAiPorUtkyRb5MFh5w=";
   };
 
diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix
index 33562008b150..a7d5a90624db 100644
--- a/pkgs/by-name/po/popsicle/package.nix
+++ b/pkgs/by-name/po/popsicle/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "popsicle";
-    tag = version;
+    rev = version;
     hash = "sha256-sWQNav7odvX+peDglLHd7Jrmvhm5ddFBLBla0WK7wcE=";
   };
 
diff --git a/pkgs/by-name/po/poptop/package.nix b/pkgs/by-name/po/poptop/package.nix
index 05377d611dff..8796c2b16272 100644
--- a/pkgs/by-name/po/poptop/package.nix
+++ b/pkgs/by-name/po/poptop/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "bakks";
     repo = "poptop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CwJpkGNTDmtXfJx6GGz2XRU0fMeKl7I3fXm4BJ9MAQ4=";
   };
 
diff --git a/pkgs/by-name/po/popura/package.nix b/pkgs/by-name/po/popura/package.nix
index bfd9165218c1..b28cee329d49 100644
--- a/pkgs/by-name/po/popura/package.nix
+++ b/pkgs/by-name/po/popura/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "${pname}-network";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iCu6/vD4vgn7aGdwK+OB8ib/QwUwoFuxDUs7vqbTZQc=";
   };
 
diff --git a/pkgs/by-name/po/porsmo/package.nix b/pkgs/by-name/po/porsmo/package.nix
index e4c0c9d6d744..21dba217b326 100644
--- a/pkgs/by-name/po/porsmo/package.nix
+++ b/pkgs/by-name/po/porsmo/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ColorCookie-dev";
     repo = "porsmo";
-    tag = version;
+    rev = version;
     hash = "sha256-bYPUSrGJKoNLFkIiGuXraYoaYn/HKSP8IiH3gtyWfmw=";
   };
 
diff --git a/pkgs/by-name/po/portal/package.nix b/pkgs/by-name/po/portal/package.nix
index 717b093f0361..c64c8050c531 100644
--- a/pkgs/by-name/po/portal/package.nix
+++ b/pkgs/by-name/po/portal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SpatiumPortae";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hGB82a2WirUL1Tph6EuoITOQGYA0Lo4zOeKPC46B5Qk=";
   };
 
diff --git a/pkgs/by-name/po/portfolio-filemanager/package.nix b/pkgs/by-name/po/portfolio-filemanager/package.nix
index a6c81d60db76..dcba59036fd6 100644
--- a/pkgs/by-name/po/portfolio-filemanager/package.nix
+++ b/pkgs/by-name/po/portfolio-filemanager/package.nix
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tchx84";
     repo = "Portfolio";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-v86pQbj5+SqdzsW0Ko5TW/12NsFVNSPyX6g0e+MdzHE=";
   };
 
diff --git a/pkgs/by-name/po/portmod/package.nix b/pkgs/by-name/po/portmod/package.nix
index 83011f1cdabb..32156ade1c36 100644
--- a/pkgs/by-name/po/portmod/package.nix
+++ b/pkgs/by-name/po/portmod/package.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitLab {
     owner = "portmod";
     repo = "Portmod";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-d5XNfjDgtBkNkUMhShYTjKtMbwVa2tLXdvYi6sXQmIA=";
   };
 
diff --git a/pkgs/by-name/po/portunus/package.nix b/pkgs/by-name/po/portunus/package.nix
index 966d93a72dd7..96408db6f66d 100644
--- a/pkgs/by-name/po/portunus/package.nix
+++ b/pkgs/by-name/po/portunus/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "majewsky";
     repo = "portunus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+pMMIutj+OWKZmOYH5NuA4a7aS5CD+33vAEC9bJmyfM=";
   };
 
diff --git a/pkgs/by-name/po/postiats-utilities/package.nix b/pkgs/by-name/po/postiats-utilities/package.nix
index a5ddac057470..8e00897e79cd 100644
--- a/pkgs/by-name/po/postiats-utilities/package.nix
+++ b/pkgs/by-name/po/postiats-utilities/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Hibou57";
     repo = "PostiATS-Utilities";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QeBbv5lwqL2ARjB+RGyBHeuibaxugffBLhC9lYs+5tE=";
   };
 
diff --git a/pkgs/by-name/po/postsrsd/package.nix b/pkgs/by-name/po/postsrsd/package.nix
index 0a51077a95a8..f100d56d94cf 100644
--- a/pkgs/by-name/po/postsrsd/package.nix
+++ b/pkgs/by-name/po/postsrsd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "roehling";
     repo = "postsrsd";
-    tag = version;
+    rev = version;
     sha256 = "sha256-aSI9TR1wSyMA0SKkbavk+IugRfW4ZEgpzrNiXn0F5ak=";
   };
 
diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix
index a3f2a9791498..780120135f6f 100644
--- a/pkgs/by-name/po/pouf/package.nix
+++ b/pkgs/by-name/po/pouf/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mothsart";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-tW86b9a7u1jyfmHjwjs+5DaUujRZH+VhGQsj0CBj0yk=";
   };
 
diff --git a/pkgs/by-name/po/power-profiles-daemon/package.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix
index 1733f5dca807..8759b2d76b14 100644
--- a/pkgs/by-name/po/power-profiles-daemon/package.nix
+++ b/pkgs/by-name/po/power-profiles-daemon/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "upower";
     repo = "power-profiles-daemon";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-iQUhA46BEln8pyIBxM/MY7An8BzfiFjxZdR/tUIj4S4=";
   };
 
diff --git a/pkgs/by-name/po/powercap/package.nix b/pkgs/by-name/po/powercap/package.nix
index 85611e40a8a6..e38ea1713f39 100644
--- a/pkgs/by-name/po/powercap/package.nix
+++ b/pkgs/by-name/po/powercap/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "powercap";
     repo = "powercap";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-l+IpFqBnCYUU825++sUPySD/Ku0TEIX2kt+S0Wml6iA=";
   };
 
diff --git a/pkgs/by-name/po/powerdns-admin/package.nix b/pkgs/by-name/po/powerdns-admin/package.nix
index 3b7a7980bb49..31f7c15777f4 100644
--- a/pkgs/by-name/po/powerdns-admin/package.nix
+++ b/pkgs/by-name/po/powerdns-admin/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "PowerDNS-Admin";
     repo = "PowerDNS-Admin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q9mt8wjSNFb452Xsg+qhNOWa03KJkYVGAeCWVSzZCyk=";
   };
 
diff --git a/pkgs/by-name/po/powerjoular/package.nix b/pkgs/by-name/po/powerjoular/package.nix
index cf35f396c323..9cb31c00c8f8 100644
--- a/pkgs/by-name/po/powerjoular/package.nix
+++ b/pkgs/by-name/po/powerjoular/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "joular";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-fJYcJKbZ6PoTJSfEDEKPOy+CDwDRsaeAn/2BW5r4p7k=";
   };
 
diff --git a/pkgs/by-name/po/powerline-go/package.nix b/pkgs/by-name/po/powerline-go/package.nix
index 5ef59667ec60..852a49f4981e 100644
--- a/pkgs/by-name/po/powerline-go/package.nix
+++ b/pkgs/by-name/po/powerline-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "justjanne";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DLw/6jnJo0IAh0/Y21mfCLP4GgTFlUGvuwyWJwhzYFU=";
   };
 
diff --git a/pkgs/by-name/pp/pps-tools/package.nix b/pkgs/by-name/pp/pps-tools/package.nix
index 303887928b59..5da54a0f02ac 100644
--- a/pkgs/by-name/pp/pps-tools/package.nix
+++ b/pkgs/by-name/pp/pps-tools/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "redlab-i";
     repo = "pps-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eLLFHrCgOQzOtVxlAsZ5X91KK+vZiKMGL7zbQFiIZtI=";
   };
 
diff --git a/pkgs/by-name/pq/pqiv/package.nix b/pkgs/by-name/pq/pqiv/package.nix
index cb76f3a5906e..ef4da7d1d6d7 100644
--- a/pkgs/by-name/pq/pqiv/package.nix
+++ b/pkgs/by-name/pq/pqiv/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "phillipberndt";
     repo = "pqiv";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-wpM8eG2/sEfwYLfh6s3AL+z73IzeXxwGm/scWRRKLPo=";
   };
 
diff --git a/pkgs/by-name/pq/pql/package.nix b/pkgs/by-name/pq/pql/package.nix
index bc2218fba24b..df0424707dc9 100644
--- a/pkgs/by-name/pq/pql/package.nix
+++ b/pkgs/by-name/pq/pql/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "runreveal";
     repo = "pql";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/112LQfIkya/9hzq3nxtpdSarHIshPw4mezNcKm4xyI=";
   };
 
diff --git a/pkgs/by-name/pq/pqrs/package.nix b/pkgs/by-name/pq/pqrs/package.nix
index 9b3617334734..24f68672f396 100644
--- a/pkgs/by-name/pq/pqrs/package.nix
+++ b/pkgs/by-name/pq/pqrs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "manojkarthick";
     repo = "pqrs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0oSSoGZga0OGAKUNsLmKkUl8N1l0pVi4KIqrKJbeVVU=";
   };
 
diff --git a/pkgs/by-name/pr/prboom-plus/package.nix b/pkgs/by-name/pr/prboom-plus/package.nix
index 6b2eb8433b3c..9367745fc611 100644
--- a/pkgs/by-name/pr/prboom-plus/package.nix
+++ b/pkgs/by-name/pr/prboom-plus/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "prboom-plus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-moU/bZ2mS1QfKPP6HaAwWP1nRNZ4Ue5DFl9zBBrJiHw=";
   };
 
diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index d7b4b15eb363..c79c90475fe7 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "precice";
     repo = "precice";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KpmcQj8cv5V5OXCMhe2KLTsqUzKWtTeQyP+zg+Y+yd0=";
   };
 
diff --git a/pkgs/by-name/pr/preserves-nim/package.nix b/pkgs/by-name/pr/preserves-nim/package.nix
index 8ea5d448158e..dd1f4f0319a6 100644
--- a/pkgs/by-name/pr/preserves-nim/package.nix
+++ b/pkgs/by-name/pr/preserves-nim/package.nix
@@ -9,7 +9,7 @@ buildNimSbom (finalAttrs: {
     domain = "git.syndicate-lang.org";
     owner = "ehmry";
     repo = "preserves-nim";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-A1v72ToSLEEUZTNcPl82t8OKvr5heQCWVWYEJh362Eo=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index 76565c24b289..33a182458c93 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -27,7 +27,7 @@ let
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-y3BsNmLh9M5NgDPURCjCGWYci40hYcQtDVqsu2HqPRU=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/downstream.nix b/pkgs/by-name/pr/pretalx/plugins/downstream.nix
index ac9a16eab63a..dd1465777ac2 100644
--- a/pkgs/by-name/pr/pretalx/plugins/downstream.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/downstream.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-downstream";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Q9519jNKQUeNCHg3ivjYyQm1ePMxp/bhtcJAselQiiM=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix
index ad659a6143dd..c240be878ad1 100644
--- a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-media-ccc-de";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-U+26hit4xXUzN8JT3WL+iGohqomX1ENb+ihM9IT1XWQ=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/pages.nix b/pkgs/by-name/pr/pretalx/plugins/pages.nix
index 215777694fa1..76395ed666d2 100644
--- a/pkgs/by-name/pr/pretalx/plugins/pages.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/pages.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-pages";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9ZJSW6kdxpwHd25CuGTE4MMXylXaZKL3eAEKKdYiuXs=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix
index 79ebd21165e4..993bfd6def88 100644
--- a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-public-voting";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ei6GgPPEXv9WVhh+4U+WDFCMsT4bND9O85cPLpPWMhQ=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/venueless.nix b/pkgs/by-name/pr/pretalx/plugins/venueless.nix
index c704ea0def08..7c138f07f651 100644
--- a/pkgs/by-name/pr/pretalx/plugins/venueless.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/venueless.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-venueless";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1YWkyTaImnlGXZWrborvJrx8zc1FOZD/ugOik7S+fC8=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix
index 2748a818cea7..a6037ca3e8fa 100644
--- a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-vimeo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MwAKmPQif2wLy03II1t87lIdIf2th4BteaAo5pACjLE=";
   };
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/youtube.nix b/pkgs/by-name/pr/pretalx/plugins/youtube.nix
index 4ee2f7bfeccf..b2b89acbd6a9 100644
--- a/pkgs/by-name/pr/pretalx/plugins/youtube.nix
+++ b/pkgs/by-name/pr/pretalx/plugins/youtube.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx-youtube";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5vQPFW0qABKQjFUvjMrtmIGEpMzLLbAOBA4GFqqBNw0=";
   };
 
diff --git a/pkgs/by-name/pr/pretix-banktool/package.nix b/pkgs/by-name/pr/pretix-banktool/package.nix
index 46d42962444b..fc91c12e97a7 100644
--- a/pkgs/by-name/pr/pretix-banktool/package.nix
+++ b/pkgs/by-name/pr/pretix-banktool/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-banktool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-x6P+WqrOak5/gmMEmBkHrx6kPsbSOAXbKRbndFG3IJU=";
   };
 
diff --git a/pkgs/by-name/pr/pretix/plugins/dbvat/package.nix b/pkgs/by-name/pr/pretix/plugins/dbvat/package.nix
index 4191f2675774..740449daf025 100644
--- a/pkgs/by-name/pr/pretix/plugins/dbvat/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/dbvat/package.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-dbvat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yAKqB0G2WyGqGogAxv8fI34gO6Wl/50sY/5rvWYH4Ho=";
   };
 
diff --git a/pkgs/by-name/pr/pretix/plugins/pages/package.nix b/pkgs/by-name/pr/pretix/plugins/pages/package.nix
index b137bb6453e3..3e7b5eb314e7 100644
--- a/pkgs/by-name/pr/pretix/plugins/pages/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/pages/package.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-pages";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZM38zHlFB5013PvoJwm7YC5/wHg2GZWmrhvreXuqNc8=";
   };
 
diff --git a/pkgs/by-name/pr/pretix/plugins/passbook/package.nix b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix
index 99e087ac6743..ad8f6ac642c6 100644
--- a/pkgs/by-name/pr/pretix/plugins/passbook/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-passbook";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xN37nM2AQVxFg+TOZ3cEvEV4F115U9m6YVX12al4SIw=";
   };
 
diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
index be573dc567ad..bda526e184b4 100644
--- a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-zugferd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VtmlgxqV34e3Yu9uTYwJAZoZQ/TQoEJgjHcpqUsxxq8=";
   };
 
diff --git a/pkgs/by-name/pr/prettier-d-slim/package.nix b/pkgs/by-name/pr/prettier-d-slim/package.nix
index 7dca656a1fd2..6278fee6b513 100644
--- a/pkgs/by-name/pr/prettier-d-slim/package.nix
+++ b/pkgs/by-name/pr/prettier-d-slim/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mikew";
     repo = "prettier_d_slim";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-M+qlFKtIro3geVsVaYu6dIfOrJIlUQY98LSBikKNV/I=";
   };
 
diff --git a/pkgs/by-name/pr/prettyping/package.nix b/pkgs/by-name/pr/prettyping/package.nix
index 7e43f998c72f..178d7756bfc5 100644
--- a/pkgs/by-name/pr/prettyping/package.nix
+++ b/pkgs/by-name/pr/prettyping/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "denilsonsa";
     repo = "prettyping";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "05vfaq9y52z40245j47yjk1xaiwrazv15sgjq64w91dfyahjffxf";
   };
 
diff --git a/pkgs/by-name/pr/prevo-tools/package.nix b/pkgs/by-name/pr/prevo-tools/package.nix
index 998c2fc8927c..5f8b9502d957 100644
--- a/pkgs/by-name/pr/prevo-tools/package.nix
+++ b/pkgs/by-name/pr/prevo-tools/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bpeel";
     repo = "prevodb";
-    tag = version;
+    rev = version;
     hash = "sha256-TfgsZidwXewwqGkb31Qv0SrX8wQdPaK7JQA3nB5h2bs=";
   };
 
diff --git a/pkgs/by-name/pr/prime-server/package.nix b/pkgs/by-name/pr/prime-server/package.nix
index 3c8783cfa6e3..41bd6671019f 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";
-    tag = version;
+    rev = version;
     sha256 = "0izmmvi3pvidhlrgfpg4ccblrw6fil3ddxg5cfxsz4qbh399x83w";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pr/principia/package.nix b/pkgs/by-name/pr/principia/package.nix
index 71925491d3aa..6ed8e890eca9 100644
--- a/pkgs/by-name/pr/principia/package.nix
+++ b/pkgs/by-name/pr/principia/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Bithack";
     repo = "principia";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-cXtc1E4iJf3//UyzZzhky/NV7zk4959xSwGLHdCeyk0=";
   };
 
diff --git a/pkgs/by-name/pr/prisma-engines/package.nix b/pkgs/by-name/pr/prisma-engines/package.nix
index d65038b16f66..d7156eaa6ba9 100644
--- a/pkgs/by-name/pr/prisma-engines/package.nix
+++ b/pkgs/by-name/pr/prisma-engines/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
-    tag = version;
+    rev = version;
     hash = "sha256-gQLDskabTaNk19BJi9Kv4TiEfVck2QZ7xdhopt5KH6M=";
   };
 
diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix
index b50013d8c0b8..5240f890a1a7 100644
--- a/pkgs/by-name/pr/prisma/package.nix
+++ b/pkgs/by-name/pr/prisma/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Buu+E0xxjcrPOyEHkQTp7IVS9kymmR1PTegeOXxb2PA=";
   };
 
diff --git a/pkgs/by-name/pr/pritunl-client/package.nix b/pkgs/by-name/pr/pritunl-client/package.nix
index d171b02b3f39..37ea802f59e2 100644
--- a/pkgs/by-name/pr/pritunl-client/package.nix
+++ b/pkgs/by-name/pr/pritunl-client/package.nix
@@ -23,7 +23,7 @@ let
   src = fetchFromGitHub {
     owner = "pritunl";
     repo = "pritunl-client-electron";
-    tag = version;
+    rev = version;
     sha256 = "sha256-bxCGZ2Jm2rPKRH6Uj0JmQ3MQ3zRd6kXjOVeAOHBl1lA=";
   };
 
diff --git a/pkgs/by-name/pr/pritunl-ssh/package.nix b/pkgs/by-name/pr/pritunl-ssh/package.nix
index 20779a364ef6..31c41e894a0b 100644
--- a/pkgs/by-name/pr/pritunl-ssh/package.nix
+++ b/pkgs/by-name/pr/pritunl-ssh/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pritunl";
     repo = "pritunl-zero-client";
-    tag = version;
+    rev = version;
     sha256 = "sha256-kccc8ZDh3S/Ko/MaBd5u0UxMNIbg5dhvRuecJuE3D6c=";
   };
 
diff --git a/pkgs/by-name/pr/procdump/package.nix b/pkgs/by-name/pr/procdump/package.nix
index a619528d9971..a547f7f69f35 100644
--- a/pkgs/by-name/pr/procdump/package.nix
+++ b/pkgs/by-name/pr/procdump/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "ProcDump-for-Linux";
-    tag = version;
+    rev = version;
     sha256 = "sha256-gVswAezHl7E2cBTJEQhPFXhHkzhWVHSpPF8m0s8+ekc=";
   };
 
diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix
index 7c6127697ac1..e88658dcb0bb 100644
--- a/pkgs/by-name/pr/process-compose/package.nix
+++ b/pkgs/by-name/pr/process-compose/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "F1bonacc1";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-E7ovd/dNSMxVld7CS4ZjxZxUVDXLuoQR7W4ZZ1cPMP0=";
     # 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/process-cpp/package.nix b/pkgs/by-name/pr/process-cpp/package.nix
index d004f1ff5191..eb9638e74ab1 100644
--- a/pkgs/by-name/pr/process-cpp/package.nix
+++ b/pkgs/by-name/pr/process-cpp/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.com";
     owner = "ubports";
     repo = "development/core/lib-cpp/process-cpp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-UCNmD5Ea2wnEwG9gkt88TaX0vfS4SCaIOPRMeNFx80Y=";
   };
 
diff --git a/pkgs/by-name/pr/prodigal/package.nix b/pkgs/by-name/pr/prodigal/package.nix
index ec052ab082e6..616ce2f6c5f8 100644
--- a/pkgs/by-name/pr/prodigal/package.nix
+++ b/pkgs/by-name/pr/prodigal/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "Prodigal";
     owner = "hyattpd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1fs1hqk83qjbjhrvhw6ni75zakx5ki1ayy3v6wwkn3xvahc9hi5s";
   };
 
diff --git a/pkgs/by-name/pr/profetch/package.nix b/pkgs/by-name/pr/profetch/package.nix
index 25084d46270b..3c7c259f9eb8 100644
--- a/pkgs/by-name/pr/profetch/package.nix
+++ b/pkgs/by-name/pr/profetch/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RustemB";
     repo = "profetch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JsjpPUXMN0jytRS4yzSjrseqHiEQ+YinklG+tIIy+Zo=";
   };
 
diff --git a/pkgs/by-name/pr/profile-cleaner/package.nix b/pkgs/by-name/pr/profile-cleaner/package.nix
index bad70ab31653..48b0916e9ac2 100644
--- a/pkgs/by-name/pr/profile-cleaner/package.nix
+++ b/pkgs/by-name/pr/profile-cleaner/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = "profile-cleaner";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-10e1S+li7SXKJX2lETSdx84GavWqQYQqyLoBIVToTBI=";
   };
 
diff --git a/pkgs/by-name/pr/profile-sync-daemon/package.nix b/pkgs/by-name/pr/profile-sync-daemon/package.nix
index 8f06a0ff7165..100848d523ab 100644
--- a/pkgs/by-name/pr/profile-sync-daemon/package.nix
+++ b/pkgs/by-name/pr/profile-sync-daemon/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = "profile-sync-daemon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Wb9YLxuu9i9s/Y6trz5NZDU9WRywe3138cp5Q2gWbxM=";
   };
 
diff --git a/pkgs/by-name/pr/programmer-calculator/package.nix b/pkgs/by-name/pr/programmer-calculator/package.nix
index 2d574b970004..75c4b15b7c12 100644
--- a/pkgs/by-name/pr/programmer-calculator/package.nix
+++ b/pkgs/by-name/pr/programmer-calculator/package.nix
@@ -12,7 +12,7 @@ gccStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alt-romes";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9mv8Jac6j3fKWLLCu1Bd/T5dbegUB8rRgsj9MaQhFDw=";
   };
 
diff --git a/pkgs/by-name/pr/progress/package.nix b/pkgs/by-name/pr/progress/package.nix
index 0962b5093b34..ec6d2916fdd6 100644
--- a/pkgs/by-name/pr/progress/package.nix
+++ b/pkgs/by-name/pr/progress/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Xfennec";
     repo = "progress";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-riewkageSZIlwDNMjYep9Pb2q1GJ+WMXazokJGbb4bE=";
   };
 
diff --git a/pkgs/by-name/pr/proj-datumgrid/package.nix b/pkgs/by-name/pr/proj-datumgrid/package.nix
index 28741013d80f..a1c7121f017c 100644
--- a/pkgs/by-name/pr/proj-datumgrid/package.nix
+++ b/pkgs/by-name/pr/proj-datumgrid/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "proj-datumgrid";
-    tag = version;
+    rev = version;
     sha256 = "132wp77fszx33wann0fjkmi1isxvsb0v9iw0gd9sxapa9h6hf3am";
   };
 
diff --git a/pkgs/by-name/pr/projectable/package.nix b/pkgs/by-name/pr/projectable/package.nix
index 929c93dfd882..5b27b6ffe9ce 100644
--- a/pkgs/by-name/pr/projectable/package.nix
+++ b/pkgs/by-name/pr/projectable/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dzfrias";
     repo = "projectable";
-    tag = version;
+    rev = version;
     hash = "sha256-GM/dPmLnv1/Qj6QhBxPu5kO/SDnbY7Ntupf1FGkmrUY=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
index fdb473882023..2390d74441c3 100644
--- a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "elasticsearch_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-v6Fi5O/87jhFI1h6qWyWb61X+dTjcqS3Fi9/MPQSr8Y=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
index 92a88dba7728..46069bd5468e 100644
--- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
@@ -9,7 +9,7 @@ let
   src = fetchFromGitHub {
     owner = "tynany";
     repo = "frr_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-J847Y2ZxD0JLEv7hYS5EsNBA6052PXO6VVoavFrWVUU=";
   };
 in
diff --git a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix
index ff9b94c17f7e..db41ced6fd45 100644
--- a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "scross01";
     repo = "prometheus-klipper-exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OlNUBdCizMOSb7WEtu00LaHYSXLSPlISVJD/0rHujnY=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix b/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix
index 1bdf39a483e5..94ee81b1b357 100644
--- a/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "utkuozdemir";
     repo = "nvidia_gpu_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nBNQqnXomQpEgspC9kmI574Onhkcg7UCXIf7O7XiiH0=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-pushgateway/package.nix b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
index dc884c766c37..5d71ec9da6f5 100644
--- a/pkgs/by-name/pr/prometheus-pushgateway/package.nix
+++ b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "pushgateway";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VIqk5GxI5qFnsjeq6FL1UUd7lX3VLLhTcPlo4j8oL/c=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-restic-exporter/package.nix b/pkgs/by-name/pr/prometheus-restic-exporter/package.nix
index 2379c3190b75..4950727a3e3f 100644
--- a/pkgs/by-name/pr/prometheus-restic-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-restic-exporter/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ngosang";
     repo = "restic-exporter";
-    tag = version;
+    rev = version;
     hash = "sha256-b3TbBZqNJEAveNVf+6OGHU2G3UUyuSEjzFMPJVuxlBE=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix
index b1c01547cacb..9073641c66e1 100644
--- a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "boynux";
     repo = "squid-exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-low1nIL7FbIYfIP7KWPskAQ50Hh+d7JI+ryYoR+mP10=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix b/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
index 51b6469bdb1d..bcb3fa0e65e8 100644
--- a/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   version = "2.0.0";
 
   src = fetchFromGitHub {
-    tag = version;
+    rev = version;
     owner = "ipstatic";
     repo = "surfboard_exporter";
     sha256 = "11qms26648nwlwslnaflinxcr5rnp55s908rm1qpnbz0jnxf5ipw";
diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix
index 8cec8fe7e81d..3dda7203bd4e 100644
--- a/pkgs/by-name/pr/promptfoo/package.nix
+++ b/pkgs/by-name/pr/promptfoo/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "promptfoo";
     repo = "promptfoo";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-sMBgjxPzG3SJ7RS4oTtOq7hJ1MYaKW3/6FF8Pn5l89c=";
   };
 
diff --git a/pkgs/by-name/pr/promql-cli/package.nix b/pkgs/by-name/pr/promql-cli/package.nix
index ac5618d4b424..b92927a19f64 100644
--- a/pkgs/by-name/pr/promql-cli/package.nix
+++ b/pkgs/by-name/pr/promql-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nalbury";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EV63fdG+GF+kVLH2TxHPhRcUU5xBvkW5bhHC1lEoj84=";
   };
 
diff --git a/pkgs/by-name/pr/promscale/package.nix b/pkgs/by-name/pr/promscale/package.nix
index c30011321c73..9c350a7f8866 100644
--- a/pkgs/by-name/pr/promscale/package.nix
+++ b/pkgs/by-name/pr/promscale/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "timescale";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-JizUI9XRzOEHF1kAblYQRYB11z9KWX7od3lPiRN+JNI=";
   };
 
diff --git a/pkgs/by-name/pr/proot/package.nix b/pkgs/by-name/pr/proot/package.nix
index d044685047e3..b3fb0a36629d 100644
--- a/pkgs/by-name/pr/proot/package.nix
+++ b/pkgs/by-name/pr/proot/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "proot";
     owner = "proot-me";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Z9Y7ccWp5KEVuo9xfHcgo58XqYVdFo7ck1jH7cnT2KA=";
   };
 
diff --git a/pkgs/by-name/pr/properties-cpp/package.nix b/pkgs/by-name/pr/properties-cpp/package.nix
index adae3bb8fad9..887c1e2eeec9 100644
--- a/pkgs/by-name/pr/properties-cpp/package.nix
+++ b/pkgs/by-name/pr/properties-cpp/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/properties-cpp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-C/BDEuKNMQHOjATO5aWBptjIlgfv6ykzjFAsHb6uP3Q=";
   };
 
diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix
index c174f954956b..4ef2318e150d 100644
--- a/pkgs/by-name/pr/protege/package.nix
+++ b/pkgs/by-name/pr/protege/package.nix
@@ -16,7 +16,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "protegeproject";
     repo = "protege";
-    tag = version;
+    rev = version;
     hash = "sha256-Q3MHa7nCeF31n7JPltcemFBc/sJwGA9Ev0ymjQhY/U0=";
   };
 
diff --git a/pkgs/by-name/pr/proteus/package.nix b/pkgs/by-name/pr/proteus/package.nix
index 9e6d6606e966..c3d774532606 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-WhJh+Sx64JYxQQ1LXpDUwXeodFU1EZ0TmMhn+6w0hQg=";
   };
diff --git a/pkgs/by-name/pr/proto-contrib/package.nix b/pkgs/by-name/pr/proto-contrib/package.nix
index 4d7e22836245..0581335fe17f 100644
--- a/pkgs/by-name/pr/proto-contrib/package.nix
+++ b/pkgs/by-name/pr/proto-contrib/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "emicklei";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk";
   };
 
diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix
index f5ba3a77604d..c073a3a72c00 100644
--- a/pkgs/by-name/pr/proto/package.nix
+++ b/pkgs/by-name/pr/proto/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = "proto";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cyRChMYYkqsTto91jZLxSrAbuYEeDcm3iXjLc23UqBI=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-doc/package.nix b/pkgs/by-name/pr/protoc-gen-doc/package.nix
index dd9abfc4a5dc..0b9d1bc03165 100644
--- a/pkgs/by-name/pr/protoc-gen-doc/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-doc/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pseudomuto";
     repo = "protoc-gen-doc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-19CN62AwqQGq5Gb5kQqVYhs+LKsJ9K2L0VAakwzPD5Y=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
index 2e9d994b5692..f7eed9ab1c33 100644
--- a/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ent";
     repo = "contrib";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8BQXjoVTasCReAc3XWBgeoYmL9zLj+uvf9TRKBYaAr4=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix b/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
index cccb1b3a142d..0c39bb857a4f 100644
--- a/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "planetscale";
     repo = "vtprotobuf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ji6elc0hN49A4Ov/ckd8chPR4/8ZX11THzVz9HJGui4=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix
index d255f86de90e..a119d4ee6fcc 100644
--- a/pkgs/by-name/pr/protoc-gen-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6Wx1XoHZS1RM0hpgVE85U7huVS4IK+AroTE2zpZR4VI=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-js/package.nix b/pkgs/by-name/pr/protoc-gen-js/package.nix
index c5535c812579..a3754ce78e46 100644
--- a/pkgs/by-name/pr/protoc-gen-js/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-js/package.nix
@@ -14,7 +14,7 @@ buildBazelPackage rec {
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf-javascript";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-swift/package.nix b/pkgs/by-name/pr/protoc-gen-swift/package.nix
index f2f5c876ad08..c0635e0868c2 100644
--- a/pkgs/by-name/pr/protoc-gen-swift/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-swift/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "apple";
     repo = "swift-protobuf";
-    tag = finalAttrs.version;
+    rev = "${finalAttrs.version}";
     hash = "sha256-UPYwu8SiBUHofqHdUT6uxdeY2WUXYqbkLj+h4chSCa4=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-twirp/package.nix b/pkgs/by-name/pr/protoc-gen-twirp/package.nix
index 02412fb40486..a1072f957800 100644
--- a/pkgs/by-name/pr/protoc-gen-twirp/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-twirp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "twitchtv";
     repo = "twirp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-p3gHVHGBHakOOQnJAuMK7vZumNXN15mOABuEHUG0wNs=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-validate/package.nix b/pkgs/by-name/pr/protoc-gen-validate/package.nix
index d25a1a10ddc4..ef920b6351ce 100644
--- a/pkgs/by-name/pr/protoc-gen-validate/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-validate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "protoc-gen-validate";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kGnfR8o12bvjJH+grAwlYezF6UzWt7lgjGslq+07p3k=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-go-inject-tag/package.nix b/pkgs/by-name/pr/protoc-go-inject-tag/package.nix
index f19777431c8b..5d6d1cc8330d 100644
--- a/pkgs/by-name/pr/protoc-go-inject-tag/package.nix
+++ b/pkgs/by-name/pr/protoc-go-inject-tag/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "favadi";
     repo = "protoc-go-inject-tag";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8mpkwv80PMfOPiammg596hW7xdrcum9Hl/v5O1DPWgY=";
   };
 
diff --git a/pkgs/by-name/pr/protolint/package.nix b/pkgs/by-name/pr/protolint/package.nix
index ffdab28cd32f..8dac80a2bb93 100644
--- a/pkgs/by-name/pr/protolint/package.nix
+++ b/pkgs/by-name/pr/protolint/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yoheimuta";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3/eoVrt/Ic2LLLbexXG3ng/uR60JbmKheSxa2PiMnvg=";
   };
 
diff --git a/pkgs/by-name/pr/protolock/package.nix b/pkgs/by-name/pr/protolock/package.nix
index 7c5c04a7c949..663219e3e719 100644
--- a/pkgs/by-name/pr/protolock/package.nix
+++ b/pkgs/by-name/pr/protolock/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nilslice";
     repo = "protolock";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+7kU4nCBwCA6mnjFrejPrIILYUSfYpq13d+0MmNZoBg=";
   };
 
diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix
index e0104ca80c0e..7321597a5dc9 100644
--- a/pkgs/by-name/pr/proton-caller/package.nix
+++ b/pkgs/by-name/pr/proton-caller/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "caverym";
     repo = "proton-caller";
-    tag = version;
+    rev = version;
     sha256 = "sha256-srzahBMihkEP9/+7oRij5POHkCcH6QBh4kGz42Pz0nM=";
   };
 
diff --git a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
index ae7360d3a256..c9a25a988dcd 100644
--- a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
+++ b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-vpn-local-agent";
-    tag = version;
+    rev = version;
     hash = "sha256-9dyyLZZEOB2080KxN0ffdkRhyvEY8xKE/7b2mA7JL+o=";
   };
 
diff --git a/pkgs/by-name/pr/protonmail-bridge/package.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix
index 59d764aa55d6..4e3a5558a601 100644
--- a/pkgs/by-name/pr/protonmail-bridge/package.nix
+++ b/pkgs/by-name/pr/protonmail-bridge/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ProtonMail";
     repo = "proton-bridge";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Jx6yzn3QNOVz/VM8dqmTm4Upzz46aNo9d6lvhjLwdL4=";
   };
 
diff --git a/pkgs/by-name/pr/prototool/package.nix b/pkgs/by-name/pr/prototool/package.nix
index 990f8217c123..211c86bd7c07 100644
--- a/pkgs/by-name/pr/prototool/package.nix
+++ b/pkgs/by-name/pr/prototool/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "uber";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T6SjjyHC4j5du2P4Emcfq/ZFbuCpMPPJFJTHb/FNMAo=";
   };
 
diff --git a/pkgs/by-name/pr/prox/package.nix b/pkgs/by-name/pr/prox/package.nix
index 043cbad24c7f..adc0751adb2d 100644
--- a/pkgs/by-name/pr/prox/package.nix
+++ b/pkgs/by-name/pr/prox/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fgrosse";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KSHTlcAmnuU8F17N0LBS0s5b/k6Of0OEHVd3v50bH3g=";
   };
 
diff --git a/pkgs/by-name/pr/proximity-sort/package.nix b/pkgs/by-name/pr/proximity-sort/package.nix
index a65e1baf9bec..38c24ff597e3 100644
--- a/pkgs/by-name/pr/proximity-sort/package.nix
+++ b/pkgs/by-name/pr/proximity-sort/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = "proximity-sort";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MRLQvspv6kjirljhAkk1KT+hPA4hdjA1b7RL9eEyglQ=";
   };
 
diff --git a/pkgs/by-name/pr/proxmove/package.nix b/pkgs/by-name/pr/proxmove/package.nix
index c97a24468bdf..8007f2a77874 100644
--- a/pkgs/by-name/pr/proxmove/package.nix
+++ b/pkgs/by-name/pr/proxmove/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ossobv";
     repo = "proxmove";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8xzsmQsogoMrdpf8+mVZRWPGQt9BO0dBT0aKt7ygUe4=";
   };
 
diff --git a/pkgs/by-name/pr/proxychains-ng/package.nix b/pkgs/by-name/pr/proxychains-ng/package.nix
index b5a7fbe1d405..6644ecdf4103 100644
--- a/pkgs/by-name/pr/proxychains-ng/package.nix
+++ b/pkgs/by-name/pr/proxychains-ng/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rofl0r";
     repo = "proxychains-ng";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cHRWPQm6aXsror0z+S2Ddm7w14c1OvEruDublWsvnXs=";
   };
 
diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix
index 3c7ce2728fea..ca7ce16a8adc 100644
--- a/pkgs/by-name/pr/proxysql/package.nix
+++ b/pkgs/by-name/pr/proxysql/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sysown";
     repo = "proxysql";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Ouz1SSc35gQaJcVQO95azkxNgLxuY712ELAwM5buEtY=";
   };
 
diff --git a/pkgs/by-name/pr/prqlc/package.nix b/pkgs/by-name/pr/prqlc/package.nix
index 1675667c5f1b..ba09becf04be 100644
--- a/pkgs/by-name/pr/prqlc/package.nix
+++ b/pkgs/by-name/pr/prqlc/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "prql";
     repo = "prql";
-    tag = version;
+    rev = version;
     hash = "sha256-lJkZXiwZUr/qACb9X52EGR0FBOicuPMmyA1105G7gZU=";
   };
 
diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix
index e3a8a2e06e9c..4715f0cf80ca 100644
--- a/pkgs/by-name/pr/prr/package.nix
+++ b/pkgs/by-name/pr/prr/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "danobi";
     repo = "prr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-siQZ3rDKv2lnn1bmisRsexWwfvmMhK+z4GZGPsrfPgc=";
   };
 
diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix
index 3bbb7561ec80..6e6089f50321 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wLM+txjngY5gh/+yiaSKrenG6oIzF2dPgMumIGyCsXU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ps/ps2eps/package.nix b/pkgs/by-name/ps/ps2eps/package.nix
index 02bdb69566cc..a5132909375a 100644
--- a/pkgs/by-name/ps/ps2eps/package.nix
+++ b/pkgs/by-name/ps/ps2eps/package.nix
@@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "roland-bless";
     repo = "ps2eps";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SPLwsGKLVhANoqSQ/GJ938cYjbjMbUOXkNn9so3aJTA=";
   };
   patches = [
diff --git a/pkgs/by-name/ps/ps_mem/package.nix b/pkgs/by-name/ps/ps_mem/package.nix
index 460c0e91fd82..2b8365f04077 100644
--- a/pkgs/by-name/ps/ps_mem/package.nix
+++ b/pkgs/by-name/ps/ps_mem/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pixelb";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jCfPtPSky/QFk9Xo/tq3W7609Pie1yLC4iS4dqjCa+E=";
   };
 
diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix
index ab228be978df..ffbd140a6627 100644
--- a/pkgs/by-name/ps/pscale/package.nix
+++ b/pkgs/by-name/ps/pscale/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "planetscale";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-aWml3iTcci1V8RkiCrvv+E7zmW5JJCDzDNv2RaDhjAg=";
   };
 
diff --git a/pkgs/by-name/ps/pscircle/package.nix b/pkgs/by-name/ps/pscircle/package.nix
index a9ac7983e41c..29e7ec26bd39 100644
--- a/pkgs/by-name/ps/pscircle/package.nix
+++ b/pkgs/by-name/ps/pscircle/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "mildlyparallel";
     repo = "pscircle";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bqbQBNscNfoqXprhoFUnUQO88YQs9xDhD4d3KHamtG0=";
   };
 
diff --git a/pkgs/by-name/ps/psi-notify/package.nix b/pkgs/by-name/ps/psi-notify/package.nix
index d53ff170728a..42ce2fb267be 100644
--- a/pkgs/by-name/ps/psi-notify/package.nix
+++ b/pkgs/by-name/ps/psi-notify/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cdown";
     repo = "psi-notify";
-    tag = version;
+    rev = version;
     sha256 = "sha256-GhGiSI5r0Ki6+MYNa5jCDyYZEW5R9LDNZ/S8K+6L0jo=";
   };
 
diff --git a/pkgs/by-name/ps/psitop/package.nix b/pkgs/by-name/ps/psitop/package.nix
index e27c58b2527b..573c6e970c9f 100644
--- a/pkgs/by-name/ps/psitop/package.nix
+++ b/pkgs/by-name/ps/psitop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jamespwilliams";
     repo = "psitop";
-    tag = version;
+    rev = version;
     hash = "sha256-TD+NTlfmBtz+m2w2FnTcUIJQakpvVBCK/MAHfCrOue4=";
   };
 
diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index 21599566f02e..63f57bd75ac8 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "psi-4ward";
     repo = "psitransfer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA=";
   };
   app = buildNpmPackage {
diff --git a/pkgs/by-name/ps/psmisc/package.nix b/pkgs/by-name/ps/psmisc/package.nix
index ed73d1b20ad7..d96dfa9456b7 100644
--- a/pkgs/by-name/ps/psmisc/package.nix
+++ b/pkgs/by-name/ps/psmisc/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-49YpdIh0DxLHfxos4sw1HUkV0XQBqmm4M9b0T4eN2xI=";
   };
 
diff --git a/pkgs/by-name/ps/pspg/package.nix b/pkgs/by-name/ps/pspg/package.nix
index 4b395f8b5ca7..fb2addc0c646 100644
--- a/pkgs/by-name/ps/pspg/package.nix
+++ b/pkgs/by-name/ps/pspg/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "pspg";
-    tag = version;
+    rev = version;
     sha256 = "sha256-8Wi8fMEBc1A0foEzwO5Dq6c3yC0pJ9hbzCjjMp+Lapg=";
   };
 
diff --git a/pkgs/by-name/ps/psql2csv/package.nix b/pkgs/by-name/ps/psql2csv/package.nix
index f46e575ea485..aaef5311a9ce 100644
--- a/pkgs/by-name/ps/psql2csv/package.nix
+++ b/pkgs/by-name/ps/psql2csv/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fphilipe";
     repo = "psql2csv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XIdZ2+Jlw2JLn4KXD9h3+xXymu4FhibAfp5uGGkVwLQ=";
   };
 
diff --git a/pkgs/by-name/ps/pssh/package.nix b/pkgs/by-name/ps/pssh/package.nix
index 6feb3528f171..7b01d058ed16 100644
--- a/pkgs/by-name/ps/pssh/package.nix
+++ b/pkgs/by-name/ps/pssh/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lilydjwg";
     repo = "pssh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B1dIa6hNeq4iE8GKVhTp3Gzq7vp+v5Yyzj8uF8X71yg=";
   };
 
diff --git a/pkgs/by-name/ps/psstop/package.nix b/pkgs/by-name/ps/psstop/package.nix
index 1d8d0c784b71..67968128d828 100644
--- a/pkgs/by-name/ps/psstop/package.nix
+++ b/pkgs/by-name/ps/psstop/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "clearlinux";
     repo = "psstop";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h";
   };
 
diff --git a/pkgs/by-name/ps/psw/package.nix b/pkgs/by-name/ps/psw/package.nix
index 930566b02917..b288a3e3b2f3 100644
--- a/pkgs/by-name/ps/psw/package.nix
+++ b/pkgs/by-name/ps/psw/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Wulfsta";
     repo = "psw";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Rf6vpVgenTzb42/aGqItuxUodl61eNyUPlry7rgLPbI=";
   };
 
diff --git a/pkgs/by-name/pt/ptags/package.nix b/pkgs/by-name/pt/ptags/package.nix
index 14f019688004..00ed0da95640 100644
--- a/pkgs/by-name/pt/ptags/package.nix
+++ b/pkgs/by-name/pt/ptags/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dalance";
     repo = "ptags";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bxp38zWufqS6PZqhw8X5HR5zMRcwH58MuZaJmDRuiys=";
   };
 
diff --git a/pkgs/by-name/pt/ptex/package.nix b/pkgs/by-name/pt/ptex/package.nix
index 2f3ff8fa5bea..4887e0ab4f67 100644
--- a/pkgs/by-name/pt/ptex/package.nix
+++ b/pkgs/by-name/pt/ptex/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wdas";
     repo = "ptex";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PR1ld9rXmL6BK4llznAsD5PNvi3anFMz2i9NDsG95DQ=";
   };
 
diff --git a/pkgs/by-name/pt/ptouch-driver/package.nix b/pkgs/by-name/pt/ptouch-driver/package.nix
index bc5bd05c35c4..95c04d04d462 100644
--- a/pkgs/by-name/pt/ptouch-driver/package.nix
+++ b/pkgs/by-name/pt/ptouch-driver/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "philpem";
     repo = "printer-driver-ptouch";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3ZotSHn7lERp53hAzx47Ct/k565rEoensCcltwX/Xls=";
   };
 
diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix
index 83e6f9210d04..366a186d99ed 100644
--- a/pkgs/by-name/pt/ptyxis/package.nix
+++ b/pkgs/by-name/pt/ptyxis/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "chergert";
     repo = "ptyxis";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ZZwrqX7GkqMVtLhyzJvThzqmxg/PRwBxSshSv/Z7uKo=";
   };
 
diff --git a/pkgs/by-name/pu/pufferpanel/package.nix b/pkgs/by-name/pu/pufferpanel/package.nix
index 387e6c595d75..590e622c3cc4 100644
--- a/pkgs/by-name/pu/pufferpanel/package.nix
+++ b/pkgs/by-name/pu/pufferpanel/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "PufferPanel";
     repo = "PufferPanel";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+ZZUoqCiSbrkaeYrm9X8SuX0INsGFegQNwa3WjBvgHQ=";
   };
 
diff --git a/pkgs/by-name/pu/puffin/package.nix b/pkgs/by-name/pu/puffin/package.nix
index 59cfea3a6add..ac3959e111c4 100644
--- a/pkgs/by-name/pu/puffin/package.nix
+++ b/pkgs/by-name/pu/puffin/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "siddhantac";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5lglIiVOsxnMbeR/E3O5TaMtoR5DJACWjStE4d7hDao=";
   };
 
diff --git a/pkgs/by-name/pu/pulsarctl/package.nix b/pkgs/by-name/pu/pulsarctl/package.nix
index 0f5f742ba00b..0113ddca9b40 100644
--- a/pkgs/by-name/pu/pulsarctl/package.nix
+++ b/pkgs/by-name/pu/pulsarctl/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "streamnative";
     repo = "pulsarctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/4JSSYd18hEHUOiay3y74VHBY3ql6aqAK4aWDJaqwCU=";
   };
 
diff --git a/pkgs/by-name/pu/pulseaudio-ctl/package.nix b/pkgs/by-name/pu/pulseaudio-ctl/package.nix
index fa192d6b1c6c..da9c2d5757da 100644
--- a/pkgs/by-name/pu/pulseaudio-ctl/package.nix
+++ b/pkgs/by-name/pu/pulseaudio-ctl/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZB1jrr31PF7+vNB+Xo5CATJmYbuDAPwewpDxCVnAowY=";
   };
 
diff --git a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
index 106e1170d289..ceec2b35af4c 100644
--- a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
+++ b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "neutrinolabs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GT0kBfq6KvuiX30B9JzCiUxgSm9E6IhdJuQKKKprDCE=";
   };
 
diff --git a/pkgs/by-name/pu/pulsemixer/package.nix b/pkgs/by-name/pu/pulsemixer/package.nix
index b7e5dae8dbf0..7a54c6a17483 100644
--- a/pkgs/by-name/pu/pulsemixer/package.nix
+++ b/pkgs/by-name/pu/pulsemixer/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GeorgeFilipkin";
     repo = "pulsemixer";
-    tag = version;
+    rev = version;
     sha256 = "1jagx9zmz5pfsld8y2rj2kqg6ww9f6vqiawfy3vhqc49x3xx92p4";
   };
 
diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix
index 3956e7cc1c7d..08dd1f41862b 100644
--- a/pkgs/by-name/pu/pulumi-esc/package.nix
+++ b/pkgs/by-name/pu/pulumi-esc/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "esc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hQYA8j0fmVdlRuUfZy4NT5oYYot2lHrTqFCPe255F2k=";
   };
 
diff --git a/pkgs/by-name/pu/pulumictl/package.nix b/pkgs/by-name/pu/pulumictl/package.nix
index a2e2e916766e..110b623787bf 100644
--- a/pkgs/by-name/pu/pulumictl/package.nix
+++ b/pkgs/by-name/pu/pulumictl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "pulumictl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rFVxfWeESWmqH0BhKY6BO5AxSPXVW8tOPGyUXB5Kc/E=";
   };
 
diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix
index 743e73456d6d..10656bfdcee3 100644
--- a/pkgs/by-name/pu/pupdate/package.nix
+++ b/pkgs/by-name/pu/pupdate/package.nix
@@ -16,7 +16,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "mattpannella";
     repo = "pupdate";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-kdxqG1Vw6jRT/YyRLi60APpayYyLG73KqAFga8N9G2A=";
   };
 
diff --git a/pkgs/by-name/pu/puppeteer-cli/package.nix b/pkgs/by-name/pu/puppeteer-cli/package.nix
index 1b7c32e1e1a3..03b71b728ab5 100644
--- a/pkgs/by-name/pu/puppeteer-cli/package.nix
+++ b/pkgs/by-name/pu/puppeteer-cli/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "JarvusInnovations";
     repo = "puppeteer-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0xrb8r4qc9ds7wmfd30nslnkqylxqfwr4gqf7b30v651sjyds29x";
   };
 
diff --git a/pkgs/by-name/pu/pure-prompt/package.nix b/pkgs/by-name/pu/pure-prompt/package.nix
index 6f2fee650944..036dd69c7fc3 100644
--- a/pkgs/by-name/pu/pure-prompt/package.nix
+++ b/pkgs/by-name/pu/pure-prompt/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sindresorhus";
     repo = "pure";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k=";
   };
 
diff --git a/pkgs/by-name/pu/pushup/package.nix b/pkgs/by-name/pu/pushup/package.nix
index ce9f4159951f..6432fa558cc3 100644
--- a/pkgs/by-name/pu/pushup/package.nix
+++ b/pkgs/by-name/pu/pushup/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adhocteam";
     repo = "pushup";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9ENXeVON2/Bt8oXnyVw+Vl0bPVPP7iFSyhxwc091ZIs=";
   };
 
diff --git a/pkgs/by-name/pv/pvsneslib/package.nix b/pkgs/by-name/pv/pvsneslib/package.nix
index 23094c2e81cc..1289fa2fff63 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";
-    tag = version;
+    rev = version;
     hash = "sha256-Cl4+WvjKbq5IPqf7ivVYwBYwDDWWHGNeq4nWXPxsUHw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pw/pw-viz/package.nix b/pkgs/by-name/pw/pw-viz/package.nix
index 40a591428e85..0d193713e6e8 100644
--- a/pkgs/by-name/pw/pw-viz/package.nix
+++ b/pkgs/by-name/pw/pw-viz/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ax9d";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fB7PnWWahCMKhGREg6neLmOZjh2OWLu61Vpmfsl03wA=";
   };
 
diff --git a/pkgs/by-name/pw/pw-volume/package.nix b/pkgs/by-name/pw/pw-volume/package.nix
index dd464fa94055..deb28d104371 100644
--- a/pkgs/by-name/pw/pw-volume/package.nix
+++ b/pkgs/by-name/pw/pw-volume/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "smasher164";
     repo = "pw-volume";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-r/6AAZKZgPYUGic/Dag7OT5RtH+RKgEkJVWxsO5VGZ0=";
   };
 
diff --git a/pkgs/by-name/pw/pw3270/package.nix b/pkgs/by-name/pw/pw3270/package.nix
index 7e89a6123d0c..2c4f1a342676 100644
--- a/pkgs/by-name/pw/pw3270/package.nix
+++ b/pkgs/by-name/pw/pw3270/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PerryWerneck";
     repo = "pw3270";
-    tag = version;
+    rev = version;
     hash = "sha256-Nk/OUqrWngKgb1D1Wi8q5ygKtvuRKUPhPQaLvWi1Z4g=";
   };
 
diff --git a/pkgs/by-name/pw/pwalarmctl/package.nix b/pkgs/by-name/pw/pwalarmctl/package.nix
index 1e841f7bb1a8..4c6c03e3e6e6 100644
--- a/pkgs/by-name/pw/pwalarmctl/package.nix
+++ b/pkgs/by-name/pw/pwalarmctl/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "amyipdev";
     repo = "pwalarmd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xoC1PtDQjkvoWb9x8A43ITo6xyYOv9hxH2pxiZBBvKI=";
   };
 
diff --git a/pkgs/by-name/pw/pwalarmd/package.nix b/pkgs/by-name/pw/pwalarmd/package.nix
index 10ec5178f061..07c6354d4a1a 100644
--- a/pkgs/by-name/pw/pwalarmd/package.nix
+++ b/pkgs/by-name/pw/pwalarmd/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "amyipdev";
     repo = "pwalarmd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xoC1PtDQjkvoWb9x8A43ITo6xyYOv9hxH2pxiZBBvKI=";
   };
 
diff --git a/pkgs/by-name/pw/pwgen-secure/package.nix b/pkgs/by-name/pw/pwgen-secure/package.nix
index a6d0a2228794..a9827117a994 100644
--- a/pkgs/by-name/pw/pwgen-secure/package.nix
+++ b/pkgs/by-name/pw/pwgen-secure/package.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mjmunger";
     repo = "pwgen_secure";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "15md5606hzy1xfhj2lxmc0nvynyrcs4vxa5jdi34kfm31rdklj28";
   };
 
diff --git a/pkgs/by-name/pw/pwgen/package.nix b/pkgs/by-name/pw/pwgen/package.nix
index e666d512d410..05585886da8b 100644
--- a/pkgs/by-name/pw/pwgen/package.nix
+++ b/pkgs/by-name/pw/pwgen/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tytso";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1j6c6m9fcy24jn8mk989x49yk765xb26lpr8yhpiaqk206wlss2z";
   };
 
diff --git a/pkgs/by-name/pw/pwru/package.nix b/pkgs/by-name/pw/pwru/package.nix
index 128dd2d9784c..42b8745f50e8 100644
--- a/pkgs/by-name/pw/pwru/package.nix
+++ b/pkgs/by-name/pw/pwru/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "pwru";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3lIKbzwPX6okJT9CeErX5/innUK3VqnnbWPpvlSN+6U=";
   };
 
diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix
index ec62d1e47782..0ef4f94a3df1 100644
--- a/pkgs/by-name/pw/pwsafe/package.nix
+++ b/pkgs/by-name/pw/pwsafe/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-GmM7AXnTjw6kme2mZqmKrirsorosSygJ38H5fnIqTZ4=";
   };
 
diff --git a/pkgs/by-name/px/pxder/package.nix b/pkgs/by-name/px/pxder/package.nix
index 1d1917985898..e01b261ae781 100644
--- a/pkgs/by-name/px/pxder/package.nix
+++ b/pkgs/by-name/px/pxder/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Tsuk1ko";
     repo = "pxder";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+WZbs10+id+nohTZzLjEofb6k8PMGd73YhY3FUTXx5Q=";
   };
 
diff --git a/pkgs/by-name/py/py3c/package.nix b/pkgs/by-name/py/py3c/package.nix
index c8f767183b31..8f42639a737c 100644
--- a/pkgs/by-name/py/py3c/package.nix
+++ b/pkgs/by-name/py/py3c/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "encukou";
     repo = "py3c";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-v8+0J56sZVbGdBlOotObUa10/zFMTvfXdMYRsKhyZaY=";
   };
 
diff --git a/pkgs/by-name/py/pyCA/package.nix b/pkgs/by-name/py/pyCA/package.nix
index 32e2dd4d926f..3af887e0c051 100644
--- a/pkgs/by-name/py/pyCA/package.nix
+++ b/pkgs/by-name/py/pyCA/package.nix
@@ -23,7 +23,7 @@ let
     src = fetchFromGitHub {
       owner = "opencast";
       repo = "pyCA";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-cTkWkOmgxJZlddqaSYKva2wih4Mvsdrd7LD4NggxKQk=";
     };
 
@@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "opencast";
     repo = "pyCA";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cTkWkOmgxJZlddqaSYKva2wih4Mvsdrd7LD4NggxKQk=";
   };
 
diff --git a/pkgs/by-name/py/pychess/package.nix b/pkgs/by-name/py/pychess/package.nix
index 2a2c647d1bf0..fdf109bb150a 100644
--- a/pkgs/by-name/py/pychess/package.nix
+++ b/pkgs/by-name/py/pychess/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pychess";
     repo = "pychess";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-hxc+vYvCeiM0+oOu1peI9qkZg5PeIsDMCiydJQAuzOk=";
   };
 
diff --git a/pkgs/by-name/py/pylint-exit/package.nix b/pkgs/by-name/py/pylint-exit/package.nix
index 592207a45a98..9095d4456e9d 100644
--- a/pkgs/by-name/py/pylint-exit/package.nix
+++ b/pkgs/by-name/py/pylint-exit/package.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jongracecox";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0hwfny48g394visa3xd15425fsw596r3lhkfhswpjrdk2mnk3cny";
   };
 
diff --git a/pkgs/by-name/py/pymol/package.nix b/pkgs/by-name/py/pymol/package.nix
index 0ea0b775d9e3..27cedfb1e044 100644
--- a/pkgs/by-name/py/pymol/package.nix
+++ b/pkgs/by-name/py/pymol/package.nix
@@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "schrodinger";
     repo = "pymol-open-source";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2C9kUpNfK9g7ehmk83iUVqqz4gn4wKO3lW5rSduFP6U=";
   };
 
diff --git a/pkgs/by-name/py/pyrseas/package.nix b/pkgs/by-name/py/pyrseas/package.nix
index 1c10a781dbb2..b408f480b572 100644
--- a/pkgs/by-name/py/pyrseas/package.nix
+++ b/pkgs/by-name/py/pyrseas/package.nix
@@ -12,7 +12,7 @@ let
     src = fetchFromGitHub {
       owner = "perseas";
       repo = "pgdbconn";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z";
     };
 
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "perseas";
     repo = "Pyrseas";
-    tag = version;
+    rev = version;
     sha256 = "sha256-+MxnxvbLMxK1Ak+qKpKe3GHbzzC+XHO0eR7rl4ON9H4=";
   };
 
diff --git a/pkgs/by-name/py/pysentation/package.nix b/pkgs/by-name/py/pysentation/package.nix
index 771e6cdae84d..508d0486562d 100644
--- a/pkgs/by-name/py/pysentation/package.nix
+++ b/pkgs/by-name/py/pysentation/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mimseyedi";
     repo = "pysentation";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TwHDXWgGWuQVgatBDc1iympnb6dy4xYThLR5MouEZHA=";
   };
 
diff --git a/pkgs/by-name/py/pystring/package.nix b/pkgs/by-name/py/pystring/package.nix
index d6865e0de04d..3e885d78d1c6 100644
--- a/pkgs/by-name/py/pystring/package.nix
+++ b/pkgs/by-name/py/pystring/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "imageworks";
     repo = "pystring";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1w31pjiyshqgk6zd6m3ab3xfgb0ribi77r6fwrry2aw8w1adjknf";
   };
 
diff --git a/pkgs/by-name/py/python-launcher/package.nix b/pkgs/by-name/py/python-launcher/package.nix
index 8cc91e132374..7d2bef8b0279 100644
--- a/pkgs/by-name/py/python-launcher/package.nix
+++ b/pkgs/by-name/py/python-launcher/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "brettcannon";
     repo = "python-launcher";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wRKTBvLLo0Vvvh1GtF9hOnUHNpOeX950y1U+8JYBGoE=";
   };
 
diff --git a/pkgs/by-name/py/pytrainer/package.nix b/pkgs/by-name/py/pytrainer/package.nix
index b0c3946a472e..aa075f4f8604 100644
--- a/pkgs/by-name/py/pytrainer/package.nix
+++ b/pkgs/by-name/py/pytrainer/package.nix
@@ -36,7 +36,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pytrainer";
     repo = "pytrainer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0=";
   };
 
diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix
index ac020d8a79bb..b2041d5e7682 100644
--- a/pkgs/by-name/py/pyxel/package.nix
+++ b/pkgs/by-name/py/pyxel/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kitao";
     repo = "pyxel";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6S+fl6J1JN785HxG8i0oYlwoTsqa3Gm1DpCd4swUPZ8=";
   };
 
diff --git a/pkgs/by-name/pz/pzip/package.nix b/pkgs/by-name/pz/pzip/package.nix
index 639a95775559..36a95dd991df 100644
--- a/pkgs/by-name/pz/pzip/package.nix
+++ b/pkgs/by-name/pz/pzip/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ybirader";
     repo = "pzip";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bb2TSSyA7TwgoV53M/7WkNcTq8F0EjCA7ObHfnGL9l0=";
   };
 
diff --git a/pkgs/by-name/q-/q-text-as-data/package.nix b/pkgs/by-name/q-/q-text-as-data/package.nix
index a6dd89e0fe83..aff72741d874 100644
--- a/pkgs/by-name/q-/q-text-as-data/package.nix
+++ b/pkgs/by-name/q-/q-text-as-data/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "harelba";
     repo = "q";
-    tag = version;
+    rev = version;
     sha256 = "18cwyfjgxxavclyd08bmb943c8bvzp1gnqp4klkq5xlgqwivr4sv";
   };
 
diff --git a/pkgs/by-name/qa/qadwaitadecorations/package.nix b/pkgs/by-name/qa/qadwaitadecorations/package.nix
index e2a0b696fd9b..dfeb8bde1207 100644
--- a/pkgs/by-name/qa/qadwaitadecorations/package.nix
+++ b/pkgs/by-name/qa/qadwaitadecorations/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = "QAdwaitaDecorations";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ZU3cwFwQECh4Z6YcTzD2WooZmJ2nSUABYft3dfakSuY=";
   };
 
diff --git a/pkgs/by-name/qa/qastools/package.nix b/pkgs/by-name/qa/qastools/package.nix
index 8f4a29dff621..b94318db64e2 100644
--- a/pkgs/by-name/qa/qastools/package.nix
+++ b/pkgs/by-name/qa/qastools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "sebholt";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mJjhM1y50f44kvxMidM7uqlkkXx1sbJC21vIMEDenoU=";
   };
 
diff --git a/pkgs/by-name/qb/qbec/package.nix b/pkgs/by-name/qb/qbec/package.nix
index b9d0daeeee90..7989ebe551d2 100644
--- a/pkgs/by-name/qb/qbec/package.nix
+++ b/pkgs/by-name/qb/qbec/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "splunk";
     repo = "qbec";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zi8UPDJxa6SJslVTi6uOxph/au42LPRSCZ/oohXPYFs=";
   };
 
diff --git a/pkgs/by-name/qc/qc/package.nix b/pkgs/by-name/qc/qc/package.nix
index e8ff6fa5d804..31121dc707bb 100644
--- a/pkgs/by-name/qc/qc/package.nix
+++ b/pkgs/by-name/qc/qc/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "qownnotes";
     repo = "qc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-D45uJk1Hb7k2qOLIbRdo0gQlPovUwcQ3rnYqhouhow0=";
   };
 
diff --git a/pkgs/by-name/qd/qdirstat/package.nix b/pkgs/by-name/qd/qdirstat/package.nix
index 133cc863ea80..04e6ae824f22 100644
--- a/pkgs/by-name/qd/qdirstat/package.nix
+++ b/pkgs/by-name/qd/qdirstat/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shundhammer";
     repo = "qdirstat";
-    tag = version;
+    rev = version;
     hash = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU=";
   };
 
diff --git a/pkgs/by-name/qg/qgrep/package.nix b/pkgs/by-name/qg/qgrep/package.nix
index 289ca109c426..dbcd06c4ce67 100644
--- a/pkgs/by-name/qg/qgrep/package.nix
+++ b/pkgs/by-name/qg/qgrep/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "qgrep";
-    tag = "v${version}";
+    rev = "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 5ccfebae57de..cdc03f547e39 100644
--- a/pkgs/by-name/qg/qgroundcontrol/package.nix
+++ b/pkgs/by-name/qg/qgroundcontrol/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mavlink";
     repo = "qgroundcontrol";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+BsI79p0XJ1nCjEtaCVgHbD+jseVGLQZOll79xZ5THo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/qh/qhull/package.nix b/pkgs/by-name/qh/qhull/package.nix
index e72af3259534..84777ff28cdc 100644
--- a/pkgs/by-name/qh/qhull/package.nix
+++ b/pkgs/by-name/qh/qhull/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "qhull";
     repo = "qhull";
-    tag = version;
+    rev = version;
     sha256 = "sha256-djUO3qzY8ch29AuhY3Bn1ajxWZ4/W70icWVrxWRAxRc=";
   };
 
diff --git a/pkgs/by-name/qm/qm-dsp/package.nix b/pkgs/by-name/qm/qm-dsp/package.nix
index 90f960cdaa5c..f30c433e13d5 100644
--- a/pkgs/by-name/qm/qm-dsp/package.nix
+++ b/pkgs/by-name/qm/qm-dsp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "c4dm";
     repo = "qm-dsp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1vkb1xr2hjcaw88gig7rknlwsx01lm0w94d2z0rk5vz9ih4fslvv";
   };
 
diff --git a/pkgs/by-name/qm/qmk_hid/package.nix b/pkgs/by-name/qm/qmk_hid/package.nix
index e87398129aca..2b2e525cc93e 100644
--- a/pkgs/by-name/qm/qmk_hid/package.nix
+++ b/pkgs/by-name/qm/qmk_hid/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "FrameworkComputer";
     repo = "qmk_hid";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wJi7FQrvMbdTwvbbjBnzmxupMbEuM8TeZ0JIK5ulQKI=";
   };
 
diff --git a/pkgs/by-name/qm/qmqtt/package.nix b/pkgs/by-name/qm/qmqtt/package.nix
index bc3f8a1e487d..45789db4a2bf 100644
--- a/pkgs/by-name/qm/qmqtt/package.nix
+++ b/pkgs/by-name/qm/qmqtt/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emqx";
     repo = "qmqtt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JLGwEF5e/IKzPzCQBzB710REGWbc/MW+r5AHmyYUkUI=";
   };
 
diff --git a/pkgs/by-name/qo/qogir-icon-theme/package.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix
index 1bd43348ebf1..26b7c6e39bdc 100644
--- a/pkgs/by-name/qo/qogir-icon-theme/package.nix
+++ b/pkgs/by-name/qo/qogir-icon-theme/package.nix
@@ -28,7 +28,7 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] color
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      tag = version;
+      rev = version;
       hash = "sha256-Eh4TWoFfArFmpM/9tkrf2sChQ0zzOZJE9pElchu8DCM=";
     };
 
diff --git a/pkgs/by-name/qo/qogir-theme/package.nix b/pkgs/by-name/qo/qogir-theme/package.nix
index 4195078a0b4a..622c7cdf85ae 100644
--- a/pkgs/by-name/qo/qogir-theme/package.nix
+++ b/pkgs/by-name/qo/qogir-theme/package.nix
@@ -37,7 +37,7 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "a
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      tag = version;
+      rev = version;
       sha256 = "Q9DWBzaLZjwXsYRa/oDIrccypO3TCbSRXTkbXWRmm70=";
     };
 
diff --git a/pkgs/by-name/qp/qperf/package.nix b/pkgs/by-name/qp/qperf/package.nix
index 357c1db89123..4ec27077d532 100644
--- a/pkgs/by-name/qp/qperf/package.nix
+++ b/pkgs/by-name/qp/qperf/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-rdma";
     repo = "qperf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-x9l8xqwMDHlXRZpWt3XiqN5xyCTV5rk8jp/ClRPPECI=";
   };
 
diff --git a/pkgs/by-name/qr/qrrs/package.nix b/pkgs/by-name/qr/qrrs/package.nix
index ffa7adbff06a..462cce869a48 100644
--- a/pkgs/by-name/qr/qrrs/package.nix
+++ b/pkgs/by-name/qr/qrrs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lenivaya";
     repo = "qrrs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L8sqvLbh85b8Ds9EvXNkyGVXm8BF3ejFd8ZH7QoxJdU=";
   };
 
diff --git a/pkgs/by-name/qr/qrscan/package.nix b/pkgs/by-name/qr/qrscan/package.nix
index 9ba22b703fd6..9a96f7f3e52c 100644
--- a/pkgs/by-name/qr/qrscan/package.nix
+++ b/pkgs/by-name/qr/qrscan/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sayanarijit";
     repo = "qrscan";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nAUZUE7NppsCAV8UyR8+OkikT4nJtnamsSVeyNz21EQ=";
   };
 
diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix
index 5cca864f4489..d7a5e09767ae 100644
--- a/pkgs/by-name/qr/qrtool/package.nix
+++ b/pkgs/by-name/qr/qrtool/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sorairolake";
     repo = "qrtool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-f/2AaNnojtZMhJod6ukLwEq+Bsu6O2oTD9OWGL8IS80=";
   };
 
diff --git a/pkgs/by-name/qs/qsreplace/package.nix b/pkgs/by-name/qs/qsreplace/package.nix
index 3d141b7fcd76..bc0e71483ed7 100644
--- a/pkgs/by-name/qs/qsreplace/package.nix
+++ b/pkgs/by-name/qs/qsreplace/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "qsreplace";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j9bqO2gp4RUxZHGBCIxI5nA3nD1dG4nCpJ1i4TM/fbo=";
   };
 
diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix
index 16a0d4e9c950..c187b7a412af 100644
--- a/pkgs/by-name/qs/qsv/package.nix
+++ b/pkgs/by-name/qs/qsv/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "dathere";
     repo = "qsv";
-    tag = version;
+    rev = version;
     hash = "sha256-LE3iQCZb3FKSsrb8/E5awjh26wGv9FlXw63+rNyzIIk=";
   };
 
diff --git a/pkgs/by-name/qu/quadrafuzz/package.nix b/pkgs/by-name/qu/quadrafuzz/package.nix
index 2b3193413c3f..c7d5357e60d5 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1kjsf7il9krihwlrq08gk2xvil4b4q5zd87nnm103hby2w7ws7z1";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/qu/quark-goldleaf/package.nix b/pkgs/by-name/qu/quark-goldleaf/package.nix
index ab2085355958..7395bff0c8f8 100644
--- a/pkgs/by-name/qu/quark-goldleaf/package.nix
+++ b/pkgs/by-name/qu/quark-goldleaf/package.nix
@@ -21,7 +21,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "XorTroll";
     repo = "Goldleaf";
-    tag = version;
+    rev = version;
     hash = "sha256-gagIQGOiygJ0Onm0SrkbFWaovqWX2WJNx7LpSRheCLM=";
   };
 
diff --git a/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix b/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
index 06dfac1f2682..d0897ffe2715 100644
--- a/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
+++ b/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "QubesOS";
     repo = "qubes-core-vchan-xen";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256:02l1vs5c2jfw22gxvl2fb66m0d99n8ya1i7rphsb5cxsljvxary0";
   };
 
diff --git a/pkgs/by-name/qu/qucsator-rf/package.nix b/pkgs/by-name/qu/qucsator-rf/package.nix
index da9c40744270..2549a5694f84 100644
--- a/pkgs/by-name/qu/qucsator-rf/package.nix
+++ b/pkgs/by-name/qu/qucsator-rf/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ra3xdh";
     repo = "qucsator_rf";
-    tag = version;
+    rev = version;
     hash = "sha256-Q1hpCt3SeXRzUFX4jPUu8ZsPTx2W28LQ3YwlYtOZhqg=";
   };
 
diff --git a/pkgs/by-name/qu/quich/package.nix b/pkgs/by-name/qu/quich/package.nix
index c6a6dc811015..37f058376349 100644
--- a/pkgs/by-name/qu/quich/package.nix
+++ b/pkgs/by-name/qu/quich/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Usbac";
     repo = "quich";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-4gsSjLZ7Z4ErNqe86Fy5IrzLMfvDyY18sE0yBnj9bvM=";
   };
 
diff --git a/pkgs/by-name/qu/quick-lint-js/package.nix b/pkgs/by-name/qu/quick-lint-js/package.nix
index 79993151cae2..b413e9d7e2ba 100644
--- a/pkgs/by-name/qu/quick-lint-js/package.nix
+++ b/pkgs/by-name/qu/quick-lint-js/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "quick-lint";
     repo = "quick-lint-js";
-    tag = version;
+    rev = version;
     hash = "sha256-L2LCRm1Fsg+xRdPc8YmgxDnuXJo92nxs862ewzObZ3I=";
   };
 
diff --git a/pkgs/by-name/qu/quickder/package.nix b/pkgs/by-name/qu/quickder/package.nix
index 7858000edc42..981fa635a30b 100644
--- a/pkgs/by-name/qu/quickder/package.nix
+++ b/pkgs/by-name/qu/quickder/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "quick-der";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk=";
   };
 
diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix
index 510c597ab66b..52b0ad3eb7da 100644
--- a/pkgs/by-name/qu/quickemu/package.nix
+++ b/pkgs/by-name/qu/quickemu/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "quickemu-project";
     repo = "quickemu";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-sCoCcN6950pH33bRZsLoLc1oSs5Qfpj9Bbywn/uA6Bc=";
   };
 
diff --git a/pkgs/by-name/qu/quickfix/package.nix b/pkgs/by-name/qu/quickfix/package.nix
index 0a05cc2fc578..bd4612c8eec1 100644
--- a/pkgs/by-name/qu/quickfix/package.nix
+++ b/pkgs/by-name/qu/quickfix/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "quickfix";
     repo = "quickfix";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1fgpwgvyw992mbiawgza34427aakn5zrik3sjld0i924a9d17qwg";
   };
 
diff --git a/pkgs/by-name/qu/quickgui/package.nix b/pkgs/by-name/qu/quickgui/package.nix
index 12fa6e78b3d0..2080dc8be4e5 100644
--- a/pkgs/by-name/qu/quickgui/package.nix
+++ b/pkgs/by-name/qu/quickgui/package.nix
@@ -12,7 +12,7 @@ flutter.buildFlutterApplication rec {
   src = fetchFromGitHub {
     owner = "quickemu-project";
     repo = "quickgui";
-    tag = version;
+    rev = version;
     hash = "sha256-M2Qy66RqsjXg7ZpHwaXCN8qXRIsisnIyaENx3KqmUfQ=";
   };
 
diff --git a/pkgs/by-name/qu/quickmem/package.nix b/pkgs/by-name/qu/quickmem/package.nix
index 74feba73f021..54ada1f9aff3 100644
--- a/pkgs/by-name/qu/quickmem/package.nix
+++ b/pkgs/by-name/qu/quickmem/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "Quick-MEM";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc=";
   };
 
diff --git a/pkgs/by-name/qu/quicktemplate/package.nix b/pkgs/by-name/qu/quicktemplate/package.nix
index 2fc43edec49a..6f6afe08d811 100644
--- a/pkgs/by-name/qu/quicktemplate/package.nix
+++ b/pkgs/by-name/qu/quicktemplate/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "valyala";
     repo = "quicktemplate";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "cra3LZ3Yq0KNQErQ2q0bVSy7rOLKdSkIryIgQsNRBHw=";
   };
 
diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix
index 75489bf2ebe9..1b7d1aeb4f52 100644
--- a/pkgs/by-name/qu/quill-log/package.nix
+++ b/pkgs/by-name/qu/quill-log/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "odygrd";
     repo = "quill";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WkJOB06yH3B3L2aqglh1jc38e1fDbxaqFEEh1AvBUcw=";
   };
 
diff --git a/pkgs/by-name/qu/quill-qr/package.nix b/pkgs/by-name/qu/quill-qr/package.nix
index 48d47a4f73e0..ec31feb4b013 100644
--- a/pkgs/by-name/qu/quill-qr/package.nix
+++ b/pkgs/by-name/qu/quill-qr/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IvanMalison";
     repo = "quill-qr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1kdsq6csmxfvs2wy31bc9r92l5pkmzlzkyqrangvrf4pbk3sk0r6";
   };
 
diff --git a/pkgs/by-name/qu/quorum/package.nix b/pkgs/by-name/qu/quorum/package.nix
index 1ee7dc92b077..5d7d48744084 100644
--- a/pkgs/by-name/qu/quorum/package.nix
+++ b/pkgs/by-name/qu/quorum/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Consensys";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pW8I4ivcKo6dsa8rQVKU6nUZuKxaki/7cMDKwEsSzNw=";
   };
 
diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix
index 91488f0a76c8..2620a8d0057d 100644
--- a/pkgs/by-name/r0/r0vm/package.nix
+++ b/pkgs/by-name/r0/r0vm/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "risc0";
     repo = "risc0";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jtROtI5/4W2pNvn1ZYR/wQAZmECTr7YxuZGu2Ns9paw=";
   };
 
diff --git a/pkgs/by-name/r1/r128gain/package.nix b/pkgs/by-name/r1/r128gain/package.nix
index f2a164b4cd0c..63b7d312d5bd 100644
--- a/pkgs/by-name/r1/r128gain/package.nix
+++ b/pkgs/by-name/r1/r128gain/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "r128gain";
-    tag = version;
+    rev = version;
     sha256 = "sha256-JyKacDqjIKTNl2GjbJPkgbakF8HR4Jd4czAtOaemDH8=";
   };
 
diff --git a/pkgs/by-name/r2/r2mod_cli/package.nix b/pkgs/by-name/r2/r2mod_cli/package.nix
index 06de7ff490b6..bc8090c09349 100644
--- a/pkgs/by-name/r2/r2mod_cli/package.nix
+++ b/pkgs/by-name/r2/r2mod_cli/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Foldex";
     repo = "r2mod_cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Y9ZffztxfGYiUSphqwhe3rTbnJ/vmGGi1pLml+1tLP8=";
   };
 
diff --git a/pkgs/by-name/r5/r53-ddns/package.nix b/pkgs/by-name/r5/r53-ddns/package.nix
index b2e9e373c54c..548f5c062886 100644
--- a/pkgs/by-name/r5/r53-ddns/package.nix
+++ b/pkgs/by-name/r5/r53-ddns/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fleaz";
     repo = "r53-ddns";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KJAPhSGaC3upWLfo2eeSD3Vit9Blmbol7s8y3f849N4=";
   };
 
diff --git a/pkgs/by-name/ra/ra-multiplex/package.nix b/pkgs/by-name/ra/ra-multiplex/package.nix
index b96031d0ce89..65dfc7fe37a4 100644
--- a/pkgs/by-name/ra/ra-multiplex/package.nix
+++ b/pkgs/by-name/ra/ra-multiplex/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pr2502";
     repo = "ra-multiplex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aBrn9g+MGXLAsOmHqw1Tt6NPFGJTyYv/L9UI/vQU4i8=";
   };
 
diff --git a/pkgs/by-name/ra/rabtap/package.nix b/pkgs/by-name/ra/rabtap/package.nix
index e108575f2ae3..91b312e2bedc 100644
--- a/pkgs/by-name/ra/rabtap/package.nix
+++ b/pkgs/by-name/ra/rabtap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jandelgado";
     repo = "rabtap";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OUpDk6nfVbz/KP7vZeZV2JfbCzh/KcuxG015/uxYuEI=";
   };
 
diff --git a/pkgs/by-name/ra/radeontop/package.nix b/pkgs/by-name/ra/radeontop/package.nix
index 03981f76d316..2f766860a520 100644
--- a/pkgs/by-name/ra/radeontop/package.nix
+++ b/pkgs/by-name/ra/radeontop/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "0kwqddidr45s1blp0h8r8h1dd1p50l516yb6mb4s6zsc827xzgg3";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "radeontop";
     owner = "clbr";
   };
diff --git a/pkgs/by-name/ra/radio-cli/package.nix b/pkgs/by-name/ra/radio-cli/package.nix
index d16fdd635d8a..8b976f7eae84 100644
--- a/pkgs/by-name/ra/radio-cli/package.nix
+++ b/pkgs/by-name/ra/radio-cli/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "margual56";
     repo = "radio-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-De/3tkvHf8dp04A0hug+aCbiXUc+XUYeHWYOiJ/bac0=";
   };
 
diff --git a/pkgs/by-name/ra/radioboat/package.nix b/pkgs/by-name/ra/radioboat/package.nix
index bf2b6d584092..f874642fe91f 100644
--- a/pkgs/by-name/ra/radioboat/package.nix
+++ b/pkgs/by-name/ra/radioboat/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slashformotion";
     repo = "radioboat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4k+WK2Cxu1yBWgvEW9LMD2RGfiY7XDAe0qqph82zvlI=";
   };
 
diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix
index 2c5d1ef8da5d..a746eba72a87 100644
--- a/pkgs/by-name/ra/raffi/package.nix
+++ b/pkgs/by-name/ra/raffi/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "raffi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-97gZZp2taX800Izhya4mYzS4PtCNCBbRnrn6cm1w8zY=";
   };
 
diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix
index eabbbdf14280..1de79c3d1b7f 100644
--- a/pkgs/by-name/ra/rage/package.nix
+++ b/pkgs/by-name/ra/rage/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "str4d";
     repo = "rage";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aZs1iqfpsiMuhxXNqRatpKD99eDBCsWHk4OPpnnaB70=";
   };
 
diff --git a/pkgs/by-name/ra/ragnarwm/package.nix b/pkgs/by-name/ra/ragnarwm/package.nix
index 45fc198c7a59..d177c112bdce 100644
--- a/pkgs/by-name/ra/ragnarwm/package.nix
+++ b/pkgs/by-name/ra/ragnarwm/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cococry";
     repo = "Ragnar";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-OZhIwrKEhTfkw9K8nZIwGZzxXBObseWS92Y+85HmdNs=";
   };
 
diff --git a/pkgs/by-name/ra/raider/package.nix b/pkgs/by-name/ra/raider/package.nix
index 82b42644079b..9283c6b443ae 100644
--- a/pkgs/by-name/ra/raider/package.nix
+++ b/pkgs/by-name/ra/raider/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ADBeveridge";
     repo = "raider";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fOv4Y5kBbZazFNkPrLS3D7LMLLvT/kIYmsCezsl/fxQ=";
   };
 
diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix
index 98b98c6feb79..1fd672670492 100644
--- a/pkgs/by-name/ra/railway/package.nix
+++ b/pkgs/by-name/ra/railway/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o3AWcUKeOBiNsDSDV0XFzQ0rWpj7el4qX6iQKnqMPgg=";
   };
 
diff --git a/pkgs/by-name/ra/rain/package.nix b/pkgs/by-name/ra/rain/package.nix
index a984b5c7abd0..eb1a8ec4d010 100644
--- a/pkgs/by-name/ra/rain/package.nix
+++ b/pkgs/by-name/ra/rain/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws-cloudformation";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0FjJXOmLHM0At0TJdcsYTafgDbw+C37BH11ft+UjEl0=";
   };
 
diff --git a/pkgs/by-name/ra/rakkess/package.nix b/pkgs/by-name/ra/rakkess/package.nix
index 9be89b1255ce..a1a349637ab8 100644
--- a/pkgs/by-name/ra/rakkess/package.nix
+++ b/pkgs/by-name/ra/rakkess/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "corneliusweig";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-igovWWk8GfNmOS/NbZWfv9kox6QLNIbM09jdvA/lL3A=";
   };
   vendorHash = "sha256-lVxJ4wFBhHc8JVpkmqphLYPE9Z8Cr6o+aAHvC1naqyE=";
diff --git a/pkgs/by-name/ra/ramfetch/package.nix b/pkgs/by-name/ra/ramfetch/package.nix
index c35fc126277d..d8d1de5c6678 100644
--- a/pkgs/by-name/ra/ramfetch/package.nix
+++ b/pkgs/by-name/ra/ramfetch/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://codeberg.org/jahway603/ramfetch.git";
-    tag = version;
+    rev = version;
     hash = "sha256-sUreZ6zm+a1N77OZszjnpS4mmo5wL1dhNGVldJCGoag=";
   };
 
diff --git a/pkgs/by-name/ra/ran/package.nix b/pkgs/by-name/ra/ran/package.nix
index 258c93ed98d2..c6216308ebea 100644
--- a/pkgs/by-name/ra/ran/package.nix
+++ b/pkgs/by-name/ra/ran/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "m3ng9i";
     repo = "ran";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iMvUvzr/jaTNdgHQFuoJNJnnkx2XHIUUlrPWyTlreEw=";
   };
 
diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix
index d186689e61f2..de7210b003b3 100644
--- a/pkgs/by-name/ra/rancher/package.nix
+++ b/pkgs/by-name/ra/rancher/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XpNs5D1hO+Vp+Qjoz//U7L9tAE6AwOrh08FE2G7Byv4=";
   };
 
diff --git a/pkgs/by-name/ra/range-v3/package.nix b/pkgs/by-name/ra/range-v3/package.nix
index 70ab1350f385..1b5d5caa8e7a 100644
--- a/pkgs/by-name/ra/range-v3/package.nix
+++ b/pkgs/by-name/ra/range-v3/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ericniebler";
     repo = "range-v3";
-    tag = version;
+    rev = version;
     hash = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU=";
   };
 
diff --git a/pkgs/by-name/ra/rapidyaml/package.nix b/pkgs/by-name/ra/rapidyaml/package.nix
index 315423fda18a..c7ae5e3f024b 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;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5Z1UV8JSgaO4X8+fTEgxD7bzD1igOgiLQMn10c3rCLs=";
   };
 
diff --git a/pkgs/by-name/ra/rar2fs/package.nix b/pkgs/by-name/ra/rar2fs/package.nix
index 34fc8a5a8dc9..4ee0edc640a4 100644
--- a/pkgs/by-name/ra/rar2fs/package.nix
+++ b/pkgs/by-name/ra/rar2fs/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hasse69";
     repo = "rar2fs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-iYlmNtaJZrnsNNNlaoV1Vu6PHrHIr/glhgs3784JCm4=";
   };
 
diff --git a/pkgs/by-name/ra/rar2hashcat/package.nix b/pkgs/by-name/ra/rar2hashcat/package.nix
index ae0dfe3cbcef..fe0d5733e920 100644
--- a/pkgs/by-name/ra/rar2hashcat/package.nix
+++ b/pkgs/by-name/ra/rar2hashcat/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hashstation";
     repo = "rar2hashcat";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-GVh4Gyjn84xAwO7wKXYe2DPnpb8gnxGIMH5Szce+XpY=";
   };
 
diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix
index a33a59a88550..671550c39555 100644
--- a/pkgs/by-name/ra/rare-regex/package.nix
+++ b/pkgs/by-name/ra/rare-regex/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zix99";
     repo = "rare";
-    tag = version;
+    rev = version;
     hash = "sha256-Sc8Ek1JfagqEDZ1Ci2UdqDkKZbQ6klH+uICML/ifO0Q=";
   };
 
diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix
index 76b1e670abd7..dc54feb8c222 100644
--- a/pkgs/by-name/ra/rasm/package.nix
+++ b/pkgs/by-name/ra/rasm/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EdouardBERGE";
     repo = "rasm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gH1YGN8uM4K8JpkV2r7PilAcgv8leswaN+IOgMM0m74=";
   };
 
diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix
index 94359301eb7b..09e8b91d7568 100644
--- a/pkgs/by-name/ra/ratman/package.nix
+++ b/pkgs/by-name/ra/ratman/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "irdest";
     repo = "irdest";
-    tag = version;
+    rev = "${version}";
     sha256 = "sha256-OuKUZSvIUekhbe1LoEFBL8+sU2KLXBsp1JCEEuxkUlk=";
   };
 
diff --git a/pkgs/by-name/ra/ratools/package.nix b/pkgs/by-name/ra/ratools/package.nix
index 0bcaaf397156..9bfb9b38bba6 100644
--- a/pkgs/by-name/ra/ratools/package.nix
+++ b/pkgs/by-name/ra/ratools/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "danrl";
     repo = "ratools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "07m45bn9lzgbfihmxic23wqp73nxg5ihrvkigr450jq6gzvgwawq";
   };
 
diff --git a/pkgs/by-name/ra/ratslap/package.nix b/pkgs/by-name/ra/ratslap/package.nix
index 6d5c9ea453a6..748063896d36 100644
--- a/pkgs/by-name/ra/ratslap/package.nix
+++ b/pkgs/by-name/ra/ratslap/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "krayon";
     repo = "ratslap";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-PO/79tTiO4TBtojrEtkSf5W6zuG+Ml2iJGAtYHDwHEY=";
     leaveDotGit = true;
   };
diff --git a/pkgs/by-name/ra/rauc/package.nix b/pkgs/by-name/ra/rauc/package.nix
index 67360791496b..26448f01cef5 100644
--- a/pkgs/by-name/ra/rauc/package.nix
+++ b/pkgs/by-name/ra/rauc/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rauc";
     repo = "rauc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Vq1dudB8OQveclAIVgiB8jbtp4o2Ga5v61Y6JUjOpbs=";
   };
 
diff --git a/pkgs/by-name/ra/raxml/package.nix b/pkgs/by-name/ra/raxml/package.nix
index e8bb5f32af33..74090f0d1fad 100644
--- a/pkgs/by-name/ra/raxml/package.nix
+++ b/pkgs/by-name/ra/raxml/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stamatak";
     repo = "standard-RAxML";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-w+Eqi0GhVira1H6ZnMNeZGBMzDjiGT7JSFpQEVXONyk=";
   };
 
diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
index 7c83bf2fd62d..b60d1a9d2f63 100644
--- a/pkgs/by-name/ra/raylib/package.nix
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -42,7 +42,7 @@ lib.checkListOfEnum "${pname}: platform"
       src = fetchFromGitHub {
         owner = "raysan5";
         repo = "raylib";
-        tag = finalAttrs.version;
+        rev = finalAttrs.version;
         hash = "sha256-J99i4z4JF7d6mJNuJIB0rHNDhXJ5AEkG0eBvvuBLHrY=";
       };
 
diff --git a/pkgs/by-name/ra/razer-cli/package.nix b/pkgs/by-name/ra/razer-cli/package.nix
index 414fe21bfe88..37bf5eedb65c 100644
--- a/pkgs/by-name/ra/razer-cli/package.nix
+++ b/pkgs/by-name/ra/razer-cli/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lolei";
     repo = "razer-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-p/RcBpkvtqYQ3Ekt0pLvKyi1Vv93oHDd7hqSTu/5CSw=";
   };
 
diff --git a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
index ffe91dc4b441..137be74c7a0d 100644
--- a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
+++ b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RobertBeckebans";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bjjeTdbQDWTibSrIWhCnr6F0Ef17efLgWGQAAwezjUw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/rc/rcon/package.nix b/pkgs/by-name/rc/rcon/package.nix
index 9951884ce993..48fd4373a3f8 100644
--- a/pkgs/by-name/rc/rcon/package.nix
+++ b/pkgs/by-name/rc/rcon/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "n0la";
     repo = "rcon";
-    tag = version;
+    rev = version;
     sha256 = "sha256-bHm6JeWmpg42VZQXikHl+BMx9zimRLBQWemTqOxyLhw=";
   };
 
diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix
index c47780fd4287..f6d630ae31af 100644
--- a/pkgs/by-name/rc/rcp/package.nix
+++ b/pkgs/by-name/rc/rcp/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wykurz";
     repo = "rcp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gFkrUqG3GXPAg9Zqv7Wr3axQ30axYGXw8bo+P1kmSJM=";
   };
 
diff --git a/pkgs/by-name/rd/rdap/package.nix b/pkgs/by-name/rd/rdap/package.nix
index 2d440a0d723b..a5fefe708662 100644
--- a/pkgs/by-name/rd/rdap/package.nix
+++ b/pkgs/by-name/rd/rdap/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openrdap";
     repo = "rdap";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FiaUyhiwKXZ3xnFPmdxb8bpbm5eRRFNDL3duOGDnc/A=";
   };
 
diff --git a/pkgs/by-name/re/re-flex/package.nix b/pkgs/by-name/re/re-flex/package.nix
index 92e7e93010f1..c976c63c2f0b 100644
--- a/pkgs/by-name/re/re-flex/package.nix
+++ b/pkgs/by-name/re/re-flex/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Genivia";
     repo = "RE-flex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oLpgY8m0hwLrTVkUwxVW7O7vr4Hl7Bn+uIQwFEVSfvc=";
   };
 
diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix
index 862bb53ae9d0..278d63702ed2 100644
--- a/pkgs/by-name/re/re2/package.nix
+++ b/pkgs/by-name/re/re2/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "google";
     repo = "re2";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=";
   };
 
diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix
index 8e40aaf15bba..02859a9bc813 100644
--- a/pkgs/by-name/re/re2c/package.nix
+++ b/pkgs/by-name/re/re2c/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skvadrik";
     repo = "re2c";
-    tag = version;
+    rev = version;
     sha256 = "sha256-hp9kwsoSRdel1z1+VWREPQdigI1rQ5GrM5/Z6wpnmE0=";
   };
 
diff --git a/pkgs/by-name/re/react-static/package.nix b/pkgs/by-name/re/react-static/package.nix
index d2d655a76242..bf10eeb9494f 100644
--- a/pkgs/by-name/re/react-static/package.nix
+++ b/pkgs/by-name/re/react-static/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "react-static";
     repo = "react-static";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dlYmD0vgEqWxYf7E0VYstZMAuNDGvQP7xDgHo/wmlUs=";
   };
 
diff --git a/pkgs/by-name/re/readability-cli/package.nix b/pkgs/by-name/re/readability-cli/package.nix
index 24b28714a34f..993e9af5faf0 100644
--- a/pkgs/by-name/re/readability-cli/package.nix
+++ b/pkgs/by-name/re/readability-cli/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitLab {
     owner = "gardenappl";
     repo = "readability-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pvAp3ZJ8/FPhrSMC8B4U1m5zuBNRP/HcsXkrW6QYgSQ=";
   };
 
diff --git a/pkgs/by-name/re/readstat/package.nix b/pkgs/by-name/re/readstat/package.nix
index e0f8b31cdf9b..627788996e82 100644
--- a/pkgs/by-name/re/readstat/package.nix
+++ b/pkgs/by-name/re/readstat/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WizardMac";
     repo = "ReadStat";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-4lRJgZPB2gfaQ9fQKvDDpGhy1eDNT/nT1QmeZlCmCis=";
   };
 
diff --git a/pkgs/by-name/re/realcugan-ncnn-vulkan/package.nix b/pkgs/by-name/re/realcugan-ncnn-vulkan/package.nix
index eaa7d2e679c7..34a5583cfa5d 100644
--- a/pkgs/by-name/re/realcugan-ncnn-vulkan/package.nix
+++ b/pkgs/by-name/re/realcugan-ncnn-vulkan/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nihui";
     repo = "realcugan-ncnn-vulkan";
-    tag = version;
+    rev = version;
     hash = "sha256-P3Y1B8m1+mpFinacwnvBE2vU150jj6Q12IS6QYNRZ6A=";
   };
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix b/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
index 382edf122767..6e0cd13ee84e 100644
--- a/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
+++ b/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xinntao";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-F+NfkAbk8UtAKzsF42ppPF2UGjK/M6iFfBsRRBbCmcI=";
   };
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix
index 2e01287767d2..b32356df4cb7 100644
--- a/pkgs/by-name/re/realm/package.nix
+++ b/pkgs/by-name/re/realm/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zhboner";
     repo = "realm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vkLGfSDRYqvoqyVM/CWGJjpvXXPisEZxUSjLZGjNzno=";
   };
 
diff --git a/pkgs/by-name/re/reason-shell/package.nix b/pkgs/by-name/re/reason-shell/package.nix
index e859f1939c53..9a3dc6692732 100644
--- a/pkgs/by-name/re/reason-shell/package.nix
+++ b/pkgs/by-name/re/reason-shell/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jaywonchung";
     repo = "reason";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oytRquZJgb1sfpZil1bSGwIIvm+5N4mkVmIMzWyzDco=";
   };
 
diff --git a/pkgs/by-name/re/reaverwps-t6x/package.nix b/pkgs/by-name/re/reaverwps-t6x/package.nix
index c7a92436eadd..880d33b773d4 100644
--- a/pkgs/by-name/re/reaverwps-t6x/package.nix
+++ b/pkgs/by-name/re/reaverwps-t6x/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "t6x";
     repo = "reaver-wps-fork-t6x";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7g4ZRkyu0TIOUw68dSPP4RyIRyeq1GgUMYFVSQB8/1I=";
   };
 
diff --git a/pkgs/by-name/re/recapp/package.nix b/pkgs/by-name/re/recapp/package.nix
index 063a4b58241d..0852d24fba54 100644
--- a/pkgs/by-name/re/recapp/package.nix
+++ b/pkgs/by-name/re/recapp/package.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "amikha1lov";
     repo = "RecApp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "08bpfcqgw0lj6j7y5b2i18kffawlzp6pfk4wdpmk29vwmgk9s9yc";
   };
 
diff --git a/pkgs/by-name/re/reco/package.nix b/pkgs/by-name/re/reco/package.nix
index aa386f0a085d..27742087dc43 100644
--- a/pkgs/by-name/re/reco/package.nix
+++ b/pkgs/by-name/re/reco/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ryonakano";
     repo = "reco";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-uZAcZJLQH0MTI4NSJnZvzYPBFVXGBqAhsjVLAVP/ZwI=";
   };
 
diff --git a/pkgs/by-name/re/redhat-official-fonts/package.nix b/pkgs/by-name/re/redhat-official-fonts/package.nix
index a8ad51461a6f..5460860d712c 100644
--- a/pkgs/by-name/re/redhat-official-fonts/package.nix
+++ b/pkgs/by-name/re/redhat-official-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RedHatOfficial";
     repo = "RedHatFont";
-    tag = version;
+    rev = version;
     hash = "sha256-r43KtMIedNitb5Arg8fTGB3hrRZoA8oUHVEL24k4LeQ=";
   };
 
diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix
index 857c22a68f51..cbda55fa8b01 100644
--- a/pkgs/by-name/re/redict/package.nix
+++ b/pkgs/by-name/re/redict/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "redict";
     repo = "redict";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-MY4OWoYQ4a5efqcUTN6lNL/kd1VrJ/OBqKw27cQ5WC8=";
   };
 
diff --git a/pkgs/by-name/re/redir/package.nix b/pkgs/by-name/re/redir/package.nix
index 0fae1d41e116..f69650db085e 100644
--- a/pkgs/by-name/re/redir/package.nix
+++ b/pkgs/by-name/re/redir/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "redir";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "13n401i3q0xwpfgr21y47kgihi057wbh59xlsna8b8zpm973qny1";
   };
 
diff --git a/pkgs/by-name/re/redis-plus-plus/package.nix b/pkgs/by-name/re/redis-plus-plus/package.nix
index cc5d1f21a18b..40cd5a4224e1 100644
--- a/pkgs/by-name/re/redis-plus-plus/package.nix
+++ b/pkgs/by-name/re/redis-plus-plus/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sewenew";
     repo = "redis-plus-plus";
-    tag = version;
+    rev = version;
     sha256 = "sha256-GN+GrV53+JPEbVefH0EXzS1PyGEdQGFcPEctdWOI5uk=";
   };
 
diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix
index 0b6ccf0701e9..2c2f4bd345b6 100644
--- a/pkgs/by-name/re/redisinsight/package.nix
+++ b/pkgs/by-name/re/redisinsight/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "RedisInsight";
     repo = "RedisInsight";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ek0Fp8v6j+mZPK2cEuFNrBgInXdYIKBBUg0UD1I51Sg=";
   };
 
diff --git a/pkgs/by-name/re/redka/package.nix b/pkgs/by-name/re/redka/package.nix
index ca9743af403e..339353d9470f 100644
--- a/pkgs/by-name/re/redka/package.nix
+++ b/pkgs/by-name/re/redka/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nalgeon";
     repo = "redka";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CCTPhcarLFs2wyhu7OqifunVSil2QU61JViY3uTjVg8=";
   };
 
diff --git a/pkgs/by-name/re/redo-c/package.nix b/pkgs/by-name/re/redo-c/package.nix
index 033cd15d4841..4ec7c4de6195 100644
--- a/pkgs/by-name/re/redo-c/package.nix
+++ b/pkgs/by-name/re/redo-c/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "redo-c";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oZcaBgESIaD7/SUBE7luh7axucKTEzXPVkQAQs2NCXE=";
   };
 
diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index 7fcac9d5688f..0bb772f90eaf 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -11,7 +11,7 @@ let
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7ufF1OXFtT+OZY6UiDDiaohe4witVPEaO9zZaM6wldA=";
   };
 in
diff --git a/pkgs/by-name/re/reflex/package.nix b/pkgs/by-name/re/reflex/package.nix
index e11445dce5a5..36c9487c6516 100644
--- a/pkgs/by-name/re/reflex/package.nix
+++ b/pkgs/by-name/re/reflex/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cespare";
     repo = "reflex";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/2qVm2xpSFVspA16rkiIw/qckxzXQp/1EGOl0f9KljY=";
   };
 
diff --git a/pkgs/by-name/re/refmt/package.nix b/pkgs/by-name/re/refmt/package.nix
index bae52c4b5c91..74ae4397f4f5 100644
--- a/pkgs/by-name/re/refmt/package.nix
+++ b/pkgs/by-name/re/refmt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rjeczalik";
     repo = "refmt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HiAWSR2S+3OcIgwdQ0ltW37lcG+OHkDRDUF07rfNcJY=";
   };
 
diff --git a/pkgs/by-name/re/reg/package.nix b/pkgs/by-name/re/reg/package.nix
index 84cd27e73b9d..9669e621aab0 100644
--- a/pkgs/by-name/re/reg/package.nix
+++ b/pkgs/by-name/re/reg/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "genuinetools";
     repo = "reg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tfBetjoJkr84XLEEcfdRTtc0UZ4m/uRH1Fpr91lQn8o=";
   };
 
diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix
index 99e95230a2f0..e29b786008b2 100644
--- a/pkgs/by-name/re/regal/package.nix
+++ b/pkgs/by-name/re/regal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "StyraInc";
     repo = "regal";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fO/hZw5aoDshemK0vmlwUJiSqGQ2peF5egT40029aAg=";
   };
 
diff --git a/pkgs/by-name/re/regex2json/package.nix b/pkgs/by-name/re/regex2json/package.nix
index 263d6ccf576f..c9f56908963e 100644
--- a/pkgs/by-name/re/regex2json/package.nix
+++ b/pkgs/by-name/re/regex2json/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "tozd";
     repo = "regex2json";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WoxrwAH2ocDuwRj52QHPN3sOMXIF3ygzKeb83BKZqKo=";
   };
 
diff --git a/pkgs/by-name/re/regexploit/package.nix b/pkgs/by-name/re/regexploit/package.nix
index 53f4d355d901..0ed524edd4fa 100644
--- a/pkgs/by-name/re/regexploit/package.nix
+++ b/pkgs/by-name/re/regexploit/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "doyensec";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0z3fghsyw0ll36in7ihc0qi3gy7mqi6cw1mi8m8c8xb1nlwpfr0y";
   };
 
diff --git a/pkgs/by-name/re/regextester/package.nix b/pkgs/by-name/re/regextester/package.nix
index 6b4f9ef72480..8ca42ead79a6 100644
--- a/pkgs/by-name/re/regextester/package.nix
+++ b/pkgs/by-name/re/regextester/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "artemanufrij";
     repo = "regextester";
-    tag = version;
+    rev = version;
     hash = "sha256-5+gU8DeB99w2h/4vMal2eHkR0305dmRYiY6fsLZzlnc=";
   };
 
diff --git a/pkgs/by-name/re/regols/package.nix b/pkgs/by-name/re/regols/package.nix
index 5a903eb87182..847162030ed3 100644
--- a/pkgs/by-name/re/regols/package.nix
+++ b/pkgs/by-name/re/regols/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kitagry";
     repo = "regols";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1L9ehqTMN9KHlvE7FBccVAXA7f3NNsLXJaTkOChT8Xo=";
   };
 
diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix
index f3246bbb3e8b..8f6d56e3a3fa 100644
--- a/pkgs/by-name/re/rehex/package.nix
+++ b/pkgs/by-name/re/rehex/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "solemnwarning";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-RlYpg3aon1d25n8K/bbHGVLn5/iOOUSlvjT8U0fp9hA=";
   };
 
diff --git a/pkgs/by-name/re/relic/package.nix b/pkgs/by-name/re/relic/package.nix
index 2ccfc2803e1b..2231b6441e87 100644
--- a/pkgs/by-name/re/relic/package.nix
+++ b/pkgs/by-name/re/relic/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sassoftware";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dXvKbuAJCL+H0Gh0ZF1VvtY+7cgjq7gs8zwtenI3JuI=";
   };
 
diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix
index 282dcaa45ca6..c5b323466b81 100644
--- a/pkgs/by-name/re/remind/package.nix
+++ b/pkgs/by-name/re/remind/package.nix
@@ -22,7 +22,7 @@ tcl.mkTclDerivation rec {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
-    tag = version;
+    rev = version;
     hash = "sha256-dMnsMV4DRxXWgev9LCb4wwdnx7A++giCsW7c2cMde9Q=";
   };
 
diff --git a/pkgs/by-name/re/remote-touchpad/package.nix b/pkgs/by-name/re/remote-touchpad/package.nix
index 2442ef43eb53..72c81bd39393 100644
--- a/pkgs/by-name/re/remote-touchpad/package.nix
+++ b/pkgs/by-name/re/remote-touchpad/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "unrud";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UZjbU9Ti5+IjcxIf+LDWlcqxb4kMIwa8zHmZDdZbnw8=";
   };
 
diff --git a/pkgs/by-name/re/rename/package.nix b/pkgs/by-name/re/rename/package.nix
index fc8d386bab22..a14365c764e7 100644
--- a/pkgs/by-name/re/rename/package.nix
+++ b/pkgs/by-name/re/rename/package.nix
@@ -11,7 +11,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "pstray";
     repo = "rename";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "SK6wS3IxjCftuDiiZU27TFnn9GVd137zmzvGH88cNLI=";
   };
   meta = with lib; {
diff --git a/pkgs/by-name/re/renderizer/package.nix b/pkgs/by-name/re/renderizer/package.nix
index 70ba5c814e72..1b3f49fa5d68 100644
--- a/pkgs/by-name/re/renderizer/package.nix
+++ b/pkgs/by-name/re/renderizer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gomatic";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jl98LuEsGN40L9IfybJhLnbzoYP/XpwFVQnjrlmDL9A=";
   };
 
diff --git a/pkgs/by-name/re/rep/package.nix b/pkgs/by-name/re/rep/package.nix
index c3913d1d5195..3af0896b304f 100644
--- a/pkgs/by-name/re/rep/package.nix
+++ b/pkgs/by-name/re/rep/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eraserhd";
     repo = "rep";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "pqmISVm3rYGxRuwKieVpRwXE8ufWnBHEA6h2hrob51s=";
   };
 
diff --git a/pkgs/by-name/re/repgrep/package.nix b/pkgs/by-name/re/repgrep/package.nix
index 97d508f04510..0850105f181c 100644
--- a/pkgs/by-name/re/repgrep/package.nix
+++ b/pkgs/by-name/re/repgrep/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "acheronfail";
     repo = "repgrep";
-    tag = version;
+    rev = version;
     hash = "sha256-Hg6N5ruf6MTf2/jSmDgaNFWnnaSb8ZCQ6hivYAeadfc=";
   };
 
diff --git a/pkgs/by-name/re/replacement/package.nix b/pkgs/by-name/re/replacement/package.nix
index c9741935b56a..0c72e617ff64 100644
--- a/pkgs/by-name/re/replacement/package.nix
+++ b/pkgs/by-name/re/replacement/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "siriobalmelli";
     repo = "replacement";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0j4lvn3rx1kqvxcsd8nhc2lgk48jyyl7qffhlkvakhy60f9lymj3";
   };
 
diff --git a/pkgs/by-name/re/repro-get/package.nix b/pkgs/by-name/re/repro-get/package.nix
index 5a0477f9063f..e3f94b5374ee 100644
--- a/pkgs/by-name/re/repro-get/package.nix
+++ b/pkgs/by-name/re/repro-get/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "reproducible-containers";
     repo = "repro-get";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qLu9SZuHCkKAOhzrBPEEev1iD5mcIBvrbXspHtifsq4=";
   };
 
diff --git a/pkgs/by-name/re/reproc/package.nix b/pkgs/by-name/re/reproc/package.nix
index a8d0d8ccfd06..d00a691ff636 100644
--- a/pkgs/by-name/re/reproc/package.nix
+++ b/pkgs/by-name/re/reproc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DaanDeMeyer";
     repo = "reproc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LWzBeKhE7cSiZsK8xWzoTdrOcPiU/zEkmi40WiFytic=";
   };
 
diff --git a/pkgs/by-name/re/reredirect/package.nix b/pkgs/by-name/re/reredirect/package.nix
index c3245002d27f..afe82bddc0a2 100644
--- a/pkgs/by-name/re/reredirect/package.nix
+++ b/pkgs/by-name/re/reredirect/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jerome-pouiller";
     repo = "reredirect";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-RHRamDo7afnJ4DlOVAqM8lQAC60YESGSMKa8Io2vcX0=";
   };
 
diff --git a/pkgs/by-name/re/rescrobbled/package.nix b/pkgs/by-name/re/rescrobbled/package.nix
index 760d7f3e1768..59914fbb785c 100644
--- a/pkgs/by-name/re/rescrobbled/package.nix
+++ b/pkgs/by-name/re/rescrobbled/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "InputUsername";
     repo = "rescrobbled";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1E+SeKjHCah+IFn2QLAyyv7jgEcZ1gtkh8iHgiVBuz4=";
   };
 
diff --git a/pkgs/by-name/re/resgate/package.nix b/pkgs/by-name/re/resgate/package.nix
index 7d5e95c5efdc..160c7b42d8c6 100644
--- a/pkgs/by-name/re/resgate/package.nix
+++ b/pkgs/by-name/re/resgate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "resgateio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HQgBWH6dqfmAfKMezUjPbwXif8bqAClns589la2lBVA=";
   };
 
diff --git a/pkgs/by-name/re/restic-browser/package.nix b/pkgs/by-name/re/restic-browser/package.nix
index 4bca9c39d9e7..0333ab8f71b3 100644
--- a/pkgs/by-name/re/restic-browser/package.nix
+++ b/pkgs/by-name/re/restic-browser/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "emuell";
     repo = "restic-browser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-magf19hA5PVAZafRcQXFaAD50qGofztpiluVc2aCeOk=";
   };
 
diff --git a/pkgs/by-name/re/restls/package.nix b/pkgs/by-name/re/restls/package.nix
index f53262b27c6b..ab12a55c7004 100644
--- a/pkgs/by-name/re/restls/package.nix
+++ b/pkgs/by-name/re/restls/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "3andne";
     repo = "restls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nlQdBwxHVbpOmb9Wq+ap2i4KI1zJYT3SEqvedDbVH8Q=";
   };
 
diff --git a/pkgs/by-name/re/restman/package.nix b/pkgs/by-name/re/restman/package.nix
index 699c80cf4215..e36aa81cf31c 100644
--- a/pkgs/by-name/re/restman/package.nix
+++ b/pkgs/by-name/re/restman/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "restman";
     owner = "jackMort";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KN3iahDdPSHPnGEacsmaVMRNI3mV9qrH3HyJOTtB2hA=";
   };
 
diff --git a/pkgs/by-name/re/restream/package.nix b/pkgs/by-name/re/restream/package.nix
index f88582e32167..80587208efc2 100644
--- a/pkgs/by-name/re/restream/package.nix
+++ b/pkgs/by-name/re/restream/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rien";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AXHKOfdIM3LsHF6u3M/lMhhcuPZADoEal7de3zlx7L4=";
   };
 
diff --git a/pkgs/by-name/re/resumed/package.nix b/pkgs/by-name/re/resumed/package.nix
index c10e08d8f027..bc1d5ade1ed9 100644
--- a/pkgs/by-name/re/resumed/package.nix
+++ b/pkgs/by-name/re/resumed/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "rbardini";
     repo = "resumed";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kDv6kOVY8IfztmLeby2NgB5q0DtP1ajMselvr1EDQJ8=";
   };
 
diff --git a/pkgs/by-name/re/resvg/package.nix b/pkgs/by-name/re/resvg/package.nix
index e0efa948b5fc..b41cbefbecc8 100644
--- a/pkgs/by-name/re/resvg/package.nix
+++ b/pkgs/by-name/re/resvg/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "RazrFalcon";
     repo = "resvg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XjWkzTdsnQZfBjf61dgGt/a7973ZljJG1rnCk0iGk6Y=";
   };
 
diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix
index 0a1bbf6dce33..92825492acc3 100644
--- a/pkgs/by-name/re/retroarch-bare/package.nix
+++ b/pkgs/by-name/re/retroarch-bare/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     owner = "libretro";
     repo = "RetroArch";
     hash = "sha256-ER90i0BlHC8SXfz6DzoIPCP1G8n4NNyJcRE88YY0gXk=";
-    tag = "v${version}";
+    rev = "v${version}";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix b/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix
index 1b936ae4e415..e72bde6a8e91 100644
--- a/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix
+++ b/pkgs/by-name/re/retroarch-joypad-autoconfig/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "retroarch-joypad-autoconfig";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TdNyQOMLBgwpeYDE8qrRrIMUYcagiBJ02rSVU4Ycn1o=";
   };
 
diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix
index 7844e57cf346..f0744008502c 100644
--- a/pkgs/by-name/re/retrospy/package.nix
+++ b/pkgs/by-name/re/retrospy/package.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "retrospy";
     repo = "RetroSpy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QoZcKFVjd0qYQ+Ds4Y/JKBPiL+z83wxm0ktuETX5ZPU=";
   };
 
diff --git a/pkgs/by-name/re/reveal-md/package.nix b/pkgs/by-name/re/reveal-md/package.nix
index 350f466d1f03..1489e1fe9b70 100644
--- a/pkgs/by-name/re/reveal-md/package.nix
+++ b/pkgs/by-name/re/reveal-md/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "webpro";
     repo = "reveal-md";
-    tag = version;
+    rev = version;
     hash = "sha256-5lYC4v+Jvm1OdWrkU/cn1I1jd0B1C+AvACCiGUBv+h0=";
   };
 
diff --git a/pkgs/by-name/re/reviewdog/package.nix b/pkgs/by-name/re/reviewdog/package.nix
index 3c58b041bafd..099ee1949cb1 100644
--- a/pkgs/by-name/re/reviewdog/package.nix
+++ b/pkgs/by-name/re/reviewdog/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B0gu6vhbnhMx2CNQzQlIIwsycBup6bnmAk/1C6F/AWE=";
   };
 
diff --git a/pkgs/by-name/re/revive/package.nix b/pkgs/by-name/re/revive/package.nix
index 7e8b5aabf37c..ae8df4a81188 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 = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lu5zbZXTaLJ5m2sVOG1Y7I/bbJ7kwqbfL1ebwPJ+C0o=";
     # 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/re/rewrk/package.nix b/pkgs/by-name/re/rewrk/package.nix
index a59e1c4d849d..5e87c9104bea 100644
--- a/pkgs/by-name/re/rewrk/package.nix
+++ b/pkgs/by-name/re/rewrk/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lnx-search";
     repo = "rewrk";
-    tag = version;
+    rev = version;
     hash = "sha256-Bqr5kmIIx+12hW4jpINcv0GBJBbMAkd4di/hZSXlT18=";
   };
 
diff --git a/pkgs/by-name/rf/rfc/package.nix b/pkgs/by-name/rf/rfc/package.nix
index da71094653cc..815dbc08d4d3 100644
--- a/pkgs/by-name/rf/rfc/package.nix
+++ b/pkgs/by-name/rf/rfc/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bfontaine";
     repo = "rfc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bCqgLkbZGQFcxhLwekVw+rUGinXTc7QJHlVRGtNf6Jc=";
   };
 
diff --git a/pkgs/by-name/rg/rgbds/package.nix b/pkgs/by-name/rg/rgbds/package.nix
index 8165827af3eb..b46ac38954f1 100644
--- a/pkgs/by-name/rg/rgbds/package.nix
+++ b/pkgs/by-name/rg/rgbds/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gbdev";
     repo = "rgbds";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Rv2ylZavLy+G4XFLBdNGjk78hSb8cDoX9lW1l2TRmtk=";
   };
   nativeBuildInputs = [
diff --git a/pkgs/by-name/rh/rhack/package.nix b/pkgs/by-name/rh/rhack/package.nix
index 7151ae205ce1..10b5c2753f9b 100644
--- a/pkgs/by-name/rh/rhack/package.nix
+++ b/pkgs/by-name/rh/rhack/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nakabonne";
     repo = "rhack";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "088ynf65szaa86pxwwasn3wwi00z5pn7i8w9gh5dyn983z4d8237";
   };
 
diff --git a/pkgs/by-name/rh/rhai-doc/package.nix b/pkgs/by-name/rh/rhai-doc/package.nix
index 44544714ed32..aa8793f859ee 100644
--- a/pkgs/by-name/rh/rhai-doc/package.nix
+++ b/pkgs/by-name/rh/rhai-doc/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rhaiscript";
     repo = "rhai-doc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GZq5C8Q95OHKftEkps4Y6X6sAc4pzSfSq3ELUW/kPWI=";
   };
 
diff --git a/pkgs/by-name/rh/rhash/package.nix b/pkgs/by-name/rh/rhash/package.nix
index 9f058ee5f825..9daddbfce993 100644
--- a/pkgs/by-name/rh/rhash/package.nix
+++ b/pkgs/by-name/rh/rhash/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rhash";
     repo = "RHash";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3CW41ULdXoID4cOgrcG2j85tgIJ/sz5hU7A83qpuxf4=";
   };
 
diff --git a/pkgs/by-name/rh/rhoas/package.nix b/pkgs/by-name/rh/rhoas/package.nix
index 9ac00d9eccb4..304f15e412f1 100644
--- a/pkgs/by-name/rh/rhoas/package.nix
+++ b/pkgs/by-name/rh/rhoas/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "app-services-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9fydRgp2u1LWf0lEDMi1OxxFURd14oKCBDKACqrgWII=";
   };
 
diff --git a/pkgs/by-name/rh/rhodium-libre/package.nix b/pkgs/by-name/rh/rhodium-libre/package.nix
index 184b5d9ce678..ea6c6d893507 100644
--- a/pkgs/by-name/rh/rhodium-libre/package.nix
+++ b/pkgs/by-name/rh/rhodium-libre/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DunwichType";
     repo = "RhodiumLibre";
-    tag = version;
+    rev = version;
     hash = "sha256-YCQvUdjEAj4G71WCRCM0+NwiqRqwt1Ggeg9jb/oWEsY=";
   };
 
diff --git a/pkgs/by-name/rh/rhvoice/package.nix b/pkgs/by-name/rh/rhvoice/package.nix
index c96dfd2467cb..50aade08446c 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";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-bkKEEtKF9ULEJ0sAGgWlxpIq4SbFLBSGbmThvvOLO5w=";
   };
diff --git a/pkgs/by-name/ri/richgo/package.nix b/pkgs/by-name/ri/richgo/package.nix
index ada43084b7e4..04e4a6b689b7 100644
--- a/pkgs/by-name/ri/richgo/package.nix
+++ b/pkgs/by-name/ri/richgo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kyoh86";
     repo = "richgo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pOB1exuwGwSxStodKhLLwh1xBvLjopUn0k+sEARdA9g=";
   };
 
diff --git a/pkgs/by-name/ri/rictydiminished-with-firacode/package.nix b/pkgs/by-name/ri/rictydiminished-with-firacode/package.nix
index 2dad3c3a590e..73b0558334bc 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";
-    tag = version;
+    rev = version;
     hash = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix
index 4c27b88d2b89..944baa2255ca 100644
--- a/pkgs/by-name/ri/riff/package.nix
+++ b/pkgs/by-name/ri/riff/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "riff";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ThHkEvu+lWojHmEgcrwdZDPROfxznB7vv78msyZf90A=";
   };
 
diff --git a/pkgs/by-name/ri/riko4/package.nix b/pkgs/by-name/ri/riko4/package.nix
index c029d8d1c0c5..047c28aef0ad 100644
--- a/pkgs/by-name/ri/riko4/package.nix
+++ b/pkgs/by-name/ri/riko4/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "incinirate";
     repo = "Riko4";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "008i9991sn616dji96jfwq6gszrspbx4x7cynxb1cjw66phyy5zp";
   };
 
diff --git a/pkgs/by-name/ri/rime-cli/package.nix b/pkgs/by-name/ri/rime-cli/package.nix
index 501bce616f81..40c08fa5e66f 100644
--- a/pkgs/by-name/ri/rime-cli/package.nix
+++ b/pkgs/by-name/ri/rime-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "puddinging";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CI0Jva7oA/zUGatv+wCdByqbTBNQRw+4clr8IDKX6HQ=";
   };
 
diff --git a/pkgs/by-name/ri/rime-ls/package.nix b/pkgs/by-name/ri/rime-ls/package.nix
index 0deb1e929959..c65b9b63e245 100644
--- a/pkgs/by-name/ri/rime-ls/package.nix
+++ b/pkgs/by-name/ri/rime-ls/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wlh320";
     repo = "rime-ls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bVpFE25Maady0oyrwWf2l7FCW/VHN6mJsnEefmStxIU=";
   };
 
diff --git a/pkgs/by-name/ri/rinetd/package.nix b/pkgs/by-name/ri/rinetd/package.nix
index 0fc3068a56ac..8e90ce6628b8 100644
--- a/pkgs/by-name/ri/rinetd/package.nix
+++ b/pkgs/by-name/ri/rinetd/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "samhocevar";
     repo = "rinetd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W8PLGd3RwmBTh1kw3k8+ZfP6AzRhZORCkxZzQ9ZbPN4=";
   };
 
diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index 864a848a0cd6..2a8edcb85d0a 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "raphamorim";
     repo = "rio";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NAg8Hm90CxRt3rthFas8IyAjc1oj/PSRjjG/5R68CD8=";
   };
 
diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix
index 53cbee33780c..d7da56c59c7c 100644
--- a/pkgs/by-name/ri/rip2/package.nix
+++ b/pkgs/by-name/ri/rip2/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MilesCranmer";
     repo = "rip2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bwIvjpZgX95Vg14sU6JmYuWNHP38ZBM98ii/Rze+lqA=";
   };
 
diff --git a/pkgs/by-name/ri/ripdrag/package.nix b/pkgs/by-name/ri/ripdrag/package.nix
index 97ce3eb23075..88634d3fb09a 100644
--- a/pkgs/by-name/ri/ripdrag/package.nix
+++ b/pkgs/by-name/ri/ripdrag/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nik012003";
     repo = "ripdrag";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aK/1f56sHspohbYO0z2Hf1NDJsN8Dbf1NoL/QadbVSY=";
   };
 
diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index e87b804f97a6..4e4bd6f102cb 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
-    tag = version;
+    rev = version;
     hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
   };
 
diff --git a/pkgs/by-name/ri/ripsecrets/package.nix b/pkgs/by-name/ri/ripsecrets/package.nix
index c3060d3c80f9..f9c77fe673de 100644
--- a/pkgs/by-name/ri/ripsecrets/package.nix
+++ b/pkgs/by-name/ri/ripsecrets/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sirwart";
     repo = "ripsecrets";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lmahS/0W5075vdPfj4QnX7ZvrxHi986/92PRrplFblg=";
   };
 
diff --git a/pkgs/by-name/ri/ripser/package.nix b/pkgs/by-name/ri/ripser/package.nix
index 74dcdd51681e..204f8a0f0244 100644
--- a/pkgs/by-name/ri/ripser/package.nix
+++ b/pkgs/by-name/ri/ripser/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Ripser";
     repo = "ripser";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BxmkPQ/nl5cF+xwQMTjXnLgkLgdmT/39y7Kzl2wDfpE=";
   };
 
diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix
index f3c12a754f50..a92406128c93 100644
--- a/pkgs/by-name/ri/ripunzip/package.nix
+++ b/pkgs/by-name/ri/ripunzip/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "ripunzip";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Y4p3CFE8MyEQJ/af0g2/EL4kto/VZABvD5OS0rRuo8g=";
   };
 
diff --git a/pkgs/by-name/ri/risor/package.nix b/pkgs/by-name/ri/risor/package.nix
index 81d12b94fdae..050d80621860 100644
--- a/pkgs/by-name/ri/risor/package.nix
+++ b/pkgs/by-name/ri/risor/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "risor-io";
     repo = "risor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QtYqepNH+c0WDGKTLtMz/VUz0oDOgCbwe4D9I4wal5s=";
   };
 
diff --git a/pkgs/by-name/ri/river-bsp-layout/package.nix b/pkgs/by-name/ri/river-bsp-layout/package.nix
index 90f213dd43db..88772a7075bc 100644
--- a/pkgs/by-name/ri/river-bsp-layout/package.nix
+++ b/pkgs/by-name/ri/river-bsp-layout/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "areif-dev";
     repo = "river-bsp-layout";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/R9v3NGsSG4JJtdk0sJX7ahRolRmJMwMP48JRmLffXc=";
   };
 
diff --git a/pkgs/by-name/ri/river-filtile/package.nix b/pkgs/by-name/ri/river-filtile/package.nix
index de024ac2863d..daffc075e6e8 100644
--- a/pkgs/by-name/ri/river-filtile/package.nix
+++ b/pkgs/by-name/ri/river-filtile/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pkulak";
     repo = "filtile";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wBU4CX6KGnTvrBsXvFAlRrvDqvHHbAlVkDqTCJx90G8=";
   };
 
diff --git a/pkgs/by-name/ri/river-luatile/package.nix b/pkgs/by-name/ri/river-luatile/package.nix
index 2ec609ef818c..41b382c58203 100644
--- a/pkgs/by-name/ri/river-luatile/package.nix
+++ b/pkgs/by-name/ri/river-luatile/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MaxVerevkin";
     repo = "river-luatile";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8/qHoNFoGH1nSdTwBkaQk+yyvJtrXADTA39gUAMeSv8=";
   };
 
diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix
index 70dc141f04a7..0994d8527043 100644
--- a/pkgs/by-name/rk/rke/package.nix
+++ b/pkgs/by-name/rk/rke/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rancher";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mTSeUFmkXI9yZ1yeBXzudf2BmLtdmoiTlB/wtn++NAo=";
   };
 
diff --git a/pkgs/by-name/rk/rkrlv2/package.nix b/pkgs/by-name/rk/rkrlv2/package.nix
index 4f8733aecf86..adb25975d7cc 100644
--- a/pkgs/by-name/rk/rkrlv2/package.nix
+++ b/pkgs/by-name/rk/rkrlv2/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ssj71";
     repo = "rkrlv2";
-    tag = version;
+    rev = version;
     sha256 = "WjpPNUEYw4aGrh57J+7kkxKFXgCJWNaWAmueFbNUJJo=";
   };
 
diff --git a/pkgs/by-name/rk/rkvm/package.nix b/pkgs/by-name/rk/rkvm/package.nix
index 597f7bfd03f2..1619646431a8 100644
--- a/pkgs/by-name/rk/rkvm/package.nix
+++ b/pkgs/by-name/rk/rkvm/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "htrefil";
     repo = "rkvm";
-    tag = version;
+    rev = version;
     hash = "sha256-pGCoNmGOeV7ND4kcRjlJZbEMnmKQhlCtyjMoWIwVZrM=";
   };
 
diff --git a/pkgs/by-name/rl/rl_json/package.nix b/pkgs/by-name/rl/rl_json/package.nix
index 58493c3ae2e5..c9c000718135 100644
--- a/pkgs/by-name/rl/rl_json/package.nix
+++ b/pkgs/by-name/rl/rl_json/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "RubyLane";
     repo = "rl_json";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-FkOsdOHPE75bSkKw3cdaech6jAv0f/RJ9tgRVzPSAdA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/rl/rlaunch/package.nix b/pkgs/by-name/rl/rlaunch/package.nix
index 77c47f1de29a..77c3c80cb2cf 100644
--- a/pkgs/by-name/rl/rlaunch/package.nix
+++ b/pkgs/by-name/rl/rlaunch/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PonasKovas";
     repo = "rlaunch";
-    tag = version;
+    rev = version;
     hash = "sha256-PyCR/ob947W+6T56y1se74aNy1avJDb2ELyv2aGf1og=";
   };
 
diff --git a/pkgs/by-name/rl/rlci/package.nix b/pkgs/by-name/rl/rlci/package.nix
index 61d1d58e06fe..ea2378ba6c68 100644
--- a/pkgs/by-name/rl/rlci/package.nix
+++ b/pkgs/by-name/rl/rlci/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orsinium-labs";
     repo = "rlci";
-    tag = version;
+    rev = version;
     hash = "sha256-+Hd1Ymm2LKnHUKoUlfN6D6pwebxgwJQHgqwMHXXtP6Y=";
   };
 
diff --git a/pkgs/by-name/rl/rlottie/package.nix b/pkgs/by-name/rl/rlottie/package.nix
index e68b1502963b..6b4c19bbbddd 100644
--- a/pkgs/by-name/rl/rlottie/package.nix
+++ b/pkgs/by-name/rl/rlottie/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Samsung";
     repo = "rlottie";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3";
   };
 
diff --git a/pkgs/by-name/rl/rlwrap/package.nix b/pkgs/by-name/rl/rlwrap/package.nix
index 503d24a3dcd5..5d465fac3472 100644
--- a/pkgs/by-name/rl/rlwrap/package.nix
+++ b/pkgs/by-name/rl/rlwrap/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hanslub42";
     repo = "rlwrap";
-    tag = version;
+    rev = version;
     sha256 = "sha256-yKJXfdxfaCsmPtI0KmTzfFKY+evUuytomVrLsSCYDGo=";
   };
 
diff --git a/pkgs/by-name/rm/rm-improved/package.nix b/pkgs/by-name/rm/rm-improved/package.nix
index 952fed89de95..ea353c78a134 100644
--- a/pkgs/by-name/rm/rm-improved/package.nix
+++ b/pkgs/by-name/rm/rm-improved/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nivekuil";
     repo = "rip";
-    tag = version;
+    rev = version;
     hash = "sha256-jbXmGPrb9PhmCSUFVcCqg8HjntS2mrYeNuaMsU+zIFI=";
   };
 
diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix
index 12d6a7e76536..44036731dd4c 100644
--- a/pkgs/by-name/rm/rmapi/package.nix
+++ b/pkgs/by-name/rm/rmapi/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ddvk";
     repo = "rmapi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pVmG9XD3AcHDRo1A25QSnPStKPsgku3lWhN47xdYrwE=";
   };
 
diff --git a/pkgs/by-name/rm/rmenu/package.nix b/pkgs/by-name/rm/rmenu/package.nix
index e1b49a152a6a..cd3d3fb2a700 100644
--- a/pkgs/by-name/rm/rmenu/package.nix
+++ b/pkgs/by-name/rm/rmenu/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   version = "1.2.2";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "imgurbot12";
     repo = "rmenu";
     hash = "sha256-khauloUGVuekR+Lran1DLnsxwY8sIf5PsEKY7sNy1K4=";
diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index 196ee25c526b..30a1709b67a5 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ddvk";
     repo = "rmfakecloud";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZsYq1+Bb6SyMGdbiy5UzanDiUiFOt4uhttiPKC0ESis=";
   };
 
diff --git a/pkgs/by-name/rm/rmount/package.nix b/pkgs/by-name/rm/rmount/package.nix
index b92ed0c572d5..30d2d86942e1 100644
--- a/pkgs/by-name/rm/rmount/package.nix
+++ b/pkgs/by-name/rm/rmount/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "1.1.0";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "Luis-Hebendanz";
     repo = "rmount";
     sha256 = "0j1ayncw1nnmgna7vyx44vwinh4ah1b0l5y8agc7i4s8clbvy3h0";
diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix
index b4d166354ec8..f124d38c0dc7 100644
--- a/pkgs/by-name/rm/rmpc/package.nix
+++ b/pkgs/by-name/rm/rmpc/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mierak";
     repo = "rmpc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RfYaWoVGdeE5y/hkRH+gZgnc0Hrp9V+Pttvjcu3Q14g=";
   };
 
diff --git a/pkgs/by-name/rm/rmtrash/package.nix b/pkgs/by-name/rm/rmtrash/package.nix
index a0b96a60fe65..5daa74add128 100644
--- a/pkgs/by-name/rm/rmtrash/package.nix
+++ b/pkgs/by-name/rm/rmtrash/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PhrozenByte";
     repo = "rmtrash";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vCtIM6jAYfrAOopiTcb4M5GNtucVnK0XEEKbMq1Cbc4=";
   };
 
diff --git a/pkgs/by-name/rm/rmw/package.nix b/pkgs/by-name/rm/rmw/package.nix
index 4a4ab2195275..f405ef621d92 100644
--- a/pkgs/by-name/rm/rmw/package.nix
+++ b/pkgs/by-name/rm/rmw/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "theimpossibleastronaut";
     repo = "rmw";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rfJdJHSkusZj/PN74KgV5i36YC0YRZmIfRdvkUNoKEM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/rn/rnd-name/package.nix b/pkgs/by-name/rn/rnd-name/package.nix
index bc2f5eb45cef..9b10a3ca766e 100644
--- a/pkgs/by-name/rn/rnd-name/package.nix
+++ b/pkgs/by-name/rn/rnd-name/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "mrhenry";
     repo = "rnd-name";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o3A7VDH6rpJmCBu8ZPfPllMm1rAN1tNrz2eUyd2Tjjs=";
   };
 
diff --git a/pkgs/by-name/rn/rng-tools/package.nix b/pkgs/by-name/rn/rng-tools/package.nix
index ee269754e927..32127d5a258a 100644
--- a/pkgs/by-name/rn/rng-tools/package.nix
+++ b/pkgs/by-name/rn/rng-tools/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nhorman";
     repo = "rng-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wqJvLvxmNG2nb5P525w25Y8byUUJi24QIHNJomCKeG8=";
   };
 
diff --git a/pkgs/by-name/rn/rnr/package.nix b/pkgs/by-name/rn/rnr/package.nix
index 68a6ef57a372..fef4a0960a48 100644
--- a/pkgs/by-name/rn/rnr/package.nix
+++ b/pkgs/by-name/rn/rnr/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ismaelgv";
     repo = "rnr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-uuM8zh0wFSsySedXmdm8WGGR4HmUc5TCZ6socdztrZI=";
   };
 
diff --git a/pkgs/by-name/ro/robotfindskitten/package.nix b/pkgs/by-name/ro/robotfindskitten/package.nix
index 8e6051a86109..d1a5520c2d50 100644
--- a/pkgs/by-name/ro/robotfindskitten/package.nix
+++ b/pkgs/by-name/ro/robotfindskitten/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "robotfindskitten";
     repo = "robotfindskitten";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-z6//Yfp3BtJAtUdY05m1eKVrTdH19MvK7LZOwX5S1CM=";
   };
 
diff --git a/pkgs/by-name/ro/robustirc-bridge/package.nix b/pkgs/by-name/ro/robustirc-bridge/package.nix
index 15aed6d2f3bb..32907b1894af 100644
--- a/pkgs/by-name/ro/robustirc-bridge/package.nix
+++ b/pkgs/by-name/ro/robustirc-bridge/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "robustirc";
     repo = "bridge";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8SNy3xqVahBuEXCrG21zIggXeahbzJtqtFMxfp+r48g=";
   };
 
diff --git a/pkgs/by-name/ro/roc-toolkit/package.nix b/pkgs/by-name/ro/roc-toolkit/package.nix
index 346792cdc75f..db097741eaff 100644
--- a/pkgs/by-name/ro/roc-toolkit/package.nix
+++ b/pkgs/by-name/ro/roc-toolkit/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "roc-streaming";
     repo = "roc-toolkit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-53irDq803dTg0YqtC1SOXmYNGypSMAEK+9HJ65pR5PA=";
   };
 
diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix
index a3694f79b3af..faec0ef7014e 100644
--- a/pkgs/by-name/ro/rockcraft/package.nix
+++ b/pkgs/by-name/ro/rockcraft/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "rockcraft";
-    tag = version;
+    rev = version;
     hash = "sha256-cgNKMxQrD9/OfmY5YEnpbNDstDdXqc/wdfCb4HvsgNM=";
   };
 
diff --git a/pkgs/by-name/ro/rofi-calc/package.nix b/pkgs/by-name/ro/rofi-calc/package.nix
index 059eeb501c9b..69641e3753a2 100644
--- a/pkgs/by-name/ro/rofi-calc/package.nix
+++ b/pkgs/by-name/ro/rofi-calc/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "rofi-calc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YDij0j/AOl69FlsGfolzv8lI+iQfDmJrXo2duTIoMRA=";
   };
 
diff --git a/pkgs/by-name/ro/rofi-file-browser/package.nix b/pkgs/by-name/ro/rofi-file-browser/package.nix
index 87a0c68619b9..59ba23bdd3ee 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";
-    tag = version;
+    rev = version;
     hash = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ro/rofi-mpd/package.nix b/pkgs/by-name/ro/rofi-mpd/package.nix
index ad84a661bb1c..2756758e349d 100644
--- a/pkgs/by-name/ro/rofi-mpd/package.nix
+++ b/pkgs/by-name/ro/rofi-mpd/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = "Rofi_MPD";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0jabyn6gqh8ychn2a06xws3avz0lqdnx3qvqkavfd2xr6sp2q7lg";
   };
 
diff --git a/pkgs/by-name/ro/rofi-power-menu/package.nix b/pkgs/by-name/ro/rofi-power-menu/package.nix
index 5a9880df2ca8..6746cfdbf4ca 100644
--- a/pkgs/by-name/ro/rofi-power-menu/package.nix
+++ b/pkgs/by-name/ro/rofi-power-menu/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jluttine";
     repo = "rofi-power-menu";
-    tag = version;
+    rev = version;
     sha256 = "sha256-VPCfmCTr6ADNT7MW4jiqLI/lvTjlAu1QrCAugiD0toU=";
   };
 
diff --git a/pkgs/by-name/ro/rofi-systemd/package.nix b/pkgs/by-name/ro/rofi-systemd/package.nix
index 05cff88d6c2e..aa3bb741fabf 100644
--- a/pkgs/by-name/ro/rofi-systemd/package.nix
+++ b/pkgs/by-name/ro/rofi-systemd/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IvanMalison";
     repo = "rofi-systemd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0lgffb6rk1kf91j4j303lzpx8w2g9zy2gk99p8g8pk62a30c5asm";
   };
 
diff --git a/pkgs/by-name/ro/rofi-vpn/package.nix b/pkgs/by-name/ro/rofi-vpn/package.nix
index 561bce6e65ed..28f3dd6ae167 100644
--- a/pkgs/by-name/ro/rofi-vpn/package.nix
+++ b/pkgs/by-name/ro/rofi-vpn/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "DamienCassou";
     repo = "rofi-vpn";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "04jcfb2jy8yyrk4mg68krwh3zb5qcyj1aq1bwk96fhybrq9k2hhp";
   };
 
diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix
index 0d0ce1b1c4f8..20181d00888f 100644
--- a/pkgs/by-name/ro/rojo/package.nix
+++ b/pkgs/by-name/ro/rojo/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rojo-rbx";
     repo = "rojo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5jiqR3gn3X+klcYr1zTEB9omxWwHKQNLKCVXhry1jjY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ro/roogle/package.nix b/pkgs/by-name/ro/roogle/package.nix
index 02a4bdc677ce..1a06c59c55c7 100644
--- a/pkgs/by-name/ro/roogle/package.nix
+++ b/pkgs/by-name/ro/roogle/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hkmatsumoto";
     repo = "roogle";
-    tag = version;
+    rev = version;
     sha256 = "sha256-oeQwRcDn4X/CL+O4APmGv9T19c9oD5tCBRz4K41K1Zg=";
   };
 
diff --git a/pkgs/by-name/ro/roon-tui/package.nix b/pkgs/by-name/ro/roon-tui/package.nix
index 451c721e124f..94b696e2f24d 100644
--- a/pkgs/by-name/ro/roon-tui/package.nix
+++ b/pkgs/by-name/ro/roon-tui/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "TheAppgineer";
     repo = "roon-tui";
-    tag = version;
+    rev = version;
     hash = "sha256-ocPSqj9/xJ2metetn6OY+IEFWysbstPmh2N5Jd8NDPM=";
   };
 
diff --git a/pkgs/by-name/ro/rootlesskit/package.nix b/pkgs/by-name/ro/rootlesskit/package.nix
index 05c1beae1c42..6b2c3e63d8e4 100644
--- a/pkgs/by-name/ro/rootlesskit/package.nix
+++ b/pkgs/by-name/ro/rootlesskit/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rootless-containers";
     repo = "rootlesskit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9jQNFjxMLjGa9m2gxmoauzLHqhljltEO/ZNsBjWjgtw=";
   };
 
diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix
index 7f72b8aae97d..6ec021b53ee6 100644
--- a/pkgs/by-name/ro/rosa/package.nix
+++ b/pkgs/by-name/ro/rosa/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openshift";
     repo = "rosa";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bImuMrrXssKEh4VvSMy4iuK61GJ+Pltt6Ksir1Bx1as=";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/ro/roslyn/package.nix b/pkgs/by-name/ro/roslyn/package.nix
index 5b8076ed57c6..4404f1ef0618 100644
--- a/pkgs/by-name/ro/roslyn/package.nix
+++ b/pkgs/by-name/ro/roslyn/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI=";
   };
 
diff --git a/pkgs/by-name/ro/rospo/package.nix b/pkgs/by-name/ro/rospo/package.nix
index 3361ae60c580..5658c5854d74 100644
--- a/pkgs/by-name/ro/rospo/package.nix
+++ b/pkgs/by-name/ro/rospo/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ferama";
     repo = "rospo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-H6hZbOnX+1P1Ob5fCROQtV+64NiFD9mO3kiaQY63OBM=";
   };
 
diff --git a/pkgs/by-name/ro/roswell/package.nix b/pkgs/by-name/ro/roswell/package.nix
index 86e8bcb7a887..f8f7ec658b09 100644
--- a/pkgs/by-name/ro/roswell/package.nix
+++ b/pkgs/by-name/ro/roswell/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "roswell";
     repo = "roswell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2aYA1AzRPXaM82Sh+dMiQJcOAD0rzwV09VyLy0oS6as=";
   };
 
diff --git a/pkgs/by-name/ro/rotate-backups/package.nix b/pkgs/by-name/ro/rotate-backups/package.nix
index ef8a29656c68..70708d123880 100644
--- a/pkgs/by-name/ro/rotate-backups/package.nix
+++ b/pkgs/by-name/ro/rotate-backups/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-rotate-backups";
-    tag = version;
+    rev = version;
     sha256 = "0r4dyd7hj403rksgp3vh1azp9n4af75r3wq3x39wxcqizpms3vkx";
   };
 
diff --git a/pkgs/by-name/ro/round/package.nix b/pkgs/by-name/ro/round/package.nix
index b620906ace0e..dc55727a2b09 100644
--- a/pkgs/by-name/ro/round/package.nix
+++ b/pkgs/by-name/ro/round/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mingrammer";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vP2q0inU5zNJ/eiAqEzwHSqril8hTtpbpNBiAkeWeSU=";
   };
 
diff --git a/pkgs/by-name/ro/roundup/package.nix b/pkgs/by-name/ro/roundup/package.nix
index 975767cd4292..743b224c07fa 100644
--- a/pkgs/by-name/ro/roundup/package.nix
+++ b/pkgs/by-name/ro/roundup/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bmizerany";
     repo = "roundup";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0nxaqmbv8mdvq9wcaqxk6k5mr31i68jzxf1wxa6pp7xp4prwdc9z";
   };
 
diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix
index 407620f97c77..434491ae88be 100644
--- a/pkgs/by-name/ro/routedns/package.nix
+++ b/pkgs/by-name/ro/routedns/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "folbricht";
     repo = "routedns";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9H/l6EAbrNwD2DnweBqjmcoaJEnTH9BdGn2x/ZC3us4=";
   };
 
diff --git a/pkgs/by-name/ro/router/package.nix b/pkgs/by-name/ro/router/package.nix
index 503e775d577a..91e27409ea46 100644
--- a/pkgs/by-name/ro/router/package.nix
+++ b/pkgs/by-name/ro/router/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "apollographql";
     repo = "router";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4l9nTbtF8hy2x1fdRhmMKcYxTD6wWKXIfihLTWdtm7U=";
   };
 
diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix
index b83f63169f85..c9e5437b32d2 100644
--- a/pkgs/by-name/ro/routinator/package.nix
+++ b/pkgs/by-name/ro/routinator/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-itD9d+EqEdJ2bTJEpHxJCFFS8Mpc7AFQ1JgkNQxncV0=";
   };
 
diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix
index 575d6bbcd19c..4ba97ffc5a7d 100644
--- a/pkgs/by-name/ro/roxterm/package.nix
+++ b/pkgs/by-name/ro/roxterm/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "realh";
     repo = "roxterm";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-IvbAL96tILXgeutoSKhNkxxfLb+d2xgKUuvyGobOTUs=";
   };
 
diff --git a/pkgs/by-name/rp/rpPPPoE/package.nix b/pkgs/by-name/rp/rpPPPoE/package.nix
index 29d638562de1..940ada94fac8 100644
--- a/pkgs/by-name/rp/rpPPPoE/package.nix
+++ b/pkgs/by-name/rp/rpPPPoE/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dfskoll";
     repo = "rp-pppoe";
-    tag = version;
+    rev = version;
     hash = "sha256-2y26FVxVn8sU9/E2yJeJmbhAeOB0Go7EUPMU9H58H6U=";
   };
 
diff --git a/pkgs/by-name/rp/rpcsvc-proto/package.nix b/pkgs/by-name/rp/rpcsvc-proto/package.nix
index c779aacb2cb1..6a4823bd5df2 100644
--- a/pkgs/by-name/rp/rpcsvc-proto/package.nix
+++ b/pkgs/by-name/rp/rpcsvc-proto/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thkukuk";
     repo = "rpcsvc-proto";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DEXzSSmjMeMsr1PoU/ljaY+6b4COUU2Z8MJkGImsgzk=";
   };
 
diff --git a/pkgs/by-name/rp/rpg-cli/package.nix b/pkgs/by-name/rp/rpg-cli/package.nix
index 6113fe3fc6b1..782720a3df5b 100644
--- a/pkgs/by-name/rp/rpg-cli/package.nix
+++ b/pkgs/by-name/rp/rpg-cli/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "facundoolano";
     repo = "rpg-cli";
-    tag = version;
+    rev = version;
     sha256 = "sha256-xNkM8qN9vg/WGRR/96aCQRVjIbSdSs2845l6oE6+tzg=";
   };
 
diff --git a/pkgs/by-name/rp/rpiboot/package.nix b/pkgs/by-name/rp/rpiboot/package.nix
index 373362a2c02c..7f0a68862f7a 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";
-    tag = version;
+    rev = version;
     hash = "sha256-WccnaIUF5M080M4vg5NzBCLpLVcE7ts/oJJE8CLRi8A=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix
index 68f521dcc3c4..c6245e9c1d42 100644
--- a/pkgs/by-name/rq/rq/package.nix
+++ b/pkgs/by-name/rq/rq/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dflemstr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI=";
   };
 
diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix
index cd7291c2da7f..f5205818e20a 100644
--- a/pkgs/by-name/rq/rqbit/package.nix
+++ b/pkgs/by-name/rq/rqbit/package.nix
@@ -17,7 +17,7 @@ let
   src = fetchFromGitHub {
     owner = "ikatson";
     repo = "rqbit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Meztr/UxLgnbd3YwkSW0vy+D2N4mFg2v+T4nBnYiQBI=";
   };
 
diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix
index f8a92c6352e9..590547f8a84a 100644
--- a/pkgs/by-name/rq/rqlite/package.nix
+++ b/pkgs/by-name/rq/rqlite/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rqlite";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mMsQJETeDyENMkCOmKb6TxDp9lYHSQIjaJtbsYzTJMs=";
   };
 
diff --git a/pkgs/by-name/rr/rrdtool/package.nix b/pkgs/by-name/rr/rrdtool/package.nix
index 9cff1e30cb53..1a66700b17d9 100644
--- a/pkgs/by-name/rr/rrdtool/package.nix
+++ b/pkgs/by-name/rr/rrdtool/package.nix
@@ -23,7 +23,7 @@ perl.pkgs.toPerlModule (
     src = fetchFromGitHub {
       owner = "oetiker";
       repo = "rrdtool-1.x";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-CPbSu1mosNlfj2nqiNVH14a5C5njkfvJM8ix3X3aP8E=";
     };
 
diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix
index 366609631719..b94c02c955e2 100644
--- a/pkgs/by-name/rs/rs-tftpd/package.nix
+++ b/pkgs/by-name/rs/rs-tftpd/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "altugbakan";
     repo = "rs-tftpd";
-    tag = version;
+    rev = version;
     hash = "sha256-qazPEzLMIlnqKTayurZgNJ8TLLdB4qNO88tKMoh6VVI=";
   };
 
diff --git a/pkgs/by-name/rs/rsbep/package.nix b/pkgs/by-name/rs/rsbep/package.nix
index 2f951992860c..0327871f807e 100644
--- a/pkgs/by-name/rs/rsbep/package.nix
+++ b/pkgs/by-name/rs/rsbep/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ttsiodras";
     repo = "rsbep-backup";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0is4jgil3wdqbvx9h66xcyzbqy84ndyydnnay2g9k81a4mcz4dns";
   };
 
diff --git a/pkgs/by-name/rs/rsclock/package.nix b/pkgs/by-name/rs/rsclock/package.nix
index d7f97d45c650..2df0891f8a14 100644
--- a/pkgs/by-name/rs/rsclock/package.nix
+++ b/pkgs/by-name/rs/rsclock/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "valebes";
     repo = "rsClock";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-l5750zP90KnB+OIg1WOikQ6OgQZK4iwVvGBN3jegjGc=";
   };
 
diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix
index 862ce2bd9bda..be16f7d71467 100644
--- a/pkgs/by-name/rs/rsgain/package.nix
+++ b/pkgs/by-name/rs/rsgain/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "complexlogic";
     repo = "rsgain";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dqvaPLVpNnbN2W0TOphS7QU6MDh5pxFJoUDGvkat164=";
   };
 
diff --git a/pkgs/by-name/rs/rshijack/package.nix b/pkgs/by-name/rs/rshijack/package.nix
index 1fcda56c7a28..25e3d04a6af0 100644
--- a/pkgs/by-name/rs/rshijack/package.nix
+++ b/pkgs/by-name/rs/rshijack/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "rshijack";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vTbjb0tm6jCP9+QWG5R83v31W6RUgSEv96iR37QdnFo=";
   };
 
diff --git a/pkgs/by-name/rs/rslint/package.nix b/pkgs/by-name/rs/rslint/package.nix
index d944ee8f81a8..becec39bd9b8 100644
--- a/pkgs/by-name/rs/rslint/package.nix
+++ b/pkgs/by-name/rs/rslint/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rslint";
     repo = "rslint";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3DEwi+bhqwP8aMpZYl07GZbe7IecraB3m54lZ5LViVc=";
   };
 
diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix
index 2dd384b228fc..84704aa15f79 100644
--- a/pkgs/by-name/rs/rspamd/package.nix
+++ b/pkgs/by-name/rs/rspamd/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rspamd";
     repo = "rspamd";
-    tag = version;
+    rev = version;
     hash = "sha256-vG52R8jYJlCgQqhA8zbZLMES1UxfxknAVOt87nhcflM=";
   };
 
diff --git a/pkgs/by-name/rs/rss-bridge/package.nix b/pkgs/by-name/rs/rss-bridge/package.nix
index 4e9b5d71b996..c622a937a19d 100644
--- a/pkgs/by-name/rs/rss-bridge/package.nix
+++ b/pkgs/by-name/rs/rss-bridge/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RSS-Bridge";
     repo = "rss-bridge";
-    tag = version;
+    rev = version;
     sha256 = "sha256-b8mBojtNbQ9QSsFT2PTwyHJIOhoOpTxd6c2ldMy/g5g=";
   };
 
diff --git a/pkgs/by-name/rt/rtg-tools/package.nix b/pkgs/by-name/rt/rtg-tools/package.nix
index 99408909df94..3fe57e0e80ae 100644
--- a/pkgs/by-name/rt/rtg-tools/package.nix
+++ b/pkgs/by-name/rt/rtg-tools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RealTimeGenomics";
     repo = "rtg-tools";
-    tag = version;
+    rev = version;
     hash = "sha256-fMrrjrgaGxBVxn6qMq2g0oFv6qtfhZcQlkvv1E9Os6Y=";
   };
 
diff --git a/pkgs/by-name/rt/rtl_433/package.nix b/pkgs/by-name/rt/rtl_433/package.nix
index 99451e9f32cd..6ef7599712ce 100644
--- a/pkgs/by-name/rt/rtl_433/package.nix
+++ b/pkgs/by-name/rt/rtl_433/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "merbanan";
     repo = "rtl_433";
-    tag = version;
+    rev = version;
     hash = "sha256-S0jtcgbpS2NOezZJ0uq1pVj0nsa82F0NRmQD9glILz4=";
   };
 
diff --git a/pkgs/by-name/rt/rtlcss/package.nix b/pkgs/by-name/rt/rtlcss/package.nix
index 1574bb50bdb0..8e39dc0c959d 100644
--- a/pkgs/by-name/rt/rtlcss/package.nix
+++ b/pkgs/by-name/rt/rtlcss/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "MohammadYounes";
     repo = "rtlcss";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KdAf7jzt8o/YEzT/bLCXj546HX0oC90kr44u3p3qv/k=";
   };
 
diff --git a/pkgs/by-name/rt/rtrlib/package.nix b/pkgs/by-name/rt/rtrlib/package.nix
index 85297770860c..33f36a05685d 100644
--- a/pkgs/by-name/rt/rtrlib/package.nix
+++ b/pkgs/by-name/rt/rtrlib/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "rtrlib";
     owner = "rtrlib";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ISb4ojcDvXY/88GbFMrA5V5+SGE6CmE5D+pokDTwotQ=";
   };
 
diff --git a/pkgs/by-name/rt/rtss/package.nix b/pkgs/by-name/rt/rtss/package.nix
index 248dcb61a48e..1e4c1546083c 100644
--- a/pkgs/by-name/rt/rtss/package.nix
+++ b/pkgs/by-name/rt/rtss/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Freaky";
     repo = "rtss";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WeeZsB42/4SlIaWwKvOqWiPNV5p0QOToynI8ozVVxJM=";
   };
 
diff --git a/pkgs/by-name/rt/rttr/package.nix b/pkgs/by-name/rt/rttr/package.nix
index 010a7230ce9c..cc8d057d8651 100644
--- a/pkgs/by-name/rt/rttr/package.nix
+++ b/pkgs/by-name/rt/rttr/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "${pname}org";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1yxad8sj40wi75hny8w6imrsx8wjasjmsipnlq559n4b6kl84ijp";
   };
 
diff --git a/pkgs/by-name/rt/rtz/package.nix b/pkgs/by-name/rt/rtz/package.nix
index a4b6ef5d4da6..51ed10eababb 100644
--- a/pkgs/by-name/rt/rtz/package.nix
+++ b/pkgs/by-name/rt/rtz/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "twitchax";
     repo = "rtz";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-V7N9NFIc/WWxLaahkjdS47Qj8sc3HRdKSkrBqi1ngA8=";
   };
 
diff --git a/pkgs/by-name/ru/ruapu/package.nix b/pkgs/by-name/ru/ruapu/package.nix
index b95d29e0fa2a..4b688ce9fd63 100644
--- a/pkgs/by-name/ru/ruapu/package.nix
+++ b/pkgs/by-name/ru/ruapu/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nihui";
     repo = "ruapu";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-gP2O0KtzArNCU3Sqc7STitO6WkS1536Z4VkA5U1uZuc=";
   };
 
diff --git a/pkgs/by-name/ru/rubyripper/package.nix b/pkgs/by-name/ru/rubyripper/package.nix
index 0258834f9e6a..453f171ae901 100644
--- a/pkgs/by-name/ru/rubyripper/package.nix
+++ b/pkgs/by-name/ru/rubyripper/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bleskodev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1qfwv8bgc9pyfh3d40bvyr9n7sjc2na61481693wwww640lm0f9f";
   };
 
diff --git a/pkgs/by-name/ru/rucksack/package.nix b/pkgs/by-name/ru/rucksack/package.nix
index 9130ddbd77a9..c6d84a6f2961 100644
--- a/pkgs/by-name/ru/rucksack/package.nix
+++ b/pkgs/by-name/ru/rucksack/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrewrk";
     repo = "rucksack";
-    tag = version;
+    rev = version;
     sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv";
   };
 
diff --git a/pkgs/by-name/ru/rucola/package.nix b/pkgs/by-name/ru/rucola/package.nix
index 502471668306..974be5e86620 100644
--- a/pkgs/by-name/ru/rucola/package.nix
+++ b/pkgs/by-name/ru/rucola/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Linus-Mussmaecher";
     repo = "rucola";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vBY6tkzLgZuSU5AqH3uzDwjPl/ayWY0S8uRvlgE/Wmw=";
   };
 
diff --git a/pkgs/by-name/ru/run/package.nix b/pkgs/by-name/ru/run/package.nix
index 79673bb18435..759f97102aca 100644
--- a/pkgs/by-name/ru/run/package.nix
+++ b/pkgs/by-name/ru/run/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TekWizely";
     repo = "run";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-an5AuRJJEM18IssdLLZC/zzPpsVCCtawRQXK/AfzMN0=";
   };
 
diff --git a/pkgs/by-name/ru/runc/package.nix b/pkgs/by-name/ru/runc/package.nix
index f430578f7762..fa8da1fb252c 100644
--- a/pkgs/by-name/ru/runc/package.nix
+++ b/pkgs/by-name/ru/runc/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "runc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-y8TcMyNRkVfmNkumhohBoyiU6GM8/yLXT/CTFPmXlU4=";
   };
 
diff --git a/pkgs/by-name/ru/rund/package.nix b/pkgs/by-name/ru/rund/package.nix
index 6e0089e794c9..7a9590fce685 100644
--- a/pkgs/by-name/ru/rund/package.nix
+++ b/pkgs/by-name/ru/rund/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dragon-lang";
     repo = "rund";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "10x6f1nn294r5qnpacrpcbp348dndz5fv4nz6ih55c61ckpkvgcf";
   };
 
diff --git a/pkgs/by-name/ru/runelite/package.nix b/pkgs/by-name/ru/runelite/package.nix
index f0fd25768078..158cc94fb9ce 100644
--- a/pkgs/by-name/ru/runelite/package.nix
+++ b/pkgs/by-name/ru/runelite/package.nix
@@ -18,7 +18,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "runelite";
     repo = "launcher";
-    tag = version;
+    rev = version;
     hash = "sha256-ckeZ/7rACyZ5j+zzC5hv1NaXTi9q/KvOzMPTDd1crHQ=";
   };
 
diff --git a/pkgs/by-name/ru/runitor/package.nix b/pkgs/by-name/ru/runitor/package.nix
index 90c990d0f886..b5e157aca970 100644
--- a/pkgs/by-name/ru/runitor/package.nix
+++ b/pkgs/by-name/ru/runitor/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bdd";
     repo = "runitor";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9sg+ku3Qh/X/EZ2VCrvIc0pq5iyn4O8RZrO4KpkciAI=";
   };
 
diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix
index a5e299032888..0b19d315d816 100644
--- a/pkgs/by-name/ru/runme/package.nix
+++ b/pkgs/by-name/ru/runme/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "runmedev";
     repo = "runme";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pMYhII+1gMZnabsGi7y82ZDvmxjDJWqhhvWegbQfTC0=";
   };
 
diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix
index 8788570f1437..729193992cae 100644
--- a/pkgs/by-name/ru/runpodctl/package.nix
+++ b/pkgs/by-name/ru/runpodctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "runpod";
     repo = "runpodctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QU2gujECzT5mPkZi6siMO7IZRXNZHS0TchYxnG4Snj8=";
   };
 
diff --git a/pkgs/by-name/ru/runzip/package.nix b/pkgs/by-name/ru/runzip/package.nix
index f9af109ec0e4..fecd659c7563 100644
--- a/pkgs/by-name/ru/runzip/package.nix
+++ b/pkgs/by-name/ru/runzip/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vlm";
     repo = "zip-fix-filename-encoding";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0l5zbb5hswxczigvyal877j0aiq3fc01j3gv88bvy7ikyvw3lc07";
   };
 
diff --git a/pkgs/by-name/ru/ruplacer/package.nix b/pkgs/by-name/ru/ruplacer/package.nix
index be956a1ec5a7..2bade1d3b9ee 100644
--- a/pkgs/by-name/ru/ruplacer/package.nix
+++ b/pkgs/by-name/ru/ruplacer/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "TankerHQ";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Zvbb9pQpxbJZi0qcDU6f2jEgavl9cA7gIYU7NRXZ9fc=";
   };
 
diff --git a/pkgs/by-name/ru/rush-parallel/package.nix b/pkgs/by-name/ru/rush-parallel/package.nix
index fb25f86635b5..96292cbd65b1 100644
--- a/pkgs/by-name/ru/rush-parallel/package.nix
+++ b/pkgs/by-name/ru/rush-parallel/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shenwei356";
     repo = "rush";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IV49d4Xu5QqpgqKH4y+yaOHDhhFQ2s4PuyeWHMawZTQ=";
   };
 
diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
index a99b7103ddb5..4271b93eb79b 100644
--- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
-    tag = version;
+    rev = version;
     hash = "sha256-GLefofvDqIcyZ/S8rcF6cuKoSPJOVkm7TSK23MGT3Kk=";
   };
 
diff --git a/pkgs/by-name/ru/rust-parallel/package.nix b/pkgs/by-name/ru/rust-parallel/package.nix
index 6b5dea4b336d..76ca93565f68 100644
--- a/pkgs/by-name/ru/rust-parallel/package.nix
+++ b/pkgs/by-name/ru/rust-parallel/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aaronriekenberg";
     repo = "rust-parallel";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4f/JE8KWYDdLwx+bCSSbz0Cpfy/g3WIaRzqCvUix4t0=";
   };
 
diff --git a/pkgs/by-name/ru/rust-script/package.nix b/pkgs/by-name/ru/rust-script/package.nix
index 43f4bcbe9255..aecd1ac4f873 100644
--- a/pkgs/by-name/ru/rust-script/package.nix
+++ b/pkgs/by-name/ru/rust-script/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fornwall";
     repo = "rust-script";
-    tag = version;
+    rev = version;
     sha256 = "sha256-uKmQgrbsFIY0XwrO16Urz3L76Gm2SxHW/CpHeCIUinM=";
   };
 
diff --git a/pkgs/by-name/ru/rust-synapse-compress-state/package.nix b/pkgs/by-name/ru/rust-synapse-compress-state/package.nix
index fadcafec3ffe..1503d2522772 100644
--- a/pkgs/by-name/ru/rust-synapse-compress-state/package.nix
+++ b/pkgs/by-name/ru/rust-synapse-compress-state/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "rust-synapse-compress-state";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nNQ/d4FFAvI+UY+XeqExyhngq+k+j5Pkz94ch27aoVM=";
   };
 
diff --git a/pkgs/by-name/ru/rust-traverse/package.nix b/pkgs/by-name/ru/rust-traverse/package.nix
index 855781b002cc..a5d80ba81433 100644
--- a/pkgs/by-name/ru/rust-traverse/package.nix
+++ b/pkgs/by-name/ru/rust-traverse/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dmcg310";
     repo = "Rust-Traverse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OcCWmBNDo4AA5Pk5TQqb8hen9LlHaY09Wrm4BkrU7qA=";
   };
 
diff --git a/pkgs/by-name/ru/rustc-demangle/package.nix b/pkgs/by-name/ru/rustc-demangle/package.nix
index 1def0d5588b4..edb6be2d7321 100644
--- a/pkgs/by-name/ru/rustc-demangle/package.nix
+++ b/pkgs/by-name/ru/rustc-demangle/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alexcrichton";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-elxclyuLmr3N66s+pR4/6OU98k1oXI2wKVJtzWPY8FI=";
   };
 
diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 383718e9f5f8..643945b4e574 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -37,7 +37,7 @@ let
     src = fetchFromGitHub {
       owner = "fzyzcjy";
       repo = "flutter_rust_bridge";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-SbwqWapJbt6+RoqRKi+wkSH1D+Wz7JmnVbfcfKkjt8Q=";
     };
 
diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix
index 030e50831537..9f15d8a80ba0 100644
--- a/pkgs/by-name/ru/rustdesk-server/package.nix
+++ b/pkgs/by-name/ru/rustdesk-server/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk-server";
-    tag = version;
+    rev = version;
     hash = "sha256-5LRMey1cxmjLg1s9RtVwgPjHjwYLSQHa6Tyv7r/XEQs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix
index fcb175727ab9..96cbda420d44 100644
--- a/pkgs/by-name/ru/rusti-cal/package.nix
+++ b/pkgs/by-name/ru/rusti-cal/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "arthurhenrique";
     repo = "rusti-cal";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pdsP2nuJh30BzqIyxSQXak/rceA4hI9jBYy1dDVEIvI=";
   };
 
diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix
index 565aa495baed..5c3f1549df0c 100644
--- a/pkgs/by-name/ru/rustlings/package.nix
+++ b/pkgs/by-name/ru/rustlings/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rustlings";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VdIIcpyoCuid3MECVc9aKeIOUlxGlxcG7znqbqo9pjc=";
   };
 
diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix
index c282540bf12f..a87e24b16802 100644
--- a/pkgs/by-name/ru/rustmission/package.nix
+++ b/pkgs/by-name/ru/rustmission/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "intuis";
     repo = "rustmission";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vQ6MBbzmOBgD1kcF62NmQys737QEN9isvFN7L7mP8mk=";
   };
 
diff --git a/pkgs/by-name/ru/rustypaste-cli/package.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix
index d841bf35d959..a19879a1d41c 100644
--- a/pkgs/by-name/ru/rustypaste-cli/package.nix
+++ b/pkgs/by-name/ru/rustypaste-cli/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "rustypaste-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ziIY/dz/2nwv0S6gUbVsrTXTNkGLh9MRNXnhhVOnCvA=";
   };
 
diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix
index 13e23fd806e8..9548360b2f22 100644
--- a/pkgs/by-name/ru/rustypaste/package.nix
+++ b/pkgs/by-name/ru/rustypaste/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "rustypaste";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Jfi2Q6551g58dfOqtHtWxkbxwYV71f7MIuLB8RbaR94=";
   };
 
diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix
index 5d16735e98a2..b0b5bbf2b2e9 100644
--- a/pkgs/by-name/ru/rustywind/package.nix
+++ b/pkgs/by-name/ru/rustywind/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "avencera";
     repo = "rustywind";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3cLpyY2Ec3XUDUoq4QLyDx8Nr85TOevBkfoReguVGII=";
   };
 
diff --git a/pkgs/by-name/rv/rvvm/package.nix b/pkgs/by-name/rv/rvvm/package.nix
index c5584b9cf22b..2625cd3f5e5a 100644
--- a/pkgs/by-name/rv/rvvm/package.nix
+++ b/pkgs/by-name/rv/rvvm/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LekKit";
     repo = "RVVM";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5nSlKyWDAx0EeKFzzwP5+99XuJz9BHXEF1WNkRMLa9U=";
   };
 
diff --git a/pkgs/by-name/rv/rvz/package.nix b/pkgs/by-name/rv/rvz/package.nix
index 9da4bf8393be..dc66ff233df4 100644
--- a/pkgs/by-name/rv/rvz/package.nix
+++ b/pkgs/by-name/rv/rvz/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bodgit";
     repo = "rvz";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OxU+Pm9OfFuwmmc2+b7eLhN8JR3SB8cjvh9lPS0qJ5Y=";
   };
 
diff --git a/pkgs/by-name/rw/rwc/package.nix b/pkgs/by-name/rw/rwc/package.nix
index 55d6effa5e62..caf6b4401fa5 100644
--- a/pkgs/by-name/rw/rwc/package.nix
+++ b/pkgs/by-name/rw/rwc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "rwc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rB20XKprd8jPwvXYdjIEr3/8ygPGCDAgLKbHfw0EgPk=";
   };
 
diff --git a/pkgs/by-name/rw/rwedid/package.nix b/pkgs/by-name/rw/rwedid/package.nix
index 8cafed081ee5..bc7dc2c04846 100644
--- a/pkgs/by-name/rw/rwedid/package.nix
+++ b/pkgs/by-name/rw/rwedid/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     domain = "codeberg.org";
     owner = "ral";
     repo = "rwedid";
-    tag = version;
+    rev = version;
     hash = "sha256-lbZD/QLCgkD5OQZdn6oCjry9edMcJ+q9qGF7IbY36U4=";
   };
 
diff --git a/pkgs/by-name/rw/rwpspread/package.nix b/pkgs/by-name/rw/rwpspread/package.nix
index 2f0dd3c06bc4..7973c1344761 100644
--- a/pkgs/by-name/rw/rwpspread/package.nix
+++ b/pkgs/by-name/rw/rwpspread/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "0xk1f0";
     repo = "rwpspread";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1i1675OiyleCXcc/uN95kyY7m5ht/rS3UKY7EmuSsrk=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/rx/rx/package.nix b/pkgs/by-name/rx/rx/package.nix
index d91c39c2527d..5a6ee0cbf2c9 100644
--- a/pkgs/by-name/rx/rx/package.nix
+++ b/pkgs/by-name/rx/rx/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cloudhead";
     repo = "rx";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM=";
   };
 
diff --git a/pkgs/by-name/ry/ryokucha/package.nix b/pkgs/by-name/ry/ryokucha/package.nix
index 389612c25c9f..35ab71b0111b 100644
--- a/pkgs/by-name/ry/ryokucha/package.nix
+++ b/pkgs/by-name/ry/ryokucha/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ryonakano";
     repo = "ryokucha";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-bmN8ZiFjUXtWMrZz7BJtO/9TMjcc4d3x8EpFvhvsewY=";
   };
 
diff --git a/pkgs/by-name/ry/ryzenadj/package.nix b/pkgs/by-name/ry/ryzenadj/package.nix
index c95d1c221f05..3f6a9206a24a 100644
--- a/pkgs/by-name/ry/ryzenadj/package.nix
+++ b/pkgs/by-name/ry/ryzenadj/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FlyGoat";
     repo = "RyzenAdj";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VuIrA5UrRqwUta/mrYd+6F4gh/Z65+zzoTXUlRA8wzA=";
   };
 
diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix
index 96a567acd198..4c4a56d5558a 100644
--- a/pkgs/by-name/s2/s2n-tls/package.nix
+++ b/pkgs/by-name/s2/s2n-tls/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "s2n-tls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3eh4+y3XyO2sUfPhkOeF5fKgakFz9f4zLceYqklEYBw=";
   };
 
diff --git a/pkgs/by-name/s2/s2png/package.nix b/pkgs/by-name/s2/s2png/package.nix
index c299b09eab9e..e3b5c6cad0ef 100644
--- a/pkgs/by-name/s2/s2png/package.nix
+++ b/pkgs/by-name/s2/s2png/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dbohdan";
     repo = "s2png";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6";
   };
 
diff --git a/pkgs/by-name/s3/s3backer/package.nix b/pkgs/by-name/s3/s3backer/package.nix
index fe15160848a4..51945c40b108 100644
--- a/pkgs/by-name/s3/s3backer/package.nix
+++ b/pkgs/by-name/s3/s3backer/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "sha256-BttU5wdnifhsFPdNX3yb/l12biskzED72v0Qfxi7FWU=";
-    tag = version;
+    rev = version;
     repo = "s3backer";
     owner = "archiecobbs";
   };
diff --git a/pkgs/by-name/s3/s3scanner/package.nix b/pkgs/by-name/s3/s3scanner/package.nix
index b6c071f8bd8e..96ab22cdfd80 100644
--- a/pkgs/by-name/s3/s3scanner/package.nix
+++ b/pkgs/by-name/s3/s3scanner/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sa7mon";
     repo = "s3scanner";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RS/+m/snJIm8OxCgvh/Bn1u9ghvRgS8tYvy1v1DV02I=";
   };
 
diff --git a/pkgs/by-name/s5/s5/package.nix b/pkgs/by-name/s5/s5/package.nix
index 70115685f561..0a5debe0e087 100644
--- a/pkgs/by-name/s5/s5/package.nix
+++ b/pkgs/by-name/s5/s5/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mvisonneau";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QQMnzDRWdW0awwNx2vqtzrOW9Ua7EmJ9YFznQoK33J0=";
   };
 
diff --git a/pkgs/by-name/s5/s5cmd/package.nix b/pkgs/by-name/s5/s5cmd/package.nix
index f7edfe294408..c89e914ab8b5 100644
--- a/pkgs/by-name/s5/s5cmd/package.nix
+++ b/pkgs/by-name/s5/s5cmd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "peak";
     repo = "s5cmd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+wSVJkXmu+1BzvO1o31jhKZLXeG7y+YkABIZZ1TlK/g=";
   };
 
diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix
index 17ad2446cfe7..5de0077b4a7b 100644
--- a/pkgs/by-name/sa/sabnzbd/package.nix
+++ b/pkgs/by-name/sa/sabnzbd/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sabnzbd";
     repo = "sabnzbd";
-    tag = version;
+    rev = version;
     hash = "sha256-7CR2hn+mXd6eKoFjrapZuB+Fpfi1UWzTQK5DnP2303k=";
   };
 
diff --git a/pkgs/by-name/sa/sacd/package.nix b/pkgs/by-name/sa/sacd/package.nix
index d0fc57ce816e..65d04693b08e 100644
--- a/pkgs/by-name/sa/sacd/package.nix
+++ b/pkgs/by-name/sa/sacd/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Sound-Linux-More";
     repo = "sacd";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "03s7jr75pzqj1xd41rkgbszlgf9zx6vzhd0nizc05wyf0fxq5xif";
   };
 
diff --git a/pkgs/by-name/sa/safe/package.nix b/pkgs/by-name/sa/safe/package.nix
index 2eba6d268e23..70bade379cd7 100644
--- a/pkgs/by-name/sa/safe/package.nix
+++ b/pkgs/by-name/sa/safe/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "starkandwayne";
     repo = "safe";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sg0RyZ5HpYu7M11bNy17Sjxm7C3pkQX3I17edbALuvU=";
   };
 
diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix
index d28facc92d60..31756bdf7d66 100644
--- a/pkgs/by-name/sa/safecloset/package.nix
+++ b/pkgs/by-name/sa/safecloset/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "safecloset";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-buIceYP/dZMDw3tyrzj1bY6+sIIPaVJIVj1L//jZnws=";
   };
 
diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
index 21be0a82d0ae..5cab886dbc58 100644
--- a/pkgs/by-name/sa/sage/sage-src.nix
+++ b/pkgs/by-name/sa/sage/sage-src.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
-    tag = version;
+    rev = version;
     hash = "sha256-ZDYFq2lJXjnADFdX6y7sskaF0rkT5EIcdN8/bs00TlQ=";
   };
 
diff --git a/pkgs/by-name/sa/sage/threejs-sage.nix b/pkgs/by-name/sa/sage/threejs-sage.nix
index 986303e00fd8..bc7230f333ab 100644
--- a/pkgs/by-name/sa/sage/threejs-sage.nix
+++ b/pkgs/by-name/sa/sage/threejs-sage.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "threejs-sage";
-    tag = version;
+    rev = version;
     sha256 = "sha256-xPAPt36Fon3hYQq6SOmGkIyUzAII2LMl10nqYG4UPI0=";
   };
 
diff --git a/pkgs/by-name/sa/sagetex/package.nix b/pkgs/by-name/sa/sagetex/package.nix
index 79a2d83c420d..ed31393e365e 100644
--- a/pkgs/by-name/sa/sagetex/package.nix
+++ b/pkgs/by-name/sa/sagetex/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sagetex";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OfhbXHbGI+DaDHqZCOGiSHJPHjGuT7ZqSEjKweloW38=";
   };
 
diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix
index 64149cad704b..e7bfd4246292 100644
--- a/pkgs/by-name/sa/sagoin/package.nix
+++ b/pkgs/by-name/sa/sagoin/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "figsoda";
     repo = "sagoin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zXYjR9ZFNX2guUSeMN/G77oBIlW3AowFWA4gwID2jQs=";
   };
 
diff --git a/pkgs/by-name/sa/sahel-fonts/package.nix b/pkgs/by-name/sa/sahel-fonts/package.nix
index b2fce908b2e5..30d09d2fa36f 100644
--- a/pkgs/by-name/sa/sahel-fonts/package.nix
+++ b/pkgs/by-name/sa/sahel-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "sahel-font";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-U4tIICXZFK9pk7zdzRwBPIPYFUlYXPSebnItUJUgGJY=";
   };
 
diff --git a/pkgs/by-name/sa/sailsd/package.nix b/pkgs/by-name/sa/sailsd/package.nix
index 822011a4275d..62e2da16fe4c 100644
--- a/pkgs/by-name/sa/sailsd/package.nix
+++ b/pkgs/by-name/sa/sailsd/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sails-simulator";
     repo = "sailsd";
-    tag = version;
+    rev = version;
     sha256 = "1s4nlffp683binbdxwwzbsci61kbjylbcr1jf44sv1h1r5d5js05";
   };
 
diff --git a/pkgs/by-name/sa/saldl/package.nix b/pkgs/by-name/sa/saldl/package.nix
index da519bf29b8d..530cba04b078 100644
--- a/pkgs/by-name/sa/saldl/package.nix
+++ b/pkgs/by-name/sa/saldl/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PAX2MUyBWWU8kGkaeoCJteidgszh7ipwDJbrLXzVsn0=";
   };
 
diff --git a/pkgs/by-name/sa/sambamba/package.nix b/pkgs/by-name/sa/sambamba/package.nix
index 57dee8f5ca56..9cf37daf1606 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3O9bHGpMuCgdR2Wm7Dv1VUjMT1QTn8K1hdwgjvwhFDw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sa/sameboy/package.nix b/pkgs/by-name/sa/sameboy/package.nix
index 9e9d4368fc2d..a2eb80b3c075 100644
--- a/pkgs/by-name/sa/sameboy/package.nix
+++ b/pkgs/by-name/sa/sameboy/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LIJI32";
     repo = "SameBoy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KUvhmORI3hIJFMCW8U2BZYnIwzg7h+GZZA4+U0IPS9E=";
   };
 
diff --git a/pkgs/by-name/sa/samim-fonts/package.nix b/pkgs/by-name/sa/samim-fonts/package.nix
index 63310a7a0f39..b5df4039595f 100644
--- a/pkgs/by-name/sa/samim-fonts/package.nix
+++ b/pkgs/by-name/sa/samim-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "samim-font";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DVBMsNOVAVwzlZ3cDus/3CSsC05bLZalQ2KeueEvwXs=";
   };
 
diff --git a/pkgs/by-name/sa/sampler/package.nix b/pkgs/by-name/sa/sampler/package.nix
index 11c0f7317072..ec2e35728b1c 100644
--- a/pkgs/by-name/sa/sampler/package.nix
+++ b/pkgs/by-name/sa/sampler/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sqshq";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-H7QllAqPp35wHeJ405YSfPX3S4lH0/hdQ8Ja2OGLVtE=";
   };
 
diff --git a/pkgs/by-name/sa/samplicator/package.nix b/pkgs/by-name/sa/samplicator/package.nix
index 89ec80beb2cb..92d0c1cd362a 100644
--- a/pkgs/by-name/sa/samplicator/package.nix
+++ b/pkgs/by-name/sa/samplicator/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sleinen";
     repo = "samplicator";
-    tag = version;
+    rev = version;
     sha256 = "0fv5vldmwd6qrdv2wkk946dk9rn9nrv3c84ldvvqqn1spxfzgirm";
   };
 
diff --git a/pkgs/by-name/sa/samurai/package.nix b/pkgs/by-name/sa/samurai/package.nix
index 4f37087db20e..7f0e9f3c18c7 100644
--- a/pkgs/by-name/sa/samurai/package.nix
+++ b/pkgs/by-name/sa/samurai/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaelforney";
     repo = "samurai";
-    tag = version;
+    rev = version;
     hash = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI=";
   };
 
diff --git a/pkgs/by-name/sa/sane-airscan/package.nix b/pkgs/by-name/sa/sane-airscan/package.nix
index dc506680a86a..69738bf67f6b 100644
--- a/pkgs/by-name/sa/sane-airscan/package.nix
+++ b/pkgs/by-name/sa/sane-airscan/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexpevzner";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-qZ7j76cwJQxGXbgIkV2bYt7puG0lSEw/d6d3fw19TCk=";
   };
 
diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix
index 007a6dacff8c..71d96226cf07 100644
--- a/pkgs/by-name/sa/sanjuuni/package.nix
+++ b/pkgs/by-name/sa/sanjuuni/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MCJack123";
     repo = "sanjuuni";
-    tag = version;
+    rev = version;
     hash = "sha256-wJRPD4OWOTPiyDr9dYseRA7BI942HPfHONVJGTc/+wU=";
   };
 
diff --git a/pkgs/by-name/sa/sanoid/package.nix b/pkgs/by-name/sa/sanoid/package.nix
index b80423c1770f..29c602ef3b39 100644
--- a/pkgs/by-name/sa/sanoid/package.nix
+++ b/pkgs/by-name/sa/sanoid/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jimsalterjrs";
     repo = "sanoid";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qfRGZ10fhLL4tJL97VHrdOkO/4OVpa087AsL9t8LMmk=";
   };
 
diff --git a/pkgs/by-name/sa/sassc/package.nix b/pkgs/by-name/sa/sassc/package.nix
index 9b3d9d18c654..c719bf0efd9a 100644
--- a/pkgs/by-name/sa/sassc/package.nix
+++ b/pkgs/by-name/sa/sassc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sass";
     repo = "sassc";
-    tag = version;
+    rev = version;
     sha256 = "sha256-jcs3+orRqKt9C3c2FTdeaj4H2rBP74lW3HF8CHSm7lQ=";
   };
 
diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix
index 899604a9ea7c..3610ca575654 100644
--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gabm";
     repo = "Satty";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-81WX9GAZ0mPai1/4FrqDGDu6k4OVYrKSJSC/FkPkZmE=";
   };
 
diff --git a/pkgs/by-name/sa/savepagenow/package.nix b/pkgs/by-name/sa/savepagenow/package.nix
index 8f7d33f2730c..3e1dfc256bc9 100644
--- a/pkgs/by-name/sa/savepagenow/package.nix
+++ b/pkgs/by-name/sa/savepagenow/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pastpages";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1lz6rc47cds9rb35jdf8n13gr61wdkh5jqzx4skikm1yrqkwjyhm";
   };
 
diff --git a/pkgs/by-name/sb/sblast/package.nix b/pkgs/by-name/sb/sblast/package.nix
index efabf8fbe156..fa0aa0178359 100644
--- a/pkgs/by-name/sb/sblast/package.nix
+++ b/pkgs/by-name/sb/sblast/package.nix
@@ -16,7 +16,7 @@ let
     src = fetchFromGitHub {
       owner = "ugjka";
       repo = "sblast";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-ICSnLfzBoaax3YKa4LiTBQ4zxgDxttxcN4YVLApFH24=";
     };
 
diff --git a/pkgs/by-name/sb/sbs/package.nix b/pkgs/by-name/sb/sbs/package.nix
index 8ce3a42a5dc9..5e2b33cb6a78 100644
--- a/pkgs/by-name/sb/sbs/package.nix
+++ b/pkgs/by-name/sb/sbs/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "onur-ozkan";
     repo = "sbs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Zgu9W/3LwHF/fyaPlxmV/2LdxilO1tU0JY/esLnJVGY=";
   };
 
diff --git a/pkgs/by-name/sc/sc-im/package.nix b/pkgs/by-name/sc/sc-im/package.nix
index 6b1932e07db6..43bd526db987 100644
--- a/pkgs/by-name/sc/sc-im/package.nix
+++ b/pkgs/by-name/sc/sc-im/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andmarti1424";
     repo = "sc-im";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-nNOifSYbmJjuw6c8TerIQRlhCwbs7GnzD2J7O3vs0gI=";
   };
 
diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix
index d70418df708d..1cf763df8793 100644
--- a/pkgs/by-name/sc/scaleway-cli/package.nix
+++ b/pkgs/by-name/sc/scaleway-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "scaleway";
     repo = "scaleway-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3yte4gNl8uBSHfDp11HH+l3trN+d5YcEYajpruyOrKc=";
   };
 
diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix
index dc6377d7e55e..8300ad167c36 100644
--- a/pkgs/by-name/sc/scalingo/package.nix
+++ b/pkgs/by-name/sc/scalingo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "cli";
-    tag = version;
+    rev = version;
     hash = "sha256-SJFQFOd9m+38TsclIs4FxAl9kejgcUG895qjy4iXKdk=";
   };
 
diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix
index 3a12188e2b79..4eaef65d6cb9 100644
--- a/pkgs/by-name/sc/scalr-cli/package.nix
+++ b/pkgs/by-name/sc/scalr-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Scalr";
     repo = "scalr-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mDcirYhqpfeS2Wt9MnYPmTn/QZa85vlrN2uUkA1+7A4=";
   };
 
diff --git a/pkgs/by-name/sc/scanmem/package.nix b/pkgs/by-name/sc/scanmem/package.nix
index 2c1d36c35764..42f665e2093a 100644
--- a/pkgs/by-name/sc/scanmem/package.nix
+++ b/pkgs/by-name/sc/scanmem/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scanmem";
     repo = "scanmem";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9";
   };
 
diff --git a/pkgs/by-name/sc/scanservjs/package.nix b/pkgs/by-name/sc/scanservjs/package.nix
index 231125cda374..5b80e075398d 100644
--- a/pkgs/by-name/sc/scanservjs/package.nix
+++ b/pkgs/by-name/sc/scanservjs/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "sbs20";
     repo = "scanservjs";
-    # tag = "v${version}";
+    # rev = "v${version}";
     # 2.27.1 doesn't have a tag
     rev = "b15adc6f97fb152fd9819371bb1a9b8118baf55b";
     hash = "sha256-ne9fEF/eurWPXzmJQzBn5jiy+JgxMWiCXsOdmu2fj6E=";
diff --git a/pkgs/by-name/sc/scaphandre/package.nix b/pkgs/by-name/sc/scaphandre/package.nix
index 5863422d2f69..083c1494d914 100644
--- a/pkgs/by-name/sc/scaphandre/package.nix
+++ b/pkgs/by-name/sc/scaphandre/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hubblo-org";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-I+cECdpLoIj4yuWXfirwHlcn0Hkm9NxPqo/EqFiBObw=";
   };
 
diff --git a/pkgs/by-name/sc/scc/package.nix b/pkgs/by-name/sc/scc/package.nix
index 90252d2034fa..2dedc510192b 100644
--- a/pkgs/by-name/sc/scc/package.nix
+++ b/pkgs/by-name/sc/scc/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "boyter";
     repo = "scc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ec3k6NL3zTYvcJo0bR/BqdTu5br4vRZpgrBR6Kj5YxY=";
   };
 
diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix
index 60e15d128da7..f5e89c173587 100644
--- a/pkgs/by-name/sc/sccache/package.nix
+++ b/pkgs/by-name/sc/sccache/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "sccache";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VEDMeRFQKNPS3V6/DhMWxHR7YWsCzAXTzp0lO+COl08=";
   };
 
diff --git a/pkgs/by-name/sc/sccmhunter/package.nix b/pkgs/by-name/sc/sccmhunter/package.nix
index 15f7df41b87d..b47540c07f19 100644
--- a/pkgs/by-name/sc/sccmhunter/package.nix
+++ b/pkgs/by-name/sc/sccmhunter/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "garrettfoster13";
     repo = "sccmhunter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Db+kBLy2ejIKKjCskAE4arppk/sq9qQ3w1nCQmeLYhs=";
   };
 
diff --git a/pkgs/by-name/sc/scenebuilder/package.nix b/pkgs/by-name/sc/scenebuilder/package.nix
index 4e3adf818c22..3dd1354f8c9f 100644
--- a/pkgs/by-name/sc/scenebuilder/package.nix
+++ b/pkgs/by-name/sc/scenebuilder/package.nix
@@ -22,7 +22,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "gluonhq";
     repo = "scenebuilder";
-    tag = version;
+    rev = version;
     hash = "sha256-YEcW1yQK6RKDqSstsrpdOqMt972ZagenGDxcJ/gP+SA=";
   };
 
diff --git a/pkgs/by-name/sc/scenic-view/package.nix b/pkgs/by-name/sc/scenic-view/package.nix
index 67854ac65d3c..1f0b215fcf93 100644
--- a/pkgs/by-name/sc/scenic-view/package.nix
+++ b/pkgs/by-name/sc/scenic-view/package.nix
@@ -22,7 +22,7 @@ let
   src = fetchFromGitHub {
     owner = "JonathanGiles";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1idfh9hxqs4fchr6gvhblhvjqk4mpl4rnpi84vn1l3yb700z7dwy";
   };
 
diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix
index e1a2f8df41b9..7705bd0d0746 100644
--- a/pkgs/by-name/sc/schemamap/package.nix
+++ b/pkgs/by-name/sc/schemamap/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "schemamap";
     repo = "schemamap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YR7Ucd8/Z1hOUNokmfSVP2ZxDL7qLb6SZ86/S7V/GKk=";
   };
 
diff --git a/pkgs/by-name/sc/scheme-bytestructures/package.nix b/pkgs/by-name/sc/scheme-bytestructures/package.nix
index 7cda0a4a58aa..a1d670b79fb2 100644
--- a/pkgs/by-name/sc/scheme-bytestructures/package.nix
+++ b/pkgs/by-name/sc/scheme-bytestructures/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TaylanUB";
     repo = "scheme-bytestructures";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7FK1dXD1Qz6fFYjNUtHMaDGaezHLVaDvdgOboNNw0Lc=";
   };
 
diff --git a/pkgs/by-name/sc/scid/package.nix b/pkgs/by-name/sc/scid/package.nix
index 8883b1e8bec6..ed1d0049b5d3 100644
--- a/pkgs/by-name/sc/scid/package.nix
+++ b/pkgs/by-name/sc/scid/package.nix
@@ -16,7 +16,7 @@ tcl.mkTclDerivation rec {
   src = fetchFromGitHub {
     owner = "benini";
     repo = "scid";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5WGZm7EwhZAMKJKxj/OOIFOJIgPBcc6/Bh4xVAlia4Y=";
   };
 
diff --git a/pkgs/by-name/sc/scion-bootstrapper/package.nix b/pkgs/by-name/sc/scion-bootstrapper/package.nix
index d6efa5fcc825..20e4817ac574 100644
--- a/pkgs/by-name/sc/scion-bootstrapper/package.nix
+++ b/pkgs/by-name/sc/scion-bootstrapper/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "netsec-ethz";
     repo = "bootstrapper";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-X4lNgd6klIw0NW9NVG+d1JK+WNfOclbu43GYucelB7o=";
   };
 
diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix
index 672b865986d6..e06936b59c1c 100644
--- a/pkgs/by-name/sc/scion/package.nix
+++ b/pkgs/by-name/sc/scion/package.nix
@@ -16,7 +16,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "scionproto";
     repo = "scion";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JemqSr1XBwW1hLuWQrApY/hqLj/VpW3xSJedVIoFSiY=";
   };
 
diff --git a/pkgs/by-name/sc/scip-go/package.nix b/pkgs/by-name/sc/scip-go/package.nix
index f7529b350e96..4b6403ba52b9 100644
--- a/pkgs/by-name/sc/scip-go/package.nix
+++ b/pkgs/by-name/sc/scip-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/3+vTz/W1mmI2zlVQLW4wPd66zK7HpFb8VaLFuUPRhk=";
   };
 
diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix
index 81df3c59e3e8..1ddfc127de6d 100644
--- a/pkgs/by-name/sc/scip/package.nix
+++ b/pkgs/by-name/sc/scip/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UXa5lMFenynHRIvA4MOXkjMVd705LBWs372s3MFAc+8=";
   };
 
diff --git a/pkgs/by-name/sc/scmpuff/package.nix b/pkgs/by-name/sc/scmpuff/package.nix
index bff3301e65fc..dabc7226af31 100644
--- a/pkgs/by-name/sc/scmpuff/package.nix
+++ b/pkgs/by-name/sc/scmpuff/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mroth";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+L0W+M8sZdUSCWj9Ftft1gkRRfWMHdxon2xNnotx8Xs=";
   };
 
diff --git a/pkgs/by-name/sc/scons/package.nix b/pkgs/by-name/sc/scons/package.nix
index 2ffa3360dc69..3f5c39877a11 100644
--- a/pkgs/by-name/sc/scons/package.nix
+++ b/pkgs/by-name/sc/scons/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Scons";
     repo = "scons";
-    tag = version;
+    rev = version;
     hash = "sha256-7VzGuz9CAUF6MRCEpj5z1FkZD19/Ic+YBukYQocvkr0=";
   };
 
diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix
index d2be14497bfb..073b1ad207d5 100644
--- a/pkgs/by-name/sc/scooter/package.nix
+++ b/pkgs/by-name/sc/scooter/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "thomasschafer";
     repo = "scooter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wu9SNcd1+JqTkhUghOiRlGP/za/9Md/lgGrwNA2lCJE=";
   };
 
diff --git a/pkgs/by-name/sc/scope-lite/package.nix b/pkgs/by-name/sc/scope-lite/package.nix
index 171bd26e8dc4..130c5704ecab 100644
--- a/pkgs/by-name/sc/scope-lite/package.nix
+++ b/pkgs/by-name/sc/scope-lite/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "martinmoene";
     repo = "scope-lite";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/Vu3blgyEOQRFqhQjuT/6ukV0iWA0TdPrLnt2Z/gd6E=";
   };
 
diff --git a/pkgs/by-name/sc/scout/package.nix b/pkgs/by-name/sc/scout/package.nix
index 117fcc727cd8..e0935322b274 100644
--- a/pkgs/by-name/sc/scout/package.nix
+++ b/pkgs/by-name/sc/scout/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9SimePyBUXXfT4+ZtciQMaoyXpyKi9D3LTwud8QMJ6w=";
   };
 
diff --git a/pkgs/by-name/sc/scream/package.nix b/pkgs/by-name/sc/scream/package.nix
index e845696e4e63..acb863fe0fa3 100644
--- a/pkgs/by-name/sc/scream/package.nix
+++ b/pkgs/by-name/sc/scream/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "duncanthrax";
     repo = "scream";
-    tag = version;
+    rev = version;
     sha256 = "sha256-lP5mdNhZjkEVjgQUEsisPy+KXUqsE6xj6dFWcgD+VGM=";
   };
 
diff --git a/pkgs/by-name/sc/screego/package.nix b/pkgs/by-name/sc/screego/package.nix
index e9d2260cf774..3eaff20baebe 100644
--- a/pkgs/by-name/sc/screego/package.nix
+++ b/pkgs/by-name/sc/screego/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "screego";
     repo = "server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wFLoReqzLx6PEW/u9oz7VIYKtJkmwGTneeB6Ysgse7Q=";
   };
 
diff --git a/pkgs/by-name/sc/screen-message/package.nix b/pkgs/by-name/sc/screen-message/package.nix
index 6d392ce2cb00..2d5eb30aecae 100644
--- a/pkgs/by-name/sc/screen-message/package.nix
+++ b/pkgs/by-name/sc/screen-message/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nomeata";
     repo = "screen-message";
-    tag = version;
+    rev = version;
     hash = "sha256-fwKle+aXZuiNo5ksrigj7BGLv2fUILN2GluHHZ6co6s=";
   };
 
diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix
index 2cdd2627c632..141eca8d82c7 100644
--- a/pkgs/by-name/sc/screen-pipe/package.nix
+++ b/pkgs/by-name/sc/screen-pipe/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "louis030195";
     repo = "screen-pipe";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rWKRCqWFuPO84C52mMrrS4euD6XdJU8kqZsAz28+vWE=";
   };
 
diff --git a/pkgs/by-name/sc/screenfetch/package.nix b/pkgs/by-name/sc/screenfetch/package.nix
index a15470295bce..12185ee31bd1 100644
--- a/pkgs/by-name/sc/screenfetch/package.nix
+++ b/pkgs/by-name/sc/screenfetch/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KittyKatt";
     repo = "screenFetch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UNZMCLXhH4wDV0/fGWsB+KAi6aJVuPs6zpWXIQAqnjo=";
   };
 
diff --git a/pkgs/by-name/sc/screenkey/package.nix b/pkgs/by-name/sc/screenkey/package.nix
index 193ddd66aba0..5a7a5698c161 100644
--- a/pkgs/by-name/sc/screenkey/package.nix
+++ b/pkgs/by-name/sc/screenkey/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kWktKzRyWHGd1lmdKhPwrJoSzAIN2E5TKyg30uhM4Ug=";
   };
 
diff --git a/pkgs/by-name/sc/script-directory/package.nix b/pkgs/by-name/sc/script-directory/package.nix
index 780262ae24d5..5d9bbca76acc 100644
--- a/pkgs/by-name/sc/script-directory/package.nix
+++ b/pkgs/by-name/sc/script-directory/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ianthehenry";
     repo = "sd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-X5RWCJQUqDnG2umcCk5KS6HQinTJVapBHp6szEmbc4U=";
   };
 
diff --git a/pkgs/by-name/sc/scripthaus/package.nix b/pkgs/by-name/sc/scripthaus/package.nix
index b8929e32f925..fd70bab54a16 100644
--- a/pkgs/by-name/sc/scripthaus/package.nix
+++ b/pkgs/by-name/sc/scripthaus/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "scripthaus-dev";
     repo = "scripthaus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZWOSLkqjauONa+fKkagpUgWB4k+l1mzEEiC0RAMUmo0=";
   };
 
diff --git a/pkgs/by-name/sc/scriptisto/package.nix b/pkgs/by-name/sc/scriptisto/package.nix
index e7d3a21a95ce..f594153fd2d8 100644
--- a/pkgs/by-name/sc/scriptisto/package.nix
+++ b/pkgs/by-name/sc/scriptisto/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "igor-petruk";
     repo = "scriptisto";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iaDdOFmi4kfcJSjXOcGAFG9i1SdB+K5Qz4+NDaVQALY=";
   };
 
diff --git a/pkgs/by-name/sc/scrot/package.nix b/pkgs/by-name/sc/scrot/package.nix
index 6e84d1fdbd71..236899adab11 100644
--- a/pkgs/by-name/sc/scrot/package.nix
+++ b/pkgs/by-name/sc/scrot/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "resurrecting-open-source-projects";
     repo = "scrot";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ExZH+bjpEvdbSYM8OhV+cyn4j+0YrHp5/b+HsHKAHCA=";
   };
 
diff --git a/pkgs/by-name/sc/scrub/package.nix b/pkgs/by-name/sc/scrub/package.nix
index e65b97e2cdf8..b65e9bfb65b4 100644
--- a/pkgs/by-name/sc/scrub/package.nix
+++ b/pkgs/by-name/sc/scrub/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chaos";
     repo = "scrub";
-    tag = version;
+    rev = version;
     sha256 = "0ndcri2ddzqlsxvy1b607ajyd4dxpiagzx331yyi7hf3ijph129f";
   };
 
diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix
index 39649fe62a01..3a7274f7af72 100644
--- a/pkgs/by-name/sc/scryer-prolog/package.nix
+++ b/pkgs/by-name/sc/scryer-prolog/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mthom";
     repo = "scryer-prolog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU=";
   };
 
diff --git a/pkgs/by-name/sc/scudcloud/package.nix b/pkgs/by-name/sc/scudcloud/package.nix
index c2ca382ac77b..36764bdb7ab4 100644
--- a/pkgs/by-name/sc/scudcloud/package.nix
+++ b/pkgs/by-name/sc/scudcloud/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "raelgc";
     repo = "scudcloud";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ffdy74igll74fwpmnn3brvcxbk4iianqscdzz18sx1pfqpw16cl";
   };
 
diff --git a/pkgs/by-name/sd/SDL2_sound/package.nix b/pkgs/by-name/sd/SDL2_sound/package.nix
index f10a16e5ab16..9ec2ec4e3cff 100644
--- a/pkgs/by-name/sd/SDL2_sound/package.nix
+++ b/pkgs/by-name/sd/SDL2_sound/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "icculus";
     repo = "SDL_sound";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N2znqy58tMHgYa07vEsSedWLRhoJzDoINcsUu0UYLnA=";
   };
 
diff --git a/pkgs/by-name/sd/sd-local/package.nix b/pkgs/by-name/sd/sd-local/package.nix
index 4a55c9586900..374efe41885a 100644
--- a/pkgs/by-name/sd/sd-local/package.nix
+++ b/pkgs/by-name/sd/sd-local/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "screwdriver-cd";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CBEdE15lAMMawTsfc45ptHsC2AbqFP6v4/nnktytwvc=";
   };
 
diff --git a/pkgs/by-name/sd/sd/package.nix b/pkgs/by-name/sd/sd/package.nix
index 495727101165..7549115f1ad0 100644
--- a/pkgs/by-name/sd/sd/package.nix
+++ b/pkgs/by-name/sd/sd/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chmln";
     repo = "sd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hC4VKEgrAVuqOX7b24XhtrxrnJW5kmlX4E6QbY9H8OA=";
   };
 
diff --git a/pkgs/by-name/sd/sdate/package.nix b/pkgs/by-name/sd/sdate/package.nix
index 6f16f0d47052..dea6aa1ed3ee 100644
--- a/pkgs/by-name/sd/sdate/package.nix
+++ b/pkgs/by-name/sd/sdate/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ChristophBerg";
     repo = "sdate";
-    tag = version;
+    rev = version;
     hash = "sha256-jkwe+bSBa0p1Xzfetsdpw0RYw/gSRxnY2jBOzC5HtJ8=";
   };
 
diff --git a/pkgs/by-name/sd/sdcv/package.nix b/pkgs/by-name/sd/sdcv/package.nix
index 83d1bd4d141e..e1773891ed8d 100644
--- a/pkgs/by-name/sd/sdcv/package.nix
+++ b/pkgs/by-name/sd/sdcv/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Dushistov";
     repo = "sdcv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-EyvljVXhOsdxIYOGTzD+T16nvW7/RNx3DuQ2OdhjXJ4=";
   };
 
diff --git a/pkgs/by-name/sd/sdlpop/package.nix b/pkgs/by-name/sd/sdlpop/package.nix
index 62ca550d8b40..42a29210c93e 100644
--- a/pkgs/by-name/sd/sdlpop/package.nix
+++ b/pkgs/by-name/sd/sdlpop/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NagyD";
     repo = "SDLPoP";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UI7NfOC/+druRYL5g2AhIjTPEq4ta1qEThcxgyrFjHY=";
   };
 
diff --git a/pkgs/by-name/se/seabird/package.nix b/pkgs/by-name/se/seabird/package.nix
index 0e07c9e0c885..5c9ff436fe6c 100644
--- a/pkgs/by-name/se/seabird/package.nix
+++ b/pkgs/by-name/se/seabird/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "getseabird";
     repo = "seabird";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-y+QIBqU3kAxedhWLnu07m9HQOCgHfOvVscIxxWtUcZo=";
   };
 
diff --git a/pkgs/by-name/se/seafile-shared/package.nix b/pkgs/by-name/se/seafile-shared/package.nix
index 14fbca3dfb1b..4e9f5c40d3f3 100644
--- a/pkgs/by-name/se/seafile-shared/package.nix
+++ b/pkgs/by-name/se/seafile-shared/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-IpRCgPxYy1El4EEvVEfzAlbxP/osQUb7pCP3/BhkecU=";
   };
 
diff --git a/pkgs/by-name/se/seasocks/package.nix b/pkgs/by-name/se/seasocks/package.nix
index e7d022790241..34bb25e5704e 100644
--- a/pkgs/by-name/se/seasocks/package.nix
+++ b/pkgs/by-name/se/seasocks/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mattgodbolt";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-R1McxZm2qsUoggFGfL587g+8eQf7si56xVkR8B8nehQ=";
   };
 
diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix
index 0785befdeba0..e86774137597 100644
--- a/pkgs/by-name/se/seaweedfs/package.nix
+++ b/pkgs/by-name/se/seaweedfs/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "seaweedfs";
     repo = "seaweedfs";
-    tag = version;
+    rev = version;
     hash = "sha256-vW/+zvpx5UIAUwsPyad2Ib+wI3gtBbh23k03yCiGnH0=";
   };
 
diff --git a/pkgs/by-name/se/sec/package.nix b/pkgs/by-name/se/sec/package.nix
index edf96e58f029..96c9192eacf6 100644
--- a/pkgs/by-name/se/sec/package.nix
+++ b/pkgs/by-name/se/sec/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simple-evcorr";
     repo = "sec";
-    tag = version;
+    rev = version;
     sha256 = "sha256-iK2v/qCWw4jdSEpx6cwSB98n5iFmbCyJH0lIpUG8pAU=";
   };
 
diff --git a/pkgs/by-name/se/see-cat/package.nix b/pkgs/by-name/se/see-cat/package.nix
index 866b234c87d2..c9310bd5bb08 100644
--- a/pkgs/by-name/se/see-cat/package.nix
+++ b/pkgs/by-name/se/see-cat/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "guilhermeprokisch";
     repo = "see";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VCUrPCaG2fKp9vpFLzNLcfCBu2NiwdY2+bo1pd7anZY=";
   };
 
diff --git a/pkgs/by-name/se/seilfahrt/package.nix b/pkgs/by-name/se/seilfahrt/package.nix
index 7cd3eb2e8630..380498612a8a 100644
--- a/pkgs/by-name/se/seilfahrt/package.nix
+++ b/pkgs/by-name/se/seilfahrt/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Nerdbergev";
     repo = "seilfahrt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pn3EsYPhggViL067nk6UhmIULGsf8IYm/dXSDudiZRA=";
   };
 
diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix
index b8dfc14305b2..31bf523f7900 100644
--- a/pkgs/by-name/se/selene/package.nix
+++ b/pkgs/by-name/se/selene/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kampfkarren";
     repo = "selene";
-    tag = version;
+    rev = version;
     sha256 = "sha256-QE9kXGQWg0pHtSI1bTppn5IE+53KoxqFED1VvwkumEI=";
   };
 
diff --git a/pkgs/by-name/se/sem/package.nix b/pkgs/by-name/se/sem/package.nix
index d418ecc58bc3..0e75dfacea5b 100644
--- a/pkgs/by-name/se/sem/package.nix
+++ b/pkgs/by-name/se/sem/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "semaphoreci";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-w/QxN8ntfyoHKVLRIawN0SoUI2oTQg8gNzVUiXR7Klc=";
   };
 
diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix
index 20bcac1d5e0d..17d014b2c562 100644
--- a/pkgs/by-name/se/semantic-release/package.nix
+++ b/pkgs/by-name/se/semantic-release/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "semantic-release";
     repo = "semantic-release";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DoOnrgS6g4Qie1v7AVyaJgseG/z7rZX8FwXyvokOy0Y=";
   };
 
diff --git a/pkgs/by-name/se/semver-tool/package.nix b/pkgs/by-name/se/semver-tool/package.nix
index f7517a549482..c86bd8f8736c 100644
--- a/pkgs/by-name/se/semver-tool/package.nix
+++ b/pkgs/by-name/se/semver-tool/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fsaintjacques";
     repo = "semver-tool";
-    tag = version;
+    rev = version;
     sha256 = "sha256-BnHuiCxE0VjzMWFTEMunQ9mkebQKIKbbMxZVfBUO57Y=";
   };
 
diff --git a/pkgs/by-name/se/semver/package.nix b/pkgs/by-name/se/semver/package.nix
index 03bbeb1b6e1a..a73fea385575 100644
--- a/pkgs/by-name/se/semver/package.nix
+++ b/pkgs/by-name/se/semver/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "catouc";
     repo = "semver-go";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0v3j7rw917wnmp4lyjscqzk4qf4azfiz70ynbq3wl4gwp1m783vv";
   };
 
diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index de952bbf80d4..bc68f58f9745 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "sendme";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OmP2FLvBupeJeGhMMBgcTpMSgQZ5JWzXBVeFZt7EU4Q=";
   };
 
diff --git a/pkgs/by-name/se/senv/package.nix b/pkgs/by-name/se/senv/package.nix
index fbcb94abeefb..d7fd3e766918 100644
--- a/pkgs/by-name/se/senv/package.nix
+++ b/pkgs/by-name/se/senv/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SpectralOps";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TjlIX8FPNiPDQo41pIt04cki/orc+v30pV3o2bQQhAQ=";
   };
 
diff --git a/pkgs/by-name/se/seqkit/package.nix b/pkgs/by-name/se/seqkit/package.nix
index 6f0c555bd2fb..b7b8c5330085 100644
--- a/pkgs/by-name/se/seqkit/package.nix
+++ b/pkgs/by-name/se/seqkit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shenwei356";
     repo = "seqkit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-W272ymy56aHRSOmi/0nCaU+AeaC0U/RyxzHOKR9meo4=";
   };
 
diff --git a/pkgs/by-name/se/seqtk/package.nix b/pkgs/by-name/se/seqtk/package.nix
index 141d76689c1e..5e223163500b 100644
--- a/pkgs/by-name/se/seqtk/package.nix
+++ b/pkgs/by-name/se/seqtk/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lh3";
     repo = "seqtk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W6IUn7R9tlnWrKe/qOHJL+43AL4EZB7zj7M5u9l83WE=";
   };
 
diff --git a/pkgs/by-name/se/sequeler/package.nix b/pkgs/by-name/se/sequeler/package.nix
index 91286a9e9c49..8c17dbe2cda3 100644
--- a/pkgs/by-name/se/sequeler/package.nix
+++ b/pkgs/by-name/se/sequeler/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Alecaddd";
     repo = "sequeler";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-MsHHTYERe0v+u3KnVtx+jmJTKORJTJ7bNfJMZHV9Ly4=";
   };
 
diff --git a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
index 0dde2dc2104e..ef90f7aa17df 100644
--- a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
+++ b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-chameleon-gnupg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-K9aeWrqJGPx2RymCXWNdNUTXXtO4NNm6Rd3jz+YxEi0=";
   };
 
diff --git a/pkgs/by-name/se/sequoia-sqv/package.nix b/pkgs/by-name/se/sequoia-sqv/package.nix
index dd979c9bd2e2..85a94c70ded2 100644
--- a/pkgs/by-name/se/sequoia-sqv/package.nix
+++ b/pkgs/by-name/se/sequoia-sqv/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-sqv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xkvCEHVyRf1tQ/oo6Hg4Nri2WxdmH0fZFX24CPwJpZQ=";
   };
 
diff --git a/pkgs/by-name/se/sequoia-wot/package.nix b/pkgs/by-name/se/sequoia-wot/package.nix
index 119a174397c3..b9aaf9dc9a92 100644
--- a/pkgs/by-name/se/sequoia-wot/package.nix
+++ b/pkgs/by-name/se/sequoia-wot/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-wot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Xbj1XLZQxyEYf/+R5e6EJMmL0C5ohfwZMZPVK5PwmUU=";
   };
 
diff --git a/pkgs/by-name/se/ser2net/package.nix b/pkgs/by-name/se/ser2net/package.nix
index ac6476a50845..5f407c8689ff 100644
--- a/pkgs/by-name/se/ser2net/package.nix
+++ b/pkgs/by-name/se/ser2net/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cminyard";
     repo = "ser2net";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-acj9D23J5FvcCasBq5GrPgtsStJrzanTpbKINuy/sqI=";
   };
 
diff --git a/pkgs/by-name/se/serfdom/package.nix b/pkgs/by-name/se/serfdom/package.nix
index 2ce220a8db2c..274e79664648 100644
--- a/pkgs/by-name/se/serfdom/package.nix
+++ b/pkgs/by-name/se/serfdom/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "serf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8kMQu3UYGihlYW7rdh1IkvRR/FgFK/N+iay0y6qOOWE=";
   };
 
diff --git a/pkgs/by-name/se/serial-studio/package.nix b/pkgs/by-name/se/serial-studio/package.nix
index 2b2928eaaa04..5cb29976b08f 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q3RWy3HRs5NG0skFb7PSv8jK5pI5rtbccP8j38l8kjM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/se/serialdv/package.nix b/pkgs/by-name/se/serialdv/package.nix
index ccd9c3ee7dcb..56f954feedb4 100644
--- a/pkgs/by-name/se/serialdv/package.nix
+++ b/pkgs/by-name/se/serialdv/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "serialdv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-uswddoIpTXqsvjM2/ygdud9jZHTemLn9Dlv9FBXXKow=";
   };
 
diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index e2b388b8936a..2b14244649ad 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Uf7HYcN/lJc2TSl2dZQcOKyEeLHMb2RTQwSzXWZnBkw=";
   };
 
diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix
index 2f37a4a96a09..24cc7ae109c5 100644
--- a/pkgs/by-name/se/serpl/package.nix
+++ b/pkgs/by-name/se/serpl/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "yassinebridi";
     repo = "serpl";
-    tag = version;
+    rev = version;
     hash = "sha256-koD5aFqL+XVxc5Iq3reTYIHiPm0z7hAQ4K59IfbY4Hg=";
   };
 
diff --git a/pkgs/by-name/se/serve-d/package.nix b/pkgs/by-name/se/serve-d/package.nix
index 6fe68764785c..b8ef204152b2 100644
--- a/pkgs/by-name/se/serve-d/package.nix
+++ b/pkgs/by-name/se/serve-d/package.nix
@@ -12,7 +12,7 @@ buildDubPackage rec {
   src = fetchFromGitHub {
     owner = "Pure-D";
     repo = "serve-d";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-h4zsW8phGcI4z0uMCIovM9cJ6hKdk8rLb/Jp4X4dkpk=";
   };
 
diff --git a/pkgs/by-name/se/serverless/package.nix b/pkgs/by-name/se/serverless/package.nix
index 9dd1d7241ed7..315a027bc730 100644
--- a/pkgs/by-name/se/serverless/package.nix
+++ b/pkgs/by-name/se/serverless/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "serverless";
     repo = "serverless";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DplJRJOdIpZfIvpyPo9VcaXCHVPWB8FwhOH4vISUh3Q=";
   };
 
diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix
index 89c4b03b6007..2eaa1c09b4d7 100644
--- a/pkgs/by-name/se/sesh/package.nix
+++ b/pkgs/by-name/se/sesh/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "joshmedeski";
     repo = "sesh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YFvUYacuvyzNXwY+y9kI4tPlrlojDuZpR7VaTGdVqb8=";
   };
 
diff --git a/pkgs/by-name/se/setbfree/package.nix b/pkgs/by-name/se/setbfree/package.nix
index 4b21ae51c757..7fcde202ab9f 100644
--- a/pkgs/by-name/se/setbfree/package.nix
+++ b/pkgs/by-name/se/setbfree/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pantherb";
     repo = "setBfree";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jtiyJntaFnAVeC1Rvkzi3wNodyJpEQKgnOAP7++36wo=";
   };
 
diff --git a/pkgs/by-name/se/setroot/package.nix b/pkgs/by-name/se/setroot/package.nix
index aa7b1ffb8247..7bb722ffdb15 100644
--- a/pkgs/by-name/se/setroot/package.nix
+++ b/pkgs/by-name/se/setroot/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ttzhou";
     repo = "setroot";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0w95828v0splk7bj5kfacp4pq6wxpyamvyjmahyvn5hc3ycq21mq";
   };
 
diff --git a/pkgs/by-name/se/setup-envtest/package.nix b/pkgs/by-name/se/setup-envtest/package.nix
index db23fb85bd7e..32b38df934b5 100644
--- a/pkgs/by-name/se/setup-envtest/package.nix
+++ b/pkgs/by-name/se/setup-envtest/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
     fetchFromGitHub {
       owner = "kubernetes-sigs";
       repo = "controller-runtime";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-9AqZMiA+OIJD+inmeUc/lq57kV7L85jk1I4ywiSKirg=";
     }
     + "/tools/setup-envtest";
diff --git a/pkgs/by-name/se/seturgent/package.nix b/pkgs/by-name/se/seturgent/package.nix
index 2997e906dc2c..1b3dbbc647bc 100644
--- a/pkgs/by-name/se/seturgent/package.nix
+++ b/pkgs/by-name/se/seturgent/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.codemadness.org/seturgent";
-    tag = version;
+    rev = version;
     sha256 = "sha256-XW7ms0BVCf1/fuL3PJ970t6sHkmMY1iLYXfS9R60JX0=";
   };
 
diff --git a/pkgs/by-name/sf/sfizz/package.nix b/pkgs/by-name/sf/sfizz/package.nix
index 9378dd079404..39b35f4e664d 100644
--- a/pkgs/by-name/sf/sfizz/package.nix
+++ b/pkgs/by-name/sf/sfizz/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sfztools";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sf/sfm/package.nix b/pkgs/by-name/sf/sfm/package.nix
index 7897a5dd7c14..37d16a8244fa 100644
--- a/pkgs/by-name/sf/sfm/package.nix
+++ b/pkgs/by-name/sf/sfm/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "afify";
     repo = "sfm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VwPux6n+azpR4qDkzZJia95pJJOaFDBBoz6/VwlC0zw=";
   };
 
diff --git a/pkgs/by-name/sf/sfsexp/package.nix b/pkgs/by-name/sf/sfsexp/package.nix
index a6889e8e8c1b..c7e9cde3ad1e 100644
--- a/pkgs/by-name/sf/sfsexp/package.nix
+++ b/pkgs/by-name/sf/sfsexp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mjsottile";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-uAk/8Emf23J0D3D5+eUEpWLY2fIvdQ7a80eGe9i1WQ8=";
   };
 
diff --git a/pkgs/by-name/sf/sftpman/package.nix b/pkgs/by-name/sf/sftpman/package.nix
index e8e27e1f913e..c0274be1de79 100644
--- a/pkgs/by-name/sf/sftpman/package.nix
+++ b/pkgs/by-name/sf/sftpman/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "spantaleev";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-YxqN4+u0nYUWehbyRhjddIo2sythH3E0fiPSyrUlWhM=";
   };
 
diff --git a/pkgs/by-name/sf/sfwbar/package.nix b/pkgs/by-name/sf/sfwbar/package.nix
index 88873c405383..f862473a27ec 100644
--- a/pkgs/by-name/sf/sfwbar/package.nix
+++ b/pkgs/by-name/sf/sfwbar/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "LBCrion";
     repo = "sfwbar";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jMEbw3Xla2cod/oKFQ4bD3sTHi7DZ0deG0H0Yt0Y7ck=";
   };
 
diff --git a/pkgs/by-name/sf/sfz/package.nix b/pkgs/by-name/sf/sfz/package.nix
index d7f3d793c763..7b2eeb057510 100644
--- a/pkgs/by-name/sf/sfz/package.nix
+++ b/pkgs/by-name/sf/sfz/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "weihanglo";
     repo = "sfz";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mKH1vgk+3tZEnjJRkfa0dDR383VN1VLNd3HEzC7f8YI=";
   };
 
diff --git a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
index 195f9632b160..bbb193b325eb 100644
--- a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
+++ b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "azure-dcap-client";
-    tag = version;
+    rev = version;
     hash = "sha256-zTDaICsSPXctgFRCZBiZwXV9dLk2pFL9kp5a8FkiTZA=";
   };
 
diff --git a/pkgs/by-name/sh/shab/package.nix b/pkgs/by-name/sh/shab/package.nix
index c26c7171874d..ee4fca701e4b 100644
--- a/pkgs/by-name/sh/shab/package.nix
+++ b/pkgs/by-name/sh/shab/package.nix
@@ -16,7 +16,7 @@ let
     src = fetchFromGitHub {
       owner = "zimbatm";
       repo = "shab";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-UW4tRZSir7KG7KXg0sOCd8kkIydEwZ6kdwxCeo0Ojgo=";
     };
 
diff --git a/pkgs/by-name/sh/shabnam-fonts/package.nix b/pkgs/by-name/sh/shabnam-fonts/package.nix
index e6e0705a70ee..8676e7310ffa 100644
--- a/pkgs/by-name/sh/shabnam-fonts/package.nix
+++ b/pkgs/by-name/sh/shabnam-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "shabnam-font";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-H03GTKRVPiwU4edkr4x5upW4JCy6320Lo+cKK9FRMQs=";
   };
 
diff --git a/pkgs/by-name/sh/shadered/package.nix b/pkgs/by-name/sh/shadered/package.nix
index c8f3acaa7726..ff9d322b9854 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 = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     sha256 = "0drf8wwx0gcmi22jq2yyjy7ppxynfq172wqakchscm313j248fjr";
   };
diff --git a/pkgs/by-name/sh/shades-of-gray-theme/package.nix b/pkgs/by-name/sh/shades-of-gray-theme/package.nix
index 89480702dd1c..692dd3c43044 100644
--- a/pkgs/by-name/sh/shades-of-gray-theme/package.nix
+++ b/pkgs/by-name/sh/shades-of-gray-theme/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WernerFP";
     repo = "shades-of-gray-theme";
-    tag = version;
+    rev = version;
     sha256 = "13ydym0i3032g5dyrnl5wxpvxv57b43q7iaq5achpmaixgn58gs8";
   };
 
diff --git a/pkgs/by-name/sh/shadow-tls/package.nix b/pkgs/by-name/sh/shadow-tls/package.nix
index 7cc124200550..06fad8e56f56 100644
--- a/pkgs/by-name/sh/shadow-tls/package.nix
+++ b/pkgs/by-name/sh/shadow-tls/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ihciah";
     repo = "shadow-tls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T+GPIrcME6Wq5sdfIt4t426/3ew5sUQMykYeZ6zw1ko=";
   };
 
diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index 5aaa47105a47..b515addb0730 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shadow-maint";
     repo = "shadow";
-    tag = version;
+    rev = version;
     hash = "sha256-IoHAr35ziujHTukMbA5QN15YbnpwBT7pUYcqRr+rdog=";
   };
 
diff --git a/pkgs/by-name/sh/shadowfox/package.nix b/pkgs/by-name/sh/shadowfox/package.nix
index a7699f95e8ba..3fb2b145bff5 100644
--- a/pkgs/by-name/sh/shadowfox/package.nix
+++ b/pkgs/by-name/sh/shadowfox/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SrKomodo";
     repo = "shadowfox-updater";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6";
   };
 
diff --git a/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix b/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
index 1d145953c011..b1192385c714 100644
--- a/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
+++ b/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shadowsocks";
     repo = "v2ray-plugin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iwfjINY/NQP9poAcCHz0ETxu0Nz58AmD7i1NbF8hBCs=";
   };
 
diff --git a/pkgs/by-name/sh/shaq/package.nix b/pkgs/by-name/sh/shaq/package.nix
index be108bd7c7fe..ff7abe883a6b 100644
--- a/pkgs/by-name/sh/shaq/package.nix
+++ b/pkgs/by-name/sh/shaq/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "woodruffw";
     repo = "shaq";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RF606Aeskqbx94H5ivd+RJ+Hk0iYsds/PUY8TZqirs4=";
   };
 
diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix
index 9b034303aa8c..961c6ca606bc 100644
--- a/pkgs/by-name/sh/share-preview/package.nix
+++ b/pkgs/by-name/sh/share-preview/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rafaelmardojai";
     repo = "share-preview";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E=";
   };
 
diff --git a/pkgs/by-name/sh/sharing/package.nix b/pkgs/by-name/sh/sharing/package.nix
index 0aff8c9cc428..45462eac5beb 100644
--- a/pkgs/by-name/sh/sharing/package.nix
+++ b/pkgs/by-name/sh/sharing/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "parvardegr";
     repo = "sharing";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-y5tAbyRGxr6lagU/+pLBN0VIpk3+SzKyXOehQk6NW+M=";
   };
 
diff --git a/pkgs/by-name/sh/shavee/package.nix b/pkgs/by-name/sh/shavee/package.nix
index d7a8be012637..d914497ce3c2 100644
--- a/pkgs/by-name/sh/shavee/package.nix
+++ b/pkgs/by-name/sh/shavee/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ashuio";
     repo = "shavee";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-41wJ3QBZdmCl7v/6JetXhzH2zF7tsKYMKZY1cKhByX8=";
   };
 
diff --git a/pkgs/by-name/sh/shell2http/package.nix b/pkgs/by-name/sh/shell2http/package.nix
index 252deea4a3e0..0a60684c2abb 100644
--- a/pkgs/by-name/sh/shell2http/package.nix
+++ b/pkgs/by-name/sh/shell2http/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "msoap";
     repo = "shell2http";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CU7ENLx5C1qCO1f9m0fl/AmUzmtmj6IjMlx9WNqAnS0=";
   };
 
diff --git a/pkgs/by-name/sh/shellharden/package.nix b/pkgs/by-name/sh/shellharden/package.nix
index c04e682e3c2f..8939e121efc2 100644
--- a/pkgs/by-name/sh/shellharden/package.nix
+++ b/pkgs/by-name/sh/shellharden/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "anordal";
     repo = "shellharden";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-aBX3RXfDhlXVMV8aPO0pu3527nDoYrUDUbH6crWO/W8=";
   };
 
diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
index 282bb0596bab..1131ec60fa85 100644
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ByKj9rnRGS3B+BEqeo7QJvjSxVXytOXydmZMx7lK8Xc=";
   };
 
diff --git a/pkgs/by-name/sh/shellspec/package.nix b/pkgs/by-name/sh/shellspec/package.nix
index 877d7a8a1bbc..8fff36ca0ac6 100644
--- a/pkgs/by-name/sh/shellspec/package.nix
+++ b/pkgs/by-name/sh/shellspec/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shellspec";
     repo = "shellspec";
-    tag = version;
+    rev = version;
     sha256 = "1ib5qp29f2fmivwnv6hq35qhvdxz42xgjlkvy0i3qn758riyqf46";
   };
 
diff --git a/pkgs/by-name/sh/shellz/package.nix b/pkgs/by-name/sh/shellz/package.nix
index f3dfe6f9e41d..b1a263c3fddc 100644
--- a/pkgs/by-name/sh/shellz/package.nix
+++ b/pkgs/by-name/sh/shellz/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sUYDopSxaUPyrHev8XXobRoX6uxbdf5goJ75KYEPFNY=";
   };
 
diff --git a/pkgs/by-name/sh/shepherd/package.nix b/pkgs/by-name/sh/shepherd/package.nix
index 6d1aebe708ae..6f6313ea0035 100644
--- a/pkgs/by-name/sh/shepherd/package.nix
+++ b/pkgs/by-name/sh/shepherd/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NerdWalletOSS";
     repo = "shepherd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LY8Vde4YpGuKnQ5UnSOpsQDY7AOyZRziUrfZb5dRiX4=";
   };
 
diff --git a/pkgs/by-name/sh/shfm/package.nix b/pkgs/by-name/sh/shfm/package.nix
index 68bad3cfa32e..d70fd20be328 100644
--- a/pkgs/by-name/sh/shfm/package.nix
+++ b/pkgs/by-name/sh/shfm/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "shfm";
-    tag = version;
+    rev = version;
     hash = "sha256-ilVrUFfyzOZgjbBTqlHA9hLaTHw1xHFo1Y/tjXygNEs=";
   };
 
diff --git a/pkgs/by-name/sh/shfmt/package.nix b/pkgs/by-name/sh/shfmt/package.nix
index ad1616e6ba52..177b053edcd4 100644
--- a/pkgs/by-name/sh/shfmt/package.nix
+++ b/pkgs/by-name/sh/shfmt/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "sh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PFUjJOVW7bCFOxi5/6D4dOu96T8jj1L5clMVLC/W1Fk=";
   };
 
diff --git a/pkgs/by-name/sh/shibboleth-sp/package.nix b/pkgs/by-name/sh/shibboleth-sp/package.nix
index 7e6212d582af..4a300718c737 100644
--- a/pkgs/by-name/sh/shibboleth-sp/package.nix
+++ b/pkgs/by-name/sh/shibboleth-sp/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.shibboleth.net/git/cpp-sp.git";
-    tag = version;
+    rev = version;
     sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr";
   };
 
diff --git a/pkgs/by-name/sh/shikane/package.nix b/pkgs/by-name/sh/shikane/package.nix
index ef1cae2a2b20..73a21535fc21 100644
--- a/pkgs/by-name/sh/shikane/package.nix
+++ b/pkgs/by-name/sh/shikane/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "w0lff";
     repo = "shikane";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Chc1+JUHXzuLl26NuBGVxSiXiaE4Ns1FXb0dBs6STVk=";
   };
 
diff --git a/pkgs/by-name/sh/shim-unsigned/package.nix b/pkgs/by-name/sh/shim-unsigned/package.nix
index 0c0fd8d790c6..21811d3a422a 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";
-    tag = version;
+    rev = version;
     hash = "sha256-KFpt//A4/T0FRBSPuTKQH/mEIqLVEiE+Lpvuq7ec6eo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sh/shine/package.nix b/pkgs/by-name/sh/shine/package.nix
index 3e8aa3b45fc9..c9107390d575 100644
--- a/pkgs/by-name/sh/shine/package.nix
+++ b/pkgs/by-name/sh/shine/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "toots";
     repo = "shine";
-    tag = version;
+    rev = version;
     sha256 = "06nwylqqji0i1isdprm2m5qsdj4qiywcgnp69c5b55pnw43f07qg";
   };
 
diff --git a/pkgs/by-name/sh/shiori/package.nix b/pkgs/by-name/sh/shiori/package.nix
index 0a319292f1a5..606db18f04c3 100644
--- a/pkgs/by-name/sh/shiori/package.nix
+++ b/pkgs/by-name/sh/shiori/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-shiori";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-T4EFwvejLgNkcykPjSHU8WXJwqSqYPFaAD+9JX+uiJU=";
   };
 
diff --git a/pkgs/by-name/sh/shisho/package.nix b/pkgs/by-name/sh/shisho/package.nix
index d6103d721074..2eb91be11f17 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sh/shmig/package.nix b/pkgs/by-name/sh/shmig/package.nix
index 4f0922e6944e..3f57bed763cf 100644
--- a/pkgs/by-name/sh/shmig/package.nix
+++ b/pkgs/by-name/sh/shmig/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mbucc";
     repo = "shmig";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "15ry1d51d6dlzzzhck2x57wrq48vs4n9pp20bv2sz6nk92fva5l5";
   };
 
diff --git a/pkgs/by-name/sh/shocco/package.nix b/pkgs/by-name/sh/shocco/package.nix
index 58ab982ac984..63ce139be600 100644
--- a/pkgs/by-name/sh/shocco/package.nix
+++ b/pkgs/by-name/sh/shocco/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rtomayko";
     repo = "shocco";
-    tag = version;
+    rev = version;
     sha256 = "1nkwcw9fqf4vyrwidqi6by7nrmainkjqkirkz3yxmzk6kzwr38mi";
   };
 
diff --git a/pkgs/by-name/sh/shod/package.nix b/pkgs/by-name/sh/shod/package.nix
index 9f7db7692bd7..8686767a3a8c 100644
--- a/pkgs/by-name/sh/shod/package.nix
+++ b/pkgs/by-name/sh/shod/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phillbush";
     repo = "shod";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0bKp1BTIdYVBDVdeGnTVo76UtBxa4UbXLZihdjHS/og=";
   };
 
diff --git a/pkgs/by-name/sh/shopify-themekit/package.nix b/pkgs/by-name/sh/shopify-themekit/package.nix
index 875d0cb9083b..cbe076825c21 100644
--- a/pkgs/by-name/sh/shopify-themekit/package.nix
+++ b/pkgs/by-name/sh/shopify-themekit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "themekit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-A/t6yQW2xRFZYuYRyNN/0v4zdivch3tiv65a7TdHm2c=";
   };
 
diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix
index 7bc23c495b93..40bbd4ff88de 100644
--- a/pkgs/by-name/sh/shotgun/package.nix
+++ b/pkgs/by-name/sh/shotgun/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "neXromancers";
     repo = "shotgun";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sBstFz7cYfwVQpDZeC3wPjzbKU5zQzmnhiWNqiCda1k=";
   };
 
diff --git a/pkgs/by-name/sh/show-midi/package.nix b/pkgs/by-name/sh/show-midi/package.nix
index 14f23b78edf9..3fc5da619ee8 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";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-jANrFZqJZZMTGyNa0sIthoQzaDMdLzpGZqHfxNw8hDg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix
index a011dd514e27..eb4eda0b2ee8 100644
--- a/pkgs/by-name/sh/shpool/package.nix
+++ b/pkgs/by-name/sh/shpool/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shell-pool";
     repo = "shpool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pSSMC4pUtB38c6UNOj+Ma/Y1jcSfm33QV1B4tA/MyKY=";
   };
 
diff --git a/pkgs/by-name/sh/shunit2/package.nix b/pkgs/by-name/sh/shunit2/package.nix
index 9203fe93001d..577ca5a6a79f 100644
--- a/pkgs/by-name/sh/shunit2/package.nix
+++ b/pkgs/by-name/sh/shunit2/package.nix
@@ -17,7 +17,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kward";
     repo = "shunit2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IZHkgkVqzeh+eEKCDJ87sqNhSA+DU6kBCNDdQaUEeiM=";
   };
 
diff --git a/pkgs/by-name/sh/shutter/package.nix b/pkgs/by-name/sh/shutter/package.nix
index 1e7ff8813491..3ba076eeccea 100644
--- a/pkgs/by-name/sh/shutter/package.nix
+++ b/pkgs/by-name/sh/shutter/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shutter-project";
     repo = "shutter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-o95skSr6rszh0wsHQTpu1GjqCDmde7aygIP+i4XQW9A=";
   };
 
diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix
index bca80c079420..ee93342f2d93 100644
--- a/pkgs/by-name/si/sic-image-cli/package.nix
+++ b/pkgs/by-name/si/sic-image-cli/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "foresterre";
     repo = "sic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PFbHHO3m4mnV5s8DVev/iao9sC3FYht0whTHYzO25Yo=";
   };
 
diff --git a/pkgs/by-name/si/sidekick/package.nix b/pkgs/by-name/si/sidekick/package.nix
index c663f3ca8100..3ff0b4340c44 100644
--- a/pkgs/by-name/si/sidekick/package.nix
+++ b/pkgs/by-name/si/sidekick/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MightyMoud";
     repo = "sidekick";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Y/dQRix/cxV3NGqTGtRP6Bcprj0jzzOpudgm9a1UMLc=";
   };
 
diff --git a/pkgs/by-name/si/sieve-connect/package.nix b/pkgs/by-name/si/sieve-connect/package.nix
index 27842893954e..8a576bd7be3f 100644
--- a/pkgs/by-name/si/sieve-connect/package.nix
+++ b/pkgs/by-name/si/sieve-connect/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "philpennock";
     repo = "sieve-connect";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ghvfa5ifa68b6imh85bkmy00r93c5f9hs6d039axb73gmma580p";
   };
 
diff --git a/pkgs/by-name/si/sift/package.nix b/pkgs/by-name/si/sift/package.nix
index 7a717f30676d..0fe1069b7020 100644
--- a/pkgs/by-name/si/sift/package.nix
+++ b/pkgs/by-name/si/sift/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "svent";
     repo = "sift";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IZ4Hwg5NzdSXtrIDNxtkzquuiHQOmLV1HSx8gpwE/i0=";
   };
 
diff --git a/pkgs/by-name/si/sig/package.nix b/pkgs/by-name/si/sig/package.nix
index 50d0887fb43c..9033c282cdc4 100644
--- a/pkgs/by-name/si/sig/package.nix
+++ b/pkgs/by-name/si/sig/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ynqa";
     repo = "sig";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-685VBQ64B+IbSSyqtVXtOgs4wY85WZ/OceHL++v5ip4=";
   };
 
diff --git a/pkgs/by-name/si/siglo/package.nix b/pkgs/by-name/si/siglo/package.nix
index fc33c8060543..147a784d1dcd 100644
--- a/pkgs/by-name/si/siglo/package.nix
+++ b/pkgs/by-name/si/siglo/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "theironrobin";
     repo = "siglo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4jKsRpzuyHH31LXndC3Ua4TYcI0G0v9qqe0cbvLuCDA=";
   };
 
diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 6c3b012649b4..5ef262012d3c 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
-    tag = version;
+    rev = version;
     hash = "sha256-PdbZxDmaM1kdc5IHkWf8RcJcT5cmfRAvUl76VYnqFXc=";
   };
 
diff --git a/pkgs/by-name/si/signaldctl/package.nix b/pkgs/by-name/si/signaldctl/package.nix
index e75a23eabde7..59e1984f4d71 100644
--- a/pkgs/by-name/si/signaldctl/package.nix
+++ b/pkgs/by-name/si/signaldctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitLab {
     owner = "signald";
     repo = "signald-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lMJyr4BPZ8V2f//CUkr7CVQ6o8nRyeLBHMDEyLcHSgQ=";
   };
 
diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix
index baa38af7114f..cd6af5de63de 100644
--- a/pkgs/by-name/si/signaturepdf/package.nix
+++ b/pkgs/by-name/si/signaturepdf/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "24eme";
     repo = "signaturepdf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8R1eowMpdb4oj3j+gMJ2RsWVzHvNiXPwFaLHR0jqFJo=";
   };
 
diff --git a/pkgs/by-name/si/signify/package.nix b/pkgs/by-name/si/signify/package.nix
index 3aeb7d3f503b..33b188a92261 100644
--- a/pkgs/by-name/si/signify/package.nix
+++ b/pkgs/by-name/si/signify/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aperezdc";
     repo = "signify";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-y2A+Szt451CmaWOc2Y2vBSwSgziJsSnTjNClbdyxG2U=";
   };
 
diff --git a/pkgs/by-name/si/sigslot/package.nix b/pkgs/by-name/si/sigslot/package.nix
index 077d2ce025f7..244d56e91cc0 100644
--- a/pkgs/by-name/si/sigslot/package.nix
+++ b/pkgs/by-name/si/sigslot/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "palacaze";
     repo = "sigslot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MKtVZLHp8UfXW8KJ3QjPMhxnt46xV+pA9NMqAX0iqiA=";
   };
 
diff --git a/pkgs/by-name/si/sigtop/package.nix b/pkgs/by-name/si/sigtop/package.nix
index e8097a281f12..6fbfe532c363 100644
--- a/pkgs/by-name/si/sigtop/package.nix
+++ b/pkgs/by-name/si/sigtop/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tbvdm";
     repo = "sigtop";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wZdQq5u44AcZs2CWRQ92wih5WBzZFywt78+slVBYseg=";
   };
 
diff --git a/pkgs/by-name/si/siketyan-ghr/package.nix b/pkgs/by-name/si/siketyan-ghr/package.nix
index b8ee4ec4c272..7293bbf2f33a 100644
--- a/pkgs/by-name/si/siketyan-ghr/package.nix
+++ b/pkgs/by-name/si/siketyan-ghr/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "siketyan";
     repo = "ghr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L9+rcdt+MGZSCOJyCE4t/TT6Fjtxvfr9LBJYyRrx208=";
   };
 
diff --git a/pkgs/by-name/si/sil-q/package.nix b/pkgs/by-name/si/sil-q/package.nix
index 170feb32dcf2..b8ab1befd925 100644
--- a/pkgs/by-name/si/sil-q/package.nix
+++ b/pkgs/by-name/si/sil-q/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sil-quirk";
     repo = "sil-q";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-v/sWhPWF9cCKD8N0RHpwzChMM1t9G2yrMDmi1cZxdOs=";
   };
 
diff --git a/pkgs/by-name/si/silicon/package.nix b/pkgs/by-name/si/silicon/package.nix
index 6864bb2b2603..9fbf5ac29326 100644
--- a/pkgs/by-name/si/silicon/package.nix
+++ b/pkgs/by-name/si/silicon/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Aloxaf";
     repo = "silicon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lwwbjSXW5uonJNZTAqTK14Ib4QDOD4puxY2CsiJk4/Q=";
   };
 
diff --git a/pkgs/by-name/si/silver-searcher/package.nix b/pkgs/by-name/si/silver-searcher/package.nix
index e38773b41756..2c225bdd585f 100644
--- a/pkgs/by-name/si/silver-searcher/package.nix
+++ b/pkgs/by-name/si/silver-searcher/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ggreer";
     repo = "the_silver_searcher";
-    tag = version;
+    rev = version;
     sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p";
   };
 
diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix
index 80b7a01cd583..894a02de384e 100644
--- a/pkgs/by-name/si/simde/package.nix
+++ b/pkgs/by-name/si/simde/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simd-everywhere";
     repo = "simde";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-igjDHCpKXy6EbA9Mf6peL4OTVRPYTV0Y2jbgYQuWMT4=";
   };
 
diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix
index 9d0c0cf9bed0..574fd70bc2d0 100644
--- a/pkgs/by-name/si/simdjson/package.nix
+++ b/pkgs/by-name/si/simdjson/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simdjson";
     repo = "simdjson";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/FfaM5BTWKrt2m70+VcUXz//RiZuzxnUOaHOjPJWsGw=";
   };
 
diff --git a/pkgs/by-name/si/simg2img/package.nix b/pkgs/by-name/si/simg2img/package.nix
index 0f7b2be9a55f..2e4ee18646d7 100644
--- a/pkgs/by-name/si/simg2img/package.nix
+++ b/pkgs/by-name/si/simg2img/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "anestisb";
     repo = "android-simg2img";
-    tag = version;
+    rev = version;
     hash = "sha256-sNHdSbms35YnENASFEG+VMLJGkV/JAlQUVMquDrePDc=";
   };
 
diff --git a/pkgs/by-name/si/simh/package.nix b/pkgs/by-name/si/simh/package.nix
index cad498a45c59..28d03352d3d6 100644
--- a/pkgs/by-name/si/simh/package.nix
+++ b/pkgs/by-name/si/simh/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simh";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-65+YfOWpVXPeT64TZcSaWJY+ODQ0q/pwF9jb8xGdpIs=";
   };
 
diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix
index 0a65dbe288c3..d13c5485db55 100644
--- a/pkgs/by-name/si/simple-http-server/package.nix
+++ b/pkgs/by-name/si/simple-http-server/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "TheWaWaR";
     repo = "simple-http-server";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WaUBMGZaIjce83mskEtH9PLYDDlBL1MNoY8lz4++684=";
   };
 
diff --git a/pkgs/by-name/si/simple-mtpfs/package.nix b/pkgs/by-name/si/simple-mtpfs/package.nix
index de7082e3e46f..567bef907b18 100644
--- a/pkgs/by-name/si/simple-mtpfs/package.nix
+++ b/pkgs/by-name/si/simple-mtpfs/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phatina";
     repo = "simple-mtpfs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vAqi2owa4LJK7y7S7TwkPAqDxzyHrZZBTu0MBwMT0gI=";
   };
 
diff --git a/pkgs/by-name/si/simpleTpmPk11/package.nix b/pkgs/by-name/si/simpleTpmPk11/package.nix
index e678d88c2390..e963955a255f 100644
--- a/pkgs/by-name/si/simpleTpmPk11/package.nix
+++ b/pkgs/by-name/si/simpleTpmPk11/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ThomasHabets";
     repo = "simple-tpm-pk11";
-    tag = version;
+    rev = version;
     sha256 = "0vpbaklr4r1a2am0pqcm6m41ph22mkcrq33y8ab5h8qkhkvhd6a6";
   };
 
diff --git a/pkgs/by-name/si/simplehttp2server/package.nix b/pkgs/by-name/si/simplehttp2server/package.nix
index a1fd5b4628ba..190257b16e92 100644
--- a/pkgs/by-name/si/simplehttp2server/package.nix
+++ b/pkgs/by-name/si/simplehttp2server/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleChromeLabs";
     repo = "simplehttp2server";
-    tag = version;
+    rev = version;
     sha256 = "113mcfvy1m91wask5039mhr0187nlw325ac32785yl4bb4igi8aw";
   };
 
diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix
index f1ef689425a2..3a674ae1a181 100644
--- a/pkgs/by-name/si/simplotask/package.nix
+++ b/pkgs/by-name/si/simplotask/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "spot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pSYYYUzChK/GNAdCybd4KMNXwkTZo/0w6CtsYOvbKj8=";
   };
 
diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index b239999179e1..a4a065084d27 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/RTpdbDFCDk1sq7lBIXQ3ElgYqflDumffZy1DVP0zOY=";
   };
 
diff --git a/pkgs/by-name/si/sink-rotate/package.nix b/pkgs/by-name/si/sink-rotate/package.nix
index 5d96255ecae9..02d8f7e26cf0 100644
--- a/pkgs/by-name/si/sink-rotate/package.nix
+++ b/pkgs/by-name/si/sink-rotate/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "mightyiam";
     repo = "sink-rotate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZHbisG9pdctkwfD1S3kxMZhBqPw0Ni5Q9qQG4RssnSw=";
   };
 
diff --git a/pkgs/by-name/si/sipexer/package.nix b/pkgs/by-name/si/sipexer/package.nix
index 8a6946deae69..ca194801d204 100644
--- a/pkgs/by-name/si/sipexer/package.nix
+++ b/pkgs/by-name/si/sipexer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "miconda";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7L29nyFOc/5XAHpzGsFSngxMTwwIDkmwhIKIjHYGszc=";
   };
 
diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix
index f819704d4549..76ebeae80949 100644
--- a/pkgs/by-name/si/sirikali/package.nix
+++ b/pkgs/by-name/si/sirikali/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mhogomchungu";
     repo = "sirikali";
-    tag = version;
+    rev = version;
     hash = "sha256-YGMmDatTKjhORTisX9kTVrpIWo6j0YkxZsDLJXga6ho=";
   };
 
diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix
index 5497632be36e..df4a5a6af8a8 100644
--- a/pkgs/by-name/si/sirius/package.nix
+++ b/pkgs/by-name/si/sirius/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "electronic-structure";
     repo = "SIRIUS";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A3WiEzo2ianxdF9HMZN9cT0lFosToGEHh0o6uBSAYqU=";
   };
 
diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix
index 63ae023dd089..886fe060694d 100644
--- a/pkgs/by-name/si/sitespeed-io/package.nix
+++ b/pkgs/by-name/si/sitespeed-io/package.nix
@@ -31,7 +31,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "sitespeedio";
     repo = "sitespeed.io";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yC/TlAJa71hbPYYuqPV+k3syGuo/VhnNjXmmxh47ySQ=";
   };
 
diff --git a/pkgs/by-name/sj/sjasmplus/package.nix b/pkgs/by-name/sj/sjasmplus/package.nix
index 2217c3393be8..51ef3793cc03 100644
--- a/pkgs/by-name/sj/sjasmplus/package.nix
+++ b/pkgs/by-name/sj/sjasmplus/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "z00m128";
     repo = "sjasmplus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+FvNYfJ5I91RfuJTiOPhj5KW8HoOq8OgnnpFEgefSGc=";
   };
 
diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix
index 0cac856b24fd..b8e77c385d51 100644
--- a/pkgs/by-name/sk/skaffold/package.nix
+++ b/pkgs/by-name/sk/skaffold/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = "skaffold";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iw9SYoepa2QjKnSaqFkIxuU5dcsLcR7S13kPh5S2Jyw=";
   };
 
diff --git a/pkgs/by-name/sk/skate/package.nix b/pkgs/by-name/sk/skate/package.nix
index 9de13dd224c4..77fe2116c9a3 100644
--- a/pkgs/by-name/sk/skate/package.nix
+++ b/pkgs/by-name/sk/skate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "skate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ihzcto41ltV5LQjLP9AF5XGl5b6QDbgZ/q4BMzfrDC8=";
   };
 
diff --git a/pkgs/by-name/sk/skeditor/package.nix b/pkgs/by-name/sk/skeditor/package.nix
index 40f15ec753aa..bdf4d2eee2e3 100644
--- a/pkgs/by-name/sk/skeditor/package.nix
+++ b/pkgs/by-name/sk/skeditor/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "skeditorteam";
     repo = "skeditor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-e8mQTkTvR8RfC27VsONqf9UtkM/H8GebxrYVUdJw7PE=";
   };
 
diff --git a/pkgs/by-name/sk/skeema/package.nix b/pkgs/by-name/sk/skeema/package.nix
index 355712ead3d9..a431b12abb36 100644
--- a/pkgs/by-name/sk/skeema/package.nix
+++ b/pkgs/by-name/sk/skeema/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "skeema";
     repo = "skeema";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3sxUy/TkacuRN8UDGgrvkdUQi//6VufoYoVFN1+X3BM=";
   };
 
diff --git a/pkgs/by-name/sk/skeu/package.nix b/pkgs/by-name/sk/skeu/package.nix
index 50cef529aa50..4bcf5bca826a 100644
--- a/pkgs/by-name/sk/skeu/package.nix
+++ b/pkgs/by-name/sk/skeu/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "skeu";
-    tag = version;
+    rev = version;
     sha256 = "0lbl09p0h493ya978fh7cib68qlmxfxahmbj0mpa3b65ynxda645";
   };
 
diff --git a/pkgs/by-name/sk/skia-aseprite/package.nix b/pkgs/by-name/sk/skia-aseprite/package.nix
index 8983f3f1e9e9..446556a126b8 100644
--- a/pkgs/by-name/sk/skia-aseprite/package.nix
+++ b/pkgs/by-name/sk/skia-aseprite/package.nix
@@ -31,7 +31,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "aseprite";
     repo = "skia";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-IlZbalmHl549uDUfPG8hlzub8TLWhG0EsV6HVAPdsl0=";
   };
 
diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix
index c7388cd0b78f..abb2a27d74eb 100644
--- a/pkgs/by-name/sk/skopeo/package.nix
+++ b/pkgs/by-name/sk/skopeo/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   version = "1.18.0";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "containers";
     repo = "skopeo";
     hash = "sha256-Ws01dYx2Jq/zB8rWiWSnV4ZgcxyBWHWvE3DfG7gvFOc=";
diff --git a/pkgs/by-name/sl/sl/package.nix b/pkgs/by-name/sl/sl/package.nix
index 5d90256d5d75..a4b14dab2db3 100644
--- a/pkgs/by-name/sl/sl/package.nix
+++ b/pkgs/by-name/sl/sl/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eyJhb";
     repo = "sl";
-    tag = version;
+    rev = version;
     sha256 = "11a1rdgb8wagikhxgm81g80g5qsl59mv4qgsval3isykqh8729bj";
   };
 
diff --git a/pkgs/by-name/sl/slack-cli/package.nix b/pkgs/by-name/sl/slack-cli/package.nix
index 7af4a7310501..49e1543e1a25 100644
--- a/pkgs/by-name/sl/slack-cli/package.nix
+++ b/pkgs/by-name/sl/slack-cli/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rockymadden";
     repo = "slack-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "022yr3cpfg0v7cxi62zzk08vp0l3w851qpfh6amyfgjiynnfyddl";
   };
 
diff --git a/pkgs/by-name/sl/slack-term/package.nix b/pkgs/by-name/sl/slack-term/package.nix
index f8ef87082f9b..8d2e09808bea 100644
--- a/pkgs/by-name/sl/slack-term/package.nix
+++ b/pkgs/by-name/sl/slack-term/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "erroneousboat";
     repo = "slack-term";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/sl/sleek/package.nix b/pkgs/by-name/sl/sleek/package.nix
index 4e3855c077ab..afe3db6eaf27 100644
--- a/pkgs/by-name/sl/sleek/package.nix
+++ b/pkgs/by-name/sl/sleek/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nrempel";
     repo = "sleek";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VQ0LmKhFsC12qoXCFHxtV5E+J7eRvZMVH0j+5r8pDk8=";
   };
 
diff --git a/pkgs/by-name/sl/slic3r/package.nix b/pkgs/by-name/sl/slic3r/package.nix
index 19f29c5b2fa4..1790d103d986 100644
--- a/pkgs/by-name/sl/slic3r/package.nix
+++ b/pkgs/by-name/sl/slic3r/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexrj";
     repo = "Slic3r";
-    tag = version;
+    rev = version;
     sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0=";
   };
 
diff --git a/pkgs/by-name/sl/slides/package.nix b/pkgs/by-name/sl/slides/package.nix
index 5f0911f7bb7c..59076db89ef2 100644
--- a/pkgs/by-name/sl/slides/package.nix
+++ b/pkgs/by-name/sl/slides/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maaslalani";
     repo = "slides";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-K8VsqaNUPxh3/Yddy6DFiOyjRuZ6r6bU456Pm31A1og=";
   };
 
diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix
index 48959fc8624d..083938fb1756 100644
--- a/pkgs/by-name/sl/slimevr/package.nix
+++ b/pkgs/by-name/sl/slimevr/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SlimeVR";
     repo = "SlimeVR-Server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XQDbP+LO/brpl7viSxuV3H4ALN0yIkj9lwr5eS1txNs=";
     # solarxr
     fetchSubmodules = true;
diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix
index 02550181117e..fe6e18c54940 100644
--- a/pkgs/by-name/sl/slimserver/package.nix
+++ b/pkgs/by-name/sl/slimserver/package.nix
@@ -38,7 +38,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "LMS-Community";
     repo = "slimserver";
-    tag = version;
+    rev = version;
     hash = "sha256-rwaHlNM5KGqvk8SAdinvCGT5+UUAU8I2jiN5Ine/eds=";
   };
 
diff --git a/pkgs/by-name/sl/slingshot/package.nix b/pkgs/by-name/sl/slingshot/package.nix
index f04087fb7098..4d3b886bedc4 100644
--- a/pkgs/by-name/sl/slingshot/package.nix
+++ b/pkgs/by-name/sl/slingshot/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "caio-ishikawa";
     repo = "slingshot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XI6uf54sEJ0htfY43aF8/X1/OF9m6peHUGDS+2nK3xA=";
   };
 
diff --git a/pkgs/by-name/sl/slippy/package.nix b/pkgs/by-name/sl/slippy/package.nix
index c59d28daacd4..70e757d7c1a1 100644
--- a/pkgs/by-name/sl/slippy/package.nix
+++ b/pkgs/by-name/sl/slippy/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "axodotdev";
     repo = "slippy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7Uvo5+saxwTMQjfDliyOYC6j6LbpMf/FiONfX38xepI=";
   };
 
diff --git a/pkgs/by-name/sl/slirp4netns/package.nix b/pkgs/by-name/sl/slirp4netns/package.nix
index 55048712752d..91849a956cca 100644
--- a/pkgs/by-name/sl/slirp4netns/package.nix
+++ b/pkgs/by-name/sl/slirp4netns/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rootless-containers";
     repo = "slirp4netns";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1OiomraQ4wfrBPihGrf9sq8hPJUB45gvf7Y5j7iN8/E=";
   };
 
diff --git a/pkgs/by-name/sl/slop/package.nix b/pkgs/by-name/sl/slop/package.nix
index 868e5f4d540b..7bf6fc1f0779 100644
--- a/pkgs/by-name/sl/slop/package.nix
+++ b/pkgs/by-name/sl/slop/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "slop";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U=";
   };
 
diff --git a/pkgs/by-name/sl/sloth/package.nix b/pkgs/by-name/sl/sloth/package.nix
index b49909c8d94e..83c9dba28207 100644
--- a/pkgs/by-name/sl/sloth/package.nix
+++ b/pkgs/by-name/sl/sloth/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slok";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qyDKM5Y8wRvqFE9rqnPePBvi/1UwR4vDRQRVTxPc6Ug=";
   };
 
diff --git a/pkgs/by-name/sl/slowhttptest/package.nix b/pkgs/by-name/sl/slowhttptest/package.nix
index b7498a37ff51..3eadcc232a03 100644
--- a/pkgs/by-name/sl/slowhttptest/package.nix
+++ b/pkgs/by-name/sl/slowhttptest/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shekyan";
     repo = "slowhttptest";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rIvd3LykVAbDXtFWZ1EQ+QKeALzqwK6pq7In0BsCOFo=";
   };
 
diff --git a/pkgs/by-name/sl/slsa-verifier/package.nix b/pkgs/by-name/sl/slsa-verifier/package.nix
index 17d83e09c3b3..2c35c1f0ba67 100644
--- a/pkgs/by-name/sl/slsa-verifier/package.nix
+++ b/pkgs/by-name/sl/slsa-verifier/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slsa-framework";
     repo = "slsa-verifier";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wOK0S0XJ0LbFSr8Z/KEnKolq0u/SyBNDiugOAD0OmgY=";
   };
 
diff --git a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
index 9a8f4f4f389d..0dc9c42d4b8c 100644
--- a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
+++ b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stanford-rc";
     repo = "slurm-spank-stunnel";
-    tag = version;
+    rev = version;
     sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj";
   };
 
diff --git a/pkgs/by-name/sl/slurm-spank-x11/package.nix b/pkgs/by-name/sl/slurm-spank-x11/package.nix
index f89c0edf308b..bd3ff6f9ae82 100644
--- a/pkgs/by-name/sl/slurm-spank-x11/package.nix
+++ b/pkgs/by-name/sl/slurm-spank-x11/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hautreux";
     repo = "slurm-spank-x11";
-    tag = version;
+    rev = version;
     sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry";
   };
 
diff --git a/pkgs/by-name/sm/smag/package.nix b/pkgs/by-name/sm/smag/package.nix
index 63be365b14aa..fc0b1198de61 100644
--- a/pkgs/by-name/sm/smag/package.nix
+++ b/pkgs/by-name/sm/smag/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aantn";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Vyd35wYDNI4T7DdqihwpmJOAZGxjnCeWS609o3L+gHM=";
   };
 
diff --git a/pkgs/by-name/sm/smarty3-i18n/package.nix b/pkgs/by-name/sm/smarty3-i18n/package.nix
index 8fd6b64de3ad..cd7e2ac511c8 100644
--- a/pkgs/by-name/sm/smarty3-i18n/package.nix
+++ b/pkgs/by-name/sm/smarty3-i18n/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kikimosha";
     repo = "smarty3-i18n";
-    tag = version;
+    rev = version;
     sha256 = "0rjxq4wka73ayna3hb5dxc5pgc8bw8p5fy507yc6cv2pl4h4nji2";
   };
 
diff --git a/pkgs/by-name/sm/smarty3/package.nix b/pkgs/by-name/sm/smarty3/package.nix
index ce1bd043bce1..1e0b41001e6c 100644
--- a/pkgs/by-name/sm/smarty3/package.nix
+++ b/pkgs/by-name/sm/smarty3/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smarty-php";
     repo = "smarty";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QGhccIJ7BZTWGF+n8rmB1RCVyJKID95NW6Yb2VvqqGQ=";
   };
 
diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix
index 14f9c527a051..89b42204c16f 100644
--- a/pkgs/by-name/sm/smassh/package.nix
+++ b/pkgs/by-name/sm/smassh/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kraanzu";
     repo = "smassh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P0fZHSsaKIwJspEBxM5MEK3Z4kemXJWlIOQI9cmvlF4=";
   };
 
diff --git a/pkgs/by-name/sm/smatch/package.nix b/pkgs/by-name/sm/smatch/package.nix
index 6741eddc02a7..b373f462a365 100644
--- a/pkgs/by-name/sm/smatch/package.nix
+++ b/pkgs/by-name/sm/smatch/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "error27";
     repo = "smatch";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME=";
   };
 
diff --git a/pkgs/by-name/sm/smcroute/package.nix b/pkgs/by-name/sm/smcroute/package.nix
index 5c5d7640314c..8b1dd8420ca1 100644
--- a/pkgs/by-name/sm/smcroute/package.nix
+++ b/pkgs/by-name/sm/smcroute/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "smcroute";
-    tag = version;
+    rev = version;
     sha256 = "sha256-b1FsaDw5wAZkOwc6Y7TsMwyfxIRQ2rNUTK+knEzOn7w=";
   };
 
diff --git a/pkgs/by-name/sm/smenu/package.nix b/pkgs/by-name/sm/smenu/package.nix
index e8029ce596f9..8a76da58bd4b 100644
--- a/pkgs/by-name/sm/smenu/package.nix
+++ b/pkgs/by-name/sm/smenu/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "p-gen";
     repo = "smenu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pAbtTqDIdDWReeaRK7UHXh/PS5f44/PRWaICluH02ec=";
   };
 
diff --git a/pkgs/by-name/sm/smimesign/package.nix b/pkgs/by-name/sm/smimesign/package.nix
index 02296c1d38a6..59c468ccc111 100644
--- a/pkgs/by-name/sm/smimesign/package.nix
+++ b/pkgs/by-name/sm/smimesign/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "github";
     repo = "smimesign";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W9Hj/+snx+X6l95Gt9d8DiLnBPV9npKydc/zMN9G0vQ=";
   };
 
diff --git a/pkgs/by-name/sm/smlfmt/package.nix b/pkgs/by-name/sm/smlfmt/package.nix
index 9f8810bf0fcc..6eed84bd0bb5 100644
--- a/pkgs/by-name/sm/smlfmt/package.nix
+++ b/pkgs/by-name/sm/smlfmt/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shwestrick";
     repo = "smlfmt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qwhYOZrck028NliPDnqFZel3IxopQzouhHq6R7DkfPE=";
   };
 
diff --git a/pkgs/by-name/sm/smlfut/package.nix b/pkgs/by-name/sm/smlfut/package.nix
index 78b87874b063..21938595b301 100644
--- a/pkgs/by-name/sm/smlfut/package.nix
+++ b/pkgs/by-name/sm/smlfut/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "diku-dk";
     repo = "smlfut";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0Bqgoyp43Y961BMghJFBUx+1lcM2HHlPDjPyLHquWiE=";
   };
 
diff --git a/pkgs/by-name/sm/smlpkg/package.nix b/pkgs/by-name/sm/smlpkg/package.nix
index 4b865daff55d..6a77c6878e7b 100644
--- a/pkgs/by-name/sm/smlpkg/package.nix
+++ b/pkgs/by-name/sm/smlpkg/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "diku-dk";
     repo = "smlpkg";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xmbdnfc34ia0a78dhkfv5jyadxndinhw8c47l1mjd4l7n8vqnph";
   };
 
diff --git a/pkgs/by-name/sm/smooth/package.nix b/pkgs/by-name/sm/smooth/package.nix
index fe792ce20c7c..4fdeb5a47b24 100644
--- a/pkgs/by-name/sm/smooth/package.nix
+++ b/pkgs/by-name/sm/smooth/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "enzo1982";
     repo = "smooth";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-J2Do1iAbE1GBC8co/4nxOzeGJQiPRc+21fgMDpzKX+A=";
   };
 
diff --git a/pkgs/by-name/sm/smu/package.nix b/pkgs/by-name/sm/smu/package.nix
index 629bbd80ed3c..dbbd80702aa0 100644
--- a/pkgs/by-name/sm/smu/package.nix
+++ b/pkgs/by-name/sm/smu/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gottox";
     repo = "smu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1jm7lhnzjx4q7gcwlkvsbffcy0zppywyh50d71ami6dnq182vvcc";
   };
 
diff --git a/pkgs/by-name/sm/smug/package.nix b/pkgs/by-name/sm/smug/package.nix
index 560d19405168..c7745d1a5cee 100644
--- a/pkgs/by-name/sm/smug/package.nix
+++ b/pkgs/by-name/sm/smug/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ivaaaan";
     repo = "smug";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9So81tZwQa3rQYgVO+KjOlTVIzlm/e2K5C/qULZeA7U=";
   };
 
diff --git a/pkgs/by-name/sn/sn-pro/package.nix b/pkgs/by-name/sn/sn-pro/package.nix
index 6e296c5eb7d9..51bbee772936 100644
--- a/pkgs/by-name/sn/sn-pro/package.nix
+++ b/pkgs/by-name/sn/sn-pro/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "supernotes";
     repo = "sn-pro";
-    tag = version;
+    rev = version;
     hash = "sha256-bagirVJtpGZOB3rULKemniGj1BkN9SQYpFhTm4ZX/is=";
   };
 
diff --git a/pkgs/by-name/sn/snabb/package.nix b/pkgs/by-name/sn/snabb/package.nix
index 160d412c1453..2adae8cc4dd8 100644
--- a/pkgs/by-name/sn/snabb/package.nix
+++ b/pkgs/by-name/sn/snabb/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "snabbco";
     repo = "snabb";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-2ULkzNeyEkXFdd8BUEcY5wZswh8Z4s4ONqSQbeWK2Qs=";
   };
 
diff --git a/pkgs/by-name/sn/snapper/package.nix b/pkgs/by-name/sn/snapper/package.nix
index a201c60771d7..11ab0eb18e76 100644
--- a/pkgs/by-name/sn/snapper/package.nix
+++ b/pkgs/by-name/sn/snapper/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "snapper";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yVjsbWa7t+md0xdy5eFST+pkPbXhgfyJcTt+aNkQpsQ=";
   };
 
diff --git a/pkgs/by-name/sn/snappy/package.nix b/pkgs/by-name/sn/snappy/package.nix
index cf51a2c3f7f1..cb6c6e559b89 100644
--- a/pkgs/by-name/sn/snappy/package.nix
+++ b/pkgs/by-name/sn/snappy/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "snappy";
-    tag = version;
+    rev = version;
     hash = "sha256-IzKzrMDjh+Weor+OrKdX62cAKYTdDXgldxCgNE2/8vk=";
   };
 
diff --git a/pkgs/by-name/sn/snapraid/package.nix b/pkgs/by-name/sn/snapraid/package.nix
index 8f0cf4c59ac5..dc9e35aca1ff 100644
--- a/pkgs/by-name/sn/snapraid/package.nix
+++ b/pkgs/by-name/sn/snapraid/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amadvance";
     repo = "snapraid";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7guTRH9AZCsQYyWLpws19/sEe9GVFop21GYPzXCK6Fg=";
   };
 
diff --git a/pkgs/by-name/sn/snapweb/package.nix b/pkgs/by-name/sn/snapweb/package.nix
index b3e4f3d82559..e3b1673a9180 100644
--- a/pkgs/by-name/sn/snapweb/package.nix
+++ b/pkgs/by-name/sn/snapweb/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "badaix";
     repo = "snapweb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rrJmuTFk2dC+GqYmBZ+hu5hx1iknAgSWjr22S7bfmEE=";
   };
 
diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix
index 948c4214b699..38efbbf4ec75 100644
--- a/pkgs/by-name/sn/snazy/package.nix
+++ b/pkgs/by-name/sn/snazy/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Vc3L93S7WQAcqsLIhiCrTGmmc+1q26zRpOWXyUNFNVc=";
   };
 
diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix
index 84d2febd66a9..970f4a48ee26 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";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-INMVyB3alwmsApO7ToAaUWgh7jlg2MeLxqHCEnUO88U=";
   };
diff --git a/pkgs/by-name/sn/sngrep/package.nix b/pkgs/by-name/sn/sngrep/package.nix
index 895c2188a639..44639ea1d8e5 100644
--- a/pkgs/by-name/sn/sngrep/package.nix
+++ b/pkgs/by-name/sn/sngrep/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "irontec";
     repo = "sngrep";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-nvuT//FWJAa6DzmjBsBW9s2p1M+6Zs4cVmpK4dVemnE=";
   };
 
diff --git a/pkgs/by-name/sn/sniffglue/package.nix b/pkgs/by-name/sn/sniffglue/package.nix
index b84e7c70bff5..459d2fb5f576 100644
--- a/pkgs/by-name/sn/sniffglue/package.nix
+++ b/pkgs/by-name/sn/sniffglue/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "sniffglue";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Pp/SJJQFpEU/4GKZQB8BjRGS4hqB850QbSb5WoG6Wh4=";
   };
 
diff --git a/pkgs/by-name/sn/snippetpixie/package.nix b/pkgs/by-name/sn/snippetpixie/package.nix
index 83b77c416544..1e0382ff5f61 100644
--- a/pkgs/by-name/sn/snippetpixie/package.nix
+++ b/pkgs/by-name/sn/snippetpixie/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bytepixie";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0gs3d9hdywg4vcfbp4qfcagfjqalfgw9xpvywg4pw1cm3rzbdqmz";
   };
 
diff --git a/pkgs/by-name/sn/sniproxy/package.nix b/pkgs/by-name/sn/sniproxy/package.nix
index 24f810eed53c..9714d6de36d1 100644
--- a/pkgs/by-name/sn/sniproxy/package.nix
+++ b/pkgs/by-name/sn/sniproxy/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dlundquist";
     repo = "sniproxy";
-    tag = version;
+    rev = version;
     sha256 = "sha256-htM9CrzaGnn1dnsWQ+0V6N65Og7rsFob3BlSc4UGfFU=";
   };
 
diff --git a/pkgs/by-name/sn/snips-sh/package.nix b/pkgs/by-name/sn/snips-sh/package.nix
index adeefd4aadc1..2c0650c0a0e0 100644
--- a/pkgs/by-name/sn/snips-sh/package.nix
+++ b/pkgs/by-name/sn/snips-sh/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "robherley";
     repo = "snips.sh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IjGXGY75k9VeeHek0V8SrIElmiQ+Q2P5gEDIp7pmQd8=";
   };
 
diff --git a/pkgs/by-name/sn/snooze/package.nix b/pkgs/by-name/sn/snooze/package.nix
index b6ed3616711b..d57f48e36a0e 100644
--- a/pkgs/by-name/sn/snooze/package.nix
+++ b/pkgs/by-name/sn/snooze/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "snooze";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-K77axli/mapUr3yxpmUfFq4iWwgRmEVUlP6+/0Iezwo=";
   };
   makeFlags = [
diff --git a/pkgs/by-name/sn/snore/package.nix b/pkgs/by-name/sn/snore/package.nix
index 7311f17fcfbe..5ad31a29ee35 100644
--- a/pkgs/by-name/sn/snore/package.nix
+++ b/pkgs/by-name/sn/snore/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "clamiax";
     repo = "snore";
-    tag = version;
+    rev = version;
     hash = "sha256-bKPGSePzp4XEZFY0QQr37fm3R1v3hLD6FeySFd7zNJc=";
   };
 
diff --git a/pkgs/by-name/sn/snowcat/package.nix b/pkgs/by-name/sn/snowcat/package.nix
index 44c6eca4fb63..aa4899dda997 100644
--- a/pkgs/by-name/sn/snowcat/package.nix
+++ b/pkgs/by-name/sn/snowcat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-EulQYGOMIh952e4Xp13hT/HMW3qP1QXYtt5PEej1VTY=";
   };
   vendorHash = "sha256-D6ipwGMxT0B3uYUzg6Oo2TYnsOVBY0mYO5lC7vtVPc0=";
diff --git a/pkgs/by-name/so/social-engineer-toolkit/package.nix b/pkgs/by-name/so/social-engineer-toolkit/package.nix
index 1948578a432b..696ed2d71fb2 100644
--- a/pkgs/by-name/so/social-engineer-toolkit/package.nix
+++ b/pkgs/by-name/so/social-engineer-toolkit/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "trustedsec";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "ePbmUvnzLO0Wfuhym3bNSPV1x8rcCPqKMeWSRcbJGAo=";
   };
 
diff --git a/pkgs/by-name/so/sockperf/package.nix b/pkgs/by-name/so/sockperf/package.nix
index b684f65b3319..7a1415d2e1f3 100644
--- a/pkgs/by-name/so/sockperf/package.nix
+++ b/pkgs/by-name/so/sockperf/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mellanox";
     repo = "sockperf";
-    tag = version;
+    rev = version;
     sha256 = "sha256-VvxL/bcn69uL7CBpDu4qwbKZwlC4N/kNeRX4k3UzxPI=";
   };
 
diff --git a/pkgs/by-name/so/soco-cli/package.nix b/pkgs/by-name/so/soco-cli/package.nix
index e4a5c9b5e05e..437d2cd92b53 100644
--- a/pkgs/by-name/so/soco-cli/package.nix
+++ b/pkgs/by-name/so/soco-cli/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "avantrec";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WxBwHjh5tCXclQXqrHrpvZdcQU93RObteAfZyyVvKf0=";
   };
 
diff --git a/pkgs/by-name/so/sof-tools/package.nix b/pkgs/by-name/so/sof-tools/package.nix
index 3c08cb3abf2c..a48693df45c2 100644
--- a/pkgs/by-name/so/sof-tools/package.nix
+++ b/pkgs/by-name/so/sof-tools/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thesofproject";
     repo = "sof";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VmP0z3q1P8LqQ+ELZGkI7lEXGiMYdAPvS8Lbwv6dUyk=";
   };
 
diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix
index 909b045b9a9c..5f24aed06052 100644
--- a/pkgs/by-name/so/soft-serve/package.nix
+++ b/pkgs/by-name/so/soft-serve/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "soft-serve";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CFUcpQ0tFpK1yKNLBwhRP6ncr44Ql3s30BNWYUiXH/w=";
   };
 
diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix
index 077880e1228a..8e589e257a6a 100644
--- a/pkgs/by-name/so/solvespace/package.nix
+++ b/pkgs/by-name/so/solvespace/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "solvespace";
     repo = "solvespace";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sSDht8pBrOG1YpsWfC/CLTTWh2cI5pn2PXGH900Z0yA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/so/somafm-cli/package.nix b/pkgs/by-name/so/somafm-cli/package.nix
index a3efbffefae5..7a9042b6836b 100644
--- a/pkgs/by-name/so/somafm-cli/package.nix
+++ b/pkgs/by-name/so/somafm-cli/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rockymadden";
     repo = "somafm-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1h5p9qsczgfr450sklh2vkllcpzb7nicbs8ciyvkavh3d7hds0yy";
   };
 
diff --git a/pkgs/by-name/so/somatic-sniper/package.nix b/pkgs/by-name/so/somatic-sniper/package.nix
index 8fa006d46d55..e979fcee2cb7 100644
--- a/pkgs/by-name/so/somatic-sniper/package.nix
+++ b/pkgs/by-name/so/somatic-sniper/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "genome";
     repo = "somatic-sniper";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0lk7p9sp6mp50f6w1nppqhr40fcwy1asw06ivw8w8jvvnwaqf987";
   };
 
diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix
index 81eb6d1ae577..d3205fbccf88 100644
--- a/pkgs/by-name/so/sonarlint-ls/package.nix
+++ b/pkgs/by-name/so/sonarlint-ls/package.nix
@@ -21,7 +21,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "SonarSource";
     repo = "sonarlint-language-server";
-    tag = version;
+    rev = version;
     hash = "sha256-/SpooLAJutBJ/FakSUyXMtPLy3TaPxCU8KEMnnzgdBs=";
   };
 
diff --git a/pkgs/by-name/so/sonata/package.nix b/pkgs/by-name/so/sonata/package.nix
index b20cc0388c29..2311c8d3ba13 100644
--- a/pkgs/by-name/so/sonata/package.nix
+++ b/pkgs/by-name/so/sonata/package.nix
@@ -29,7 +29,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "multani";
     repo = "sonata";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x";
   };
 
diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix
index b235a4bf64b6..aaff4caac201 100644
--- a/pkgs/by-name/so/songrec/package.nix
+++ b/pkgs/by-name/so/songrec/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "marin-m";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-pTonrxlYvfuLRKMXW0Lao4KCoNFlMzE9rH+hwpa60JY=";
   };
 
diff --git a/pkgs/by-name/so/sonivox/package.nix b/pkgs/by-name/so/sonivox/package.nix
index 62fbba276eac..717f8eefa752 100644
--- a/pkgs/by-name/so/sonivox/package.nix
+++ b/pkgs/by-name/so/sonivox/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pedrolcl";
     repo = "sonivox";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-k+EhhLFp+ehptjDS8ZHvo5tfFxmSCA2lFTjkWFLi+cs=";
   };
 
diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix
index bdcc44d62730..e752dddf7b6a 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";
-    tag = finalAttrs.version;
+    rev = 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 c17507fb6faf..0682713cf1c5 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vhI97KheKzr87exCh4xNN7NDefcagdMu1tWSt67vLiU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/so/sooperlooper/package.nix b/pkgs/by-name/so/sooperlooper/package.nix
index 5da1c393f061..2dd184be7ecf 100644
--- a/pkgs/by-name/so/sooperlooper/package.nix
+++ b/pkgs/by-name/so/sooperlooper/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "essej";
     repo = "sooperlooper";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Lrsz/UDCgoac63FJ3CaPVaYwvBtzkGQQRLhUi6lUusE=";
   };
 
diff --git a/pkgs/by-name/so/sophus/package.nix b/pkgs/by-name/so/sophus/package.nix
index 5acb8802daf5..69e59195e7ac 100644
--- a/pkgs/by-name/so/sophus/package.nix
+++ b/pkgs/by-name/so/sophus/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "strasdat";
     repo = "Sophus";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-k5t3kSUrH6B1f60dtqq3Ai4R4D2h+Ld+6Cpljl/AN0w=";
   };
 
diff --git a/pkgs/by-name/so/sord/package.nix b/pkgs/by-name/so/sord/package.nix
index 9cbdf03cc496..bec23bbd710c 100644
--- a/pkgs/by-name/so/sord/package.nix
+++ b/pkgs/by-name/so/sord/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "drobilla";
     repo = "sord";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cFobmmO2RHJdfCgTyGigzsdLpj7YF6U3r71i267Azks=";
   };
 
diff --git a/pkgs/by-name/so/souffle/package.nix b/pkgs/by-name/so/souffle/package.nix
index 45f7992bef68..d0f8a16c7342 100644
--- a/pkgs/by-name/so/souffle/package.nix
+++ b/pkgs/by-name/so/souffle/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "souffle-lang";
     repo = "souffle";
-    tag = version;
+    rev = version;
     sha256 = "sha256-U3/1iNOLFzuXiBsVDAc5AXnK4F982Uifp18jjFNUv2o=";
   };
 
diff --git a/pkgs/by-name/so/soundtouch/package.nix b/pkgs/by-name/so/soundtouch/package.nix
index d3deff2f69eb..12540494e975 100644
--- a/pkgs/by-name/so/soundtouch/package.nix
+++ b/pkgs/by-name/so/soundtouch/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "soundtouch";
     repo = "soundtouch";
-    tag = version;
+    rev = version;
     hash = "sha256-imeeTj+3gXxoGTuC/13+BAplwcnQ0wRJdSVt7MPlBxc=";
   };
 
diff --git a/pkgs/by-name/so/sov/package.nix b/pkgs/by-name/so/sov/package.nix
index b07f80088b23..e7a27e8372a3 100644
--- a/pkgs/by-name/so/sov/package.nix
+++ b/pkgs/by-name/so/sov/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "milgra";
     repo = "sov";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-JgLah21ye3G9jE3UTZu8r+nanwBDIQXmqv9iP1C+aUw=";
   };
 
diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix
index 27d47b26dff4..cd8a5bae52ca 100644
--- a/pkgs/by-name/so/sozu/package.nix
+++ b/pkgs/by-name/so/sozu/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sozu-proxy";
     repo = "sozu";
-    tag = version;
+    rev = version;
     hash = "sha256-Cda53lhKPxm2w8guoKuQjdjhZNWJinzR1PHc5S57y2w=";
   };
 
diff --git a/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix
index d42c2c8ae813..12455e9dc40e 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix
@@ -36,7 +36,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "space-wizards";
     repo = "SS14.Launcher";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Gajs8zINWBJ3BvAPKYan0bCRbEVscz56pyE9WOLiOqU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix
index e437f2e09605..da44ad45380c 100644
--- a/pkgs/by-name/sp/spaceFM/package.nix
+++ b/pkgs/by-name/sp/spaceFM/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IgnorantGuru";
     repo = "spacefm";
-    tag = version;
+    rev = version;
     sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
   };
 
diff --git a/pkgs/by-name/sp/spacebar/package.nix b/pkgs/by-name/sp/spacebar/package.nix
index d4d63d1d399a..535b8d5876d8 100644
--- a/pkgs/by-name/sp/spacebar/package.nix
+++ b/pkgs/by-name/sp/spacebar/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cmacrae";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM=";
   };
 
diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix
index 9e16fba31f6a..5be2be78aa8b 100644
--- a/pkgs/by-name/sp/spacectl/package.nix
+++ b/pkgs/by-name/sp/spacectl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "spacelift-io";
     repo = "spacectl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3s64o4rmkbvT9rOdqYZN1No08Lh1S4oNlIal+otfhWU=";
   };
 
diff --git a/pkgs/by-name/sp/spacer/package.nix b/pkgs/by-name/sp/spacer/package.nix
index 7d3fe8abca3a..c195e03b3f6e 100644
--- a/pkgs/by-name/sp/spacer/package.nix
+++ b/pkgs/by-name/sp/spacer/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "samwho";
     repo = "spacer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N6HNPuEYcbuqpHv8Qr43iRtRdtyBo4TP7YccIcbpIpc=";
   };
 
diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix
index f342e4c205e9..e6c64c1c4484 100644
--- a/pkgs/by-name/sp/spaceship-prompt/package.nix
+++ b/pkgs/by-name/sp/spaceship-prompt/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "denysdovhan";
     repo = "spaceship-prompt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-a7z/z++dmwMqIrutOc74ljz/Tu/wuEuQaN2XRBMtOvw=";
   };
 
diff --git a/pkgs/by-name/sp/spacevim/package.nix b/pkgs/by-name/sp/spacevim/package.nix
index e2a6da8fdc7b..104e30e50d1c 100644
--- a/pkgs/by-name/sp/spacevim/package.nix
+++ b/pkgs/by-name/sp/spacevim/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SpaceVim";
     repo = "SpaceVim";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qiNadhQJjU9RY14X8+pd4Ul+NLoNqbxuh3Kenw1dHDc=";
   };
 
diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix
index d41c1e142d28..657976b3d2cb 100644
--- a/pkgs/by-name/sp/spade/package.nix
+++ b/pkgs/by-name/sp/spade/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "spade-lang";
     repo = "spade";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eWeEbwIm+PC0XHmvV3xZqUIcA01arnalbGFtPTUP9tg=";
     # only needed for vatch, which contains test data
     fetchSubmodules = true;
diff --git a/pkgs/by-name/sp/span-lite/package.nix b/pkgs/by-name/sp/span-lite/package.nix
index ae70110ce175..50940924f3ab 100644
--- a/pkgs/by-name/sp/span-lite/package.nix
+++ b/pkgs/by-name/sp/span-lite/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martinmoene";
     repo = "span-lite";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BYRSdGzIvrOjPXxeabMj4tPFmQ0wfq7y+zJf6BD/bTw=";
   };
 
diff --git a/pkgs/by-name/sp/sparkleshare/package.nix b/pkgs/by-name/sp/sparkleshare/package.nix
index 7180d7dd4c96..62606d12dc97 100644
--- a/pkgs/by-name/sp/sparkleshare/package.nix
+++ b/pkgs/by-name/sp/sparkleshare/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hbons";
     repo = "SparkleShare";
-    tag = version;
+    rev = version;
     sha256 = "1a9csflmj96iyr1l0mdm3ziv1bljfcjnzm9xb2y4qqk7ha2p6fbq";
   };
 
diff --git a/pkgs/by-name/sp/spatial-shell/package.nix b/pkgs/by-name/sp/spatial-shell/package.nix
index 879714ef0ce5..1147698930ec 100644
--- a/pkgs/by-name/sp/spatial-shell/package.nix
+++ b/pkgs/by-name/sp/spatial-shell/package.nix
@@ -12,7 +12,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "lthms";
     repo = "spatial-shell";
-    tag = version;
+    rev = version;
     hash = "sha256-OeNBP/jea1ABh/WpvCP7We+L20WoTfLZH71raH7bKPI=";
   };
 
diff --git a/pkgs/by-name/sp/spdk/package.nix b/pkgs/by-name/sp/spdk/package.nix
index eae53a785d5d..7a3e57071253 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-27mbIycenOk51PLQrAfU1cZcjiWddNtxoyC6Q9wxqFg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sp/spdx-license-list-data/package.nix b/pkgs/by-name/sp/spdx-license-list-data/package.nix
index 810bde2389cd..c75633ed90bf 100644
--- a/pkgs/by-name/sp/spdx-license-list-data/package.nix
+++ b/pkgs/by-name/sp/spdx-license-list-data/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spdx";
     repo = "license-list-data";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Zz171OlSa8bzxQUinyO/FF4QjBc4wKp0EUEXwzJewEU=";
   };
 
diff --git a/pkgs/by-name/sp/spectra/package.nix b/pkgs/by-name/sp/spectra/package.nix
index cc6489dd40c3..9db8b068fb3f 100644
--- a/pkgs/by-name/sp/spectra/package.nix
+++ b/pkgs/by-name/sp/spectra/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yixuan";
     repo = "spectra";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ut6nEOpzIoFy+IUWQy9x2pJ4+sA0d/Dt8WaNq5AFCFg=";
   };
 
diff --git a/pkgs/by-name/sp/spfft/package.nix b/pkgs/by-name/sp/spfft/package.nix
index 870fd317b079..a1b0279b080b 100644
--- a/pkgs/by-name/sp/spfft/package.nix
+++ b/pkgs/by-name/sp/spfft/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eth-cscs";
     repo = "SpFFT";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Qc/omdRv7dW9NJUOczMZJKhc+Z/sXeIxv3SbpegAGdU=";
   };
 
diff --git a/pkgs/by-name/sp/spice-up/package.nix b/pkgs/by-name/sp/spice-up/package.nix
index 4c4218b83ad1..48b1bce684c3 100644
--- a/pkgs/by-name/sp/spice-up/package.nix
+++ b/pkgs/by-name/sp/spice-up/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Philip-Scott";
     repo = "Spice-up";
-    tag = version;
+    rev = version;
     sha256 = "sha256-FI6YMbqZfaU19k8pS2eoNCnX8O8F99SHHOxMwHC5fTc=";
   };
 
diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix
index 782b04ff1b13..24ba6b58db2c 100644
--- a/pkgs/by-name/sp/spicetify-cli/package.nix
+++ b/pkgs/by-name/sp/spicetify-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rdyHVHKVgl9fOviFYQuXY8Ko+/XwpKlKDfriQAgkusE=";
   };
 
diff --git a/pkgs/by-name/sp/spicy-parser-generator/package.nix b/pkgs/by-name/sp/spicy-parser-generator/package.nix
index 6a2d0f195229..41a2d44929e1 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MLwBklSNLqx3LgNSFvo5p/MPyt/IlYGwvTbN1PJlims=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sp/spicy/package.nix b/pkgs/by-name/sp/spicy/package.nix
index e44bea0355fd..76db75020481 100644
--- a/pkgs/by-name/sp/spicy/package.nix
+++ b/pkgs/by-name/sp/spicy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trhodeos";
     repo = "spicy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TodMm4UbnLB+LiyfPVXT7bcVLbyBFbGoOYQSsz3IMfM=";
   };
 
diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix
index 5bf80fb8f1d0..d4563bebf85f 100644
--- a/pkgs/by-name/sp/spire/package.nix
+++ b/pkgs/by-name/sp/spire/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "spiffe";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hNa1e6h4IhD2SfhZZ5xkwQ7e7X5x3Gk4v33nw2t+cvk=";
   };
 
diff --git a/pkgs/by-name/sp/spla/package.nix b/pkgs/by-name/sp/spla/package.nix
index a987797a1507..ee203b200913 100644
--- a/pkgs/by-name/sp/spla/package.nix
+++ b/pkgs/by-name/sp/spla/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eth-cscs";
     repo = "spla";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fNH1IOKV1Re8G7GH9Xfn3itR80eonTbEGKQRRD16/2k=";
   };
 
diff --git a/pkgs/by-name/sp/spoof/package.nix b/pkgs/by-name/sp/spoof/package.nix
index f832acc961ee..a9af358d968b 100644
--- a/pkgs/by-name/sp/spoof/package.nix
+++ b/pkgs/by-name/sp/spoof/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "feross";
     repo = "spoof";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oysURKLQ/rbGAvsy3K0OmDRHUqRKa8S8l5ihBjNqYXc=";
   };
 
diff --git a/pkgs/by-name/sp/spoofdpi/package.nix b/pkgs/by-name/sp/spoofdpi/package.nix
index f80e0b85d584..1b7d67f8cd36 100644
--- a/pkgs/by-name/sp/spoofdpi/package.nix
+++ b/pkgs/by-name/sp/spoofdpi/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xvzc";
     repo = "SpoofDPI";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m4fhFhZLuWT1diDlDTmTsNrckKTjhEZbhciv44FZcro=";
   };
 
diff --git a/pkgs/by-name/sp/spotify-tray/package.nix b/pkgs/by-name/sp/spotify-tray/package.nix
index 5a0924f20689..60c1d1eb8d10 100644
--- a/pkgs/by-name/sp/spotify-tray/package.nix
+++ b/pkgs/by-name/sp/spotify-tray/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tsmetana";
     repo = "spotify-tray";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-E86rA8cBjy/bI7sZHlT40o7i23PcONXT5GTHEfcaDf0=";
   };
 
diff --git a/pkgs/by-name/sp/spral/package.nix b/pkgs/by-name/sp/spral/package.nix
index f5f0f94cd9e7..e8376d81e716 100644
--- a/pkgs/by-name/sp/spral/package.nix
+++ b/pkgs/by-name/sp/spral/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ralna";
     repo = "spral";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tuhJClSjah/ud6PVr6biOq5KdKtspJ7hpWZ350yzz+U=";
   };
 
diff --git a/pkgs/by-name/sp/spruce/package.nix b/pkgs/by-name/sp/spruce/package.nix
index cb4fdd7a666f..7e84b075cfae 100644
--- a/pkgs/by-name/sp/spruce/package.nix
+++ b/pkgs/by-name/sp/spruce/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "geofffranks";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wLxPHaCU0fciSIdK26dV4XOnJsp5EKKEXzgspWC1GvA=";
   };
 
diff --git a/pkgs/by-name/sp/sptk/package.nix b/pkgs/by-name/sp/sptk/package.nix
index 0b7b2acaf8b3..79a0c8a4c501 100644
--- a/pkgs/by-name/sp/sptk/package.nix
+++ b/pkgs/by-name/sp/sptk/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sp-nitech";
     repo = "SPTK";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lIyOcN2AR3ilUZ9stpicjbwlredbwgGPwmMICxZEijU=";
   };
 
diff --git a/pkgs/by-name/sp/sptlrx/package.nix b/pkgs/by-name/sp/sptlrx/package.nix
index 535bae927b8e..4c20e7a6d59a 100644
--- a/pkgs/by-name/sp/sptlrx/package.nix
+++ b/pkgs/by-name/sp/sptlrx/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "raitonoberu";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-b8ALhEjolH0RH+I9HVQeOagPBi2isLNUxqKdj5u2O9s=";
   };
 
diff --git a/pkgs/by-name/sp/spyre/package.nix b/pkgs/by-name/sp/spyre/package.nix
index bcef0ab1f2f0..c9296162f014 100644
--- a/pkgs/by-name/sp/spyre/package.nix
+++ b/pkgs/by-name/sp/spyre/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "spyre-project";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wlGZTMCJE6Ki5/6R6J9EJP06/S125BNNd/jNPYGwKNw=";
   };
 
diff --git a/pkgs/by-name/sq/sq/package.nix b/pkgs/by-name/sq/sq/package.nix
index c3fca2762594..6b18c426d126 100644
--- a/pkgs/by-name/sq/sq/package.nix
+++ b/pkgs/by-name/sq/sq/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "neilotoole";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-y7+UfwTbL0KTQgz4JX/q6QQqL0n8SO1qgKTrK9AFhO4=";
   };
 
diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix
index 9078007970dd..9125450950b3 100644
--- a/pkgs/by-name/sq/sql-formatter/package.nix
+++ b/pkgs/by-name/sq/sql-formatter/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sql-formatter-org";
     repo = "sql-formatter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-13S7Qagra+RxWOct7wsvK1C0QftWtLZRB58YVWw9gGU=";
   };
 
diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix
index 0726f9d62504..1624d07f80aa 100644
--- a/pkgs/by-name/sq/sql-studio/package.nix
+++ b/pkgs/by-name/sq/sql-studio/package.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "frectonz";
     repo = "sql-studio";
-    tag = version;
+    rev = version;
     hash = "sha256-ZWGV4DYf+85LIGVDc8hcWSEJsM6UisuCB2Wd2kiw/sk=";
   };
 
diff --git a/pkgs/by-name/sq/sqlcheck/package.nix b/pkgs/by-name/sq/sqlcheck/package.nix
index 7bcf34efe87e..15bd89c81f8f 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rGqCtEO2K+OT44nYU93mF1bJ07id+ixPkRSC8DcO6rY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sq/sqlcipher/package.nix b/pkgs/by-name/sq/sqlcipher/package.nix
index c8925deeb415..c102af52448b 100644
--- a/pkgs/by-name/sq/sqlcipher/package.nix
+++ b/pkgs/by-name/sq/sqlcipher/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sqlcipher";
     repo = "sqlcipher";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VcD3NwVrC75kLOJiIgrnzVpkBPhjxTmEFyKg/87wHGc=";
   };
 
diff --git a/pkgs/by-name/sq/sqlcmd/package.nix b/pkgs/by-name/sq/sqlcmd/package.nix
index 479b773b8e1c..bb27d50a6870 100644
--- a/pkgs/by-name/sq/sqlcmd/package.nix
+++ b/pkgs/by-name/sq/sqlcmd/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "go-sqlcmd";
     owner = "microsoft";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LHNH/Jybtv+P/mRby3/nn8XjDHYWDTtgefb8z35J2VM=";
   };
 
diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix
index 46f0824f8ab1..bfcda6373cb3 100644
--- a/pkgs/by-name/sq/sqldef/package.nix
+++ b/pkgs/by-name/sq/sqldef/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sqldef";
     repo = "sqldef";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vwkvKOM8/57lzT6toLqaux3yJD6zYi+J5Ae1qhxnhEw=";
   };
 
diff --git a/pkgs/by-name/sq/sqlitecpp/package.nix b/pkgs/by-name/sq/sqlitecpp/package.nix
index f6f8f5a33494..e1dcac1598de 100644
--- a/pkgs/by-name/sq/sqlitecpp/package.nix
+++ b/pkgs/by-name/sq/sqlitecpp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "SRombauts";
     repo = "sqlitecpp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-rsVFk4FsonrwpBd3TonkxilwWeOBocH8AyeB+71OBdI=";
   };
 
diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix
index b105af2c91f0..9972a052e431 100644
--- a/pkgs/by-name/sq/sqlitestudio/package.nix
+++ b/pkgs/by-name/sq/sqlitestudio/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pawelsalawa";
     repo = "sqlitestudio";
-    tag = version;
+    rev = version;
     hash = "sha256-nGu1MYI3uaQ/3rc5LlixF6YEUU+pUsB6rn/yjFDGYf0=";
   };
 
diff --git a/pkgs/by-name/sq/sqls/package.nix b/pkgs/by-name/sq/sqls/package.nix
index 114a07f295d8..473beadb4be0 100644
--- a/pkgs/by-name/sq/sqls/package.nix
+++ b/pkgs/by-name/sq/sqls/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sqls-server";
     repo = "sqls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-b3zLyj2n+eKOPBRooS68GfM0bsiTVXDblYKyBYKiYug=";
   };
 
diff --git a/pkgs/by-name/sq/squashfsTools/package.nix b/pkgs/by-name/sq/squashfsTools/package.nix
index bedbac1470fc..8629b8f53943 100644
--- a/pkgs/by-name/sq/squashfsTools/package.nix
+++ b/pkgs/by-name/sq/squashfsTools/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "plougher";
     repo = "squashfs-tools";
-    tag = version;
+    rev = version;
     hash = "sha256-C/awQpp1Q/0adx3YVNTq6ruEAzcjL5G7SkOCgpvAA50=";
   };
 
diff --git a/pkgs/by-name/sq/squashfuse/package.nix b/pkgs/by-name/sq/squashfuse/package.nix
index 9c877676c57a..172979803507 100644
--- a/pkgs/by-name/sq/squashfuse/package.nix
+++ b/pkgs/by-name/sq/squashfuse/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vasi";
     repo = "squashfuse";
-    tag = version;
+    rev = version;
     sha256 = "sha256-d2mc6bIlprnVV5yCN7WxrE91ZMTSaJtpR0UVEROoYJQ=";
   };
 
diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix
index f2cabc0e572e..d3fabde12927 100644
--- a/pkgs/by-name/sq/squirreldisk/package.nix
+++ b/pkgs/by-name/sq/squirreldisk/package.nix
@@ -23,7 +23,7 @@ let
   src = fetchFromGitHub {
     owner = "adileo";
     repo = "squirreldisk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-As2nvc68knjeLPuX0QLBoybj8vuvkpS5Vr+7U7E5CjA=";
   };
   frontend-build = buildNpmPackage {
diff --git a/pkgs/by-name/sr/srain/package.nix b/pkgs/by-name/sr/srain/package.nix
index 6a091c84a51c..96eaf54390ec 100644
--- a/pkgs/by-name/sr/srain/package.nix
+++ b/pkgs/by-name/sr/srain/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SrainApp";
     repo = "srain";
-    tag = version;
+    rev = version;
     hash = "sha256-c5dy5dD5Eb/MVNCpLqIGNuafsrmgLjEfRfSxKVxu5wY=";
   };
 
diff --git a/pkgs/by-name/sr/srandrd/package.nix b/pkgs/by-name/sr/srandrd/package.nix
index 4fb359fc9b98..28f2136486af 100644
--- a/pkgs/by-name/sr/srandrd/package.nix
+++ b/pkgs/by-name/sr/srandrd/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jceb";
     repo = "srandrd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Wf+tVqDaNAiH6UHN8fFv2wM+LEch6wKlZOkqWEqLLkw=";
   };
 
diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix
index 1678198e4f60..3057f97ad5ae 100644
--- a/pkgs/by-name/sr/src-cli/package.nix
+++ b/pkgs/by-name/sr/src-cli/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "src-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-vxoki4kQL3B0v3AhqZGzw3U5BF73Jg5pX92EldTYiWg=";
   };
 
diff --git a/pkgs/by-name/sr/sregex/package.nix b/pkgs/by-name/sr/sregex/package.nix
index ed9a4a9f9e40..8472743e5336 100644
--- a/pkgs/by-name/sr/sregex/package.nix
+++ b/pkgs/by-name/sr/sregex/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openresty";
     repo = "sregex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HZ9O/3BQHHrTVLLlU0o1fLHxyRSesBhreT3IdGHnNsg=";
   };
 
diff --git a/pkgs/by-name/sr/srisum/package.nix b/pkgs/by-name/sr/srisum/package.nix
index 3da213557a75..085d7f7011fe 100644
--- a/pkgs/by-name/sr/srisum/package.nix
+++ b/pkgs/by-name/sr/srisum/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zkat";
     repo = "srisum-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Nw3uTGOcz1ivAm9X+PnOdNA937wuK3vtJQ0iJHlHVdw=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/sr/srt/package.nix b/pkgs/by-name/sr/srt/package.nix
index 35f2f60b75a9..6dfb61849ad6 100644
--- a/pkgs/by-name/sr/srt/package.nix
+++ b/pkgs/by-name/sr/srt/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Haivision";
     repo = "srt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-NLy9GuP4OT/kKAIIDXSHtsmaBzXRuFohFM/aM+46cao=";
   };
 
diff --git a/pkgs/by-name/sr/srtp/package.nix b/pkgs/by-name/sr/srtp/package.nix
index 42dac8854635..6d3262407817 100644
--- a/pkgs/by-name/sr/srtp/package.nix
+++ b/pkgs/by-name/sr/srtp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cisco";
     repo = "libsrtp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vWL5bksKT5NUoNkIRiJ2FeGODQthD8SgXjCaA7SeTe4=";
   };
 
diff --git a/pkgs/by-name/sr/srtrelay/package.nix b/pkgs/by-name/sr/srtrelay/package.nix
index 361db913c246..975a38408c37 100644
--- a/pkgs/by-name/sr/srtrelay/package.nix
+++ b/pkgs/by-name/sr/srtrelay/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "voc";
     repo = "srtrelay";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-llBPlfvW9Bvm9nL8w4BTOgccsQNAAb3omRBXBISNBcc=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-agents/package.nix b/pkgs/by-name/ss/ssh-agents/package.nix
index ede80771ba0b..7c15a763f42f 100644
--- a/pkgs/by-name/ss/ssh-agents/package.nix
+++ b/pkgs/by-name/ss/ssh-agents/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kalbasit";
     repo = "ssh-agents";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1l09zy87033v7hd17lhkxikwikqz5nj9x6c2w80rqpad4lp9ihwz";
   };
 
diff --git a/pkgs/by-name/ss/ssh-chat/package.nix b/pkgs/by-name/ss/ssh-chat/package.nix
index 3858fee0e7fe..a6592121aae9 100644
--- a/pkgs/by-name/ss/ssh-chat/package.nix
+++ b/pkgs/by-name/ss/ssh-chat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "shazow";
     repo = "ssh-chat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LgrqIuM/tLC0JqDai2TLu6G/edZ5Q7WFXjX5bzc0Bcc=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-key-confirmer/package.nix b/pkgs/by-name/ss/ssh-key-confirmer/package.nix
index 7643761536bb..7a9add923ca0 100644
--- a/pkgs/by-name/ss/ssh-key-confirmer/package.nix
+++ b/pkgs/by-name/ss/ssh-key-confirmer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "benjojo";
     repo = "ssh-key-confirmer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CXDjm8PMdCTwHnZWa0fYKel7Rmxq0XBWkfLmoVuSkKM=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-to-age/package.nix b/pkgs/by-name/ss/ssh-to-age/package.nix
index 8029d4151a5e..db0e49155c7d 100644
--- a/pkgs/by-name/ss/ssh-to-age/package.nix
+++ b/pkgs/by-name/ss/ssh-to-age/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "ssh-to-age";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Y+GC8Zkznjr0pTvYED+uE1v6zIg+tq44F++ZrBytS1E=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-to-pgp/package.nix b/pkgs/by-name/ss/ssh-to-pgp/package.nix
index a4a84ccfa9a3..2d7d8f3db54e 100644
--- a/pkgs/by-name/ss/ssh-to-pgp/package.nix
+++ b/pkgs/by-name/ss/ssh-to-pgp/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "ssh-to-pgp";
-    tag = version;
+    rev = version;
     sha256 = "sha256-h1/KWkbHpROkMRJ3pMN42/9+thlfY8BtWoOvqt7rxII=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-tpm-agent/package.nix b/pkgs/by-name/ss/ssh-tpm-agent/package.nix
index 9bc267d75248..ca13fe9d84ba 100644
--- a/pkgs/by-name/ss/ssh-tpm-agent/package.nix
+++ b/pkgs/by-name/ss/ssh-tpm-agent/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Foxboron";
     repo = "ssh-tpm-agent";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yK7G+wZIn+kJazKOFOs8EYlRWZkCQuT0qZfmdqbcOnM=";
   };
 
diff --git a/pkgs/by-name/ss/sshchecker/package.nix b/pkgs/by-name/ss/sshchecker/package.nix
index 5c2e55a166cd..9aef78f68877 100644
--- a/pkgs/by-name/ss/sshchecker/package.nix
+++ b/pkgs/by-name/ss/sshchecker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lazytools";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QMc64ynPLHQGsmDOsoChgmqmpRDyMYmmSAPwAEFBK40=";
   };
 
diff --git a/pkgs/by-name/ss/sshed/package.nix b/pkgs/by-name/ss/sshed/package.nix
index 4bf5a500233c..3927b72ce3d2 100644
--- a/pkgs/by-name/ss/sshed/package.nix
+++ b/pkgs/by-name/ss/sshed/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trntv";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-y8IQzOGs78T44jLcNNjPlfopyptX3Mhv2LdawqS1T+U=";
   };
 
diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix
index fa9851ef1b0d..5006d7e7901f 100644
--- a/pkgs/by-name/ss/sshesame/package.nix
+++ b/pkgs/by-name/ss/sshesame/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jaksi";
     repo = "sshesame";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-h0qvi90gbWm4LCL3FeipW8BKkbuUt0xGMTjaaeYadnE=";
   };
 
diff --git a/pkgs/by-name/ss/sshlatex/package.nix b/pkgs/by-name/ss/sshlatex/package.nix
index da19f566a1ab..2b5da221ea76 100644
--- a/pkgs/by-name/ss/sshlatex/package.nix
+++ b/pkgs/by-name/ss/sshlatex/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iblech";
     repo = "sshlatex";
-    tag = version;
+    rev = version;
     sha256 = "0kaah8is74zba9373xccmsxmnnn6kh0isr4qpg21x3qhdzhlxl7q";
   };
 
diff --git a/pkgs/by-name/ss/sshping/package.nix b/pkgs/by-name/ss/sshping/package.nix
index 34a62f73e693..0a9eb06350bc 100644
--- a/pkgs/by-name/ss/sshping/package.nix
+++ b/pkgs/by-name/ss/sshping/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spook";
     repo = "sshping";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0p1fvpgrsy44yvj44xp9k9nf6z1fh0sqcjvy75pcb9f5icgms815";
   };
 
diff --git a/pkgs/by-name/ss/sshportal/package.nix b/pkgs/by-name/ss/sshportal/package.nix
index a38c18ed6578..850a7739eb66 100644
--- a/pkgs/by-name/ss/sshportal/package.nix
+++ b/pkgs/by-name/ss/sshportal/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "moul";
     repo = "sshportal";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-XJ8Hgc8YoJaH2gYOvoYhcpY4qgasgyr4M+ecKJ/RXTs=";
   };
 
diff --git a/pkgs/by-name/ss/sshs/package.nix b/pkgs/by-name/ss/sshs/package.nix
index 970c57afaa77..3d1dff4682fb 100644
--- a/pkgs/by-name/ss/sshs/package.nix
+++ b/pkgs/by-name/ss/sshs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "quantumsheep";
     repo = "sshs";
-    tag = version;
+    rev = version;
     hash = "sha256-8tIIpGEQBXfLQ/Bok4KrpDGwoYhIQz/ylg6fUc6mBdc=";
   };
 
diff --git a/pkgs/by-name/ss/sslh/package.nix b/pkgs/by-name/ss/sslh/package.nix
index db165481f3b5..83a377e1be2a 100644
--- a/pkgs/by-name/ss/sslh/package.nix
+++ b/pkgs/by-name/ss/sslh/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yrutschle";
     repo = "sslh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-46lnQ+u+TfHrI2Yz5jd/Tl82K8mmqFY2Cqu6ktLiveA=";
   };
 
diff --git a/pkgs/by-name/ss/sslsplit/package.nix b/pkgs/by-name/ss/sslsplit/package.nix
index 1c4eff1c5bf5..3f1a8fd9e8b7 100644
--- a/pkgs/by-name/ss/sslsplit/package.nix
+++ b/pkgs/by-name/ss/sslsplit/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "droe";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1p43z9ln5rbc76v0j1k3r4nhvfw71hq8jzsallb54z9hvwfvqp3l";
   };
 
diff --git a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
index ad4af117b1d3..4168b8b1d828 100644
--- a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
+++ b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "session-manager-plugin";
-    tag = version;
+    rev = version;
     hash = "sha256-4DPwFKt5pNNl4AczgIhZA7CuBHx7q41jMZKenDFYmwg=";
   };
 
diff --git a/pkgs/by-name/ss/ssmsh/package.nix b/pkgs/by-name/ss/ssmsh/package.nix
index 0a06144f5a2d..e613ec7c0b7a 100644
--- a/pkgs/by-name/ss/ssmsh/package.nix
+++ b/pkgs/by-name/ss/ssmsh/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bwhaley";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UmfwDukRVyfX+DmUfRi+KepqFrPtDNImKd22/dI7ytk=";
   };
 
diff --git a/pkgs/by-name/ss/ssocr/package.nix b/pkgs/by-name/ss/ssocr/package.nix
index 26c36b7d57b7..6179b456225c 100644
--- a/pkgs/by-name/ss/ssocr/package.nix
+++ b/pkgs/by-name/ss/ssocr/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "auerswal";
     repo = "ssocr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yQPjs4kGvp6C7kFcWQ3EzoFhwEAhm2nC7yXu9RbU4os=";
   };
 
diff --git a/pkgs/by-name/ss/sss-cli/package.nix b/pkgs/by-name/ss/sss-cli/package.nix
index 214036933f8a..5fb3fdc43c2c 100644
--- a/pkgs/by-name/ss/sss-cli/package.nix
+++ b/pkgs/by-name/ss/sss-cli/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dsprenkels";
     repo = "sss-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9Wht+t48SsWpj1z2yY6P7G+h9StmuqfMdODtyPffhak=";
   };
 
diff --git a/pkgs/by-name/ss/sssnake/package.nix b/pkgs/by-name/ss/sssnake/package.nix
index 930d8d8de2a3..9c6a24a43aa6 100644
--- a/pkgs/by-name/ss/sssnake/package.nix
+++ b/pkgs/by-name/ss/sssnake/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "angeljumbo";
     repo = "sssnake";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zkErOV6Az0kJdwyXzMCnVW1997zpAB79TBvf/41Igic=";
   };
   postPatch = ''
diff --git a/pkgs/by-name/st/stackblur-go/package.nix b/pkgs/by-name/st/stackblur-go/package.nix
index 26fc1daa9b2c..eb97f4d51304 100644
--- a/pkgs/by-name/st/stackblur-go/package.nix
+++ b/pkgs/by-name/st/stackblur-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "esimov";
     repo = "stackblur-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-y1Fov81mholhz+bLRYl+G7jhzcsFS5TUjQ3SUntD8E0=";
   };
 
diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index ad073eeea1c0..cd678c8f98a9 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EPjQrPt6m7yOFgYqHOaWAZN7CjlsOgl2jsEuRB8+1fE=";
   };
 
diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix
index cefd98a3c151..18176e51d051 100644
--- a/pkgs/by-name/st/stackql/package.nix
+++ b/pkgs/by-name/st/stackql/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stackql";
     repo = "stackql";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FLr4xGE9x9O0+BcjBiqDoNdw5LAqtqYYkqZ8wWjhgHA=";
   };
 
diff --git a/pkgs/by-name/st/stacs/package.nix b/pkgs/by-name/st/stacs/package.nix
index ce2ff2cb2699..7cc6c87151c0 100644
--- a/pkgs/by-name/st/stacs/package.nix
+++ b/pkgs/by-name/st/stacs/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "stacscan";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "00ZYdpJktqUXdzPcouHyZcOQyFm7jdFNVuDqsufOviE=";
   };
 
diff --git a/pkgs/by-name/st/stagit/package.nix b/pkgs/by-name/st/stagit/package.nix
index b5fe1ff2688e..03a038da51bb 100644
--- a/pkgs/by-name/st/stagit/package.nix
+++ b/pkgs/by-name/st/stagit/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.codemadness.org/stagit";
-    tag = version;
+    rev = version;
     sha256 = "sha256-mVYR8THGGfaTsx3aaSbQBxExRo87K47SD+PU5cZ8z58=";
   };
 
diff --git a/pkgs/by-name/st/stalonetray/package.nix b/pkgs/by-name/st/stalonetray/package.nix
index b9356d3458c0..f86096c4ba9b 100644
--- a/pkgs/by-name/st/stalonetray/package.nix
+++ b/pkgs/by-name/st/stalonetray/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kolbusa";
     repo = "stalonetray";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/55oP6xA1LeLawOBkhh9acaDcObO4L4ojcy7e3vwnBw=";
   };
 
diff --git a/pkgs/by-name/st/stanc/package.nix b/pkgs/by-name/st/stanc/package.nix
index 21b6817577f7..8ac7add6d2ae 100644
--- a/pkgs/by-name/st/stanc/package.nix
+++ b/pkgs/by-name/st/stanc/package.nix
@@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = "stanc3";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IrpHV00Fn3Nxail4Xgv/8ezclKpyVuQa1F34kF07wwA=";
   };
 
diff --git a/pkgs/by-name/st/star/package.nix b/pkgs/by-name/st/star/package.nix
index 2dca2f5b8bcd..7b2d3405afd5 100644
--- a/pkgs/by-name/st/star/package.nix
+++ b/pkgs/by-name/st/star/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "STAR";
     owner = "alexdobin";
-    tag = version;
+    rev = version;
     sha256 = "sha256-58Y4lzqXwBhRlXcionUg2IhAg5znNUuyr/FsuNZd+5Q=";
   };
 
diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix
index 540cef55f73c..a69598c32c5f 100644
--- a/pkgs/by-name/st/starboard/package.nix
+++ b/pkgs/by-name/st/starboard/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GZ+KOnQV/eXPt1QGaqWj4JAlPNhNKpVn7rlC7W4zfDo=";
     # 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/starcharts/package.nix b/pkgs/by-name/st/starcharts/package.nix
index 474ba0bec2b6..48e051049aad 100644
--- a/pkgs/by-name/st/starcharts/package.nix
+++ b/pkgs/by-name/st/starcharts/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "starcharts";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RLGKf5+HqJlZUhA5C3cwDumIhlbXcOr5iitI+7GZPBc=";
   };
 
diff --git a/pkgs/by-name/st/starfetch/package.nix b/pkgs/by-name/st/starfetch/package.nix
index 1b335a2d2b3e..34694aa95136 100644
--- a/pkgs/by-name/st/starfetch/package.nix
+++ b/pkgs/by-name/st/starfetch/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Haruno19";
     repo = "starfetch";
-    tag = version;
+    rev = version;
     sha256 = "sha256-I2M/FlLRkGtD2+GcK1l5+vFsb5tCb4T3UJTPxRx68Ww=";
   };
 
diff --git a/pkgs/by-name/st/stargate-libcds/package.nix b/pkgs/by-name/st/stargate-libcds/package.nix
index 419a775c17fd..362abbd11d16 100644
--- a/pkgs/by-name/st/stargate-libcds/package.nix
+++ b/pkgs/by-name/st/stargate-libcds/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stargateaudio";
     repo = "libcds";
-    tag = version;
+    rev = version;
     sha256 = "sha256-THThEzS8gGdwn3h0EBttaX5ljZH9Ma2Rcg143+GIdU8=";
   };
 
diff --git a/pkgs/by-name/st/static-server/package.nix b/pkgs/by-name/st/static-server/package.nix
index 048f502ea93a..57527d9e3c2c 100644
--- a/pkgs/by-name/st/static-server/package.nix
+++ b/pkgs/by-name/st/static-server/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "eliben";
     repo = "static-server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AZcNh/kF6IdAceA7qe+nhRlwU4yGh19av/S1Zt7iKIs=";
   };
 
diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index 9887474cdd27..f31a7d1ccbec 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "static-web-server";
     repo = "static-web-server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-labHPDsPRyF/cxHFoOJ5n+tBFn1KF2QdB/hZnDGWf1Q=";
   };
 
diff --git a/pkgs/by-name/st/statik/package.nix b/pkgs/by-name/st/statik/package.nix
index fe93b905fcf7..8c965a73220d 100644
--- a/pkgs/by-name/st/statik/package.nix
+++ b/pkgs/by-name/st/statik/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rakyll";
     repo = "statik";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "ahsNiac/3I2+PUqc90E73Brb99M68ewh9nWXoupfE3g=";
   };
 
diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix
index 010d7f380a07..a78f423e9d58 100644
--- a/pkgs/by-name/st/statix/package.nix
+++ b/pkgs/by-name/st/statix/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nerdypepper";
     repo = "statix";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bMs3XMiGP6sXCqdjna4xoV6CANOIWuISSzCaL5LYY4c=";
   };
 
diff --git a/pkgs/by-name/st/stayrtr/package.nix b/pkgs/by-name/st/stayrtr/package.nix
index a94a1fef997b..dc90fb2b358c 100644
--- a/pkgs/by-name/st/stayrtr/package.nix
+++ b/pkgs/by-name/st/stayrtr/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bgp";
     repo = "stayrtr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QdPp+AHOVn/L4lArhwUNNu3OP2ALEFzs/hVnfSxaEbg=";
   };
   vendorHash = "sha256-m1CHpmTUQVkBjkjg2bjl9llU1Le1GLRKKLGT4h7MbnE=";
diff --git a/pkgs/by-name/st/stc-cli/package.nix b/pkgs/by-name/st/stc-cli/package.nix
index a02d0dc07ed4..6fcef93d0d74 100644
--- a/pkgs/by-name/st/stc-cli/package.nix
+++ b/pkgs/by-name/st/stc-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tenox7";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-ftlq7vrnTb4N2bqwiF9gtRj7hZlo6PTUMb/bk2hn/cU=";
   };
 
diff --git a/pkgs/by-name/st/stdman/package.nix b/pkgs/by-name/st/stdman/package.nix
index fdfb6d0caaf9..56b1bcd5a7b2 100644
--- a/pkgs/by-name/st/stdman/package.nix
+++ b/pkgs/by-name/st/stdman/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeaye";
     repo = "stdman";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/yJqKwJHonnBkP6/yQQJT3yPyYO6/nFAf4XFrgl3L0A=";
   };
 
diff --git a/pkgs/by-name/st/stdoutisatty/package.nix b/pkgs/by-name/st/stdoutisatty/package.nix
index 3b9e5ff57324..f99476c57a9f 100644
--- a/pkgs/by-name/st/stdoutisatty/package.nix
+++ b/pkgs/by-name/st/stdoutisatty/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lilydjwg";
     repo = "stdoutisatty";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-NyVn9cxx0rY1ridNDTqe0pzcVhdLVaPCKT4hoQkQzRs=";
   };
 
diff --git a/pkgs/by-name/st/stduuid/package.nix b/pkgs/by-name/st/stduuid/package.nix
index 7a09e5a4d5bc..a0a2ce6d9fae 100644
--- a/pkgs/by-name/st/stduuid/package.nix
+++ b/pkgs/by-name/st/stduuid/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "mariusbancila";
     repo = "stduuid";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MhpKv+gH3QxiaQMx5ImiQjDGrbKUFaaoBLj5Voh78vg=";
   };
 
diff --git a/pkgs/by-name/st/steam-acf/package.nix b/pkgs/by-name/st/steam-acf/package.nix
index 54b4e81fcd56..787c67fbdef1 100644
--- a/pkgs/by-name/st/steam-acf/package.nix
+++ b/pkgs/by-name/st/steam-acf/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chisui";
     repo = "acf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "16q3md7cvdz37pqm1sda81rkjf249xbsrlpdl639r06p7f4nqlc2";
   };
 
diff --git a/pkgs/by-name/st/steam-tui/package.nix b/pkgs/by-name/st/steam-tui/package.nix
index 2546d63706d3..822b234fe549 100644
--- a/pkgs/by-name/st/steam-tui/package.nix
+++ b/pkgs/by-name/st/steam-tui/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dmadisetti";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-3vBIpPIsh+7PjTuNNqp7e/pdciOYnzuGkjb/Eks6QJw=";
   };
 
diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index a3406e8fefd8..2147b331caf7 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dyc3";
     repo = "steamguard-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o4hJ8+FsFLKJwifLP3pGbn35SOsTTnQosO4IejitUeI=";
   };
 
diff --git a/pkgs/by-name/st/steghide/package.nix b/pkgs/by-name/st/steghide/package.nix
index 49070e78b934..b230015d241e 100644
--- a/pkgs/by-name/st/steghide/package.nix
+++ b/pkgs/by-name/st/steghide/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "steghide";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-uUXEipIUfu9AbG7Ekz+25JkWSEGzqA7sJHZqezLzUto=";
   };
 
diff --git a/pkgs/by-name/st/stegseek/package.nix b/pkgs/by-name/st/stegseek/package.nix
index 0566a871ee70..1418d2001100 100644
--- a/pkgs/by-name/st/stegseek/package.nix
+++ b/pkgs/by-name/st/stegseek/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RickdeJager";
     repo = "stegseek";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-B5oJffYOYfsH0YRq/Bq0ciIlCsCONyScFBjP7a1lIzo=";
   };
 
diff --git a/pkgs/by-name/st/stella/package.nix b/pkgs/by-name/st/stella/package.nix
index 3634af710d8d..9e0a77bef1eb 100644
--- a/pkgs/by-name/st/stella/package.nix
+++ b/pkgs/by-name/st/stella/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-AbZBBg4P0qnB+mZpiG8/kHixBfkKQptyLrF4lwgRr/Y=";
   };
 
diff --git a/pkgs/by-name/st/stellarsolver/package.nix b/pkgs/by-name/st/stellarsolver/package.nix
index 231bdd4b46bd..0417d3cbd2f0 100644
--- a/pkgs/by-name/st/stellarsolver/package.nix
+++ b/pkgs/by-name/st/stellarsolver/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rlancaste";
     repo = "stellarsolver";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-6WDiHaBhi9POtXynGU/eTeuqZSK81JJeuZv4SxOeVoE=";
   };
 
diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix
index a6c92a9bd32f..99a253961d19 100644
--- a/pkgs/by-name/st/step-kms-plugin/package.nix
+++ b/pkgs/by-name/st/step-kms-plugin/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "smallstep";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6+5xZGzLsXu+283aOCeRmzxvjsk5PXTpbszVYuSSuGA=";
   };
 
diff --git a/pkgs/by-name/st/stern/package.nix b/pkgs/by-name/st/stern/package.nix
index 44b8b7076224..361905275897 100644
--- a/pkgs/by-name/st/stern/package.nix
+++ b/pkgs/by-name/st/stern/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stern";
     repo = "stern";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1yueWGyVM9pDnKjdCq6MHZdOzYessPTKs9xq1ganDf0=";
   };
 
diff --git a/pkgs/by-name/st/stgit/package.nix b/pkgs/by-name/st/stgit/package.nix
index e04ca6db91c0..39046668c0c8 100644
--- a/pkgs/by-name/st/stgit/package.nix
+++ b/pkgs/by-name/st/stgit/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "stacked-git";
     repo = "stgit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YrJf4uNICPmXpuJvf0QRDHpODw39Q+40SLZuoIwZ5qA=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/st/sticky-notes/package.nix b/pkgs/by-name/st/sticky-notes/package.nix
index 1b140419c213..76c32999eae7 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-keSxUTil4/QO8Wn4p6LB7oERxXHKD83qIRPZ93ZygWE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix
index 775fcac7b70e..8fc848008d0a 100644
--- a/pkgs/by-name/st/sticky/package.nix
+++ b/pkgs/by-name/st/sticky/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Mj14S4M7NMQE17SN8uED4UIJN6nwTo3E+D3j0tGKXc4=";
   };
 
diff --git a/pkgs/by-name/st/stig/package.nix b/pkgs/by-name/st/stig/package.nix
index 3a57d76cf738..1f82c837e928 100644
--- a/pkgs/by-name/st/stig/package.nix
+++ b/pkgs/by-name/st/stig/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rndusr";
     repo = "stig";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lSFI4/DxWl17KFgLXZ7c5nW/e5IUGN7s8Gm6wTM5ZWg=";
   };
 
diff --git a/pkgs/by-name/st/stilo-themes/package.nix b/pkgs/by-name/st/stilo-themes/package.nix
index 289595c97e0d..e3dde8a7de62 100644
--- a/pkgs/by-name/st/stilo-themes/package.nix
+++ b/pkgs/by-name/st/stilo-themes/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "stilo-themes";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YKEDXrOAn7pGWb0VcOx7cKHnuX120yPzqtUVnzyLrDQ=";
   };
 
diff --git a/pkgs/by-name/st/stl-to-obj/package.nix b/pkgs/by-name/st/stl-to-obj/package.nix
index 9cc761a5eb92..47f584d30297 100644
--- a/pkgs/by-name/st/stl-to-obj/package.nix
+++ b/pkgs/by-name/st/stl-to-obj/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Neizvestnyj";
     repo = "stl-to-obj";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-+R7rNpMxKFC7sLYQXZX3Ikb5MqNd57r1M8gma73kCcg=";
   };
 
diff --git a/pkgs/by-name/st/stlink/package.nix b/pkgs/by-name/st/stlink/package.nix
index 7feefe528b27..b88b06393fed 100644
--- a/pkgs/by-name/st/stlink/package.nix
+++ b/pkgs/by-name/st/stlink/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stlink-org";
     repo = "stlink";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hlFI2xpZ4ldMcxZbg/T5/4JuFFdO9THLcU0DQKSFqrw=";
   };
 
diff --git a/pkgs/by-name/st/stochas/package.nix b/pkgs/by-name/st/stochas/package.nix
index 6ad06b890180..e82fc7864d98 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Gp49cWvUkwz4xAq5sA1nUO+amRC39iWeUemQJyv6hTs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/st/stone-phaser/package.nix b/pkgs/by-name/st/stone-phaser/package.nix
index 8199cd12ea51..74f2fdfc9441 100644
--- a/pkgs/by-name/st/stone-phaser/package.nix
+++ b/pkgs/by-name/st/stone-phaser/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jpcima";
     repo = "stone-phaser";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "180b32z8h9zi8p0q55r1dzxfckamnngm52zjypjjvvy7qdj3mfcd";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/st/stopmotion/package.nix b/pkgs/by-name/st/stopmotion/package.nix
index 361ca192c8e7..a285c847a6fb 100644
--- a/pkgs/by-name/st/stopmotion/package.nix
+++ b/pkgs/by-name/st/stopmotion/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://invent.kde.org/multimedia/stopmotion";
-    tag = version;
+    rev = version;
     hash = "sha256-wqrB0mo7sI9ntWF9QlYmGiRiIoLkMzD+mQ6BzhbAKX8=";
   };
 
diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix
index 6e7b88404b32..402147fc0122 100644
--- a/pkgs/by-name/st/storj-uplink/package.nix
+++ b/pkgs/by-name/st/storj-uplink/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "storj";
     repo = "storj";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-r0N9TpSlKkGy/hlVxKB+fMXFvQQOXC5L4Ryd5fP+Ud0=";
   };
 
diff --git a/pkgs/by-name/st/strace-analyzer/package.nix b/pkgs/by-name/st/strace-analyzer/package.nix
index d27a74602bd7..6b558aed0b7f 100644
--- a/pkgs/by-name/st/strace-analyzer/package.nix
+++ b/pkgs/by-name/st/strace-analyzer/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wookietreiber";
     repo = "strace-analyzer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KbdQeZoWFz4D5txu/411J0HNnIAs3t5IvO30/34vBek=";
   };
 
diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix
index 84f20fc9d5ce..4400537bf7f1 100644
--- a/pkgs/by-name/st/streamdeck-ui/package.nix
+++ b/pkgs/by-name/st/streamdeck-ui/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     repo = "streamdeck-linux-gui";
     owner = "streamdeck-linux-gui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KpsW3EycYRYU5YOg7NNGv5eeZbS9MAikj0Ke2ybPzAU=";
   };
 
diff --git a/pkgs/by-name/st/streamrip/package.nix b/pkgs/by-name/st/streamrip/package.nix
index 9e3419307c72..4b84727083bd 100644
--- a/pkgs/by-name/st/streamrip/package.nix
+++ b/pkgs/by-name/st/streamrip/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nathom";
     repo = "streamrip";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Klrkz0U36EIGO2sNxTnKPACvvqu1sslLFFrQRjFdxiE=";
   };
 
diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index 87477e780b56..71bb01cb86e2 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stripe";
     repo = "stripe-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WlLrWMDOwpSoHUixkJbCoewt/4UgnTbwIMBD5p5SI3c=";
   };
   vendorHash = "sha256-dWLrJ866R+yPEYs4vc8SRADZXC1xCO7sDosHbU1G63o=";
diff --git a/pkgs/by-name/st/strongswan/package.nix b/pkgs/by-name/st/strongswan/package.nix
index 1ad402ac86b6..c014a2080be4 100644
--- a/pkgs/by-name/st/strongswan/package.nix
+++ b/pkgs/by-name/st/strongswan/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "strongswan";
     repo = "strongswan";
-    tag = version;
+    rev = version;
     hash = "sha256-qFM7ErfqiDlUsZdGXJQVW3nJoh+I6tEdKRwzrKteRVY=";
   };
 
diff --git a/pkgs/by-name/st/structorizer/package.nix b/pkgs/by-name/st/structorizer/package.nix
index d78b94b6b3c0..9b8db6ac84a7 100644
--- a/pkgs/by-name/st/structorizer/package.nix
+++ b/pkgs/by-name/st/structorizer/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fesch";
     repo = "Structorizer.Desktop";
-    tag = version;
+    rev = version;
     hash = "sha256-hRcs0fey+6YCXcWXNTWuAnaRfmRNL2Cpn+dry8wYRSg=";
   };
 
diff --git a/pkgs/by-name/st/sttr/package.nix b/pkgs/by-name/st/sttr/package.nix
index 0d23fe7da2c4..1d7558fa43ea 100644
--- a/pkgs/by-name/st/sttr/package.nix
+++ b/pkgs/by-name/st/sttr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "abhimanyu003";
     repo = "sttr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FVjdlheKt3WoFQnb9qrYQATSkJmuXCVrigBbnKUHUR0=";
   };
 
diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix
index 8423230425c7..5ddc4dda2e30 100644
--- a/pkgs/by-name/st/stu/package.nix
+++ b/pkgs/by-name/st/stu/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "stu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ks9QN9hVejgmQKJ5tZJx67IqgC37QKH3MEBwLYr/TZI=";
   };
 
diff --git a/pkgs/by-name/st/stuffbin/package.nix b/pkgs/by-name/st/stuffbin/package.nix
index 7b3542dc9283..a5b629bf3da1 100644
--- a/pkgs/by-name/st/stuffbin/package.nix
+++ b/pkgs/by-name/st/stuffbin/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knadh";
     repo = "stuffbin";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dOlc/G2IiuMAN0LqiZtbpXLSYaOpe5cl1+cs3YhaAbg=";
   };
 
diff --git a/pkgs/by-name/st/stxxl/package.nix b/pkgs/by-name/st/stxxl/package.nix
index 0f825db83941..d045a889a016 100644
--- a/pkgs/by-name/st/stxxl/package.nix
+++ b/pkgs/by-name/st/stxxl/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stxxl";
     repo = "stxxl";
-    tag = version;
+    rev = version;
     sha256 = "sha256-U6DQ5mI83pyTmq5/ga5rI8v0h2/iEnNl8mxhIOpbF1I=";
   };
 
diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix
index 70cd821bb57b..88ed83192f1e 100644
--- a/pkgs/by-name/st/stylua/package.nix
+++ b/pkgs/by-name/st/stylua/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "johnnymorganz";
     repo = "stylua";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sZrymo1RRfDLz8fPa7FnbutSpOCFoyQPoFVjA6BH5qQ=";
   };
 
diff --git a/pkgs/by-name/st/styx/package.nix b/pkgs/by-name/st/styx/package.nix
index 0bd133ea2eec..bc9825efdbab 100644
--- a/pkgs/by-name/st/styx/package.nix
+++ b/pkgs/by-name/st/styx/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "styx-static";
     repo = "styx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-f6iA/nHpKnm3BALoQq8SzdcSzJLCFSferEf69SpgD2Y=";
   };
 
diff --git a/pkgs/by-name/su/su-exec/package.nix b/pkgs/by-name/su/su-exec/package.nix
index 164f173d7bee..c65562b5c248 100644
--- a/pkgs/by-name/su/su-exec/package.nix
+++ b/pkgs/by-name/su/su-exec/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ncopa";
     repo = "su-exec";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eymE9r9Rm/u4El5wXHbkAh7ma5goWV0EdJIhsq+leIs=";
   };
 
diff --git a/pkgs/by-name/su/sub-batch/package.nix b/pkgs/by-name/su/sub-batch/package.nix
index 6dbc068d8fdf..44662023adca 100644
--- a/pkgs/by-name/su/sub-batch/package.nix
+++ b/pkgs/by-name/su/sub-batch/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kl";
     repo = "sub-batch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4=";
   };
 
diff --git a/pkgs/by-name/su/subberthehut/package.nix b/pkgs/by-name/su/subberthehut/package.nix
index 2e20561f78bb..3dd753b78761 100644
--- a/pkgs/by-name/su/subberthehut/package.nix
+++ b/pkgs/by-name/su/subberthehut/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mus65";
     repo = "subberthehut";
-    tag = version;
+    rev = version;
     sha256 = "19prdqbk19h0wak318g2jn1mnfm7l7f83a633bh0rhskysmqrsj1";
   };
 
diff --git a/pkgs/by-name/su/subjs/package.nix b/pkgs/by-name/su/subjs/package.nix
index 26b9e377cfdc..9bc455593bba 100644
--- a/pkgs/by-name/su/subjs/package.nix
+++ b/pkgs/by-name/su/subjs/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lc";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-csxFn3YUnuYjZ5/4jIi7DfuujB/gFjHogLaV4XK5kQU=";
   };
 
diff --git a/pkgs/by-name/su/subtitlr/package.nix b/pkgs/by-name/su/subtitlr/package.nix
index 38799057f121..ffcb31ed21ae 100644
--- a/pkgs/by-name/su/subtitlr/package.nix
+++ b/pkgs/by-name/su/subtitlr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yoanbernabeu";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-PbeQzNkFj4eSg/zhk8bXij36DvJ9+g22kF5TqdX5O04=";
   };
 
diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix
index 0a8a204e9c24..53969233d425 100644
--- a/pkgs/by-name/su/subxt/package.nix
+++ b/pkgs/by-name/su/subxt/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "subxt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zg2MraqKLbyhaxTi02rE4MsMuPw4diIseYNUQEoqnVA=";
   };
 
diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index f7ed0c5dc44f..2706ef823421 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "trifectatechfoundation";
     repo = "sudo-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-apvMcn/1dV9uujyoHikiOxregwWtAFPvrZvYjd3XQwM=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/su/suitesparse-graphblas/package.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix
index e9236835f8ba..c4a89eeb4733 100644
--- a/pkgs/by-name/su/suitesparse-graphblas/package.nix
+++ b/pkgs/by-name/su/suitesparse-graphblas/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DrTimothyAldenDavis";
     repo = "GraphBLAS";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5FrVVLKZ9WDa+a3Tq9WrhMfhvbVLGMKtKZH0h9h/3tk=";
   };
 
diff --git a/pkgs/by-name/su/summon/package.nix b/pkgs/by-name/su/summon/package.nix
index eedb7e6221c6..4c57b68d08c3 100644
--- a/pkgs/by-name/su/summon/package.nix
+++ b/pkgs/by-name/su/summon/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cyberark";
     repo = "summon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nAjaZh0bnGBZh2wK78M4gg8BGsM6kBQ8MNvfPI7TIOg=";
   };
 
diff --git a/pkgs/by-name/su/sunwait/package.nix b/pkgs/by-name/su/sunwait/package.nix
index ca48f8bf5ff3..770e67b9f73c 100644
--- a/pkgs/by-name/su/sunwait/package.nix
+++ b/pkgs/by-name/su/sunwait/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "risacher";
     repo = "sunwait";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-v2cNjecJ4SstOsvDe/Lu0oOyBd8I8LMHZIH+f9ZC7Fc=";
   };
 
diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index f82d2bd5744d..8e358adbd446 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-350b+79Jmrk8wsVQdE3gRAP3JZbgAtL1Cw46sOCyaok=";
   };
 
diff --git a/pkgs/by-name/su/supercronic/package.nix b/pkgs/by-name/su/supercronic/package.nix
index 9af7efe98e71..49ac6669c58a 100644
--- a/pkgs/by-name/su/supercronic/package.nix
+++ b/pkgs/by-name/su/supercronic/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aptible";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tvDjjG8ym1wdQzQSO7T5BkbYbqD1M+EnPSPumbFKRhE=";
   };
 
diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix
index fb64ee1812a4..6fcd56c2104a 100644
--- a/pkgs/by-name/su/supersonic/package.nix
+++ b/pkgs/by-name/su/supersonic/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dweymouth";
     repo = "supersonic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ua2INyKPncXDOwzmKrgnRCb7q8CFEApEaYuBbQeau98=";
   };
 
diff --git a/pkgs/by-name/su/supertag/package.nix b/pkgs/by-name/su/supertag/package.nix
index 42241a2029dc..50ef178d470e 100644
--- a/pkgs/by-name/su/supertag/package.nix
+++ b/pkgs/by-name/su/supertag/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "amoffat";
     repo = "supertag";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0jzm7pn38hlr96n0z8gqfsfdbw48y0nnbsgjdq7hpgwmcgvgqdam";
   };
 
diff --git a/pkgs/by-name/su/surface-control/package.nix b/pkgs/by-name/su/surface-control/package.nix
index 6e2e347bab97..865faac1f0dd 100644
--- a/pkgs/by-name/su/surface-control/package.nix
+++ b/pkgs/by-name/su/surface-control/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "linux-surface";
     repo = "surface-control";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QgkUxT5Ae0agvalZl1ie+1LwxgaTzMrKpQY3KkpWwG4=";
   };
 
diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix
index f42fd1003201..8cffcf7dd82d 100644
--- a/pkgs/by-name/su/surfer/package.nix
+++ b/pkgs/by-name/su/surfer/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "surfer-project";
     repo = "surfer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mvHyljAEVi1FMkEbKsPmCNx2Cg0/Ydw3ZQCZsowEKGc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/su/surge-cli/package.nix b/pkgs/by-name/su/surge-cli/package.nix
index 5fff3186501a..0431c69f04d7 100644
--- a/pkgs/by-name/su/surge-cli/package.nix
+++ b/pkgs/by-name/su/surge-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "sintaxi";
     repo = "surge";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EpYww/YCQhPFmnOJ1zbigI2qyUrKN2TxKHEju/0Si3M=";
   };
 
diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix
index 9ef409c072fa..175366a2c8fe 100644
--- a/pkgs/by-name/su/surrealist/package.nix
+++ b/pkgs/by-name/su/surrealist/package.nix
@@ -39,7 +39,7 @@ let
             src = fetchFromGitHub {
               owner = "evanw";
               repo = "esbuild";
-              tag = "v${version}";
+              rev = "v${version}";
               hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";
             };
             vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/by-name/su/suscan/package.nix b/pkgs/by-name/su/suscan/package.nix
index f0d0e147512b..0c052705cc26 100644
--- a/pkgs/by-name/su/suscan/package.nix
+++ b/pkgs/by-name/su/suscan/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BatchDrake";
     repo = "suscan";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-h1ogtYjkqiHb1/NAJfJ0HQIvGnZM2K/PSP5nqLXUf9M=";
   };
 
diff --git a/pkgs/by-name/su/sutils/package.nix b/pkgs/by-name/su/sutils/package.nix
index e893f4ec7461..1ea0e1c22b16 100644
--- a/pkgs/by-name/su/sutils/package.nix
+++ b/pkgs/by-name/su/sutils/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "sutils";
-    tag = version;
+    rev = version;
     sha256 = "0i2g6a6xdaq3w613dhq7mnsz4ymwqn6kvkyan5kgy49mzq97va6j";
   };
 
diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix
index f924680f4328..65e51db70263 100644
--- a/pkgs/by-name/sv/sv-lang/package.nix
+++ b/pkgs/by-name/sv/sv-lang/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MikePopoloski";
     repo = "slang";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-msSc6jw2xbEZfOwtqwFEDIKcwf5SDKp+j15lVbNO98g=";
   };
 
diff --git a/pkgs/by-name/sv/svaba/package.nix b/pkgs/by-name/sv/svaba/package.nix
index 075f5cc7f394..ea1d3938c009 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";
-    tag = version;
+    rev = version;
     sha256 = "1vv5mc9z5d22kgdy7mm27ya5aahnqgkcrskdr2405058ikk9g8kp";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sv/svg2pdf/package.nix b/pkgs/by-name/sv/svg2pdf/package.nix
index 213e2f86e7a6..dde8c61fb1a0 100644
--- a/pkgs/by-name/sv/svg2pdf/package.nix
+++ b/pkgs/by-name/sv/svg2pdf/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "typst";
     repo = "svg2pdf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A3lUX2q5D1Z5Q3sZOl2uvaOLTuLRdtJyR9tmfPkE7TI=";
   };
 
diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix
index 0447ed058d7a..7c3435fc1d6e 100644
--- a/pkgs/by-name/sv/svix-server/package.nix
+++ b/pkgs/by-name/sv/svix-server/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "svix";
     repo = "svix-webhooks";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ft08skfLASgfZo3lrlN+nuF2FK78kEm2geRVg8cO5hM=";
   };
 
diff --git a/pkgs/by-name/sv/svls/package.nix b/pkgs/by-name/sv/svls/package.nix
index 362f97a91aa7..fa9bbdf1dfa5 100644
--- a/pkgs/by-name/sv/svls/package.nix
+++ b/pkgs/by-name/sv/svls/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dalance";
     repo = "svls";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DuwH0qie8SctvOGntljOdTRMGKrNFPycdaFG3QZxihA=";
   };
 
diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix
index 549b1d71613b..722579b17237 100644
--- a/pkgs/by-name/sv/svtplay-dl/package.nix
+++ b/pkgs/by-name/sv/svtplay-dl/package.nix
@@ -33,7 +33,7 @@ buildPythonApplication {
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
-    tag = version;
+    rev = version;
     hash = "sha256-pSTYrDgHmx4V+Y9iGRj3fCHiyoBP9FUf/XIRJyoUvMY=";
   };
 
diff --git a/pkgs/by-name/sv/svu/package.nix b/pkgs/by-name/sv/svu/package.nix
index 3a3dbe2777c3..82eddfa960d7 100644
--- a/pkgs/by-name/sv/svu/package.nix
+++ b/pkgs/by-name/sv/svu/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jnUVl34luj6kUyx27+zWFxKZMD+R1uzu78oJV7ziSag=";
   };
 
diff --git a/pkgs/by-name/sw/swagger-cli/package.nix b/pkgs/by-name/sw/swagger-cli/package.nix
index 2aab80288358..f78dd09b46a4 100644
--- a/pkgs/by-name/sw/swagger-cli/package.nix
+++ b/pkgs/by-name/sw/swagger-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "APIDevTools";
     repo = "swagger-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WgzfSd57vRwa1HrSgNxD0F5ckczBkOaVmrEZ9tMAcRA=";
   };
 
diff --git a/pkgs/by-name/sw/sway-launcher-desktop/package.nix b/pkgs/by-name/sw/sway-launcher-desktop/package.nix
index 2e0f5637d0ad..93cc778fc4e9 100644
--- a/pkgs/by-name/sw/sway-launcher-desktop/package.nix
+++ b/pkgs/by-name/sw/sway-launcher-desktop/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Biont";
     repo = "sway-launcher-desktop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lv1MLPJsJJjm6RLzZXWEz1JO/4EXTQ8wj225Di+98G4=";
   };
 
diff --git a/pkgs/by-name/sw/sway-new-workspace/package.nix b/pkgs/by-name/sw/sway-new-workspace/package.nix
index 42861e7e384e..b998818dd39d 100644
--- a/pkgs/by-name/sw/sway-new-workspace/package.nix
+++ b/pkgs/by-name/sw/sway-new-workspace/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nzig";
     repo = "sway-new-workspace";
-    tag = version;
+    rev = version;
     hash = "sha256-CoSfpsaGqNNR5jdAQys3nQxshI0NXXr8MacUnSTKFNo=";
   };
 
diff --git a/pkgs/by-name/sw/sway-overfocus/package.nix b/pkgs/by-name/sw/sway-overfocus/package.nix
index 6341e4a9c115..9789e8f7afb2 100644
--- a/pkgs/by-name/sw/sway-overfocus/package.nix
+++ b/pkgs/by-name/sw/sway-overfocus/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "korreman";
     repo = "sway-overfocus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-trpjKA0TV8InSfViIXKnMDeZeFXZfavpiU7/R3JDQkQ=";
   };
 
diff --git a/pkgs/by-name/sw/sway-scratch/package.nix b/pkgs/by-name/sw/sway-scratch/package.nix
index 5a35154b8e9e..4a6b914ecfca 100644
--- a/pkgs/by-name/sw/sway-scratch/package.nix
+++ b/pkgs/by-name/sw/sway-scratch/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aokellermann";
     repo = "sway-scratch";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1N/33XtkEWamgQYNDyZgSSaaGD+2HtbseEpQgrAz3CU=";
   };
 
diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix
index b0aed7b420d6..279e711c923b 100644
--- a/pkgs/by-name/sw/sway-unwrapped/package.nix
+++ b/pkgs/by-name/sw/sway-unwrapped/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "sway";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-uBtQk8uhW/i8lSbv6zwsRyiiImFBw1YCQHVWQ8jot5w=";
   };
 
diff --git a/pkgs/by-name/sw/swayest-workstyle/package.nix b/pkgs/by-name/sw/swayest-workstyle/package.nix
index 5ab2099c110c..0d933df7259e 100644
--- a/pkgs/by-name/sw/swayest-workstyle/package.nix
+++ b/pkgs/by-name/sw/swayest-workstyle/package.nix
@@ -10,7 +10,7 @@ let
   src = fetchFromGitHub {
     owner = "Lyr-7D1h";
     repo = "swayest_workstyle";
-    tag = version;
+    rev = version;
     hash = "sha256-0IFEVk6LQagwbm/QZG+dzYFfNhb7ieMxaCbFdeoZWwc=";
   };
 in
diff --git a/pkgs/by-name/sw/swayidle/package.nix b/pkgs/by-name/sw/swayidle/package.nix
index 5208a91fb029..9023cb5af80e 100644
--- a/pkgs/by-name/sw/swayidle/package.nix
+++ b/pkgs/by-name/sw/swayidle/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "swayidle";
-    tag = version;
+    rev = version;
     hash = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg=";
   };
 
diff --git a/pkgs/by-name/sw/swaykbdd/package.nix b/pkgs/by-name/sw/swaykbdd/package.nix
index 7549c67eddc5..07d73adb07cd 100644
--- a/pkgs/by-name/sw/swaykbdd/package.nix
+++ b/pkgs/by-name/sw/swaykbdd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "artemsen";
     repo = "swaykbdd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FtXmn5Lf0PhL99xGl/SHWNaE6vAMOF2Ok4xVJT2Bf/s=";
   };
 
diff --git a/pkgs/by-name/sw/swaylock-effects/package.nix b/pkgs/by-name/sw/swaylock-effects/package.nix
index 414d6cda1b5d..42c59876ecb1 100644
--- a/pkgs/by-name/sw/swaylock-effects/package.nix
+++ b/pkgs/by-name/sw/swaylock-effects/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jirutka";
     repo = "swaylock-effects";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cuFM+cbUmGfI1EZu7zOsQUj4rA4Uc4nUXcvIfttf9zE=";
   };
 
diff --git a/pkgs/by-name/sw/swaynag-battery/package.nix b/pkgs/by-name/sw/swaynag-battery/package.nix
index 3ac3df47bf24..b9223980ecef 100644
--- a/pkgs/by-name/sw/swaynag-battery/package.nix
+++ b/pkgs/by-name/sw/swaynag-battery/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "m00qek";
     repo = "swaynag-battery";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7f9+4Fzw5B5ATuud4MJC3iyuNRTx6kwJ7/KsusGtQM8=";
   };
 
diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix
index 00ec7d9031f7..74f631876189 100644
--- a/pkgs/by-name/sw/swaynotificationcenter/package.nix
+++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "ErikReider";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SR3FfEit50y4XSCLh3raUoigRNXpxh0mk4qLhQ/FozM=";
   };
 
diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix
index bb5700bc89e6..e4c63e331eea 100644
--- a/pkgs/by-name/sw/swayosd/package.nix
+++ b/pkgs/by-name/sw/swayosd/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ErikReider";
     repo = "SwayOSD";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-V3V18BoBRJU8mtvwWXvdYPbKBDIHdu5LzVSkDkGJjFU=";
   };
 
diff --git a/pkgs/by-name/sw/swh_lv2/package.nix b/pkgs/by-name/sw/swh_lv2/package.nix
index 5351fa9127e4..6e74700ef624 100644
--- a/pkgs/by-name/sw/swh_lv2/package.nix
+++ b/pkgs/by-name/sw/swh_lv2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swh";
     repo = "lv2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-v6aJUWDbBZEmz0v6+cSCi/KhOYNUeK/MJLUSgzi39ng=";
   };
 
diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix
index a7860c03f617..da95f8af7998 100644
--- a/pkgs/by-name/sw/swiftformat/package.nix
+++ b/pkgs/by-name/sw/swiftformat/package.nix
@@ -17,7 +17,7 @@ swift.stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nicklockwood";
     repo = "SwiftFormat";
-    tag = version;
+    rev = version;
     sha256 = "sha256-AZAQSwmGNHN6ykh9ufeQLC1dEXvTt32X24MPTDh6bI8=";
   };
 
diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix
index 7ef039d314c0..bf8d01099dab 100644
--- a/pkgs/by-name/sw/swim/package.nix
+++ b/pkgs/by-name/sw/swim/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "spade-lang";
     repo = "swim";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0H45kOIwFMdp+eIQJNutLUC/jEpWKsPfEZXDUOUa12g=";
   };
 
diff --git a/pkgs/by-name/sx/sx-go/package.nix b/pkgs/by-name/sx/sx-go/package.nix
index 9c57d430d24b..18679532f617 100644
--- a/pkgs/by-name/sx/sx-go/package.nix
+++ b/pkgs/by-name/sx/sx-go/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "v-byte-cpu";
     repo = "sx";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HTIzA1QOVn3V/hGUu7wLIYUNYmcJ/FXi2yr6BGRizZA=";
   };
 
diff --git a/pkgs/by-name/sx/sx/package.nix b/pkgs/by-name/sx/sx/package.nix
index a397f8a93469..5bbb60e52aba 100644
--- a/pkgs/by-name/sx/sx/package.nix
+++ b/pkgs/by-name/sx/sx/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "earnestly";
     repo = "sx";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-hKoz7Kuus8Yp7D0F05wCOQs6BvV0NkRM9uUXTntLJxQ=";
   };
 
diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix
index 60dcc1e24978..f2093f835c13 100644
--- a/pkgs/by-name/sx/sxhkd/package.nix
+++ b/pkgs/by-name/sx/sxhkd/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "sxhkd";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-OelMqenk0tiWMLraekS/ggGf6IsXP7Sz7bv75NvnNvI=";
   };
 
diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix
index 3d2c93eacf8f..4d70b1ee494e 100644
--- a/pkgs/by-name/sy/symbolicator/package.nix
+++ b/pkgs/by-name/sy/symbolicator/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "symbolicator";
-    tag = version;
+    rev = version;
     hash = "sha256-/8Jo/M51ulrQFzXKkcFXTYfh9a3w6C5oW6A/bDFcRp0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sy/symengine/package.nix b/pkgs/by-name/sy/symengine/package.nix
index 05725691a897..4764d76e69ae 100644
--- a/pkgs/by-name/sy/symengine/package.nix
+++ b/pkgs/by-name/sy/symengine/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "symengine";
     repo = "symengine";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WriVcYt3fkObR2U4J6a4KGGc2HgyyFyFpdrwxBD+AHA=";
   };
 
diff --git a/pkgs/by-name/sy/symlinks/package.nix b/pkgs/by-name/sy/symlinks/package.nix
index 65ec4e186c92..c5709e86c110 100644
--- a/pkgs/by-name/sy/symlinks/package.nix
+++ b/pkgs/by-name/sy/symlinks/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brandt";
     repo = "symlinks";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "EMWd7T/k4v1uvXe2QxhyPoQKUpKIUANE9AOwX461FgU=";
   };
 
diff --git a/pkgs/by-name/sy/sympa/package.nix b/pkgs/by-name/sy/sympa/package.nix
index 1d6fb703303d..ff0767ca46b8 100644
--- a/pkgs/by-name/sy/sympa/package.nix
+++ b/pkgs/by-name/sy/sympa/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sympa-community";
     repo = "sympa";
-    tag = version;
+    rev = version;
     sha256 = "sha256-XvLTO2Wau34zMoi+5d16JnWd/K96w2py9xC5oLlRfRM=";
   };
 
diff --git a/pkgs/by-name/sy/syn2mas/package.nix b/pkgs/by-name/sy/syn2mas/package.nix
index d69c08e58927..7fb4efaecba9 100644
--- a/pkgs/by-name/sy/syn2mas/package.nix
+++ b/pkgs/by-name/sy/syn2mas/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-s6LVCISmbG3ubY/67DcUUE/pnTJSE0v9n8INmLMQNcw=";
   };
 
diff --git a/pkgs/by-name/sy/syncall/package.nix b/pkgs/by-name/sy/syncall/package.nix
index 86dfcda299f0..9cfcd9599b05 100644
--- a/pkgs/by-name/sy/syncall/package.nix
+++ b/pkgs/by-name/sy/syncall/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bergercookie";
     repo = "syncall";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-f9WVZ1gpVG0wvIqoAkeaYBE4QsGXSqrYS4KyHy6S+0Q=";
   };
 
diff --git a/pkgs/by-name/sy/synchrony/package.nix b/pkgs/by-name/sy/synchrony/package.nix
index c4744c84237a..fdc86661cbfb 100644
--- a/pkgs/by-name/sy/synchrony/package.nix
+++ b/pkgs/by-name/sy/synchrony/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "relative";
     repo = "synchrony";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-nJ6H1SZAQCG6U3BPEPmm+BGQa8Af+Vb1E+Lv8lIqDBE=";
   };
 
diff --git a/pkgs/by-name/sy/syncthing-tray/package.nix b/pkgs/by-name/sy/syncthing-tray/package.nix
index 1404d77d3e43..0f429fd36c24 100644
--- a/pkgs/by-name/sy/syncthing-tray/package.nix
+++ b/pkgs/by-name/sy/syncthing-tray/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alex2108";
     repo = "syncthing-tray";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g/seDpNdoJ1tc5CTh2EuXoeo8XNpa9CaR+s7bW2cySA=";
   };
 
diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix
index c4546f5685c8..0765c78a7335 100644
--- a/pkgs/by-name/sy/syncyomi/package.nix
+++ b/pkgs/by-name/sy/syncyomi/package.nix
@@ -52,7 +52,7 @@ buildGoModule rec {
               src = fetchFromGitHub {
                 owner = "evanw";
                 repo = "esbuild";
-                tag = "v${version}";
+                rev = "v${version}";
                 hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU=";
               };
               vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix
index fdb7a46b3906..c3a0ffb93ab2 100644
--- a/pkgs/by-name/sy/syndicate_utils/package.nix
+++ b/pkgs/by-name/sy/syndicate_utils/package.nix
@@ -16,7 +16,7 @@ buildNimSbom (finalAttrs: {
     domain = "git.syndicate-lang.org";
     owner = "ehmry";
     repo = "syndicate_utils";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-X8sb/2mkhVp0jJpTk9uYSDhAVui4jHl355amRCnkNhA=";
   };
 
diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix
index 20faaa9ccedf..3d5cee8a5931 100644
--- a/pkgs/by-name/sy/synfigstudio/package.nix
+++ b/pkgs/by-name/sy/synfigstudio/package.nix
@@ -33,7 +33,7 @@ let
   src = fetchFromGitHub {
     owner = "synfig";
     repo = "synfig";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-D+FUEyzJ74l0USq3V9HIRAfgyJfRP372aEKDqF8+hsQ=";
   };
 
diff --git a/pkgs/by-name/sy/syntax/package.nix b/pkgs/by-name/sy/syntax/package.nix
index 5c971233693b..8dffc4b6ed9e 100644
--- a/pkgs/by-name/sy/syntax/package.nix
+++ b/pkgs/by-name/sy/syntax/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "DmitrySoshnikov";
     repo = "syntax";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5ZbelnZQvJ9k4GbWR+lDEgxXGLt4VsXput9nBV8nUdc=";
   };
 
diff --git a/pkgs/by-name/sy/sysbench/package.nix b/pkgs/by-name/sy/sysbench/package.nix
index a45dd72331cc..873932a81805 100644
--- a/pkgs/by-name/sy/sysbench/package.nix
+++ b/pkgs/by-name/sy/sysbench/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "akopytov";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1sanvl2a52ff4shj62nw395zzgdgywplqvwip74ky8q7s6qjf5qy";
   };
 
diff --git a/pkgs/by-name/sy/system76-firmware/package.nix b/pkgs/by-name/sy/system76-firmware/package.nix
index 88b57068880c..fe4efbae8ff4 100644
--- a/pkgs/by-name/sy/system76-firmware/package.nix
+++ b/pkgs/by-name/sy/system76-firmware/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-firmware";
-    tag = version;
+    rev = version;
     sha256 = "sha256-6c2OTHCTIYl/ezkWjmyb60FAdasOrV9hjd0inDc44wI=";
   };
 
diff --git a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
index 63a3e97d5e94..69574c66581f 100644
--- a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
+++ b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "keyboard-configurator";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rnKWzct2k/ObjBnf90uwMar7fjZAUvQ2RPPZVZQsWEA=";
   };
 
diff --git a/pkgs/by-name/sy/system76-scheduler/package.nix b/pkgs/by-name/sy/system76-scheduler/package.nix
index 599e3b765f4e..f45d3836b7fd 100644
--- a/pkgs/by-name/sy/system76-scheduler/package.nix
+++ b/pkgs/by-name/sy/system76-scheduler/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-scheduler";
-    tag = version;
+    rev = version;
     hash = "sha256-5GiHmu++YRCewDHm/qxKmQwDIAZwlW5Eya/fDriVSdA=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/sy/systembus-notify/package.nix b/pkgs/by-name/sy/systembus-notify/package.nix
index 1111071ea896..ce599973c572 100644
--- a/pkgs/by-name/sy/systembus-notify/package.nix
+++ b/pkgs/by-name/sy/systembus-notify/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = "systembus-notify";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WzuBw7LXW54CCMgFE9BSJ2skxaz4IA2BcBny63Ihtt0=";
   };
 
diff --git a/pkgs/by-name/sy/systemc/package.nix b/pkgs/by-name/sy/systemc/package.nix
index 28c265351752..5e78ee093f12 100644
--- a/pkgs/by-name/sy/systemc/package.nix
+++ b/pkgs/by-name/sy/systemc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "accellera-official";
     repo = "systemc";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ReYRKx7H9rxVhvY9gAdxrMu5nlsK2FcVIzfgvZroD/E=";
   };
 
diff --git a/pkgs/by-name/sy/systemfd/package.nix b/pkgs/by-name/sy/systemfd/package.nix
index e1f0477b6062..a96eaaf35b87 100644
--- a/pkgs/by-name/sy/systemfd/package.nix
+++ b/pkgs/by-name/sy/systemfd/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     repo = "systemfd";
     owner = "mitsuhiko";
-    tag = version;
+    rev = version;
     sha256 = "sha256-OUsQBHymoiLClRS45KE4zsyOh/Df8psP0t8aIkKNZsM=";
   };
 
diff --git a/pkgs/by-name/sy/systeroid/package.nix b/pkgs/by-name/sy/systeroid/package.nix
index e20b6220be54..7dea30db2189 100644
--- a/pkgs/by-name/sy/systeroid/package.nix
+++ b/pkgs/by-name/sy/systeroid/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "systeroid";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-nyQFNPmPcguPGeArd+w1Jexj4/J53PXAeGDvoRSsh/k=";
   };
 
diff --git a/pkgs/by-name/sy/sysz/package.nix b/pkgs/by-name/sy/sysz/package.nix
index f238442e1070..29efc02e4894 100644
--- a/pkgs/by-name/sy/sysz/package.nix
+++ b/pkgs/by-name/sy/sysz/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "joehillen";
     repo = "sysz";
-    tag = version;
+    rev = version;
     sha256 = "sha256-X9vj6ILPUKFo/i50JNehM2GSDWfxTdroWGYJv765Cm4=";
   };
 
diff --git a/pkgs/by-name/sz/szyszka/package.nix b/pkgs/by-name/sz/szyszka/package.nix
index b1e560760a86..97cb882bff2c 100644
--- a/pkgs/by-name/sz/szyszka/package.nix
+++ b/pkgs/by-name/sz/szyszka/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "qarmin";
     repo = "szyszka";
-    tag = version;
+    rev = version;
     hash = "sha256-LkXGKDFKaY+mg53ZEO4h2br/4eRle/QbSQJTVEMpAoY=";
   };
 
diff --git a/pkgs/by-name/t-/t-rex/package.nix b/pkgs/by-name/t-/t-rex/package.nix
index 8b04e19557a9..3001f15a4a94 100644
--- a/pkgs/by-name/t-/t-rex/package.nix
+++ b/pkgs/by-name/t-/t-rex/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "t-rex-tileserver";
     repo = "t-rex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oZZrR86/acoyMX3vC1JGrpc8G+DEuplqfEAnaP+TBGU=";
   };
 
diff --git a/pkgs/by-name/ta/ta-lib/package.nix b/pkgs/by-name/ta/ta-lib/package.nix
index 7cadbf47cfed..094b0004973f 100644
--- a/pkgs/by-name/ta/ta-lib/package.nix
+++ b/pkgs/by-name/ta/ta-lib/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rafa-dot-el";
     repo = "talib";
-    tag = version;
+    rev = version;
     sha256 = "sha256-bIzN8f9ZiOLaVzGAXcZUHUh/v9z1U+zY+MnyjJr1lSw=";
   };
 
diff --git a/pkgs/by-name/ta/tab/package.nix b/pkgs/by-name/ta/tab/package.nix
index 1a7c102fd7bc..9bd7719ae29c 100644
--- a/pkgs/by-name/ta/tab/package.nix
+++ b/pkgs/by-name/ta/tab/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ivan-tkatchev";
     repo = "tab";
-    tag = version;
+    rev = version;
     hash = "sha256-UOXfnpzYMKDdp8EeBo2HsVPGn61hkCqHe8olX9KAgOU=";
   };
 
diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix
index 7bd1d7b921d4..ea60b3371476 100644
--- a/pkgs/by-name/ta/tabiew/package.nix
+++ b/pkgs/by-name/ta/tabiew/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shshemi";
     repo = "tabiew";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mBGEw3WyjEmDPo9L+CPOtMiVA+2ndQ2pjo7bUBZZO8o=";
   };
 
diff --git a/pkgs/by-name/ta/tabula-java/package.nix b/pkgs/by-name/ta/tabula-java/package.nix
index 937204ea5fc0..c0ec2ee26bee 100644
--- a/pkgs/by-name/ta/tabula-java/package.nix
+++ b/pkgs/by-name/ta/tabula-java/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "tabulapdf";
     repo = "tabula-java";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lg8/diyGhfkUU0w7PEOlxb1WNpJZVDDllxMMsTIU/Cw=";
   };
 
diff --git a/pkgs/by-name/ta/tagger/package.nix b/pkgs/by-name/ta/tagger/package.nix
index ba309b0fd3fe..d093812a5ce7 100644
--- a/pkgs/by-name/ta/tagger/package.nix
+++ b/pkgs/by-name/ta/tagger/package.nix
@@ -21,7 +21,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "nlogozzo";
     repo = "NickvisionTagger";
-    tag = version;
+    rev = version;
     hash = "sha256-4OfByQYhLXmeFWxzhqt8d7pLUyuMLhDM20E2YcA9Q3s=";
   };
 
diff --git a/pkgs/by-name/ta/tagparser/package.nix b/pkgs/by-name/ta/tagparser/package.nix
index f4deee81dacc..5bd6c959a538 100644
--- a/pkgs/by-name/ta/tagparser/package.nix
+++ b/pkgs/by-name/ta/tagparser/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "tagparser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Xu6pvqyBWew3xD0nD5k7QKUOEpDchF1FiuSN7oHfYME=";
   };
 
diff --git a/pkgs/by-name/ta/tagref/package.nix b/pkgs/by-name/ta/tagref/package.nix
index 14acb95eb1f3..4ece754dc809 100644
--- a/pkgs/by-name/ta/tagref/package.nix
+++ b/pkgs/by-name/ta/tagref/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "stepchowfun";
     repo = "tagref";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ANQxW5Qznu2JbiazFElB1sxpX4BwPgk6SVGgYpJ6DUw=";
   };
 
diff --git a/pkgs/by-name/ta/tagutil/package.nix b/pkgs/by-name/ta/tagutil/package.nix
index eb7fd4ac6877..de5b89cad116 100644
--- a/pkgs/by-name/ta/tagutil/package.nix
+++ b/pkgs/by-name/ta/tagutil/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kaworu";
     repo = "tagutil";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oY1aGl5CKVtpOfh8Wskio/huWYMiPuxWPqxlooTutcw=";
   };
 
diff --git a/pkgs/by-name/ta/tailer/package.nix b/pkgs/by-name/ta/tailer/package.nix
index 45755cd3094c..d9899b7d2cac 100644
--- a/pkgs/by-name/ta/tailer/package.nix
+++ b/pkgs/by-name/ta/tailer/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hionay";
     repo = "tailer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gPezz2ksqdCffgdAHwU2NMTar2glp5YGfA5C+tMYPtE=";
   };
 
diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 727314b63324..40d1d302c0dd 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -38,7 +38,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/8MJE1Io0MRSUXiFirYDn6FH2qkWQHE7Fl3nJLjieDw=";
   };
 
diff --git a/pkgs/by-name/ta/tailscalesd/package.nix b/pkgs/by-name/ta/tailscalesd/package.nix
index e1cc38f504e9..718b05df48d9 100644
--- a/pkgs/by-name/ta/tailscalesd/package.nix
+++ b/pkgs/by-name/ta/tailscalesd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cfunkhouser";
     repo = "tailscalesd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OcvLVsPtAIaGTxk5SKNme0+i0PsDc8uY/sDcM/L5yqU=";
   };
 
diff --git a/pkgs/by-name/ta/talentedhack/package.nix b/pkgs/by-name/ta/talentedhack/package.nix
index 76b558ea754b..648d5e3b4864 100644
--- a/pkgs/by-name/ta/talentedhack/package.nix
+++ b/pkgs/by-name/ta/talentedhack/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeremysalwen";
     repo = "talentedhack";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx";
   };
 
diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index c7b7089d3acf..ee0744f777c9 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -26,7 +26,7 @@ let
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
-            tag = "v${version}";
+            rev = "v${version}";
             hash = "sha256-GiQTB/P+7uVGZfUaeM7S/5lGvfHlTl/cFt7XbNfE0qw=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/by-name/ta/tambura/package.nix b/pkgs/by-name/ta/tambura/package.nix
index e3458d3e0a5d..5c7fb003ba3d 100644
--- a/pkgs/by-name/ta/tambura/package.nix
+++ b/pkgs/by-name/ta/tambura/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "olilarkin";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y";
   };
 
diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix
index e369107b0d68..d840bc808327 100644
--- a/pkgs/by-name/ta/tandoor-recipes/common.nix
+++ b/pkgs/by-name/ta/tandoor-recipes/common.nix
@@ -5,7 +5,7 @@ rec {
   src = fetchFromGitHub {
     owner = "TandoorRecipes";
     repo = "recipes";
-    tag = version;
+    rev = version;
     hash = "sha256-CNlst4bpvRSOPABg85k9xltbrZhs5MQLfJr+t7l7hhI=";
   };
 
diff --git a/pkgs/by-name/ta/tango/package.nix b/pkgs/by-name/ta/tango/package.nix
index fe5545920fde..3fb877a9a9a7 100644
--- a/pkgs/by-name/ta/tango/package.nix
+++ b/pkgs/by-name/ta/tango/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "masakichi";
     repo = "tango";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-e/M2iRm/UwfnRVnMo1PmQTkz4IGTxnsCXNSSUkhsiHk=";
   };
 
diff --git a/pkgs/by-name/ta/tangram/package.nix b/pkgs/by-name/ta/tangram/package.nix
index a0972cbb3154..60dfcae1a73f 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OtQN8Iigu92iKa7CAaslIpbS0bqJ9Vus++inrgV/eeM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix
index a367840e24e4..2256bdffd70c 100644
--- a/pkgs/by-name/ta/tanka/package.nix
+++ b/pkgs/by-name/ta/tanka/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-MaWO9I2+xHA+55tUSQ91yJ7suubnWP4V7JxZTruN1A0=";
   };
 
diff --git a/pkgs/by-name/ta/taoup/package.nix b/pkgs/by-name/ta/taoup/package.nix
index 6a45bc6ce8f1..3243c6a8ca76 100644
--- a/pkgs/by-name/ta/taoup/package.nix
+++ b/pkgs/by-name/ta/taoup/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "globalcitizen";
     repo = "taoup";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9J46fKyeSZW71r67R8y9KVPeCH8fn27hOk/XpusqGmk=";
   };
 
diff --git a/pkgs/by-name/ta/taproot-assets/package.nix b/pkgs/by-name/ta/taproot-assets/package.nix
index 2a46c27f3edf..2ab0bf31e5e5 100644
--- a/pkgs/by-name/ta/taproot-assets/package.nix
+++ b/pkgs/by-name/ta/taproot-assets/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "taproot-assets";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-R6x8M69HM7mC0XG5cAH5SwTzeoSicNwZx0ExAKwcI80=";
   };
 
diff --git a/pkgs/by-name/ta/tar2ext4/package.nix b/pkgs/by-name/ta/tar2ext4/package.nix
index 3e677937c00a..c33f25412231 100644
--- a/pkgs/by-name/ta/tar2ext4/package.nix
+++ b/pkgs/by-name/ta/tar2ext4/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "hcsshim";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-20+y7wFV3HxkrS1qHNq2neIc826HU5AXzuqqS7Ll2gg=";
   };
 
diff --git a/pkgs/by-name/ta/tarantool/package.nix b/pkgs/by-name/ta/tarantool/package.nix
index f61eeae0247d..4bfc8c4bb9e4 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";
-    tag = version;
+    rev = version;
     hash = "sha256-yCRU5IxC6gNS+O2KYtKWjFk35EHkBnnzWy5UnyuB9f4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ta/target-isns/package.nix b/pkgs/by-name/ta/target-isns/package.nix
index 6f0faed2a2bb..acdffceb3a98 100644
--- a/pkgs/by-name/ta/target-isns/package.nix
+++ b/pkgs/by-name/ta/target-isns/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "open-iscsi";
     repo = "target-isns";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1b6jjalvvkkjyjbg1pcgk8vmvc6xzzksyjnh2pfi45bbpya4zxim";
   };
 
diff --git a/pkgs/by-name/ta/tarsnapper/package.nix b/pkgs/by-name/ta/tarsnapper/package.nix
index d4d694ff444f..b1afa06f6008 100644
--- a/pkgs/by-name/ta/tarsnapper/package.nix
+++ b/pkgs/by-name/ta/tarsnapper/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "miracle2k";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-5i9eum9hbh6VFhvEIDq5Uapy6JtIbf9jZHhRYZVoC1w=";
   };
 
diff --git a/pkgs/by-name/ta/tarssh/package.nix b/pkgs/by-name/ta/tarssh/package.nix
index 5f12425c288b..031a2a214b37 100644
--- a/pkgs/by-name/ta/tarssh/package.nix
+++ b/pkgs/by-name/ta/tarssh/package.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.7.0";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "Freaky";
     repo = pname;
     sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk=";
diff --git a/pkgs/by-name/ta/taskopen/package.nix b/pkgs/by-name/ta/taskopen/package.nix
index 2e37d91696eb..8507256139e9 100644
--- a/pkgs/by-name/ta/taskopen/package.nix
+++ b/pkgs/by-name/ta/taskopen/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ValiValpas";
     repo = "taskopen";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/xf7Ph2KKiZ5lgLKk95nCgw/z9wIBmuWf3QGaNebgHg=";
   };
 
diff --git a/pkgs/by-name/ta/tasktimer/package.nix b/pkgs/by-name/ta/tasktimer/package.nix
index a0ff1cb32a1c..de2cdc50fe71 100644
--- a/pkgs/by-name/ta/tasktimer/package.nix
+++ b/pkgs/by-name/ta/tasktimer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CAqOsxmJxDgQRMx8cN23TajHd6BNiCFraFvhf5kKnzc=";
   };
 
diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix
index 633574f5c4d8..cfdc047d0dfd 100644
--- a/pkgs/by-name/ta/taskwarrior-tui/package.nix
+++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kdheepak";
     repo = "taskwarrior-tui";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8PFGlsm9B6qHRrY7YIPwknmGS+Peg5MWd0kMT173wIQ=";
   };
 
diff --git a/pkgs/by-name/ta/taskwarrior2/package.nix b/pkgs/by-name/ta/taskwarrior2/package.nix
index db6eed2e2081..151a2f134160 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ta/tau-hydrogen/package.nix b/pkgs/by-name/ta/tau-hydrogen/package.nix
index b10d47eaec3b..745d7638e5ba 100644
--- a/pkgs/by-name/ta/tau-hydrogen/package.nix
+++ b/pkgs/by-name/ta/tau-hydrogen/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tau-OS";
     repo = "tau-hydrogen";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-nnQ0lkHtkOjJhF4NSMqjt0deddYjMnHHlANlHoZS2wY=";
   };
 
diff --git a/pkgs/by-name/ta/taxi/package.nix b/pkgs/by-name/ta/taxi/package.nix
index 34e9e5d2eac5..4eb5e061f089 100644
--- a/pkgs/by-name/ta/taxi/package.nix
+++ b/pkgs/by-name/ta/taxi/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Alecaddd";
     repo = "taxi";
-    tag = version;
+    rev = version;
     sha256 = "1a4a14b2d5vqbk56drzbbldp0nngfqhwycpyv8d3svi2nchkvpqa";
   };
 
diff --git a/pkgs/by-name/tb/tbox/package.nix b/pkgs/by-name/tb/tbox/package.nix
index 9c2ede531ba7..54ee57c0b5a0 100644
--- a/pkgs/by-name/tb/tbox/package.nix
+++ b/pkgs/by-name/tb/tbox/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tboox";
     repo = "tbox";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cwpZ7F8WzT/46HrckHe0Aug2mxirCkNA68aCxg/FcsE=";
   };
 
diff --git a/pkgs/by-name/tc/tcat/package.nix b/pkgs/by-name/tc/tcat/package.nix
index 3fe4be042abd..25c826e70326 100644
--- a/pkgs/by-name/tc/tcat/package.nix
+++ b/pkgs/by-name/tc/tcat/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rsc";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1szzfz5xsx9l8gjikfncgp86hydzpvsi0y5zvikd621xkp7g7l21";
   };
   vendorHash = null;
diff --git a/pkgs/by-name/tc/tcpcrypt/package.nix b/pkgs/by-name/tc/tcpcrypt/package.nix
index 984954d2f73b..bf9552a1ee45 100644
--- a/pkgs/by-name/tc/tcpcrypt/package.nix
+++ b/pkgs/by-name/tc/tcpcrypt/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "tcpcrypt";
     owner = "scslab";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0a015rlyvagz714pgwr85f8gjq1fkc0il7d7l39qcgxrsp15b96w";
   };
 
diff --git a/pkgs/by-name/tc/tcpkali/package.nix b/pkgs/by-name/tc/tcpkali/package.nix
index 156f97115e08..3641c698ac48 100644
--- a/pkgs/by-name/tc/tcpkali/package.nix
+++ b/pkgs/by-name/tc/tcpkali/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "machinezone";
     repo = "tcpkali";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09ky3cccaphcqc6nhfs00pps99lasmzc2pf5vk0gi8hlqbbhilxf";
   };
   postPatch = ''
diff --git a/pkgs/by-name/td/tdl/package.nix b/pkgs/by-name/td/tdl/package.nix
index 62b1e1089a0c..a2b11b68a982 100644
--- a/pkgs/by-name/td/tdl/package.nix
+++ b/pkgs/by-name/td/tdl/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "iyear";
     repo = "tdl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PVd9aYo4ALgzovNOfAUQkAaAbWNLeqF+UEPlL9iGhAs=";
   };
 
diff --git a/pkgs/by-name/td/tdrop/package.nix b/pkgs/by-name/td/tdrop/package.nix
index bb640e3c0877..017f72e44fac 100644
--- a/pkgs/by-name/td/tdrop/package.nix
+++ b/pkgs/by-name/td/tdrop/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "noctuid";
     repo = "tdrop";
-    tag = version;
+    rev = version;
     sha256 = "sha256-fHvGXaZL7MMvTnkap341B79PDDo2lOVPPcOH4AX/zXo=";
   };
 
diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix
index 7f361c5e67ed..27eb4d3fd6a7 100644
--- a/pkgs/by-name/te/tealdeer/package.nix
+++ b/pkgs/by-name/te/tealdeer/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dbrgn";
     repo = "tealdeer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GZN7WE12f3MEoBfswag0O04UOCmZeYwt5CbYwddmwHs=";
   };
 
diff --git a/pkgs/by-name/te/teapot/package.nix b/pkgs/by-name/te/teapot/package.nix
index 29f535d2fd85..34c24962354d 100644
--- a/pkgs/by-name/te/teapot/package.nix
+++ b/pkgs/by-name/te/teapot/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     name = "${pname}-${version}";
     owner = "museoa";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-38XFjRzOGasr030f+mRYT+ptlabpnVJfa+1s7ZAjS+k=";
   };
 
diff --git a/pkgs/by-name/te/tebreak/package.nix b/pkgs/by-name/te/tebreak/package.nix
index bb903c798d1f..47587b1a8c22 100644
--- a/pkgs/by-name/te/tebreak/package.nix
+++ b/pkgs/by-name/te/tebreak/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "adamewing";
     repo = "tebreak";
-    tag = version;
+    rev = version;
     sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz";
   };
 
diff --git a/pkgs/by-name/te/techmino/ccloader.nix b/pkgs/by-name/te/techmino/ccloader.nix
index 0af1c23f0c11..ff312555d791 100644
--- a/pkgs/by-name/te/techmino/ccloader.nix
+++ b/pkgs/by-name/te/techmino/ccloader.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "26F-Studio";
     repo = "cold_clear_ai_love2d_wrapper";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-sguV+Dw+etZH43tXZYL46NAdsI/qvyvGWCPUiTEjhy4=";
   };
diff --git a/pkgs/by-name/te/teehee/package.nix b/pkgs/by-name/te/teehee/package.nix
index 2a3f23e2d15d..a7d5b4780076 100644
--- a/pkgs/by-name/te/teehee/package.nix
+++ b/pkgs/by-name/te/teehee/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Gskartwii";
     repo = "teehee";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI=";
   };
 
diff --git a/pkgs/by-name/te/teensy-loader-cli/package.nix b/pkgs/by-name/te/teensy-loader-cli/package.nix
index e30a1bc42358..ab668e7527d6 100644
--- a/pkgs/by-name/te/teensy-loader-cli/package.nix
+++ b/pkgs/by-name/te/teensy-loader-cli/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "PaulStoffregen";
     repo = "teensy_loader_cli";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-NYqCNWO/nHEuNc9eOzsUqJEHJtZ3XaNz1VYNbeuqEk8=";
   };
 
diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix
index eb4e0a6d12c4..fb976e3e531f 100644
--- a/pkgs/by-name/te/teip/package.nix
+++ b/pkgs/by-name/te/teip/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "greymd";
     repo = "teip";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Lr4nlAM2mEKwF3HXso/6FQEKoQK43xxLMgOU7j7orYg=";
   };
 
diff --git a/pkgs/by-name/te/tektoncd-cli/package.nix b/pkgs/by-name/te/tektoncd-cli/package.nix
index 923b1fd7331a..e3b3cbe537a3 100644
--- a/pkgs/by-name/te/tektoncd-cli/package.nix
+++ b/pkgs/by-name/te/tektoncd-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tektoncd";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LcYd8v6+at/GqlEV2Qkj5g+WNiTBfnQuhDtpP7lmnuk=";
   };
 
diff --git a/pkgs/by-name/te/tela-icon-theme/package.nix b/pkgs/by-name/te/tela-icon-theme/package.nix
index e7e16d172220..c202c013adec 100644
--- a/pkgs/by-name/te/tela-icon-theme/package.nix
+++ b/pkgs/by-name/te/tela-icon-theme/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "tela-icon-theme";
-    tag = version;
+    rev = version;
     hash = "sha256-ufjKFlKJnmNwD2m1w+7JSBQij6ltxXWCpUEvVxECS98=";
   };
 
diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix
index e39e390be2f0..5b456eaa482e 100644
--- a/pkgs/by-name/te/telegraf/package.nix
+++ b/pkgs/by-name/te/telegraf/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "telegraf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q+v4cKqBLGxsvR5e8OS6Ix/0JZ+0I/cf0M6P27ym9Go=";
   };
 
diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix
index aac8e705d352..e5aea69a6f1a 100644
--- a/pkgs/by-name/te/telepresence2/package.nix
+++ b/pkgs/by-name/te/telepresence2/package.nix
@@ -13,7 +13,7 @@ let
     src = fetchFromGitHub {
       owner = "datawire";
       repo = "go-fuseftp";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-bkaC+EOqFPQA4fDkVhO6EqgGhOJy31yGwVbbPoRd+70=";
     };
 
@@ -36,7 +36,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "telepresenceio";
     repo = "telepresence";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Bae77Kzc2cWxIb1yYKXctffuiC3ICPfi0qYP6fgaqvQ=";
   };
 
diff --git a/pkgs/by-name/te/telescope/package.nix b/pkgs/by-name/te/telescope/package.nix
index a428ac9d492d..5b1e417f0c5b 100644
--- a/pkgs/by-name/te/telescope/package.nix
+++ b/pkgs/by-name/te/telescope/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "omar-polo";
     repo = "telescope";
-    tag = version;
+    rev = version;
     hash = "sha256-MVZ/pvDAETacQiEMEXM0gYM20LXqNiHtMfFGqS1vipY=";
   };
 
diff --git a/pkgs/by-name/te/teller/package.nix b/pkgs/by-name/te/teller/package.nix
index 5f275da061d5..1fcdbcd46ff7 100644
--- a/pkgs/by-name/te/teller/package.nix
+++ b/pkgs/by-name/te/teller/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "tellerops";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CI74nMMTIPwjJfy7ASR19V6EbYZ62NoAOxlP3Xt2BuI=";
   };
 
diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix
index 59f730ad6908..ca3d1bd37a0e 100644
--- a/pkgs/by-name/te/templ/package.nix
+++ b/pkgs/by-name/te/templ/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "a-h";
     repo = "templ";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-c3x7v5PeMJFADRfImMyEasvlC9WSjqHQxNDg1sgPBfQ=";
   };
 
diff --git a/pkgs/by-name/te/tempo/package.nix b/pkgs/by-name/te/tempo/package.nix
index e3712aea5eb5..730472af229a 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-JBbECknhqYKzFlxAOVinuUCf/2xuUdh2ryK9c35YZ9o=";
   };
diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix
index 3a5845ba0f17..585e01627596 100644
--- a/pkgs/by-name/te/temporal-cli/package.nix
+++ b/pkgs/by-name/te/temporal-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9O+INXJhNwgwwvC0751ifdHmxbD0qI5A3LdDb4Krk/o=";
   };
 
diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix
index aadf51f34673..cf788adb5a66 100644
--- a/pkgs/by-name/te/temporal/package.nix
+++ b/pkgs/by-name/te/temporal/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "temporal";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3x94Cccy5CHAKb2eHdMThAC+ONQjuYZ4UyQ8YwrWvgU=";
   };
 
diff --git a/pkgs/by-name/te/temporalite/package.nix b/pkgs/by-name/te/temporalite/package.nix
index 0c70966c6489..578f81790a26 100644
--- a/pkgs/by-name/te/temporalite/package.nix
+++ b/pkgs/by-name/te/temporalite/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-IEB9AFEt8U2zXYfbChfL/UH1rNSLPnfS396/cPE8UdE=";
   };
 
diff --git a/pkgs/by-name/te/tendermint/package.nix b/pkgs/by-name/te/tendermint/package.nix
index f6f525c45055..919df2219340 100644
--- a/pkgs/by-name/te/tendermint/package.nix
+++ b/pkgs/by-name/te/tendermint/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tendermint";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3tggW+M3vZChDT1g77W5M3hchEN6pTSVvkrZda6ZTCY=";
   };
 
diff --git a/pkgs/by-name/te/tenki/package.nix b/pkgs/by-name/te/tenki/package.nix
index 134064e669b7..275422880048 100644
--- a/pkgs/by-name/te/tenki/package.nix
+++ b/pkgs/by-name/te/tenki/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ckaznable";
     repo = "tenki";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jd7D0iC3+s3w6uG0WqlvL9F4xQL+cQzsUvAIOc7ORgw=";
   };
 
diff --git a/pkgs/by-name/te/tensorflow-lite/package.nix b/pkgs/by-name/te/tensorflow-lite/package.nix
index c5352b2b81f6..2c2556f7d4eb 100644
--- a/pkgs/by-name/te/tensorflow-lite/package.nix
+++ b/pkgs/by-name/te/tensorflow-lite/package.nix
@@ -38,7 +38,7 @@ buildBazelPackage rec {
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "tensorflow";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Rq5pAVmxlWBVnph20fkAwbfy+iuBNlfFy14poDPd5h0=";
   };
 
diff --git a/pkgs/by-name/te/termbg/package.nix b/pkgs/by-name/te/termbg/package.nix
index 43f97cb8d14d..c0a45c888e57 100644
--- a/pkgs/by-name/te/termbg/package.nix
+++ b/pkgs/by-name/te/termbg/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dalance";
     repo = "termbg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KLWfdA7TArJqYoxIXQavaTNw/lmWQN9aeltxssIUEvk=";
   };
 
diff --git a/pkgs/by-name/te/termbook/package.nix b/pkgs/by-name/te/termbook/package.nix
index 53a20d4d45fd..d6b450f6b7de 100644
--- a/pkgs/by-name/te/termbook/package.nix
+++ b/pkgs/by-name/te/termbook/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "termbook";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "Bo3DI0cMXIfP7ZVr8MAW/Tmv+4mEJBIQyLvRfVBDG8c=";
   };
 
diff --git a/pkgs/by-name/te/termcolor/package.nix b/pkgs/by-name/te/termcolor/package.nix
index 340c71245d36..6741ffdb4470 100644
--- a/pkgs/by-name/te/termcolor/package.nix
+++ b/pkgs/by-name/te/termcolor/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ikalnytskyi";
     repo = "termcolor";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-2RXQ8sn2VNhQ2WZfwCCeQuM6x6C+sLA6ulAaFtaDMZw=";
   };
 
diff --git a/pkgs/by-name/te/terminal-colors/package.nix b/pkgs/by-name/te/terminal-colors/package.nix
index 833f81350b91..7dd498833053 100644
--- a/pkgs/by-name/te/terminal-colors/package.nix
+++ b/pkgs/by-name/te/terminal-colors/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eikenb";
     repo = "terminal-colors";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KRoP/Reo5nDKJYG9zVTVpoYL7soAGMNk46vDoaLfnv4=";
   };
 
diff --git a/pkgs/by-name/te/terminal-parrot/package.nix b/pkgs/by-name/te/terminal-parrot/package.nix
index 2215ee3a9cf2..f3e7cec81db3 100644
--- a/pkgs/by-name/te/terminal-parrot/package.nix
+++ b/pkgs/by-name/te/terminal-parrot/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jmhobbs";
     repo = "terminal-parrot";
-    tag = version;
+    rev = version;
     hash = "sha256-LI67DDcK3M084r9JPx8NcBWthaiBOCEL4lQJhuUJSok=";
   };
 
diff --git a/pkgs/by-name/te/terminal-stocks/package.nix b/pkgs/by-name/te/terminal-stocks/package.nix
index dbdb65500f8a..02aa044f47e3 100644
--- a/pkgs/by-name/te/terminal-stocks/package.nix
+++ b/pkgs/by-name/te/terminal-stocks/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "shweshi";
     repo = "terminal-stocks";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6eDBcQfo6M+Z31ILLM4BbiOxoTD6t4LQJxawoJFEzhg=";
   };
 
diff --git a/pkgs/by-name/te/termshark/package.nix b/pkgs/by-name/te/termshark/package.nix
index 2ae99082227b..4e8439fa0329 100644
--- a/pkgs/by-name/te/termshark/package.nix
+++ b/pkgs/by-name/te/termshark/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gcla";
     repo = "termshark";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qq7BDGprRkWKRMJiVnqPeTwtHd3tea9dPE8RIPL2YVI=";
   };
 
diff --git a/pkgs/by-name/te/termsvg/package.nix b/pkgs/by-name/te/termsvg/package.nix
index fc190548d94e..9726eeb44474 100644
--- a/pkgs/by-name/te/termsvg/package.nix
+++ b/pkgs/by-name/te/termsvg/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mrmarble";
     repo = "termsvg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q6xjsoxQTIQwPYkBTGwLfTt1VQ8GJPdsiP5dvTyEBIw=";
   };
 
diff --git a/pkgs/by-name/te/termtekst/package.nix b/pkgs/by-name/te/termtekst/package.nix
index 2ae738471a6b..09b13dd74459 100644
--- a/pkgs/by-name/te/termtekst/package.nix
+++ b/pkgs/by-name/te/termtekst/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "zevv";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1gm7j5d49a60wm7px82b76f610i8pl8ccz4r6qsz90z4mp3lyw9b";
   };
 
diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix
index aa356825d28c..137551166f52 100644
--- a/pkgs/by-name/te/termusic/package.nix
+++ b/pkgs/by-name/te/termusic/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tramhao";
     repo = "termusic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Yd23Jk2BFuLtxgF8vgat0wTGq6ahHHBd/HjGI9BY9z4=";
   };
 
diff --git a/pkgs/by-name/te/terracognita/package.nix b/pkgs/by-name/te/terracognita/package.nix
index fcf0ffb92756..f5afcc70ef02 100644
--- a/pkgs/by-name/te/terracognita/package.nix
+++ b/pkgs/by-name/te/terracognita/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cycloidio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pPY8y+pQdk9/F7dnUBz/y4lvcR1k/EClywcZATArZVA=";
   };
 
diff --git a/pkgs/by-name/te/terraform-backend-git/package.nix b/pkgs/by-name/te/terraform-backend-git/package.nix
index 75a4c74f4dc0..0df99f3ddce7 100644
--- a/pkgs/by-name/te/terraform-backend-git/package.nix
+++ b/pkgs/by-name/te/terraform-backend-git/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "plumber-cd";
     repo = "terraform-backend-git";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mZbGMv5b9wK/gWqQB75sDJIVURrS6t/L7WBhTonaatQ=";
   };
 
diff --git a/pkgs/by-name/te/terraform-docs/package.nix b/pkgs/by-name/te/terraform-docs/package.nix
index 31465213f5c0..bbeb074c625d 100644
--- a/pkgs/by-name/te/terraform-docs/package.nix
+++ b/pkgs/by-name/te/terraform-docs/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "terraform-docs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DiKoYAe7vcNy35ormKHYZcZrGK/MEb6VmcHWPgrbmUg=";
   };
 
diff --git a/pkgs/by-name/te/terraform-inventory/package.nix b/pkgs/by-name/te/terraform-inventory/package.nix
index 249e51854906..aeec2b66e1f5 100644
--- a/pkgs/by-name/te/terraform-inventory/package.nix
+++ b/pkgs/by-name/te/terraform-inventory/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adammck";
     repo = "terraform-inventory";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gkSDxcBoYmCBzkO8y1WKcRtZdfl8w5qVix0zbyb4Myo=";
   };
 
diff --git a/pkgs/by-name/te/terraform-ls/package.nix b/pkgs/by-name/te/terraform-ls/package.nix
index 490a130ad87f..9449895a8cb8 100644
--- a/pkgs/by-name/te/terraform-ls/package.nix
+++ b/pkgs/by-name/te/terraform-ls/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-20spDPVJC48r6Qy6KS8Yp6lUE22DuoOM17WPS3+KN9E=";
   };
 
diff --git a/pkgs/by-name/te/terraform-lsp/package.nix b/pkgs/by-name/te/terraform-lsp/package.nix
index b8d84c57fe34..385aca330aaa 100644
--- a/pkgs/by-name/te/terraform-lsp/package.nix
+++ b/pkgs/by-name/te/terraform-lsp/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "juliosueiras";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "111350jbq0dp0qhk48j12hrlisd1fwzqpcv357igrbqf6ki7r78q";
   };
 
diff --git a/pkgs/by-name/te/terraformer/package.nix b/pkgs/by-name/te/terraformer/package.nix
index d9c0c8c4e412..cf7f10285783 100644
--- a/pkgs/by-name/te/terraformer/package.nix
+++ b/pkgs/by-name/te/terraformer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-xbZm0FOa/W6/qXMnJHuGgJhgu2NWtKrMoP0Ttd+hhdw=";
   };
 
diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix
index fbd1ea9a6486..03d92bc3af40 100644
--- a/pkgs/by-name/te/terramate/package.nix
+++ b/pkgs/by-name/te/terramate/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "terramate-io";
     repo = "terramate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9Bv4FlQzUX/mnSlv1qZqVER/JS0gr3HHmPV+axHKgJw=";
   };
 
diff --git a/pkgs/by-name/te/terranix/package.nix b/pkgs/by-name/te/terranix/package.nix
index bb041fd00417..65f1d715154c 100644
--- a/pkgs/by-name/te/terranix/package.nix
+++ b/pkgs/by-name/te/terranix/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mrVanDalo";
     repo = "terranix";
-    tag = version;
+    rev = version;
     sha256 = "sha256-1Pu2j5xsBTuoyga08ZVf+rKp3FOMmJh/0fXen/idOrA=";
   };
 
diff --git a/pkgs/by-name/te/terser/package.nix b/pkgs/by-name/te/terser/package.nix
index 4a4dea1d8239..39e23a691bbd 100644
--- a/pkgs/by-name/te/terser/package.nix
+++ b/pkgs/by-name/te/terser/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "terser";
     repo = "terser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iVl5L5qxpXkBfiW8OqsMr4iZ0UQiN4TSAYXz9d29bnA=";
   };
 
diff --git a/pkgs/by-name/te/tesh/package.nix b/pkgs/by-name/te/tesh/package.nix
index a57585d44aaa..0e1ff3a788e3 100644
--- a/pkgs/by-name/te/tesh/package.nix
+++ b/pkgs/by-name/te/tesh/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OceanSprint";
     repo = "tesh";
-    tag = version;
+    rev = version;
     hash = "sha256-GIwg7Cv7tkLu81dmKT65c34eeVnRR5MIYfNwTE7j2Vs=";
   };
 
diff --git a/pkgs/by-name/te/test-drive/package.nix b/pkgs/by-name/te/test-drive/package.nix
index afa9b1167ceb..0d38269587a4 100644
--- a/pkgs/by-name/te/test-drive/package.nix
+++ b/pkgs/by-name/te/test-drive/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fortran-lang";
     repo = "test-drive";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xRx8ErIN9xjxZt/nEsdIQkIGFRltuELdlI8lXA+M030=";
   };
 
diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix
index e95540622e20..f428dbba2df9 100644
--- a/pkgs/by-name/te/testkube/package.nix
+++ b/pkgs/by-name/te/testkube/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubeshop";
     repo = "testkube";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Coi/aPEZb1VoMCOtzl2AcURomo4uS76AZDS449B4EcU=";
   };
 
diff --git a/pkgs/by-name/te/testssl/package.nix b/pkgs/by-name/te/testssl/package.nix
index c4df0fe9504e..b2eae1e9b66f 100644
--- a/pkgs/by-name/te/testssl/package.nix
+++ b/pkgs/by-name/te/testssl/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "drwetter";
     repo = "testssl.sh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-MZNQ7oOJD/vjOwDiPOZr3k+Mn0XXVdkP7cC/0mnWLic=";
   };
 
diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix
index 23c68ed5e427..4fe472b6affc 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 = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-ke1T5nOrDoJilpfshAIAFWw/640Gm5OaxZ+ZakCevTs=";
   };
diff --git a/pkgs/by-name/te/tewi-font/package.nix b/pkgs/by-name/te/tewi-font/package.nix
index 12c33326cf14..61b72b3249ef 100644
--- a/pkgs/by-name/te/tewi-font/package.nix
+++ b/pkgs/by-name/te/tewi-font/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lucy";
     repo = "tewi-font";
-    tag = version;
+    rev = version;
     sha256 = "1axv9bv10xlcmgfyjh3z5kn5fkg3m6n1kskcs5hvlmyb6m1zk91j";
   };
 
diff --git a/pkgs/by-name/te/texstudio/package.nix b/pkgs/by-name/te/texstudio/package.nix
index 52a9e364196f..8c87594998a0 100644
--- a/pkgs/by-name/te/texstudio/package.nix
+++ b/pkgs/by-name/te/texstudio/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "texstudio-org";
     repo = "texstudio";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-PvxzG4VPhCmwc/Kh5g85fV/Mc7ih08pt/zUNBgldZiI=";
   };
 
diff --git a/pkgs/by-name/te/text-engine/package.nix b/pkgs/by-name/te/text-engine/package.nix
index 913cb9d0d498..434cdbb78326 100644
--- a/pkgs/by-name/te/text-engine/package.nix
+++ b/pkgs/by-name/te/text-engine/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mjakeman";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YSG4Vk3hrmtaJkK1WAlQcdgiDdgC4Un0t6UdaoIcUes=";
   };
 
diff --git a/pkgs/by-name/te/textual-paint/package.nix b/pkgs/by-name/te/textual-paint/package.nix
index 355498a5779b..a512c4e173b7 100644
--- a/pkgs/by-name/te/textual-paint/package.nix
+++ b/pkgs/by-name/te/textual-paint/package.nix
@@ -35,7 +35,7 @@ let
         src = fetchFromGitHub {
           owner = "Textualize";
           repo = "textual";
-          tag = "v${version}";
+          rev = "v${version}";
           hash = "sha256-ag+sJFprYW3IpH+BiMR5eSRUFMBeVuOnF6GTTuXGBHw=";
         };
       };
@@ -51,7 +51,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "1j01";
     repo = "textual-paint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ubBWK4aoa9+wyUED7CmWwjknWsWauR/mkurDgkKDiY8=";
   };
 
diff --git a/pkgs/by-name/te/texture-synthesis/package.nix b/pkgs/by-name/te/texture-synthesis/package.nix
index 8da69f3742b0..d850db20cad8 100644
--- a/pkgs/by-name/te/texture-synthesis/package.nix
+++ b/pkgs/by-name/te/texture-synthesis/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "embarkstudios";
     repo = "texture-synthesis";
-    tag = version;
+    rev = version;
     hash = "sha256-BJa6T+qlbn7uABKIEhFhwLrw5sG/9al4L/2sbllfPFg=";
   };
 
diff --git a/pkgs/by-name/te/tezos-rust-libs/package.nix b/pkgs/by-name/te/tezos-rust-libs/package.nix
index 85eca39fd8d1..03e10ca9ed6b 100644
--- a/pkgs/by-name/te/tezos-rust-libs/package.nix
+++ b/pkgs/by-name/te/tezos-rust-libs/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "tezos";
     repo = "tezos-rust-libs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SuCqDZDXmWdGI/GN+3nYcUk66jnW5FQQaeTB76/rvaw=";
   };
 
diff --git a/pkgs/by-name/tf/tf-summarize/package.nix b/pkgs/by-name/tf/tf-summarize/package.nix
index 46c1638c2c95..29da31f6e66b 100644
--- a/pkgs/by-name/tf/tf-summarize/package.nix
+++ b/pkgs/by-name/tf/tf-summarize/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dineshba";
     repo = "tf-summarize";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yjketL/7+gsWIvltqotouSNgTCBOqVrHqiblXoCsWgI=";
   };
 
diff --git a/pkgs/by-name/tf/tf2pulumi/package.nix b/pkgs/by-name/tf/tf2pulumi/package.nix
index 934f06dacd60..37b1ac9bfe2e 100644
--- a/pkgs/by-name/tf/tf2pulumi/package.nix
+++ b/pkgs/by-name/tf/tf2pulumi/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "tf2pulumi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-i6nK1AEnQY47ro6tNDBExdcb9WvltY/21FVrVaiSTvo=";
   };
 
diff --git a/pkgs/by-name/tf/tfautomv/package.nix b/pkgs/by-name/tf/tfautomv/package.nix
index 3ae4cf1f0b10..97eb4ba2054a 100644
--- a/pkgs/by-name/tf/tfautomv/package.nix
+++ b/pkgs/by-name/tf/tfautomv/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "busser";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qUeIbHJqxGkt2esMm4w6fM52ZE16jWnxugVXxqBh1Qc=";
   };
 
diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix
index d254ce0b17ef..b4558be4d273 100644
--- a/pkgs/by-name/tf/tfswitch/package.nix
+++ b/pkgs/by-name/tf/tfswitch/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "terraform-switcher";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5Zyu0SLF+xjemFKInzRKCcDZs72gwAJN7bacO+5StMg=";
   };
 
diff --git a/pkgs/by-name/tf/tfupdate/package.nix b/pkgs/by-name/tf/tfupdate/package.nix
index c0f9f23bb43b..098510b344fe 100644
--- a/pkgs/by-name/tf/tfupdate/package.nix
+++ b/pkgs/by-name/tf/tfupdate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "minamijoyo";
     repo = "tfupdate";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-iWiY1IuNZCqHpnAoib0SkWwAg1Mnuqr2QjKI3KZGYs0=";
   };
 
diff --git a/pkgs/by-name/tg/tgswitch/package.nix b/pkgs/by-name/tg/tgswitch/package.nix
index 5ba677a70766..bfa533b26815 100644
--- a/pkgs/by-name/tg/tgswitch/package.nix
+++ b/pkgs/by-name/tg/tgswitch/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "tgswitch";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Q3Cef3B7hfVHLvW8Rx6IdH9g/3luDhpUMZ8TXVpb8gQ=";
   };
 
diff --git a/pkgs/by-name/tg/tgt/package.nix b/pkgs/by-name/tg/tgt/package.nix
index 9b1c8e1f51af..525a882ed0c0 100644
--- a/pkgs/by-name/tg/tgt/package.nix
+++ b/pkgs/by-name/tg/tgt/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fujita";
     repo = "tgt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-e7rI8/WQl1L78l2Nk9ajomRucPwsSqZ7fLSHSw11jeY=";
   };
 
diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix
index 072937f79c38..f65c0428f7c5 100644
--- a/pkgs/by-name/th/thc-hydra/package.nix
+++ b/pkgs/by-name/th/thc-hydra/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vanhauser-thc";
     repo = "thc-hydra";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gdMxdFrBGVHA1ZBNFW89PBXwACnXTGJ/e/Z5+xVV5F0=";
   };
 
diff --git a/pkgs/by-name/th/thc-ipv6/package.nix b/pkgs/by-name/th/thc-ipv6/package.nix
index d94fbcd9a744..c28e42efb764 100644
--- a/pkgs/by-name/th/thc-ipv6/package.nix
+++ b/pkgs/by-name/th/thc-ipv6/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vanhauser-thc";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "07kwika1zdq62s5p5z94xznm77dxjxdg8k0hrg7wygz50151nzmx";
   };
 
diff --git a/pkgs/by-name/th/the-legend-of-edgar/package.nix b/pkgs/by-name/th/the-legend-of-edgar/package.nix
index 8cf790412318..8504e66e4eb7 100644
--- a/pkgs/by-name/th/the-legend-of-edgar/package.nix
+++ b/pkgs/by-name/th/the-legend-of-edgar/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "riksweeney";
     repo = "edgar";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-hhzDNnoQCwHOwknABTz4a9AQ7MkU9vayi2tZvJtK1PQ=";
   };
 
diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix
index 9a6746d2e16c..537e992cf725 100644
--- a/pkgs/by-name/th/theforceengine/package.nix
+++ b/pkgs/by-name/th/theforceengine/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "luciusDXL";
     repo = "TheForceEngine";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m/VNlcuvpJkcfTpL97gCUTQtdAWqimVrhU0qLj0Erck=";
   };
 
diff --git a/pkgs/by-name/th/theft/package.nix b/pkgs/by-name/th/theft/package.nix
index f32ef0f84ecc..97c56847006a 100644
--- a/pkgs/by-name/th/theft/package.nix
+++ b/pkgs/by-name/th/theft/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "silentbicycle";
     repo = "theft";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd";
   };
 
diff --git a/pkgs/by-name/th/theme-sh/package.nix b/pkgs/by-name/th/theme-sh/package.nix
index ba996142cc43..653bf7b148a6 100644
--- a/pkgs/by-name/th/theme-sh/package.nix
+++ b/pkgs/by-name/th/theme-sh/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lemnos";
     repo = "theme.sh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zDw8WGBzO4/HRCgN7yoUxT49ibTz+QkRa5WpBQbl1nI=";
   };
 
diff --git a/pkgs/by-name/th/theme-vertex/package.nix b/pkgs/by-name/th/theme-vertex/package.nix
index cd5052e898cb..7ff73b4cbe8c 100644
--- a/pkgs/by-name/th/theme-vertex/package.nix
+++ b/pkgs/by-name/th/theme-vertex/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "horst3180";
     repo = "vertex-theme";
-    tag = version;
+    rev = version;
     sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98";
   };
 
diff --git a/pkgs/by-name/th/themechanger/package.nix b/pkgs/by-name/th/themechanger/package.nix
index b726e4e0906d..8d1f483c3f82 100644
--- a/pkgs/by-name/th/themechanger/package.nix
+++ b/pkgs/by-name/th/themechanger/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ALEX11BR";
     repo = "ThemeChanger";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+uTofigS1F/nBNs/OyJ+RSz10DNnqgvNjWpkTXAvARM=";
   };
 
diff --git a/pkgs/by-name/th/themix-gui/package.nix b/pkgs/by-name/th/themix-gui/package.nix
index 0c2bef19e7f5..91bf3f3bf027 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";
-    tag = version;
+    rev = version;
     hash = "sha256-xFtwNx1c7Atb+9yorZhs/uVkkoxbZiELJ0SZ88L7KMs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/th/thermald/package.nix b/pkgs/by-name/th/thermald/package.nix
index b4ef34a9154a..fbf1e7fdf9aa 100644
--- a/pkgs/by-name/th/thermald/package.nix
+++ b/pkgs/by-name/th/thermald/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "thermal_daemon";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ydv6wZ3r2QxVji9bSx0sgpaOQNtgN+Y4rPZ44XtxNh8=";
   };
 
diff --git a/pkgs/by-name/th/thicket/package.nix b/pkgs/by-name/th/thicket/package.nix
index 8ffcb422aac3..bef6bc28c2b5 100644
--- a/pkgs/by-name/th/thicket/package.nix
+++ b/pkgs/by-name/th/thicket/package.nix
@@ -11,7 +11,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "taylorthurlow";
     repo = "thicket";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sF+fNKEZEfjpW3buh6kFUpL1P0yO9g4SrTb0rhx1uNc=";
   };
 
diff --git a/pkgs/by-name/th/thin-provisioning-tools/package.nix b/pkgs/by-name/th/thin-provisioning-tools/package.nix
index 8090f8aec03a..216e37afb3b7 100644
--- a/pkgs/by-name/th/thin-provisioning-tools/package.nix
+++ b/pkgs/by-name/th/thin-provisioning-tools/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jthornber";
     repo = "thin-provisioning-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gpUiLUdg+EpVkJzDg43gI5oXhy611QwndwZZVVgg4Lg=";
   };
 
diff --git a/pkgs/by-name/th/thinkfan/package.nix b/pkgs/by-name/th/thinkfan/package.nix
index 0fe4f18c4439..6d7360a69f30 100644
--- a/pkgs/by-name/th/thinkfan/package.nix
+++ b/pkgs/by-name/th/thinkfan/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vmatare";
     repo = "thinkfan";
-    tag = version;
+    rev = version;
     sha256 = "sha256-aREZv+t4QhtfLKOMrneLiRxgnu0fzB8UV8dvr1dnhx4=";
   };
 
diff --git a/pkgs/by-name/th/thokr/package.nix b/pkgs/by-name/th/thokr/package.nix
index 6c4f2a82a5f8..928f68416573 100644
--- a/pkgs/by-name/th/thokr/package.nix
+++ b/pkgs/by-name/th/thokr/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "thatvegandev";
     repo = "thokr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0aryfx9qlnjdq3iq2d823c82fhkafvibmbz58g48b8ah5x5fv3ir";
   };
 
diff --git a/pkgs/by-name/th/thrift-ls/package.nix b/pkgs/by-name/th/thrift-ls/package.nix
index 505237eef8e7..3b97e030594d 100644
--- a/pkgs/by-name/th/thrift-ls/package.nix
+++ b/pkgs/by-name/th/thrift-ls/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "joyme123";
     repo = "thrift-ls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BkkXvmJ1XmDamU2Mt0BjbSnNVwlBxphW1FvE4x32ja0=";
   };
 
diff --git a/pkgs/by-name/th/throttled/package.nix b/pkgs/by-name/th/throttled/package.nix
index 2487f87d0b5f..61bb31de5862 100644
--- a/pkgs/by-name/th/throttled/package.nix
+++ b/pkgs/by-name/th/throttled/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "erpalma";
     repo = "throttled";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+3ktDkr5hvOfHcch4+mjgJqcuw24UgWTkJqTyDQumyk=";
   };
 
diff --git a/pkgs/by-name/th/thud/package.nix b/pkgs/by-name/th/thud/package.nix
index 74d7ad589ad5..2ceea89f1f2c 100644
--- a/pkgs/by-name/th/thud/package.nix
+++ b/pkgs/by-name/th/thud/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "donovanglover";
     repo = "thud";
-    tag = version;
+    rev = version;
     hash = "sha256-BmrJaZ1IKXjx4/QkBDZyXvTTaalfEOKsBp9ZCW8px7I=";
   };
 
diff --git a/pkgs/by-name/th/thumbs/package.nix b/pkgs/by-name/th/thumbs/package.nix
index f9c5990e8b75..4062e6517a04 100644
--- a/pkgs/by-name/th/thumbs/package.nix
+++ b/pkgs/by-name/th/thumbs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fcsonline";
     repo = "tmux-thumbs";
-    tag = version;
+    rev = version;
     sha256 = "sha256-XMz1ZOTz2q1Dt4QdxG83re9PIsgvxTTkytESkgKxhGM=";
   };
 
diff --git a/pkgs/by-name/th/thunderbolt/package.nix b/pkgs/by-name/th/thunderbolt/package.nix
index 6decf0a54010..9ed40b0d4741 100644
--- a/pkgs/by-name/th/thunderbolt/package.nix
+++ b/pkgs/by-name/th/thunderbolt/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "01org";
     repo = "thunderbolt-software-user-space";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x";
   };
 
diff --git a/pkgs/by-name/ti/tidb/package.nix b/pkgs/by-name/ti/tidb/package.nix
index 524231ff83b5..caa55285b65a 100644
--- a/pkgs/by-name/ti/tidb/package.nix
+++ b/pkgs/by-name/ti/tidb/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pingcap";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lJrW61FARZO1ll7Ln9mgCTZxGhcMlBaL6AeAVGgExIA=";
   };
 
diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
index 380bb1984cb1..09a9dcd7dbfc 100644
--- a/pkgs/by-name/ti/tidy-viewer/package.nix
+++ b/pkgs/by-name/ti/tidy-viewer/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alexhallam";
     repo = "tv";
-    tag = version;
+    rev = version;
     sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4=";
   };
 
diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix
index bbe79cd74dc6..617d901ed547 100644
--- a/pkgs/by-name/ti/tigervnc/package.nix
+++ b/pkgs/by-name/ti/tigervnc/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TigerVNC";
     repo = "tigervnc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TgVV/4MRsQHYKpDf9L5eHMLVpdwvNy1KPDIe7xMlQ9o=";
   };
 
diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix
index aac76df5d03f..ca15cf16221e 100644
--- a/pkgs/by-name/ti/tiledb/package.nix
+++ b/pkgs/by-name/ti/tiledb/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB";
-    tag = version;
+    rev = version;
     hash = "sha256-uLiXhigYz3v7NgY38twot3sBHxZS5QCrOiPfME4wWzE=";
   };
 
diff --git a/pkgs/by-name/ti/tilix/package.nix b/pkgs/by-name/ti/tilix/package.nix
index 3865c4089ee0..4ede51c57fcd 100644
--- a/pkgs/by-name/ti/tilix/package.nix
+++ b/pkgs/by-name/ti/tilix/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gnunn1";
     repo = "tilix";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-KP0ojwyZ5FaYKW0nK9mGGAiz1h+gTbfjCUDCgN2LAO8=";
   };
 
diff --git a/pkgs/by-name/ti/tilt/package.nix b/pkgs/by-name/ti/tilt/package.nix
index e62769362141..77ffc410c05c 100644
--- a/pkgs/by-name/ti/tilt/package.nix
+++ b/pkgs/by-name/ti/tilt/package.nix
@@ -14,7 +14,7 @@ let
     src = fetchFromGitHub {
       owner = "tilt-dev";
       repo = "tilt";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-3LFsTaz47QAIDGId/Tl3G7xP5b9gc25X+ZeMaVhXf8w=";
     };
   };
diff --git a/pkgs/by-name/ti/time-ghc-modules/package.nix b/pkgs/by-name/ti/time-ghc-modules/package.nix
index d580252d1f71..e4dbe40b46cd 100644
--- a/pkgs/by-name/ti/time-ghc-modules/package.nix
+++ b/pkgs/by-name/ti/time-ghc-modules/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "codedownio";
     repo = "time-ghc-modules";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/PhJAhP3KCWFyeSk8e5JV0cpBueH/eVDwQTMZSnnZCo=";
   };
 
diff --git a/pkgs/by-name/ti/timelapse-deflicker/package.nix b/pkgs/by-name/ti/timelapse-deflicker/package.nix
index 45b6057d8021..091ad288ddc2 100644
--- a/pkgs/by-name/ti/timelapse-deflicker/package.nix
+++ b/pkgs/by-name/ti/timelapse-deflicker/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cyberang3l";
     repo = "timelapse-deflicker";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0bbfnrdycrpyz7rqrql5ib9qszny7z5xpqp65c1mxqd2876gv960";
   };
 
diff --git a/pkgs/by-name/ti/timemachine/package.nix b/pkgs/by-name/ti/timemachine/package.nix
index 923ddd316341..c1781aed8171 100644
--- a/pkgs/by-name/ti/timemachine/package.nix
+++ b/pkgs/by-name/ti/timemachine/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "swh";
     repo = "timemachine";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "16fgyw6jnscx9279dczv72092dddghwlp53rkfw469kcgvjhwx0z";
   };
 
diff --git a/pkgs/by-name/ti/timer/package.nix b/pkgs/by-name/ti/timer/package.nix
index 03d578472b70..c19a23e153ad 100644
--- a/pkgs/by-name/ti/timer/package.nix
+++ b/pkgs/by-name/ti/timer/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "timer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Y4goNURzWl3DGeR14jEB87IJSNhSRqoF+/7zjGQ+19E=";
   };
 
diff --git a/pkgs/by-name/ti/timescaledb-tune/package.nix b/pkgs/by-name/ti/timescaledb-tune/package.nix
index 2412d4caeaf2..1c17f31484df 100644
--- a/pkgs/by-name/ti/timescaledb-tune/package.nix
+++ b/pkgs/by-name/ti/timescaledb-tune/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "timescale";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-SW+JCH+oxAHAmgPO7XmSVFFug7NOvslblMViG+oooAo=";
   };
 
diff --git a/pkgs/by-name/ti/timew-sync-client/package.nix b/pkgs/by-name/ti/timew-sync-client/package.nix
index 19e663a94595..7ad8a4c9c418 100644
--- a/pkgs/by-name/ti/timew-sync-client/package.nix
+++ b/pkgs/by-name/ti/timew-sync-client/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "timewarrior-synchronize";
     repo = "timew-sync-client";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8Bw+BI7EiW9UcHo6gaDthX4VH4kAlycm4EvAJEEAOWc=";
   };
 
diff --git a/pkgs/by-name/ti/timew-sync-server/package.nix b/pkgs/by-name/ti/timew-sync-server/package.nix
index 683aca335601..54bd274b4c97 100644
--- a/pkgs/by-name/ti/timew-sync-server/package.nix
+++ b/pkgs/by-name/ti/timew-sync-server/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "timewarrior-synchronize";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3THRP+hydvq/dnxzUOFGeuu8//qL7pFN0RHJVxzgibI=";
   };
 
diff --git a/pkgs/by-name/ti/timewall/package.nix b/pkgs/by-name/ti/timewall/package.nix
index 5e6a7d154c5b..6e735cd46c6f 100644
--- a/pkgs/by-name/ti/timewall/package.nix
+++ b/pkgs/by-name/ti/timewall/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bcyran";
     repo = "timewall";
-    tag = version;
+    rev = version;
     hash = "sha256-ohJDaN29FG/WqkcvpbukWS37RiX2pXdkKMzNh+3NqAU=";
   };
 
diff --git a/pkgs/by-name/ti/timewarrior/package.nix b/pkgs/by-name/ti/timewarrior/package.nix
index 33525933e27a..054a32860248 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sc4AfdXLuA9evoGU6Z97+Hq7zj9nx093+nPALRkhziQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ti/tini/package.nix b/pkgs/by-name/ti/tini/package.nix
index 6154499f4cac..0779a1ac627c 100644
--- a/pkgs/by-name/ti/tini/package.nix
+++ b/pkgs/by-name/ti/tini/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "krallin";
     repo = "tini";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4";
   };
 
diff --git a/pkgs/by-name/ti/tintin/package.nix b/pkgs/by-name/ti/tintin/package.nix
index d512055cf5f0..8e5f13f43d8c 100644
--- a/pkgs/by-name/ti/tintin/package.nix
+++ b/pkgs/by-name/ti/tintin/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scandum";
     repo = "tintin";
-    tag = version;
+    rev = version;
     hash = "sha256-8+tYI9+yAIEqByr6kDEEs2hqtIVKwC9bgWssXq24dbg=";
   };
 
diff --git a/pkgs/by-name/ti/tiny-dfr/package.nix b/pkgs/by-name/ti/tiny-dfr/package.nix
index d691c8499953..0f217d0f7492 100644
--- a/pkgs/by-name/ti/tiny-dfr/package.nix
+++ b/pkgs/by-name/ti/tiny-dfr/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "WhatAmISupposedToPutHere";
     repo = "tiny-dfr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5u5jyoDEt7aMs8/8QrhrUrUzFJJCNayqbN2WrMhUCV4=";
   };
 
diff --git a/pkgs/by-name/ti/tinycbor/package.nix b/pkgs/by-name/ti/tinycbor/package.nix
index c8a7d2fd46f3..597e6f01f56d 100644
--- a/pkgs/by-name/ti/tinycbor/package.nix
+++ b/pkgs/by-name/ti/tinycbor/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "tinycbor";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JgkZAvZ63jjTdFRnyk+AeIWcGsg36UtPPFbhFjky9e8=";
   };
 
diff --git a/pkgs/by-name/ti/tinyfecvpn/package.nix b/pkgs/by-name/ti/tinyfecvpn/package.nix
index 04077328094d..c62d4076d246 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";
-    tag = version;
+    rev = 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 82affa3937ba..e32871b6a40d 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";
-    tag = "v${version}";
+    rev = "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/ti/tinymembench/package.nix b/pkgs/by-name/ti/tinymembench/package.nix
index 06240da5a38f..0dc6f5a7fd10 100644
--- a/pkgs/by-name/ti/tinymembench/package.nix
+++ b/pkgs/by-name/ti/tinymembench/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ssvb";
     repo = "tinymembench";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N6jHRLqVSNe+Mk3WNfIEBGtVC7Y6/sERVaeAD68LQJc=";
   };
 
diff --git a/pkgs/by-name/ti/tinyobjloader/package.nix b/pkgs/by-name/ti/tinyobjloader/package.nix
index 5caaf155d443..a48259172c45 100644
--- a/pkgs/by-name/ti/tinyobjloader/package.nix
+++ b/pkgs/by-name/ti/tinyobjloader/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tinyobjloader";
     repo = "tinyobjloader";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BNffbicnLTGK2GQ2/bB328LFU9fqHxrpAVj2hJaekWc=";
   };
 
diff --git a/pkgs/by-name/ti/tinyproxy/package.nix b/pkgs/by-name/ti/tinyproxy/package.nix
index f7ef3ed76963..01c1382afd86 100644
--- a/pkgs/by-name/ti/tinyproxy/package.nix
+++ b/pkgs/by-name/ti/tinyproxy/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     hash = "sha256-bpr/O723FmW2gb+85aJrwW5/U7R2HwbePTx15i3rpsE=";
-    tag = version;
+    rev = version;
     repo = "tinyproxy";
     owner = "tinyproxy";
   };
diff --git a/pkgs/by-name/ti/tinyxml-2/package.nix b/pkgs/by-name/ti/tinyxml-2/package.nix
index fc557e07266c..9b56e8f64d0b 100644
--- a/pkgs/by-name/ti/tinyxml-2/package.nix
+++ b/pkgs/by-name/ti/tinyxml-2/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "leethomason";
     repo = "tinyxml2";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-rYVQSvxA0nxlZFHwGcOWkxcXZWEvTxR9P+d8E7CSm6U=";
   };
 
diff --git a/pkgs/by-name/ti/tiv/package.nix b/pkgs/by-name/ti/tiv/package.nix
index 287ee3c96010..b2347948d2e8 100644
--- a/pkgs/by-name/ti/tiv/package.nix
+++ b/pkgs/by-name/ti/tiv/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stefanhaustein";
     repo = "TerminalImageViewer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mCgybL4af19zqECN1pBV+WnxMq2ZtlK5GDTQO3u9CK0=";
   };
 
diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
index c8582f2ecd5c..2ada4ad71cb6 100644
--- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix
+++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tillitis";
     repo = "tkey-ssh-agent";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Uf3VJJfZn4UYX1q79JdaOfrore+L/Mic3whzpP32JV0=";
   };
 
diff --git a/pkgs/by-name/tl/tl-expected/package.nix b/pkgs/by-name/tl/tl-expected/package.nix
index 92de52058d1c..1beac87e9267 100644
--- a/pkgs/by-name/tl/tl-expected/package.nix
+++ b/pkgs/by-name/tl/tl-expected/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TartanLlama";
     repo = "expected";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AuRU8VI5l7Th9fJ5jIc/6mPm0Vqbbt6rY8QCCNDOU50=";
   };
 
diff --git a/pkgs/by-name/tl/tllist/package.nix b/pkgs/by-name/tl/tllist/package.nix
index e7bfa0172c08..33b89b6f186c 100644
--- a/pkgs/by-name/tl/tllist/package.nix
+++ b/pkgs/by-name/tl/tllist/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "tllist";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-4WW0jGavdFO3LX9wtMPzz3Z1APCPgUQOktpmwAM0SQw=";
   };
 
diff --git a/pkgs/by-name/tl/tlock/package.nix b/pkgs/by-name/tl/tlock/package.nix
index f70ab54a79a3..99df2eb8123f 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-O6erxzanSO5BjMnSSmn89w9SA+xyHhp0SSDkCk5hp8Y=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix
index 0ade60f89747..a1ff5926d464 100644
--- a/pkgs/by-name/tl/tlrc/package.nix
+++ b/pkgs/by-name/tl/tlrc/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tldr-pages";
     repo = "tlrc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LXuURq+MSSkd8+VzhltX2VqKsU3PWcQLMQTqqS5oLMg=";
   };
 
diff --git a/pkgs/by-name/tl/tlwg/package.nix b/pkgs/by-name/tl/tlwg/package.nix
index 1243bbb3865f..d0e7e6c77655 100644
--- a/pkgs/by-name/tl/tlwg/package.nix
+++ b/pkgs/by-name/tl/tlwg/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tlwg";
     repo = "fonts-tlwg";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "hWiH5KJnYTdcrm+Kzn9HUQry8ry3SKzjA6/0536kCLQ=";
   };
 
diff --git a/pkgs/by-name/tm/tmatrix/package.nix b/pkgs/by-name/tm/tmatrix/package.nix
index 7267eb41f5d8..478f7222fbae 100644
--- a/pkgs/by-name/tm/tmatrix/package.nix
+++ b/pkgs/by-name/tm/tmatrix/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "M4444";
     repo = "TMatrix";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-G3dg0SWfBjCA66TTxkVAcVrFNJOWE9+GJXYKzCUX34w=";
   };
 
diff --git a/pkgs/by-name/tm/tml/package.nix b/pkgs/by-name/tm/tml/package.nix
index 05c28517f3ee..af5d73a40524 100644
--- a/pkgs/by-name/tm/tml/package.nix
+++ b/pkgs/by-name/tm/tml/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = "tml";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QMXEKjOKYQlzXc2ds8OAAL5xUxayGb6mxxyeHsCkfwo=";
   };
 
diff --git a/pkgs/by-name/tm/tmpmail/package.nix b/pkgs/by-name/tm/tmpmail/package.nix
index 3ac1f40f6713..a7fe5fe237da 100644
--- a/pkgs/by-name/tm/tmpmail/package.nix
+++ b/pkgs/by-name/tm/tmpmail/package.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sdushantha";
     repo = "tmpmail";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-s4c1M4YHK/CNpH7nPt7rRqlkLUZrpBXvAVS/qxCai9c=";
   };
 
diff --git a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
index 39136f64c5f8..53fdc8e1be0f 100644
--- a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
+++ b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thewtex";
     repo = "tmux-mem-cpu-load";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8QUcEbgk3DSsWt9TRHHtDhQ7a1hkK8RZEX+0d3h/c0w=";
   };
 
diff --git a/pkgs/by-name/tm/tmux-xpanes/package.nix b/pkgs/by-name/tm/tmux-xpanes/package.nix
index eec8787145bc..562e00167e15 100644
--- a/pkgs/by-name/tm/tmux-xpanes/package.nix
+++ b/pkgs/by-name/tm/tmux-xpanes/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "greymd";
     repo = "tmux-xpanes";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PF2K2A49c5djQqSO7ZLFyBwPZaJRK58qZTFpY7n+Z0w=";
   };
 
diff --git a/pkgs/by-name/tm/tmux/package.nix b/pkgs/by-name/tm/tmux/package.nix
index b09ad3878e84..983a27538ad6 100644
--- a/pkgs/by-name/tm/tmux/package.nix
+++ b/pkgs/by-name/tm/tmux/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tmux";
     repo = "tmux";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Z9XHpyh4Y6iBI4+SfFBCGA8huFJpRFZy9nEB7+WQVJE=";
   };
 
diff --git a/pkgs/by-name/tm/tmuxifier/package.nix b/pkgs/by-name/tm/tmuxifier/package.nix
index 3ee6e9193a49..a92d54c7e92b 100644
--- a/pkgs/by-name/tm/tmuxifier/package.nix
+++ b/pkgs/by-name/tm/tmuxifier/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jimeh";
     repo = "tmuxifier";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7TvJnvtZEo5h45PcSy3tJN09UblswV0mQbTaKjgLyqw=";
   };
 
diff --git a/pkgs/by-name/tn/tncattach/package.nix b/pkgs/by-name/tn/tncattach/package.nix
index 46efc459d184..bc46515c44d0 100644
--- a/pkgs/by-name/tn/tncattach/package.nix
+++ b/pkgs/by-name/tn/tncattach/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "tncattach";
-    tag = version;
+    rev = version;
     sha256 = "0n7ad4gqvpgabw2i67s51lfz386wmv0cvnhxq9ygxpsqmx9aynxk";
   };
 
diff --git a/pkgs/by-name/tn/tnef/package.nix b/pkgs/by-name/tn/tnef/package.nix
index 1b827c9ccdf6..699887888bb9 100644
--- a/pkgs/by-name/tn/tnef/package.nix
+++ b/pkgs/by-name/tn/tnef/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "verdammelt";
     repo = "tnef";
-    tag = version;
+    rev = version;
     sha256 = "104g48mcm00bgiyzas2vf86331w7bnw7h3bc11ib4lp7rz6zqfck";
   };
 
diff --git a/pkgs/by-name/to/to-html/package.nix b/pkgs/by-name/to/to-html/package.nix
index 8bbb7a102e09..f4b57320848a 100644
--- a/pkgs/by-name/to/to-html/package.nix
+++ b/pkgs/by-name/to/to-html/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Aloso";
     repo = "to-html";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eNFt9/yK4oHOspNM8PMTewhx8APaHzmgNdrWqrUuQSU=";
   };
 
diff --git a/pkgs/by-name/to/toast/package.nix b/pkgs/by-name/to/toast/package.nix
index 7d2d80824996..ea88fde7dcaf 100644
--- a/pkgs/by-name/to/toast/package.nix
+++ b/pkgs/by-name/to/toast/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "stepchowfun";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vp70jv4F0VKd/OZHVRDcIJlKLwK9w+cV28lh0C7ESqg=";
   };
 
diff --git a/pkgs/by-name/to/tocpdf/package.nix b/pkgs/by-name/to/tocpdf/package.nix
index 524188525581..b2136973fc8d 100644
--- a/pkgs/by-name/to/tocpdf/package.nix
+++ b/pkgs/by-name/to/tocpdf/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kszenes";
     repo = "tocPDF";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RaNMhEgJ2pSL9BvK1d2Z8AsUPhARaRtEiCnt/2E2uNs=";
   };
 
diff --git a/pkgs/by-name/to/todo/package.nix b/pkgs/by-name/to/todo/package.nix
index 4c4d89583e8f..34d97ea887d7 100644
--- a/pkgs/by-name/to/todo/package.nix
+++ b/pkgs/by-name/to/todo/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sioodmy";
     repo = "todo";
-    tag = version;
+    rev = version;
     sha256 = "oyRdXvVnCfdFM8lI1eCDHHYNWcJc0Qg0TKxQXUqNo40=";
   };
 
diff --git a/pkgs/by-name/to/todofi-sh/package.nix b/pkgs/by-name/to/todofi-sh/package.nix
index 3117108ad15d..b00b94bfcd08 100644
--- a/pkgs/by-name/to/todofi-sh/package.nix
+++ b/pkgs/by-name/to/todofi-sh/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hugokernel";
     repo = "todofi.sh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1gmy5inlghycsxiwnyyjyv81jn2fmfk3s9x78kcgyf7khzb5kwvj";
   };
 
diff --git a/pkgs/by-name/to/todoist/package.nix b/pkgs/by-name/to/todoist/package.nix
index fc28de727a04..e65deb19f956 100644
--- a/pkgs/by-name/to/todoist/package.nix
+++ b/pkgs/by-name/to/todoist/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sachaos";
     repo = "todoist";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+UECYUozca7PKKiTrmPAobSF0y6xnWYCGaChk9bwANg=";
   };
 
diff --git a/pkgs/by-name/to/tofi/package.nix b/pkgs/by-name/to/tofi/package.nix
index f3fbbda46543..8bfb589dcf08 100644
--- a/pkgs/by-name/to/tofi/package.nix
+++ b/pkgs/by-name/to/tofi/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "philj56";
     repo = "tofi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lokp6Zmdt7WuAyuRnHBkKD4ydbNiQY7pEVY97Z62U90=";
   };
 
diff --git a/pkgs/by-name/to/toml-f/package.nix b/pkgs/by-name/to/toml-f/package.nix
index 20f80983bcb8..28de929377f0 100644
--- a/pkgs/by-name/to/toml-f/package.nix
+++ b/pkgs/by-name/to/toml-f/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "toml-f";
     repo = "toml-f";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+cac4rUNpd2w3yBdH1XoCKdJ9IgOHZioZg8AhzGY0FE=";
   };
 
diff --git a/pkgs/by-name/to/ton/package.nix b/pkgs/by-name/to/ton/package.nix
index 438bedac6cfb..4423a274ddff 100644
--- a/pkgs/by-name/to/ton/package.nix
+++ b/pkgs/by-name/to/ton/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ton-blockchain";
     repo = "ton";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Eab5tXP5gv9v/hu/Eh2WC/SeJ/bG1u6FKbREKB/ry9c=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/to/toolbox/package.nix b/pkgs/by-name/to/toolbox/package.nix
index 4842e766a919..cb2b136ab9c0 100644
--- a/pkgs/by-name/to/toolbox/package.nix
+++ b/pkgs/by-name/to/toolbox/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-9HiWgEtaMypLOwXJ6Xg3grLSZOQ4NInZtcvLPV51YO8=";
   };
 
diff --git a/pkgs/by-name/to/topfew-rs/package.nix b/pkgs/by-name/to/topfew-rs/package.nix
index d5bb18146be5..0caaee2629ea 100644
--- a/pkgs/by-name/to/topfew-rs/package.nix
+++ b/pkgs/by-name/to/topfew-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "djc";
     repo = "topfew-rs";
-    tag = version;
+    rev = version;
     hash = "sha256-VlSLPcKw3LYGnmKk5YOkcGIizw1tqtKF2BykY+1MtvY=";
   };
 
diff --git a/pkgs/by-name/to/topfew/package.nix b/pkgs/by-name/to/topfew/package.nix
index d92152fbeefc..a4853fda5d23 100644
--- a/pkgs/by-name/to/topfew/package.nix
+++ b/pkgs/by-name/to/topfew/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "timbray";
     repo = "topfew";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P3K3IhgYkrxmEG2l7EQDVWQ+P7fOjUMUFrlAnY+8NmI=";
   };
 
diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix
index 019c900360bd..4274c97bfae7 100644
--- a/pkgs/by-name/to/topicctl/package.nix
+++ b/pkgs/by-name/to/topicctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "segmentio";
     repo = "topicctl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sYt/t16OVJiWFVqSdLNog/mj1gj/TeY0r7z/gMZspls=";
   };
 
diff --git a/pkgs/by-name/to/topydo/package.nix b/pkgs/by-name/to/topydo/package.nix
index fd6e08e59269..f0a888787dd1 100644
--- a/pkgs/by-name/to/topydo/package.nix
+++ b/pkgs/by-name/to/topydo/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "topydo";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1lpfdai0pf90ffrzgmmkadbd86rb7250i3mglpkc82aj6prjm6yb";
   };
 
diff --git a/pkgs/by-name/to/torctl/package.nix b/pkgs/by-name/to/torctl/package.nix
index 8269142b79b5..d184953e8560 100644
--- a/pkgs/by-name/to/torctl/package.nix
+++ b/pkgs/by-name/to/torctl/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BlackArch";
     repo = "torctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rTJR+9pbK/sWMqdHyIqJgASgCGtGtpUPoHmYZJ7COFQ=";
   };
 
diff --git a/pkgs/by-name/to/torrent7z/package.nix b/pkgs/by-name/to/torrent7z/package.nix
index 71ccdffdec94..054b48e630a9 100644
--- a/pkgs/by-name/to/torrent7z/package.nix
+++ b/pkgs/by-name/to/torrent7z/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BubblesInTheTub";
     repo = "torrent7z";
-    tag = version;
+    rev = version;
     sha256 = "Y2tr0+z9uij4Ifi6FfWRN24BwcDXUZKVLkLtKUiVjU4=";
   };
 
diff --git a/pkgs/by-name/to/torrential/package.nix b/pkgs/by-name/to/torrential/package.nix
index 3a23baa582c6..913e1b5c34e8 100644
--- a/pkgs/by-name/to/torrential/package.nix
+++ b/pkgs/by-name/to/torrential/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "davidmhewitt";
     repo = "torrential";
-    tag = version;
+    rev = version;
     sha256 = "sha256-uHc/VNtbhetmGyuhynZH1TvxJscVX17eWO6dzX6Ft3A=";
   };
 
diff --git a/pkgs/by-name/to/torrentstream/package.nix b/pkgs/by-name/to/torrentstream/package.nix
index 5335c6092edb..8d9a9044eeb7 100644
--- a/pkgs/by-name/to/torrentstream/package.nix
+++ b/pkgs/by-name/to/torrentstream/package.nix
@@ -12,7 +12,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "trueromanus";
     repo = "TorrentStream";
-    tag = version;
+    rev = version;
     hash = "sha256-3lmQWx00Ulp0ZyQBEhFT+djHBi84foMlWGJEp/UOGek=";
   };
 
diff --git a/pkgs/by-name/to/toss/package.nix b/pkgs/by-name/to/toss/package.nix
index 3a1dd9049447..a1f877837c71 100644
--- a/pkgs/by-name/to/toss/package.nix
+++ b/pkgs/by-name/to/toss/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zerotier";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "05ql0d8wbdhnmh3dw8ch5bi6clfb9h8v21lq2a74iy02slya2y0r";
   };
   preInstall = "export DESTDIR=$out/bin";
diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix
index 06342efedecd..aebc2e3f1028 100644
--- a/pkgs/by-name/to/touchegg/package.nix
+++ b/pkgs/by-name/to/touchegg/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JoseExposito";
     repo = "touchegg";
-    tag = version;
+    rev = version;
     sha256 = "sha256-he6ERl6ZNWuD5StUqQWsUjeJ35nD0b8KddIAvntqlOI=";
   };
 
diff --git a/pkgs/by-name/to/tox-node/package.nix b/pkgs/by-name/to/tox-node/package.nix
index 60884b9ac34e..906daf467030 100644
--- a/pkgs/by-name/to/tox-node/package.nix
+++ b/pkgs/by-name/to/tox-node/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tox-rs";
     repo = "tox";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3ZRpri3WxwHjMq88TxRJAaTXMui8N1uLek+q8g5PGD4=";
   };
 
diff --git a/pkgs/by-name/to/toxic/package.nix b/pkgs/by-name/to/toxic/package.nix
index c1c28cc4f040..8c2c228b53c4 100644
--- a/pkgs/by-name/to/toxic/package.nix
+++ b/pkgs/by-name/to/toxic/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TokTok";
     repo = "toxic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qwMkqPTONtG+LnH6a/Debp+n39dJpbUMoy1nIukYjKo=";
   };
 
diff --git a/pkgs/by-name/to/toxiproxy/package.nix b/pkgs/by-name/to/toxiproxy/package.nix
index fd63d047bc38..b4ea12ad2178 100644
--- a/pkgs/by-name/to/toxiproxy/package.nix
+++ b/pkgs/by-name/to/toxiproxy/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "toxiproxy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CqJr3h2n+fzN6Ves38H7fYXd5vlpDVfF3kg4Tr8ThPc=";
   };
 
diff --git a/pkgs/by-name/tp/tp-auto-kbbl/package.nix b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
index b3f1ba57be86..d5d2915627ec 100644
--- a/pkgs/by-name/tp/tp-auto-kbbl/package.nix
+++ b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "saibotd";
     repo = "tp-auto-kbbl";
-    tag = version;
+    rev = version;
     hash = "sha256-fhBCsOjaQH2tRsBjMGiDmZSIkAgEVxxywVp8/0uAaTU=";
   };
 
diff --git a/pkgs/by-name/tp/tpacpi-bat/package.nix b/pkgs/by-name/tp/tpacpi-bat/package.nix
index afc8d4df2322..8a5f8d32e534 100644
--- a/pkgs/by-name/tp/tpacpi-bat/package.nix
+++ b/pkgs/by-name/tp/tpacpi-bat/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "teleshoes";
     repo = "tpacpi-bat";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9XnvVNdgB5VeI3juZfc8N5weEyULXuqu1IDChZfQqFk=";
   };
 
diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix
index a61c2e85b317..338ab7df26f8 100644
--- a/pkgs/by-name/tp/tparse/package.nix
+++ b/pkgs/by-name/tp/tparse/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "mfridman";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yU4hP+EJ+Ci3Ms0dAoSuqZFT9RRwqmN1V0x5cV+87z0=";
   };
 
diff --git a/pkgs/by-name/tp/tpi/package.nix b/pkgs/by-name/tp/tpi/package.nix
index baeb0ddec2e5..0e2135103417 100644
--- a/pkgs/by-name/tp/tpi/package.nix
+++ b/pkgs/by-name/tp/tpi/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "turing-machines";
     repo = "tpi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-se5+8Zf+RKtvfkmDDxKiUVp5J+bQ9j9RFedDK/pxCgA=";
   };
 
diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix
index a907fb2d2945..2c567f0254a1 100644
--- a/pkgs/by-name/tp/tplay/package.nix
+++ b/pkgs/by-name/tp/tplay/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "maxcurzi";
     repo = "tplay";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SRn7kg5FdSimKMFowKNUIan+MrojtNO0apeehIRTzfw=";
   };
 
diff --git a/pkgs/by-name/tp/tpm2-abrmd/package.nix b/pkgs/by-name/tp/tpm2-abrmd/package.nix
index 729e72856940..28e9069d983c 100644
--- a/pkgs/by-name/tp/tpm2-abrmd/package.nix
+++ b/pkgs/by-name/tp/tpm2-abrmd/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = "tpm2-abrmd";
-    tag = version;
+    rev = version;
     sha256 = "sha256-l0ncCMsStaeFACRU3Bt6F1zyiOTGY6wOHewA4AD58Ww=";
   };
 
diff --git a/pkgs/by-name/tp/tpm2-openssl/package.nix b/pkgs/by-name/tp/tpm2-openssl/package.nix
index db220200a3d1..a3a36bf24a3e 100644
--- a/pkgs/by-name/tp/tpm2-openssl/package.nix
+++ b/pkgs/by-name/tp/tpm2-openssl/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = "tpm2-openssl";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-CCTR7qBqI/y+jLBEEcgRanYOBNUYM/sH/hCqOLGA4QM=";
   };
 
diff --git a/pkgs/by-name/tp/tpm2-totp/package.nix b/pkgs/by-name/tp/tpm2-totp/package.nix
index 1f35badcc8e5..4bfea9d11936 100644
--- a/pkgs/by-name/tp/tpm2-totp/package.nix
+++ b/pkgs/by-name/tp/tpm2-totp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = "tpm2-totp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aeWhI2GQcWa0xAqlmHfcbCMg78UqcD6eanLlEVNVnRM=";
   };
 
diff --git a/pkgs/by-name/tp/tpsecore/package.nix b/pkgs/by-name/tp/tpsecore/package.nix
index ea463048fb9f..b4501a90f222 100644
--- a/pkgs/by-name/tp/tpsecore/package.nix
+++ b/pkgs/by-name/tp/tpsecore/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitLab {
     owner = "UniQMG";
     repo = "tpsecore";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+OynnLMBEiYwdFzxGzgkcBN6xrHoH1Q6O5i+OW7RBLo=";
   };
 
diff --git a/pkgs/by-name/tr/tracebox/package.nix b/pkgs/by-name/tr/tracebox/package.nix
index 2b5dd819bd89..7a373f49796e 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1KBJ4uXa1XpzEw23IjndZg+aGJXk3PVw8LYKAvxbxCA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/tr/trackballs/package.nix b/pkgs/by-name/tr/trackballs/package.nix
index 3ce688e60fdd..1b21058149a1 100644
--- a/pkgs/by-name/tr/trackballs/package.nix
+++ b/pkgs/by-name/tr/trackballs/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trackballs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8=";
   };
 
diff --git a/pkgs/by-name/tr/trackma/package.nix b/pkgs/by-name/tr/trackma/package.nix
index f5fdfe55102f..69f91e5af2eb 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "qlkFQSJFjxkGd5WkNGfyAo64ys8VJLep/ZOL6icXQ4c=";
     fetchSubmodules = true; # for anime-relations submodule
   };
diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix
index f4088ca7e0a6..5916ac4cca4f 100644
--- a/pkgs/by-name/tr/tracy/package.nix
+++ b/pkgs/by-name/tr/tracy/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wolfpld";
     repo = "tracy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HofqYJT1srDJ6Y1f18h7xtAbI/Gvvz0t9f0wBNnOZK8=";
   };
 
diff --git a/pkgs/by-name/tr/traefik-certs-dumper/package.nix b/pkgs/by-name/tr/traefik-certs-dumper/package.nix
index 098af6aa576f..521e56259ddb 100644
--- a/pkgs/by-name/tr/traefik-certs-dumper/package.nix
+++ b/pkgs/by-name/tr/traefik-certs-dumper/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ldez";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zXbtabh5ZziELZHzvYisXETPUmhHAVo6sMuF4O3crBY=";
   };
 
diff --git a/pkgs/by-name/tr/traitor/package.nix b/pkgs/by-name/tr/traitor/package.nix
index 823e20b4366e..df86de2717dd 100644
--- a/pkgs/by-name/tr/traitor/package.nix
+++ b/pkgs/by-name/tr/traitor/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LQfKdjZaTm5z8DUt6He/RJHbOUCUwP3CV3Fyt5rJIfU=";
   };
 
diff --git a/pkgs/by-name/tr/trak/package.nix b/pkgs/by-name/tr/trak/package.nix
index fd8d82c65865..27340965ce88 100644
--- a/pkgs/by-name/tr/trak/package.nix
+++ b/pkgs/by-name/tr/trak/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lcfd";
     repo = "trak";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YJMX7pNRWdNPyWNZ1HfpdYsKSStRWLcianLz6nScMa8=";
   };
 
diff --git a/pkgs/by-name/tr/tran/package.nix b/pkgs/by-name/tr/tran/package.nix
index 2e682dd85f6c..f4a36a4110b1 100644
--- a/pkgs/by-name/tr/tran/package.nix
+++ b/pkgs/by-name/tr/tran/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "abdfnx";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qp4g1ZLRIIz0CZ/Zey354g0j9ePE4pGb82IivLezU7s=";
   };
 
diff --git a/pkgs/by-name/tr/transcrypt/package.nix b/pkgs/by-name/tr/transcrypt/package.nix
index c5905f2c9b6c..2a1e10b1822a 100644
--- a/pkgs/by-name/tr/transcrypt/package.nix
+++ b/pkgs/by-name/tr/transcrypt/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elasticdog";
     repo = "transcrypt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-s95EnEmcdd5mFAKvtZ88aXxkrRLSZUP0VBrCy5PR4fo=";
   };
 
diff --git a/pkgs/by-name/tr/transfer-sh/package.nix b/pkgs/by-name/tr/transfer-sh/package.nix
index 1f8808922597..360621b97433 100644
--- a/pkgs/by-name/tr/transfer-sh/package.nix
+++ b/pkgs/by-name/tr/transfer-sh/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dutchcoders";
     repo = "transfer.sh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-V8E6RwzxKB6KeGPer5074e7y6XHn3ZD24PQMwTxw5lQ=";
   };
 
diff --git a/pkgs/by-name/tr/transifex-cli/package.nix b/pkgs/by-name/tr/transifex-cli/package.nix
index 2b24c01ee2d2..0a46be3e71b3 100644
--- a/pkgs/by-name/tr/transifex-cli/package.nix
+++ b/pkgs/by-name/tr/transifex-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "transifex";
     repo = "cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jzAt/SalItGG0KI3GZb4/pT4T7oHwCji2bjNR1BTJXI=";
   };
 
diff --git a/pkgs/by-name/tr/translate-shell/package.nix b/pkgs/by-name/tr/translate-shell/package.nix
index bcd809810f0b..132ce92697eb 100644
--- a/pkgs/by-name/tr/translate-shell/package.nix
+++ b/pkgs/by-name/tr/translate-shell/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "soimort";
     repo = "translate-shell";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ILXE8cSrivYqMruE+xtNIInLdwdRfMX5dneY9Nn12Uk=";
   };
 
diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix
index a490eaa699ad..96530f98f980 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";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-n4iEDt9AstDZPZXN47p13brNLbNWS3BTB+A4UuoEjzE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/tr/trash-cli/package.nix b/pkgs/by-name/tr/trash-cli/package.nix
index f195ed9f428f..c0aa05da5e6c 100644
--- a/pkgs/by-name/tr/trash-cli/package.nix
+++ b/pkgs/by-name/tr/trash-cli/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "andreafrancia";
     repo = "trash-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-ltuMnxtG4jTTSZd6ZHWl8wI0oQMMFqW0HAPetZMfGtc=";
   };
 
diff --git a/pkgs/by-name/tr/trayscale/package.nix b/pkgs/by-name/tr/trayscale/package.nix
index e998ffc38942..fc3844d274c1 100644
--- a/pkgs/by-name/tr/trayscale/package.nix
+++ b/pkgs/by-name/tr/trayscale/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DeedleFake";
     repo = "trayscale";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ct52IcRm44aDibiZfA1YySC7/jocHC4rB418DQvrp1s=";
   };
 
diff --git a/pkgs/by-name/tr/trdl-client/package.nix b/pkgs/by-name/tr/trdl-client/package.nix
index e1a62b4f6196..b0ba4f81af4e 100644
--- a/pkgs/by-name/tr/trdl-client/package.nix
+++ b/pkgs/by-name/tr/trdl-client/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "werf";
     repo = "trdl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-f7gyGGClMk/5+FCivuLasiIG/Ty17yeJ8qQ/GVEbC14=";
   };
 
diff --git a/pkgs/by-name/tr/tre-command/package.nix b/pkgs/by-name/tr/tre-command/package.nix
index 98d1c47e51a1..f7e239e2acd9 100644
--- a/pkgs/by-name/tr/tre-command/package.nix
+++ b/pkgs/by-name/tr/tre-command/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dduan";
     repo = "tre";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JlkONhXMWLzxAf3SYoLkSvXw4bFYBnsCyyj0TUsezwg=";
   };
 
diff --git a/pkgs/by-name/tr/tree-from-tags/package.nix b/pkgs/by-name/tr/tree-from-tags/package.nix
index bc9488016625..eb571a41ddf4 100644
--- a/pkgs/by-name/tr/tree-from-tags/package.nix
+++ b/pkgs/by-name/tr/tree-from-tags/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "dbrock";
     repo = "bongo";
-    tag = version;
+    rev = version;
     hash = "sha256-G+6rRJLNBECxGc8WuaesXhrYqvEDy2Chpw4lWxO8X9s=";
   };
 
diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix
index 732dee38175e..ae557127722e 100644
--- a/pkgs/by-name/tr/treedome/package.nix
+++ b/pkgs/by-name/tr/treedome/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchgit {
     url = "https://codeberg.org/solver-orgz/treedome";
-    tag = version;
+    rev = version;
     hash = "sha256-fJnrM9I11JKqzrprXa51mJiz9oO5hDp6u69FqJs5l8o=";
     fetchLFS = true;
   };
diff --git a/pkgs/by-name/tr/treefmt/package.nix b/pkgs/by-name/tr/treefmt/package.nix
index 78fd7935ec11..8a2713a5fc47 100644
--- a/pkgs/by-name/tr/treefmt/package.nix
+++ b/pkgs/by-name/tr/treefmt/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "treefmt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-097qAvJnMpxvhXNEjk54TXQHIODXP8lpitbN0ekWN+U=";
   };
 
diff --git a/pkgs/by-name/tr/tremc/package.nix b/pkgs/by-name/tr/tremc/package.nix
index 5dca40c7154e..adfdebdee737 100644
--- a/pkgs/by-name/tr/tremc/package.nix
+++ b/pkgs/by-name/tr/tremc/package.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tremc";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-219rntmetmj1JFG+4NyYMFTWmrHKJL7fnLoMIvnTP4Y=";
   };
 
diff --git a/pkgs/by-name/tr/trexio/package.nix b/pkgs/by-name/tr/trexio/package.nix
index 8a1c1d40a7bd..ecfa125c8579 100644
--- a/pkgs/by-name/tr/trexio/package.nix
+++ b/pkgs/by-name/tr/trexio/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TREX-CoE";
     repo = "trexio";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KP8tpwBr/ymjcXmCssdn+Xti0UKgazJSGTgVpvE+CiM=";
   };
 
diff --git a/pkgs/by-name/tr/trf/package.nix b/pkgs/by-name/tr/trf/package.nix
index a7d0f1ebd6db..3bd1f19bbec6 100644
--- a/pkgs/by-name/tr/trf/package.nix
+++ b/pkgs/by-name/tr/trf/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Benson-Genomics-Lab";
     repo = "trf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-73LypVqBdlRdDCblf9JNZQmS5Za8xpId4ha5GjTJHDo=";
   };
 
diff --git a/pkgs/by-name/tr/triforce-lv2/package.nix b/pkgs/by-name/tr/triforce-lv2/package.nix
index 7933b60dded4..a41fa390eea6 100644
--- a/pkgs/by-name/tr/triforce-lv2/package.nix
+++ b/pkgs/by-name/tr/triforce-lv2/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chadmed";
     repo = "triforce";
-    tag = version;
+    rev = version;
     hash = "sha256-Y9ufUADhpT3NPj/OfhQ7xJoBqoOkPkVFA0TvUwCubrU=";
   };
 
diff --git a/pkgs/by-name/tr/trillian/package.nix b/pkgs/by-name/tr/trillian/package.nix
index 7e9c5f79edc6..0f65953ea0e0 100644
--- a/pkgs/by-name/tr/trillian/package.nix
+++ b/pkgs/by-name/tr/trillian/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TOJqBfYVubwgDF/9i6lwmCLj6x0utzz0O7QJ5SqshCA=";
   };
 
diff --git a/pkgs/by-name/tr/trimal/package.nix b/pkgs/by-name/tr/trimal/package.nix
index 8888c7663d78..110227ca764e 100644
--- a/pkgs/by-name/tr/trimal/package.nix
+++ b/pkgs/by-name/tr/trimal/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "trimal";
     owner = "scapella";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6GXirih7nY0eD2XS8aplLcYf53EeLuae+ewdUgBiKQQ=";
   };
 
diff --git a/pkgs/by-name/tr/trippy/package.nix b/pkgs/by-name/tr/trippy/package.nix
index 301b2c893d30..5d928123fc4b 100644
--- a/pkgs/by-name/tr/trippy/package.nix
+++ b/pkgs/by-name/tr/trippy/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fujiapple852";
     repo = "trippy";
-    tag = version;
+    rev = version;
     hash = "sha256-LRO2blzzSaYjQVmXpN2aF3qPhfzCrbyc9R7C11UVyV8=";
   };
 
diff --git a/pkgs/by-name/tr/triton/package.nix b/pkgs/by-name/tr/triton/package.nix
index 4cabeeec6182..3d3a383bfda0 100644
--- a/pkgs/by-name/tr/triton/package.nix
+++ b/pkgs/by-name/tr/triton/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "TritonDataCenter";
     repo = "node-triton";
-    tag = version;
+    rev = version;
     hash = "sha256-udS5CnaaeaY+owOrbC3R2jrNBpuTBKOkHrIS2AlHWAE=";
   };
 
diff --git a/pkgs/by-name/tr/trlib/package.nix b/pkgs/by-name/tr/trlib/package.nix
index e6a1beeea9d0..a3770293dd02 100644
--- a/pkgs/by-name/tr/trlib/package.nix
+++ b/pkgs/by-name/tr/trlib/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "felixlen";
     repo = "trlib";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-pD2MGsIQgMO4798Gp9oLprKhmV0lcjgtUHh1rvEjSIY=";
   };
 
diff --git a/pkgs/by-name/tr/trompeloeil/package.nix b/pkgs/by-name/tr/trompeloeil/package.nix
index 625f31f6904d..09098810b63e 100644
--- a/pkgs/by-name/tr/trompeloeil/package.nix
+++ b/pkgs/by-name/tr/trompeloeil/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rollbear";
     repo = "trompeloeil";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-AyTBHsPYaruq0jadifVqOs80YZ5xwajHdHgMINl3i1Q=";
   };
 
diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix
index 26c329a9c51c..47959e4eddbf 100644
--- a/pkgs/by-name/tr/trunk-ng/package.nix
+++ b/pkgs/by-name/tr/trunk-ng/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ctron";
     repo = "trunk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SnE0z9Wa4gtX/ts0vG9pYnnxumILHTSV9/tVYkCHFck=";
   };
 
diff --git a/pkgs/by-name/tr/trunk-recorder/package.nix b/pkgs/by-name/tr/trunk-recorder/package.nix
index 39ead399cc5d..f7846b0ac194 100644
--- a/pkgs/by-name/tr/trunk-recorder/package.nix
+++ b/pkgs/by-name/tr/trunk-recorder/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "robotastic";
     repo = "trunk-recorder";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-d2iBCSLR3kr6rnLXO3MeGVdi6+8pqXZqW/yhxAvA1cY=";
   };
 
diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix
index 46da103d5e21..df7650f46460 100644
--- a/pkgs/by-name/tr/trunk/package.nix
+++ b/pkgs/by-name/tr/trunk/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "trunk-rs";
     repo = "trunk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GFRNbrfI0sJ/GuvT924/gxmzbnf0s0QNf+Mpv1+5rbc=";
   };
 
diff --git a/pkgs/by-name/tr/try/package.nix b/pkgs/by-name/tr/try/package.nix
index 2127456b59e2..7211abbc775f 100644
--- a/pkgs/by-name/tr/try/package.nix
+++ b/pkgs/by-name/tr/try/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "binpash";
     repo = "try";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2EDRVwW4XzQhd7rAM2rDuR94Fkaq4pH5RTooFEBBh5g=";
   };
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ts/ts-warp/package.nix b/pkgs/by-name/ts/ts-warp/package.nix
index b727727f0856..653b0856ac80 100644
--- a/pkgs/by-name/ts/ts-warp/package.nix
+++ b/pkgs/by-name/ts/ts-warp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mezantrop";
     repo = "ts-warp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-bFF/xVI6K2pDMQazJ3E/lAMfrAMbb0cCVUgbfoFxd4Y=";
   };
 
diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix
index c8686c5eaace..aab0192fe498 100644
--- a/pkgs/by-name/ts/ts_query_ls/package.nix
+++ b/pkgs/by-name/ts/ts_query_ls/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "ribru17";
     repo = "ts_query_ls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3dUmHux+kXuIGao8vX0ZzVZO6fnPegQ4yqzmt2mMmOg=";
   };
 
diff --git a/pkgs/by-name/ts/tsduck/package.nix b/pkgs/by-name/ts/tsduck/package.nix
index f28d212fc4e4..b58896719134 100644
--- a/pkgs/by-name/ts/tsduck/package.nix
+++ b/pkgs/by-name/ts/tsduck/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tsduck";
     repo = "tsduck";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-268TKCh3naebbw+sOQ6d4N/zl7UEVtc3l3flFAYHDU4=";
   };
 
diff --git a/pkgs/by-name/ts/tslib/package.nix b/pkgs/by-name/ts/tslib/package.nix
index 48e0549dc5a2..4ab8ddda9b62 100644
--- a/pkgs/by-name/ts/tslib/package.nix
+++ b/pkgs/by-name/ts/tslib/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libts";
     repo = "tslib";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = finalAttrs.hash;
   };
 
diff --git a/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix b/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
index a957370f507f..8e92d249f6f4 100644
--- a/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
+++ b/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "feediron";
     repo = "ttrss_plugin-feediron";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KU4XQJNK7Ua7rZaXA32lv16RlloCysAb54E5kEY847A=";
   };
 
diff --git a/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
index b615c650c176..18e14aae380d 100644
--- a/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
+++ b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "levito";
     repo = "tt-rss-feedly-theme";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3mD1aY7gjdvucRzY7sLmZ1RsHtraAg1RGE/3uDp6/o4=";
   };
 
diff --git a/pkgs/by-name/tt/tt/package.nix b/pkgs/by-name/tt/tt/package.nix
index cf7a07a85748..480b9f245c05 100644
--- a/pkgs/by-name/tt/tt/package.nix
+++ b/pkgs/by-name/tt/tt/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lemnos";
     repo = "tt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vKh19xYBeNqvVFilvA7NeQ34RM5VnwDs+Hu/pe3J0y4=";
   };
 
diff --git a/pkgs/by-name/tt/tt2020/package.nix b/pkgs/by-name/tt/tt2020/package.nix
index 706affdaec73..94872dd6b8ec 100644
--- a/pkgs/by-name/tt/tt2020/package.nix
+++ b/pkgs/by-name/tt/tt2020/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ctrlcctrlv";
     repo = "TT2020";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eAJzaookHcQ/7QNq/HUKA/O2liyKynJNdo6QuZ1Bv6k=";
   };
 
diff --git a/pkgs/by-name/tt/ttags/package.nix b/pkgs/by-name/tt/ttags/package.nix
index 8f06dbfb8612..879f8b4fecf9 100644
--- a/pkgs/by-name/tt/ttags/package.nix
+++ b/pkgs/by-name/tt/ttags/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "npezza93";
     repo = "ttags";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-z0IxGdveMtCXmCKD4jp/BEA6mtTl4CitIrVhM6BtHzA=";
   };
 
diff --git a/pkgs/by-name/tt/ttchat/package.nix b/pkgs/by-name/tt/ttchat/package.nix
index 8d9b55be8db7..893abb63c4f0 100644
--- a/pkgs/by-name/tt/ttchat/package.nix
+++ b/pkgs/by-name/tt/ttchat/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "atye";
     repo = "ttchat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ezlqji/j6nyCzc1jrfB1MZR4ugKAa5D5CL6wfuP6PsY=";
   };
 
diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix
index 1ea36553d4dd..4d577365b809 100644
--- a/pkgs/by-name/tt/ttdl/package.nix
+++ b/pkgs/by-name/tt/ttdl/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "VladimirMarkelov";
     repo = "ttdl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cCz2wxYvYAoI+Hmyll+Fn56NUCuWlIiJycmYvGyhkR4=";
   };
 
diff --git a/pkgs/by-name/tt/tty-share/package.nix b/pkgs/by-name/tt/tty-share/package.nix
index af28a5eb3f5b..1847050236b1 100644
--- a/pkgs/by-name/tt/tty-share/package.nix
+++ b/pkgs/by-name/tt/tty-share/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "elisescu";
     repo = "tty-share";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+Bh39WtzReOmHcvpGbNfEdBqw7ZL9Vhxu5d337CMc/M=";
   };
 
diff --git a/pkgs/by-name/tt/tty-solitaire/package.nix b/pkgs/by-name/tt/tty-solitaire/package.nix
index 6479619a6ca8..b4018375295d 100644
--- a/pkgs/by-name/tt/tty-solitaire/package.nix
+++ b/pkgs/by-name/tt/tty-solitaire/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mpereira";
     repo = "tty-solitaire";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zMLNWJieHxHALFQoSkdAxGbUBGuZnznLX86lI3P21F0=";
   };
 
diff --git a/pkgs/by-name/tt/ttygif/package.nix b/pkgs/by-name/tt/ttygif/package.nix
index 5da47fc9a114..e2446e2a687b 100644
--- a/pkgs/by-name/tt/ttygif/package.nix
+++ b/pkgs/by-name/tt/ttygif/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "icholy";
     repo = "ttygif";
-    tag = version;
+    rev = version;
     sha256 = "sha256-GsMeVR2wNivQguZ6B/0v39Td9VGHg+m3RtAG9DYkNmU=";
   };
 
diff --git a/pkgs/by-name/tt/ttylog/package.nix b/pkgs/by-name/tt/ttylog/package.nix
index 8aaae29aa327..d98e3a27acc7 100644
--- a/pkgs/by-name/tt/ttylog/package.nix
+++ b/pkgs/by-name/tt/ttylog/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rocasa";
     repo = "ttylog";
-    tag = version;
+    rev = version;
     sha256 = "0c746bpjpa77vsr88fxk8h1803p5np1di1mpjf4jy5bv5x3zwm07";
   };
 
diff --git a/pkgs/by-name/tt/ttyper/package.nix b/pkgs/by-name/tt/ttyper/package.nix
index 4c32aff3d289..17c4096da056 100644
--- a/pkgs/by-name/tt/ttyper/package.nix
+++ b/pkgs/by-name/tt/ttyper/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "max-niederman";
     repo = "ttyper";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g4OD4Mc3KHN9rrzM+9JvN2xTnSojGQy6yptdGj3zgW4=";
   };
 
diff --git a/pkgs/by-name/tt/ttyplot/package.nix b/pkgs/by-name/tt/ttyplot/package.nix
index 04cea2d4aa73..2b3fad58f44b 100644
--- a/pkgs/by-name/tt/ttyplot/package.nix
+++ b/pkgs/by-name/tt/ttyplot/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tenox7";
     repo = "ttyplot";
-    tag = version;
+    rev = version;
     hash = "sha256-XPWfSL1395TBkUmAO5kB9TdAZHL011o6t/2s01W/kk8=";
   };
 
diff --git a/pkgs/by-name/tu/tuba/package.nix b/pkgs/by-name/tu/tuba/package.nix
index ad35d3dc9962..93ff59a89383 100644
--- a/pkgs/by-name/tu/tuba/package.nix
+++ b/pkgs/by-name/tu/tuba/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "Tuba";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SQrk6zsn3zZQTIruqVfjzs5cNyT2pAvM8XNI8SmyFM0=";
   };
 
diff --git a/pkgs/by-name/tu/tuc/package.nix b/pkgs/by-name/tu/tuc/package.nix
index 238a67dbea41..d07b518c253a 100644
--- a/pkgs/by-name/tu/tuc/package.nix
+++ b/pkgs/by-name/tu/tuc/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "riquito";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+QkkwQfp818bKVo1yUkWKLMqbdzRJ+oHpjxB+UFDRsU=";
   };
 
diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix
index 049a893f049b..283259994be1 100644
--- a/pkgs/by-name/tu/tuckr/package.nix
+++ b/pkgs/by-name/tu/tuckr/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "RaphGL";
     repo = "Tuckr";
-    tag = version;
+    rev = version;
     hash = "sha256-0ZPBJ2MNeoGCvYW6HswVZ5SyjZpdR21lp9ebceIhsfw=";
   };
 
diff --git a/pkgs/by-name/tu/tuhi/package.nix b/pkgs/by-name/tu/tuhi/package.nix
index e3fac77f3f5c..fa0fb7097139 100644
--- a/pkgs/by-name/tu/tuhi/package.nix
+++ b/pkgs/by-name/tu/tuhi/package.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tuhiproject";
     repo = "tuhi";
-    tag = version;
+    rev = version;
     sha256 = "sha256-NwyG2KhOrAKRewgmU23OMO0+A9SjkQZsDL4SGnLVCvo=";
   };
 
diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index 466dc23d7e9d..cf11de57e07f 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AmmarAbouZor";
     repo = "tui-journal";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XbOKC+utKt53iFzNbm861tMGsNMZ2GQc+/J0Dm/SYS8=";
   };
 
diff --git a/pkgs/by-name/tu/tuir/package.nix b/pkgs/by-name/tu/tuir/package.nix
index 8de2528e6c06..e193ea2d9ecf 100644
--- a/pkgs/by-name/tu/tuir/package.nix
+++ b/pkgs/by-name/tu/tuir/package.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "Chocimier";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VYBtD3Ex6+iIRNvX6jF0b0iPvno41/58xCRydiyssvk=";
   };
 
diff --git a/pkgs/by-name/tu/tuntox/package.nix b/pkgs/by-name/tu/tuntox/package.nix
index ae6a5b159470..374e4a30b703 100644
--- a/pkgs/by-name/tu/tuntox/package.nix
+++ b/pkgs/by-name/tu/tuntox/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gjedeer";
     repo = "tuntox";
-    tag = version;
+    rev = version;
     sha256 = "sha256-c/0OxUH8iw8nRuVg4Fszf6Z/JiEV+m0B2ofzy81uFu8=";
   };
 
diff --git a/pkgs/by-name/tu/tunwg/package.nix b/pkgs/by-name/tu/tunwg/package.nix
index a6aa8222752b..3616c023fea8 100644
--- a/pkgs/by-name/tu/tunwg/package.nix
+++ b/pkgs/by-name/tu/tunwg/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ntnj";
     repo = "tunwg";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+vgl7saHp1Co35nkxQ+IhqYr6GdGd0JIFEFrezQd5Yo=";
   };
 
diff --git a/pkgs/by-name/tu/tup/package.nix b/pkgs/by-name/tu/tup/package.nix
index ce6bc9ad0968..4bccae8ee432 100644
--- a/pkgs/by-name/tu/tup/package.nix
+++ b/pkgs/by-name/tu/tup/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gittup";
     repo = "tup";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-biVR932wHiUG56mvXoKWFzrzpkclbW9RWM4vY1+OMZ0=";
   };
 
diff --git a/pkgs/by-name/tu/tuptime/package.nix b/pkgs/by-name/tu/tuptime/package.nix
index 1bc6533baa93..02b01ff4a455 100644
--- a/pkgs/by-name/tu/tuptime/package.nix
+++ b/pkgs/by-name/tu/tuptime/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rfmoz";
     repo = "tuptime";
-    tag = version;
+    rev = version;
     sha256 = "sha256-pYGtgv9hPBG/URD2nOWg6qJYYLtlqLW+t5mCLpzKlEc=";
   };
 
diff --git a/pkgs/by-name/tu/turbocase/package.nix b/pkgs/by-name/tu/turbocase/package.nix
index a65d57586fe9..cfc46e3c5a27 100644
--- a/pkgs/by-name/tu/turbocase/package.nix
+++ b/pkgs/by-name/tu/turbocase/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
     domain = "codeberg.org";
     owner = "MartijnBraam";
     repo = "TurboCase";
-    tag = version;
+    rev = version;
     hash = "sha256-mwWN7XYKr/BD9r935oElqoQN87kdrrWjkmhURkAkjj4=";
   };
 
diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix
index e4cd64b410da..3a582fd21167 100644
--- a/pkgs/by-name/tu/turnon/package.nix
+++ b/pkgs/by-name/tu/turnon/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "swsnr";
     repo = "turnon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eKJRyQMZOa/QRUW0VQ0EkXbJSMcYHfCC9wTs0YEB1yo=";
   };
 
diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix
index 0aa96ed224ce..1e13fe0a3505 100644
--- a/pkgs/by-name/tu/turso-cli/package.nix
+++ b/pkgs/by-name/tu/turso-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-94av3EW96qApCYWpo08QjrxoneuqGrE98aE7YXQEaT4=";
   };
 
diff --git a/pkgs/by-name/tu/turtle-build/package.nix b/pkgs/by-name/tu/turtle-build/package.nix
index f8343c211e42..ad33d92191ae 100644
--- a/pkgs/by-name/tu/turtle-build/package.nix
+++ b/pkgs/by-name/tu/turtle-build/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "raviqqe";
     repo = "turtle-build";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PDpiLPMyBZzj2nBy76cSC4ab/kyaoZC/Gd2HSaRVHUM=";
   };
 
diff --git a/pkgs/by-name/tu/tusc-sh/package.nix b/pkgs/by-name/tu/tusc-sh/package.nix
index 3aa527f243d9..08fe5eb9a895 100644
--- a/pkgs/by-name/tu/tusc-sh/package.nix
+++ b/pkgs/by-name/tu/tusc-sh/package.nix
@@ -16,7 +16,7 @@ let
     src = fetchFromGitHub {
       owner = "adhocore";
       repo = "tusc.sh";
-      tag = finalAttrs.version;
+      rev = finalAttrs.version;
       hash = "sha256-EKlcE+rsVh5lUd8dQzAwXDjiUvrrud5yWfF6JWSZQFE=";
     };
 
diff --git a/pkgs/by-name/tu/tut/package.nix b/pkgs/by-name/tu/tut/package.nix
index 50a9d00bbd58..4e2cc64c3dac 100644
--- a/pkgs/by-name/tu/tut/package.nix
+++ b/pkgs/by-name/tu/tut/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "RasmusLindroth";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-AtwwLRZx9O8IWPFgFI/ZK0tbeshEmaKpTQxA1PepnWM=";
   };
 
diff --git a/pkgs/by-name/tu/tuxmux/package.nix b/pkgs/by-name/tu/tuxmux/package.nix
index 4f11cb9dac6f..2609f4b9dbc6 100644
--- a/pkgs/by-name/tu/tuxmux/package.nix
+++ b/pkgs/by-name/tu/tuxmux/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "edeneast";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WcHsFKpYexBEg382837NqGgNMTKzVUG3XIER9aa1zK8=";
   };
 
diff --git a/pkgs/by-name/tv/tv/package.nix b/pkgs/by-name/tv/tv/package.nix
index 9b5f9629c1e4..f345d8474f24 100644
--- a/pkgs/by-name/tv/tv/package.nix
+++ b/pkgs/by-name/tv/tv/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "uzimaru0000";
     repo = "tv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qODv45smZ6jHCJBaa6EEvFLG+7g+FWrRf6BiHRFLzqM=";
   };
 
diff --git a/pkgs/by-name/tv/tvm/package.nix b/pkgs/by-name/tv/tvm/package.nix
index e4e94deb3170..3d8af028ddc4 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-/5IpOraFTgg6sQ1TLHoepq/C8VHKg5BXKrNMBSyYajA=";
   };
diff --git a/pkgs/by-name/tw/twa/package.nix b/pkgs/by-name/tw/twa/package.nix
index 53d0ed7028f1..02e9dea8eeaf 100644
--- a/pkgs/by-name/tw/twa/package.nix
+++ b/pkgs/by-name/tw/twa/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "twa";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B+UwH7oCtediLzurjYuLp56IxiKNAqyoW5QkwXX72MA=";
   };
 
diff --git a/pkgs/by-name/tw/tweego/package.nix b/pkgs/by-name/tw/tweego/package.nix
index c23a151d0929..f0e77b801d9d 100644
--- a/pkgs/by-name/tw/tweego/package.nix
+++ b/pkgs/by-name/tw/tweego/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tmedwards";
     repo = "tweego";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LE85mSByTz7uFjs0XtrpfD7OARoMPE56FpjFw+FlGYw=";
   };
 
diff --git a/pkgs/by-name/tw/twitch-cli/package.nix b/pkgs/by-name/tw/twitch-cli/package.nix
index ee95b256e3e1..64b0ee6fd247 100644
--- a/pkgs/by-name/tw/twitch-cli/package.nix
+++ b/pkgs/by-name/tw/twitch-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "twitchdev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kRyJl2SxppVGCO/6wrsb8cO+wpBT1nBsyI/JsPRYzMc=";
   };
 
diff --git a/pkgs/by-name/tw/twitch-hls-client/package.nix b/pkgs/by-name/tw/twitch-hls-client/package.nix
index db549be38306..190a8e94b5b7 100644
--- a/pkgs/by-name/tw/twitch-hls-client/package.nix
+++ b/pkgs/by-name/tw/twitch-hls-client/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "2bc4";
     repo = "twitch-hls-client";
-    tag = version;
+    rev = version;
     hash = "sha256-H446qXFwRGippLMZemkW8sVhTV3YGpKmAvD8QBamAlo=";
   };
 
diff --git a/pkgs/by-name/tw/twitter-color-emoji/package.nix b/pkgs/by-name/tw/twitter-color-emoji/package.nix
index 120291c11bef..5ddcb8a7d613 100644
--- a/pkgs/by-name/tw/twitter-color-emoji/package.nix
+++ b/pkgs/by-name/tw/twitter-color-emoji/package.nix
@@ -22,7 +22,7 @@ let
     name = "twemoji";
     owner = "jdecked";
     repo = "twemoji";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo=";
   };
 
diff --git a/pkgs/by-name/tx/txtw/package.nix b/pkgs/by-name/tx/txtw/package.nix
index f432ae8050a6..0268c7b708fb 100644
--- a/pkgs/by-name/tx/txtw/package.nix
+++ b/pkgs/by-name/tx/txtw/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "txtw";
-    tag = version;
+    rev = version;
     sha256 = "17yjdgdd080fsf5r1wzgk6vvzwsa15gcwc9z64v7x588jm1ryy3k";
   };
 
diff --git a/pkgs/by-name/ty/tydra/package.nix b/pkgs/by-name/ty/tydra/package.nix
index f65258f756e8..e9baf788587e 100644
--- a/pkgs/by-name/ty/tydra/package.nix
+++ b/pkgs/by-name/ty/tydra/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Mange";
     repo = "tydra";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bH/W54b7UHdkbgLXAd+l5I6UAKjWDMW+I5mfwT4yEEY=";
   };
 
diff --git a/pkgs/by-name/ty/tygo/package.nix b/pkgs/by-name/ty/tygo/package.nix
index 9f7c6a3438de..533737f67456 100644
--- a/pkgs/by-name/ty/tygo/package.nix
+++ b/pkgs/by-name/ty/tygo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gzuidhof";
     repo = "tygo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W2PgBcbkreP61QtAuOZ+VHUUZ4Mhe++1SK1p4Tg4Ack=";
   };
 
diff --git a/pkgs/by-name/ty/tym/package.nix b/pkgs/by-name/ty/tym/package.nix
index cbd5b7671e5b..a63dff1c6e73 100644
--- a/pkgs/by-name/ty/tym/package.nix
+++ b/pkgs/by-name/ty/tym/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "endaaman";
     repo = "tym";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ySriCBmwDiDmAkIIByaZgmK0nUyYiVb0VAV5bi38JGw=";
   };
 
diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript/package.nix
index 97d290b0ac90..e95c9e79d893 100644
--- a/pkgs/by-name/ty/typescript/package.nix
+++ b/pkgs/by-name/ty/typescript/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "TypeScript";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fOA5IblxUd+C9ST3oI8IUmTTRL3exC63MPqW5hoWN0M=";
   };
 
diff --git a/pkgs/by-name/ty/typeshare/package.nix b/pkgs/by-name/ty/typeshare/package.nix
index 9d24f21bda7d..e6cea0420f30 100644
--- a/pkgs/by-name/ty/typeshare/package.nix
+++ b/pkgs/by-name/ty/typeshare/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "1password";
     repo = "typeshare";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZoCl/dWGtoHUtNsNhHQvMjyUnoVdkGBuiBkWPwaQeIQ=";
   };
 
diff --git a/pkgs/by-name/ty/typical/package.nix b/pkgs/by-name/ty/typical/package.nix
index 548c0e6ffaaf..7b3e508af9de 100644
--- a/pkgs/by-name/ty/typical/package.nix
+++ b/pkgs/by-name/ty/typical/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "stepchowfun";
     repo = "typical";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-y7PWTzD9+rkC4wZYhecmDTa3AoWl4Tgh7QXbSK4Qq5Q=";
   };
 
diff --git a/pkgs/by-name/ty/typioca/package.nix b/pkgs/by-name/ty/typioca/package.nix
index 4156cb649525..dfc9d61398bb 100644
--- a/pkgs/by-name/ty/typioca/package.nix
+++ b/pkgs/by-name/ty/typioca/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bloznelis";
     repo = "typioca";
-    tag = version;
+    rev = version;
     hash = "sha256-fViYwewzhJUJjMupCYk1UsnnPAhByYZqYkuKD6MJNnE=";
   };
 
diff --git a/pkgs/by-name/ty/typstfmt/package.nix b/pkgs/by-name/ty/typstfmt/package.nix
index cf74fddc8016..4109ef87488b 100644
--- a/pkgs/by-name/ty/typstfmt/package.nix
+++ b/pkgs/by-name/ty/typstfmt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "astrale-sharp";
     repo = "typstfmt";
-    tag = version;
+    rev = version;
     hash = "sha256-JsNaHeFYr92VdruE87dLj2kPGc9M+ww7AGiGO4Gbbr0=";
   };
 
diff --git a/pkgs/by-name/tz/tz/package.nix b/pkgs/by-name/tz/tz/package.nix
index bb29712076aa..7c8caa485dd0 100644
--- a/pkgs/by-name/tz/tz/package.nix
+++ b/pkgs/by-name/tz/tz/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "oz";
     repo = "tz";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OpftKCEoAltvQw0bB3SyFeXUDiGjVHNDrrKsdRH6zl4=";
   };
 
diff --git a/pkgs/by-name/u2/u2ps/package.nix b/pkgs/by-name/u2/u2ps/package.nix
index 46de4db26452..6c3089dbf74f 100644
--- a/pkgs/by-name/u2/u2ps/package.nix
+++ b/pkgs/by-name/u2/u2ps/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "arsv";
     repo = "u2ps";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-sa0CL47PwYVDykxzF8KeWhz7HXAX6jZ0AcfecD+aFyg=";
   };
 
diff --git a/pkgs/by-name/ua/uacme/package.nix b/pkgs/by-name/ua/uacme/package.nix
index 1daaaf11a091..1769fc8ba77e 100644
--- a/pkgs/by-name/ua/uacme/package.nix
+++ b/pkgs/by-name/ua/uacme/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ndilieto";
     repo = "uacme";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-he0k4o/5JGFDxLrHBO6PNtRgKUzIkGby96cSz0ymuRs=";
   };
 
diff --git a/pkgs/by-name/ua/uair/package.nix b/pkgs/by-name/ua/uair/package.nix
index 3799ba2d0d90..05038009ec4e 100644
--- a/pkgs/by-name/ua/uair/package.nix
+++ b/pkgs/by-name/ua/uair/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "metent";
     repo = "uair";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VytbtTQch8O5hCg3L3ANNOfFOyiQY1V7DvGMEKr1R04=";
   };
 
diff --git a/pkgs/by-name/ua/uarmsolver/package.nix b/pkgs/by-name/ua/uarmsolver/package.nix
index be2374de3a8e..6c53ae93e32b 100644
--- a/pkgs/by-name/ua/uarmsolver/package.nix
+++ b/pkgs/by-name/ua/uarmsolver/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "firefly-cpp";
     repo = "uARMSolver";
-    tag = version;
+    rev = version;
     sha256 = "sha256-IMlh6Y5iVouMZatR1uxw0gUNZBdh2qm56s+GEjcr1+M=";
   };
 
diff --git a/pkgs/by-name/ub/ubertooth/package.nix b/pkgs/by-name/ub/ubertooth/package.nix
index cc18603a7d16..ea8cd38a1d16 100644
--- a/pkgs/by-name/ub/ubertooth/package.nix
+++ b/pkgs/by-name/ub/ubertooth/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "ubertooth";
-    tag = version;
+    rev = version;
     sha256 = "11r5ag2l5xn4pr7ycicm30w9c3ldn9yiqj1sqnjc79csxl2vrcfw";
   };
 
diff --git a/pkgs/by-name/ub/ubi_reader/package.nix b/pkgs/by-name/ub/ubi_reader/package.nix
index 629b734776db..20c3782e9062 100644
--- a/pkgs/by-name/ub/ubi_reader/package.nix
+++ b/pkgs/by-name/ub/ubi_reader/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "onekey-sec";
     repo = "ubi_reader";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-04HwzkonPzzWfX8VE//fMoVv5ggAS+61zx2W8VEUIy4=";
   };
 
diff --git a/pkgs/by-name/uc/uchess/package.nix b/pkgs/by-name/uc/uchess/package.nix
index 9c92243b285c..232262a17a20 100644
--- a/pkgs/by-name/uc/uchess/package.nix
+++ b/pkgs/by-name/uc/uchess/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tmountain";
     repo = "uchess";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1njl3f41gshdpj431zkvpv2b7zmh4m2m5q6xsijb0c0058dk46mz";
   };
 
diff --git a/pkgs/by-name/uc/ucode/package.nix b/pkgs/by-name/uc/ucode/package.nix
index 92dc37ae8b55..8395bff407fc 100644
--- a/pkgs/by-name/uc/ucode/package.nix
+++ b/pkgs/by-name/uc/ucode/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jow-";
     repo = "ucode";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dJjlwuQLS73D6W/bmhWLPPaT7himQyO1RvD+MXVxBMw=";
   };
 
diff --git a/pkgs/by-name/uc/ucx/package.nix b/pkgs/by-name/uc/ucx/package.nix
index 80bafdf84943..d024c119edcf 100644
--- a/pkgs/by-name/uc/ucx/package.nix
+++ b/pkgs/by-name/uc/ucx/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openucx";
     repo = "ucx";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ve9/h8DntyEClZA0P/iIg8WAuWOwYD7yzfKeN779eIo=";
   };
 
diff --git a/pkgs/by-name/ud/uddup/package.nix b/pkgs/by-name/ud/uddup/package.nix
index af5ecbeb9b73..00045852ee98 100644
--- a/pkgs/by-name/ud/uddup/package.nix
+++ b/pkgs/by-name/ud/uddup/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rotemreiss";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1f5dm3772hiik9irnyvbs7wygcafbwi7czw3b47cwhb90b8fi5hg";
   };
 
diff --git a/pkgs/by-name/ud/udevil/package.nix b/pkgs/by-name/ud/udevil/package.nix
index 38e015c76979..d30a5b8c767c 100644
--- a/pkgs/by-name/ud/udevil/package.nix
+++ b/pkgs/by-name/ud/udevil/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IgnorantGuru";
     repo = "udevil";
-    tag = version;
+    rev = version;
     sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad";
   };
 
diff --git a/pkgs/by-name/ud/udict/package.nix b/pkgs/by-name/ud/udict/package.nix
index db0e260daa5c..881c7b8cb9ba 100644
--- a/pkgs/by-name/ud/udict/package.nix
+++ b/pkgs/by-name/ud/udict/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lsmb";
     repo = "udict";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vcyzMw2tWil4MULEkf25S6kXzqMG6JXIx6GibxxspkY=";
   };
 
diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix
index 347b25b6dd24..1031709ff3e8 100644
--- a/pkgs/by-name/ud/udiskie/package.nix
+++ b/pkgs/by-name/ud/udiskie/package.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "coldfix";
     repo = "udiskie";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ndoTVeF6iTe4+aqFDRaLUEaBavgCWHzULXeG3Kj3ptY=";
   };
 
diff --git a/pkgs/by-name/ud/udp2raw/package.nix b/pkgs/by-name/ud/udp2raw/package.nix
index 7ff6dbbdf35f..28f7b6bc10c6 100644
--- a/pkgs/by-name/ud/udp2raw/package.nix
+++ b/pkgs/by-name/ud/udp2raw/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wangyu-";
     repo = "udp2raw";
-    tag = version;
+    rev = version;
     hash = "sha256-mchSaqw6sOJ7+dydCM8juP7QMOVUrPL4MFA79Rvyjdo=";
   };
 
diff --git a/pkgs/by-name/ud/udpreplay/package.nix b/pkgs/by-name/ud/udpreplay/package.nix
index 135d5e552a29..3367597e688c 100644
--- a/pkgs/by-name/ud/udpreplay/package.nix
+++ b/pkgs/by-name/ud/udpreplay/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rigtorp";
     repo = "udpreplay";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kF9a3pjQbFKf25NKyK7uSq0AAO6JK7QeChLhm9Z3wEA=";
   };
 
diff --git a/pkgs/by-name/ud/udpt/package.nix b/pkgs/by-name/ud/udpt/package.nix
index 2fef8d121d15..e3532dd212ec 100644
--- a/pkgs/by-name/ud/udpt/package.nix
+++ b/pkgs/by-name/ud/udpt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "naim94a";
     repo = "udpt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dWZRl5OiuEmCx7+Id0/feCohH5k/HA47nbPUEo8BBwQ=";
   };
 
diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix
index f6e596e95c65..6d44c5905b93 100644
--- a/pkgs/by-name/ue/ueberzugpp/package.nix
+++ b/pkgs/by-name/ue/ueberzugpp/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jstkdng";
     repo = "ueberzugpp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qo9Rwnx6Oh8DRcCBUMS3JVdNyx1iZSB2Z1qfptUoPFQ=";
   };
 
diff --git a/pkgs/by-name/ue/uefi-firmware-parser/package.nix b/pkgs/by-name/ue/uefi-firmware-parser/package.nix
index 01f5290c75b9..3f8e4cfc193d 100644
--- a/pkgs/by-name/ue/uefi-firmware-parser/package.nix
+++ b/pkgs/by-name/ue/uefi-firmware-parser/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "theopolis";
     repo = "uefi-firmware-parser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Yiw9idmvSpx4CcVrXHznR8vK/xl7DTL+L7k4Nvql2B8=";
   };
 
diff --git a/pkgs/by-name/ue/uefi-run/package.nix b/pkgs/by-name/ue/uefi-run/package.nix
index 00760dcdb4b9..0c8f84054e45 100644
--- a/pkgs/by-name/ue/uefi-run/package.nix
+++ b/pkgs/by-name/ue/uefi-run/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Richard-W";
     repo = "uefi-run";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tR547osqw18dCMHJLqJ8AQBelbv8yCl7rAqslu+vnDQ=";
   };
 
diff --git a/pkgs/by-name/ue/uesave/package.nix b/pkgs/by-name/ue/uesave/package.nix
index 8e2838e654ff..f090eea2065f 100644
--- a/pkgs/by-name/ue/uesave/package.nix
+++ b/pkgs/by-name/ue/uesave/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "trumank";
     repo = "uesave-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9gOOSLejVfR1KJMhcNuKDkuTOvPC6sNG8xQOZlt8NxI=";
   };
 
diff --git a/pkgs/by-name/uf/ufiformat/package.nix b/pkgs/by-name/uf/ufiformat/package.nix
index 60b1eeef9bfa..c830b3ac9dfb 100644
--- a/pkgs/by-name/uf/ufiformat/package.nix
+++ b/pkgs/by-name/uf/ufiformat/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tedigh";
     repo = "ufiformat";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "heFETZj9migz2s9kvmw0ZQ1ieNpU4V4Lwfp91ek2cS4=";
   };
 
diff --git a/pkgs/by-name/uf/uftpd/package.nix b/pkgs/by-name/uf/uftpd/package.nix
index c4323f633464..fd1aa0aad2a7 100644
--- a/pkgs/by-name/uf/uftpd/package.nix
+++ b/pkgs/by-name/uf/uftpd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "uftpd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+y1eRPUgYf5laRFIDD1XOEfonPP8QMJNCSkmHlXIjdY=";
   };
 
diff --git a/pkgs/by-name/uf/uftrace/package.nix b/pkgs/by-name/uf/uftrace/package.nix
index 6263f34b8e0e..9dd614f7b422 100644
--- a/pkgs/by-name/uf/uftrace/package.nix
+++ b/pkgs/by-name/uf/uftrace/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "namhyung";
     repo = "uftrace";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xx/eABF1q5uZYDGWUQc1YO6qCqR7J2mCHHQTBsHxMVw=";
   };
 
diff --git a/pkgs/by-name/ug/uget-integrator/package.nix b/pkgs/by-name/ug/uget-integrator/package.nix
index c26bca581ff4..cda04712302f 100644
--- a/pkgs/by-name/ug/uget-integrator/package.nix
+++ b/pkgs/by-name/ug/uget-integrator/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ugetdm";
     repo = "uget-integrator";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0bfqwbpprxp5sy49p2hqcjdfj7zamnp2hhcnnyccffkn7pghx8pp";
   };
 
diff --git a/pkgs/by-name/ug/uglify-js/package.nix b/pkgs/by-name/ug/uglify-js/package.nix
index d2bc7d7ecd93..b664a63046ba 100644
--- a/pkgs/by-name/ug/uglify-js/package.nix
+++ b/pkgs/by-name/ug/uglify-js/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mishoo";
     repo = "UglifyJS";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sMLQSB1+ux/ya/J22KGojlAxWhtPQdk22KdHy43zdyg=";
   };
 
diff --git a/pkgs/by-name/ug/ugm/package.nix b/pkgs/by-name/ug/ugm/package.nix
index d544c5435e42..db5fe787f319 100644
--- a/pkgs/by-name/ug/ugm/package.nix
+++ b/pkgs/by-name/ug/ugm/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ariasmn";
     repo = "ugm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FTgu5bzhX+B71dj4wHcgwbtrde5fzF98zMV1lRO++AE=";
   };
 
diff --git a/pkgs/by-name/ug/ugtrain/package.nix b/pkgs/by-name/ug/ugtrain/package.nix
index 731c708cec79..c355dfbb30f1 100644
--- a/pkgs/by-name/ug/ugtrain/package.nix
+++ b/pkgs/by-name/ug/ugtrain/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ugtrain";
     repo = "ugtrain";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0pw9lm8y83mda7x39874ax2147818h1wcibi83pd2x4rp1hjbkkn";
   };
 
diff --git a/pkgs/by-name/uh/uhttpmock_1_0/package.nix b/pkgs/by-name/uh/uhttpmock_1_0/package.nix
index 2308f3b9c4d5..cab0f0b466f5 100644
--- a/pkgs/by-name/uh/uhttpmock_1_0/package.nix
+++ b/pkgs/by-name/uh/uhttpmock_1_0/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "pwithnall";
     repo = "uhttpmock";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-itJhiPpAF5dwLrVF2vuNznABqTwEjVj6W8mbv1aEmE4=";
   };
 
diff --git a/pkgs/by-name/uh/uhubctl/package.nix b/pkgs/by-name/uh/uhubctl/package.nix
index d1baa5585f8c..bd4ce7a1be24 100644
--- a/pkgs/by-name/uh/uhubctl/package.nix
+++ b/pkgs/by-name/uh/uhubctl/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mvp";
     repo = "uhubctl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mpeDePHLsa4sGe2+8X9KQ8AYn7wtybDnaZzxnf4oETQ=";
   };
 
diff --git a/pkgs/by-name/ui/uivonim/package.nix b/pkgs/by-name/ui/uivonim/package.nix
index 5e0ebfd2e746..e0ab2a1f8d18 100644
--- a/pkgs/by-name/ui/uivonim/package.nix
+++ b/pkgs/by-name/ui/uivonim/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "smolck";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TcsKjRwiCTRQLxolRuJ7nRTGxFC0V2Q8LQC5p9iXaaY=";
   };
 
diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix
index c719c6e3a7f8..e8a4a8c9bd23 100644
--- a/pkgs/by-name/ul/ulid/package.nix
+++ b/pkgs/by-name/ul/ulid/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "oklog";
     repo = "ulid";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/oQPgcO1xKbHXutxz0WPfIduShPrfH1l+7/mj8jLst8=";
   };
 
diff --git a/pkgs/by-name/ul/ultralist/package.nix b/pkgs/by-name/ul/ultralist/package.nix
index bbb41112ea28..c95ca2ec1db6 100644
--- a/pkgs/by-name/ul/ultralist/package.nix
+++ b/pkgs/by-name/ul/ultralist/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ultralist";
     repo = "ultralist";
-    tag = version;
+    rev = version;
     sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY=";
   };
 
diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix
index e7484fa03802..e6006ebb4df6 100644
--- a/pkgs/by-name/ul/ultrastardx/package.nix
+++ b/pkgs/by-name/ul/ultrastardx/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "UltraStar-Deluxe";
     repo = "USDX";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tMYw+nkyEEK7AqG9AvMchCGzzKWlfut4poXc1WK6vkA=";
   };
 
diff --git a/pkgs/by-name/um/umoci/package.nix b/pkgs/by-name/um/umoci/package.nix
index f49b01f9a3c1..8f74acd0dd70 100644
--- a/pkgs/by-name/um/umoci/package.nix
+++ b/pkgs/by-name/um/umoci/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "umoci";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0in8kyi4jprvbm3zsl3risbjj8b0ma62yl3rq8rcvcgypx0mn7d4";
   };
 
diff --git a/pkgs/by-name/um/umoria/package.nix b/pkgs/by-name/um/umoria/package.nix
index fc29a5e5a431..9e56a85f1d42 100644
--- a/pkgs/by-name/um/umoria/package.nix
+++ b/pkgs/by-name/um/umoria/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dungeons-of-moria";
     repo = "umoria";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1j4QkE33UcTzM06qAjk1/PyK5uNA7E/kyDe3bZcFKUM=";
   };
 
diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index bb6a8dd6a7a2..3ae60b57ea0e 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IL8jfG0qTDjp80E8bniNYUiH77PTtL4QIwMCEkqdwSE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/um/umurmur/package.nix b/pkgs/by-name/um/umurmur/package.nix
index d5c7ad30fd46..0c4ee7e9bbba 100644
--- a/pkgs/by-name/um/umurmur/package.nix
+++ b/pkgs/by-name/um/umurmur/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "umurmur";
     repo = "umurmur";
-    tag = version;
+    rev = version;
     sha256 = "sha256-q5k1Lv+/Kz602QFcdb/FoWWaH9peAQIf7u1NTCWKTBM=";
   };
 
diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix
index a5cbdb056930..0a80554a9180 100644
--- a/pkgs/by-name/un/unbook/package.nix
+++ b/pkgs/by-name/un/unbook/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ludios";
     repo = "unbook";
-    tag = version;
+    rev = version;
     hash = "sha256-whWWh/jQ4RkGA3T1VCmt6zhpQQCzh2jASYg69IlfEeo=";
   };
 
diff --git a/pkgs/by-name/un/unclutter-xfixes/package.nix b/pkgs/by-name/un/unclutter-xfixes/package.nix
index 8eade082f2f0..4c04befe01c1 100644
--- a/pkgs/by-name/un/unclutter-xfixes/package.nix
+++ b/pkgs/by-name/un/unclutter-xfixes/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Airblader";
     repo = "unclutter-xfixes";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-suKmaoJq0PBHZc7NzBQ60JGwJkAtWmvzPtTHWOPJEdc=";
   };
 
diff --git a/pkgs/by-name/un/undervolt/package.nix b/pkgs/by-name/un/undervolt/package.nix
index 7ea797665778..57a7cb882855 100644
--- a/pkgs/by-name/un/undervolt/package.nix
+++ b/pkgs/by-name/un/undervolt/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "georgewhewell";
     repo = "undervolt";
-    tag = version;
+    rev = version;
     hash = "sha256-G+CK/lnZXkQdyNZPqY9P3owVJsd22H3K8wSpjHFG0ow=";
   };
 
diff --git a/pkgs/by-name/un/unfurl/package.nix b/pkgs/by-name/un/unfurl/package.nix
index 5d4ba58d5c36..ccca02140d70 100644
--- a/pkgs/by-name/un/unfurl/package.nix
+++ b/pkgs/by-name/un/unfurl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tomnomnom";
     repo = "unfurl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7aLe5d8ku5llfJ2xh8fT56vqj12/CJ1ez3Vte2PF8KQ=";
   };
 
diff --git a/pkgs/by-name/un/ungit/package.nix b/pkgs/by-name/un/ungit/package.nix
index 05e0b49501b7..c5eedfb02c73 100644
--- a/pkgs/by-name/un/ungit/package.nix
+++ b/pkgs/by-name/un/ungit/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "FredrikNoren";
     repo = "ungit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zLc+qzbbaQs6Y3NJFHupxyZ0QfuM/VW97dFESR+5dVQ=";
   };
 
diff --git a/pkgs/by-name/un/unhide/package.nix b/pkgs/by-name/un/unhide/package.nix
index ee39dce68efb..e6dd2c8ec8aa 100644
--- a/pkgs/by-name/un/unhide/package.nix
+++ b/pkgs/by-name/un/unhide/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "YJesus";
     repo = "Unhide";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-v4otbDhKKRLywH6aP+mbMR0olHbW+jk4TXTBY+iaxdo=";
   };
 
diff --git a/pkgs/by-name/un/unibilium/package.nix b/pkgs/by-name/un/unibilium/package.nix
index 65b8309646fe..2932306e1a85 100644
--- a/pkgs/by-name/un/unibilium/package.nix
+++ b/pkgs/by-name/un/unibilium/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "neovim";
     repo = "unibilium";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6bFZtR8TUZJembRBj6wUUCyurUdsn3vDGnCzCti/ESc=";
   };
 
diff --git a/pkgs/by-name/un/unicode-paracode/package.nix b/pkgs/by-name/un/unicode-paracode/package.nix
index b2decb9f433d..f2d6e7cb8d29 100644
--- a/pkgs/by-name/un/unicode-paracode/package.nix
+++ b/pkgs/by-name/un/unicode-paracode/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "garabik";
     repo = "unicode";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FHAlZ5HID/FE9+YR7Dmc3Uh7E16QKORoD8g9jgTeQdY=";
   };
 
diff --git a/pkgs/by-name/un/unifiedpush-common-proxies/package.nix b/pkgs/by-name/un/unifiedpush-common-proxies/package.nix
index ad8320182643..14952cad6566 100644
--- a/pkgs/by-name/un/unifiedpush-common-proxies/package.nix
+++ b/pkgs/by-name/un/unifiedpush-common-proxies/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "unifiedpush";
     repo = "common-proxies";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pMzKK18FZCqJ86nqXfOT7tKCqIw6P0ioxRUi72aef0A=";
   };
 
diff --git a/pkgs/by-name/un/unimap/package.nix b/pkgs/by-name/un/unimap/package.nix
index 386d4b2c4f56..04a4d50f8cbb 100644
--- a/pkgs/by-name/un/unimap/package.nix
+++ b/pkgs/by-name/un/unimap/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Edu4rdSHL";
     repo = "unimap";
-    tag = version;
+    rev = version;
     hash = "sha256-7UbzE5VXycjo7KNpPe2oqwyZDT4Vk8rQZ6HXT1q9Cw4=";
   };
 
diff --git a/pkgs/by-name/un/unison-fsmonitor/package.nix b/pkgs/by-name/un/unison-fsmonitor/package.nix
index 3b22e80e9abb..13afed3aaff4 100644
--- a/pkgs/by-name/un/unison-fsmonitor/package.nix
+++ b/pkgs/by-name/un/unison-fsmonitor/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "autozimu";
     repo = "unison-fsmonitor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1W05b9s0Pg2LzNu0mFo/JKpPw0QORqZkXhbbSuCZIUo=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/un/unit/package.nix b/pkgs/by-name/un/unit/package.nix
index bead43e26ece..7c9ddfee455c 100644
--- a/pkgs/by-name/un/unit/package.nix
+++ b/pkgs/by-name/un/unit/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nginx";
     repo = "unit";
-    tag = version;
+    rev = version;
     sha256 = "sha256-tu1JqGWtfTznTDmZqEEVF3FmiDEXvaAdgQPsvLHCWy8=";
   };
 
diff --git a/pkgs/by-name/un/unittest-cpp/package.nix b/pkgs/by-name/un/unittest-cpp/package.nix
index b7bda2c145e0..58f859ae43ea 100644
--- a/pkgs/by-name/un/unittest-cpp/package.nix
+++ b/pkgs/by-name/un/unittest-cpp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "unittest-cpp";
     repo = "unittest-cpp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i";
   };
 
diff --git a/pkgs/by-name/un/unnethack/package.nix b/pkgs/by-name/un/unnethack/package.nix
index f16fc645ac3b..ec6637926b84 100644
--- a/pkgs/by-name/un/unnethack/package.nix
+++ b/pkgs/by-name/un/unnethack/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     name = "UnNetHack";
     owner = "UnNetHack";
     repo = "UnNetHack";
-    tag = version;
+    rev = version;
     sha256 = "1rg0mqyplgn3dfh3wz09a600qxk7aidqw4d84kyiincljvhyb7ps";
   };
 
diff --git a/pkgs/by-name/un/unoconv/package.nix b/pkgs/by-name/un/unoconv/package.nix
index 3429a5dc2021..0291fc19c1dd 100644
--- a/pkgs/by-name/un/unoconv/package.nix
+++ b/pkgs/by-name/un/unoconv/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "unoconv";
     repo = "unoconv";
-    tag = version;
+    rev = version;
     sha256 = "1akx64686in8j8arl6vsgp2n3bv770q48pfv283c6fz6wf9p8fvr";
   };
 
diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix
index d565ba2a2c5e..d4d38fca860e 100644
--- a/pkgs/by-name/un/unpoller/package.nix
+++ b/pkgs/by-name/un/unpoller/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "unpoller";
     repo = "unpoller";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-x3Uboa6bs59LafEF9/aYmudo9JIh3KIMNdLJRimcmxY=";
   };
 
diff --git a/pkgs/by-name/un/unshield/package.nix b/pkgs/by-name/un/unshield/package.nix
index 912ecbd23703..e3f2ff9be845 100644
--- a/pkgs/by-name/un/unshield/package.nix
+++ b/pkgs/by-name/un/unshield/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "twogood";
     repo = "unshield";
-    tag = version;
+    rev = version;
     sha256 = "1p2inn93svm83kr5p0j1al0rx47f1zykmagxsblgy04gi942iza3";
   };
 
diff --git a/pkgs/by-name/un/unsilence/package.nix b/pkgs/by-name/un/unsilence/package.nix
index 7f56c2a2b99e..a746adf6bd92 100644
--- a/pkgs/by-name/un/unsilence/package.nix
+++ b/pkgs/by-name/un/unsilence/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lagmoellertim";
     repo = "unsilence";
-    tag = version;
+    rev = version;
     hash = "sha256-M4Ek1JZwtr7vIg14aTa8h4otIZnPQfKNH4pZE4GpiBQ=";
   };
 
diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix
index 01b0280014f2..96a5a15584d8 100644
--- a/pkgs/by-name/un/unstructured-api/package.nix
+++ b/pkgs/by-name/un/unstructured-api/package.nix
@@ -163,7 +163,7 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-api";
-    tag = version;
+    rev = version;
     hash = "sha256-mvcARpewqC25x3ZdpM8QB7SjbqGoBL/rtxi90KdKdO8=";
   };
 
diff --git a/pkgs/by-name/un/unused/package.nix b/pkgs/by-name/un/unused/package.nix
index 05bedd47e9c7..71790d0f6b99 100644
--- a/pkgs/by-name/un/unused/package.nix
+++ b/pkgs/by-name/un/unused/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "unused-code";
     repo = "unused";
-    tag = version;
+    rev = version;
     sha256 = "sha256-+1M8dUfjjrT4llS0C6WYDyNxJ9QZ5s9v+W185TbgwMw=";
   };
 
diff --git a/pkgs/by-name/un/unvanquished/package.nix b/pkgs/by-name/un/unvanquished/package.nix
index c183a38b905c..ef32e161cd3f 100644
--- a/pkgs/by-name/un/unvanquished/package.nix
+++ b/pkgs/by-name/un/unvanquished/package.nix
@@ -39,7 +39,7 @@ let
   src = fetchFromGitHub {
     owner = "Unvanquished";
     repo = "Unvanquished";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-4ONge+GnrpV/FHKuA66o7uK7jIygBYizZl8JAUr8x/0=";
   };
diff --git a/pkgs/by-name/un/unyaffs/package.nix b/pkgs/by-name/un/unyaffs/package.nix
index a4bfe461d0dd..b5f8e0269ab8 100644
--- a/pkgs/by-name/un/unyaffs/package.nix
+++ b/pkgs/by-name/un/unyaffs/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "whataday";
     repo = "unyaffs";
-    tag = finalAttrs.version;
+    rev = "${finalAttrs.version}";
     hash = "sha256-FcuPaxq74gVJ6UlOhFPSMtuwUAJVV/sAxAQojhmVXCs=";
   };
 
diff --git a/pkgs/by-name/un/unzoo/package.nix b/pkgs/by-name/un/unzoo/package.nix
index 7e6afeb2b733..dcb2fe0bbe43 100644
--- a/pkgs/by-name/un/unzoo/package.nix
+++ b/pkgs/by-name/un/unzoo/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "unzoo";
-    tag = version;
+    rev = version;
     hash = "sha256-oPq1I7EsvHaJ7anHbm/KWrYrxJkM79rLhgRfSAdoLtk=";
   };
 
diff --git a/pkgs/by-name/up/up/package.nix b/pkgs/by-name/up/up/package.nix
index 8c9633ef035a..a25f1406e436 100644
--- a/pkgs/by-name/up/up/package.nix
+++ b/pkgs/by-name/up/up/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "akavel";
     repo = "up";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-d6FCJ9G9ytHhWQ5lXEtlmzclt3odS9e+Y1ry6EiIDsk=";
   };
 
diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix
index f4681b242fe6..66ef766b6532 100644
--- a/pkgs/by-name/up/updatecli/package.nix
+++ b/pkgs/by-name/up/updatecli/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "updatecli";
     repo = "updatecli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-znl0yUqnN9eQHY18wPfcYiUnsGw349tLSkZNa/Wz2KA=";
   };
 
diff --git a/pkgs/by-name/up/uplosi/package.nix b/pkgs/by-name/up/uplosi/package.nix
index f2253c569856..14da37539a1f 100644
--- a/pkgs/by-name/up/uplosi/package.nix
+++ b/pkgs/by-name/up/uplosi/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "edgelesssys";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5I916T70sH4UAq5EGRjR7lnRBbPqMJIxaXwUCJQ4DcM=";
   };
 
diff --git a/pkgs/by-name/up/ups/package.nix b/pkgs/by-name/up/ups/package.nix
index 75575092faa3..f563ea93a170 100644
--- a/pkgs/by-name/up/ups/package.nix
+++ b/pkgs/by-name/up/ups/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rameshvarun";
     repo = "ups";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7AuZ1gyp8tAWHM0Ry54tKucPJ3enaGDtvrM1J8uBIT8=";
   };
 
diff --git a/pkgs/by-name/up/upterm/package.nix b/pkgs/by-name/up/upterm/package.nix
index 06f339564086..3c9b76021c17 100644
--- a/pkgs/by-name/up/upterm/package.nix
+++ b/pkgs/by-name/up/upterm/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "owenthereal";
     repo = "upterm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-koZRKxp6Q52jvpmQqQAGvPHoiiU2LaEuNeRY/rru+XM=";
   };
 
diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix
index de2e7f2f59ab..1c0b8a6737df 100644
--- a/pkgs/by-name/up/uptime-kuma/package.nix
+++ b/pkgs/by-name/up/uptime-kuma/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "louislam";
     repo = "uptime-kuma";
-    tag = version;
+    rev = version;
     hash = "sha256-+bhKnyZnGd+tNlsxvP96I9LXOca8FmOPhIFHp7ijmyA=";
   };
 
diff --git a/pkgs/by-name/up/uptimed/package.nix b/pkgs/by-name/up/uptimed/package.nix
index a3245e516642..adfdb5b0e334 100644
--- a/pkgs/by-name/up/uptimed/package.nix
+++ b/pkgs/by-name/up/uptimed/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "sha256-gP6Syzu54/co4L+UCPikUhXDpxpfAB4jO/5ZF/9RdN0=";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "uptimed";
     owner = "rpodgorny";
   };
diff --git a/pkgs/by-name/uq/uqm/3dovideo.nix b/pkgs/by-name/uq/uqm/3dovideo.nix
index 049d435b1b5f..78b42ae2c1df 100644
--- a/pkgs/by-name/uq/uqm/3dovideo.nix
+++ b/pkgs/by-name/uq/uqm/3dovideo.nix
@@ -35,7 +35,7 @@ let
       src = fetchFromGitHub {
         owner = "aszlig";
         repo = "uqm3donix";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-rK30u2PBysiSGSA9829F1Nom/wtoVN6rGTBneRKeWEw=";
       };
 
diff --git a/pkgs/by-name/ur/urban-cli/package.nix b/pkgs/by-name/ur/urban-cli/package.nix
index 0cc4b650d3d9..fb05c8e7686e 100644
--- a/pkgs/by-name/ur/urban-cli/package.nix
+++ b/pkgs/by-name/ur/urban-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tfkhdyt";
     repo = "urban-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-URTEhtOiwb3IDyjRUtUmVTaeDXw4Beg0woWdGxeq098=";
   };
 
diff --git a/pkgs/by-name/ur/urdfdom-headers/package.nix b/pkgs/by-name/ur/urdfdom-headers/package.nix
index 41a2d95af471..e1d0ed250c2d 100644
--- a/pkgs/by-name/ur/urdfdom-headers/package.nix
+++ b/pkgs/by-name/ur/urdfdom-headers/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ros";
     repo = "urdfdom_headers";
-    tag = version;
+    rev = version;
     hash = "sha256-FQSnYuTc40MOxyFsMPfoCIonP+4AUQxdq74eoQ9tOoo=";
   };
 
diff --git a/pkgs/by-name/ur/urdfdom/package.nix b/pkgs/by-name/ur/urdfdom/package.nix
index 8fa16647f915..ec65438b542e 100644
--- a/pkgs/by-name/ur/urdfdom/package.nix
+++ b/pkgs/by-name/ur/urdfdom/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ros";
     repo = "urdfdom";
-    tag = version;
+    rev = version;
     hash = "sha256-t1ff5aRHE7LuQdCXuooWPDUgPWjyYyQmQUB1RJmte1w=";
   };
 
diff --git a/pkgs/by-name/ur/uri/package.nix b/pkgs/by-name/ur/uri/package.nix
index 970dedbbc249..5b788d8d424a 100644
--- a/pkgs/by-name/ur/uri/package.nix
+++ b/pkgs/by-name/ur/uri/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cpp-netlib";
     repo = "uri";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd";
   };
 
diff --git a/pkgs/by-name/ur/urlencode/package.nix b/pkgs/by-name/ur/urlencode/package.nix
index b8ac18fa4d8e..f79bc0598cf8 100644
--- a/pkgs/by-name/ur/urlencode/package.nix
+++ b/pkgs/by-name/ur/urlencode/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dead10ck";
     repo = "urlencode";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LvLUbtMPVbYZMUb9vWhTscYfZPtEM5GrZme3azvVlPE=";
   };
 
diff --git a/pkgs/by-name/ur/urlhunter/package.nix b/pkgs/by-name/ur/urlhunter/package.nix
index b48e36f36019..9347fa3dfabd 100644
--- a/pkgs/by-name/ur/urlhunter/package.nix
+++ b/pkgs/by-name/ur/urlhunter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "utkusen";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QRQLN8NFIIvlK+sHNj0MMs7tlBODMKHdWJFh/LwnysI=";
   };
 
diff --git a/pkgs/by-name/ur/urlwatch/package.nix b/pkgs/by-name/ur/urlwatch/package.nix
index 6ab281cbae37..b484e07e2e5d 100644
--- a/pkgs/by-name/ur/urlwatch/package.nix
+++ b/pkgs/by-name/ur/urlwatch/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "thp";
     repo = "urlwatch";
-    tag = version;
+    rev = version;
     hash = "sha256-X1UR9JrQuujOIUg87W0YqfXsM3A5nttWjjJMIe3hgk8=";
   };
 
diff --git a/pkgs/by-name/ur/urn/package.nix b/pkgs/by-name/ur/urn/package.nix
index c01a638720ef..9f1ee36f59a6 100644
--- a/pkgs/by-name/ur/urn/package.nix
+++ b/pkgs/by-name/ur/urn/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
   src = fetchFromGitLab {
     owner = "urn";
     repo = "urn";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0nclr3d8ap0y5cg36i7g4ggdqci6m5q27y9f26b57km8p266kcpy";
   };
 
diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix
index 2336c596b0ed..9a8c5edb764a 100644
--- a/pkgs/by-name/us/usage/package.nix
+++ b/pkgs/by-name/us/usage/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "usage";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-No/BDBW/NRnF81UOuAMrAs4cXEdzEAxnmkn67mReUcM=";
   };
 
diff --git a/pkgs/by-name/us/usbview/package.nix b/pkgs/by-name/us/usbview/package.nix
index 451c5be5f85f..2fa506a18b82 100644
--- a/pkgs/by-name/us/usbview/package.nix
+++ b/pkgs/by-name/us/usbview/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gregkh";
     repo = "usbview";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-h+sB83BYsrB2VxwtatPWNiM0WdTCMY289nh+/0o8GOw=";
   };
 
diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix
index 10abdb723c4b..5ba51b7a63f3 100644
--- a/pkgs/by-name/us/userborn/package.nix
+++ b/pkgs/by-name/us/userborn/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "userborn";
-    tag = version;
+    rev = version;
     hash = "sha256-Zh2u7we/MAIM7varuJA4AmEWeSMuA/C+0NSIUJN7zTs=";
   };
 
diff --git a/pkgs/by-name/us/userhosts/package.nix b/pkgs/by-name/us/userhosts/package.nix
index b3b041f91095..bf6c1b58f8db 100644
--- a/pkgs/by-name/us/userhosts/package.nix
+++ b/pkgs/by-name/us/userhosts/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "figiel";
     repo = "hosts";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9uF0fYl4Zz/Ia2UKx7CBi8ZU8jfWoBfy2QSgTSwXo5A";
   };
 
diff --git a/pkgs/by-name/us/usrsctp/package.nix b/pkgs/by-name/us/usrsctp/package.nix
index 588c61e45a64..9d5e72f1f2c6 100644
--- a/pkgs/by-name/us/usrsctp/package.nix
+++ b/pkgs/by-name/us/usrsctp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sctplab";
     repo = "usrsctp";
-    tag = version;
+    rev = version;
     sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9";
   };
 
diff --git a/pkgs/by-name/us/ustreamer/package.nix b/pkgs/by-name/us/ustreamer/package.nix
index faa67923a8a2..d6a3c866dfdf 100644
--- a/pkgs/by-name/us/ustreamer/package.nix
+++ b/pkgs/by-name/us/ustreamer/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pikvm";
     repo = "ustreamer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SvvIY52FMO6Y4B6TOfk7dLtci4OayPX6+d8voKenKbQ=";
   };
 
diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix
index f6dcd9d26f33..4ab4fe494edc 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";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-e8qH4eygLnQw7B8x+HN+vH8cr8fkxnTFz+PKtFJ8dGE=";
   };
diff --git a/pkgs/by-name/ut/utf8proc/package.nix b/pkgs/by-name/ut/utf8proc/package.nix
index 2e85d52014b8..a75d5555be92 100644
--- a/pkgs/by-name/ut/utf8proc/package.nix
+++ b/pkgs/by-name/ut/utf8proc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JuliaStrings";
     repo = "utf8proc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wmtMo6eBK/xxxkIeJfh5Yb293po9cKK+7WjqNPoxM9g=";
   };
 
diff --git a/pkgs/by-name/ut/uthash/package.nix b/pkgs/by-name/ut/uthash/package.nix
index ed9c67889155..d0487a764472 100644
--- a/pkgs/by-name/ut/uthash/package.nix
+++ b/pkgs/by-name/ut/uthash/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troydhanson";
     repo = "uthash";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-F0M5ENT3bMn3dD16Oaq9mBFYOWzVliVWupAIrLc2nkQ=";
   };
 
diff --git a/pkgs/by-name/ut/uthenticode/package.nix b/pkgs/by-name/ut/uthenticode/package.nix
index a8b362c05a41..85e1e65086b8 100644
--- a/pkgs/by-name/ut/uthenticode/package.nix
+++ b/pkgs/by-name/ut/uthenticode/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "uthenticode";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NGVOGXMRlgpSRw56jr63rJc/5/qCmPjtAFa0D21ogd4=";
   };
 
diff --git a/pkgs/by-name/ut/utox/package.nix b/pkgs/by-name/ut/utox/package.nix
index 701496ddf60c..58aff9b45cf0 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/uw/uwufetch/package.nix b/pkgs/by-name/uw/uwufetch/package.nix
index 0fe2354c8f36..811c2378013f 100644
--- a/pkgs/by-name/uw/uwufetch/package.nix
+++ b/pkgs/by-name/uw/uwufetch/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TheDarkBug";
     repo = "uwufetch";
-    tag = version;
+    rev = version;
     hash = "sha256-cA8sajh+puswyKikr0Jp9ei+EpVkH+vhEp+pTerkUqA=";
   };
 
diff --git a/pkgs/by-name/uw/uwuify/package.nix b/pkgs/by-name/uw/uwuify/package.nix
index d6792ae94ea1..e539ca7cb556 100644
--- a/pkgs/by-name/uw/uwuify/package.nix
+++ b/pkgs/by-name/uw/uwuify/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Daniel-Liu-c0deb0t";
     repo = "uwu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-MzXObbxccwEG7egmQMCdhUukGqZS+NgbYwZjTaqME7I=";
   };
 
diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index 0d2865bdae4c..2989d934eb78 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -13,7 +13,7 @@ let
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
-      tag = version;
+      rev = version;
       hash = "sha256-oxL9XgaTdMISdCQ37gAz4LtgV1bk09GirTtVbSOm8Z4=";
     };
     vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix
index 5ca2dfa42314..ba2b1bdd1538 100644
--- a/pkgs/by-name/v2/v2ray/package.nix
+++ b/pkgs/by-name/v2/v2ray/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "v2fly";
     repo = "v2ray-core";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HCXfyWpwjryFcmk/7uUByqeJzdhJgb1zv1LDREc0k10=";
   };
 
diff --git a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
index 747eebc129dd..564460b104bc 100644
--- a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
+++ b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "intel-hybrid-driver";
-    tag = version;
+    rev = version;
     sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8=";
   };
 
diff --git a/pkgs/by-name/va/vala-language-server/package.nix b/pkgs/by-name/va/vala-language-server/package.nix
index 1b13cedb9b04..87d67a44acf4 100644
--- a/pkgs/by-name/va/vala-language-server/package.nix
+++ b/pkgs/by-name/va/vala-language-server/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vala-lang";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-Vl5DjKBdpk03aPD+0xGoTwD9Slg1rREorqZGX5o10cY=";
   };
 
diff --git a/pkgs/by-name/va/vale/styles.nix b/pkgs/by-name/va/vale/styles.nix
index 904a9db89c92..c910014fbca0 100644
--- a/pkgs/by-name/va/vale/styles.nix
+++ b/pkgs/by-name/va/vale/styles.nix
@@ -49,7 +49,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "alex";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-p0CQg6ZLusSKr57SugwlnoDEoPNVY3UIM8rHHxOL2l0=";
     };
     meta = {
@@ -65,7 +65,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "Google";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-ldwK9tMA04H/jTd3dQeRX/sZOwZcyPb+I56cDg0vZDg=";
     };
     meta = {
@@ -81,7 +81,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "Joblint";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-zRz5ThOg5RLTZj3dYPe0PDvOF5DjO31lduSpi2Us87U=";
     };
     meta = {
@@ -97,7 +97,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "Microsoft";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-4j05bIGAVEy6untUqtrUxdLKlhyOcJsbcsow8OxRp1A=";
     };
     meta = {
@@ -113,7 +113,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "proselint";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-ryKJDX1JrvDWVKLC5qQGctweDf74yuwEXxl/IqumM4s=";
     };
     meta = {
@@ -129,7 +129,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "readability";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-5Y9v8QsZjC2w3/pGIcL5nBdhpogyJznO5IFa0s8VOOI=";
     };
     meta = {
@@ -145,7 +145,7 @@ in
     src = fetchFromGitHub {
       owner = "errata-ai";
       repo = "write-good";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-W/eHlXklAVlAnY8nLPi/SIKsg8UUnH8UkH99BDo5yKk=";
     };
     meta = {
diff --git a/pkgs/by-name/va/valijson/package.nix b/pkgs/by-name/va/valijson/package.nix
index c56a6f5a771c..a558e5c410f6 100644
--- a/pkgs/by-name/va/valijson/package.nix
+++ b/pkgs/by-name/va/valijson/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tristanpenman";
     repo = "valijson";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nIXcS8PMKoo8D616uUZ+GdIbkGb3VGSlCvg7QqZtz20=";
   };
 
diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index 9fbd3f406544..bca8fa9c5302 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "valkey-io";
     repo = "valkey";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-05EuPjVokzfJxhrnvFHD7prwt5y7gPxemeDIkLML7lw=";
   };
 
diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix
index b82d16630a83..04f0fe27fb39 100644
--- a/pkgs/by-name/va/vals/package.nix
+++ b/pkgs/by-name/va/vals/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   version = "0.40.1";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "helmfile";
     repo = pname;
     sha256 = "sha256-1mN8JbFgzHjzuuSoagDo9f4zFrrZc2iNk8AoSrBsyBs=";
diff --git a/pkgs/by-name/va/valum/package.nix b/pkgs/by-name/va/valum/package.nix
index 55f2137bce29..e2dec1824b57 100644
--- a/pkgs/by-name/va/valum/package.nix
+++ b/pkgs/by-name/va/valum/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "valum-framework";
     repo = "valum";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-baAv83YiX8HdBm/t++ktB7pmTVlt4aWZ5xnsAs/NrTI=";
   };
 
diff --git a/pkgs/by-name/va/valuta/package.nix b/pkgs/by-name/va/valuta/package.nix
index 27ad06506813..05a2a0ff7ba8 100644
--- a/pkgs/by-name/va/valuta/package.nix
+++ b/pkgs/by-name/va/valuta/package.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ideveCore";
     repo = "Valuta";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g2x+pqs7dXdTMSxzSU5TeQtE+Q+tdQ93xaMtUVEE5/U=";
   };
 
diff --git a/pkgs/by-name/va/vapoursynth-mvtools/package.nix b/pkgs/by-name/va/vapoursynth-mvtools/package.nix
index 866986d347f5..41ae1a11ccee 100644
--- a/pkgs/by-name/va/vapoursynth-mvtools/package.nix
+++ b/pkgs/by-name/va/vapoursynth-mvtools/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dubhater";
     repo = "vapoursynth-mvtools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bEifU1PPNOBr6o9D6DGIzTaG4xjygBxkQYnZxd/4SwQ=";
   };
 
diff --git a/pkgs/by-name/va/vault-medusa/package.nix b/pkgs/by-name/va/vault-medusa/package.nix
index bd0af91df79e..9697eb60bcfa 100644
--- a/pkgs/by-name/va/vault-medusa/package.nix
+++ b/pkgs/by-name/va/vault-medusa/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jonasvinther";
     repo = "medusa";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pMCkJMY5KFkNsmv/LFYZrDmrq2G7fw1fl9HEYGAKuIM=";
   };
 
diff --git a/pkgs/by-name/va/vault-ssh-plus/package.nix b/pkgs/by-name/va/vault-ssh-plus/package.nix
index a7390cf5038f..56d8a92197f4 100644
--- a/pkgs/by-name/va/vault-ssh-plus/package.nix
+++ b/pkgs/by-name/va/vault-ssh-plus/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "isometry";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-l2Gr4AxikPWbSGeZqmkZa1wTRXNZ0l6fTSAcjl+6P8s=";
   };
 
diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix
index 7d2e7a9c9b6f..6c816272dade 100644
--- a/pkgs/by-name/va/vault-tasks/package.nix
+++ b/pkgs/by-name/va/vault-tasks/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "louis-thevenet";
     repo = "vault-tasks";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IjpmvoibxDwbdq4SyPXWxhsUTzaRKH1qUXwskCWOqm4=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/by-name/va/vault-unseal/package.nix b/pkgs/by-name/va/vault-unseal/package.nix
index b3fdb299af8d..0e0d940267db 100644
--- a/pkgs/by-name/va/vault-unseal/package.nix
+++ b/pkgs/by-name/va/vault-unseal/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "lrstanley";
     repo = "vault-unseal";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+9o2+6PwRZjCaJnr2sriTk74cWZXURMndusakd4Vd8g=";
   };
 
diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix
index 581024ac766f..52fd0905aa97 100644
--- a/pkgs/by-name/va/vault/package.nix
+++ b/pkgs/by-name/va/vault/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZpfUQJdwt7byRUs8sJRdVQABLYGqZVFPfaXwCdK2rR4=";
   };
 
diff --git a/pkgs/by-name/va/vazir-code-font/package.nix b/pkgs/by-name/va/vazir-code-font/package.nix
index 439ae33e01a3..5b81c36426b3 100644
--- a/pkgs/by-name/va/vazir-code-font/package.nix
+++ b/pkgs/by-name/va/vazir-code-font/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "vazir-code-font";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iBojse3eHr4ucZtPfpkN+mmO6sEExY8WcAallyPgMsI=";
   };
 
diff --git a/pkgs/by-name/va/vazir-fonts/package.nix b/pkgs/by-name/va/vazir-fonts/package.nix
index d16e47feac9e..3aa6170f57b1 100644
--- a/pkgs/by-name/va/vazir-fonts/package.nix
+++ b/pkgs/by-name/va/vazir-fonts/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rastikerdar";
     repo = "vazir-font";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-C1UtfrRFzz0uv/hj8e7huXe4sNd5h7ozVhirWEAyXGg=";
   };
 
diff --git a/pkgs/by-name/vc/vcftools/package.nix b/pkgs/by-name/vc/vcftools/package.nix
index 2f3389b83fb7..41924c9db0e6 100644
--- a/pkgs/by-name/vc/vcftools/package.nix
+++ b/pkgs/by-name/vc/vcftools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "vcftools";
     owner = "vcftools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx";
   };
 
diff --git a/pkgs/by-name/vc/vcg/package.nix b/pkgs/by-name/vc/vcg/package.nix
index bab90a189080..7fe6f3832f86 100644
--- a/pkgs/by-name/vc/vcg/package.nix
+++ b/pkgs/by-name/vc/vcg/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cnr-isti-vclab";
     repo = "vcglib";
-    tag = version;
+    rev = version;
     sha256 = "sha256-U3pu1k2pCH+G4CtacaDQ9SgkFX5A9/O/qrdpgWvB1+U=";
   };
 
diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix
index 830267d3691c..0cdd12ae13d9 100644
--- a/pkgs/by-name/vc/vcpkg-tool/package.nix
+++ b/pkgs/by-name/vc/vcpkg-tool/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg-tool";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-tu6mN9y2lYsf71LUmRPMdZHE6VIWODOOQFs8+v0KIt8=";
   };
 
diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix
index 60e4db4e336c..ee751ff49052 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";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-HmaP1WKl8s5eKAC32nTALFd4gbqKnzWnJn6L0/fFmqk=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/vc/vcs_query/package.nix b/pkgs/by-name/vc/vcs_query/package.nix
index 9267dabb5edc..0449f3eac05e 100644
--- a/pkgs/by-name/vc/vcs_query/package.nix
+++ b/pkgs/by-name/vc/vcs_query/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mageta";
     repo = "vcs_query";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "05va0na9yxkpqhm9v0x3k58148qcf2bbcv5bnmj7vn9r7fwyjrlx";
   };
 
diff --git a/pkgs/by-name/vd/vde2/package.nix b/pkgs/by-name/vd/vde2/package.nix
index 431ccb0d1b25..695940bee37e 100644
--- a/pkgs/by-name/vd/vde2/package.nix
+++ b/pkgs/by-name/vd/vde2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "virtualsquare";
     repo = "vde-2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Yf6QB7j5lYld2XtqhYspK4037lTtimoFc7nCavCP+mU=";
   };
 
diff --git a/pkgs/by-name/vd/vdhcoapp/filepicker.nix b/pkgs/by-name/vd/vdhcoapp/filepicker.nix
index f255f1ec315f..cd2f34dc114a 100644
--- a/pkgs/by-name/vd/vdhcoapp/filepicker.nix
+++ b/pkgs/by-name/vd/vdhcoapp/filepicker.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "paulrouget";
     repo = "static-filepicker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7sRzf3SA9RSBf4O36olXgka8c6Bufdb0qsuTofVe55s=";
   };
 
diff --git a/pkgs/by-name/vd/vdhcoapp/package.nix b/pkgs/by-name/vd/vdhcoapp/package.nix
index fc521327f195..d4cad21ba302 100644
--- a/pkgs/by-name/vd/vdhcoapp/package.nix
+++ b/pkgs/by-name/vd/vdhcoapp/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "aclap-dev";
     repo = "vdhcoapp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8xeZvqpRq71aShVogiwlVD3gQoPGseNOmz5E3KbsZxU=";
   };
 
diff --git a/pkgs/by-name/vd/vdo/package.nix b/pkgs/by-name/vd/vdo/package.nix
index c37c107127fe..64860aa4202d 100644
--- a/pkgs/by-name/vd/vdo/package.nix
+++ b/pkgs/by-name/vd/vdo/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dm-vdo";
     repo = "vdo";
-    tag = version;
+    rev = version;
     hash = "sha256-6oX3ngsBPhE6XsMfliWw5Qzu3UosnsIFIAFRCqckU7U=";
   };
 
diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 1847a707b2ef..6e1e29e8e1d7 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "vectordotdev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ixBB0rMHeeEAGbazRAXiWMZOOf4nFC8iY0qZ4fmARWk=";
   };
 
diff --git a/pkgs/by-name/ve/vegeta/package.nix b/pkgs/by-name/ve/vegeta/package.nix
index 5e22af8a64cd..950ddd96b297 100644
--- a/pkgs/by-name/ve/vegeta/package.nix
+++ b/pkgs/by-name/ve/vegeta/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tsenart";
     repo = "vegeta";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nTtQ/BB5rU+0k4dPRCmukCRNI0iFTjHIJiSTN0cNR+Q=";
   };
 
diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix
index a40a56c60561..f4ddd73c10a7 100644
--- a/pkgs/by-name/ve/velero/package.nix
+++ b/pkgs/by-name/ve/velero/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "velero";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WClNupUW1Nd5Xnx58KYDRLz1/2kNCOR4AoAsUv78yPE=";
   };
 
diff --git a/pkgs/by-name/ve/vendir/package.nix b/pkgs/by-name/ve/vendir/package.nix
index d089147f8ae7..5ee4df9747da 100644
--- a/pkgs/by-name/ve/vendir/package.nix
+++ b/pkgs/by-name/ve/vendir/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "carvel-vendir";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VIP1NkSZMoTZfvl6xAAbs0sL9rBc6FDaZHgOmRViStY=";
   };
 
diff --git a/pkgs/by-name/ve/venta/package.nix b/pkgs/by-name/ve/venta/package.nix
index 2270ff5e36cc..1dfe7ed911e2 100644
--- a/pkgs/by-name/ve/venta/package.nix
+++ b/pkgs/by-name/ve/venta/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "venta";
-    tag = version;
+    rev = version;
     sha256 = "14ckkvyarq1xmf48fh47by5h3jnkmksj2n4y6zvx3aw7pfg2jc51";
   };
 
diff --git a/pkgs/by-name/ve/vep/package.nix b/pkgs/by-name/ve/vep/package.nix
index e6db1edb522a..576b4c9b35fb 100644
--- a/pkgs/by-name/ve/vep/package.nix
+++ b/pkgs/by-name/ve/vep/package.nix
@@ -53,7 +53,7 @@ let
       inherit version;
       owner = "Ensembl";
       repo = "ensembl-xs";
-      tag = version;
+      rev = version;
       sha256 = "1qqnski532f4bz32wxbqd9w1sz40rjh81ipp9p02k3rlaf1gp1fa";
     };
     # PREFIX is important
diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix
index ec803312ee81..77e3185e5818 100644
--- a/pkgs/by-name/ve/verapdf/package.nix
+++ b/pkgs/by-name/ve/verapdf/package.nix
@@ -17,7 +17,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "veraPDF";
     repo = "veraPDF-apps";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2g16PJdbC4OgFzLonfZgE7LRw2dKGjLCb2AYvrr8lxA=";
   };
 
diff --git a/pkgs/by-name/ve/vercel-pkg/package.nix b/pkgs/by-name/ve/vercel-pkg/package.nix
index 0a6de3622d64..ab8f4fbb0498 100644
--- a/pkgs/by-name/ve/vercel-pkg/package.nix
+++ b/pkgs/by-name/ve/vercel-pkg/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vercel";
     repo = "pkg";
-    tag = version;
+    rev = version;
     hash = "sha256-h3rHR3JE9hVcd3oiE7VL2daYXGTQo7NcOHGC6pmE/xs=";
   };
 
diff --git a/pkgs/by-name/ve/verco/package.nix b/pkgs/by-name/ve/verco/package.nix
index 6e7f9f0c2454..79f387a35a34 100644
--- a/pkgs/by-name/ve/verco/package.nix
+++ b/pkgs/by-name/ve/verco/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vamolessa";
     repo = "verco";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-M3Utrt350I67kqzEH130tgBIiI7rY8ODCSxgMohWWWM=";
   };
 
diff --git a/pkgs/by-name/ve/verifpal/package.nix b/pkgs/by-name/ve/verifpal/package.nix
index 7319a510b743..95fa4763a0f9 100644
--- a/pkgs/by-name/ve/verifpal/package.nix
+++ b/pkgs/by-name/ve/verifpal/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "symbolicsoft";
     repo = "verifpal";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kBeQ7U97Ezj85A/FbNnE1dXR7VJzx0EUrDbzwOgKl8E=";
   };
 
diff --git a/pkgs/by-name/ve/verilator/package.nix b/pkgs/by-name/ve/verilator/package.nix
index 96d5c4e78157..fde5e2828a81 100644
--- a/pkgs/by-name/ve/verilator/package.nix
+++ b/pkgs/by-name/ve/verilator/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "verilator";
     repo = "verilator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1o9Qf6avdiRgIYUgBS/S0W2GLSi/HdO9Xgs78oW6VJE=";
   };
 
diff --git a/pkgs/by-name/ve/vermin/package.nix b/pkgs/by-name/ve/vermin/package.nix
index 43cacbf9b8a1..3fe5c63dc1e8 100644
--- a/pkgs/by-name/ve/vermin/package.nix
+++ b/pkgs/by-name/ve/vermin/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "netromdk";
     repo = "vermin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lgxYQ8oNfa0+8BUf3nRv0fcNLP+UATjz733ms3pM6gQ=";
   };
 
diff --git a/pkgs/by-name/ve/versus/package.nix b/pkgs/by-name/ve/versus/package.nix
index 0aeb595b9656..668178b438db 100644
--- a/pkgs/by-name/ve/versus/package.nix
+++ b/pkgs/by-name/ve/versus/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "INFURA";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jX2HRdrLwDjnrUofRzmsSFLMbiPh0a1DPv1tzl+StUg=";
   };
 
diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix
index cf74fae438b1..8c3340b508a9 100644
--- a/pkgs/by-name/ve/veryl/package.nix
+++ b/pkgs/by-name/ve/veryl/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "veryl-lang";
     repo = "veryl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PeRz44agIKDPsgUhjPgm1Pn1oJb7Epyw0oj3xPCkj4k=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/vf/vfkit/package.nix b/pkgs/by-name/vf/vfkit/package.nix
index ef7889370c73..66deaf161197 100644
--- a/pkgs/by-name/vf/vfkit/package.nix
+++ b/pkgs/by-name/vf/vfkit/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "crc-org";
     repo = "vfkit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+ds9GIa3q2ck4D3sjUHz7e9w00XgD6/jq4L8QkBpCJg=";
   };
 
diff --git a/pkgs/by-name/vg/vgrep/package.nix b/pkgs/by-name/vg/vgrep/package.nix
index d55653b910bb..e24a35769773 100644
--- a/pkgs/by-name/vg/vgrep/package.nix
+++ b/pkgs/by-name/vg/vgrep/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vrothberg";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OQjuNRuzFluZLssM+q+WpoRncdJMj6Sl/A+mUZA7UpI=";
   };
 
diff --git a/pkgs/by-name/vh/vhdl-ls/package.nix b/pkgs/by-name/vh/vhdl-ls/package.nix
index 85dd20b87178..6c427cf3ad7c 100644
--- a/pkgs/by-name/vh/vhdl-ls/package.nix
+++ b/pkgs/by-name/vh/vhdl-ls/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "VHDL-LS";
     repo = "rust_hdl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MzlsZoV09QeerpbE/Nmu5tMIvgscu84fk2bYlWn7bjg=";
   };
 
diff --git a/pkgs/by-name/vh/vhs/package.nix b/pkgs/by-name/vh/vhs/package.nix
index 82a33e913618..14729aa532b6 100644
--- a/pkgs/by-name/vh/vhs/package.nix
+++ b/pkgs/by-name/vh/vhs/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ceY4zLd+4EwXpwunKiWnaAB25qutSK1b1SyIriAbAI0=";
   };
 
diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix
index 0c05f023114b..de37893373a3 100644
--- a/pkgs/by-name/vi/viddy/package.nix
+++ b/pkgs/by-name/vi/viddy/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sachaos";
     repo = "viddy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZdDe0ymPkj0ZGiPLo1Y0qMDk2SsUcPsSStay+Tuf4p0=";
   };
 
diff --git a/pkgs/by-name/vi/vidmerger/package.nix b/pkgs/by-name/vi/vidmerger/package.nix
index fe744ffcea15..28f5fdff031a 100644
--- a/pkgs/by-name/vi/vidmerger/package.nix
+++ b/pkgs/by-name/vi/vidmerger/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "TGotwig";
     repo = "vidmerger";
-    tag = version;
+    rev = version;
     hash = "sha256-E3Y1UaYXl6NdCMM7IepqFzWNuHaMGLCN5BvQ/lxjFoc=";
   };
 
diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix
index 87ae34b7fd1b..af64d403dcb6 100644
--- a/pkgs/by-name/vi/vieb/package.nix
+++ b/pkgs/by-name/vi/vieb/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Jelmerro";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-5LbVSwU+G3mu5MWxmnscoqfQw3ZA9xFXNJGYx3L+aUQ=";
   };
 
diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix
index e1e5b46fcb27..1096639899de 100644
--- a/pkgs/by-name/vi/vikunja/package.nix
+++ b/pkgs/by-name/vi/vikunja/package.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "go-vikunja";
     repo = "vikunja";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yUUZ6gPI2Bte36HzfUE6z8B/I1NlwWDSJA2pwkuzd34=";
   };
 
diff --git a/pkgs/by-name/vi/vim-startuptime/package.nix b/pkgs/by-name/vi/vim-startuptime/package.nix
index 29151237f55d..e3b58b92316d 100644
--- a/pkgs/by-name/vi/vim-startuptime/package.nix
+++ b/pkgs/by-name/vi/vim-startuptime/package.nix
@@ -18,7 +18,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "rhysd";
     repo = "vim-startuptime";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-d6AXTWTUawkBCXCvMs3C937qoRUZmy0qCFdSLcWh0BE=";
   };
 
diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix
index b62924732b30..b57e51867316 100644
--- a/pkgs/by-name/vi/vimcats/package.nix
+++ b/pkgs/by-name/vi/vimcats/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mrcjkb";
     repo = "vimcats";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QV/eIy6yd6Lnmo8XV+E37/oCZCC3jlPu31emH0MgiO4=";
   };
 
diff --git a/pkgs/by-name/vi/vimer/package.nix b/pkgs/by-name/vi/vimer/package.nix
index cb375bd863d4..e131eb0e044f 100644
--- a/pkgs/by-name/vi/vimer/package.nix
+++ b/pkgs/by-name/vi/vimer/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "susam";
     repo = "vimer";
-    tag = version;
+    rev = version;
     sha256 = "01qhr3i7wasbaxvms39c81infpry2vk0nzh7r5m5b9p713p0phsi";
   };
 
diff --git a/pkgs/by-name/vi/vimiv-qt/package.nix b/pkgs/by-name/vi/vimiv-qt/package.nix
index 30b9eac6cb9c..f11716993ce5 100644
--- a/pkgs/by-name/vi/vimiv-qt/package.nix
+++ b/pkgs/by-name/vi/vimiv-qt/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "karlch";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-28sk5qDVmrgXYX2wm5G8zv564vG6GwxNp+gjrFHCRfU=";
   };
 
diff --git a/pkgs/by-name/vi/vimix-gtk-themes/package.nix b/pkgs/by-name/vi/vimix-gtk-themes/package.nix
index 021918f7f3b1..30da5f31cb41 100644
--- a/pkgs/by-name/vi/vimix-gtk-themes/package.nix
+++ b/pkgs/by-name/vi/vimix-gtk-themes/package.nix
@@ -50,7 +50,7 @@ lib.checkListOfEnum "${pname}: theme variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      tag = version;
+      rev = version;
       sha256 = "RbAdoix+UWKiLB+04YiPa0UwzO1fFLy56IG1MipmE+E=";
     };
 
diff --git a/pkgs/by-name/vi/vimix-icon-theme/package.nix b/pkgs/by-name/vi/vimix-icon-theme/package.nix
index aa7f312379ed..eefc7aed915a 100644
--- a/pkgs/by-name/vi/vimix-icon-theme/package.nix
+++ b/pkgs/by-name/vi/vimix-icon-theme/package.nix
@@ -34,7 +34,7 @@ lib.checkListOfEnum "${pname}: color variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      tag = version;
+      rev = version;
       hash = "sha256-HNwEqp6G9nZDIJo9b6FD4d5NSXUx523enENM0NVwviA=";
     };
 
diff --git a/pkgs/by-name/vi/vimpc/package.nix b/pkgs/by-name/vi/vimpc/package.nix
index d87b97362d4d..3a546b764f97 100644
--- a/pkgs/by-name/vi/vimpc/package.nix
+++ b/pkgs/by-name/vi/vimpc/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "boysetsfrog";
     repo = "vimpc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0lswzkap2nm7v5h7ppb6a64cb35rajysd09nb204rxgrkij4m6nx";
   };
 
diff --git a/pkgs/by-name/vi/virter/package.nix b/pkgs/by-name/vi/virter/package.nix
index 3d12bb93819b..36875efeb9b7 100644
--- a/pkgs/by-name/vi/virter/package.nix
+++ b/pkgs/by-name/vi/virter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "LINBIT";
     repo = "virter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zEdG1n+tsDzyMTHBCikZaMalEhqdQiQvcsbElrbd1H4=";
   };
 
diff --git a/pkgs/by-name/vi/virtiofsd/package.nix b/pkgs/by-name/vi/virtiofsd/package.nix
index be2dd77f765b..6bd26991cab7 100644
--- a/pkgs/by-name/vi/virtiofsd/package.nix
+++ b/pkgs/by-name/vi/virtiofsd/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "virtio-fs";
     repo = "virtiofsd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QT0GfE0AOrNuL7ppiKNs6IKbCtdkfAnAT3PCGujMIUQ=";
   };
 
diff --git a/pkgs/by-name/vi/vis/package.nix b/pkgs/by-name/vi/vis/package.nix
index c67505d8507d..edf173026d90 100644
--- a/pkgs/by-name/vi/vis/package.nix
+++ b/pkgs/by-name/vi/vis/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   version = "0.9";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SYM3zlzhp3NdyOjtXc+pOiWY4/WA/Ax+qAWe18ggq3g=";
     repo = "vis";
     owner = "martanne";
diff --git a/pkgs/by-name/vi/vitess/package.nix b/pkgs/by-name/vi/vitess/package.nix
index cb904b625261..b7366739f6f7 100644
--- a/pkgs/by-name/vi/vitess/package.nix
+++ b/pkgs/by-name/vi/vitess/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vitessio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZSxshQF84DjMQsurYhcMObPzzfT63oj8c5Pt9f9N+5Q=";
   };
 
diff --git a/pkgs/by-name/vi/vitetris/package.nix b/pkgs/by-name/vi/vitetris/package.nix
index 1fb31a574b54..ce96940699e0 100644
--- a/pkgs/by-name/vi/vitetris/package.nix
+++ b/pkgs/by-name/vi/vitetris/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vicgeralds";
     repo = "vitetris";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Rbfa2hD67RGmInfWwYD4SthL8lm5bGSBi3oudV5hAao=";
   };
 
diff --git a/pkgs/by-name/vi/viu/package.nix b/pkgs/by-name/vi/viu/package.nix
index 0b30fb141ceb..91ceb2116473 100644
--- a/pkgs/by-name/vi/viu/package.nix
+++ b/pkgs/by-name/vi/viu/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "atanunq";
     repo = "viu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sx8BH01vTFsAEnMKTcVZTDMHiVi230BVVGRexoBNxeo=";
   };
 
diff --git a/pkgs/by-name/vi/vivictpp/package.nix b/pkgs/by-name/vi/vivictpp/package.nix
index 49cead31712c..97bba1a68e7a 100644
--- a/pkgs/by-name/vi/vivictpp/package.nix
+++ b/pkgs/by-name/vi/vivictpp/package.nix
@@ -25,7 +25,7 @@ let
     src = fetchFromGitHub {
       owner = "vivictorg";
       repo = "vivictpp";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-ScuCOmcK714YXEHncizwj6EWdiNIJA1xRMn5gfmg4K4=";
     };
 
diff --git a/pkgs/by-name/vi/vivid/package.nix b/pkgs/by-name/vi/vivid/package.nix
index d974e21d2eb1..2dfd013f1f0c 100644
--- a/pkgs/by-name/vi/vivid/package.nix
+++ b/pkgs/by-name/vi/vivid/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "vivid";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mxBBfezaMM2dfiXK/s+Htr+i5GJP1xVSXzkmYxEuwNs=";
   };
 
diff --git a/pkgs/by-name/vk/vk-bootstrap/package.nix b/pkgs/by-name/vk/vk-bootstrap/package.nix
index 5085aea3101a..15ba18a3f10c 100644
--- a/pkgs/by-name/vk/vk-bootstrap/package.nix
+++ b/pkgs/by-name/vk/vk-bootstrap/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "charles-lunarg";
     repo = "vk-bootstrap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-X3ANqfplrCF1R494+H5/plcwMH7rbW6zpLA4MZrYaoE=";
   };
 
diff --git a/pkgs/by-name/vk/vkbasalt-cli/package.nix b/pkgs/by-name/vk/vkbasalt-cli/package.nix
index 4c3fb4a9d94f..3c66ba9c0781 100644
--- a/pkgs/by-name/vk/vkbasalt-cli/package.nix
+++ b/pkgs/by-name/vk/vkbasalt-cli/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "TheEvilSkeleton";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4MFqndnvwAsqyer9kMNuCZFP/Xdl7W//AyCe7n83328=";
   };
 
diff --git a/pkgs/by-name/vk/vkdevicechooser/package.nix b/pkgs/by-name/vk/vkdevicechooser/package.nix
index 8bfa9031dbec..2af58ec88424 100644
--- a/pkgs/by-name/vk/vkdevicechooser/package.nix
+++ b/pkgs/by-name/vk/vkdevicechooser/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jiriks74";
     repo = "vkdevicechooser";
-    tag = version;
+    rev = version;
     hash = "sha256-j4hefarOQ3q0sKkB2g/dO2/4bSYzt4oxmCna0nMAjFk=";
   };
 
diff --git a/pkgs/by-name/vk/vkdisplayinfo/package.nix b/pkgs/by-name/vk/vkdisplayinfo/package.nix
index ced39952198a..85047758ca29 100644
--- a/pkgs/by-name/vk/vkdisplayinfo/package.nix
+++ b/pkgs/by-name/vk/vkdisplayinfo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ChristophHaag";
     repo = "vkdisplayinfo";
-    tag = version;
+    rev = version;
     hash = "sha256-n6U7T5aOYTpgWE2WGPBPHtQKzitf9PxAoXJNWyz4rYw=";
   };
 
diff --git a/pkgs/by-name/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix
index 041ec6a26179..62c1101460f9 100644
--- a/pkgs/by-name/vk/vkmark/package.nix
+++ b/pkgs/by-name/vk/vkmark/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vkmark";
     repo = "vkmark";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-Rjpjqe7htwlhDdwELm74MvSzHzXLhRD/P8IES7nz/VY=";
   };
 
diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix
index d3b6367cfdc6..2b3cdbaf80a0 100644
--- a/pkgs/by-name/vl/vlang/package.nix
+++ b/pkgs/by-name/vl/vlang/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "vlang";
     repo = "v";
-    tag = version;
+    rev = version;
     hash = "sha256-V4f14TcuKW8unzlo6i/tE6MzSb3HAll478OU2LxiTPQ=";
   };
 
diff --git a/pkgs/by-name/vm/vmtouch/package.nix b/pkgs/by-name/vm/vmtouch/package.nix
index 9d2daccfae4d..a49750e59ffd 100644
--- a/pkgs/by-name/vm/vmtouch/package.nix
+++ b/pkgs/by-name/vm/vmtouch/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hoytech";
     repo = "vmtouch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "08da6apzfkfjwasn4dxrlfxqfx7arl28apdzac5nvm0fhvws0dxk";
   };
 
diff --git a/pkgs/by-name/vn/vnstat/package.nix b/pkgs/by-name/vn/vnstat/package.nix
index 181530446924..af2d11682c0c 100644
--- a/pkgs/by-name/vn/vnstat/package.nix
+++ b/pkgs/by-name/vn/vnstat/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vergoh";
     repo = "vnstat";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Xd3s4Wrtfwis0dxRijeWhfloHcXPUNAj0P91uWi1C3M=";
   };
 
diff --git a/pkgs/by-name/vo/vo-amrwbenc/package.nix b/pkgs/by-name/vo/vo-amrwbenc/package.nix
index a61d875eab4f..4fcf5c2b1fe3 100644
--- a/pkgs/by-name/vo/vo-amrwbenc/package.nix
+++ b/pkgs/by-name/vo/vo-amrwbenc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mstorsjo";
     repo = "vo-amrwbenc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oHhoJAI47VqBGk9cO3G5oqnHpWxA2jnJs103MwcYj+w=";
   };
 
diff --git a/pkgs/by-name/vo/vocal/package.nix b/pkgs/by-name/vo/vocal/package.nix
index 82c01fef585f..dd43e0263909 100644
--- a/pkgs/by-name/vo/vocal/package.nix
+++ b/pkgs/by-name/vo/vocal/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "needle-and-thread";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1c4n89rdl9r13kmmh2qymmy9sa6shjwai7df48k2kfn0pnzq5mad";
   };
 
diff --git a/pkgs/by-name/vo/volctl/package.nix b/pkgs/by-name/vo/volctl/package.nix
index 633088b4d52b..9be2580032c4 100644
--- a/pkgs/by-name/vo/volctl/package.nix
+++ b/pkgs/by-name/vo/volctl/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "buzz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jzS97KV17wKeBI6deKE4rEj5lvqC38fq1JGundHn2So=";
   };
 
diff --git a/pkgs/by-name/vo/volumeicon/package.nix b/pkgs/by-name/vo/volumeicon/package.nix
index 033d29a4de0a..c8925b4ce9a4 100644
--- a/pkgs/by-name/vo/volumeicon/package.nix
+++ b/pkgs/by-name/vo/volumeicon/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Maato";
     repo = "volumeicon";
-    tag = version;
+    rev = version;
     hash = "sha256-zYKC7rOoLf08rV4B43TrGNBcXfSBFxWZCe9bQD9JzaA";
   };
 
diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix
index df02754e1ab9..d69af5c172a9 100644
--- a/pkgs/by-name/vp/vpp/package.nix
+++ b/pkgs/by-name/vp/vpp/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FDio";
     repo = "vpp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GcmblIAu/BDbqZRycmnBsHkvzJe07qB2lSfDnO7ZYtg=";
   };
 
diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix
index bd84a3d8e9ba..63e42bb73b67 100644
--- a/pkgs/by-name/vs/vscode-js-debug/package.nix
+++ b/pkgs/by-name/vs/vscode-js-debug/package.nix
@@ -22,7 +22,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vscode-js-debug";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MZY6gthj3q2ptAvV28hVvIYgBsW4dpsznasZmK1wVOU=";
   };
 
diff --git a/pkgs/by-name/vs/vscode-langservers-extracted/package.nix b/pkgs/by-name/vs/vscode-langservers-extracted/package.nix
index 484961f5d972..228cf96966a4 100644
--- a/pkgs/by-name/vs/vscode-langservers-extracted/package.nix
+++ b/pkgs/by-name/vs/vscode-langservers-extracted/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
     (fetchFromGitHub {
       owner = "hrsh7th";
       repo = "vscode-langservers-extracted";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-3m9+HZY24xdlLcFKY/5DfvftqprwLJk0vve2ZO1aEWk=";
     })
     vscodium.src
diff --git a/pkgs/by-name/vs/vscode-runner/package.nix b/pkgs/by-name/vs/vscode-runner/package.nix
index e97308465186..24a3a23826f2 100644
--- a/pkgs/by-name/vs/vscode-runner/package.nix
+++ b/pkgs/by-name/vs/vscode-runner/package.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "Merrit";
     repo = "vscode-runner";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mDhwydAFlDcpbpmh+I2zjjuC+/5hmygFkpHSZGEpuLs=";
   };
 in
diff --git a/pkgs/by-name/vs/vsh/package.nix b/pkgs/by-name/vs/vsh/package.nix
index 716b421a2743..a5fce89e1c4c 100644
--- a/pkgs/by-name/vs/vsh/package.nix
+++ b/pkgs/by-name/vs/vsh/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fishi0x01";
     repo = "vsh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "083rqca4gx9lmzkc9rl453zqmspbpn0h2vajkrjjcwk96km7064f";
   };
 
diff --git a/pkgs/by-name/vt/vtable-dumper/package.nix b/pkgs/by-name/vt/vtable-dumper/package.nix
index 31bb78515adb..ba63b8d51be2 100644
--- a/pkgs/by-name/vt/vtable-dumper/package.nix
+++ b/pkgs/by-name/vt/vtable-dumper/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lvc";
     repo = "vtable-dumper";
-    tag = version;
+    rev = version;
     sha256 = "0sl7lnjr2l4c2f7qaazvpwpzsp4gckkvccfam88wcq9f7j9xxbyp";
   };
 
diff --git a/pkgs/by-name/vt/vtracer/package.nix b/pkgs/by-name/vt/vtracer/package.nix
index a5a7662dcfb7..254b5b851104 100644
--- a/pkgs/by-name/vt/vtracer/package.nix
+++ b/pkgs/by-name/vt/vtracer/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "visioncortex";
     repo = "vtracer";
-    tag = version;
+    rev = version;
     hash = "sha256-n5AUc4C0eUfeVe3zTo0ZC/KWMS1/uW/+3Uoz8Q2qQI0=";
   };
 
diff --git a/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix b/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
index a9f58c410327..3b36912bc5f7 100644
--- a/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
+++ b/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martinus";
     repo = "robin-hood-hashing";
-    tag = version; # pin
+    rev = version; # pin
     sha256 = "sha256-J4u9Q6cXF0SLHbomP42AAn5LSKBYeVgTooOhqxOIpuM=";
   };
 
diff --git a/pkgs/by-name/vu/vultr-cli/package.nix b/pkgs/by-name/vu/vultr-cli/package.nix
index 22ca97cc56be..a69bce393302 100644
--- a/pkgs/by-name/vu/vultr-cli/package.nix
+++ b/pkgs/by-name/vu/vultr-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vultr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uk0tG66u0gQgEzpiFAeMC0qPrd+Pk6nbrXuuyOtVLe4=";
   };
 
diff --git a/pkgs/by-name/vu/vultr/package.nix b/pkgs/by-name/vu/vultr/package.nix
index 19163d850d9e..705382d7dea9 100644
--- a/pkgs/by-name/vu/vultr/package.nix
+++ b/pkgs/by-name/vu/vultr/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "JamesClonk";
     repo = "vultr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kyB6gUbc32NsSDqDy1zVT4HXn0pWxHdBOEBOSaI0Xro=";
   };
 
diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix
index 7265e538b3ad..94d1fcb6d377 100644
--- a/pkgs/by-name/vv/vvvvvv/package.nix
+++ b/pkgs/by-name/vv/vvvvvv/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TerryCavanagh";
     repo = "VVVVVV";
-    tag = version;
+    rev = version;
     hash = "sha256-SYXuA7RJ0x4d1Lyvmk/R2nofEt5k7OJ91X6w3sGQOhg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 55b3b66b69d5..3722c6a5ceba 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tats";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-upb5lWqhC1jRegzTncIz5e21v4Pw912FyVn217HucFs=";
   };
 
diff --git a/pkgs/by-name/w_/w_scan2/package.nix b/pkgs/by-name/w_/w_scan2/package.nix
index bbf63a8197b4..0554e20d92b3 100644
--- a/pkgs/by-name/w_/w_scan2/package.nix
+++ b/pkgs/by-name/w_/w_scan2/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stefantalpalaru";
     repo = "w_scan2";
-    tag = version;
+    rev = version;
     hash = "sha256-8yFK2BnlrRBnQhsuy3Dh+oBH8Ainr6mLdRTqOSqY2FA=";
   };
 
diff --git a/pkgs/by-name/wa/wabt/package.nix b/pkgs/by-name/wa/wabt/package.nix
index 3474ffb569d4..d2d16f1f7de8 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";
-    tag = version;
+    rev = version;
     hash = "sha256-Ejr+FxaYRDI01apHhKTs11iwcv72a8ZxyPmVetEvadU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wa/wad/package.nix b/pkgs/by-name/wa/wad/package.nix
index 1baa09f4e1ef..c1e21ab8261a 100644
--- a/pkgs/by-name/wa/wad/package.nix
+++ b/pkgs/by-name/wa/wad/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CERN-CERT";
     repo = "WAD";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/mlmOzFkyKpmK/uk4813Wk0cf/+ynX3Qxafnd1mGR5k=";
   };
 
diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix
index 1d583445e770..7b531ed4fd84 100644
--- a/pkgs/by-name/wa/wait4x/package.nix
+++ b/pkgs/by-name/wa/wait4x/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "wait4x";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UVs8tCOgPU/IwM3Z3/ehFnAbHTSOHGAO9VpcB/NItGM=";
   };
 
diff --git a/pkgs/by-name/wa/wakeonlan/package.nix b/pkgs/by-name/wa/wakeonlan/package.nix
index c8cfcc7c0ae1..28efca282e44 100644
--- a/pkgs/by-name/wa/wakeonlan/package.nix
+++ b/pkgs/by-name/wa/wakeonlan/package.nix
@@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "jpoliv";
     repo = "wakeonlan";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zCOpp5iNrWwh2knBGWhiEyG9IPAnFRwH5jJLEVLBISM=";
   };
 
diff --git a/pkgs/by-name/wa/wal-g/package.nix b/pkgs/by-name/wa/wal-g/package.nix
index 107a8ecb437b..94798ae0ba75 100644
--- a/pkgs/by-name/wa/wal-g/package.nix
+++ b/pkgs/by-name/wa/wal-g/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wal-g";
     repo = "wal-g";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wVr0L2ZXMuEo6tc2ajNzPinVQ8ZVzNOSoaHZ4oFsA+U=";
   };
 
diff --git a/pkgs/by-name/wa/wal-listener/package.nix b/pkgs/by-name/wa/wal-listener/package.nix
index c8043cd20d61..8768d6eccab2 100644
--- a/pkgs/by-name/wa/wal-listener/package.nix
+++ b/pkgs/by-name/wa/wal-listener/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ihippik";
     repo = "wal-listener";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OqjCFIdU4wCiPGIMrlp+nGVr0XTNHTE8zB8/toZtM44=";
   };
 
diff --git a/pkgs/by-name/wa/walk/package.nix b/pkgs/by-name/wa/walk/package.nix
index 7622dcc94c79..60a429de0fe1 100644
--- a/pkgs/by-name/wa/walk/package.nix
+++ b/pkgs/by-name/wa/walk/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "antonmedv";
     repo = "walk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yvycd+Ob/C2MRR7k7Ip9xySnsXUg/znMr6+ocIN4WKU=";
   };
 
diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix
index aeb865c32ada..c8f596c4e730 100644
--- a/pkgs/by-name/wa/walker/package.nix
+++ b/pkgs/by-name/wa/walker/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "abenz1267";
     repo = "walker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XOOYalJ+6V/O/fhC5gEDk2m1yZ2e5DofRRIi8ETHgoQ=";
   };
 
diff --git a/pkgs/by-name/wa/wallust/package.nix b/pkgs/by-name/wa/wallust/package.nix
index 462bc7fd9502..422ea2141da4 100644
--- a/pkgs/by-name/wa/wallust/package.nix
+++ b/pkgs/by-name/wa/wallust/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     domain = "codeberg.org";
     owner = "explosion-mental";
     repo = "wallust";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-n3FXPlm8nructXh+Wc7BgJvxas6OFHEPbTe2QWjEpsg=";
   };
 
diff --git a/pkgs/by-name/wa/wallutils/package.nix b/pkgs/by-name/wa/wallutils/package.nix
index ba68ab31843a..5bfe3bee7fd7 100644
--- a/pkgs/by-name/wa/wallutils/package.nix
+++ b/pkgs/by-name/wa/wallutils/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "wallutils";
-    tag = version;
+    rev = version;
     hash = "sha256-kayzaNOV2xTjbMeGUJ1jMLGxcVZzYkMLr6qWlAupPKM=";
   };
 
diff --git a/pkgs/by-name/wa/wander/package.nix b/pkgs/by-name/wa/wander/package.nix
index 93cec295f6d8..db55f3ce2c27 100644
--- a/pkgs/by-name/wa/wander/package.nix
+++ b/pkgs/by-name/wa/wander/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "robinovitch61";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1+bKdIAWdg/+5FBDbtvjDV0xpZ5jot3y6F+KuLO9WVk=";
   };
 
diff --git a/pkgs/by-name/wa/wannier90/package.nix b/pkgs/by-name/wa/wannier90/package.nix
index 284508e3716b..631fcd276de4 100644
--- a/pkgs/by-name/wa/wannier90/package.nix
+++ b/pkgs/by-name/wa/wannier90/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wannier-developers";
     repo = "wannier90";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+Mq7lM6WuwAnK/2FlDz9gNRIg2sRazQRezb3BfD0veY=";
   };
 
diff --git a/pkgs/by-name/wa/waon/package.nix b/pkgs/by-name/wa/waon/package.nix
index 6fe8b89735ee..96a67bb1302a 100644
--- a/pkgs/by-name/wa/waon/package.nix
+++ b/pkgs/by-name/wa/waon/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kichiki";
     repo = "waon";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xmq8d2rj58xbp4rnyav95y1vnz3r9s9db7xxfa2rd0ilq0ps4y7";
   };
 
diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix
index a0b20ed06075..d70166275e6b 100644
--- a/pkgs/by-name/wa/wapm/package.nix
+++ b/pkgs/by-name/wa/wapm/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wasmerio";
     repo = "wapm-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T7YEe8xg5iwI/npisW0m+6FLi+eaAQVgYNe6TvMlhAs=";
   };
 
diff --git a/pkgs/by-name/wa/wargus/package.nix b/pkgs/by-name/wa/wargus/package.nix
index 335399cf4014..7618dff32643 100644
--- a/pkgs/by-name/wa/wargus/package.nix
+++ b/pkgs/by-name/wa/wargus/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wargus";
     repo = "wargus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yJeMFxCD0ikwVPQApf+IBuMQ6eOjn1fVKNmqh6r760c=";
   };
 
diff --git a/pkgs/by-name/wa/wargus/stratagus.nix b/pkgs/by-name/wa/wargus/stratagus.nix
index df0b82176937..69baa283fa04 100644
--- a/pkgs/by-name/wa/wargus/stratagus.nix
+++ b/pkgs/by-name/wa/wargus/stratagus.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wargus";
     repo = "stratagus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-q8AvIWr/bOzI0wV0D2emxIXYEKDYmFxbtwr2BS+xYfA=";
   };
 
diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index 13e6213c8c23..2b34aed01ea9 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bepass-org";
     repo = "warp-plus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gDn4zicSD+Hz3GsL6pzGpUaiHcw+8KHDaOJGCML6LOA=";
   };
 
diff --git a/pkgs/by-name/wa/warpd/package.nix b/pkgs/by-name/wa/warpd/package.nix
index e548b153521a..3c1fb984c2d4 100644
--- a/pkgs/by-name/wa/warpd/package.nix
+++ b/pkgs/by-name/wa/warpd/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rvaiya";
     repo = "warpd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5B3Ec+R1vF2iI0ennYcsRlnFXJkSns0jVbyAWJA4lTU=";
     leaveDotGit = true;
   };
diff --git a/pkgs/by-name/wa/warpinator/package.nix b/pkgs/by-name/wa/warpinator/package.nix
index 0350039cb33c..790470389940 100644
--- a/pkgs/by-name/wa/warpinator/package.nix
+++ b/pkgs/by-name/wa/warpinator/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-aqqKCYlCAL/6srbyYRoVQlIFKpTmwYZsdfLibRyAUXg=";
   };
 
diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index e6c3b9d2dbe7..f76ee2bb3183 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lVrZCjLhSCyD3aEr6IyRZejqwdiT89w0/ppmQE8Thto=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wa/wasm3/package.nix b/pkgs/by-name/wa/wasm3/package.nix
index 12e2caf582d1..0f820505e78a 100644
--- a/pkgs/by-name/wa/wasm3/package.nix
+++ b/pkgs/by-name/wa/wasm3/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wasm3";
     repo = "wasm3";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "07zzmk776j8ydyxhrnnjiscbhhmz182a62r6aix6kfk5kq2cwia2";
   };
 
diff --git a/pkgs/by-name/wa/wasmer-pack/package.nix b/pkgs/by-name/wa/wasmer-pack/package.nix
index 0e79aabdc884..0536ed30e8f2 100644
--- a/pkgs/by-name/wa/wasmer-pack/package.nix
+++ b/pkgs/by-name/wa/wasmer-pack/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wasmerio";
     repo = "wasmer-pack";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+wqgYkdkuhPFkJBdQLnUKAGmUfGBU9mBfMRNBFmiT4E=";
   };
 
diff --git a/pkgs/by-name/wa/wasmserve/package.nix b/pkgs/by-name/wa/wasmserve/package.nix
index 2eace8f2beba..fbdbd76a8fd6 100644
--- a/pkgs/by-name/wa/wasmserve/package.nix
+++ b/pkgs/by-name/wa/wasmserve/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hajimehoshi";
     repo = "wasmserve";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sj2PPCuvh2RkQq5rAPQZdr96a8FG7RL5RCzWBDt2TeI=";
   };
 
diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix
index a4da69f0bf97..3b8e300d2696 100644
--- a/pkgs/by-name/wa/wastebin/package.nix
+++ b/pkgs/by-name/wa/wastebin/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "matze";
     repo = "wastebin";
-    tag = version;
+    rev = version;
     hash = "sha256-DuIT4jIxk+L7c+rWIzrNjNEs2Lv5mYqLeCAaBMsBCBg=";
   };
 
diff --git a/pkgs/by-name/wa/wasynth/package.nix b/pkgs/by-name/wa/wasynth/package.nix
index 34afb33c7cab..7f3f132cceb4 100644
--- a/pkgs/by-name/wa/wasynth/package.nix
+++ b/pkgs/by-name/wa/wasynth/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Rerumu";
     repo = "Wasynth";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hbY+epUtYSQrvnAbCELsVcqd3UoXGn24FkzWfrM0K14=";
   };
 
diff --git a/pkgs/by-name/wa/watchdogd/package.nix b/pkgs/by-name/wa/watchdogd/package.nix
index 3de9c0514e1a..a725a78f7278 100644
--- a/pkgs/by-name/wa/watchdogd/package.nix
+++ b/pkgs/by-name/wa/watchdogd/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "watchdogd";
-    tag = version;
+    rev = version;
     hash = "sha256-JNJj0CJGJXuIRpob2RXYqDRrU4Cn20PRxOjQ6TFsVYQ=";
   };
 
diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix
index cc6a35deca58..4942c18cfd96 100644
--- a/pkgs/by-name/wa/watchlog/package.nix
+++ b/pkgs/by-name/wa/watchlog/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "kevincox";
     repo = "watchlog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RQggLV4ROV9j5FxiJ2pRh/jlTFhgKUiBO/Gh/jLJ3tg=";
   };
 
diff --git a/pkgs/by-name/wa/watershot/package.nix b/pkgs/by-name/wa/watershot/package.nix
index 0a12a4b40ab0..51854c095e6e 100644
--- a/pkgs/by-name/wa/watershot/package.nix
+++ b/pkgs/by-name/wa/watershot/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Kirottu";
     repo = "watershot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-l9CPSB8TCw901ugl5FLVZDkp2rLha0yXMewK7LxXIiE=";
   };
 
diff --git a/pkgs/by-name/wa/watson/package.nix b/pkgs/by-name/wa/watson/package.nix
index 4d961ac0e14f..38ee0e27b87c 100644
--- a/pkgs/by-name/wa/watson/package.nix
+++ b/pkgs/by-name/wa/watson/package.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "Watson";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/AASYeMkt18KPJljAjNPRYOpg/T5xuM10LJq4LrFD0g=";
   };
 
diff --git a/pkgs/by-name/wa/wavemon/package.nix b/pkgs/by-name/wa/wavemon/package.nix
index ebb94de09353..d5da2ca88f7f 100644
--- a/pkgs/by-name/wa/wavemon/package.nix
+++ b/pkgs/by-name/wa/wavemon/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uoaerg";
     repo = "wavemon";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OnELXlnzXamQflCAWuc4fxwvqHZtl+nrlTpkKK4IGKw=";
   };
 
diff --git a/pkgs/by-name/wa/wavpack/package.nix b/pkgs/by-name/wa/wavpack/package.nix
index 78023bd01e0b..3dbe41e1d949 100644
--- a/pkgs/by-name/wa/wavpack/package.nix
+++ b/pkgs/by-name/wa/wavpack/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dbry";
     repo = "WavPack";
-    tag = version;
+    rev = version;
     hash = "sha256-V9jRIuDpZYIBohJRouGr2TI32BZMXSNVfavqPl56YO0=";
   };
 
diff --git a/pkgs/by-name/wa/way-displays/package.nix b/pkgs/by-name/wa/way-displays/package.nix
index c76962077fff..471ed140dcb5 100644
--- a/pkgs/by-name/wa/way-displays/package.nix
+++ b/pkgs/by-name/wa/way-displays/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alex-courtis";
     repo = "way-displays";
-    tag = version;
+    rev = version;
     sha256 = "sha256-auZhA29l3eBz5OALLP5MDqoT8DxLLyOpjMAbNf4pYwg=";
   };
 
diff --git a/pkgs/by-name/wa/wayback-machine-archiver/package.nix b/pkgs/by-name/wa/wayback-machine-archiver/package.nix
index 98df6ae39ab5..cf7e7da82f90 100644
--- a/pkgs/by-name/wa/wayback-machine-archiver/package.nix
+++ b/pkgs/by-name/wa/wayback-machine-archiver/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "agude";
     repo = "wayback-machine-archiver";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0dnnqx507gpj8wsx6f2ivfmha969ydayiqsvxh23p9qcixw9257x";
   };
 
diff --git a/pkgs/by-name/wa/wayback/package.nix b/pkgs/by-name/wa/wayback/package.nix
index d0a7eb1dddb3..3750a15b05b2 100644
--- a/pkgs/by-name/wa/wayback/package.nix
+++ b/pkgs/by-name/wa/wayback/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wabarc";
     repo = "wayback";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GnirEgJHgZVzxkFFVDU9795kgvMTitnH+xWd7ooNf7Y=";
   };
 
diff --git a/pkgs/by-name/wa/waybox/package.nix b/pkgs/by-name/wa/waybox/package.nix
index a4bbf0bed294..d31d642a33ea 100644
--- a/pkgs/by-name/wa/waybox/package.nix
+++ b/pkgs/by-name/wa/waybox/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "wizbright";
     repo = "waybox";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-hAXS9laDfigWR2pfNmdPiOeez3NpTIuKHnpeQyYa9IQ=";
   };
 
diff --git a/pkgs/by-name/wa/wayfarer/package.nix b/pkgs/by-name/wa/wayfarer/package.nix
index 18cc6ce11841..d9d03e709e6d 100644
--- a/pkgs/by-name/wa/wayfarer/package.nix
+++ b/pkgs/by-name/wa/wayfarer/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "stronnag";
     repo = "wayfarer";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Vuiy2SjpK2T1ekbwa/KyIFa1V4BJsnJRIj4b+Yx0VEw=";
   };
 
diff --git a/pkgs/by-name/wa/wayland-logout/package.nix b/pkgs/by-name/wa/wayland-logout/package.nix
index 15f61a62ceaf..cf2aa12973db 100644
--- a/pkgs/by-name/wa/wayland-logout/package.nix
+++ b/pkgs/by-name/wa/wayland-logout/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "soreau";
     repo = "wayland-logout";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VSAw6go4v937HWazXfMz8OdHgOnUtrlDXkslsV4eDIg=";
   };
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix
index 31c0d231d74d..da3dc53ed1ae 100644
--- a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix
+++ b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rafaelrc7";
     repo = "wayland-pipewire-idle-inhibit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8oVTexYGQWyaAVJedrp4kIQ7VjBR47l65eByZr7oghg=";
   };
 
diff --git a/pkgs/by-name/wa/waylyrics/package.nix b/pkgs/by-name/wa/waylyrics/package.nix
index 0b256ec86697..5cb339592e66 100644
--- a/pkgs/by-name/wa/waylyrics/package.nix
+++ b/pkgs/by-name/wa/waylyrics/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "waylyrics";
     repo = "waylyrics";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NDdZH33tkY+TgDLkT7r+M9uHCeE9/NRQgVZhJ7EuxEc=";
   };
 
diff --git a/pkgs/by-name/wa/waynergy/package.nix b/pkgs/by-name/wa/waynergy/package.nix
index 792a42c93b1f..bbb3cf9bc11d 100644
--- a/pkgs/by-name/wa/waynergy/package.nix
+++ b/pkgs/by-name/wa/waynergy/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "r-c-f";
     repo = "waynergy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cwpW6O+KJNDvSrHeSM1Ci7S0kNw6a8KCdGAIhowPEIw=";
   };
 
diff --git a/pkgs/by-name/wa/wayshot/package.nix b/pkgs/by-name/wa/wayshot/package.nix
index ab751b7e7244..e5dfd7921806 100644
--- a/pkgs/by-name/wa/wayshot/package.nix
+++ b/pkgs/by-name/wa/wayshot/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "waycrate";
     repo = "wayshot";
-    tag = version;
+    rev = version;
     hash = "sha256-nUpIN4WTePtFZTmKAjv0tgj4VTdZeXjoQX6am9+M3ig=";
   };
 
diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix
index 87651a5ef863..746cf31bacbc 100644
--- a/pkgs/by-name/wa/wayvnc/package.nix
+++ b/pkgs/by-name/wa/wayvnc/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "any1";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LINzkC18gitj1a8Giqlt/6LyydOdV+8YXRJmuxT/Nq8=";
   };
 
diff --git a/pkgs/by-name/wa/wazero/package.nix b/pkgs/by-name/wa/wazero/package.nix
index b1dcbeb90b76..e2ebdf957d1e 100644
--- a/pkgs/by-name/wa/wazero/package.nix
+++ b/pkgs/by-name/wa/wazero/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tetratelabs";
     repo = "wazero";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yxnHLc0PFxh8NRBgK2hvhKaxRM1w3IZ9TnfJM0+uadg=";
   };
 
diff --git a/pkgs/by-name/wb/wb32-dfu-updater/package.nix b/pkgs/by-name/wb/wb32-dfu-updater/package.nix
index 68c611154ecb..91c9f24b9dbb 100644
--- a/pkgs/by-name/wb/wb32-dfu-updater/package.nix
+++ b/pkgs/by-name/wb/wb32-dfu-updater/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "WestberryTech";
     repo = "wb32-dfu-updater";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-DKsDVO00JFhR9hIZksFVJLRwC6PF9LCRpf++QywFO2w=";
   };
 
diff --git a/pkgs/by-name/wb/wbg/package.nix b/pkgs/by-name/wb/wbg/package.nix
index 6f8440691d11..47f8ac7844d4 100644
--- a/pkgs/by-name/wb/wbg/package.nix
+++ b/pkgs/by-name/wb/wbg/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "wbg";
-    tag = version;
+    rev = version;
     hash = "sha256-zd5OWC0r/75IaeKy5xjV+pQefRy48IcFTxx93iy0a0Q=";
   };
 
diff --git a/pkgs/by-name/wc/wcpg/package.nix b/pkgs/by-name/wc/wcpg/package.nix
index 52358840acb2..1a6b3d0616a9 100644
--- a/pkgs/by-name/wc/wcpg/package.nix
+++ b/pkgs/by-name/wc/wcpg/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fixif";
     repo = "wcpg";
-    tag = version;
+    rev = version;
     sha256 = "sha256-uA/ENjf4urEO+lqebkp/k54199o2434FYgPSmYCG4UA=";
   };
 
diff --git a/pkgs/by-name/wd/wdisplays/package.nix b/pkgs/by-name/wd/wdisplays/package.nix
index 094f76b278e5..0f74c294abfa 100644
--- a/pkgs/by-name/wd/wdisplays/package.nix
+++ b/pkgs/by-name/wd/wdisplays/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "artizirk";
     repo = "wdisplays";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-dtvP930ChiDRT60xq6xBDU6k+zHnkrAkxkKz2FxlzRs=";
   };
 
diff --git a/pkgs/by-name/we/weave-gitops/package.nix b/pkgs/by-name/we/weave-gitops/package.nix
index 718733f6300a..b70aa20dba6a 100644
--- a/pkgs/by-name/we/weave-gitops/package.nix
+++ b/pkgs/by-name/we/weave-gitops/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Gm4DIQK8T+dTwB5swdrD+SjGgy/wFQ/fJYdSqNDSy9c=";
   };
 
diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix
index e62083a01a69..80e838b23272 100644
--- a/pkgs/by-name/we/weaver/package.nix
+++ b/pkgs/by-name/we/weaver/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "weaver";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kfBWI+1f39oSSKYflXfXnBTc96OZch7o5HWfOgOfuxs=";
   };
 
diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix
index b8560d79f4d7..ef0e55faacb4 100644
--- a/pkgs/by-name/we/weaviate/package.nix
+++ b/pkgs/by-name/we/weaviate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Akg0iY5M3X6ztKxhNEkhi03VnbNpNW7/Vcbv2KB6X54=";
   };
 
diff --git a/pkgs/by-name/we/web-ext/package.nix b/pkgs/by-name/we/web-ext/package.nix
index 1d77c0a9a244..401aff4d5867 100644
--- a/pkgs/by-name/we/web-ext/package.nix
+++ b/pkgs/by-name/we/web-ext/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "web-ext";
-    tag = version;
+    rev = version;
     hash = "sha256-RT/K/fYMys1RAvnusAMuHtfZ7gndYf3FPuHBYCklBpw=";
   };
 
diff --git a/pkgs/by-name/we/webcat/package.nix b/pkgs/by-name/we/webcat/package.nix
index 6d6a1a41e494..b9af14457226 100644
--- a/pkgs/by-name/we/webcat/package.nix
+++ b/pkgs/by-name/we/webcat/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rumpelsepp";
     repo = "webcat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JyZHH8JgS3uoNVicx1wj0SAzlrXyTrpwIBZuok6buRw=";
   };
 
diff --git a/pkgs/by-name/we/webdis/package.nix b/pkgs/by-name/we/webdis/package.nix
index 4299f783e187..48a696c4180d 100644
--- a/pkgs/by-name/we/webdis/package.nix
+++ b/pkgs/by-name/we/webdis/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nicolasff";
     repo = "webdis";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-eFUI3RDDrEI1bV+SfTVsIO6yjswK7tzgNsNepoo7DQ4=";
   };
 
diff --git a/pkgs/by-name/we/webfontkitgenerator/package.nix b/pkgs/by-name/we/webfontkitgenerator/package.nix
index 8d2496c033f9..9359c11fdcda 100644
--- a/pkgs/by-name/we/webfontkitgenerator/package.nix
+++ b/pkgs/by-name/we/webfontkitgenerator/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rafaelmardojai";
     repo = "webfont-kit-generator";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ZfyF1Didce88/HaLeMNTw0nGzj3EZnC7V9OzsN21L40=";
   };
 
diff --git a/pkgs/by-name/we/webhook/package.nix b/pkgs/by-name/we/webhook/package.nix
index 10dec0382080..d9ed2bb27b02 100644
--- a/pkgs/by-name/we/webhook/package.nix
+++ b/pkgs/by-name/we/webhook/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adnanh";
     repo = "webhook";
-    tag = version;
+    rev = version;
     sha256 = "sha256-3Ew72ADGTlvp6w37nYbCng7HHCZ0a7kVf3DNRNyCkZU=";
   };
 
diff --git a/pkgs/by-name/we/webmesh/package.nix b/pkgs/by-name/we/webmesh/package.nix
index bbbd6135b6a4..053669528c11 100644
--- a/pkgs/by-name/we/webmesh/package.nix
+++ b/pkgs/by-name/we/webmesh/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "webmeshproj";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Inh7j01/xBJgGYmX1tGBRNYjn1N4AO2sywBwZ8yXlsY=";
   };
 
diff --git a/pkgs/by-name/we/webp-pixbuf-loader/package.nix b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
index 3957edfb0467..9448088c08c6 100644
--- a/pkgs/by-name/we/webp-pixbuf-loader/package.nix
+++ b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aruiz";
     repo = "webp-pixbuf-loader";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2GDH5+YCwb2mPdMfEscmWDOzdGnWRcppE+4rcDCZog4=";
   };
 
diff --git a/pkgs/by-name/we/websocketd/package.nix b/pkgs/by-name/we/websocketd/package.nix
index 682f4c0b9d31..78e5db1f1ed9 100644
--- a/pkgs/by-name/we/websocketd/package.nix
+++ b/pkgs/by-name/we/websocketd/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "joewalnes";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cp4iBSQ6Cd0+NPZ2i79Mulg1z17u//OCm3yoArbZEHs=";
   };
 
diff --git a/pkgs/by-name/we/websocketpp/package.nix b/pkgs/by-name/we/websocketpp/package.nix
index 493a06792cd0..6b933480b0ba 100644
--- a/pkgs/by-name/we/websocketpp/package.nix
+++ b/pkgs/by-name/we/websocketpp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zaphoyd";
     repo = "websocketpp";
-    tag = version;
+    rev = version;
     sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=";
   };
 
diff --git a/pkgs/by-name/we/weggli/package.nix b/pkgs/by-name/we/weggli/package.nix
index 43e31894cdd3..2f12a878274e 100644
--- a/pkgs/by-name/we/weggli/package.nix
+++ b/pkgs/by-name/we/weggli/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "weggli-rs";
     repo = "weggli";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6XSedsTUjcZzFXaNitsXlUBpxC6TYVMCB+AfH3x7c5E=";
   };
 
diff --git a/pkgs/by-name/we/wego/package.nix b/pkgs/by-name/we/wego/package.nix
index 30cffa02a910..107ff1421bc7 100644
--- a/pkgs/by-name/we/wego/package.nix
+++ b/pkgs/by-name/we/wego/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "schachmat";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-YGUll0Wi/oulNMXSrSFeAVe+aGpyFeyXRZTW4ngC3Zk=";
   };
 
diff --git a/pkgs/by-name/we/weidu/package.nix b/pkgs/by-name/we/weidu/package.nix
index 9a845ddfcc2a..984eb273f24f 100644
--- a/pkgs/by-name/we/weidu/package.nix
+++ b/pkgs/by-name/we/weidu/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WeiDUorg";
     repo = "weidu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+vkKTzFZdAzY2dL+mZ4A0PDxhTKGgs9bfArz7S6b4m4=";
   };
 
diff --git a/pkgs/by-name/we/wesher/package.nix b/pkgs/by-name/we/wesher/package.nix
index e04c11090745..0d25f819d5b6 100644
--- a/pkgs/by-name/we/wesher/package.nix
+++ b/pkgs/by-name/we/wesher/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "costela";
     repo = "wesher";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-EIajvcBhS5G9dJzRgXhnD1QKOAhmzngdyCU4L7itT8U=";
   };
 
diff --git a/pkgs/by-name/wf/wf-recorder/package.nix b/pkgs/by-name/wf/wf-recorder/package.nix
index 66ee460826f5..4389f5caa463 100644
--- a/pkgs/by-name/wf/wf-recorder/package.nix
+++ b/pkgs/by-name/wf/wf-recorder/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ammen99";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7/fQOkfAw5v3irD5blJOdq88j0VBrPVQQufdt9wsACk=";
   };
 
diff --git a/pkgs/by-name/wf/wfa2-lib/package.nix b/pkgs/by-name/wf/wfa2-lib/package.nix
index 3dbc7ad2492a..eae3514a8d5d 100644
--- a/pkgs/by-name/wf/wfa2-lib/package.nix
+++ b/pkgs/by-name/wf/wfa2-lib/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "smarco";
     repo = "WFA2-lib";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vTeSvhSt3PQ/BID6uM1CuXkQipgG7VViDexvAwV4nW8=";
   };
 
diff --git a/pkgs/by-name/wg/wg-access-server/package.nix b/pkgs/by-name/wg/wg-access-server/package.nix
index 753dc5e4ed92..b77bc0acab69 100644
--- a/pkgs/by-name/wg/wg-access-server/package.nix
+++ b/pkgs/by-name/wg/wg-access-server/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "freifunkMUC";
     repo = "wg-access-server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AhFqEmHrx9MCdjnB/YA3qU7KsaMyLO+vo53VWUrcL8I=";
   };
 
diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix
index d23df6d24159..07f3a999ee6c 100644
--- a/pkgs/by-name/wg/wget2/package.nix
+++ b/pkgs/by-name/wg/wget2/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "gnuwget";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+xw1nQMBs0m9RlunyrAYaSDPnLY1yRX8zt8hKOMXQT8=";
   };
 
diff --git a/pkgs/by-name/wg/wgo/package.nix b/pkgs/by-name/wg/wgo/package.nix
index 60ad9c445c4c..491a74627125 100644
--- a/pkgs/by-name/wg/wgo/package.nix
+++ b/pkgs/by-name/wg/wgo/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "bokwoon95";
     repo = "wgo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iTUZTeruP21pfd/28fdIhhS5GiSn6DC9Oe2w6VTaxFE=";
   };
 
diff --git a/pkgs/by-name/wh/whatfiles/package.nix b/pkgs/by-name/wh/whatfiles/package.nix
index d975b579e1d6..2c6a81d505ea 100644
--- a/pkgs/by-name/wh/whatfiles/package.nix
+++ b/pkgs/by-name/wh/whatfiles/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spieglt";
     repo = "whatfiles";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5Ju9g7/B9uxLkQzV/MN3vBkjve4EAMseO6K4HTAoS/o=";
   };
 
diff --git a/pkgs/by-name/wh/whipper/package.nix b/pkgs/by-name/wh/whipper/package.nix
index a052eb0eac7f..1d9019d97773 100644
--- a/pkgs/by-name/wh/whipper/package.nix
+++ b/pkgs/by-name/wh/whipper/package.nix
@@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "whipper-team";
     repo = "whipper";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5";
   };
 
diff --git a/pkgs/by-name/wh/whisper/package.nix b/pkgs/by-name/wh/whisper/package.nix
index 61e2a0c0dde3..08aa9ffc4c0b 100644
--- a/pkgs/by-name/wh/whisper/package.nix
+++ b/pkgs/by-name/wh/whisper/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "refresh-bio";
     repo = "whisper";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0wpx1w1mar2d6zq2v14vy6nn896ds1n3zshxhhrrj5d528504iyw";
   };
 
diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix
index 237390e15edb..0ce94c4affe3 100644
--- a/pkgs/by-name/wh/whistle/package.nix
+++ b/pkgs/by-name/wh/whistle/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "avwo";
     repo = "whistle";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yCFehRcMB5hxBRB2GjI/uTE+mA5Wfr5MeVrdj5xbJlA=";
   };
 
diff --git a/pkgs/by-name/wh/whitebophir/package.nix b/pkgs/by-name/wh/whitebophir/package.nix
index 3d1e038d4322..5457e64f5267 100644
--- a/pkgs/by-name/wh/whitebophir/package.nix
+++ b/pkgs/by-name/wh/whitebophir/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "lovasoa";
     repo = "whitebophir";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4T7s9WrpyHVPcw0QY0C0sczDJYKzA4bAAfEv8q2pOy4=";
   };
 
diff --git a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
index f6f446705a63..0fdb72fd553e 100644
--- a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
+++ b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
@@ -99,7 +99,7 @@ lib.checkListOfEnum "${pname}: window control buttons variants" [ "normal" "alt"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      tag = version;
+      rev = version;
       hash = "sha256-XSghDBpxAjdQMB9tyV2NIM6j/AzmzsnybGGDYi7u3BQ=";
     };
 
diff --git a/pkgs/by-name/wh/whoami/package.nix b/pkgs/by-name/wh/whoami/package.nix
index b1077b621ad0..61cb8708fdcf 100644
--- a/pkgs/by-name/wh/whoami/package.nix
+++ b/pkgs/by-name/wh/whoami/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "traefik";
     repo = "whoami";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3jzLdCmmts/7S1Oxig9Dg3kRGh/H5l5UD7ztev0yvXY=";
   };
 
diff --git a/pkgs/by-name/wh/whois/package.nix b/pkgs/by-name/wh/whois/package.nix
index 84af6e674729..7b12b26ecf9e 100644
--- a/pkgs/by-name/wh/whois/package.nix
+++ b/pkgs/by-name/wh/whois/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-c/Mx2HXAj6mHH8rElG7+F94sSrVSL1N9HZBvaMWUjlw=";
   };
 
diff --git a/pkgs/by-name/wh/whsniff/package.nix b/pkgs/by-name/wh/whsniff/package.nix
index 3a12d8396dcd..f73fa552477b 100644
--- a/pkgs/by-name/wh/whsniff/package.nix
+++ b/pkgs/by-name/wh/whsniff/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "homewsn";
     repo = "whsniff";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "000l5vk9c0332m35lndk8892ivdr445lgg25hmq1lajn24cash5w";
   };
 
diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix
index ae5932d0e3a3..917c1f2d4370 100644
--- a/pkgs/by-name/wi/widelands/package.nix
+++ b/pkgs/by-name/wi/widelands/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "widelands";
     repo = "widelands";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/MEeb0KnefK812w5y238Icd4gW85d/pvZ08xnlVXDdk=";
   };
 
diff --git a/pkgs/by-name/wi/wifi-password/package.nix b/pkgs/by-name/wi/wifi-password/package.nix
index e42a43ab1552..83c9d7937139 100644
--- a/pkgs/by-name/wi/wifi-password/package.nix
+++ b/pkgs/by-name/wi/wifi-password/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rauchg";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0sfvb40h7rz9jzp4l9iji3jg80paklqsbmnk5h7ipsv2xbsplp64";
   };
 
diff --git a/pkgs/by-name/wi/wifish/package.nix b/pkgs/by-name/wi/wifish/package.nix
index f5b5c1e48b5d..4477e565f5ab 100644
--- a/pkgs/by-name/wi/wifish/package.nix
+++ b/pkgs/by-name/wi/wifish/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bougyman";
     repo = "wifish";
-    tag = version;
+    rev = version;
     sha256 = "sha256-eTErN6CfKDey/wV+9o9cBVaG5FzCRBiA9UicrMz3KBc=";
   };
 
diff --git a/pkgs/by-name/wi/wifite2/package.nix b/pkgs/by-name/wi/wifite2/package.nix
index 17f5218d4862..9fc4fd21db47 100644
--- a/pkgs/by-name/wi/wifite2/package.nix
+++ b/pkgs/by-name/wi/wifite2/package.nix
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kimocoder";
     repo = "wifite2";
-    tag = version;
+    rev = version;
     hash = "sha256-G2AKKZUDS2UQm95TEhGJIucyMRcm7oL0d3J8uduEQhw=";
   };
 
diff --git a/pkgs/by-name/wi/wiggle/package.nix b/pkgs/by-name/wi/wiggle/package.nix
index 1fd610a7a26b..f1c97794c714 100644
--- a/pkgs/by-name/wi/wiggle/package.nix
+++ b/pkgs/by-name/wi/wiggle/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "neilbrown";
     repo = "wiggle";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf";
   };
 
diff --git a/pkgs/by-name/wi/wiiload/package.nix b/pkgs/by-name/wi/wiiload/package.nix
index af8b24f5cfeb..54ca0efb8d18 100644
--- a/pkgs/by-name/wi/wiiload/package.nix
+++ b/pkgs/by-name/wi/wiiload/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "devkitPro";
     repo = "wiiload";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pZdZzCAPfAVucuiV/q/ROY3cz/wxQWep6dCTGNn2fSo=";
   };
 
diff --git a/pkgs/by-name/wi/wike/package.nix b/pkgs/by-name/wi/wike/package.nix
index 1ec5d7682962..90cfb897ffbf 100644
--- a/pkgs/by-name/wi/wike/package.nix
+++ b/pkgs/by-name/wi/wike/package.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "hugolabe";
     repo = "Wike";
-    tag = version;
+    rev = version;
     hash = "sha256-Unw+r8NlfaSn/UCtdnkCCsC6xM33Qy6hQdUg/4bIG+I=";
   };
 
diff --git a/pkgs/by-name/wi/wimboot/package.nix b/pkgs/by-name/wi/wimboot/package.nix
index 24028bf706fc..1dc0a55cbdfb 100644
--- a/pkgs/by-name/wi/wimboot/package.nix
+++ b/pkgs/by-name/wi/wimboot/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "wimboot";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JqdOgcwOXIJDl8O7k/pHdd4MNC/rJ0fWTowtEVpJyx8=";
   };
 
diff --git a/pkgs/by-name/wi/win2xcur/package.nix b/pkgs/by-name/wi/win2xcur/package.nix
index 8572e5e6af19..f93b064d00e6 100644
--- a/pkgs/by-name/wi/win2xcur/package.nix
+++ b/pkgs/by-name/wi/win2xcur/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "quantum5";
     repo = "win2xcur";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OjLj+QYg8YOJzDq3Y6/uyEXlNWbPm8VA/b1yP9jT6Jo=";
   };
 
diff --git a/pkgs/by-name/wi/windmill/package.nix b/pkgs/by-name/wi/windmill/package.nix
index cbc6f2ee2ac7..3f0a39efe5d1 100644
--- a/pkgs/by-name/wi/windmill/package.nix
+++ b/pkgs/by-name/wi/windmill/package.nix
@@ -49,7 +49,7 @@ let
   src = fetchFromGitHub {
     owner = "windmill-labs";
     repo = "windmill";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9BtItmqyW4NbG4istssAYn4CWlfYAv33CE1enL+5LtE=";
   };
 in
diff --git a/pkgs/by-name/wi/windowchef/package.nix b/pkgs/by-name/wi/windowchef/package.nix
index 73f53bd02077..e74e4c063751 100644
--- a/pkgs/by-name/wi/windowchef/package.nix
+++ b/pkgs/by-name/wi/windowchef/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tudurom";
     repo = "windowchef";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1m4vly7w2f28lrj26rhh3x9xsp3d97m5cxj91fafgh5rds4ygyhp";
   };
 
diff --git a/pkgs/by-name/wi/windows10-icons/package.nix b/pkgs/by-name/wi/windows10-icons/package.nix
index 38b121e4fa84..7cdda913ff2f 100644
--- a/pkgs/by-name/wi/windows10-icons/package.nix
+++ b/pkgs/by-name/wi/windows10-icons/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "B00merang-Artwork";
     repo = "Windows-10";
-    tag = finalAttrs.version;
+    rev = "${finalAttrs.version}";
     hash = "sha256-Yz6a7FcgPfzz4w8cKp8oq7/usIBUUZV7qhVmDewmzrI=";
   };
 
diff --git a/pkgs/by-name/wi/wineasio/package.nix b/pkgs/by-name/wi/wineasio/package.nix
index 871b8e32e287..9152b850216c 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 = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-d5BGJAkaM5XZXyqm6K/UzFE4sD6QVHHGnLi1bcHxiaM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wi/wire/package.nix b/pkgs/by-name/wi/wire/package.nix
index d38715b02312..de9274ebed35 100644
--- a/pkgs/by-name/wi/wire/package.nix
+++ b/pkgs/by-name/wi/wire/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "wire";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bV/bb577JzGF37HmvRprxr+GWcLLiFRisURwtGDbqko=";
   };
 
diff --git a/pkgs/by-name/wi/wiredtiger/package.nix b/pkgs/by-name/wi/wiredtiger/package.nix
index 8cf4f9a73de7..0d5b4e3203ee 100644
--- a/pkgs/by-name/wi/wiredtiger/package.nix
+++ b/pkgs/by-name/wi/wiredtiger/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "wiredtiger";
     owner = "wiredtiger";
-    tag = version;
+    rev = version;
     sha256 = "04j2zw8b9jym43r682rh4kpdippxx7iw3ry16nxlbybzar9kgk83";
   };
 
diff --git a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix
index 4c9fa3bc3848..f1b9e3336996 100644
--- a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix
+++ b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "axllent";
     repo = "wireguard-vanity-keygen";
-    tag = version;
+    rev = version;
     hash = "sha256-LibNWnjm52iPwrPKAA5v3krADvHcewKuLe9k5HhJgzg=";
   };
 
diff --git a/pkgs/by-name/wi/wireproxy/package.nix b/pkgs/by-name/wi/wireproxy/package.nix
index 6d1e5997f610..e145dadf5f17 100644
--- a/pkgs/by-name/wi/wireproxy/package.nix
+++ b/pkgs/by-name/wi/wireproxy/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "pufferffish";
     repo = "wireproxy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-F8WatQsXgq3ex2uAy8eoS2DkG7uClNwZ74eG/mJN83o=";
   };
 
diff --git a/pkgs/by-name/wi/wiringpi/package.nix b/pkgs/by-name/wi/wiringpi/package.nix
index 78a2b44c2291..57d72b67bcbf 100644
--- a/pkgs/by-name/wi/wiringpi/package.nix
+++ b/pkgs/by-name/wi/wiringpi/package.nix
@@ -11,7 +11,7 @@ let
   srcAll = fetchFromGitHub {
     owner = "WiringPi";
     repo = "WiringPi";
-    tag = version;
+    rev = version;
     sha256 = "sha256-OWR+yo+SnYaMd8J+ku9ettZi+rDHcHlGZCoucCiRkCI=";
   };
   mkSubProject =
diff --git a/pkgs/by-name/wi/wiseunpacker/package.nix b/pkgs/by-name/wi/wiseunpacker/package.nix
index 9b3d9d12b581..f5c9690a757f 100644
--- a/pkgs/by-name/wi/wiseunpacker/package.nix
+++ b/pkgs/by-name/wi/wiseunpacker/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "mnadareski";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-APbfo2D/p733AwNNByu5MvC9LA8WW4mAzq6t2w/YNrs=";
   };
 
diff --git a/pkgs/by-name/wi/wishbone-tool/package.nix b/pkgs/by-name/wi/wishbone-tool/package.nix
index d51224cbf329..053021fe29f9 100644
--- a/pkgs/by-name/wi/wishbone-tool/package.nix
+++ b/pkgs/by-name/wi/wishbone-tool/package.nix
@@ -10,7 +10,7 @@ let
   src = fetchFromGitHub {
     owner = "litex-hub";
     repo = "wishbone-utils";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Gl0bxHJ8Y0ytYJxToYAR2tVkD4YNMihk+zRpieSvMGE=";
   };
 in
diff --git a/pkgs/by-name/wi/wishlist/package.nix b/pkgs/by-name/wi/wishlist/package.nix
index 4a7828e753fa..cbb5a316614f 100644
--- a/pkgs/by-name/wi/wishlist/package.nix
+++ b/pkgs/by-name/wi/wishlist/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "wishlist";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-53fojA+gdvpSVNjx6QncH16F8/x+lpY5SkNs7obW2XQ=";
   };
 
diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix
index 87a78cfa6740..43f88744ce42 100644
--- a/pkgs/by-name/wi/wit-bindgen/package.nix
+++ b/pkgs/by-name/wi/wit-bindgen/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wit-bindgen";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ePrtWOCta9UtoEtSJ1NZb6iJricfsc2YtRF8hi///3c=";
   };
 
diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix
index b36065fcb75b..7bcf5d3369f3 100644
--- a/pkgs/by-name/wi/witness/package.nix
+++ b/pkgs/by-name/wi/witness/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "in-toto";
     repo = "witness";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ylCUy44sX1KPfQqEldixmLcXkk+Uwca4q1gZRgxHdeg=";
   };
   vendorHash = "sha256-CR95CsGthdjq/dtxmIjmZlQeyKimumCP9mWr6tNrBJI=";
diff --git a/pkgs/by-name/wl/wl-clip-persist/package.nix b/pkgs/by-name/wl/wl-clip-persist/package.nix
index fdc18b2d29f9..cd7704ef7f3f 100644
--- a/pkgs/by-name/wl/wl-clip-persist/package.nix
+++ b/pkgs/by-name/wl/wl-clip-persist/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Linus789";
     repo = "wl-clip-persist";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dFhHsBazBHVWgPxoRDNwh8Yctt4w64E0RyFaHEC4mvk=";
   };
 
diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
index cf8eaf4fa75a..2fc26e2c3836 100644
--- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix
+++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "wl-clipboard-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jGTWcVR6atkEeEUunystJ4B6I3GzYiCOMs0MC6pvPfI=";
   };
 
diff --git a/pkgs/by-name/wl/wl-clipboard-x11/package.nix b/pkgs/by-name/wl/wl-clipboard-x11/package.nix
index c0be284fd1a1..d37426b1949a 100644
--- a/pkgs/by-name/wl/wl-clipboard-x11/package.nix
+++ b/pkgs/by-name/wl/wl-clipboard-x11/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brunelli";
     repo = "wl-clipboard-x11";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-i+oF1Mu72O5WPTWzqsvo4l2CERWWp4Jq/U0DffPZ8vg=";
   };
 
diff --git a/pkgs/by-name/wl/wl-clipboard/package.nix b/pkgs/by-name/wl/wl-clipboard/package.nix
index e651dd10a544..45e310684489 100644
--- a/pkgs/by-name/wl/wl-clipboard/package.nix
+++ b/pkgs/by-name/wl/wl-clipboard/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bugaevc";
     repo = "wl-clipboard";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BYRXqVpGt9FrEBYQpi2kHPSZyeMk9o1SXkxjjcduhiY=";
   };
 
diff --git a/pkgs/by-name/wl/wl-color-picker/package.nix b/pkgs/by-name/wl/wl-color-picker/package.nix
index 85042ef50734..3f128e6bdd67 100644
--- a/pkgs/by-name/wl/wl-color-picker/package.nix
+++ b/pkgs/by-name/wl/wl-color-picker/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jgmdev";
     repo = "wl-color-picker";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lvhpXy4Sd1boYNGhbPoZTJlBhlW5obltDOrEzB1Gq0A=";
   };
 
diff --git a/pkgs/by-name/wl/wl-gammarelay-rs/package.nix b/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
index 4392e1775d0f..a9cea8534b54 100644
--- a/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
+++ b/pkgs/by-name/wl/wl-gammarelay-rs/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MaxVerevkin";
     repo = "wl-gammarelay-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zmtC4xNNAK/TiB5TU6qsY5y0Z3roaEnTwHMZPjq6SbE=";
   };
 
diff --git a/pkgs/by-name/wl/wl-mirror/package.nix b/pkgs/by-name/wl/wl-mirror/package.nix
index d131fa69d218..2f6f15f5badb 100644
--- a/pkgs/by-name/wl/wl-mirror/package.nix
+++ b/pkgs/by-name/wl/wl-mirror/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ferdi265";
     repo = "wl-mirror";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-E8mbCMfmN3key1W3m8YbH1wKa56yESiXujACfKFS/+s=";
   };
 
diff --git a/pkgs/by-name/wl/wldash/package.nix b/pkgs/by-name/wl/wldash/package.nix
index bd9134222039..287f9da37e37 100644
--- a/pkgs/by-name/wl/wldash/package.nix
+++ b/pkgs/by-name/wl/wldash/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "kennylevinsen";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZzsBD3KKTT+JGiFCpdumPyVAE2gEJvzCq+nRnK3RdxI=";
   };
 
diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix
index e9f12a85a26d..f29345c0afca 100644
--- a/pkgs/by-name/wl/wleave/package.nix
+++ b/pkgs/by-name/wl/wleave/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AMNatty";
     repo = "wleave";
-    tag = version;
+    rev = version;
     hash = "sha256-xl0JOepQDvYdeTv0LFYzp8QdufKXkayJcHklLBjupeA=";
   };
 
diff --git a/pkgs/by-name/wl/wljoywake/package.nix b/pkgs/by-name/wl/wljoywake/package.nix
index 1751bfd4bcfb..00899a219751 100644
--- a/pkgs/by-name/wl/wljoywake/package.nix
+++ b/pkgs/by-name/wl/wljoywake/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     repo = "wljoywake";
     owner = "nowrep";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zSYNfsFjswaSXZPlIDMDC87NK/6AKtArHBeWCWDDR3E=";
   };
 
diff --git a/pkgs/by-name/wl/wlogout/package.nix b/pkgs/by-name/wl/wlogout/package.nix
index 7f876305bcd5..6a50af56cd81 100644
--- a/pkgs/by-name/wl/wlogout/package.nix
+++ b/pkgs/by-name/wl/wlogout/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ArtsyMacaw";
     repo = "wlogout";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-/tYZy56ku68ziSOhy6Dex9RGy+blkU6CN2ze76y7718=";
   };
 
diff --git a/pkgs/by-name/wl/wlr-which-key/package.nix b/pkgs/by-name/wl/wlr-which-key/package.nix
index 3bd34c745a38..fa49d11db5e0 100644
--- a/pkgs/by-name/wl/wlr-which-key/package.nix
+++ b/pkgs/by-name/wl/wlr-which-key/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MaxVerevkin";
     repo = "wlr-which-key";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BEf1qpy0bVPi5nmu3UUiv8k0bJvE5VFB5Zqb5lS0+t4=";
   };
 
diff --git a/pkgs/by-name/wl/wlx-overlay-s/package.nix b/pkgs/by-name/wl/wlx-overlay-s/package.nix
index 7ec5bfeacbc2..5010e6bce075 100644
--- a/pkgs/by-name/wl/wlx-overlay-s/package.nix
+++ b/pkgs/by-name/wl/wlx-overlay-s/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "galister";
     repo = "wlx-overlay-s";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m2YVXF9bEjovZOWa+X1CYHAUaAsUI4dBMG2ni3jP9L4=";
   };
 
diff --git a/pkgs/by-name/wm/wmic-bin/package.nix b/pkgs/by-name/wm/wmic-bin/package.nix
index b744850553c7..e557ffd76764 100644
--- a/pkgs/by-name/wm/wmic-bin/package.nix
+++ b/pkgs/by-name/wm/wmic-bin/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "R-Vision";
     repo = "wmi-client";
-    tag = version;
+    rev = version;
     sha256 = "1w1mdbiwz37wzry1q38h8dyjaa6iggmsb9wcyhhlawwm1vj50w48";
   };
 
diff --git a/pkgs/by-name/wm/wmutils-core/package.nix b/pkgs/by-name/wm/wmutils-core/package.nix
index 7ee5477c907a..5f35c29dbb42 100644
--- a/pkgs/by-name/wm/wmutils-core/package.nix
+++ b/pkgs/by-name/wm/wmutils-core/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wmutils";
     repo = "core";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OKAvJovGu9rMxEe5g4kdL7Foj41kl3zUYIJa04jf0dI=";
   };
 
diff --git a/pkgs/by-name/wm/wmutils-opt/package.nix b/pkgs/by-name/wm/wmutils-opt/package.nix
index 27d9fa6d9632..00142588d2e7 100644
--- a/pkgs/by-name/wm/wmutils-opt/package.nix
+++ b/pkgs/by-name/wm/wmutils-opt/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wmutils";
     repo = "opt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0gd05qsir1lnzfrbnfh08qwsryz7arwj20f886nqh41m87yqaljz";
   };
 
diff --git a/pkgs/by-name/wo/wob/package.nix b/pkgs/by-name/wo/wob/package.nix
index c90e7edb6078..1fc1b26282b4 100644
--- a/pkgs/by-name/wo/wob/package.nix
+++ b/pkgs/by-name/wo/wob/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "francma";
     repo = "wob";
-    tag = version;
+    rev = version;
     sha256 = "sha256-9LFAEo17w861ldMJU+t1oLAKoM6gJc4Em4tSwQDXbKU=";
   };
 
diff --git a/pkgs/by-name/wo/woeusb-ng/package.nix b/pkgs/by-name/wo/woeusb-ng/package.nix
index ff94077ab583..408440e0f8be 100644
--- a/pkgs/by-name/wo/woeusb-ng/package.nix
+++ b/pkgs/by-name/wo/woeusb-ng/package.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "WoeUSB";
     repo = "WoeUSB-ng";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2opSiXbbk0zDRt6WqMh97iAt6/KhwNDopOas+OZn6TU=";
   };
 
diff --git a/pkgs/by-name/wo/woeusb/package.nix b/pkgs/by-name/wo/woeusb/package.nix
index 2554ea9f252e..8382ad157ec9 100644
--- a/pkgs/by-name/wo/woeusb/package.nix
+++ b/pkgs/by-name/wo/woeusb/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "WoeUSB";
     repo = "WoeUSB";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HB1E7rP/U58dyL3j6YnhF5AOGAcHqmA/ZZ5JNBDibco=";
   };
 
diff --git a/pkgs/by-name/wo/woff2/package.nix b/pkgs/by-name/wo/woff2/package.nix
index f0b1267e7c14..ef5a9a5e006c 100644
--- a/pkgs/by-name/wo/woff2/package.nix
+++ b/pkgs/by-name/wo/woff2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "woff2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "13l4g536h0pr84ww4wxs2za439s0xp1va55g6l478rfbb1spp44y";
   };
 
diff --git a/pkgs/by-name/wo/wolf-shaper/package.nix b/pkgs/by-name/wo/wolf-shaper/package.nix
index cb3efbe23d6c..d4e234fc6173 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4oi1wnex6eNRHUWXZHnvrmqp4veFuPJqD0YuOhDepg4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wo/wolfebin/package.nix b/pkgs/by-name/wo/wolfebin/package.nix
index 2090ec8d5d42..e44f30213899 100644
--- a/pkgs/by-name/wo/wolfebin/package.nix
+++ b/pkgs/by-name/wo/wolfebin/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thejoshwolfe";
     repo = "wolfebin";
-    tag = version;
+    rev = version;
     sha256 = "sha256-tsI71/UdLaGZ3O2lNTd1c8S5OS2imquLovh0n0ez8Ts=";
   };
 
diff --git a/pkgs/by-name/wo/wordgrinder/package.nix b/pkgs/by-name/wo/wordgrinder/package.nix
index 69e1c17ff738..9f7d84c9bb37 100644
--- a/pkgs/by-name/wo/wordgrinder/package.nix
+++ b/pkgs/by-name/wo/wordgrinder/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "wordgrinder";
     owner = "davidgiven";
-    tag = version;
+    rev = version;
     sha256 = "124d1bnn2aqs6ik8pdazzni6a0583prz9lfdjrbwyb97ipqga9pm";
   };
 
diff --git a/pkgs/by-name/wo/workshop-runner/package.nix b/pkgs/by-name/wo/workshop-runner/package.nix
index 8be4b3b2ce0b..ed44154c1f0f 100644
--- a/pkgs/by-name/wo/workshop-runner/package.nix
+++ b/pkgs/by-name/wo/workshop-runner/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mainmatter";
     repo = "rust-workshop-runner";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PfQPRbOPK1Y/j8Xtg78oDzBFUx8eiM3ZwRul/ao0SgI=";
   };
 
diff --git a/pkgs/by-name/wo/wormhole-william/package.nix b/pkgs/by-name/wo/wormhole-william/package.nix
index d2e7f545c6fe..aedb6c88177a 100644
--- a/pkgs/by-name/wo/wormhole-william/package.nix
+++ b/pkgs/by-name/wo/wormhole-william/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "psanford";
     repo = "wormhole-william";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KGJfz3nd03vcdrIsX8UUfdw96XwyU9PRzwK8O4/I8JQ=";
   };
 
diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix
index cccb00450e11..5e7ad8d457bf 100644
--- a/pkgs/by-name/wp/wpaperd/package.nix
+++ b/pkgs/by-name/wp/wpaperd/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "danyspin97";
     repo = "wpaperd";
-    tag = version;
+    rev = version;
     hash = "sha256-L3xoEhVjbJoPsGgie95SIxpRDCV5ZZcrfL01TPAffZc=";
   };
 
diff --git a/pkgs/by-name/wp/wpgtk/package.nix b/pkgs/by-name/wp/wpgtk/package.nix
index c7d34509b572..4cf918c52012 100644
--- a/pkgs/by-name/wp/wpgtk/package.nix
+++ b/pkgs/by-name/wp/wpgtk/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "deviantfero";
     repo = "wpgtk";
-    tag = version;
+    rev = version;
     sha256 = "sha256-NlJG9d078TW1jcnVrpBORIIwDUGIAGWZoDbXp9/qRr4=";
   };
 
diff --git a/pkgs/by-name/wp/wprecon/package.nix b/pkgs/by-name/wp/wprecon/package.nix
index 93cf7286934a..c6aedc564b4c 100644
--- a/pkgs/by-name/wp/wprecon/package.nix
+++ b/pkgs/by-name/wp/wprecon/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "blackbinn";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-23zJD3Nnkeko+J2FjPq5RA5dIjORMXvwt3wtAYiVlQs=";
   };
 
diff --git a/pkgs/by-name/wr/wrap/package.nix b/pkgs/by-name/wr/wrap/package.nix
index 9dc2dc4d74aa..946c41e15dda 100644
--- a/pkgs/by-name/wr/wrap/package.nix
+++ b/pkgs/by-name/wr/wrap/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Wraparound";
     repo = "wrap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-58wsH/e3X72S7tJUObazyvvkI8+B7DLPTBmQO9A+jmk=";
   };
 
diff --git a/pkgs/by-name/wr/write-good/package.nix b/pkgs/by-name/wr/write-good/package.nix
index 5507d3b145ad..c682e732de98 100644
--- a/pkgs/by-name/wr/write-good/package.nix
+++ b/pkgs/by-name/wr/write-good/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "btford";
     repo = "write-good";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cq3cj2BwoQMKqo3iU2l+PR/2bJIFMSTRsDGQJ06GWXk=";
   };
 
diff --git a/pkgs/by-name/wr/writefreely/package.nix b/pkgs/by-name/wr/writefreely/package.nix
index 5aadd11c32dd..f952481f828d 100644
--- a/pkgs/by-name/wr/writefreely/package.nix
+++ b/pkgs/by-name/wr/writefreely/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "writefreely";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Qr31XSbAckLElD81yxD+K7tngWECQ+wyuESC+biAbyw=";
   };
 
diff --git a/pkgs/by-name/wr/wrk/package.nix b/pkgs/by-name/wr/wrk/package.nix
index c047e0bcd2bc..46b3433bf845 100644
--- a/pkgs/by-name/wr/wrk/package.nix
+++ b/pkgs/by-name/wr/wrk/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wg";
     repo = "wrk";
-    tag = version;
+    rev = version;
     sha256 = "sha256-nCfA444p7krXOB3qRtDKWxWj9tsrDZsGf03ThtE1dXM=";
   };
 
diff --git a/pkgs/by-name/ws/wsdd/package.nix b/pkgs/by-name/ws/wsdd/package.nix
index a5402b171384..1c69a0ef8fb8 100644
--- a/pkgs/by-name/ws/wsdd/package.nix
+++ b/pkgs/by-name/ws/wsdd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "christgau";
     repo = "wsdd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T8/XlQpx4CtNy8LuLwOQBG9muFe9pp5583tDaCT4ReI=";
   };
 
diff --git a/pkgs/by-name/ws/wsl-open/package.nix b/pkgs/by-name/ws/wsl-open/package.nix
index 1f029f89a238..bf92ea0b3058 100644
--- a/pkgs/by-name/ws/wsl-open/package.nix
+++ b/pkgs/by-name/ws/wsl-open/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "4U6U57";
     repo = "wsl-open";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-amqkDXdgIqGjRZMkltwco0UAI++G0RY/MxLXwtlxogE=";
   };
 
diff --git a/pkgs/by-name/ws/wsl-vpnkit/package.nix b/pkgs/by-name/ws/wsl-vpnkit/package.nix
index 4d59c7874941..22d4b341d496 100644
--- a/pkgs/by-name/ws/wsl-vpnkit/package.nix
+++ b/pkgs/by-name/ws/wsl-vpnkit/package.nix
@@ -30,7 +30,7 @@ resholve.mkDerivation {
   src = fetchFromGitHub {
     owner = "sakai135";
     repo = "wsl-vpnkit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Igbr3L2W32s4uBepllSz07bkbI3qwAKMZkBrXLqGrGA=";
   };
 
diff --git a/pkgs/by-name/ws/wslu/package.nix b/pkgs/by-name/ws/wslu/package.nix
index 938261b1dff5..43fb9cbbfafc 100644
--- a/pkgs/by-name/ws/wslu/package.nix
+++ b/pkgs/by-name/ws/wslu/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wslutilities";
     repo = "wslu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ssiwYkQg2rOirC/ZZVq2bJm4Ggc364uRkoS2y365Eb0=";
   };
 
diff --git a/pkgs/by-name/ws/wsysmon/package.nix b/pkgs/by-name/ws/wsysmon/package.nix
index cf9ccb0cbde2..76ffb4ab5964 100644
--- a/pkgs/by-name/ws/wsysmon/package.nix
+++ b/pkgs/by-name/ws/wsysmon/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "slyfabi";
     repo = "wsysmon";
-    tag = version;
+    rev = version;
     hash = "sha256-5kfZT+hm064qXoAzi0RdmUqXi8VaXamlbm+FJOrGh3A=";
   };
 
diff --git a/pkgs/by-name/wt/wtfutil/package.nix b/pkgs/by-name/wt/wtfutil/package.nix
index 4c9b31b54301..d4f638264b13 100644
--- a/pkgs/by-name/wt/wtfutil/package.nix
+++ b/pkgs/by-name/wt/wtfutil/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wtfutil";
     repo = "wtf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DFrA4bx+wSOxmt1CVA1oNiYVmcWeW6wpfR5F1tnhyDY=";
   };
 
diff --git a/pkgs/by-name/wt/wthrr/package.nix b/pkgs/by-name/wt/wthrr/package.nix
index 1ec688dbd15e..be0b4608788e 100644
--- a/pkgs/by-name/wt/wthrr/package.nix
+++ b/pkgs/by-name/wt/wthrr/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ttytm";
     repo = "wthrr-the-weathercrab";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8o84FFdcEPRtbsxWCc97tTGGownxlhpIM71GiBRT6uM=";
   };
 
diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix
index 044f5fe567ce..b5bc96f793eb 100644
--- a/pkgs/by-name/wt/wttrbar/package.nix
+++ b/pkgs/by-name/wt/wttrbar/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bjesus";
     repo = "wttrbar";
-    tag = version;
+    rev = version;
     hash = "sha256-+M0s6v9ULf+D2pPOE8KlHoyV+jBMbPsAXpYxGjms5DY=";
   };
 
diff --git a/pkgs/by-name/wt/wtwitch/package.nix b/pkgs/by-name/wt/wtwitch/package.nix
index 6a68d682be5a..cf9d19877857 100644
--- a/pkgs/by-name/wt/wtwitch/package.nix
+++ b/pkgs/by-name/wt/wtwitch/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "krathalan";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-2YLBuxGwGkav3zB2qMqM6yRXf7ZLqgULoJV4s5p+hSw=";
   };
 
diff --git a/pkgs/by-name/wt/wtype/package.nix b/pkgs/by-name/wt/wtype/package.nix
index 9a26e6dd85c2..e1ebaf728d3a 100644
--- a/pkgs/by-name/wt/wtype/package.nix
+++ b/pkgs/by-name/wt/wtype/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "atx";
     repo = "wtype";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TfpzAi0mkXugQn70MISyNFOXIJpDwvgh3enGv0Xq8S4=";
   };
 
diff --git a/pkgs/by-name/wu/wush/package.nix b/pkgs/by-name/wu/wush/package.nix
index 84be56594ea1..884c0e590143 100644
--- a/pkgs/by-name/wu/wush/package.nix
+++ b/pkgs/by-name/wu/wush/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "coder";
     repo = "wush";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-K83peIfr1+OHuuq6gdgco0RhfF1tAAewb4pxNT6vV+w=";
   };
 
diff --git a/pkgs/by-name/wu/wuzz/package.nix b/pkgs/by-name/wu/wuzz/package.nix
index 2c6a5c1f7a61..d67236051250 100644
--- a/pkgs/by-name/wu/wuzz/package.nix
+++ b/pkgs/by-name/wu/wuzz/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-H0soiKOytchfcFx17az0pGoFbA+hhXLxGJVdaARvnDc=";
   };
 
diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix
index a013d30be047..5b40cd47a5c9 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9qYPatpTT28H+fz77o7/Y3YVmiK0OCsiQT5QAYe93M0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix
index cf43e38063f3..a1e2ca6b7a5d 100644
--- a/pkgs/by-name/wx/wxGTK32/package.nix
+++ b/pkgs/by-name/wx/wxGTK32/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wxWidgets";
     repo = "wxWidgets";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7dc7NGiKSonFFaWp3UxLYqDc1Cc6no1Eba0QmtzX5mM=";
   };
 
diff --git a/pkgs/by-name/wx/wxhexeditor/package.nix b/pkgs/by-name/wx/wxhexeditor/package.nix
index 82775b18e5cc..e581b8c50ba8 100644
--- a/pkgs/by-name/wx/wxhexeditor/package.nix
+++ b/pkgs/by-name/wx/wxhexeditor/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "wxHexEditor";
     owner = "EUA";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EmdWYifwewk40s1TARYoUzx/qhyMmgmUC9tr5KKCtiM=";
   };
 
diff --git a/pkgs/by-name/wx/wxmacmolplt/package.nix b/pkgs/by-name/wx/wxmacmolplt/package.nix
index 286fa1aba7c3..6252ff7d5f24 100644
--- a/pkgs/by-name/wx/wxmacmolplt/package.nix
+++ b/pkgs/by-name/wx/wxmacmolplt/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brettbode";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gFGstyq9bMmBaIS4QE6N3EIC9GxRvyJYUr8DUvwRQBc=";
   };
 
diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix
index 2178d54c728e..94595ff510e8 100644
--- a/pkgs/by-name/wx/wxsqlite3/package.nix
+++ b/pkgs/by-name/wx/wxsqlite3/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "utelle";
     repo = "wxsqlite3";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aDEVT3R948P+N1fFC9Q7LNf8FpPuxlKs+dQurewtaFA=";
   };
 
diff --git a/pkgs/by-name/wx/wxsqliteplus/package.nix b/pkgs/by-name/wx/wxsqliteplus/package.nix
index 1dc6538c0c05..8a64e7fec2b8 100644
--- a/pkgs/by-name/wx/wxsqliteplus/package.nix
+++ b/pkgs/by-name/wx/wxsqliteplus/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "guanlisheng";
     repo = "wxsqliteplus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gyH1Wlmg9xQy7xm7rhKZa7BFTFFN4JQHp3CHmzMkVOg=";
   };
 
diff --git a/pkgs/by-name/x-/x-create-mouse-void/package.nix b/pkgs/by-name/x-/x-create-mouse-void/package.nix
index af57dc5ada8b..4be1a0460634 100644
--- a/pkgs/by-name/x-/x-create-mouse-void/package.nix
+++ b/pkgs/by-name/x-/x-create-mouse-void/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cas--";
     repo = "XCreateMouseVoid";
-    tag = version;
+    rev = version;
     sha256 = "151pv4gmzz9g6nd1xw94hmawlb5z8rgs1jb3x1zpvn3znd7f355c";
   };
 
diff --git a/pkgs/by-name/x1/x11docker/package.nix b/pkgs/by-name/x1/x11docker/package.nix
index 011121ad8e0f..56bedfc7e5e6 100644
--- a/pkgs/by-name/x1/x11docker/package.nix
+++ b/pkgs/by-name/x1/x11docker/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mviereck";
     repo = "x11docker";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DehAWrEvoE/zWbfjQmF5Z7HTaQL5WMA/279Ee1Xm47g=";
   };
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/x1/x11vnc/package.nix b/pkgs/by-name/x1/x11vnc/package.nix
index f06500b8e415..5331f43e37d9 100644
--- a/pkgs/by-name/x1/x11vnc/package.nix
+++ b/pkgs/by-name/x1/x11vnc/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LibVNC";
     repo = "x11vnc";
-    tag = version;
+    rev = version;
     sha256 = "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1";
   };
 
diff --git a/pkgs/by-name/x4/x4/package.nix b/pkgs/by-name/x4/x4/package.nix
index d50846487cf0..26815dd7a0c7 100644
--- a/pkgs/by-name/x4/x4/package.nix
+++ b/pkgs/by-name/x4/x4/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pwnwriter";
     repo = "x4";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IF+8lu56fzYM79p7MiNpVLFIs2GKPlzw5pNXD/hT6BM=";
   };
 
diff --git a/pkgs/by-name/x4/x42-avldrums/package.nix b/pkgs/by-name/x4/x42-avldrums/package.nix
index e89ba0b2dcbe..b17474141d7d 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";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AZKHjzgw0TtLHh4TF+yOUSa+GlNVwyHCpJWAZikXTy4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/x4/x42-gmsynth/package.nix b/pkgs/by-name/x4/x42-gmsynth/package.nix
index d075b679ac9f..4c8dec54e04a 100644
--- a/pkgs/by-name/x4/x42-gmsynth/package.nix
+++ b/pkgs/by-name/x4/x42-gmsynth/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "x42";
     repo = "gmsynth.lv2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Fu/wCQY5fTvAWo18hhiQC9LZAUwi3WJfhgWLI0rgmKs=";
   };
 
diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix
index e05505036624..7b47143d9661 100644
--- a/pkgs/by-name/xa/xapp/package.nix
+++ b/pkgs/by-name/xa/xapp/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-vd3uAihOF4dgZ49VVhRjG+Cx7sjMvHI/0oRLvIs2ZaM=";
   };
 
diff --git a/pkgs/by-name/xa/xarchiver/package.nix b/pkgs/by-name/xa/xarchiver/package.nix
index 36800e2a178f..a2cf7b39fa38 100644
--- a/pkgs/by-name/xa/xarchiver/package.nix
+++ b/pkgs/by-name/xa/xarchiver/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ib";
     repo = "xarchiver";
-    tag = version;
+    rev = version;
     hash = "sha256-pLNAgyYqujk+xvHZjq98kzTG47G4C2JvSTDoS7UTNeo=";
   };
 
diff --git a/pkgs/by-name/xa/xautoclick/package.nix b/pkgs/by-name/xa/xautoclick/package.nix
index 9f1189e824af..fb1861842d17 100644
--- a/pkgs/by-name/xa/xautoclick/package.nix
+++ b/pkgs/by-name/xa/xautoclick/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "qarkai";
     repo = "xautoclick";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "GN3zI5LQnVmRC0KWffzUTHKrxcqnstiL55hopwTTwpE=";
   };
 
diff --git a/pkgs/by-name/xb/xbanish/package.nix b/pkgs/by-name/xb/xbanish/package.nix
index 02357353e0f8..0e6536592b4c 100644
--- a/pkgs/by-name/xb/xbanish/package.nix
+++ b/pkgs/by-name/xb/xbanish/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jcs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jwCoJ2shFGuJHhmXmlw/paFpMl5ARD6e5zDnDZHlsoo=";
   };
 
diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix
index 23be1f416162..052e1338eb6d 100644
--- a/pkgs/by-name/xb/xbps/package.nix
+++ b/pkgs/by-name/xb/xbps/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "xbps";
-    tag = version;
+    rev = version;
     hash = "sha256-3+LzFLDZ1zfRPBETMlpEn66zsfHRHQLlgeZPdMtmA14=";
   };
 
diff --git a/pkgs/by-name/xc/xcaddy/package.nix b/pkgs/by-name/xc/xcaddy/package.nix
index 9a7a0ed3d048..fc21390fcd48 100644
--- a/pkgs/by-name/xc/xcaddy/package.nix
+++ b/pkgs/by-name/xc/xcaddy/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caddyserver";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vpaweUU++3ZHj7KT5WNUCw3X93sQBTgjKlB8rJwrHlM=";
   };
 
diff --git a/pkgs/by-name/xc/xcalib/package.nix b/pkgs/by-name/xc/xcalib/package.nix
index 22972ae3df45..a1c789fef49a 100644
--- a/pkgs/by-name/xc/xcalib/package.nix
+++ b/pkgs/by-name/xc/xcalib/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenICC";
     repo = "xcalib";
-    tag = version;
+    rev = version;
     sha256 = "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr";
   };
 
diff --git a/pkgs/by-name/xc/xcat/package.nix b/pkgs/by-name/xc/xcat/package.nix
index 9666a444de0d..fcca8ee73cdd 100644
--- a/pkgs/by-name/xc/xcat/package.nix
+++ b/pkgs/by-name/xc/xcat/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "orf";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "01r5998gdvqjdrahpk0ci27lx9yghbddlanqcspr3qp5y5930i0s";
   };
 
diff --git a/pkgs/by-name/xc/xcb-imdkit/package.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix
index 8375b8348f93..538b84c1c4bf 100644
--- a/pkgs/by-name/xc/xcb-imdkit/package.nix
+++ b/pkgs/by-name/xc/xcb-imdkit/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "xcb-imdkit";
-    tag = version;
+    rev = version;
     hash = "sha256-QfuetGPY6u4OhFiE5/CoVEpdODWnd1PHWBtM3ymsZ98=";
   };
 
diff --git a/pkgs/by-name/xc/xcfun/package.nix b/pkgs/by-name/xc/xcfun/package.nix
index bb839c638ef0..1241bbc6f64e 100644
--- a/pkgs/by-name/xc/xcfun/package.nix
+++ b/pkgs/by-name/xc/xcfun/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dftlibs";
     repo = "xcfun";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1bj70cnhbh6ziy02x988wwl7cbwaq17ld7qwhswqkgnnx8rpgxid";
   };
 
diff --git a/pkgs/by-name/xc/xchm/package.nix b/pkgs/by-name/xc/xchm/package.nix
index ca5badba00f0..3472dbfa0d57 100644
--- a/pkgs/by-name/xc/xchm/package.nix
+++ b/pkgs/by-name/xc/xchm/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rzvncj";
     repo = "xCHM";
-    tag = version;
+    rev = version;
     sha256 = "sha256-UMn8ds4nheuYSu0PesxdGoyxyn5AcKq9WByeRUxxx3k=";
   };
 
diff --git a/pkgs/by-name/xc/xclip/package.nix b/pkgs/by-name/xc/xclip/package.nix
index 9fff1976eee7..5b3383dae99c 100644
--- a/pkgs/by-name/xc/xclip/package.nix
+++ b/pkgs/by-name/xc/xclip/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "astrand";
     repo = "xclip";
-    tag = version;
+    rev = version;
     sha256 = "0q0hmvcjlv8arhh1pzhja2wglyj6n7z209jnpnzd281kqqv4czcs";
   };
 
diff --git a/pkgs/by-name/xc/xcodes/package.nix b/pkgs/by-name/xc/xcodes/package.nix
index 73510e0112f7..bd5a56ce145d 100644
--- a/pkgs/by-name/xc/xcodes/package.nix
+++ b/pkgs/by-name/xc/xcodes/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "XcodesOrg";
     repo = "xcodes";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-TwPfASRU98rifyA/mINFfoY0MbbwmAh8JneVpJa38CA=";
   };
 
diff --git a/pkgs/by-name/xc/xcolor/package.nix b/pkgs/by-name/xc/xcolor/package.nix
index 8b75f4821f13..b85df70ff98a 100644
--- a/pkgs/by-name/xc/xcolor/package.nix
+++ b/pkgs/by-name/xc/xcolor/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Soft";
     repo = "xcolor";
-    tag = version;
+    rev = version;
     sha256 = "sha256-NfmoBZek4hsga6RflE5EKkWarhCFIcTwEXhg2fpkxNE=";
   };
 
diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix
index ee7fd5e76cc7..2165afeda87d 100644
--- a/pkgs/by-name/xc/xcp/package.nix
+++ b/pkgs/by-name/xc/xcp/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tarka";
     repo = "xcp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tAECD3gNx6RDzEJhGt2nrykxHfh4S1qJKt9yNdZpuGs=";
   };
 
diff --git a/pkgs/by-name/xc/xcur2png/package.nix b/pkgs/by-name/xc/xcur2png/package.nix
index 22057453fc6d..60bfb9b72e38 100644
--- a/pkgs/by-name/xc/xcur2png/package.nix
+++ b/pkgs/by-name/xc/xcur2png/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eworm-de";
     repo = "xcur2png";
-    tag = version;
+    rev = version;
     sha256 = "0858wn2p14bxpv9lvaz2bz1rk6zk0g8zgxf8iy595m8fqv4q2fya";
   };
 
diff --git a/pkgs/by-name/xd/xd/package.nix b/pkgs/by-name/xd/xd/package.nix
index 61d5b1cad2a0..eb4c92925411 100644
--- a/pkgs/by-name/xd/xd/package.nix
+++ b/pkgs/by-name/xd/xd/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "majestrate";
     repo = "XD";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-k8Mm0tC7wiBmHFdCX38Rz7ccEFkdeArzGJVHTLQ7iWY=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
index 4db64c762ac1..2cc28e37711d 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "flatpak";
     repo = "xdg-desktop-portal-gtk";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-aeSm6Wd0EMaZb7tYpnKT/QBt9l/fVyQLgvn5aBqQOAc=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix
index 92c99c113f9d..0fe1a24e1f09 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Decodetalkers";
     repo = "xdg-desktop-portal-shana";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9uie6VFyi7sO8DbthUTgpEc68MvvLA+bUwyV/DSpKkE=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
index 5de32b747857..0151ea6ed1cb 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emersion";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GIIDeZMIGUiZV0IUhcclRVThE5LKaqVc5VwnNT8beNU=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
index f22e6565c4df..36d80571c5ea 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xdg-desktop-portal-xapp";
-    tag = version;
+    rev = version;
     hash = "sha256-9v0faB5HhUUPXOWDDyTUPaPwzMjhqdiAyuv9kM4mm2Q=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-launch/package.nix b/pkgs/by-name/xd/xdg-launch/package.nix
index f551503b8c93..7944270548af 100644
--- a/pkgs/by-name/xd/xdg-launch/package.nix
+++ b/pkgs/by-name/xd/xdg-launch/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bbidulock";
     repo = "xdg-launch";
-    tag = version;
+    rev = version;
     sha256 = "sha256-S/0Wn1T5MSOPN6QXkzfmygHL6XTAnnMJr5Z3fBzsHEw=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-ninja/package.nix b/pkgs/by-name/xd/xdg-ninja/package.nix
index d74943d86d2f..0de1ec79c389 100644
--- a/pkgs/by-name/xd/xdg-ninja/package.nix
+++ b/pkgs/by-name/xd/xdg-ninja/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "b3nj5m1n";
     repo = "xdg-ninja";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ASJIFQ/BpZMQGRtw8kPhtMCbXC1eb/X8TWQz+CAnaSM=";
   };
 
diff --git a/pkgs/by-name/xd/xdg-utils-cxx/package.nix b/pkgs/by-name/xd/xdg-utils-cxx/package.nix
index 05f5efdecfd4..d5c9e7c9aff8 100644
--- a/pkgs/by-name/xd/xdg-utils-cxx/package.nix
+++ b/pkgs/by-name/xd/xdg-utils-cxx/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "azubieta";
     repo = "xdg-utils-cxx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hEN0xqZUNfMOIrw3q+x4kEFhYoqmyn7W3f2w8AGw2wI=";
   };
 
diff --git a/pkgs/by-name/xd/xdgmenumaker/package.nix b/pkgs/by-name/xd/xdgmenumaker/package.nix
index 4f7c7909174f..d52029b89ee3 100644
--- a/pkgs/by-name/xd/xdgmenumaker/package.nix
+++ b/pkgs/by-name/xd/xdgmenumaker/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gapan";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "rh1rRgbw8uqii4oN3XXNNKsWam1d8TY0qGceHERlG1k=";
   };
 
diff --git a/pkgs/by-name/xd/xdo/package.nix b/pkgs/by-name/xd/xdo/package.nix
index c1be4711152c..dfb804c030e4 100644
--- a/pkgs/by-name/xd/xdo/package.nix
+++ b/pkgs/by-name/xd/xdo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "xdo";
-    tag = version;
+    rev = version;
     sha256 = "1h3jrygcjjbavdbkpx2hscsf0yf97gk487lzjdlvymd7dxdv9hy9";
   };
 
diff --git a/pkgs/by-name/xd/xdotool/package.nix b/pkgs/by-name/xd/xdotool/package.nix
index c04b58cffe49..96dc805e0c02 100644
--- a/pkgs/by-name/xd/xdotool/package.nix
+++ b/pkgs/by-name/xd/xdotool/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jordansissel";
     repo = "xdotool";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-XFiaiHHtUSNFw+xhUR29+2RUHOa+Eyj1HHfjCUjwd9k=";
   };
 
diff --git a/pkgs/by-name/xd/xdp-tools/package.nix b/pkgs/by-name/xd/xdp-tools/package.nix
index 839931616093..7b6a0fd9606a 100644
--- a/pkgs/by-name/xd/xdp-tools/package.nix
+++ b/pkgs/by-name/xd/xdp-tools/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xdp-project";
     repo = "xdp-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NJawacCrmTuRXsOiAOMD8RaljPnuPFISoWEgiDcInw8=";
   };
 
diff --git a/pkgs/by-name/xe/xe-guest-utilities/package.nix b/pkgs/by-name/xe/xe-guest-utilities/package.nix
index 71ebf0a365d8..4d63c8660ac3 100644
--- a/pkgs/by-name/xe/xe-guest-utilities/package.nix
+++ b/pkgs/by-name/xe/xe-guest-utilities/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xenserver";
     repo = "xe-guest-utilities";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LpZx+Km2qRywYK/eFLP3aCDku6K6HC4+MzEODH+8Gvs=";
   };
 
diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix
index 8b990e55b13e..6809ecac4198 100644
--- a/pkgs/by-name/xe/xed-editor/package.nix
+++ b/pkgs/by-name/xe/xed-editor/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xed";
-    tag = version;
+    rev = version;
     hash = "sha256-LSAOo6lPm6CQdTNxfAIthul9I9VnWpbEo1vOnKN7SNU=";
   };
 
diff --git a/pkgs/by-name/xe/xed/package.nix b/pkgs/by-name/xe/xed/package.nix
index 7631b6ef40d1..1bb99548bb5e 100644
--- a/pkgs/by-name/xe/xed/package.nix
+++ b/pkgs/by-name/xe/xed/package.nix
@@ -15,7 +15,7 @@ let
     src = fetchFromGitHub {
       owner = "intelxed";
       repo = "mbuild";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-nVHHiaPbf+b+RntjUGjLLGS53e6c+seXIBx7AcTtiWU=";
     };
   };
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intelxed";
     repo = "xed";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LF4iJ1/Z3OifCiir/kU3ufZqtiRLeaJeAwuBqP2BCF4=";
   };
 
diff --git a/pkgs/by-name/xe/xenomapper/package.nix b/pkgs/by-name/xe/xenomapper/package.nix
index b2cc6176acb0..212b5c7ef9dd 100644
--- a/pkgs/by-name/xe/xenomapper/package.nix
+++ b/pkgs/by-name/xe/xenomapper/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "genomematt";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0mnmfzlq5mhih6z8dq5bkx95vb8whjycz9mdlqwbmlqjb3gb3zhr";
   };
 
diff --git a/pkgs/by-name/xe/xephem/package.nix b/pkgs/by-name/xe/xephem/package.nix
index 33a73eeca0a5..edaec00e8670 100644
--- a/pkgs/by-name/xe/xephem/package.nix
+++ b/pkgs/by-name/xe/xephem/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "XEphem";
     repo = "XEphem";
-    tag = version;
+    rev = version;
     hash = "sha256-TuzXrWoJOAHg31DrJObPcHBXgtqR/KWKFRsqddPzL4c=";
   };
 
diff --git a/pkgs/by-name/xe/xeus-zmq/package.nix b/pkgs/by-name/xe/xeus-zmq/package.nix
index bf425a3005bb..ae4374163458 100644
--- a/pkgs/by-name/xe/xeus-zmq/package.nix
+++ b/pkgs/by-name/xe/xeus-zmq/package.nix
@@ -19,7 +19,7 @@ clangStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jupyter-xeus";
     repo = "xeus-zmq";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-CrFb0LDb6akCfFnwMSa4H3D3A8KJx9Kiejw6VeV3IDs=";
   };
 
diff --git a/pkgs/by-name/xf/xf86_input_cmt/package.nix b/pkgs/by-name/xf/xf86_input_cmt/package.nix
index 8be5ec148898..80c8f895aa3d 100644
--- a/pkgs/by-name/xf/xf86_input_cmt/package.nix
+++ b/pkgs/by-name/xf/xf86_input_cmt/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hugegreenbug";
     repo = "xf86-input-cmt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1cnwf518nc0ybc1r3rsgc1gcql1k3785khffv0i4v3akrm9wdw98";
   };
 
diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix
index 7c8096a0b4c5..6489f3d4fdcf 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;
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-k1k6K11cWpG6PtzTt99q/rrkN3FyxCVEzfPI9fCTAjM=";
   };
diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix
index 01ff30aedf7c..a91cba99b26e 100644
--- a/pkgs/by-name/xh/xh/package.nix
+++ b/pkgs/by-name/xh/xh/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ducaale";
     repo = "xh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5Eq/rJ917zjlTnuxdIWhBNr8LA/ag+fyECYYX5k2S7I=";
   };
 
diff --git a/pkgs/by-name/xi/xiccd/package.nix b/pkgs/by-name/xi/xiccd/package.nix
index 47bc4336754c..30fa495d71a0 100644
--- a/pkgs/by-name/xi/xiccd/package.nix
+++ b/pkgs/by-name/xi/xiccd/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agalakhov";
     repo = "xiccd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "159fyz5535lcabi5bzmxgmjdgxlqcjaiqgzr00mi3ax0i5fdldwn";
   };
 
diff --git a/pkgs/by-name/xi/xilinx-bootgen/package.nix b/pkgs/by-name/xi/xilinx-bootgen/package.nix
index 4004b1764680..57abaf0e36d6 100644
--- a/pkgs/by-name/xi/xilinx-bootgen/package.nix
+++ b/pkgs/by-name/xi/xilinx-bootgen/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xilinx";
     repo = "bootgen";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-t165nTG4IkI3WrcS3ZryINmAOVzfctxg5zY3oqmNtLw=";
   };
 
diff --git a/pkgs/by-name/xi/xinput_calibrator/package.nix b/pkgs/by-name/xi/xinput_calibrator/package.nix
index 2fbd1a16b6d2..e54ab099c874 100644
--- a/pkgs/by-name/xi/xinput_calibrator/package.nix
+++ b/pkgs/by-name/xi/xinput_calibrator/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tias";
     repo = "xinput_calibrator";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "5ZkNw+CKNUcPt1PY5PLzB/OT2wcf5n3UcaQlmMcwRVE=";
   };
 
diff --git a/pkgs/by-name/xi/xiphos/package.nix b/pkgs/by-name/xi/xiphos/package.nix
index e39afacab389..b990de90fee8 100644
--- a/pkgs/by-name/xi/xiphos/package.nix
+++ b/pkgs/by-name/xi/xiphos/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "crosswire";
     repo = "xiphos";
-    tag = version;
+    rev = version;
     hash = "sha256-H5Q+azE2t3fgu77C9DxrkeUCJ7iJz3Cc91Ln4dqLvD8=";
   };
 
diff --git a/pkgs/by-name/xi/xits-math/package.nix b/pkgs/by-name/xi/xits-math/package.nix
index 83dad5068e9c..d997fad5d11f 100644
--- a/pkgs/by-name/xi/xits-math/package.nix
+++ b/pkgs/by-name/xi/xits-math/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alif-type";
     repo = "xits";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1x3r505dylz9rz8dj98h5n9d0zixyxmvvhnjnms9qxdrz9bxy9g1";
   };
 
diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix
index f96751c17605..7d9433cc4221 100644
--- a/pkgs/by-name/xi/xiu/package.nix
+++ b/pkgs/by-name/xi/xiu/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "harlanc";
     repo = "xiu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EjyvCwqcPkOe69YnDiAExtBNPhsqqGa95ao+bn6wcyA=";
   };
 
diff --git a/pkgs/by-name/xj/xjadeo/package.nix b/pkgs/by-name/xj/xjadeo/package.nix
index 2842021129fc..6ba651e7244a 100644
--- a/pkgs/by-name/xj/xjadeo/package.nix
+++ b/pkgs/by-name/xj/xjadeo/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "x42";
     repo = "xjadeo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GTg0W3D0BRSxsmeVsB4On3MfwncScEGFJGVJK7wflCM=";
   };
 
diff --git a/pkgs/by-name/xk/xkb-switch-i3/package.nix b/pkgs/by-name/xk/xkb-switch-i3/package.nix
index 2b65df932864..bf7954c782b7 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";
-    tag = version;
+    rev = version;
     hash = "sha256-5d1DdRtz0QCWISSsWQt9xgTOekYUCkhfMsjG+/kyQK4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/xk/xkb-switch/package.nix b/pkgs/by-name/xk/xkb-switch/package.nix
index 3466119a2da0..8ecfe8d4ef5f 100644
--- a/pkgs/by-name/xk/xkb-switch/package.nix
+++ b/pkgs/by-name/xk/xkb-switch/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ierton";
     repo = "xkb-switch";
-    tag = version;
+    rev = version;
     sha256 = "sha256-DZAIL6+D+Hgs+fkJwRaQb9BHrEjAkxiqhOZyrR+Mpuk=";
   };
 
diff --git a/pkgs/by-name/xk/xkblayout-state/package.nix b/pkgs/by-name/xk/xkblayout-state/package.nix
index 5e821e52480b..85798f902184 100644
--- a/pkgs/by-name/xk/xkblayout-state/package.nix
+++ b/pkgs/by-name/xk/xkblayout-state/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nonpop";
     repo = "xkblayout-state";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-diorqwDEBdzcBteKvhRisQaY3bx5seaOaWSaPwBkWDo=";
   };
 
diff --git a/pkgs/by-name/xk/xkbmon/package.nix b/pkgs/by-name/xk/xkbmon/package.nix
index a1a66eedf1ce..a6cef8a63a07 100644
--- a/pkgs/by-name/xk/xkbmon/package.nix
+++ b/pkgs/by-name/xk/xkbmon/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xkbmon";
     repo = "xkbmon";
-    tag = version;
+    rev = version;
     sha256 = "sha256-EWW6L6NojzXodDOET01LMcQT8/1JIMpOD++MCiM3j1Y=";
   };
 
diff --git a/pkgs/by-name/xl/xl2tpd/package.nix b/pkgs/by-name/xl/xl2tpd/package.nix
index 2126393b11fa..9921812ed5cc 100644
--- a/pkgs/by-name/xl/xl2tpd/package.nix
+++ b/pkgs/by-name/xl/xl2tpd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xelerance";
     repo = "xl2tpd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Uc3PeTf/ow9p8noPcMLdT6S5dks9igDU6CC9koy+ff4=";
   };
 
diff --git a/pkgs/by-name/xl/xlayoutdisplay/package.nix b/pkgs/by-name/xl/xlayoutdisplay/package.nix
index 3795b6e024a8..03d32d6ee66a 100644
--- a/pkgs/by-name/xl/xlayoutdisplay/package.nix
+++ b/pkgs/by-name/xl/xlayoutdisplay/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alex-courtis";
     repo = "xlayoutdisplay";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A37jFhVTW/3QNEf776Oi3ViRK+ebOPRTsEQqdmNhA7E=";
   };
 
diff --git a/pkgs/by-name/xl/xlibinput-calibrator/package.nix b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
index 310fc9b255a0..2fc3a5640d01 100644
--- a/pkgs/by-name/xl/xlibinput-calibrator/package.nix
+++ b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kreijack";
     repo = "xlibinput_calibrator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MvlamN8WSER0zN9Ru3Kr2MFARD9s7PYKkRtyD8s6ZPI=";
   };
 
diff --git a/pkgs/by-name/xm/xmenu/package.nix b/pkgs/by-name/xm/xmenu/package.nix
index 24041d0fc4a8..23569e6a12c7 100644
--- a/pkgs/by-name/xm/xmenu/package.nix
+++ b/pkgs/by-name/xm/xmenu/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phillbush";
     repo = "xmenu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Gg4hSBBVBOB/wlY44C5bJOuOnLoA/tPvcNZamXae/WE=";
   };
 
diff --git a/pkgs/by-name/xm/xml-security-c/package.nix b/pkgs/by-name/xm/xml-security-c/package.nix
index d73df6742b34..e198848d0fa2 100644
--- a/pkgs/by-name/xm/xml-security-c/package.nix
+++ b/pkgs/by-name/xm/xml-security-c/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://git.shibboleth.net/git/cpp-xml-security";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-D60JtD4p9ERh6sowvwBHtE9XWVm3D8saooagDvA6ZtQ=";
   };
 
diff --git a/pkgs/by-name/xm/xml-tooling-c/package.nix b/pkgs/by-name/xm/xml-tooling-c/package.nix
index 427ff86e8024..118b087dba8a 100644
--- a/pkgs/by-name/xm/xml-tooling-c/package.nix
+++ b/pkgs/by-name/xm/xml-tooling-c/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.shibboleth.net/git/cpp-xmltooling.git";
-    tag = version;
+    rev = version;
     hash = "sha256-czmBu7ThDwq+x7FahgZDMHqid8jeUNnTuKMI/Fj4IIw=";
   };
 
diff --git a/pkgs/by-name/xm/xmldiff/package.nix b/pkgs/by-name/xm/xmldiff/package.nix
index c615ef91dc1a..20c03ad733e4 100644
--- a/pkgs/by-name/xm/xmldiff/package.nix
+++ b/pkgs/by-name/xm/xmldiff/package.nix
@@ -9,7 +9,7 @@ let
   src = fetchFromGitHub {
     owner = "Shoobx";
     repo = "xmldiff";
-    tag = version;
+    rev = version;
     hash = "sha256-qn8gGultTSNKPUro6Ap4xJGcbpxV+lKgZFpKvyPdhtc=";
   };
 in
diff --git a/pkgs/by-name/xm/xmloscopy/package.nix b/pkgs/by-name/xm/xmloscopy/package.nix
index fd29bfba9cc0..b547ede58132 100644
--- a/pkgs/by-name/xm/xmloscopy/package.nix
+++ b/pkgs/by-name/xm/xmloscopy/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grahamc";
     repo = "xmloscopy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "06y5bckrmnq7b5ny2hfvlmdws910jw3xbw5nzy3bcpqsccqnjxrc";
   };
 
diff --git a/pkgs/by-name/xm/xmlroff/package.nix b/pkgs/by-name/xm/xmlroff/package.nix
index be5f4ca298c8..bfa6a4578ffc 100644
--- a/pkgs/by-name/xm/xmlroff/package.nix
+++ b/pkgs/by-name/xm/xmlroff/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xmlroff";
     repo = "xmlroff";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0dgp72094lx9i9gvg21pp8ak7bg39707rdf6wz011p9s6n6lrq5g";
   };
 
diff --git a/pkgs/by-name/xm/xmltoman/package.nix b/pkgs/by-name/xm/xmltoman/package.nix
index a17f1c2c6a0e..6a3f7cbcb38a 100644
--- a/pkgs/by-name/xm/xmltoman/package.nix
+++ b/pkgs/by-name/xm/xmltoman/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "atsb";
     repo = "xmltoman";
-    tag = version;
+    rev = version;
     hash = "sha256-EmFdGIeBEcTY0Pqp7BJded9WB/DaXWcMNWh6aTsZlLg=";
   };
 
diff --git a/pkgs/by-name/xm/xmoto/package.nix b/pkgs/by-name/xm/xmoto/package.nix
index 026c3ebda8ca..a25518bc2507 100644
--- a/pkgs/by-name/xm/xmoto/package.nix
+++ b/pkgs/by-name/xm/xmoto/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DNljUd7FSH0fTgQx8LMqItZ54aLZtwMUPzqR8Z820SM=";
   };
 
diff --git a/pkgs/by-name/xm/xmousepasteblock/package.nix b/pkgs/by-name/xm/xmousepasteblock/package.nix
index d21302d52172..ba74ded883e0 100644
--- a/pkgs/by-name/xm/xmousepasteblock/package.nix
+++ b/pkgs/by-name/xm/xmousepasteblock/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "milaq";
     repo = "XMousePasteBlock";
     hash = "sha256-uHlHGVnIro6X4kRp79ibtqMmiv2XQT+zgbQagUxdB0c=";
-    tag = version;
+    rev = version;
   };
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/xm/xmpp-bridge/package.nix b/pkgs/by-name/xm/xmpp-bridge/package.nix
index 00eb7fa1c486..68f13d58c0b3 100644
--- a/pkgs/by-name/xm/xmpp-bridge/package.nix
+++ b/pkgs/by-name/xm/xmpp-bridge/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "majewsky";
     repo = "xmpp-bridge";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JXhVi2AiV/PmWPfoQJl/N92GAZQ9UxReAiCkiDxgdFY=";
   };
 
diff --git a/pkgs/by-name/xm/xmppc/package.nix b/pkgs/by-name/xm/xmppc/package.nix
index a6e0a54ec428..f7d7d3d12d3e 100644
--- a/pkgs/by-name/xm/xmppc/package.nix
+++ b/pkgs/by-name/xm/xmppc/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "Anoxinon_e.V.";
     repo = "xmppc";
-    tag = version;
+    rev = version;
     sha256 = "07cy3j4g7vycagdiva3dqb59361lw7s5f2yydpczmyih29v7hkm8";
   };
 
diff --git a/pkgs/by-name/xm/xmrig-mo/package.nix b/pkgs/by-name/xm/xmrig-mo/package.nix
index 012b9390f3e1..6db6bf7349c0 100644
--- a/pkgs/by-name/xm/xmrig-mo/package.nix
+++ b/pkgs/by-name/xm/xmrig-mo/package.nix
@@ -11,7 +11,7 @@ xmrig.overrideAttrs (oldAttrs: rec {
   src = fetchFromGitHub {
     owner = "MoneroOcean";
     repo = "xmrig";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pJ4NTdpWCt7C98k1EqGoiU0Lup25Frdm1kFJuwTfXgY=";
   };
 
diff --git a/pkgs/by-name/xm/xmrig-proxy/package.nix b/pkgs/by-name/xm/xmrig-proxy/package.nix
index 5a5286368f07..3bbc7ee70883 100644
--- a/pkgs/by-name/xm/xmrig-proxy/package.nix
+++ b/pkgs/by-name/xm/xmrig-proxy/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig-proxy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qRn/FiYvogGFUIUj3CojtfO6fXRZghH+bgRP+ysI6mc=";
   };
 
diff --git a/pkgs/by-name/xm/xmrig/package.nix b/pkgs/by-name/xm/xmrig/package.nix
index ed8b53a26228..bd8895534285 100644
--- a/pkgs/by-name/xm/xmrig/package.nix
+++ b/pkgs/by-name/xm/xmrig/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/1pSGbKBfin7xqoILacKp2//65NNiBXZxzhO39FOOjY=";
   };
 
diff --git a/pkgs/by-name/xn/xnotify/package.nix b/pkgs/by-name/xn/xnotify/package.nix
index ac2905ed6261..969a76eacd7b 100644
--- a/pkgs/by-name/xn/xnotify/package.nix
+++ b/pkgs/by-name/xn/xnotify/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phillbush";
     repo = "xnotify";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RfnmiAEFTPqQZursyVPDIZ6J3KBouvaaxyhTc1liqBc=";
   };
 
diff --git a/pkgs/by-name/xo/xob/package.nix b/pkgs/by-name/xo/xob/package.nix
index e82bf9c26dca..001bd80ec3ea 100644
--- a/pkgs/by-name/xo/xob/package.nix
+++ b/pkgs/by-name/xo/xob/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "florentc";
     repo = "xob";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1x4aafiyd9k4y8cmvn7rgfif3g5s5hhlbj5nz71qsyqg21nn7hrw";
   };
 
diff --git a/pkgs/by-name/xo/xorex/package.nix b/pkgs/by-name/xo/xorex/package.nix
index 148518795fc2..e28cc7227fe4 100644
--- a/pkgs/by-name/xo/xorex/package.nix
+++ b/pkgs/by-name/xo/xorex/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Neo23x0";
     repo = "xorex";
-    tag = version;
+    rev = version;
     sha256 = "rBsOSXWnHRhpLmq20XBuGx8gGBM8ouMyOISkbzUcvE4=";
   };
 
diff --git a/pkgs/by-name/xo/xosview/package.nix b/pkgs/by-name/xo/xosview/package.nix
index b8d45790dd62..4c165f639c51 100644
--- a/pkgs/by-name/xo/xosview/package.nix
+++ b/pkgs/by-name/xo/xosview/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hills";
     repo = "xosview";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-9Pr7voJiCH7oBziMFRHCWxoyuGdndcdRD2POjiNT7yw=";
   };
 
diff --git a/pkgs/by-name/xp/xpano/package.nix b/pkgs/by-name/xp/xpano/package.nix
index 88ea61c37c11..da0ef84d8a93 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 = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-f2qoBpZ5lPBocPas8KMsY5bSYL20gO+ZHLz2R66qSig=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/xp/xpar/package.nix b/pkgs/by-name/xp/xpar/package.nix
index 944963d160f9..0409a1351b70 100644
--- a/pkgs/by-name/xp/xpar/package.nix
+++ b/pkgs/by-name/xp/xpar/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kspalaiologos";
     repo = "xpar";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-DMUDWQqYSQjGxYOpcfwNaaM21avcZ1w3IqEhuOaabrw=";
   };
 
diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix
index 1676301981cb..7ea709aadb76 100644
--- a/pkgs/by-name/xp/xplr/package.nix
+++ b/pkgs/by-name/xp/xplr/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sayanarijit";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0c2QJUEQwKEzzDBDP5XdX7xe1rivazsoZtepB4Dxp/c=";
   };
 
diff --git a/pkgs/by-name/xp/xplugd/package.nix b/pkgs/by-name/xp/xplugd/package.nix
index dedfb6b29a7f..e536c9b8e3b6 100644
--- a/pkgs/by-name/xp/xplugd/package.nix
+++ b/pkgs/by-name/xp/xplugd/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "xplugd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "11vjr69prrs4ir9c267zwq4g9liipzrqi0kmw1zg95dbn7r7zmql";
   };
 
diff --git a/pkgs/by-name/xp/xprintidle/package.nix b/pkgs/by-name/xp/xprintidle/package.nix
index bab02e2e7b51..7ded44bf7a21 100644
--- a/pkgs/by-name/xp/xprintidle/package.nix
+++ b/pkgs/by-name/xp/xprintidle/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "g0hl1n";
     repo = "xprintidle";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-MawkT4RconRDDCNnaWMxU18lK34ywcebbiHlYeZn/lc=";
   };
 
diff --git a/pkgs/by-name/xp/xprompt/package.nix b/pkgs/by-name/xp/xprompt/package.nix
index 9aa15652d476..bc10c7b44b66 100644
--- a/pkgs/by-name/xp/xprompt/package.nix
+++ b/pkgs/by-name/xp/xprompt/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phillbush";
     repo = "xprompt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pOayKngUlrMY3bFsP4Fi+VsOLKCUQU3tdkZ+0OY1SCo=";
   };
 
diff --git a/pkgs/by-name/xq/xq-xml/package.nix b/pkgs/by-name/xq/xq-xml/package.nix
index 6f490b8a1cc8..94571f41c3f8 100644
--- a/pkgs/by-name/xq/xq-xml/package.nix
+++ b/pkgs/by-name/xq/xq-xml/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sibprogrammer";
     repo = "xq";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KLpf4db3D+SQzbitc9ROO+k/VHggWpwZmwwhV3QVNiE=";
   };
 
diff --git a/pkgs/by-name/xr/xrandr-invert-colors/package.nix b/pkgs/by-name/xr/xrandr-invert-colors/package.nix
index 7a79e5c4fc7e..ecc75ba4c2b4 100644
--- a/pkgs/by-name/xr/xrandr-invert-colors/package.nix
+++ b/pkgs/by-name/xr/xrandr-invert-colors/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zoltanp";
     repo = "xrandr-invert-colors";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-MIbHNJFDQsvjPUbperTKKbHY5GSgItvRyV5OsfpzYT4=";
   };
 
diff --git a/pkgs/by-name/xr/xray/package.nix b/pkgs/by-name/xr/xray/package.nix
index f30c3f8e0d3c..f59b6c858e1e 100644
--- a/pkgs/by-name/xr/xray/package.nix
+++ b/pkgs/by-name/xr/xray/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "XTLS";
     repo = "Xray-core";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1KJ6YUYpOHp9AFSDmbPWqcyRdf/4XNQtuT9oiNcKRnU=";
   };
 
diff --git a/pkgs/by-name/xr/xrdp/package.nix b/pkgs/by-name/xr/xrdp/package.nix
index 8ed2b4b6d386..69e8592aa7dd 100644
--- a/pkgs/by-name/xr/xrdp/package.nix
+++ b/pkgs/by-name/xr/xrdp/package.nix
@@ -34,7 +34,7 @@ let
     src = fetchFromGitHub {
       owner = "neutrinolabs";
       repo = "xorgxrdp";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-xwkGY9dD747kyTvoXrYAIoiFBzQe5ngskUYQhDawnbU=";
     };
 
@@ -83,7 +83,7 @@ let
       src = fetchFromGitHub {
         owner = "neutrinolabs";
         repo = "xrdp";
-        tag = "v${version}";
+        rev = "v${version}";
         fetchSubmodules = true;
         hash = "sha256-lqifQJ/JX+0304arVctsEBEDFPhEPn2OWLyjAQW1who=";
       };
diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix
index 4a06c6de4419..d39cdd541b85 100644
--- a/pkgs/by-name/xr/xreader/package.nix
+++ b/pkgs/by-name/xr/xreader/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-qBnnxygkAn1wF3gtqR0At1e1e+sx1/2MoSWqmshW5Qg=";
   };
 
diff --git a/pkgs/by-name/xr/xrectsel/package.nix b/pkgs/by-name/xr/xrectsel/package.nix
index 67d4ce516832..4673d4a8017d 100644
--- a/pkgs/by-name/xr/xrectsel/package.nix
+++ b/pkgs/by-name/xr/xrectsel/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ropery";
     repo = "xrectsel";
-    tag = version;
+    rev = version;
     sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l";
   };
 
diff --git a/pkgs/by-name/xs/xschem/package.nix b/pkgs/by-name/xs/xschem/package.nix
index 5fe788a0a391..0cd6d92c16c7 100644
--- a/pkgs/by-name/xs/xschem/package.nix
+++ b/pkgs/by-name/xs/xschem/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "StefanSchippers";
     repo = "xschem";
-    tag = version;
+    rev = version;
     hash = "sha256-+ygwHkQOXmkoNgcuofwuaZcpYTAV6sOmvO4xeE+8DXE=";
   };
 
diff --git a/pkgs/by-name/xs/xsecurelock/package.nix b/pkgs/by-name/xs/xsecurelock/package.nix
index e9d9ef2f5d1e..28dc1c642ef5 100644
--- a/pkgs/by-name/xs/xsecurelock/package.nix
+++ b/pkgs/by-name/xs/xsecurelock/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "xsecurelock";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OPasi5zmvmcWnVCj/dU2KprzNmar51zDElD23750yk4=";
   };
 
diff --git a/pkgs/by-name/xs/xsel/package.nix b/pkgs/by-name/xs/xsel/package.nix
index 94f36234e699..d929ae669155 100644
--- a/pkgs/by-name/xs/xsel/package.nix
+++ b/pkgs/by-name/xs/xsel/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kfish";
     repo = "xsel";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-F2w/Ad8IWxJNH90/0a9+1M8bLfn1M3m4TH3PNpQmEFI=";
   };
 
diff --git a/pkgs/by-name/xs/xsettingsd/package.nix b/pkgs/by-name/xs/xsettingsd/package.nix
index 5815a87217f2..ac54cd7f77c7 100644
--- a/pkgs/by-name/xs/xsettingsd/package.nix
+++ b/pkgs/by-name/xs/xsettingsd/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "derat";
     repo = "xsettingsd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-CIYshZqJICuL8adKHIN4R6nudaqWOCK2UPrGhsKf9pE=";
   };
 
diff --git a/pkgs/by-name/xs/xsimd/package.nix b/pkgs/by-name/xs/xsimd/package.nix
index b5df45942bab..a96de8723816 100644
--- a/pkgs/by-name/xs/xsimd/package.nix
+++ b/pkgs/by-name/xs/xsimd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xtensor-stack";
     repo = "xsimd";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE=";
   };
   patches =
diff --git a/pkgs/by-name/xs/xsos/package.nix b/pkgs/by-name/xs/xsos/package.nix
index 20a024d64861..9583dadd9e8a 100644
--- a/pkgs/by-name/xs/xsos/package.nix
+++ b/pkgs/by-name/xs/xsos/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ryran";
     repo = "xsos";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VEOY422/+4veMlN9HOtPB/THDiFLNnRfbUJpKjc/cqE=";
   };
 
diff --git a/pkgs/by-name/xs/xssproxy/package.nix b/pkgs/by-name/xs/xssproxy/package.nix
index b27ff216be82..4ee27f971413 100644
--- a/pkgs/by-name/xs/xssproxy/package.nix
+++ b/pkgs/by-name/xs/xssproxy/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vincentbernat";
     repo = "xssproxy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OPzFI1ifbV/DJo0hC2xybHKaWTprictN0muKtuq1JaY=";
   };
 
diff --git a/pkgs/by-name/xs/xstow/package.nix b/pkgs/by-name/xs/xstow/package.nix
index 7102bf70bb82..83957658f852 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";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-c89+thw5N3Cgl1Ww+W7c3YsyhNJMLlreedvdWJFY3WY=";
   };
diff --git a/pkgs/by-name/xs/xsuspender/package.nix b/pkgs/by-name/xs/xsuspender/package.nix
index c66c4862bf6c..2d4c230ee712 100644
--- a/pkgs/by-name/xs/xsuspender/package.nix
+++ b/pkgs/by-name/xs/xsuspender/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kernc";
     repo = "xsuspender";
-    tag = version;
+    rev = version;
     sha256 = "1c6ab1s9bbkjbmcfv2mny273r66dlz7sgxsmzfwi0fm2vcb2lwim";
   };
 
diff --git a/pkgs/by-name/xt/xtensor/package.nix b/pkgs/by-name/xt/xtensor/package.nix
index 6872565d5408..6a83fd42353a 100644
--- a/pkgs/by-name/xt/xtensor/package.nix
+++ b/pkgs/by-name/xt/xtensor/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xtensor-stack";
     repo = "xtensor";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-hVfdtYcJ6mzqj0AUu6QF9aVKQGYKd45RngY6UN3yOH4=";
   };
 
diff --git a/pkgs/by-name/xt/xteve/package.nix b/pkgs/by-name/xt/xteve/package.nix
index 8e514452b3bb..39c60136d205 100644
--- a/pkgs/by-name/xt/xteve/package.nix
+++ b/pkgs/by-name/xt/xteve/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xteve-project";
     repo = "xTeVe";
-    tag = version;
+    rev = version;
     hash = "sha256-hD4GudSkGZO41nR/CgcMg/SqKjpAO1yJDkfwa8AUges=";
   };
 
diff --git a/pkgs/by-name/xt/xtitle/package.nix b/pkgs/by-name/xt/xtitle/package.nix
index 06e57ff32eac..ec4e3867ad9a 100644
--- a/pkgs/by-name/xt/xtitle/package.nix
+++ b/pkgs/by-name/xt/xtitle/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "xtitle";
-    tag = version;
+    rev = version;
     hash = "sha256-SVfM2vCCacgchXj0c0sPk3VR6DUI4R0ofFnxJSY4oDg=";
   };
 
diff --git a/pkgs/by-name/xt/xtl/package.nix b/pkgs/by-name/xt/xtl/package.nix
index 8bdae88e4f72..2ca5932ac793 100644
--- a/pkgs/by-name/xt/xtl/package.nix
+++ b/pkgs/by-name/xt/xtl/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xtensor-stack";
     repo = "xtl";
-    tag = version;
+    rev = version;
     hash = "sha256-f8qYh8ibC/ToHsUv3OF1ujzt3fUe7kW9cNpGyLqsgqw=";
   };
 
diff --git a/pkgs/by-name/xt/xtuner/package.nix b/pkgs/by-name/xt/xtuner/package.nix
index 617b2fbc0d45..a2199f49e70d 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";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1i5chfnf3hcivwzni9z6cn9pb68qmwsx8bf4z7d29a5vig8kbhrv";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/xu/xunit-viewer/package.nix b/pkgs/by-name/xu/xunit-viewer/package.nix
index b78f99acb112..4e3ccd52d7ba 100644
--- a/pkgs/by-name/xu/xunit-viewer/package.nix
+++ b/pkgs/by-name/xu/xunit-viewer/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "lukejpreston";
     repo = "xunit-viewer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-n9k1Z/wofExG6k/BxtkU8M+Lo3XdCgCh8VFj9jcwL1Q=";
   };
 
diff --git a/pkgs/by-name/xv/xv/package.nix b/pkgs/by-name/xv/xv/package.nix
index 09d16d9fa805..ad9b264e893e 100644
--- a/pkgs/by-name/xv/xv/package.nix
+++ b/pkgs/by-name/xv/xv/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jasper-software";
     repo = "xv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-abmMrAxgccECsOi0eIy9/y0haPkUgbOl9wCgISLy5Rs=";
   };
 
diff --git a/pkgs/by-name/xv/xva-img/package.nix b/pkgs/by-name/xv/xva-img/package.nix
index 69e23d8831c0..64b3c36e9212 100644
--- a/pkgs/by-name/xv/xva-img/package.nix
+++ b/pkgs/by-name/xv/xva-img/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eriklax";
     repo = "xva-img";
-    tag = version;
+    rev = version;
     sha256 = "sha256-QHCKGsHSMT2P64No1IUCjenm1XZMSgEvsJGJOyHFZS8=";
   };
 
diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix
index 1528b082f962..cf8a368573b9 100644
--- a/pkgs/by-name/xv/xviewer/package.nix
+++ b/pkgs/by-name/xv/xviewer/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Wn1a/tGNIJNGbgDKoMMMo/oCXrqCXDM1nTUgCZt0O/U=";
   };
 
diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix
index 423d38199dac..f59e1d1b3e6e 100644
--- a/pkgs/by-name/xw/xwallpaper/package.nix
+++ b/pkgs/by-name/xw/xwallpaper/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stoeckmann";
     repo = "xwallpaper";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8VRQFH00yXplvhCqBuMGrwvOB7bJhfe50Ii6h8kvDMM=";
   };
 
diff --git a/pkgs/by-name/xx/xxHash/package.nix b/pkgs/by-name/xx/xxHash/package.nix
index b8449e5c477a..684af9642b1b 100644
--- a/pkgs/by-name/xx/xxHash/package.nix
+++ b/pkgs/by-name/xx/xxHash/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Cyan4973";
     repo = "xxHash";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-h6kohM+NxvQ89R9NEXZcYBG2wPOuB4mcyPfofKrx9wQ=";
   };
 
diff --git a/pkgs/by-name/ya/yad/package.nix b/pkgs/by-name/ya/yad/package.nix
index 369eb4298d8c..7b1bf736bcd0 100644
--- a/pkgs/by-name/ya/yad/package.nix
+++ b/pkgs/by-name/ya/yad/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "v1cont";
     repo = "yad";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Y7bp20fkNdSgBcSV1kPEpWEP7ASwZcScVRaPauwI72M=";
   };
 
diff --git a/pkgs/by-name/ya/yadm/package.nix b/pkgs/by-name/ya/yadm/package.nix
index 0b452c34ac08..b7bd0d18da74 100644
--- a/pkgs/by-name/ya/yadm/package.nix
+++ b/pkgs/by-name/ya/yadm/package.nix
@@ -37,7 +37,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TheLocehiliosan";
     repo = "yadm";
-    tag = version;
+    rev = version;
     hash = "sha256-VQhfRtg9wtquJGjhB8fFQqHIJ5GViMfNQQep13ZH5SE=";
   };
 
diff --git a/pkgs/by-name/ya/yaegi/package.nix b/pkgs/by-name/ya/yaegi/package.nix
index eff739c8c706..50426b5d7946 100644
--- a/pkgs/by-name/ya/yaegi/package.nix
+++ b/pkgs/by-name/ya/yaegi/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "traefik";
     repo = "yaegi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jpLx2z65KeCPC4AQgFmUUphmmiT4EeHwrYn3/rD4Rzg=";
   };
 
diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
index 651f2ed38bfc..0d8ebe02570f 100644
--- a/pkgs/by-name/ya/yafc-ce/package.nix
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -17,7 +17,7 @@ buildDotnetModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "shpaass";
     repo = "yafc-ce";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-jWJOJ00VXBaHogm3xUsV9Shvv9islRA+Z4fkln5VuWM=";
   };
 
diff --git a/pkgs/by-name/ya/yaft/package.nix b/pkgs/by-name/ya/yaft/package.nix
index 77c594d3bdb5..ceab3d6d8610 100644
--- a/pkgs/by-name/ya/yaft/package.nix
+++ b/pkgs/by-name/ya/yaft/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uobikiemukot";
     repo = "yaft";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0l1ig8wm545kpn4l7186rymny83jkahnjim290wsl7hsszfq1ckd";
   };
 
diff --git a/pkgs/by-name/ya/yai/package.nix b/pkgs/by-name/ya/yai/package.nix
index 28f0b2574efd..cad6fe75f8be 100644
--- a/pkgs/by-name/ya/yai/package.nix
+++ b/pkgs/by-name/ya/yai/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ekkinox";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-MoblXLfptlIYJbXQTpbc8GBo2a3Zgxdvwra8IUEGiZs==";
   };
 
diff --git a/pkgs/by-name/ya/yajsv/package.nix b/pkgs/by-name/ya/yajsv/package.nix
index a26263014cf4..6d08a5d87f26 100644
--- a/pkgs/by-name/ya/yajsv/package.nix
+++ b/pkgs/by-name/ya/yajsv/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "neilpa";
     repo = "yajsv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dp7PBN8yR+gPPUWA+ug11dUN7slU6CJAojuxt5eNTxA=";
   };
 
diff --git a/pkgs/by-name/ya/yallback/package.nix b/pkgs/by-name/ya/yallback/package.nix
index 0e7c9ad5725e..b1b221fce7ec 100644
--- a/pkgs/by-name/ya/yallback/package.nix
+++ b/pkgs/by-name/ya/yallback/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "abathur";
     repo = "yallback";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-t+fdnDJMFiFqN23dSY3TnsZsIDcravtwdNKJ5MiZosE=";
   };
 
diff --git a/pkgs/by-name/ya/yambar-hyprland-wses/package.nix b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
index 50e9a707022d..2b1c8ce049f0 100644
--- a/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
+++ b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = "yambar-hyprland-wses";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-furHj1AAFgNiNHP9RBsVrIvrDckSKU8FXilzH9TQ99c=";
   };
 
diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix
index ed09bc969d7e..c331e20a8d64 100644
--- a/pkgs/by-name/ya/yambar/package.nix
+++ b/pkgs/by-name/ya/yambar/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "yambar";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-QCwwMpBYuMWYqxE2ugPFpG/QtZDW7VsSBYs5EqKYejA=";
   };
 
diff --git a/pkgs/by-name/ya/yaml-filter/package.nix b/pkgs/by-name/ya/yaml-filter/package.nix
index 3386fde15d4b..1f7f19b9ddef 100644
--- a/pkgs/by-name/ya/yaml-filter/package.nix
+++ b/pkgs/by-name/ya/yaml-filter/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenSCAP";
     repo = "yaml-filter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HDHjOapMFjuDcWW5+opKD2tllbwz4YBw/EI4W7Wf/6g=";
   };
 
diff --git a/pkgs/by-name/ya/yaml2json/package.nix b/pkgs/by-name/ya/yaml2json/package.nix
index 2c43d25a9c62..1e843d0da18a 100644
--- a/pkgs/by-name/ya/yaml2json/package.nix
+++ b/pkgs/by-name/ya/yaml2json/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bronze1man";
     repo = "yaml2json";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mIjtR1VsSeUhEgeSKDG0qT0kj+NCqVwn31m300cMDeU=";
   };
 
diff --git a/pkgs/by-name/ya/yams/package.nix b/pkgs/by-name/ya/yams/package.nix
index ac1a02a8f093..713d8a96b762 100644
--- a/pkgs/by-name/ya/yams/package.nix
+++ b/pkgs/by-name/ya/yams/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Berulacks";
     repo = "yams";
-    tag = version;
+    rev = version;
     sha256 = "1zkhcys9i0s6jkaz24an690rvnkv1r84jxpaa84sf46abi59ijh8";
   };
 
diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix
index 21d3f0c7ce44..fa83fc56171a 100644
--- a/pkgs/by-name/ya/yandex-music/package.nix
+++ b/pkgs/by-name/ya/yandex-music/package.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cucumber-sp";
     repo = "yandex-music-linux";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oEbbQRqvnK521N3Kerv18h1frVLbioFeHfb/FCkHC6Y=";
   };
 
diff --git a/pkgs/by-name/ya/yanic/package.nix b/pkgs/by-name/ya/yanic/package.nix
index 2a85ea1332e8..5ac0ff685481 100644
--- a/pkgs/by-name/ya/yanic/package.nix
+++ b/pkgs/by-name/ya/yanic/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FreifunkBremen";
     repo = "yanic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-z2vr1QmRCo8y4hopWP14xSV7lsWKkCzK9OehlVLFdIg=";
   };
 
diff --git a/pkgs/by-name/ya/yank/package.nix b/pkgs/by-name/ya/yank/package.nix
index d2ac34c6edb5..8cdc1dc8aeb7 100644
--- a/pkgs/by-name/ya/yank/package.nix
+++ b/pkgs/by-name/ya/yank/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mptre";
     repo = "yank";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sZiZki2Zl0Tfmls5KrLGxT94Bdf9TA9EwoaLoFOX9B4=";
   };
 
diff --git a/pkgs/by-name/ya/yarGen/package.nix b/pkgs/by-name/ya/yarGen/package.nix
index 76e03064a48e..0c3bb3b5eeff 100644
--- a/pkgs/by-name/ya/yarGen/package.nix
+++ b/pkgs/by-name/ya/yarGen/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Neo23x0";
     repo = "yarGen";
-    tag = version;
+    rev = version;
     sha256 = "6PJNAeeLAyUlZcIi0g57sO1Ex6atn7JhbK9kDbNrZ6A=";
   };
 
diff --git a/pkgs/by-name/ya/yarn-bash-completion/package.nix b/pkgs/by-name/ya/yarn-bash-completion/package.nix
index ca4cb94c7148..748db1f186f0 100644
--- a/pkgs/by-name/ya/yarn-bash-completion/package.nix
+++ b/pkgs/by-name/ya/yarn-bash-completion/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dsifford";
     repo = "yarn-completion";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0xflbrbwskjqv3knvc8jqygpvfxh5ak66q7w22d1ng8gwrfqzcng";
   };
 
diff --git a/pkgs/by-name/ya/yarp/package.nix b/pkgs/by-name/ya/yarp/package.nix
index 0ecd5f94ab60..f14e40f931fa 100644
--- a/pkgs/by-name/ya/yarp/package.nix
+++ b/pkgs/by-name/ya/yarp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "robotology";
     repo = "yarp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a";
   };
 
diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix
index dedb32c96ebb..e8f39fb3cc1a 100644
--- a/pkgs/by-name/ya/yarr/package.nix
+++ b/pkgs/by-name/ya/yarr/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nkanaev";
     repo = "yarr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZMQ+IX8dZuxyxQhD/eWAe4bGGCVcaCeVgF+Wqs79G+k=";
   };
 
diff --git a/pkgs/by-name/ya/yaru-remix-theme/package.nix b/pkgs/by-name/ya/yaru-remix-theme/package.nix
index 56d46f55cea0..281ada4dac35 100644
--- a/pkgs/by-name/ya/yaru-remix-theme/package.nix
+++ b/pkgs/by-name/ya/yaru-remix-theme/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Muqtxdir";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0xilhw5gbxsyy80ixxgj0nw6w782lz9dsinhi24026li1xny804c";
   };
 
diff --git a/pkgs/by-name/ya/yaru-theme/package.nix b/pkgs/by-name/ya/yaru-theme/package.nix
index 0b094230f880..bac296204983 100644
--- a/pkgs/by-name/ya/yaru-theme/package.nix
+++ b/pkgs/by-name/ya/yaru-theme/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ubuntu";
     repo = "yaru";
-    tag = version;
+    rev = version;
     hash = "sha256-axaUQ2E0FpWI66yWpQS+zsk7ee5ysllgUbqCZePzcD8=";
   };
 
diff --git a/pkgs/by-name/ya/yas/package.nix b/pkgs/by-name/ya/yas/package.nix
index 154c233fc517..e394d342a502 100644
--- a/pkgs/by-name/ya/yas/package.nix
+++ b/pkgs/by-name/ya/yas/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "niXman";
     repo = "yas";
-    tag = version;
+    rev = version;
     hash = "sha256-2+CpftWOEnntYBCc1IoR5eySbmhrMVunpUTZRdQ5I+A=";
   };
 
diff --git a/pkgs/by-name/ya/yascreen/package.nix b/pkgs/by-name/ya/yascreen/package.nix
index 221b6da502b9..5a83c9b8884c 100644
--- a/pkgs/by-name/ya/yascreen/package.nix
+++ b/pkgs/by-name/ya/yascreen/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bbonev";
     repo = "yascreen";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-z7j2yceiUyJNdyoVXAPiINln2/MUMqVJh+VwQnmzO2A=";
   };
 
diff --git a/pkgs/by-name/ya/yash/package.nix b/pkgs/by-name/ya/yash/package.nix
index 1b5cbc9dd485..a9904fc053f8 100644
--- a/pkgs/by-name/ya/yash/package.nix
+++ b/pkgs/by-name/ya/yash/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "magicant";
     repo = "yash";
-    tag = version;
+    rev = version;
     hash = "sha256-024/Nj4i5fxXMAqVEjlcrSf62a9CZv3W+imAAEdR+xo=";
   };
 
diff --git a/pkgs/by-name/yd/yder/package.nix b/pkgs/by-name/yd/yder/package.nix
index 7481e39998d0..3afa7ef07ae8 100644
--- a/pkgs/by-name/yd/yder/package.nix
+++ b/pkgs/by-name/yd/yder/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "babelouest";
     repo = "yder";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BaCF1r5mOYxj0zKc11uoKI9gVKuxWd8GaneGcV+qIFg=";
   };
 
diff --git a/pkgs/by-name/yd/ydict/package.nix b/pkgs/by-name/yd/ydict/package.nix
index c05ea13a7bf4..9ceb25b0d99b 100644
--- a/pkgs/by-name/yd/ydict/package.nix
+++ b/pkgs/by-name/yd/ydict/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TimothyYe";
     repo = "ydict";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FcrkfWE1m5OveK4YPgVmUbL/jkh2NEs9bfeCHm2H9P8=";
   };
 
diff --git a/pkgs/by-name/ye/yeahconsole/package.nix b/pkgs/by-name/ye/yeahconsole/package.nix
index dfda5a5ab2a0..f0e665b8e125 100644
--- a/pkgs/by-name/ye/yeahconsole/package.nix
+++ b/pkgs/by-name/ye/yeahconsole/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jceb";
     repo = "yeahconsole";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ea6erNF9hEhDHlWLctu1SHFVoXXXsPeWUbvCBSZwn4s=";
   };
 
diff --git a/pkgs/by-name/ye/yeetgif/package.nix b/pkgs/by-name/ye/yeetgif/package.nix
index d6d7e83899b7..42395ceaa54d 100644
--- a/pkgs/by-name/ye/yeetgif/package.nix
+++ b/pkgs/by-name/ye/yeetgif/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sgreben";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Z05GhtEPj3PLXpjF1wK8+pNUY3oDjbwZWQsYlTX14Rc=";
   };
 
diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix
index 94c9bc77c814..c7e2b7c5ee8b 100644
--- a/pkgs/by-name/yg/yggdrasil/package.nix
+++ b/pkgs/by-name/yg/yggdrasil/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yggdrasil-network";
     repo = "yggdrasil-go";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NlNQnYmK//p35pj2MInD6RVsajM/bGDhOuzOZZYoWRw=";
   };
 
diff --git a/pkgs/by-name/yg/yggstack/package.nix b/pkgs/by-name/yg/yggstack/package.nix
index 37c8cc54bd71..8a1ed1ccd5fd 100644
--- a/pkgs/by-name/yg/yggstack/package.nix
+++ b/pkgs/by-name/yg/yggstack/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yggdrasil-network";
     repo = "yggstack";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-S3yk2v2RPGFeGDJ8Lmjr7VM2kIswIREfPpDLXM/P1YU=";
   };
 
diff --git a/pkgs/by-name/yj/yj/package.nix b/pkgs/by-name/yj/yj/package.nix
index 19fe4f4e75fe..bb6f8372c312 100644
--- a/pkgs/by-name/yj/yj/package.nix
+++ b/pkgs/by-name/yj/yj/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sclevine";
     repo = "yj";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lsn5lxtix5W7po6nzvGcHmifbyhrtHgvaKYT7RPPCOg=";
   };
 
diff --git a/pkgs/by-name/yl/yle-dl/package.nix b/pkgs/by-name/yl/yle-dl/package.nix
index 266276024bfa..0094b450cff9 100644
--- a/pkgs/by-name/yl/yle-dl/package.nix
+++ b/pkgs/by-name/yl/yle-dl/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "aajanki";
     repo = "yle-dl";
-    tag = version;
+    rev = version;
     hash = "sha256-X5fkcJgTVGASoVvvshGWUFNzB1V4KMSKgwoxzP62mxc=";
   };
 
diff --git a/pkgs/by-name/ym/ympd/package.nix b/pkgs/by-name/ym/ympd/package.nix
index c4c2cee74c46..89bb628e8c2f 100644
--- a/pkgs/by-name/ym/ympd/package.nix
+++ b/pkgs/by-name/ym/ympd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "notandy";
     repo = "ympd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq";
   };
 
diff --git a/pkgs/by-name/ym/ymuse/package.nix b/pkgs/by-name/ym/ymuse/package.nix
index 3c0c4e2fe087..1795f9f42791 100644
--- a/pkgs/by-name/ym/ymuse/package.nix
+++ b/pkgs/by-name/ym/ymuse/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yktoo";
     repo = "ymuse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WbIeqOAhdqxU8EvHEsG7ASwy5xZG1domZKT5ccOggHg=";
   };
 
diff --git a/pkgs/by-name/yo/yo/package.nix b/pkgs/by-name/yo/yo/package.nix
index fe17a6799d62..e1472e0ee300 100644
--- a/pkgs/by-name/yo/yo/package.nix
+++ b/pkgs/by-name/yo/yo/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "yeoman";
     repo = "yo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-twV5vmQ5loR8j9guf0w5DG4sU4BQYz22GjqjsUkqE4U=";
   };
 
diff --git a/pkgs/by-name/yo/yoink/package.nix b/pkgs/by-name/yo/yoink/package.nix
index b642dac04bb6..8a816e104506 100644
--- a/pkgs/by-name/yo/yoink/package.nix
+++ b/pkgs/by-name/yo/yoink/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "MrMarble";
     repo = "yoink";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9ftlAECywF4khH279h2qcSvKRDQX2I7GDQ7EYcEybL0=";
   };
 
diff --git a/pkgs/by-name/yo/yor/package.nix b/pkgs/by-name/yo/yor/package.nix
index 26cff1e8b079..4c6e20ec6116 100644
--- a/pkgs/by-name/yo/yor/package.nix
+++ b/pkgs/by-name/yo/yor/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-IoQe1/D3Sl1y76dXH0CuwU6/LBC6n6or9vsysHhDeeg=";
   };
 
diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix
index 1339ce24f048..f74822341f51 100644
--- a/pkgs/by-name/yo/yoshimi/package.nix
+++ b/pkgs/by-name/yo/yoshimi/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Yoshimi";
     repo = "yoshimi";
-    tag = version;
+    rev = version;
     hash = "sha256-i6kzVtg2ukob0QBr/hbxblm+eTkPIKbnGLpFdUl/zGQ=";
   };
 
diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix
index 37dd3bed69f2..66aa0c0940cd 100644
--- a/pkgs/by-name/yo/youki/package.nix
+++ b/pkgs/by-name/yo/youki/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "youki";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SFU7v5pefQkh751Ato4xkPqiEc/3++9hpwyNJjXwqMA=";
   };
 
diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix
index 34c612501d82..ba6e639b5732 100644
--- a/pkgs/by-name/yq/yq-go/package.nix
+++ b/pkgs/by-name/yq/yq-go/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mikefarah";
     repo = "yq";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AsTDbeRMb6QJE89Z0NGooyTY3xZpWFoWkT7dofsu0DI=";
   };
 
diff --git a/pkgs/by-name/yt/yt-dlg/package.nix b/pkgs/by-name/yt/yt-dlg/package.nix
index 0cf2d80c48b1..a5ba63307be0 100644
--- a/pkgs/by-name/yt/yt-dlg/package.nix
+++ b/pkgs/by-name/yt/yt-dlg/package.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "oleksis";
     repo = "youtube-dl-gui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W1ZlArmM+Ro5MF/rB88me/PD79dJA4v188mPbMd8Kow=";
   };
 
diff --git a/pkgs/by-name/yt/ytarchive/package.nix b/pkgs/by-name/yt/ytarchive/package.nix
index 7aaaa0156b18..283f4258df18 100644
--- a/pkgs/by-name/yt/ytarchive/package.nix
+++ b/pkgs/by-name/yt/ytarchive/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Kethsar";
     repo = "ytarchive";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Y1frd7iJJuNFvLL/C1Y+RrqYC/1LF7P3J9rkPAThp9c=";
   };
 
diff --git a/pkgs/by-name/yt/ytcast/package.nix b/pkgs/by-name/yt/ytcast/package.nix
index c998e8a3cc18..9a1caccc1f22 100644
--- a/pkgs/by-name/yt/ytcast/package.nix
+++ b/pkgs/by-name/yt/ytcast/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MarcoLucidi01";
     repo = "ytcast";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-iy9+MgXwP4ALz4NHJyn2ghC5boR53H3ioB2+7tcJunE=";
   };
 
diff --git a/pkgs/by-name/yt/ytcc/package.nix b/pkgs/by-name/yt/ytcc/package.nix
index 3f80705e3880..4fb2f6db9399 100644
--- a/pkgs/by-name/yt/ytcc/package.nix
+++ b/pkgs/by-name/yt/ytcc/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "woefe";
     repo = "ytcc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pC2uoog+nev/Xa6UbXX4vX00VQQLHtZzbVkxrxO/Pg8=";
   };
 
diff --git a/pkgs/by-name/yt/ytfzf/package.nix b/pkgs/by-name/yt/ytfzf/package.nix
index ba3563c89cc1..333dad2174de 100644
--- a/pkgs/by-name/yt/ytfzf/package.nix
+++ b/pkgs/by-name/yt/ytfzf/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pystardust";
     repo = "ytfzf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rwCVOdu9UfTArISt8ITQtLU4Gj2EZd07bcFKvxXQ7Bc=";
   };
 
diff --git a/pkgs/by-name/yt/ytt/package.nix b/pkgs/by-name/yt/ytt/package.nix
index 37b551b6a4c4..d3897c818a88 100644
--- a/pkgs/by-name/yt/ytt/package.nix
+++ b/pkgs/by-name/yt/ytt/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "ytt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vFD0CKEVbaOiETSsDQeBJV1flekvS893wPYc6iHxxRE=";
   };
 
diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix
index 20977ccc2711..53ca6814919d 100644
--- a/pkgs/by-name/yt/ytui-music/package.nix
+++ b/pkgs/by-name/yt/ytui-music/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sudipghimire533";
     repo = "ytui-music";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-f/23PVk4bpUCvcQ25iNI/UVXqiPBzPKWq6OohVF41p8=";
   };
 
diff --git a/pkgs/by-name/yu/yubihsm-connector/package.nix b/pkgs/by-name/yu/yubihsm-connector/package.nix
index cc5da8e631ce..0b0299fdcc8f 100644
--- a/pkgs/by-name/yu/yubihsm-connector/package.nix
+++ b/pkgs/by-name/yu/yubihsm-connector/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubihsm-connector";
-    tag = version;
+    rev = version;
     hash = "sha256-hiCh/TG1epSmJtaptfVzcPklDTaBh0biKqfM01YoWo0=";
   };
 
diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix
index 11db0b7bdb20..58358991c087 100644
--- a/pkgs/by-name/yu/yubihsm-shell/package.nix
+++ b/pkgs/by-name/yu/yubihsm-shell/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubihsm-shell";
-    tag = version;
+    rev = version;
     hash = "sha256-0IsdIhuKpzfArVB4xBaxCPqtk0fKWb6RuGImUj1E4Zs=";
   };
 
diff --git a/pkgs/by-name/yu/yubikey-agent/package.nix b/pkgs/by-name/yu/yubikey-agent/package.nix
index 02fd44622d02..98a97dab94bf 100644
--- a/pkgs/by-name/yu/yubikey-agent/package.nix
+++ b/pkgs/by-name/yu/yubikey-agent/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "FiloSottile";
     repo = "yubikey-agent";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Knk1ipBOzjmjrS2OFUMuxi1TkyDcSYlVKezDWT//ERY=";
   };
 
diff --git a/pkgs/by-name/yu/yubikey-manager/package.nix b/pkgs/by-name/yu/yubikey-manager/package.nix
index 45140165e77d..6f3192774a1d 100644
--- a/pkgs/by-name/yu/yubikey-manager/package.nix
+++ b/pkgs/by-name/yu/yubikey-manager/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubikey-manager";
-    tag = version;
+    rev = version;
     hash = "sha256-qEEAByg6Smn1Wk8U4VA6MIJDLWBtM+S+qTDIcgPUGA0=";
   };
 
diff --git a/pkgs/by-name/yu/yubikey-touch-detector/package.nix b/pkgs/by-name/yu/yubikey-touch-detector/package.nix
index 4e6891804a21..8b6576eb3b72 100644
--- a/pkgs/by-name/yu/yubikey-touch-detector/package.nix
+++ b/pkgs/by-name/yu/yubikey-touch-detector/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maximbaz";
     repo = "yubikey-touch-detector";
-    tag = version;
+    rev = version;
     hash = "sha256-eNRwDGTNxBtDepQvf2TXCH/5fb4kRYBn80tzvI4fzME=";
   };
   vendorHash = "sha256-x8Fmhsk6MtgAtLxgH/V3KusM0BXAOaSU+2HULR5boJQ=";
diff --git a/pkgs/by-name/yu/yubioath-flutter/package.nix b/pkgs/by-name/yu/yubioath-flutter/package.nix
index 70dc2d332aab..e22005d905ce 100644
--- a/pkgs/by-name/yu/yubioath-flutter/package.nix
+++ b/pkgs/by-name/yu/yubioath-flutter/package.nix
@@ -19,7 +19,7 @@ flutter324.buildFlutterApplication rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubioath-flutter";
-    tag = version;
+    rev = version;
     hash = "sha256-MpY6yJvGBaFiEwuGEme2Uvyi5INCYhZJHyaRpC9pCuk=";
   };
 
diff --git a/pkgs/by-name/yu/yunfaavatar/package.nix b/pkgs/by-name/yu/yunfaavatar/package.nix
index 2441cf4571ae..c3456673e1ef 100644
--- a/pkgs/by-name/yu/yunfaavatar/package.nix
+++ b/pkgs/by-name/yu/yunfaavatar/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yunfachi";
     repo = "yunfaAvatar";
-    tag = version;
+    rev = version;
     hash = "sha256-hCpbe+gW9hkiVOKq7a55n5s3bMpyCNGWiY3D2b4VYxg=";
   };
 
diff --git a/pkgs/by-name/yy/yyjson/package.nix b/pkgs/by-name/yy/yyjson/package.nix
index 97ff290cbe76..6799d3adf5fe 100644
--- a/pkgs/by-name/yy/yyjson/package.nix
+++ b/pkgs/by-name/yy/yyjson/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ibireme";
     repo = "yyjson";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-mp9Oz08qTyhj3P6F1d81SX96vamUY/JWpD2DTYR+v04=";
   };
 
diff --git a/pkgs/by-name/z-/z-lua/package.nix b/pkgs/by-name/z-/z-lua/package.nix
index 9b4a6867ffe3..4c6c11303872 100644
--- a/pkgs/by-name/z-/z-lua/package.nix
+++ b/pkgs/by-name/z-/z-lua/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "skywind3000";
     repo = "z.lua";
-    tag = version;
+    rev = version;
     sha256 = "sha256-8ANFHI2lnf81TF3Nrrg+fW0Z3TXYkQR8913GXF304kA=";
   };
 
diff --git a/pkgs/by-name/za/zam-plugins/package.nix b/pkgs/by-name/za/zam-plugins/package.nix
index a9373322dc4a..4dde2a42bf9e 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";
-    tag = version;
+    rev = version;
     hash = "sha256-wT1BXQrcD+TI+trqx0ZVUmVLZMTDQgJI3dAvN54wy6Y=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix
index 3657293e3769..cd665e81cbc0 100644
--- a/pkgs/by-name/za/zap-chip/package.nix
+++ b/pkgs/by-name/za/zap-chip/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "project-chip";
     repo = "zap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oYw1CxeCr4dUpw7hhXjtB+QwTfBI7rG9jgfxWKZYsSc=";
   };
 
diff --git a/pkgs/by-name/za/zarchive/package.nix b/pkgs/by-name/za/zarchive/package.nix
index a3a705415ad4..2efece44cadb 100644
--- a/pkgs/by-name/za/zarchive/package.nix
+++ b/pkgs/by-name/za/zarchive/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Exzap";
     repo = "ZArchive";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hX637O/mVLTzmG0a9swJu9w+3o26VHo+K/9RhMuf1lI=";
   };
 
diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix
index 6231f5d3167f..328b64a53e99 100644
--- a/pkgs/by-name/za/zarf/package.nix
+++ b/pkgs/by-name/za/zarf/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "defenseunicorns";
     repo = "zarf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rY9xWqJ+2Yfs6VRHTF89LmuEruAavDI7MgBm4UFEuBs=";
   };
 
diff --git a/pkgs/by-name/za/zasm/package.nix b/pkgs/by-name/za/zasm/package.nix
index 9d2102a71536..0eaf0992e6f6 100644
--- a/pkgs/by-name/za/zasm/package.nix
+++ b/pkgs/by-name/za/zasm/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "megatokio";
     repo = "zasm";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Zbno8kmzss1H2FjwzHB4U7UXxa6oDfsPV80MVVFfM68=";
     postFetch = ''
       # remove folder containing files with weird names (causes the hash to turn out differently under macOS vs. Linux)
diff --git a/pkgs/by-name/zc/zcfan/package.nix b/pkgs/by-name/zc/zcfan/package.nix
index dba45b966822..d661199e9a8f 100644
--- a/pkgs/by-name/zc/zcfan/package.nix
+++ b/pkgs/by-name/zc/zcfan/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cdown";
     repo = "zcfan";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-/q9jDqjG4g211CTb4ahagpxux2BsZWTEyoAY8kRRTB8=";
   };
 
diff --git a/pkgs/by-name/zc/zchunk/package.nix b/pkgs/by-name/zc/zchunk/package.nix
index b00c528a33f4..6f1c049e29be 100644
--- a/pkgs/by-name/zc/zchunk/package.nix
+++ b/pkgs/by-name/zc/zchunk/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zchunk";
     repo = "zchunk";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-X8qywx55TUVEOfYJMV5ARwyUdMjmN4hTmJQ6Upq5zyI=";
   };
 
diff --git a/pkgs/by-name/ze/zed/package.nix b/pkgs/by-name/ze/zed/package.nix
index 2a0243f68b7a..3f49bdec0d5b 100644
--- a/pkgs/by-name/ze/zed/package.nix
+++ b/pkgs/by-name/ze/zed/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "brimdata";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-NCoeTeOkxkCsj/nRBhMJeEshFuwozOXNJvgp8vyCQDk=";
   };
 
diff --git a/pkgs/by-name/ze/zenith/package.nix b/pkgs/by-name/ze/zenith/package.nix
index dc6d48175e3a..a0d8928478b0 100644
--- a/pkgs/by-name/ze/zenith/package.nix
+++ b/pkgs/by-name/ze/zenith/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bvaisvil";
     repo = "zenith";
-    tag = version;
+    rev = version;
     hash = "sha256-y+/s0TDVAFGio5uCzHjf+kHFZB0G8dDgTt2xaqSSz1c=";
   };
 
diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix
index 348ff64a9623..ac38986f3bdb 100644
--- a/pkgs/by-name/ze/zenoh/package.nix
+++ b/pkgs/by-name/ze/zenoh/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh";
-    tag = version;
+    rev = version;
     hash = "sha256-iwimXL1jcBLwaek9tmvGuow56+LMCyA5qkvHsn72m+c=";
   };
 
diff --git a/pkgs/by-name/ze/zerobin/package.nix b/pkgs/by-name/ze/zerobin/package.nix
index 3d32a8218f4e..5a826ccec891 100644
--- a/pkgs/by-name/ze/zerobin/package.nix
+++ b/pkgs/by-name/ze/zerobin/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Tygs";
     repo = "0bin";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1dfy3h823ylz4w2vv3mrmnmiyvf6rvyvsp4j3llr074w9id0zy16";
   };
 
diff --git a/pkgs/by-name/ze/zeroc-ice/package.nix b/pkgs/by-name/ze/zeroc-ice/package.nix
index a8337a8b8065..2bcd6e85f399 100644
--- a/pkgs/by-name/ze/zeroc-ice/package.nix
+++ b/pkgs/by-name/ze/zeroc-ice/package.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitHub {
       owner = "zeroc-ice";
       repo = "mcpp";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "1psryc2ql1cp91xd3f8jz84mdaqvwzkdq2pr96nwn03ds4cd88wh";
     };
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeroc-ice";
     repo = "ice";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-l3cKsR8HSdtFGw1S12xueQOu/U9ABlOxQQtbHBj2izs=";
   };
 
diff --git a/pkgs/by-name/ze/zeronet-conservancy/package.nix b/pkgs/by-name/ze/zeronet-conservancy/package.nix
index c5b7e94635e0..8f62e053f78f 100644
--- a/pkgs/by-name/ze/zeronet-conservancy/package.nix
+++ b/pkgs/by-name/ze/zeronet-conservancy/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "zeronet-conservancy";
     repo = "zeronet-conservancy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZQYdK0B0z0cXTx7ujFngW3wSa/j8sEuwHB+BC5Xqq8o=";
   };
 
diff --git a/pkgs/by-name/ze/zeronet/package.nix b/pkgs/by-name/ze/zeronet/package.nix
index 7b7cab114f92..e74133b76358 100644
--- a/pkgs/by-name/ze/zeronet/package.nix
+++ b/pkgs/by-name/ze/zeronet/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "HelloZeroNet";
     repo = "ZeroNet";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "04prgicm0yjh2klcxdgwx1mvlsxxi2bdkzfcvysvixbgq20wjvdk";
   };
 
diff --git a/pkgs/by-name/ze/zeronsd/package.nix b/pkgs/by-name/ze/zeronsd/package.nix
index 33fe6af03652..0c1cc9f88052 100644
--- a/pkgs/by-name/ze/zeronsd/package.nix
+++ b/pkgs/by-name/ze/zeronsd/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zerotier";
     repo = "zeronsd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TL0bgzQgge6j1SpZCdxv/s4pBMSg4/3U5QisjkVE6BE=";
   };
 
diff --git a/pkgs/by-name/ze/zet/package.nix b/pkgs/by-name/ze/zet/package.nix
index 61a4b6f0ab05..747659a22ca4 100644
--- a/pkgs/by-name/ze/zet/package.nix
+++ b/pkgs/by-name/ze/zet/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yarrow";
     repo = "zet";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IjM+jSb+kdML0zZGuz9+9wrFzQCujn/bg9/vaTzMtUs=";
   };
 
diff --git a/pkgs/by-name/zf/zfind/package.nix b/pkgs/by-name/zf/zfind/package.nix
index fe5ab3f6e4e1..f0017eb84c8c 100644
--- a/pkgs/by-name/zf/zfind/package.nix
+++ b/pkgs/by-name/zf/zfind/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "laktak";
     repo = "zfind";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bbeS2x9HzrsOE5h1y07LoEBm9dinMCHX9GJftj5Md9s=";
   };
 
diff --git a/pkgs/by-name/zf/zfp/package.nix b/pkgs/by-name/zf/zfp/package.nix
index 6e0493324ad6..01919156fc80 100644
--- a/pkgs/by-name/zf/zfp/package.nix
+++ b/pkgs/by-name/zf/zfp/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "LLNL";
     repo = "zfp";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-iZxA4lIviZQgaeHj6tEQzEFSKocfgpUyf4WvUykb9qk=";
   };
 
diff --git a/pkgs/by-name/zf/zfs-prune-snapshots/package.nix b/pkgs/by-name/zf/zfs-prune-snapshots/package.nix
index 9503c322b590..a272cb93cdb8 100644
--- a/pkgs/by-name/zf/zfs-prune-snapshots/package.nix
+++ b/pkgs/by-name/zf/zfs-prune-snapshots/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bahamas10";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gCf/ZIeIh84WQNs5wZO1/l3zpnl2sNxsFO7cOa92JUM=";
   };
 
diff --git a/pkgs/by-name/zf/zfsnap/package.nix b/pkgs/by-name/zf/zfsnap/package.nix
index 3ae6461f73cc..0b7fd9b2048b 100644
--- a/pkgs/by-name/zf/zfsnap/package.nix
+++ b/pkgs/by-name/zf/zfsnap/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zfsnap";
     repo = "zfsnap";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0670a5sghvqx32c9gfsird15mg9nqcvwxsrfcjrwc0sj7br9bd2g";
   };
 
diff --git a/pkgs/by-name/zf/zfstools/package.nix b/pkgs/by-name/zf/zfstools/package.nix
index babd05eccf51..c11aafa65998 100644
--- a/pkgs/by-name/zf/zfstools/package.nix
+++ b/pkgs/by-name/zf/zfstools/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "zfstools";
     owner = "bdrewery";
   };
diff --git a/pkgs/by-name/zf/zfxtop/package.nix b/pkgs/by-name/zf/zfxtop/package.nix
index 9856a09310ac..82a3453ffc0c 100644
--- a/pkgs/by-name/zf/zfxtop/package.nix
+++ b/pkgs/by-name/zf/zfxtop/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ssleert";
     repo = "zfxtop";
-    tag = version;
+    rev = version;
     hash = "sha256-7qeTC9CIx4K2fLRM/pYrSU1NHv9TFMsl7TT0W5Uph60=";
   };
 
diff --git a/pkgs/by-name/zi/zigbee2mqtt_1/package.nix b/pkgs/by-name/zi/zigbee2mqtt_1/package.nix
index 5ad9d50018ef..91485153133b 100644
--- a/pkgs/by-name/zi/zigbee2mqtt_1/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt_1/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
-    tag = version;
+    rev = version;
     hash = "sha256-/7mZrf3FyIliCzsy6yzVRJYMy4bViphYi81UY43iO98=";
   };
 
diff --git a/pkgs/by-name/zi/zimfw/package.nix b/pkgs/by-name/zi/zimfw/package.nix
index 1184349c9cff..09f57daac283 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";
-    tag = "v${version}";
+    rev = "v${version}";
     ## zim only needs this one file to be installed.
     sparseCheckout = [ "zimfw.zsh" ];
     hash = "sha256-qQViaQOpLp8F4zvJETbNp0lxpdVhM1Meg7WcMKkjJRQ=";
diff --git a/pkgs/by-name/zi/zitadel-tools/package.nix b/pkgs/by-name/zi/zitadel-tools/package.nix
index e47827d06696..bf8f21fccd32 100644
--- a/pkgs/by-name/zi/zitadel-tools/package.nix
+++ b/pkgs/by-name/zi/zitadel-tools/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zitadel";
     repo = "zitadel-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wtCBRsP0b7qPOQfYgvmgDT0t2zZHocokO5J8yLZcsgQ=";
   };
 
diff --git a/pkgs/by-name/zi/zitadel/package.nix b/pkgs/by-name/zi/zitadel/package.nix
index 9dcb3eab1251..78eab2712375 100644
--- a/pkgs/by-name/zi/zitadel/package.nix
+++ b/pkgs/by-name/zi/zitadel/package.nix
@@ -20,7 +20,7 @@ let
   zitadelRepo = fetchFromGitHub {
     owner = "zitadel";
     repo = "zitadel";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-izYsf2Cc0jG8Wf82K6HsTVP+kAhmoEJVU7OJXhSzXLo=";
   };
   goModulesHash = "sha256-mE0vhW1nW16SzqIu0C3q8qCXabJO7fZgkp7GeLWCwog=";
diff --git a/pkgs/by-name/zi/zix/package.nix b/pkgs/by-name/zi/zix/package.nix
index 751a9dbc72dc..30df1154459d 100644
--- a/pkgs/by-name/zi/zix/package.nix
+++ b/pkgs/by-name/zi/zix/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "drobilla";
     repo = "zix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nMm3Mdqc4ncCae8SoyGxZYURzmXLNcp1GjsSExfB6x4=";
   };
 
diff --git a/pkgs/by-name/zk/zk/package.nix b/pkgs/by-name/zk/zk/package.nix
index 950020704aaa..fe1116ccf1ef 100644
--- a/pkgs/by-name/zk/zk/package.nix
+++ b/pkgs/by-name/zk/zk/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zk-org";
     repo = "zk";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-aFpn3luIp5tMp9jpBxVCmU+IU9eJg3/5UZFIklauFjI=";
   };
 
diff --git a/pkgs/by-name/zk/zktree/package.nix b/pkgs/by-name/zk/zktree/package.nix
index 65fcf58ad4ad..36f7b50f0a36 100644
--- a/pkgs/by-name/zk/zktree/package.nix
+++ b/pkgs/by-name/zk/zktree/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alirezameskin";
     repo = "zktree";
-    tag = version;
+    rev = version;
     sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9";
   };
 
diff --git a/pkgs/by-name/zl/zlib-ng/package.nix b/pkgs/by-name/zl/zlib-ng/package.nix
index d7e04daddb68..86c6ccd48e8a 100644
--- a/pkgs/by-name/zl/zlib-ng/package.nix
+++ b/pkgs/by-name/zl/zlib-ng/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zlib-ng";
     repo = "zlib-ng";
-    tag = version;
+    rev = version;
     hash = "sha256-Khmrhp5qy4vvoQe4WgoogpjWrgcUB/q8zZeqIydthYg=";
   };
 
diff --git a/pkgs/by-name/zl/zls/package.nix b/pkgs/by-name/zl/zls/package.nix
index e03a7600f8df..09b86edb4099 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";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-A5Mn+mfIefOsX+eNBRHrDVkqFDVrD3iXDNsUL4TPhKo=";
   };
diff --git a/pkgs/by-name/zm/zmap/package.nix b/pkgs/by-name/zm/zmap/package.nix
index 46db513be0ca..5ef06600ff92 100644
--- a/pkgs/by-name/zm/zmap/package.nix
+++ b/pkgs/by-name/zm/zmap/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zmap";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dHJ3H3jc0/cVfJ7NVoJG+WF9+rowbgYF1Ph5/exxRkE=";
   };
 
diff --git a/pkgs/by-name/zm/zmqpp/package.nix b/pkgs/by-name/zm/zmqpp/package.nix
index 4a088d5a3804..02a46f02e982 100644
--- a/pkgs/by-name/zm/zmqpp/package.nix
+++ b/pkgs/by-name/zm/zmqpp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "zmqpp";
-    tag = version;
+    rev = version;
     sha256 = "08v34q3sd8g1b95k73n7jwryb0xzwca8ib9dz8ngczqf26j8k72i";
   };
 
diff --git a/pkgs/by-name/zm/zmusic/package.nix b/pkgs/by-name/zm/zmusic/package.nix
index 8eb1727a857c..e68cb3db7368 100644
--- a/pkgs/by-name/zm/zmusic/package.nix
+++ b/pkgs/by-name/zm/zmusic/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ZDoom";
     repo = "ZMusic";
-    tag = version;
+    rev = version;
     hash = "sha256-rEE3MZLwqnvn5MqbSTCErbsGRjKMK8cC3wTJxtf8WaU=";
   };
 
diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix
index d45d97fd09f6..155c6a492eec 100644
--- a/pkgs/by-name/zo/zola/package.nix
+++ b/pkgs/by-name/zo/zola/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "getzola";
     repo = "zola";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pk7xlNgYybKHm7Zn6cbO1CMUOAKVtX1uxq+6vl48FZk=";
   };
 
diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix
index bda350a2dbc4..82135e9ddd2b 100644
--- a/pkgs/by-name/zo/zon2nix/package.nix
+++ b/pkgs/by-name/zo/zon2nix/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "zon2nix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pS0D+wdebtpNaGpDee9aBwEKTDvNU56VXer9uzULXcM=";
   };
 
diff --git a/pkgs/by-name/zo/zoneminder/package.nix b/pkgs/by-name/zo/zoneminder/package.nix
index dd31ad156833..f58c5e7de804 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";
-    tag = version;
+    rev = version;
     hash = "sha256-0mpT3qjF8zlcsd6OlNIvrabDsz+oJPPy9Vn2TQSuHAI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index f5441b8d3b29..8e5a49a9d48d 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fcorbelli";
     repo = "zpaqfranz";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-brTlBvJ6MQY7kPbdUuNrSuYZUtwhkNfu+SDoNJqyZ9o=";
   };
 
diff --git a/pkgs/by-name/zp/zplug/package.nix b/pkgs/by-name/zp/zplug/package.nix
index e3a009f7ca21..dd10a62ae28a 100644
--- a/pkgs/by-name/zp/zplug/package.nix
+++ b/pkgs/by-name/zp/zplug/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zplug";
     repo = "zplug";
-    tag = version;
+    rev = version;
     sha256 = "0hci1pbs3k5icwfyfw5pzcgigbh9vavprxxvakg1xm19n8zb61b3";
   };
 
diff --git a/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix b/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
index 4c860483c964..6b6754d2dd34 100644
--- a/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
+++ b/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "zpool-auto-expand-partitions";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N1znZbJULEeNR4ABSrUtHHkmz08N+CZqX6Ni7jFzc4c=";
   };
 
diff --git a/pkgs/by-name/zp/zps/package.nix b/pkgs/by-name/zp/zps/package.nix
index 2b0a12fbb7c4..9408d844e349 100644
--- a/pkgs/by-name/zp/zps/package.nix
+++ b/pkgs/by-name/zp/zps/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "zps";
-    tag = version;
+    rev = version;
     hash = "sha256-t+y+m9cwngVlX5o7FQTI4FMj10bN0euH51DmAnOAvPc=";
   };
 
diff --git a/pkgs/by-name/zr/zram-generator/package.nix b/pkgs/by-name/zr/zram-generator/package.nix
index abffde3cf432..b433aa08ab63 100644
--- a/pkgs/by-name/zr/zram-generator/package.nix
+++ b/pkgs/by-name/zr/zram-generator/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "zram-generator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aGBvvjGKZ5biruwmJ0ITakqPhTWs9hspRIE9QirqstA=";
   };
 
diff --git a/pkgs/by-name/zr/zrepl/package.nix b/pkgs/by-name/zr/zrepl/package.nix
index 1742593027d4..7748db7cf484 100644
--- a/pkgs/by-name/zr/zrepl/package.nix
+++ b/pkgs/by-name/zr/zrepl/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zrepl";
     repo = "zrepl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sFSWcJ0aBMay+ngUqnr0PKBMOfCcKHgBjff6KRpPZrg=";
   };
 
diff --git a/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix b/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
index 5fbeb9933a8b..7211f4448283 100644
--- a/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
+++ b/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fogti";
     repo = "zs-apc-spdu-ctl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "TMV9ETWBVeXq6tZ2e0CrvHBXoyKfOLCQurjBdf/iw/M=";
   };
 
diff --git a/pkgs/by-name/zs/zs/package.nix b/pkgs/by-name/zs/zs/package.nix
index 41339e7876f7..9f6a293f0381 100644
--- a/pkgs/by-name/zs/zs/package.nix
+++ b/pkgs/by-name/zs/zs/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
     domain = "git.mills.io";
     owner = "prologic";
     repo = "zs";
-    tag = version;
+    rev = version;
     hash = "sha256-V8+p19kvVh64yCreNVp4RVdkJkjrq8Q5VbjaJWekZHY=";
   };
 
diff --git a/pkgs/by-name/zs/zscroll/package.nix b/pkgs/by-name/zs/zscroll/package.nix
index a4512155f0d5..f52784ea8676 100644
--- a/pkgs/by-name/zs/zscroll/package.nix
+++ b/pkgs/by-name/zs/zscroll/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "noctuid";
     repo = "zscroll";
-    tag = version;
+    rev = version;
     sha256 = "sha256-gEluWzCbztO4N1wdFab+2xH7l9w5HqZVzp2LrdjHSRM=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-autocomplete/package.nix b/pkgs/by-name/zs/zsh-autocomplete/package.nix
index 74202fd1f38f..4d14345098b8 100644
--- a/pkgs/by-name/zs/zsh-autocomplete/package.nix
+++ b/pkgs/by-name/zs/zsh-autocomplete/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "marlonrichert";
     repo = "zsh-autocomplete";
-    tag = version;
+    rev = version;
     sha256 = "sha256-eb5a5WMQi8arZRZDt4aX1IV+ik6Iee3OxNMCiMnjIx4=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-autosuggestions/package.nix b/pkgs/by-name/zs/zsh-autosuggestions/package.nix
index b91001caae15..bb5a9c977c2e 100644
--- a/pkgs/by-name/zs/zsh-autosuggestions/package.nix
+++ b/pkgs/by-name/zs/zsh-autosuggestions/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-autosuggestions";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vpTyYq9ZgfgdDsWzjxVAE7FZH4MALMNZIFyEOBLm5Qo=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-completions/package.nix b/pkgs/by-name/zs/zsh-completions/package.nix
index 8da1c873e36a..d44b15c62701 100644
--- a/pkgs/by-name/zs/zsh-completions/package.nix
+++ b/pkgs/by-name/zs/zsh-completions/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-completions";
-    tag = version;
+    rev = version;
     sha256 = "sha256-GFHlZjIHUWwyeVoCpszgn4AmLPSSE8UVNfRmisnhkpg=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-f-sy-h/package.nix b/pkgs/by-name/zs/zsh-f-sy-h/package.nix
index 87289f13a916..be92c8e667d8 100644
--- a/pkgs/by-name/zs/zsh-f-sy-h/package.nix
+++ b/pkgs/by-name/zs/zsh-f-sy-h/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "z-shell";
     repo = "F-Sy-H";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0bcsc4kgda577fs3bnvymmxdz3z5mf19pn8ngfqsklabnf79f5nf";
   };
 
diff --git a/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix b/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
index c32305785c31..7daf234f0102 100644
--- a/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
+++ b/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zdharma-continuum";
     repo = "fast-syntax-highlighting";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0h7f27gz586xxw7cc0wyiv3bx0x3qih2wwh05ad85bh2h834ar8d";
   };
 
diff --git a/pkgs/by-name/zs/zsh-fzf-tab/package.nix b/pkgs/by-name/zs/zsh-fzf-tab/package.nix
index fa9174d9c9a2..3369278cc64a 100644
--- a/pkgs/by-name/zs/zsh-fzf-tab/package.nix
+++ b/pkgs/by-name/zs/zsh-fzf-tab/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Aloxaf";
     repo = "fzf-tab";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-q26XVS/LcyZPRqDNwKKA9exgBByE0muyuNb0Bbar2lY=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-history-substring-search/package.nix b/pkgs/by-name/zs/zsh-history-substring-search/package.nix
index bae266667295..e291025f6ee1 100644
--- a/pkgs/by-name/zs/zsh-history-substring-search/package.nix
+++ b/pkgs/by-name/zs/zsh-history-substring-search/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-history-substring-search";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0vjw4s0h4sams1a1jg9jx92d6hd2swq4z908nbmmm2qnz212y88r";
   };
 
diff --git a/pkgs/by-name/zs/zsh-navigation-tools/package.nix b/pkgs/by-name/zs/zsh-navigation-tools/package.nix
index bd41ab1442f8..e208c65891d2 100644
--- a/pkgs/by-name/zs/zsh-navigation-tools/package.nix
+++ b/pkgs/by-name/zs/zsh-navigation-tools/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psprint";
     repo = "zsh-navigation-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0c4kb19aprb868xnlyq8h1nd2d32r0zkrqblsrzvg7m9gx8vqps8";
   };
 
diff --git a/pkgs/by-name/zs/zsh-nix-shell/package.nix b/pkgs/by-name/zs/zsh-nix-shell/package.nix
index 610872be84c0..243c35949fd0 100644
--- a/pkgs/by-name/zs/zsh-nix-shell/package.nix
+++ b/pkgs/by-name/zs/zsh-nix-shell/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "chisui";
     repo = "zsh-nix-shell";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix b/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
index 306bba4d9d43..dba2adb6c37d 100644
--- a/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
+++ b/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-syntax-highlighting";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-iJdWopZwHpSyYl5/FQXEW7gl/SrKaYDEtTH9cGP7iPo=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-system-clipboard/package.nix b/pkgs/by-name/zs/zsh-system-clipboard/package.nix
index 555d616aeac7..ae389956037e 100644
--- a/pkgs/by-name/zs/zsh-system-clipboard/package.nix
+++ b/pkgs/by-name/zs/zsh-system-clipboard/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kutsan";
     repo = "zsh-system-clipboard";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VWTEJGudlQlNwLOUfpo0fvh0MyA2DqV+aieNPx/WzSI=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-vi-mode/package.nix b/pkgs/by-name/zs/zsh-vi-mode/package.nix
index bab472431917..c24d7d6f1697 100644
--- a/pkgs/by-name/zs/zsh-vi-mode/package.nix
+++ b/pkgs/by-name/zs/zsh-vi-mode/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeffreytse";
     repo = "zsh-vi-mode";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xbchXJTFWeABTwq6h4KWLh+EvydDrDzcY9AQVK65RS8=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-wd/package.nix b/pkgs/by-name/zs/zsh-wd/package.nix
index 2ca4856a9d84..4ec34b4e7aa8 100644
--- a/pkgs/by-name/zs/zsh-wd/package.nix
+++ b/pkgs/by-name/zs/zsh-wd/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mfaerevaag";
     repo = "wd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-u1VrsSF+JqsvWOZfj5mSOknLra6Bxl9tR7fybyP476Y=";
   };
 
diff --git a/pkgs/by-name/zs/zsync2/package.nix b/pkgs/by-name/zs/zsync2/package.nix
index f6a488c7ff29..70a204eafab6 100644
--- a/pkgs/by-name/zs/zsync2/package.nix
+++ b/pkgs/by-name/zs/zsync2/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AppImageCommunity";
     repo = "zsync2";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-OCeMEXQmbc34MZ1NyOfAASdrUyeSQqqfvWqAszJN4x0=";
   };
 
diff --git a/pkgs/by-name/zu/zug/package.nix b/pkgs/by-name/zu/zug/package.nix
index 4befc1d78b7f..5b66fadc505b 100644
--- a/pkgs/by-name/zu/zug/package.nix
+++ b/pkgs/by-name/zu/zug/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arximboldi";
     repo = "zug";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7xTMDhPIx1I1PiYNanGUsK8pdrWuemMWM7BW+NQs2BQ=";
   };
   patches = [
diff --git a/pkgs/by-name/zu/zuki-themes/package.nix b/pkgs/by-name/zu/zuki-themes/package.nix
index eb5f40eb5ac6..82e359b41053 100644
--- a/pkgs/by-name/zu/zuki-themes/package.nix
+++ b/pkgs/by-name/zu/zuki-themes/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "zuki-themes";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1q026wa8xgyb6f5k7pqpm5zav30dbnm3b8w59as3sh8rhfgpbf80";
   };
 
diff --git a/pkgs/by-name/zu/zuo/package.nix b/pkgs/by-name/zu/zuo/package.nix
index 8be6a51e1ab3..00b4ece29cd2 100644
--- a/pkgs/by-name/zu/zuo/package.nix
+++ b/pkgs/by-name/zu/zuo/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "racket";
     repo = "zuo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-F7ba/4VVVhNDK/wqk+kgJKYxETS2pR9ZiDh0O0aOWn0=";
   };
 
diff --git a/pkgs/by-name/zw/zwave-js-server/package.nix b/pkgs/by-name/zw/zwave-js-server/package.nix
index 81e7bdf6e33d..8b67e2814ddf 100644
--- a/pkgs/by-name/zw/zwave-js-server/package.nix
+++ b/pkgs/by-name/zw/zwave-js-server/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-server";
-    tag = version;
+    rev = version;
     hash = "sha256-vY/afOza0ewOqlhbp6uMf/mw9nvQLN0lEFmHekxpJVA=";
   };
 
diff --git a/pkgs/by-name/zx/zx/package.nix b/pkgs/by-name/zx/zx/package.nix
index 28e4592498f5..a0dd9812b37e 100644
--- a/pkgs/by-name/zx/zx/package.nix
+++ b/pkgs/by-name/zx/zx/package.nix
@@ -20,7 +20,7 @@ let
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
-            tag = "v${version}";
+            rev = "v${version}";
             hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
@@ -35,7 +35,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "zx";
-    tag = version;
+    rev = version;
     hash = "sha256-jajkHUz+3ujKXbcsfN7y3pwHqAofTgdQHEC29srzs1M=";
   };
 
diff --git a/pkgs/by-name/zx/zxcvbn-c/package.nix b/pkgs/by-name/zx/zxcvbn-c/package.nix
index 8129fac50b2c..3fc9d2ae5090 100644
--- a/pkgs/by-name/zx/zxcvbn-c/package.nix
+++ b/pkgs/by-name/zx/zxcvbn-c/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tsyrogit";
     repo = "zxcvbn-c";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-RKqbv0iGkjS7Y7KikqglZ+AK1oiw4G1mB2Zg87tOlbI=";
   };
 
diff --git a/pkgs/by-name/zx/zxfer/package.nix b/pkgs/by-name/zx/zxfer/package.nix
index 2c6951125849..d44eb8947779 100644
--- a/pkgs/by-name/zx/zxfer/package.nix
+++ b/pkgs/by-name/zx/zxfer/package.nix
@@ -21,7 +21,7 @@ resholve.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "allanjude";
     repo = "zxfer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-11SQJcD3GqPYBIgaycyKkc62/diVKPuuj2Or97j+NZY=";
   };
 
diff --git a/pkgs/by-name/zy/zydis/package.nix b/pkgs/by-name/zy/zydis/package.nix
index 9d6ec11f9793..f02b1e6b1713 100644
--- a/pkgs/by-name/zy/zydis/package.nix
+++ b/pkgs/by-name/zy/zydis/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zyantific";
     repo = "zydis";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6J4pTUm3xQXwlQNBldjXVWRcse+auSFJtxGWaPRVzLg=";
   };
 
diff --git a/pkgs/by-name/zy/zydis/zycore.nix b/pkgs/by-name/zy/zydis/zycore.nix
index db55b6e3234a..b55e4ec46f2e 100644
--- a/pkgs/by-name/zy/zydis/zycore.nix
+++ b/pkgs/by-name/zy/zydis/zycore.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zyantific";
     repo = "zycore-c";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/RQl43gx3CO0OxH1syz4l3E4+/m46ql+HKVyuC1x4sA=";
   };
 
diff --git a/pkgs/by-name/zz/zziplib/package.nix b/pkgs/by-name/zz/zziplib/package.nix
index 4218a679719f..d37001c0f5ca 100644
--- a/pkgs/by-name/zz/zziplib/package.nix
+++ b/pkgs/by-name/zz/zziplib/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gdraheim";
     repo = "zziplib";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8QxQrxqYO4LtB8prMqgz5a0QqvSKL7KzTkgi+VdHp6A=";
   };
 
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
index 68a052370bca..d46325f6a81c 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "eosrei";
     repo = "emojione-color-font";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1781kxfbhnvylypbkwxc3mx6hi0gcjisfjr9cf0jdz4d1zkf09b3";
   };
 
diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix
index c3dafcc2b1f5..52974e657f9d 100644
--- a/pkgs/data/fonts/iosevka/comfy.nix
+++ b/pkgs/data/fonts/iosevka/comfy.nix
@@ -29,7 +29,7 @@ let
   src = fetchFromGitHub {
     owner = "protesilaos";
     repo = "iosevka-comfy";
-    tag = version;
+    rev = version;
     sha256 = "sha256-z9OlxeD88HuPJF88CsAy3vd1SFpJF1qh5c/0AIeMA7o=";
   };
   privateBuildPlan = src.outPath + "/private-build-plans.toml";
diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix
index 57dbfec4989f..2e1e0e68cae3 100644
--- a/pkgs/data/fonts/liberation-fonts/default.nix
+++ b/pkgs/data/fonts/liberation-fonts/default.nix
@@ -27,7 +27,7 @@ let
 
       src = fetchFromGitHub {
         owner = "liberationfonts";
-        tag = version;
+        rev = version;
         inherit repo sha256;
       };
 
diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix
index ac2c9cbbd6e2..5c9e54611545 100644
--- a/pkgs/data/fonts/openmoji/default.nix
+++ b/pkgs/data/fonts/openmoji/default.nix
@@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hfg-gmuend";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-k37MsBbRUZ4vIEPAgVMiCK8gz377DWwAfjjjOassNMY=";
   };
 
diff --git a/pkgs/data/icons/beauty-line-icon-theme/default.nix b/pkgs/data/icons/beauty-line-icon-theme/default.nix
index d1d7a953df90..d1bea8dfd6bd 100644
--- a/pkgs/data/icons/beauty-line-icon-theme/default.nix
+++ b/pkgs/data/icons/beauty-line-icon-theme/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gvolpe";
     repo = pname;
-    tag = version;
+    rev = version;
     sparseCheckout = [
       "BeautyLine-V3"
     ];
diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix
index 02fe6aad1e3b..ac7e8c2ce677 100644
--- a/pkgs/data/icons/bibata-cursors/translucent.nix
+++ b/pkgs/data/icons/bibata-cursors/translucent.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Silicasandwhich";
     repo = "Bibata_Cursor_Translucent";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-RroynJfdFpu+Wl9iw9NrAc9wNZsSxWI+heJXUTwEe7s=";
   };
 
diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix
index 0fcae0a8838a..ad9d166a5a6b 100644
--- a/pkgs/data/icons/flat-remix-icon-theme/default.nix
+++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = "flat-remix";
-    tag = version;
+    rev = version;
     sha256 = "sha256-3TkBRgoT2AW0Sb0CrXdxh53/jYARAMFC/TIj/r/zruo=";
   };
 
diff --git a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix b/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
index 13f45ed4c73d..ad03691639da 100644
--- a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
+++ b/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jmattheis";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1fks2rrrb62ybzn8gqan5swcgksrb579vk37bx4xpwkc552dz2z2";
   };
 
diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix
index 55155cccd349..22f5ddd734d4 100644
--- a/pkgs/data/icons/kora-icon-theme/default.nix
+++ b/pkgs/data/icons/kora-icon-theme/default.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bikass";
     repo = "kora";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5bGiePD0PwTvVEdVDzr6hIVtLwwF2mPa8ywLH1u8hLk=";
   };
 
diff --git a/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/pkgs/data/icons/la-capitaine-icon-theme/default.nix
index e5a6d7ddf1c9..6b215636bffb 100644
--- a/pkgs/data/icons/la-capitaine-icon-theme/default.nix
+++ b/pkgs/data/icons/la-capitaine-icon-theme/default.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "keeferrourke";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0id2dddx6rl71472l47vafx968wnklmq6b980br68w82kcvqczzs";
   };
 
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 81c80b87b9f8..b14400ed0d61 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-LON73XRVZQxbEMJ32qKXU/TYf6Q8nWU9wms7eT/DHa8=";
   };
 
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index e448967bb6d1..8aa000b133fe 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-E2SpGAMsFfB64axDzUgVOZZwHDyPVbZjEvY4fJzRyUQ=";
   };
 
diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix
index 1ef85c6f0d32..e9226c205d0a 100644
--- a/pkgs/data/icons/tela-circle-icon-theme/default.nix
+++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix
@@ -44,7 +44,7 @@ lib.checkListOfEnum "${pname}: color variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      tag = version;
+      rev = version;
       hash = "sha256-5Kqf6QNM+/JGGp2H3Vcl69Vh1iZYPq3HJxhvSH6k+eQ=";
     };
 
diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix
index 36c8589e935c..44858afeb9e3 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/data/icons/zafiro-icons/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zayronxio";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU=";
   };
 
diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix
index 210c00422f68..704d49af1cb0 100644
--- a/pkgs/data/themes/adwaita-qt/default.nix
+++ b/pkgs/data/themes/adwaita-qt/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-K/+SL52C+M2OC4NL+mhBnm/9BwH0KNNTGIDmPwuUwkM=";
   };
 
diff --git a/pkgs/data/themes/gtk-theme-framework/default.nix b/pkgs/data/themes/gtk-theme-framework/default.nix
index 60d769b0ba36..1ae655fe8c37 100644
--- a/pkgs/data/themes/gtk-theme-framework/default.nix
+++ b/pkgs/data/themes/gtk-theme-framework/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jaxwilko";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1z5s5rsgiypanf2z0avaisbflnvwrc8aiy5qskrsvbbaja63jy3s";
   };
 
diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix
index 353fadb100ee..4eab64997811 100644
--- a/pkgs/data/themes/kde2/default.nix
+++ b/pkgs/data/themes/kde2/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "repos-holder";
     repo = "kdecoration2-kde2";
-    tag = version;
+    rev = version;
     sha256 = "y2q1j36EURJc7k1huqhEH1Z82PnVSKlfx20bpQWY28c=";
   };
 
diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
index a248d104ee4b..21b27a63cd69 100644
--- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
+++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matinlotfali";
     repo = "KDE-Rounded-Corners";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iJNEwDsGOOqWQgG3iwrZt9mpbKWHOw7zkEORURcAGLQ=";
   };
 
diff --git a/pkgs/data/themes/lightly-qt/default.nix b/pkgs/data/themes/lightly-qt/default.nix
index 49d5b79b68f9..6b6729c9cbb7 100644
--- a/pkgs/data/themes/lightly-qt/default.nix
+++ b/pkgs/data/themes/lightly-qt/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Luwx";
     repo = "Lightly";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0qkjzgjplgwczhk6959iah4ilvazpprv7yb809jy75kkp1jw8mwk";
   };
 
diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index 412de4308203..dd2aaeed7d35 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -34,7 +34,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KDE";
     repo = "qtcurve";
-    tag = version;
+    rev = version;
     sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo=";
   };
 
diff --git a/pkgs/data/themes/sddm-sugar-dark/default.nix b/pkgs/data/themes/sddm-sugar-dark/default.nix
index b28b363487ac..0f10a916cf95 100644
--- a/pkgs/data/themes/sddm-sugar-dark/default.nix
+++ b/pkgs/data/themes/sddm-sugar-dark/default.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = pkgs.fetchFromGitHub {
     owner = "MarianArlt";
     repo = "sddm-sugar-dark";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-C3qB9hFUeuT5+Dos2zFj5SyQegnghpoFV9wHvE9VoD8=";
   };
 
diff --git a/pkgs/data/themes/whitesur-kde/default.nix b/pkgs/data/themes/whitesur-kde/default.nix
index 2af900edf0a6..3c42179c86a0 100644
--- a/pkgs/data/themes/whitesur-kde/default.nix
+++ b/pkgs/data/themes/whitesur-kde/default.nix
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "whitesur-kde";
-    tag = version;
+    rev = version;
     hash = "sha256-052mKpf8e5pSecMzaWB3McOZ/uAqp/XGJjcVWnlKPLE=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
index db9637336dcc..a45e219bc59b 100644
--- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-p3tEUIM7rxYUVLl7ZaEm20IZWRMNi12AIj9mQe6iB5I=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
index 524ec4ea36bb..9d269f40ba0e 100644
--- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-DUpYb1xNmWpBcKo9kajeVm/+z4yj2OBE+qOyEkCHbUI=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
index f32eb0ac0aa3..50db4ec7095b 100644
--- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-WeubXsshN4tUlIwEHTxHXv1L2dvJ2DZ6qtSPyiVtc98=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix
index 63106dd0c123..b0b6deea9f9f 100644
--- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-aMxEESZ/noGtEDpQZz1asR0M+wnAfQT1FXLaQB6B0Zs=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix
index 75a846cc3633..11482fe170d2 100644
--- a/pkgs/desktops/deepin/apps/deepin-music/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-tj0XICmp7sM2m6aSf/DgxS7JXO3Wy/83sZIPGV17gFo=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix
index 12bcc8ead58e..480320dfa886 100644
--- a/pkgs/desktops/deepin/apps/deepin-picker/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-picker/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-TeUhDEldte5PJJe1l0q4wUTnnaXY052YP1JAhpLz/sA=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix
index 928f22a50376..44faf032a4b7 100644
--- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-G5UZ8lBrUo5G3jMae70p/zi9kOVqHWMNCedOy45L1PA=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
index 75bdc3e1ba37..2692f445c08e 100644
--- a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-7lyHPE/x7rmwh7FtCPkuA8JgYpy90jRXhUWoaeZpVag=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
index ea96bf758f84..540d9d5f1fd7 100644
--- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-A4LFi0KcqChjgYrO90paMBAivv02TsRjYQ26I0k71x0=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
index 81780ea5c4ef..ab53a9709fb8 100644
--- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-UOF0/RBceuRX6AtI1p5qqHhbRDAhA7i0+seOrkAFFgI=";
   };
 
diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
index cba3dfcb04a1..ffd4df4eae88 100644
--- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-T5tjjbNYUaiG9a5zMoKN6I0ec/WLftF2xwUPczlNwB8=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
index 958b34c01b6b..33dffba91c95 100644
--- a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
+++ b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-PtbEsFQl6M5Ouadxy9CTVh1Bmmect83NODO4Ks+ckKU=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
index fb11933ebb0b..7dfc41fe8f0d 100644
--- a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-uNeRAsPbgC7IHHBIlczPXhnwZI65Le70D9MsbH+6Fwk=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
index 9d0383fc9699..6405a95cd55d 100644
--- a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-gtk-theme";
-    tag = version;
+    rev = version;
     hash = "sha256-2B2BtbPeg3cEbnEIgdGFzy8MjCMWlbP/Sq4jzG5cjmc=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
index 213d8443d9be..8c44914e7bb5 100644
--- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Vt2rYZthGelXVUp8/L57ZlDsVEjjZhCv+kSGeU6nC2s=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
index 227ec4b2cdca..79e2f15716b1 100644
--- a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-BvG/ygZfM6sDuDSzAqwCzDXGT/bbA6Srlpg3br117OU=";
   };
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
index b2a38b427b6d..c472244adf2a 100644
--- a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-o5rg1l8N6Ch+BdBLp+HMbVBBvrTdRtn8NSgH/9AnB2Q=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
index aeb09816f080..a46ead0f6e7c 100644
--- a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
+++ b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dde-api-proxy";
-    tag = version;
+    rev = version;
     hash = "sha256-kWodNftOPLIiQNPHAIC9p3VHFAis8FAI7vLJTqahAtU=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-app-services/default.nix b/pkgs/desktops/deepin/core/dde-app-services/default.nix
index b4d1eaa31092..711e3e9f9301 100644
--- a/pkgs/desktops/deepin/core/dde-app-services/default.nix
+++ b/pkgs/desktops/deepin/core/dde-app-services/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-/lHiSUOTD8nC0WDLAHAFzm1YC0WjSS5W5JNC0cjeVEo=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix
index c2bd3afdb820..ca391f0379c2 100644
--- a/pkgs/desktops/deepin/core/dde-appearance/default.nix
+++ b/pkgs/desktops/deepin/core/dde-appearance/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-M39EugV0uGCIaXK4isTQpHd6Rh2Vl6sg3Jp8JIEFEE4=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix
index 5286513590cf..cf1ae2d6dec3 100644
--- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-KUwX7oilV562WDxkBhTQhwz2lgcQIYwkmRRglWj0zh8=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix
index f562c923f8d1..9dbbf0a966e6 100644
--- a/pkgs/desktops/deepin/core/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-bZxNOBtLjop0eYxpMeoomaWYvPcMyDfQfgGPK9m+ARo=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
index d69bdead3abe..03fd59596732 100644
--- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix
+++ b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-VSwip3WgpOYvqGw7/A8bqsYrVSACrVgoIp/pjXSAKcU=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix
index 4761a0c09a0f..6600df5b7964 100644
--- a/pkgs/desktops/deepin/core/dde-control-center/default.nix
+++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-9v2UtLjQQ3OX69UxMknLlrQhorahDI4Z4EEHItBs7G0=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
index bbda1e89d024..a0d91cbfd262 100644
--- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-laM6PgNdUNbsqbzKFGWk7DPuAWR+XHo0eXKG0CDuc9c=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
index 4635f2c49c09..66fe532c9f0c 100644
--- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix
+++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-6s6M0cL8gjq1B5tuIRGPi8D69p4T8hPJv5QvBIvsO1w=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
index 16bbc0477a92..63b625fe90aa 100644
--- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix
+++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-2arO1WSILY5TVPBvdyhttssddwhMYIBcCGq/pW/DnB0=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix
index 554be75f37a8..9d5272df7266 100644
--- a/pkgs/desktops/deepin/core/dde-network-core/default.nix
+++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-bS/PkutP5BQtqZ6MzeImFyGKoztoTswXhXaEftEv0FI=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
index c80e3d7d6a12..cf83ed735088 100644
--- a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-r2WVyy1lqcBJIQnRsPWlBFWQtSeZkq98J1S4dkipCys=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
index 85515479f11a..9d4e8a227878 100644
--- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-v0+Bz6J77Kgf4YV1iDhCqhmcNn493GFq1IEQbXBAVUU=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
index 0718457edc9d..1f1d9907ec16 100644
--- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-3twtJ1KT7TqpyLopHqPY2Lo8oZsH9liir0SJUV/k3OU=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix
index c44979de24b7..a146f0c6747a 100644
--- a/pkgs/desktops/deepin/core/dde-session/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-WiWG4f+vMgAYDBp/porjiV9a6ZqqdmxdXAqX1ISdlfU=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix
index 6d2f7d368f78..62663f6756e9 100644
--- a/pkgs/desktops/deepin/core/dde-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-shell/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dde-shell";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Gko1fFut5zWH/L6X5hEe5OZBjRIbKWIrrjjhh2wrsCg=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
index 2eb4a31a61c6..6c3b7febf80b 100644
--- a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
+++ b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dde-tray-loader";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-LzRjOl3kHArpxwerh7XOisYIJ+t+r/zWUbvYh6k6zKw=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix
index ef27cbc9bc98..a8a14938a661 100644
--- a/pkgs/desktops/deepin/core/dde-widgets/default.nix
+++ b/pkgs/desktops/deepin/core/dde-widgets/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-aeWQdWi1mMche7AJhAvchRXu89hiZ+CM/RR9HvvbXTw=";
   };
 
diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
index 788cb12b3c8f..49e1ec49d769 100644
--- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix
+++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-EjPPjdxa+iL/nXhuccoM3NiLmGXh7Un2aGz8O3sP6xE=";
   };
 
diff --git a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
index 48296ae1fe66..b3deff9bf44f 100644
--- a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
+++ b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-gTzyQHFPyn2+A+o+4VYySDBCZftfG2WnTXuqzeF+QhA=";
   };
 
diff --git a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
index f8d6e9fd036a..30c9bf457642 100644
--- a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
+++ b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-SyoahSdGPkWitDek4RD5M2hTR78GFpuijryteKVAx6k=";
   };
 
diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix
index c123a2eaf5a2..512db885951d 100644
--- a/pkgs/desktops/deepin/go-package/dde-api/default.nix
+++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-VpZwVNXxdi8ODwxbksQpT0nnUuLOTJ9h0JYucEKdGYM=";
   };
 
diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
index 09a73c805057..44120eae4e5c 100644
--- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
@@ -40,7 +40,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-3BzFFlcNwNWNcysD3qRYfdyGaX7gW2XJZ4HzdGiK7jU=";
   };
 
diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
index 90de34316865..34577db77ed8 100644
--- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
+++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Zp80Yz0qkFAwpQJPgs/gcfCG2DMtvpKdVKRlqOTmaCk=";
   };
 
diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
index 4202a8b60bc4..b1ad7c0c4c9e 100644
--- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
+++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-kBrkcB0IWGUV4ZrkFzwdPglRgDcnVvYDFhTXS20pKOk=";
   };
 
diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix
index 2c907ac2341f..89f1602a1c7a 100644
--- a/pkgs/desktops/deepin/go-package/startdde/default.nix
+++ b/pkgs/desktops/deepin/go-package/startdde/default.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-RSfdlLT2v3fM4P8E0mIyZZ8A1MWVIS0N0MDczqq7Y64=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
index 7c6a7756eac3..bcfcef845b6e 100644
--- a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-B9SrApvjTIW2g9VayrmCsWXS9Gkg55Voi1kPP+KYp3s=";
   };
 
diff --git a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
index 70afbc5d420e..5d904914218d 100644
--- a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
+++ b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-ymJSTAccwRumXrh4VjwarKYgaqadMBrtXM1rjWNfe8o=";
   };
 
diff --git a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
index a81614936feb..839b02633af9 100644
--- a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
+++ b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-8Im3CueC8sYA5mwRU/Z7z8HA4mPQvVSqcTD813QCYxo=";
   };
 
diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix
index 445a9329df83..d485fbb23f3b 100644
--- a/pkgs/desktops/deepin/library/disomaster/default.nix
+++ b/pkgs/desktops/deepin/library/disomaster/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-wN8mhddqqzYXkT6rRWsHVCWzaG2uRcF2iiFHlZx2LfY=";
   };
 
diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix
index a27e02ff0fa5..b30d4be40f74 100644
--- a/pkgs/desktops/deepin/library/docparser/default.nix
+++ b/pkgs/desktops/deepin/library/docparser/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-shZXhs9ncgm6rECvCWrLi26RO1WAc1gRowoYmeKesfk=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix
index 3f99d65e47e9..97ac2fb5843f 100644
--- a/pkgs/desktops/deepin/library/dtk6core/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6core/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6core";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-51TvPQy0b/8kkBs0e3q1B53mEAKHpAYPBla4h1k616c=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
index d88efbdd89ba..9092cafdac51 100644
--- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6declarative";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-i6gkVWs6CQC6i6H6lfrWNYT76fFBc8ECZ1ePvXQ7j8E=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix
index 18e00f7b1957..4204ad9f2356 100644
--- a/pkgs/desktops/deepin/library/dtk6gui/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6gui";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Ybi68lTSUJpAipx92JF7wj6y+GTYDodJKRCVFhfnBvQ=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6log/default.nix b/pkgs/desktops/deepin/library/dtk6log/default.nix
index 5ad1ec4b0859..ac47ad7a2be9 100644
--- a/pkgs/desktops/deepin/library/dtk6log/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6log/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6log";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-R+jxlS8/FXUxnnzIDIePU2NwwNQU624n++E3q3oElco=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
index 5b8ec229a8de..a3048cbd2b22 100644
--- a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-b/iI2OKQQoFj3vWatfGdDP9z+SEsK5XBra9KqjlGzqs=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix
index 5d9b8ee125c7..b1400c9cf9c8 100644
--- a/pkgs/desktops/deepin/library/dtk6widget/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6widget";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-aDuLybIEzF8ATzH6vkN2SS/yn1eAc2WooNZxeQyH2QM=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix
index 8be035ac33d2..b7f7523abb9f 100644
--- a/pkgs/desktops/deepin/library/dtkcommon/default.nix
+++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-e+8kG9bB6iby2RgD8jn75GyefLRHNnjD+n04hXbi5ec=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix
index eb0630a30f3c..980292bbf200 100644
--- a/pkgs/desktops/deepin/library/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/library/dtkcore/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-APuBVgewr701wzfTRwaQIg/ERFIhabEs5Jd6+GvD04k=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
index 86a06e35ff1d..189fdc13b075 100644
--- a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
+++ b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-MOiNpuvYwJi9rNKx6TuUuWnlGhmZrRbL48EFapy442M=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix
index d8072a1d3bbf..449a9d4156a1 100644
--- a/pkgs/desktops/deepin/library/dtkgui/default.nix
+++ b/pkgs/desktops/deepin/library/dtkgui/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-F3tuLV1hWoUZle0O66MQ+Ew9LRnP6N++HaqS88xBLRY=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtklog/default.nix b/pkgs/desktops/deepin/library/dtklog/default.nix
index 3f4105f6c9e4..043999f614a9 100644
--- a/pkgs/desktops/deepin/library/dtklog/default.nix
+++ b/pkgs/desktops/deepin/library/dtklog/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtklog";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-8c3KL6pjAFPC4jRpOpPEbEDRBMWnDptwBSbEtcQcf5E=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix
index 24e4105ca792..56100bedbdb3 100644
--- a/pkgs/desktops/deepin/library/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-FAF66FsmUX0dhFlbT5wAUWkxY0TOU6dcKNwlY10Qou0=";
   };
 
diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix
index e46decd43181..32a385d9cef8 100644
--- a/pkgs/desktops/deepin/library/dwayland/default.nix
+++ b/pkgs/desktops/deepin/library/dwayland/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-XZvL3lauVW5D3r3kybpS3SiitvwEScqgYe2h9c1DuCs=";
   };
 
diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix
index ac43f60011e5..af90a645f25f 100644
--- a/pkgs/desktops/deepin/library/gio-qt/default.nix
+++ b/pkgs/desktops/deepin/library/gio-qt/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-qDkkLqGsrw+otUy3/iZJJZ2RtpNYPGc/wktdVpw2weg=";
   };
 
diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix
index 3a788799975f..ccf8f6a4817d 100644
--- a/pkgs/desktops/deepin/library/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/library/qt5integration/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-WRMeH66X21Z6TBKPEabnWqzC95+OR9M5azxvAp6K7T4=";
   };
 
diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
index 731605d4e745..fbf3879cf37b 100644
--- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
+++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-jbt+ym6TQX3tecFCSlz8Z2ZnqOa69zYgaB5ohQM3lQg=";
   };
 
diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix
index 4df38555d607..1383ef81e07e 100644
--- a/pkgs/desktops/deepin/library/qt6integration/default.nix
+++ b/pkgs/desktops/deepin/library/qt6integration/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-J0HKtxnQCizHFf2VR9srS/CxWqAkczia7kDWxvGzKsw=";
   };
 
diff --git a/pkgs/desktops/deepin/library/qt6mpris/default.nix b/pkgs/desktops/deepin/library/qt6mpris/default.nix
index 61ac0e94f9fe..71a17256d6c1 100644
--- a/pkgs/desktops/deepin/library/qt6mpris/default.nix
+++ b/pkgs/desktops/deepin/library/qt6mpris/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "deepin-community";
     repo = "qt6mpris";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-PCdA9q/txaL2Fbr2/4+Z7L4zxWeULl3bq8MVH3i1g3g=";
   };
 
diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
index 4750e6c8c696..2befb9219bd3 100644
--- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
+++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Ih3VlEv2hl8y/Cc5uI8gQFgIVvcCaHUhHAudNOSqfs4=";
   };
 
diff --git a/pkgs/desktops/deepin/library/treeland-protocols/default.nix b/pkgs/desktops/deepin/library/treeland-protocols/default.nix
index 00e9b9db7e3a..f1b8016bb978 100644
--- a/pkgs/desktops/deepin/library/treeland-protocols/default.nix
+++ b/pkgs/desktops/deepin/library/treeland-protocols/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-SS4jnfr/9Ec3qpnHS4EjQViekBRMix5oz7b9qhNZpfY=";
   };
 
diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
index 26b5dc3bdbae..cdfbe3011c64 100644
--- a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
+++ b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4=";
   };
 
diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix
index 4d89edee87df..5b298b8765ea 100644
--- a/pkgs/desktops/deepin/library/util-dfm/default.nix
+++ b/pkgs/desktops/deepin/library/util-dfm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-ngDjjdwuYqvyhaUcMNV5PRmGKC3lmY/nJQGOQgRMIQE=";
   };
 
diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
index 02358253c19d..197928a86407 100644
--- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-JOC8nQ/YgUpY93FcniO2uypAfsL/SNU+KfTrthoZfQo=";
   };
 
diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
index 3dcd9c96cffd..2b13bd66ab0c 100644
--- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
+++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-l2D+j+u5Q6G45KTM7eg1QNEakEPtEJ0tzlDlQO5/08I=";
   };
 
diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
index 340a5a39198f..441003d522b3 100644
--- a/pkgs/desktops/deepin/tools/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-anything";
-    tag = version;
+    rev = version;
     hash = "sha256-OYPsUXMjuU6gG+EzyYl640+2/59n8D5V906CVGwn6Bo=";
   };
 
diff --git a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix
index 808fd46b5a50..7f2db77f4567 100644
--- a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix
+++ b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-V6X0E80352Vb6zwaBTRfZZnXEVCmBRbO2bca9A9OL6c=";
   };
 
diff --git a/pkgs/desktops/expidus/calculator/default.nix b/pkgs/desktops/expidus/calculator/default.nix
index 5e17376ec160..528d77648b5f 100644
--- a/pkgs/desktops/expidus/calculator/default.nix
+++ b/pkgs/desktops/expidus/calculator/default.nix
@@ -10,7 +10,7 @@ flutter.buildFlutterApplication rec {
   src = fetchFromGitHub {
     owner = "ExpidusOS";
     repo = "calculator";
-    tag = version;
+    rev = version;
     hash = "sha256-O3LHp10Fo3PW3zoN7mFSQEKh+AAaR+IqkRtc6nQrIZE=";
   };
 
diff --git a/pkgs/desktops/expidus/file-manager/default.nix b/pkgs/desktops/expidus/file-manager/default.nix
index 43e637057e6e..b32b84d10999 100644
--- a/pkgs/desktops/expidus/file-manager/default.nix
+++ b/pkgs/desktops/expidus/file-manager/default.nix
@@ -10,7 +10,7 @@ flutter.buildFlutterApplication rec {
   src = fetchFromGitHub {
     owner = "ExpidusOS";
     repo = "file-manager";
-    tag = version;
+    rev = version;
     hash = "sha256-R6eszy4Dz8tAPRTwZzRiZWIgVMiGv5zlhFB/HcD6gqg=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
index 8c2d88a2f248..2107936087ad 100644
--- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
+++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "EasyScreenCast";
     repo = "EasyScreenCast";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-CK9ta+2Kf7IFKb+uQhI1AtdNkJZpBgIL7JDM3JqsV4c=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix
index 0ac7fb0a5b3c..8fc92494caad 100644
--- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix
+++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "arcmenu";
     repo = "ArcMenu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XlDkdNINTnUAqr2bxL0u2tHWfiggqT1oOryED7sG/vs=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index 1743847240db..8babf752da08 100644
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GSConnect";
     repo = "gnome-shell-extension-gsconnect";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bpy4G+f3NJ2iVsycPluV+98at0G2wlp7t5cPEMGM90s=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
index fcb8a08ddff5..d55f097134fa 100644
--- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ikalnytskyi";
     repo = "gnome-shell-extension-icon-hider";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
index 4d28ee8a29f4..c46a1b7447c4 100644
--- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
+++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "muffinmad";
     repo = "pidgin-im-gnome-shell-extension";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1jyg8r0s1v83sgg6y0jbsj2v37mglh8rvd8vi27fxnjq9xmg8kpc";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/systemd-manager/default.nix b/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
index e745aa6781ff..c6d983de6e40 100644
--- a/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
+++ b/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hardpixel";
     repo = "systemd-manager";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-V4vYv1nAjFjvkSYdOpcpt8h9L+g0ch4V2VZRVSbtSKE=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
index 413dc44e85e0..32b920fce9c0 100644
--- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cinatic";
     repo = "taskwhisperer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UVBLFXsbOPRXC4P5laZ82Rs08yXnNnzJ+pp5fbx6Zqc=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix
index 84084baa61a2..b216a6ae451f 100644
--- a/pkgs/desktops/gnome/extensions/topicons-plus/default.nix
+++ b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phocean";
     repo = "TopIcons-plus";
-    tag = version;
+    rev = version;
     sha256 = "1p3jlvs4zgnrvy8am7myivv4rnnshjp49kg87rd22qqyvcz51ykr";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix
index 2cf050d991d3..41d93826f0d7 100644
--- a/pkgs/desktops/gnome/extensions/unite/default.nix
+++ b/pkgs/desktops/gnome/extensions/unite/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hardpixel";
     repo = "unite-shell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ceo0HQupiihD6GW6/PUbjuArOXtPtAmUPxmNi7DS8E0=";
   };
 
diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
index 26008ddf1dac..2e9e3078c6cd 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-system-settings";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-8X5a2zJ0y8bSSnbqDvRoYm/2VPAWcfZZuiH+5p8eXi4=";
   };
 
diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix
index a134e335834f..b26d37d54a89 100644
--- a/pkgs/desktops/lomiri/applications/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Godl/SQ0+NkI6kwH85SXHPQ5GRlih3xvCyeYxwiqH/s=";
   };
 
diff --git a/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/pkgs/desktops/lomiri/data/lomiri-session/default.nix
index 8be5afada02d..fdc7b90ad875 100644
--- a/pkgs/desktops/lomiri/data/lomiri-session/default.nix
+++ b/pkgs/desktops/lomiri/data/lomiri-session/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-session";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-XduE3tPUjw/wIjFCACasxtN33KO4bDLWrpl7pZcYaAA=";
   };
 
diff --git a/pkgs/desktops/lomiri/data/lomiri-sounds/default.nix b/pkgs/desktops/lomiri/data/lomiri-sounds/default.nix
index 230b08ae0f5f..e940bb1c03e6 100644
--- a/pkgs/desktops/lomiri/data/lomiri-sounds/default.nix
+++ b/pkgs/desktops/lomiri/data/lomiri-sounds/default.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-sounds";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-j4OUwE1z++rLsg5y2YvZktFQfOys3QjoE8Ravd1JFVA=";
   };
 
diff --git a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
index ecc1b0188e6d..b45868c2808b 100644
--- a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
+++ b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-wallpapers";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-n8+vY+MPVqW6s5kSo4aEtGZv1AsjB3nNEywbmcNWfhI=";
   };
 
diff --git a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
index c2eb5c080fe1..91be03cd1df8 100644
--- a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
+++ b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/suru-icon-theme";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-rbhfcjca0vMBa0tJWGpXMRGGygZH1hmdQv/nLJWPS7s=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/deviceinfo/default.nix b/pkgs/desktops/lomiri/development/deviceinfo/default.nix
index 3a87147ff514..0ceae216c9dd 100644
--- a/pkgs/desktops/lomiri/development/deviceinfo/default.nix
+++ b/pkgs/desktops/lomiri/development/deviceinfo/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/deviceinfo";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-wTl+GgNiWzJxGLdU2iMH94UhQ40gjAPTVErouQIGXOA=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/geonames/default.nix b/pkgs/desktops/lomiri/development/geonames/default.nix
index 178263920ac7..d2fff65bf5f8 100644
--- a/pkgs/desktops/lomiri/development/geonames/default.nix
+++ b/pkgs/desktops/lomiri/development/geonames/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/geonames";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-AhRnUoku17kVY0UciHQXFDa6eCH6HQ4ZGIOobCaGTKQ=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/gmenuharness/default.nix b/pkgs/desktops/lomiri/development/gmenuharness/default.nix
index 121be1cc8f1b..e9b4cca04120 100644
--- a/pkgs/desktops/lomiri/development/gmenuharness/default.nix
+++ b/pkgs/desktops/lomiri/development/gmenuharness/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/gmenuharness";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-MswB8cQvz3JvcJL2zj7szUOBzKRjxzJO7/x+87m7E7c=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/libusermetrics/default.nix b/pkgs/desktops/lomiri/development/libusermetrics/default.nix
index 89afd3d3b92c..7305db4cb593 100644
--- a/pkgs/desktops/lomiri/development/libusermetrics/default.nix
+++ b/pkgs/desktops/lomiri/development/libusermetrics/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/libusermetrics";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-V4vxNyHMs2YYBILkpco79FN9xnooULgB+z2Kf3V0790=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix
index ae3f1cfc63cb..dacb1ceedac2 100644
--- a/pkgs/desktops/lomiri/development/trust-store/default.nix
+++ b/pkgs/desktops/lomiri/development/trust-store/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/trust-store";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-tVwqBu4py8kdydyKECZfLvcLijpZSQszeo8ytTDagy0=";
   };
 
diff --git a/pkgs/desktops/lomiri/development/u1db-qt/default.nix b/pkgs/desktops/lomiri/development/u1db-qt/default.nix
index 7780ea886c21..9e8d6b20f295 100644
--- a/pkgs/desktops/lomiri/development/u1db-qt/default.nix
+++ b/pkgs/desktops/lomiri/development/u1db-qt/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/u1db-qt";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-KmAEgnWHY0cDKJqRhZpY0fzVjNlEU67e559XEbAPpJI=";
   };
 
diff --git a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
index 51e6d2f842c6..8493e89f8f15 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-action-api";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-JDcUq7qEp6Z8TjdNspIz4FE/euH+ytGWa4rSxy4voiU=";
   };
 
diff --git a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
index 0c20e176bab9..0ce25119ef6a 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-settings-components";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-H7G3dzzitdyahB/MwgtfRBpo+qMOhmQSzN4EGYculks=";
   };
 
diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
index 7313836a5079..800163372b0a 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-ui-extras";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-SF/UF84K9kNtLHO9FDuIFdQId0NfbmRiRZiPrOKvE9o=";
   };
 
diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
index 0da8bf964479..ca2dece93391 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-ui-toolkit";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-j2Fowwj+ArdfJacqBSWksPk+wXRoTpL/Jrgme2tUSC8=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix
index d1a29b452312..0636f116e452 100644
--- a/pkgs/desktops/lomiri/services/biometryd/default.nix
+++ b/pkgs/desktops/lomiri/services/biometryd/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/biometryd";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-derU7pKdNf6pwhskaW7gCLcU9ixBG3U0EI/qtANmmTs=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/hfd-service/default.nix b/pkgs/desktops/lomiri/services/hfd-service/default.nix
index edba2866043e..9df11be34d6d 100644
--- a/pkgs/desktops/lomiri/services/hfd-service/default.nix
+++ b/pkgs/desktops/lomiri/services/hfd-service/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/hfd-service";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-PvZPdisqpKl9OSuQXIJW1y6EJ5moesJiEAQjpQjzyWQ=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
index b12e58dd8a2a..753dc120f3cf 100644
--- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-content-hub";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-eA5oCoAZB7fWyWm0Sy6wXh0EW+h76bdfJ2dotr7gUC0=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index b950b08081aa..4bd5ad3c4342 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-download-manager";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-LhhO/zZ4wNiRd235NB2b08SQcCZt1awN/flcsLs2m8U=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix b/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
index eef978ba81b3..f4f793cf577e 100644
--- a/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/history-service";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-pcTYuumywTarW+ZciwwvmmBQQH6aq4+FdVjV62VzSZU=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
index 51c3a223241b..f94b6f971f8b 100644
--- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-url-dispatcher";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-kde/HzhBHxTeyc2TCUJwpG7IfC8doDd/jNMF8KLM7KU=";
   };
 
diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index 3eb5cc8d2121..1467119fb204 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/mediascanner2";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-e1vDPnIIfevXj9ODEEKJ2y4TiU0H+08aTf2vU+emdQk=";
   };
 
diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix
index 3705178a9dca..98ed2a4fadeb 100644
--- a/pkgs/desktops/lumina/lumina-calculator/default.nix
+++ b/pkgs/desktops/lumina/lumina-calculator/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lumina-desktop";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1238d1m0mjkwkdpgq165a4ql9aql0aji5f41rzdzny6m7ws9nm2y";
   };
 
diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix
index 08747e269c9a..04117d7f4cce 100644
--- a/pkgs/desktops/lumina/lumina-pdf/default.nix
+++ b/pkgs/desktops/lumina/lumina-pdf/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lumina-desktop";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "08caj4nashp79fbvj94rabn0iaa1hymifqmb782x03nb2vkn38r6";
   };
 
diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix
index e3959c43e2b8..280885b07cae 100644
--- a/pkgs/desktops/lumina/lumina/default.nix
+++ b/pkgs/desktops/lumina/lumina/default.nix
@@ -24,7 +24,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lumina-desktop";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1llr65gilcf0k88f9mbwzlalqwdnjy4nv2jq7w154z0xmd6iarfq";
   };
 
diff --git a/pkgs/desktops/lxde/core/lxsession/default.nix b/pkgs/desktops/lxde/core/lxsession/default.nix
index b34ff16e9233..ab6b77429d9a 100644
--- a/pkgs/desktops/lxde/core/lxsession/default.nix
+++ b/pkgs/desktops/lxde/core/lxsession/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxsession";
-    tag = version;
+    rev = version;
     sha256 = "17sqsx57ymrimm5jfmcyrp7b0nzi41bcvpxsqckmwbhl19g6c17d";
   };
 
diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index db96183feb19..84e1b76ad428 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxtask";
-    tag = version;
+    rev = version;
     hash = "sha256-BI50jV/17jGX91rcmg98+gkoy35oNpdSSaVDLyagbIc=";
   };
 
diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
index b72f9eac38bd..3db308a08c7c 100644
--- a/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/compton-conf/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-GNS0GdkQOEFQHCeXFVNDdT35KCRhfwmkL78tpY71mz0=";
   };
 
diff --git a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
index 16fa35d95e4f..3c71e8d3268d 100644
--- a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-OF12t08hOuDsl80n4lXO3AFCf29f01eDpoRcbXmI4+I=";
   };
 
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 997a0a583099..734818687e4d 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "libfm-qt";
-    tag = version;
+    rev = version;
     hash =
       {
         "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 130d0daa8d98..2e884006e2a7 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-90t7jukm2vNfkgZ3326UDMXNzwJ+FIVEF3kNZ2SgNN8=";
   };
 
diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index d0e1f3999077..89ae2a931865 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash =
       {
         "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix
index d96bebb89249..2030d5579e32 100644
--- a/pkgs/desktops/lxqt/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/libsysstat/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-CwQz0vaBhMe32xBoSgFkxSwx3tnIHutp9Vs32FvTNVU=";
   };
 
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index 171f74c88fbb..9beecc88fe05 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Y9lBXEROC4LIl1M7js0TvJBBNyO06qCWpHxvQjcYPhc=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index 1cfd1a85ee21..08103ae0f946 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-BjtU63SD6y4LnjAr8QGMqo/aYkcQ0Y+vg3lAOf97ZY8=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index 500f703c82bd..12fca14d95bf 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-7RyPUv/M8mMoRO+SopFuru+bY9ZwnKz2BkiLz1cW/wg=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index 583ce83f54af..144c819a177e 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-archiver";
-    tag = version;
+    rev = version;
     hash = "sha256-a3NdU1OZI+BqtvpUhqhwylf5upFJxeg8B+1cPTAdDr4=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index a0b50426806e..15c2a73c9f0f 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash =
       {
         "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index d49d54396401..6977648d4e06 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Vzf+Olaxl6tn3ETEQseFIPstjo+pfdzZUgyVFqk6p3c=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index 7a5d19fd8179..4e2cb1a8c705 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-jQdr3epezQtBoyC2hyMBceiqarruZLasSMYa2gDraCI=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
index 7547f99cc588..ccb89df6fd59 100644
--- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Q9VPPGPyMueoFrTTdAMlIR+VnWVXu0J2uXhaOlJPTAs=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index d166b97076b1..df05f4664e66 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-L2eXab1V2t7+h51wEh0p2Uzdc3ImR4euoiXVVJ8BguA=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index 19a450ae9b24..e496260b7fe4 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-oFN4FpTBxOcXtykkkrJvaoxhvwEJKBp+eusrrSBIXIU=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index e6c485c8f6ed..d352e4bdb268 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-WS+rPiPB/BBmg4yNkpZ2cFJG/1awdjCN0ziWtcESRP4=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index ed6bae074625..5a632594dde5 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-wj9i09F9If5JZO6W358XcZ/rawt9Oj3QwDvLLRvS2Bc=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index a5156bdb08e3..f24d1d62f02e 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-S60m8ixz6HnTZe0MTyvU0pXWWOS88KeXfDcQJ/I1Keo=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index 4c1e08b47d1e..7efceeb7dad8 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash =
       {
         "1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc=";
diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index 12fb23d9cdfc..dd3cb3190bc6 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-AJLm6bjlM6cq9PNrM8eyvX4xN6lUxVSzgJs4+p/11ug=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index 273cffb3c473..e01b14f30888 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-t3odaG9znMohROutoEquJ7JYsvPQPjPxOik+WD8WGSA=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index 5b7384544f91..0db1cefbafb8 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-ohB0LsEnDDe3wygRgvP5mFQ2hu1c9xv2RilSdqOQBxA=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
index b8d62086caa1..0b90cbfd4a8f 100644
--- a/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-TUBcYQ7mWGVZKHNi4zQh8/ogSuMr20xIAoR+IGYQE0w=";
   };
 
diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
index 86742600e1f3..430cde7762c5 100644
--- a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-wayland-session";
-    tag = version;
+    rev = version;
     hash = "sha256-UMlV8LqUXM2+3ZSLj30FFgC+ZVPmt2W8uE2RrZKqCJE=";
   };
 
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
index 59b6d78270f6..7ab69bbdd973 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "obconf-qt";
-    tag = version;
+    rev = version;
     hash = "sha256-C7s312DeLiustPBBY4OdjYvN7X6noktLA8LuhlOaVRo=";
   };
 
diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index fdb813f6d15a..0244300f3ed2 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-V3VYwDlTRd7q7EJhC4zHcX56AbUYJdfumqXaKlkLEfg=";
   };
 
diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 962843047785..4b23fb6e37d5 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-3LdoJLlGoUsv0MdbxIOZrzLaPnZ2hI6m+bLp4GNonng=";
   };
 
diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index 41547c820f49..e958658f3c9c 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pvanek";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-wHhaRtNiNCk5dtO2dVjRFDVicmYtrnCb2twx6h1m834=";
   };
 
diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index 0e7d247a0e1a..ea9da54dfb64 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-FJw1J4c8oLBo7adl1uhCuS+o/ZhJAOyLmbjUgtdt0ss=";
   };
 
diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
index be0d5142b183..823a3b09cc9e 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/qterminal/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Nluw0waf+lqpbajsPv+HYhPD3y7XmgifSu2r7I/J4RI=";
   };
 
diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index d4f9808421b9..ac06cab1d053 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash =
       {
         "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
index b8ca6c9c9a04..8971a3aa1fe0 100644
--- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix
+++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-I8HV7QwyyRssWB6AjC1GswjlXoYwPJHowE74zgqghX4=";
   };
 
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index e3167c019701..ac14483f1cea 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-V5ulRkckeSX2EsYmhmA9phVssDtix31M5oZXkOgF660=";
   };
 
diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index d20a6f478ce7..1f31a200f7a7 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-uII6elLoREc/AO6NSe9QsT+jYARd2hgKSa84NCDza10=";
   };
 
diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix
index 46a332ad4c7c..a3b32f0ede77 100644
--- a/pkgs/desktops/mate/mate-tweak/default.nix
+++ b/pkgs/desktops/mate/mate-tweak/default.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ubuntu-mate";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "emeNgCzMhHMeLOyUkXe+8OzQMEWuwNdD4xkGXIFgbh4=";
   };
 
diff --git a/pkgs/desktops/mate/mate-wayland-session/default.nix b/pkgs/desktops/mate/mate-wayland-session/default.nix
index 7aab723647ea..1900c0b7107e 100644
--- a/pkgs/desktops/mate/mate-wayland-session/default.nix
+++ b/pkgs/desktops/mate/mate-wayland-session/default.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "mate-wayland-session";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sUAq2BylsvjYn8Lt+nm4yIfVhzIEefxKZYnhJnuxjs0=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index 5469fbb5a474..e6dc305588b3 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-jVMXSy83z4zaG1YtCPRGvj1yl6wa5MJYtNp4XIsIY1k=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index 9d2b29f5c350..af8c515326b7 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "calculator";
-    tag = version;
+    rev = version;
     sha256 = "sha256-QEs83hSv9Kupj2p/OTnuPZsC8tdm+IqgpeObBVrPRas=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index e031e4ae7acc..fba7602500e8 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "calendar";
-    tag = version;
+    rev = version;
     sha256 = "sha256-gBQfrRSaw3TKcsSAQh/hcTpBoEQstGdLbppoZ1/Z1q8=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index ec386e7eda1c..9409b5a25c99 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "camera";
-    tag = version;
+    rev = version;
     sha256 = "sha256-PSUav16aU9TFX9Zb0TkqLxgn+yed86Qft0rQvbjbXtA=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 008d84863627..513121a336b0 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "code";
-    tag = version;
+    rev = version;
     sha256 = "sha256-KoRpGBYen1eOdMBHOTBMopC+mPMOkD+iYWV3JA21mKc=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
index 5fbbc305189c..199e1c82e46d 100644
--- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "dock";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-bixNYpPdWU2FndiCPX7SxNTz2MEttRuj35NaWn3GJrI=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index 7aea0c7af3cd..10ef5782fb74 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "feedback";
-    tag = version;
+    rev = version;
     sha256 = "sha256-D0x0jKYEB6Bo8ETgVCjgdOItc+VJYlrr8N9lI/Z3eXU=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index ea7c31f8cfa5..e1a1b58721b5 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "files";
-    tag = version;
+    rev = version;
     hash = "sha256-GJ+OYe2DJ9VIMkwobQJxD1bGoV8k6ALkx9RpT3Cazis=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix b/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix
index acaae3e4dd89..4ada52722230 100644
--- a/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "iconbrowser";
-    tag = version;
+    rev = version;
     sha256 = "sha256-T0VCpk3pdq+2gr/UblLu8mRX7TKJrAtyyFk4i+tAVfI=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index ffece5b59a01..a0a9b1a719fb 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "music";
-    tag = version;
+    rev = version;
     sha256 = "sha256-pqOAeHTFWSoJqXE9UCUkVIy5T7EoYsieJ4PMU1oX9ko=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 2010b04db53b..bfda13868f2f 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "photos";
-    tag = version;
+    rev = version;
     sha256 = "sha256-+aqBeGRisngbH/EALROTr0IZvyrWIlQvFFEgJNfv95Y=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
index 43906d32fe77..536362efa0a1 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "screenshot";
-    tag = version;
+    rev = version;
     hash = "sha256-qhXTOdxMpiCPJR0Gp65itr6Em9e6OzMn3m/OyS7YfcA=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
index 27b496dab209..41d5244aeeff 100644
--- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "tasks";
-    tag = version;
+    rev = version;
     hash = "sha256-xOMS4Zwfl7TLHvm8Zn6wQ4ZoMg+Yuci+cTpUVG+liss=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 35eaba6fdf9e..5497a0a77e9f 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "terminal";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2Z56U6nbqwlbrSMzTYv7cSI7LT7pvDhW0w4f3wxv6ZA=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index 12632f96d9b2..87cbcff8b851 100644
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "videos";
-    tag = version;
+    rev = version;
     hash = "sha256-3TpPgMd4dABhvnnmHHQCHDvuSdC5rWxGvaXPg20/Mrs=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix
index a48e8bf08689..dbcf1d2ea454 100644
--- a/pkgs/desktops/pantheon/apps/sideload/default.nix
+++ b/pkgs/desktops/pantheon/apps/sideload/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-2tYdcHx77XN2iu2PKXAKwOtb4TOFt3Igv17w2zIxqT4=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index d5d78803e261..2583f609718c 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-NMi+QyIunUIzg9IlzeUCz2eQrQlF28lufFc51XOQljU=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index 41e7b81fb2a4..4456b1480530 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-jdSdzOHu1u/8N/eN6D9MjR/9K7n+rfmuBpyRSweb6lA=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index 7ea9b4831948..16b54deeefb5 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-NefWnkI7K6I1JY3UG9wUbB/yF3R8tUdPb4tAafiTR3o=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index bf53e96c7541..a9503c4fbb3f 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-VOL0F0obuXVz0G5hMI/hpUf2T3H8XUw64wu4MxRi57g=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index 3fcee01f38f1..6fb63063f4ff 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-uSEixgakYmh+rheDVF9kYs43C+vjfzuz1SNfwV3+RIU=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index d5d85fa7282d..f6d67728297a 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-/jfUftlNL+B4570ajropS7/2fqro380kZzpPwm+A9fA=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 51b5a534e3a2..5837552a2d47 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-332y3D3T90G6bDVacRm3a1p4mLK3vsW8sBvre5lW/mk=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index ed15cb6fe8b1..ee7c56c606d3 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-mTTcavuxnRSBiifFpga14xPReHguvp9wIUS71Djorjk=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index 7514df938106..5e3622f1ed24 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-53rpnp1RWdPofY00XWKiz8WDPC7RNMaGQFHBDzjsIt4=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index ae039117aa74..d2d6136bf8d2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-E4UAhrs+YQ47VEHMFY8PbSFvBqhqrTf4aPezeqEjdLo=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index 52bd4817bf33..3d7b419d0f09 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-S6EJGF9jRiCzH0f7WNrbLtAX23fjD/Hzd8YLEzkXesw=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 1557236ed3f2..7c9078ad9b6b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-GKZouuWdWl1JDCmzPImeW/hStyFQA6NOAFFmAhiiFe8=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index de6919b2ed64..a3ad381e12cb 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-1znz8B4CGQGDiJC4Mt61XAh9wWAV8J0+K3AIpFcffXQ=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index 7291af698729..3007862edd71 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-k6dSiiBqqbhH7rmhpBu83LX8at/qJ4gkrg4Xc+VbkIE=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index 1ee8d11d5ea4..94503b403df3 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-BWlQrM13gI6FXoqfOKoeqtE1+HVBUB09NDatGraTYtY=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index 9dd960a20684..45ca8bcc48f5 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-GLeQxdrrjz4MurN8Ia5Q68y6gHuyxiMVNneft1AXKvs=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
index 3db1a9dcac71..bb96b4a8add9 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-Ct+1n/GmrS9xi8QIJDWKfwNL1kvNz3o+0tsxLZtwjmI=";
   };
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 2cc28b483082..02eaeae906d9 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-iRxxXAUuSJzhX6uj1YeEzMUihWmrVZ6BFfayfteg/c8=";
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index 4afb92c6e6da..408046979745 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "stylesheet";
-    tag = version;
+    rev = version;
     sha256 = "sha256-l7E5o7JNqfJZzKpyvsjIVd2i9fwLh4Qn8oJ/S5RlFQ8=";
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 34db7917173b..7a3ba9f0020f 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "icons";
-    tag = version;
+    rev = version;
     sha256 = "sha256-WltMfWMcfUqpnfuGa6NzfxSeTais0MLsiu82ybaOcvs=";
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
index dcefc479fff1..9aa511fc35b6 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "fonts";
-    tag = version;
+    rev = version;
     sha256 = "sha256-YiE7yaH0ZrF1/Cp+3bcJYm2cExQjFcat6JLMJPjhops=";
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
index 16b71ef893ec..d9e01a191b8e 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "sound-theme";
-    tag = version;
+    rev = version;
     sha256 = "sha256-fR6gtKx9J6o2R1vQZ5yx4kEX3Ak+q8I6hRVMZzyB2E8=";
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
index 72197356ffe9..0579a6048cae 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "wallpapers";
-    tag = version;
+    rev = version;
     sha256 = "sha256-qbqYr+3Vqwi1UBD0fRW6lI2rj5Iy51taZRGxDTpKfpg=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index 2786f3242e51..8a180593edb0 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "default-settings";
-    tag = version;
+    rev = version;
     sha256 = "sha256-V8jzebnMD41U0ycu66xIZmssoqrKVS+4L70mqc3GEzg=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 7f8d0b8c4274..c76592c322c6 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "greeter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-T/tI8WRVbTLdolDYa98M2Vm26p0xhGiai74lXAlpQ8k=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index 5ae2fc99619d..d2749bfa5471 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "onboarding";
-    tag = version;
+    rev = version;
     sha256 = "sha256-e8eYBGQ+qTXsp+E3l0g5UI1nYD75z0ibTtzm0WbqlU4=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
index 2e85e55cad2a..66bd35ff6401 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "print";
-    tag = version;
+    rev = version;
     sha256 = "sha256-l2IUu9Mj22lZ5yajPcsGrJcJDakNu4srCV0Qea5ybPA=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 6d357fa49af2..5cdf1966ea76 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "session-settings";
-    tag = version;
+    rev = version;
     sha256 = "sha256-4B7lUjHEa4LdKrmsFCB3iFIsdVd/rgwmtQUAgAj3rXs=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index bbca848ef54d..045d0d5944e4 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "shortcut-overlay";
-    tag = version;
+    rev = version;
     sha256 = "sha256-RWFzs4rw/KC0MXkNfA178FejMbuIBh5FVox1RxmxCJA=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index d8b00958e024..12b8ca683b28 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-C0Vct2xuGHd/G5x0Faif0DfpyNyCLJDxki+O9697c2s=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
index 54f49f1fe026..8c7a2d63047b 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-HECK+IEUAKJ4F1TotTHF84j4BYS6EZdAtLBoM401+mw=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 4436c7e0a98c..023e42f1c492 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "applications-menu";
-    tag = version;
+    rev = version;
     sha256 = "sha256-bwQI41Znm75GFoXxSbWkY9daAJTMvUo+UHyyPmvzOUA=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index d2761957b1b0..5b20d161f7b5 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-N0ehiK8sYAZ/3Lu2u7dut7ZflroFptALFCxjbI0++BA=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 7cbac340b930..dc8d244b1c6a 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-iR80pF3KUe0WboFm2/f1ZK9/wER2LfmRBd92e8jGTHs=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index 90fb6946a43d..53992f8c7b36 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-vPQ+Bt7ggeT3Zzsvbie8Wpu3D2WMEIh8GDOI3frnedM=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index f5ebb26b68b0..10d0da9acb9c 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-B3loX1yAUQktqNztikUCOHM1DgIu48fMFFol1N4BN7A=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index ac76d6d91e19..209cb7f22027 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-77+JGJ0/Y9UJwOuKfJAqjNnmZfBy/YiEwCybx6yoVwM=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index 8c7794cc41e3..5181cb1797be 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-fuC9ldDjKuy1kBeFOAIZ/Onhl2o45Xj+YjSrfYz1xvw=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index bc0692e05bff..28b0333882b9 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-AeeL/OcQ7V3HT3IWhTQHx/dcCSqL/0s/fShPq96V3xE=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix
index bbfb7a35f646..13c589fcfe3a 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "quick-settings";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-77NkzdE0Z655qeh718L4Mil6FkMxTNaEqh7DLHoldQ4=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index 1bcc2485d288..f45aedfdd55a 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-oWgq8rgdK81QsN/LhVUk6YgKYG4pFjVfu00t974n+i8=";
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index fec223771e8e..d656aea8ac18 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-3UNtqfDqgclRE8Pe9N8rOt6i2FG6lKNfJAv5Q2OYXUU=";
   };
 
diff --git a/pkgs/desktops/pantheon/libraries/granite/7/default.nix b/pkgs/desktops/pantheon/libraries/granite/7/default.nix
index ab0f01a668e1..7e64ff2f1810 100644
--- a/pkgs/desktops/pantheon/libraries/granite/7/default.nix
+++ b/pkgs/desktops/pantheon/libraries/granite/7/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-bv2rOq16xg9lCWfcLzAFN4LjBTJBxPhXvEJzutkdYzs=";
   };
 
diff --git a/pkgs/desktops/pantheon/libraries/granite/default.nix b/pkgs/desktops/pantheon/libraries/granite/default.nix
index 6a0cdcf9b165..ffbbca7b44c4 100644
--- a/pkgs/desktops/pantheon/libraries/granite/default.nix
+++ b/pkgs/desktops/pantheon/libraries/granite/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-WM0Wo9giVP5pkMFaPCHsMfnAP6xD71zg6QLCYV6lmkY=";
   };
 
diff --git a/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix b/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix
index 7aa86dcebdd1..e3977713aa1e 100644
--- a/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix
+++ b/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "pantheon-wayland";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-UKGgz3G960dPmcDaFwLjDy55x+mDPdQQv2Ejs7BujLg=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix
index ad4de8241720..d5fbc6563619 100644
--- a/pkgs/desktops/pantheon/services/contractor/default.nix
+++ b/pkgs/desktops/pantheon/services/contractor/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1sqww7zlzl086pjww3d21ah1g78lfrc9aagrqhmsnnbji9gwb8ab";
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix
index 00f598901d17..5945fa4c798e 100644
--- a/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "bluetooth-daemon";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-XRskwLtQKlG96fpIxNZKWG7kn3HR0ngjAUwyn7fnxdY=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index 66ba40972d47..797c57dee9d9 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "capnet-assist";
-    tag = version;
+    rev = version;
     sha256 = "sha256-u+JYJ5J5Cx27MrVlhh6AXAtpKGw7Kf1+MyJEEHqgod0=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
index 250d4eca1bfa..c6bf79d93f53 100644
--- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "notifications";
-    tag = version;
+    rev = version;
     sha256 = "sha256-40STrDpMx1WFaTriJNrvkkbzAM0DeBaPdc8o8URItQI=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 7ea815520491..5e93b90feb9d 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "settings-daemon";
-    tag = version;
+    rev = version;
     sha256 = "sha256-mLchzYp2HB4QEJS/Jz9o7ZSKUJtbUUUbFCTHwHZYCEE=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index be05a4bb8f34..9dd3e6d7217d 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-DvE0/bR4mVfqCw/c/1h75M8DfCiNPZ2h6Jl6ySk1qxs=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
index 4be8e8376b5f..4b7d3ca4e1cf 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-qqeB8SLuES/KoK7ycQ2J1YBA07HITovdnO8kSsrVcfs=";
   };
 
diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
index 273f86e5dcd5..cf34497148c5 100644
--- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
+++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "portals";
-    tag = version;
+    rev = version;
     sha256 = "sha256-pf7xQwsBRjjyOMUPe7fJp1vOhhBmuXJ6Uf4YosxbHtw=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
index 89b489c58352..56e684794817 100644
--- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Bismuth-Forge";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-c13OFEw6E/I8j/mqeLnuc9Chi6pc3+AgwAMPpCzh974=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
index d3b50518e8e5..7f85fa9f0fc7 100644
--- a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "qunxyz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/Nz0kSDGok7GjqSQtjH/8q/u6blVTFPO6kfjEyt/jEo=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
index 2962aee49812..6703944b01ff 100644
--- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "domschrei";
     repo = "krunner-symbols";
-    tag = version;
+    rev = version;
     sha256 = "sha256-YsoZdPTWpk3/YERwerrVEcaf2IfGVJwpq32onhP8Exo=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
index 7d6daf03c324..676ea18d2e9f 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "d86leader";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1mnwh489i6l8z9s5a1zl7zybkw76pp9fdmmis41mym7r4wz4iznm";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
index 0491994e2e1c..0d62bdf32869 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "esjeon";
     repo = "krohnkite";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HZCD5884pHuHey+d+HRx/F/Sp1b6ZUy7MdqqZ08H0lU=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
index f4e045a22394..698af1cadd00 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tcorreabr";
     repo = "parachute";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "QIWb1zIGfkS+Bef7LK+JA6XpwGUW+79XZY47j75nlCE=";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
index c06433367003..384635ad9423 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kwin-scripts";
     repo = "kwin-tiling";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "095slpvipy0zcmbn0l7mdnl9g74jaafkr2gqi09b0by5fkvnbh37";
   };
 
diff --git a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
index 45316e1bbe24..cb8189b994ea 100644
--- a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Luwx";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "k1fEZbhzluNlAmj5s/O9X20aCVQxlWQm/Iw/euX7cmI=";
   };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
index 9ba5478f430d..3f0d0e559318 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xuzhen";
     repo = "xfce4-dockbarx-plugin";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZxaWORqA8LiM4CzakxClg5C6AsyHrzCGydgboCrC45g=";
   };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix
index 9607c8dcf87e..a1812ca7dffe 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "denesb";
     repo = "xfce4-i3-workspaces-plugin";
-    tag = version;
+    rev = version;
     sha256 = "sha256-CKpofupoJhe5IORJgij6gOGotB+dGkUDtTUdon8/JdE=";
   };
 
diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
index 6aadd71aa347..8a379d6c8f3a 100644
--- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Jeinzi";
     repo = "thunar-dropbox";
-    tag = version;
+    rev = version;
     sha256 = "sha256-q7tw/1JgEn9SyjH1KBZl0tintWJjd3ctUs4JUuCWULs=";
   };
 
diff --git a/pkgs/development/ada-modules/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix
index 9526a301d492..9d233cee4bd4 100644
--- a/pkgs/development/ada-modules/gnatcoll/bindings.nix
+++ b/pkgs/development/ada-modules/gnatcoll/bindings.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AdaCore";
     repo = "gnatcoll-bindings";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0ayc7zvv8w90v0xzhrjk2x88zrsk62xxcm27ya9crlp6affn5idk";
   };
 
diff --git a/pkgs/development/ada-modules/gnatcoll/core.nix b/pkgs/development/ada-modules/gnatcoll/core.nix
index 3ba78fd4228f..6cd55e28c0bb 100644
--- a/pkgs/development/ada-modules/gnatcoll/core.nix
+++ b/pkgs/development/ada-modules/gnatcoll/core.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AdaCore";
     repo = "gnatcoll-core";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1srnh7vhs46c2zy4hcy4pg0a0prghfzlpv7c82k0jan384yz1g6g";
   };
 
diff --git a/pkgs/development/ada-modules/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix
index e4dc3f98059b..ad2c90c44438 100644
--- a/pkgs/development/ada-modules/gnatcoll/db.nix
+++ b/pkgs/development/ada-modules/gnatcoll/db.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AdaCore";
     repo = "gnatcoll-db";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0q35ii0aa4hh59v768l5cilg1b30a4ckcvlbfy0lkcbp3rcfnbz3";
   };
 
diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix
index 694aeff89ffc..c9377237be8c 100644
--- a/pkgs/development/ada-modules/gnatprove/default.nix
+++ b/pkgs/development/ada-modules/gnatprove/default.nix
@@ -24,7 +24,7 @@ let
         src = fetchFromGitHub {
           owner = "AdaCore";
           repo = "gpr";
-          tag = "v${version}";
+          rev = "v${version}";
           hash = "sha256-Tp+N9VLKjVWs1VRPYE0mQY3rl4E5iGb8xDoNatEYBg4=";
         };
       });
diff --git a/pkgs/development/ada-modules/gprbuild/boot.nix b/pkgs/development/ada-modules/gprbuild/boot.nix
index d7da05e398d2..8b7ad156d8a2 100644
--- a/pkgs/development/ada-modules/gprbuild/boot.nix
+++ b/pkgs/development/ada-modules/gprbuild/boot.nix
@@ -14,7 +14,7 @@ let
     name = "gprconfig-kb-${version}-src";
     owner = "AdaCore";
     repo = "gprconfig_kb";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09x1njq0i0z7fbwg0mg39r5ghy7369avbqvdycfj67lpmw17gb1r";
   };
 in
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     name = "gprbuild-${version}";
     owner = "AdaCore";
     repo = "gprbuild";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1mqsmc0q5bzg8223ls18kbvaz6mhzjz7ik8d3sqhhn24c0j6wjaw";
   };
 
diff --git a/pkgs/development/ada-modules/xmlada/default.nix b/pkgs/development/ada-modules/xmlada/default.nix
index 1cec4d36d59a..987fef8c8fe7 100644
--- a/pkgs/development/ada-modules/xmlada/default.nix
+++ b/pkgs/development/ada-modules/xmlada/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     name = "xmlada-${version}-src";
     owner = "AdaCore";
     repo = "xmlada";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UMJiXSHMS8+X5gyV1nmC29gF71BFnz7LNPQnwUMD3Yg=";
   };
 
diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix
index eeeed4375d2c..77891bd51268 100644
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "elixir-lsp";
     repo = "elixir-ls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-y1QT+wRFc+++OVFJwEheqcDIwaKHlyjbhEjhLJ2rYaI=";
   };
 in
diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix
index e7c463589f1d..c9b2deaeea42 100644
--- a/pkgs/development/beam-modules/elvis-erlang/default.nix
+++ b/pkgs/development/beam-modules/elvis-erlang/default.nix
@@ -20,7 +20,7 @@ rebar3Relx rec {
   src = fetchFromGitHub {
     inherit owner repo;
     sha256 = "13QM6UbH+1PxzhY/ufi5PEP2pKqSl5+g6tMvKmOUMb0=";
-    tag = version;
+    rev = version;
   };
   beamDeps = builtins.attrValues (
     import ./rebar-deps.nix {
diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix
index 0e3484892b9d..548cb2ee4d06 100644
--- a/pkgs/development/beam-modules/erlang-ls/default.nix
+++ b/pkgs/development/beam-modules/erlang-ls/default.nix
@@ -49,7 +49,7 @@ rebar3Relx {
   src = fetchFromGitHub {
     inherit owner repo;
     hash = "sha256-MSDBU+blsAdeixaHMMXmeMJ+9Yrzn3HekE8KbIc/Guo=";
-    tag = version;
+    rev = version;
   };
 
   # remove when fixed upstream https://github.com/erlang-ls/erlang_ls/pull/1576
diff --git a/pkgs/development/beam-modules/erlfmt/default.nix b/pkgs/development/beam-modules/erlfmt/default.nix
index 20dba9f61531..405aec021fc3 100644
--- a/pkgs/development/beam-modules/erlfmt/default.nix
+++ b/pkgs/development/beam-modules/erlfmt/default.nix
@@ -12,7 +12,7 @@ rebar3Relx rec {
     owner = "WhatsApp";
     repo = "erlfmt";
     sha256 = "sha256-O7+7dMgmnNd9hHuRcJqMAI0gmONz5EO3qSlUC3tufh0=";
-    tag = "v${version}";
+    rev = "v${version}";
   };
   meta = with lib; {
     homepage = "https://github.com/WhatsApp/erlfmt";
diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index 5d9a4ae56005..e5ec87da1e16 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "${pname}";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2tam+3vYLC216Q78GIUI3fGnE5FJ/lECJAUQMSxz46w=";
   };
 in
diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index b45ffc1c1df1..74de36b9269e 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -23,7 +23,7 @@ let
       src = fetchFromGitHub {
         owner = "hexpm";
         repo = "hex";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = "sha256-pEfd2BqkVwZVbnka98MafJ/NRn94BHh+wM0i2Q5duTo=";
       };
 
diff --git a/pkgs/development/beam-modules/rebar3-nix/default.nix b/pkgs/development/beam-modules/rebar3-nix/default.nix
index 799731a07cd1..f4c195159873 100644
--- a/pkgs/development/beam-modules/rebar3-nix/default.nix
+++ b/pkgs/development/beam-modules/rebar3-nix/default.nix
@@ -9,7 +9,7 @@ buildRebar3 rec {
   src = fetchFromGitHub {
     owner = "erlang-nix";
     repo = name;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "10ijc06qvv5hqv0qy3w7mbv9pshdb8bvy0f3phr1vd5hksbk731y";
   };
 
diff --git a/pkgs/development/compilers/alan/default.nix b/pkgs/development/compilers/alan/default.nix
index df1dc369ed7f..3a3fcfef81f2 100644
--- a/pkgs/development/compilers/alan/default.nix
+++ b/pkgs/development/compilers/alan/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alan-if";
     repo = "alan";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0zfg1frmb4yl39hk8h733bmlwk4rkikzfhvv7j34cxpdpsp7spzl";
   };
 
diff --git a/pkgs/development/compilers/armips/default.nix b/pkgs/development/compilers/armips/default.nix
index 3c3cbe7ed715..c8386845b35a 100644
--- a/pkgs/development/compilers/armips/default.nix
+++ b/pkgs/development/compilers/armips/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Kingcom";
     repo = "armips";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA=";
   };
 
diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix
index 8e78ca2669dd..2adb096e2099 100644
--- a/pkgs/development/compilers/chicken/4/egg2nix.nix
+++ b/pkgs/development/compilers/chicken/4/egg2nix.nix
@@ -15,7 +15,7 @@ eggDerivation rec {
   src = fetchFromGitHub {
     owner = "the-kenny";
     repo = "egg2nix";
-    tag = version;
+    rev = version;
     sha256 = "sha256-5ov2SWVyTUQ6NHnZNPRywd9e7oIxHlVWv4uWbsNaj/s=";
   };
 
diff --git a/pkgs/development/compilers/codon/default.nix b/pkgs/development/compilers/codon/default.nix
index c4f779ec60cb..491f38f2606a 100644
--- a/pkgs/development/compilers/codon/default.nix
+++ b/pkgs/development/compilers/codon/default.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "exaloop";
     repo = "codon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-s2GqiFcekXRts8BU5CSmTrkFZ9xLqq4A5MybhB1o1Gg=";
   };
 
diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix
index 15515a834382..6094f07057a0 100644
--- a/pkgs/development/compilers/corretto/11.nix
+++ b/pkgs/development/compilers/corretto/11.nix
@@ -30,7 +30,7 @@ let
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-11";
-      tag = version;
+      rev = version;
       hash = "sha256-ewGGj4BHmwoPdULeT3PSI0Fo9T3cFbTO7cZXhzuKISY=";
     };
   };
diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix
index 1c25be045d28..ec1c7d759798 100644
--- a/pkgs/development/compilers/corretto/17.nix
+++ b/pkgs/development/compilers/corretto/17.nix
@@ -25,7 +25,7 @@ let
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-17";
-      tag = version;
+      rev = version;
       hash = "sha256-2jMre5aI02uDFjSgToTyVNriyb4EuZ01lKsNi822o5Q=";
     };
   };
diff --git a/pkgs/development/compilers/corretto/21.nix b/pkgs/development/compilers/corretto/21.nix
index 421b89c25b2e..731eecca1fb3 100644
--- a/pkgs/development/compilers/corretto/21.nix
+++ b/pkgs/development/compilers/corretto/21.nix
@@ -25,7 +25,7 @@ let
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-21";
-      tag = version;
+      rev = version;
       hash = "sha256-Df2Pq2aPrTxD4FeqG12apE/USfQULmMGsDsgXrmCINc=";
     };
   };
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 3c72df0a6fff..f87a4a0ab37d 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -104,7 +104,7 @@ let
       src = fetchFromGitHub {
         owner = "crystal-lang";
         repo = "crystal";
-        tag = version;
+        rev = version;
         inherit sha256;
       };
 
diff --git a/pkgs/development/compilers/elm/packages/elm-review/default.nix b/pkgs/development/compilers/elm/packages/elm-review/default.nix
index d47a413ebdd3..1143e960a161 100644
--- a/pkgs/development/compilers/elm/packages/elm-review/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-review/default.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jfmengels";
     repo = "node-elm-review";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HQ7ilGfw/sMXMQVoJQAj31LbyJfdCfbrZ22gTh1vbD8=";
   };
 
diff --git a/pkgs/development/compilers/elm/packages/elm-test/default.nix b/pkgs/development/compilers/elm/packages/elm-test/default.nix
index 15248f1d7ba8..ac96b39ed866 100644
--- a/pkgs/development/compilers/elm/packages/elm-test/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-test/default.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "rtfeldman";
     repo = "node-test-runner";
-    tag = version;
+    rev = version;
     hash = "sha256-y9ejNZHtgRtZCKE1myH+LwZMOaPdG9for0zCH7xGSR4=";
   };
 
diff --git a/pkgs/development/compilers/elm/packages/node/default.nix b/pkgs/development/compilers/elm/packages/node/default.nix
index 2d9939c3dcbf..6e0f9c4055c4 100644
--- a/pkgs/development/compilers/elm/packages/node/default.nix
+++ b/pkgs/development/compilers/elm/packages/node/default.nix
@@ -23,7 +23,7 @@ let
             src = pkgs.fetchFromGitHub {
               owner = "evanw";
               repo = "esbuild";
-              tag = "v${version}";
+              rev = "v${version}";
               hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
             };
             vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix b/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix
index 69babe55e91f..45d9079105fa 100644
--- a/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix
+++ b/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix
@@ -17,7 +17,7 @@ let
             src = pkgs.fetchFromGitHub {
               owner = "evanw";
               repo = "esbuild";
-              tag = "v${version}";
+              rev = "v${version}";
               hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";
             };
             vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 48996b63a84b..54386a3ca24e 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     owner = "emscripten-core";
     repo = "emscripten";
     hash = "sha256-QlC2k2rhF3/Pz+knnrlBDV8AfHHBSlGr7b9Ae6TNsxY=";
-    tag = version;
+    rev = version;
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 1727eb60907f..dd055799863f 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -72,7 +72,7 @@ let
         src = fetchFromGitHub {
           owner = "flutter";
           repo = "flutter";
-          tag = version;
+          rev = version;
           hash = flutterHash;
         };
       };
diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index 4b8f0b0a9112..0dd7a1819fa9 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -18,7 +18,7 @@ let
   src = fetchFromGitHub {
     owner = "FStarLang";
     repo = "FStar";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yaA6WpP2XIQhjK7kpXBdBFUgKZyvtThd6JmSchUCfbI=";
   };
 
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index abef7a1cb471..4756acfb425f 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -72,7 +72,7 @@ let
       src = fetchFromGitHub {
         owner = "HaxeFoundation";
         repo = "haxe";
-        tag = version;
+        rev = version;
         fetchSubmodules = true;
         inherit hash;
       };
diff --git a/pkgs/development/compilers/idris2/idris2.nix b/pkgs/development/compilers/idris2/idris2.nix
index fbbac4c06dcf..6f39eea61868 100644
--- a/pkgs/development/compilers/idris2/idris2.nix
+++ b/pkgs/development/compilers/idris2/idris2.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "idris-lang";
     repo = "Idris2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
   };
 
diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix
index fd81b2cf9d09..67f3f931025f 100644
--- a/pkgs/development/compilers/koka/default.nix
+++ b/pkgs/development/compilers/koka/default.nix
@@ -36,7 +36,7 @@ let
   src = fetchFromGitHub {
     owner = "koka-lang";
     repo = "koka";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BNkMtYf5maWtKEZzob+218ke1SIkrP7/nboQ2sZKkxI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix
index 9d824e2d1b50..620e4716dd5b 100644
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/pkgs/development/compilers/mkcl/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jcbeaudoin";
     repo = "mkcl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0i2bfkda20lfypis6i4m7srfz6miyf66d8knp693d6sms73m2l26";
   };
 
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index 51620be97110..17df7fa6f050 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenShadingLanguage";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-E/LUTtT0ZU0SBuwtJPA0FznvOuc2a3aJn2/n3ru5l0s=";
   };
 
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index b7c1df3ef819..c35a325ba01a 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "polyml";
     repo = "polyml";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755";
   };
 
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 416911fbcaba..99b6889eb4d6 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "polyml";
     repo = "polyml";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA=";
   };
 
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 6340a5f5d3fd..a78cd863dabd 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (rec {
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-cCZo/lOvSvF19SGQ9BU2J3EBKHF9PgRBhuUVBkggF9I=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix
index 283ceceea63d..f56b4d0f5b19 100644
--- a/pkgs/development/compilers/ponyc/pony-corral.nix
+++ b/pkgs/development/compilers/ponyc/pony-corral.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "corral";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-arcMtCSbXFLBT2ygdj44UKMdGStlgHyiBgt5xZpPRhs=";
   };
 
diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix
index 7eb7c75a5948..95143226b041 100644
--- a/pkgs/development/compilers/rust/cargo-auditable.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable.nix
@@ -15,7 +15,7 @@ let
     src = fetchFromGitHub {
       owner = "rust-secure-code";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8=";
     };
 
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index 612a5f3319a7..cbbb42b62cfc 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "shaderc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Cwp7WbaKWw/wL9m70wfYu47xoUGQW+QGeoYhbyyzstQ=";
   };
 
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
index 741430eef237..e90eb300ffdc 100644
--- a/pkgs/development/compilers/x11basic/default.nix
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kollokollo";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2";
   };
 
diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
index e96674c9150f..82ff16fe5ed4 100644
--- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix
+++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
@@ -17,7 +17,7 @@ let
   src = fetchFromGitHub {
     owner = "chipsalliance";
     repo = "yosys-f4pga-plugins";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XIn5wFw8i2njDN0Arua5BdZ0u1q6a/aJAs48YICehsc=";
   };
 
diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index 6e6d4cad160f..eb08623f2013 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ziglang";
     repo = "zig";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     inherit hash;
   };
 
diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix
index e1c19a039974..133e5b02fda6 100644
--- a/pkgs/development/embedded/arduino/arduino-core/default.nix
+++ b/pkgs/development/embedded/arduino/arduino-core/default.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arduino";
     repo = "Arduino";
-    tag = version;
+    rev = version;
     sha256 = "sha256-I+PvfGc5F8H/NJOGRa18z7dKyKcO8I8Cg7Tj5yxkYAQ=";
   };
 
diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix
index 0fdf4ad1166e..85e011d22dc1 100644
--- a/pkgs/development/embedded/fpga/apio/default.nix
+++ b/pkgs/development/embedded/fpga/apio/default.nix
@@ -24,7 +24,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "FPGAwars";
     repo = "apio";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VU4tOszGkw20DWW2SerFsnjFiSkrSwqBcwosGnHJfU8=";
   };
 
diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix
index 42bab28b3935..7babd86443a3 100644
--- a/pkgs/development/embedded/fpga/ecpdap/default.nix
+++ b/pkgs/development/embedded/fpga/ecpdap/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "adamgreig";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pgQqDRdewBSCm1/9/r8E9DBzwSKAaons3e6OLNv5gHM=";
   };
 
diff --git a/pkgs/development/embedded/fpga/fujprog/default.nix b/pkgs/development/embedded/fpga/fujprog/default.nix
index 78074e36bd36..fea0900ab2af 100644
--- a/pkgs/development/embedded/fpga/fujprog/default.nix
+++ b/pkgs/development/embedded/fpga/fujprog/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kost";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5";
   };
 
diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix
index 68e0959dec59..76ff17c0b6fe 100644
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Koromix";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-MKhh0ooDZI1Ks8vVuPRiHhpOqStetGaAhE2ulvBstxA=";
   };
 
diff --git a/pkgs/development/emilua-plugins/bech32/default.nix b/pkgs/development/emilua-plugins/bech32/default.nix
index 9d27e05b74e3..dee2e9973768 100644
--- a/pkgs/development/emilua-plugins/bech32/default.nix
+++ b/pkgs/development/emilua-plugins/bech32/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "bech32";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DJUdwnX9jHKpVYRkP/UFYNefphbqCoUIjXLTNQ5umis=";
   };
 
diff --git a/pkgs/development/emilua-plugins/botan/default.nix b/pkgs/development/emilua-plugins/botan/default.nix
index 1b7f361ef277..806ed5d8526d 100644
--- a/pkgs/development/emilua-plugins/botan/default.nix
+++ b/pkgs/development/emilua-plugins/botan/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "botan";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-b5yOkjXKnJBQWSKCqiHJcznH1QOmTVgBbS5IwP3VTXA=";
   };
 
diff --git a/pkgs/development/emilua-plugins/qt5/default.nix b/pkgs/development/emilua-plugins/qt5/default.nix
index c24ddab607b4..a8667331ad00 100644
--- a/pkgs/development/emilua-plugins/qt5/default.nix
+++ b/pkgs/development/emilua-plugins/qt5/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "qt5";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9w9E0RWwW3scbmOOXdOXj22LR65a6XBHDkC8eimAfUs=";
   };
 
diff --git a/pkgs/development/emilua-plugins/qt6/default.nix b/pkgs/development/emilua-plugins/qt6/default.nix
index 2d8008a3a849..1a482ef91053 100644
--- a/pkgs/development/emilua-plugins/qt6/default.nix
+++ b/pkgs/development/emilua-plugins/qt6/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "qt6";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/GIEMkJnF/nubbTya9SDm3Zb8dvdbPQCMrgKtRtIrMs=";
   };
 
diff --git a/pkgs/development/emilua-plugins/secp256k1/default.nix b/pkgs/development/emilua-plugins/secp256k1/default.nix
index 4e58e7690323..64dd6ad939ea 100644
--- a/pkgs/development/emilua-plugins/secp256k1/default.nix
+++ b/pkgs/development/emilua-plugins/secp256k1/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "secp256k1";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-u3o6kE1HykxH2KbrJmNTDz9IbT+e26Vxze5RzvfCfVA=";
   };
 
diff --git a/pkgs/development/emilua-plugins/tdlib/default.nix b/pkgs/development/emilua-plugins/tdlib/default.nix
index bbd60aaedb28..611c1cd33b16 100644
--- a/pkgs/development/emilua-plugins/tdlib/default.nix
+++ b/pkgs/development/emilua-plugins/tdlib/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "tdlib";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dqbSECQLM664l2QrkEAfT65/NBI0ghj286dt7eaxcks=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/emilua-plugins/this-thread/default.nix b/pkgs/development/emilua-plugins/this-thread/default.nix
index 6b7e46a37f6d..cb3e328c464a 100644
--- a/pkgs/development/emilua-plugins/this-thread/default.nix
+++ b/pkgs/development/emilua-plugins/this-thread/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "this-thread";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3f2nB6KwNka0P7jnvMZF2+ExuTmICj2NswmRWB+YDKo=";
   };
 
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1f37baeba7bb..40ba605fe792 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -3090,7 +3090,7 @@ self: super:
       src = pkgs.fetchFromGitHub {
         owner = "PostgREST";
         repo = "postgrest";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-peXM5/K034Phcy5vNhc5AT3/9oGXohVogFN9gRsSosY=";
       };
     })
diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix
index 6dee57e7ddf9..f1170c103237 100644
--- a/pkgs/development/idris-modules/sdl2.nix
+++ b/pkgs/development/idris-modules/sdl2.nix
@@ -27,7 +27,7 @@ build-idris-package rec {
   src = fetchFromGitHub {
     owner = "steshaw";
     repo = "idris-sdl2";
-    tag = version;
+    rev = version;
     sha256 = "1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a";
   };
 
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index b9a26112c7f2..3f6fbe627898 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acl2-devel";
     repo = "acl2-devel";
-    tag = version;
+    rev = version;
     sha256 = "12cv5ms1j3vfrq066km020nwxb6x2dzh12g8nz6xxyxysn44wzzi";
   };
 
diff --git a/pkgs/development/interpreters/clojure/obb.nix b/pkgs/development/interpreters/clojure/obb.nix
index a24e4cfe4f5b..e367bcd72df9 100644
--- a/pkgs/development/interpreters/clojure/obb.nix
+++ b/pkgs/development/interpreters/clojure/obb.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "babashka";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1Gxh4IMtytQCuPS+BWOc5AgjEBxa43ebYfDsxLSPeY0=";
   };
 
diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index e60852c16c39..79c291f08e02 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/pkgs/development/interpreters/evcxr/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "evcxr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6gSJJ3ptqpYydjg+xf5Pz3iTk0D+bkC6N79OeiKxPHY=";
   };
 
diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix
index b892ad686b99..f7570e745d3d 100644
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "gdl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-IrCLL8MQp0SkWj7sbfZlma5FrnMbgdl4E/1nPGy0Y60=";
   };
 
diff --git a/pkgs/development/interpreters/janet/jpm.nix b/pkgs/development/interpreters/janet/jpm.nix
index 4382e3d9b80e..2982822bb508 100644
--- a/pkgs/development/interpreters/janet/jpm.nix
+++ b/pkgs/development/interpreters/janet/jpm.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "janet-lang";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lPB4jew6RkJlDp8xOQ4YA9MkgLBImaBHcvv4WF/sLRc=";
   };
 
diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
index 19e415855d8e..2120ac516a3f 100644
--- a/pkgs/development/interpreters/love/0.10.nix
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "love2d";
     repo = "love";
-    tag = version;
+    rev = version;
     sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym";
   };
 
diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix
index e5da81ef084a..785db5e9939c 100644
--- a/pkgs/development/interpreters/love/11.nix
+++ b/pkgs/development/interpreters/love/11.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "love2d";
     repo = "love";
-    tag = version;
+    rev = version;
     sha256 = "sha256-wZktNh4UB3QH2wAIIlnYUlNoXbjEDwUmPnT4vesZNm0=";
   };
 
diff --git a/pkgs/development/interpreters/luajit/openresty.nix b/pkgs/development/interpreters/luajit/openresty.nix
index 04779db52e26..5a1397ec3da1 100644
--- a/pkgs/development/interpreters/luajit/openresty.nix
+++ b/pkgs/development/interpreters/luajit/openresty.nix
@@ -11,7 +11,7 @@ callPackage ./default.nix rec {
   src = fetchFromGitHub {
     owner = "openresty";
     repo = "luajit2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kMHE4iQtm2CujK9TVut1jNhY2QxYP514jfBsxOCyd4s=";
   };
 
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index ec3561064341..1a9c554dc5a8 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -99,7 +99,7 @@ let
   src = fetchFromGitHub {
     owner = "ActiveState";
     repo = "cpython";
-    tag = "v${version}";
+    rev = "v${version}";
     inherit hash;
   };
 
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 346f358cd323..145f515a3c1d 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rakudo";
     repo = "rakudo";
-    tag = version;
+    rev = version;
     hash = "sha256-NrbeB6/VnxlUt6glIvetK1o9huWaeVD6WLdpi4bb2FU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index 1d057f11b913..9000fab8bb72 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moarvm";
     repo = "moarvm";
-    tag = version;
+    rev = version;
     hash = "sha256-Xvkn1edzOeXBiBn2QSwk0eKfSG1JvfSkVrCAmyYtlmI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index 4a4e68fb9eda..b1d06179fc23 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "raku";
     repo = "nqp";
-    tag = version;
+    rev = version;
     hash = "sha256-45L3fEL8jIk9bkKpuhrsLM014zNW1P7Kf6qVXxJjWws=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 15cb6c5b524d..9201f0e9c947 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IQeYmqCXhzWsuufrLKeBI2sw86dXbn7c5DbmcoJTWvo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix
index ac50f5abb76c..823e816e03fd 100644
--- a/pkgs/development/libraries/abseil-cpp/202103.nix
+++ b/pkgs/development/libraries/abseil-cpp/202103.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "abseil";
     repo = "abseil-cpp";
-    tag = version;
+    rev = version;
     sha256 = "sha256-fcxPhuI2eL/fnd6nT11p8DpUNwGNaXZmd03yOiZcOT0=";
   };
 
diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix
index ae57c0ddf56e..60a74c353f3e 100644
--- a/pkgs/development/libraries/agda/agda-categories/default.nix
+++ b/pkgs/development/libraries/agda/agda-categories/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "agda";
     repo = "agda-categories";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GQuQxzYSQxAIVSJ1vf0blRC0juoxAqD1AHW66H/6NSk=";
   };
 
diff --git a/pkgs/development/libraries/agda/agdarsec/default.nix b/pkgs/development/libraries/agda/agdarsec/default.nix
index 6320dbc5e7ba..257172ad3178 100644
--- a/pkgs/development/libraries/agda/agdarsec/default.nix
+++ b/pkgs/development/libraries/agda/agdarsec/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gallais";
     repo = "agdarsec";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "02fqkycvicw6m2xsz8p01aq8n3gj2d2gyx8sgj15l46f8434fy0x";
   };
 
diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix
index b20c3d41700c..8d33b36c55ed 100644
--- a/pkgs/development/libraries/agda/cubical/default.nix
+++ b/pkgs/development/libraries/agda/cubical/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "agda";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oLpKRWfQqb6CIscC2XM0ia9HJ8edJFHoPeql3kfvyrA=";
   };
 
diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
index 88c6a0a34003..40ec014ca129 100644
--- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
+++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     repo = "functional-linear-algebra";
     owner = "ryanorendorff";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3nme/eH4pY6bD0DkhL4Dj/Vp/WnZqkQtZTNk+n1oAyY=";
   };
 
diff --git a/pkgs/development/libraries/agda/generic/default.nix b/pkgs/development/libraries/agda/generic/default.nix
index 6f2aa2a1b275..4f2a787dc667 100644
--- a/pkgs/development/libraries/agda/generic/default.nix
+++ b/pkgs/development/libraries/agda/generic/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "effectfully";
     repo = "Generic";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "05igsd2gaj6h9bkqwp8llhvn4qvc5gmi03x4fnz096ba8m6x8s3n";
   };
 
diff --git a/pkgs/development/libraries/agda/generics/default.nix b/pkgs/development/libraries/agda/generics/default.nix
index b7d1bfa72a12..71219e334612 100644
--- a/pkgs/development/libraries/agda/generics/default.nix
+++ b/pkgs/development/libraries/agda/generics/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flupe";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-B1eT6F0Dp2zto50ulf+K/KYMlMp8Pgc/tO9qkcqn+O8=";
   };
 
diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix
index 34b8788e3800..55505f0edf42 100644
--- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix
@@ -11,7 +11,7 @@ mkDerivation (rec {
   src = fetchFromGitHub {
     owner = "cedille";
     repo = "ial";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0dlis6v6nzbscf713cmwlx8h9n2gxghci8y21qak3hp18gkxdp0g";
   };
 
diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix
index 719883b5714d..f05158d56a1c 100644
--- a/pkgs/development/libraries/agda/standard-library/default.nix
+++ b/pkgs/development/libraries/agda/standard-library/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     repo = "agda-stdlib";
     owner = "agda";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/Fy5EOSbVNXt6Jq0yKSnlNPW4SYfn+eCTAYFnMZrbR0=";
   };
 
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index c7d2466a70cf..091edf349412 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alembic";
     repo = "alembic";
-    tag = version;
+    rev = version;
     hash = "sha256-R69UYyvLnMwv1JzEQ6S6elvR83Rmvc8acBJwSV/+hCk=";
   };
 
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 716046b1e51f..b8c0b72062ac 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "liballeg";
     repo = "allegro5";
-    tag = version;
+    rev = version;
     sha256 = "sha256-agE3K+6VhhG/LO52fiesCsOq1fNYVRhdW7aKdPCbTOo=";
   };
 
diff --git a/pkgs/development/libraries/applet-window-buttons/default.nix b/pkgs/development/libraries/applet-window-buttons/default.nix
index 6bf873562dbc..ed67ddd197af 100644
--- a/pkgs/development/libraries/applet-window-buttons/default.nix
+++ b/pkgs/development/libraries/applet-window-buttons/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "psifidotos";
     repo = "applet-window-buttons";
-    tag = version;
+    rev = version;
     hash = "sha256-Qww/22bEmjuq+R3o0UDcS6U+34qjaeSEy+g681/hcfE=";
   };
 
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
index 9824a7c76eb4..e289cc2c3f9f 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thestk";
     repo = "rtaudio";
-    tag = version;
+    rev = version;
     sha256 = "0xvahlfj3ysgsjsp53q81hayzw7f99n1g214gh7dwdr52kv2l987";
   };
 
diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 78636fbdddbf..a3bf187dd9c2 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "lv2";
     repo = "suil";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rP8tq+zmHrAZeuNttakPPfraFXNvnwqbhtt+LtTNV/k=";
   };
 
diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix
index 751d645a15d5..ef2a51754de2 100644
--- a/pkgs/development/libraries/aws-c-io/default.nix
+++ b/pkgs/development/libraries/aws-c-io/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/pG/+MHAu/TYTtY/RQrr1U1ev2FZ1p/O8kIRUDDOcvQ=";
   };
 
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index f9c8634cc03e..47ef7a371a72 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sdk-cpp";
-    tag = version;
+    rev = version;
     hash = "sha256-K0UFs7vOeZeQIs3G5L4FfEWXDGTXT9ssr/vQwa1l2lw=";
   };
 
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index 416be32fdd00..63be83763eb2 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bulletphysics";
     repo = "bullet3";
-    tag = version;
+    rev = version;
     sha256 = "sha256-AGP05GoxLjHqlnW63/KkZe+TjO3IKcgBi+Qb/osQuCM=";
   };
 
diff --git a/pkgs/development/libraries/capstone/4.nix b/pkgs/development/libraries/capstone/4.nix
index f7dd2da8320d..d16356dc274d 100644
--- a/pkgs/development/libraries/capstone/4.nix
+++ b/pkgs/development/libraries/capstone/4.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "capstone-engine";
     repo = "capstone";
-    tag = version;
+    rev = version;
     sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g=";
   };
 
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 25697a52f9b8..df84133c6e5c 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "capstone-engine";
     repo = "capstone";
-    tag = version;
+    rev = version;
     hash = "sha256-ovIvsxVq+/q5UUMzP4WpxzaE0898uayNc1g2Coignnc=";
   };
 
diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix
index 5898decaf498..01d35a85d873 100644
--- a/pkgs/development/libraries/catch2/3.nix
+++ b/pkgs/development/libraries/catch2/3.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2gK+CUpml6AaHcwNoq0tHLr2NwqtMPx+jP80/LLFFr4=";
   };
 
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 20c79fe5d1be..087ad0923f26 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-XnT2ziES94Y4uzWmaxSw7nWegJFQjAqFUG8PkwK5nLU=";
   };
 
diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/development/libraries/cctag/default.nix
index 4a516929d8c9..557f88090405 100644
--- a/pkgs/development/libraries/cctag/default.nix
+++ b/pkgs/development/libraries/cctag/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alicevision";
     repo = "CCTag";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-foB+e7BCuUucyhN8FsI6BIT3/fsNLTjY6QmjkMWZu6A=";
   };
 
diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix
index 81d19f5beaa1..2786ea7b1dca 100644
--- a/pkgs/development/libraries/cctz/default.nix
+++ b/pkgs/development/libraries/cctz/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "cctz";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-F4h8nT1karymV16FFHC0ldSbdOOx5AMstqi4Bc5m3UQ=";
   };
 
diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix
index af07ad14fd8a..2422540de7ff 100644
--- a/pkgs/development/libraries/ctranslate2/default.nix
+++ b/pkgs/development/libraries/ctranslate2/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenNMT";
     repo = "CTranslate2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2Znrt+TiQf/9YI1HYAikDfqbekAghOvxKoC05S18scQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index 31f34a9666f1..187a9c8470ab 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CxxTest";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17";
   };
 
diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
index c47f70a213c9..077c52be3735 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "dbus-sharp-glib";
 
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm";
   };
 
diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix
index 9eaa5f1b3c27..538a14597b10 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/default.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "dbus-sharp-glib";
 
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8";
   };
 
diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
index a782085a0f28..e949ebb05fe5 100644
--- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "dbus-sharp";
 
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562";
   };
 
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index fe61ae8fcb53..31bb564d3a5a 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "mono";
     repo = "dbus-sharp";
 
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7";
   };
 
diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix
index faff6f855ee2..7b85ec1a18d6 100644
--- a/pkgs/development/libraries/discord-rpc/default.nix
+++ b/pkgs/development/libraries/discord-rpc/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "discordapp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "04cxhqdv5r92lrpnhxf8702a8iackdf3sfk1050z7pijbijiql2a";
   };
 
diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix
index 57b7f6a8f691..daf0116b06e2 100644
--- a/pkgs/development/libraries/draco/default.nix
+++ b/pkgs/development/libraries/draco/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "google";
     repo = "draco";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-p0Mn4kGeBBKL7Hoz4IBgb6Go6MdkgE7WZgxAnt1tE/0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/draco/tinygltf.nix b/pkgs/development/libraries/draco/tinygltf.nix
index ab95b557ee73..bce14b2d65d0 100644
--- a/pkgs/development/libraries/draco/tinygltf.nix
+++ b/pkgs/development/libraries/draco/tinygltf.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "syoyo";
     repo = "tinygltf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uQlv+mUWnqUJIXnPf2pVuRg1akcXAfqyBIzPPmm4Np4=";
   };
 
diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix
index 063e787b9411..ace060f54d07 100644
--- a/pkgs/development/libraries/embree/default.nix
+++ b/pkgs/development/libraries/embree/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "embree";
     repo = "embree";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bHVokEfnTW2cJqx3Zz2x1hIH07WamPAVFY9tiv6nHd0=";
   };
 
diff --git a/pkgs/development/libraries/flatbuffers/23.nix b/pkgs/development/libraries/flatbuffers/23.nix
index 64f0689e69e8..4e30c3dd37b6 100644
--- a/pkgs/development/libraries/flatbuffers/23.nix
+++ b/pkgs/development/libraries/flatbuffers/23.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "flatbuffers";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE=";
   };
 
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
index 6bf3d4b33d3c..f2430aa47b2d 100644
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "flatbuffers";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LApjF14eoqcT11Jp9SaJQbtvK8iIelTY4GJKqjVCpCM=";
   };
 
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index c04705dd1751..e4d6aaf99037 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -32,7 +32,7 @@ let
       src = fetchFromGitHub {
         owner = "fmtlib";
         repo = "fmt";
-        tag = version;
+        rev = version;
         inherit hash;
       };
 
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index 9689d7a130e5..b00ba47bbe29 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fplll";
     repo = "fplll";
-    tag = version;
+    rev = version;
     sha256 = "sha256-WvjXaCnUMioSmLlWmLV673mhRjnF+8DU9MqgUmBgaFQ=";
   };
 
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index 6e2844649e88..08c6b5a3a810 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenKinect";
     repo = "libfreenect";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PpJGFWrlQ5sK7TJxQNoPujw1MxWRjphvblwOqnF+mSg=";
   };
 
diff --git a/pkgs/development/libraries/gamenetworkingsockets/default.nix b/pkgs/development/libraries/gamenetworkingsockets/default.nix
index 957cfe39be9f..247d5d76b4a4 100644
--- a/pkgs/development/libraries/gamenetworkingsockets/default.nix
+++ b/pkgs/development/libraries/gamenetworkingsockets/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "12741wmpvy7mcvqqmjg4a7ph75rwliwgclhk4imjijqf2qkvsphd";
   };
 
diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix
index 89ffc74c3686..87505e71a2ff 100644
--- a/pkgs/development/libraries/gensio/default.nix
+++ b/pkgs/development/libraries/gensio/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cminyard";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DlveXTkdNu6Pb/0sL9K5HaOJ9HEhv2gwk5Kka9nI7U0=";
   };
 
diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index 46583fd25e07..e9ff8223501a 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maxmind";
     repo = "geoip-api-c";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv";
   };
 
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 37204ea70515..f5db48e14988 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "steveire";
     repo = "grantlee";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY=";
   };
 
diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index b5bf3890a274..982023d53f3d 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "steveire";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY=";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index 60c00834df94..c80c40b1d3f4 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "gstreamer";
     repo = "gst-plugins-rs";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-G6JdZXBNiZfbu6EBTOsJ4Id+BvPhIToZmHHi7zuapnE=";
     # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
     postFetch = ''
diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index 451ed44e8234..8981e4df3981 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mono";
     repo = "gtk-sharp";
-    tag = version;
+    rev = version;
     sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg";
   };
 
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 842e25ff2014..0644c6b6e984 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hunspell";
     repo = "hunspell";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-x2FXxnVIqsf5/UEQcvchAndXBv/3mW8Z55djQAFgNA8=";
   };
 
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 7ff61c9c9214..63c24cabe9bb 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -61,7 +61,7 @@ let
       src = fetchFromGitHub {
         owner = "sbosio";
         repo = "rla-es";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = "sha256-oGnxOGHzDogzUMZESydIxRTbq9Dmd03flwHx16AK1yk=";
       };
       meta = with lib; {
@@ -903,7 +903,7 @@ rec {
     src = fetchFromGitHub {
       owner = "OpenTaal";
       repo = "opentaal-hunspell";
-      tag = version;
+      rev = version;
       sha256 = "0jma8mmrncyzd77kxliyngs4z6z4769g3nh0a7xn2pd4s5y2xdpy";
     };
 
@@ -1194,7 +1194,7 @@ rec {
     src = fetchFromGitHub {
       owner = "spellcheck-ko";
       repo = "hunspell-dict-ko";
-      tag = version;
+      rev = version;
       hash = "sha256-eHuNppqB536wHXftzDghpB3cM9CNFKW1z8f0SNkEiD8=";
     };
 
diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix
index 99d8d2d8b208..440790d97ec9 100644
--- a/pkgs/development/libraries/iksemel/default.nix
+++ b/pkgs/development/libraries/iksemel/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "timothytylee";
     repo = "iksemel-1.4";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh";
   };
 
diff --git a/pkgs/development/libraries/kcolorpicker/default.nix b/pkgs/development/libraries/kcolorpicker/default.nix
index 83b52c249d13..a9ce1f68272d 100644
--- a/pkgs/development/libraries/kcolorpicker/default.nix
+++ b/pkgs/development/libraries/kcolorpicker/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ksnip";
     repo = "kColorPicker";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FG/A4pDNuhGPOeJNZlsnX3paEy4ibJVWKxn8rVUGpN8=";
   };
 
diff --git a/pkgs/development/libraries/kddockwidgets/default.nix b/pkgs/development/libraries/kddockwidgets/default.nix
index 88ebf0dc73e5..d9aa3433644d 100644
--- a/pkgs/development/libraries/kddockwidgets/default.nix
+++ b/pkgs/development/libraries/kddockwidgets/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KDAB";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VDLHED/QKxccZ18WEPV7GPdr3v7VaizDa5sZq7ei5+g=";
   };
 
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index 258b47edad2d..258326091b97 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "engla";
     repo = "keybinder";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-elL6DZtzCwAtoyGZYP0jAma6tHPks2KAtrziWtBENGU=";
   };
 
diff --git a/pkgs/development/libraries/kimageannotator/default.nix b/pkgs/development/libraries/kimageannotator/default.nix
index ed7f51cdd36c..ea46ff3f1155 100644
--- a/pkgs/development/libraries/kimageannotator/default.nix
+++ b/pkgs/development/libraries/kimageannotator/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ksnip";
     repo = "kImageAnnotator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LFou8gTF/XDBLNQbA4uurYJHQl7yOTKe2OGklUsmPrg=";
   };
 
diff --git a/pkgs/development/libraries/kompute/default.nix b/pkgs/development/libraries/kompute/default.nix
index c859101e8951..6bed23f4eb94 100644
--- a/pkgs/development/libraries/kompute/default.nix
+++ b/pkgs/development/libraries/kompute/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KomputeProject";
     repo = "kompute";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cf9Ef85R+VKao286+WHLgBWUqgwvuRocgeCzVJOGbdc=";
   };
 
diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix
index 45ce18ac4702..1ccac4b6fa75 100644
--- a/pkgs/development/libraries/l-smash/default.nix
+++ b/pkgs/development/libraries/l-smash/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "l-smash";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0rcq9727im6kd8da8b7kzzbzxdldvmh5nsljj9pvr4m3lj484b02";
   };
 
diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix
index 7c17b7d02e2b..42d7be0c068c 100644
--- a/pkgs/development/libraries/libadwaita/default.nix
+++ b/pkgs/development/libraries/libadwaita/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "libadwaita";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-7AI8Eb6o/Gysli9CprwsgAzz1cGmNU79Qm7OzlsaTFw=";
   };
 
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index e1ea19aae24a..25d52e369e47 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xiph";
     repo = "libao";
-    tag = version;
+    rev = version;
     sha256 = "0svgk4sc9kdhcsfyvbvgm5vpbg3sfr6z5rliflrw49v3x2i4vxq5";
   };
 
diff --git a/pkgs/development/libraries/libarchive-qt/default.nix b/pkgs/development/libraries/libarchive-qt/default.nix
index e4080c0bd837..1ed4e92e5b9b 100644
--- a/pkgs/development/libraries/libarchive-qt/default.nix
+++ b/pkgs/development/libraries/libarchive-qt/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "marcusbritanicus";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-31a6DsxObSJWyLfT6mVtyjloT26IwFHpH53iuyC2mco=";
   };
 
diff --git a/pkgs/development/libraries/libbtbb/default.nix b/pkgs/development/libraries/libbtbb/default.nix
index ac04757a3ce6..02175448c703 100644
--- a/pkgs/development/libraries/libbtbb/default.nix
+++ b/pkgs/development/libraries/libbtbb/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d";
   };
 
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 0ca9127d04d6..54b362b4ed34 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "communi";
     repo = "libcommuni";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9eYJpmjW1J48RD6wVJOHmsAgTbauNeeCrXe076ufq1I=";
   };
 
diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix
index c64ec6738385..142d768acd68 100644
--- a/pkgs/development/libraries/libepoxy/default.nix
+++ b/pkgs/development/libraries/libepoxy/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     fetchFromGitHub {
       owner = "anholt";
       repo = pname;
-      tag = version;
+      rev = version;
       sha256 = "sha256-gZiyPOW2PeTMILcPiUTqPUGRNlMM5mI1z9563v4SgEs=";
     };
 
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index 120d95710c7d..ce75d6c0fe83 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "analogdevicesinc";
     repo = "libiio";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-c5HsxCdp1cv5BGTQ/8dc8J893zk9ntbfAudLpqoQ1ow=";
   };
 
diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix
index 7c3f98e21776..04510dc5bca0 100644
--- a/pkgs/development/libraries/libint/default.nix
+++ b/pkgs/development/libraries/libint/default.nix
@@ -150,7 +150,7 @@ let
     src = fetchFromGitHub {
       owner = "evaleev";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-y+Mo8J/UWDrkkNEDAoostb/k6jrhYYeU0u9Incrd2cE=";
     };
 
diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix
index bcc15601d20f..3062a91186cc 100644
--- a/pkgs/development/libraries/liblqr-1/default.nix
+++ b/pkgs/development/libraries/liblqr-1/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "carlobaldassi";
     repo = "liblqr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "10mrl5k3l2hxjhz4w93n50xwywp6y890rw2vsjcgai8627x5f1df";
   };
 
diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix
index 97642dbec6cb..c255ee432d0e 100644
--- a/pkgs/development/libraries/libpulsar/default.nix
+++ b/pkgs/development/libraries/libpulsar/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "pulsar-client-cpp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hY6ivTKWgl/2KLeP6MMAdWcM/LJ5b7zoNVRlg6nx6Sc=";
   };
 
diff --git a/pkgs/development/libraries/libqofono/default.nix b/pkgs/development/libraries/libqofono/default.nix
index 731bc7374765..4b67650d3541 100644
--- a/pkgs/development/libraries/libqofono/default.nix
+++ b/pkgs/development/libraries/libqofono/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sailfishos";
     repo = "libqofono";
-    tag = version;
+    rev = version;
     hash = "sha256-fI7RS0V8wrsJ2AZAyjVgHmG+c13DXdo6xTjIlGbOHI8=";
   };
 
diff --git a/pkgs/development/libraries/libqtdbusmock/default.nix b/pkgs/development/libraries/libqtdbusmock/default.nix
index 31a3f47b32fa..c5fcb384530f 100644
--- a/pkgs/development/libraries/libqtdbusmock/default.nix
+++ b/pkgs/development/libraries/libqtdbusmock/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/libqtdbusmock";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-hVw2HnIHlA7vvt0Sr6F2qVhvBZ33aCeqb9vgbu3rgBo=";
   };
 
diff --git a/pkgs/development/libraries/libqtdbustest/default.nix b/pkgs/development/libraries/libqtdbustest/default.nix
index 394a620964f1..756fa756c396 100644
--- a/pkgs/development/libraries/libqtdbustest/default.nix
+++ b/pkgs/development/libraries/libqtdbustest/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/libqtdbustest";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-yqqyKxsbqiVTrkas79YoPMi28dKFNntiE7+dx1v+Qh4=";
   };
 
diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix
index c512ec6747ae..7964b19391bb 100644
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "quotient-im";
     repo = "libQuotient";
-    tag = version;
+    rev = version;
     hash = "sha256-R9ms3sYGdHaYKUMnZyBjw5KCik05k93vlvXMRtAXh5Y=";
   };
 
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 8d3da752c464..0a53591d6908 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "re";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OWVDuKlF7YLipDURC46s14WOLWWagUqWg20sH0kSIA4=";
   };
 
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 5a3f27516f0e..9639193ffb58 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "IntelRealSense";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Stx337mGcpMCg9DlZmvX4LPQmCSzLRFcUQPxaD/Y0Ds=";
   };
 
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 3315899d3eca..0c91b3e13d8b 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-MOOX/O0UaoeMaQPW9PvvE0izVp+6IoE5VbtTx0RvMkI=";
   };
 
diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index 0e294dd19706..6dab2ea2c6f0 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andrewrk";
     repo = "libsoundio";
-    tag = version;
+    rev = version;
     sha256 = "12l4rvaypv87vigdrmjz48d4d6sq4gfxf5asvnc4adyabxb73i4x";
   };
 
diff --git a/pkgs/development/libraries/libuiohook/default.nix b/pkgs/development/libraries/libuiohook/default.nix
index 9097c2e16e6e..e39c2addfac4 100644
--- a/pkgs/development/libraries/libuiohook/default.nix
+++ b/pkgs/development/libraries/libuiohook/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kwhat";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1qlz55fp4i9dd8sdwmy1m8i4i1jy1s09cpmlxzrgf7v34w72ncm7";
   };
 
diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix
index 7ed6385ae8d9..904848cf78fb 100644
--- a/pkgs/development/libraries/libusb-compat/0.1.nix
+++ b/pkgs/development/libraries/libusb-compat/0.1.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libusb";
     repo = "libusb-compat-0.1";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pAPERYSxoc47gwpPUoMkrbK8TOXyx03939vlFN0hHRg=";
   };
 
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 7bb4193497cc..a02047b552c9 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libusb";
     repo = "libusb";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OtzYxWwiba0jRK9X+4deWWDDTeZWlysEt0qMyGUarDo=";
   };
 
diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix
index a189bdfcfb9d..05680090878a 100644
--- a/pkgs/development/libraries/libva/1.nix
+++ b/pkgs/development/libraries/libva/1.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "libva";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ur59cqdZqXIY2dDUSie9XsxyRomVBxIW2IVKAgWYC38=";
   };
 
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 9c1a9cace939..9fd523a70610 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "libva";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-0eOYxyMt2M2lkhoWOhoUQgP/1LYY3QQqSF5TdRUuCbs=";
   };
 
diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix
index d258594d08be..1be8fd098fce 100644
--- a/pkgs/development/libraries/libva/utils.nix
+++ b/pkgs/development/libraries/libva/utils.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "libva-utils";
-    tag = version;
+    rev = version;
     sha256 = "sha256-CmhdhNNRO2j8lH7awp9YiKWMvV17GTBsXdrNY06jT2w=";
   };
 
diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix
index 62f4696ee6b2..019749eac91a 100644
--- a/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/pkgs/development/libraries/liquid-dsp/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jgaeddert";
     repo = "liquid-dsp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8=";
   };
 
diff --git a/pkgs/development/libraries/luksmeta/default.nix b/pkgs/development/libraries/luksmeta/default.nix
index aec23b942bb2..0968c5374a8f 100644
--- a/pkgs/development/libraries/luksmeta/default.nix
+++ b/pkgs/development/libraries/luksmeta/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "latchset";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "10nslwk7m1qwskd12c204ipa3cbad0q6fn0v084z2f7q6xxbkd2d";
   };
 
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index b84eec2a6d8a..60708ed7a4a2 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MailCore";
     repo = "mailcore2";
-    tag = version;
+    rev = version;
     sha256 = "0a69q11z194fdfwyazjyyylx57sqs9j4lz7jwh5qcws8syqgb23z";
   };
 
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 3cb96e60fbd8..5ac9522155f1 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mapnik";
     repo = "mapnik";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pReoyMdu8RYrberKcwGw0DKmkxVRJezZYcPAM/UAn6o=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 44239d8d5160..75355eb4c4c9 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
-    tag = "v${version}";
+    rev = "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/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix
index ebfacb7fd8b8..885dd5e5137d 100644
--- a/pkgs/development/libraries/mypaint-brushes/1.0.nix
+++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mypaint";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j";
   };
 
diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix
index ea15524f8578..a8ca5edacc7e 100644
--- a/pkgs/development/libraries/mypaint-brushes/default.nix
+++ b/pkgs/development/libraries/mypaint-brushes/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mypaint";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9";
   };
 
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index 63e7988c239e..aacafb1e674f 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Unidata";
     repo = "netcdf-fortran";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-nC93NcA4VJbrqaLwyhjP10j/t6rQSYcAzKBxclpZVe0=";
   };
 
diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix
index 992e42d0a685..c354ed018946 100644
--- a/pkgs/development/libraries/nghttp3/default.nix
+++ b/pkgs/development/libraries/nghttp3/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SWc7qTQjk03I24nYjzUnOj58ZuV3cbX0G5y4zXwiU4w=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index 14bca8663315..2351230a0a7a 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ize2i2kx9spAWOq3joTZGiAd01cwmBmFXF6jBtyjPWc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix
index c4796f8dc374..accb78d9c411 100644
--- a/pkgs/development/libraries/ngtcp2/gnutls.nix
+++ b/pkgs/development/libraries/ngtcp2/gnutls.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = "ngtcp2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m9kJrEDYfxPSreH14M/h/f+7vgk6Ho6pmvVdJ1S8acc=";
   };
 
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 7c57b93c7914..1e1f5f01c382 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stevengj";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o=";
   };
 
diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index 90a64e90690b..f2e7309b09ed 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nuspell";
     repo = "nuspell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-U/lHSxpKsBnamf4ikE2aIjEPSU5fxjtuSmhZR0jxMAI=";
   };
 
diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
index fbaf3732120f..89eee7dbf8d5 100644
--- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
+++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "elFarto";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KeOg9VvPTqIo0qB+dcU915yTztvFxo1jJcHHpsmMmfk=";
   };
 
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index b8274ff4441f..9ec54c3828da 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -57,7 +57,7 @@ let
       src = fetchFromGitHub {
         owner = "OGRECave";
         repo = "ogre";
-        tag = "v${version}";
+        rev = "v${version}";
         inherit hash;
       };
 
diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix
index 31828c17defc..b6ddc5ebbf63 100644
--- a/pkgs/development/libraries/ois/default.nix
+++ b/pkgs/development/libraries/ois/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wgois";
     repo = "OIS";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ir6p+Tzf8L5VOW/rsG4yelsth7INbhABO2T7pfMHcFo=";
   };
 
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index c9daca95a39d..9972d316a941 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kcat";
     repo = "openal-soft";
-    tag = version;
+    rev = version;
     sha256 = "sha256-jwY1NzNJdWIvVv7TvJyg4cIGFLWGZhL3BkMI1NbOEG0=";
   };
 
diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix
index b1d5bcf65331..4ac41482037f 100644
--- a/pkgs/development/libraries/opencolorio/1.x.nix
+++ b/pkgs/development/libraries/opencolorio/1.x.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "imageworks";
     repo = "OpenColorIO";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb";
   };
 
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 2f179268b423..5b5a45b6c372 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenColorIO";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+P7T8UZuQEVmsMykSWtUxg0vC7Sr4fQJpovCU5sKtsA=";
   };
 
diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index 308fc70041d9..c52dac8dab25 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openexr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mVUxxYe6teiJ18PQ9703/kjBpJ9+a7vcDme+NwtQQQM=";
   };
 
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 5c15c6860020..84dc7fb990e7 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openexr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xdC+T79ZQBx/XhuIXtP93Roj0N9lF+E65ReEKQ4kIsg=";
   };
 
diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix
index 4d205eb499a8..adb25d2ab3ae 100644
--- a/pkgs/development/libraries/openimageio/default.nix
+++ b/pkgs/development/libraries/openimageio/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenImageIO";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hUCwlzQW5mJH5HYPbLWOcupc36nxM12CV0sakZhiGzo=";
   };
 
diff --git a/pkgs/development/libraries/openvdb/11.nix b/pkgs/development/libraries/openvdb/11.nix
index ea491b88fc3d..a65bb286ae2e 100644
--- a/pkgs/development/libraries/openvdb/11.nix
+++ b/pkgs/development/libraries/openvdb/11.nix
@@ -10,7 +10,7 @@ openvdb.overrideAttrs (old: rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openvdb";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ=";
   };
   meta = old.meta // {
diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
index 4b61f111f42f..ff662ed440d7 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/pkgs/development/libraries/openvdb/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openvdb";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-S2uvzDCrTxAmvUMJr5PChcYTqhIHvRZbOfQLtUvzypI=";
   };
 
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix
index 73dbc6ce6731..c53c31e32c1e 100644
--- a/pkgs/development/libraries/pangolin/default.nix
+++ b/pkgs/development/libraries/pangolin/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stevenlovegrove";
     repo = "Pangolin";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-B5YuNcJZHjR3dlVs66rySi68j29O3iMtlQvCjTUZBeY=";
   };
 
diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix
index e528b589e46e..fd298709181e 100644
--- a/pkgs/development/libraries/pc-ble-driver/default.nix
+++ b/pkgs/development/libraries/pc-ble-driver/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NordicSemiconductor";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-srH7Gdiy9Lsv68fst/9jhifx03R2e+4kMia6pU/oCZg=";
   };
 
diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix
index 3520a749dedf..7ed7f08a8337 100644
--- a/pkgs/development/libraries/pdfhummus/default.nix
+++ b/pkgs/development/libraries/pdfhummus/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "galkahana";
     repo = "PDF-Writer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sCa/yu+DVggN7Sha7dP9FXzZUJ2tGLYEFrq87dD4tsE=";
   };
 
diff --git a/pkgs/development/libraries/phonetisaurus/default.nix b/pkgs/development/libraries/phonetisaurus/default.nix
index 881d93017f46..91a2f3801153 100644
--- a/pkgs/development/libraries/phonetisaurus/default.nix
+++ b/pkgs/development/libraries/phonetisaurus/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AdolfVonKleist";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1b18s5zz0l0fhqh9n9jnmgjz2hzprwzf6hx5a12zibmmam3qyriv";
   };
 
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 07408c6641ba..06c44206853a 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "pipewire";
     repo = "pipewire";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-TnGn6EVjjpEybslLEvBb66uqOiLg5ngpNV9LYO6TfvA=";
   };
 
diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix
index 4042dc65facd..a1d202232544 100644
--- a/pkgs/development/libraries/podofo/0.10.x.nix
+++ b/pkgs/development/libraries/podofo/0.10.x.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "podofo";
     repo = "podofo";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ZY+kyimLzAeEgvDaflXM7MbyzsGgivOnG1aBD9/ozbk=";
   };
 
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix
index cb6ee80ef4e9..9afbb6018aeb 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/pkgs/development/libraries/portmidi/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-uqBeh9vBP6+V+FN4lfeGxePQcpZMDYUuAo/d9a5rQxU=";
   };
 
diff --git a/pkgs/development/libraries/proj/7.nix b/pkgs/development/libraries/proj/7.nix
index e67377aa3cfe..19f205df4b72 100644
--- a/pkgs/development/libraries/proj/7.nix
+++ b/pkgs/development/libraries/proj/7.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
-    tag = version;
+    rev = version;
     sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
   };
 
diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index cf1b9fd8f1ed..42da509dce8b 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-sY3AIvsQnV2zi38nJs/U6zTsIgIv4/CaZaxinCg5nEs=";
   };
 
diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix
index 627acae91079..340a87666c14 100644
--- a/pkgs/development/libraries/prometheus-client-c/default.nix
+++ b/pkgs/development/libraries/prometheus-client-c/default.nix
@@ -21,7 +21,7 @@ let
       src = fetchFromGitHub {
         owner = "digitalocean";
         repo = "prometheus-client-c";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = "0g69s24xwrv5974acshrhnp6i8rpby8c6bhz15m3d8kpgjw3cm8f";
       };
 
diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix
index 58a3c762c45b..566c1e05f6ca 100644
--- a/pkgs/development/libraries/pyotherside/default.nix
+++ b/pkgs/development/libraries/pyotherside/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thp";
     repo = "pyotherside";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2OYVULNW9EzssqodiVtL2EmhTSbefXpLkub3zFvNwNo=";
   };
 
diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix
index db8cbb06853f..92818b35571b 100644
--- a/pkgs/development/libraries/qcoro/default.nix
+++ b/pkgs/development/libraries/qcoro/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "danvratil";
     repo = "qcoro";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-teRuWtNR8r/MHZhqphazr7Jmn43qsHGv9eXOGrhSND0=";
   };
 
diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
index 0e4f789b9ed7..98bea95922e4 100644
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = "QGnomePlatform";
-    tag = version;
+    rev = version;
     sha256 = "sha256-DaIBtWmce+58OOhqFG5802c3EprBAtDXhjiSPIImoOM=";
   };
 
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index 076d43f5f503..4edb927e2213 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flavio";
     repo = "qjson";
-    tag = version;
+    rev = version;
     sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs";
   };
 
diff --git a/pkgs/development/libraries/qmenumodel/default.nix b/pkgs/development/libraries/qmenumodel/default.nix
index fed362435046..16e23abcc34a 100644
--- a/pkgs/development/libraries/qmenumodel/default.nix
+++ b/pkgs/development/libraries/qmenumodel/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "qmenumodel";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-zbKAfq9R5fD2IqVYOAhy903QX1TDom9m6Ib2qpkFMak=";
   };
 
diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix
index 810249f35e17..5f6cf45351f2 100644
--- a/pkgs/development/libraries/qmlbox2d/default.nix
+++ b/pkgs/development/libraries/qmlbox2d/default.nix
@@ -18,7 +18,7 @@ let
     src = fetchFromGitHub {
       owner = "erincatto";
       repo = "box2d";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs=";
     };
     sourceRoot = "${src.name}/Box2D";
diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index 54e3bf0ba020..2ba063f56ea7 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ayoy";
     repo = "qoauth";
-    tag = "v${version}";
+    rev = "v${version}";
     name = "qoauth-${version}.tar.gz";
     sha256 = "1b2jdqs526ac635yb2whm049spcsk7almnnr6r5b4yqhq922anw3";
   };
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index 269941e6ad9e..401316c38016 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -38,7 +38,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
     src = fetchFromGitHub {
       owner = "qt";
       repo = "qtpositioning";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-L/P+yAQItm3taPpCNoOOm7PNdOFZiIwJJYflk6JDWvU=";
     };
   };
@@ -49,7 +49,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
     src = fetchFromGitHub {
       owner = "qt";
       repo = "qtwebkit";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
     };
     version = "5.212.0-alpha4";
diff --git a/pkgs/development/libraries/qtdbusextended/default.nix b/pkgs/development/libraries/qtdbusextended/default.nix
index bad71c85328d..c1cc09b29bc1 100644
--- a/pkgs/development/libraries/qtdbusextended/default.nix
+++ b/pkgs/development/libraries/qtdbusextended/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nemomobile";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-tUp7OhNBXwomR2tO4UOaR0vJQ3GTirMk/hRl1cMk61o=";
   };
 
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index d7574e438338..5ad105a64bac 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "frankosterfeld";
     repo = "qtkeychain";
-    tag = version;
+    rev = version;
     sha256 = "sha256-/gdozAJbjaaCcttQED2PixaFNRDZOXbBIoV9QLexNUg=";
   };
 
diff --git a/pkgs/development/libraries/qtmpris/default.nix b/pkgs/development/libraries/qtmpris/default.nix
index a51804ff3530..6bc94edeb30e 100644
--- a/pkgs/development/libraries/qtmpris/default.nix
+++ b/pkgs/development/libraries/qtmpris/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sailfishos";
     repo = "qtmpris";
-    tag = version;
+    rev = version;
     hash = "sha256-kuM8hUdsa7N+eLDbwYw3ay+PWxg35zcTBOvGow1NlzI=";
   };
 
diff --git a/pkgs/development/libraries/qtspell/default.nix b/pkgs/development/libraries/qtspell/default.nix
index 47a3ff92d1bc..fafa13d11457 100644
--- a/pkgs/development/libraries/qtspell/default.nix
+++ b/pkgs/development/libraries/qtspell/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "manisandro";
     repo = "qtspell";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-yaR3eCUbK2KTpvzO2G5sr+NEJ2mDnzJzzzwlU780zqU=";
   };
 
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 8b2175d60862..e82952780c4d 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stachenov";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-AOamvy2UgN8n7EZ8EidWkVzRICzEXMmvZsB18UwxIVo=";
   };
 
diff --git a/pkgs/development/libraries/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix
index 67e4cfa729e1..eaa7fb392e2c 100644
--- a/pkgs/development/libraries/qwlroots/default.nix
+++ b/pkgs/development/libraries/qwlroots/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vioken";
     repo = "qwlroots";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-ZyG0JGUlz/ubtwN5wYtC8qeYsPur+0kTkD7iIjHX7KU=";
   };
 
diff --git a/pkgs/development/libraries/qxlsx/default.nix b/pkgs/development/libraries/qxlsx/default.nix
index 65fa2e07d243..a9280ae76f47 100644
--- a/pkgs/development/libraries/qxlsx/default.nix
+++ b/pkgs/development/libraries/qxlsx/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "QtExcel";
     repo = "QXlsx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-twOlAiLE0v7+9nWo/Gd+oiKT1umL3UnG1Xa0zDG7u7s=";
   };
 
diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix
index ab074ec0713d..3fe969629394 100644
--- a/pkgs/development/libraries/qxmpp/default.nix
+++ b/pkgs/development/libraries/qxmpp/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "qxmpp-project";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-M3F4tNIO3RvDxk/lce8/J6kmQtnsGLILQ15uEzgyfds=";
   };
 
diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix
index b96457840ad2..75e72e16fbc1 100644
--- a/pkgs/development/libraries/randomx/default.nix
+++ b/pkgs/development/libraries/randomx/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tevador";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dfImzwbEfJQcaPZCoWypHiI6dishVRdqS/r+n3tfjvM=";
   };
 
diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix
index 3c26a60210a0..98cf154ec1e6 100644
--- a/pkgs/development/libraries/rnnoise-plugin/default.nix
+++ b/pkgs/development/libraries/rnnoise-plugin/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "werman";
     repo = "noise-suppression-for-voice";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sfwHd5Fl2DIoGuPDjELrPp5KpApZJKzQikCJmCzhtY8=";
   };
 
diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
index dd2a3a1414ba..e30e14e4b031 100644
--- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
+++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-zDn5cgMBJYM27mfQHujxhIf4ZTljFxvFrKl7pNa4K9E=";
   };
 
diff --git a/pkgs/development/libraries/science/chemistry/molequeue/default.nix b/pkgs/development/libraries/science/chemistry/molequeue/default.nix
index 9c2b918ccc34..4ac575e75238 100644
--- a/pkgs/development/libraries/science/chemistry/molequeue/default.nix
+++ b/pkgs/development/libraries/science/chemistry/molequeue/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-+NoY8YVseFyBbxc3ttFWiQuHQyy1GN8zvV1jGFjmvLg=";
   };
 
diff --git a/pkgs/development/libraries/science/chemistry/tblite/default.nix b/pkgs/development/libraries/science/chemistry/tblite/default.nix
index c2ea6e5f7768..860a9f55d42f 100644
--- a/pkgs/development/libraries/science/chemistry/tblite/default.nix
+++ b/pkgs/development/libraries/science/chemistry/tblite/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tblite";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KV2fxB+SF4LilN/87YCvxUt4wsY4YyIV4tqnn+3/0oI=";
   };
 
diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix
index b13015088bc2..8bd4297fb95b 100644
--- a/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "clMathLibraries";
     repo = "clBLAS";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs";
   };
 
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index ca2d13959c18..9a07f5355219 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -176,7 +176,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenMathLib";
     repo = "OpenBLAS";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-n/3FGmZxnNiOEKYHSIuqX2LJS1BzYPCwLWT9DSwEoPI=";
   };
 
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 3a3f9a90a10b..adb5b196a34b 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -32,7 +32,7 @@ effectiveStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DrTimothyAldenDavis";
     repo = "SuiteSparse";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Anen1YtXsSPhk8DpA4JtADIz9m8oXFl9umlkb4iImf8=";
   };
 
diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix
index 2acb15eb9a0f..bb9a91be24d9 100644
--- a/pkgs/development/libraries/soci/default.nix
+++ b/pkgs/development/libraries/soci/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SOCI";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-NE0ApbX8HG2VAQ9cg9+kX3kJQ4PR1XvWL9BlT8NphmE=";
   };
 
diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index f19439c72d63..d70bd95bef04 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/pkgs/development/libraries/sofia-sip/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "freeswitch";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY=";
   };
 
diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix
index 20c69b6adebe..74ffba0e6256 100644
--- a/pkgs/development/libraries/spglib/default.nix
+++ b/pkgs/development/libraries/spglib/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spglib";
     repo = "spglib";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rmQYFFfpyUhT9pfQZk1fN5tZWTg40wwtszhPhiZpXs4=";
   };
 
diff --git a/pkgs/development/libraries/structuresynth/default.nix b/pkgs/development/libraries/structuresynth/default.nix
index fe513f19400f..362aaa7e25c9 100644
--- a/pkgs/development/libraries/structuresynth/default.nix
+++ b/pkgs/development/libraries/structuresynth/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "alemuntoni";
     repo = "structuresynth";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-uFz4WPwA586B/5p+DUJ/W8KzbHLBhLIwP6mySZJ1vPY=";
   };
 
diff --git a/pkgs/development/libraries/tbb/2020_3.nix b/pkgs/development/libraries/tbb/2020_3.nix
index 0a68be2b5f70..0399aa4c165f 100644
--- a/pkgs/development/libraries/tbb/2020_3.nix
+++ b/pkgs/development/libraries/tbb/2020_3.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneTBB";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";
   };
 
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 02492ad5b50b..05e18da04560 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneTBB";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zGZHMtAUVzBKFbCshpepm3ce3tW6wQ+F30kYYXAQ/TE=";
   };
 
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index f1a75b049d1a..b8b68919c807 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-BP28utEUI9g1VNv3lCXuiKrDtEImFQxxZfIjLiE3Wr8=";
   };
 
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index f9e674915b7a..38d0d8ff4f7f 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -47,7 +47,7 @@
     src = fetchFromGitHub {
       owner = "mariadb-corporation";
       repo = "mariadb-connector-odbc";
-      tag = version;
+      rev = version;
       hash = "sha256-l+HlS7/A0shwsEXYKDhi+QCmwHaMTeKrtcvo9yYpYws=";
       # this driver only seems to build correctly when built against the mariadb-connect-c subrepo
       # (see https://github.com/NixOS/nixpkgs/issues/73258)
diff --git a/pkgs/development/libraries/unqlite/default.nix b/pkgs/development/libraries/unqlite/default.nix
index ad4a88bb0b6c..4d93dec6f352 100644
--- a/pkgs/development/libraries/unqlite/default.nix
+++ b/pkgs/development/libraries/unqlite/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "symisc";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WLsyGEt7Xe6ZrOGMO7+3TU2sBgDTSmfD1WzD70pcDjo=";
   };
 
diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix
index 31cf8282036c..c894dc31de22 100644
--- a/pkgs/development/libraries/vc/0.7.nix
+++ b/pkgs/development/libraries/vc/0.7.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "VcDevel";
     repo = "Vc";
-    tag = version;
+    rev = version;
     sha256 = "190s4r2n3jsivl4j2m288j3rqmgjj6gl308hi9mzwyhcfn17q8br";
   };
 
diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index 9e4925babb79..8ff1ccd81d53 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "VcDevel";
     repo = "Vc";
-    tag = version;
+    rev = version;
     sha256 = "sha256-A2qUzjXv50unFcoZp2nRVinkph+CoHyiU7AgOphDphM=";
   };
 
diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix
index 542c195f76bf..fbb0d0dad266 100644
--- a/pkgs/development/libraries/waylandpp/default.nix
+++ b/pkgs/development/libraries/waylandpp/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NilsBrause";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg=";
   };
 
diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix
index e49e900c258e..17e2c2eadcb7 100644
--- a/pkgs/development/libraries/waylib/default.nix
+++ b/pkgs/development/libraries/waylib/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vioken";
     repo = "waylib";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-djFwUe/+5CNEnOTKL5OAC8zVQqsT8BSqQEWjkbEt7xQ=";
   };
 
diff --git a/pkgs/development/libraries/webkit2-sharp/default.nix b/pkgs/development/libraries/webkit2-sharp/default.nix
index f2f8c58bfaa5..78b89397b76d 100644
--- a/pkgs/development/libraries/webkit2-sharp/default.nix
+++ b/pkgs/development/libraries/webkit2-sharp/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hbons";
     repo = "webkit2-sharp";
-    tag = version;
+    rev = version;
     sha256 = "sha256:0a7vx81zvzn2wq4q2mqrxvlps1mqk28lm1gpfndqryxm4iiw28vc";
   };
 
diff --git a/pkgs/development/libraries/wiiuse/default.nix b/pkgs/development/libraries/wiiuse/default.nix
index 34e59bc4ff1f..606dd201f324 100644
--- a/pkgs/development/libraries/wiiuse/default.nix
+++ b/pkgs/development/libraries/wiiuse/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wiiuse";
     repo = "wiiuse";
-    tag = version;
+    rev = version;
     sha256 = "sha256-l2CS//7rx5J3kI32yTSp0BDtP0T5+riLowtnxnfAotc=";
   };
 
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 1d74d2c317da..a42a60d002a3 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -49,7 +49,7 @@ let
         domain = "gitlab.freedesktop.org";
         owner = "wlroots";
         repo = "wlroots";
-        tag = finalAttrs.version;
+        rev = finalAttrs.version;
         inherit hash;
       };
 
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index 6f44ad33973c..57e7b8fb80a4 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -31,7 +31,7 @@ let
       src = fetchFromGitHub {
         owner = "emweb";
         repo = "wt";
-        tag = version;
+        rev = version;
         inherit sha256;
       };
 
diff --git a/pkgs/development/libraries/yaml-cpp/default.nix b/pkgs/development/libraries/yaml-cpp/default.nix
index b8360da44343..75941866b604 100644
--- a/pkgs/development/libraries/yaml-cpp/default.nix
+++ b/pkgs/development/libraries/yaml-cpp/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jbeder";
     repo = "yaml-cpp";
-    tag = version;
+    rev = version;
     hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI=";
   };
 
diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix
index e94be184d934..646188c4c694 100644
--- a/pkgs/development/libraries/yubico-pam/default.nix
+++ b/pkgs/development/libraries/yubico-pam/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0hb773zlf11xz4bwmsqv2mq5d4aq2g0crdr5cp9xwc4ivi5gd4kg";
   };
 
diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix
index 407c12650c28..8badae678e11 100644
--- a/pkgs/development/libraries/zint/default.nix
+++ b/pkgs/development/libraries/zint/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zint";
     repo = "zint";
-    tag = version;
+    rev = version;
     hash = "sha256-/ILq/7A8Lffe2NuiABiV3KeYXapuL1SO55Qk3wXfC/8=";
   };
 
diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index 9e5f7daf367c..9acb067effaf 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -161,7 +161,7 @@ let
         src = pkgs.fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          tag = "v${version}";
+          rev = "v${version}";
           hash = "sha256-5hNB5XxbTER4HX3dn4umUGnw6UeiTQkczmggFz4uWoE=";
         };
         systems = [
diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix
index 71d6deb6cb93..94df290fec08 100644
--- a/pkgs/development/misc/msp430/mspdebug.nix
+++ b/pkgs/development/misc/msp430/mspdebug.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dlbeer";
     repo = "mspdebug";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c";
   };
 
diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix
index 4f2dd79601d4..577a6ed1bb90 100644
--- a/pkgs/development/misc/resholve/deps.nix
+++ b/pkgs/development/misc/resholve/deps.nix
@@ -26,7 +26,7 @@ rec {
     src = fetchFromGitHub {
       owner = "bw2";
       repo = "ConfigArgParse";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz";
     };
 
diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix
index eebc1207c2d6..670010c83562 100644
--- a/pkgs/development/misc/resholve/source.nix
+++ b/pkgs/development/misc/resholve/source.nix
@@ -8,7 +8,7 @@ rec {
   rSrc = fetchFromGitHub {
     owner = "abathur";
     repo = "resholve";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SzJbA0wLeSwvXnAE4bTNqh0tnpFPkn6N1hp7sZGAkB4=";
   };
 }
diff --git a/pkgs/development/mobile/fdroidcl/default.nix b/pkgs/development/mobile/fdroidcl/default.nix
index b4aad9f14cc1..60bccaef812a 100644
--- a/pkgs/development/mobile/fdroidcl/default.nix
+++ b/pkgs/development/mobile/fdroidcl/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "fdroidcl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tqhs3b/DHfnGOm9qcM56NSzt1GJflJfbemkp7+nXbug=";
   };
 
diff --git a/pkgs/development/ocaml-modules/afl-persistent/default.nix b/pkgs/development/ocaml-modules/afl-persistent/default.nix
index 44f960ab3aac..e1b1c375b332 100644
--- a/pkgs/development/ocaml-modules/afl-persistent/default.nix
+++ b/pkgs/development/ocaml-modules/afl-persistent/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stedolan";
     repo = "ocaml-${pname}";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i";
   };
 
diff --git a/pkgs/development/ocaml-modules/algaeff/default.nix b/pkgs/development/ocaml-modules/algaeff/default.nix
index 18cba82616be..0e867f8a0838 100644
--- a/pkgs/development/ocaml-modules/algaeff/default.nix
+++ b/pkgs/development/ocaml-modules/algaeff/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "RedPRL";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-VRZfULbXKRcExU1bnEu/X1KPX+L+dzcRYZVD985rQT4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/alsa/default.nix b/pkgs/development/ocaml-modules/alsa/default.nix
index a0d0c64c458c..15b60d288221 100644
--- a/pkgs/development/ocaml-modules/alsa/default.nix
+++ b/pkgs/development/ocaml-modules/alsa/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-alsa";
-    tag = version;
+    rev = version;
     sha256 = "1qy22g73qc311rmv41w005rdlj5mfnn4yj1dx1jhqzr31zixl8hj";
   };
 
diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index 4f27cea36f02..423267fb2b1b 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-EPqDK+7RU2vHEHvuoTXb8V2FkdXQ6tGu0ghbNPS3gZ4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ao/default.nix b/pkgs/development/ocaml-modules/ao/default.nix
index 7e2a60cc97eb..06d96fddeb82 100644
--- a/pkgs/development/ocaml-modules/ao/default.nix
+++ b/pkgs/development/ocaml-modules/ao/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ao";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HhJdb4i9B4gz3emgDCDT4riQuAsY4uP/47biu7EZ+sk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix
index ae70ee419d2d..308803b75ced 100644
--- a/pkgs/development/ocaml-modules/apron/default.nix
+++ b/pkgs/development/ocaml-modules/apron/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "antoinemine";
     repo = "apron";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gHLCurydxX1pS66DTAWUJGl9Yqu9RWRjkZh6lXzM7YY=";
   };
 
diff --git a/pkgs/development/ocaml-modules/asai/default.nix b/pkgs/development/ocaml-modules/asai/default.nix
index 2e17570fc24a..2a5a59895b6e 100644
--- a/pkgs/development/ocaml-modules/asai/default.nix
+++ b/pkgs/development/ocaml-modules/asai/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "RedPRL";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-IpRLX7umpmlNt2uV2MB+YvjAvNk0+gl5plbBExVvcdM=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index 43e82c3a040e..067e2bc16adb 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -51,7 +51,7 @@ else
     src = fetchFromGitHub {
       owner = "BinaryAnalysisPlatform";
       repo = "bap";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "1c30zxn0zyi0wypvjmik3fd6n6a8xjcb102qfnccn1af052bvsrd";
     };
 
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index a645fd797b20..3b2da021c212 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-batteries-team";
     repo = "batteries-included";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+PGfExdvp3WyX1s8dLTBYp1SoUOBkzrxyqMUuaW6Bto=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/pkgs/development/ocaml-modules/bigarray-compat/default.nix
index 3f91d4ff4359..476e9a3b33b0 100644
--- a/pkgs/development/ocaml-modules/bigarray-compat/default.nix
+++ b/pkgs/development/ocaml-modules/bigarray-compat/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mirage";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-2JVopggK2JuXWEPu8qn12F1jQIJ9OV89XY1rHtUqLkI=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bigstring/default.nix b/pkgs/development/ocaml-modules/bigstring/default.nix
index eab8c13a726a..4023d5db5c4f 100644
--- a/pkgs/development/ocaml-modules/bigstring/default.nix
+++ b/pkgs/development/ocaml-modules/bigstring/default.nix
@@ -20,7 +20,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-bigstring";
-    tag = version;
+    rev = version;
     sha256 = "0bkxwdcswy80f6rmx5wjza92xzq4rdqsb4a9fm8aav8bdqx021n8";
   };
 
diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix
index 4b30fb05ce89..f32bee87255d 100644
--- a/pkgs/development/ocaml-modules/bigstringaf/default.nix
+++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bindlib/default.nix b/pkgs/development/ocaml-modules/bindlib/default.nix
index cdffa3907374..49121cb39746 100644
--- a/pkgs/development/ocaml-modules/bindlib/default.nix
+++ b/pkgs/development/ocaml-modules/bindlib/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rlepigre";
     repo = "ocaml-${pname}";
-    tag = version;
+    rev = version;
     hash = "sha256-058yMbz9ExvgNG/kY9tPk70XSeVRSSKVg4n4F4fmPu4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix
index f8303bf31a86..0f5cc4f4c942 100644
--- a/pkgs/development/ocaml-modules/biocaml/default.nix
+++ b/pkgs/development/ocaml-modules/biocaml/default.nix
@@ -26,7 +26,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "biocaml";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "01yw12yixs45ya1scpb9jy2f7dw1mbj7741xib2xpq3kkc1hc21s";
   };
 
diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
index cfe9b46f6e89..a2ecd17f418e 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "aantron";
     repo = "bisect_ppx";
-    tag = version;
+    rev = version;
     hash = "sha256-3qXobZLPivFDtls/3WNqDuAgWgO+tslJV47kjQPoi6o=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index a880a290bd00..12f1232b71a5 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "xguerin";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eO7/S9PoMybZPnQQ+q9qbqKpYO4Foc9OjW4uiwwNds8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bjack/default.nix b/pkgs/development/ocaml-modules/bjack/default.nix
index 942a3c2ea47c..1ee6783162b7 100644
--- a/pkgs/development/ocaml-modules/bjack/default.nix
+++ b/pkgs/development/ocaml-modules/bjack/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-bjack";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jIxxqBVWphWYyLh+24rTxk4WWfPPdGCvNdevFJEKw70=";
   };
 
diff --git a/pkgs/development/ocaml-modules/bwd/default.nix b/pkgs/development/ocaml-modules/bwd/default.nix
index 603db6a9bbde..c6179b4f31e3 100644
--- a/pkgs/development/ocaml-modules/bwd/default.nix
+++ b/pkgs/development/ocaml-modules/bwd/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "RedPRL";
     repo = "ocaml-bwd";
-    tag = version;
+    rev = version;
     hash = "sha256-rzn0U/D6kPNsH5hBTElc3d1jfKbgKbjA2JHicpaJtu4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix
index 577cc43ab1ab..769386333fba 100644
--- a/pkgs/development/ocaml-modules/calendar/default.nix
+++ b/pkgs/development/ocaml-modules/calendar/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-community";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+VQzi6pEMqzV1ZR84Yjdu4jsJEWtx+7bd6PQGX7TiEs=";
   };
 
diff --git a/pkgs/development/ocaml-modules/camlp-streams/default.nix b/pkgs/development/ocaml-modules/camlp-streams/default.nix
index 33f7de863e05..cabccf89e7fc 100644
--- a/pkgs/development/ocaml-modules/camlp-streams/default.nix
+++ b/pkgs/development/ocaml-modules/camlp-streams/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kHuFBqu0mjFv53sOtmFZcX2reo5ToaOpItP7P53bfGQ=";
   };
 
diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix
index dae1f13cef0b..3bd8856bf1ce 100644
--- a/pkgs/development/ocaml-modules/camlpdf/default.nix
+++ b/pkgs/development/ocaml-modules/camlpdf/default.nix
@@ -17,7 +17,7 @@ else
     src = fetchFromGitHub {
       owner = "johnwhitington";
       repo = "camlpdf";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-+SFuFqlrP0nwm199y0QFWYvlwD+Cbh0PHA5bmXIWdNk=";
     };
 
diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index d5616b7e45d0..3bb9677e7442 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -20,7 +20,7 @@ let
           src = fetchFromGitHub {
             owner = "yoriyuki";
             repo = "camomile";
-            tag = version;
+            rev = version;
             sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
           };
 
@@ -42,7 +42,7 @@ let
       src = fetchFromGitHub {
         owner = "ocaml-community";
         repo = "camomile";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-HklX+VPD0Ta3Knv++dBT2rhsDSlDRH90k4Cj1YtWIa8=";
       };
 
diff --git a/pkgs/development/ocaml-modules/capnp/default.nix b/pkgs/development/ocaml-modules/capnp/default.nix
index 2db57b5aa610..e81c1252edc3 100644
--- a/pkgs/development/ocaml-modules/capnp/default.nix
+++ b/pkgs/development/ocaml-modules/capnp/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "capnproto";
     repo = "capnp-ocaml";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-G4B1llsHnGcuGIarDB248QMaRBvS47IEQB5B93wY7nA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix
index 7442cf241533..07a16e32fbb3 100644
--- a/pkgs/development/ocaml-modules/cfstream/default.nix
+++ b/pkgs/development/ocaml-modules/cfstream/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "biocaml";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ=";
   };
 
diff --git a/pkgs/development/ocaml-modules/chacha/default.nix b/pkgs/development/ocaml-modules/chacha/default.nix
index daa43eeb967f..f5d6c4c1008b 100644
--- a/pkgs/development/ocaml-modules/chacha/default.nix
+++ b/pkgs/development/ocaml-modules/chacha/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "abeaumont";
     repo = "ocaml-chacha";
-    tag = version;
+    rev = version;
     hash = "sha256-PmeiFloU0k3SqOK1VjaliiCEzDzrzyMSasgnO5fJS1k=";
   };
 
diff --git a/pkgs/development/ocaml-modules/clap/default.nix b/pkgs/development/ocaml-modules/clap/default.nix
index 1e7141ff2721..8ea75a2c7c70 100644
--- a/pkgs/development/ocaml-modules/clap/default.nix
+++ b/pkgs/development/ocaml-modules/clap/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rbardou";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-IEol27AVYs55ntvNprBxOk3/EsBKAdPkF3Td3w9qOJg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/pkgs/development/ocaml-modules/class_group_vdf/default.nix
index 60eb84d8114d..e36c34634919 100644
--- a/pkgs/development/ocaml-modules/class_group_vdf/default.nix
+++ b/pkgs/development/ocaml-modules/class_group_vdf/default.nix
@@ -21,7 +21,7 @@ buildDunePackage (
     src = fetchFromGitLab {
       owner = "nomadic-labs/cryptography";
       repo = "ocaml-chia-vdf";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-KvpnX2DTUyfKARNWHC2lLBGH2Ou2GfRKjw05lu4jbBs=";
     };
 
diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
index cb5f1175c23a..804cea216a4b 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -22,7 +22,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-containers";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PMtyJOuw+9u6rF5EGif/66ZSbkTu1Msgke9JVpDWC1c=";
   };
 
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index debcde8ba363..66823ce21fa1 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -18,7 +18,7 @@ else
     src = fetchFromGitHub {
       owner = "johnwhitington";
       repo = "cpdf-source";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-DvTY5EQcvnL76RlQTcVqBiycqbCdGQCXzarSMH2P/pg=";
     };
 
diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix
index a62f082a61a1..a93826b34496 100644
--- a/pkgs/development/ocaml-modules/cpu/default.nix
+++ b/pkgs/development/ocaml-modules/cpu/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "UnixJunkie";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1vir6gh1bhvxgj2fcn69c38yhw3jgk7dyikmw789m5ld2csnyjiv";
   };
 
diff --git a/pkgs/development/ocaml-modules/crowbar/default.nix b/pkgs/development/ocaml-modules/crowbar/default.nix
index 237825d5d8d3..045df90d775d 100644
--- a/pkgs/development/ocaml-modules/crowbar/default.nix
+++ b/pkgs/development/ocaml-modules/crowbar/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "stedolan";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0jjwiOZ9Ut+dv5Iw4xNvf396WTehT1VClxY9VHicw4U=";
   };
 
diff --git a/pkgs/development/ocaml-modules/cry/default.nix b/pkgs/development/ocaml-modules/cry/default.nix
index 01cd931d73f0..dfa64d096cea 100644
--- a/pkgs/development/ocaml-modules/cry/default.nix
+++ b/pkgs/development/ocaml-modules/cry/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-cry";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ea6f2xTVmYekPmzAKasA9mNG4Voxw2MCkfZ9LB9gwbo=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix
index 1a0a33d122c0..2db0438c7659 100644
--- a/pkgs/development/ocaml-modules/ctypes/default.nix
+++ b/pkgs/development/ocaml-modules/ctypes/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocamllabs";
     repo = "ocaml-ctypes";
-    tag = version;
+    rev = version;
     hash = "sha256-fZfTsOMppHiI7BVvgICVt/9ofGFAfYjXzHSDA7L4vZk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix
index afc21f541416..40cb979e50ad 100644
--- a/pkgs/development/ocaml-modules/cudf/default.nix
+++ b/pkgs/development/ocaml-modules/cudf/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "irill";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-E4KXKnso/Q3ZwcYpKPgvswNR9qd/lafKljPMxfStedM=";
   };
 
diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix
index 5beb234fb64d..dea0a2f0d985 100644
--- a/pkgs/development/ocaml-modules/curses/default.nix
+++ b/pkgs/development/ocaml-modules/curses/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mbacarella";
     repo = "curses";
-    tag = version;
+    rev = version;
     hash = "sha256-tjBOv7RARDzBShToNLL9LEaU/Syo95MfwZunFsyN4/Q=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dates_calc/default.nix b/pkgs/development/ocaml-modules/dates_calc/default.nix
index c95241c7db08..4cfeeb34956f 100644
--- a/pkgs/development/ocaml-modules/dates_calc/default.nix
+++ b/pkgs/development/ocaml-modules/dates_calc/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "catalalang";
     repo = "dates-calc";
-    tag = version;
+    rev = version;
     sha256 = "sha256-B4li8vIK6AnPXJ1QSJ8rtr+JOcy4+h5sc1SH97U+Vgw=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dbf/default.nix b/pkgs/development/ocaml-modules/dbf/default.nix
index c499ddb70088..e02b13291ecd 100644
--- a/pkgs/development/ocaml-modules/dbf/default.nix
+++ b/pkgs/development/ocaml-modules/dbf/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "pveber";
     repo = "dbf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-096GodM3J/4dsVdylG+6xz/p6ogUkhDGdFjiPwl/jLQ=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dedukti/default.nix b/pkgs/development/ocaml-modules/dedukti/default.nix
index ee058e1427db..9c5ef6de01de 100644
--- a/pkgs/development/ocaml-modules/dedukti/default.nix
+++ b/pkgs/development/ocaml-modules/dedukti/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "Deducteam";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SFxbgq2znO+OCEFzuekVquvtOEuCQanseKy+iZAeWbc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/directories/default.nix b/pkgs/development/ocaml-modules/directories/default.nix
index 1f3f0fa7e182..e90a1ce19222 100644
--- a/pkgs/development/ocaml-modules/directories/default.nix
+++ b/pkgs/development/ocaml-modules/directories/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocamlpro";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-31CGhmmfOORJ1ewgp+IU+p1+f2kfX/W+lxK7EGU62vc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dispatch/default.nix b/pkgs/development/ocaml-modules/dispatch/default.nix
index aea6b2752e2d..b5546a406c3d 100644
--- a/pkgs/development/ocaml-modules/dispatch/default.nix
+++ b/pkgs/development/ocaml-modules/dispatch/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = "ocaml-dispatch";
-    tag = version;
+    rev = version;
     sha256 = "12r39ylbxc297cbwjadhd1ghxnwwcdzfjk68r97wim8hcgzxyxv4";
   };
 
diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix
index 116ca673918e..c5c9323de4e0 100644
--- a/pkgs/development/ocaml-modules/dolog/default.nix
+++ b/pkgs/development/ocaml-modules/dolog/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "UnixJunkie";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g68260mcb4G4wX8y4T0MTaXsYnM9wn2d0V1VCdSFZjY=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dssi/default.nix b/pkgs/development/ocaml-modules/dssi/default.nix
index 1e404ea6a8cb..58427339a480 100644
--- a/pkgs/development/ocaml-modules/dssi/default.nix
+++ b/pkgs/development/ocaml-modules/dssi/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-dssi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1frbmx1aznwp60r6bkx1whqyr6mkflvd9ysmjg7s7b80mh0s4ix6";
   };
 
diff --git a/pkgs/development/ocaml-modules/dtools/default.nix b/pkgs/development/ocaml-modules/dtools/default.nix
index a608b5968b0d..9b94bf1a7ac8 100644
--- a/pkgs/development/ocaml-modules/dtools/default.nix
+++ b/pkgs/development/ocaml-modules/dtools/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-dtools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-MIZM/IlPWPa/r/f8EXkhU8gZctOZeAIGZgxoGMF2IkE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix
index 5a2ed4b10bfa..fa41fe11f7c7 100644
--- a/pkgs/development/ocaml-modules/dum/default.nix
+++ b/pkgs/development/ocaml-modules/dum/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mjambon";
     repo = "dum";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0yrxl97szjc0s2ghngs346x3y0xszx2chidgzxk93frjjpsr1mlr";
   };
 
diff --git a/pkgs/development/ocaml-modules/duppy/default.nix b/pkgs/development/ocaml-modules/duppy/default.nix
index e35493728b7e..5164c9455645 100644
--- a/pkgs/development/ocaml-modules/duppy/default.nix
+++ b/pkgs/development/ocaml-modules/duppy/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-duppy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hWR7utYMxMjz8Cw0j6cgoHlUj4Jc7Q4vJHD5kGHN4Rc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix
index 291b6581d878..9437809938c5 100644
--- a/pkgs/development/ocaml-modules/dypgen/default.nix
+++ b/pkgs/development/ocaml-modules/dypgen/default.nix
@@ -15,7 +15,7 @@ let
         src = fetchFromGitHub {
           owner = "grain-lang";
           repo = "dypgen";
-          tag = version;
+          rev = version;
           hash = "sha256-fKuO/e5YbA2B7XcghWl9pXxwvKw9YlhnmZDZcuKe3cs=";
         };
       }
diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix
index a9d2e52fdf57..7154c0554055 100644
--- a/pkgs/development/ocaml-modules/earley/default.nix
+++ b/pkgs/development/ocaml-modules/earley/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rlepigre";
     repo = "ocaml-earley";
-    tag = version;
+    rev = version;
     sha256 = "1vi58zdxchpw6ai0bz9h2ggcmg8kv57yk6qbx82lh47s5wb3mz5y";
   };
 
diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix
index 4afaf80f6a0e..4d07d9a35d91 100644
--- a/pkgs/development/ocaml-modules/earlybird/default.nix
+++ b/pkgs/development/ocaml-modules/earlybird/default.nix
@@ -27,7 +27,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "hackwaly";
     repo = "ocamlearlybird";
-    tag = version;
+    rev = version;
     hash = "sha256-TzRJ+0I3VEx4Lvj3lhN9POzlXRgmTTdD5Bg1AX0pf3c=";
   };
 
diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix
index 5d2178ecc465..3dbe6315d5cd 100644
--- a/pkgs/development/ocaml-modules/eigen/default.nix
+++ b/pkgs/development/ocaml-modules/eigen/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "owlbarn";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1zaw03as14hyvfpyj6bjrfbcxp2ljdbqcqqgm53kms244mig425f";
   };
 
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 61bdaddfed82..0e6e19250d1b 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -23,7 +23,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "eliom";
-    tag = version;
+    rev = version;
     hash = "sha256-ALuoyO6axNQEeBteBVIFwdoSrbLxxcaSTObAcLPGIvo=";
   };
 
diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix
index b1ec0d38ce2b..17bc6e628c5d 100644
--- a/pkgs/development/ocaml-modules/expat/default.nix
+++ b/pkgs/development/ocaml-modules/expat/default.nix
@@ -19,7 +19,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02")
     src = fetchFromGitHub {
       owner = "whitequark";
       repo = "ocaml-expat";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-eDA6MUcztaI+fpunWBdanNnPo9Y5gvbj/ViVcxYYEBg=";
     };
 
diff --git a/pkgs/development/ocaml-modules/faad/default.nix b/pkgs/development/ocaml-modules/faad/default.nix
index cd3b49c08091..1a45794059ee 100644
--- a/pkgs/development/ocaml-modules/faad/default.nix
+++ b/pkgs/development/ocaml-modules/faad/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-faad";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3ayKZhgJAgsoOqn0InSrM5f3TImRHOQMtWETICo4t3o=";
   };
 
diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix
index 18f28c3e7b25..c7507ee38f7c 100644
--- a/pkgs/development/ocaml-modules/faraday/default.nix
+++ b/pkgs/development/ocaml-modules/faraday/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-wR4kDocR1t3OLRuudXH8IccYde552O6Gvo5BHNxRbAI=";
   };
 
diff --git a/pkgs/development/ocaml-modules/fdkaac/default.nix b/pkgs/development/ocaml-modules/fdkaac/default.nix
index d6667542ace3..ccabbfcc2a5d 100644
--- a/pkgs/development/ocaml-modules/fdkaac/default.nix
+++ b/pkgs/development/ocaml-modules/fdkaac/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-fdkaac";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cTPPQKBq0EFo35eK7TXlszbodHYIg1g7v+yQ/rG7Y9I=";
   };
 
diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix
index d04b151d5e5e..16283af681ea 100644
--- a/pkgs/development/ocaml-modules/flac/default.nix
+++ b/pkgs/development/ocaml-modules/flac/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-flac";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-68zunpRIX4lrRsKJhDF3Sre6Rp3g+ntP19ObFqG57jE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/frei0r/default.nix b/pkgs/development/ocaml-modules/frei0r/default.nix
index fc96ac88ef47..e4aba92bf4c6 100644
--- a/pkgs/development/ocaml-modules/frei0r/default.nix
+++ b/pkgs/development/ocaml-modules/frei0r/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-frei0r";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eh/ymZO/3a1z6uvZdnXgma/7AU2NBVs2lddA+R/kuQA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix
index 9581ce08cc6c..857555a5363f 100644
--- a/pkgs/development/ocaml-modules/frontc/default.nix
+++ b/pkgs/development/ocaml-modules/frontc/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "FrontC";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1mi1vh4qgscnb470qwidccaqd068j1bqlz6pf6wddk21paliwnqb";
   };
 
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index df104e8bcb61..3cce4f30823c 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "astrada";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qlQEE8l/H22bb1VcK9YehR+9L5XepMu8JY7OLw1OIXg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gd/default.nix b/pkgs/development/ocaml-modules/gd/default.nix
index 72b211b545cd..28c123450864 100644
--- a/pkgs/development/ocaml-modules/gd/default.nix
+++ b/pkgs/development/ocaml-modules/gd/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-gd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-78cqxVEappTybRLk7Y6vW1POvZKFIxtGNVcmkKq9GEE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix
index d03224c3e096..c46efbbf766b 100644
--- a/pkgs/development/ocaml-modules/gen/default.nix
+++ b/pkgs/development/ocaml-modules/gen/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "gen";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZytPPGhmt/uANaSgkgsUBOwyQ9ka5H4J+5CnJpEdrNk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gen_js_api/default.nix b/pkgs/development/ocaml-modules/gen_js_api/default.nix
index 45c3581ea52a..feabcb80f65e 100644
--- a/pkgs/development/ocaml-modules/gen_js_api/default.nix
+++ b/pkgs/development/ocaml-modules/gen_js_api/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "LexiFi";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZDlVJLw9xKFTz1NR5sGiw3WnEmMyNQy69Vt9zkw0fPA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/get-activity/lib.nix b/pkgs/development/ocaml-modules/get-activity/lib.nix
index a4c8ef662a06..352b75d27f4f 100644
--- a/pkgs/development/ocaml-modules/get-activity/lib.nix
+++ b/pkgs/development/ocaml-modules/get-activity/lib.nix
@@ -20,7 +20,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "tarides";
     repo = "get-activity";
-    tag = version;
+    rev = version;
     hash = "sha256-QU/LPIxcem5nFvSxcNApOuBu6UHqLHIXVSOJ2UT0eKA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/getopt/default.nix b/pkgs/development/ocaml-modules/getopt/default.nix
index 9c6953ff4d2f..9de42e3d8bae 100644
--- a/pkgs/development/ocaml-modules/getopt/default.nix
+++ b/pkgs/development/ocaml-modules/getopt/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "scemama";
     repo = "ocaml-getopt";
-    tag = version;
+    rev = version;
     hash = "sha256-oYDm945LgjIW+8x7UrO4FlbHywnu8480aiEVvnjBxc8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/github/default.nix b/pkgs/development/ocaml-modules/github/default.nix
index 2c414c657945..e104f98b743d 100644
--- a/pkgs/development/ocaml-modules/github/default.nix
+++ b/pkgs/development/ocaml-modules/github/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mirage";
     repo = "ocaml-github";
-    tag = version;
+    rev = version;
     sha256 = "sha256-psUIiIvjVV2NTlBtHnBisWreaKKnsqIjKT2+mLnfsxg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gitlab/default.nix b/pkgs/development/ocaml-modules/gitlab/default.nix
index 9753e9da3d40..08b500bba423 100644
--- a/pkgs/development/ocaml-modules/gitlab/default.nix
+++ b/pkgs/development/ocaml-modules/gitlab/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "tmcgilchrist";
     repo = "ocaml-gitlab";
-    tag = version;
+    rev = version;
     hash = "sha256-7pUpH1SoP4eW8ild5j+Tcy+aTXq0+eSkhKUOXJ6Z30k=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gnuplot/default.nix b/pkgs/development/ocaml-modules/gnuplot/default.nix
index 8dc93e94e723..181366c22626 100644
--- a/pkgs/development/ocaml-modules/gnuplot/default.nix
+++ b/pkgs/development/ocaml-modules/gnuplot/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-${pname}";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "02pzi3lb57ysrdsba743s3vmnapjbxgq8ynlzpxbbs6cn1jj6ch9";
   };
 
diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
index 6c36b80bf9df..08ae3343d062 100644
--- a/pkgs/development/ocaml-modules/graphql_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
@@ -20,7 +20,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "reasonml-community";
     repo = "graphql-ppx";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+WJhA2ixZHiSZBoX14dnQKk7JfVAIME4JooNSnhRp44=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix
index f04ed82004de..5ab096a5a99c 100644
--- a/pkgs/development/ocaml-modules/gsl/default.nix
+++ b/pkgs/development/ocaml-modules/gsl/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mmottl";
     repo = "gsl-ocaml";
-    tag = version;
+    rev = version;
     hash = "sha256-h1jO2RheBBzxiBgig2yEPk4YyBaZxStt5f+KNZqHdBo=";
   };
 
diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix
index 3ba28b93255d..cbe55294443d 100644
--- a/pkgs/development/ocaml-modules/gstreamer/default.nix
+++ b/pkgs/development/ocaml-modules/gstreamer/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-gstreamer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0y8xi1q0ld4hrk96bn6jfh9slyjrxmnlhm662ynacp3yzalp8jji";
   };
 
diff --git a/pkgs/development/ocaml-modules/hack_parallel/default.nix b/pkgs/development/ocaml-modules/hack_parallel/default.nix
index 366bc1376477..f7fb5ace45bc 100644
--- a/pkgs/development/ocaml-modules/hack_parallel/default.nix
+++ b/pkgs/development/ocaml-modules/hack_parallel/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rvantonder";
     repo = "hack_parallel";
-    tag = version;
+    rev = version;
     sha256 = "0qjlkw35r4q2cm0n2x0i73zvx1xgrp6axaia2nm8zxpm49mid629";
   };
 
diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix
index a9e61938fde0..d65243e2cb71 100644
--- a/pkgs/development/ocaml-modules/hidapi/default.nix
+++ b/pkgs/development/ocaml-modules/hidapi/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "vbmithr";
     repo = "ocaml-hidapi";
-    tag = version;
+    rev = version;
     hash = "sha256-upygm5G46C65lxaiI6kBOzLrWxzW9qWb6efN/t58SRg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix
index a0ff819413e3..ec39fd662995 100644
--- a/pkgs/development/ocaml-modules/httpaf/default.nix
+++ b/pkgs/development/ocaml-modules/httpaf/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0zk78af3qyvf6w66mg8sxygr6ndayzqw5s3zfxibvn121xwni26z";
   };
 
diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix
index fafc010050ad..900f60e7c774 100644
--- a/pkgs/development/ocaml-modules/inotify/default.nix
+++ b/pkgs/development/ocaml-modules/inotify/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "whitequark";
     repo = "ocaml-inotify";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Vg9uVIx6/OMS1WoJIHwZbSt5ZyFy+Xgw5167FJWGslg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix
index 402db9761371..104438eeab50 100644
--- a/pkgs/development/ocaml-modules/integers/default.nix
+++ b/pkgs/development/ocaml-modules/integers/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocamllabs";
     repo = "ocaml-integers";
-    tag = version;
+    rev = version;
     sha256 = "sha256-zuUgP1jOiVT0q6GisGpkqx7nybWbARgnAcU8NYqvCzA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix
index a97a0601e1e4..1ab3dbb25407 100644
--- a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix
+++ b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "o1-labs";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-lg5cX9/LQlVmR42XcI17b6KaatnFO2L9A9ZXfID8mTY=";
   };
 
diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix
index 9f41c7cd5a61..39dbd8e07fd6 100644
--- a/pkgs/development/ocaml-modules/iso8601/default.nix
+++ b/pkgs/development/ocaml-modules/iso8601/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sagotch";
     repo = "ISO8601.ml";
-    tag = version;
+    rev = version;
     sha256 = "sha256-QWjZ+2AjvXnnRVenbyCG/hSjfW53bHiftQUtWpK/7I8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
index 3ac1ea0f13e3..67435557a36d 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
@@ -23,7 +23,7 @@ buildDunePackage (
     src = fetchFromGitHub {
       owner = "janestreet";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = hash;
     };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
index 8af3c332b6fe..1a7e8c8f6f60 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
@@ -26,7 +26,7 @@ buildDunePackage (
     src = fetchFromGitHub {
       owner = "janestreet";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = hash;
     };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
index ad2c0e9545a3..73812e186bd8 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
@@ -26,7 +26,7 @@ buildDunePackage (
     src = fetchFromGitHub {
       owner = "janestreet";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = hash;
     };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix
index 2c11fc0f34cc..a08ff1e3b9b6 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix
@@ -26,7 +26,7 @@ buildDunePackage (
     src = fetchFromGitHub {
       owner = "janestreet";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = hash;
     };
 
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix
index 10a886a4f11f..f366d6d1db8a 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix
@@ -25,7 +25,7 @@ buildDunePackage (
     src = fetchFromGitHub {
       owner = "janestreet";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = hash;
     };
 
diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index 1150ffdfef20..43a6424f7c04 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -20,7 +20,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
     src = fetchFromGitHub {
       owner = "javalib-team";
       repo = "javalib";
-      tag = version;
+      rev = version;
       hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s=";
     };
 
diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix
index 5e3fc5f4a24e..41c6e667bea4 100644
--- a/pkgs/development/ocaml-modules/jingoo/default.nix
+++ b/pkgs/development/ocaml-modules/jingoo/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "tategakibunko";
     repo = "jingoo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-qIw69OE7wYyZYKnIc9QrmF8MzY5Fg5pBFyIpexmaYxA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/pkgs/development/ocaml-modules/json-data-encoding/default.nix
index da5bb7d38194..3c21d451d81b 100644
--- a/pkgs/development/ocaml-modules/json-data-encoding/default.nix
+++ b/pkgs/development/ocaml-modules/json-data-encoding/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "data-encoding";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KoA4xX4tNyi6bX5kso/Wof1LA7431EXJ34eD5X4jnd8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix
index 450fa52b5a77..6c73b06213ac 100644
--- a/pkgs/development/ocaml-modules/jwto/default.nix
+++ b/pkgs/development/ocaml-modules/jwto/default.nix
@@ -23,7 +23,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "sporto";
     repo = "jwto";
-    tag = version;
+    rev = version;
     hash = "sha256-TOWwNyrOqboCm8Y4mM6GgtmxGO3NmyDdAX7m8CifA7Y=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix
index b83a7552bf72..3736fc84a8d4 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -20,7 +20,7 @@ else
     src = fetchFromGitHub {
       owner = "garrigue";
       repo = "lablgl";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-GiQKHMn5zHyvDrA2ve12X5YTm3/RZp8tukIqifgVaW4=";
     };
 
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index 5c894183186e..7f0bd839cd2a 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -24,7 +24,7 @@ let
         src = fetchFromGitHub {
           owner = "garrigue";
           repo = "lablgtk";
-          tag = version;
+          rev = version;
           sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po=";
         };
         env = { };
diff --git a/pkgs/development/ocaml-modules/ladspa/default.nix b/pkgs/development/ocaml-modules/ladspa/default.nix
index 3be6dd031c68..7ff7a0311356 100644
--- a/pkgs/development/ocaml-modules/ladspa/default.nix
+++ b/pkgs/development/ocaml-modules/ladspa/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ladspa";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1y83infjaz9apzyvaaqw331zqdysmn3bpidfab061v3bczv4jzbz";
   };
 
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
index 29f7324b38b8..10a916a5f17f 100644
--- a/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -34,7 +34,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-community";
     repo = pname;
-    tag = version;
+    rev = version;
     inherit (params) sha256;
   };
 
diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix
index 3d6f4a874624..ea4b3512c16d 100644
--- a/pkgs/development/ocaml-modules/lambdasoup/default.nix
+++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "aantron";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-+d1JPU7OyQgt8pDTlwZraqPHH+OBQD1ycsELKpHT95Y=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lame/default.nix b/pkgs/development/ocaml-modules/lame/default.nix
index c32d35fc70fd..338d6a4bb913 100644
--- a/pkgs/development/ocaml-modules/lame/default.nix
+++ b/pkgs/development/ocaml-modules/lame/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lame";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/ZzoGFQQrBf17TaBPSFDQ1yHaQnva56YLmscOacrKBI=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lastfm/default.nix b/pkgs/development/ocaml-modules/lastfm/default.nix
index b636d232b1e5..12b2777b79fa 100644
--- a/pkgs/development/ocaml-modules/lastfm/default.nix
+++ b/pkgs/development/ocaml-modules/lastfm/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lastfm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-1te9B2+sUmkT/i2K5ueswWAWpvJf9rXob0zR4CMOJlg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lem/default.nix b/pkgs/development/ocaml-modules/lem/default.nix
index 63fcdc60cea8..8a2ac28d8289 100644
--- a/pkgs/development/ocaml-modules/lem/default.nix
+++ b/pkgs/development/ocaml-modules/lem/default.nix
@@ -21,7 +21,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
     src = fetchFromGitHub {
       owner = "rems-project";
       repo = "lem";
-      tag = version;
+      rev = version;
       hash = "sha256-ZV2OiFonMlNzqtsumMQ8jzY9/ATaZxiNHZ7JzOfGluY=";
     };
 
diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/pkgs/development/ocaml-modules/lens/default.nix
index be69440c684c..0499e640e240 100644
--- a/pkgs/development/ocaml-modules/lens/default.nix
+++ b/pkgs/development/ocaml-modules/lens/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "pdonadeo";
     repo = "ocaml-lens";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1k23n7pa945fk6nbaq6nlkag5kg97wsw045ghz4gqp8b9i2im3vn";
   };
 
diff --git a/pkgs/development/ocaml-modules/lilv/default.nix b/pkgs/development/ocaml-modules/lilv/default.nix
index cc266b0619fa..3ff0782ca288 100644
--- a/pkgs/development/ocaml-modules/lilv/default.nix
+++ b/pkgs/development/ocaml-modules/lilv/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lilv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "080ja8c4sxprk5qnldpfzxriag57m9603vny3b4bnwh5xm1id08c";
   };
 
diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix
index 8400e075610c..05596866b070 100644
--- a/pkgs/development/ocaml-modules/linenoise/default.nix
+++ b/pkgs/development/ocaml-modules/linenoise/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "fxfactorial";
     repo = "ocaml-${pname}";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yWBWMbk1anXaF4hIakTOcRZFCYmxI0xG3bHFFOAyEDA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/linksem/default.nix b/pkgs/development/ocaml-modules/linksem/default.nix
index 2d4e3d373e0a..ccefd91c06cf 100644
--- a/pkgs/development/ocaml-modules/linksem/default.nix
+++ b/pkgs/development/ocaml-modules/linksem/default.nix
@@ -18,7 +18,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
     src = fetchFromGitHub {
       owner = "rems-project";
       repo = "linksem";
-      tag = version;
+      rev = version;
       hash = "sha256-7/YfDK3TruKCckMzAPLRrwBkHRJcX1S+AzXHWRxkZPA=";
     };
 
diff --git a/pkgs/development/ocaml-modules/lo/default.nix b/pkgs/development/ocaml-modules/lo/default.nix
index 165e5a81d98d..dd2dc8d49328 100644
--- a/pkgs/development/ocaml-modules/lo/default.nix
+++ b/pkgs/development/ocaml-modules/lo/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0mi8h6f6syxjkxz493l5c3l270pvxx33pz0k3v5465wqjsnppar2";
   };
 
diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix
index 26a346966e43..1ea40e57d002 100644
--- a/pkgs/development/ocaml-modules/lua-ml/default.nix
+++ b/pkgs/development/ocaml-modules/lua-ml/default.nix
@@ -20,7 +20,7 @@ else
     src = fetchFromGitHub {
       owner = "lindig";
       repo = pname;
-      tag = version;
+      rev = version;
       sha256 = "sha256-xkjsjKD89W7Y5XK8kfL/ZErYKS14z0u0QCARN0DbTC8=";
     };
 
diff --git a/pkgs/development/ocaml-modules/lwt-canceler/default.nix b/pkgs/development/ocaml-modules/lwt-canceler/default.nix
index 688114d9eda6..e49e5de90d01 100644
--- a/pkgs/development/ocaml-modules/lwt-canceler/default.nix
+++ b/pkgs/development/ocaml-modules/lwt-canceler/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "lwt-canceler";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xbb7012hp901b755kxmfgg293rz34rkhwzg2z9i6sakwd7i0h9p";
   };
   useDune2 = true;
diff --git a/pkgs/development/ocaml-modules/lwt-watcher/default.nix b/pkgs/development/ocaml-modules/lwt-watcher/default.nix
index 2ed44537e032..02bfc43abc5b 100644
--- a/pkgs/development/ocaml-modules/lwt-watcher/default.nix
+++ b/pkgs/development/ocaml-modules/lwt-watcher/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-35Z73bSzEEgTabNH2cD9lRdDczsyIMZR2ktyKx4aN9k=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index decc5bce2e78..20e3e146d68d 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "lwt";
-    tag = version;
+    rev = version;
     hash = "sha256-oPYLFugMTI3a+hmnwgUcoMgn5l88NP1Roq0agLhH/vI=";
   };
 
diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix
index 8ffa997a7b8e..4bcd3524e849 100644
--- a/pkgs/development/ocaml-modules/lwt_log/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_log/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "aantron";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-ODTD3KceEnrEzD01CeuNg4BNKOtKZEpYaDIB+RIte1U=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mad/default.nix b/pkgs/development/ocaml-modules/mad/default.nix
index b02f3e64b482..401e75f7ea89 100644
--- a/pkgs/development/ocaml-modules/mad/default.nix
+++ b/pkgs/development/ocaml-modules/mad/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-mad";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rSFzWyUYTrGL7GvVsY5qKdCXqY/XJQkuBerexG838jc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/magic-trace/default.nix b/pkgs/development/ocaml-modules/magic-trace/default.nix
index 699e69f3541b..1cca903398f6 100644
--- a/pkgs/development/ocaml-modules/magic-trace/default.nix
+++ b/pkgs/development/ocaml-modules/magic-trace/default.nix
@@ -25,7 +25,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "janestreet";
     repo = "magic-trace";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cAoaAXZOeWNQh6emm17a9oCis8s4jJxPQMI/NfiUa7g=";
   };
 
diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix
index fe35940dad46..85a9afd80a22 100644
--- a/pkgs/development/ocaml-modules/markup/default.nix
+++ b/pkgs/development/ocaml-modules/markup/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "aantron";
     repo = "markup.ml";
-    tag = version;
+    rev = version;
     sha256 = "sha256-tsXz39qFSyL6vPYKG7P73zSEiraaFuOySL1n0uFij6k=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix
index 8c1e6ec28c00..ecbac7c2da27 100644
--- a/pkgs/development/ocaml-modules/mccs/default.nix
+++ b/pkgs/development/ocaml-modules/mccs/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "AltGr";
     repo = "ocaml-mccs";
-    tag = version;
+    rev = version;
     hash = "sha256-xvcqPXyzVGXXFYRVdFPaCfieFEguWffWVB04ImEuPvQ=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mem_usage/default.nix b/pkgs/development/ocaml-modules/mem_usage/default.nix
index 71b47aa9f743..613edfe0377f 100644
--- a/pkgs/development/ocaml-modules/mem_usage/default.nix
+++ b/pkgs/development/ocaml-modules/mem_usage/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-mem_usage";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5tQNsqbiU9oJvKHUjeTo/ST4A0Axc95gdJISLaa9VRM=";
   };
 
diff --git a/pkgs/development/ocaml-modules/memprof-limits/default.nix b/pkgs/development/ocaml-modules/memprof-limits/default.nix
index 1f4934f3ac53..32ffbd5f82cf 100644
--- a/pkgs/development/ocaml-modules/memprof-limits/default.nix
+++ b/pkgs/development/ocaml-modules/memprof-limits/default.nix
@@ -15,7 +15,7 @@ else
     src = fetchFromGitLab {
       owner = "gadmm";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-Pmuln5TihPoPZuehZlqPfERif6lf7O+0454kW9y3aKc=";
     };
 
diff --git a/pkgs/development/ocaml-modules/memtrace/default.nix b/pkgs/development/ocaml-modules/memtrace/default.nix
index 01b9140716fa..47520e2e61b7 100644
--- a/pkgs/development/ocaml-modules/memtrace/default.nix
+++ b/pkgs/development/ocaml-modules/memtrace/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "janestreet";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dWkTrN8ZgNUz7BW7Aut8mfx8o4n8f6UZaDv/7rbbwNs=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mew/default.nix b/pkgs/development/ocaml-modules/mew/default.nix
index 1064bca3813e..479aae5283f0 100644
--- a/pkgs/development/ocaml-modules/mew/default.nix
+++ b/pkgs/development/ocaml-modules/mew/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "kandu";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0417xsghj92v3xa5q4dk4nzf2r4mylrx2fd18i7cg3nzja65nia2";
   };
 
diff --git a/pkgs/development/ocaml-modules/mew_vi/default.nix b/pkgs/development/ocaml-modules/mew_vi/default.nix
index 7795787a0bbe..f5ae24e1c5df 100644
--- a/pkgs/development/ocaml-modules/mew_vi/default.nix
+++ b/pkgs/development/ocaml-modules/mew_vi/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "kandu";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0lihbf822k5zasl60w5mhwmdkljlq49c9saayrws7g4qc1j353r8";
   };
 
diff --git a/pkgs/development/ocaml-modules/minisat/default.nix b/pkgs/development/ocaml-modules/minisat/default.nix
index 142ba7dee832..0148f37c1fca 100644
--- a/pkgs/development/ocaml-modules/minisat/default.nix
+++ b/pkgs/development/ocaml-modules/minisat/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-minisat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dH0Ndlyo/DTZ6Ao1S478aBuxoZFSkRBi5HblkTWCPas=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix
index ccf57a5ba8f2..20398177d135 100644
--- a/pkgs/development/ocaml-modules/mldoc/default.nix
+++ b/pkgs/development/ocaml-modules/mldoc/default.nix
@@ -39,7 +39,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "logseq";
     repo = "mldoc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7uuNUFMSQEgakTKfpYixp43gnfpQSW++snBzgr0Ni0Y=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix
index 80f0e33077ed..ee578464641f 100644
--- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix
+++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nberth";
     repo = "mlgmpidl";
-    tag = version;
+    rev = version;
     hash = "sha256-ZmSDKZiHko8MCeIuZL53HjupfwO6PAm8QOCc9O3xJOk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mlx/default.nix b/pkgs/development/ocaml-modules/mlx/default.nix
index dad8f40a336b..830938e70330 100644
--- a/pkgs/development/ocaml-modules/mlx/default.nix
+++ b/pkgs/development/ocaml-modules/mlx/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-mlx";
     repo = "mlx";
-    tag = version;
+    rev = version;
     hash = "sha256-3hPtyBKD2dp4UJBykOudW6KR2KXPnBuDnuJ1UNLpAp0=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mm/default.nix b/pkgs/development/ocaml-modules/mm/default.nix
index 44f8460aa0c6..f7e3eb323371 100644
--- a/pkgs/development/ocaml-modules/mm/default.nix
+++ b/pkgs/development/ocaml-modules/mm/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-mm";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ME6Naza7OvZ/63zEjrPeKq5JwMoMfV2fpkCuZdtCZ/c=";
   };
 
diff --git a/pkgs/development/ocaml-modules/morbig/default.nix b/pkgs/development/ocaml-modules/morbig/default.nix
index 7f62f76f4c2e..76150f19cf18 100644
--- a/pkgs/development/ocaml-modules/morbig/default.nix
+++ b/pkgs/development/ocaml-modules/morbig/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "colis-anr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fOBaJHHP/Imi9UDLflI52OdKDcmMxpl+NH3pfofmv/o=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix
index 802efe6d1fc7..d9fa6326e93f 100644
--- a/pkgs/development/ocaml-modules/mparser/default.nix
+++ b/pkgs/development/ocaml-modules/mparser/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "murmour";
     repo = "mparser";
-    tag = version;
+    rev = version;
     sha256 = "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx";
   };
 
diff --git a/pkgs/development/ocaml-modules/msat/default.nix b/pkgs/development/ocaml-modules/msat/default.nix
index ea000010702b..43d9d0e77694 100644
--- a/pkgs/development/ocaml-modules/msat/default.nix
+++ b/pkgs/development/ocaml-modules/msat/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "Gbury";
     repo = "mSAT";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ER7ZUejW+Zy3l2HIoFDYbR8iaKMvLZWaeWrOAAYXjG4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/msgpck/default.nix b/pkgs/development/ocaml-modules/msgpck/default.nix
index 8ee13df63d74..bfee304681bb 100644
--- a/pkgs/development/ocaml-modules/msgpck/default.nix
+++ b/pkgs/development/ocaml-modules/msgpck/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "vbmithr";
     repo = "ocaml-msgpck";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-gBHIiicmk/5KBkKzRKyV0ymEH8dGCZG8vfE0mtpcDCM=";
   };
 
diff --git a/pkgs/development/ocaml-modules/multipart-form-data/default.nix b/pkgs/development/ocaml-modules/multipart-form-data/default.nix
index 954e71c7c673..fc5e9a0bbf6d 100644
--- a/pkgs/development/ocaml-modules/multipart-form-data/default.nix
+++ b/pkgs/development/ocaml-modules/multipart-form-data/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "cryptosense";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-3MYJDvVbPIv/JDiB9nKcLRFC5Qa0afyEfz7hk8MWRII=";
   };
 
diff --git a/pkgs/development/ocaml-modules/mustache/default.nix b/pkgs/development/ocaml-modules/mustache/default.nix
index c9dc58299f6d..cefb4d3c1b77 100644
--- a/pkgs/development/ocaml-modules/mustache/default.nix
+++ b/pkgs/development/ocaml-modules/mustache/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rgrinberg";
     repo = "ocaml-mustache";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "19v8rk8d8lkfm2rmhdawfgadji6wa267ir5dprh4w9l1sfj8a1py";
   };
 
diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix
index b6d3acf4150b..624a97507495 100644
--- a/pkgs/development/ocaml-modules/npy/default.nix
+++ b/pkgs/development/ocaml-modules/npy/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "LaurentMazare";
     repo = "${pname}-ocaml";
-    tag = version;
+    rev = version;
     hash = "sha256:1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1";
   };
 
diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix
index 1605810ef85b..98dae8b475ba 100644
--- a/pkgs/development/ocaml-modules/num/default.nix
+++ b/pkgs/development/ocaml-modules/num/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (
     src = fetchFromGitHub {
       owner = "ocaml";
       repo = "num";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0";
     };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
index ca6ae71302c2..1c69c85ab4e2 100644
--- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
@@ -28,7 +28,7 @@ else
     src = fetchFromGitHub {
       owner = "mirage";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256:1mbyjzwcs64n7i3xkkyaxgl3r46drbl0gkqf3fqgm2kh3q03638l";
     };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 84321ecacf32..20737655bd21 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -23,7 +23,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02")
     src = fetchFromGitLab {
       owner = "libvirt";
       repo = "libvirt-ocaml";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k";
     };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
index 35c27cd50860..6e16fd2f2556 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
@@ -18,7 +18,7 @@ else
     src = fetchFromGitHub {
       owner = "ocaml-ppx";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq";
     };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
index 197cb4e7bc36..fa28353f1082 100644
--- a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "zepalmer";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1ynv3yhdqmkhkgnz6c5kv6ryjcc934sdvw9rhh8rjg2dlzlffgbw";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix
index 9227b2344496..a48d73b341af 100644
--- a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = author;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0hw4gl7irarcywibdjqxmrga8f7yj52wgy7sc7n0wyy74jzxb8np";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix
index 1505441683a5..0de49d843861 100644
--- a/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "issuu";
     repo = "ocaml-protoc-plugin";
-    tag = version;
+    rev = version;
     hash = "sha256-ZHeOi3y2X11MmkRuthmYFSjPLoGlGTO1pnRfk/XmgPU=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix
index 039682d19f86..a2e0bca7092f 100644
--- a/pkgs/development/ocaml-modules/ocaml-r/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "pveber";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jPyVMxjeh9+xu0dD1gelAxcOhxouKczyvzVoKZ5oSrs=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
index 273a6d670046..b24ef9e28682 100644
--- a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
@@ -14,7 +14,7 @@ buildOasisPackage rec {
   src = fetchFromGitHub {
     owner = "tcsprojects";
     repo = "ocaml-sat-solvers";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1hxr16cyl1p1k1cik848mqrysq95wxmlykpm93a99pn55mp28938";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index 31655810309f..599591cc76c0 100644
--- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "astrada";
     repo = "ocamlfuse";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-D/Gn+02Kq4mqEpNZrYYw/NXSJce2joGhl3wUZDhVDYo=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocamline/default.nix b/pkgs/development/ocaml-modules/ocamline/default.nix
index 5a340e815bdb..eb77721bf0a6 100644
--- a/pkgs/development/ocaml-modules/ocamline/default.nix
+++ b/pkgs/development/ocaml-modules/ocamline/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "chrisnevers";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "Sljm/Bfr2Eo0d75tmJRuWUkkfHUYQ0g27+FzXBePnVg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
index 2b6666c31e4f..263caad54863 100644
--- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
+++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
@@ -18,7 +18,7 @@ else
     src = fetchFromGitHub {
       owner = "OCamlPro";
       repo = "ocp-ocamlres";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
     };
 
diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix
index 73e9c795507f..2d7ea6e26359 100644
--- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocplib-endian";
-    tag = version;
+    rev = version;
     sha256 = "sha256-THTlhOfXAPaqTt1qBkht+D67bw6M175QLvXoUMgjks4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
index 5ff8c0413662..cb070c0a34b4 100644
--- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fLTht+TlyJIsIAsRLmmkFKsnbSeW3BgyAyURFdnGfko=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix b/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix
index 45d80849080c..ae41c0549029 100644
--- a/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256:0qgasd89ayamgl2rfyxsipznmwa3pjllkyq9qg0g1f41h8ixpsfh";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index 9027c47e3f6b..37a63948a355 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsigen-start";
-    tag = version;
+    rev = version;
     hash = "sha256-i2nj/m1Ihb/bprtHvZh47/oK0v+aFNVH+A2CB4rrrPk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
index 475b94a0824d..737646b16a2b 100644
--- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-1kw2HANajHDdMmjuYNB79ZDqy2Ml02nc5s+cJzIoxQ8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocsipersist/lib.nix b/pkgs/development/ocaml-modules/ocsipersist/lib.nix
index ec60a49f33c0..e21c1979cc23 100644
--- a/pkgs/development/ocaml-modules/ocsipersist/lib.nix
+++ b/pkgs/development/ocaml-modules/ocsipersist/lib.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsipersist";
-    tag = version;
+    rev = version;
     sha256 = "sha256:1d6kdcfjvrz0dl764mnyxc477aa57rvmzkg154qc915w2y1nbz9a";
   };
 
diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix
index 654eca23d066..fadb54519abf 100644
--- a/pkgs/development/ocaml-modules/octavius/default.nix
+++ b/pkgs/development/ocaml-modules/octavius/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-doc";
     repo = "octavius";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/S6WpIo1c5J9uM3xgtAM/elhnsl0XimnIFsKy3ootbA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix
index 164523cafb1e..c952882e7d0e 100644
--- a/pkgs/development/ocaml-modules/odate/default.nix
+++ b/pkgs/development/ocaml-modules/odate/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "hhugo";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-C11HpftrYOCVyWT31wrqo8FVZuP7mRUkRv5IDeAZ+To=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ogg/default.nix b/pkgs/development/ocaml-modules/ogg/default.nix
index 29349752a4b1..b815923bb911 100644
--- a/pkgs/development/ocaml-modules/ogg/default.nix
+++ b/pkgs/development/ocaml-modules/ogg/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ogg";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-S6rJw90c//a9d63weCLuOBoQwNqbpTb+lRytvHUOZuc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix
index ee698c29f78c..eaf87e5684f8 100644
--- a/pkgs/development/ocaml-modules/opam-file-format/default.nix
+++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-Ka9pMYB99kM+5X7wf9F13gUrjouZucGevvkSY0TaXGg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/opus/default.nix b/pkgs/development/ocaml-modules/opus/default.nix
index 6afb769c92bf..693426fb2356 100644
--- a/pkgs/development/ocaml-modules/opus/default.nix
+++ b/pkgs/development/ocaml-modules/opus/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-opus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ghfqw/J1oLbTJpYJaiB5M79jaA6DACvyxBVE+NjnPkg=";
   };
 
diff --git a/pkgs/development/ocaml-modules/oseq/default.nix b/pkgs/development/ocaml-modules/oseq/default.nix
index 31f0a67097d0..7d462b10c6a2 100644
--- a/pkgs/development/ocaml-modules/oseq/default.nix
+++ b/pkgs/development/ocaml-modules/oseq/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fyr/OKlvvHBfovtdubSW4rd4OwQbMLKWXghyU3uBy/k=";
   };
 
diff --git a/pkgs/development/ocaml-modules/otfed/default.nix b/pkgs/development/ocaml-modules/otfed/default.nix
index 9e75583bb7f6..b33036380e17 100644
--- a/pkgs/development/ocaml-modules/otfed/default.nix
+++ b/pkgs/development/ocaml-modules/otfed/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "gfngfn";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-6QCom9nrz0B5vCmuBzqsM0zCs8tBLJC6peig+vCgMVA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix
index ae0b554ab54a..8990a3611eca 100644
--- a/pkgs/development/ocaml-modules/otoml/default.nix
+++ b/pkgs/development/ocaml-modules/otoml/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "dmbaturin";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-e9Bqd6KHorglLMzvsjakyYt/CLZR3yI/yZPl/rnbkDE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix
index 3fac3643e3f1..1b0605a6269d 100644
--- a/pkgs/development/ocaml-modules/parany/default.nix
+++ b/pkgs/development/ocaml-modules/parany/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "UnixJunkie";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QR3Rq30iKhft+9tVCgJLOq9bwJe7bcay/kMTXjjCLjE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix
index 663d933cae11..7babaab8b725 100644
--- a/pkgs/development/ocaml-modules/parmap/default.nix
+++ b/pkgs/development/ocaml-modules/parmap/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rdicosmo";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-tBu7TGtDOe5FbxLZuz6nl+65aN9FHIngq/O4dJWzr3Q=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix
index 9925b7d71454..454939a9d114 100644
--- a/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/pkgs/development/ocaml-modules/pgocaml/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "darioteixeira";
     repo = "pgocaml";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Mz3zVgXas1UivH/BVARx5kWClgr9v9YcGarwaD961tU=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pgsolver/default.nix b/pkgs/development/ocaml-modules/pgsolver/default.nix
index 2d24310299f4..ddfde095c7d9 100644
--- a/pkgs/development/ocaml-modules/pgsolver/default.nix
+++ b/pkgs/development/ocaml-modules/pgsolver/default.nix
@@ -14,7 +14,7 @@ buildOasisPackage rec {
   src = fetchFromGitHub {
     owner = "tcsprojects";
     repo = "pgsolver";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "16skrn8qql9djpray25xv66rjgfl20js5wqnxyq1763nmyizyj8a";
   };
 
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index 8d14f966d392..74f01c35ce94 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alavrik";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6Luq49sbo+AqLSq57mc6fLhrRx0K6G5LCUIzkGPfqYo=";
   };
 
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index 0d9dc4dc5a9b..1c45d67324d6 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -23,7 +23,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "alavrik";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-qE+yybTn+kzbY0h8udhZYO+GwQPI/J/6p3LMmF12cFU=";
     };
 
diff --git a/pkgs/development/ocaml-modules/portaudio/default.nix b/pkgs/development/ocaml-modules/portaudio/default.nix
index 0a2f3600d943..208796727925 100644
--- a/pkgs/development/ocaml-modules/portaudio/default.nix
+++ b/pkgs/development/ocaml-modules/portaudio/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-portaudio";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rMSE+ta7ughjjCnz4oho1D3VGaAsUlLtxizvxZT0/cQ=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix
index 5f653199e737..a542bf2e2ec1 100644
--- a/pkgs/development/ocaml-modules/pprint/default.nix
+++ b/pkgs/development/ocaml-modules/pprint/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "fpottier";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-avf71vAgCL1MU8O7Q3FNN3wEdCDtbNZP0ipETnn8AqA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_bap/default.nix b/pkgs/development/ocaml-modules/ppx_bap/default.nix
index f819c7421f19..7414253eef2e 100644
--- a/pkgs/development/ocaml-modules/ppx_bap/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_bap/default.nix
@@ -24,7 +24,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1c6rcdp8bicdiwqc2mb59cl9l2vxlp3y8hmnr9x924fq7acly248";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
index 900b7e5733be..75bdee5783a8 100644
--- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
@@ -27,7 +27,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.2")
     src = fetchFromGitHub {
       owner = "fdopen";
       repo = "ppx_cstubs";
-      tag = version;
+      rev = version;
       hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs=";
     };
 
diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
index 39f6b9ee2fad..e1208fe330e3 100644
--- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "diml";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
index 329d36450f03..d289734a9a1c 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
@@ -20,7 +20,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "hammerlab";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/22KLQnxu3e2ZSca6ZLxTJDfv/rsmgCUkJnZC0RwRi8";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index 95f9a3c527d4..a509985cdec2 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -37,7 +37,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = "ppx_deriving_yojson";
-    tag = "v${version}";
+    rev = "v${version}";
     inherit (param) sha256;
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_monad/default.nix b/pkgs/development/ocaml-modules/ppx_monad/default.nix
index 8207bce79d00..cb45f5233790 100644
--- a/pkgs/development/ocaml-modules/ppx_monad/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_monad/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "niols";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cbguAddSlUxBK7pmT7vNmtJW9TrVZZjdSJRMT3lqxOA=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_show/default.nix b/pkgs/development/ocaml-modules/ppx_show/default.nix
index a916af5ce01b..8874f2f4253a 100644
--- a/pkgs/development/ocaml-modules/ppx_show/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_show/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "thierry-martinez";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YwWAdOtb0zg2hqNkGRiigz/Pci8Jy/QD+WyUEohEsns=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
index 11f6996b139d..3a887bdd5aeb 100644
--- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
index fec5c3f421af..11bbb63b59ca 100644
--- a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "janestreet";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lSOUSMVgsRiArEhFTKpAj2yFBPbtaIc/SxdPA+24xXs=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
index 431751e43310..22fe2ef279f2 100644
--- a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "janestreet";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XGgpcAEemBNEagblBjpK+BiL0OUsU2JPqOq+heHbqVk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix
index 953e1daad0bb..d3e7673a5c27 100644
--- a/pkgs/development/ocaml-modules/printbox/default.nix
+++ b/pkgs/development/ocaml-modules/printbox/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PQbr2sjASoWz0OHAMV6buAJERpnUJxVpLAigIVnADIc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/process/default.nix b/pkgs/development/ocaml-modules/process/default.nix
index 0e23ddd1a4f7..ad1c2d96b6c0 100644
--- a/pkgs/development/ocaml-modules/process/default.nix
+++ b/pkgs/development/ocaml-modules/process/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dsheets";
     repo = "ocaml-process";
-    tag = version;
+    rev = version;
     sha256 = "0m1ldah5r9gcq09d9jh8lhvr77910dygx5m309k1jm60ah9mdcab";
   };
 
diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
index a8bfd999b442..74798bc3d6fe 100644
--- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
+++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ACoquereau";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pulseaudio/default.nix b/pkgs/development/ocaml-modules/pulseaudio/default.nix
index ea7b1b7f104d..3afa4d4fee7f 100644
--- a/pkgs/development/ocaml-modules/pulseaudio/default.nix
+++ b/pkgs/development/ocaml-modules/pulseaudio/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-pulseaudio";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-eG2HS5g3ycDftRDyXGBwPJE7VRnLXNUgcEgNfVm//ds=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pure-splitmix/default.nix b/pkgs/development/ocaml-modules/pure-splitmix/default.nix
index a0b2a4a4da1c..8b929da7331c 100644
--- a/pkgs/development/ocaml-modules/pure-splitmix/default.nix
+++ b/pkgs/development/ocaml-modules/pure-splitmix/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "Lysxia";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "RUnsAB4hMV87ItCyGhc47bHGY1iOwVv9kco2HxnzqbU=";
   };
 
diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix
index f1fc1fa9f3c2..2d63152d9f6b 100644
--- a/pkgs/development/ocaml-modules/pyml/default.nix
+++ b/pkgs/development/ocaml-modules/pyml/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "thierry-martinez";
     repo = "pyml";
-    tag = version;
+    rev = version;
     sha256 = "sha256-0Yy5T/S3Npwt0XJmEsdXGg5AXYi9vV9UG9nMSzz/CEc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix
index 6906cf5b201c..b266f47ffcfa 100644
--- a/pkgs/development/ocaml-modules/qcheck/core.nix
+++ b/pkgs/development/ocaml-modules/qcheck/core.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "qcheck";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iuFlmSeUhumeWhqHlaNqDjReRf8c4e76hhT27DK3+/g=";
   };
 
diff --git a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
index 5df598b77328..c659e1343386 100644
--- a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
+++ b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-multicore";
     repo = "multicoretests";
-    tag = version;
+    rev = version;
     hash = "sha256-taaH+hBOdiCK2HT+5OfX892/f1ozlLdd/AteapYWK9Y=";
   };
 
diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix
index 6362002182d4..de1bbca4ef08 100644
--- a/pkgs/development/ocaml-modules/qtest/default.nix
+++ b/pkgs/development/ocaml-modules/qtest/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "vincent-hugot";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VLY8+Nu6md0szW4RVxTFwlSQ9kyrgUqf7wQEA6GW8BE=";
   };
 
diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix
index f36843e630f1..8d01acc1afb9 100644
--- a/pkgs/development/ocaml-modules/reactivedata/default.nix
+++ b/pkgs/development/ocaml-modules/reactivedata/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "reactiveData";
-    tag = version;
+    rev = version;
     sha256 = "sha256-MO9WMe1k2QcC5RynE6uZHohmu3QlpTHvAkvQNgu3P90=";
   };
 
diff --git a/pkgs/development/ocaml-modules/repr/default.nix b/pkgs/development/ocaml-modules/repr/default.nix
index 19e8c883fd63..ba9a0fc85729 100644
--- a/pkgs/development/ocaml-modules/repr/default.nix
+++ b/pkgs/development/ocaml-modules/repr/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mirage";
     repo = "repr";
-    tag = version;
+    rev = version;
     hash = "sha256-SM55m5NIaQ2UKAtznNFSt3LN4QA7As0DyTxVeQjOTjI=";
   };
 
diff --git a/pkgs/development/ocaml-modules/resource-pooling/default.nix b/pkgs/development/ocaml-modules/resource-pooling/default.nix
index 9ae330436b39..d98e8e8c47e9 100644
--- a/pkgs/development/ocaml-modules/resource-pooling/default.nix
+++ b/pkgs/development/ocaml-modules/resource-pooling/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-GNYPxjMTo7y40y7aQdseuFyeVF/hSCZKXfEaH/WIO9w=";
   };
 
diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix
index f7c2d6298e77..5018a282e59e 100644
--- a/pkgs/development/ocaml-modules/resto/default.nix
+++ b/pkgs/development/ocaml-modules/resto/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "resto";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VdkYUy7Fi53ku6F/1FV55/VcyF/tDZKN4NTMabDd/T4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/rfc7748/default.nix b/pkgs/development/ocaml-modules/rfc7748/default.nix
index 5d76b5e5f816..8adf46c3b384 100644
--- a/pkgs/development/ocaml-modules/rfc7748/default.nix
+++ b/pkgs/development/ocaml-modules/rfc7748/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "burgerdev";
     repo = "ocaml-rfc7748";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mgZooyfxrKBVQFn01B8PULmFUW9Zq5HJfgHCSJSkJo4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ringo/default.nix b/pkgs/development/ocaml-modules/ringo/default.nix
index 796982c251e4..4120d82cb295 100644
--- a/pkgs/development/ocaml-modules/ringo/default.nix
+++ b/pkgs/development/ocaml-modules/ringo/default.nix
@@ -10,7 +10,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "ringo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8dThhY7TIjd0lLdCt6kxr0yhgVGDyN6ZMSx0Skfbcwk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix
index 66cee03b2677..363c8edf71ee 100644
--- a/pkgs/development/ocaml-modules/safepass/default.nix
+++ b/pkgs/development/ocaml-modules/safepass/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "darioteixeira";
     repo = "ocaml-safepass";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1cwslwdb1774lfmhcclj9kymvidbcpjx1vp16jnjirqdqgl4zs5q";
   };
 
diff --git a/pkgs/development/ocaml-modules/samplerate/default.nix b/pkgs/development/ocaml-modules/samplerate/default.nix
index 643c2a3c3b5a..51f80d727f1a 100644
--- a/pkgs/development/ocaml-modules/samplerate/default.nix
+++ b/pkgs/development/ocaml-modules/samplerate/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-samplerate";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0h0i9v9p9n2givv3wys8qrfi1i7vp8kq7lnkf14s7d3m4r8x4wrp";
   };
 
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index b467a5ca213b..57cf08744cb3 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -26,7 +26,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
     src = fetchFromGitHub {
       owner = "javalib-team";
       repo = pname;
-      tag = version;
+      rev = version;
       hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw=";
     };
 
diff --git a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
index be88d871e7d2..5a57a79889e1 100644
--- a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
+++ b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "ocaml-secp256k1-internal";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-amVtp94cE1NxClWJgcJvRmilnQlC7z44mORUaxvPn00=";
   };
 
diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix
index 0a4d05fd5133..d27d260a3723 100644
--- a/pkgs/development/ocaml-modules/secp256k1/default.nix
+++ b/pkgs/development/ocaml-modules/secp256k1/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "dakk";
     repo = "secp256k1-ml";
-    tag = version;
+    rev = version;
     hash = "sha256-22+dZb3MC1W5Qvsz3+IHV1/XiGCRmJHTH+6IW2QX2hU=";
   };
 
diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix
index f6f6ee69531c..6d4797ecf4ac 100644
--- a/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -51,7 +51,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-community";
     repo = "sedlex";
-    tag = "v${version}";
+    rev = "v${version}";
     inherit (param) sha256;
   };
 
diff --git a/pkgs/development/ocaml-modules/simple-diff/default.nix b/pkgs/development/ocaml-modules/simple-diff/default.nix
index 793322541f17..0a578f28b2b1 100644
--- a/pkgs/development/ocaml-modules/simple-diff/default.nix
+++ b/pkgs/development/ocaml-modules/simple-diff/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gjaldon";
     repo = "simple_diff";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OaKECUBCCt9KfdRJf3HcXTUJVxKKdYtnzOHpMPOllrk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/slug/default.nix b/pkgs/development/ocaml-modules/slug/default.nix
index 987dec7525b2..55657d32c454 100644
--- a/pkgs/development/ocaml-modules/slug/default.nix
+++ b/pkgs/development/ocaml-modules/slug/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "thangngoc89";
     repo = "ocaml-slug";
-    tag = version;
+    rev = version;
     sha256 = "sha256-pIk/0asSyibXbwmBSBuLwl2SS9aw6dNDDvwO+1VJGf8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix
index cd2f53833d27..7ca2e65935ad 100644
--- a/pkgs/development/ocaml-modules/sodium/default.nix
+++ b/pkgs/development/ocaml-modules/sodium/default.nix
@@ -20,7 +20,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "dsheets";
       repo = "ocaml-sodium";
-      tag = version;
+      rev = version;
       sha256 = "124gpi1jhac46x05gp5viykyrafnlp03v1cmkl13c6pgcs8w04pv";
     };
 
diff --git a/pkgs/development/ocaml-modules/soundtouch/default.nix b/pkgs/development/ocaml-modules/soundtouch/default.nix
index e457c2503899..db7cb1de1060 100644
--- a/pkgs/development/ocaml-modules/soundtouch/default.nix
+++ b/pkgs/development/ocaml-modules/soundtouch/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-soundtouch";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-81Mhk4PZx4jGrVIevzMslvVbKzipzDzHWnbtOjeZCI8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/speex/default.nix b/pkgs/development/ocaml-modules/speex/default.nix
index 501acecb0808..e0e8da318dd9 100644
--- a/pkgs/development/ocaml-modules/speex/default.nix
+++ b/pkgs/development/ocaml-modules/speex/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-speex";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0p4ip37kihlz9qy604llak2kzd00g45ix1yiihnrri2nm01scfab";
   };
 
diff --git a/pkgs/development/ocaml-modules/spelll/default.nix b/pkgs/development/ocaml-modules/spelll/default.nix
index f7ff64ba1141..ec59977d333e 100644
--- a/pkgs/development/ocaml-modules/spelll/default.nix
+++ b/pkgs/development/ocaml-modules/spelll/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nI8fdArYynR70PUJIgyogGBCe4gFhfVzuRdZzFGKqOc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/srt/default.nix b/pkgs/development/ocaml-modules/srt/default.nix
index f95ab010a8f3..6cbcf20b1727 100644
--- a/pkgs/development/ocaml-modules/srt/default.nix
+++ b/pkgs/development/ocaml-modules/srt/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-srt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FVgOEBPYZz7SQ5c6mLAssDwY1NuXsV3ghP7OyLRd9Kw=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index 3015bb6f521f..fea4be04f8a3 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ssl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gi80iwlKaI4TdAVnCyPG03qRWFa19DHdTrA0KMFBAc4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/swhid_core/default.nix b/pkgs/development/ocaml-modules/swhid_core/default.nix
index d0ef4f658a8a..bc9998be2dc2 100644
--- a/pkgs/development/ocaml-modules/swhid_core/default.nix
+++ b/pkgs/development/ocaml-modules/swhid_core/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "swhid_core";
-    tag = version;
+    rev = version;
     hash = "sha256-uLnVbptCvmBeNbOjGjyAWAKgzkKLDTYVFY6SNH2zf0A=";
   };
 
diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix
index 6cd603be6ff1..293e508c283f 100644
--- a/pkgs/development/ocaml-modules/syslog/default.nix
+++ b/pkgs/development/ocaml-modules/syslog/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "geneanet";
     repo = "ocaml-syslog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WybNZBPhv4fhjzzb95E+6ZHcZUnfROLlNF3PMBGO9ys=";
   };
 
diff --git a/pkgs/development/ocaml-modules/taglib/default.nix b/pkgs/development/ocaml-modules/taglib/default.nix
index a957f2093998..ca0a47a356b0 100644
--- a/pkgs/development/ocaml-modules/taglib/default.nix
+++ b/pkgs/development/ocaml-modules/taglib/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-taglib";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-tAvzVr0PW1o0kKFxdi/ks4obqnyBm8YfiiFupXZkUho=";
   };
 
diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix
index 53b0a2ae0627..58c19e399cc4 100644
--- a/pkgs/development/ocaml-modules/tcslib/default.nix
+++ b/pkgs/development/ocaml-modules/tcslib/default.nix
@@ -15,7 +15,7 @@ buildOasisPackage rec {
   src = fetchFromGitHub {
     owner = "tcsprojects";
     repo = "tcslib";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "05g6m82blsccq8wx8knxv6a5fzww7hi624jx91f9h87nk2fsplhi";
   };
 
diff --git a/pkgs/development/ocaml-modules/tdigest/default.nix b/pkgs/development/ocaml-modules/tdigest/default.nix
index 37988eaf7a7b..5ea7ed0f7ee0 100644
--- a/pkgs/development/ocaml-modules/tdigest/default.nix
+++ b/pkgs/development/ocaml-modules/tdigest/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "SGrondin";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-Z2rOaiNGvVDbRwf5XfoNIcenQdrE3fxHnfzyi6Ki2Ic=";
   };
 
diff --git a/pkgs/development/ocaml-modules/terml/default.nix b/pkgs/development/ocaml-modules/terml/default.nix
index 83235387edb3..b70371e623fc 100644
--- a/pkgs/development/ocaml-modules/terml/default.nix
+++ b/pkgs/development/ocaml-modules/terml/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "wllfaria";
     repo = "terml";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-2ifMfUaYYsCFOACgXgJ5IuoSEicHyIqumLpun2ZqcDc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/theora/default.nix b/pkgs/development/ocaml-modules/theora/default.nix
index 42dca090c2e4..e0aa39107f8b 100644
--- a/pkgs/development/ocaml-modules/theora/default.nix
+++ b/pkgs/development/ocaml-modules/theora/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-theora";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2FXB5BOBRQhnpEmdlYBdZZXuXW9K+1cu7akJQDuDAMc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/timed/default.nix b/pkgs/development/ocaml-modules/timed/default.nix
index f1386b8460c6..d68f85ca9fb1 100644
--- a/pkgs/development/ocaml-modules/timed/default.nix
+++ b/pkgs/development/ocaml-modules/timed/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rlepigre";
     repo = "ocaml-${pname}";
-    tag = version;
+    rev = version;
     sha256 = "sha256-wUoI9j/j0IGYW2NfJHmyR2XEYfYejyoYLWnKsuWdFas=";
   };
 
diff --git a/pkgs/development/ocaml-modules/tiny_httpd/default.nix b/pkgs/development/ocaml-modules/tiny_httpd/default.nix
index 197f20660d9a..4ea3551aae83 100644
--- a/pkgs/development/ocaml-modules/tiny_httpd/default.nix
+++ b/pkgs/development/ocaml-modules/tiny_httpd/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9L4WCduQNj5Jd/u3SozuXiGTkgojwfGIP5KgQmnWgQw=";
   };
 
diff --git a/pkgs/development/ocaml-modules/toml/default.nix b/pkgs/development/ocaml-modules/toml/default.nix
index 1008afb001ef..2f7f9b547e06 100644
--- a/pkgs/development/ocaml-modules/toml/default.nix
+++ b/pkgs/development/ocaml-modules/toml/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-toml";
     repo = "to.ml";
-    tag = version;
+    rev = version;
     hash = "sha256-uk14Py7lEEDJhFsRRtStXqKlJLtx0o8eS9DEIes4SHw=";
   };
 
diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix
index 1454d38d9a6f..6ac2867ac1a7 100644
--- a/pkgs/development/ocaml-modules/torch/default.nix
+++ b/pkgs/development/ocaml-modules/torch/default.nix
@@ -27,7 +27,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "LaurentMazare";
     repo = "ocaml-${pname}";
-    tag = version;
+    rev = version;
     hash = "sha256-z/9NUBjeFWE63Z/e8OyzDiy8hrn6qzjaiBH8G9MPeos=";
   };
 
diff --git a/pkgs/development/ocaml-modules/trie/default.nix b/pkgs/development/ocaml-modules/trie/default.nix
index 2a5a842939c8..f0101bb73139 100644
--- a/pkgs/development/ocaml-modules/trie/default.nix
+++ b/pkgs/development/ocaml-modules/trie/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "kandu";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0s7p9swjqjsqddylmgid6cv263ggq7pmb734z4k84yfcrgb6kg4g";
   };
 
diff --git a/pkgs/development/ocaml-modules/tsdl-image/default.nix b/pkgs/development/ocaml-modules/tsdl-image/default.nix
index bcc27850382d..8ee97c9aa4dd 100644
--- a/pkgs/development/ocaml-modules/tsdl-image/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl-image/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "sanette";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-mgTFwkuFJVwJmHrzHSdNh8v4ehZIcWemK+eLqjglw5o=";
   };
 
diff --git a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix
index 9e1357eb8c8e..fbe0f16ff0c9 100644
--- a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "sanette";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-szuGmLzgGyQExCQwpopVNswtZZdhP29Q1+uNQJZb43Q=";
   };
 
diff --git a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix
index c2e978e04916..17b5e2006b0c 100644
--- a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "sanette";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-1MGbsekaBoCz4vAwg+Dfzsl0xUKgs8dUEr+OpLopnig=";
   };
 
diff --git a/pkgs/development/ocaml-modules/tsort/default.nix b/pkgs/development/ocaml-modules/tsort/default.nix
index f9eb4648e28c..e026ecb27ffc 100644
--- a/pkgs/development/ocaml-modules/tsort/default.nix
+++ b/pkgs/development/ocaml-modules/tsort/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "dmbaturin";
     repo = "ocaml-tsort";
-    tag = version;
+    rev = version;
     sha256 = "sha256-SCd0R8iGwMeRhhSxMid9lzqj5fm+owCJ2dzwtLpFqB4=";
   };
 
diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix
index 1c6edd3f1081..ef5fae48b37c 100644
--- a/pkgs/development/ocaml-modules/twt/default.nix
+++ b/pkgs/development/ocaml-modules/twt/default.nix
@@ -17,7 +17,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "mlin";
       repo = "twt";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-xbjLPd7P1KyuC3i6WHLBcdLwd14atcBsd5ER+l97KAk=";
     };
 
diff --git a/pkgs/development/ocaml-modules/uecc/default.nix b/pkgs/development/ocaml-modules/uecc/default.nix
index 271f00af2315..e9bdc340647a 100644
--- a/pkgs/development/ocaml-modules/uecc/default.nix
+++ b/pkgs/development/ocaml-modules/uecc/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "ocaml-uecc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o/DylUx+olRRloiCU6b1t/xOmW8A5IZB2n3U7fkMo80=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix
index 11b003ec5061..ac98285c101f 100644
--- a/pkgs/development/ocaml-modules/ulex/default.nix
+++ b/pkgs/development/ocaml-modules/ulex/default.nix
@@ -34,7 +34,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "whitequark";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       inherit (param) sha256;
     };
 
diff --git a/pkgs/development/ocaml-modules/vorbis/default.nix b/pkgs/development/ocaml-modules/vorbis/default.nix
index d686541b062e..968c51f5e373 100644
--- a/pkgs/development/ocaml-modules/vorbis/default.nix
+++ b/pkgs/development/ocaml-modules/vorbis/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-vorbis";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iCoE7I70wAp4n4XfETVKeaob2811E97/e6144bY/nqk=";
   };
 
diff --git a/pkgs/development/ocaml-modules/vpl-core/default.nix b/pkgs/development/ocaml-modules/vpl-core/default.nix
index 863b30fefbbb..bdc78d941925 100644
--- a/pkgs/development/ocaml-modules/vpl-core/default.nix
+++ b/pkgs/development/ocaml-modules/vpl-core/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "VERIMAG-Polyhedra";
     repo = "vpl";
-    tag = version;
+    rev = version;
     hash = "sha256-mSD/xSweeK9WMxWDdX/vzN96iXo74RkufjuNvtzsP9o=";
   };
 
diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix
index 86739685f38e..3cd3fb98e481 100644
--- a/pkgs/development/ocaml-modules/webmachine/default.nix
+++ b/pkgs/development/ocaml-modules/webmachine/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = "ocaml-webmachine";
-    tag = version;
+    rev = version;
     sha256 = "03ynb1l2jjqba88m9r8m5hwlm8izpfp617r4vcab5kmdim1l2ffx";
   };
 
diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix
index 7b476589ea40..2955755ccb41 100644
--- a/pkgs/development/ocaml-modules/xenstore/default.nix
+++ b/pkgs/development/ocaml-modules/xenstore/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mirage";
     repo = "ocaml-xenstore";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LaynsbCE/+2QfbQCOLZi8nw1rqmZtgrwAov9cSxYZw8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix
index 7eb501621234..735495979cc5 100644
--- a/pkgs/development/ocaml-modules/xenstore_transport/default.nix
+++ b/pkgs/development/ocaml-modules/xenstore_transport/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "xapi-project";
     repo = "ocaml-xenstore-clients";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1kxxd9i4qiq98r7sgvl59iq2ni7y6drnv48qj580q5cyiyyc85q3";
   };
 
diff --git a/pkgs/development/ocaml-modules/xmlplaylist/default.nix b/pkgs/development/ocaml-modules/xmlplaylist/default.nix
index 6f0379b53648..a9294cf162df 100644
--- a/pkgs/development/ocaml-modules/xmlplaylist/default.nix
+++ b/pkgs/development/ocaml-modules/xmlplaylist/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-xmlplaylist";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1x5lbwkr2ip00x8vyfbl8936yy79j138vx8a16ix7g9p2j5qsfcq";
   };
 
diff --git a/pkgs/development/ocaml-modules/yuujinchou/default.nix b/pkgs/development/ocaml-modules/yuujinchou/default.nix
index 79ddbd4f8323..3a0f6b08ea46 100644
--- a/pkgs/development/ocaml-modules/yuujinchou/default.nix
+++ b/pkgs/development/ocaml-modules/yuujinchou/default.nix
@@ -35,7 +35,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "RedPRL";
     repo = pname;
-    tag = version;
+    rev = version;
     inherit (params) hash;
   };
 
diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix
index 1479fb8a3baa..1e2dea1420b6 100644
--- a/pkgs/development/ocaml-modules/zed/default.nix
+++ b/pkgs/development/ocaml-modules/zed/default.nix
@@ -26,7 +26,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-community";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-lbhqjZxeUqHdd+yahRO+B6L2mc+h+4T2+qKVgWC2HY8=";
   };
 
diff --git a/pkgs/development/ocaml-modules/zelus/default.nix b/pkgs/development/ocaml-modules/zelus/default.nix
index b1e0d40e5da8..5425038111fb 100644
--- a/pkgs/development/ocaml-modules/zelus/default.nix
+++ b/pkgs/development/ocaml-modules/zelus/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "INRIA";
     repo = "zelus";
-    tag = version;
+    rev = version;
     hash = "sha256-NcGX343LProADtzJwlq1kmihLaya1giY6xv9ScvdgTA=";
   };
 
diff --git a/pkgs/development/octave-modules/bim/default.nix b/pkgs/development/octave-modules/bim/default.nix
index 5df6370e2de9..afffe81ef8e9 100644
--- a/pkgs/development/octave-modules/bim/default.nix
+++ b/pkgs/development/octave-modules/bim/default.nix
@@ -13,7 +13,7 @@ buildOctavePackage rec {
   src = fetchFromGitHub {
     owner = "carlodefalco";
     repo = "bim";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hgFb1KFE1KJC8skIaeT/7h/fg1aqRpedGnEPY24zZSI=";
   };
 
diff --git a/pkgs/development/octave-modules/msh/default.nix b/pkgs/development/octave-modules/msh/default.nix
index 7415a5a0ce4c..181b0c2ac58f 100644
--- a/pkgs/development/octave-modules/msh/default.nix
+++ b/pkgs/development/octave-modules/msh/default.nix
@@ -20,7 +20,7 @@ buildOctavePackage rec {
   src = fetchFromGitHub {
     owner = "carlodefalco";
     repo = "msh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UnMrIruzm3ARoTgUlMMxfjTOMZw/znZUQJmj3VEOw8I=";
   };
 
diff --git a/pkgs/development/octave-modules/video/default.nix b/pkgs/development/octave-modules/video/default.nix
index b16da24c87d0..903d68589d2f 100644
--- a/pkgs/development/octave-modules/video/default.nix
+++ b/pkgs/development/octave-modules/video/default.nix
@@ -14,7 +14,7 @@ buildOctavePackage rec {
   src = fetchFromGitHub {
     owner = "Andy1978";
     repo = "octave-video";
-    tag = version;
+    rev = version;
     hash = "sha256-JFySAu/3lCnfuFMNGYPzX2MqhsRi1+IyJQBcKB9vCo0=";
   };
 
diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
index 633e32ef1472..8a86295dc45c 100644
--- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix
+++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
@@ -16,7 +16,7 @@ buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "percona";
     repo = "percona-toolkit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "084ldpskvlfm32lfss5qqzm5y9b8hf029aa4i5pcnzgb53xaxkqx";
   };
 
diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
index 7ffc31b53e78..0669f5b7c7af 100644
--- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
+++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
@@ -18,7 +18,7 @@ buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "trizen";
     repo = "youtube-viewer";
-    tag = version;
+    rev = version;
     sha256 = "9Z4fv2B0AnwtYsp7h9phnRMmHtBOMObIJvK8DmKQRxs=";
   };
 
diff --git a/pkgs/development/php-packages/amqp/default.nix b/pkgs/development/php-packages/amqp/default.nix
index 164dec9812d2..8891aba7cd9d 100644
--- a/pkgs/development/php-packages/amqp/default.nix
+++ b/pkgs/development/php-packages/amqp/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "php-amqp";
     repo = "php-amqp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jVD5dq2kgFnprj190W9hnLG+9yPLWm19AjoGBBz6v8c=";
   };
 
diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix
index 4064e9a5f653..e6a617d1aed2 100644
--- a/pkgs/development/php-packages/apcu/default.nix
+++ b/pkgs/development/php-packages/apcu/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "krakjoe";
     repo = "apcu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-g+Oo6y+24VOWHaDZ23iItkGwOa5bTtKMAjZOmAi6EOo=";
   };
 
diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix
index 7dfa81851545..027c80d02c86 100644
--- a/pkgs/development/php-packages/ast/default.nix
+++ b/pkgs/development/php-packages/ast/default.nix
@@ -14,7 +14,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "nikic";
     repo = "php-ast";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-9HP+hKcpkWmvsx335JiCVjFG+xyAMEm5dWxWC1nZPxU=";
   };
 
diff --git a/pkgs/development/php-packages/composer-local-repo-plugin/default.nix b/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
index c61a096a1b43..d6199a568659 100644
--- a/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
+++ b/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
@@ -14,7 +14,7 @@ php.buildComposerWithPlugin {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "composer-local-repo-plugin";
-    tag = version;
+    rev = version;
     hash = "sha256-edbn07r/Uc1g0qOuVBZBs6N1bMN5kIfA1b4FCufdw5M=";
   };
 
diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix
index ff5efe577732..fb98e4846d83 100644
--- a/pkgs/development/php-packages/couchbase/default.nix
+++ b/pkgs/development/php-packages/couchbase/default.nix
@@ -17,7 +17,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "php-couchbase";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JpzLR4NcyShl2VTivj+15iAsTTsZmdMIdZYc3dLCbIA=";
   };
 
diff --git a/pkgs/development/php-packages/cyclonedx-php-composer/default.nix b/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
index 44bffde927ad..d3af20b63bc7 100644
--- a/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
+++ b/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
@@ -14,7 +14,7 @@ php.buildComposerWithPlugin {
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-php-composer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0fb1QiuVJqcB7CAEyB0y60/O9iiibT06mccZYe52dFQ=";
   };
 
diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix
index 10cf492f5788..866de8be10ab 100644
--- a/pkgs/development/php-packages/datadog_trace/default.nix
+++ b/pkgs/development/php-packages/datadog_trace/default.nix
@@ -20,7 +20,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "DataDog";
     repo = "dd-trace-php";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-Kx2HaWvRT+mFIs0LAAptx6nm9DQ83QEuyHNcEPEr7A4=";
   };
diff --git a/pkgs/development/php-packages/ds/default.nix b/pkgs/development/php-packages/ds/default.nix
index bf10b58add8f..a78974c42a0f 100644
--- a/pkgs/development/php-packages/ds/default.nix
+++ b/pkgs/development/php-packages/ds/default.nix
@@ -16,7 +16,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "php-ds";
     repo = "ext-ds";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lL1PUjc4bMTsWm2th0wDxnMaGuVziBUtgK88bUJXuBY=";
   };
 
diff --git a/pkgs/development/php-packages/imap/default.nix b/pkgs/development/php-packages/imap/default.nix
index 48d6afc6113c..208130e95158 100644
--- a/pkgs/development/php-packages/imap/default.nix
+++ b/pkgs/development/php-packages/imap/default.nix
@@ -21,7 +21,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "php";
     repo = "pecl-mail-imap";
-    tag = version;
+    rev = version;
     hash = "sha256-QVeimxm3rfWMvMpSgadhMKd24yPdDGVuhXIOs8668do=";
   };
 
diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix
index 531819e7b61e..173b2753dc85 100644
--- a/pkgs/development/php-packages/maxminddb/default.nix
+++ b/pkgs/development/php-packages/maxminddb/default.nix
@@ -14,7 +14,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "maxmind";
     repo = "MaxMind-DB-Reader-php";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-zFO77h++OHxnk0Rz61jiCBZS80g0+GmRbw2LxayIFuo=";
   };
 
diff --git a/pkgs/development/php-packages/memcache/default.nix b/pkgs/development/php-packages/memcache/default.nix
index 8cda14d2cc97..30180ed16723 100644
--- a/pkgs/development/php-packages/memcache/default.nix
+++ b/pkgs/development/php-packages/memcache/default.nix
@@ -14,7 +14,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "websupport-sk";
     repo = "pecl-memcache";
-    tag = version;
+    rev = version;
     hash = "sha256-77GvQ59XUpIZmdYZP6IhtjdkYwXKuNBSG+LBScz2BtI=";
   };
 
diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix
index 7ae3589d8eac..1b85b25671ae 100644
--- a/pkgs/development/php-packages/memcached/default.nix
+++ b/pkgs/development/php-packages/memcached/default.nix
@@ -16,7 +16,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "php-memcached-dev";
     repo = "php-memcached";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-V4d6bY0m1nuEfjZjt3qio4/HOBcSlD9+XMEl1GPfbhs=";
   };
 
diff --git a/pkgs/development/php-packages/memprof/default.nix b/pkgs/development/php-packages/memprof/default.nix
index fd874dae1f04..2b6b3de25fdf 100644
--- a/pkgs/development/php-packages/memprof/default.nix
+++ b/pkgs/development/php-packages/memprof/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "arnaud-lb";
     repo = "php-memory-profiler";
-    tag = version;
+    rev = version;
     hash = "sha256-gq+txAU2Fw+Zm1aIu0lwPUHRqtccNcHFpp0fm3f7BnQ=";
   };
 
diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix
index 43bc37ba66f2..0f44ca36c387 100644
--- a/pkgs/development/php-packages/mongodb/default.nix
+++ b/pkgs/development/php-packages/mongodb/default.nix
@@ -21,7 +21,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-php-driver";
-    tag = version;
+    rev = version;
     hash = "sha256-BMa0JOhk3jMiuhKX9AcGC2cpL1K0mocOs5wH8F43F0U=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix
index dde3c8314bcb..2b4e107b91b9 100644
--- a/pkgs/development/php-packages/openswoole/default.nix
+++ b/pkgs/development/php-packages/openswoole/default.nix
@@ -18,7 +18,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "openswoole";
     repo = "swoole-src";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1Bq/relLhjPRROikpCzSzzrelxW3AiMA5G17Ln2lg34=";
   };
 
diff --git a/pkgs/development/php-packages/opentelemetry/default.nix b/pkgs/development/php-packages/opentelemetry/default.nix
index 8f521acd11a3..9f22936e6a6f 100644
--- a/pkgs/development/php-packages/opentelemetry/default.nix
+++ b/pkgs/development/php-packages/opentelemetry/default.nix
@@ -14,7 +14,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-php-instrumentation";
-    tag = version;
+    rev = version;
     hash = "sha256-frFnL49tF74cDKdlTJorOOrs8rNgFMZdMdVmqsyO3cI=";
   };
 
diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix
index a5a55f5e891e..75714ac70640 100644
--- a/pkgs/development/php-packages/pdlib/default.nix
+++ b/pkgs/development/php-packages/pdlib/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "goodspb";
     repo = "pdlib";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-AKZ3F2XzEQCeZkacSXBinxeGQrHBmqjP7mDGQ3RBAiE=";
   };
 
diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix
index a8684ab7802f..6202a1adc7ab 100644
--- a/pkgs/development/php-packages/phalcon/default.nix
+++ b/pkgs/development/php-packages/phalcon/default.nix
@@ -14,7 +14,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "phalcon";
     repo = "cphalcon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SuY65GZ4eys2N5jX3/cmRMF4g+tGTeeQecoZvFkOnr4=";
   };
 
diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix
index 081c2b5cd1bf..2b49c13a86b2 100644
--- a/pkgs/development/php-packages/phan/default.nix
+++ b/pkgs/development/php-packages/phan/default.nix
@@ -12,7 +12,7 @@
     src = fetchFromGitHub {
       owner = "phan";
       repo = "phan";
-      tag = finalAttrs.version;
+      rev = finalAttrs.version;
       hash = "sha256-CSV+kapCzGOCBaYnX0lJVlDdZGNBCKZ/nogOac1xj1A=";
     };
 
diff --git a/pkgs/development/php-packages/pspell/default.nix b/pkgs/development/php-packages/pspell/default.nix
index aa66d8911af6..fb8609bca3a3 100644
--- a/pkgs/development/php-packages/pspell/default.nix
+++ b/pkgs/development/php-packages/pspell/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "php";
     repo = "pecl-text-pspell";
-    tag = version;
+    rev = version;
     hash = "sha256-IVBuEVsUKah8W+oVpIPT9Iln6MFox0e5/5Y14/Kgcg4=";
   };
 
diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix
index c9e4d012aa59..30f7ca2a99cb 100644
--- a/pkgs/development/php-packages/redis/default.nix
+++ b/pkgs/development/php-packages/redis/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     repo = "phpredis";
     owner = "phpredis";
-    tag = version;
+    rev = version;
     hash = "sha256-uUnH+AS4PgIm+uias5T5+W7X5Pzq4hx4c6zAl4OYk1g=";
   };
 
diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix
index 7866aff30fc2..8a2e5a45f7f1 100644
--- a/pkgs/development/php-packages/snuffleupagus/default.nix
+++ b/pkgs/development/php-packages/snuffleupagus/default.nix
@@ -16,7 +16,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "jvoisin";
     repo = "snuffleupagus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W+EQXjvmDHih5YW/SjRcEdUELePUPKrNWB8vW9dLK/g=";
   };
 
diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix
index 51eecd7c4c56..7b9e73b538de 100644
--- a/pkgs/development/php-packages/spx/default.nix
+++ b/pkgs/development/php-packages/spx/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "NoiseByNorthwest";
     repo = "php-spx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Dcv8ncYPIug7e24mvL1gn0x0CeLNAck8djm/r/yiPe8=";
   };
 
diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix
index 89aef535f3cb..16e121531ad3 100644
--- a/pkgs/development/php-packages/swoole/default.nix
+++ b/pkgs/development/php-packages/swoole/default.nix
@@ -18,7 +18,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "swoole";
     repo = "swoole-src";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mCJj0vLpJinxK/EfPq+CeVWnoxouqClOKYbrgj7GNDc=";
   };
 
diff --git a/pkgs/development/php-packages/uv/default.nix b/pkgs/development/php-packages/uv/default.nix
index 098103ce5de5..1bbc6450d0b2 100644
--- a/pkgs/development/php-packages/uv/default.nix
+++ b/pkgs/development/php-packages/uv/default.nix
@@ -12,7 +12,7 @@ buildPecl rec {
   src = fetchFromGitHub {
     owner = "amphp";
     repo = "ext-uv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RYb7rszHbdTLfBi66o9hVkFwX+7RlcxH5PAw5frjpFg=";
   };
 
diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index c7fb19f44565..1bb8ddde7164 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "xdebug";
     repo = "xdebug";
-    tag = version;
+    rev = version;
     hash = "sha256-LTM2c9DC837y0t4S3m9292x37q4tXg1Poh2dm0KAyJc=";
   };
 
diff --git a/pkgs/development/php-packages/zstd/default.nix b/pkgs/development/php-packages/zstd/default.nix
index 97159bfce62b..1e249c5aa9ad 100644
--- a/pkgs/development/php-packages/zstd/default.nix
+++ b/pkgs/development/php-packages/zstd/default.nix
@@ -16,7 +16,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "kjdev";
     repo = "php-ext-zstd";
-    tag = version;
+    rev = version;
     hash = "sha256-XB8GatrL2gQbTiZp6eJCFu8yRAOcrQbcJCaKol3or8Q=";
   };
 
diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix
index c00a670c12a6..35d39fed9a6f 100644
--- a/pkgs/development/python-modules/accupy/default.nix
+++ b/pkgs/development/python-modules/accupy/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = "accupy";
-    tag = version;
+    rev = version;
     hash = "sha256-xxwLmL/rFgDFQNr8mRBFG1/NArQk9wanelL4Lu7ls2s=";
   };
 
diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index bbc638b1f24d..bb6b018fd849 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AzureAD";
     repo = "azure-activedirectory-library-for-python";
-    tag = version;
+    rev = version;
     hash = "sha256-HE8/P0aohoZNeMdcQVKdz6M31FMrjsd7oVytiaD0idI=";
   };
 
diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix
index bf93cfc2cfbd..3aaf814b608c 100644
--- a/pkgs/development/python-modules/adb-shell/default.nix
+++ b/pkgs/development/python-modules/adb-shell/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JeffLIrion";
     repo = "adb_shell";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pOkFUh3SEu/ch9R1lVoQn50nufQp8oI+D4/+Ybal5CA=";
   };
 
diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix
index 40e5bb4f317b..08da1feadb11 100644
--- a/pkgs/development/python-modules/add-trailing-comma/default.nix
+++ b/pkgs/development/python-modules/add-trailing-comma/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B+wjBy42RwabVz/6qEMGpB0JmwJ9hqSskwcNj4x/B/k=";
   };
 
diff --git a/pkgs/development/python-modules/advocate/default.nix b/pkgs/development/python-modules/advocate/default.nix
index 4dda0ea26414..a0954dae4439 100644
--- a/pkgs/development/python-modules/advocate/default.nix
+++ b/pkgs/development/python-modules/advocate/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JordanMilne";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-opObkjkad+yrLE2b7DULHjGuNeVhu4fEmSavgA39YPw=";
   };
 
diff --git a/pkgs/development/python-modules/aggdraw/default.nix b/pkgs/development/python-modules/aggdraw/default.nix
index 36e1fad0a748..5eaa52f72676 100644
--- a/pkgs/development/python-modules/aggdraw/default.nix
+++ b/pkgs/development/python-modules/aggdraw/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytroll";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-J9+mxlUxOoRBFdz+p8me2T93jaov5rNvKbAZ2YX/VhA=";
   };
 
diff --git a/pkgs/development/python-modules/aggregate6/default.nix b/pkgs/development/python-modules/aggregate6/default.nix
index 4152ee2da8d9..2be5f07a85ac 100644
--- a/pkgs/development/python-modules/aggregate6/default.nix
+++ b/pkgs/development/python-modules/aggregate6/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "job";
     repo = "aggregate6";
-    tag = version;
+    rev = version;
     hash = "sha256-tBo9LSmEu/0KPSeg17dlh7ngUvP9GyW6b01qqpr5Bx0=";
   };
 
diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix
index 2a601f0eaa76..47f7108309e6 100644
--- a/pkgs/development/python-modules/aiocontextvars/default.nix
+++ b/pkgs/development/python-modules/aiocontextvars/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fantix";
     repo = "aiocontextvars";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-s1YhpBLz+YNmUO+0BOltfjr3nz4m6mERszNqlmquTyg=";
   };
 
diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix
index 44f08e34b165..bb484353a5da 100644
--- a/pkgs/development/python-modules/aiodhcpwatcher/default.nix
+++ b/pkgs/development/python-modules/aiodhcpwatcher/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiodhcpwatcher";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qdtOEfhBrLpO14IJNuTL71ajmf9sjgKgjuT/3Mqycc8=";
   };
 
diff --git a/pkgs/development/python-modules/aioemonitor/default.nix b/pkgs/development/python-modules/aioemonitor/default.nix
index b3d8a133716f..a9fcde7fb79a 100644
--- a/pkgs/development/python-modules/aioemonitor/default.nix
+++ b/pkgs/development/python-modules/aioemonitor/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0h8zqqy8v8r1fl9bp3m8icr2sy44p0mbfl1hbb0zni17r9r50dhn";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix
index 3488b7796eee..f20c0156768b 100644
--- a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix
+++ b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiohttp-asyncmdnsresolver";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gtB5vnlOVeAFACnhR5DIS5p3caZkOXrollXFINl/7hQ=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix
index bd903ec2e07a..0b7dc5c6ea2e 100644
--- a/pkgs/development/python-modules/aiohttp-swagger/default.nix
+++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cr0hn";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-M43sNpbXWXFRTd549cZhvhO35nBB6OH+ki36BzSk87Q=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix
index d916a455ab67..f962c82166e9 100644
--- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix
+++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "etianen";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3Q00FidZWV1KueuHyHKQf1PsDJGOaRW6v/kBy7lzD4Q=";
   };
 
diff --git a/pkgs/development/python-modules/aiohwenergy/default.nix b/pkgs/development/python-modules/aiohwenergy/default.nix
index eca8f37a5a18..a5f6c852d13f 100644
--- a/pkgs/development/python-modules/aiohwenergy/default.nix
+++ b/pkgs/development/python-modules/aiohwenergy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DCSBL";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho=";
   };
 
diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix
index cf37a4b28f45..ed6251b4ce04 100644
--- a/pkgs/development/python-modules/aiokef/default.nix
+++ b/pkgs/development/python-modules/aiokef/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "basnijholt";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9";
   };
 
diff --git a/pkgs/development/python-modules/aiomcache/default.nix b/pkgs/development/python-modules/aiomcache/default.nix
index d876340c21e3..f320ae7945d3 100644
--- a/pkgs/development/python-modules/aiomcache/default.nix
+++ b/pkgs/development/python-modules/aiomcache/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiomcache";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+rlKHDop0kNxJ0HoXROs/oyI4zE3MDyxXXhWZtVDMj4=";
   };
 
diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix
index 9a5b6fe0e109..103c2e9fad03 100644
--- a/pkgs/development/python-modules/aiomodernforms/default.nix
+++ b/pkgs/development/python-modules/aiomodernforms/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wonderslug";
     repo = "aiomodernforms";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Vx51WBjjNPIfLlwMnAuwHnGNljhnjKkU0tWB9M9rjsw=";
   };
 
diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix
index 1b62c6a2a261..a54ce5436b7a 100644
--- a/pkgs/development/python-modules/aiopg/default.nix
+++ b/pkgs/development/python-modules/aiopg/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GD5lRSUjASTwBk5vEK8v3xD8eNyxpwSrO3HHvtwubmk=";
   };
 
diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix
index 52bafecf5a2b..8a23532f6345 100644
--- a/pkgs/development/python-modules/aiopylgtv/default.nix
+++ b/pkgs/development/python-modules/aiopylgtv/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bendavid";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM=";
   };
 
diff --git a/pkgs/development/python-modules/aiosenz/default.nix b/pkgs/development/python-modules/aiosenz/default.nix
index 829afdf58630..430c5ba68d63 100644
--- a/pkgs/development/python-modules/aiosenz/default.nix
+++ b/pkgs/development/python-modules/aiosenz/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "milanmeu";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-ODdWPS14zzptxuS6mff51f0s1SYnIqjF40DmvT0sL0w=";
   };
 
diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix
index c8e96855820d..128e8c4f2d9b 100644
--- a/pkgs/development/python-modules/aiosignal/default.nix
+++ b/pkgs/development/python-modules/aiosignal/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CvNarJpSq8EKnt+PuSerMK/ZVbxL9rp7rQ4dkWykG1M=";
   };
 
diff --git a/pkgs/development/python-modules/airium/default.nix b/pkgs/development/python-modules/airium/default.nix
index 35b50bbb4c21..c433c0066771 100644
--- a/pkgs/development/python-modules/airium/default.nix
+++ b/pkgs/development/python-modules/airium/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     owner = "kamichal";
     repo = "airium";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qAU+rmj2ZHw7KdxVvRyponcPiRcyENfDyW1y9JTiwsY=";
   };
 
diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix
index be3c60043eef..c9e3d2726e36 100644
--- a/pkgs/development/python-modules/airly/default.nix
+++ b/pkgs/development/python-modules/airly/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ak-ambi";
     repo = "python-airly";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-weliT/FYnRX+pzVAyRWFly7lfj2z7P+hpq5SIhyIgmI=";
   };
 
diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix
index c71c41eaf793..185843b7db50 100644
--- a/pkgs/development/python-modules/alarmdecoder/default.nix
+++ b/pkgs/development/python-modules/alarmdecoder/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nutechsoftware";
     repo = "alarmdecoder";
-    tag = version;
+    rev = version;
     hash = "sha256-d9xNXPhFX2TUjnzZlhvqq/YASITBn6lMVTzqi+TPNjI=";
   };
 
diff --git a/pkgs/development/python-modules/amshan/default.nix b/pkgs/development/python-modules/amshan/default.nix
index da5ed6ff68db..f019474e89b4 100644
--- a/pkgs/development/python-modules/amshan/default.nix
+++ b/pkgs/development/python-modules/amshan/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "toreamun";
     repo = "amshan";
-    tag = version;
+    rev = version;
     hash = "sha256-aw0wTqb2s84STVUN55h6L926pXwaMSppBCfXZVb87w0=";
   };
 
diff --git a/pkgs/development/python-modules/android-backup/default.nix b/pkgs/development/python-modules/android-backup/default.nix
index 3106d6e692a9..cc153ab2e395 100644
--- a/pkgs/development/python-modules/android-backup/default.nix
+++ b/pkgs/development/python-modules/android-backup/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bluec0re";
     repo = "android-backup-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0c436hv64ddqrjs77pa7z6spiv49pjflbmgg31p38haj5mzlrqvw";
   };
 
diff --git a/pkgs/development/python-modules/anitopy/default.nix b/pkgs/development/python-modules/anitopy/default.nix
index e87319a22330..d7d3f2a0e56b 100644
--- a/pkgs/development/python-modules/anitopy/default.nix
+++ b/pkgs/development/python-modules/anitopy/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "igorcmoura";
     repo = "anitopy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xXEf7AJKg7grDmkKfFuC4Fk6QYFJtezClyfA3vq8TfQ=";
   };
 
diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix
index 5512e90f5e04..6982aa47b297 100644
--- a/pkgs/development/python-modules/anonip/default.nix
+++ b/pkgs/development/python-modules/anonip/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DigitaleGesellschaft";
     repo = "Anonip";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc";
   };
 
diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix
index 830b5929143c..4e5a82dc3339 100644
--- a/pkgs/development/python-modules/ansiconv/default.nix
+++ b/pkgs/development/python-modules/ansiconv/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ansible";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4";
   };
 
diff --git a/pkgs/development/python-modules/anyqt/default.nix b/pkgs/development/python-modules/anyqt/default.nix
index bfaf83ec5423..7e6742b432ca 100644
--- a/pkgs/development/python-modules/anyqt/default.nix
+++ b/pkgs/development/python-modules/anyqt/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ales-erjavec";
     repo = "anyqt";
-    tag = version;
+    rev = version;
     hash = "sha256-iDUgu+x9rnpxpHzO7Rf2rJFXsheivrK7HI3FUbomkTU=";
   };
 
diff --git a/pkgs/development/python-modules/apcaccess/default.nix b/pkgs/development/python-modules/apcaccess/default.nix
index 2462f713ec82..5fb60a8c6f82 100644
--- a/pkgs/development/python-modules/apcaccess/default.nix
+++ b/pkgs/development/python-modules/apcaccess/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "flyte";
     repo = "apcaccess";
-    tag = version;
+    rev = version;
     hash = "sha256-XLoNRh6MgXCfRtWD9NpVZSyroW6E9nRYw6Grxa+AQkc=";
   };
 
diff --git a/pkgs/development/python-modules/appnope/default.nix b/pkgs/development/python-modules/appnope/default.nix
index 2d558524d97b..19a9263a0697 100644
--- a/pkgs/development/python-modules/appnope/default.nix
+++ b/pkgs/development/python-modules/appnope/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "minrk";
     repo = "appnope";
-    tag = version;
+    rev = version;
     hash = "sha256-JYzNOPD1ofOrtZK5TTKxbF1ausmczsltR7F1Vwss8Sw=";
   };
 
diff --git a/pkgs/development/python-modules/aprslib/default.nix b/pkgs/development/python-modules/aprslib/default.nix
index c5188d0ae70d..72f9d05d4e2b 100644
--- a/pkgs/development/python-modules/aprslib/default.nix
+++ b/pkgs/development/python-modules/aprslib/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rossengeorgiev";
     repo = "aprs-python";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2bYTnbJ8wF/smTpZ2tV+3ZRae7FpbNBtXoaR2Sc9Pek=";
   };
 
diff --git a/pkgs/development/python-modules/aqipy-atmotech/default.nix b/pkgs/development/python-modules/aqipy-atmotech/default.nix
index de5aa88eae61..549e49b3d486 100644
--- a/pkgs/development/python-modules/aqipy-atmotech/default.nix
+++ b/pkgs/development/python-modules/aqipy-atmotech/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "atmotube";
     repo = "aqipy";
-    tag = version;
+    rev = version;
     hash = "sha256-tqHhfJmtVFUSO57Cid9y3LK4pOoG7ROtwDT2hY5IE1Y=";
   };
 
diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix
index 2b2bc53a4ee7..4e5ac2e73f48 100644
--- a/pkgs/development/python-modules/aqualogic/default.nix
+++ b/pkgs/development/python-modules/aqualogic/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "swilson";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-hBg02Wypd+MyqM2SUD53djhm5OMP2QAmsp8Stf+UT2c=";
   };
 
diff --git a/pkgs/development/python-modules/arc4/default.nix b/pkgs/development/python-modules/arc4/default.nix
index a594b324390c..6706519259c7 100644
--- a/pkgs/development/python-modules/arc4/default.nix
+++ b/pkgs/development/python-modules/arc4/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "manicmaniac";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-DlZIygf5v3ZNY2XFmrKOA15ccMo3Rv0kf6hZJ0CskeQ=";
   };
 
diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix
index cd448c7a0979..5c8c98177b69 100644
--- a/pkgs/development/python-modules/aresponses/default.nix
+++ b/pkgs/development/python-modules/aresponses/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aresponses";
     repo = "aresponses";
-    tag = version;
+    rev = version;
     hash = "sha256-RklXlIsbdq46/7D6Hv4mdskunqw1a7SFF09OjhrvMRY=";
   };
 
diff --git a/pkgs/development/python-modules/arpy/default.nix b/pkgs/development/python-modules/arpy/default.nix
index 91edbb3332a2..819d4559dc94 100644
--- a/pkgs/development/python-modules/arpy/default.nix
+++ b/pkgs/development/python-modules/arpy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "viraptor";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-jD1XJJhcpJymn0CwZ65U06xLKm1JjHffmx/umEO7a5s=";
   };
 
diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/pkgs/development/python-modules/arxiv2bib/default.nix
index 073f4ff17d7a..889159ccff34 100644
--- a/pkgs/development/python-modules/arxiv2bib/default.nix
+++ b/pkgs/development/python-modules/arxiv2bib/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nathangrigg";
     repo = "arxiv2bib";
-    tag = version;
+    rev = version;
     sha256 = "1kp2iyx20lpc9dv4qg5fgwf83a1wx6f7hj1ldqyncg0kn9xcrhbg";
   };
 
diff --git a/pkgs/development/python-modules/asciitree/default.nix b/pkgs/development/python-modules/asciitree/default.nix
index c7575b691536..ab8ec69bef49 100644
--- a/pkgs/development/python-modules/asciitree/default.nix
+++ b/pkgs/development/python-modules/asciitree/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mbr";
     repo = "asciitree";
-    tag = version;
+    rev = version;
     hash = "sha256-AaLDO27W6fGHGU11rRpBf5gg1we+9SS1MEJdFP2lPBw=";
   };
 
diff --git a/pkgs/development/python-modules/asks/default.nix b/pkgs/development/python-modules/asks/default.nix
index 2798b1dcd17c..1bab5a583c1a 100644
--- a/pkgs/development/python-modules/asks/default.nix
+++ b/pkgs/development/python-modules/asks/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "theelous3";
     repo = "asks";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ipQ5n2386DqR3kNpmTVhNPG+LC7gfCbvrlZ97+UP55g=";
   };
 
diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix
index e7f1e541e555..0a1032259c84 100644
--- a/pkgs/development/python-modules/asn1ate/default.nix
+++ b/pkgs/development/python-modules/asn1ate/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     sha256 = "1p8hv4gsyqsdr0gafcq497n52pybiqmc22di8ai4nsj60fv0km45";
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "kimgr";
     repo = pname;
   };
diff --git a/pkgs/development/python-modules/aspy-refactor-imports/default.nix b/pkgs/development/python-modules/aspy-refactor-imports/default.nix
index e313e196cf82..dbc97cca6efb 100644
--- a/pkgs/development/python-modules/aspy-refactor-imports/default.nix
+++ b/pkgs/development/python-modules/aspy-refactor-imports/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = "aspy.refactor_imports";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "MlCM3zNTQZJ1RWrTQG0AN28RUepWINKCeLENykbu2nw=";
   };
 
diff --git a/pkgs/development/python-modules/assertpy/default.nix b/pkgs/development/python-modules/assertpy/default.nix
index dbc71cf4ceb9..e45e59409c72 100644
--- a/pkgs/development/python-modules/assertpy/default.nix
+++ b/pkgs/development/python-modules/assertpy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f";
   };
 
diff --git a/pkgs/development/python-modules/async-dns/default.nix b/pkgs/development/python-modules/async-dns/default.nix
index f28a0fc48d9d..cbc8f15ed210 100644
--- a/pkgs/development/python-modules/async-dns/default.nix
+++ b/pkgs/development/python-modules/async-dns/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gera2ld";
     repo = "async_dns";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0vn7hxvpzikd7q61a27fwzal4lwsra2063awyr6fjpy6lh3cjdwf";
   };
 
diff --git a/pkgs/development/python-modules/asyncio-throttle/default.nix b/pkgs/development/python-modules/asyncio-throttle/default.nix
index 99f4e24fdc12..dc8dc03599a1 100644
--- a/pkgs/development/python-modules/asyncio-throttle/default.nix
+++ b/pkgs/development/python-modules/asyncio-throttle/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hallazzang";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1hsjcymdcm0hf4l68scf9n8j7ba89azgh96xhxrnyvwxfs5acnmv";
   };
 
diff --git a/pkgs/development/python-modules/attr/default.nix b/pkgs/development/python-modules/attr/default.nix
index cd77d01039ac..5a6400d3e5e3 100644
--- a/pkgs/development/python-modules/attr/default.nix
+++ b/pkgs/development/python-modules/attr/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "denis-ryzhkov";
     repo = "attr";
-    tag = version;
+    rev = version;
     hash = "sha256-1gOAONDuZb7xEPFZJc00BRtFF06uX65S8b3RRRNGeSo=";
   };
 
diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix
index c97188bc0258..babb22ee434f 100644
--- a/pkgs/development/python-modules/aubio/default.nix
+++ b/pkgs/development/python-modules/aubio/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aubio";
     repo = "aubio";
-    tag = version;
+    rev = version;
     hash = "sha256-RvzhB1kQNP0IbAygwH2RBi/kSyuFPAHgsiCATPeMHTo=";
   };
 
diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix
index 100026c56c81..6154b82465b9 100644
--- a/pkgs/development/python-modules/augeas/default.nix
+++ b/pkgs/development/python-modules/augeas/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hercules-team";
     repo = "python-augeas";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Lq8ckra3sqN38zo1d5JsEq6U5TtLKRmqysoWNwR9J9A=";
   };
 
diff --git a/pkgs/development/python-modules/autograd-gamma/default.nix b/pkgs/development/python-modules/autograd-gamma/default.nix
index d73390a9d8e9..0e38848d6f7d 100644
--- a/pkgs/development/python-modules/autograd-gamma/default.nix
+++ b/pkgs/development/python-modules/autograd-gamma/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CamDavidsonPilon";
     repo = "autograd-gamma";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0v03gly5k3a1hzb54zpw6409m3riak49qd27hkq2f66ai42ivqz2";
   };
 
diff --git a/pkgs/development/python-modules/avea/default.nix b/pkgs/development/python-modules/avea/default.nix
index f1d9806201df..202d6e7b7742 100644
--- a/pkgs/development/python-modules/avea/default.nix
+++ b/pkgs/development/python-modules/avea/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "k0rventen";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1dirf0zdf4hb941w1dvh97vsvcy4h3w9r8jwdgr1ggmhdf9kfx4v";
   };
 
diff --git a/pkgs/development/python-modules/aw-core/default.nix b/pkgs/development/python-modules/aw-core/default.nix
index f0fdecb8d156..591c862597d5 100644
--- a/pkgs/development/python-modules/aw-core/default.nix
+++ b/pkgs/development/python-modules/aw-core/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ActivityWatch";
     repo = "aw-core";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-bKxf+fqm+6V3JgDluKVpqq5hRL3Z+x8SHMRQmNe8vUA=";
   };
 
diff --git a/pkgs/development/python-modules/backports-tarfile/default.nix b/pkgs/development/python-modules/backports-tarfile/default.nix
index 6050d4bba097..450db5506756 100644
--- a/pkgs/development/python-modules/backports-tarfile/default.nix
+++ b/pkgs/development/python-modules/backports-tarfile/default.nix
@@ -18,7 +18,7 @@ let
     src = fetchFromGitHub {
       owner = "jaraco";
       repo = "backports.tarfile";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-X3rkL35aDG+DnIOq0fI7CFoWGNtgLkLjtT9y6+23oto=";
     };
 
diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix
index ced175a55557..6742f35877c4 100644
--- a/pkgs/development/python-modules/bagit/default.nix
+++ b/pkgs/development/python-modules/bagit/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LibraryOfCongress";
     repo = "bagit-python";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-t01P7MPWgOrktuW2zF0TIzt6u/jkLmrpD2OnqawhJaI=";
   };
 
diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index 73d3d3e375a6..f598b1aa7907 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap-python";
-    tag = version;
+    rev = version;
     sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp";
   };
 
diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix
index 21a04cc2e9f6..968570904067 100644
--- a/pkgs/development/python-modules/barectf/default.nix
+++ b/pkgs/development/python-modules/barectf/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "efficios";
     repo = "barectf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JelFfd3WS012dveNlIljhLdyPmgE9VEOXoZE3MBA/Gw=";
   };
 
diff --git a/pkgs/development/python-modules/base36/default.nix b/pkgs/development/python-modules/base36/default.nix
index d01bbfc2721c..33909a6c942a 100644
--- a/pkgs/development/python-modules/base36/default.nix
+++ b/pkgs/development/python-modules/base36/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tonyseek";
     repo = "python-base36";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "076nmk9s0zkmgs2zqzkaqij5cmzhf4mrhivbb9n6cvz52i1mppr5";
   };
 
diff --git a/pkgs/development/python-modules/base58check/default.nix b/pkgs/development/python-modules/base58check/default.nix
index d782d714307e..338775bf6cee 100644
--- a/pkgs/development/python-modules/base58check/default.nix
+++ b/pkgs/development/python-modules/base58check/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joeblackwaslike";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Tig6beLRDsXC//x4+t/z2BGaJQWzcP0J+QEKx3D0rhs=";
   };
 
diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix
index 6df00c05a354..17d2485c6def 100644
--- a/pkgs/development/python-modules/bashlex/default.nix
+++ b/pkgs/development/python-modules/bashlex/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "idank";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-ddZN91H95RiTLXx4lpES1Dmz7nNsSVUeuFuOEpJ7LQI=";
   };
 
diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix
index aa96759a2729..6c02b8e8cb20 100644
--- a/pkgs/development/python-modules/batchgenerators/default.nix
+++ b/pkgs/development/python-modules/batchgenerators/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MIC-DKFZ";
     repo = "batchgenerators";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L2mWH2t8PN9o1M67KDdl1Tj2ZZ02MY4icsJY2VNrj3A=";
   };
 
diff --git a/pkgs/development/python-modules/bcf/default.nix b/pkgs/development/python-modules/bcf/default.nix
index 66cad5a83519..f8a1f6825d8e 100644
--- a/pkgs/development/python-modules/bcf/default.nix
+++ b/pkgs/development/python-modules/bcf/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hardwario";
     repo = "bch-firmware-tool";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "i28VewTB2XEZSfk0UeCuwB7Z2wz4qPBhzvxJIYkKwJ4=";
   };
 
diff --git a/pkgs/development/python-modules/bcg/default.nix b/pkgs/development/python-modules/bcg/default.nix
index ad747386a963..4065c235861c 100644
--- a/pkgs/development/python-modules/bcg/default.nix
+++ b/pkgs/development/python-modules/bcg/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hardwario";
     repo = "bch-gateway";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "2Yh5MeIv+BIxjoO9GOPqq7xTAFhyBvnxPy7DeO2FrkI=";
   };
 
diff --git a/pkgs/development/python-modules/bch/default.nix b/pkgs/development/python-modules/bch/default.nix
index 67f4891f98ec..b29e2f0dfe94 100644
--- a/pkgs/development/python-modules/bch/default.nix
+++ b/pkgs/development/python-modules/bch/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hardwario";
     repo = "bch-control-tool";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY=";
   };
 
diff --git a/pkgs/development/python-modules/beancount-plugin-utils/default.nix b/pkgs/development/python-modules/beancount-plugin-utils/default.nix
index 39fac3170562..01fb3178182c 100644
--- a/pkgs/development/python-modules/beancount-plugin-utils/default.nix
+++ b/pkgs/development/python-modules/beancount-plugin-utils/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Akuukis";
     repo = "beancount_plugin_utils";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oyfL2K/sS4zZ7cq1P36h0dTcW1m5GUyQ9+IyZGfpb2E=";
   };
 
diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix
index 95080a0fe6f9..ce9d606553ef 100644
--- a/pkgs/development/python-modules/beanstalkc/default.nix
+++ b/pkgs/development/python-modules/beanstalkc/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bosondata";
     repo = "beanstalkc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1dpb1yimp2pfnikmgsb2fr9x6h8riixlsx3xfqphnfvrid49vw5s";
   };
 
diff --git a/pkgs/development/python-modules/beaupy/default.nix b/pkgs/development/python-modules/beaupy/default.nix
index ab364078467d..33e5a8e5eeca 100644
--- a/pkgs/development/python-modules/beaupy/default.nix
+++ b/pkgs/development/python-modules/beaupy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "petereon";
     repo = "beaupy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tN78OV0Ks1MIdqVh8yisTgK4dOaKqYlZxvIoCa44eAI=";
   };
 
diff --git a/pkgs/development/python-modules/beautifultable/default.nix b/pkgs/development/python-modules/beautifultable/default.nix
index b8d0f1e69052..9b1544ae2bd0 100644
--- a/pkgs/development/python-modules/beautifultable/default.nix
+++ b/pkgs/development/python-modules/beautifultable/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pri22296";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/SReCEvSwiNjBoz/3tGJ9zUNBAag4mLsHlUXwm47zCw=";
   };
 
diff --git a/pkgs/development/python-modules/beautysh/default.nix b/pkgs/development/python-modules/beautysh/default.nix
index 48e490145dea..8c8af617f833 100644
--- a/pkgs/development/python-modules/beautysh/default.nix
+++ b/pkgs/development/python-modules/beautysh/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lovesegfault";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o=";
   };
 
diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index 813fbcb3b66c..e196257a8377 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "behave";
     repo = "behave";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-G1o0a57MRczwjGLl/tEYC+yx3nxpk6+E58RvR9kVJpA=";
   };
 
diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix
index 373941df8b06..e0fdaaca9c0a 100644
--- a/pkgs/development/python-modules/beziers/default.nix
+++ b/pkgs/development/python-modules/beziers/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simoncozens";
     repo = "beziers.py";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NjmWsRz/NPPwXPbiSaOeKJMrYmSyNTt5ikONyAljgvM=";
   };
 
diff --git a/pkgs/development/python-modules/bip32/default.nix b/pkgs/development/python-modules/bip32/default.nix
index ce6dbf75dcb1..ea8e22a52cc6 100644
--- a/pkgs/development/python-modules/bip32/default.nix
+++ b/pkgs/development/python-modules/bip32/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "darosior";
     repo = "python-bip32";
-    tag = version;
+    rev = version;
     hash = "sha256-o8UKR17XDWp1wTWYeDL0DJY+D11YI4mg0UuGEAPkHxE=";
   };
 
diff --git a/pkgs/development/python-modules/birch/default.nix b/pkgs/development/python-modules/birch/default.nix
index 552ef0034fdc..772ab25109e4 100644
--- a/pkgs/development/python-modules/birch/default.nix
+++ b/pkgs/development/python-modules/birch/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "shaypal5";
     repo = "birch";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KdQZzQJvJ+logpcLQfaqqEEZJ/9VmNTQX/a4v0oBC98=";
   };
 
diff --git a/pkgs/development/python-modules/bitcoinrpc/default.nix b/pkgs/development/python-modules/bitcoinrpc/default.nix
index aae47daa1330..cfdc523b1213 100644
--- a/pkgs/development/python-modules/bitcoinrpc/default.nix
+++ b/pkgs/development/python-modules/bitcoinrpc/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bibajz";
     repo = "bitcoin-python-async-rpc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uxkSz99X9ior7l825PaXGIC5XJzO/Opv0vTyY1ixvxU=";
   };
 
diff --git a/pkgs/development/python-modules/bitvavo-aio/default.nix b/pkgs/development/python-modules/bitvavo-aio/default.nix
index b303008e08b2..0df3e7add098 100644
--- a/pkgs/development/python-modules/bitvavo-aio/default.nix
+++ b/pkgs/development/python-modules/bitvavo-aio/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1d9nbbvv7xnkixj03sfhs2da5j3i2m7p73r7j1yb7b39zas2rbig";
   };
 
diff --git a/pkgs/development/python-modules/bitvector-for-humans/default.nix b/pkgs/development/python-modules/bitvector-for-humans/default.nix
index e09944279b5b..5652d850a7ea 100644
--- a/pkgs/development/python-modules/bitvector-for-humans/default.nix
+++ b/pkgs/development/python-modules/bitvector-for-humans/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JnyJny";
     repo = "bitvector";
-    tag = version;
+    rev = version;
     hash = "sha256-GVTRD83tq/Hea53US4drOD5ruoYCLTVd24aZOSdDsSo=";
   };
 
diff --git a/pkgs/development/python-modules/bizkaibus/default.nix b/pkgs/development/python-modules/bizkaibus/default.nix
index c9923821838b..c79a3c35b966 100644
--- a/pkgs/development/python-modules/bizkaibus/default.nix
+++ b/pkgs/development/python-modules/bizkaibus/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "UgaitzEtxebarria";
     repo = "BizkaibusRTPI";
-    tag = version;
+    rev = version;
     hash = "sha256-TM02pSSOELRGSwsKc5C+34W94K6mnS0C69aijsPqSWs=";
   };
 
diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix
index 4f515f5742da..ca8663c1d656 100644
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ b/pkgs/development/python-modules/bjoern/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jonashaag";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-d7u/lEh2Zr5NYWYu4Zr7kgyeOIQuHQLYrZeiZMHbpio=";
     fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules
   };
diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix
index 9fdddeb36bd3..da26ce0ed3a8 100644
--- a/pkgs/development/python-modules/black-macchiato/default.nix
+++ b/pkgs/development/python-modules/black-macchiato/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wbolster";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0lc9w50nlbmlzj44krk7kxcia202fhybbnwfh77xixlc7vb4rayl";
   };
 
diff --git a/pkgs/development/python-modules/blacken-docs/default.nix b/pkgs/development/python-modules/blacken-docs/default.nix
index 8ff9baa2ec8b..7370471c2604 100644
--- a/pkgs/development/python-modules/blacken-docs/default.nix
+++ b/pkgs/development/python-modules/blacken-docs/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "blacken-docs";
-    tag = version;
+    rev = version;
     hash = "sha256-3FGuFOAHCcybPwujWlh58NWtuF5CebaKTgBWgCGpSL8=";
   };
 
diff --git a/pkgs/development/python-modules/blurhash-python/default.nix b/pkgs/development/python-modules/blurhash-python/default.nix
index fd0098c36e9e..e8acda803941 100644
--- a/pkgs/development/python-modules/blurhash-python/default.nix
+++ b/pkgs/development/python-modules/blurhash-python/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "woltapp";
     repo = "blurhash-python";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Cz+PkPp1knvT3U5ofyb1PstM9kzBOkgPbx03LgOLXgw=";
   };
 
diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix
index 0624bbb7a9be..2131fa0bfb2d 100644
--- a/pkgs/development/python-modules/bond-api/default.nix
+++ b/pkgs/development/python-modules/bond-api/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "prystupa";
     repo = "bond-api";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+87/j94eHyW3EMMBK+aXaNTVoNxsixeLusyBsPWa9yM=";
   };
 
diff --git a/pkgs/development/python-modules/bonsai/default.nix b/pkgs/development/python-modules/bonsai/default.nix
index e115b61a9227..ad14127686ce 100644
--- a/pkgs/development/python-modules/bonsai/default.nix
+++ b/pkgs/development/python-modules/bonsai/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "noirello";
     repo = "bonsai";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SAP/YeWqow5dqXlXDzjnTWIfJhMwVeZSSUfWr1Mgmng=";
   };
 
diff --git a/pkgs/development/python-modules/boolean-py/default.nix b/pkgs/development/python-modules/boolean-py/default.nix
index 9d3928bb69d2..fde29936132f 100644
--- a/pkgs/development/python-modules/boolean-py/default.nix
+++ b/pkgs/development/python-modules/boolean-py/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bastikr";
     repo = "boolean.py";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-i6aNzGDhZip9YHXLiuh9crGm2qT2toBU2xze4PDLleg=";
   };
 
diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix
index e2ea3cec604f..854f1451c0b1 100644
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/pkgs/development/python-modules/braintree/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "braintree";
     repo = "braintree_python";
-    tag = version;
+    rev = version;
     hash = "sha256-5MF8W2zUVvNiOnmszgJkMDmeYLZ6ppFHqmH6dmlCzQY=";
   };
 
diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix
index 4a7ff5578705..e3832e5ed550 100644
--- a/pkgs/development/python-modules/bravado-core/default.nix
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kyHmZNPl5lLKmm5i3TSi8Tfi96mQHqaiyBfceBJcOdw=";
   };
 
diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix
index 604179c03abe..9339066299a3 100644
--- a/pkgs/development/python-modules/bravia-tv/default.nix
+++ b/pkgs/development/python-modules/bravia-tv/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dcnielsen90";
     repo = "python-bravia-tv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g47bDd5bZl0jad3o6T1jJLcnZj8nx944kz3Vxv8gD2U=";
   };
 
diff --git a/pkgs/development/python-modules/brotli-asgi/default.nix b/pkgs/development/python-modules/brotli-asgi/default.nix
index 1209959f2123..79d090f6127a 100644
--- a/pkgs/development/python-modules/brotli-asgi/default.nix
+++ b/pkgs/development/python-modules/brotli-asgi/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "fullonic";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y=";
   };
 
diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix
index 33ba3d40dd35..53c0280b56b3 100644
--- a/pkgs/development/python-modules/brotlicffi/default.nix
+++ b/pkgs/development/python-modules/brotlicffi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-hyper";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oW4y1WBJ7+4XwNwwSSR0qUqN03cZYXUYQ6EAwce9dzI=";
   };
 
diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix
index b81ce4530c4b..8de7c2194ab2 100644
--- a/pkgs/development/python-modules/brottsplatskartan/default.nix
+++ b/pkgs/development/python-modules/brottsplatskartan/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrillux";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "07iwmnchvpw156j23yfccg4c32izbwm8b02bjr1xgmcwzbq21ks9";
   };
 
diff --git a/pkgs/development/python-modules/btsmarthub-devicelist/default.nix b/pkgs/development/python-modules/btsmarthub-devicelist/default.nix
index e1fa0128a58b..e55dd620e4e3 100644
--- a/pkgs/development/python-modules/btsmarthub-devicelist/default.nix
+++ b/pkgs/development/python-modules/btsmarthub-devicelist/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jxwolstenholme";
     repo = "btsmarthub_devicelist";
-    tag = version;
+    rev = version;
     hash = "sha256-7ncxCpY+A2SuSFa3k21QchrmFs1dPRUMb1r1z/laa6M=";
   };
 
diff --git a/pkgs/development/python-modules/bubop/default.nix b/pkgs/development/python-modules/bubop/default.nix
index 3b2881957c04..9c6c39fd25d2 100644
--- a/pkgs/development/python-modules/bubop/default.nix
+++ b/pkgs/development/python-modules/bubop/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bergercookie";
     repo = "bubop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-p4Mv73oX5bsYKby7l0nGon89KyAMIUhDAEKSTNB++Cw=";
   };
 
diff --git a/pkgs/development/python-modules/cachey/default.nix b/pkgs/development/python-modules/cachey/default.nix
index 1ca1dcae70f6..a8cb498b2026 100644
--- a/pkgs/development/python-modules/cachey/default.nix
+++ b/pkgs/development/python-modules/cachey/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-5USmuufrrWtmgibpfkjo9NtgN30hdl8plJfythmxM4s=";
   };
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/calver/default.nix b/pkgs/development/python-modules/calver/default.nix
index 6d7be3a263d9..528632743605 100644
--- a/pkgs/development/python-modules/calver/default.nix
+++ b/pkgs/development/python-modules/calver/default.nix
@@ -18,7 +18,7 @@ let
     src = fetchFromGitHub {
       owner = "di";
       repo = "calver";
-      tag = version;
+      rev = version;
       hash = "sha256-YaXTkeUazwzghCX96Wfx39hGvukWKtHMLLeyF9OeiZI=";
     };
 
diff --git a/pkgs/development/python-modules/calysto/default.nix b/pkgs/development/python-modules/calysto/default.nix
index c7fc22a2a060..04d428e9e6fc 100644
--- a/pkgs/development/python-modules/calysto/default.nix
+++ b/pkgs/development/python-modules/calysto/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Calysto";
     repo = "calysto";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lr/cHFshpFs/PGMCsa3FKMRPTP+eE9ziH5XCpV+KzO8=";
   };
 
diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix
index bd34f35e8f53..b9895dd18f97 100644
--- a/pkgs/development/python-modules/capturer/default.nix
+++ b/pkgs/development/python-modules/capturer/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-capturer";
-    tag = version;
+    rev = version;
     sha256 = "0fwrxa049gzin5dck7fvwhdp1856jrn0d7mcjcjsd7ndqvhgvjj1";
   };
 
diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix
index d9a05776c759..a09cc9fd444e 100644
--- a/pkgs/development/python-modules/catkin-pkg/default.nix
+++ b/pkgs/development/python-modules/catkin-pkg/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ros-infrastructure";
     repo = "catkin_pkg";
-    tag = version;
+    rev = version;
     hash = "sha256-lHUKhE9dQLO1MbkstUEiGrHc9Rm+bY/AmgLyh7AbvFQ=";
   };
 
diff --git a/pkgs/development/python-modules/celery-singleton/default.nix b/pkgs/development/python-modules/celery-singleton/default.nix
index 0cee95e107e0..3d75770e932a 100644
--- a/pkgs/development/python-modules/celery-singleton/default.nix
+++ b/pkgs/development/python-modules/celery-singleton/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "steinitzu";
     repo = "celery-singleton";
-    tag = version;
+    rev = version;
     hash = "sha256-fHlakxxjYIADELZdxIj6rvsZ/+1QfnKvAg3w5cdzvDc=";
   };
 
diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index fe636ae8f265..a125dc86da39 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "python-certifi";
-    tag = version;
+    rev = version;
     hash = "sha256-LHoFI9+vrrrRzyhWNchQYp4AAiFcQwZHdeNzMjTJ8jk=";
   };
 
diff --git a/pkgs/development/python-modules/certvalidator/default.nix b/pkgs/development/python-modules/certvalidator/default.nix
index 9f6e414141b3..c59e2b6738e0 100644
--- a/pkgs/development/python-modules/certvalidator/default.nix
+++ b/pkgs/development/python-modules/certvalidator/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wbond";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-yVF7t4FuU3C9fDg67JeM7LWZZh/mv5F4EKmjlO4AuBY=";
   };
 
diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix
index 9e09057986b2..e5ae3494d88b 100644
--- a/pkgs/development/python-modules/cfn-flip/default.nix
+++ b/pkgs/development/python-modules/cfn-flip/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-cfn-template-flip";
-    tag = version;
+    rev = version;
     hash = "sha256-lfhTR3+D1FvblhQGF83AB8+I8WDPBTmo+q22ksgDgt4=";
   };
 
diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix
index 96b51a9c9dfa..17047a321389 100644
--- a/pkgs/development/python-modules/cgroup-utils/default.nix
+++ b/pkgs/development/python-modules/cgroup-utils/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "peo3";
     repo = "cgroup-utils";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq";
   };
 
diff --git a/pkgs/development/python-modules/checksumdir/default.nix b/pkgs/development/python-modules/checksumdir/default.nix
index 4f40a8b439f7..ae54695e8a54 100644
--- a/pkgs/development/python-modules/checksumdir/default.nix
+++ b/pkgs/development/python-modules/checksumdir/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "to-mc";
     repo = "checksumdir";
-    tag = version;
+    rev = version;
     hash = "sha256-PO8sRGFQ1Dt/UYJuFH6Y3EaQVaS+4DJlOQtvF8ZmBWQ=";
   };
 
diff --git a/pkgs/development/python-modules/chirpstack-api/default.nix b/pkgs/development/python-modules/chirpstack-api/default.nix
index 0676480d21cb..38ea1d8739cf 100644
--- a/pkgs/development/python-modules/chirpstack-api/default.nix
+++ b/pkgs/development/python-modules/chirpstack-api/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "brocaar";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-69encHMk0eXE2Av87ysKvxoiXog5o68qCUlOx/lgHFU=";
   };
 
diff --git a/pkgs/development/python-modules/cjkwrap/default.nix b/pkgs/development/python-modules/cjkwrap/default.nix
index f1d5dcc4d226..bf93185a122e 100644
--- a/pkgs/development/python-modules/cjkwrap/default.nix
+++ b/pkgs/development/python-modules/cjkwrap/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     owner = "fgallaire";
     repo = "cjkwrap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0wTx3rnlUfQEE2/Z8Y7iwlsHk+CIy6ut+QIpC5yg4aM=";
   };
 
diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix
index 97cd43d437b8..53eaf1745231 100644
--- a/pkgs/development/python-modules/classify-imports/default.nix
+++ b/pkgs/development/python-modules/classify-imports/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU=";
   };
 
diff --git a/pkgs/development/python-modules/cleanit/default.nix b/pkgs/development/python-modules/cleanit/default.nix
index 334a32a60e5f..7ce39e3392a5 100644
--- a/pkgs/development/python-modules/cleanit/default.nix
+++ b/pkgs/development/python-modules/cleanit/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ratoaq2";
     repo = "cleanit";
-    tag = version;
+    rev = version;
     hash = "sha256-z1QAWWm+yg/pRCQfPqGbL0EFFT9UwqIkwhmjUuRHyuk=";
   };
 
diff --git a/pkgs/development/python-modules/click-aliases/default.nix b/pkgs/development/python-modules/click-aliases/default.nix
index 23a4ccca29c2..cf1a33cf3140 100644
--- a/pkgs/development/python-modules/click-aliases/default.nix
+++ b/pkgs/development/python-modules/click-aliases/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "click-contrib";
     repo = "click-aliases";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vR5MUbgQfgownnq/VuEB/Jreibh/SB8wbDWGOmareRU=";
   };
 
diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix
index f551ad495ed2..170ffd907128 100644
--- a/pkgs/development/python-modules/clickclick/default.nix
+++ b/pkgs/development/python-modules/clickclick/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     domain = "codeberg.org";
     owner = "hjacobs";
     repo = "python-clickclick";
-    tag = version;
+    rev = version;
     hash = "sha256-gefU6CI4ibtvonsaKZmuffuUNUioBn5ODs72BI5zXOw=";
   };
 
diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix
index f20bac1e28d7..6eb3013063f5 100644
--- a/pkgs/development/python-modules/clickhouse-driver/default.nix
+++ b/pkgs/development/python-modules/clickhouse-driver/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mymarilyn";
     repo = "clickhouse-driver";
-    tag = version;
+    rev = version;
     hash = "sha256-l0YHWY25PMHgZG/sAZjtGhwmcxWdA8k96zlm9hbKcek=";
   };
 
diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix
index 4a7d2d30061d..1d3c57b3edfc 100644
--- a/pkgs/development/python-modules/cligj/default.nix
+++ b/pkgs/development/python-modules/cligj/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "cligj";
-    tag = version;
+    rev = version;
     hash = "sha256-0f9+I6ozX93Vn0l7+WR0mpddDZymJQ3+Krovt6co22Y=";
   };
 
diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix
index 611dc9be0b90..e0d3e1e30e5f 100644
--- a/pkgs/development/python-modules/clldutils/default.nix
+++ b/pkgs/development/python-modules/clldutils/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "clld";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OD+WJ9JuYZb/oXDgVqL4i5YlcVEt0+swq0SB3cutyRo=";
   };
 
diff --git a/pkgs/development/python-modules/coapthon3/default.nix b/pkgs/development/python-modules/coapthon3/default.nix
index 195d4b039fd5..b565349584b3 100644
--- a/pkgs/development/python-modules/coapthon3/default.nix
+++ b/pkgs/development/python-modules/coapthon3/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Tanganelli";
     repo = "CoAPthon3";
-    tag = version;
+    rev = version;
     hash = "sha256-9QApoPUu3XFZY/lgjAsf5r2StFiRtUd1UXWDrzYUh6w=";
   };
 
diff --git a/pkgs/development/python-modules/codepy/default.nix b/pkgs/development/python-modules/codepy/default.nix
index 4f730642c46f..edcda2857bc3 100644
--- a/pkgs/development/python-modules/codepy/default.nix
+++ b/pkgs/development/python-modules/codepy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "inducer";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-viMfB/nDrvDA/IGRZEX+yXylxbbmqbh/fgdYXBzK0zM=";
   };
 
diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix
index 27e9bf2ebd14..c3852dc4ad07 100644
--- a/pkgs/development/python-modules/coloredlogs/default.nix
+++ b/pkgs/development/python-modules/coloredlogs/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-coloredlogs";
-    tag = version;
+    rev = version;
     hash = "sha256-TodI2Wh8M0qMM2K5jzqlLmUKILa5+5qq4ByLttmAA7E=";
   };
 
diff --git a/pkgs/development/python-modules/colorthief/default.nix b/pkgs/development/python-modules/colorthief/default.nix
index 73fbe8b2faad..66fb4f9fe502 100644
--- a/pkgs/development/python-modules/colorthief/default.nix
+++ b/pkgs/development/python-modules/colorthief/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fengsp";
     repo = "color-thief-py";
-    tag = version;
+    rev = version;
     sha256 = "0lzpflal1iqbj4k7hayss5z024qf2sn8c3wxw03a0mgxg06ca2hm";
   };
 
diff --git a/pkgs/development/python-modules/commandlines/default.nix b/pkgs/development/python-modules/commandlines/default.nix
index bcd66ae59737..aa5da9c0d37f 100644
--- a/pkgs/development/python-modules/commandlines/default.nix
+++ b/pkgs/development/python-modules/commandlines/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrissimpkins";
     repo = "commandlines";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-x3iUeOTAaTKNW5Y5foMPMJcWVxu52uYZoY3Hhe3UvQ4=";
   };
 
diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix
index 2ef7dee01bd0..f410d16628f4 100644
--- a/pkgs/development/python-modules/commentjson/default.nix
+++ b/pkgs/development/python-modules/commentjson/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vaidik";
     repo = "commentjson";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dPnIcv7TIeyG7rU938w7FrDklmaGuPpXz34uw/JjOgY=";
   };
 
diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix
index 9fd9c494dcd7..59ba5a4b3faf 100644
--- a/pkgs/development/python-modules/confuse/default.nix
+++ b/pkgs/development/python-modules/confuse/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8=";
   };
 
diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix
index 71fe66c4d514..a89f8f030a0e 100644
--- a/pkgs/development/python-modules/construct-classes/default.nix
+++ b/pkgs/development/python-modules/construct-classes/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matejcik";
     repo = "construct-classes";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-l4sVacKTuQbhXCw2lVHCl1OzpCiKmEAm9nSQ8pxFuTo=";
   };
 
diff --git a/pkgs/development/python-modules/controku/default.nix b/pkgs/development/python-modules/controku/default.nix
index bfb3a1ba3e93..9aff50bfc087 100644
--- a/pkgs/development/python-modules/controku/default.nix
+++ b/pkgs/development/python-modules/controku/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "benthetechguy";
     repo = "controku";
-    tag = version;
+    rev = version;
     hash = "sha256-sye2GtL3a77pygllZc6ylaIP7faPb+NFbyKKyqJzIXw=";
   };
 
diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix
index e62e6fc1c82d..e4c2e9bd8ec0 100644
--- a/pkgs/development/python-modules/convertdate/default.nix
+++ b/pkgs/development/python-modules/convertdate/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fitnr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE=";
   };
 
diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix
index baa3da19cbc9..f70b8a73a65e 100644
--- a/pkgs/development/python-modules/coreapi/default.nix
+++ b/pkgs/development/python-modules/coreapi/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "python-client";
     owner = "core-api";
-    tag = version;
+    rev = version;
     sha256 = "1c6chm3q3hyn8fmjv23qgc79ai1kr3xvrrkp4clbqkssn10k7mcw";
   };
 
diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix
index fc73863b8ab6..1aede8b9f587 100644
--- a/pkgs/development/python-modules/coreschema/default.nix
+++ b/pkgs/development/python-modules/coreschema/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "python-coreschema";
     owner = "core-api";
-    tag = version;
+    rev = version;
     sha256 = "027pc753mkgbb3r1v1x7dsdaarq93drx0f79ppvw9pfkcjcq6wb1";
   };
 
diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix
index 38192b22c1d0..639ddcacd487 100644
--- a/pkgs/development/python-modules/cornice/default.nix
+++ b/pkgs/development/python-modules/cornice/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Cornices";
     repo = "cornice";
-    tag = version;
+    rev = version;
     hash = "sha256-jAf8unDPpr/ZAWkb9LhOW4URjwcRnaYVUKmfnYBStTg=";
   };
 
diff --git a/pkgs/development/python-modules/cose/default.nix b/pkgs/development/python-modules/cose/default.nix
index 2cb7ccc77b65..6ddb5676bef6 100644
--- a/pkgs/development/python-modules/cose/default.nix
+++ b/pkgs/development/python-modules/cose/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TimothyClaeys";
     repo = "pycose";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8d6HebWlSKgx7dmOnT7ZZ5mrMfg6mNWhz1hHPv75XF4=";
   };
 
diff --git a/pkgs/development/python-modules/crownstone-core/default.nix b/pkgs/development/python-modules/crownstone-core/default.nix
index 767737ddd146..7e297cce4f55 100644
--- a/pkgs/development/python-modules/crownstone-core/default.nix
+++ b/pkgs/development/python-modules/crownstone-core/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crownstone";
     repo = "crownstone-lib-python-core";
-    tag = version;
+    rev = version;
     hash = "sha256-zrlCzx7N3aUcTUNa64jSzDdWgQneX+Hc5n8TTTcZ4ck=";
   };
 
diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix
index 2c3de3ab1609..177b319ca4cb 100644
--- a/pkgs/development/python-modules/crownstone-uart/default.nix
+++ b/pkgs/development/python-modules/crownstone-uart/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crownstone";
     repo = "crownstone-lib-python-uart";
-    tag = version;
+    rev = version;
     hash = "sha256-Sc6BCIRbf1+GraTScmV4EAgwtSE/JXNe0f2XhKyACIY=";
   };
 
diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix
index 3f1831258f2a..0639c1e021bb 100644
--- a/pkgs/development/python-modules/cryptg/default.nix
+++ b/pkgs/development/python-modules/cryptg/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cher-nov";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GCTVxCJQvpvHpzaU+OaFM/AKoRvxLyA0u6VIV+94UTY=";
   };
 
diff --git a/pkgs/development/python-modules/crysp/default.nix b/pkgs/development/python-modules/crysp/default.nix
index 94aed57a8fd8..d3a555a6d801 100644
--- a/pkgs/development/python-modules/crysp/default.nix
+++ b/pkgs/development/python-modules/crysp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdcht";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-51SKS6OOXIFT1L3YICR6a4QGSz/rbB8V+Z0u0jMO474=";
   };
 
diff --git a/pkgs/development/python-modules/csv2md/default.nix b/pkgs/development/python-modules/csv2md/default.nix
index 7ae90274c17e..f3c6faf3f195 100644
--- a/pkgs/development/python-modules/csv2md/default.nix
+++ b/pkgs/development/python-modules/csv2md/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lzakharov";
     repo = "csv2md";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CzURejGIxsD7IBSbAYXz0kj5oX47e+uN13fqd56CM1A=";
   };
 
diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix
index 8cd254bc0335..be429844d13d 100644
--- a/pkgs/development/python-modules/csvw/default.nix
+++ b/pkgs/development/python-modules/csvw/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cldf";
     repo = "csvw";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1393xwqawaxsflbq62vks92vv4zch8p6dd1mdvdi7j4vvf0zljkg";
   };
 
diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix
index ba6ad847b903..e5e27c7c9be5 100644
--- a/pkgs/development/python-modules/cxxheaderparser/default.nix
+++ b/pkgs/development/python-modules/cxxheaderparser/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robotpy";
     repo = "cxxheaderparser";
-    tag = version;
+    rev = version;
     hash = "sha256-+Q8EaVhx8/e+37GEHW3In5tMTIMl+5MySuCLgAzTypo=";
   };
 
diff --git a/pkgs/development/python-modules/cython-test-exception-raiser/default.nix b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix
index b14c8929bfa4..70a2746b1c60 100644
--- a/pkgs/development/python-modules/cython-test-exception-raiser/default.nix
+++ b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "twisted";
     repo = "cython-test-exception-raiser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fwMq0pOrFUJnPndH/a6ghoo6mlcVSxtsWazqE9mCx3M=";
   };
 
diff --git a/pkgs/development/python-modules/daemonocle/default.nix b/pkgs/development/python-modules/daemonocle/default.nix
index 4cd8f1f623cc..abe58995650f 100644
--- a/pkgs/development/python-modules/daemonocle/default.nix
+++ b/pkgs/development/python-modules/daemonocle/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jnrbsn";
     repo = "daemonocle";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-K+IqpEQ4yhfSguPPm2Ult3kGNO/9H56B+kD5ntaCZdk=";
   };
 
diff --git a/pkgs/development/python-modules/darkdetect/default.nix b/pkgs/development/python-modules/darkdetect/default.nix
index f6eecc5cfba5..c51f22fb368d 100644
--- a/pkgs/development/python-modules/darkdetect/default.nix
+++ b/pkgs/development/python-modules/darkdetect/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "albertosottile";
     repo = "darkdetect";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OOINgrgjSLr3L07E9zf1+mlTPr+7ZlgN3CfkWE8+LoE=";
   };
 
diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix
index d88ecd188de6..f1aa0dbc6fb3 100644
--- a/pkgs/development/python-modules/dask-gateway-server/default.nix
+++ b/pkgs/development/python-modules/dask-gateway-server/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-gateway";
-    tag = version;
+    rev = version;
     hash = "sha256-hwNLcuFN6ItH5KhC2gDUsaZT7qTC48fPR/Qx6u8B1+M=";
   };
 
diff --git a/pkgs/development/python-modules/dataclass-factory/default.nix b/pkgs/development/python-modules/dataclass-factory/default.nix
index 9b4e705e04fa..83de3f721832 100644
--- a/pkgs/development/python-modules/dataclass-factory/default.nix
+++ b/pkgs/development/python-modules/dataclass-factory/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "reagento";
     repo = "dataclass-factory";
-    tag = version;
+    rev = version;
     hash = "sha256-0BIWgyAV1hJzFX4xYFqswvQi5F1Ce+V9FKSmNYuJfZM=";
   };
 
diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix
index b3892e482b78..21a5ddcee0fa 100644
--- a/pkgs/development/python-modules/dataclass-wizard/default.nix
+++ b/pkgs/development/python-modules/dataclass-wizard/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rnag";
     repo = "dataclass-wizard";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ufi4lZc+UkM6NZr4bS2OibpOmMjyiBEoVKxmrqauW50=";
   };
 
diff --git a/pkgs/development/python-modules/dataclasses-serialization/default.nix b/pkgs/development/python-modules/dataclasses-serialization/default.nix
index 8bf3fa1ff842..d99f4ada0bdf 100644
--- a/pkgs/development/python-modules/dataclasses-serialization/default.nix
+++ b/pkgs/development/python-modules/dataclasses-serialization/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "madman-bob";
     repo = "python-dataclasses-serialization";
-    tag = version;
+    rev = version;
     hash = "sha256-jLMR2D01KgzHHRP0zduMBJt8xgBmIquWLCjZYLo2/AA=";
   };
 
diff --git a/pkgs/development/python-modules/datasette-template-sql/default.nix b/pkgs/development/python-modules/datasette-template-sql/default.nix
index 6d9278ecb6b0..5bdb48aa28cb 100644
--- a/pkgs/development/python-modules/datasette-template-sql/default.nix
+++ b/pkgs/development/python-modules/datasette-template-sql/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonw";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-VmdIEDk3iCBFrTPMm6ud00Z5CWqO0Wk707IQ4oVx5ak=";
   };
 
diff --git a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix
index 9ef15b38984c..aa3892ee9aaa 100644
--- a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix
+++ b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+jY8kg3jBDpZr5doih3DiyUEcSskq7TgubmW3qdBoZM=";
   };
 
diff --git a/pkgs/development/python-modules/deepwave/default.nix b/pkgs/development/python-modules/deepwave/default.nix
index fb3815c75ca4..56b9765686e8 100644
--- a/pkgs/development/python-modules/deepwave/default.nix
+++ b/pkgs/development/python-modules/deepwave/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ar4";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DOOy+B12jgwJzQ90qzX50OFxYLPRcVdVYSE5gi3pqDM=";
   };
 
diff --git a/pkgs/development/python-modules/dehinter/default.nix b/pkgs/development/python-modules/dehinter/default.nix
index 2bc691c55df9..55dc1c503fb4 100644
--- a/pkgs/development/python-modules/dehinter/default.nix
+++ b/pkgs/development/python-modules/dehinter/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "source-foundry";
     repo = "dehinter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-l988SW6OWKXzJK0WGAJZR/QDFvgnSir+5TwMMvFcOxg=";
   };
 
diff --git a/pkgs/development/python-modules/dek/default.nix b/pkgs/development/python-modules/dek/default.nix
index c8e3fe3ea85f..4f528b855133 100644
--- a/pkgs/development/python-modules/dek/default.nix
+++ b/pkgs/development/python-modules/dek/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rec";
     repo = "dek";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DYODdImTRCukGmGbkZ+9TQeI9DYaeRd/EHS6VND5IDs=";
   };
 
diff --git a/pkgs/development/python-modules/deploykit/default.nix b/pkgs/development/python-modules/deploykit/default.nix
index 7fcb82a1232e..e2882a7fa7f5 100644
--- a/pkgs/development/python-modules/deploykit/default.nix
+++ b/pkgs/development/python-modules/deploykit/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "numtide";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-7PiXq1bQJ1jswLHNqCDSYZabgfp8HRuRt5YPGzd5Ej0=";
   };
 
diff --git a/pkgs/development/python-modules/desktop-entry-lib/default.nix b/pkgs/development/python-modules/desktop-entry-lib/default.nix
index 3af1c772b81a..6582d0fd283a 100644
--- a/pkgs/development/python-modules/desktop-entry-lib/default.nix
+++ b/pkgs/development/python-modules/desktop-entry-lib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     domain = "codeberg.org";
     owner = "JakobDev";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-+c+FuLv88wc4yVw3iyFFtfbocnWzTCIe2DS0SWoj+VI=";
   };
 
diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix
index d787fe072fbc..b4f3ea395e0f 100644
--- a/pkgs/development/python-modules/devolo-home-control-api/default.nix
+++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "2Fake";
     repo = "devolo_home_control_api";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4AyC1DDYtKl8SwJf75BbzoOAhbZXmBZ05ma9YmLzksM=";
   };
 
diff --git a/pkgs/development/python-modules/dfdiskcache/default.nix b/pkgs/development/python-modules/dfdiskcache/default.nix
index d0afa82a8d63..600818090024 100644
--- a/pkgs/development/python-modules/dfdiskcache/default.nix
+++ b/pkgs/development/python-modules/dfdiskcache/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thombashi";
     repo = "df-diskcache";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-s+sqEPXw6tbEz9mnG+qeUSF6BmDssYhaDYOmraFaRbw=";
   };
 
diff --git a/pkgs/development/python-modules/dictdiffer/default.nix b/pkgs/development/python-modules/dictdiffer/default.nix
index c8b0d552eaf2..496c3d51af71 100644
--- a/pkgs/development/python-modules/dictdiffer/default.nix
+++ b/pkgs/development/python-modules/dictdiffer/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "inveniosoftware";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lQyPs3lQWtsvNPuvvwJUTDzrFaOX5uwGuRHe3yWUheU=";
   };
 
diff --git a/pkgs/development/python-modules/dingz/default.nix b/pkgs/development/python-modules/dingz/default.nix
index 3c125e49d74f..9f8d8a4a551f 100644
--- a/pkgs/development/python-modules/dingz/default.nix
+++ b/pkgs/development/python-modules/dingz/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-dingz";
-    tag = version;
+    rev = version;
     hash = "sha256-bCytQwLWw8D1UkKb/3LQ301eDCkVR4alD6NHjTs6I+4=";
   };
 
diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix
index 6e9689015467..43a1a1d0e655 100644
--- a/pkgs/development/python-modules/directv/default.nix
+++ b/pkgs/development/python-modules/directv/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ctalkington";
     repo = "python-directv";
-    tag = version;
+    rev = version;
     sha256 = "19jckf6qvl8fwi8yff1qy8c44xdz3zpi1ip1md6zl2c503qc91mk";
   };
 
diff --git a/pkgs/development/python-modules/dirsearch/default.nix b/pkgs/development/python-modules/dirsearch/default.nix
index 126aa43ac452..74b97e1f9ce3 100644
--- a/pkgs/development/python-modules/dirsearch/default.nix
+++ b/pkgs/development/python-modules/dirsearch/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maurosoria";
     repo = "dirsearch";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eXB103qUB3m7V/9hlq2xv3Y3bIz89/pGJsbPZQ+AZXs=";
   };
 
diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix
index a35fa3bcef07..8211267f2eb0 100644
--- a/pkgs/development/python-modules/diskcache/default.nix
+++ b/pkgs/development/python-modules/diskcache/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "grantjenks";
     repo = "python-diskcache";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1cDpdf+rLaG14TDd1wEHAiYXb69NFTFeOHD1Ib1oOVY=";
   };
 
diff --git a/pkgs/development/python-modules/dissononce/default.nix b/pkgs/development/python-modules/dissononce/default.nix
index 4deac2738870..b4745c059465 100644
--- a/pkgs/development/python-modules/dissononce/default.nix
+++ b/pkgs/development/python-modules/dissononce/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tgalal";
     repo = "dissononce";
-    tag = version;
+    rev = version;
     sha256 = "0hn64qfr0d5npmza6rjyxwwp12k2z2y1ma40zpl104ghac6g3mbs";
   };
 
diff --git a/pkgs/development/python-modules/dj-static/default.nix b/pkgs/development/python-modules/dj-static/default.nix
index 77fb47315ff1..83e07a45bc04 100644
--- a/pkgs/development/python-modules/dj-static/default.nix
+++ b/pkgs/development/python-modules/dj-static/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "heroku-python";
     repo = "dj-static";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B6TydlezbDkmfFgJjdFniZIYo/JjzPvFj43co+HYCdc=";
   };
 
diff --git a/pkgs/development/python-modules/django-apscheduler/default.nix b/pkgs/development/python-modules/django-apscheduler/default.nix
index d1ff2fa62962..e2f544615b0a 100644
--- a/pkgs/development/python-modules/django-apscheduler/default.nix
+++ b/pkgs/development/python-modules/django-apscheduler/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jcass77";
     repo = "django-apscheduler";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2YSVX4FxE1OfJkSYV9IRKd2scV4BrMA/mBzJARQCX38=";
   };
 
diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix
index 360ea93c74fc..880512f617de 100644
--- a/pkgs/development/python-modules/django-auditlog/default.nix
+++ b/pkgs/development/python-modules/django-auditlog/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-auditlog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SJ4GJp/gVIxiLbdAj3ZS+weevqIDZCMQnW/pqc5liJU=";
   };
 
diff --git a/pkgs/development/python-modules/django-bootstrap5/default.nix b/pkgs/development/python-modules/django-bootstrap5/default.nix
index c3a3670e0d72..7b7f2bba0620 100644
--- a/pkgs/development/python-modules/django-bootstrap5/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap5/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zostera";
     repo = "django-bootstrap5";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5VYw9Kq33/YFW9mFzkFzhrxavfx6r/CtC1SJhZbanhg=";
   };
 
diff --git a/pkgs/development/python-modules/django-celery-email/default.nix b/pkgs/development/python-modules/django-celery-email/default.nix
index 854fda4eaafb..ea7608ffca47 100644
--- a/pkgs/development/python-modules/django-celery-email/default.nix
+++ b/pkgs/development/python-modules/django-celery-email/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pmclanahan";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-LBavz5Nh2ObmIwLCem8nHvsuKgPwkzbS/OzFPmSje/M=";
   };
 
diff --git a/pkgs/development/python-modules/django-choices-field/default.nix b/pkgs/development/python-modules/django-choices-field/default.nix
index 5b7b802f8411..ea115e5c6258 100644
--- a/pkgs/development/python-modules/django-choices-field/default.nix
+++ b/pkgs/development/python-modules/django-choices-field/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bellini666";
     repo = "django-choices-field";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2oLMUM/aE4aY0eEU+CLIjTNQJAMUt/GK5Fw26QN7t34=";
   };
 
diff --git a/pkgs/development/python-modules/django-context-decorator/default.nix b/pkgs/development/python-modules/django-context-decorator/default.nix
index dd725ac77a94..e1c6d17259fb 100644
--- a/pkgs/development/python-modules/django-context-decorator/default.nix
+++ b/pkgs/development/python-modules/django-context-decorator/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rixx";
     repo = "django-context-decorator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lNmZDsguOu2+gtMVjbwr709sbLCQOQ1sAePN7UJQbcw=";
   };
 
diff --git a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
index e75756ee9fd3..0f8ab4fed5ec 100644
--- a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
+++ b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "flavors";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0fikr7xl786jqfkjdifymqpqnxy4qj8g3nlkgfm24wwq0za719dw";
   };
 
diff --git a/pkgs/development/python-modules/django-htmx/default.nix b/pkgs/development/python-modules/django-htmx/default.nix
index 92d0a6cad419..f5a342d66f1c 100644
--- a/pkgs/development/python-modules/django-htmx/default.nix
+++ b/pkgs/development/python-modules/django-htmx/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "django-htmx";
-    tag = version;
+    rev = version;
     hash = "sha256-IgVkHgTk4hC0lL6LVM16QoT2xtPWxKNu+NrcyxZ5oVY=";
   };
 
diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix
index b133867bc0a6..49a6e3cb6b5b 100644
--- a/pkgs/development/python-modules/django-js-reverse/default.nix
+++ b/pkgs/development/python-modules/django-js-reverse/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BITSOLVER";
     repo = "django-js-reverse";
-    tag = version;
+    rev = version;
     hash = "sha256-i78UsxVwxyDAc8LrOVEXLG0tdidoQhvUx7GvPDaH0KY=";
   };
 
diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix
index b85e79a6c497..8a8f7a8effe9 100644
--- a/pkgs/development/python-modules/django-logentry-admin/default.nix
+++ b/pkgs/development/python-modules/django-logentry-admin/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yprez";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1bndxgvisw8kk52zfdifvly6dl4833wqilxf77pg473172yaf5gq";
   };
 
diff --git a/pkgs/development/python-modules/django-mdeditor/default.nix b/pkgs/development/python-modules/django-mdeditor/default.nix
index ff91eb7a1a1b..a495b41c892d 100644
--- a/pkgs/development/python-modules/django-mdeditor/default.nix
+++ b/pkgs/development/python-modules/django-mdeditor/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "pylixm";
     repo = "django-mdeditor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-t57j1HhjNQtBwlbqe4mAHQ9WiNcIhMKYmrZkiqh+k5k=";
   };
 
diff --git a/pkgs/development/python-modules/django-mptt/default.nix b/pkgs/development/python-modules/django-mptt/default.nix
index aebed58ba922..404b6df1bc90 100644
--- a/pkgs/development/python-modules/django-mptt/default.nix
+++ b/pkgs/development/python-modules/django-mptt/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-mptt";
     repo = "django-mptt";
-    tag = version;
+    rev = version;
     hash = "sha256-vWnXKWzaa5AWoNaIc8NA1B2mnzKXRliQmi5VdrRMadE=";
   };
 
diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index 26beffcacae8..cf9685e0b2ac 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jimfunk";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-76vGvxxfNZQBCCsTkkSgQZ8PpFspWxJQDj/xq9iOSTU=";
   };
 
diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix
index 9fdcecd06419..e15174d56ae4 100644
--- a/pkgs/development/python-modules/django-prometheus/default.nix
+++ b/pkgs/development/python-modules/django-prometheus/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "korfuri";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JiLH+4mmNdb9BN81J5YFiMPna/3gaKUK6ARjmCa3fE8=";
   };
 
diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix
index ba1172bc9783..316b07a274e0 100644
--- a/pkgs/development/python-modules/django-rest-auth/default.nix
+++ b/pkgs/development/python-modules/django-rest-auth/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Tivix";
     repo = "django-rest-auth";
-    tag = version;
+    rev = version;
     hash = "sha256-rCChUHv8sTEFErDCZnPN5b5XVtMJ7JNVZwBYF3d99mY=";
   };
 
diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix
index cc103867c917..e83ab1239f45 100644
--- a/pkgs/development/python-modules/django-sites/default.nix
+++ b/pkgs/development/python-modules/django-sites/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niwinz";
     repo = "django-sites";
-    tag = version;
+    rev = version;
     hash = "sha256-MQtQC+9DyS1ICXXovbqPpkKIQ5wpuJDgq3Lcd/1kORU=";
   };
 
diff --git a/pkgs/development/python-modules/django-split-settings/default.nix b/pkgs/development/python-modules/django-split-settings/default.nix
index 7a95fb34b1a5..31ac1836b5dc 100644
--- a/pkgs/development/python-modules/django-split-settings/default.nix
+++ b/pkgs/development/python-modules/django-split-settings/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wemake-services";
     repo = "django-split-settings";
-    tag = version;
+    rev = version;
     hash = "sha256-Bk2/DU+K524mCUvteWT0fIQH5ZgeMHiufMTF+dJYVtc=";
   };
 
diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix
index 1c65fcb44ed1..978ae2e8e39e 100644
--- a/pkgs/development/python-modules/django-timezone-field/default.nix
+++ b/pkgs/development/python-modules/django-timezone-field/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mfogel";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-q06TuYkBA4z6tJdT3an6Z8o1i/o85XbYa1JYZBHC8lI=";
   };
 
diff --git a/pkgs/development/python-modules/djangorestframework-guardian/default.nix b/pkgs/development/python-modules/djangorestframework-guardian/default.nix
index 8c8a2374b1af..4d4a1d45fc9c 100644
--- a/pkgs/development/python-modules/djangorestframework-guardian/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-guardian/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rpkilby";
     repo = "django-rest-framework-guardian";
-    tag = version;
+    rev = version;
     hash = "sha256-jl/VEl1pUHU8J1d5ZQSGJweNJayIGw1iVAmwID85fqw=";
   };
 
diff --git a/pkgs/development/python-modules/djangorestframework-recursive/default.nix b/pkgs/development/python-modules/djangorestframework-recursive/default.nix
index 25444752e286..cdb68b5164f3 100644
--- a/pkgs/development/python-modules/djangorestframework-recursive/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-recursive/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "heywbj";
     repo = "django-rest-framework-recursive";
-    tag = version;
+    rev = version;
     hash = "sha256-Q/6yxpz3c402sMZudAeFIht9+5GmTRlzM51AMAx5muY=";
   };
 
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index ee3463de1791..43a5c0779801 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = "django-rest-framework";
-    tag = version;
+    rev = version;
     hash = "sha256-ne0sk4m11Ha77tNmCsdhj7QVmCkYj5GjLn/dLF4qxU8=";
   };
 
diff --git a/pkgs/development/python-modules/dodgy/default.nix b/pkgs/development/python-modules/dodgy/default.nix
index ed21b8957104..3e4569f3035a 100644
--- a/pkgs/development/python-modules/dodgy/default.nix
+++ b/pkgs/development/python-modules/dodgy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "landscapeio";
     repo = "dodgy";
-    tag = version;
+    rev = version;
     sha256 = "0ywwjpz0p6ls3hp1lndjr9ql6s5lkj7dgpll1h87w04kwan70j0x";
   };
 
diff --git a/pkgs/development/python-modules/doit-py/default.nix b/pkgs/development/python-modules/doit-py/default.nix
index 5583c91c1c81..8ebaadbcf2e7 100644
--- a/pkgs/development/python-modules/doit-py/default.nix
+++ b/pkgs/development/python-modules/doit-py/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydoit";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-DBl6/no04ZGRHHmN9gkEtBmAMgmyZWcfPCcFz0uxAv4=";
   };
 
diff --git a/pkgs/development/python-modules/donfig/default.nix b/pkgs/development/python-modules/donfig/default.nix
index 49b307480d4b..3c06c81917c7 100644
--- a/pkgs/development/python-modules/donfig/default.nix
+++ b/pkgs/development/python-modules/donfig/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytroll";
     repo = "donfig";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hF4hzI1MTLgUexRIqwBEEEMV7Az2oDkp5GQQ5282vwE=";
   };
 
diff --git a/pkgs/development/python-modules/donut-shellcode/default.nix b/pkgs/development/python-modules/donut-shellcode/default.nix
index 5efa746a0fbf..42be76fc8c3f 100644
--- a/pkgs/development/python-modules/donut-shellcode/default.nix
+++ b/pkgs/development/python-modules/donut-shellcode/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TheWover";
     repo = "donut";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gKa7ngq2+r4EYRdwH9AWnJodJjCdppzKch4Ve/4ZPhk=";
   };
 
diff --git a/pkgs/development/python-modules/drafthorse/default.nix b/pkgs/development/python-modules/drafthorse/default.nix
index 9f2f1ca7db9c..81874cc6017a 100644
--- a/pkgs/development/python-modules/drafthorse/default.nix
+++ b/pkgs/development/python-modules/drafthorse/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "python-drafthorse";
-    tag = version;
+    rev = version;
     hash = "sha256-v4yN2VHSA6pOXCSHscHIECeQchZkzH+/Hal4JwGXh74=";
   };
 
diff --git a/pkgs/development/python-modules/drf-jwt/default.nix b/pkgs/development/python-modules/drf-jwt/default.nix
index 1b32cb8eda7c..5e4960385803 100644
--- a/pkgs/development/python-modules/drf-jwt/default.nix
+++ b/pkgs/development/python-modules/drf-jwt/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Styria-Digital";
     repo = "django-rest-framework-jwt";
-    tag = version;
+    rev = version;
     hash = "sha256-bbkk78uYTG+JTzY3AyOmEVtVSgout/TETfr5N5fUto4=";
   };
 
diff --git a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
index 5fa5de0eb5f6..426a9e440013 100644
--- a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
+++ b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tfranzel";
     repo = "drf-spectacular-sidecar";
-    tag = version;
+    rev = version;
     hash = "sha256-EoQKbxzXEuKC50/W1/tBB2wASJZmNNwg9r1qhIB4Ws8=";
   };
 
diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/pkgs/development/python-modules/ds4drv/default.nix
index 132258120332..d4ebc468f9ef 100644
--- a/pkgs/development/python-modules/ds4drv/default.nix
+++ b/pkgs/development/python-modules/ds4drv/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrippa";
     repo = "ds4drv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0vinpla0apizzykcyfis79mrm1i6fhns83nkzw85svypdhkx2g8v";
   };
 
diff --git a/pkgs/development/python-modules/dsinternals/default.nix b/pkgs/development/python-modules/dsinternals/default.nix
index 838cb2f74ca3..ef827f13ba15 100644
--- a/pkgs/development/python-modules/dsinternals/default.nix
+++ b/pkgs/development/python-modules/dsinternals/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "p0dalirius";
     repo = "pydsinternals";
-    tag = version;
+    rev = version;
     hash = "sha256-C1ar9c4F4WI5ICX7PJe8FzVwK8bxZds+kMBpttEp9Ko=";
   };
 
diff --git a/pkgs/development/python-modules/duct-py/default.nix b/pkgs/development/python-modules/duct-py/default.nix
index 1154fb037e93..2d9b7ca504ce 100644
--- a/pkgs/development/python-modules/duct-py/default.nix
+++ b/pkgs/development/python-modules/duct-py/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oconnor663";
     repo = "duct.py";
-    tag = version;
+    rev = version;
     hash = "sha256-4ja/SQ9R/SbKlf3NqKxLi+Fl/4JI0Fl/zG9EmTZjWZc=";
   };
 
diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix
index a0d4afef5b29..dc47ee1e976e 100644
--- a/pkgs/development/python-modules/duden/default.nix
+++ b/pkgs/development/python-modules/duden/default.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitHub {
       owner = "radomirbosak";
       repo = "duden";
-      tag = finalAttrs.version;
+      rev = finalAttrs.version;
       hash = "sha256-c6IItrjFVbsdYg3sDrExcxv7aRcKhd/M5hiZD+wBZ2Y=";
     };
 
diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix
index efa3dcd0096b..53ef911b8814 100644
--- a/pkgs/development/python-modules/dufte/default.nix
+++ b/pkgs/development/python-modules/dufte/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48";
   };
 
diff --git a/pkgs/development/python-modules/dungeon-eos/default.nix b/pkgs/development/python-modules/dungeon-eos/default.nix
index 42ac01708ba3..d4282575c88b 100644
--- a/pkgs/development/python-modules/dungeon-eos/default.nix
+++ b/pkgs/development/python-modules/dungeon-eos/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY=";
   };
 
diff --git a/pkgs/development/python-modules/durationpy/default.nix b/pkgs/development/python-modules/durationpy/default.nix
index ebf525c029f7..79f9bf439a79 100644
--- a/pkgs/development/python-modules/durationpy/default.nix
+++ b/pkgs/development/python-modules/durationpy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "icholy";
     repo = "durationpy";
-    tag = version;
+    rev = version;
     hash = "sha256-R/cZPnUUlosGHCOcqwRJ0GJlcB6Lu5a3e5h1CQ6fysA=";
   };
 
diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix
index 8da8db1955da..b60e57b34c9c 100644
--- a/pkgs/development/python-modules/dynd/default.nix
+++ b/pkgs/development/python-modules/dynd/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "libdynd";
     repo = "dynd-python";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh";
   };
 
diff --git a/pkgs/development/python-modules/ebooklib/default.nix b/pkgs/development/python-modules/ebooklib/default.nix
index 4af858b31074..67e00275f3b9 100644
--- a/pkgs/development/python-modules/ebooklib/default.nix
+++ b/pkgs/development/python-modules/ebooklib/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aerkalov";
     repo = "ebooklib";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ciks/eeRpkqkWnyLgyHC+x/dSOcj/ZT45KUElKqv1F8=";
   };
 
diff --git a/pkgs/development/python-modules/editdistance-s/default.nix b/pkgs/development/python-modules/editdistance-s/default.nix
index 7f05296fa1ff..e0ae8a91703d 100644
--- a/pkgs/development/python-modules/editdistance-s/default.nix
+++ b/pkgs/development/python-modules/editdistance-s/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0w2qd5b6a3c3ahd0xy9ykq4wzqk0byqwdqrr26dyn8j2425j46lg";
   };
 
diff --git a/pkgs/development/python-modules/editor/default.nix b/pkgs/development/python-modules/editor/default.nix
index a174ce9eb72a..5cf8a6d2de33 100644
--- a/pkgs/development/python-modules/editor/default.nix
+++ b/pkgs/development/python-modules/editor/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rec";
     repo = "editor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FVtat3gUsK5Lv6XSkVXj0hY6NkMGw6LxRWMJrZ/cIis=";
   };
 
diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix
index d1438724407b..7de5770e67c7 100644
--- a/pkgs/development/python-modules/editorconfig/default.nix
+++ b/pkgs/development/python-modules/editorconfig/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "editorconfig";
     repo = "editorconfig-core-py";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vYuXW+Yb0GXZAwaarV4WBIJtS31+EleiddU9ibBn/hs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/einx/default.nix b/pkgs/development/python-modules/einx/default.nix
index c919c7dd1395..0f181b5051aa 100644
--- a/pkgs/development/python-modules/einx/default.nix
+++ b/pkgs/development/python-modules/einx/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fferflo";
     repo = "einx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lbcf47h1tW1fj94NLG4iJPEs6ziGPkcX1Q+wn59PvS8=";
   };
 
diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix
index 7f79b2962d40..30bcb15c2106 100644
--- a/pkgs/development/python-modules/elmax/default.nix
+++ b/pkgs/development/python-modules/elmax/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-elmax";
-    tag = version;
+    rev = version;
     hash = "sha256-EcYEpYv+EwwEfW8Sy7aQjFAPpmsA6qVbmlwrPdxdnEw=";
   };
 
diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix
index 0116df9315b3..b18d0f1e6d7b 100644
--- a/pkgs/development/python-modules/emailthreads/default.nix
+++ b/pkgs/development/python-modules/emailthreads/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "python-emailthreads";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7BhYS1DQCW9QpG31asPCq5qPyJy+WW2onZpvEHhwQCs=";
   };
 
diff --git a/pkgs/development/python-modules/emulated-roku/default.nix b/pkgs/development/python-modules/emulated-roku/default.nix
index f8e1d086cb17..1e29bead57fb 100644
--- a/pkgs/development/python-modules/emulated-roku/default.nix
+++ b/pkgs/development/python-modules/emulated-roku/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mindigmarton";
     repo = "emulated_roku";
-    tag = version;
+    rev = version;
     hash = "sha256-7DbJl1e1ESWPCNuQX7m/ggXNDyPYZ5eNGwSz+jnxZj0=";
   };
 
diff --git a/pkgs/development/python-modules/encodec/default.nix b/pkgs/development/python-modules/encodec/default.nix
index d3bbdcd6d378..6c8c363e75ec 100644
--- a/pkgs/development/python-modules/encodec/default.nix
+++ b/pkgs/development/python-modules/encodec/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = "encodec";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+iJZkX1HoyuNFu9VRxMO6aAzNQybkH9lrQJ5Ao9+/CY=";
   };
 
diff --git a/pkgs/development/python-modules/enturclient/default.nix b/pkgs/development/python-modules/enturclient/default.nix
index bb30a91b871b..372bdf17e075 100644
--- a/pkgs/development/python-modules/enturclient/default.nix
+++ b/pkgs/development/python-modules/enturclient/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hfurubotten";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Y2sBPikCAxumylP1LUy8XgjBRCWaNryn5XHSrRjJIIo=";
   };
 
diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix
index 92d44aac445d..46a8249d9e2f 100644
--- a/pkgs/development/python-modules/envoy-reader/default.nix
+++ b/pkgs/development/python-modules/envoy-reader/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jesserizzo";
     repo = "envoy_reader";
-    tag = version;
+    rev = version;
     hash = "sha256-aIpZ4ln4L57HwK8H0FqsyNnXosnAp3ingrJI6/MPS90=";
   };
 
diff --git a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix
index 1d7b634f7d80..d582c5cfc37c 100644
--- a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix
+++ b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = "ephemeral-port-reserve";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-R6NRpfaT05PO/cTWgCakiGfCuCyucjVOXbAezn5x1cU=";
   };
 
diff --git a/pkgs/development/python-modules/esprima/default.nix b/pkgs/development/python-modules/esprima/default.nix
index 7bf434c2e9b8..8969ec792282 100644
--- a/pkgs/development/python-modules/esprima/default.nix
+++ b/pkgs/development/python-modules/esprima/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Kronuz";
     repo = "esprima-python";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "WtkPCReXhxyr6pOzE9gsdIeBlLk+nSnbxkS3OowEaHo=";
   };
 
diff --git a/pkgs/development/python-modules/essentials/default.nix b/pkgs/development/python-modules/essentials/default.nix
index d4a8e5219a32..e94a3ccf98b8 100644
--- a/pkgs/development/python-modules/essentials/default.nix
+++ b/pkgs/development/python-modules/essentials/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Neoteroi";
     repo = "essentials";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WMHjBVkeSoQ4Naj1U7Bg9j2hcoErH1dx00BPKiom9T4=";
   };
 
diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix
index c99a79dcd886..d9dc4fcd0753 100644
--- a/pkgs/development/python-modules/etcd/default.nix
+++ b/pkgs/development/python-modules/etcd/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dsoprea";
     repo = "PythonEtcdClient";
-    tag = version;
+    rev = version;
     hash = "sha256-h+jYIRSNdrGkW3tBV1ifIDEXU46EQGyeJoz/Mxym4pI=";
   };
 
diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix
index f3669fd4c531..10e71d28cb2f 100644
--- a/pkgs/development/python-modules/etebase/default.nix
+++ b/pkgs/development/python-modules/etebase/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "etesync";
     repo = "etebase-py";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZNUUp/0fGJxL/Rt8sAZ864rg8uCcNybIYSk4POt0vqg=";
   };
 
diff --git a/pkgs/development/python-modules/eth-rlp/default.nix b/pkgs/development/python-modules/eth-rlp/default.nix
index fc78616a85d0..3bc8d7c35b83 100644
--- a/pkgs/development/python-modules/eth-rlp/default.nix
+++ b/pkgs/development/python-modules/eth-rlp/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "eth-rlp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FTqIutndf+epmO5XNEUoRAUEmn299aTLIZNe5SMcxAQ=";
   };
 
diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix
index e43810ed99c1..58c766811fe1 100644
--- a/pkgs/development/python-modules/executing/default.nix
+++ b/pkgs/development/python-modules/executing/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexmojaki";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2BT4VTZBAJx8Gk4qTTyhSoBMjJvKzmL4PO8IfTpN+2g=";
   };
 
diff --git a/pkgs/development/python-modules/expects/default.nix b/pkgs/development/python-modules/expects/default.nix
index c2fbcddfe4e0..a36769259e36 100644
--- a/pkgs/development/python-modules/expects/default.nix
+++ b/pkgs/development/python-modules/expects/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaimegildesagredo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0mk1mhh8n9ly820krkhazn1w96f10vmgh21y2wr44sn8vwr4ngyy";
   };
 
diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix
index ee193ad6b0f5..d94227989c49 100644
--- a/pkgs/development/python-modules/fabulous/default.nix
+++ b/pkgs/development/python-modules/fabulous/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jart";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4=";
   };
 
diff --git a/pkgs/development/python-modules/fairseq/default.nix b/pkgs/development/python-modules/fairseq/default.nix
index 42bf6d88158e..aa2932bbf91f 100644
--- a/pkgs/development/python-modules/fairseq/default.nix
+++ b/pkgs/development/python-modules/fairseq/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XX/grU5ljQCwx33miGoFc/7Uj9fZDtmhm4Fz7L4U+Bc=";
   };
 
diff --git a/pkgs/development/python-modules/farama-notifications/default.nix b/pkgs/development/python-modules/farama-notifications/default.nix
index 8c18b1f17708..c04c3a50a584 100644
--- a/pkgs/development/python-modules/farama-notifications/default.nix
+++ b/pkgs/development/python-modules/farama-notifications/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-UUrJ/5t5x54xs1gweNUhwqrMJQXiyrUPn1bBfTsiPcw=";
   };
 
diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix
index 4d7c78573fa2..5d55886302b0 100644
--- a/pkgs/development/python-modules/fastdtw/default.nix
+++ b/pkgs/development/python-modules/fastdtw/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "slaypni";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0irc5x4ahfp7f7q4ic97qa898s2awi0vdjznahxrfjirn8b157dw";
   };
 
diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix
index 4b14bd0d76e4..ad250ee1715c 100644
--- a/pkgs/development/python-modules/fastjsonschema/default.nix
+++ b/pkgs/development/python-modules/fastjsonschema/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "horejsek";
     repo = "python-fastjsonschema";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-H/jmvm5U4RB9KuD5EgCedbc499Fl8L2S9Y5SXy51JP0=";
   };
diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix
index 2c8afe28666a..2d6d68a3842d 100644
--- a/pkgs/development/python-modules/fastpbkdf2/default.nix
+++ b/pkgs/development/python-modules/fastpbkdf2/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ayrx";
     repo = "python-fastpbkdf2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1hvvlk3j28i6nswb6gy3mq7278nq0mgfnpxh1rv6jvi7xhd7qmlc";
   };
 
diff --git a/pkgs/development/python-modules/filedate/default.nix b/pkgs/development/python-modules/filedate/default.nix
index 3cf760253d70..5317169caa68 100644
--- a/pkgs/development/python-modules/filedate/default.nix
+++ b/pkgs/development/python-modules/filedate/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kubinka0505";
     repo = "filedate";
-    tag = version;
+    rev = version;
     hash = "sha256-HvuGP+QlUlfAUfFmaVVvtPHGdrbWVxghQipnqTTvAQc=";
   };
 
diff --git a/pkgs/development/python-modules/finalfusion/default.nix b/pkgs/development/python-modules/finalfusion/default.nix
index 3da5f7fbda82..2452a6cbf07d 100644
--- a/pkgs/development/python-modules/finalfusion/default.nix
+++ b/pkgs/development/python-modules/finalfusion/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "finalfusion";
     repo = "finalfusion-python";
-    tag = version;
+    rev = version;
     sha256 = "0pwzflamxqvpl1wcz0zbhhd6aa4xn18rmza6rggaic3ckidhyrh4";
   };
 
diff --git a/pkgs/development/python-modules/fingerprints/default.nix b/pkgs/development/python-modules/fingerprints/default.nix
index 81ce12d9d339..6b3bf80810f6 100644
--- a/pkgs/development/python-modules/fingerprints/default.nix
+++ b/pkgs/development/python-modules/fingerprints/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alephdata";
     repo = "fingerprints";
-    tag = version;
+    rev = version;
     hash = "sha256-U2UslCy1OagVTtllCKsEBX4zI/qIczbxs2Cxzy+/Xys=";
   };
 
diff --git a/pkgs/development/python-modules/fissix/default.nix b/pkgs/development/python-modules/fissix/default.nix
index 4e9e06bfd2cd..d600d8410795 100644
--- a/pkgs/development/python-modules/fissix/default.nix
+++ b/pkgs/development/python-modules/fissix/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "amyreese";
     repo = "fissix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-geGctke+1PWFqJyiH1pQ0zWj9wVIjV/SQ5njOOk9gOw=";
   };
 
diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix
index cdd85841e9ea..f53eba81b2ea 100644
--- a/pkgs/development/python-modules/fitbit/default.nix
+++ b/pkgs/development/python-modules/fitbit/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "orcasgit";
     repo = "python-fitbit";
-    tag = version;
+    rev = version;
     hash = "sha256-1u3h47lRBrJ7EUWBl5+RLGW4KHHqXqqrXbboZdy7VPA=";
   };
 
diff --git a/pkgs/development/python-modules/fixerio/default.nix b/pkgs/development/python-modules/fixerio/default.nix
index e34211a3eabf..550181765263 100644
--- a/pkgs/development/python-modules/fixerio/default.nix
+++ b/pkgs/development/python-modules/fixerio/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amatellanes";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "009h1mys175xdyznn5bl980vly40544s4ph1zcgqwg2i2ic93gvb";
   };
 
diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix
index d659850301db..b7cb3821defc 100644
--- a/pkgs/development/python-modules/flasgger/default.nix
+++ b/pkgs/development/python-modules/flasgger/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "flasgger";
     repo = "flasgger";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cYFMKZxpi69gVWqyZUltCL0ZwcfIABNsJKqAhN2TTSg=";
   };
 
diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix
index 11876321bcc4..da98864cf818 100644
--- a/pkgs/development/python-modules/flask-bcrypt/default.nix
+++ b/pkgs/development/python-modules/flask-bcrypt/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maxcountryman";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-WlIholi/nzq6Ikc0LS6FhG0Q5Kz0kvvAlA2YJ7EksZ4=";
   };
 
diff --git a/pkgs/development/python-modules/flask-expects-json/default.nix b/pkgs/development/python-modules/flask-expects-json/default.nix
index 24d6dd4db71a..a0598642d497 100644
--- a/pkgs/development/python-modules/flask-expects-json/default.nix
+++ b/pkgs/development/python-modules/flask-expects-json/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Fischerfredl";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-CUxuwqjjAb9Fy6xWtX1WtSANYaYr5//vY8k89KghYoQ=";
   };
 
diff --git a/pkgs/development/python-modules/flask-mysqldb/default.nix b/pkgs/development/python-modules/flask-mysqldb/default.nix
index 0c0768737ba3..995d44efcc57 100644
--- a/pkgs/development/python-modules/flask-mysqldb/default.nix
+++ b/pkgs/development/python-modules/flask-mysqldb/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexferl";
     repo = "flask-mysqldb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RHAB9WGRzojH6eAOG61QguwF+4LssO9EcFjbWxoOtF4=";
   };
 
diff --git a/pkgs/development/python-modules/flask-paranoid/default.nix b/pkgs/development/python-modules/flask-paranoid/default.nix
index fcd7f38520d4..0e4d49127ae9 100644
--- a/pkgs/development/python-modules/flask-paranoid/default.nix
+++ b/pkgs/development/python-modules/flask-paranoid/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tikD8efc3Q3xIQnaC3SSBaCRQxMI1HzXxeupvYeNnE4=";
   };
 
diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
index d0be0d06db2d..a4ea585c909c 100644
--- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
+++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "antarctica";
     repo = "flask-reverse-proxy-fix";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZRZI1psr1dnY2FbuLZXOQvLMJd4TF7BfBNZnW9kxeck=";
   };
 
diff --git a/pkgs/development/python-modules/flask-sock/default.nix b/pkgs/development/python-modules/flask-sock/default.nix
index a42aaf1114ca..bb5f82925cfb 100644
--- a/pkgs/development/python-modules/flask-sock/default.nix
+++ b/pkgs/development/python-modules/flask-sock/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "flask-sock";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GKfOVdeLPag2IKGCWrMjQp4NTL1/9GiyLhXhf9jQKhQ=";
   };
 
diff --git a/pkgs/development/python-modules/flatdict/default.nix b/pkgs/development/python-modules/flatdict/default.nix
index 1ef142fd94f9..d0aacabfbbca 100644
--- a/pkgs/development/python-modules/flatdict/default.nix
+++ b/pkgs/development/python-modules/flatdict/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gmr";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-CWsTiCNdIKSQtjpQC07lhZoU1hXT/MGpXdj649x2GlU=";
   };
 
diff --git a/pkgs/development/python-modules/flatten-dict/default.nix b/pkgs/development/python-modules/flatten-dict/default.nix
index 62861916c42f..9f50f2c7dab9 100644
--- a/pkgs/development/python-modules/flatten-dict/default.nix
+++ b/pkgs/development/python-modules/flatten-dict/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ianlini";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-uHenKoD4eLm9sMREVuV0BB/oUgh4NMiuj+IWd0hlxNQ=";
   };
 
diff --git a/pkgs/development/python-modules/flatten-json/default.nix b/pkgs/development/python-modules/flatten-json/default.nix
index 6c978d7bad00..408eb95d572c 100644
--- a/pkgs/development/python-modules/flatten-json/default.nix
+++ b/pkgs/development/python-modules/flatten-json/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amirziai";
     repo = "flatten";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ViOLbfJtFWkDQ5cGNYerTk2BqVg5f5B3hZ96t0uvhpk=";
   };
 
diff --git a/pkgs/development/python-modules/flexcache/default.nix b/pkgs/development/python-modules/flexcache/default.nix
index cd0cb310edce..a15801505ca9 100644
--- a/pkgs/development/python-modules/flexcache/default.nix
+++ b/pkgs/development/python-modules/flexcache/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hgrecco";
     repo = "flexcache";
-    tag = version;
+    rev = version;
     hash = "sha256-MAbTe7NxzfRPzo/Wnb5SnPJvJWf6zVeYsaw/g9OJYSE=";
   };
 
diff --git a/pkgs/development/python-modules/flexparser/default.nix b/pkgs/development/python-modules/flexparser/default.nix
index 1573426f8338..4cb3cfbf6c58 100644
--- a/pkgs/development/python-modules/flexparser/default.nix
+++ b/pkgs/development/python-modules/flexparser/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hgrecco";
     repo = "flexparser";
-    tag = version;
+    rev = version;
     hash = "sha256-0Ocp4GsrnzkpSqnP+AK5OxJ3KyUf5Uc6CegDXpRYRqo=";
   };
 
diff --git a/pkgs/development/python-modules/flit-gettext/default.nix b/pkgs/development/python-modules/flit-gettext/default.nix
index 9c1008436546..cdf3dadf14ed 100644
--- a/pkgs/development/python-modules/flit-gettext/default.nix
+++ b/pkgs/development/python-modules/flit-gettext/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "codingjoe";
     repo = "flit-gettext";
-    tag = version;
+    rev = version;
     hash = "sha256-YsRfpciSrHmivEJKfzdp6UaPx2tSr3VdjU4ZIbYQX6c=";
   };
 
diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix
index d26819078b82..2bf1e93072d2 100644
--- a/pkgs/development/python-modules/flit/default.nix
+++ b/pkgs/development/python-modules/flit/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "flit";
-    tag = version;
+    rev = version;
     hash = "sha256-AK5iuR1l/i2Cgj8D4CnyV6mQkSNbFw4sHGQF2OdwNkU=";
   };
 
diff --git a/pkgs/development/python-modules/fnvhash/default.nix b/pkgs/development/python-modules/fnvhash/default.nix
index a418dcce0f10..76ec4ed770b4 100644
--- a/pkgs/development/python-modules/fnvhash/default.nix
+++ b/pkgs/development/python-modules/fnvhash/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "znerol";
     repo = "py-fnvhash";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "00h8i70qd3dpsyf2dp7fkcb9m2prd6m3l33qv3wf6idpnqgjz6fq";
   };
 
diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/development/python-modules/font-v/default.nix
index dfcbf2c2b535..fd2970d07a34 100644
--- a/pkgs/development/python-modules/font-v/default.nix
+++ b/pkgs/development/python-modules/font-v/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "source-foundry";
     repo = "font-v";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ceASyYcNul5aWPAPGajCQrqsQ3bN1sE+nMbCbj7f35w=";
   };
 
diff --git a/pkgs/development/python-modules/fordpass/default.nix b/pkgs/development/python-modules/fordpass/default.nix
index cedfa4d1884a..0a7d9f68e6ec 100644
--- a/pkgs/development/python-modules/fordpass/default.nix
+++ b/pkgs/development/python-modules/fordpass/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "clarkd";
     repo = "fordpass-python";
-    tag = version;
+    rev = version;
     sha256 = "0i1dlswxc2bv1smc5d4r1adbxbl7sgr1swh2cjfajp73vs43xa0m";
   };
 
diff --git a/pkgs/development/python-modules/fqdn/default.nix b/pkgs/development/python-modules/fqdn/default.nix
index 778af7f48e44..dd8f5b8d8ca8 100644
--- a/pkgs/development/python-modules/fqdn/default.nix
+++ b/pkgs/development/python-modules/fqdn/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ypcrts";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T0CdWWr8p3JVhp3nol5hyxsrD3951JE2EDpFt+m+3bE=";
   };
 
diff --git a/pkgs/development/python-modules/frilouz/default.nix b/pkgs/development/python-modules/frilouz/default.nix
index 0a8fd9d8dd51..962c0bc45884 100644
--- a/pkgs/development/python-modules/frilouz/default.nix
+++ b/pkgs/development/python-modules/frilouz/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "QuantStack";
     repo = "frilouz";
-    tag = version;
+    rev = version;
     sha256 = "0w2qzi4zb10r9iw64151ay01vf0yzyhh0bsjkx1apxp8fs15cdiw";
   };
 
diff --git a/pkgs/development/python-modules/frozenlist2/default.nix b/pkgs/development/python-modules/frozenlist2/default.nix
index a90b123162be..ca7ab067ea06 100644
--- a/pkgs/development/python-modules/frozenlist2/default.nix
+++ b/pkgs/development/python-modules/frozenlist2/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rohanpm";
     repo = "frozenlist2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fF0oFZ2q1wRH7IKBlCjm3Za4xtEMSHyEaGL09rHgtTY=";
   };
 
diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix
index 8e6ec9c3c4c0..4c67565fd5f3 100644
--- a/pkgs/development/python-modules/funcparserlib/default.nix
+++ b/pkgs/development/python-modules/funcparserlib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vlasovskikh";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-LE9ItCaEzEGeahpM3M3sSnDBXEr6uX5ogEkO5x2Jgzc=";
   };
 
diff --git a/pkgs/development/python-modules/functions-framework/default.nix b/pkgs/development/python-modules/functions-framework/default.nix
index 67d58c49893e..b9df27a48b5f 100644
--- a/pkgs/development/python-modules/functions-framework/default.nix
+++ b/pkgs/development/python-modules/functions-framework/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "functions-framework-python";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wLL8VWhRb3AEa41DO/mwx3G0AwmLACiXeDvo+LEq1xM=";
   };
 
diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix
index 3a1953e46b8d..7e99404d942a 100644
--- a/pkgs/development/python-modules/fx2/default.nix
+++ b/pkgs/development/python-modules/fx2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "whitequark";
     repo = "libfx2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PtWxjT+97+EeNMN36zOT1+ost/w3lRRkaON3Cl3dpp4=";
   };
 
diff --git a/pkgs/development/python-modules/garminconnect-aio/default.nix b/pkgs/development/python-modules/garminconnect-aio/default.nix
index dab04e1ff7d9..362ffd393e4e 100644
--- a/pkgs/development/python-modules/garminconnect-aio/default.nix
+++ b/pkgs/development/python-modules/garminconnect-aio/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "python-garminconnect-aio";
-    tag = version;
+    rev = version;
     hash = "sha256-GWY2kTG2D+wOJqM/22pNV5rLvWjAd4jxVGlHBou/T2g=";
   };
 
diff --git a/pkgs/development/python-modules/gatt/default.nix b/pkgs/development/python-modules/gatt/default.nix
index 812c72d1a2b8..5a928d5c7991 100644
--- a/pkgs/development/python-modules/gatt/default.nix
+++ b/pkgs/development/python-modules/gatt/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getsenic";
     repo = "gatt-python";
-    tag = version;
+    rev = version;
     hash = "sha256-GMLqQ9ojQ649hbbJB+KiQoOhiTWweOgv6zaCDzhIB5A=";
   };
 
diff --git a/pkgs/development/python-modules/gawd/default.nix b/pkgs/development/python-modules/gawd/default.nix
index 04c9fbb9db0f..b3afe56d9daf 100644
--- a/pkgs/development/python-modules/gawd/default.nix
+++ b/pkgs/development/python-modules/gawd/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pooya-rostami";
     repo = "gawd";
-    tag = version;
+    rev = version;
     hash = "sha256-DCcU7vO5VApRsO+ljVs827TrHIfe3R+1/2wgBEcp1+c=";
   };
 
diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix
index 36275bab4124..df7477fe8ddc 100644
--- a/pkgs/development/python-modules/gb-io/default.nix
+++ b/pkgs/development/python-modules/gb-io/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "althonos";
     repo = "gb-io.py";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1B7BUJ8H+pTtmDtazfPfYtlXzL/x4rAHtRIFAAsSoWs=";
   };
 
diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix
index d7378eac338a..24bf6109e8ac 100644
--- a/pkgs/development/python-modules/gbinder-python/default.nix
+++ b/pkgs/development/python-modules/gbinder-python/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "erfanoabdi";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1X9gAux9w/mCEVmE3Yqvvq3kU7hu4iAFaZWNZZZxt3E=";
   };
 
diff --git a/pkgs/development/python-modules/gcodepy/default.nix b/pkgs/development/python-modules/gcodepy/default.nix
index 69b30c3406f7..6e62d9bb3bf6 100644
--- a/pkgs/development/python-modules/gcodepy/default.nix
+++ b/pkgs/development/python-modules/gcodepy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rmeno12";
     repo = "gcodepy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+amBkwwISPyes8ABdqgCw50Zg5ioDa46WZgQsZZgl+8=";
   };
 
diff --git a/pkgs/development/python-modules/gcsa/default.nix b/pkgs/development/python-modules/gcsa/default.nix
index 25436d9b1153..c487881f92b4 100644
--- a/pkgs/development/python-modules/gcsa/default.nix
+++ b/pkgs/development/python-modules/gcsa/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kuzmoyev";
     repo = "google-calendar-simple-api";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ye8mQSzgaEZx0vUpt5xiMrJTFh2AmSB7ZZlKaEj/YpM=";
   };
 
diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix
index be7bce85d7d3..b2282a04a1c0 100644
--- a/pkgs/development/python-modules/gdsfactory/default.nix
+++ b/pkgs/development/python-modules/gdsfactory/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gdsfactory";
     repo = "gdsfactory";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wDz8QpRgu40FB8+otnGsHVn2e6/SWXIZgA1aeMqMhPQ=";
   };
 
diff --git a/pkgs/development/python-modules/gekitchen/default.nix b/pkgs/development/python-modules/gekitchen/default.nix
index a24879df23f0..615be02d1785 100644
--- a/pkgs/development/python-modules/gekitchen/default.nix
+++ b/pkgs/development/python-modules/gekitchen/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ajmarks";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eKGundh7j9LqFd71bx86rNBVu2iAcgLN25JfFa39+VA=";
   };
 
diff --git a/pkgs/development/python-modules/georss-generic-client/default.nix b/pkgs/development/python-modules/georss-generic-client/default.nix
index b7f761164f9a..d0ac06cf8122 100644
--- a/pkgs/development/python-modules/georss-generic-client/default.nix
+++ b/pkgs/development/python-modules/georss-generic-client/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-generic-client";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Y19zMHL6DjAqiDi47Lmst8m9d9kEtTgyRiECKo6CqZY=";
   };
 
diff --git a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
index d9ce2d4c8204..299d78bd3c82 100644
--- a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
+++ b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-nrcan-earthquakes-client";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FFm37+dCkdoZXgvAjYhcHOYFf0oQ37bxJb7vzbWDTro=";
   };
 
diff --git a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
index e2c59fdaf7a5..764fc3fc92f8 100644
--- a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
+++ b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-tfs-incidents-client";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Cz0PRcGReAE0mg04ktCUaoLqPTjvyU1TiB/Pdz7o7zo=";
   };
 
diff --git a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
index a7444c85d6c1..d686f5049aef 100644
--- a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
+++ b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-wa-dfes-client";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-s7qGTlWFdOtw0eMK7idld7HPOxO8CjODCmUi0WmRLdI=";
   };
 
diff --git a/pkgs/development/python-modules/gerbonara/default.nix b/pkgs/development/python-modules/gerbonara/default.nix
index a0b148b0c64e..46a226f5637d 100644
--- a/pkgs/development/python-modules/gerbonara/default.nix
+++ b/pkgs/development/python-modules/gerbonara/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaseg";
     repo = "gerbonara";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SwXoCA9ru5VgH4geKUDgdcPrgEYgNoVwNb5YUBAcXlo=";
   };
 
diff --git a/pkgs/development/python-modules/gfal2-python/default.nix b/pkgs/development/python-modules/gfal2-python/default.nix
index 64f194e70df5..52cb5ad1b227 100644
--- a/pkgs/development/python-modules/gfal2-python/default.nix
+++ b/pkgs/development/python-modules/gfal2-python/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cern-fts";
     repo = "gfal2-python";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Xk+gLTrqfWb0kGB6QhnM62zAHVFb8rRAqCIBxn0V824=";
   };
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/gfal2-util/default.nix b/pkgs/development/python-modules/gfal2-util/default.nix
index ba17c3ec7245..4294aa48b741 100644
--- a/pkgs/development/python-modules/gfal2-util/default.nix
+++ b/pkgs/development/python-modules/gfal2-util/default.nix
@@ -15,7 +15,7 @@
   src = fetchFromGitHub {
     owner = "cern-fts";
     repo = "gfal2-util";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3JbJgKD17aYkrB/aaww7IQU8fLFrTCh868KWlLPxmlk=";
   };
 
diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix
index 74cc334361bb..d03703b37e96 100644
--- a/pkgs/development/python-modules/gibberish-detector/default.nix
+++ b/pkgs/development/python-modules/gibberish-detector/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "domanchi";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b";
   };
 
diff --git a/pkgs/development/python-modules/git-dummy/default.nix b/pkgs/development/python-modules/git-dummy/default.nix
index a2f0e94d2b9d..2fffa2d6e06c 100644
--- a/pkgs/development/python-modules/git-dummy/default.nix
+++ b/pkgs/development/python-modules/git-dummy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "initialcommit-com";
     repo = "git-dummy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-viybxn2J7SO7NgSvjwlP+tgtm+H6QrACafIy82d9XEk=";
   };
 
diff --git a/pkgs/development/python-modules/git-find-repos/default.nix b/pkgs/development/python-modules/git-find-repos/default.nix
index bf47ae7a377d..d97d153ee6c1 100644
--- a/pkgs/development/python-modules/git-find-repos/default.nix
+++ b/pkgs/development/python-modules/git-find-repos/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "acroz";
     repo = "git-find-repos";
-    tag = version;
+    rev = version;
     sha256 = "sha256-4TuZlt6XH4//DBHPuIMl/i3Tp6Uft62dGCTAuZ2rseE=";
   };
 
diff --git a/pkgs/development/python-modules/git-url-parse/default.nix b/pkgs/development/python-modules/git-url-parse/default.nix
index 2ec51928c897..67a0e5a38030 100644
--- a/pkgs/development/python-modules/git-url-parse/default.nix
+++ b/pkgs/development/python-modules/git-url-parse/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coala";
     repo = "git-url-parse";
-    tag = version;
+    rev = version;
     hash = "sha256-+0V/C3wE02ppdDGn7iqdvmgsUwTR7THUakUilvkzoYg=";
   };
 
diff --git a/pkgs/development/python-modules/git-versioner/default.nix b/pkgs/development/python-modules/git-versioner/default.nix
index 042dcc82e33f..ed2fc5ec732e 100644
--- a/pkgs/development/python-modules/git-versioner/default.nix
+++ b/pkgs/development/python-modules/git-versioner/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     owner = "alelec";
     repo = "__version__";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bnpuFJSd4nBXJA75V61kiB+nU5pUzdEAIScfKx7aaGU=";
   };
 
diff --git a/pkgs/development/python-modules/github-to-sqlite/default.nix b/pkgs/development/python-modules/github-to-sqlite/default.nix
index 22b6e69c86f5..20ca2879ae3f 100644
--- a/pkgs/development/python-modules/github-to-sqlite/default.nix
+++ b/pkgs/development/python-modules/github-to-sqlite/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dogsheep";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-KwLaaZxBBzRhiBv4p8Imb5XI1hyka9rmr/rxA6wDc7Q=";
   };
 
diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix
index a500a36807f0..17a2b18c536d 100644
--- a/pkgs/development/python-modules/glean-sdk/default.nix
+++ b/pkgs/development/python-modules/glean-sdk/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "glean";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-egn6RYQHY173fvTCTYrTJltn923UowCjBZg1DI+iHSk=";
   };
 
diff --git a/pkgs/development/python-modules/gpt-2-simple/default.nix b/pkgs/development/python-modules/gpt-2-simple/default.nix
index c6ffc8e8df75..6d12f2629793 100644
--- a/pkgs/development/python-modules/gpt-2-simple/default.nix
+++ b/pkgs/development/python-modules/gpt-2-simple/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "minimaxir";
     repo = "gpt-2-simple";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WwD4sDcc28zXEOISJsq8e+rgaNrrgIy79Wa4J3E7Ovc=";
   };
 
diff --git a/pkgs/development/python-modules/gpxpy/default.nix b/pkgs/development/python-modules/gpxpy/default.nix
index 5a322173ec7c..640f2b4d6fe1 100644
--- a/pkgs/development/python-modules/gpxpy/default.nix
+++ b/pkgs/development/python-modules/gpxpy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tkrajina";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-s65k0u4LIwHX9RJMJIYMkNS4/Z0wstzqYVPAjydo2iI=";
   };
 
diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix
index 6f7c9e9906ce..c447d061e4a2 100644
--- a/pkgs/development/python-modules/grandalf/default.nix
+++ b/pkgs/development/python-modules/grandalf/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdcht";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j2SvpQvDMfwoj2PAQSxzEIyIzzJ61Eb9wgetKyni6A4=";
   };
 
diff --git a/pkgs/development/python-modules/graphlib-backport/default.nix b/pkgs/development/python-modules/graphlib-backport/default.nix
index a850de86b5cf..7f91976b4c21 100644
--- a/pkgs/development/python-modules/graphlib-backport/default.nix
+++ b/pkgs/development/python-modules/graphlib-backport/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mariushelf";
     repo = "graphlib_backport";
-    tag = version;
+    rev = version;
     hash = "sha256-ssJLtBQH8sSnccgcAKLKfYpPyw5U0RIm1F66/Er81lo=";
   };
 
diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix
index 17e986229dce..7d19247c2a34 100644
--- a/pkgs/development/python-modules/graphql-server-core/default.nix
+++ b/pkgs/development/python-modules/graphql-server-core/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "graphql-python";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1w3biv2za2m1brwjy0z049c2m94gm1zfwxzgc6lwrsci724jv9fr";
   };
 
diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix
index dceb43fea137..f29e44d2f440 100644
--- a/pkgs/development/python-modules/grip/default.nix
+++ b/pkgs/development/python-modules/grip/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joeyespo";
     repo = "grip";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CHL2dy0H/i0pLo653F7aUHFvZHTeZA6jC/rwn1KrEW4=";
   };
 
diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix
index 9c8557a10110..5ebc3f1f3361 100644
--- a/pkgs/development/python-modules/gruut-ipa/default.nix
+++ b/pkgs/development/python-modules/gruut-ipa/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Q2UKELoG8OaAPxIrZNCpXgeWZ2fCzb3g3SOVzCm/gg0=";
   };
 
diff --git a/pkgs/development/python-modules/gtts-token/default.nix b/pkgs/development/python-modules/gtts-token/default.nix
index cca1c03efbd0..a747522827ca 100644
--- a/pkgs/development/python-modules/gtts-token/default.nix
+++ b/pkgs/development/python-modules/gtts-token/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "boudewijn26";
     repo = "gTTS-token";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0vr52zc0jqyfvsccl67j1baims3cdx2is1y2lpx2kav9gadkn8hp";
   };
 
diff --git a/pkgs/development/python-modules/help2man/default.nix b/pkgs/development/python-modules/help2man/default.nix
index 69c9c50a2fb7..df9398fcb265 100644
--- a/pkgs/development/python-modules/help2man/default.nix
+++ b/pkgs/development/python-modules/help2man/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Freed-Wu";
     repo = "help2man";
-    tag = version;
+    rev = version;
     hash = "sha256-BIDn+LQzBtDHUtFvIRL3NMXNouO3cMLibuYBoFtCUxI=";
   };
 
diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix
index 505ac130b1a5..930d743b7bf0 100644
--- a/pkgs/development/python-modules/helper/default.nix
+++ b/pkgs/development/python-modules/helper/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gmr";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0zypjv8rncvrsgl200v7d3bn08gs48dwqvgamfqv71h07cj6zngp";
   };
 
diff --git a/pkgs/development/python-modules/here-routing/default.nix b/pkgs/development/python-modules/here-routing/default.nix
index 16e384886e93..d8e6e4a3c800 100644
--- a/pkgs/development/python-modules/here-routing/default.nix
+++ b/pkgs/development/python-modules/here-routing/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eifinger";
     repo = "here_routing";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sdNs5QNYvL1Cpbk9Yi+7PSiDZ6LEgAXQ19IYSAY78p0=";
   };
 
diff --git a/pkgs/development/python-modules/here-transit/default.nix b/pkgs/development/python-modules/here-transit/default.nix
index d83b3d91cee3..2aae9b51fe53 100644
--- a/pkgs/development/python-modules/here-transit/default.nix
+++ b/pkgs/development/python-modules/here-transit/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eifinger";
     repo = "here_transit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fORg1iqRcD75Is1EW9XeAu8astibypmnNXo3vHduQdk=";
   };
 
diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix
index ae2aeee423e1..fd4eb8496ce9 100644
--- a/pkgs/development/python-modules/hetzner/default.nix
+++ b/pkgs/development/python-modules/hetzner/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "hetzner";
     owner = "aszlig";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0nhm7j2y4rgmrl0c1rklg982qllp7fky34dchqwd4czbsdnv9j7a";
   };
 
diff --git a/pkgs/development/python-modules/hightime/default.nix b/pkgs/development/python-modules/hightime/default.nix
index 995ba1d3aaf5..eb2d6b6ad60c 100644
--- a/pkgs/development/python-modules/hightime/default.nix
+++ b/pkgs/development/python-modules/hightime/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ni";
     repo = "hightime";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-P/ZP5smKyNg18YGYWpm/57YGFY3MrX1UIVDU5RsF+rA=";
   };
 
diff --git a/pkgs/development/python-modules/hlk-sw16/default.nix b/pkgs/development/python-modules/hlk-sw16/default.nix
index 43d5add58da3..49a2da2686e4 100644
--- a/pkgs/development/python-modules/hlk-sw16/default.nix
+++ b/pkgs/development/python-modules/hlk-sw16/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jameshilliard";
     repo = "hlk-sw16";
-    tag = version;
+    rev = version;
     sha256 = "010s85nr6xn89i8yvdagg72a97dh1v2pyfqa33v76p9p8xbgh8dz";
   };
 
diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix
index 3648e90f26d7..40d2653d6c0d 100644
--- a/pkgs/development/python-modules/hocr-tools/default.nix
+++ b/pkgs/development/python-modules/hocr-tools/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tmbdev";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p";
   };
 
diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix
index 11746d32b670..7af19f73f6fe 100644
--- a/pkgs/development/python-modules/homepluscontrol/default.nix
+++ b/pkgs/development/python-modules/homepluscontrol/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chemaaa";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-COOGqfYiR4tueQHXuCvVxShrYS0XNltcW4mclbFWcfA=";
   };
 
diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix
index 6495c197cec7..df23b4ec3c8e 100644
--- a/pkgs/development/python-modules/hpack/default.nix
+++ b/pkgs/development/python-modules/hpack/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-hyper";
     repo = "hpack";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2CehGy3K5fKbkB1J8+8x1D4XvnBn1Mbapx+p8rdXDYc=";
   };
 
diff --git a/pkgs/development/python-modules/hsh/default.nix b/pkgs/development/python-modules/hsh/default.nix
index 27edb2daee2d..f7efbc14e8ae 100644
--- a/pkgs/development/python-modules/hsh/default.nix
+++ b/pkgs/development/python-modules/hsh/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrissimpkins";
     repo = "hsh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bAAytoidFHH2dSXqN9aqBd2H4p/rwTWXIZa1t5Djdz0=";
   };
 
diff --git a/pkgs/development/python-modules/hsluv/default.nix b/pkgs/development/python-modules/hsluv/default.nix
index f19ec807e264..063137b74e4d 100644
--- a/pkgs/development/python-modules/hsluv/default.nix
+++ b/pkgs/development/python-modules/hsluv/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hsluv";
     repo = "hsluv-python";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bjivmPTU3Gp3pcC0ru4GSZANdhPqS1QSTMeiPGN8GCI=";
   };
 
diff --git a/pkgs/development/python-modules/html-table-parser-python3/default.nix b/pkgs/development/python-modules/html-table-parser-python3/default.nix
index f8e3c320b3e5..c4f3f8fc46aa 100644
--- a/pkgs/development/python-modules/html-table-parser-python3/default.nix
+++ b/pkgs/development/python-modules/html-table-parser-python3/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "schmijos";
     repo = "html-table-parser-python3";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-okYl0T12wVld7GVbFQH2hgEVKXSScipJN/vYaiRVdGY=";
   };
 
diff --git a/pkgs/development/python-modules/html-tag-names/default.nix b/pkgs/development/python-modules/html-tag-names/default.nix
index d2149d8ecf80..e61fee5d89ab 100644
--- a/pkgs/development/python-modules/html-tag-names/default.nix
+++ b/pkgs/development/python-modules/html-tag-names/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Riverside-Healthcare";
     repo = "html-tag-names";
-    tag = version;
+    rev = version;
     hash = "sha256-2YywP4/0yocejuJwanC5g9BR7mcy5C+zMhCjNZ9FRH4=";
   };
 
diff --git a/pkgs/development/python-modules/html-void-elements/default.nix b/pkgs/development/python-modules/html-void-elements/default.nix
index 3c0f69583759..41cbefbf7ada 100644
--- a/pkgs/development/python-modules/html-void-elements/default.nix
+++ b/pkgs/development/python-modules/html-void-elements/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Riverside-Healthcare";
     repo = "html-void-elements";
-    tag = version;
+    rev = version;
     hash = "sha256-Q5OEczTdgCCyoOsKv3MKRE3w4t/qyPG4YKbF19jlC88=";
   };
 
diff --git a/pkgs/development/python-modules/html5tagger/default.nix b/pkgs/development/python-modules/html5tagger/default.nix
index ac0260a20640..527e3660481b 100644
--- a/pkgs/development/python-modules/html5tagger/default.nix
+++ b/pkgs/development/python-modules/html5tagger/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sanic-org";
     repo = "html5tagger";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Or0EizZC9FMjTcbgecDvgGB09KNGyxHreSDojgB7ysg=";
   };
 
diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix
index 4e2a0cc883f1..6428b99868f2 100644
--- a/pkgs/development/python-modules/httmock/default.nix
+++ b/pkgs/development/python-modules/httmock/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "patrys";
     repo = "httmock";
-    tag = version;
+    rev = version;
     hash = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I=";
   };
 
diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix
index b185f3e8be34..d4010abc5242 100644
--- a/pkgs/development/python-modules/http-ece/default.nix
+++ b/pkgs/development/python-modules/http-ece/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "web-push-libs";
     repo = "encrypted-content-encoding";
-    tag = version;
+    rev = version;
     hash = "sha256-HjXJWoOvCVOdEto4Ss4HPUuf+uNcQkfvj/cxJGHOhQ8=";
   };
 
diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix
index d771e0006f5e..47041ff971fa 100644
--- a/pkgs/development/python-modules/http-message-signatures/default.nix
+++ b/pkgs/development/python-modules/http-message-signatures/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyauth";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Jsivw4lNA/2oqsOGGx8D4gUPftzuys877A9RXyapnSQ=";
   };
 
diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index d014c36c3a3f..a6c3e42a5317 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-76gdiRbF535CEaNXwNqsVeVc0dKglovMPQpGsOkbd/4=";
   };
 
diff --git a/pkgs/development/python-modules/huisbaasje-client/default.nix b/pkgs/development/python-modules/huisbaasje-client/default.nix
index 58cc4c2ff664..65d12537cda8 100644
--- a/pkgs/development/python-modules/huisbaasje-client/default.nix
+++ b/pkgs/development/python-modules/huisbaasje-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dennisschroer";
     repo = "huisbaasje-client";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "113aymffyz1nki3a43j5cyj87qa0762j38qlz0wd5px7diwjxsfl";
   };
 
diff --git a/pkgs/development/python-modules/humblewx/default.nix b/pkgs/development/python-modules/humblewx/default.nix
index 9f7a96a85892..2a60e7e97212 100644
--- a/pkgs/development/python-modules/humblewx/default.nix
+++ b/pkgs/development/python-modules/humblewx/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thetimelineproj";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210";
   };
 
diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix
index fb8d27db2383..84ffe3bcc7e3 100644
--- a/pkgs/development/python-modules/hydrawiser/default.nix
+++ b/pkgs/development/python-modules/hydrawiser/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ptcryan";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "161hazlpvd71xcl2ja86560wm5lnrjv210ki3ji37l6c6gwmhjdj";
   };
 
diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix
index 58f058927ab5..6c0285e8cadd 100644
--- a/pkgs/development/python-modules/hyperion-py/default.nix
+++ b/pkgs/development/python-modules/hyperion-py/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dermotduffy";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-arcnpCQsRuiWCrAz/t4TCjTe8DRDtRuzYp8k7nnjGDk=";
   };
 
diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix
index f5ba5ff55db7..febac35bc4a4 100644
--- a/pkgs/development/python-modules/i3ipc/default.nix
+++ b/pkgs/development/python-modules/i3ipc/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "i3ipc-python";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "13bzs9dcv27czpnnbgz7a037lm8h991c8gk0qzzk5mq5yak24715";
   };
   propagatedBuildInputs = [ xlib ];
diff --git a/pkgs/development/python-modules/ibis/default.nix b/pkgs/development/python-modules/ibis/default.nix
index 912b5a24892f..2300af234784 100644
--- a/pkgs/development/python-modules/ibis/default.nix
+++ b/pkgs/development/python-modules/ibis/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dmulholl";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-EPz9zHnxR75WoRaiHKJNiCRWFwU1TBpC4uHz62jUOqM=";
   };
 
diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix
index 6f182ec16da6..1ea2b702001b 100644
--- a/pkgs/development/python-modules/icmplib/default.nix
+++ b/pkgs/development/python-modules/icmplib/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ValentinBELYN";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PnBcGiUvftz/KYg9Qd2GaIcF3OW4lYH301uI5/M5CBI=";
   };
 
diff --git a/pkgs/development/python-modules/image-diff/default.nix b/pkgs/development/python-modules/image-diff/default.nix
index 7e5f4883c049..1b64799cb0af 100644
--- a/pkgs/development/python-modules/image-diff/default.nix
+++ b/pkgs/development/python-modules/image-diff/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "image-diff";
-    tag = version;
+    rev = version;
     hash = "sha256-AQykJNvBgVjmPVTwJOX17eKWelqvZZieq/giid8GYAY=";
   };
 
diff --git a/pkgs/development/python-modules/imaplib2/default.nix b/pkgs/development/python-modules/imaplib2/default.nix
index 3ce1cd1f21a3..5df25d7ca5ee 100644
--- a/pkgs/development/python-modules/imaplib2/default.nix
+++ b/pkgs/development/python-modules/imaplib2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "imaplib2";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "14asi3xnvf4bb394k5j8c3by6svvmrr75pawzy6kaax5jx0h793m";
   };
 
diff --git a/pkgs/development/python-modules/imgdiff/default.nix b/pkgs/development/python-modules/imgdiff/default.nix
index 43602996edd8..6a168c965d67 100644
--- a/pkgs/development/python-modules/imgdiff/default.nix
+++ b/pkgs/development/python-modules/imgdiff/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mgedmin";
     repo = "imgdiff";
-    tag = version;
+    rev = version;
     hash = "sha256-Y5nUnjihRpVVehhP1LUgfuJN5nCxEJu6P1w99Igpxjs=";
   };
 
diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix
index d27fb1c13dba..64e9a3191a67 100644
--- a/pkgs/development/python-modules/installer/default.nix
+++ b/pkgs/development/python-modules/installer/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A=";
   };
 
diff --git a/pkgs/development/python-modules/interface-meta/default.nix b/pkgs/development/python-modules/interface-meta/default.nix
index f8d8e7c9220d..34754618b5a5 100644
--- a/pkgs/development/python-modules/interface-meta/default.nix
+++ b/pkgs/development/python-modules/interface-meta/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matthewwardrop";
     repo = "interface_meta";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0rzh11wnab33b11391vc2ynf8ncxn22b12wn46lmgkrc5mqza8hd";
   };
 
diff --git a/pkgs/development/python-modules/into-dbus-python/default.nix b/pkgs/development/python-modules/into-dbus-python/default.nix
index 8ca2662ca770..004138c13bdb 100644
--- a/pkgs/development/python-modules/into-dbus-python/default.nix
+++ b/pkgs/development/python-modules/into-dbus-python/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ld/DyhVaDiWUXgqmvSmEHqFW2dcoRNM0O4X5DXE3UtM=";
   };
 
diff --git a/pkgs/development/python-modules/ionhash/default.nix b/pkgs/development/python-modules/ionhash/default.nix
index 1cc215661df7..8d99e24101f3 100644
--- a/pkgs/development/python-modules/ionhash/default.nix
+++ b/pkgs/development/python-modules/ionhash/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amzn";
     repo = "ion-hash-python";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mXOLKXauWwwIA/LnF4qyZsBiF/QM+rF9MmE2ewmozYo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix
index 0a8c567bdeb8..263870816dab 100644
--- a/pkgs/development/python-modules/ipfshttpclient/default.nix
+++ b/pkgs/development/python-modules/ipfshttpclient/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ipfs-shipyard";
     repo = "py-ipfs-http-client";
-    tag = version;
+    rev = version;
     hash = "sha256-OmC67pN2BbuGwM43xNDKlsLhwVeUbpvfOazyIDvoMEA=";
   };
 
diff --git a/pkgs/development/python-modules/ipyniivue/default.nix b/pkgs/development/python-modules/ipyniivue/default.nix
index 8746cc540f70..cdc0a1d2308d 100644
--- a/pkgs/development/python-modules/ipyniivue/default.nix
+++ b/pkgs/development/python-modules/ipyniivue/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niivue";
     repo = "ipyniivue";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rgScBBJ0Jqr5REZ+YFJcKwWcV33RzJ/sn6RqTL/limo=";
   };
 
diff --git a/pkgs/development/python-modules/ipyxact/default.nix b/pkgs/development/python-modules/ipyxact/default.nix
index 3fce40e72527..803ed5378cb4 100644
--- a/pkgs/development/python-modules/ipyxact/default.nix
+++ b/pkgs/development/python-modules/ipyxact/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "olofk";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-myD+NnqcxxaSAV7qZa8xqeciaiFqFePqIzd7sb/2GXA=";
   };
 
diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix
index ca583755b7c0..7fcb1280987f 100644
--- a/pkgs/development/python-modules/ircrobots/default.nix
+++ b/pkgs/development/python-modules/ircrobots/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jesopo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-slz4AH2Mi21N3aV+OrnoXoQsseS7arW2NuUZARQJsf0=";
   };
 
diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix
index 3592aad0445e..3efe469fe093 100644
--- a/pkgs/development/python-modules/ircstates/default.nix
+++ b/pkgs/development/python-modules/ircstates/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jesopo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Mq9aOj6PXzPjaz3ofoPcAbur59oUWffmEg8aHt0v+0Q=";
   };
 
diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix
index 974c4d6f1a72..1e2b962d0f6a 100644
--- a/pkgs/development/python-modules/irctokens/default.nix
+++ b/pkgs/development/python-modules/irctokens/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jesopo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Y9NBqxGUkt48hnXxsmfydHkJmWWb+sRrElV8C7l9bpw=";
   };
 
diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix
index c1cdfd1d00b5..bc4cca3eb2cd 100644
--- a/pkgs/development/python-modules/isal/default.nix
+++ b/pkgs/development/python-modules/isal/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pycompression";
     repo = "python-isal";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gvUVSGarPA4KupQTd61x75CfqNVqZfFC1zq0R21Clf8=";
   };
 
diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix
index fe0962bfcf43..0cf69fbd7660 100644
--- a/pkgs/development/python-modules/isbnlib/default.nix
+++ b/pkgs/development/python-modules/isbnlib/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xlcnd";
     repo = "isbnlib";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-d6p0wv7kj+NOZJRE2rzQgb7PXv+E3tASIibYCjzCdx8=";
   };
 
diff --git a/pkgs/development/python-modules/isoduration/default.nix b/pkgs/development/python-modules/isoduration/default.nix
index c61b68804e16..613f21105d9b 100644
--- a/pkgs/development/python-modules/isoduration/default.nix
+++ b/pkgs/development/python-modules/isoduration/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bolsote";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-6LqsH+3V/K0s2YD1gvmelo+cCH+yCAmmyTYGhUegVdk=";
   };
 
diff --git a/pkgs/development/python-modules/item-synchronizer/default.nix b/pkgs/development/python-modules/item-synchronizer/default.nix
index 4cf0ce22c26b..5e8ecf202995 100644
--- a/pkgs/development/python-modules/item-synchronizer/default.nix
+++ b/pkgs/development/python-modules/item-synchronizer/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bergercookie";
     repo = "item_synchronizer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+mviKtCLlJhYV576Q07kcFJvtls5qohKSrqZtBqE/s4=";
   };
 
diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix
index c8b404890a32..a1e83de89c12 100644
--- a/pkgs/development/python-modules/itypes/default.nix
+++ b/pkgs/development/python-modules/itypes/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "tomchristie";
-    tag = version;
+    rev = version;
     sha256 = "1ljhjp9pacbrv2phs58vppz1dlxix01p98kfhyclvbml6dgjcr52";
   };
 
diff --git a/pkgs/development/python-modules/jax-jumpy/default.nix b/pkgs/development/python-modules/jax-jumpy/default.nix
index 42c6f4d97e1a..1fbda8b2cd3e 100644
--- a/pkgs/development/python-modules/jax-jumpy/default.nix
+++ b/pkgs/development/python-modules/jax-jumpy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-tPQ/v2AVnAEC+08BVAvvgJ8Pj89nXZSn2tQ6nxXuSfA=";
   };
 
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index cdfb2b2a75bb..8e31fe41c780 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "davidhalter";
     repo = "jedi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2nDQJS6LIaq91PG3Av85OMFfs1ZwId00K/kvog3PGXE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/jello/default.nix b/pkgs/development/python-modules/jello/default.nix
index b0f1ee172a7f..bd945515fff8 100644
--- a/pkgs/development/python-modules/jello/default.nix
+++ b/pkgs/development/python-modules/jello/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kellyjonbrazil";
     repo = "jello";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EN09Kcnw4HNT2roCoQyZkoHEfkM9qxqtneZPuBg46z4=";
   };
 
diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix
index 4c116f5df6aa..ca47c0ca312b 100644
--- a/pkgs/development/python-modules/jellyfish/default.nix
+++ b/pkgs/development/python-modules/jellyfish/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jamesturk";
     repo = "jellyfish";
-    tag = version;
+    rev = version;
     hash = "sha256-xInjoTXYgZuHyvyKm+N4PAwHozE5BOkxoYhRzZnPs3Q=";
   };
 
diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix
index 9f89ef60de0d..efce378d706b 100644
--- a/pkgs/development/python-modules/jieba/default.nix
+++ b/pkgs/development/python-modules/jieba/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fxsjy";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk";
   };
 
diff --git a/pkgs/development/python-modules/jproperties/default.nix b/pkgs/development/python-modules/jproperties/default.nix
index 222795c5ccae..83ba9855a0e2 100644
--- a/pkgs/development/python-modules/jproperties/default.nix
+++ b/pkgs/development/python-modules/jproperties/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Tblue";
     repo = "python-jproperties";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-O+ALeGHMNjW1dc9IRyLzO81k8DW2vbGjuZqXxgrhYjo=";
   };
 
diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix
index 8f65574e1be0..951ce91ce43c 100644
--- a/pkgs/development/python-modules/jpylyzer/default.nix
+++ b/pkgs/development/python-modules/jpylyzer/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openpreserve";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-P42qAks8suI/Xknwd8WAkymbGE7RApRa/a11J/V4LA0=";
   };
 
diff --git a/pkgs/development/python-modules/jschon/default.nix b/pkgs/development/python-modules/jschon/default.nix
index cd160ef2cee0..a2308db968c4 100644
--- a/pkgs/development/python-modules/jschon/default.nix
+++ b/pkgs/development/python-modules/jschon/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "marksparkza";
     repo = "jschon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uOvEIEUEILsoLuV5U9AJCQAlT4iHQhsnSt65gfCiW0k=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/json-home-client/default.nix b/pkgs/development/python-modules/json-home-client/default.nix
index 798f84cb3779..fa74eec1676a 100644
--- a/pkgs/development/python-modules/json-home-client/default.nix
+++ b/pkgs/development/python-modules/json-home-client/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "plinss";
     repo = "json_home_client";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DhnvvY1nMe1sdRE+OgjBt4TsLmiqnD8If4rl700zW9E=";
   };
 
diff --git a/pkgs/development/python-modules/json2html/default.nix b/pkgs/development/python-modules/json2html/default.nix
index 3eef3376efef..8a7ef46d7241 100644
--- a/pkgs/development/python-modules/json2html/default.nix
+++ b/pkgs/development/python-modules/json2html/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "softvar";
     repo = "json2html";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Y+mwJ0p4Q2TKMU8qQvuvo08RiMdsReO7psgXaiW9ntk=";
   };
 
diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix
index c237eae59224..b5f3da6150ff 100644
--- a/pkgs/development/python-modules/jsonlines/default.nix
+++ b/pkgs/development/python-modules/jsonlines/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wbolster";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-KNEJdAxEgd0NGPnk9J51C3yUN2e6Cvvevth0iKOMlhE=";
   };
 
diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix
index 8334b5d4ec59..52224a0b8dcd 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emlove";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-KOnycsOZFDEVj8CJDwGbdtbOpMPQMVdrXbHG0fzr9PI=";
   };
 
diff --git a/pkgs/development/python-modules/jsonstreams/default.nix b/pkgs/development/python-modules/jsonstreams/default.nix
index 6e90f2c159e0..49ffcee24b82 100644
--- a/pkgs/development/python-modules/jsonstreams/default.nix
+++ b/pkgs/development/python-modules/jsonstreams/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dcbaker";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0qw74wz9ngz9wiv89vmilbifsbvgs457yn1bxnzhrh7g4vs2wcav";
   };
 
diff --git a/pkgs/development/python-modules/jsonxs/default.nix b/pkgs/development/python-modules/jsonxs/default.nix
index 8ce2511f61e9..cf71095cf765 100644
--- a/pkgs/development/python-modules/jsonxs/default.nix
+++ b/pkgs/development/python-modules/jsonxs/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "fboender";
     repo = "jsonxs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CmKK+qStb9xjmEACY41tQnffD4cMUUQPb74Cni5FTEk=";
   };
 
diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix
index f64184c981e1..2ff93168391a 100644
--- a/pkgs/development/python-modules/junitparser/default.nix
+++ b/pkgs/development/python-modules/junitparser/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "weiwei";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-rhDP05GSWT4K6Z2ip8C9+e3WbvBJOwP0vctvANBs7cw=";
   };
 
diff --git a/pkgs/development/python-modules/justbackoff/default.nix b/pkgs/development/python-modules/justbackoff/default.nix
index 39576c015eac..e8c680a89d37 100644
--- a/pkgs/development/python-modules/justbackoff/default.nix
+++ b/pkgs/development/python-modules/justbackoff/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexferl";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "097j6jxgl4b3z46x9y9z10643vnr9v831vhagrxzrq6nviil2z6l";
   };
 
diff --git a/pkgs/development/python-modules/jwt/default.nix b/pkgs/development/python-modules/jwt/default.nix
index 050ae0b3e161..2da80c7e183c 100644
--- a/pkgs/development/python-modules/jwt/default.nix
+++ b/pkgs/development/python-modules/jwt/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     inherit version;
     owner = "GehirnInc";
     repo = "python-jwt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N1J8yBVX/O+92cRp+q2gA2cFsd+C7JjUR9jo0VGoINg=";
   };
 
diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix
index 6f30b1f50799..c26bbabb60c7 100644
--- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix
+++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "daanzu";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0lilk6yjzcy31avy2z36bl9lr60gzwhmyqwqn8akq11qc3mbffsk";
   };
 
diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
index f28353881e57..00d2e2802f09 100644
--- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
+++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "daanzu";
     repo = "kaldi-fork-active-grammar";
-    tag = version;
+    rev = version;
     sha256 = "+kT2xJRwDj/ECv/v/J1FpsINWOK8XkP9ZvZ9moFRl70=";
   };
 
diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix
index fd126f1aac33..f0633a06b838 100644
--- a/pkgs/development/python-modules/keepkey/default.nix
+++ b/pkgs/development/python-modules/keepkey/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "keepkey";
     repo = "python-keepkey";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "00hqppdj3s9y25x4ad59y8axq94dd4chhw9zixq32sdrd9v8z55a";
   };
 
diff --git a/pkgs/development/python-modules/keyboard/default.nix b/pkgs/development/python-modules/keyboard/default.nix
index b80367909c06..7620e272ea71 100644
--- a/pkgs/development/python-modules/keyboard/default.nix
+++ b/pkgs/development/python-modules/keyboard/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "boppreh";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-U4GWhPp28azBE3Jn9xpLxudOKx0PjnYO77EM2HsJ9lM=";
   };
 
diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix
index 16e10820df07..e9b09ba1e0ec 100644
--- a/pkgs/development/python-modules/keyutils/default.nix
+++ b/pkgs/development/python-modules/keyutils/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sassoftware";
     repo = "python-keyutils";
-    tag = version;
+    rev = version;
     sha256 = "0pfqfr5xqgsqkxzrmj8xl2glyl4nbq0irs0k6ik7iy3gd3mxf5g1";
   };
 
diff --git a/pkgs/development/python-modules/kfactory/default.nix b/pkgs/development/python-modules/kfactory/default.nix
index b543601fc48a..3652d517d048 100644
--- a/pkgs/development/python-modules/kfactory/default.nix
+++ b/pkgs/development/python-modules/kfactory/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gdsfactory";
     repo = "kfactory";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VLhAJ5rOBKEO1FDCnlaseA+SmrMSoyS+BaEzjdHm59Y=";
   };
 
diff --git a/pkgs/development/python-modules/kivy-garden/default.nix b/pkgs/development/python-modules/kivy-garden/default.nix
index 015cd084e49a..34792e64d144 100644
--- a/pkgs/development/python-modules/kivy-garden/default.nix
+++ b/pkgs/development/python-modules/kivy-garden/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kivy-garden";
     repo = "garden";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xOMBPFKV7mTa51Q0VKja7b0E509IaWjwlJVlSRVdct8=";
   };
 
diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix
index 7a5f56ba3812..c120217683c6 100644
--- a/pkgs/development/python-modules/klaus/default.nix
+++ b/pkgs/development/python-modules/klaus/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jonashaag";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-GflSDhBmMsQ34o3ApraEJ6GmlXXP2kK6WW3lsfr6b7g=";
   };
 
diff --git a/pkgs/development/python-modules/kml2geojson/default.nix b/pkgs/development/python-modules/kml2geojson/default.nix
index e23fd7833638..3b392a227aae 100644
--- a/pkgs/development/python-modules/kml2geojson/default.nix
+++ b/pkgs/development/python-modules/kml2geojson/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mrcagney";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-iJEcXpvy+Y3MkxAF2Q1Tkcx8GxUVjeVzv6gl134zdiI=";
   };
 
diff --git a/pkgs/development/python-modules/kotsu/default.nix b/pkgs/development/python-modules/kotsu/default.nix
index 6c251d729c08..9add6e9733a3 100644
--- a/pkgs/development/python-modules/kotsu/default.nix
+++ b/pkgs/development/python-modules/kotsu/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "datavaluepeople";
     repo = "kotsu";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-V5OkgiLUTRNbNt6m94+aYUZd9Nw+/60LfhrqqdFhiUw=";
   };
 
diff --git a/pkgs/development/python-modules/krakenex/default.nix b/pkgs/development/python-modules/krakenex/default.nix
index b51c5b5f5e0b..fb756b65ae64 100644
--- a/pkgs/development/python-modules/krakenex/default.nix
+++ b/pkgs/development/python-modules/krakenex/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "veox";
     repo = "python3-krakenex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-htldEds3vf9bjFkJAew0e0fHDLD15OTcVYybSmIp3DI=";
   };
 
diff --git a/pkgs/development/python-modules/laszip/default.nix b/pkgs/development/python-modules/laszip/default.nix
index 97d43819b903..461102cc69db 100644
--- a/pkgs/development/python-modules/laszip/default.nix
+++ b/pkgs/development/python-modules/laszip/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tmontaigu";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-MiPzL9TDCf1xnCv7apwdfcpkFnBRi4PO/atTQxqL8cw=";
   };
 
diff --git a/pkgs/development/python-modules/latex2mathml/default.nix b/pkgs/development/python-modules/latex2mathml/default.nix
index 152ec203e71c..0cf23f39e3e9 100644
--- a/pkgs/development/python-modules/latex2mathml/default.nix
+++ b/pkgs/development/python-modules/latex2mathml/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "roniemartinez";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-DLdSFMsNA0gD6Iw0kn+0IrbvyI0VEGOpz0ZYD48nRkY=";
   };
 
diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix
index af4536e85233..0cbc048ee670 100644
--- a/pkgs/development/python-modules/ledgerwallet/default.nix
+++ b/pkgs/development/python-modules/ledgerwallet/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LedgerHQ";
     repo = "ledgerctl";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PBULYvyO3+YaW+a1/enJtKB/DR4ndL/o/WdpETbWyZ0=";
   };
 
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index c40b26513e17..cf13ca12e3e2 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libArcus";
-    tag = version;
+    rev = version;
     hash = "sha256-X33ptwYj9YkVWqUDPP+Ic+hoIb+rwsLdQXvHLA9z+3w=";
   };
 
diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix
index a506c0a1cd65..65e4c578dff9 100644
--- a/pkgs/development/python-modules/liblarch/default.nix
+++ b/pkgs/development/python-modules/liblarch/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getting-things-gnome";
     repo = "liblarch";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A2qChe2z6rAhjRVX5VoHQitebf/nMATdVZQgtlquuYg=";
   };
 
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index 7c806e0c4175..265bfeab5443 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "saltstack";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-phECLGDcBfDi/r2y0eGtqgIX/hvirtBqO8UUvEJ66zo=";
   };
 
diff --git a/pkgs/development/python-modules/libpyvivotek/default.nix b/pkgs/development/python-modules/libpyvivotek/default.nix
index 0b7e980f53b9..7320880a1539 100644
--- a/pkgs/development/python-modules/libpyvivotek/default.nix
+++ b/pkgs/development/python-modules/libpyvivotek/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HarlemSquirrel";
     repo = "python-vivotek";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "pNlnGpDjdYE7Lxog8GGZV+UZZmfmt5bwHof5LngPQjg=";
   };
 
diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
index ea54a3a2eee7..da39e67f5225 100644
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libSavitar";
-    tag = version;
+    rev = version;
     hash = "sha256-MAA1WtGED6lvU6N4BE6wwY1aYaFrCq/gkmQFz3VWqNA=";
   };
 
diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix
index fd5c080819cb..b311d6888d6c 100644
--- a/pkgs/development/python-modules/libversion/default.nix
+++ b/pkgs/development/python-modules/libversion/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "repology";
     repo = "py-libversion";
-    tag = version;
+    rev = version;
     hash = "sha256-p0wtSB+QXAERf+57MMb8cqWoy1bG3XaCpR9GPwYYvJM=";
   };
 
diff --git a/pkgs/development/python-modules/lightparam/default.nix b/pkgs/development/python-modules/lightparam/default.nix
index f0d5b2fdb55e..635827b45669 100644
--- a/pkgs/development/python-modules/lightparam/default.nix
+++ b/pkgs/development/python-modules/lightparam/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "portugueslab";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "13hlkvjcyz2lhvlfqyavja64jccbidshhs39sl4fibrn9iq34s3i";
   };
 
diff --git a/pkgs/development/python-modules/limiter/default.nix b/pkgs/development/python-modules/limiter/default.nix
index 4c4f54f869c4..4da1afdb4f88 100644
--- a/pkgs/development/python-modules/limiter/default.nix
+++ b/pkgs/development/python-modules/limiter/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexdelorenzo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2Et4ozVf9t+tp2XtLbDk/LgLIU+jQAEAlU8hA5lpxdk=";
   };
 
diff --git a/pkgs/development/python-modules/lineedit/default.nix b/pkgs/development/python-modules/lineedit/default.nix
index 89e4154c86b1..51f5e5a83407 100644
--- a/pkgs/development/python-modules/lineedit/default.nix
+++ b/pkgs/development/python-modules/lineedit/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "fq2NpjIQkIq1yzXEUxi6cz80kutVqcH6MqJXHtpTFsk=";
   };
 
diff --git a/pkgs/development/python-modules/litemapy/default.nix b/pkgs/development/python-modules/litemapy/default.nix
index 62cafa694733..02e321182f05 100644
--- a/pkgs/development/python-modules/litemapy/default.nix
+++ b/pkgs/development/python-modules/litemapy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SmylerMC";
     repo = "litemapy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mGRnrFfrg0VD9pXs0WOuiP6QnYyu0Jbv/bqCWtkOie0=";
   };
 
diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix
index 9a77cb48d7e3..df6ab5c4b7b3 100644
--- a/pkgs/development/python-modules/lizard/default.nix
+++ b/pkgs/development/python-modules/lizard/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "terryyin";
     repo = "lizard";
-    tag = version;
+    rev = version;
     hash = "sha256-4jq6gXpI1hFtX7ka2c/qQ+S6vZCThKOGhQwJ2FOYItY=";
   };
 
diff --git a/pkgs/development/python-modules/logi-circle/default.nix b/pkgs/development/python-modules/logi-circle/default.nix
index 5510591ac3ad..af73f77aadef 100644
--- a/pkgs/development/python-modules/logi-circle/default.nix
+++ b/pkgs/development/python-modules/logi-circle/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "evanjd";
     repo = "python-logi-circle";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Q+uoaimJjn6MiO3jXGYyZ6cS0tqI06Azkq1QbNq2FN8=";
   };
 
diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix
index 42b48b1d8f95..19fa5b64b9ed 100644
--- a/pkgs/development/python-modules/logster/default.nix
+++ b/pkgs/development/python-modules/logster/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "etsy";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "06ac5hydas24h2cn8l5i69v1z0min5hwh6a1lcm1b08xnvpsi85q";
   };
 
diff --git a/pkgs/development/python-modules/lpc-checksum/default.nix b/pkgs/development/python-modules/lpc-checksum/default.nix
index 2ec9840c5352..810878cec585 100644
--- a/pkgs/development/python-modules/lpc-checksum/default.nix
+++ b/pkgs/development/python-modules/lpc-checksum/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "basilfx";
     repo = "lpc_checksum";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-POgV0BdkMLmdjBh/FToPPmJTAxsPASB7ZE32SqGGKHk=";
   };
 
diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix
index d24b14072ce3..213db1480c14 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/pkgs/development/python-modules/luftdaten/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-luftdaten";
-    tag = version;
+    rev = version;
     hash = "sha256-nOhJKlUJ678DJ/ilyRHaiQ2fGfoCl+x6l9lsczVLAGw=";
   };
 
diff --git a/pkgs/development/python-modules/luhn/default.nix b/pkgs/development/python-modules/luhn/default.nix
index 0319c8a09431..b0407235fe0a 100644
--- a/pkgs/development/python-modules/luhn/default.nix
+++ b/pkgs/development/python-modules/luhn/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mmcloughlin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-ZifaCjOVhWdXuzi5n6V+6eVN5vrEHKgUdpSOXoMyR18=";
   };
 
diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix
index 89b79b61e88c..fd1f6c474fa0 100644
--- a/pkgs/development/python-modules/luxtronik/default.nix
+++ b/pkgs/development/python-modules/luxtronik/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bouni";
     repo = "python-luxtronik";
-    tag = version;
+    rev = version;
     hash = "sha256-7TuvqOAb/MUumOF6BKTRLOJuvteqZPmFUXXsuwEpmOM=";
   };
 
diff --git a/pkgs/development/python-modules/lzallright/default.nix b/pkgs/development/python-modules/lzallright/default.nix
index d3d721f84e35..bb6138bb7d16 100644
--- a/pkgs/development/python-modules/lzallright/default.nix
+++ b/pkgs/development/python-modules/lzallright/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vlaci";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6Dez14qlZ7cnVQfaiTHGuiTSAHvBoKtolgKF7ne9ASw=";
   };
 
diff --git a/pkgs/development/python-modules/macaddress/default.nix b/pkgs/development/python-modules/macaddress/default.nix
index a6238a0dd478..137561253049 100644
--- a/pkgs/development/python-modules/macaddress/default.nix
+++ b/pkgs/development/python-modules/macaddress/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mentalisttraceur";
     repo = "python-macaddress";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2eD5Ui8kUduKLJ0mSiwaz7TQSeF1+2ASirp70V/8+EA=";
   };
 
diff --git a/pkgs/development/python-modules/macholib/default.nix b/pkgs/development/python-modules/macholib/default.nix
index 2e36ef54e41c..6bf2ec3eeeb7 100644
--- a/pkgs/development/python-modules/macholib/default.nix
+++ b/pkgs/development/python-modules/macholib/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ronaldoussoren";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bTql10Ceny4fBCxnEWz1m1wi03EWMDW9u99IQiWYbnY=";
   };
 
diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix
index 948794579959..d87d2de44bb5 100644
--- a/pkgs/development/python-modules/macropy/default.nix
+++ b/pkgs/development/python-modules/macropy/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lihaoyi";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1bd2fzpa30ddva3f8lw2sbixxf069idwib8srd64s5v46ricm2cf";
   };
 
diff --git a/pkgs/development/python-modules/mando/default.nix b/pkgs/development/python-modules/mando/default.nix
index 7198c434f17d..d6b8055a730c 100644
--- a/pkgs/development/python-modules/mando/default.nix
+++ b/pkgs/development/python-modules/mando/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rubik";
     repo = "mando";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FuQZ53ojrQO++0TN0C3hk0LXH+mcfRqtGq8VvfYDufg=";
   };
 
diff --git a/pkgs/development/python-modules/manuf/default.nix b/pkgs/development/python-modules/manuf/default.nix
index 95575e9a884e..2210f4a40fae 100644
--- a/pkgs/development/python-modules/manuf/default.nix
+++ b/pkgs/development/python-modules/manuf/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coolbho3k";
     repo = "manuf";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-3CFs3aqwE8rZPwU1QBqAGxNHT5jg7ymG12yBD56gTNI=";
   };
 
diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix
index f53443dca1e8..304f143b884b 100644
--- a/pkgs/development/python-modules/matchpy/default.nix
+++ b/pkgs/development/python-modules/matchpy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HPAC";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-n5rXIjqVQZzEbfIZVQiGLh2PR1DHAJ9gumcrbvwnasA=";
   };
 
diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix
index c8c5a20ff03c..43b766a5662f 100644
--- a/pkgs/development/python-modules/materialx/default.nix
+++ b/pkgs/development/python-modules/materialx/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "MaterialX";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo=";
   };
 
diff --git a/pkgs/development/python-modules/matplotx/default.nix b/pkgs/development/python-modules/matplotx/default.nix
index 3fd34261ad25..17bf869e874a 100644
--- a/pkgs/development/python-modules/matplotx/default.nix
+++ b/pkgs/development/python-modules/matplotx/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = "matplotx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EWEiEY23uFwd/vgWVLCH/buUmgRqz1rqqlJEdXINYMg=";
   };
 
diff --git a/pkgs/development/python-modules/mbddns/default.nix b/pkgs/development/python-modules/mbddns/default.nix
index 7f0595aac503..d738cca95394 100644
--- a/pkgs/development/python-modules/mbddns/default.nix
+++ b/pkgs/development/python-modules/mbddns/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thinkl33t";
     repo = "mb-ddns";
-    tag = version;
+    rev = version;
     sha256 = "13xzkprqk1v0zlzx4a0n9zzpnlb1g2h6pc62ms66fj72lsmjynj7";
   };
 
diff --git a/pkgs/development/python-modules/mdurl/default.nix b/pkgs/development/python-modules/mdurl/default.nix
index ae1bec1d7f68..6a5e3a7cdc73 100644
--- a/pkgs/development/python-modules/mdurl/default.nix
+++ b/pkgs/development/python-modules/mdurl/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-wxV8DKeTwKpFTUBuGTQXaVHc0eW1//Y+2V8Kgs85TDM=";
   };
 
diff --git a/pkgs/development/python-modules/medvol/default.nix b/pkgs/development/python-modules/medvol/default.nix
index ed265a0848f7..79eec9d2cb64 100644
--- a/pkgs/development/python-modules/medvol/default.nix
+++ b/pkgs/development/python-modules/medvol/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MIC-DKFZ";
     repo = "medvol";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JOw0ODx5yuBY5FyXy9z5C/NE/iok5GwiInalgXW/1J8=";
   };
 
diff --git a/pkgs/development/python-modules/memory-tempfile/default.nix b/pkgs/development/python-modules/memory-tempfile/default.nix
index a105d595a6e7..a50a7c50de60 100644
--- a/pkgs/development/python-modules/memory-tempfile/default.nix
+++ b/pkgs/development/python-modules/memory-tempfile/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mbello";
     repo = "memory-tempfile";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4fz2CLkZdy2e1GwGw/afG54LkUVJ4cza70jcbX3rVlQ=";
   };
 
diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix
index d7179b4cd815..7fd6e040a2af 100644
--- a/pkgs/development/python-modules/mercantile/default.nix
+++ b/pkgs/development/python-modules/mercantile/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w=";
   };
 
diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix
index 48de8d7c6b79..ebb396a99089 100644
--- a/pkgs/development/python-modules/mergedeep/default.nix
+++ b/pkgs/development/python-modules/mergedeep/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "clarketm";
     repo = "mergedeep";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1msvvdzk33sxzgyvs4fs8dlsrsi7fjj038z83s0yw5h8m8d78469";
   };
 
diff --git a/pkgs/development/python-modules/messagebird/default.nix b/pkgs/development/python-modules/messagebird/default.nix
index 8ee32c481c79..302ce5087bc6 100644
--- a/pkgs/development/python-modules/messagebird/default.nix
+++ b/pkgs/development/python-modules/messagebird/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "messagebird";
     repo = "python-rest-api";
-    tag = version;
+    rev = version;
     hash = "sha256-OiLhnmZ725VbyoOHvSf4nKQRA7JsxqcOv0VKBL6rUtU=";
   };
 
diff --git a/pkgs/development/python-modules/meteocalc/default.nix b/pkgs/development/python-modules/meteocalc/default.nix
index 80c6e2f81be2..38c39d7d42ca 100644
--- a/pkgs/development/python-modules/meteocalc/default.nix
+++ b/pkgs/development/python-modules/meteocalc/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "malexer";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-WuIW6hROQkjMfbCLUouECIrp4s6oCd2/N79hsrTbVTk=";
   };
 
diff --git a/pkgs/development/python-modules/methodtools/default.nix b/pkgs/development/python-modules/methodtools/default.nix
index b742eb6d7014..88898db177ee 100644
--- a/pkgs/development/python-modules/methodtools/default.nix
+++ b/pkgs/development/python-modules/methodtools/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "youknowone";
     repo = "methodtools";
-    tag = version;
+    rev = version;
     hash = "sha256-Y5VdYVSb3A+32waUUoIDDGW+AhRapN71pebTTlJC0es=";
   };
 
diff --git a/pkgs/development/python-modules/microdata/default.nix b/pkgs/development/python-modules/microdata/default.nix
index 6c8f1700fa3d..d53ecea8defc 100644
--- a/pkgs/development/python-modules/microdata/default.nix
+++ b/pkgs/development/python-modules/microdata/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "edsu";
     repo = "microdata";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BAygCLBLxZ033ZWRFSR52dSM2nPY8jXplDXQ8WW3KPo=";
   };
 
diff --git a/pkgs/development/python-modules/minexr/default.nix b/pkgs/development/python-modules/minexr/default.nix
index d34b3cf973f1..d99149d8b568 100644
--- a/pkgs/development/python-modules/minexr/default.nix
+++ b/pkgs/development/python-modules/minexr/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cheind";
     repo = "py-minexr";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Om67ttAHxu7C3IwPB+JHYi78E9qBi1E6layMVg4+S3M=";
   };
 
diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix
index e96c8e7268dd..63e8ef0b3778 100644
--- a/pkgs/development/python-modules/minimock/default.nix
+++ b/pkgs/development/python-modules/minimock/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lowks";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ut3iKc7Sr28uGgWCV3K3CS+gBta2icvbUPMjjo4fflU=";
   };
 
diff --git a/pkgs/development/python-modules/mitmproxy-rs/default.nix b/pkgs/development/python-modules/mitmproxy-rs/default.nix
index 2b8896c8a06c..e5f9300a38d1 100644
--- a/pkgs/development/python-modules/mitmproxy-rs/default.nix
+++ b/pkgs/development/python-modules/mitmproxy-rs/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "mitmproxy_rs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vC+Vsv7UWjkO+6lm7gAb91Ig04Y7r9gYQoz6R9xpxsA=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-get-deps/default.nix b/pkgs/development/python-modules/mkdocs-get-deps/default.nix
index 379f107a2c2c..60faf85431f3 100644
--- a/pkgs/development/python-modules/mkdocs-get-deps/default.nix
+++ b/pkgs/development/python-modules/mkdocs-get-deps/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkdocs";
     repo = "get-deps";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DahmSYWYhVch950InYBiCh6qz1pH2Kibf5ixwCNdsTg=";
   };
 
diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix
index 73a5f5f12519..284222299cd3 100644
--- a/pkgs/development/python-modules/mlrose/default.nix
+++ b/pkgs/development/python-modules/mlrose/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gkhayes";
     repo = "mlrose";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1dn43k3rcypj58ymcj849b37w66jz7fphw8842v6mlbij3x0rxfl";
   };
 
diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix
index a16aff9aeba2..4250e048430e 100644
--- a/pkgs/development/python-modules/mnemonic/default.nix
+++ b/pkgs/development/python-modules/mnemonic/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trezor";
     repo = "python-mnemonic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-D1mS/JQhefYmwrShfWR9SdiGsBUM+jmuCkfWix9tDOU=";
   };
 
diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix
index 2669463ebf1e..3cf1095b20ea 100644
--- a/pkgs/development/python-modules/mock-open/default.nix
+++ b/pkgs/development/python-modules/mock-open/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nivbend";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm";
   };
 
diff --git a/pkgs/development/python-modules/mock-services/default.nix b/pkgs/development/python-modules/mock-services/default.nix
index 0674206ce6f7..723ec6f78233 100644
--- a/pkgs/development/python-modules/mock-services/default.nix
+++ b/pkgs/development/python-modules/mock-services/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "peopledoc";
     repo = "mock-services";
-    tag = version;
+    rev = version;
     sha256 = "1rqyyfwngi1xsd9a81irjxacinkj1zf6nqfvfxhi55ky34x5phf9";
   };
 
diff --git a/pkgs/development/python-modules/mockfs/default.nix b/pkgs/development/python-modules/mockfs/default.nix
index e9ead7662c88..5e6da22c91d4 100644
--- a/pkgs/development/python-modules/mockfs/default.nix
+++ b/pkgs/development/python-modules/mockfs/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mockfs";
     repo = "mockfs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JwSkOI0dz9ZetfE0ZL3CthvcCSXGFYX+yQZy/oC6VBk=";
   };
 
diff --git a/pkgs/development/python-modules/moddb/default.nix b/pkgs/development/python-modules/moddb/default.nix
index 0173841c4362..9da9cb837c51 100644
--- a/pkgs/development/python-modules/moddb/default.nix
+++ b/pkgs/development/python-modules/moddb/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ClementJ18";
     repo = "moddb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2t5QQAmSLOrdNCl0XdsFPdP2UF10/qq69DovqeQ1Vt8=";
   };
 
diff --git a/pkgs/development/python-modules/monero/default.nix b/pkgs/development/python-modules/monero/default.nix
index 9268800b3c17..af2afd3d7502 100644
--- a/pkgs/development/python-modules/monero/default.nix
+++ b/pkgs/development/python-modules/monero/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "monero-ecosystem";
     repo = "monero-python";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WIF3pFBOLgozYTrQHLzIRgSlT3dTZTe+7sF/dVjVdTo=";
   };
 
diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix
index d6981a14f0e0..487de3c3228c 100644
--- a/pkgs/development/python-modules/motioneye-client/default.nix
+++ b/pkgs/development/python-modules/motioneye-client/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dermotduffy";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kgFSd5RjO+OtnPeAOimPTDVEfJ47rXh2Ku5xEYStHv8=";
   };
 
diff --git a/pkgs/development/python-modules/mozilla-django-oidc/default.nix b/pkgs/development/python-modules/mozilla-django-oidc/default.nix
index bb3e79141336..cd44808efc57 100644
--- a/pkgs/development/python-modules/mozilla-django-oidc/default.nix
+++ b/pkgs/development/python-modules/mozilla-django-oidc/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "mozilla-django-oidc";
-    tag = version;
+    rev = version;
     hash = "sha256-72F1aLLIId+YClTrpOz3bL8LSq6ZhZjjtv8V/GJGkqs=";
   };
 
diff --git a/pkgs/development/python-modules/mpegdash/default.nix b/pkgs/development/python-modules/mpegdash/default.nix
index bc21eb9df839..3480c4dcafd8 100644
--- a/pkgs/development/python-modules/mpegdash/default.nix
+++ b/pkgs/development/python-modules/mpegdash/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sangwonl";
     repo = "python-mpegdash";
-    tag = version;
+    rev = version;
     hash = "sha256-eKtJ+QzeoMog5X1r1ix9vrmGTi/9KzdJiu80vrTX14I=";
   };
 
diff --git a/pkgs/development/python-modules/mplcursors/default.nix b/pkgs/development/python-modules/mplcursors/default.nix
index dc8d2dd101ac..1a1c2dda4c4a 100644
--- a/pkgs/development/python-modules/mplcursors/default.nix
+++ b/pkgs/development/python-modules/mplcursors/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "anntzer";
     repo = "mplcursors";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L5pJqRpgPRQEsRDoP10+Pi8uzH5TQNBuGRx7hIL1x7s=";
   };
 
diff --git a/pkgs/development/python-modules/mpldatacursor/default.nix b/pkgs/development/python-modules/mpldatacursor/default.nix
index fd98a968d3e2..4b33f34b93ed 100644
--- a/pkgs/development/python-modules/mpldatacursor/default.nix
+++ b/pkgs/development/python-modules/mpldatacursor/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joferkington";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0i1lwl6x6hgjq4xwsc138i4v5895lmnpfqwpzpnj5mlck6fy6rda";
   };
 
diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix
index 44c84dd875e0..716a51f00d86 100644
--- a/pkgs/development/python-modules/mpv/default.nix
+++ b/pkgs/development/python-modules/mpv/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaseg";
     repo = "python-mpv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2sYWTzj7+ozezNX0uFdJW+A0K6bwAmiVvqo/lr9UToA=";
   };
 
diff --git a/pkgs/development/python-modules/ms-cv/default.nix b/pkgs/development/python-modules/ms-cv/default.nix
index f5db26e0c424..d651ce1a3771 100644
--- a/pkgs/development/python-modules/ms-cv/default.nix
+++ b/pkgs/development/python-modules/ms-cv/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OpenXbox";
     repo = "ms_cv";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0pkna0kvmq1cp4rx3dnzxsvvlxxngryp77k42wkyw2phv19a2mjd";
   };
 
diff --git a/pkgs/development/python-modules/mutf8/default.nix b/pkgs/development/python-modules/mutf8/default.nix
index 22b6b5d18b18..c7d2afdd1308 100644
--- a/pkgs/development/python-modules/mutf8/default.nix
+++ b/pkgs/development/python-modules/mutf8/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TkTech";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4Ojn3t0EbOVdrYEiY8JegJuvW9sz8jt9tKFwOluiGQo=";
   };
 
diff --git a/pkgs/development/python-modules/mygene/default.nix b/pkgs/development/python-modules/mygene/default.nix
index bcff032fb29c..42da42425495 100644
--- a/pkgs/development/python-modules/mygene/default.nix
+++ b/pkgs/development/python-modules/mygene/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "biothings";
     repo = "mygene.py";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/KxlzOTbZTN5BA0PrJyivVFh4cLtW90/EFwczda61Tg=";
   };
 
diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix
index 37916c04f6ba..badf6d899708 100644
--- a/pkgs/development/python-modules/mygpoclient/default.nix
+++ b/pkgs/development/python-modules/mygpoclient/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gpodder";
     repo = "mygpoclient";
-    tag = version;
+    rev = version;
     hash = "sha256-McHllitWiBiCdNuJlUg6K/vgr2l3ychu+KOx3r/UCv0=";
   };
 
diff --git a/pkgs/development/python-modules/myhome/default.nix b/pkgs/development/python-modules/myhome/default.nix
index 81fa459d95db..ce22d1a25c63 100644
--- a/pkgs/development/python-modules/myhome/default.nix
+++ b/pkgs/development/python-modules/myhome/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "speijnik";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DJzwvgvSA9Q0kpueUoQV64pdDDNA7WzGu7r+g5aqutk=";
   };
 
diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix
index ed792fea5849..3282a6b6e863 100644
--- a/pkgs/development/python-modules/mypy/extensions.nix
+++ b/pkgs/development/python-modules/mypy/extensions.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python";
     repo = "mypy_extensions";
-    tag = version;
+    rev = version;
     hash = "sha256-gOfHC6dUeBE7SsWItpUHHIxW3wzhPM5SuGW1U8P7DD0=";
   };
 
diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix
index b587dacefb96..be6966cd9a1e 100644
--- a/pkgs/development/python-modules/mysql-connector/default.nix
+++ b/pkgs/development/python-modules/mysql-connector/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mysql";
     repo = "mysql-connector-python";
-    tag = version;
+    rev = version;
     hash = "sha256-GtMq7E2qBqFu54hjUotzPyxScTKXNdEQcmgHnS7lBhc=";
   };
 
diff --git a/pkgs/development/python-modules/nad-receiver/default.nix b/pkgs/development/python-modules/nad-receiver/default.nix
index 8ef8c8aed310..35b6cacf54f8 100644
--- a/pkgs/development/python-modules/nad-receiver/default.nix
+++ b/pkgs/development/python-modules/nad-receiver/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joopert";
     repo = "nad_receiver";
-    tag = version;
+    rev = version;
     hash = "sha256-jRMk/yMA48ei+g/33+mMYwfwixaKTMYcU/z/VOoJbvY=";
   };
 
diff --git a/pkgs/development/python-modules/naked/default.nix b/pkgs/development/python-modules/naked/default.nix
index 44113126507e..adabd6c6f5aa 100644
--- a/pkgs/development/python-modules/naked/default.nix
+++ b/pkgs/development/python-modules/naked/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrissimpkins";
     repo = "naked";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KhygnURFggvUTR9wwWtORtfQES8ANd5sIaCONvIhfRM=";
   };
 
diff --git a/pkgs/development/python-modules/name-that-hash/default.nix b/pkgs/development/python-modules/name-that-hash/default.nix
index 01b4e82ab857..ae094b0a142c 100644
--- a/pkgs/development/python-modules/name-that-hash/default.nix
+++ b/pkgs/development/python-modules/name-that-hash/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HashPals";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-zOb4BS3zG1x8GLXAooqqvMOw0fNbw35JuRWOdGP26/8=";
   };
 
diff --git a/pkgs/development/python-modules/names/default.nix b/pkgs/development/python-modules/names/default.nix
index 0a13054c9b71..c4648e171a72 100644
--- a/pkgs/development/python-modules/names/default.nix
+++ b/pkgs/development/python-modules/names/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "treyhunner";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0jfn11bl05k3qkqw0f4vi2i2lhllxdrbb1732qiisdy9fbvv8611";
   };
 
diff --git a/pkgs/development/python-modules/nbtlib/default.nix b/pkgs/development/python-modules/nbtlib/default.nix
index 792e2b41d603..cb4a0ad4f6f3 100644
--- a/pkgs/development/python-modules/nbtlib/default.nix
+++ b/pkgs/development/python-modules/nbtlib/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vberlier";
     repo = "nbtlib";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L8eX6/0qiQ4UxbmDicLedzj+oBjYmlK96NpljE/A3eI=";
   };
 
diff --git a/pkgs/development/python-modules/nc-dnsapi/default.nix b/pkgs/development/python-modules/nc-dnsapi/default.nix
index 5b6a9ea291e3..cf6511b1eb97 100644
--- a/pkgs/development/python-modules/nc-dnsapi/default.nix
+++ b/pkgs/development/python-modules/nc-dnsapi/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nbuchwitz";
     repo = "nc_dnsapi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OE4+wJbJbUZ+YB5J5OyvytLFCcrnXCeZEqmphHKKprQ=";
   };
 
diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix
index 3127b4f08a9c..6773eed000c8 100644
--- a/pkgs/development/python-modules/ndg-httpsclient/default.nix
+++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cedadev";
     repo = "ndg_httpsclient";
-    tag = version;
+    rev = version;
     sha256 = "0lhsgs4am4xyjssng5p0vkfwqncczj1dpa0vss4lrhzq86mnn5rz";
   };
 
diff --git a/pkgs/development/python-modules/ndms2-client/default.nix b/pkgs/development/python-modules/ndms2-client/default.nix
index 817b5823201f..619cbe171cfa 100644
--- a/pkgs/development/python-modules/ndms2-client/default.nix
+++ b/pkgs/development/python-modules/ndms2-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "foxel";
     repo = "python_ndms2_client";
-    tag = version;
+    rev = version;
     hash = "sha256-A19olC1rTHTy0xyeSP45fqvv9GUynQSrMgXBgW8ySOs=";
   };
 
diff --git a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix
index 0cd9ea5fa3c2..d3b03558148e 100644
--- a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix
+++ b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "netbox-napalm-plugin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nog6DymnnD0ABzG21jy00yNWhSTHfd7vJ4vo1DjsfKs=";
   };
 
diff --git a/pkgs/development/python-modules/netdata-pandas/default.nix b/pkgs/development/python-modules/netdata-pandas/default.nix
index f16b8e07504c..ff8bc2c4622e 100644
--- a/pkgs/development/python-modules/netdata-pandas/default.nix
+++ b/pkgs/development/python-modules/netdata-pandas/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "netdata";
     repo = "netdata-pandas";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AXt8BKWyM3glm5hrRryb+vBzs3z2x61HhbR6DDZkh9o=";
   };
 
diff --git a/pkgs/development/python-modules/netmap/default.nix b/pkgs/development/python-modules/netmap/default.nix
index 0e4de1f6044d..81d326f50e41 100644
--- a/pkgs/development/python-modules/netmap/default.nix
+++ b/pkgs/development/python-modules/netmap/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "python-nmap";
-    tag = version;
+    rev = version;
     sha256 = "1a44zz9zsxy48ahlpjjrddpyfi7cnfknicfcp35hi588qm430mag";
   };
 
diff --git a/pkgs/development/python-modules/newick/default.nix b/pkgs/development/python-modules/newick/default.nix
index 31618ca09dc5..ccda2606a56f 100644
--- a/pkgs/development/python-modules/newick/default.nix
+++ b/pkgs/development/python-modules/newick/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dlce-eva";
     repo = "python-newick";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TxyR6RYvy2oIcDNZnHrExtPYGspyWOtZqNy488OmWwk=";
   };
 
diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix
index a71c25afb8de..d1437292d7bb 100644
--- a/pkgs/development/python-modules/nh3/default.nix
+++ b/pkgs/development/python-modules/nh3/default.nix
@@ -14,7 +14,7 @@ let
   src = fetchFromGitHub {
     owner = "messense";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-N+xMS1sb3Qq80eNaI5GUACjCHaCba2d8zZeizayy4kY=";
   };
 in
diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix
index c88e8549f8e4..b054bc1a21d7 100644
--- a/pkgs/development/python-modules/nidaqmx/default.nix
+++ b/pkgs/development/python-modules/nidaqmx/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ni";
     repo = "nidaqmx-python";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-rf5cGq3Iv6ucURSUFuFANQzaGeufBZ+adjKlg4B5DRY=";
   };
 
diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix
index 0aa0bf0d106e..de23fe6548bd 100644
--- a/pkgs/development/python-modules/nix-prefetch-github/default.nix
+++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "seppeljordan";
     repo = "nix-prefetch-github";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eQd/MNlnuzXzgFzvwUMchvHoIvkIrbpGKV7iknO14Cc=";
   };
 
diff --git a/pkgs/development/python-modules/nmapthon2/default.nix b/pkgs/development/python-modules/nmapthon2/default.nix
index ef7d06299602..0a518c29013c 100644
--- a/pkgs/development/python-modules/nmapthon2/default.nix
+++ b/pkgs/development/python-modules/nmapthon2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cblopez";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4Na75TdKDywUomJF4tDWUWwCCtcOSxBUMOF7+FDhbpY=";
   };
 
diff --git a/pkgs/development/python-modules/norfair/default.nix b/pkgs/development/python-modules/norfair/default.nix
index d57621c94426..7624e396b9de 100644
--- a/pkgs/development/python-modules/norfair/default.nix
+++ b/pkgs/development/python-modules/norfair/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tryolabs";
     repo = "norfair";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aKB5TYSLW7FOXIy9u2hK7px6eEmIQdKPrhChKaU1uYs=";
   };
 
diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix
index c960c9a7cc7a..3e46d2cdf2bf 100644
--- a/pkgs/development/python-modules/normality/default.nix
+++ b/pkgs/development/python-modules/normality/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pudo";
     repo = "normality";
-    tag = version;
+    rev = version;
     hash = "sha256-RsZP/GkEuPKGZK2+/57kvMwm9vk0FTKN2/XtOmfoZxA=";
   };
 
diff --git a/pkgs/development/python-modules/nose2pytest/default.nix b/pkgs/development/python-modules/nose2pytest/default.nix
index 62ec8908d328..72f554e8a501 100644
--- a/pkgs/development/python-modules/nose2pytest/default.nix
+++ b/pkgs/development/python-modules/nose2pytest/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "nose2pytest";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BYyj2ZOZvWBpmzQACpmxAzCdQhlZlDYt+HLMdft+wYY=";
   };
 
diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix
index a8b7162db1bf..76b22857f172 100644
--- a/pkgs/development/python-modules/nplusone/default.nix
+++ b/pkgs/development/python-modules/nplusone/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jmcarp";
     repo = "nplusone";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0qdwpvvg7dzmksz3vqkvb27n52lq5sa8i06m7idnj5xk2dgjkdxg";
   };
 
diff --git a/pkgs/development/python-modules/nuclear/default.nix b/pkgs/development/python-modules/nuclear/default.nix
index c20fb75c141b..5daade948aa8 100644
--- a/pkgs/development/python-modules/nuclear/default.nix
+++ b/pkgs/development/python-modules/nuclear/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "igrek51";
     repo = "nuclear";
-    tag = version;
+    rev = version;
     hash = "sha256-UeU803SYMBLSWXjuxtWP2R2dBumRom+qsj2ljTiYFm0=";
   };
 
diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix
index f9b2ec8523bc..45e7fa77eb03 100644
--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/pkgs/development/python-modules/nuitka/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Nuitka";
     repo = "Nuitka";
-    tag = version;
+    rev = version;
     hash = "sha256-nKdCMgA92v9VsSgfktXDbSh3DyKsGlcTjpn0Y7u4rxU=";
   };
 
diff --git a/pkgs/development/python-modules/numdifftools/default.nix b/pkgs/development/python-modules/numdifftools/default.nix
index eaa9dd890772..29dee4bbbaa4 100644
--- a/pkgs/development/python-modules/numdifftools/default.nix
+++ b/pkgs/development/python-modules/numdifftools/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pbrod";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HYacLaowSDdrwkxL1h3h+lw/8ahzaecpXEnwrCqMCWk=";
   };
 
diff --git a/pkgs/development/python-modules/oasatelematics/default.nix b/pkgs/development/python-modules/oasatelematics/default.nix
index d951cc45675e..fca7740dc6de 100644
--- a/pkgs/development/python-modules/oasatelematics/default.nix
+++ b/pkgs/development/python-modules/oasatelematics/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "panosmz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3O7XbNVj1S3ZwheklEhm0ivw16Tj7drML/xYC9383Kg=";
   };
 
diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix
index 9a1af0ae81b0..ea504ea4f621 100644
--- a/pkgs/development/python-modules/oauthlib/default.nix
+++ b/pkgs/development/python-modules/oauthlib/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oauthlib";
     repo = "oauthlib";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KADS1pEaLYi86LEt2VVuz8FVTBANzxC8EeQLgGMxuBU=";
   };
 
diff --git a/pkgs/development/python-modules/ochre/default.nix b/pkgs/development/python-modules/ochre/default.nix
index 03e43dbc048e..023fb09d1ef4 100644
--- a/pkgs/development/python-modules/ochre/default.nix
+++ b/pkgs/development/python-modules/ochre/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getcuia";
     repo = "ochre";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-U6qycLnldwNze3XMAn6DS3XGX4RaCZgW0pH/y/FEAkk=";
   };
 
diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
index dd6b459177ba..8ad3f94c534e 100644
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ocrmypdf";
     repo = "OCRmyPDF";
-    tag = "v${version}";
+    rev = "v${version}";
     # The content of .git_archival.txt is substituted upon tarball creation,
     # which creates indeterminism if master no longer points to the tag.
     # See https://github.com/ocrmypdf/OCRmyPDF/issues/841
diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix
index b2f43540163a..0110cfdba10d 100644
--- a/pkgs/development/python-modules/ofxhome/default.nix
+++ b/pkgs/development/python-modules/ofxhome/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "captin411";
     repo = "ofxhome";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-i16bE9iuafhAKco2jYfg5T5QCWFHdnYVztf1z2XbO9g=";
   };
 
diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix
index 8e85143891e9..cbf5d5e3c0b2 100644
--- a/pkgs/development/python-modules/ofxtools/default.nix
+++ b/pkgs/development/python-modules/ofxtools/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "csingley";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-NsImnD+erhpakQnl1neuHfSKiV6ipNBMPGKMDM0gwWc=";
   };
 
diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix
index 391603e3783a..0858e4bc7b90 100644
--- a/pkgs/development/python-modules/oletools/default.nix
+++ b/pkgs/development/python-modules/oletools/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "decalage2";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ons1VeWStxUZw2CPpnX9p5I3Q7cMhi34JU8TeuUDt+Y=";
   };
 
diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix
index 0a2f96ff0bbb..a36c97dd2cda 100644
--- a/pkgs/development/python-modules/opcua-widgets/default.nix
+++ b/pkgs/development/python-modules/opcua-widgets/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "FreeOpcUa";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-ABJlKYN5H/1k8ynvSTSoJBX12vTTyavuNUAmTJ84mn0=";
   };
 
diff --git a/pkgs/development/python-modules/open-garage/default.nix b/pkgs/development/python-modules/open-garage/default.nix
index b95a51718e73..ff50be9476e4 100644
--- a/pkgs/development/python-modules/open-garage/default.nix
+++ b/pkgs/development/python-modules/open-garage/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pyOpenGarage";
-    tag = version;
+    rev = version;
     hash = "sha256-iJ7HcJhpTceFpHTUdNZOYDuxUWZGWPmZ9lxD3CyGvk8=";
   };
 
diff --git a/pkgs/development/python-modules/open-interpreter/default.nix b/pkgs/development/python-modules/open-interpreter/default.nix
index a89fe1239c17..dcd9ec37333c 100644
--- a/pkgs/development/python-modules/open-interpreter/default.nix
+++ b/pkgs/development/python-modules/open-interpreter/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KillianLucas";
     repo = "open-interpreter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TeBiRylrq5CrAG9XS47Z9GlruAv7V7Nsl4QbSV55isM=";
   };
 
diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix
index e210469ef716..cab5d956effd 100644
--- a/pkgs/development/python-modules/open-meteo/default.nix
+++ b/pkgs/development/python-modules/open-meteo/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-open-meteo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PddQyCCYbI9DjTvlJ4F3IQB6VichwcNhC04DJMULYZM=";
   };
 
diff --git a/pkgs/development/python-modules/openapi-pydantic/default.nix b/pkgs/development/python-modules/openapi-pydantic/default.nix
index e68c9b0dceb5..da4053638982 100644
--- a/pkgs/development/python-modules/openapi-pydantic/default.nix
+++ b/pkgs/development/python-modules/openapi-pydantic/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mike-oakley";
     repo = "openapi-pydantic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SMAjzHGuu+QVWe/y8jQ4UWJI9f+pLR2BxgjvE6vOT0Q=";
   };
 
diff --git a/pkgs/development/python-modules/openapi3/default.nix b/pkgs/development/python-modules/openapi3/default.nix
index 4591bcdf0826..1ddd3a9bbfb6 100644
--- a/pkgs/development/python-modules/openapi3/default.nix
+++ b/pkgs/development/python-modules/openapi3/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Dorthu";
     repo = "openapi3";
-    tag = version;
+    rev = version;
     hash = "sha256-Crn+nRbptRycnWJzH8Tm/BBLcBSRCcNtLX8NoKnSDdA=";
   };
 
diff --git a/pkgs/development/python-modules/openevsewifi/default.nix b/pkgs/development/python-modules/openevsewifi/default.nix
index 7b1449ef6ab0..8a65b3e56f34 100644
--- a/pkgs/development/python-modules/openevsewifi/default.nix
+++ b/pkgs/development/python-modules/openevsewifi/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miniconfig";
     repo = "python-openevse-wifi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7+BC5WG0JoyHNjgsoJBQRVDpmdXMJCV4bMf6pIaS5qo=";
   };
 
diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
index 39a494ac9983..a54f14c99602 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -6,7 +6,7 @@ rec {
   src = fetchFromGitHub {
     owner = "openrazer";
     repo = "openrazer";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MLwhqLPWdjg1ZUZP5Sig37RgZEeHlU+DyELpyMif6iY=";
   };
 
diff --git a/pkgs/development/python-modules/openrouteservice/default.nix b/pkgs/development/python-modules/openrouteservice/default.nix
index 63c842858f51..eae98abfeeb9 100644
--- a/pkgs/development/python-modules/openrouteservice/default.nix
+++ b/pkgs/development/python-modules/openrouteservice/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GIScience";
     repo = "${pname}-py";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1d5qbygb81fhpwfdm1a118r3xv45xz9n9avfkgxkvw1n8y6ywz2q";
   };
 
diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix
index 6175a934da43..634efaf196b2 100644
--- a/pkgs/development/python-modules/opensimplex/default.nix
+++ b/pkgs/development/python-modules/opensimplex/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lmas";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "C/MTKTHjxMsOgzuXvokw039Kv6N/PgBoOqKleWPLpw0=";
   };
 
diff --git a/pkgs/development/python-modules/opytimark/default.nix b/pkgs/development/python-modules/opytimark/default.nix
index 4f238a8d758d..29b5fcee2c51 100644
--- a/pkgs/development/python-modules/opytimark/default.nix
+++ b/pkgs/development/python-modules/opytimark/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gugarosa";
     repo = "opytimark";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T3OFm10gvGrUXAAHOnO0Zv1nWrXPBXSmEWnbJxrWYU0=";
   };
 
diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix
index b76f492562ae..20825a18b550 100644
--- a/pkgs/development/python-modules/orm/default.nix
+++ b/pkgs/development/python-modules/orm/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = "orm";
-    tag = version;
+    rev = version;
     hash = "sha256-nlKEWdqttFnjBnXutlxTy9oILqFzKHKKPJpTtCUbJ5k=";
   };
 
diff --git a/pkgs/development/python-modules/orvibo/default.nix b/pkgs/development/python-modules/orvibo/default.nix
index b6c7f5709dc4..15ff4dcee51b 100644
--- a/pkgs/development/python-modules/orvibo/default.nix
+++ b/pkgs/development/python-modules/orvibo/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "happyleavesaoc";
     repo = "python-orvibo";
-    tag = version;
+    rev = version;
     sha256 = "sha256-Azmho47CEbRo18emmLKhYa/sViQX0oxUTUk4zdrpOaE=";
   };
 
diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix
index 4d8eba71266f..db1ecc6d51d2 100644
--- a/pkgs/development/python-modules/osc-lib/default.nix
+++ b/pkgs/development/python-modules/osc-lib/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "osc-lib";
-    tag = version;
+    rev = version;
     hash = "sha256-DDjWM4hjHPXYDeAJ6FDZZPzi65DG1rJ3efs8MouX1WY=";
   };
 
diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix
index 318e3045f51a..bb16aa7d40e0 100644
--- a/pkgs/development/python-modules/osc/default.nix
+++ b/pkgs/development/python-modules/osc/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "osc";
-    tag = version;
+    rev = version;
     hash = "sha256-03EDarU7rmsiE96IYHXFuPtD8nWur0qwj8NDzSj8OX0=";
   };
 
diff --git a/pkgs/development/python-modules/oscpy/default.nix b/pkgs/development/python-modules/oscpy/default.nix
index 8518adff4188..9889b746405a 100644
--- a/pkgs/development/python-modules/oscpy/default.nix
+++ b/pkgs/development/python-modules/oscpy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kivy";
     repo = "oscpy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Luj36JLgU9xbBMydeobyf98U5zs5VwWQOPGV7TPXQwA=";
   };
 
diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix
index 32565af05996..ef90df289af6 100644
--- a/pkgs/development/python-modules/oscrypto/default.nix
+++ b/pkgs/development/python-modules/oscrypto/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wbond";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw=";
   };
 
diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix
index c2478ff718df..b64ea716e553 100644
--- a/pkgs/development/python-modules/osmpythontools/default.nix
+++ b/pkgs/development/python-modules/osmpythontools/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mocnik-science";
     repo = "osm-python-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lTDA1Rad9aYI/ymU/0xzdJHmebUGcpVJ0GW7D0Ujdko=";
   };
 
diff --git a/pkgs/development/python-modules/pa-ringbuffer/default.nix b/pkgs/development/python-modules/pa-ringbuffer/default.nix
index d10174961e81..4ddd9af2b063 100644
--- a/pkgs/development/python-modules/pa-ringbuffer/default.nix
+++ b/pkgs/development/python-modules/pa-ringbuffer/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spatialaudio";
     repo = "python-pa-ringbuffer";
-    tag = version;
+    rev = version;
     sha256 = "1d4k6z13mc1f88m6wbhfx8hillb7q78n33ws5bmyblsdkv1gx607";
   };
 
diff --git a/pkgs/development/python-modules/paginate/default.nix b/pkgs/development/python-modules/paginate/default.nix
index 25feed2dce23..096fdb92719f 100644
--- a/pkgs/development/python-modules/paginate/default.nix
+++ b/pkgs/development/python-modules/paginate/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Pylons";
     repo = "paginate";
-    tag = version;
+    rev = version;
     hash = "sha256-+zX9uGNWcV4BWbD2lcd1u9zZ4m7CnbsYZnc99HNaF8I=";
   };
 
diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix
index dc240cff546f..10afacd1c197 100644
--- a/pkgs/development/python-modules/paho-mqtt/default.nix
+++ b/pkgs/development/python-modules/paho-mqtt/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "paho.mqtt.python";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VMq+WTW+njK34QUUTE6fR2j2OmHxVzR0wrC92zYb1rY=";
   };
 
diff --git a/pkgs/development/python-modules/paintcompiler/default.nix b/pkgs/development/python-modules/paintcompiler/default.nix
index f2f90281c7aa..c2e6009fa4f7 100644
--- a/pkgs/development/python-modules/paintcompiler/default.nix
+++ b/pkgs/development/python-modules/paintcompiler/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simoncozens";
     repo = "paintcompiler";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dmVBQUUyFc71zq8fXBQ4ii/llrGdtUCOponCzSeut6g=";
   };
 
diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix
index 4c6cc0ec01d3..184df403f5e7 100644
--- a/pkgs/development/python-modules/pamqp/default.nix
+++ b/pkgs/development/python-modules/pamqp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gmr";
     repo = "pamqp";
-    tag = version;
+    rev = version;
     hash = "sha256-0vjiPBLd8afnATjmV2sINsBd4j7L544u5DA3jLiLSsY=";
   };
 
diff --git a/pkgs/development/python-modules/pasimple/default.nix b/pkgs/development/python-modules/pasimple/default.nix
index 1f719aad9c71..515fb636ae31 100644
--- a/pkgs/development/python-modules/pasimple/default.nix
+++ b/pkgs/development/python-modules/pasimple/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "henrikschnor";
     repo = "pasimple";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Z271FdBCqPFcQzVqGidL74nO85rO9clNvP4czAHmdEw=";
   };
 
diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/pkgs/development/python-modules/path-and-address/default.nix
index 21d6a60313c8..09918dec9309 100644
--- a/pkgs/development/python-modules/path-and-address/default.nix
+++ b/pkgs/development/python-modules/path-and-address/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joeyespo";
     repo = "path-and-address";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0b0afpsaim06mv3lhbpm8fmawcraggc11jhzr6h72kdj1cqjk5h6";
   };
 
diff --git a/pkgs/development/python-modules/patrowl4py/default.nix b/pkgs/development/python-modules/patrowl4py/default.nix
index 73b1f0d6361f..ada7a272918f 100644
--- a/pkgs/development/python-modules/patrowl4py/default.nix
+++ b/pkgs/development/python-modules/patrowl4py/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Patrowl";
     repo = "Patrowl4py";
-    tag = version;
+    rev = version;
     hash = "sha256-ZGvntLbXIWmL0WoT+kQoNT6gDPgsSKwHQQjYlarvnKo=";
   };
 
diff --git a/pkgs/development/python-modules/pcapy-ng/default.nix b/pkgs/development/python-modules/pcapy-ng/default.nix
index 0e31ab4b325b..97313c157072 100644
--- a/pkgs/development/python-modules/pcapy-ng/default.nix
+++ b/pkgs/development/python-modules/pcapy-ng/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stamparm";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-6LA2n7Kv0MiZcqUJpi0lDN4Q+GcOttYw7hJwVqK/DU0=";
   };
 
diff --git a/pkgs/development/python-modules/pcodedmp/default.nix b/pkgs/development/python-modules/pcodedmp/default.nix
index 323185b38c00..eef04412632a 100644
--- a/pkgs/development/python-modules/pcodedmp/default.nix
+++ b/pkgs/development/python-modules/pcodedmp/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bontchev";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-SYOFGMvrzxDPMACaCvqwU28Mh9LEuvFBGvAph4X+geo=";
   };
 
diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix
index 7d0789a15c00..986965a927d8 100644
--- a/pkgs/development/python-modules/pdoc/default.nix
+++ b/pkgs/development/python-modules/pdoc/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "pdoc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HDrDGnK557EWbBQtsvDzTst3oV0NjLRm4ilXaxd6/j8=";
   };
 
diff --git a/pkgs/development/python-modules/pepit/default.nix b/pkgs/development/python-modules/pepit/default.nix
index 6a53c12fb7fc..37017f445e9e 100644
--- a/pkgs/development/python-modules/pepit/default.nix
+++ b/pkgs/development/python-modules/pepit/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PerformanceEstimation";
     repo = "PEPit";
-    tag = version;
+    rev = version;
     hash = "sha256-Gdymdfi0Iv9KXBNSbAEWGYIQ4k5EONnbyWs+99L5D/A=";
   };
 
diff --git a/pkgs/development/python-modules/permissionedforms/default.nix b/pkgs/development/python-modules/permissionedforms/default.nix
index 997481c6cd69..053786250673 100644
--- a/pkgs/development/python-modules/permissionedforms/default.nix
+++ b/pkgs/development/python-modules/permissionedforms/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "django-permissionedforms";
     owner = "wagtail";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DQzPGmh5UEVpGWnW3IrEVPkZZ8mdiW9J851Ej4agTDc=";
   };
 
diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix
index ee5f30cdd47e..585c9ed93419 100644
--- a/pkgs/development/python-modules/pgpy/default.nix
+++ b/pkgs/development/python-modules/pgpy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SecurityInnovation";
     repo = "PGPy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-47YiHNxmjyCOYHHUV3Zyhs3Att9HZtCXYfbN34ooTxU=";
   };
 
diff --git a/pkgs/development/python-modules/pickpack/default.nix b/pkgs/development/python-modules/pickpack/default.nix
index b6cdfdeb5b75..98a96749f592 100644
--- a/pkgs/development/python-modules/pickpack/default.nix
+++ b/pkgs/development/python-modules/pickpack/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "anafvana";
     repo = "pickpack";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IUIs+Cgl2fvjSougyVSzhmY2SeEYL2T2ODrBWBg3zZM=";
   };
 
diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix
index 14ecfb56c1b1..9abd4d5cdc10 100644
--- a/pkgs/development/python-modules/piexif/default.nix
+++ b/pkgs/development/python-modules/piexif/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hMatoba";
     repo = "Piexif";
-    tag = version;
+    rev = version;
     sha256 = "1akmaxq1cjr8wghwaaql1bd3sajl8psshl58lprgfsigrvnklp8b";
   };
 
diff --git a/pkgs/development/python-modules/pinboard/default.nix b/pkgs/development/python-modules/pinboard/default.nix
index 29af195bca79..dd4e489defd6 100644
--- a/pkgs/development/python-modules/pinboard/default.nix
+++ b/pkgs/development/python-modules/pinboard/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lionheart";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0ppc3vwv48ahqx6n5c7d7066zhi31cjdik0ma9chq6fscq2idgdf";
   };
 
diff --git a/pkgs/development/python-modules/pixel-ring/default.nix b/pkgs/development/python-modules/pixel-ring/default.nix
index b43bcaf0f8ab..1628276f5b19 100644
--- a/pkgs/development/python-modules/pixel-ring/default.nix
+++ b/pkgs/development/python-modules/pixel-ring/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "respeaker";
     repo = "pixel_ring";
-    tag = version;
+    rev = version;
     hash = "sha256-J9kScjD6Xon0YWGxFU881bIbjmDpY7cnWzJ8G0SOKaw=";
   };
 
diff --git a/pkgs/development/python-modules/pkce/default.nix b/pkgs/development/python-modules/pkce/default.nix
index 3ee712238881..08539054316a 100644
--- a/pkgs/development/python-modules/pkce/default.nix
+++ b/pkgs/development/python-modules/pkce/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RomeoDespres";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME=";
   };
 
diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix
index 271ce9cd1f0b..aa69c7f286ca 100644
--- a/pkgs/development/python-modules/pkgconfig/default.nix
+++ b/pkgs/development/python-modules/pkgconfig/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matze";
     repo = "pkgconfig";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uuLUGRNLCR3NS9g6OPCI+qG7tPWsLhI3OE5WmSI3vm8=";
   };
 
diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix
index fc5b8712d07d..c46bf6f66ea6 100644
--- a/pkgs/development/python-modules/pkginfo2/default.nix
+++ b/pkgs/development/python-modules/pkginfo2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nexB";
     repo = "pkginfo2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-E9EyaN3ncf/34vvvhRe0rwV28VrjqJo79YFgXq2lKWU=";
   };
 
diff --git a/pkgs/development/python-modules/playsound/default.nix b/pkgs/development/python-modules/playsound/default.nix
index abeb3b27797a..54537341ba38 100644
--- a/pkgs/development/python-modules/playsound/default.nix
+++ b/pkgs/development/python-modules/playsound/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TaylorSMarks";
     repo = "playsound";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0jbq641lmb0apq4fy6r2zyag8rdqgrz8c4wvydzrzmxrp6yx6wyd";
   };
 
diff --git a/pkgs/development/python-modules/pleroma-bot/default.nix b/pkgs/development/python-modules/pleroma-bot/default.nix
index 1a61b6d8abf6..9678a3449f82 100644
--- a/pkgs/development/python-modules/pleroma-bot/default.nix
+++ b/pkgs/development/python-modules/pleroma-bot/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robertoszek";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-vJxblpf3NMSyYMHeWG7vHP5AeluTtMtVxOsHgvGDHeA=";
   };
 
diff --git a/pkgs/development/python-modules/plexauth/default.nix b/pkgs/development/python-modules/plexauth/default.nix
index 91e7d06ba8b4..7e4767c76c60 100644
--- a/pkgs/development/python-modules/plexauth/default.nix
+++ b/pkgs/development/python-modules/plexauth/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jjlawren";
     repo = "python-plexauth";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1wy6syz3cgfw28zvigh2br4jabg8rzpi5l0bhfb6vjjc7aam13ag";
   };
 
diff --git a/pkgs/development/python-modules/plugp100/default.nix b/pkgs/development/python-modules/plugp100/default.nix
index 138f9c96ba5a..0cc356e3d15b 100644
--- a/pkgs/development/python-modules/plugp100/default.nix
+++ b/pkgs/development/python-modules/plugp100/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "petretiandrea";
     repo = "plugp100";
-    tag = version;
+    rev = version;
     sha256 = "sha256-V+9cVBMN8H4oFU51T9BDrLF46xgQHqIsMj8nuPedUGA=";
   };
 
diff --git a/pkgs/development/python-modules/pluthon/default.nix b/pkgs/development/python-modules/pluthon/default.nix
index 7904c43bb3a1..21994bd0817e 100644
--- a/pkgs/development/python-modules/pluthon/default.nix
+++ b/pkgs/development/python-modules/pluthon/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OpShin";
     repo = "pluthon";
-    tag = version;
+    rev = version;
     hash = "sha256-IYpkb/RXRu53HoeVKik7Jog5FyXwrWItrxSla9dN0s4=";
   };
 
diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix
index 4f59d082fbdc..3e4eb695bde8 100644
--- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix
+++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-uhLmEViiJ5+2Aw9MJP8GL7nhk8lMPcRZRB8WTDFXe+s=";
   };
 
diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix
index 1b19101aea31..f95fb719212f 100644
--- a/pkgs/development/python-modules/podcats/default.nix
+++ b/pkgs/development/python-modules/podcats/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jakubroztocil";
     repo = "podcats";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0zjdgry5n209rv19kj9yaxy7c7zq5gxr488izrgs4sc75vdzz8xc";
   };
 
diff --git a/pkgs/development/python-modules/polling/default.nix b/pkgs/development/python-modules/polling/default.nix
index baf83b6810be..bbf858356234 100644
--- a/pkgs/development/python-modules/polling/default.nix
+++ b/pkgs/development/python-modules/polling/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "justiniso";
     repo = "polling";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Qy2QxCWzAjZMJ6yxZiDT/80I2+rLimoG8/SYxq960Tk=";
   };
 
diff --git a/pkgs/development/python-modules/pre-commit-po-hooks/default.nix b/pkgs/development/python-modules/pre-commit-po-hooks/default.nix
index 126aa7253692..1b682ad2c0a6 100644
--- a/pkgs/development/python-modules/pre-commit-po-hooks/default.nix
+++ b/pkgs/development/python-modules/pre-commit-po-hooks/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mondeja";
     repo = "pre-commit-po-hooks";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wTmcV8KkoQLuK4EWDt0pbp+EQJRatxnQYeBfikK+vlA=";
   };
 
diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix
index 5ea281c1bacb..f35fcb5e9c87 100644
--- a/pkgs/development/python-modules/pretend/default.nix
+++ b/pkgs/development/python-modules/pretend/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alex";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OqMfeIMFNBBLq6ejR3uOCIHZ9aA4zew7iefVlAsy1JQ=";
   };
 
diff --git a/pkgs/development/python-modules/prison/default.nix b/pkgs/development/python-modules/prison/default.nix
index 1ae94c9afb00..5abb41f26910 100644
--- a/pkgs/development/python-modules/prison/default.nix
+++ b/pkgs/development/python-modules/prison/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "betodealmeida";
     repo = "python-rison";
-    tag = version;
+    rev = version;
     hash = "sha256-qor40vUQeTdlO3vwug3GGNX5vkNaF0H7EWlRdsY4bvc=";
   };
 
diff --git a/pkgs/development/python-modules/prodict/default.nix b/pkgs/development/python-modules/prodict/default.nix
index 08c844d069d3..fdee36a3c615 100644
--- a/pkgs/development/python-modules/prodict/default.nix
+++ b/pkgs/development/python-modules/prodict/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ramazanpolat";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-c46JEQFg4KRwerqpMSgh6+tYRpKTOX02Lzsq4/meS3o=";
   };
 
diff --git a/pkgs/development/python-modules/prometheus-async/default.nix b/pkgs/development/python-modules/prometheus-async/default.nix
index 95208ea0874c..a8c89b503d61 100644
--- a/pkgs/development/python-modules/prometheus-async/default.nix
+++ b/pkgs/development/python-modules/prometheus-async/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hynek";
     repo = "prometheus-async";
-    tag = version;
+    rev = version;
     hash = "sha256-e/BVxATpafxddq26Rt7XTiK4ajY+saUApXbmTG0/I6I=";
   };
 
diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix
index 9da8e0d839f4..2aa6ce30ebe4 100644
--- a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix
+++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rycus86";
     repo = "prometheus_flask_exporter";
-    tag = version;
+    rev = version;
     hash = "sha256-GAQ80J7at8Apqu+DUMN3+rLi/lrNv5Y7w/DKpUN2iu8=";
   };
 
diff --git a/pkgs/development/python-modules/prompthub-py/default.nix b/pkgs/development/python-modules/prompthub-py/default.nix
index 33e707919a52..8becc3b2ac30 100644
--- a/pkgs/development/python-modules/prompthub-py/default.nix
+++ b/pkgs/development/python-modules/prompthub-py/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "deepset-ai";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FA4IfhHViSL1u4pgd7jh40rEcS0BldSFDwCPG5irk1g=";
   };
 
diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix
index 33a4267045ac..71fa0e1aeddb 100644
--- a/pkgs/development/python-modules/property-manager/default.nix
+++ b/pkgs/development/python-modules/property-manager/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-property-manager";
-    tag = version;
+    rev = version;
     sha256 = "1v7hjm7qxpgk92i477fjhpcnjgp072xgr8jrgmbrxfbsv4cvl486";
   };
 
diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix
index 4fb072671ee9..710b3e893d72 100644
--- a/pkgs/development/python-modules/prophet/default.nix
+++ b/pkgs/development/python-modules/prophet/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "prophet";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vvSn2sVs6KZsTAKPuq9irlHgM1BmpkG8LJbvcu8ohd0=";
   };
 
diff --git a/pkgs/development/python-modules/proton-client/default.nix b/pkgs/development/python-modules/proton-client/default.nix
index 98074429932a..b7a4db2ae9b0 100644
--- a/pkgs/development/python-modules/proton-client/default.nix
+++ b/pkgs/development/python-modules/proton-client/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ProtonMail";
     repo = "proton-python-client";
-    tag = version;
+    rev = version;
     hash = "sha256-mhPq9O/LCu3+E1jKlaJmrI8dxbA9BIwlc34qGwoxi5g=";
   };
 
diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
index 2232f5bf4c02..0361703a9df8 100644
--- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-vpn-api-core";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/GV5DFWc6RBWP723APNxn9FTxdePumYOtdwDQEg4ccA=";
   };
 
diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix
index c8a67f98d026..605936dd8637 100644
--- a/pkgs/development/python-modules/psautohint/default.nix
+++ b/pkgs/development/python-modules/psautohint/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adobe-type-tools";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "125nx7accvbk626qlfar90va1995kp9qfrz6a978q4kv2kk37xai";
     fetchSubmodules = true; # data dir for tests
   };
diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix
index 271027af21f7..926cb058cec8 100644
--- a/pkgs/development/python-modules/pure-eval/default.nix
+++ b/pkgs/development/python-modules/pure-eval/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexmojaki";
     repo = "pure_eval";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gdP8/MkzTyjkZaWUG5PoaOtBqzbCXYNYBX2XBLWLh18=";
   };
 
diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix
index d125b8dc7ff2..493ac2fd2960 100644
--- a/pkgs/development/python-modules/purl/default.nix
+++ b/pkgs/development/python-modules/purl/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "codeinthehole";
     repo = "purl";
-    tag = version;
+    rev = version;
     hash = "sha256-Jb3JRW/PtQ7NlO4eQ9DmTPu/sjvFTg2mztphoIF79gc=";
   };
 
diff --git a/pkgs/development/python-modules/py-air-control/default.nix b/pkgs/development/python-modules/py-air-control/default.nix
index 65a7d4770e9c..73cac52da828 100644
--- a/pkgs/development/python-modules/py-air-control/default.nix
+++ b/pkgs/development/python-modules/py-air-control/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rgerganov";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0mkggl5hwmj90djxbbz4svim6iv7xl8k324cb4rlc75p5rgcdwmh";
   };
 
diff --git a/pkgs/development/python-modules/py-cid/default.nix b/pkgs/development/python-modules/py-cid/default.nix
index 8128d254d0da..7b986be7dc42 100644
--- a/pkgs/development/python-modules/py-cid/default.nix
+++ b/pkgs/development/python-modules/py-cid/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ipld";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aN7ee25ghKKa90+FoMDCdGauToePc5AzDLV3tONvh4U=";
   };
 
diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix
index d4254a6b6068..8485fe8c2837 100644
--- a/pkgs/development/python-modules/py-cpuinfo/default.nix
+++ b/pkgs/development/python-modules/py-cpuinfo/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "workhorsy";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Q5u0guAqDVhf6bvJTzNvCpWbIzjxxAjE7s0OuXj9T4Q=";
   };
 
diff --git a/pkgs/development/python-modules/py-deprecate/default.nix b/pkgs/development/python-modules/py-deprecate/default.nix
index cb624963b0c5..c6c2c62ee041 100644
--- a/pkgs/development/python-modules/py-deprecate/default.nix
+++ b/pkgs/development/python-modules/py-deprecate/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "Borda";
     repo = "pyDeprecate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-84RmQvLxwtLPQk3hX7Q6eeJeejhrO3t+mc95W1E85Fg=";
   };
 
diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix
index 60e9039729e1..6ee5b0534673 100644
--- a/pkgs/development/python-modules/py-ecc/default.nix
+++ b/pkgs/development/python-modules/py-ecc/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "py_ecc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DKe+bI1GEzXg4Y4n5OA1/hWYz9L3X1AvaOFPEnCaAfs=";
   };
 
diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix
index a66b7e7ef9b3..bf95fb2da73f 100644
--- a/pkgs/development/python-modules/py-eth-sig-utils/default.nix
+++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rmeissner";
     repo = "py-eth-sig-utils";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PNvEHH5w2ptntRGzqWrqlbIzJJsT60OXg/Dh5f6Wq9k=";
   };
 
diff --git a/pkgs/development/python-modules/py-expression-eval/default.nix b/pkgs/development/python-modules/py-expression-eval/default.nix
index 704e84ddeb63..f184c025e218 100644
--- a/pkgs/development/python-modules/py-expression-eval/default.nix
+++ b/pkgs/development/python-modules/py-expression-eval/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "axiacore";
     repo = "py-expression-eval";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "YxhZd8V6ofphcNdcbBbrT5mc37O9c6W1mfhsvFVC+KM=";
   };
 
diff --git a/pkgs/development/python-modules/py-multiaddr/default.nix b/pkgs/development/python-modules/py-multiaddr/default.nix
index 1a0ba4dd93da..95016f826c62 100644
--- a/pkgs/development/python-modules/py-multiaddr/default.nix
+++ b/pkgs/development/python-modules/py-multiaddr/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "multiformats";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cGM7iYQPP+UOkbTxRhzuED0pkcydFCO8vpx9wTc0/HI=";
   };
 
diff --git a/pkgs/development/python-modules/py-nightscout/default.nix b/pkgs/development/python-modules/py-nightscout/default.nix
index 17f7843e1d60..e690f1b1caca 100644
--- a/pkgs/development/python-modules/py-nightscout/default.nix
+++ b/pkgs/development/python-modules/py-nightscout/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "marciogranzotto";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0kslmm3wrxhm307nqmjmq8i8vy1x6mjaqlgba0hgvisj6b4hx65k";
   };
 
diff --git a/pkgs/development/python-modules/py-ubjson/default.nix b/pkgs/development/python-modules/py-ubjson/default.nix
index dc8b6b79da60..7eca2165efc1 100644
--- a/pkgs/development/python-modules/py-ubjson/default.nix
+++ b/pkgs/development/python-modules/py-ubjson/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Iotic-Labs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1frn97xfa88zrfmpnvdk1pc03yihlchhph99bhjayvzlfcrhm5v3";
   };
 
diff --git a/pkgs/development/python-modules/py3buddy/default.nix b/pkgs/development/python-modules/py3buddy/default.nix
index be3af959eb14..e076aa3b667e 100644
--- a/pkgs/development/python-modules/py3buddy/default.nix
+++ b/pkgs/development/python-modules/py3buddy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "armijnhemel";
     repo = "py3buddy";
-    tag = version;
+    rev = version;
     hash = "sha256-KJ0xGEXHY6o2074WFZ0u7gATS+wrrjyzanYretckWYk=";
   };
 
diff --git a/pkgs/development/python-modules/pyaehw4a1/default.nix b/pkgs/development/python-modules/pyaehw4a1/default.nix
index d51cd1a683cc..1506bfd80a78 100644
--- a/pkgs/development/python-modules/pyaehw4a1/default.nix
+++ b/pkgs/development/python-modules/pyaehw4a1/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bannhead";
     repo = "pyaehw4a1";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0grs7kiyhzlwqzmw2yxkkglnwjfpimgwxbgp0047rlp3k8md7sjv";
   };
 
diff --git a/pkgs/development/python-modules/pyarlo/default.nix b/pkgs/development/python-modules/pyarlo/default.nix
index cb2636018f36..a9b9c8c040db 100644
--- a/pkgs/development/python-modules/pyarlo/default.nix
+++ b/pkgs/development/python-modules/pyarlo/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tchellomello";
     repo = "python-arlo";
-    tag = version;
+    rev = version;
     sha256 = "0pp7y2llk4xnf6zh57j5xas0gw5zqm42qaqssd8p4qa3g5rds8k3";
   };
 
diff --git a/pkgs/development/python-modules/pyasn/default.nix b/pkgs/development/python-modules/pyasn/default.nix
index 70c9e6d8a3dc..7e684c27ae1e 100644
--- a/pkgs/development/python-modules/pyasn/default.nix
+++ b/pkgs/development/python-modules/pyasn/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   datasrc = fetchFromGitHub {
     owner = "hadiasghari";
     repo = "pyasn";
-    tag = version;
+    rev = version;
     hash = "sha256-R7Vi1Mn44Mg3HQLDk9O43MkXXwbLRr/jjVKSHJvgYj0";
   };
 
diff --git a/pkgs/development/python-modules/pyasynchat/default.nix b/pkgs/development/python-modules/pyasynchat/default.nix
index 7d1e062adc4a..b8f7cd764133 100644
--- a/pkgs/development/python-modules/pyasynchat/default.nix
+++ b/pkgs/development/python-modules/pyasynchat/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonrob";
     repo = "pyasynchat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Cep8tsapLjhPbVhMrC1ZUgd4jZZLOliL4yF0OX2KrYs=";
   };
 
diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
index c4f551a1a075..6e4a7e846b3e 100644
--- a/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "appknox";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NtAsO/I1jDEv676yhAgLguQnB/kHdAqPoLt2QFWbvmw=";
   };
 
diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index 0a8280ca3e2a..e7c8750ad8ee 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bids-standard";
     repo = "pybids";
-    tag = version;
+    rev = version;
     hash = "sha256-nSBc4vhkCdRo7CNBwvJreCiwoxJK6ztyI5gvcpzYZ/Y=";
   };
 
diff --git a/pkgs/development/python-modules/pybind11-abseil/default.nix b/pkgs/development/python-modules/pybind11-abseil/default.nix
index 3feb3e2c567b..de497d6eec18 100644
--- a/pkgs/development/python-modules/pybind11-abseil/default.nix
+++ b/pkgs/development/python-modules/pybind11-abseil/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pybind";
     repo = "pybind11_abseil";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hFVuGzEFqAEm2p2RmfhFtLB6qOqNuVNcwcLh8dIWi0k=";
   };
 
diff --git a/pkgs/development/python-modules/pycarwings2/default.nix b/pkgs/development/python-modules/pycarwings2/default.nix
index 40e65882c85a..2d83d009aad8 100644
--- a/pkgs/development/python-modules/pycarwings2/default.nix
+++ b/pkgs/development/python-modules/pycarwings2/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "filcole";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kqj/NZXqgPUsOnnzMPmIlICHek7RBxksmL3reNBK+bo=";
   };
 
diff --git a/pkgs/development/python-modules/pychannels/default.nix b/pkgs/development/python-modules/pychannels/default.nix
index 7ab1904a3ecd..48310b769912 100644
--- a/pkgs/development/python-modules/pychannels/default.nix
+++ b/pkgs/development/python-modules/pychannels/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fancybits";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-E+VL4mJ2KxS5bJZc3Va+wvyVjT55LJz+1wHkxDRa85s=";
   };
 
diff --git a/pkgs/development/python-modules/pycketcasts/default.nix b/pkgs/development/python-modules/pycketcasts/default.nix
index 2d153da4b495..7b4c51fcc6e8 100644
--- a/pkgs/development/python-modules/pycketcasts/default.nix
+++ b/pkgs/development/python-modules/pycketcasts/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nwithan8";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-O4j89fE7fYPthhCH8b2gGskkelEA4mU6GvSbKIl+4Mk=";
   };
 
diff --git a/pkgs/development/python-modules/pyclimacell/default.nix b/pkgs/development/python-modules/pyclimacell/default.nix
index 8b06a0360edc..8b61e177f5db 100644
--- a/pkgs/development/python-modules/pyclimacell/default.nix
+++ b/pkgs/development/python-modules/pyclimacell/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "raman325";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jWHjnebg4Aar48gid7bB7XYXOQtSqbmVmASsZd0YoPc=";
   };
 
diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix
index d190b85b801d..9b3733939c02 100644
--- a/pkgs/development/python-modules/pycodestyle/default.nix
+++ b/pkgs/development/python-modules/pycodestyle/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "pycodestyle";
-    tag = version;
+    rev = version;
     hash = "sha256-rQkOjDikJPHCBqrqxFQ9PLikYSeQZwJnHAmPGRUZecA=";
   };
 
diff --git a/pkgs/development/python-modules/pycolorecho/default.nix b/pkgs/development/python-modules/pycolorecho/default.nix
index 51e7a9645747..91d29555800d 100644
--- a/pkgs/development/python-modules/pycolorecho/default.nix
+++ b/pkgs/development/python-modules/pycolorecho/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coldsofttech";
     repo = "pycolorecho";
-    tag = version;
+    rev = version;
     hash = "sha256-h/7Wi0x8iLMZpPYekK6W9LTM+2nYJTaKClNtRTzbmdg=";
   };
 
diff --git a/pkgs/development/python-modules/pycompliance/default.nix b/pkgs/development/python-modules/pycompliance/default.nix
index c27735fabf3b..af1d976c0471 100644
--- a/pkgs/development/python-modules/pycompliance/default.nix
+++ b/pkgs/development/python-modules/pycompliance/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhmdnd";
     repo = "pycompliance";
-    tag = version;
+    rev = version;
     hash = "sha256-gCrKbKqRDlh9q9bETQ9NEPbf+40WKF1ltfBy6LYjlVw=";
   };
 
diff --git a/pkgs/development/python-modules/pycsdr/default.nix b/pkgs/development/python-modules/pycsdr/default.nix
index 1c6eec9627f6..53a8f25d78d8 100644
--- a/pkgs/development/python-modules/pycsdr/default.nix
+++ b/pkgs/development/python-modules/pycsdr/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jketterl";
     repo = "pycsdr";
-    tag = version;
+    rev = version;
     hash = "sha256-OyfcXCcbvOOhBUkbAba3ayPzpH5z2nJWHbR6GcrCMy8=";
   };
 
diff --git a/pkgs/development/python-modules/pydigiham/default.nix b/pkgs/development/python-modules/pydigiham/default.nix
index 21458b9f6136..77653bc83c34 100644
--- a/pkgs/development/python-modules/pydigiham/default.nix
+++ b/pkgs/development/python-modules/pydigiham/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jketterl";
     repo = "pydigiham";
-    tag = version;
+    rev = version;
     hash = "sha256-QenoMyVFs8MEDPoMV6TT6XfzktfN/gAMIHR0Scq11wk=";
   };
 
diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix
index d08cd6fdeaac..6ccc5f099e4c 100644
--- a/pkgs/development/python-modules/pyeight/default.nix
+++ b/pkgs/development/python-modules/pyeight/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mezz64";
     repo = "pyEight";
-    tag = version;
+    rev = version;
     hash = "sha256-JYmhEZQw11qPNV2jZhP+0VFb387kNom70R3C13PM7kc=";
   };
 
diff --git a/pkgs/development/python-modules/pyeverlights/default.nix b/pkgs/development/python-modules/pyeverlights/default.nix
index 0aac76b0c74b..dd9abeca4f31 100644
--- a/pkgs/development/python-modules/pyeverlights/default.nix
+++ b/pkgs/development/python-modules/pyeverlights/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joncar";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "16xpq933j8yydq78fnf4f7ivyw5a45ix4mfycpmm91aj549p6pm0";
   };
 
diff --git a/pkgs/development/python-modules/pyevilgenius/default.nix b/pkgs/development/python-modules/pyevilgenius/default.nix
index 0bb049bfed97..40d48342e57e 100644
--- a/pkgs/development/python-modules/pyevilgenius/default.nix
+++ b/pkgs/development/python-modules/pyevilgenius/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o=";
   };
 
diff --git a/pkgs/development/python-modules/pyevmasm/default.nix b/pkgs/development/python-modules/pyevmasm/default.nix
index 1a4945f88bb7..c683c93143b2 100644
--- a/pkgs/development/python-modules/pyevmasm/default.nix
+++ b/pkgs/development/python-modules/pyevmasm/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crytic";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "134q0z0dqzxzr0jw5jr98kp90kx2dl0qw9smykwxdgq555q1l6qa";
   };
 
diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix
index e77a6992fc4c..8d0196473c09 100644
--- a/pkgs/development/python-modules/pyexcel-ods/default.nix
+++ b/pkgs/development/python-modules/pyexcel-ods/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyexcel";
     repo = "pyexcel-ods";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wptjCSi56hotmiIE0TrLY7jsCHKwDR+a7d89sAQWBHg=";
   };
 
diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix
index 9092bba1bdaa..81bcc8ade772 100644
--- a/pkgs/development/python-modules/pyexcel-xls/default.nix
+++ b/pkgs/development/python-modules/pyexcel-xls/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyexcel";
     repo = "pyexcel-xls";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wxsx/LfeBxi+NnHxfxk3svzsBcdwOiLQ1660eoHfmLg=";
   };
 
diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix
index 0491e9ad744b..04534f99c58d 100644
--- a/pkgs/development/python-modules/pyflakes/default.nix
+++ b/pkgs/development/python-modules/pyflakes/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "pyflakes";
-    tag = version;
+    rev = version;
     hash = "sha256-ouCkkm9OrYob00uLTilqgWsTWfHhzaiZp7sa2C5liqk=";
   };
 
diff --git a/pkgs/development/python-modules/pyflexit/default.nix b/pkgs/development/python-modules/pyflexit/default.nix
index bd9afd126012..22190d150b40 100644
--- a/pkgs/development/python-modules/pyflexit/default.nix
+++ b/pkgs/development/python-modules/pyflexit/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Sabesto";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1ajlqr3z6zj4fyslqzpwpfkvh8xjx94wsznzij0vx0q7jp43bqig";
   };
 
diff --git a/pkgs/development/python-modules/pyflic/default.nix b/pkgs/development/python-modules/pyflic/default.nix
index 0c58c55d9657..f780c16cd144 100644
--- a/pkgs/development/python-modules/pyflic/default.nix
+++ b/pkgs/development/python-modules/pyflic/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "soldag";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-K1trMBZfc1aHSNSddq0v//Gv8ySgT/ONQYgrKWzw2qs=";
   };
 
diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix
index 63f7c8b2f1b9..926d03bf3743 100644
--- a/pkgs/development/python-modules/pyfma/default.nix
+++ b/pkgs/development/python-modules/pyfma/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = "pyfma";
-    tag = version;
+    rev = version;
     hash = "sha256-1qNa+FcIAP1IMzdNKrEbTVPo6gTOSCvhTRIHm6REJoo=";
   };
 
diff --git a/pkgs/development/python-modules/pyfzf/default.nix b/pkgs/development/python-modules/pyfzf/default.nix
index 701c330eb835..296d2d11670e 100644
--- a/pkgs/development/python-modules/pyfzf/default.nix
+++ b/pkgs/development/python-modules/pyfzf/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nk412";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-w+ZjQGFd/lR2TiTHc2uQSJXORmzJJZXsr9BO4PIw/Co=";
   };
 
diff --git a/pkgs/development/python-modules/pygrok/default.nix b/pkgs/development/python-modules/pygrok/default.nix
index c9b87d703698..3313a921808d 100644
--- a/pkgs/development/python-modules/pygrok/default.nix
+++ b/pkgs/development/python-modules/pygrok/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "garyelephant";
     repo = "pygrok";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "07487rcmv74srnchh60jp0vg46g086qmpkaj8gxqhp9rj47r1s4m";
   };
 
diff --git a/pkgs/development/python-modules/pygtail/default.nix b/pkgs/development/python-modules/pygtail/default.nix
index e70dd97d1787..8ef39af5c314 100644
--- a/pkgs/development/python-modules/pygtail/default.nix
+++ b/pkgs/development/python-modules/pygtail/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bgreenlee";
     repo = "pygtail";
-    tag = version;
+    rev = version;
     hash = "sha256-TlXTlxeGDd+elGpMjxcJCmRuJmp5k9xj6MrViRzcST4=";
   };
 
diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix
index 58d9f6c1bdf7..d4abb9fabaae 100644
--- a/pkgs/development/python-modules/pyhcl/default.nix
+++ b/pkgs/development/python-modules/pyhcl/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "virtuald";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0rcpx4vvj2c6wxp31vay7a2xa5p62kabi91vps9plj6710yz29nc";
   };
 
diff --git a/pkgs/development/python-modules/pyhomepilot/default.nix b/pkgs/development/python-modules/pyhomepilot/default.nix
index ffc45069cce9..db00d9190ff0 100644
--- a/pkgs/development/python-modules/pyhomepilot/default.nix
+++ b/pkgs/development/python-modules/pyhomepilot/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nico0302";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "00gmqx8cwsd15iccnlr8ypgqrdg6nw9ha518cfk7pyp8vhw1ziwy";
   };
 
diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix
index 229fdbf9ee23..e5f36fe22d9d 100644
--- a/pkgs/development/python-modules/pyhumps/default.nix
+++ b/pkgs/development/python-modules/pyhumps/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nficano";
     repo = "humps";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ElL/LY2V2Z3efdV5FnDy9dSoBltULrzxsjaOx+7W9Oo=";
   };
 
diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix
index cfb263d03c15..f76788180202 100644
--- a/pkgs/development/python-modules/pyialarm/default.nix
+++ b/pkgs/development/python-modules/pyialarm/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RyuzakiKK";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rOdeYewjoFVbHdNPHN6ZC2g6X5yr84/JFE6tGSDIoRU=";
   };
 
diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix
index dd1bd4661c08..6aebdaa47f52 100644
--- a/pkgs/development/python-modules/pyicloud/default.nix
+++ b/pkgs/development/python-modules/pyicloud/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "picklepete";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-2E1pdHHt8o7CGpdG+u4xy5OyNCueUGVw5CY8oicYd5w=";
   };
 
diff --git a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
index 8af7000acfad..f941b8dc67c1 100644
--- a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
+++ b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DudeNr33";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lz1GuiXU+r8sMld5SsG3qS+FOsWfbvkQmO2bxAR3XcY=";
   };
 
diff --git a/pkgs/development/python-modules/pykostalpiko/default.nix b/pkgs/development/python-modules/pykostalpiko/default.nix
index e91ed6d4f815..c9c183819818 100644
--- a/pkgs/development/python-modules/pykostalpiko/default.nix
+++ b/pkgs/development/python-modules/pykostalpiko/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Florian7843";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kmzFsOgmMb8bOkulg7G6vXEPdb0xizh7u5LjnHfEWWQ=";
   };
 
diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix
index 33733ba3b30e..55cdaf71b4bb 100644
--- a/pkgs/development/python-modules/pykrakenapi/default.nix
+++ b/pkgs/development/python-modules/pykrakenapi/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dominiktraxl";
     repo = "pykrakenapi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sMtNdXM+47iCnDgo33DCD1nx/I+jVX/oG/9aN80LfRg=";
   };
 
diff --git a/pkgs/development/python-modules/pykulersky/default.nix b/pkgs/development/python-modules/pykulersky/default.nix
index 43ffde5bc5f1..1c3ddaea9cd7 100644
--- a/pkgs/development/python-modules/pykulersky/default.nix
+++ b/pkgs/development/python-modules/pykulersky/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emlove";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-BaGcsHlQpuEnUn8OgSUsJi2q89vFl7vpkinviKnUZJk=";
   };
 
diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix
index 6bc39d1f4a52..39b5657819ad 100644
--- a/pkgs/development/python-modules/pylama/default.nix
+++ b/pkgs/development/python-modules/pylama/default.nix
@@ -27,7 +27,7 @@ let
       name = "${pname}-${version}-source";
       owner = "klen";
       repo = "pylama";
-      tag = version;
+      rev = version;
       hash = "sha256-WOGtZ412tX3YH42JCd5HIngunluwtMmQrOSUZp23LPU=";
     };
 
diff --git a/pkgs/development/python-modules/pylatex/default.nix b/pkgs/development/python-modules/pylatex/default.nix
index bc32614284f6..ecd6adf3cdd2 100644
--- a/pkgs/development/python-modules/pylatex/default.nix
+++ b/pkgs/development/python-modules/pylatex/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JelteF";
     repo = "PyLaTeX";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gZKMYGMp7bzDY5+Xx9h1AFP4l0Zd936fDfSXyW5lY1k=";
   };
 
diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix
index db8a84c29c28..d48fe47bf447 100644
--- a/pkgs/development/python-modules/pylatexenc/default.nix
+++ b/pkgs/development/python-modules/pylatexenc/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "phfaist";
     repo = "pylatexenc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3Ho04qrmCtmmrR+BUJNbtdCZcK7lXhUGJjm4yfCTUkM=";
   };
 
diff --git a/pkgs/development/python-modules/pyld/default.nix b/pkgs/development/python-modules/pyld/default.nix
index 1833c368ae66..aa66ac581c3c 100644
--- a/pkgs/development/python-modules/pyld/default.nix
+++ b/pkgs/development/python-modules/pyld/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "digitalbazaar";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0z2vkllw8bvzxripwb6l757r7av5qwhzsiy4061gmlhq8z8gq961";
   };
 
diff --git a/pkgs/development/python-modules/pyldavis/default.nix b/pkgs/development/python-modules/pyldavis/default.nix
index 64dcefcf70b2..8b26af56615c 100644
--- a/pkgs/development/python-modules/pyldavis/default.nix
+++ b/pkgs/development/python-modules/pyldavis/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bmabey";
     repo = "pyLDAvis";
-    tag = version;
+    rev = version;
     sha256 = "sha256-WIQytds3PeU85l6ix2UUIwypjpM5rMZvQxiHx9BY91Y=";
   };
 
diff --git a/pkgs/development/python-modules/pylddwrap/default.nix b/pkgs/development/python-modules/pylddwrap/default.nix
index a3b57cf45e26..cb68291f27e6 100644
--- a/pkgs/development/python-modules/pylddwrap/default.nix
+++ b/pkgs/development/python-modules/pylddwrap/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Parquery";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Gm82VRu8GP52BohQzpMUJfh6q2tiUA2GJWOcG7ymGgg=";
   };
 
diff --git a/pkgs/development/python-modules/pylev/default.nix b/pkgs/development/python-modules/pylev/default.nix
index b8d73205cf1f..30831a8c5727 100644
--- a/pkgs/development/python-modules/pylev/default.nix
+++ b/pkgs/development/python-modules/pylev/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "toastdriven";
     repo = "pylev";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0fgxjdnvnvavnxmxxd0fl5jyr2f31g3a26bwyxcpy56mgpd095c1";
   };
 
diff --git a/pkgs/development/python-modules/pylibdmtx/default.nix b/pkgs/development/python-modules/pylibdmtx/default.nix
index d0cbe7d8344c..97037747a25b 100644
--- a/pkgs/development/python-modules/pylibdmtx/default.nix
+++ b/pkgs/development/python-modules/pylibdmtx/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NaturalHistoryMuseum";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-vNWzhO4V0mj4eItZ0Z5UG9RBCqprIcgMGNyIe1+mXWY=";
   };
 
diff --git a/pkgs/development/python-modules/pylint-celery/default.nix b/pkgs/development/python-modules/pylint-celery/default.nix
index 90c8092ffc93..99ffa65d6cd7 100644
--- a/pkgs/development/python-modules/pylint-celery/default.nix
+++ b/pkgs/development/python-modules/pylint-celery/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "05fhwraq12c2724pn4py1bjzy5rmsrb1x68zck73nlp5icba6yap";
   };
 
diff --git a/pkgs/development/python-modules/pyloggermanager/default.nix b/pkgs/development/python-modules/pyloggermanager/default.nix
index 64286daf6d4e..827f826c99e2 100644
--- a/pkgs/development/python-modules/pyloggermanager/default.nix
+++ b/pkgs/development/python-modules/pyloggermanager/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coldsofttech";
     repo = "pyloggermanager";
-    tag = version;
+    rev = version;
     hash = "sha256-1hfcmMLH2d71EV71ExKqjZ7TMcqVd1AQrEwJhmEWOVU=";
   };
 
diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix
index 1ffa1bbdd3ef..27dd4c93d6fc 100644
--- a/pkgs/development/python-modules/pylru/default.nix
+++ b/pkgs/development/python-modules/pylru/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jlhutch";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dTYiD+/zt0ZSP+sefYyeD87To1nRXyoFodlBg8pm1YE=";
   };
 
diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix
index 7fec36f98064..de2cbdae88b8 100644
--- a/pkgs/development/python-modules/pyls-spyder/default.nix
+++ b/pkgs/development/python-modules/pyls-spyder/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spyder-ide";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "11ajbsia60d4c9s6m6rbvaqp1d69fcdbq6a98lkzkkzv2b9pdhkk";
   };
 
diff --git a/pkgs/development/python-modules/pymailgunner/default.nix b/pkgs/development/python-modules/pymailgunner/default.nix
index dd9b50ba1a14..7e5a5bd5d8c4 100644
--- a/pkgs/development/python-modules/pymailgunner/default.nix
+++ b/pkgs/development/python-modules/pymailgunner/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pschmitt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-QKwpW1aeN6OI76Kocow1Zhghq4/fl/cMPexny0MTwQs=";
   };
 
diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix
index e46ae368758b..44bd1c815614 100644
--- a/pkgs/development/python-modules/pymarshal/default.nix
+++ b/pkgs/development/python-modules/pymarshal/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stargateaudio";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A=";
   };
 
diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix
index d1a352f7fe1a..d516ba9b38e7 100644
--- a/pkgs/development/python-modules/pymata-express/default.nix
+++ b/pkgs/development/python-modules/pymata-express/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MrYsLab";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1mibyn84kjahrv3kn51yl5mhkyig4piv6wanggzjflh5nm96bhy8";
   };
 
diff --git a/pkgs/development/python-modules/pymdstat/default.nix b/pkgs/development/python-modules/pymdstat/default.nix
index 43e88110274b..f447d15e45af 100644
--- a/pkgs/development/python-modules/pymdstat/default.nix
+++ b/pkgs/development/python-modules/pymdstat/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "pymdstat";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ifQZXc+it/UTltHc1ZL2zxJu7GvAxYzzmB4D+mCqEoE=";
   };
 
diff --git a/pkgs/development/python-modules/pymelcloud/default.nix b/pkgs/development/python-modules/pymelcloud/default.nix
index ee9fffe2b0c1..d859da4ff22a 100644
--- a/pkgs/development/python-modules/pymelcloud/default.nix
+++ b/pkgs/development/python-modules/pymelcloud/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vilppuvuorinen";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1q6ny58cn9qy86blxbk6l2iklab7y11b734l7yb1bp35dmy27w26";
   };
 
diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix
index 661738c8eb0d..6f570f8d8306 100644
--- a/pkgs/development/python-modules/pymemcache/default.nix
+++ b/pkgs/development/python-modules/pymemcache/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pinterest";
     repo = "pymemcache";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WgtHhp7lE6StoOBfSy9+v3ODe/+zUC7lGrc2S4M68+M=";
   };
 
diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix
index 3f7f4002119d..9178399610b3 100644
--- a/pkgs/development/python-modules/pymysensors/default.nix
+++ b/pkgs/development/python-modules/pymysensors/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "theolind";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-3t9YrSJf02kc5CuTqPBc/qNJV7yy7Vke4WqhtuOaAYo=";
   };
 
diff --git a/pkgs/development/python-modules/pynamecheap/default.nix b/pkgs/development/python-modules/pynamecheap/default.nix
index 12f3fb09fd91..adf63d29af72 100644
--- a/pkgs/development/python-modules/pynamecheap/default.nix
+++ b/pkgs/development/python-modules/pynamecheap/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bemmu";
     repo = "PyNamecheap";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1g1cd2yc6rpdsc5ax7s93y5nfkf91gcvbgcaqyl9ida6srd9hr97";
   };
 
diff --git a/pkgs/development/python-modules/pynello/default.nix b/pkgs/development/python-modules/pynello/default.nix
index 299c873ea904..919674c639fc 100644
--- a/pkgs/development/python-modules/pynello/default.nix
+++ b/pkgs/development/python-modules/pynello/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pschmitt";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-sUy37sEPEMyFYFVBzFVdcg31nZAyC+Ricm4LqxmjuQQ=";
   };
 
diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix
index da6d5bb171de..87cbebb03d7f 100644
--- a/pkgs/development/python-modules/pynest2d/default.nix
+++ b/pkgs/development/python-modules/pynest2d/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "pynest2d";
-    tag = version;
+    rev = version;
     hash = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo=";
   };
 
diff --git a/pkgs/development/python-modules/pynotifier/default.nix b/pkgs/development/python-modules/pynotifier/default.nix
index 80eb6add920e..f264d9a32803 100644
--- a/pkgs/development/python-modules/pynotifier/default.nix
+++ b/pkgs/development/python-modules/pynotifier/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "YuriyLisovskiy";
     repo = "pynotifier";
-    tag = version;
+    rev = version;
     hash = "sha256-xS3hH3cyqgDD7uoWkIYXpQAh7SN7XJ/qMfB0Vq5bva0=";
   };
 
diff --git a/pkgs/development/python-modules/pynut2/default.nix b/pkgs/development/python-modules/pynut2/default.nix
index 4b8036287cd0..44c687f12592 100644
--- a/pkgs/development/python-modules/pynut2/default.nix
+++ b/pkgs/development/python-modules/pynut2/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mezz64";
     repo = "python-nut2";
-    tag = version;
+    rev = version;
     sha256 = "1lg7n1frndfgw73s0ssl1h7kc6zxm7fpiwlc6v6d60kxzaj1dphx";
   };
 
diff --git a/pkgs/development/python-modules/pyperscan/default.nix b/pkgs/development/python-modules/pyperscan/default.nix
index f07a4230ecb0..99511047b1a5 100644
--- a/pkgs/development/python-modules/pyperscan/default.nix
+++ b/pkgs/development/python-modules/pyperscan/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vlaci";
     repo = "pyperscan";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uGZ0XFxnZHSLEWcwoHVd+xMulDRqEIrQ5Lf7886GdlM=";
   };
 
diff --git a/pkgs/development/python-modules/pypika/default.nix b/pkgs/development/python-modules/pypika/default.nix
index b7d52aee1a6c..70e3d3bcb114 100644
--- a/pkgs/development/python-modules/pypika/default.nix
+++ b/pkgs/development/python-modules/pypika/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kayak";
     repo = "pypika";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9HKT1xRu23F5ptiKhIgIR8srLIcpDzpowBNuYOhqMU0=";
   };
 
diff --git a/pkgs/development/python-modules/pyqt5-stubs/default.nix b/pkgs/development/python-modules/pyqt5-stubs/default.nix
index 80cdd365b8d8..a891942d1d45 100644
--- a/pkgs/development/python-modules/pyqt5-stubs/default.nix
+++ b/pkgs/development/python-modules/pyqt5-stubs/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-qt-tools";
     repo = "PyQt5-stubs";
-    tag = version;
+    rev = version;
     hash = "sha256-qWnvlHnFRy8wbZJ28C0pYqAxod623Epe5z5FZufheDc=";
   };
   postPatch =
diff --git a/pkgs/development/python-modules/pyqtdarktheme/default.nix b/pkgs/development/python-modules/pyqtdarktheme/default.nix
index 7beeda6ea12b..2d4841227071 100644
--- a/pkgs/development/python-modules/pyqtdarktheme/default.nix
+++ b/pkgs/development/python-modules/pyqtdarktheme/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "5yutan5";
     repo = "PyQtDarkTheme";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jK+wnIyPE8Bav0pzbvVisYYCzdRshYw1S2t0H3Pro5M=";
   };
 
diff --git a/pkgs/development/python-modules/pyquaternion/default.nix b/pkgs/development/python-modules/pyquaternion/default.nix
index 7bb645e9e6f5..f3e1212d9847 100644
--- a/pkgs/development/python-modules/pyquaternion/default.nix
+++ b/pkgs/development/python-modules/pyquaternion/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KieranWynn";
     repo = "pyquaternion";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L0wT9DFUDRcmmN7OpmIDNvtQWQrM7iFnZt6R2xrJ+3A=";
   };
 
diff --git a/pkgs/development/python-modules/pyqvrpro/default.nix b/pkgs/development/python-modules/pyqvrpro/default.nix
index d31c05e9e827..53392e3cb18d 100644
--- a/pkgs/development/python-modules/pyqvrpro/default.nix
+++ b/pkgs/development/python-modules/pyqvrpro/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oblogic7";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lOd2AqnrkexNqT/usmJts5NW7vJtV8CRsliYgkhgRaU=";
   };
 
diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix
index f90fc0bc83e4..9003ad79c530 100644
--- a/pkgs/development/python-modules/pyrate-limiter/default.nix
+++ b/pkgs/development/python-modules/pyrate-limiter/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vutran1710";
     repo = "PyrateLimiter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0=";
   };
 
diff --git a/pkgs/development/python-modules/pyrituals/default.nix b/pkgs/development/python-modules/pyrituals/default.nix
index c6c1b9572838..c8514f59ae78 100644
--- a/pkgs/development/python-modules/pyrituals/default.nix
+++ b/pkgs/development/python-modules/pyrituals/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "milanmeu";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0ynjz7khp67bwxjp580w3zijxr9yn44nmnbvkxjxq9scyb2mjf6g";
   };
 
diff --git a/pkgs/development/python-modules/pyrmvtransport/default.nix b/pkgs/development/python-modules/pyrmvtransport/default.nix
index 9bf2a61c588d..89eea0f2ecbb 100644
--- a/pkgs/development/python-modules/pyrmvtransport/default.nix
+++ b/pkgs/development/python-modules/pyrmvtransport/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cgtobi";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40=";
   };
 
diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix
index 22c579a4f1fb..b7961fa3e690 100644
--- a/pkgs/development/python-modules/pyrogram/default.nix
+++ b/pkgs/development/python-modules/pyrogram/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyrogram";
     repo = "pyrogram";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W/t3v5q0s+ba0Uly+JUaJl75uDQGeFaj2zDKGRMIMow=";
   };
 
diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix
index cffd3d249c6b..eacbbe5b8b9c 100644
--- a/pkgs/development/python-modules/pyroma/default.nix
+++ b/pkgs/development/python-modules/pyroma/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "regebro";
     repo = "pyroma";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ElSw+bY6fbHJPTX7O/9JZ4drttfbUQsU/fv3Cqqb/J4=";
   };
 
diff --git a/pkgs/development/python-modules/pysaj/default.nix b/pkgs/development/python-modules/pysaj/default.nix
index a0294ec65771..499cb552b36e 100644
--- a/pkgs/development/python-modules/pysaj/default.nix
+++ b/pkgs/development/python-modules/pysaj/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fredericvl";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7mN6GPRbXfEUfCrCrCs71SSt4x2Ch2y3a5rfXnuwVA0=";
   };
 
diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix
index 131c8d2cf0df..0921aa790e80 100644
--- a/pkgs/development/python-modules/pysatochip/default.nix
+++ b/pkgs/development/python-modules/pysatochip/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "toporin";
     repo = "pysatochip";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7wA9erk2OA1FyNSzOSWJzjyp9QeYq6C+YA8B0Dk2iQE=";
   };
 
diff --git a/pkgs/development/python-modules/pysbd/default.nix b/pkgs/development/python-modules/pysbd/default.nix
index d9fd306a677e..fcc440fe4c74 100644
--- a/pkgs/development/python-modules/pysbd/default.nix
+++ b/pkgs/development/python-modules/pysbd/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nipunsadvilkar";
     repo = "pySBD";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "12p7qm237z56hw4zr03n8rycgfymhki2m9c4w3ib0mvqq122a5dp";
   };
 
diff --git a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix
index bda8aca64d18..17951563bed7 100644
--- a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix
+++ b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "pyserial-asyncio-fast";
-    tag = version;
+    rev = version;
     hash = "sha256-ZnXuwHvYq/BrEW6YV6T0sQ03u2rpwNBnpF+dXAmvxKQ=";
   };
 
diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix
index 2f17412b5093..176e04eed522 100644
--- a/pkgs/development/python-modules/pyshp/default.nix
+++ b/pkgs/development/python-modules/pyshp/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GeospatialPython";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-yfxhgk8a1rdpGVkE1sjJqT6tiFLimhu2m2SjGxLI6wo=";
   };
 
diff --git a/pkgs/development/python-modules/pyskyqhub/default.nix b/pkgs/development/python-modules/pyskyqhub/default.nix
index d358ce28b78f..ee460a27f566 100644
--- a/pkgs/development/python-modules/pyskyqhub/default.nix
+++ b/pkgs/development/python-modules/pyskyqhub/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RogerSelwyn";
     repo = "skyq_hub";
-    tag = version;
+    rev = version;
     hash = "sha256-yXqtABbsCh1yb96lsEA0gquikVenGLCo6J93AeXAC8k=";
   };
 
diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix
index 418557aec465..dbf3d11da54b 100644
--- a/pkgs/development/python-modules/pysmappee/default.nix
+++ b/pkgs/development/python-modules/pysmappee/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "smappee";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Ffi55FZsZUKDcS4qV46NpRK3VP6axzrL2BO+hYW7J9E=";
   };
 
diff --git a/pkgs/development/python-modules/pysmartapp/default.nix b/pkgs/development/python-modules/pysmartapp/default.nix
index 7322d97591dd..295624bafc76 100644
--- a/pkgs/development/python-modules/pysmartapp/default.nix
+++ b/pkgs/development/python-modules/pysmartapp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "andrewsayre";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-RiRGOO5l5hcHllyDDGLtQHr51JOTZhAa/wK8BfMqmAY=";
   };
 
diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix
index 9b7c30179cfc..7197bb1b6bb5 100644
--- a/pkgs/development/python-modules/pysmt/default.nix
+++ b/pkgs/development/python-modules/pysmt/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pysmt";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HmEdCJOF04h0z5UPpfYa07b78EEBj5KyVAk6aNRFPEo=";
   };
 
diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix
index 05858f98dae7..80897afcf851 100644
--- a/pkgs/development/python-modules/pysnow/default.nix
+++ b/pkgs/development/python-modules/pysnow/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rbw";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-nKOPCkS2b3ObmBnk/7FTv4o4vwUX+tOtZI5OQQ4HSTY=";
   };
 
diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix
index 3b4ccd16c41f..a95787c5444a 100644
--- a/pkgs/development/python-modules/pysonos/default.nix
+++ b/pkgs/development/python-modules/pysonos/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amelchio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gBOknYHL5nQWFVhCbLN0Ah+1fovcNY4P2myryZnUadk=";
   };
 
diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix
index 3066ea95bf5d..9be5028a8787 100644
--- a/pkgs/development/python-modules/pysrt/default.nix
+++ b/pkgs/development/python-modules/pysrt/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "byroot";
     repo = "pysrt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1f5hxyzlh5mdvvi52qapys9qcinffr6ghgivb6k4jxa92cbs3mfg";
   };
 
diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix
index aa4622ba0e41..a0145c30c553 100644
--- a/pkgs/development/python-modules/pyssim/default.nix
+++ b/pkgs/development/python-modules/pyssim/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jterrace";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-LDNIugQeRqNsAZ5ZxS/NxHokEAwefpfRutTRpR0IcXk=";
   };
 
diff --git a/pkgs/development/python-modules/pystardict/default.nix b/pkgs/development/python-modules/pystardict/default.nix
index f4c529db9c31..ac890f7fdbf6 100644
--- a/pkgs/development/python-modules/pystardict/default.nix
+++ b/pkgs/development/python-modules/pystardict/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lig";
     repo = "pystardict";
-    tag = version;
+    rev = version;
     hash = "sha256-YrZpIhyxfA3G7rP0SJ+EvzGwAXlne80AYilkj6cIDnA=";
   };
 
diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix
index c42689589197..632356001c59 100644
--- a/pkgs/development/python-modules/pystray/default.nix
+++ b/pkgs/development/python-modules/pystray/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "moses-palmer";
     repo = "pystray";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CZhbaXwKFrRBEomzfFPMQdMkTOl5lbgI64etfDRiRu4=";
   };
 
diff --git a/pkgs/development/python-modules/pysubs2/default.nix b/pkgs/development/python-modules/pysubs2/default.nix
index 265b7fb62873..03f7077afd42 100644
--- a/pkgs/development/python-modules/pysubs2/default.nix
+++ b/pkgs/development/python-modules/pysubs2/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tkarabela";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-fKSb7MfBHGft8Tp6excjfkVXKnHRER11X0QxbR1zD4I=";
   };
 
diff --git a/pkgs/development/python-modules/pysvg-py3/default.nix b/pkgs/development/python-modules/pysvg-py3/default.nix
index d3d17f8c8e4a..77d430e67052 100644
--- a/pkgs/development/python-modules/pysvg-py3/default.nix
+++ b/pkgs/development/python-modules/pysvg-py3/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alorence";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1slync0knpcjgl4xpym8w4249iy6vmrwbarpnbjzn9xca8g1h2f0";
   };
 
diff --git a/pkgs/development/python-modules/pytap2/default.nix b/pkgs/development/python-modules/pytap2/default.nix
index 09efc79663ff..1e080f0bbad3 100644
--- a/pkgs/development/python-modules/pytap2/default.nix
+++ b/pkgs/development/python-modules/pytap2/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "johnthagen";
     repo = "pytap2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GN8yFnS7HVgIP73/nVtYnwwhCBI9doGHLGSOaFiWIdw=";
   };
 
diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix
index f3cd24bb0f00..0110008ae3dd 100644
--- a/pkgs/development/python-modules/pyte/default.nix
+++ b/pkgs/development/python-modules/pyte/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "selectel";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-u24ltX/LEteiZ2a/ioKqxV2AZgrFmKOHXmySmw21sLE=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix
index 27f33ca0e486..2a970b16e7e0 100644
--- a/pkgs/development/python-modules/pytest-click/default.nix
+++ b/pkgs/development/python-modules/pytest-click/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Stranger6667";
     repo = "pytest-click";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A/RF+SgPu2yYF3eHEFiZwKJW2VwQ185Ln6S3wn2cS0k=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-error-for-skips/default.nix b/pkgs/development/python-modules/pytest-error-for-skips/default.nix
index bf3ea025cc33..594c16c4a87f 100644
--- a/pkgs/development/python-modules/pytest-error-for-skips/default.nix
+++ b/pkgs/development/python-modules/pytest-error-for-skips/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jankatins";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "04i4jd3bg4lgn2jfh0a0dzg3ml9b2bjv2ndia6b64w96r3r4p3qr";
   };
 
diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix
index c28c9ab2e683..5b10967a0b00 100644
--- a/pkgs/development/python-modules/pytest-factoryboy/default.nix
+++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-factoryboy";
-    tag = version;
+    rev = version;
     sha256 = "sha256-GYqYwtbmMWVqImVPPBbZNRJJGcbksUPsIbi6QuPRMco=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-freezegun/default.nix b/pkgs/development/python-modules/pytest-freezegun/default.nix
index 66b915854a16..259f698431ab 100644
--- a/pkgs/development/python-modules/pytest-freezegun/default.nix
+++ b/pkgs/development/python-modules/pytest-freezegun/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ktosiek";
     repo = "pytest-freezegun";
-    tag = version;
+    rev = version;
     sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas";
   };
 
diff --git a/pkgs/development/python-modules/pytest-logdog/default.nix b/pkgs/development/python-modules/pytest-logdog/default.nix
index ff4eaa397a6f..b047d86acc12 100644
--- a/pkgs/development/python-modules/pytest-logdog/default.nix
+++ b/pkgs/development/python-modules/pytest-logdog/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ods";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Tmoq+KAGzn0MMj29rukDfAc4LSIwC8DoMTuBAppV32I=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-mockito/default.nix b/pkgs/development/python-modules/pytest-mockito/default.nix
index d84830e6a59a..06b9a9355367 100644
--- a/pkgs/development/python-modules/pytest-mockito/default.nix
+++ b/pkgs/development/python-modules/pytest-mockito/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kaste";
     repo = "pytest-mockito";
-    tag = version;
+    rev = version;
     hash = "sha256-vY/i1YV1lo4mZvnxsXBOyaq31YTiF0BY6PTVwdVX10I=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-mockservers/default.nix b/pkgs/development/python-modules/pytest-mockservers/default.nix
index 7b2bff70a7e9..3ab4e4e63cbf 100644
--- a/pkgs/development/python-modules/pytest-mockservers/default.nix
+++ b/pkgs/development/python-modules/pytest-mockservers/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Gr1N";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Mb3wSbambC1h+lFI+fafwZzm78IvADNAsF/Uw60DFHc=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-mpi/default.nix b/pkgs/development/python-modules/pytest-mpi/default.nix
index ea91edb9c69a..7a474fd084b0 100644
--- a/pkgs/development/python-modules/pytest-mpi/default.nix
+++ b/pkgs/development/python-modules/pytest-mpi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aragilar";
     repo = "pytest-mpi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m3HTGLoPnYeg0oeIA1nzTzch7FtkuXTYpox4rRgo5MU=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-pytestrail/default.nix b/pkgs/development/python-modules/pytest-pytestrail/default.nix
index 19330c434fca..99c2c8786673 100644
--- a/pkgs/development/python-modules/pytest-pytestrail/default.nix
+++ b/pkgs/development/python-modules/pytest-pytestrail/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tolstislon";
     repo = "pytest-pytestrail";
-    tag = version;
+    rev = version;
     sha256 = "sha256-y34aRxQ8mu6b6GBRMFVzn1shMVc7TumdjRS3daMEZJM=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-raisin/default.nix b/pkgs/development/python-modules/pytest-raisin/default.nix
index 23f7ccfdd8e4..762a3a6fa0ec 100644
--- a/pkgs/development/python-modules/pytest-raisin/default.nix
+++ b/pkgs/development/python-modules/pytest-raisin/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wimglenn";
     repo = "pytest-raisin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-BI0SWy671DYDTPH4iO811ku6SzpH4ho7eQFUA8PmxW8=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix
index 112af28891ff..b2ecfb4edb50 100644
--- a/pkgs/development/python-modules/pytest-randomly/default.nix
+++ b/pkgs/development/python-modules/pytest-randomly/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "pytest-dev";
-    tag = version;
+    rev = version;
     hash = "sha256-bxbW22Nf/0hfJYSiz3xdrNCzrb7vZwuVvSIrWl0Bkv4=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix
index bef2e62f2df2..66389e622e64 100644
--- a/pkgs/development/python-modules/pytest-resource-path/default.nix
+++ b/pkgs/development/python-modules/pytest-resource-path/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yukihiko-shinoda";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2";
   };
 
diff --git a/pkgs/development/python-modules/pytest-reverse/default.nix b/pkgs/development/python-modules/pytest-reverse/default.nix
index 7ad085558e4d..9e6736625b36 100644
--- a/pkgs/development/python-modules/pytest-reverse/default.nix
+++ b/pkgs/development/python-modules/pytest-reverse/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "pytest-reverse";
-    tag = version;
+    rev = version;
     hash = "sha256-r0aSbUgArHQkpaXUvMT6oyOxEliQRtSGuDt4IILzhH4=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-tap/default.nix b/pkgs/development/python-modules/pytest-tap/default.nix
index 58205abcdbbc..91513ca894e2 100644
--- a/pkgs/development/python-modules/pytest-tap/default.nix
+++ b/pkgs/development/python-modules/pytest-tap/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-tap";
     repo = "pytest-tap";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "R0RSdKTyJYGq+x0+ut4pJEywTGNgGp/ps36ZaH5dyY4=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix
index 132aa061ec80..31caf8fc5e09 100644
--- a/pkgs/development/python-modules/pytest-trio/default.nix
+++ b/pkgs/development/python-modules/pytest-trio/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-trio";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-gUH35Yk/pBD2EdCEt8D0XQKWU8BwmX5xtAW10qRhoYk=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-vcr/default.nix b/pkgs/development/python-modules/pytest-vcr/default.nix
index c0661e97136c..2e77d3af8261 100644
--- a/pkgs/development/python-modules/pytest-vcr/default.nix
+++ b/pkgs/development/python-modules/pytest-vcr/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ktosiek";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i";
   };
 
diff --git a/pkgs/development/python-modules/python-awair/default.nix b/pkgs/development/python-modules/python-awair/default.nix
index c46366e106d0..c814188477fa 100644
--- a/pkgs/development/python-modules/python-awair/default.nix
+++ b/pkgs/development/python-modules/python-awair/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ahayworth";
     repo = "python_awair";
-    tag = version;
+    rev = version;
     hash = "sha256-zdZyA6adM4bfEYupdZl7CzMjwyfRkQBrntNh0MusynE=";
   };
 
diff --git a/pkgs/development/python-modules/python-barbicanclient/default.nix b/pkgs/development/python-modules/python-barbicanclient/default.nix
index 6497880c7905..9c65649a2336 100644
--- a/pkgs/development/python-modules/python-barbicanclient/default.nix
+++ b/pkgs/development/python-modules/python-barbicanclient/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     domain = "opendev.org";
     owner = "openstack";
     repo = "python-barbicanclient";
-    tag = version;
+    rev = version;
     hash = "sha256-odoYyBulOQkjUpymFyZgvI+DYmdHJY3PaG8hh2ms+/0=";
   };
 
diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix
index 1eb4082e6214..ae00c34c3354 100644
--- a/pkgs/development/python-modules/python-constraint/default.nix
+++ b/pkgs/development/python-modules/python-constraint/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-constraint";
     repo = "python-constraint";
-    tag = version;
+    rev = version;
     sha256 = "1dv11406yxmmgkkhwzqicajbg2bmla5xfad7lv57zyahxz8jzz94";
   };
 
diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix
index 97b163c5c9bf..aa82db324c16 100644
--- a/pkgs/development/python-modules/python-ctags3/default.nix
+++ b/pkgs/development/python-modules/python-ctags3/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "universal-ctags";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-XVsZckNVJ1H5q8FzqoVd1UWRw0zOygvRtb7arX9dwGE=";
   };
 
diff --git a/pkgs/development/python-modules/python-designateclient/default.nix b/pkgs/development/python-modules/python-designateclient/default.nix
index c131dc98e092..44b5b4a665ef 100644
--- a/pkgs/development/python-modules/python-designateclient/default.nix
+++ b/pkgs/development/python-modules/python-designateclient/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     domain = "opendev.org";
     owner = "openstack";
     repo = "python-designateclient";
-    tag = version;
+    rev = version;
     hash = "sha256-MwcpRQXH8EjWv41iHxorbFL9EpYu8qOLkDeUx6inEAU=";
   };
 
diff --git a/pkgs/development/python-modules/python-doi/default.nix b/pkgs/development/python-modules/python-doi/default.nix
index 5d03e0e15bf7..c624d1284532 100644
--- a/pkgs/development/python-modules/python-doi/default.nix
+++ b/pkgs/development/python-modules/python-doi/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "papis";
     repo = "python-doi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1wa5inh2a0drjswrnhjv6m23mvbfdgqj2jb8fya7q0armzp7l6fr";
   };
 
diff --git a/pkgs/development/python-modules/python-ev3dev2/default.nix b/pkgs/development/python-modules/python-ev3dev2/default.nix
index 5963c95722bc..dc185aced7d1 100644
--- a/pkgs/development/python-modules/python-ev3dev2/default.nix
+++ b/pkgs/development/python-modules/python-ev3dev2/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ev3dev";
     repo = "ev3dev-lang-python";
-    tag = version;
+    rev = version;
     sha256 = "XxsiQs3k5xKb+3RewARbvBbxaztdvdq3w5ZMgTq+kRc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/python-flirt/default.nix b/pkgs/development/python-modules/python-flirt/default.nix
index d8f3633d2ce8..47fdc3cfa08d 100644
--- a/pkgs/development/python-modules/python-flirt/default.nix
+++ b/pkgs/development/python-modules/python-flirt/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "williballenthin";
     repo = "lancelot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-J48tRgJw6JjUrcAQdRELFE50pyDptbmbgYbr+rAK/PA=";
   };
 
diff --git a/pkgs/development/python-modules/python-gammu/default.nix b/pkgs/development/python-modules/python-gammu/default.nix
index 341156e603da..ed35a96f7752 100644
--- a/pkgs/development/python-modules/python-gammu/default.nix
+++ b/pkgs/development/python-modules/python-gammu/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gammu";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-lFQBrKWwdvUScwsBva08izZVeVDn1u+ldzixtL9YTpA=";
   };
 
diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix
index 734fada88765..7d303d71ef01 100644
--- a/pkgs/development/python-modules/python-http-client/default.nix
+++ b/pkgs/development/python-modules/python-http-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sendgrid";
     repo = "python-http-client";
-    tag = version;
+    rev = version;
     hash = "sha256-8Qs5Jw0LMV2UucLnlFKJQ2PUhYaQx6uJdIV/4gaPH3w=";
   };
 
diff --git a/pkgs/development/python-modules/python-i18n/default.nix b/pkgs/development/python-modules/python-i18n/default.nix
index c51f055e9093..319fe49f8d1f 100644
--- a/pkgs/development/python-modules/python-i18n/default.nix
+++ b/pkgs/development/python-modules/python-i18n/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "danhper";
     repo = "python-i18n";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "6FahoHZqaOWYGaT9RqLARCm2kLfUIlYuauB6+0eX7jA=";
   };
 
diff --git a/pkgs/development/python-modules/python-juicenet/default.nix b/pkgs/development/python-modules/python-juicenet/default.nix
index 817be3cdf947..1ceb9d031cc6 100644
--- a/pkgs/development/python-modules/python-juicenet/default.nix
+++ b/pkgs/development/python-modules/python-juicenet/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jesserockz";
     repo = "python-juicenet";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5RKnVwOfEHzFZCiC8OUpS8exKrENK+I3Ok45HlKEvtU=";
   };
 
diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix
index 2015f7637b2e..ee9503865f70 100644
--- a/pkgs/development/python-modules/python-magic/default.nix
+++ b/pkgs/development/python-modules/python-magic/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ahupp";
     repo = "python-magic";
-    tag = version;
+    rev = version;
     hash = "sha256-fZ+5xJ3P0EYK+6rQ8VzXv2zckKfEH5VUdISIR6ybIfQ=";
   };
 
diff --git a/pkgs/development/python-modules/python-mbedtls/default.nix b/pkgs/development/python-modules/python-mbedtls/default.nix
index ec6b653d59ad..8459559938c7 100644
--- a/pkgs/development/python-modules/python-mbedtls/default.nix
+++ b/pkgs/development/python-modules/python-mbedtls/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Synss";
     repo = "python-mbedtls";
-    tag = version;
+    rev = version;
     hash = "sha256-gMFludfAprQ/1JR77Ee6/xVvGLJ9pY1LrouLpSKVrzk=";
   };
 
diff --git a/pkgs/development/python-modules/python-memcached/default.nix b/pkgs/development/python-modules/python-memcached/default.nix
index 3d2d87aa3fad..048e53e7eb4c 100644
--- a/pkgs/development/python-modules/python-memcached/default.nix
+++ b/pkgs/development/python-modules/python-memcached/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "linsomniac";
     repo = "python-memcached";
-    tag = version;
+    rev = version;
     hash = "sha256-Qko4Qr9WofeklU0uRRrSPrT8YaBYMCy0GP+TF7YZHLI=";
   };
 
diff --git a/pkgs/development/python-modules/python-mistralclient/default.nix b/pkgs/development/python-modules/python-mistralclient/default.nix
index b0e660bc37c7..6452fe3063e2 100644
--- a/pkgs/development/python-modules/python-mistralclient/default.nix
+++ b/pkgs/development/python-modules/python-mistralclient/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     domain = "opendev.org";
     owner = "openstack";
     repo = "python-mistralclient";
-    tag = version;
+    rev = version;
     hash = "sha256-Vi56+OlFU2Aj7yJ/cH5y0ZbzPhglTciJcTnkbA0S7Qo=";
   };
 
diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
index 8051c213dbb9..76570a030980 100644
--- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
+++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iwalton3";
     repo = "python-mpv-jsonipc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W9TNtbRhQmwZXhi0TJIDkZRtWhi92/iwL056YIcWnLM=";
   };
 
diff --git a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
index b600866cf4d9..5aaca9b14f11 100644
--- a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
+++ b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zaproxy";
     repo = "zap-api-python";
-    tag = version;
+    rev = version;
     sha256 = "0b46m9s0vwaaq8vhiqspdr2ns9qdw65fnjh8mf58gjinlsd27ygk";
   };
 
diff --git a/pkgs/development/python-modules/python-pae/default.nix b/pkgs/development/python-modules/python-pae/default.nix
index ad4c043276bb..731626689adf 100644
--- a/pkgs/development/python-modules/python-pae/default.nix
+++ b/pkgs/development/python-modules/python-pae/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MatthiasValvekens";
     repo = "python-pae";
-    tag = version;
+    rev = version;
     hash = "sha256-D0X2T0ze79KR6Gno4UWpA/XvlkK6Y/jXUtLbzlOKr3E=";
   };
 
diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix
index 312e12ea172b..b4891105ce22 100644
--- a/pkgs/development/python-modules/python-pkcs11/default.nix
+++ b/pkgs/development/python-modules/python-pkcs11/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "danni";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0kncbipfpsb7m7mhv5s5b9wk604h1j08i2j26fn90pklgqll0xhv";
   };
 
diff --git a/pkgs/development/python-modules/python-pptx/default.nix b/pkgs/development/python-modules/python-pptx/default.nix
index f73d82a85b55..542ffd9f21d4 100644
--- a/pkgs/development/python-modules/python-pptx/default.nix
+++ b/pkgs/development/python-modules/python-pptx/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scanny";
     repo = "python-pptx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KyBttTAtP8sVPjYdrY0XReB+4Xfru8GdyYWuiyNZ67w=";
   };
 
diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix
index e46abd4b3d68..fee2f88d5038 100644
--- a/pkgs/development/python-modules/python-rabbitair/default.nix
+++ b/pkgs/development/python-modules/python-rabbitair/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rabbit-air";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CGr7NvnGRNTiKq5BpB/zmfgyd/2ggTbO0nj+Q+MavTs=";
   };
 
diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix
index dc8a0578a599..bf1c6c45982c 100644
--- a/pkgs/development/python-modules/python-sat/default.nix
+++ b/pkgs/development/python-modules/python-sat/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pysathq";
     repo = "pysat";
-    tag = version;
+    rev = version;
     hash = "sha256-zGdgD+SgoMB7/zDQI/trmV70l91TB7OkDxaJ30W3dkI=";
   };
 
diff --git a/pkgs/development/python-modules/python-tds/default.nix b/pkgs/development/python-modules/python-tds/default.nix
index 886a3b117b07..f4775b8e1798 100644
--- a/pkgs/development/python-modules/python-tds/default.nix
+++ b/pkgs/development/python-modules/python-tds/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "denisenkom";
     repo = "pytds";
-    tag = version;
+    rev = version;
     hash = "sha256-ubAXCifSfNtxbFIJZD8IuK/8oPT9vo77YBCexoO9zsw=";
   };
 
diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix
index a2d36af68e38..1811ba176a1e 100644
--- a/pkgs/development/python-modules/python-twitter/default.nix
+++ b/pkgs/development/python-modules/python-twitter/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bear";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "08ydmf6dcd416cvw6xq1wxsz6b9s21f2mf9fh3y4qz9swj6n9h8z";
   };
 
diff --git a/pkgs/development/python-modules/python-u2flib-server/default.nix b/pkgs/development/python-modules/python-u2flib-server/default.nix
index 0d4cd944891c..fa93cb83fce8 100644
--- a/pkgs/development/python-modules/python-u2flib-server/default.nix
+++ b/pkgs/development/python-modules/python-u2flib-server/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "python-u2flib-server";
-    tag = version;
+    rev = version;
     hash = "sha256-ginP9u+aHcdaWpwcFYJWu0Ghf7+nDZq9i3TVAacIPhg=";
   };
 
diff --git a/pkgs/development/python-modules/python-xapp/default.nix b/pkgs/development/python-modules/python-xapp/default.nix
index 4d3018b8d6e7..9abed704189a 100644
--- a/pkgs/development/python-modules/python-xapp/default.nix
+++ b/pkgs/development/python-modules/python-xapp/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "python-xapp";
-    tag = version;
+    rev = version;
     hash = "sha256-Gbm4YT9ZyrROOAbKz5xYd9J9YG9cUL2Oo6dDCPciaBs=";
   };
 
diff --git a/pkgs/development/python-modules/python-yakh/default.nix b/pkgs/development/python-modules/python-yakh/default.nix
index 66339528800c..a3fba540022b 100644
--- a/pkgs/development/python-modules/python-yakh/default.nix
+++ b/pkgs/development/python-modules/python-yakh/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "petereon";
     repo = "yakh";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mXG0fit+0MLOkn2ezRzLboDGKxkES/T7kyWAfaF0EQQ=";
   };
 
diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix
index 96e8efd290f0..0904441944de 100644
--- a/pkgs/development/python-modules/python3-eventlib/default.nix
+++ b/pkgs/development/python-modules/python3-eventlib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AGProjects";
     repo = "python3-eventlib";
-    tag = version;
+    rev = version;
     hash = "sha256-LFW3rCGa7A8tk6SjgYgjkLQ+72GE2WN8wG+XkXYTAoQ=";
   };
 
diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix
index 801f40e068da..18eb56419219 100644
--- a/pkgs/development/python-modules/pythonix/default.nix
+++ b/pkgs/development/python-modules/pythonix/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "pythonix";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1wxqv3i4bva2qq9mx670bcx0g0irjn68fvk28dwvhay9ndwcspqf";
   };
 
diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix
index ceaa9122cc7b..98b20b6ffc46 100644
--- a/pkgs/development/python-modules/pytomlpp/default.nix
+++ b/pkgs/development/python-modules/pytomlpp/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bobfang1992";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-QJeXvj1M3Vq5ctmx7RhczONsPRXAecv3WhJgKWtNK+M=";
   };
diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix
index 00c692d37f40..eabf55c89caa 100644
--- a/pkgs/development/python-modules/pytube/default.nix
+++ b/pkgs/development/python-modules/pytube/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytube";
     repo = "pytube";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Nvs/YlOjk/P5nd1kpUnCM2n6yiEaqZP830UQI0Ug1rk=";
   };
 
diff --git a/pkgs/development/python-modules/pytun/default.nix b/pkgs/development/python-modules/pytun/default.nix
index f591c966df8d..166afc454433 100644
--- a/pkgs/development/python-modules/pytun/default.nix
+++ b/pkgs/development/python-modules/pytun/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   format = "setuptools";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "montag451";
     repo = "pytun";
     sha256 = "sha256-DZ7CoLi6LPhuc55HF9dtek+/N4A29ecnZn7bk7jweuI=";
diff --git a/pkgs/development/python-modules/pyuca/default.nix b/pkgs/development/python-modules/pyuca/default.nix
index dc12b8c0fa63..e4a7a2a0b5f1 100644
--- a/pkgs/development/python-modules/pyuca/default.nix
+++ b/pkgs/development/python-modules/pyuca/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jtauber";
     repo = "pyuca";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KIWk+/o1MX5J9cO7xITvjHrYg0NdgdTetOzfGVwAI/4=";
   };
 
diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix
index aecfd30bd825..a2e0af522d83 100644
--- a/pkgs/development/python-modules/pyupgrade/default.nix
+++ b/pkgs/development/python-modules/pyupgrade/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bijW1uxoaVKLO0Psv3JeAG6rKeTwGa9ZW06VU1qFrrU=";
   };
 
diff --git a/pkgs/development/python-modules/pyuseragents/default.nix b/pkgs/development/python-modules/pyuseragents/default.nix
index ae0805d18636..f817a04222de 100644
--- a/pkgs/development/python-modules/pyuseragents/default.nix
+++ b/pkgs/development/python-modules/pyuseragents/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Animenosekai";
     repo = "useragents";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "D7Qs3vsfkRH2FDkbfakrR+FfWzQFiOCQM7q9AdJavyU=";
   };
 
diff --git a/pkgs/development/python-modules/pyversasense/default.nix b/pkgs/development/python-modules/pyversasense/default.nix
index b31548800864..d6328c4acf81 100644
--- a/pkgs/development/python-modules/pyversasense/default.nix
+++ b/pkgs/development/python-modules/pyversasense/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "imstevenxyz";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "vTaDEwImWDMInwti0Jj+j+RFEtXOOKtiH5wOMD6ZmJk=";
   };
 
diff --git a/pkgs/development/python-modules/pyvolumio/default.nix b/pkgs/development/python-modules/pyvolumio/default.nix
index 4769d89beda8..10a846948f24 100644
--- a/pkgs/development/python-modules/pyvolumio/default.nix
+++ b/pkgs/development/python-modules/pyvolumio/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OnFreund";
     repo = "PyVolumio";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1nyvflap39cwq1cm9wwl9idvfmz1ixsl80f1dnskx22fk0lmvj4h";
   };
 
diff --git a/pkgs/development/python-modules/pywavefront/default.nix b/pkgs/development/python-modules/pywavefront/default.nix
index 40840423c831..676f2aaab661 100644
--- a/pkgs/development/python-modules/pywavefront/default.nix
+++ b/pkgs/development/python-modules/pywavefront/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pywavefront";
     repo = "PyWavefront";
-    tag = version;
+    rev = version;
     hash = "sha256-ci40L2opJ+NYYtaAeX1Y5pzkdK+loFspTriX/xv4KR8=";
   };
 
diff --git a/pkgs/development/python-modules/pywebcopy/default.nix b/pkgs/development/python-modules/pywebcopy/default.nix
index b1b632e6e600..b8065204a811 100644
--- a/pkgs/development/python-modules/pywebcopy/default.nix
+++ b/pkgs/development/python-modules/pywebcopy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rajatomar788";
     repo = "pywebcopy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XTPk3doF9dqImsLtTB03YKMWLzQrJpJtjNXe+691rZo=";
   };
 
diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix
index 753ab6d94fa1..213d33de2314 100644
--- a/pkgs/development/python-modules/pywizlight/default.nix
+++ b/pkgs/development/python-modules/pywizlight/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sbidy";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-JT0Ud17U9etByaDVu9+hcadymze1rfj+mEK6nqksuWc=";
   };
 
diff --git a/pkgs/development/python-modules/pyws66i/default.nix b/pkgs/development/python-modules/pyws66i/default.nix
index 822519e67546..aa196c646a69 100644
--- a/pkgs/development/python-modules/pyws66i/default.nix
+++ b/pkgs/development/python-modules/pyws66i/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ssaenger";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NTL2+xLqSNsz4YdUTwr0nFjhm1NNgB8qDnWSoE2sizY=";
   };
 
diff --git a/pkgs/development/python-modules/pyxiaomigateway/default.nix b/pkgs/development/python-modules/pyxiaomigateway/default.nix
index a33f22192d09..c42d7f055c8c 100644
--- a/pkgs/development/python-modules/pyxiaomigateway/default.nix
+++ b/pkgs/development/python-modules/pyxiaomigateway/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "PyXiaomiGateway";
-    tag = version;
+    rev = version;
     hash = "sha256-TAbZvs1RrUy9+l2KpfbBopc3poTy+M+Q3ERQLFYbQis=";
   };
 
diff --git a/pkgs/development/python-modules/qnap-qsw/default.nix b/pkgs/development/python-modules/qnap-qsw/default.nix
index 41f8a482b7d7..697b0b98fe8a 100644
--- a/pkgs/development/python-modules/qnap-qsw/default.nix
+++ b/pkgs/development/python-modules/qnap-qsw/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Noltari";
     repo = "python-qnap-qsw";
-    tag = version;
+    rev = version;
     sha256 = "WP1bGt7aAtSVFOMJgPXKqVSbi5zj9K7qoIVrYCrPGqk=";
   };
 
diff --git a/pkgs/development/python-modules/quadprog/default.nix b/pkgs/development/python-modules/quadprog/default.nix
index 20784847f1c8..17faac7d13d4 100644
--- a/pkgs/development/python-modules/quadprog/default.nix
+++ b/pkgs/development/python-modules/quadprog/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "quadprog";
     repo = "quadprog";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8gPuqDY3ajw/+B6kJdtpq+HL+Oq2Nsy/O7m+IWzxP38=";
   };
 
diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix
index 07d212dcea80..a95cf4903b5d 100644
--- a/pkgs/development/python-modules/quantiphy-eval/default.nix
+++ b/pkgs/development/python-modules/quantiphy-eval/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "quantiphy_eval";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg=";
   };
 
diff --git a/pkgs/development/python-modules/quantum-gateway/default.nix b/pkgs/development/python-modules/quantum-gateway/default.nix
index b01b102133a7..e39b66b42ae6 100644
--- a/pkgs/development/python-modules/quantum-gateway/default.nix
+++ b/pkgs/development/python-modules/quantum-gateway/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cisasteelersfan";
     repo = "quantum_gateway";
-    tag = version;
+    rev = version;
     hash = "sha256-jwLfth+UaisPR0p+UHfm6qMXT2eSYWnsYEp0BqyeI9U=";
   };
 
diff --git a/pkgs/development/python-modules/questo/default.nix b/pkgs/development/python-modules/questo/default.nix
index 52aa09624231..c1f8ad3b4b8f 100644
--- a/pkgs/development/python-modules/questo/default.nix
+++ b/pkgs/development/python-modules/questo/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "petereon";
     repo = "questo";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XCxSH2TSU4YdfyqfLpVSEeDeU1S24C+NezP1IL5qj/4=";
   };
 
diff --git a/pkgs/development/python-modules/radiotherm/default.nix b/pkgs/development/python-modules/radiotherm/default.nix
index 321a15a2eecb..c574b09301b8 100644
--- a/pkgs/development/python-modules/radiotherm/default.nix
+++ b/pkgs/development/python-modules/radiotherm/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mhrivnak";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0p37pc7l2malmjfkdlh4q2cfa6dqpsk1rah2j2xil0pj57ai6bks";
   };
 
diff --git a/pkgs/development/python-modules/radon/default.nix b/pkgs/development/python-modules/radon/default.nix
index 137eaf9fa0b8..6a9baf65e6a6 100644
--- a/pkgs/development/python-modules/radon/default.nix
+++ b/pkgs/development/python-modules/radon/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rubik";
     repo = "radon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yY+j9kuX0ou/uDoVI/Qfqsmq0vNHv735k+vRl22LwwY=";
   };
 
diff --git a/pkgs/development/python-modules/range-typed-integers/default.nix b/pkgs/development/python-modules/range-typed-integers/default.nix
index 4c62337eb609..912bee04ffc7 100644
--- a/pkgs/development/python-modules/range-typed-integers/default.nix
+++ b/pkgs/development/python-modules/range-typed-integers/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "theCapypara";
     repo = "range-typed-integers";
-    tag = version;
+    rev = version;
     sha256 = "sha256-4+XdalHq6Q2cBbuYi4x7kmCNQh1MwYf+XlLP9FzzzgE=";
   };
 
diff --git a/pkgs/development/python-modules/rank-bm25/default.nix b/pkgs/development/python-modules/rank-bm25/default.nix
index 6f126d1fb35e..7318aa2a7934 100644
--- a/pkgs/development/python-modules/rank-bm25/default.nix
+++ b/pkgs/development/python-modules/rank-bm25/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "dorianbrown";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-+BxQBflMm2AvCLAFFj52Jpkqn+KErwYXU1wztintgOg=";
   };
 
diff --git a/pkgs/development/python-modules/rapidfuzz-capi/default.nix b/pkgs/development/python-modules/rapidfuzz-capi/default.nix
index 312030dc0ef3..342f09b2708b 100644
--- a/pkgs/development/python-modules/rapidfuzz-capi/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz-capi/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "rapidfuzz_capi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0IvJl2JU/k1WbGPWRoucVGbVsEFNPHZT1ozEQAKQnPk=";
   };
 
diff --git a/pkgs/development/python-modules/ratelimit/default.nix b/pkgs/development/python-modules/ratelimit/default.nix
index e32bc748ece8..b17d017fbd6a 100644
--- a/pkgs/development/python-modules/ratelimit/default.nix
+++ b/pkgs/development/python-modules/ratelimit/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tomasbasham";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "04hy3hhh5xdqcsz0lx8j18zbj88kh5ik4wyi5d3a5sfy2hx70in2";
   };
 
diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix
index 8caecb2e0649..ac4f03faaa78 100644
--- a/pkgs/development/python-modules/raven/default.nix
+++ b/pkgs/development/python-modules/raven/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "raven-python";
-    tag = version;
+    rev = version;
     sha256 = "16x9ldl8cy7flw5kh7qmgbmflqyf210j3q6ac2lw61sgwajsnvw8";
   };
 
diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix
index 94d9615f14db..7c75c32be269 100644
--- a/pkgs/development/python-modules/readability-lxml/default.nix
+++ b/pkgs/development/python-modules/readability-lxml/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "buriy";
     repo = "python-readability";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MKdQRety24qOG9xgIdaCJ72XEImP42SlMG6tC7bwzo4=";
   };
 
diff --git a/pkgs/development/python-modules/readlike/default.nix b/pkgs/development/python-modules/readlike/default.nix
index 66d303b15a22..fa7480f31ad4 100644
--- a/pkgs/development/python-modules/readlike/default.nix
+++ b/pkgs/development/python-modules/readlike/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jangler";
     repo = "readlike";
-    tag = version;
+    rev = version;
     sha256 = "1mw8j8ads8hqdbz42siwpffi4wi5s33z9g14a5c2i7vxp8m68qc1";
   };
 
diff --git a/pkgs/development/python-modules/readmdict/default.nix b/pkgs/development/python-modules/readmdict/default.nix
index e46da18003a3..9089bd1b44dd 100644
--- a/pkgs/development/python-modules/readmdict/default.nix
+++ b/pkgs/development/python-modules/readmdict/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ffreemt";
     repo = "readmdict";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1/f+o2bVscT3EA8XQyS2hWjhimLRzfIBM6u2O7UqwcA=";
   };
 
diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix
index 39dfb0c54902..a61f2804d71f 100644
--- a/pkgs/development/python-modules/recommonmark/default.nix
+++ b/pkgs/development/python-modules/recommonmark/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rtfd";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0kwm4smxbgq0c0ybkxfvlgrfb3gq9amdw94141jyykk9mmz38379";
   };
 
diff --git a/pkgs/development/python-modules/rectangle-packer/default.nix b/pkgs/development/python-modules/rectangle-packer/default.nix
index 64edd9f16955..53a58f1246b6 100644
--- a/pkgs/development/python-modules/rectangle-packer/default.nix
+++ b/pkgs/development/python-modules/rectangle-packer/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Penlect";
     repo = "rectangle-packer";
-    tag = version;
+    rev = version;
     hash = "sha256-YsMLB9jfAC5yB8TnlY9j6ybXM2ILireOgQ8m8wYo4ts=";
   };
 
diff --git a/pkgs/development/python-modules/rectpack/default.nix b/pkgs/development/python-modules/rectpack/default.nix
index b9138eeb07fc..d469d7021ef3 100644
--- a/pkgs/development/python-modules/rectpack/default.nix
+++ b/pkgs/development/python-modules/rectpack/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "secnot";
     repo = "rectpack";
-    tag = version;
+    rev = version;
     hash = "sha256-kU0TT3wiudcLXrT+lYPYHYRtf7aNj/IKpnYKb/H91ng=";
   };
 
diff --git a/pkgs/development/python-modules/releases/default.nix b/pkgs/development/python-modules/releases/default.nix
index 137ca659e8ff..2db172bdeb5b 100644
--- a/pkgs/development/python-modules/releases/default.nix
+++ b/pkgs/development/python-modules/releases/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bitprophet";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-IgEKAUk97R3ZvqvexD/ptT8i0uf48K+DKkk4q3pn3G8=";
   };
 
diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix
index 68b84d1b30c7..b88ab282a6ad 100644
--- a/pkgs/development/python-modules/remi/default.nix
+++ b/pkgs/development/python-modules/remi/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rawpython";
     repo = "remi";
-    tag = version;
+    rev = version;
     hash = "sha256-VQn+Uzp6oGSit8ot0e8B0C2N41Q8+J+o91skyVN1gDA=";
   };
 
diff --git a/pkgs/development/python-modules/remote-pdb/default.nix b/pkgs/development/python-modules/remote-pdb/default.nix
index a336280b9bf9..c17f48d45155 100644
--- a/pkgs/development/python-modules/remote-pdb/default.nix
+++ b/pkgs/development/python-modules/remote-pdb/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ionelmc";
     repo = "python-remote-pdb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/7RysJOJigU4coC6d/Ob2lrtw8u8nLZI8wBk4oEEY3g=";
   };
   meta = with lib; {
diff --git a/pkgs/development/python-modules/reparser/default.nix b/pkgs/development/python-modules/reparser/default.nix
index 2a7f8651c9e8..4ea2dab3e785 100644
--- a/pkgs/development/python-modules/reparser/default.nix
+++ b/pkgs/development/python-modules/reparser/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xmikos";
     repo = "reparser";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "04v7h52wny0j2qj37501nk33j0s4amm134kagdicx2is49zylzq1";
   };
 
diff --git a/pkgs/development/python-modules/reprint/default.nix b/pkgs/development/python-modules/reprint/default.nix
index 601ee9081ce9..5981e3abb4b2 100644
--- a/pkgs/development/python-modules/reprint/default.nix
+++ b/pkgs/development/python-modules/reprint/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yinzo";
     repo = "reprint";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-99FC12LcvvRRwNAxDSvWo9vRYmieL0JHSaCJqO/UGEs=";
   };
 
diff --git a/pkgs/development/python-modules/reprshed/default.nix b/pkgs/development/python-modules/reprshed/default.nix
index 060378f9d1a4..fb05ed572625 100644
--- a/pkgs/development/python-modules/reprshed/default.nix
+++ b/pkgs/development/python-modules/reprshed/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mentalisttraceur";
     repo = "python-reprshed";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XfmiewI74eDLKTAU6Ed76QXfJYMRb+idRACl6CW07ME=";
   };
 
diff --git a/pkgs/development/python-modules/requests-credssp/default.nix b/pkgs/development/python-modules/requests-credssp/default.nix
index 375a0c7f12ed..428b4ac18777 100644
--- a/pkgs/development/python-modules/requests-credssp/default.nix
+++ b/pkgs/development/python-modules/requests-credssp/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HHLEmQ+mNjMjpR6J+emrKFM+2PiYq32o7Gnoo0gUrNA=";
   };
 
diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix
index 69e274608f3c..541604089e25 100644
--- a/pkgs/development/python-modules/requests-http-signature/default.nix
+++ b/pkgs/development/python-modules/requests-http-signature/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyauth";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sW2vYqT/nY27DvEKHdptc3dUpuqKmD7PLMs+Xp+cpeU=";
   };
 
diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix
index df0b30772309..70a5eebacdb5 100644
--- a/pkgs/development/python-modules/requests-kerberos/default.nix
+++ b/pkgs/development/python-modules/requests-kerberos/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "requests";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-s1Q3zqKPSuTkiFExr+axai9Eta1xjw/cip8xzfDGR88=";
   };
 
diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix
index 0d711eb4d78b..550465962e31 100644
--- a/pkgs/development/python-modules/requests-pkcs12/default.nix
+++ b/pkgs/development/python-modules/requests-pkcs12/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "m-click";
     repo = "requests_pkcs12";
-    tag = version;
+    rev = version;
     hash = "sha256-ukS0vxG2Rd71GsF1lmpsDSM2JovwqhXsaAnZdF8WGQo=";
   };
 
diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix
index fb2d170ee56a..3bb181342c65 100644
--- a/pkgs/development/python-modules/resolvelib/default.nix
+++ b/pkgs/development/python-modules/resolvelib/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sarugaku";
     repo = "resolvelib";
-    tag = version;
+    rev = version;
     hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8=";
   };
 
diff --git a/pkgs/development/python-modules/result/default.nix b/pkgs/development/python-modules/result/default.nix
index 95a464b9126d..cd4793401976 100644
--- a/pkgs/development/python-modules/result/default.nix
+++ b/pkgs/development/python-modules/result/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rustedpy";
     repo = "result";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o+7qKxGQCeMUnsmEReggvf+XwQWFHRCYArYk3DxCa50=";
   };
 
diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix
index 55b146f43614..596a2ca07290 100644
--- a/pkgs/development/python-modules/rfc6555/default.nix
+++ b/pkgs/development/python-modules/rfc6555/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sethmlarson";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM=";
   };
 
diff --git a/pkgs/development/python-modules/rich-argparse-plus/default.nix b/pkgs/development/python-modules/rich-argparse-plus/default.nix
index 86c1ad2976a9..159190d45e1d 100644
--- a/pkgs/development/python-modules/rich-argparse-plus/default.nix
+++ b/pkgs/development/python-modules/rich-argparse-plus/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "michelcrypt4d4mus";
     repo = "rich-argparse-plus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oF2wuvyLYwObVJ4fhJl9b/sdfmQ2ahgKkfd9ZwObfPw=";
   };
 
diff --git a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
index f5b492267522..014f651e18c3 100644
--- a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
+++ b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RIPE-NCC";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xIBIKsQvDmVBa/C8/7Wr3WKeepHaGhoXlgatXSUtWLA=";
   };
 
diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index c659d78206b3..3c258f2b8fea 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "pyrlp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cRp+ZOPYs9kcqMKGaiYMOFBY+aPCyFqu+1/5wloLwqU=";
   };
 
diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix
index 4b7e583597e1..5041ec57ab1a 100644
--- a/pkgs/development/python-modules/roku/default.nix
+++ b/pkgs/development/python-modules/roku/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jcarbaugh";
     repo = "python-roku";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09mq59kjll7gj1srw4qc921ncsm7cld95sbz5v3p2bwmgckpqza7";
   };
 
diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix
index acda0181650b..76f93dc33905 100644
--- a/pkgs/development/python-modules/roonapi/default.nix
+++ b/pkgs/development/python-modules/roonapi/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pavoni";
     repo = "pyroon";
-    tag = version;
+    rev = version;
     hash = "sha256-6wQsaZ50J2xIPXzICglg5pf8U0r4tL8iqcbdwjZadwU=";
   };
 
diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index 21c62fabfcb6..4d88ca3d47d8 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sashs";
     repo = "Ropper";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yuHJ+EpglumEAXEu0iJKIXK1ouW1yptNahM9Wmk7AW4=";
   };
 
diff --git a/pkgs/development/python-modules/rowan/default.nix b/pkgs/development/python-modules/rowan/default.nix
index da77f867150e..84b872d871a7 100644
--- a/pkgs/development/python-modules/rowan/default.nix
+++ b/pkgs/development/python-modules/rowan/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "glotzerlab";
     repo = "rowan";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-klIqyX04w1xYmYtAbLF5jwpcJ83oKOaENboxyCL70EY=";
   };
 
diff --git a/pkgs/development/python-modules/rpi-bad-power/default.nix b/pkgs/development/python-modules/rpi-bad-power/default.nix
index eaca16184d77..00e7830fbd7c 100644
--- a/pkgs/development/python-modules/rpi-bad-power/default.nix
+++ b/pkgs/development/python-modules/rpi-bad-power/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "shenxn";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256:1yvfz28blq4fdnn614n985vbs5hcw1gm3i9am53k410sfs7ilvkk";
   };
 
diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix
index 46c7ec835636..064a7a7a9040 100644
--- a/pkgs/development/python-modules/rply/default.nix
+++ b/pkgs/development/python-modules/rply/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alex";
     repo = "rply";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mO/wcIsDIBjoxUsFvzftj5H5ziJijJcoyrUk52fcyE4=";
   };
 
diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix
index 9c2fe5fc537b..24aa686c807c 100644
--- a/pkgs/development/python-modules/rtoml/default.nix
+++ b/pkgs/development/python-modules/rtoml/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "samuelcolvin";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1movtKMQkQ6PEpKpSkK0Oy4AV0ee7XrS0P9m6QwZTaM=";
   };
 
diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix
index 175bdede9f15..f7c96b10d3e1 100644
--- a/pkgs/development/python-modules/ruffus/default.nix
+++ b/pkgs/development/python-modules/ruffus/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cgat-developers";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0fnzpchwwqsy5h18fs0n90s51w25n0dx0l74j0ka6lvhjl5sxn4c";
   };
 
diff --git a/pkgs/development/python-modules/runs/default.nix b/pkgs/development/python-modules/runs/default.nix
index ba4dca8a6ea3..19ea9683b378 100644
--- a/pkgs/development/python-modules/runs/default.nix
+++ b/pkgs/development/python-modules/runs/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rec";
     repo = "runs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aEamhXr3C+jYDzQGzcmGFyl5oEtovxlNacFM08y0ZEk=";
   };
 
diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix
index 37b013c7c459..cdf4143afb04 100644
--- a/pkgs/development/python-modules/rustworkx/default.nix
+++ b/pkgs/development/python-modules/rustworkx/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Qiskit";
     repo = "rustworkx";
-    tag = version;
+    rev = version;
     hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0=";
   };
 
diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix
index abf4099d034f..30be2072b595 100644
--- a/pkgs/development/python-modules/rxv/default.nix
+++ b/pkgs/development/python-modules/rxv/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wuub";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0jldnlzbfg5jm1nbgv91mlvcqkswd9f2n3qj9aqlbmj1cxq19yz8";
   };
 
diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix
index 4314690ce77c..08960b6dbc39 100644
--- a/pkgs/development/python-modules/sacremoses/default.nix
+++ b/pkgs/development/python-modules/sacremoses/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alvations";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1gzr56w8yx82mn08wax5m0xyg15ym4ri5l80gmagp8r53443j770";
   };
 
diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix
index 478323551f9f..e9ad2980e319 100644
--- a/pkgs/development/python-modules/sarge/default.nix
+++ b/pkgs/development/python-modules/sarge/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vsajip";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-bT1DbcQi+SbeRBsL7ILuQbSnAj3BBB4+FNl+Zek5xU4=";
   };
 
diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix
index bcc3f0e390be..63014b75aa34 100644
--- a/pkgs/development/python-modules/scramp/default.nix
+++ b/pkgs/development/python-modules/scramp/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tlocke";
     repo = "scramp";
-    tag = version;
+    rev = version;
     hash = "sha256-KpododRJ+CYRGBR7Sr5cVBhJvUwh9YmPERd/DAJqEcY=";
   };
 
diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix
index e4e1efff1927..257955ed8d5c 100644
--- a/pkgs/development/python-modules/seekpath/default.nix
+++ b/pkgs/development/python-modules/seekpath/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "giovannipizzi";
     repo = "seekpath";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8Nm8SKHda2qt1kncXZxC4T3cpicXpDZhxPzs78JICzE=";
   };
 
diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix
index a4486159c421..322446fd0353 100644
--- a/pkgs/development/python-modules/segments/default.nix
+++ b/pkgs/development/python-modules/segments/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cldf";
     repo = "segments";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Z9AQnsK/0HUCZDzdpQKNfSBWxfAOjWNBytcfI6yBY84=";
   };
 
diff --git a/pkgs/development/python-modules/semgrep/default.nix b/pkgs/development/python-modules/semgrep/default.nix
index 8342caeab0ce..91abd5bea075 100644
--- a/pkgs/development/python-modules/semgrep/default.nix
+++ b/pkgs/development/python-modules/semgrep/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "semgrep";
     repo = "semgrep";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = common.srcHash;
   };
 
diff --git a/pkgs/development/python-modules/sentence-splitter/default.nix b/pkgs/development/python-modules/sentence-splitter/default.nix
index 7e22c1ff60ef..1b88987698ce 100644
--- a/pkgs/development/python-modules/sentence-splitter/default.nix
+++ b/pkgs/development/python-modules/sentence-splitter/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mediacloud";
     repo = "sentence-splitter";
-    tag = version;
+    rev = version;
     hash = "sha256-FxRi8fhKB9++lCTFpCAug0fxjkSVTKChLY84vkshR34=";
   };
 
diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix
index bd83c96ad44e..d1e12b2ae1fa 100644
--- a/pkgs/development/python-modules/sepaxml/default.nix
+++ b/pkgs/development/python-modules/sepaxml/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "python-sepaxml";
-    tag = version;
+    rev = version;
     hash = "sha256-l5UMy0M3Ovzb6rcSAteGOnKdmBPHn4L9ZWY+YGOCn40=";
   };
 
diff --git a/pkgs/development/python-modules/seqeval/default.nix b/pkgs/development/python-modules/seqeval/default.nix
index 7e6617a7f16e..a8a06ed89ab2 100644
--- a/pkgs/development/python-modules/seqeval/default.nix
+++ b/pkgs/development/python-modules/seqeval/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chakki-works";
     repo = "seqeval";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0qv05gn54kc4wpmwnflmfqw4gwwb8lxqhkiihl0pvl7s2i7qzx2j";
   };
 
diff --git a/pkgs/development/python-modules/seventeentrack/default.nix b/pkgs/development/python-modules/seventeentrack/default.nix
index 2a7336b442d7..d0331594e3fd 100644
--- a/pkgs/development/python-modules/seventeentrack/default.nix
+++ b/pkgs/development/python-modules/seventeentrack/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "McSwindler";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-vMdRXcd0es/LjgsVyWItSLFzlSTEa3oaA6lr/NL4i8U=";
   };
 
diff --git a/pkgs/development/python-modules/shellescape/default.nix b/pkgs/development/python-modules/shellescape/default.nix
index d0c6d13a8344..fe0a29458b6f 100644
--- a/pkgs/development/python-modules/shellescape/default.nix
+++ b/pkgs/development/python-modules/shellescape/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrissimpkins";
     repo = "shellescape";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HAe3Qf3lLeVWw/tVkW0J+CfoxSoOnCcWDR2nEWZn7HM=";
   };
 
diff --git a/pkgs/development/python-modules/shutilwhich/default.nix b/pkgs/development/python-modules/shutilwhich/default.nix
index 157fbe15e794..bc022fbe0f85 100644
--- a/pkgs/development/python-modules/shutilwhich/default.nix
+++ b/pkgs/development/python-modules/shutilwhich/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mbr";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "05fwcjn86w8wprck04iv1zccfi39skdf0lhwpb4b9gpvklyc9mj0";
   };
 
diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix
index ec265dec157a..2bd0bd80be06 100644
--- a/pkgs/development/python-modules/simanneal/default.nix
+++ b/pkgs/development/python-modules/simanneal/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "perrygeo";
     repo = "simanneal";
-    tag = version;
+    rev = version;
     hash = "sha256-yKZHkrf6fM0WsHczIEK5Kxusz5dSBgydK3fLu1nDyvk=";
   };
 
diff --git a/pkgs/development/python-modules/simple-rest-client/default.nix b/pkgs/development/python-modules/simple-rest-client/default.nix
index 05c9f6d9f5d7..023b604c8a57 100644
--- a/pkgs/development/python-modules/simple-rest-client/default.nix
+++ b/pkgs/development/python-modules/simple-rest-client/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "allisson";
     repo = "python-simple-rest-client";
-    tag = version;
+    rev = version;
     hash = "sha256-IaLo7nBMIabi4ZjZ4ZLJliCL/dzidaCBCmn0cq7Fzdw=";
   };
 
diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix
index 3e9001b8e08f..8e336d4e61c2 100644
--- a/pkgs/development/python-modules/simpleaudio/default.nix
+++ b/pkgs/development/python-modules/simpleaudio/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hamiltron";
     repo = "py-simple-audio";
-    tag = version;
+    rev = version;
     sha256 = "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i";
   };
 
diff --git a/pkgs/development/python-modules/simplehound/default.nix b/pkgs/development/python-modules/simplehound/default.nix
index 631722cebe71..bf2efed90c09 100644
--- a/pkgs/development/python-modules/simplehound/default.nix
+++ b/pkgs/development/python-modules/simplehound/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robmarkcole";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1b5m3xjmk0l6ynf0yvarplsfsslgklalfcib7sikxg3v5hiv9qwh";
   };
 
diff --git a/pkgs/development/python-modules/simplenote/default.nix b/pkgs/development/python-modules/simplenote/default.nix
index 5ae0616db447..2c3203446683 100644
--- a/pkgs/development/python-modules/simplenote/default.nix
+++ b/pkgs/development/python-modules/simplenote/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simplenote-vim";
     repo = "simplenote.py";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1grvvgzdybhxjydalnsgh2aaz3f48idv5lqs48gr0cn7n18xwhd5";
   };
 
diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix
index 690cd7ec75f8..00d5dd7a784e 100644
--- a/pkgs/development/python-modules/sklearn-deap/default.nix
+++ b/pkgs/development/python-modules/sklearn-deap/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rsteca";
     repo = "sklearn-deap";
-    tag = version;
+    rev = version;
     hash = "sha256-bXBHlv1pIOyDLKCBeffyHaTZ7gNiZNl0soa73e8E4/M=";
   };
 
diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix
index 25420e038e58..b917cf214890 100644
--- a/pkgs/development/python-modules/skyfield/default.nix
+++ b/pkgs/development/python-modules/skyfield/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "skyfielders";
     repo = "python-skyfield";
-    tag = version;
+    rev = version;
     hash = "sha256-PZ63sohdfpop3nYQr2RIMjPbrL9jdfincEhw5D8NZ+Y=";
   };
 
diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix
index a1d71ab647a7..2ce2555a25ca 100644
--- a/pkgs/development/python-modules/skytemple-dtef/default.nix
+++ b/pkgs/development/python-modules/skytemple-dtef/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = "skytemple-dtef";
-    tag = version;
+    rev = version;
     hash = "sha256-vVh4WRjx/iFJnTZC7D/OCi0gOwKaXs/waVXUEu5Cda8=";
   };
 
diff --git a/pkgs/development/python-modules/skytemple-eventserver/default.nix b/pkgs/development/python-modules/skytemple-eventserver/default.nix
index daf2286c2fa8..275948b3970d 100644
--- a/pkgs/development/python-modules/skytemple-eventserver/default.nix
+++ b/pkgs/development/python-modules/skytemple-eventserver/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-PWLGPORNprTfG+jgXI1sxyVkRTwSEib4SZhPdOBchwE=";
   };
 
diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix
index 7a8a18de6963..3d68f501919c 100644
--- a/pkgs/development/python-modules/skytemple-files/default.nix
+++ b/pkgs/development/python-modules/skytemple-files/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = "skytemple-files";
-    tag = version;
+    rev = version;
     hash = "sha256-4ENuYq074j/VdzLyrGVCGaZhoStwlgJWTqGbrt20A3Q=";
     # Most patches are in submodules
     fetchSubmodules = true;
diff --git a/pkgs/development/python-modules/skytemple-icons/default.nix b/pkgs/development/python-modules/skytemple-icons/default.nix
index 4abbcf196051..20c6187a2c25 100644
--- a/pkgs/development/python-modules/skytemple-icons/default.nix
+++ b/pkgs/development/python-modules/skytemple-icons/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0wagdvzks9irdl5lj8sfqkkvfwwmdpvjyzx6424shvpp5mk28dcv";
   };
 
diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix
index 52f094ea3e05..f635aa35f9ec 100644
--- a/pkgs/development/python-modules/skytemple-rust/default.nix
+++ b/pkgs/development/python-modules/skytemple-rust/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = "skytemple-rust";
-    tag = version;
+    rev = version;
     hash = "sha256-0hIwFJn/cwtKHKoD+upeorC52YnDlej3TrWf3PmAQAQ=";
   };
 
diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
index 49c018831c66..64bd47671d03 100644
--- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
+++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = "skytemple-ssb-debugger";
-    tag = version;
+    rev = version;
     hash = "sha256-HmJOjHX2/P284DSIdKuSz3++Qr1fKVGRQmA/+cMrcYw=";
   };
 
diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix
index 9b2126366fe9..8c7b0e242ce4 100644
--- a/pkgs/development/python-modules/slicedimage/default.nix
+++ b/pkgs/development/python-modules/slicedimage/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spacetx";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1vpg8varvfx0nj6xscdfm7m118hzsfz7qfzn28r9rsfvrhr0dlcw";
   };
 
diff --git a/pkgs/development/python-modules/slugid/default.nix b/pkgs/development/python-modules/slugid/default.nix
index 5dfeeb9ef7d3..3e9a885a6023 100644
--- a/pkgs/development/python-modules/slugid/default.nix
+++ b/pkgs/development/python-modules/slugid/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "taskcluster";
     repo = "slugid.py";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "McBxGRi8KqVhe2Xez5k4G67R5wBCCoh41dRsTKW4xMA=";
   };
 
diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix
index 15175c0f3dfd..b742c8d6985a 100644
--- a/pkgs/development/python-modules/snuggs/default.nix
+++ b/pkgs/development/python-modules/snuggs/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1p3lh9s2ylsnrzbs931y2vn7mp2y2xskgqmh767c9l1a33shfgwf";
   };
 
diff --git a/pkgs/development/python-modules/socketio-client/default.nix b/pkgs/development/python-modules/socketio-client/default.nix
index 49afa3d77f5a..4f7177766821 100644
--- a/pkgs/development/python-modules/socketio-client/default.nix
+++ b/pkgs/development/python-modules/socketio-client/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "invisibleroads";
     repo = "socketio-client";
-    tag = version;
+    rev = version;
     hash = "sha256-71sjiGJDDYElPGUNCH1HaVdvgMt8KeD/kXVDpF615ho=";
   };
 
diff --git a/pkgs/development/python-modules/solidpython2/default.nix b/pkgs/development/python-modules/solidpython2/default.nix
index 6b7e576131ae..124945750e7d 100644
--- a/pkgs/development/python-modules/solidpython2/default.nix
+++ b/pkgs/development/python-modules/solidpython2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jeff-dh";
     repo = "SolidPython";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Tq3hrsC2MmueCqChk6mY/u/pCjF/pFuU2o3K+qw7ImY=";
   };
 
diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix
index 235ec97e4a32..679351c90657 100644
--- a/pkgs/development/python-modules/solo-python/default.nix
+++ b/pkgs/development/python-modules/solo-python/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "solokeys";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU=";
   };
 
diff --git a/pkgs/development/python-modules/somfy-mylink-synergy/default.nix b/pkgs/development/python-modules/somfy-mylink-synergy/default.nix
index 16ad50c367dc..1bb28e17cd1f 100644
--- a/pkgs/development/python-modules/somfy-mylink-synergy/default.nix
+++ b/pkgs/development/python-modules/somfy-mylink-synergy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bendews";
     repo = "somfy-mylink-synergy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1aa178b5lxdzfa4z7sjw6ky39dkfazp7dqs9dq78z2zay2sqgmgr";
   };
 
diff --git a/pkgs/development/python-modules/somweb/default.nix b/pkgs/development/python-modules/somweb/default.nix
index cd5dd0a7dded..7abe33c14bf3 100644
--- a/pkgs/development/python-modules/somweb/default.nix
+++ b/pkgs/development/python-modules/somweb/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "taarskog";
     repo = "pySOMweb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cLKEKDCMK7lCtbmj2KbhgJUCZpPnPI5tZvO5L+ey8qI=";
   };
 
diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix
index 5b05a6262d40..a525167635b6 100644
--- a/pkgs/development/python-modules/sortedcollections/default.nix
+++ b/pkgs/development/python-modules/sortedcollections/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "grantjenks";
     repo = "python-sortedcollections";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GkZO8afUAgDpDjIa3dhO6nxykqrljeKldunKMODSXfg=";
   };
 
diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix
index ba62a7c44bb6..967119bbe776 100644
--- a/pkgs/development/python-modules/sortedcontainers/default.nix
+++ b/pkgs/development/python-modules/sortedcontainers/default.nix
@@ -14,7 +14,7 @@ let
     src = fetchFromGitHub {
       owner = "grantjenks";
       repo = "python-sortedcontainers";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-YRbSM2isWi7AzfquFvuZBlpEMNUnBJTBLBn0/XYVHKQ=";
     };
 
diff --git a/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/pkgs/development/python-modules/sphinx-basic-ng/default.nix
index bb4fb0b0a4dd..9afde893cfde 100644
--- a/pkgs/development/python-modules/sphinx-basic-ng/default.nix
+++ b/pkgs/development/python-modules/sphinx-basic-ng/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pradyunsg";
     repo = "sphinx-basic-ng";
-    tag = version;
+    rev = version;
     hash = "sha256-MHBGIKOKhGklrx3O075LRud8NhY2hzlTWh+jalrFpko=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-better-theme/default.nix b/pkgs/development/python-modules/sphinx-better-theme/default.nix
index 217e85c56d09..130f96e3b78c 100644
--- a/pkgs/development/python-modules/sphinx-better-theme/default.nix
+++ b/pkgs/development/python-modules/sphinx-better-theme/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "irskep";
     repo = "sphinx-better-theme";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "07lhfmsjcfzcchsjzh6kxdq5s47j2a6lb5wv3m1kmv2hcm3gvddh";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-copybutton/default.nix b/pkgs/development/python-modules/sphinx-copybutton/default.nix
index 9a10da901a69..67216681b75e 100644
--- a/pkgs/development/python-modules/sphinx-copybutton/default.nix
+++ b/pkgs/development/python-modules/sphinx-copybutton/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "sphinx-copybutton";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-LM2LtQuYsPRJ2XX9aAW36xRtwghTkzug6A6fpVJ6hbk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix
index 3fdcd50dfc84..903005d0df9a 100644
--- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix
+++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "readthedocs";
     repo = "sphinx-hoverxref";
-    tag = version;
+    rev = version;
     hash = "sha256-DJ+mHu9IeEYEyf/SD+nDNtWpTf6z7tQzG0ogaECDpkU=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix
index 7d871b6b5f27..5a36420dc430 100644
--- a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix
+++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pradyunsg";
     repo = "sphinx-inline-tabs";
-    tag = version;
+    rev = version;
     hash = "sha256-1oZheHDNOQU0vWL3YClQrJe94WyUJ72bCAF1UKtjJ0w=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-issues/default.nix b/pkgs/development/python-modules/sphinx-issues/default.nix
index 357167a8d8d4..ea8f4268fb97 100644
--- a/pkgs/development/python-modules/sphinx-issues/default.nix
+++ b/pkgs/development/python-modules/sphinx-issues/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sloria";
     repo = "sphinx-issues";
-    tag = version;
+    rev = version;
     sha256 = "1lns6isq9kwcw8z4jwgy927f7idx9srvri5adaa5zmypw5x47hha";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-lv2-theme/default.nix b/pkgs/development/python-modules/sphinx-lv2-theme/default.nix
index 0321ace366d4..47689da31158 100644
--- a/pkgs/development/python-modules/sphinx-lv2-theme/default.nix
+++ b/pkgs/development/python-modules/sphinx-lv2-theme/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     owner = "LV2";
     repo = "sphinx_lv2_theme";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-x3h2hOQIyzOmnh58WMHjuOARdML1sDiVAf7m0YghhJ4=";
   };
 
diff --git a/pkgs/development/python-modules/spiderpy/default.nix b/pkgs/development/python-modules/spiderpy/default.nix
index 7430c989ddb2..88823aff54ba 100644
--- a/pkgs/development/python-modules/spiderpy/default.nix
+++ b/pkgs/development/python-modules/spiderpy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "peternijssen";
     repo = "spiderpy";
-    tag = version;
+    rev = version;
     hash = "sha256-Yujy8HSMbK2DQ/913r2c74hKPYDfcHFKq04ysqxG+go=";
   };
 
diff --git a/pkgs/development/python-modules/sqlalchemy-file/default.nix b/pkgs/development/python-modules/sqlalchemy-file/default.nix
index 858ea3b3b43a..0cd6d46988ae 100644
--- a/pkgs/development/python-modules/sqlalchemy-file/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-file/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jowilf";
     repo = "sqlalchemy-file";
-    tag = version;
+    rev = version;
     hash = "sha256-gtW7YA/rQ48tnqPdypMnSqqtwb90nhAkiQNhgEr1M3I=";
   };
 
diff --git a/pkgs/development/python-modules/ssdpy/default.nix b/pkgs/development/python-modules/ssdpy/default.nix
index 2cb916edb982..8cadb4ec74fa 100644
--- a/pkgs/development/python-modules/ssdpy/default.nix
+++ b/pkgs/development/python-modules/ssdpy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MoshiBin";
     repo = "ssdpy";
-    tag = version;
+    rev = version;
     hash = "sha256-luOanw4aOepGxoGtmnWZosq9JyHLJb3E+25tPkkL1w0=";
   };
 
diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix
index 9d15f6c49194..0f2fc24474a1 100644
--- a/pkgs/development/python-modules/sshpubkeys/default.nix
+++ b/pkgs/development/python-modules/sshpubkeys/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ojarva";
     repo = "python-${pname}";
-    tag = version;
+    rev = version;
     sha256 = "1qsixmqg97kyvg1naw76blq4314vaw4hl5f9wi0v111mcmdia1r4";
   };
 
diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix
index c5f97b69e10e..5ff77b3a6488 100644
--- a/pkgs/development/python-modules/starlette-admin/default.nix
+++ b/pkgs/development/python-modules/starlette-admin/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jowilf";
     repo = "starlette-admin";
-    tag = version;
+    rev = version;
     hash = "sha256-DoYD8Hc5pd68+BhASw3mwwCdhu0vYHiELjVmVwU8FHs=";
   };
 
diff --git a/pkgs/development/python-modules/static3/default.nix b/pkgs/development/python-modules/static3/default.nix
index 352416b9de63..13a41618feb3 100644
--- a/pkgs/development/python-modules/static3/default.nix
+++ b/pkgs/development/python-modules/static3/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rmohr";
     repo = "static3";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uFgv+57/UZs4KoOdkFxbvTEDQrJbb0iYJ5JoWWN4yFY=";
   };
 
diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix
index f0d55464cff1..2967f11b9aa6 100644
--- a/pkgs/development/python-modules/staticjinja/default.nix
+++ b/pkgs/development/python-modules/staticjinja/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "staticjinja";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-LfJTQhZtnTOm39EWF1m2MP5rxz/5reE0G1Uk9L7yx0w=";
   };
 
diff --git a/pkgs/development/python-modules/stopit/default.nix b/pkgs/development/python-modules/stopit/default.nix
index f71471c7b7d3..4569b1ba88e2 100644
--- a/pkgs/development/python-modules/stopit/default.nix
+++ b/pkgs/development/python-modules/stopit/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "glenfant";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-uXJUA70JOGWT2NmS6S7fPrTWAJZ0mZ/hICahIUzjfbw=";
   };
 
diff --git a/pkgs/development/python-modules/stransi/default.nix b/pkgs/development/python-modules/stransi/default.nix
index 6c024a6126cf..52e6ee474549 100644
--- a/pkgs/development/python-modules/stransi/default.nix
+++ b/pkgs/development/python-modules/stransi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getcuia";
     repo = "stransi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PDMel6emra5bzX+FwHvUVpFu2YkRKy31UwkCL4sGJ14=";
   };
 
diff --git a/pkgs/development/python-modules/strct/default.nix b/pkgs/development/python-modules/strct/default.nix
index 0d11d793cc13..989b4e006d30 100644
--- a/pkgs/development/python-modules/strct/default.nix
+++ b/pkgs/development/python-modules/strct/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "shaypal5";
     repo = "strct";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uPM2U+emZUCGqEhIeTBmaOu8eSfK4arqvv9bItBWpUs=";
   };
 
diff --git a/pkgs/development/python-modules/streamcontroller-plugin-tools/default.nix b/pkgs/development/python-modules/streamcontroller-plugin-tools/default.nix
index 00ae02831029..1375f6eae785 100644
--- a/pkgs/development/python-modules/streamcontroller-plugin-tools/default.nix
+++ b/pkgs/development/python-modules/streamcontroller-plugin-tools/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "StreamController";
     repo = "streamcontroller-plugin-tools";
-    tag = version;
+    rev = version;
     hash = "sha256-dQZPRSzHhI3X+Pf7miwJlECGFgUfp68PtvwXAmpq5/s=";
   };
 
diff --git a/pkgs/development/python-modules/streaming-form-data/default.nix b/pkgs/development/python-modules/streaming-form-data/default.nix
index 8bfabae1e74d..0d13b9db97cc 100644
--- a/pkgs/development/python-modules/streaming-form-data/default.nix
+++ b/pkgs/development/python-modules/streaming-form-data/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "siddhantgoel";
     repo = "streaming-form-data";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ntiad5GZtfRd+2uDPgbDzLBzErGFroffK6ZAmMcsfXA=";
   };
 
diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix
index fd2106585d79..7b37464a69be 100644
--- a/pkgs/development/python-modules/stups-cli-support/default.nix
+++ b/pkgs/development/python-modules/stups-cli-support/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zalando-stups";
     repo = "stups-cli-support";
-    tag = version;
+    rev = version;
     sha256 = "1r6g29gd009p87m8a6wv4rzx7f0564zdv67qz5xys4wsgvc95bx0";
   };
 
diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix
index 51229696c590..a2662d754c55 100644
--- a/pkgs/development/python-modules/stups-fullstop/default.nix
+++ b/pkgs/development/python-modules/stups-fullstop/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zalando-stups";
     repo = "fullstop-cli";
-    tag = version;
+    rev = version;
     sha256 = "1cpzz1b8g2mich7c1p74vfgw70vlxpgwi82a1ld82wv3srwqa0h3";
   };
 
diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix
index 1ee4c775ba66..1415e07ab1af 100644
--- a/pkgs/development/python-modules/stups-pierone/default.nix
+++ b/pkgs/development/python-modules/stups-pierone/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zalando-stups";
     repo = "pierone-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-OypGYHfiFUfcUndylM2N2WfPnfXXJ4gvWypUbltYAYE=";
   };
 
diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/pkgs/development/python-modules/stups-tokens/default.nix
index eb7892a7f05f..3d9c4cd07735 100644
--- a/pkgs/development/python-modules/stups-tokens/default.nix
+++ b/pkgs/development/python-modules/stups-tokens/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zalando-stups";
     repo = "python-tokens";
-    tag = version;
+    rev = version;
     sha256 = "09z3l3xzdlwpivbi141gk1k0zd9m75mjwbdy81zc386rr9k8s0im";
   };
 
diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix
index 89f3b42e3aa0..1c54cdb51212 100644
--- a/pkgs/development/python-modules/stups-zign/default.nix
+++ b/pkgs/development/python-modules/stups-zign/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zalando-stups";
     repo = "zign";
-    tag = version;
+    rev = version;
     sha256 = "1vk6pnprnd5lfx96hc2c1n7kwh99f260r730x4y2h7lamlv82fh4";
   };
 
diff --git a/pkgs/development/python-modules/sumtypes/default.nix b/pkgs/development/python-modules/sumtypes/default.nix
index df5f35ece83e..91ae86b01206 100644
--- a/pkgs/development/python-modules/sumtypes/default.nix
+++ b/pkgs/development/python-modules/sumtypes/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "radix";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-qwQyFKVnGEqHUqFmUSnHVvedsp2peM6rJZcS90paLOo=";
   };
 
diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix
index 3375f5502ff8..24bb2622ecc1 100644
--- a/pkgs/development/python-modules/svgwrite/default.nix
+++ b/pkgs/development/python-modules/svgwrite/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozman";
     repo = "svgwrite";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uOsrDhE9AwWU7GIrCVuL3uXTPqtrh8sofvo2C5t+25I=";
   };
 
diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix
index 109129d2232a..c6f41fd03b1c 100644
--- a/pkgs/development/python-modules/swagger-spec-validator/default.nix
+++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = "swagger_spec_validator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7+kFmtzeze0QlGf6z/M4J4F7z771a5NWewB1S3+bxn4=";
   };
 
diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix
index b352c7870e85..7ed844e91d6a 100644
--- a/pkgs/development/python-modules/swspotify/default.nix
+++ b/pkgs/development/python-modules/swspotify/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SwagLyrics";
     repo = "SwSpotify";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY=";
   };
 
diff --git a/pkgs/development/python-modules/syncer/default.nix b/pkgs/development/python-modules/syncer/default.nix
index e23e1e904465..aed4172d9a3f 100644
--- a/pkgs/development/python-modules/syncer/default.nix
+++ b/pkgs/development/python-modules/syncer/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miyakogi";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3EYWy6LuZ/3i+9d0QaclCqWMMw5O3WzhTY3LUL5iMso=";
   };
 
diff --git a/pkgs/development/python-modules/systembridge/default.nix b/pkgs/development/python-modules/systembridge/default.nix
index 14f897302192..3af2cb7c4964 100644
--- a/pkgs/development/python-modules/systembridge/default.nix
+++ b/pkgs/development/python-modules/systembridge/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timmo001";
     repo = "system-bridge-connector-py";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ts8zPRK6S5iLnl19Y/Uz0YAh6hDeVRNBY6HsvLwdUFw=";
   };
 
diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix
index 908b4b99eb84..72fe6ed5cd2b 100644
--- a/pkgs/development/python-modules/systemd/default.nix
+++ b/pkgs/development/python-modules/systemd/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "python-systemd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8p4m4iM/z4o6PHRQIpuSXb64tPTWGlujEYCDVLiIt2o=";
   };
 
diff --git a/pkgs/development/python-modules/systemdunitparser/default.nix b/pkgs/development/python-modules/systemdunitparser/default.nix
index c7e23aa577d3..0b3431c06680 100644
--- a/pkgs/development/python-modules/systemdunitparser/default.nix
+++ b/pkgs/development/python-modules/systemdunitparser/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sgallagher";
     repo = "systemdunitparser";
-    tag = version;
+    rev = version;
     hash = "sha256-lcvXEieaifPUDhLdaz2FXaNdbw7wKR+x/kC+MMDT0tE=";
   };
 
diff --git a/pkgs/development/python-modules/tabview/default.nix b/pkgs/development/python-modules/tabview/default.nix
index ea463e7880a7..4db25a42b8cd 100644
--- a/pkgs/development/python-modules/tabview/default.nix
+++ b/pkgs/development/python-modules/tabview/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TabViewer";
     repo = "tabview";
-    tag = version;
+    rev = version;
     sha256 = "1d1l8fhdn3w2zg7wakvlmjmgjh9lh9h5fal1clgyiqmhfix4cn4m";
   };
 
diff --git a/pkgs/development/python-modules/tahoma-api/default.nix b/pkgs/development/python-modules/tahoma-api/default.nix
index 29916da2c74e..13744f25f24d 100644
--- a/pkgs/development/python-modules/tahoma-api/default.nix
+++ b/pkgs/development/python-modules/tahoma-api/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "philklei";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YwOKSBlN4lNyS+hfdbQDUq1gc14FBof463ofxtUVLC4=";
   };
 
diff --git a/pkgs/development/python-modules/tailer/default.nix b/pkgs/development/python-modules/tailer/default.nix
index ff8998571c4d..dbdc4e527962 100644
--- a/pkgs/development/python-modules/tailer/default.nix
+++ b/pkgs/development/python-modules/tailer/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "six8";
     repo = "pytailer";
-    tag = version;
+    rev = version;
     sha256 = "1s5p5m3q9k7r1m0wx5wcxf20xzs0rj14qwg1ydwhf6adr17y2w5y";
   };
 
diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix
index e6262571e470..6fd45eef85eb 100644
--- a/pkgs/development/python-modules/taxi/default.nix
+++ b/pkgs/development/python-modules/taxi/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sephii";
     repo = "taxi";
-    tag = version;
+    rev = version;
     hash = "sha256-QB88RpgzrQy7DGeRdMHC2SV5Esp/r5LZtlaY5C8vJxw=";
   };
 
diff --git a/pkgs/development/python-modules/tbats/default.nix b/pkgs/development/python-modules/tbats/default.nix
index a165bfd0eae3..1f0545b49caf 100644
--- a/pkgs/development/python-modules/tbats/default.nix
+++ b/pkgs/development/python-modules/tbats/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "intive-DataScience";
     repo = "tbats";
-    tag = version;
+    rev = version;
     hash = "sha256-f6QqDq/ffbnFBZRAT6KQRlqvZZSE+Pff2/o+htVabZI=";
   };
 
diff --git a/pkgs/development/python-modules/tcxparser/default.nix b/pkgs/development/python-modules/tcxparser/default.nix
index c96f18a1bd87..4de4e9a39a97 100644
--- a/pkgs/development/python-modules/tcxparser/default.nix
+++ b/pkgs/development/python-modules/tcxparser/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vkurup";
     repo = "python-tcxparser";
-    tag = version;
+    rev = version;
     hash = "sha256-HOACQpPVg/UKopz3Jdsyg0CIBnXYuVyhWUVPA+OXI0k=";
   };
 
diff --git a/pkgs/development/python-modules/tdir/default.nix b/pkgs/development/python-modules/tdir/default.nix
index 2658e9fd2eb7..c00e0b3f0bc5 100644
--- a/pkgs/development/python-modules/tdir/default.nix
+++ b/pkgs/development/python-modules/tdir/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rec";
     repo = "tdir";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YYQ33Blhqk/CbocqkB9Nh6qbzMjQT07fmzx+fDTvdw8=";
   };
 
diff --git a/pkgs/development/python-modules/telepath/default.nix b/pkgs/development/python-modules/telepath/default.nix
index b97e8705e0d6..3af1ba09950f 100644
--- a/pkgs/development/python-modules/telepath/default.nix
+++ b/pkgs/development/python-modules/telepath/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "telepath";
     owner = "wagtail";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MS4Q41WVSrjFmFjv4fztyf0U2+5WkNU79aPEKv/CeUQ=";
   };
 
diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix
index e530367a3caa..18b67b6bf502 100644
--- a/pkgs/development/python-modules/telfhash/default.nix
+++ b/pkgs/development/python-modules/telfhash/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trendmicro";
     repo = "telfhash";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "124zajv43wx9l8rvdvmzcnbh0xpzmbn253pznpbjwvygfx16gq02";
   };
 
diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix
index d71f4a5ec8bf..d690ad1aa5a9 100644
--- a/pkgs/development/python-modules/termplotlib/default.nix
+++ b/pkgs/development/python-modules/termplotlib/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1qfrv2w7vb2bbjvd5lqfq57c23iqkry0pwmif1ha3asmz330rja1";
   };
 
diff --git a/pkgs/development/python-modules/tesla-wall-connector/default.nix b/pkgs/development/python-modules/tesla-wall-connector/default.nix
index 4d19fc44db02..cc5907be5b37 100644
--- a/pkgs/development/python-modules/tesla-wall-connector/default.nix
+++ b/pkgs/development/python-modules/tesla-wall-connector/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "einarhauks";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-GblKXWV9h37E3bxNsx17hEe0uDm8ahzJUx8wiE+Vc38=";
   };
 
diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix
index c546209ee495..d133362c3fb2 100644
--- a/pkgs/development/python-modules/test-tube/default.nix
+++ b/pkgs/development/python-modules/test-tube/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "williamFalcon";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0w60xarmcw06gc4002sy7bjfykdz34gbgniswxkl0lw8a1v0xn2m";
   };
 
diff --git a/pkgs/development/python-modules/testbook/default.nix b/pkgs/development/python-modules/testbook/default.nix
index f21493ff6de7..3e6661ceb687 100644
--- a/pkgs/development/python-modules/testbook/default.nix
+++ b/pkgs/development/python-modules/testbook/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nteract";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-qaDgae/5TRpjmjOf7aom7TC5HLHp0PHM/ds47AKtq8U=";
   };
 
diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix
index 329345244d34..89ba02bf4f25 100644
--- a/pkgs/development/python-modules/textfsm/default.nix
+++ b/pkgs/development/python-modules/textfsm/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IHgKG8v0X+LSK6purWBdwDnI/BCs5XA12ZJixuqqXWg=";
   };
 
diff --git a/pkgs/development/python-modules/textstat/default.nix b/pkgs/development/python-modules/textstat/default.nix
index 6f065919d073..127c6f453a92 100644
--- a/pkgs/development/python-modules/textstat/default.nix
+++ b/pkgs/development/python-modules/textstat/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "textstat";
     repo = "textstat";
-    tag = version;
+    rev = version;
     hash = "sha256-UOCWsIdoVGxmkro4kNBYNMYhA3kktngRDxKjo6o+GXY=";
   };
 
diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix
index 9429c65dd072..924464439578 100644
--- a/pkgs/development/python-modules/textx/default.nix
+++ b/pkgs/development/python-modules/textx/default.nix
@@ -18,7 +18,7 @@ let
     src = fetchFromGitHub {
       owner = pname;
       repo = pname;
-      tag = version;
+      rev = version;
       hash = "sha256-qiKOG6B7yWWzkL7bmcRAVv6AOHKTWmrlrsJlXD5RoaQ=";
     };
 
diff --git a/pkgs/development/python-modules/thorlabspm100/default.nix b/pkgs/development/python-modules/thorlabspm100/default.nix
index 0fe8e2b0a226..c88dab853f57 100644
--- a/pkgs/development/python-modules/thorlabspm100/default.nix
+++ b/pkgs/development/python-modules/thorlabspm100/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "clade";
     repo = "ThorlabsPM100";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-X4qEow6u4aE0sbFwZfK3YEso2RS0c9j4iaWJPHaPQV4=";
   };
 
diff --git a/pkgs/development/python-modules/threat9-test-bed/default.nix b/pkgs/development/python-modules/threat9-test-bed/default.nix
index 73d4c6ca0a9c..e98cdd6fdd2f 100644
--- a/pkgs/development/python-modules/threat9-test-bed/default.nix
+++ b/pkgs/development/python-modules/threat9-test-bed/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "threat9";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0YSjMf2gDdrvkDaT77iwfCkiDDXKHnZyI8d7JmBSuCg=";
   };
 
diff --git a/pkgs/development/python-modules/tikzplotlib/default.nix b/pkgs/development/python-modules/tikzplotlib/default.nix
index c013eb91f639..e09c735f4c1f 100644
--- a/pkgs/development/python-modules/tikzplotlib/default.nix
+++ b/pkgs/development/python-modules/tikzplotlib/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PLExHhEnxkEiXsE0rqvpNWwVZ+YoaDa2BTx8LktdHl0=";
   };
 
diff --git a/pkgs/development/python-modules/timeago/default.nix b/pkgs/development/python-modules/timeago/default.nix
index aebf5a75c56a..a1bd21cf16ae 100644
--- a/pkgs/development/python-modules/timeago/default.nix
+++ b/pkgs/development/python-modules/timeago/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hustcc";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-PqORJKAVrjezU/yP2ky3gb1XsM8obDI3GQzi+mok/OM=";
   };
 
diff --git a/pkgs/development/python-modules/tls-parser/default.nix b/pkgs/development/python-modules/tls-parser/default.nix
index 6a821b1b60b9..9c5cc5724f19 100644
--- a/pkgs/development/python-modules/tls-parser/default.nix
+++ b/pkgs/development/python-modules/tls-parser/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nabla-c0d3";
     repo = "tls_parser";
-    tag = version;
+    rev = version;
     hash = "sha256-2XHhUDiJ1EctnYdxYFbNSVLF8dmHP9cZXjziOE9+Dew=";
   };
 
diff --git a/pkgs/development/python-modules/tlv8/default.nix b/pkgs/development/python-modules/tlv8/default.nix
index 5acbe1b22569..4e3045ddff50 100644
--- a/pkgs/development/python-modules/tlv8/default.nix
+++ b/pkgs/development/python-modules/tlv8/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jlusiardi";
     repo = "tlv8_python";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-G35xMFYasKD3LnGi9q8wBmmFvqgtg0HPdC+y82nxRWA=";
   };
 
diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix
index 85d60a54e050..9c97153d9d22 100644
--- a/pkgs/development/python-modules/tmb/default.nix
+++ b/pkgs/development/python-modules/tmb/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alemuro";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-XuRhRmeTXAplb14UwISyzaqEIrFeg8/aCdMxUccMUos=";
   };
 
diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix
index c5da2234439f..b3e994e26020 100644
--- a/pkgs/development/python-modules/tokenize-rt/default.nix
+++ b/pkgs/development/python-modules/tokenize-rt/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7ykczY73KkqR99tYLL/5bgr9bqU444qHs2ONz+ldVyg=";
   };
 
diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix
index f7e2fdc08b2e..59a19b81a3f9 100644
--- a/pkgs/development/python-modules/tokenlib/default.nix
+++ b/pkgs/development/python-modules/tokenlib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = "tokenlib";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-+KybaLb4XAcuBARJUhL5gK71jfNMb8YL8dV5Vzf7yXI=";
   };
 
diff --git a/pkgs/development/python-modules/tomli-w/default.nix b/pkgs/development/python-modules/tomli-w/default.nix
index 6c0cc6290862..3741f4e2881e 100644
--- a/pkgs/development/python-modules/tomli-w/default.nix
+++ b/pkgs/development/python-modules/tomli-w/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-wZSC5uOi1JUeKXIli1I8/Vo0wGsv9Q1I84dAMQQP95w=";
   };
 
diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix
index cd536b224ca6..ea17a226873e 100644
--- a/pkgs/development/python-modules/tomli/default.nix
+++ b/pkgs/development/python-modules/tomli/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-4MWp9pPiUZZkjvGXzw8/gDele743NBj8uG4jvK2ohUM=";
   };
 
diff --git a/pkgs/development/python-modules/torpy/default.nix b/pkgs/development/python-modules/torpy/default.nix
index 97d249fff906..d6f257dfa9ad 100644
--- a/pkgs/development/python-modules/torpy/default.nix
+++ b/pkgs/development/python-modules/torpy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "torpyorg";
     repo = "torpy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ni7GcpkxzAMtP4wBOFsi4KnxK+nC0XCZR/2Z/eS/C+w=";
   };
 
diff --git a/pkgs/development/python-modules/torrent-parser/default.nix b/pkgs/development/python-modules/torrent-parser/default.nix
index 49a1cda66916..ae1c3a601624 100644
--- a/pkgs/development/python-modules/torrent-parser/default.nix
+++ b/pkgs/development/python-modules/torrent-parser/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "7sDream";
     repo = "torrent_parser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zM738r3o9dGZYoWLN7fM4E06m6YPcAODEkgDS6wU/Sc=";
   };
 
diff --git a/pkgs/development/python-modules/trakit/default.nix b/pkgs/development/python-modules/trakit/default.nix
index 89afd8eddd62..5fbe67a6cf17 100644
--- a/pkgs/development/python-modules/trakit/default.nix
+++ b/pkgs/development/python-modules/trakit/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ratoaq2";
     repo = "trakit";
-    tag = version;
+    rev = version;
     hash = "sha256-VV+pdsQ5WEALYZgu4AmvNce1rCTLSYPZtTMjh+aExsU=";
   };
 
diff --git a/pkgs/development/python-modules/tree-sitter-languages/default.nix b/pkgs/development/python-modules/tree-sitter-languages/default.nix
index 835b598c9b96..0e6ae4e47530 100644
--- a/pkgs/development/python-modules/tree-sitter-languages/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-languages/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "grantjenks";
     repo = "py-tree-sitter-languages";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wKU2c8QRBKFVFqg+DAeH5+cwm5jpDLmPZG3YBUsh/lM=";
     # Use git, to also fetch tree-sitter repositories that upstream puts their
     # hashes in the repository as well, in repos.txt.
diff --git a/pkgs/development/python-modules/tree-sitter-make/default.nix b/pkgs/development/python-modules/tree-sitter-make/default.nix
index ce16b45140fe..3a2abf3d04ee 100644
--- a/pkgs/development/python-modules/tree-sitter-make/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-make/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tree-sitter-grammars";
     repo = "tree-sitter-make";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WiuhAp9JZKLd0wKCui9MV7AYFOW9dCbUp+kkVl1OEz0=";
   };
 
diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix
index ef077ee597ee..afcc26350ee9 100644
--- a/pkgs/development/python-modules/trio-websocket/default.nix
+++ b/pkgs/development/python-modules/trio-websocket/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HyperionGray";
     repo = "trio-websocket";
-    tag = version;
+    rev = version;
     hash = "sha256-TGFf4WUeZDrjp/UiQ9O/GoaK5BRC2aaGZVPfqZ4Ip9I=";
   };
 
diff --git a/pkgs/development/python-modules/tunigo/default.nix b/pkgs/development/python-modules/tunigo/default.nix
index 416e90d86e50..034aed0251b3 100644
--- a/pkgs/development/python-modules/tunigo/default.nix
+++ b/pkgs/development/python-modules/tunigo/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trygveaa";
     repo = "python-tunigo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs";
   };
 
diff --git a/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix b/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
index f83452d77737..cf8c96e1b143 100644
--- a/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
+++ b/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tuya";
     repo = "tuya-iot-python-sdk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KmSVa71CM/kNhzE4GznaxISGmIaV+UcTSn3v+fmxmrQ=";
   };
 
diff --git a/pkgs/development/python-modules/tuyaha/default.nix b/pkgs/development/python-modules/tuyaha/default.nix
index a428befc0fde..eb56f96547d6 100644
--- a/pkgs/development/python-modules/tuyaha/default.nix
+++ b/pkgs/development/python-modules/tuyaha/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PaulAnnekov";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-PTIw/2NRHHiqV6E5oj2pMeGq1uApevKfT2n5zV8AQmM=";
   };
 
diff --git a/pkgs/development/python-modules/tweedledum/default.nix b/pkgs/development/python-modules/tweedledum/default.nix
index 4a327658b29b..bb7f83599ecd 100644
--- a/pkgs/development/python-modules/tweedledum/default.nix
+++ b/pkgs/development/python-modules/tweedledum/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "boschmitt";
     repo = "tweedledum";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wgrY5ajaMYxznyNvlD0ul1PFr3W8oV9I/OVsStlZEBM=";
   };
 
diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix
index 086c54eb83a4..41a4b5147fa9 100644
--- a/pkgs/development/python-modules/typesystem/default.nix
+++ b/pkgs/development/python-modules/typesystem/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-fjnheHWjIDbJY1iXCRKCpqTCwtUWK9YXbynRCZquQ7c=";
   };
 
diff --git a/pkgs/development/python-modules/uasiren/default.nix b/pkgs/development/python-modules/uasiren/default.nix
index f35080d01c84..a30bc00e8ba3 100644
--- a/pkgs/development/python-modules/uasiren/default.nix
+++ b/pkgs/development/python-modules/uasiren/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "PaulAnnekov";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NHrnG5Vhz+JZgcTJyfIgGz0Ye+3dFVv2zLCCqw2++oM=";
   };
 
diff --git a/pkgs/development/python-modules/ueagle/default.nix b/pkgs/development/python-modules/ueagle/default.nix
index 93b647e4b7f7..5edd077416ef 100644
--- a/pkgs/development/python-modules/ueagle/default.nix
+++ b/pkgs/development/python-modules/ueagle/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jcalbert";
     repo = "uEagle";
-    tag = version;
+    rev = version;
     sha256 = "1hxwk5alalvmhc31y917dxsnbiwq1xci2krma3235581319xr3w7";
   };
 
diff --git a/pkgs/development/python-modules/ufolint/default.nix b/pkgs/development/python-modules/ufolint/default.nix
index a6951eb3de7c..714a5cac45f3 100644
--- a/pkgs/development/python-modules/ufolint/default.nix
+++ b/pkgs/development/python-modules/ufolint/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "source-foundry";
     repo = "ufolint";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sv8WbnDd2LFHkwNsB9FO04OlLhemdzwjq0tC9+Fd6/M=";
   };
 
diff --git a/pkgs/development/python-modules/ukkonen/default.nix b/pkgs/development/python-modules/ukkonen/default.nix
index aff715efac5f..136303b02b72 100644
--- a/pkgs/development/python-modules/ukkonen/default.nix
+++ b/pkgs/development/python-modules/ukkonen/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "jG6VP/P5sadrdrmneH36/ExSld9blyMAAG963QS9+p0=";
   };
 
diff --git a/pkgs/development/python-modules/unasync/default.nix b/pkgs/development/python-modules/unasync/default.nix
index f64e45323e46..afdfc152bfa8 100644
--- a/pkgs/development/python-modules/unasync/default.nix
+++ b/pkgs/development/python-modules/unasync/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-trio";
     repo = "unasync";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZRvmX1fSfSJ1HNEymzhIuUi3tdjFmUoidfr0rN8c7tk=";
   };
 
diff --git a/pkgs/development/python-modules/unifiled/default.nix b/pkgs/development/python-modules/unifiled/default.nix
index b8079ea90b87..0c2ec7dd9645 100644
--- a/pkgs/development/python-modules/unifiled/default.nix
+++ b/pkgs/development/python-modules/unifiled/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "florisvdk";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1nmqxxhwa0isxdb889nhbp7w4axj1mcrwd3pr9d8nhpw4yj9h3vq";
   };
 
diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix
index 7f7a4bd86973..9dbbe1b8bf4f 100644
--- a/pkgs/development/python-modules/upass/default.nix
+++ b/pkgs/development/python-modules/upass/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Kwpolska";
     repo = "upass";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IlNqPmDaRZ3yRV8O6YKjQkZ3fKNcFgzJHtIX0ADrOyU=";
   };
 
diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix
index fcfed389f60d..d6f92a0e4061 100644
--- a/pkgs/development/python-modules/update-dotdee/default.nix
+++ b/pkgs/development/python-modules/update-dotdee/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-update-dotdee";
-    tag = version;
+    rev = version;
     hash = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A=";
   };
 
diff --git a/pkgs/development/python-modules/upnpy/default.nix b/pkgs/development/python-modules/upnpy/default.nix
index c12ddee951fa..b6677afbd2b2 100644
--- a/pkgs/development/python-modules/upnpy/default.nix
+++ b/pkgs/development/python-modules/upnpy/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "5kyc0d3r";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "17rqcmmwsl0m4722b1cr74f80kqwq7cgxsy7lq9c88zf6srcgjsf";
   };
 
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index dcf913081fd9..cb3bde14e581 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Uranium";
-    tag = version;
+    rev = version;
     hash = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk=";
   };
 
diff --git a/pkgs/development/python-modules/url-normalize/default.nix b/pkgs/development/python-modules/url-normalize/default.nix
index 0cbf4b59bd24..b914c8ae61eb 100644
--- a/pkgs/development/python-modules/url-normalize/default.nix
+++ b/pkgs/development/python-modules/url-normalize/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niksite";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-WE3MM9B/voI23taFbLp2FYhl0uxOfuUWsaCTBG1hyiY=";
   };
 
diff --git a/pkgs/development/python-modules/urlman/default.nix b/pkgs/development/python-modules/urlman/default.nix
index 832a7ffac3c0..fb6ca4ebb5e9 100644
--- a/pkgs/development/python-modules/urlman/default.nix
+++ b/pkgs/development/python-modules/urlman/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "andrewgodwin";
     repo = "urlman";
-    tag = version;
+    rev = version;
     hash = "sha256-p6lRuMHM2xJrlY5LDa0XLCGQPDE39UwCouK6e0U9zJE=";
   };
 
diff --git a/pkgs/development/python-modules/urlpy/default.nix b/pkgs/development/python-modules/urlpy/default.nix
index 59f11edbae1f..fda5519701fa 100644
--- a/pkgs/development/python-modules/urlpy/default.nix
+++ b/pkgs/development/python-modules/urlpy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nexB";
     repo = "urlpy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "962jLyx+/GS8wrDPzG2ONnHvtUG5Pqe6l1Z5ml63Cmg=";
   };
 
diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix
index 7e501c9d461a..9220c3acde9e 100644
--- a/pkgs/development/python-modules/usbtmc/default.nix
+++ b/pkgs/development/python-modules/usbtmc/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-ivi";
     repo = "python-usbtmc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-69kqBTqnVqdWC2mqlXylzb9VkdhwTGZI0Ykf6lqbypI=";
   };
 
diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix
index d689628cb92b..1da16e9c6864 100644
--- a/pkgs/development/python-modules/user-agents/default.nix
+++ b/pkgs/development/python-modules/user-agents/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "selwin";
     repo = "python-user-agents";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0pcbjqj21c2ixhl414bh2h8khi8y1igzfpkyqwan1pakix0lq45a";
   };
 
diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix
index 35c3533e11e4..714bb5a630b0 100644
--- a/pkgs/development/python-modules/ush/default.nix
+++ b/pkgs/development/python-modules/ush/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tarruda";
     repo = "python-ush";
-    tag = version;
+    rev = version;
     hash = "sha256-a6ICbd8647DRtuHl2vs64bsChUjlpuWHV1ipBdFA600=";
   };
 
diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix
index fb0ec9a93e9e..e76fa6e6bab0 100644
--- a/pkgs/development/python-modules/utils/default.nix
+++ b/pkgs/development/python-modules/utils/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "haaksmash";
     repo = "pyutils";
-    tag = version;
+    rev = version;
     sha256 = "07pr39cfw5ayzkp6h53y7lfpd0w19pphsdzsf100fsyy3npavgbr";
   };
 
diff --git a/pkgs/development/python-modules/vat-moss/default.nix b/pkgs/development/python-modules/vat-moss/default.nix
index 735b12c99500..a3fba68a65c0 100644
--- a/pkgs/development/python-modules/vat-moss/default.nix
+++ b/pkgs/development/python-modules/vat-moss/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "vat_moss-python";
-    tag = version;
+    rev = version;
     hash = "sha256-c0lcyeW8IUhWKcfn3BmsbNmHyAzm8T0sdYp0Zp0FbFw=";
   };
 
diff --git a/pkgs/development/python-modules/verboselogs/default.nix b/pkgs/development/python-modules/verboselogs/default.nix
index e392636039a1..63393b593fc6 100644
--- a/pkgs/development/python-modules/verboselogs/default.nix
+++ b/pkgs/development/python-modules/verboselogs/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-verboselogs";
-    tag = version;
+    rev = version;
     hash = "sha256-hcIdbn0gdkdJ33KcOx6uv0iMXW0x+i880SoROi+qX4I=";
   };
 
diff --git a/pkgs/development/python-modules/versionfinder/default.nix b/pkgs/development/python-modules/versionfinder/default.nix
index 498570569580..647b339f4e90 100644
--- a/pkgs/development/python-modules/versionfinder/default.nix
+++ b/pkgs/development/python-modules/versionfinder/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jantman";
     repo = "versionfinder";
-    tag = version;
+    rev = version;
     hash = "sha256-aa2bRGn8Hn7gpEMUM7byh1qZVsqvJeMXomnwCj2Xu5o=";
   };
 
diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix
index d45db6b4de48..4bd46a3f8fba 100644
--- a/pkgs/development/python-modules/vfblib/default.nix
+++ b/pkgs/development/python-modules/vfblib/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LucasFonts";
     repo = "vfbLib";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-D37i4dJPWGruwhLVEEPY3mzu0ONM38JTbC3Pt+/35lQ=";
   };
 
diff --git a/pkgs/development/python-modules/vincenty/default.nix b/pkgs/development/python-modules/vincenty/default.nix
index 6f3ac2511a06..c4e28ff23f44 100644
--- a/pkgs/development/python-modules/vincenty/default.nix
+++ b/pkgs/development/python-modules/vincenty/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maurycyp";
     repo = "vincenty";
-    tag = version;
+    rev = version;
     sha256 = "1li8gv0zb1pdbxdybgaykm38lqbkb5dr7rph6zs1k4k3sh15ldw3";
   };
 
diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index 6f03359f3349..056e38a32923 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "edwardgeorge";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-qrN74IwLRqiVPxU8gVhdiM34yBmiS/5ot07uroYPDVw=";
   };
 
diff --git a/pkgs/development/python-modules/visions/default.nix b/pkgs/development/python-modules/visions/default.nix
index 9db74acd120e..b79e2a403704 100644
--- a/pkgs/development/python-modules/visions/default.nix
+++ b/pkgs/development/python-modules/visions/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dylan-profiler";
     repo = "visions";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MHseb1XJ0t7jQ45VXKQclYPgddrzmJAC7cde8qqYhNQ=";
   };
 
diff --git a/pkgs/development/python-modules/vnoise/default.nix b/pkgs/development/python-modules/vnoise/default.nix
index d74ca423ed65..169f5b3fd61b 100644
--- a/pkgs/development/python-modules/vnoise/default.nix
+++ b/pkgs/development/python-modules/vnoise/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "plottertools";
     repo = "vnoise";
-    tag = version;
+    rev = version;
     hash = "sha256-nflAh3vj48wneM0wy/+M+XD6GC63KZEIFb1x4SS46YI=";
   };
 
diff --git a/pkgs/development/python-modules/vpk/default.nix b/pkgs/development/python-modules/vpk/default.nix
index eddae9e917b0..188ef50b36f1 100644
--- a/pkgs/development/python-modules/vpk/default.nix
+++ b/pkgs/development/python-modules/vpk/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ValvePython";
     repo = "vpk";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SPkPb8kveAR2cN9kd2plS+TjmBYBCfa6pJ0c22l69M0=";
   };
 
diff --git a/pkgs/development/python-modules/vttlib/default.nix b/pkgs/development/python-modules/vttlib/default.nix
index c6bb540e5fec..d90b9c3c3bfd 100644
--- a/pkgs/development/python-modules/vttlib/default.nix
+++ b/pkgs/development/python-modules/vttlib/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "daltonmaag";
     repo = "vttLib";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ChsuzeFRQFDYGlAE4TWzE+et7yGLOfha1VqGcOdayOs=";
   };
 
diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix
index ebc563c0bcee..4e10e0144243 100644
--- a/pkgs/development/python-modules/vultr/default.nix
+++ b/pkgs/development/python-modules/vultr/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spry-group";
     repo = "python-vultr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "00lc5hdhchvm0472p03019bp9541d8y2773xkjy8vblq9qhys8q7";
   };
 
diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix
index 7c39192b61aa..f68979cf2fea 100644
--- a/pkgs/development/python-modules/vxi11/default.nix
+++ b/pkgs/development/python-modules/vxi11/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-ivi";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn";
   };
 
diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix
index c0e3223226ad..5ea52995d331 100644
--- a/pkgs/development/python-modules/wasmer/default.nix
+++ b/pkgs/development/python-modules/wasmer/default.nix
@@ -33,7 +33,7 @@ let
       src = fetchFromGitHub {
         owner = "wasmerio";
         repo = "wasmer-python";
-        tag = version;
+        rev = version;
         hash = "sha256-Iu28LMDNmtL2r7gJV5Vbb8HZj18dlkHe+mw/Y1L8YKE=";
       };
 
diff --git a/pkgs/development/python-modules/wasserstein/default.nix b/pkgs/development/python-modules/wasserstein/default.nix
index 1b578b70349f..c9a9495b42ef 100644
--- a/pkgs/development/python-modules/wasserstein/default.nix
+++ b/pkgs/development/python-modules/wasserstein/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pkomiske";
     repo = "Wasserstein";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-s9en6XwvO/WPsF7/+SEmGePHZQgl7zLgu5sEn4nD9YE=";
   };
 
diff --git a/pkgs/development/python-modules/wat/default.nix b/pkgs/development/python-modules/wat/default.nix
index a724be75b6d5..3cad48246313 100644
--- a/pkgs/development/python-modules/wat/default.nix
+++ b/pkgs/development/python-modules/wat/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "igrek51";
     repo = "wat";
-    tag = version;
+    rev = version;
     hash = "sha256-vTq+R/EBkBm27qWR4S9Za6/ppfWD9CLE21SXhTabkhc=";
   };
 
diff --git a/pkgs/development/python-modules/webthing/default.nix b/pkgs/development/python-modules/webthing/default.nix
index 52f594338f2f..4f4ede0e8ba1 100644
--- a/pkgs/development/python-modules/webthing/default.nix
+++ b/pkgs/development/python-modules/webthing/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "WebThingsIO";
     repo = "webthing-python";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-z4GVycdq25QZxuzZPLg6nhj0MAD1bHrsqph4yHgmRhg=";
   };
 
diff --git a/pkgs/development/python-modules/wgnlpy/default.nix b/pkgs/development/python-modules/wgnlpy/default.nix
index 784bb427f0de..11cb4e38b046 100644
--- a/pkgs/development/python-modules/wgnlpy/default.nix
+++ b/pkgs/development/python-modules/wgnlpy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ArgosyLabs";
     repo = "wgnlpy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5XAfBiKx4SqouA57PxmaCb0ea7mT2VeUI1tgnQE/ZwQ=";
   };
 
diff --git a/pkgs/development/python-modules/whois-api/default.nix b/pkgs/development/python-modules/whois-api/default.nix
index 9cbcbe3dfc9f..f3a40dcc9a1a 100644
--- a/pkgs/development/python-modules/whois-api/default.nix
+++ b/pkgs/development/python-modules/whois-api/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "whois-api-llc";
     repo = "whois-api-py";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SeBeJ6k2R53LxHov+8t70geqUosk/yBJQCi6GaVteMM=";
   };
 
diff --git a/pkgs/development/python-modules/widlparser/default.nix b/pkgs/development/python-modules/widlparser/default.nix
index 464e6f5a5978..9b961c89a9a9 100644
--- a/pkgs/development/python-modules/widlparser/default.nix
+++ b/pkgs/development/python-modules/widlparser/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "plinss";
     repo = "widlparser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-G5N29K0/ByfKwP1XfxZH9u/5x361JD/8qAD6eZaySnU=";
   };
 
diff --git a/pkgs/development/python-modules/wifi/default.nix b/pkgs/development/python-modules/wifi/default.nix
index 9bc1171fb977..b99d4782f47b 100644
--- a/pkgs/development/python-modules/wifi/default.nix
+++ b/pkgs/development/python-modules/wifi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rockymeza";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-scg/DvApvyQZtzDgkHFJzf9gCRfJgBvZ64CG/c2Cx8E=";
   };
 
diff --git a/pkgs/development/python-modules/wikitextparser/default.nix b/pkgs/development/python-modules/wikitextparser/default.nix
index 531b5620c2ef..1b5fe1da7e3a 100644
--- a/pkgs/development/python-modules/wikitextparser/default.nix
+++ b/pkgs/development/python-modules/wikitextparser/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "5j9";
     repo = "wikitextparser";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g0Hvxw8evmCebM2joGT7XMnakVjDG74VJmZhlvUiQMU=";
   };
 
diff --git a/pkgs/development/python-modules/wirerope/default.nix b/pkgs/development/python-modules/wirerope/default.nix
index fde09344d158..10622e40b2b4 100644
--- a/pkgs/development/python-modules/wirerope/default.nix
+++ b/pkgs/development/python-modules/wirerope/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "youknowone";
     repo = "wirerope";
-    tag = version;
+    rev = version;
     hash = "sha256-oojnv+2+nwL/TJhN+QZ5eiV6WGHC3SCxBQrCri0aHQc=";
   };
 
diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix
index dec5df40316f..a9a5b5153fbd 100644
--- a/pkgs/development/python-modules/worldengine/default.nix
+++ b/pkgs/development/python-modules/worldengine/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Mindwerks";
     repo = "worldengine";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry";
   };
 
diff --git a/pkgs/development/python-modules/wsdiscovery/default.nix b/pkgs/development/python-modules/wsdiscovery/default.nix
index 94952134abaa..7af12d7689fe 100644
--- a/pkgs/development/python-modules/wsdiscovery/default.nix
+++ b/pkgs/development/python-modules/wsdiscovery/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "andreikop";
     repo = "python-ws-discovery";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6LGZogNRCnmCrRXvHq9jmHwqW13KQPpaGaao/52JPtk=";
   };
 
diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/pkgs/development/python-modules/wsgiproxy2/default.nix
index 925834cbaae3..25c66e98cf6d 100644
--- a/pkgs/development/python-modules/wsgiproxy2/default.nix
+++ b/pkgs/development/python-modules/wsgiproxy2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gawel";
     repo = "WSGIProxy2";
-    tag = version;
+    rev = version;
     hash = "sha256-ouofw3cBQzBwSh3Pdtdl7KI2pg/T/z3qoh8zoeiKiSs=";
   };
 
diff --git a/pkgs/development/python-modules/wtforms-bootstrap5/default.nix b/pkgs/development/python-modules/wtforms-bootstrap5/default.nix
index 1fc0dd7e98d4..280fc791e0b0 100644
--- a/pkgs/development/python-modules/wtforms-bootstrap5/default.nix
+++ b/pkgs/development/python-modules/wtforms-bootstrap5/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LaunchPlatform";
     repo = "wtforms-bootstrap5";
-    tag = version;
+    rev = version;
     hash = "sha256-TJJ3KOeC9JXnxK0YpnfeBNq1KHwaAZ4+t9CXbc+85Ro=";
   };
 
diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix
index 98f12ed089a4..07aabe725302 100644
--- a/pkgs/development/python-modules/xbox-webapi/default.nix
+++ b/pkgs/development/python-modules/xbox-webapi/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OpenXbox";
     repo = "xbox-webapi-python";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9A3gdSlRjBCx5fBW+jkaSWsFuGieXQKvbEbZzGzLf94=";
   };
 
diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix
index f0eb82b0dfab..944b9f4619e9 100644
--- a/pkgs/development/python-modules/xdot/default.nix
+++ b/pkgs/development/python-modules/xdot/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jrfonseca";
     repo = "xdot.py";
-    tag = version;
+    rev = version;
     hash = "sha256-fkO1bINRkCCzVRrQg9+vIODbN+bpXq2OHBKkzzZUZNA=";
   };
 
diff --git a/pkgs/development/python-modules/xmind/default.nix b/pkgs/development/python-modules/xmind/default.nix
index 162267b9bdcb..3b5565955bdd 100644
--- a/pkgs/development/python-modules/xmind/default.nix
+++ b/pkgs/development/python-modules/xmind/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zhuifengshen";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "xC1WpHz2eHb5+xShM/QUQAIYnJNyK1EKWbTXJKhDwbQ=";
   };
 
diff --git a/pkgs/development/python-modules/xmod/default.nix b/pkgs/development/python-modules/xmod/default.nix
index 4553350f2a8e..34b197579c3e 100644
--- a/pkgs/development/python-modules/xmod/default.nix
+++ b/pkgs/development/python-modules/xmod/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rec";
     repo = "xmod";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pfFxtDQ4kaBrx4XzYMQO1vE4dUr2zs8jgGUQUdXB798=";
   };
 
diff --git a/pkgs/development/python-modules/xpath-expressions/default.nix b/pkgs/development/python-modules/xpath-expressions/default.nix
index d0a602048201..56d514db4055 100644
--- a/pkgs/development/python-modules/xpath-expressions/default.nix
+++ b/pkgs/development/python-modules/xpath-expressions/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "orf";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UAzDXrz1Tr9/OOjKAg/5Std9Qlrnizei8/3XL3hMSFA=";
   };
 
diff --git a/pkgs/development/python-modules/xpybutil/default.nix b/pkgs/development/python-modules/xpybutil/default.nix
index b0fe3ce2f024..631cf33a77c2 100644
--- a/pkgs/development/python-modules/xpybutil/default.nix
+++ b/pkgs/development/python-modules/xpybutil/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "17gbqq955fcl29aayn8l0x14azc60cxgkvdxblz9q8x3l50w0xpg";
   };
 
diff --git a/pkgs/development/python-modules/xtensor-python/default.nix b/pkgs/development/python-modules/xtensor-python/default.nix
index 827e937b10c4..14d063a802d6 100644
--- a/pkgs/development/python-modules/xtensor-python/default.nix
+++ b/pkgs/development/python-modules/xtensor-python/default.nix
@@ -18,7 +18,7 @@ toPythonModule (
     src = fetchFromGitHub {
       owner = "xtensor-stack";
       repo = "xtensor-python";
-      tag = finalAttrs.version;
+      rev = finalAttrs.version;
       hash = "sha256-Cy/aXuiriE/qxSd4Apipzak30DjgE7jX8ai1ThJ/VnE=";
     };
 
diff --git a/pkgs/development/python-modules/yacs/default.nix b/pkgs/development/python-modules/yacs/default.nix
index 0166fa4f67f7..f3e15c5ce41e 100644
--- a/pkgs/development/python-modules/yacs/default.nix
+++ b/pkgs/development/python-modules/yacs/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rbgirshick";
     repo = "yacs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nO8FL4tTkfTthXYXxXORLieFwvn780DDxfrxC9EUUJ0=";
   };
 
diff --git a/pkgs/development/python-modules/yasi/default.nix b/pkgs/development/python-modules/yasi/default.nix
index 9d4f0388464d..1c2fc835be57 100644
--- a/pkgs/development/python-modules/yasi/default.nix
+++ b/pkgs/development/python-modules/yasi/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nkmathew";
     repo = "yasi-sexp-indenter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xKhVTmh/vrtBkatxtk8R4yqbGroH0I+xTKNYUpuikt4=";
   };
 
diff --git a/pkgs/development/python-modules/zenoh/default.nix b/pkgs/development/python-modules/zenoh/default.nix
index 2aa653676c80..56dde703451e 100644
--- a/pkgs/development/python-modules/zenoh/default.nix
+++ b/pkgs/development/python-modules/zenoh/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh-python";
-    tag = version;
+    rev = version;
     hash = "sha256-AIsIjMcT9g0mTAgxOL/shBEjpeuOm/7Wn4EOSyYbShE=";
   };
 
diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix
index dc30bd04848f..048fc2b17d10 100644
--- a/pkgs/development/python-modules/zigpy-cc/default.nix
+++ b/pkgs/development/python-modules/zigpy-cc/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-cc";
-    tag = version;
+    rev = version;
     sha256 = "U3S8tQ3zPlexZDt5GvCd+rOv7CBVeXJJM1NGe7nRl2o=";
   };
 
diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix
index c3e3bc45b791..15380edc65fa 100644
--- a/pkgs/development/python-modules/zlib-ng/default.nix
+++ b/pkgs/development/python-modules/zlib-ng/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pycompression";
     repo = "python-zlib-ng";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UsdZgpRI7h6GemT1+1g/cP/8uhLykZ//saH4JMwwlY4=";
   };
 
diff --git a/pkgs/development/python-modules/zulip-emoji-mapping/default.nix b/pkgs/development/python-modules/zulip-emoji-mapping/default.nix
index e20aeeaecb63..d27d2fd355b0 100644
--- a/pkgs/development/python-modules/zulip-emoji-mapping/default.nix
+++ b/pkgs/development/python-modules/zulip-emoji-mapping/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GearKite";
     repo = "zulip-emoji-mapping";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-logm5uAnLAcFqI7mUxKEO9ZmHqRkd6CFiCW4B5tqZzg=";
   };
 
diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix
index 8acad2d01633..d5bec61a0c0f 100644
--- a/pkgs/development/python-modules/zulip/default.nix
+++ b/pkgs/development/python-modules/zulip/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zulip";
     repo = "python-zulip-api";
-    tag = version;
+    rev = version;
     hash = "sha256-YnNXduZ2KOjRHGwhojkqpMP2mwhflk8/f4FVZL8NvHU=";
   };
   sourceRoot = "${src.name}/zulip";
diff --git a/pkgs/development/python2-modules/pip/default.nix b/pkgs/development/python2-modules/pip/default.nix
index 452a1eb1f456..229f34fa1a7a 100644
--- a/pkgs/development/python2-modules/pip/default.nix
+++ b/pkgs/development/python2-modules/pip/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0hkhs9yc1cjdj1gn9wkycd3sy65c05q8k8rhqgsm5jbpksfssiwn";
     name = "${pname}-${version}-source";
   };
diff --git a/pkgs/development/python2-modules/pycairo/default.nix b/pkgs/development/python2-modules/pycairo/default.nix
index 989811961d6f..85430cae6ac2 100644
--- a/pkgs/development/python2-modules/pycairo/default.nix
+++ b/pkgs/development/python2-modules/pycairo/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pygobject";
     repo = "pycairo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "142145a2whvlk92jijrbf3i2bqrzmspwpysj0bfypw0krzi0aa6j";
   };
 
diff --git a/pkgs/development/python2-modules/setuptools/default.nix b/pkgs/development/python2-modules/setuptools/default.nix
index 96605273965a..3761a055a0a2 100644
--- a/pkgs/development/python2-modules/setuptools/default.nix
+++ b/pkgs/development/python2-modules/setuptools/default.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitHub {
       owner = "pypa";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "0z3q0qinyp1rmnxkw3y5f6nbsxhqlfq5k7skfrqa6ymb3zr009y1";
       name = "${pname}-${version}-source";
     };
diff --git a/pkgs/development/python2-modules/wheel/default.nix b/pkgs/development/python2-modules/wheel/default.nix
index 360f9623316d..95841e413c63 100644
--- a/pkgs/development/python2-modules/wheel/default.nix
+++ b/pkgs/development/python2-modules/wheel/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-JlTmUPY3yo/uROyd3nW1dJa23zbLhgQTwcmqZkPOrHs=";
     name = "${pname}-${version}-source";
     postFetch = ''
diff --git a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix
index 15adce8774fa..f199bc9b9277 100644
--- a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix
+++ b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "rocm-docs-core";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-++Vi0jZLtHWsGy5IUohgF3P+Q6Jg/d0xWyDA6urbHUA=";
   };
 
diff --git a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix
index 2d9da15b8a70..63c9a551fe11 100644
--- a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocm-docs-core";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-++Vi0jZLtHWsGy5IUohgF3P+Q6Jg/d0xWyDA6urbHUA=";
   };
 
diff --git a/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix b/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix
index eb564a5dc01c..ff61e9a8d94b 100644
--- a/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix
+++ b/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix
@@ -12,7 +12,7 @@ mkTclDerivation rec {
   src = fetchFromGitHub {
     owner = "ianka";
     repo = "mustache.tcl";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-apM57LEZ0Y9hXcEPWrKYOoTVtP5QSqiaQrjTHQc3pc4=";
   };
 
diff --git a/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
index 6dbbf1397dfe..c0321c734f04 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
@@ -17,7 +17,7 @@ mkTclDerivation rec {
   src = fetchFromGitHub {
     owner = "flightaware";
     repo = "tclreadline";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6FIQJsAm28jPIfNG+7xsMlCJSLw9JStOVzDemw2P+EI=";
   };
 
diff --git a/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix
index bf593ee9412d..a82b75b56faf 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix
@@ -11,7 +11,7 @@ mkTclDerivation rec {
   src = fetchFromGitHub {
     owner = "flightaware";
     repo = "tclx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bzLF6qOF9o24joWnGR7B4S+Doj7zv9iTh/mo50iFbUs=";
   };
 
diff --git a/pkgs/development/tcl-modules/critcl/default.nix b/pkgs/development/tcl-modules/critcl/default.nix
index 587a682be14c..045b9a28958c 100644
--- a/pkgs/development/tcl-modules/critcl/default.nix
+++ b/pkgs/development/tcl-modules/critcl/default.nix
@@ -13,7 +13,7 @@ mkTclDerivation rec {
   src = fetchFromGitHub {
     owner = "andreas-kupries";
     repo = "critcl";
-    tag = version;
+    rev = version;
     hash = "sha256-LBTAuwTrvwj42vo/TXVSUK8euxHgvSLai23e1jmhMso=";
   };
 
diff --git a/pkgs/development/tools/amazon-qldb-shell/default.nix b/pkgs/development/tools/amazon-qldb-shell/default.nix
index abcffdaf173d..6cd0c01ad20a 100644
--- a/pkgs/development/tools/amazon-qldb-shell/default.nix
+++ b/pkgs/development/tools/amazon-qldb-shell/default.nix
@@ -17,7 +17,7 @@ let
     src = fetchFromGitHub {
       owner = "awslabs";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-aXScqJ1LijMSAy9YkS5QyXtTqxd19lLt3BbyVXlbw8o=";
     };
 
diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
index eb9ab929c35d..bf51057d1786 100644
--- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
+++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
-    tag = version;
+    rev = version;
     hash = "sha256-sKb+e2aROl1IBUUR0LB8aHxQfEOkbqz9WYqUWVNj8W8=";
   };
 
diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix
index b3f391899e49..04be4a79ca19 100644
--- a/pkgs/development/tools/analysis/dotenv-linter/default.nix
+++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dotenv-linter";
     repo = "dotenv-linter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo=";
   };
 
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 16af86682aaf..50c839d12ba1 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WlHta/wXTULehopXeIUdNAQb12Lf0SJnm1HIVHTDshA=";
   };
 
diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix
index a86f0da30848..f4ff446abe59 100644
--- a/pkgs/development/tools/analysis/ikos/default.nix
+++ b/pkgs/development/tools/analysis/ikos/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NASA-SW-VnV";
     repo = "ikos";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kqgGD0plTW0N30kD7Y8xOvGODplJbi37Wh6yYAkzNKI=";
   };
 
diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index d5d9ed11f624..6ba10c6611c7 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "clarkware";
     repo = "jdepend";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-0/xGgAaJ7TTUHxShJbbcPzTODk4lDn+FOn5St5McrtM=";
   };
 
diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix
index 07539fa8bcc6..213894fa62e3 100644
--- a/pkgs/development/tools/analysis/rizin/cutter.nix
+++ b/pkgs/development/tools/analysis/rizin/cutter.nix
@@ -30,7 +30,7 @@ let
     src = fetchFromGitHub {
       owner = "rizinorg";
       repo = "cutter";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-TSEi1mXVvvaGo4koo3EnN/veXPUHF747g+gifnl4IDQ=";
       fetchSubmodules = true;
     };
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index d876a27dccf6..eade75043d16 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rr-debugger";
     repo = "rr";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-o+HXrgGXdsvjlNh70qsXRtp2yXOiZIT30ejfs1KEaqE=";
   };
 
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index d6e4df9b5436..4cc3b44a37df 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yegord";
     repo = "snowman";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1mrmhj2nddi0d47c266vsg5vbapbqbcpj5ld4v1qcwnnk6z2zn0j";
   };
 
diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
index 346a780dcdb8..9564cc5ee7e0 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7xS1V7Ec3eWiVjMB/4MLeKlGxNKRYeHVFc61dpoBU/8=";
   };
 
diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
index 670e5748dfd4..71f0cc211e0c 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DMFIJ0ywR2goHad3SvUSbj5w2057HJ4k0pNbiR/Y0pI=";
   };
 
diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix
index 24eddb0262ed..be236cb5464d 100644
--- a/pkgs/development/tools/asn2quickder/default.nix
+++ b/pkgs/development/tools/asn2quickder/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "quick-der";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk=";
   };
 
diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index 24a86b288da7..ca639ca9b254 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -20,7 +20,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BoomerangDecompiler";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0xncdp0z8ry4lkzmvbj5d7hlzikivghpwicgywlv47spgh8ny0ix";
   };
 
diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index 15a429ddbee4..c4066663a9d9 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "15v4sk1l43pgd5jxr5lxnh0ks6vb3xk5253n66s7vvsnph48j14q";
   };
 
diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix
index 7af005c9126d..d566431b5062 100644
--- a/pkgs/development/tools/build-managers/moon/default.nix
+++ b/pkgs/development/tools/build-managers/moon/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-25qRoWj3QeO/T/JLCkq41ZUI0CH0qgltbUy+wA9feJY=";
   };
 
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index 9798cfa481a0..fb2cb702e5b5 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "qbs";
     repo = "qbs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-nL7UZh29Oecu3RvXYg5xsin2IvPWpApleLH37sEdSAI=";
   };
 
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index 0828601cca8b..b6fc00753c5c 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rebar";
     repo = "rebar";
-    tag = version;
+    rev = version;
     sha256 = "sha256-okvG7X2uHtZ1p+HUoFOmslrWvYjk0QWBAvAMAW2E40c=";
   };
 
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index bdbc065b9fa9..9a70da3f09fd 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -28,7 +28,7 @@ let
     src = fetchFromGitHub {
       inherit owner;
       repo = pname;
-      tag = version;
+      rev = version;
       sha256 = "OhzgDipFhscHtRGlfc33ZewBgHgQLa9Zhjby/r1m49A=";
     };
 
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 5783bf11e28a..c53d412f7d30 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "buildah";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-k7nlBvoAVUTsh98XurTSRuk+yzEKbJh2HFSU1IvX1g0=";
   };
 
diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix
index 8afb64559abb..ad072ca9ce3f 100644
--- a/pkgs/development/tools/comby/default.nix
+++ b/pkgs/development/tools/comby/default.nix
@@ -29,7 +29,7 @@ let
       src = fetchFromGitHub {
         owner = "comby-tools";
         repo = "comby";
-        tag = version;
+        rev = version;
         sha256 = "sha256-yQrfSzJgJm0OWJxhxst2XjZULIVHeEfPMvMIwH7BYDc=";
       };
 
diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix
index 59071c3785c7..d1a77f0ab25a 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/master.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix
@@ -83,7 +83,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "buildbot";
     repo = "buildbot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Kf8sxZE2cQDQSVSMpRTokJU4f3/M6OJq6bXzGonrRLU=";
   };
 
diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
index 0b8f5ad8ebc0..fae399658a30 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "test-collector-rust";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-PF2TFfzWmHXLgTopzJ04dfnzd3Sc/A6Hduffz2guxmU=";
   };
 
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index ea0263baa79d..c077fae90f93 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "harness";
     repo = "drone";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rTMu3wd/drxALAZB0O5bAJuWdYsHSwwOD4nbAFIhXbg=";
   };
 
diff --git a/pkgs/development/tools/database/replibyte/default.nix b/pkgs/development/tools/database/replibyte/default.nix
index 0e608347faf4..a71e14136239 100644
--- a/pkgs/development/tools/database/replibyte/default.nix
+++ b/pkgs/development/tools/database/replibyte/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Qovery";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VExA92g+1y65skxLKU62ZPUPOwdm9N73Ne9xW7Q0Sic=";
   };
 
diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix
index ea0efd6730c0..25e379eaa01f 100644
--- a/pkgs/development/tools/database/surrealdb-migrations/default.nix
+++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Odonno";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OiH3O74tJQFAW+ZyyspvOXUMcWkqjpd4GVU4cKn1jBg=";
   };
 
diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix
index 4f6c7cf60175..2f57f15fd49a 100644
--- a/pkgs/development/tools/devbox/default.nix
+++ b/pkgs/development/tools/devbox/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jetpack-io";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-ka3knS57Nc9LvGxr2DitcfI7VlkqsVXIi/llFFMb14g=";
   };
 
diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix
index 522d40008295..e7851d7d1e29 100644
--- a/pkgs/development/tools/devpod/default.nix
+++ b/pkgs/development/tools/devpod/default.nix
@@ -29,7 +29,7 @@ let
   src = fetchFromGitHub {
     owner = "loft-sh";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8LbqrOKC1als3Xm6ZuU2AySwT0UWjLN2xh+/CvioYew=";
   };
 
diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix
index d5eb5495b8e6..88f1f2bcf251 100644
--- a/pkgs/development/tools/dump_syms/default.nix
+++ b/pkgs/development/tools/dump_syms/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6VDuZ5rw2N4z6wOVbaOKO6TNaq8QA5RstsIzmuE3QrI=";
   };
 
diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix
index 614a1bf0e9a6..05563a439981 100644
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aDxheDMeQYqCT9XO3In6RbmzmXVchn+bjgf3nL3VE4I=";
   };
 
diff --git a/pkgs/development/tools/gammaray/default.nix b/pkgs/development/tools/gammaray/default.nix
index 2c2b02d99b34..a00ddf3cb699 100644
--- a/pkgs/development/tools/gammaray/default.nix
+++ b/pkgs/development/tools/gammaray/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KDAB";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-mJw9yckbkFVYZlcakai/hH/gAD0xOQir5JqGMNnB/dE=";
   };
 
diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index 03bd183d5310..850acef69f0e 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "getgauge";
     repo = "gauge";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eWVU1uAUAM7GGMI6uTpn+89rdwhNVq4sMIfll6NE2XY=";
   };
 
diff --git a/pkgs/development/tools/gauge/plugins/js/default.nix b/pkgs/development/tools/gauge/plugins/js/default.nix
index 3426392a5476..c3f2923cdb31 100644
--- a/pkgs/development/tools/gauge/plugins/js/default.nix
+++ b/pkgs/development/tools/gauge/plugins/js/default.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "getgauge";
     repo = "gauge-js";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OUjB/ZETv8z3YDf/ftyqL8oKDEqyp1h1pK5IgEcq+rw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix
index e4b6bbda12a7..6053aaae41f7 100644
--- a/pkgs/development/tools/git-ps-rs/default.nix
+++ b/pkgs/development/tools/git-ps-rs/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "uptech";
     repo = "git-ps-rs";
-    tag = version;
+    rev = version;
     hash = "sha256-4lk6AHquWKgDk0pBaswbVShZbUDA3wO6cPakhrvrwac=";
   };
 
diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
index 4aa399312be9..c6ccd1588cea 100644
--- a/pkgs/development/tools/github/cligh/default.nix
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CMB";
     repo = "cligh";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0d1fd78rzl2n75xpmy1gnxh1shvcs4qm0j4qqszqvfriwkg2flxn";
   };
 
diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
index 598a1ab5dce6..dc2dc3f7c457 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     owner = "patriciogonzalezvivo";
     repo = "glslViewer";
     fetchSubmodules = true;
-    tag = version;
+    rev = version;
     hash = "sha256-Ve3wmX5+kABCu8IRe4ySrwsBJm47g1zvMqDbqrpQl88=";
   };
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix
index e8e60f9914dc..a3f07bf00f50 100644
--- a/pkgs/development/tools/gptcommit/default.nix
+++ b/pkgs/development/tools/gptcommit/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "zurawiki";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw=";
   };
 
diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index 4748378c7cbc..d19f1fb1f5aa 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -37,7 +37,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "channable";
     repo = "vaultenv";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Jb+Y/Cbapw2ZCXMwXMw1hsy0vT/K8mM/A/Z1all7y+A=";
   };
 
diff --git a/pkgs/development/tools/hors/default.nix b/pkgs/development/tools/hors/default.nix
index 3d81384c3c64..09bf6b2ec98a 100644
--- a/pkgs/development/tools/hors/default.nix
+++ b/pkgs/development/tools/hors/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "windsoilder";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1q17i8zg7dwd8al42wfnkn891dy5hdhw4325plnihkarr50avbr0";
   };
 
diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix
index 71be5d57dfd1..76f7bb443aa2 100644
--- a/pkgs/development/tools/htmlq/default.nix
+++ b/pkgs/development/tools/htmlq/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mgdm";
     repo = "htmlq";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kZtK2QuefzfxxuE1NjXphR7otr+RYfMif/RSpR6TxY0=";
   };
 
diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix
index 483329b040c6..61918c6b7a95 100644
--- a/pkgs/development/tools/ilspycmd/default.nix
+++ b/pkgs/development/tools/ilspycmd/default.nix
@@ -15,7 +15,7 @@ buildDotnetModule (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "icsharpcode";
     repo = "ILSpy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7cPXFaEKr76GtqcNsKx7tstRUeTpSTF8ggxbyEnQa9M=";
   };
 
diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix
index cc9c8c9f5042..a3a26c4eae2c 100644
--- a/pkgs/development/tools/jless/default.nix
+++ b/pkgs/development/tools/jless/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "PaulJuliusMartinez";
     repo = "jless";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-76oFPUWROX389U8DeMjle/GkdItu+0eYxZkt1c6l0V4=";
   };
 
diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix
index 016371df2778..c01d074e7079 100644
--- a/pkgs/development/tools/kdash/default.nix
+++ b/pkgs/development/tools/kdash/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kdash-rs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fFpdWVoeWycnp/hRw2S+hYpnXYmCs+rLqcZdmSSMGwI=";
   };
 
diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix
index 87f41503827f..846667aaf457 100644
--- a/pkgs/development/tools/kubie/default.nix
+++ b/pkgs/development/tools/kubie/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.25.1";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "sbstp";
     repo = "kubie";
     sha256 = "sha256-aZM4rIYDEO1oezHeG2cL0O3hWrj7OJFzW/uFaX+cczw=";
diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix
index ee0ac8c5370a..9db6c4d19ccf 100644
--- a/pkgs/development/tools/kustomize/kustomize-sops.nix
+++ b/pkgs/development/tools/kustomize/kustomize-sops.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "viaduct-ai";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qIYV0wDzBRPt6s6d2dL4FobBSMlmVm+Z0ogig3r0Q/c=";
   };
 
diff --git a/pkgs/development/tools/language-servers/crystalline/default.nix b/pkgs/development/tools/language-servers/crystalline/default.nix
index ddc05b0cf19e..1555dc35e824 100644
--- a/pkgs/development/tools/language-servers/crystalline/default.nix
+++ b/pkgs/development/tools/language-servers/crystalline/default.nix
@@ -17,7 +17,7 @@ crystal.buildCrystalPackage {
   src = fetchFromGitHub {
     owner = "elbywan";
     repo = "crystalline";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-6ZAogEuOJH1QQ6NSJ+8KZUSFSgQAcvd4U9vWNAGix/M=";
   };
 
diff --git a/pkgs/development/tools/loganalyzer/default.nix b/pkgs/development/tools/loganalyzer/default.nix
index 7c6420c5036a..76e782e8f8b9 100644
--- a/pkgs/development/tools/loganalyzer/default.nix
+++ b/pkgs/development/tools/loganalyzer/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pbek";
     repo = "loganalyzer";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-k9hOGI/TmiftwhSHQEh3ZVV8kkMSs1yKejqHelFSQJ4=";
   };
diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index 10dfea26c1a5..f85d1a61c734 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "MiniZinc";
     repo = "libminizinc";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-rR+QvRt73wvulx+T+vhSc3354Cpx1QC6+adaodEiQ7Q=";
   };
 
diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix
index 9eba42f200a0..6e297e0c075e 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/development/tools/minizinc/ide.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MiniZinc";
     repo = "MiniZincIDE";
-    tag = version;
+    rev = version;
     hash = "sha256-gUsv4peZhWrwujRloNisuSf/0Wx5W5xRusAHJCx0wNA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix
index eee94c34caee..279c1238f055 100644
--- a/pkgs/development/tools/misc/chruby/default.nix
+++ b/pkgs/development/tools/misc/chruby/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "postmodern";
     repo = "chruby";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1894g6fymr8kra9vwhbmnrcr58l022mcd7g9ans4zd3izla2j3gx";
   };
 
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 271242cccb97..5d5a7e81407b 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     repo = "coccinelle";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     owner = "coccinelle";
     hash = "sha256-be95cuFP6bAdpCT0Z9zBAx9cc3gYuuXAmHYaI/bmyTE=";
   };
diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix
index 7a3f231a787c..a0d9a450ff55 100644
--- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix
+++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix
@@ -30,7 +30,7 @@ let
 
         src = fetchgit {
           url = "https://review.coreboot.org/coreboot";
-          tag = finalAttrs.version;
+          rev = finalAttrs.version;
           hash = "sha256-zyfBQKVton+2vjYd6fqrUqkHY9bci411pujRGabvTjQ=";
           fetchSubmodules = false;
           leaveDotGit = true;
diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix
index db453884838d..390c9661ef80 100644
--- a/pkgs/development/tools/misc/dura/default.nix
+++ b/pkgs/development/tools/misc/dura/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tkellogg";
     repo = "dura";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-xAcFk7z26l4BYYBEw+MvbG6g33MpPUvnpGvgmcqhpGM=";
   };
 
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 7383f4dd987b..eb13e9d9b738 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
-    tag = version;
+    rev = version;
     sha256 = "sha256-C/NHDhhRTQppu8xRWe9fy1+KIutyoRbkkabUtGlJ1fE=";
   };
 
diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix
index 016b72b286cd..d646d96ea9ef 100644
--- a/pkgs/development/tools/misc/linuxkit/default.nix
+++ b/pkgs/development/tools/misc/linuxkit/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "linuxkit";
     repo = "linuxkit";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dCRTBy2Nbl5KP8dxXt+1ww1BF/gWm3PfLtSBAaVcBvw=";
   };
 
diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix
index 37680bfbae53..0cb6f1c24b74 100644
--- a/pkgs/development/tools/misc/nixbang/default.nix
+++ b/pkgs/development/tools/misc/nixbang/default.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "madjar";
     repo = "nixbang";
-    tag = version;
+    rev = version;
     sha256 = "1kzk53ry60i814wa6n9y2ni0bcxhbi9p8gdv10b974gf23mhi8vc";
   };
 
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix
index 279bc0167866..6ab724089453 100644
--- a/pkgs/development/tools/misc/premake/5.nix
+++ b/pkgs/development/tools/misc/premake/5.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "premake";
     repo = "premake-core";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-sNLCyIHWDW/8jIrMFCZAqtWsh4SRugqtPR4HaoW/Vzk=";
   };
 
diff --git a/pkgs/development/tools/misc/pwninit/default.nix b/pkgs/development/tools/misc/pwninit/default.nix
index 8dfb253299ba..7a645f4b8106 100644
--- a/pkgs/development/tools/misc/pwninit/default.nix
+++ b/pkgs/development/tools/misc/pwninit/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "io12";
     repo = "pwninit";
-    tag = version;
+    rev = version;
     sha256 = "sha256-tbZS7PdRFvO2ifoHA/w3cSPfqqHrLeLHAg6V8oG9gVE=";
   };
 
diff --git a/pkgs/development/tools/misc/seer/default.nix b/pkgs/development/tools/misc/seer/default.nix
index 5285f3be4933..7b959c4fa102 100644
--- a/pkgs/development/tools/misc/seer/default.nix
+++ b/pkgs/development/tools/misc/seer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "epasveer";
     repo = "seer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-+3yghoK8fAM6UFomv1Ga05kxwsLcoL2CpuIDXkFfWHc=";
   };
 
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 1fc9c34e4cc5..a9026979efea 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI=";
   };
 
diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix
index 5acf85dfc8ed..e7dd2ec40735 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/pkgs/development/tools/misc/whatstyle/default.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mikr";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "08lfd8h5fnvy5gci4f3an411cypad7p2yiahvbmlp51r9xwpaiwr";
   };
 
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index af7342ed8cf9..4f6f0463e23f 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -27,7 +27,7 @@ else
           src = fetchFromGitHub {
             owner = "camlp5";
             repo = "camlp5";
-            tag = version;
+            rev = version;
             hash = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o=";
           };
 
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index 105ea5c67565..6a94480be688 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -33,7 +33,7 @@ if lib.versionAtLeast ocaml.version "4.02" then
     src = fetchFromGitHub {
       owner = "ocaml-community";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-+HnAGM+GddYJK0RCvKrs+baZS+1o8Yq+/cVa3U3nFWg=";
     };
 
@@ -55,7 +55,7 @@ else
     src = fetchFromGitHub {
       owner = "mjambon";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8";
     };
 
diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix
index b79aa5681010..7a24d014a733 100644
--- a/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -11,7 +11,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "Lelio-Brun";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JJ8k9/6awKZH87T9Ut8x/hlshiUI6sy2fZtY6x2dIIk=";
   };
 
diff --git a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
index 1ed8c9cf0975..2057bb0c8f3e 100644
--- a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
@@ -23,7 +23,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "serokell";
       repo = pname;
-      tag = version;
+      rev = version;
       sha256 = "gOKvjmlcHDOgsTllj2sPL/qNtW/rlNlEVIrosahNsAQ=";
     };
 
diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
index 2d1a0ec6929a..03460b3b5548 100644
--- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "ocamlbuild";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash =
       {
         "0.14.3" = "sha256-dfcNu4ugOYu/M0rRQla7lXum/g1UzncdLGmpPYo0QUM=";
diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix
index 31df126ea361..fee5a45b3f5d 100644
--- a/pkgs/development/tools/ocaml/ocamlscript/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix
@@ -16,7 +16,7 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
     src = fetchFromGitHub {
       owner = "mjambon";
       repo = "ocamlscript";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256:10xz8jknlmcgnf233nahd04q98ijnxpijhpvb8hl7sv94dgkvpql";
     };
 
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index b1d4225a497f..d7d780d1a6d5 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -21,7 +21,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
     src = fetchFromGitHub {
       owner = "OCamlPro";
       repo = "ocp-build";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "1641xzik98c7xnjwxpacijd6d9jzx340fmdn6i372z8h554jjlg9";
     };
 
diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix
index 3818de2c81d2..73c834c6624f 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocp-indent";
-    tag = version;
+    rev = version;
     sha256 = "sha256-IyvURw/6R0eKrnahV1fqLV0iIeypykrmxDbliECgbLc=";
   };
 
diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
index fa95db1e71da..1fa391f607f8 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocp-index";
-    tag = version;
+    rev = version;
     hash = "sha256-FbkVJRbFNSho/E59QMUoGK+TrdnnacmykJWWG2JVDVA=";
   };
 
diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix
index f7983e990a47..9d85c9594ad8 100644
--- a/pkgs/development/tools/pactorio/default.nix
+++ b/pkgs/development/tools/pactorio/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "figsoda";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-3+irejeDltf7x+gyJxWBgvPgpQx5uU3DewU23Z4Nr/A=";
   };
 
diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index ced087c961f6..492864c6d9ae 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KDE";
     repo = "heaptrack";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pP+s60ERnmOctYTe/vezCg0VYzziApNY0QaF3aTccZU=";
   };
 
diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix
index 04924301335a..61e9c252c12c 100644
--- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix
+++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc-web";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-yqiSuqan4vynE3AS8OnYdzA+3AVlVFTBkxTuJe17114=";
   };
 
diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix
index 59033ace6a89..f0000dd4c458 100644
--- a/pkgs/development/tools/py-spy/default.nix
+++ b/pkgs/development/tools/py-spy/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "benfred";
     repo = "py-spy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T96F8xgB9HRwuvDLXi6+lfi8za/iNn1NAbG4AIpE0V0=";
   };
 
diff --git a/pkgs/development/tools/remodel/default.nix b/pkgs/development/tools/remodel/default.nix
index 628f304d28ab..6d3f6a560271 100644
--- a/pkgs/development/tools/remodel/default.nix
+++ b/pkgs/development/tools/remodel/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rojo-rbx";
     repo = "remodel";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-tZ6ptGeNBULJaoFomMFN294wY8YUu1SrJh4UfOL/MnI=";
   };
 
diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix
index 2384c1ac43c5..720066ca6910 100644
--- a/pkgs/development/tools/rover/default.nix
+++ b/pkgs/development/tools/rover/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "apollographql";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-uyeePAHBDCzXzwIWrKcc9LHClwSI7DMBYod/o4LfK+Y=";
   };
 
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index e049d29eb922..39fd3f726caf 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andersbakken";
     repo = "rtags";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c=";
     fetchSubmodules = true;
     # unicode file names lead to different checksums on HFS+ vs. other
diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix
index 712b3418b012..ebb5769e8082 100644
--- a/pkgs/development/tools/rubyfmt/default.nix
+++ b/pkgs/development/tools/rubyfmt/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fables-tales";
     repo = "rubyfmt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IIHPU6iwFwQ5cOAtOULpMSjexFtTelSd/LGLuazdmUo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix
index 47ac78e2a3b9..1aad2fdf19b9 100644
--- a/pkgs/development/tools/rust/cargo-clone/default.nix
+++ b/pkgs/development/tools/rust/cargo-clone/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "janlikar";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kK0J1Vfx1T17CgZ3DV9kQbAUxk4lEfje5p6QvdBS5VQ=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix
index 6636e52e1fc6..3d8fef633af4 100644
--- a/pkgs/development/tools/rust/cargo-codspeed/default.nix
+++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "CodSpeedHQ";
     repo = "codspeed-rust";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VAl9UceVDS2XltP3G1YxNp07R+PmuJGJ8zvtxblcQLc=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix
index 67035ce2dfc9..faf717762fba 100644
--- a/pkgs/development/tools/rust/cargo-crev/default.nix
+++ b/pkgs/development/tools/rust/cargo-crev/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "crev-dev";
     repo = "cargo-crev";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OxE0+KK2qt06gAi7rw3hiG2lczBqbyNThb4aCpyM6q8=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix
index fa86634af392..d2ee4011a5ee 100644
--- a/pkgs/development/tools/rust/cargo-edit/default.nix
+++ b/pkgs/development/tools/rust/cargo-edit/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "killercup";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kwchy30i2zYS7uwUonDusumLbpZxdzZ/8Rts25zwqdo=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix
index 698106410047..0a62e9a99992 100644
--- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix
+++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "flamegraph-rs";
     repo = "flamegraph";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-OpneGyulSreUKhmnLfsJ2sEbkDPCcrDjkRu9ccKZcJc=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix
index 749cf877dec4..589186bd86e0 100644
--- a/pkgs/development/tools/rust/cargo-fund/default.nix
+++ b/pkgs/development/tools/rust/cargo-fund/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "acfoltzer";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-8mnCwWwReNH9s/gbxIhe7XdJRIA6BSUKm5jzykU5qMU=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix
index ffb56b5d9914..e132991be676 100644
--- a/pkgs/development/tools/rust/cargo-ndk/default.nix
+++ b/pkgs/development/tools/rust/cargo-ndk/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bbqsrc";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-tzjiq1jjluWqTl+8MhzFs47VRp3jIRJ7EOLhUP8ydbM=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index 343bded490c0..9eedd3129e2e 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "est31";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-4/JfD2cH46it8PkU58buTHwFXBZI3sytyJCUWl+vSAE=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix
index 2b96c6a38281..6ff8f75f407e 100644
--- a/pkgs/development/tools/rust/cargo-vet/default.nix
+++ b/pkgs/development/tools/rust/cargo-vet/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-VnOqQ1dKgNZSHTzJrD7stoCzNGrSkYxcLDJAsrJUsEQ=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix
index 8d3eb7151ed6..8564f62150d7 100644
--- a/pkgs/development/tools/rust/cargo-watch/default.nix
+++ b/pkgs/development/tools/rust/cargo-watch/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "watchexec";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-agwK20MkvnhqSVAWMy3HLkUJbraINn12i6VAg8mTzBk=";
   };
 
diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix
index 6a77c1eaf407..6014baaf3a90 100644
--- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix
+++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "museun";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-YJ08oBTn9OwovnTOuuc1OuVsQp+/TPO3vcY4ybJ26Ms=";
   };
 
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index 7b910737d204..fa4842c65a79 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cbindgen";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1GT+EgltLhveEACxhY+748L1HIIyQHbEs7wLKANFWr0=";
   };
 
diff --git a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix
index adb6a19a7697..63ddaae84bd9 100644
--- a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix
+++ b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kennytm";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-J25ER/g8Kylw/oTIEl4Gl8i1xmhR+4JM5M5EHpl1ras=";
   };
 
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 90755be239fc..649497629329 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rustup";
-    tag = version;
+    rev = version;
     sha256 = "sha256-BehkJTEIbZHaM+ABaWN/grl9pX75lPqyBj1q1Kt273M=";
   };
 
diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix
index 95ff26c827ad..4a3b1880436f 100644
--- a/pkgs/development/tools/rust/sqlx-cli/default.nix
+++ b/pkgs/development/tools/rust/sqlx-cli/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "launchbadge";
     repo = "sqlx";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kAZUconMYUF9gZbLSg7KW3fVb7pkTq/d/yQyVzscxRw=";
   };
 
diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix
index 2b907659ed11..0b69da6c8de9 100644
--- a/pkgs/development/tools/sentry-cli/default.nix
+++ b/pkgs/development/tools/sentry-cli/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-Nm9MN20M5NbnqONKe2JREjX03f/fLirbuypamVTzC5I=";
   };
   doCheck = false;
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index 09313873a1ea..9a8dc3ef60e7 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "buserror";
     repo = "simavr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0njz03lkw5374x1lxrq08irz4b86lzj2hibx46ssp7zv712pq55q";
   };
 
diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix
index aa03bf8785d5..873314138265 100644
--- a/pkgs/development/tools/solarus-quest-editor/default.nix
+++ b/pkgs/development/tools/solarus-quest-editor/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn";
   };
 
diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix
index f9f8e8f31937..fbe1416808f7 100644
--- a/pkgs/development/tools/toluapp/default.nix
+++ b/pkgs/development/tools/toluapp/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LuaDist";
     repo = "toluapp";
-    tag = version;
+    rev = version;
     sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0";
   };
 
diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix
index ee0734f8548f..3b2481f49c33 100644
--- a/pkgs/development/tools/viceroy/default.nix
+++ b/pkgs/development/tools/viceroy/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fastly";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NmXBD/BEQnAH4ES5SYwf8fInC4k++JX2OIhvusLlmG8=";
   };
 
diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix
index a1f72fa1e56f..d21ac338f34f 100644
--- a/pkgs/development/tools/wasmedge/default.nix
+++ b/pkgs/development/tools/wasmedge/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "WasmEdge";
     repo = "WasmEdge";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-70vvQGYcer3dosb1ulWO1F4xFwKwfo35l/TFSFa5idM=";
   };
 
diff --git a/pkgs/development/tools/wrangler_1/default.nix b/pkgs/development/tools/wrangler_1/default.nix
index 62f4e802d51a..b51d26745bf2 100644
--- a/pkgs/development/tools/wrangler_1/default.nix
+++ b/pkgs/development/tools/wrangler_1/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "wrangler";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GfuU+g4tPU3TorzymEa9q8n4uKYsG0ZTz8rJirGOLfQ=";
   };
 
diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix
index cee8678f642e..ab0638768a08 100644
--- a/pkgs/development/web/playwright/driver.nix
+++ b/pkgs/development/web/playwright/driver.nix
@@ -32,7 +32,7 @@ let
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "playwright";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-s4lJRdsA4H+Uf9LjriZ6OimBl5A9Pf4fvhWDw2kOMkg=";
   };
 
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 0af732ed9685..76033e6fdec7 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -37,7 +37,7 @@ let
   src = fetchFromGitHub {
     owner = "ankitects";
     repo = "anki";
-    tag = version;
+    rev = version;
     hash = "sha256-pAQBl5KbTu7LD3gKBaiyn4QiWeGYoGmxD3sDJfCZVdA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index 9add47c41845..a55b58c7e83a 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "arx";
     repo = "ArxLibertatis";
-    tag = version;
+    rev = version;
     sha256 = "GBJcsibolZP3oVOTSaiVqG2nMmvXonKTp5i/0NNODKY=";
   };
 
diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix
index 34771580bdea..b38c6dffa88d 100644
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/games/blightmud/default.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk=";
   };
 
diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix
index d56b750c4b71..3c47f02131c2 100644
--- a/pkgs/games/bugdom/default.nix
+++ b/pkgs/games/bugdom/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jorio";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-0c7v5tSqYuqtLOFl4sqD7+naJNqX/wlKHVntkZQGJ8A=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix
index e5554b7fd466..cead8704e11b 100644
--- a/pkgs/games/chiaki-ng/default.nix
+++ b/pkgs/games/chiaki-ng/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "streetpea";
     repo = "chiaki-ng";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TY27Xc13RiTcAgrUFJ3M3ALnxgeY+/4re3cjZ5kNwc8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix
index bcb0d4c23c8a..5f12863d9f67 100644
--- a/pkgs/games/cockatrice/default.nix
+++ b/pkgs/games/cockatrice/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Cockatrice";
     repo = "Cockatrice";
-    tag = version;
+    rev = version;
     sha256 = "sha256-vM12ufqoItlDeYXHhyN3Jkqm+chGgm9gB4xtIdDbI94=";
   };
 
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 2ed7cf98979c..81e8f826e509 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "crawl";
     repo = "crawl";
-    tag = version;
+    rev = version;
     hash = "sha256-jhjFC8+A2dQomMwKZPSiEViXeQpty2Dk9alDcNsLvq0=";
   };
 
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
index 517dd8124d84..87c6accaaad5 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/pkgs/games/devilutionx/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "diasurgical";
     repo = "devilutionX";
-    tag = version;
+    rev = version;
     sha256 = "sha256-4cA2OHTc51U8XIk3iS16En7JJExkcn4a4VdtjNkZfH8=";
   };
 
diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix
index 22ecaefb9f21..6db8e8dd2a91 100644
--- a/pkgs/games/doom-ports/slade/default.nix
+++ b/pkgs/games/doom-ports/slade/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
-    tag = version;
+    rev = version;
     hash = "sha256-pcWmv1fnH18X/S8ljfHxaL1PjApo5jyM8W+WYn+/7zI=";
   };
 
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index ef34d2a9bddf..05cc82297acb 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Dwarf-Therapist";
     repo = "Dwarf-Therapist";
-    tag = "v${version}";
+    rev = "v${version}";
     inherit hash;
   };
 
diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix
index 51dca37dc4da..be92949cb91a 100644
--- a/pkgs/games/easyrpg-player/default.nix
+++ b/pkgs/games/easyrpg-player/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EasyRPG";
     repo = "Player";
-    tag = version;
+    rev = version;
     hash = "sha256-t0sa9ONVVfsiTy+us06vU2bMa4QmmQeYxU395g0WS6w=";
   };
 
diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix
index 4bb50aebba14..1ac4db6a2ac7 100644
--- a/pkgs/games/exult/default.nix
+++ b/pkgs/games/exult/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "exult";
     repo = "exult";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-NlvtYtmJNYhOC1BtIxIij3NEQHWAGOeD4XgRq7evjzE=";
   };
 
diff --git a/pkgs/games/fallout-ce/fallout-ce.nix b/pkgs/games/fallout-ce/fallout-ce.nix
index 6409ce41cf63..6754fad6a1b5 100644
--- a/pkgs/games/fallout-ce/fallout-ce.nix
+++ b/pkgs/games/fallout-ce/fallout-ce.nix
@@ -11,7 +11,7 @@ callPackage ./build.nix rec {
   src = fetchFromGitHub {
     owner = "alexbatalov";
     repo = "fallout1-ce";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZiBoF3SL00sN0QrD3fkWG9SAknumOvzRB1oQJff6ITA=";
   };
 
diff --git a/pkgs/games/fallout-ce/fallout2-ce.nix b/pkgs/games/fallout-ce/fallout2-ce.nix
index cd326d7a5cce..a1b4f28b1971 100644
--- a/pkgs/games/fallout-ce/fallout2-ce.nix
+++ b/pkgs/games/fallout-ce/fallout2-ce.nix
@@ -12,7 +12,7 @@ callPackage ./build.nix rec {
   src = fetchFromGitHub {
     owner = "alexbatalov";
     repo = "fallout2-ce";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-r1pnmyuo3uw2R0x9vGScSHIVNA6t+txxABzgHkUEY5U=";
   };
 
diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix
index 49fed5002a34..4c835cab698a 100644
--- a/pkgs/games/ferium/default.nix
+++ b/pkgs/games/ferium/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gorilla-devs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eeQjezB6pRdnPADLgDLo8b+bUSP12gfBhFNt/uYCwHU=";
   };
 
diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix
index c8b1c080dd18..8d4069874bd6 100644
--- a/pkgs/games/flare/engine.nix
+++ b/pkgs/games/flare/engine.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc=";
   };
 
diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix
index 370794d8ab1f..74dbcaaaae31 100644
--- a/pkgs/games/flare/game.nix
+++ b/pkgs/games/flare/game.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo=";
   };
 
diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix
index 940e97c28202..3fdd60a5fa2c 100644
--- a/pkgs/games/gshogi/default.nix
+++ b/pkgs/games/gshogi/default.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "johncheetham";
     repo = "gshogi";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-EPOIYPSFAhilxuZeYfuZ4Cd29ReJs/E4KNF5/lyzbxs=";
   };
 
diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/games/iortcw/sp.nix
index bbe43b887c38..b614d3b37f0f 100644
--- a/pkgs/games/iortcw/sp.nix
+++ b/pkgs/games/iortcw/sp.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "iortcw";
     repo = "iortcw";
-    tag = version;
+    rev = version;
     sha256 = "0g5wgqb1gm34pd05dj2i8nj3qhsz0831p3m7bsgxpjcg9c00jpyw";
   };
 
diff --git a/pkgs/games/koboredux/default.nix b/pkgs/games/koboredux/default.nix
index dabf376ab735..5f4d0a39a8a9 100644
--- a/pkgs/games/koboredux/default.nix
+++ b/pkgs/games/koboredux/default.nix
@@ -28,7 +28,7 @@ let
   main_src = fetchFromGitHub {
     owner = "olofson";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig";
   };
 
diff --git a/pkgs/games/ldmud/default.nix b/pkgs/games/ldmud/default.nix
index e0999f818a94..bdfff52c3e74 100644
--- a/pkgs/games/ldmud/default.nix
+++ b/pkgs/games/ldmud/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA=";
   };
 
diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix
index 4e83dfc2f5aa..da7c815fa056 100644
--- a/pkgs/games/leela-zero/default.nix
+++ b/pkgs/games/leela-zero/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gcp";
     repo = "leela-zero";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-AQRp2rkL9KCZdsJN6uz2Y+3kV4lyRLYjWn0p7UOjBMw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/games/libremines/default.nix b/pkgs/games/libremines/default.nix
index 57816d6095e5..b3b7cda9d4c6 100644
--- a/pkgs/games/libremines/default.nix
+++ b/pkgs/games/libremines/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Bollos00";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TQwjEgtqAvKnrpia6VloRgFwtq5TNDmxU+ZWjtEK/n8=";
   };
 
diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix
index 56aabfbd916e..aa24289ba070 100644
--- a/pkgs/games/nile/default.nix
+++ b/pkgs/games/nile/default.nix
@@ -24,7 +24,7 @@ buildPythonApplication {
   src = fetchFromGitHub {
     owner = "imLinguin";
     repo = "nile";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI=";
   };
 
diff --git a/pkgs/games/openra_2019/mods.nix b/pkgs/games/openra_2019/mods.nix
index c3ba646dbc9c..a9f95d0f25c8 100644
--- a/pkgs/games/openra_2019/mods.nix
+++ b/pkgs/games/openra_2019/mods.nix
@@ -58,7 +58,7 @@ in
       src = fetchFromGitHub {
         owner = "OpenRA";
         repo = "OpenRA";
-        tag = version;
+        rev = version;
         sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r";
         name = "engine";
         inherit postFetch;
@@ -110,7 +110,7 @@ in
       src = fetchFromGitHub {
         owner = "MustaphaTR";
         repo = "OpenRA";
-        tag = version;
+        rev = version;
         sha256 = "1x6byz37s8qcpqj902zvkvbv95rv2mv2kj35c12gbpyc92xkqkq0";
         name = "generals-alpha-engine";
         inherit postFetch;
@@ -194,7 +194,7 @@ in
       src = fetchFromGitHub {
         owner = "OpenRA";
         repo = "OpenRA";
-        tag = version;
+        rev = version;
         sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5";
         name = "engine";
         inherit postFetch;
@@ -222,7 +222,7 @@ in
       src = fetchFromGitHub {
         owner = "OpenRA";
         repo = "OpenRA";
-        tag = version;
+        rev = version;
         sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr";
         name = "engine";
         inherit postFetch;
@@ -327,7 +327,7 @@ in
       src = fetchFromGitHub {
         owner = "RAunplugged";
         repo = "OpenRA";
-        tag = version;
+        rev = version;
         sha256 = "1p5hgxxvxlz8480vj0qkmnxjh7zj3hahk312m0zljxfdb40652w1";
         name = "engine";
         inherit postFetch;
@@ -351,7 +351,7 @@ in
       src = fetchFromGitHub {
         owner = "OpenRA";
         repo = "OpenRA";
-        tag = version;
+        rev = version;
         sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr";
         name = "engine";
         inherit postFetch;
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index baef1cfd4833..8ad42af360bd 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yvt";
     repo = "openspades";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1fvmqbif9fbipd0vphp57pk6blb4yp8xvqlc2ppipk5pjv6a3d2h";
   };
 
diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix
index de715ba18bae..5278cd20c6e1 100644
--- a/pkgs/games/orthorobot/default.nix
+++ b/pkgs/games/orthorobot/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Stabyourself";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ca6hvd890kxmamsmsfiqzw15ngsvb4lkihjb6kabgmss61a6s5p";
   };
 
diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix
index 9923921b28b9..cbcddf570b03 100644
--- a/pkgs/games/pentobi/default.nix
+++ b/pkgs/games/pentobi/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "enz";
     repo = "pentobi";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-DQM3IJ0pRkX4OsrjZGROg50LfKb621UnpvtqSjxchz8=";
   };
 
diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix
index 57e43f47530c..f8ef4e598d0f 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@@ -26,7 +26,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pokerth";
     repo = "pokerth";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j4E3VMpaPqX7+hE3wYRZZUeRD//F+K2Gp8oPmJqX5FQ=";
   };
 
diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix
index f89d16d8dab1..88894e2fb99d 100644
--- a/pkgs/games/pro-office-calculator/default.nix
+++ b/pkgs/games/pro-office-calculator/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RobJinman";
     repo = "pro_office_calc";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1v75cysargmp4fk7px5zgib1p6h5ya4w39rndbzk614fcnv0iipd";
   };
 
diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix
index 3b7058131e88..4de706b5c50d 100644
--- a/pkgs/games/qtads/default.nix
+++ b/pkgs/games/qtads/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "realnc";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KIqufpvl7zeUtDBXUOAZxBIbfv+s51DoSaZr3jol+bw=";
   };
 
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index 61148df574ab..ea8b0bf1cf0c 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scummvm";
     repo = "scummvm";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4/h1bzauYWNvG7skn6afF79t0KEdgYLZoeqeqRudH7I=";
   };
 
diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix
index 23daee7df3b1..d5b64267d216 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/default.nix
@@ -11,7 +11,7 @@ callPackage ./generic.nix rec {
   src = fetchFromGitHub {
     owner = "00-Evan";
     repo = "shattered-pixel-dungeon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tEgwB/YIhSpwUZrEC4Gw9+6lLllNK8JuTMNKgVzqv7c=";
   };
 
diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
index 819992e19f62..094641c94b11 100644
--- a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
@@ -10,7 +10,7 @@ callPackage ../generic.nix rec {
   src = fetchFromGitHub {
     owner = "TrashboxBobylev";
     repo = "Rat-King-Adventure";
-    tag = version;
+    rev = version;
     hash = "sha256-mh54m2YwGOmE03fxndk3wNX/xi6UyIdXWEguiC3mDeA=";
   };
 
diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix b/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix
index d57ab446f746..747162444a13 100644
--- a/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix
@@ -10,7 +10,7 @@ callPackage ../generic.nix rec {
   src = fetchFromGitHub {
     owner = "Zrp200";
     repo = "rkpd2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jM4CtC3AVXXBjHAfeDp4dFomDpRl76DhD+q9vIAeEhA=";
   };
 
diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix
index 7e5028b95418..90b988de4796 100644
--- a/pkgs/games/solarus/default.nix
+++ b/pkgs/games/solarus/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sbdlf+R9OskDQ5U5rqUX2gF8l/fj0sDJv6BL7H1I1Ng=";
   };
 
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
index aa8b3042e267..c847ad4ceda4 100644
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@@ -39,13 +39,13 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stuntrally";
     repo = "stuntrally";
-    tag = version;
+    rev = version;
     hash = "sha256-0Eh9ilIHSh/Uz8TuPnXxLQfy7KF7qqNXUgBXQUCz9ys=";
   };
   tracks = fetchFromGitHub {
     owner = "stuntrally";
     repo = "tracks";
-    tag = version;
+    rev = version;
     hash = "sha256-fglm1FetFGHM/qGTtpxDb8+k2iAREn5DQR5GPujuLms=";
   };
 
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index b9c0135bdcc3..31aaf3a5f46b 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "supertuxkart";
     repo = "stk-code";
-    tag = version;
+    rev = version;
     hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM=";
   };
 
diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index 7172a79ecebe..047562bc028a 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "teeworlds";
     repo = "teeworlds";
-    tag = version;
+    rev = version;
     sha256 = "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz";
     fetchSubmodules = true;
   };
diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix
index 02674ad4cffc..f36b912b471f 100644
--- a/pkgs/games/vcmi/default.nix
+++ b/pkgs/games/vcmi/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vcmi";
     repo = "vcmi";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-ImfEKVyuvl8VAsaq34DBe+fiAxf11Mr0jWVI51EsSRs=";
   };
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index e259ca650e66..74c2e5230d18 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   version = "1.18.4";
 
   src = fetchFromGitHub {
-    tag = version;
+    rev = version;
     owner = "wesnoth";
     repo = "wesnoth";
     hash = "sha256-c3BoTFnSUqtp71QeSCsC2teVuzsQwV8hOJtIcZdP+1E=";
diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix
index 689506ffd1c7..33ab54b180cf 100644
--- a/pkgs/kde/third-party/applet-window-buttons6/default.nix
+++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "moodyhunter";
     repo = "applet-window-buttons6";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-HnlgBQKT99vVkl6DWqMkN8Vz+QzzZBGj5tqOJ22VkJ8=";
   };
 
diff --git a/pkgs/kde/third-party/koi/default.nix b/pkgs/kde/third-party/koi/default.nix
index abb5328fd5cb..3a7e8ceda25d 100644
--- a/pkgs/kde/third-party/koi/default.nix
+++ b/pkgs/kde/third-party/koi/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "baduhai";
     repo = "Koi";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ip7e/Sz/l5UiTFUTLJPorPO7NltE2Isij2MCmvHZV40=";
   };
 
diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix
index 4bad66ebcc83..c8bc4d7140ec 100644
--- a/pkgs/misc/apulse/default.nix
+++ b/pkgs/misc/apulse/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "i-rinat";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn";
   };
 
diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix
index f431dac7177a..311b87f6b429 100644
--- a/pkgs/misc/calaos/installer/default.nix
+++ b/pkgs/misc/calaos/installer/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "calaos";
     repo = "calaos_installer";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY=";
   };
 
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 14878d2e0c35..a5468f00fecc 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -58,7 +58,7 @@
       src = fetchFromGitHub {
         owner = "OpenPrinting";
         repo = "cups-filters";
-        tag = version;
+        rev = version;
         hash = "sha256-bLOl64bdeZ10JLcQ7GbU+VffJu3Lzo0ves7O7GQIOWY=";
       };
 
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index 9ba776f6aba1..d509cb443db6 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -20,7 +20,7 @@ let
         src = fetchFromGitHub {
           owner = "elastic";
           repo = "beats";
-          tag = "v${version}";
+          rev = "v${version}";
           hash = "sha256-TzcKB1hIHe1LNZ59GcvR527yvYqPKNXPIhpWH2vyMTY=";
         };
 
diff --git a/pkgs/misc/opcua-client-gui/default.nix b/pkgs/misc/opcua-client-gui/default.nix
index 63cb377162c9..9315bdd8ca3d 100644
--- a/pkgs/misc/opcua-client-gui/default.nix
+++ b/pkgs/misc/opcua-client-gui/default.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "FreeOpcUa";
     repo = "opcua-client-gui";
-    tag = version;
+    rev = version;
     hash = "sha256-0BH1Txr3z4a7iFcsfnovmBUreXMvIX2zpZa8QivQVx8=";
   };
 
diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix
index 748afe7770e0..5e8ff5be7ed1 100644
--- a/pkgs/misc/t-rec/default.nix
+++ b/pkgs/misc/t-rec/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sassman";
     repo = "t-rec-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-aQX+JJ2MwzzxJkA1vsE8JqvYpWtqyycvycPc2pyFU7g=";
   };
 
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 82315655c5c5..8cc8f8200cd5 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -116,7 +116,7 @@ in
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "tmux";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-Is0CQ1ZJMXIwpDjrI5MDNHJtq+R3jlNcd9NXQESUe2w=";
     };
     postInstall = ''
@@ -213,7 +213,7 @@ in
     src = fetchFromGitHub {
       owner = "eraserhd";
       repo = "tmux-ctrlw";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-YYbPkGQmukIDD1fcYleioETFai/SOJni+aZ9Jh2+Zc8=";
     };
   };
@@ -562,7 +562,7 @@ in
     src = fetchFromGitHub {
       owner = "eraserhd";
       repo = "tmux-plumb";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-WcTyAeuGAF+Xsqeb3MtRtHDSXiUmTJNDQOkrQJsj07A=";
     };
     postInstall = ''
@@ -940,7 +940,7 @@ in
     src = pkgs.fetchFromGitHub {
       owner = "joshmedeski";
       repo = "t-smart-tmux-session-manager";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-EMDEEIWJ+XFOk0WsQPAwj9BFBVDNwFUCyd1ScceqKpc=";
     };
     nativeBuildInputs = [ pkgs.makeWrapper ];
@@ -1046,7 +1046,7 @@ in
     src = fetchFromGitHub {
       owner = "o0th";
       repo = "tmux-nova";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-0LIql8as2+OendEHVqR0F3pmQTxC1oqapwhxT+34lJo=";
     };
     meta = with lib; {
diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix
index 17567a73dd6d..b9cc9abb40bf 100644
--- a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix
+++ b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix
@@ -12,7 +12,7 @@ let
     src = fetchFromGitHub {
       owner = "Morantron";
       repo = "tmux-fingers";
-      tag = version;
+      rev = "${version}";
       sha256 = "sha256-m9QON7diHVEDnnv/alXCJOG+BnfrAKygScrubZZ605I=";
     };
 
diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix
index 42876168afef..2f9919ed7d42 100644
--- a/pkgs/misc/wiki-tui/default.nix
+++ b/pkgs/misc/wiki-tui/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Builditluc";
     repo = "wiki-tui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-eTDxRrTP9vX7F1lmDCuF6g1pfaZChqB8Pv1kfrd7I9w=";
   };
 
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix
index 6b83613a4372..002b9276cf5b 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "freebsd";
     repo = "drm-kmod-firmware";
-    tag = version;
+    rev = version;
     hash = "sha256-Ly9B0zf+YODel/X1sZYVVUVWh38faNLhkcXcjEnQwII=";
   };
 
diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index 431cb934b711..474d750ecc8c 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "khd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0nzfhknv1s71870w2dk9dy56a3g5zsbjphmfrz0vsvi438g099r4";
   };
 
diff --git a/pkgs/os-specific/darwin/noah/default.nix b/pkgs/os-specific/darwin/noah/default.nix
index e2da94f16d60..421b11df3232 100644
--- a/pkgs/os-specific/darwin/noah/default.nix
+++ b/pkgs/os-specific/darwin/noah/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-noah";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0bivfsgb56kndz61lzjgdcnqlhjikqw89ma0h6f6radyvfzy0vis";
   };
 
diff --git a/pkgs/os-specific/darwin/pngpaste/default.nix b/pkgs/os-specific/darwin/pngpaste/default.nix
index 65f7ed47f6e8..3df66b88534a 100644
--- a/pkgs/os-specific/darwin/pngpaste/default.nix
+++ b/pkgs/os-specific/darwin/pngpaste/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "jcsalterego";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "uvajxSelk1Wfd5is5kmT2fzDShlufBgC0PDCeabEOSE=";
   };
 
diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index 56130e685857..9aacbce1c790 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ChrisJohnsen";
     repo = "tmux-MacOSX-pasteboard";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1qgimh58hcx5f646gj2kpd36ayvrdkw616ad8cb3lcm11kg0ag79";
   };
 
diff --git a/pkgs/os-specific/darwin/sigtool/default.nix b/pkgs/os-specific/darwin/sigtool/default.nix
index d38db0d8464c..41dccbfff6c0 100644
--- a/pkgs/os-specific/darwin/sigtool/default.nix
+++ b/pkgs/os-specific/darwin/sigtool/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "thefloweringash";
     repo = "sigtool";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-K3VSFaqcZEomF7kROJz+AwxdW1MmxxEFDaRnWnzcw54=";
   };
 
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix
index 489bbc720cd6..d3bfcf6420d1 100644
--- a/pkgs/os-specific/darwin/trash/default.nix
+++ b/pkgs/os-specific/darwin/trash/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ali-rantakari";
     repo = "trash";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1d3rc03vgz32faj7qi18iiggxvxlqrj9lsk5jkpa9r1mcs5d89my";
   };
 
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index f159c64f8d7b..504b713b908d 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "acpi_call";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1s7h9y3adyfhw7cjldlfmid79lrwz3vqlvziw9nwd6x5qdj4w9vp";
   };
 
diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix
index 3626e574afb5..ffbdf880efa8 100644
--- a/pkgs/os-specific/linux/akvcam/default.nix
+++ b/pkgs/os-specific/linux/akvcam/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "webcamoid";
     repo = "akvcam";
-    tag = version;
+    rev = version;
     sha256 = "sha256-8jQxBvWRE9Bsh0oz76gO7o+ROm6Z5QGAIe3WERIouUw=";
   };
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index c6f6959d094d..63ad87c6a1fa 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "brndnmtthws";
     repo = "conky";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L8YSbdk+qQl17L4IRajFD/AEWRXb2w7xH9sM9qPGrQo=";
   };
 
diff --git a/pkgs/os-specific/linux/corefreq/default.nix b/pkgs/os-specific/linux/corefreq/default.nix
index 79b7fe733fd6..3f69b46b76bd 100644
--- a/pkgs/os-specific/linux/corefreq/default.nix
+++ b/pkgs/os-specific/linux/corefreq/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cyring";
     repo = "CoreFreq";
-    tag = version;
+    rev = version;
     hash = "sha256-gdJ3yaE/Q10NV9TTbBUwzlF2wogiXFNy8gA36Fr/S7o=";
   };
 
diff --git a/pkgs/os-specific/linux/cpupower-gui/default.nix b/pkgs/os-specific/linux/cpupower-gui/default.nix
index 493fe2cfd3ae..f29cce5b8f19 100644
--- a/pkgs/os-specific/linux/cpupower-gui/default.nix
+++ b/pkgs/os-specific/linux/cpupower-gui/default.nix
@@ -32,7 +32,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "vagnum08";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "05lvpi3wgyi741sd8lgcslj8i7yi3wz7jwl7ca3y539y50hwrdas";
   };
 
diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix
index 605ee33c3037..926e024d9e3e 100644
--- a/pkgs/os-specific/linux/digimend/default.nix
+++ b/pkgs/os-specific/linux/digimend/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "digimend";
     repo = "digimend-kernel-drivers";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YYCxTyoZGMnqC2nKkRi5Z1uofldGvJDGY2/sO9iMNIo=";
   };
 
diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix
index 73ebe8edf944..d4e7841518f9 100644
--- a/pkgs/os-specific/linux/facetimehd/default.nix
+++ b/pkgs/os-specific/linux/facetimehd/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "patjak";
     repo = "facetimehd";
-    tag = version;
+    rev = version;
     sha256 = "sha256-3BDIQNMdNeZyuEgnAkJ0uy7b5lOOx1CfS3eamyZyZm8=";
   };
 
diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix
index 8a14cbf4037b..44a5d65358b4 100644
--- a/pkgs/os-specific/linux/firmware/ath9k/default.nix
+++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
         }
       else
         {
-          tag = finalAttrs.version;
+          rev = finalAttrs.version;
           hash = "sha256-Q/A0ryIC5E1pt2Sh7o79gxHbe4OgdlrwflOWtxWSS5o=";
         }
     )
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 2600b68788bb..8f8210c65466 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
-    tag = version;
+    rev = version;
     hash = "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=";
   };
 
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index a63037890764..cb01e684735a 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DimitryAndric";
     repo = "i7z";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "00c4ng30ry88hcya4g1i9dngiqmz3cs31x7qh1a10nalxn1829xy";
   };
 
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 12ffb19a84da..7bf1f155b21d 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-2CjzIOe1hrW3He9DN+w+Wi2zaaMBkVEdA7dezTpkx8I=";
   };
 
diff --git a/pkgs/os-specific/linux/libbpf/0.x.nix b/pkgs/os-specific/linux/libbpf/0.x.nix
index b91b4d7ee673..603fded29262 100644
--- a/pkgs/os-specific/linux/libbpf/0.x.nix
+++ b/pkgs/os-specific/linux/libbpf/0.x.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "libbpf";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-J5cUvfUYc+uLdkFa2jx/2bqBoZg/eSzc6SWlgKqcfIc=";
   };
 
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index b09e883c8dbf..7fa6d3fcef1b 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "libbpf";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+L/rbp0a3p4PHq1yTJmuMcNj0gT5sqAPeaNRo3Sh6U8=";
   };
 
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index b229e719c4b1..846c5ae0beff 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lttng";
     repo = "lttng-modules";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cEiv1EjsEvyreRERrCGKKpJdA1IKvuyVmgA7S3EkEnU=";
   };
 
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 0885748b8dcb..28eb2ef55385 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "andikleen";
     repo = "mcelog";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1xy1082c67yd48idg5vwvrw7yx74gn6jj2d9c67d0rh6yji091ki";
   };
 
diff --git a/pkgs/os-specific/linux/nullfs/default.nix b/pkgs/os-specific/linux/nullfs/default.nix
index dc6a0f4f666e..db2c52d6c068 100644
--- a/pkgs/os-specific/linux/nullfs/default.nix
+++ b/pkgs/os-specific/linux/nullfs/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "abbbi";
     repo = "nullfsvfs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Hkplhem4Gb1xsYQtRSWub0m15Fiil3qJAO183ygP+WI=";
   };
 
diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix
index 878d23e54e6d..fc74771d74d6 100644
--- a/pkgs/os-specific/linux/projecteur/default.nix
+++ b/pkgs/os-specific/linux/projecteur/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jahnf";
     repo = "Projecteur";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = false;
     hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A=";
   };
diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix
index fb477c0beb25..77d91d039bc6 100644
--- a/pkgs/os-specific/linux/r8168/default.nix
+++ b/pkgs/os-specific/linux/r8168/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mtorromeo";
     repo = "r8168";
-    tag = version;
+    rev = version;
     sha256 = "0bHGs8jyWd+ZiixOoNkBqhS9RjDpRp3vveAgk1YuOWU=";
   };
 
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 5f86d54282f2..d1a420d22422 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "draios";
     repo = "sysdig";
-    tag = version;
+    rev = version;
     hash = "sha256-oufRTr5TFdpF50pmem2L3bBFIfwxCR8f1xi0A328iHo=";
   };
 
diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix
index efb2672a3900..299129a7f025 100644
--- a/pkgs/os-specific/linux/system76-acpi/default.nix
+++ b/pkgs/os-specific/linux/system76-acpi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-acpi-dkms";
-    tag = version;
+    rev = version;
     inherit sha256;
   };
 
diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix
index ab9b5619cae4..708eb6f80208 100644
--- a/pkgs/os-specific/linux/system76-io/default.nix
+++ b/pkgs/os-specific/linux/system76-io/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-io-dkms";
-    tag = version;
+    rev = version;
     inherit hash;
   };
 
diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix
index bf78f478cfe7..fe84cc4df83c 100644
--- a/pkgs/os-specific/linux/system76/default.nix
+++ b/pkgs/os-specific/linux/system76/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-dkms";
-    tag = version;
+    rev = version;
     inherit hash;
   };
 
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 59bcb325db43..c67384b3d938 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -214,7 +214,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "systemd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GvRn55grHWR6M+tA86RMzqinuXNpPZzRB4ApuGN/ZvU=";
   };
 
diff --git a/pkgs/os-specific/linux/usbrelay/default.nix b/pkgs/os-specific/linux/usbrelay/default.nix
index 988cb1ce39a5..bf5935b6af67 100644
--- a/pkgs/os-specific/linux/usbrelay/default.nix
+++ b/pkgs/os-specific/linux/usbrelay/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "darrylb123";
     repo = "usbrelay";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-9jEiMmBEpqY4+nKh3H8N/JrLohp/7oPK3rPmRjp2gvc=";
   };
 
diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index 4d96d40c12d1..f119c5c1ad24 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "umlaeute";
     repo = "v4l2loopback";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-rcwgOXnhRPTmNKUppupfe/2qNUBDUqVb3TeDbrP5pnU=";
   };
 
diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix
index 2a66e31c3607..55ce63db7902 100644
--- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix
+++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jlam55555";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "11mg74ds58jwvdmi3i7c4chxs6v9g09r9ll22pc2kbxjdnrp8zrn";
   };
 
diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix
index e1fb87f5a4d5..edd77f3fb9e4 100644
--- a/pkgs/os-specific/linux/virtio_vmmci/default.nix
+++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "voutilad";
     repo = "virtio_vmmci";
-    tag = version;
+    rev = version;
     hash = "sha256-h8yu4+vTgpAD+sKa1KnVD+qubiIlkYtG2nmQnXOi/sk=";
   };
 
diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix
index 0e7ed67d67b0..11242fccbc95 100644
--- a/pkgs/os-specific/linux/vmm_clock/default.nix
+++ b/pkgs/os-specific/linux/vmm_clock/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "voutilad";
     repo = "vmm_clock";
-    tag = version;
+    rev = version;
     hash = "sha256-XYRxrVixvImxr2j3qxBcv1df1LvPRKqKKgegW3HqUcQ=";
   };
 
diff --git a/pkgs/os-specific/windows/dlfcn/default.nix b/pkgs/os-specific/windows/dlfcn/default.nix
index 95f0eb3b39bc..1f4ea20d550d 100644
--- a/pkgs/os-specific/windows/dlfcn/default.nix
+++ b/pkgs/os-specific/windows/dlfcn/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dlfcn-win32";
     repo = "dlfcn-win32";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ljVTMBiGp8TPufrQcK4zQtcVH1To4zcfBAbUOb+v910=";
   };
 
diff --git a/pkgs/os-specific/windows/npiperelay/default.nix b/pkgs/os-specific/windows/npiperelay/default.nix
index 7f0c406157ee..a0c22a8552c5 100644
--- a/pkgs/os-specific/windows/npiperelay/default.nix
+++ b/pkgs/os-specific/windows/npiperelay/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jstarks";
     repo = "npiperelay";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cg4aZmpTysc8m1euxIO2XPv8OMnBk1DwhFcuIFHF/1o=";
   };
 
diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix
index f20243491331..be8ec5069ca3 100644
--- a/pkgs/servers/authelia/sources.nix
+++ b/pkgs/servers/authelia/sources.nix
@@ -6,7 +6,7 @@ rec {
   src = fetchFromGitHub {
     owner = "authelia";
     repo = "authelia";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Q/NGjJphuZ7MMnOSTAukzEg4iAQWc/VDFWs0jj4e0dY=";
   };
   vendorHash = "sha256-FE4YABsWKhifVjdzJSnjWPesjuSe/hWDa6oTg8MZjo8=";
diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix
index 868c25a266a8..4121a5e8b4d3 100644
--- a/pkgs/servers/code-server/default.nix
+++ b/pkgs/servers/code-server/default.nix
@@ -45,7 +45,7 @@ let
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
-            tag = "v${version}";
+            rev = "v${version}";
             hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix
index 84903a220c8a..ee7b4919f194 100644
--- a/pkgs/servers/etcd/3.4.nix
+++ b/pkgs/servers/etcd/3.4.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "etcd-io";
     repo = "etcd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-M0iD05Wk3pC56kGKeIb0bfMUpy9idMKin0+DYhBo/cw=";
   };
 
diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix
index 3f936efade7e..aee1cc8892c8 100644
--- a/pkgs/servers/etcd/3.5/default.nix
+++ b/pkgs/servers/etcd/3.5/default.nix
@@ -17,7 +17,7 @@ let
   src = fetchFromGitHub {
     owner = "etcd-io";
     repo = "etcd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = etcdSrcHash;
   };
 
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 2c82f3c1b42c..1612f518a795 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -91,7 +91,7 @@ rec {
       src = fetchFromGitHub {
         owner = "FirebirdSQL";
         repo = "firebird";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-po8tMrOahfwayVXa7Eadr9+ZEmZizHlCmxi094cOJSY=";
       };
 
@@ -114,7 +114,7 @@ rec {
       src = fetchFromGitHub {
         owner = "FirebirdSQL";
         repo = "firebird";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-OxkPpmnYTl65ns+hKHJd5IAPUiMj0g3HUpyRpwDNut8=";
       };
 
diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix
index 2b168fb2ba00..9d48f9c1136b 100644
--- a/pkgs/servers/geospatial/martin/default.nix
+++ b/pkgs/servers/geospatial/martin/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "maplibre";
     repo = "martin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Jq72aEwM5bIaVywmS3HetR6nnBZnr3oa9a/4ZbgeL9E=";
   };
 
diff --git a/pkgs/servers/hockeypuck/sources.nix b/pkgs/servers/hockeypuck/sources.nix
index f17034673ad5..b504cd331410 100644
--- a/pkgs/servers/hockeypuck/sources.nix
+++ b/pkgs/servers/hockeypuck/sources.nix
@@ -10,7 +10,7 @@ in
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "0da3ffbqck0dr7d89gy2yillp7g9a4ziyjlvrm8vgkkg2fs8dlb1";
   };
 }
diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix
index 825c591f76b9..d8839e155d56 100644
--- a/pkgs/servers/home-assistant/cli.nix
+++ b/pkgs/servers/home-assistant/cli.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "home-assistant-cli";
-    tag = version;
+    rev = version;
     hash = "sha256-4OeHJ7icDZUOC5K4L0F0Nd9lbJPgdW4LCU0wniLvJ1Q=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
index 0fbd3cb25dad..ba19b714ae4c 100644
--- a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
@@ -14,7 +14,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
-    tag = version;
+    rev = version;
     hash = "sha256-6bYKqU9yucISjTrmCUx1bNn9kqvT9jW1OBrqAa4ayEQ=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix
index 9e5ea81ff5bd..43fff7a6fde3 100644
--- a/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "sanjoyg";
     repo = "dirigera_platform";
-    tag = version;
+    rev = version;
     hash = "sha256-FNcGl6INQlVP+P3qmExWLI1ALh9ZacjJAbNKRtgM3ms=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/dwd/package.nix b/pkgs/servers/home-assistant/custom-components/dwd/package.nix
index cf9ef97049f2..9968ba73fc35 100644
--- a/pkgs/servers/home-assistant/custom-components/dwd/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/dwd/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "hg1337";
     repo = "homeassistant-dwd";
-    tag = version;
+    rev = version;
     hash = "sha256-v5xSIUW8EMTdLY66yZ31cR/1DWVvn85CfIl/Y4xpXiw=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix
index 0c88be384c58..c4a1d9893f42 100644
--- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "magico13";
     repo = "ha-emporia-vue";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OfJvln80ek/+4PURk23REhIyUckAEZ+Ybb5rZyKs6h4=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix b/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
index 0506c0c4dde6..19c5cc3d4d0e 100644
--- a/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
@@ -12,7 +12,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "lichtteil";
     repo = "local_luftdaten";
-    tag = version;
+    rev = version;
     hash = "sha256-68clZgS7Qo62srcZWD3Un9BnNSwQUBr4Z5oBMTC9m8o=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/localtuya/package.nix b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix
index 27ee664e0da4..5c4e63386784 100644
--- a/pkgs/servers/home-assistant/custom-components/localtuya/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix
@@ -12,7 +12,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "xZetsubou";
     repo = "hass-localtuya";
-    tag = version;
+    rev = version;
     hash = "sha256-6JE2hVD650YE7pSrLt+Ie1QpvHcG0bJ2yrTpwTukBG0=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix b/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix
index 0c6a02558e4c..8e4b7ca0059c 100644
--- a/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant-midea-air-appliances-lan";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-61LAecJRHQi9/Wf4L25HwAMOV5Yzsr8irAnh5xuWJ7c=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
index 0ef5db69dc65..fdc34a3f679f 100644
--- a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant_integration_ntfy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-cdqO8fwaEZzAEa7aVjV00OQYnmx0vJZqz7Nd9+MUHN8=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix b/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix
index 70d8dc362ded..ec5eaf815b7c 100644
--- a/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix
@@ -15,7 +15,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "philips-airpurifier-coap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jQXQdcgW8IDmjaHjmeyXHcNTXYmknNDw7Flegy6wj2A=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix
index 9fcba5dd78d2..89609238a092 100644
--- a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix
@@ -15,7 +15,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha-smartthinq-sensors";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L0diABbUq/0wmwvhHeMOg6ieNrvM+LWZ/ynezEpBblk=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix
index 4e6db194fb88..2d1a056407cf 100644
--- a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix
@@ -14,7 +14,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "hultenvp";
     repo = "solis-sensor";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-RgsKIav3ozWYO9CXzvhMVmvOW74L/AHGOW8OWOMFBcQ=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
index f2d1a4fb3443..081590df249b 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
@@ -14,7 +14,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "XiaomiGateway3";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VvuvOUldhmROTs1+YbCT7++VJ71GgGKRbHjqZxQQY0w=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
index 7087822ba4cc..9204ee81fe66 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "al-one";
     repo = "hass-xiaomi-miot";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2qUzLGFXbBq5m+ecSQScC2PHeI6kz6CDeRAjyVu4oWk=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix
index 6a71f6ee9377..739491acb180 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "RomRider";
     repo = "apexcharts-card";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bB/FCNVBK8vOfT3q9+qNssNJCtiN7ReqrsJoobf5dpU=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
index 294969233174..a9e8e5485c1c 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "totaldebug";
     repo = "atomic-calendar-revive";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TaxvxAUcewQH0IMJ0/VjW4+T6squ1tuZIFGn3PE3jhU=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
index 08b11ffdac8f..811709ef4d7f 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Clooos";
     repo = "Bubble-Card";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Hn6jH7lT+bjkOM/iRCmD1B8l6ZRqjNTmVMj4IN7ixE4=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix
index 4dd8aa9b3ede..e0c4883406cc 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "custom-cards";
     repo = "button-card";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ntg1sNgAehcL2fT0rP0YHzV5q6rB5p1TyFXtbZyB3Vo=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
index c81e09b3fe87..8a6df713f416 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "thomasloven";
     repo = "lovelace-card-mod";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MjeLbo1r/PMbzDfZurZYm1fHUukHfzOx6njRgEB8rWk=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix
index 2f9b3a9bb12b..bed75c9c63b7 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "custom-cards";
     repo = "decluttering-card";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8pf7G6RbLdpIdXYz801+wwAc3NcNs8l0x4fSGqlAmG0=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
index 11aff6076411..f046c21aecca 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "decompil3d";
     repo = "lovelace-hourly-weather";
-    tag = version;
+    rev = version;
     hash = "sha256-D2kCUcUgLyMVeba3xc02q/5PrEzXrBVCX+75F58j8y0=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix
index 3377846a1f22..674dd3b4e741 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "madmicio";
     repo = "LG-WebOS-Remote-Control";
-    tag = version;
+    rev = version;
     hash = "sha256-ICOAi8q8dWrBFCv18JYSWc6MIwqxfDXOcc6kCKLGehs=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix
index 8c338c550ff8..ebfca7e42437 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "kalkih";
     repo = "mini-media-player";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-tEG8xmqsPDssXmsCobHJoNK3qdRvBRe6FcTfm16r6+g=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix
index b24743016a79..2ece70bd477d 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "benct";
     repo = "lovelace-multiple-entity-row";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-CXRgXyH1NUg7ssQhenqP0tXr1m2qOkHna3Rf30K3SjI=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix
index 02a5520804a2..eeefe1b1cd13 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "piitaya";
     repo = "lovelace-mushroom";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IYixXKitnrqw9t4UMfIl6v1v627FQwiv0TZEh1LVJTI=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
index 4177291ccac6..308d5bba3170 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "MindFreeze";
     repo = "ha-sankey-chart";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Yjh9HrL7zcMFSlXLRW071zG4Wiyv9q2siIw5Ego4e80=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix
index 7fbe42ad60ed..d4fbd31640ec 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "thomasloven";
     repo = "lovelace-template-entity-row";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-XQxdnRQywWki5mJhmQU5Etz2XSB8jYC32tFGLWb3IXs=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
index af39576ba1f1..2bead7d12330 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "android-tv-card";
-    tag = version;
+    rev = version;
     hash = "sha256-93qPYFr7qNDlQH28dT461EQjWKZJOpL3EpfBBGt4acw=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix
index 4130b62f8423..1b384501eb03 100755
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "denysdovhan";
     repo = "vacuum-card";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-egWseYspxm+zkfFwTEBYQfBox3sswYMuOYqU6oEQTb4=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix
index d26cf84bb1d8..d08b8dd0ba60 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Hypfer";
     repo = "lovelace-valetudo-map-card";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-owOIbA1tRlnbWJ/p/wAUpeDnz/Wzu+GmUammJ6VFxHc=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
index 41c3b5d9493b..c15d1b4fd5cd 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "jmcollin78";
     repo = "versatile-thermostat-ui-card";
-    tag = version;
+    rev = "${version}";
     hash = "sha256-yPp478uXiRWDH4DP/d0Mloie7nPY1hWLt8X1vLhysvA=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix
index 5f8ed9ec1595..b93b44ae96b5 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix
@@ -12,7 +12,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "azuwis";
     repo = "zigbee2mqtt-networkmap";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-S4iUTjI+pFfa8hg1/lJSI1tl2nEIh+LO2WTYhWWLh/s=";
   };
 
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index cd3420d0f56e..1a25a9bf1007 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -236,7 +236,7 @@ let
         src = fetchFromGitHub {
           owner = "MatsNl";
           repo = "pyatag";
-          tag = version;
+          rev = version;
           sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6";
         };
       });
@@ -370,7 +370,7 @@ let
         src = fetchFromGitHub {
           owner = "spry-group";
           repo = "python-vultr";
-          tag = version;
+          rev = version;
           hash = "sha256-sHCZ8Csxs5rwg1ZG++hP3MfK7ldeAdqm5ta9tEXeW+I=";
         };
       });
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index b5d6dc5b0f38..3691aa8e80bb 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "mod_auth_mellon";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-VcR+HZ5S7fLrGqT1SHCQLQw6v516G0x+wf8Wb5Sy4Gk=";
   };
 
diff --git a/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix b/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix
index abbf85c6fd4f..2ee6f59041a4 100644
--- a/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wyattoday";
     repo = "mod_cspnonce";
-    tag = version;
+    rev = version;
     hash = "sha256-uUWRKUjS2LvHgT5xrK+LZLQRHc6wMaxGca2OsVxVlRs=";
   };
 
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index e5caba38f11e..d2f6a7ae3bb5 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FastCGI-Archives";
     repo = "mod_fastcgi";
-    tag = version;
+    rev = version;
     hash = "sha256-ovir59kCjKkgbraX23nsmzlMzGdeNTyj3MQd8cgvLsg=";
   };
 
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 86a2bd89bf73..83940d9e1fab 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GrahamDumpleton";
     repo = "mod_wsgi";
-    tag = version;
+    rev = version;
     hash = "sha256-FhOSU8/4QoWa73bNi/qkgKm3CeEEdboh2MgxgQxcYzE=";
   };
 
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index e3271507cff4..14176166d3a9 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -103,7 +103,7 @@ let
           src = fetchFromGitLab {
             owner = "arpa2";
             repo = "arpa2common";
-            tag = "v${version}";
+            rev = "v${version}";
             sha256 = "sha256-8zVsAlGtmya9EK4OkGUMu2FKJRn2Q3bg2QWGjqcii64=";
           };
         }))
@@ -245,7 +245,7 @@ let
         name = "echo";
         owner = "openresty";
         repo = "echo-nginx-module";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-K7oOE0yxPYLf+3YMVbBsncpHRpGHXjs/8B5QPO3MQC4=";
       };
 
@@ -391,7 +391,7 @@ let
         name = "lua";
         owner = "openresty";
         repo = "lua-nginx-module";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-007up/XncaSBimBumHpbwgB1WnkXgBe8e/q/yT6vthI=";
       };
 
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index 72c7f6fe79f1..d60b8ec7815b 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alibaba";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-cClSNBlresMHqJrqSFWvUo589TlwJ2tL5FWJG9QBuis=";
   };
 
diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index 8f69d528363f..a8ebcc9e2e56 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Icinga";
     repo = "icingaweb2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PWP5fECKjdXhdX1E5hYaGv/fqb1KIKfclcPiCY/MMZM=";
   };
 
diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix
index 35f1db000e74..e408fc8130c2 100644
--- a/pkgs/servers/icingaweb2/ipl.nix
+++ b/pkgs/servers/icingaweb2/ipl.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Icinga";
     repo = "icinga-php-library";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dzrYiZJx7h0gQzXbmp1X3NKlWZAl7hKCEd05+lSRomg=";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-april/default.nix b/pkgs/servers/icingaweb2/theme-april/default.nix
index d77d847f12ed..51633ea0a8d0 100644
--- a/pkgs/servers/icingaweb2/theme-april/default.nix
+++ b/pkgs/servers/icingaweb2/theme-april/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mikesch-mp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0i1js2k47llzgmc77q9frvcmr02mqlhg0qhswx1486fvm6myxg0g";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-lsd/default.nix b/pkgs/servers/icingaweb2/theme-lsd/default.nix
index 56c91b0f7257..5e3afdc72bb3 100644
--- a/pkgs/servers/icingaweb2/theme-lsd/default.nix
+++ b/pkgs/servers/icingaweb2/theme-lsd/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mikesch-mp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "172y08sar4nbyv5pfq5chw8xa3b7fg1dacmsg778zky5zf49qz2w";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-particles/default.nix b/pkgs/servers/icingaweb2/theme-particles/default.nix
index d083028e8d26..da9aaaf6a499 100644
--- a/pkgs/servers/icingaweb2/theme-particles/default.nix
+++ b/pkgs/servers/icingaweb2/theme-particles/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mikesch-mp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0m6bbz191686k4djqbk8v0zcdm4cyi159jb3zwz7q295xbpi2vfy";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-snow/default.nix b/pkgs/servers/icingaweb2/theme-snow/default.nix
index b7e732506752..e38ea325e2ab 100644
--- a/pkgs/servers/icingaweb2/theme-snow/default.nix
+++ b/pkgs/servers/icingaweb2/theme-snow/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mikesch-mp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1c974v85mbsis52y2knwzh33996q8sza7pqrcs6ydx033s0rxjrp";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-spring/default.nix b/pkgs/servers/icingaweb2/theme-spring/default.nix
index 203a6e2c0c32..618e78a1bd74 100644
--- a/pkgs/servers/icingaweb2/theme-spring/default.nix
+++ b/pkgs/servers/icingaweb2/theme-spring/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mikesch-mp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09v4871pndarhm2spxm9fdab58l5wj8m40kh53wvk1xc3g7pqki9";
   };
 
diff --git a/pkgs/servers/icingaweb2/theme-unicorn/default.nix b/pkgs/servers/icingaweb2/theme-unicorn/default.nix
index 4a94e8f9f564..7fc162b90b25 100644
--- a/pkgs/servers/icingaweb2/theme-unicorn/default.nix
+++ b/pkgs/servers/icingaweb2/theme-unicorn/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     (fetchFromGitHub {
       owner = "Mikesch-mp";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "1qmcajdf0g70vp2avqa50lfrfigq22k91kggbgn5ablwyg9dki05";
     })
     (fetchurl {
diff --git a/pkgs/servers/icingaweb2/thirdparty.nix b/pkgs/servers/icingaweb2/thirdparty.nix
index 97531059de3a..87a12d2f5788 100644
--- a/pkgs/servers/icingaweb2/thirdparty.nix
+++ b/pkgs/servers/icingaweb2/thirdparty.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Icinga";
     repo = "icinga-php-thirdparty";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-T67DcsHVf3yDQveNtSPqLoOOPuT4ThkUSCJ9aCSVaIc=";
   };
 
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 727a2852d141..a698422da543 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -16,7 +16,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha512-AnyCT52wZR+2rhUXg3BOaWo7ESZUQNMLtaiVld2c2vYw7atq78N+uDFUIYfsvxemDAStB5tjw1mdwdLevzCkTA==";
   };
 
diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix
index abd4a9338cb2..fd8f627fa316 100644
--- a/pkgs/servers/krill/default.nix
+++ b/pkgs/servers/krill/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-3pkDu20vgzslJcK5KQH+GY+jnimEZgm+bQxy8QMUeCk=";
   };
 
diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix
index 812621011af3..473df8ed243a 100644
--- a/pkgs/servers/mail/mailpit/default.nix
+++ b/pkgs/servers/mail/mailpit/default.nix
@@ -24,7 +24,7 @@ let
   src = fetchFromGitHub {
     owner = "axllent";
     repo = "mailpit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = source.hash;
   };
 
diff --git a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix
index 381bd276c0b6..0cba39036ffe 100644
--- a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix
+++ b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "poolpOrg";
     repo = "filter-rspamd";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Ud1irvEyYr9QDsm2PsnWoWkXoDH0WWeH73k/IbLrVf4=";
   };
 
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 6fde6dddf81f..58563cc2a07a 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -11,7 +11,7 @@ in
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-KmeWBMuyJ/ZdZnFXAlpvgXV+J8IZrcaTXvvui4l6mjY=";
   };
   patches = patches ++ [ ];
diff --git a/pkgs/servers/memos/default.nix b/pkgs/servers/memos/default.nix
index 233d0a4b3c5d..4abdcf3f7e56 100644
--- a/pkgs/servers/memos/default.nix
+++ b/pkgs/servers/memos/default.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "usememos";
     repo = "memos";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lcOZg5mlFPp04ZCm5GDhQfSwE2ahSmGhmdAw+pygK0A=";
   };
 
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 5363222c3b49..1b30c6ead78f 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -55,7 +55,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-oXotHi79XBhxD/qYC7QDQwn7jiX0wKWe/RXZS5DwN9o=";
   };
 
diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix
index 0b1ecb800333..403420cb9962 100644
--- a/pkgs/servers/monitoring/icinga2/default.nix
+++ b/pkgs/servers/monitoring/icinga2/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "icinga";
     repo = "icinga2";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-QXe/+yQlyyOa78eEiudDni08SCUP3nhTYVpbmVUVKA8=";
   };
 
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_openvpn/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_openvpn/default.nix
index 03ec735b0307..6fec9f0f0077 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_openvpn/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_openvpn/default.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "liquidat";
     repo = "nagios-icinga-openvpn";
-    tag = version;
+    rev = version;
     sha256 = "1vz3p7nckc5k5f06nm1xfzpykhyndh2dzyagmifrzg5k478p1lpm";
   };
 
diff --git a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
index dd7343022db1..36ca174a8e66 100644
--- a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "alexander-naumov";
     repo = "openbsd_snmp3_check";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qDYANMvQU72f9wz8os7S1PfBH08AAqhtWLHVuSmkub4=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
index 72427f923446..585f0ca58c99 100644
--- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "apcupsd_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-c0LsUqpJbmWQmbmSGdEy7Bbk20my6iWNLeqtU5BjYlw=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix
index 2b535a54ebb4..5aaa34f65c52 100644
--- a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "czerwonk";
     repo = "atlas_exporter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-vhUhWO7fQpUHT5nyxbT8AylgUqDNZRSb+EGRNGZJ14E=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
index b7fa1cabe78e..bdfee37adbde 100644
--- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ribbybibby";
     repo = "s3_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-dYkMCCAIlFDFOFUNJd4NvtAeJDTsHeJoH90b5pSGlQE=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
index 5d39ad4f1ef6..ff60ee2c8232 100644
--- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   version = "0.7.0";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "prometheus-community";
     repo = "bind_exporter";
     sha256 = "sha256-x/XGatlXCKo9cI92JzFItApsjuZAfZX+8IZRpy7PVUo=";
diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix
index 6d379556d519..b25523083d23 100644
--- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "czerwonk";
     repo = "bird_exporter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-aClwJ+J83iuZbfNP+Y1vKEjBULD5wh/R3TMceCccacc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix
index f11a6b1d5b6b..6740df977e4e 100644
--- a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jvstein";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZWr+bBNnRYzqjatOJ4jYGzvTyfheceY2UDvG4Juvo5I=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix b/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix
index 566b8abb52b9..a02de197b6d2 100644
--- a/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.0.16";
 
   src = fetchFromGitHub {
-    tag = version;
+    rev = version;
     owner = "lablabs";
     repo = pname;
     sha256 = "sha256-7cyHAN4VQWfWMdlFbZvHL38nIEeC1z/vpCDR5R2pOAw=";
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index 30b6cbd24e31..e50c4f2fe549 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "collectd_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-MxgHJ9+e94ReY/8ISPfGEX9Z9ZHDyNsV0AqlPfsjXvc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
index 367d2f4b60b2..9364526b9864 100644
--- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "dnsmasq_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2sOOJWEEseWwozIyZ7oes400rBjlxIrOOtkP3rSNFXo=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix
index 975dda650ce9..3ab4e9795df9 100644
--- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "domain_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qk/shaWY7M2JDx6W4e7z8Nv7yWUZKZNGZE/mj4zCZHw=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix
index ff02c0a807e3..636e49ddd8a3 100644
--- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "fastly-exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-1xgTAMsUw+eYeHD6NEo2Zw3fL1Hdm6fxQWfgp/VQaXc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/pkgs/servers/monitoring/prometheus/flow-exporter.nix
index 0f2155c1b82e..2de347f3010d 100644
--- a/pkgs/servers/monitoring/prometheus/flow-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/flow-exporter.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "1.1.1";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "neptune-networks";
     repo = pname;
     sha256 = "sha256-6FqupoYWRvex7XhM7ly8f7ICnuS9JvCRIVEBIJe+64k=";
diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
index 6d6a8ad95b31..21feb543c9d4 100644
--- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mvisonneau";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-G298u9bitEst8QzZd1/B6PTCNpGqq88Z8W8w67/cVkQ=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix
index 0a9b17e6c9eb..4837b6d6190a 100644
--- a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "graphite_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Dr7I4+gQXZYKUMnf/P9DgLYRb4SRaDnvqvDwHfMpAn0=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index e60c56eb8606..527c8e0b2d0d 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "haproxy_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hpZnMvHAAEbvzASK3OgfG34AhPkCdRM7eOm15PRemkA=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix
index 0a8892d5ed3f..26ff81f60e32 100644
--- a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "ipmi_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Go47Txf/NX9ytMvvFQeNVCw0ORWqbsg2sIWK4MVRyIA=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
index 027ca59d488c..7a9a6007bed9 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "json_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Zeq4gbwGd16MkGQRL8+bq0Ns06Yg+H9GAEo3qaMGDbc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix
index 6ce200bb46ac..fc92bf47a8e0 100644
--- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "czerwonk";
     repo = "junos_exporter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-PZKP8kcxU5ArC+bkYIO91Dg/f85T5qneX4wuKTj/jP4=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix
index cf9c16413dd5..45525cd946e2 100644
--- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "keylight_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yI1mmEb5SP2lbP37CpPxYITJL/nvd/mIwxB0RIQRe4I=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/kthxbye.nix b/pkgs/servers/monitoring/prometheus/kthxbye.nix
index ccdcb270462e..a8cd32b3e02d 100644
--- a/pkgs/servers/monitoring/prometheus/kthxbye.nix
+++ b/pkgs/servers/monitoring/prometheus/kthxbye.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prymitive";
     repo = "kthxbye";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B6AgD79q0kA67iC9pIfv8PH8xejx2srpRccdds1GsZo=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
index d9e96f5c5dfb..69e504dba384 100644
--- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "lndmon";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-PzmDotyuG8Fgkr6SlBWofqQamDG39v65fFjRUKjIWWM=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix
index 4f927ab6ab1a..e6b2afa7500a 100644
--- a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "modemmanager_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wQATmTjYsm1J2DicPryoa/jVpbLjXz+1TTQUH5yGV6w=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
index fd4eb9256470..b9f3983d5a56 100644
--- a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "percona";
     repo = "mongodb_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-FwY4rAmv7P55EGfEHrs0y15BvU3qnq0VHf37R7W2yA4=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index ae7b9af90c30..ff8e33b3ad41 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "mysqld_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-vkbjOWVV79fDBdCa6/ueY9QhPDkFCApR/EZn20SYHYU=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/servers/monitoring/prometheus/nats-exporter.nix
index bea89eb00453..3ea933d48527 100644
--- a/pkgs/servers/monitoring/prometheus/nats-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nats-exporter.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-siucc55qi1SS2R07xgxh25CWYjxncUqvzxo0XoIPyOo=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
index 142537114d5a..de6e31c91eae 100644
--- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xperimental";
     repo = "nextcloud-exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lK5a63ZokFlm5S3k1a0MGBm+vAAqQV/5ERjJ0zZ4Yno=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index d09cf6ee4306..8f1d9e765bee 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nginxinc";
     repo = "nginx-prometheus-exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-yujMufcL4uJHxbEd8mwqxPmPlopVm6szkDxz+GZITio=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
index c70333ecd7e5..08e49707907d 100644
--- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "martin-helmich";
     repo = "prometheus-nginxlog-exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UkXrVHHHZ9mEgsMUcHu+wI6NZFw4h3X4atDBjpBcz8E=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix
index 40479979fd79..b6a8cefded99 100644
--- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DRuggeri";
     repo = "nut_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-6qexTBCLitL+dgT1Ff+414AUQqgn9s+CP5J5MkByb7s=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
index 3ea3123fdc60..569e84501099 100644
--- a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "pgbouncer_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8ChYYJIHdzH2vWxqnzS6sz9fDeLe+Y29fzia3/aBkgc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix b/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix
index 1080189115ad..c4c25909bedd 100644
--- a/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hipages";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ggrFnyEdGBoZVh4dHMw+7RUm8nJ1hJXo/fownO3wvzE=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
index 65124990541c..60dea11316c7 100644
--- a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "eko";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7gomafTMK8rk+QFw3Vm8KUgNFqiUDILeTwNFa7vdgAw=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/ping-exporter.nix b/pkgs/servers/monitoring/prometheus/ping-exporter.nix
index 306ab5e69db2..60e60a795e3b 100644
--- a/pkgs/servers/monitoring/prometheus/ping-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/ping-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "czerwonk";
     repo = "ping_exporter";
-    tag = version;
+    rev = version;
     hash = "sha256-Jdo+6/e9gES8q4wTGRuy5HSj7VimOMZ9q3guKDcKJxg=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
index e7a9902f0771..d84cb5d931dd 100644
--- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "postgres_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-F7nLz6NkvWSeZTzjo1/wNWCPn3Veo9/SkJdlFRwdlo4=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix
index 78df154948f6..068c7e416078 100644
--- a/pkgs/servers/monitoring/prometheus/process-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ncabatoff";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WGfKF7GE9RHrMiqbx5c3WtHEKUA2SShwuUUAqAeiMts=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index 37bdce2ca137..d11e1a16aa21 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "1.4.1";
 
   src = fetchFromGitHub {
-    tag = "v${version}";
+    rev = "v${version}";
     owner = "prometheus";
     repo = "prom2json";
     sha256 = "sha256-cKz+ZFQYjsL7dFfXXCrl4T8OuvQkdqVAotG9HRNtN7o=";
diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
index 68880c10ec2d..8fa0995e38cc 100644
--- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "oliver006";
     repo = "redis_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KIbrJJ2QNghj/dehcDXJqWJU2pD6mt8Gw9RPLK3RTk0=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix b/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix
index a08ce7889d14..80f1ecc37cc5 100644
--- a/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mhansen";
     repo = "rtl_433_prometheus";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ggtGi1gnpTLGvZnfAW9vyYyU7ELbTRNhXyCMotx+KKU=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/sachet.nix b/pkgs/servers/monitoring/prometheus/sachet.nix
index 85c61d0574b5..8011b96e23a2 100644
--- a/pkgs/servers/monitoring/prometheus/sachet.nix
+++ b/pkgs/servers/monitoring/prometheus/sachet.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "messagebird";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-zcFViE1/B+wrkxZ3YIyfy2IBbxLvXOf8iK/6eqZb1ZQ=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/script-exporter.nix b/pkgs/servers/monitoring/prometheus/script-exporter.nix
index 65df6d1a4569..a3e1d76a3ec5 100644
--- a/pkgs/servers/monitoring/prometheus/script-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/script-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "adhocteam";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-t/xgRalcHxEcT1peU1ePJUItD02rQdfz1uWpXDBo6C0=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
index 70235b6bf4c3..e5917819b631 100644
--- a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aexel90";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-L0TuBDq5eEahQvzqd1WuvmXuQbbblCM+Nvj15IybnVo=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix
index 831723ee1c8b..cafe88657ac4 100644
--- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix
+++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SuperQ";
     repo = "smokeping_prober";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-TOt0YKgzcASQVY0ohoIwRJhjoH/Q0cuPabaItPnhv+w=";
   };
   vendorHash = "sha256-m6jOZx4zuVl1Bay4OCvPTF/pRFXfBfitWfQ+S10xe9I=";
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index 94a01ab421b3..7c2ad7f12dd6 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "snmp_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/uNmY4xON9VFXEi4njAC5nD1RVWn+nUr1oQnt9w8pmQ=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
index 393458bd9a29..83423fef422c 100644
--- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "justwatchcom";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-KygxnNbElzRtVwjKmlbgdCxO3oEYssfFl5UAk5+F50c=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
index 39a90317952a..c2874b4b6a67 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "statsd_exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-h58yD+jmvUCvYsJqNcBSR1f+5YgDyMbLDd3I0HW9/kA=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix
index 029a7a84065d..d0759e991f7a 100644
--- a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wWXtAyQ48fsh/9BBo2tHXf4QS3Pbsmj6rha28TdBRWI=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix
index 2808b8f80d40..9a3f339b5fbf 100644
--- a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wi1dcard";
     repo = "v2ray-exporter";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "12mzng3cw24fyyh8zjfi26gh853k5blzg3zbxcccnv5lryh2r0yi";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index 8f46dff28418..772069ddeb06 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jonnenauha";
     repo = "prometheus_varnish_exporter";
-    tag = version;
+    rev = version;
     hash = "sha256-1sUzKLNkLP/eX0wYSestMAJpjAmX1iimjYoFYb6Mgpc=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 95d0aa7f9bf5..b77b1254c86c 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MindFlavor";
     repo = "prometheus_wireguard_exporter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2e31ZuGJvpvu7L2Lb+n6bZWpC1JhETzEzSiNaxxsAtA=";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
index 20a44e8b5d6d..3e397eb0cfc8 100644
--- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
+++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jelmer";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-iwqcowwJktZQfdxykpsw/MweAPY0KF7ojVwvk1LP8a4=";
   };
 
diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index efef9ba71a95..9181b19189df 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -20,7 +20,7 @@ let
       src = fetchFromGitHub {
         owner = "sensu";
         repo = "sensu-go";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = "sha256-Vcay8vUYLjV65g526btQX0+m5n/cRocIKx7C2LuWeP4=";
       };
 
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 207b329a89cb..158d0cc142e4 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -205,7 +205,7 @@ let
       src = fetchFromGitHub {
         owner = "MusicPlayerDaemon";
         repo = "MPD";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = "sha256-6wEFgiMsEoWvmfH609d+UZY7jzqDoNmXalpHBipqTN0=";
       };
 
diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix
index 587502e42308..4c0ed8d0abda 100644
--- a/pkgs/servers/mtprotoproxy/default.nix
+++ b/pkgs/servers/mtprotoproxy/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "alexbers";
     repo = "mtprotoproxy";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-tQ6e1Y25V4qAqBvhhKdirSCYzeALfH+PhNtcHTuBurs=";
   };
 
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 511a4dd29c73..a6f053467a5b 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -74,7 +74,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Aibu3yG/D1501Hr2F2qsGvjig14tbEAI+MBfqbxlpg8=";
   };
 
diff --git a/pkgs/servers/nosql/influxdb2/cli.nix b/pkgs/servers/nosql/influxdb2/cli.nix
index b2c4fc4ae3bb..85b3e910b696 100644
--- a/pkgs/servers/nosql/influxdb2/cli.nix
+++ b/pkgs/servers/nosql/influxdb2/cli.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "influx-cli";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-0Gyoy9T5pA+40k8kKybWBMtOfpKZxw3Vvp4ZB4ptcJs=";
   };
 
diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
index ed769f05c7a8..c90a77f4af36 100644
--- a/pkgs/servers/nosql/influxdb2/default.nix
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -21,7 +21,7 @@ let
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "influxdb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-0gqFUIV0ETdVuVmC+SwoKsO6OkoT/s+qKO1f8fkaZj4=";
   };
 
diff --git a/pkgs/servers/nosql/influxdb2/provision.nix b/pkgs/servers/nosql/influxdb2/provision.nix
index feca1ef3867d..01be841f6a8a 100644
--- a/pkgs/servers/nosql/influxdb2/provision.nix
+++ b/pkgs/servers/nosql/influxdb2/provision.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oddlama";
     repo = "influxdb2-provision";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-kgpUtXmwy9buupNzQj/6AIeN8XG2x0XjIckK3WIFC+I=";
   };
 
diff --git a/pkgs/servers/nosql/influxdb2/token-manipulator.nix b/pkgs/servers/nosql/influxdb2/token-manipulator.nix
index 7722da0134d0..12db726fdb56 100644
--- a/pkgs/servers/nosql/influxdb2/token-manipulator.nix
+++ b/pkgs/servers/nosql/influxdb2/token-manipulator.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "oddlama";
     repo = "influxdb2-token-manipulator";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9glz+TdqvGJgSsbLm4J/fn7kzMC75z74/jxZrEZiooc=";
   };
 
diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix
index 2311b5c76053..309030b4d303 100644
--- a/pkgs/servers/openvscode-server/default.nix
+++ b/pkgs/servers/openvscode-server/default.nix
@@ -54,7 +54,7 @@ let
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
-            tag = "v${version}";
+            rev = "v${version}";
             hash = "sha256-4TC1d5FOZHUMuEMTcTOBLZZM+sFUswhyblI5HVWyvPA=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
diff --git a/pkgs/servers/osmocom/libasn1c/default.nix b/pkgs/servers/osmocom/libasn1c/default.nix
index ee09814419f6..983ef5dbc196 100644
--- a/pkgs/servers/osmocom/libasn1c/default.nix
+++ b/pkgs/servers/osmocom/libasn1c/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libasn1c";
-    tag = version;
+    rev = version;
     hash = "sha256-cnXcUvP6WwHVvpdsIVsMkizlLyg9KMwVj8XYX/nIfic=";
   };
 
diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix
index f316953c3889..4c53bbc5200f 100644
--- a/pkgs/servers/oxigraph/default.nix
+++ b/pkgs/servers/oxigraph/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-sv9LpAoPQ4oFrGI6j6NgVZwEwpM1wt93lHkUwnvmhIY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix
index de2c489f2f64..18c718734d56 100644
--- a/pkgs/servers/pingvin-share/default.nix
+++ b/pkgs/servers/pingvin-share/default.nix
@@ -9,7 +9,7 @@ let
   src = fetchFromGitHub {
     owner = "stonith404";
     repo = "pingvin-share";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xP6XiehTbbXu9hCxF1mwb9ud/2SCnaskhz9XMtF3HKI=";
   };
 in
diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix
index 138d0e785328..2798e203542e 100644
--- a/pkgs/servers/piping-server-rust/default.nix
+++ b/pkgs/servers/piping-server-rust/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nwtgck";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-8kYaANVWmBOncTdhtjjbaYnEFQeuWjemdz/kTjwj2fw=";
   };
 
diff --git a/pkgs/servers/plik/programs.nix b/pkgs/servers/plik/programs.nix
index 3b643e73d23b..791cd96d03b7 100644
--- a/pkgs/servers/plik/programs.nix
+++ b/pkgs/servers/plik/programs.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "root-gg";
     repo = "plik";
-    tag = version;
+    rev = version;
     hash = "sha256-WCtfkzlZnyzZDwNDBrW06bUbLYTL2C704Y7aXbiVi5c=";
   };
 
diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix
index 6df39c267c4c..0d958d6e5a28 100644
--- a/pkgs/servers/polaris/default.nix
+++ b/pkgs/servers/polaris/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "agersant";
     repo = "polaris";
-    tag = version;
+    rev = version;
     hash = "sha256-2GHYIlEzRS7KXahdrxMjyIcPCNw8gXJw5/4ZpB/zT3Y=";
 
     # The polaris version upstream in Cargo.lock is "0.0.0".
diff --git a/pkgs/servers/rtrtr/default.nix b/pkgs/servers/rtrtr/default.nix
index 732d7a511dab..4774ebd1ce2d 100644
--- a/pkgs/servers/rtrtr/default.nix
+++ b/pkgs/servers/rtrtr/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-c1jzUP7cYjqn49gbjXLWTge8ywHBI29gSnhzWDzNCV8=";
   };
 
diff --git a/pkgs/servers/search/quickwit/default.nix b/pkgs/servers/search/quickwit/default.nix
index e29173b5f544..f056a726d476 100644
--- a/pkgs/servers/search/quickwit/default.nix
+++ b/pkgs/servers/search/quickwit/default.nix
@@ -26,7 +26,7 @@ let
   src = fetchFromGitHub {
     owner = "quickwit-oss";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OrCO0mCFmhYBdpr4Gps56KJJ37uuJpV6ZJHWspOScyw=";
   };
 
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index c40dee0614b9..bbbccaea5fc2 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uOO+TpKjJkdjEp4nHzxcHtZOXqXzpkIF3dno1AX17d8=";
   };
 
diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix
index 6b9ab7affeeb..731b6c43b759 100644
--- a/pkgs/servers/spicedb/default.nix
+++ b/pkgs/servers/spicedb/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7E9wbPi82F9mqqEsnK96a376QRu9NnpdZRAFB0pe1Lc=";
   };
 
diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix
index ee3f17908226..f7ae38c731c0 100644
--- a/pkgs/servers/spicedb/zed.nix
+++ b/pkgs/servers/spicedb/zed.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "zed";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m9RHgMqbYBo/p4hXVbLa6j8ms9JcNH0CccF8rjfeUns=";
   };
 
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
index ef3f7195a9e9..6b5a5674078f 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "mariadb-corporation";
     repo = "mariadb-connector-c";
-    tag = "v${version}";
+    rev = "v${version}";
     inherit hash;
   };
 
diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix
index 365703f5d514..0663d08b2424 100644
--- a/pkgs/servers/teleport/generic.nix
+++ b/pkgs/servers/teleport/generic.nix
@@ -36,7 +36,7 @@ let
   src = fetchFromGitHub {
     owner = "gravitational";
     repo = "teleport";
-    tag = "v${version}";
+    rev = "v${version}";
     inherit hash;
   };
   pname = "teleport";
diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix
index 73ccd934aabb..f916716c3eb5 100644
--- a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix
+++ b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix
@@ -13,7 +13,7 @@ import ./versions.nix (
     src = fetchFromGitHub {
       owner = "honeycombio";
       repo = "honeymarker";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = sha256;
     };
 
diff --git a/pkgs/servers/tracing/honeycomb/honeytail/default.nix b/pkgs/servers/tracing/honeycomb/honeytail/default.nix
index 9b791fec5511..cebed31d7213 100644
--- a/pkgs/servers/tracing/honeycomb/honeytail/default.nix
+++ b/pkgs/servers/tracing/honeycomb/honeytail/default.nix
@@ -13,7 +13,7 @@ import ./versions.nix (
     src = fetchFromGitHub {
       owner = "honeycombio";
       repo = "honeytail";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = sha256;
     };
 
diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix
index 2871902833de..7f083e5c377f 100644
--- a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix
+++ b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix
@@ -13,7 +13,7 @@ import ./versions.nix (
     src = fetchFromGitHub {
       owner = "honeycombio";
       repo = "honeyvent";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = sha256;
     };
 
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index b21ecf745ecd..7b4ea22faa13 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trezor";
     repo = "trezord-go";
-    tag = "v${version}";
+    rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-3I6NOzDMhzRyVSOURl7TjJ1Z0P0RcKrSs5rNaZ0Ho9M=";
   };
diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix
index b07f65adb4b9..bcdfb989bee8 100644
--- a/pkgs/servers/trickster/trickster.nix
+++ b/pkgs/servers/trickster/trickster.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trickstercache";
     repo = "trickster";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-BRD8IF3s9RaDorVtXRvbKLVVVXWiEQTQyKBR9jFo1eM=";
   };
 
diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix
index e3e1a5d9c5e7..0e01767fa2ba 100644
--- a/pkgs/servers/unpackerr/default.nix
+++ b/pkgs/servers/unpackerr/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "davidnewhall";
     repo = "unpackerr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-uQwpdgV6ksouW9JTuiiuQjxBGOE/ypDW769kNJgWrHw=";
   };
 
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
index 11a9ab53202e..763e534a5697 100644
--- a/pkgs/servers/varnish/digest.nix
+++ b/pkgs/servers/varnish/digest.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "varnish";
     repo = "libvmod-digest";
-    tag = version;
+    rev = version;
     inherit sha256;
   };
 
diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix
index eac1e1eef559..da1df5fc50a6 100644
--- a/pkgs/servers/varnish/dynamic.nix
+++ b/pkgs/servers/varnish/dynamic.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "nigoroll";
     repo = "libvmod-dynamic";
-    tag = "v${version}";
+    rev = "v${version}";
     inherit sha256;
   };
 
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 9e62cafbe282..d51a2dae3f7c 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -22,7 +22,7 @@ let
       src = fetchFromGitHub {
         owner = "varnish";
         repo = "varnish-modules";
-        tag = version;
+        rev = version;
         inherit hash;
       };
 
diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix
index 74f16ad18dde..f52cc3c3ef0e 100644
--- a/pkgs/servers/web-apps/bookstack/default.nix
+++ b/pkgs/servers/web-apps/bookstack/default.nix
@@ -32,7 +32,7 @@ package.override rec {
   src = fetchFromGitHub {
     owner = "bookstackapp";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-uuek56256NCIhvvLYTHgbRBea66SUg+9xnfcOsK5Bo0=";
   };
 
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 6ac3a29da1a0..347aefd22d28 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -53,7 +53,7 @@ let
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-FaPcUta5z/8oasw+9zGBRZnUVYD8eCo1t/XwwsFoSM8=";
   };
 
diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix
index 6f8e689b4f9a..f6cc8c6fead6 100644
--- a/pkgs/servers/web-apps/freshrss/default.nix
+++ b/pkgs/servers/web-apps/freshrss/default.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FreshRSS";
     repo = "FreshRSS";
-    tag = version;
+    rev = version;
     hash = "sha256-hgkFNZg+A1cF+xh17d2n4SCvxTZm/Eryj6jP7MvnpTE=";
   };
 
diff --git a/pkgs/servers/web-apps/freshrss/extensions/default.nix b/pkgs/servers/web-apps/freshrss/extensions/default.nix
index 82a0360da4ca..3c7c920350a6 100644
--- a/pkgs/servers/web-apps/freshrss/extensions/default.nix
+++ b/pkgs/servers/web-apps/freshrss/extensions/default.nix
@@ -27,7 +27,7 @@ let
         src = fetchFromGitHub {
           owner = "mgnsk";
           repo = "FreshRSS-AutoTTL";
-          tag = "v${version}";
+          rev = "v${version}";
           hash = "sha256-OiTiLZ2BjQD1W/BD8EkUt7WB2wOjL6GMGJ+APT4YpwE=";
         };
         meta = {
@@ -82,7 +82,7 @@ let
         src = fetchFromGitHub {
           owner = "aledeg";
           repo = "xExtension-RedditImage";
-          tag = "v${version}";
+          rev = "v${version}";
           hash = "sha256-H/uxt441ygLL0RoUdtTn9Q6Q/Ois8RHlhF8eLpTza4Q=";
         };
         meta = {
diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix
index c8b54239883f..2c0d7c0cf57f 100644
--- a/pkgs/servers/web-apps/lemmy/server.nix
+++ b/pkgs/servers/web-apps/lemmy/server.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LemmyNet";
     repo = "lemmy";
-    tag = version;
+    rev = version;
     hash = pinData.serverHash;
     fetchSubmodules = true;
   };
diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix
index 6d7b90c02928..b423bcd8748f 100644
--- a/pkgs/servers/web-apps/lemmy/ui.nix
+++ b/pkgs/servers/web-apps/lemmy/ui.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     fetchFromGitHub {
       owner = "LemmyNet";
       repo = pname;
-      tag = version;
+      rev = version;
       fetchSubmodules = true;
       hash = pinData.uiHash;
     };
diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix
index b2b455a9ec47..49f0ae356713 100644
--- a/pkgs/servers/web-apps/outline/default.nix
+++ b/pkgs/servers/web-apps/outline/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nCXyR4k/Ny0OLAE18B+GJDyOMTjt6rc375yj+d+c8zQ=";
   };
 
diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix
index 70694152ae98..aa5ab0595910 100644
--- a/pkgs/servers/web-apps/plausible/default.nix
+++ b/pkgs/servers/web-apps/plausible/default.nix
@@ -23,7 +23,7 @@ let
   src = fetchFromGitHub {
     owner = "plausible";
     repo = "analytics";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4gwK/AxzhsU0vgvKgIXrOyQLCgZMeZyKjj7PWbUmJ+8=";
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/assets/package-lock.json
diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix
index 8982be6b4f22..f5efb7306312 100644
--- a/pkgs/shells/carapace/default.nix
+++ b/pkgs/shells/carapace/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "carapace-sh";
     repo = "carapace-bin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ewZ06HPAS7UXmnRlrOaHegVrfYxwko/jyHqtQV/0JwY=";
   };
 
diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix
index 605e4da998ee..d5a317b61863 100644
--- a/pkgs/shells/fish/babelfish.nix
+++ b/pkgs/shells/fish/babelfish.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bouk";
     repo = "babelfish";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/rWX77n9wqWxkHG7gVOinCJ6ahuEfbAcGijC1oAxrno=";
   };
 
diff --git a/pkgs/shells/fish/plugins/async-prompt.nix b/pkgs/shells/fish/plugins/async-prompt.nix
index 99568bb104ce..2f25dcf87060 100644
--- a/pkgs/shells/fish/plugins/async-prompt.nix
+++ b/pkgs/shells/fish/plugins/async-prompt.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "acomagu";
     repo = "fish-async-prompt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-B7Ze0a5Zp+5JVsQUOv97mKHh5wiv3ejsDhJMrK7YOx4=";
   };
 
diff --git a/pkgs/shells/fish/plugins/autopair.nix b/pkgs/shells/fish/plugins/autopair.nix
index 2ed41d568cdb..6832c0bf746b 100644
--- a/pkgs/shells/fish/plugins/autopair.nix
+++ b/pkgs/shells/fish/plugins/autopair.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "jorgebucaran";
     repo = "autopair.fish";
-    tag = version;
+    rev = version;
     sha256 = "sha256-s1o188TlwpUQEN3X5MxUlD/2CFCpEkWu83U9O+wg3VU=";
   };
 
diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix
index 4d86b9e07b5d..7c94772dc8df 100644
--- a/pkgs/shells/fish/plugins/done.nix
+++ b/pkgs/shells/fish/plugins/done.nix
@@ -12,7 +12,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "franciscolourenco";
     repo = "done";
-    tag = version;
+    rev = version;
     hash = "sha256-DMIRKRAVOn7YEnuAtz4hIxrU93ULxNoQhW6juxCoh4o=";
   };
 
diff --git a/pkgs/shells/fish/plugins/fifc.nix b/pkgs/shells/fish/plugins/fifc.nix
index 34809a367309..0b287d39ba2f 100644
--- a/pkgs/shells/fish/plugins/fifc.nix
+++ b/pkgs/shells/fish/plugins/fifc.nix
@@ -10,7 +10,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "gazorby";
     repo = "fifc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-p5E4Mx6j8hcM1bDbeftikyhfHxQ+qPDanuM1wNqGm6E=";
   };
 
diff --git a/pkgs/shells/fish/plugins/fish-bd.nix b/pkgs/shells/fish/plugins/fish-bd.nix
index fc5c10693336..154fc6213389 100644
--- a/pkgs/shells/fish/plugins/fish-bd.nix
+++ b/pkgs/shells/fish/plugins/fish-bd.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "0rax";
     repo = "fish-bd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GeWjoakXa0t2TsMC/wpLEmsSVGhHFhBVK3v9eyQdzv0=";
   };
 
diff --git a/pkgs/shells/fish/plugins/fishtape.nix b/pkgs/shells/fish/plugins/fishtape.nix
index e049f5982c00..6bfe0dba1a7d 100644
--- a/pkgs/shells/fish/plugins/fishtape.nix
+++ b/pkgs/shells/fish/plugins/fishtape.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "jorgebucaran";
     repo = "fishtape";
-    tag = version;
+    rev = version;
     sha256 = "0dxcyhs2shhgy5xnwcimqja8vqsyk841x486lgq13i3y1h0kp2kd";
   };
 
diff --git a/pkgs/shells/fish/plugins/fishtape_3.nix b/pkgs/shells/fish/plugins/fishtape_3.nix
index 5354a04529b8..fa9d1c3839a0 100644
--- a/pkgs/shells/fish/plugins/fishtape_3.nix
+++ b/pkgs/shells/fish/plugins/fishtape_3.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "jorgebucaran";
     repo = "fishtape";
-    tag = version;
+    rev = version;
     sha256 = "072a3qbk1lpxw53bxp91drsffylx8fbywhss3x0jbnayn9m8i7aa";
   };
 
diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix
index d415809af8c8..acb3783bb968 100644
--- a/pkgs/shells/fish/plugins/forgit.nix
+++ b/pkgs/shells/fish/plugins/forgit.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
-    tag = version;
+    rev = version;
     hash = "sha256-wYCuCxPv3HGEGaze/+an6ZprCtXu5ThsTCwaIquEy3Y=";
   };
 
diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix
index f97295227d6a..1bf3f640e309 100644
--- a/pkgs/shells/fish/plugins/fzf-fish.nix
+++ b/pkgs/shells/fish/plugins/fzf-fish.nix
@@ -21,7 +21,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "PatrickF1";
     repo = "fzf.fish";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM=";
   };
 
diff --git a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix
index 6718c3d9dd2a..0a1370f71561 100644
--- a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix
+++ b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "z11i";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-CFXbeO0euC/UtvQV0KCz4WQfdJgsuXKPM6M9oaw7hvg=";
   };
 
diff --git a/pkgs/shells/fish/plugins/pisces.nix b/pkgs/shells/fish/plugins/pisces.nix
index f643127d2ce8..be59b248277b 100644
--- a/pkgs/shells/fish/plugins/pisces.nix
+++ b/pkgs/shells/fish/plugins/pisces.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "laughedelic";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Oou2IeNNAqR00ZT3bss/DbhrJjGeMsn9dBBYhgdafBw=";
   };
 
diff --git a/pkgs/shells/fish/plugins/puffer.nix b/pkgs/shells/fish/plugins/puffer.nix
index d58f81813e27..107191ca52e6 100644
--- a/pkgs/shells/fish/plugins/puffer.nix
+++ b/pkgs/shells/fish/plugins/puffer.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "nickeb96";
     repo = "puffer-fish";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2niYj0NLfmVIQguuGTA7RrPIcorJEPkxhH6Dhcy+6Bk=";
   };
 
diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix
index aa1445924585..c5a288b8f027 100644
--- a/pkgs/shells/fish/plugins/pure.nix
+++ b/pkgs/shells/fish/plugins/pure.nix
@@ -13,7 +13,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "pure-fish";
     repo = "pure";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8zxqPU9N5XGbKc0b3bZYkQ3yH64qcbakMsHIpHZSne4=";
   };
 
diff --git a/pkgs/shells/fish/plugins/sdkman-for-fish.nix b/pkgs/shells/fish/plugins/sdkman-for-fish.nix
index f49f89afe983..c137cc2cded9 100644
--- a/pkgs/shells/fish/plugins/sdkman-for-fish.nix
+++ b/pkgs/shells/fish/plugins/sdkman-for-fish.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "reitzig";
     repo = "sdkman-for-fish";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-7cgyR3hQ30Jv+9lJS5qaBvSaI/0YVT8xPXlUhDBTdFc=";
   };
 
diff --git a/pkgs/shells/fish/plugins/sponge.nix b/pkgs/shells/fish/plugins/sponge.nix
index 895177278986..81b29d775366 100644
--- a/pkgs/shells/fish/plugins/sponge.nix
+++ b/pkgs/shells/fish/plugins/sponge.nix
@@ -11,7 +11,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "meaningful-ooo";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w=";
   };
 
diff --git a/pkgs/shells/fish/plugins/tide.nix b/pkgs/shells/fish/plugins/tide.nix
index 04f40baf0e55..a0bfc69e95e7 100644
--- a/pkgs/shells/fish/plugins/tide.nix
+++ b/pkgs/shells/fish/plugins/tide.nix
@@ -13,7 +13,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "IlanCosman";
     repo = "tide";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZyEk/WoxdX5Fr2kXRERQS1U1QHH3oVSyBQvlwYnEYyc=";
   };
 
diff --git a/pkgs/shells/fish/plugins/wakatime-fish.nix b/pkgs/shells/fish/plugins/wakatime-fish.nix
index f6c42e93a804..743164202ddf 100644
--- a/pkgs/shells/fish/plugins/wakatime-fish.nix
+++ b/pkgs/shells/fish/plugins/wakatime-fish.nix
@@ -12,7 +12,7 @@ buildFishPlugin rec {
   src = fetchFromGitHub {
     owner = "ik11235";
     repo = "wakatime.fish";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Hsr69n4fCvPc64NztgaBZQuR0znkzlL8Uotw9Jf2S1o=";
   };
 
diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/shells/nushell/plugins/dbus.nix
index c958f394aced..91d63bb9f316 100644
--- a/pkgs/shells/nushell/plugins/dbus.nix
+++ b/pkgs/shells/nushell/plugins/dbus.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "devyn";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Ga+1zFwS/v+3iKVEz7TFmJjyBW/gq6leHeyH2vjawto=";
   };
 
diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix
index 3288a7c4690f..4be46ad05f7e 100644
--- a/pkgs/shells/nushell/plugins/units.nix
+++ b/pkgs/shells/nushell/plugins/units.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     repo = "nu_plugin_units";
     owner = "JosephTLyons";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iDRrA8bvufV92ADeG+eF3xu7I/4IinJcSxEkwuhkHlg=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index 7e137179f9f4..27f57ab1ab9d 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -140,7 +140,7 @@ let
         src = pkgs.fetchFromGitHub {
           owner = "knqyf263";
           repo = "pet";
-          tag = "v${version}";
+          rev = "v${version}";
           hash = "sha256-Gjw1dRrgM8D3G7v6WIM2+50r4HmTXvx0Xxme2fH9TlQ=";
         };
 
@@ -161,7 +161,7 @@ let
         src = pkgs.fetchFromGitHub {
           owner = "knqyf263";
           repo = "pet";
-          tag = "v${version}";
+          rev = "v${version}";
           hash = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg=";
         };
 
@@ -181,7 +181,7 @@ let
 
           src = pkgs.fetchFromGitHub {
             inherit (previousAttrs.src) owner repo;
-            tag = "v${finalAttrs.version}";
+            rev = "v${finalAttrs.version}";
             hash = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg=";
           };
 
diff --git a/pkgs/tools/admin/aws-mfa/default.nix b/pkgs/tools/admin/aws-mfa/default.nix
index 962aeb7323ec..69b2a5a56622 100644
--- a/pkgs/tools/admin/aws-mfa/default.nix
+++ b/pkgs/tools/admin/aws-mfa/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "broamski";
     repo = "aws-mfa";
-    tag = version;
+    rev = version;
     hash = "sha256-XhnDri7QV8esKtx0SttWAvevE3SH2Yj2YMq/P4K6jK4=";
   };
 
diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/tools/admin/awsume/default.nix
index db9f656d4b49..98cba0c23403 100644
--- a/pkgs/tools/admin/awsume/default.nix
+++ b/pkgs/tools/admin/awsume/default.nix
@@ -19,7 +19,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "trek10inc";
     repo = "awsume";
-    tag = version;
+    rev = version;
     sha256 = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc=";
   };
 
diff --git a/pkgs/tools/admin/cdist/default.nix b/pkgs/tools/admin/cdist/default.nix
index 334ff629f65b..d15ce58e0566 100644
--- a/pkgs/tools/admin/cdist/default.nix
+++ b/pkgs/tools/admin/cdist/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
     domain = "code.ungleich.ch";
     owner = "ungleich-public";
     repo = "cdist";
-    tag = version;
+    rev = version;
     hash = "sha256-lIx0RtGQJdY2e00azI9yS6TV+5pCegpKOOD0dQmgMqA=";
   };
 
diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 69547815ca22..37d84e65cef1 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dalance";
     repo = "procs";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-+qY0BG3XNCm5vm5W6VX4a0JWCb4JSat/oK9GLXRis/M=";
   };
 
diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix
index c0eb8e4becb2..6fa866e6bd11 100644
--- a/pkgs/tools/admin/turbovnc/default.nix
+++ b/pkgs/tools/admin/turbovnc/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "TurboVNC";
     repo = "turbovnc";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-Qt9yGyGWKFBppO91D+hUfmN7CMg0I66rAXyRoCYUOEA=";
   };
 
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 2d0b35fba293..af927a4a45de 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zpaq";
     repo = "zpaq";
-    tag = version;
+    rev = version;
     sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4";
   };
 
diff --git a/pkgs/tools/audio/beets/plugins/audible.nix b/pkgs/tools/audio/beets/plugins/audible.nix
index 17b7138f71e3..f1aee4179ea9 100644
--- a/pkgs/tools/audio/beets/plugins/audible.nix
+++ b/pkgs/tools/audio/beets/plugins/audible.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Neurrone";
     repo = "beets-audible";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Sds16h+W9t7N755ADPXXDi+SxwouBMxP9ApUqaXedqY=";
   };
 
diff --git a/pkgs/tools/audio/opl3bankeditor/common.nix b/pkgs/tools/audio/opl3bankeditor/common.nix
index a6f31148a299..8c0ce9eabfee 100644
--- a/pkgs/tools/audio/opl3bankeditor/common.nix
+++ b/pkgs/tools/audio/opl3bankeditor/common.nix
@@ -31,7 +31,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Wohlstand";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     inherit sha256;
   };
 
diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix
index 940d06ae73da..86367d92dad7 100644
--- a/pkgs/tools/backup/bupstash/default.nix
+++ b/pkgs/tools/backup/bupstash/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "andrewchambers";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Ekjxna3u+71s1q7jjXp7PxYUQIfbp2E+jAqKGuszU6g=";
   };
 
diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix
index 2f8a8cf22ad1..eb081f742075 100644
--- a/pkgs/tools/backup/monolith/default.nix
+++ b/pkgs/tools/backup/monolith/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Y2Z";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-048WUDMMaTjGsNY54m2eKY1MdyX9llojIzGvbcC+Buc=";
   };
 
diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index 975e5d2db882..3b49848beffd 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dpc";
     repo = "rdedup";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-GEYP18CaCQShvCg8T7YTvlybH1LNO34KBxgmsTv2Lzs=";
   };
 
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 483ae7f77362..e4723e357a41 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "restic";
     repo = "restic";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-odyKcpNAhk1dlVBhjrtmgKjWTOCMtooYOJ5p0J9OUFY=";
   };
 
diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix
index 63c796da04ca..5d6938a0570a 100644
--- a/pkgs/tools/backup/restic/rest-server.nix
+++ b/pkgs/tools/backup/restic/rest-server.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "restic";
     repo = "rest-server";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o55y+g9XklKghVK1c6MTRI8EHLplTv5YKUWGRyyvmtk=";
   };
 
diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix
index b3c59849ffbd..21df241f7db8 100644
--- a/pkgs/tools/backup/zbackup/default.nix
+++ b/pkgs/tools/backup/zbackup/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zbackup";
     repo = "zbackup";
-    tag = version;
+    rev = version;
     hash = "sha256-9Fk4EhEeQ2J4Kirc7oad4CzmW70Mmza6uozd87qfgZI=";
   };
 
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 2ee0e569795b..bd2e66c72b47 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-psX15XicPXAsd36BhuvK0G3GQS8hV/hazzO0HByCqV4=";
   };
 
diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix
index c0629cae364b..8c00769c1f76 100644
--- a/pkgs/tools/compression/bzip3/default.nix
+++ b/pkgs/tools/compression/bzip3/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kspalaiologos";
     repo = "bzip3";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-QMvK0MP0Zx2mQfvYvrOjGV1Lo/ObO5diXcibmwtQATk=";
   };
 
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index f32f43ee68af..971811517a2e 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "09mmsalc7dwlvgrda56s2k927rpl3a5dzfa88aslkqcjnr790wjy";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "xdelta-devel";
     owner = "jmacd";
   };
diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix
index 94bc0fc88eef..a8272fdb7653 100644
--- a/pkgs/tools/compression/xdelta/unstable.nix
+++ b/pkgs/tools/compression/xdelta/unstable.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "09mmsalc7dwlvgrda56s2k927rpl3a5dzfa88aslkqcjnr790wjy";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "xdelta-devel";
     owner = "jmacd";
   };
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 586de4b1ba54..9923adf3e001 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "zstd";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-qcd92hQqVBjMT3hyntjcgk29o9wGQsg5Hg7HE5C0UNc=";
   };
 
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix
index 886ef7ccd467..d7a48f8ed9ed 100644
--- a/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "whoozle";
     repo = "android-file-transfer-linux";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-UOARMtOnG6tekmOsIWRZbl2y32mR0kPD6w7IHRG8VsU=";
   };
 
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index a67c4e64af7b..0cb9d3158564 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -297,7 +297,7 @@ let
           src = fetchFromGitHub {
             owner = "kubernetes-client";
             repo = "python";
-            tag = "v${version}";
+            rev = "v${version}";
             sha256 = "1sawp62j7h0yksmg9jlv4ik9b9i1a1w9syywc9mv8x89wibf5ql1";
             fetchSubmodules = true;
           };
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index afa9f13a594c..dcc80c0acca7 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     sha256 = "099rjb02knr6yz7przlnyj62ic0ag5ncs7vvcc36ikyqrmpqsdch";
-    tag = "v${version}";
+    rev = "v${version}";
     repo = "encfs";
     owner = "vgough";
   };
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index 5f48f2306eaa..e5e6f29e7eb4 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -98,7 +98,7 @@ rec {
       src = fetchFromGitHub {
         owner = "irods";
         repo = "irods";
-        tag = finalAttrs.version;
+        rev = finalAttrs.version;
         hash = "sha256-SmN2FzeoA2/gjiDfGs2oifOVj0mK2WdQCgiSdIlENfk=";
         fetchSubmodules = true;
       };
@@ -143,7 +143,7 @@ rec {
       src = fetchFromGitHub {
         owner = "irods";
         repo = "irods_client_icommands";
-        tag = finalAttrs.version;
+        rev = finalAttrs.version;
         hash = "sha256-cc0V6BztJk3njobWt27VeJNmQUXyH6aBJkvYIDFEzWY=";
       };
 
diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix
index ea71e43704b2..e094f6ce5ee8 100644
--- a/pkgs/tools/filesystems/kdiskmark/default.nix
+++ b/pkgs/tools/filesystems/kdiskmark/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jonmagon";
     repo = "kdiskmark";
-    tag = version;
+    rev = version;
     hash = "sha256-JueY7zw9PIo9ETi7pQLpw8FGRhNXYXeXEvTzZGz9lbw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index 2334cedef9d1..ff57c0c4ba78 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "trapexit";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-3DfSGuTtM+h0IdtsIhLVXQxX5/Tj9G5Qcha3DWmyyq4=";
   };
 
diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix
index 422150a82a65..808b27dd687d 100644
--- a/pkgs/tools/filesystems/mkspiffs/default.nix
+++ b/pkgs/tools/filesystems/mkspiffs/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "igrr";
     repo = "mkspiffs";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-oa6Lmo2yb66IjtEKkZyJBgM/p7rdvmrKfgNd2rAM/Lk=";
   };
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index 9fd117c60861..ff1347c6c7e1 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tuxera";
     repo = "ntfs-3g";
-    tag = version;
+    rev = version;
     sha256 = "sha256-nuFTsGkm3zmSzpwmhyY7Ke0VZfZU0jHOzEWaLBbglQk=";
   };
 
diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix
index 911867df136e..387d17ce1861 100644
--- a/pkgs/tools/filesystems/romdirfs/default.nix
+++ b/pkgs/tools/filesystems/romdirfs/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mlafeldt";
     repo = "romdirfs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1jbsmpklrycz5q86qmzvbz4iz2g5fvd7p9nca160aw2izwpws0g7";
   };
 
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 688b3794b54d..4ca4d71a8f6b 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "s3fs-fuse";
     repo = "s3fs-fuse";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wHszw3S+fuZRwTvJy+FkxQTR2BAvr8H924Wd4/C5heE=";
   };
 
diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix
index 41785780aa88..1dd426b55a37 100644
--- a/pkgs/tools/filesystems/securefs/default.nix
+++ b/pkgs/tools/filesystems/securefs/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "netheril96";
     repo = "securefs";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-7xjGuN7jcLgfGkaBoSj+WsBpM806PPGzeBs7DnI+fwc=";
   };
diff --git a/pkgs/tools/games/alice-tools/default.nix b/pkgs/tools/games/alice-tools/default.nix
index c3c549d519b9..7964aa77c38a 100644
--- a/pkgs/tools/games/alice-tools/default.nix
+++ b/pkgs/tools/games/alice-tools/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nunuhara";
     repo = "alice-tools";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-DazWnBeI5XShkIx41GFZLP3BbE0O8T9uflvKIZUXCHo=";
   };
diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix
index f20b8d87859a..ed9d62db08ce 100644
--- a/pkgs/tools/games/pokefinder/default.nix
+++ b/pkgs/tools/games/pokefinder/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Admiral-Fish";
     repo = "PokeFinder";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "R0FrRRQRe0tWrHUoU4PPwOgIsltUEImEMTXL79ISfRE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/tools/games/slipstream/default.nix
index 54d7e25fefa8..8269072876f3 100644
--- a/pkgs/tools/games/slipstream/default.nix
+++ b/pkgs/tools/games/slipstream/default.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "Vhati";
     repo = "Slipstream-Mod-Manager";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU=";
   };
 
diff --git a/pkgs/tools/graphics/hobbits/default.nix b/pkgs/tools/graphics/hobbits/default.nix
index 7ab9709733f7..6a429f9e7065 100644
--- a/pkgs/tools/graphics/hobbits/default.nix
+++ b/pkgs/tools/graphics/hobbits/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Mahlet-Inc";
     repo = "hobbits";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SbSuw5e2ll/wU5UBV0MOlvCXb4rvPtsE4l8XzRbBiLI=";
   };
 
diff --git a/pkgs/tools/graphics/maskromtool/default.nix b/pkgs/tools/graphics/maskromtool/default.nix
index 79cd09453c73..94fbfdb61fe0 100644
--- a/pkgs/tools/graphics/maskromtool/default.nix
+++ b/pkgs/tools/graphics/maskromtool/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "travisgoodspeed";
     repo = "maskromtool";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-iuCjAAVEKVwJuAgKITwkXGhKau2DVWhFQLPjp28tjIo=";
   };
 
diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
index 95a1de2394f8..649071755e98 100644
--- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
+++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "SaschaWillems";
     repo = "VulkanCapsViewer";
-    tag = version;
+    rev = version;
     hash = "sha256-fliiNeZPEP4uNMRDgG093fvU01ZTxwv08YLGwBooOLA=";
     # Note: this derivation strictly requires vulkan-header to be the same it was developed against.
     # To help us, they've put it in a git-submodule.
diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
index afa56fdb1758..1464e0b0beb2 100644
--- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
+++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DeadSix27";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0rv8bnyxz89za6gwk9gmdbaf3j7c1j52mip7h81rir288j35m84x";
   };
 
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index cd3da8494c9a..ce7968e11131 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mchehab";
     repo = "zbar";
-    tag = version;
+    rev = version;
     sha256 = "sha256-6gOqMsmlYy6TK+iYPIBsCPAk8tYDliZYMYeTOidl4XQ=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index 71bd51a9bc8d..325c1a7e6b3b 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Jk7YY6nrY1Yn9KeNlRJbMF/fCMIlUVg/Elt7SymlK84=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
index cb1d8d030285..ce6815843a39 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-bamboo";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-yvyJHIXUYpOIeiSQasSRKTbN4Z0BAjohz8VlZKqMg0Q=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
index 8a0ef9965b07..163c922359da 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-QL1rRMsaDP98as0zlmoDPoVnbqbKQFoUFSCX+j31JcM=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
index d009cceba687..4203126e72e5 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-QO136EbUFxT7yA1Fs4DvV0CKpdCMw/s5s9sW3vRzGD8=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index f3fadef64c88..2bb6a8659051 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-4CvRQU6tcr3l14KzCGIhMvtYuT8DbSywxz6knbl+HgA=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
index be2d9961dfd0..d59449b7d6a1 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-qckaD2VDlXyaXe52PTjYfKIJbsIBRgD5s3b9Oc6l/64=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
index 3a50269307f2..61ac278d0239 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-WTTMW86KsrncfDHttri2eSA0bp/Vm4QVyl9tWkJn00E=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
index f18c0d399c1b..4a6b3dc7268b 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-7FBUOsaKr9cuEaqd4dqnAGL5sd3RF+qV6GEkOUQ1/k4=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
index adcaad2a4cec..7eaaa0fc818d 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-kHMCMsJ8+rI0AtS9zEE5knGvKALhgfmgS8lC/CTmYs0=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index be55934a8a93..f8c7d6742d19 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-qt";
-    tag = version;
+    rev = version;
     hash = "sha256-cOCLPsWRcwukGCKAYHrZSRUYlmfYxdyspX5Y0rqbD2w=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
index 734b6662fc81..0978efc04c07 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-1gfR0wXBXM6Gttwldg2vm8DUUW4OciqKMQkpFQHqLoE=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
index 839a3de83ee6..6989bab1100e 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-3Er01Qj3XEIO36xTQrBISzxMaIO4j8uqPe7+w9uk3UM=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
index 0a53b388ecbd..bbfb6d53800d 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-Yt6lAievCj9FC4eO6EIqUxiSaBPMvjSEb1PNyXPa82Q=";
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
index 83d93d669403..c6b43043956b 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-unikey";
-    tag = version;
+    rev = version;
     hash = "sha256-hx3GXoloO3eQP9yhLY8v1ahwvOTCe5XcBey+ZbReRjE=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index caa034addbf8..0db733c43034 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libhangul";
     repo = "ibus-hangul";
-    tag = version;
+    rev = version;
     hash = "sha256-x2oOW8eiEuwmdCGUo+r/KcsitfGccSyianwIEaOBS3M=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index 65f078d3ba01..1f8f443adc22 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ibus";
     repo = "ibus-m17n";
-    tag = version;
+    rev = version;
     sha256 = "sha256-+pNECooSLFqTRkijJiU4a3NpTnDNL9qzhkMp6gSq4XY=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix
index 7824dce788a3..8574b04875f0 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ibus";
     repo = "ibus-pinyin";
-    tag = version;
+    rev = version;
     hash = "sha256-8nM/dEjkNhQNv6Ikv4xtRkS3mALDT6OYC1EAKn1zNtI=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
index e0066d4651c1..ad1aae82f170 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rime";
     repo = "ibus-rime";
-    tag = version;
+    rev = version;
     sha256 = "sha256-6lqPdcIJmwHcr4G6BhIDMhEtEOpOPgWqfkKXqaDjUY0=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 2db202aede31..0a938c0ef170 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kaio";
     repo = "ibus-table";
-    tag = version;
+    rev = version;
     sha256 = "sha256-0322G1cmiISkFaCq5RVFLRdWRUxS66B7E4omxB+7ntE=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index b559256d55fd..1c94f999ded8 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
-    tag = version;
+    rev = version;
     hash = "sha256-0dyp7kNnmuw9YcYTH/5Eln+EzIbM2HTojXXC9NCA8vE=";
   };
 
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 60e00c5f976c..8e2f0bfbbc80 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ibus";
     repo = "ibus";
-    tag = version;
+    rev = version;
     sha256 = "sha256-YMCtLIK/9iUdS37Oiow7WMhFFPKhomNXvzWbLzlUkdQ=";
   };
 
diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix
index 057d25c83809..4713d7f2f4c0 100644
--- a/pkgs/tools/inputmethods/input-remapper/default.nix
+++ b/pkgs/tools/inputmethods/input-remapper/default.nix
@@ -41,7 +41,7 @@ in
   src = fetchFromGitHub {
     owner = "sezanzeb";
     repo = "input-remapper";
-    tag = version;
+    rev = version;
     hash = "sha256-rwlVGF/cWSv6Bsvhrs6nMDQ8avYT80aasrhWyQv55/A=";
   };
 
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix
index 74479a2b5732..84ed9eb6a8b0 100644
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "interception/linux";
     repo = "tools";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-jhdgfCWbkF+jD/iXsJ+fYKOtPymxcC46Q4w0aqpvcek=";
   };
 
diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix
index 6a88ed1b1626..4fa71b40fbad 100644
--- a/pkgs/tools/misc/antimicrox/default.nix
+++ b/pkgs/tools/misc/antimicrox/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AntiMicroX";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-ZIHhgyOpabWkdFZoha/Hj/1d8/b6qVolE6dn0xAFZVw=";
   };
 
diff --git a/pkgs/tools/misc/aoc-cli/default.nix b/pkgs/tools/misc/aoc-cli/default.nix
index bc6df1b41ff8..b0c7c615cfaf 100644
--- a/pkgs/tools/misc/aoc-cli/default.nix
+++ b/pkgs/tools/misc/aoc-cli/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "scarvalhojr";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-UdeCKhEWr1BjQ6OMLP19OLWPlvvP7FGAO+mi+bQUPQA=";
   };
 
diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index 35946245c098..323b1dc21cc7 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -44,7 +44,7 @@ let
     src = fetchFromGitHub {
       owner = "eth-p";
       repo = "bat-extras";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-6IRAKSy5f/WcQZBcJKVSweTjHLznzdxhsyx074bXnUQ=";
       fetchSubmodules = true;
     };
diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix
index 27d654c4b0de..8fe0143d9258 100644
--- a/pkgs/tools/misc/brotab/default.nix
+++ b/pkgs/tools/misc/brotab/default.nix
@@ -13,7 +13,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "balta2ar";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-HKKjiW++FwjdorqquSCIdi1InE6KbMbFKZFYHBxzg8Q=";
   };
 
diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix
index 6e3dbc291004..490d1a7049d9 100644
--- a/pkgs/tools/misc/chafa/default.nix
+++ b/pkgs/tools/misc/chafa/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hpjansson";
     repo = "chafa";
-    tag = version;
+    rev = version;
     sha256 = "sha256-9RkN0yZnHf5cx6tsp3P6jsi0/xtplWxMm3hYCPjWj0M=";
   };
 
diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix
index 20da3b2fa602..921e1094997e 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/pkgs/tools/misc/ckb-next/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ckb-next";
     repo = "ckb-next";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lA1FpUee2SpUQwJotbYhG0QX7LT5l2PP9lJ9F3uNtdU=";
   };
 
diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix
index 82b0a4ec2b7a..e0892eda4b57 100644
--- a/pkgs/tools/misc/coreboot-utils/default.nix
+++ b/pkgs/tools/misc/coreboot-utils/default.nix
@@ -44,7 +44,7 @@ let
 
         src = fetchgit {
           url = "https://review.coreboot.org/coreboot";
-          tag = version;
+          rev = version;
           hash = "sha256-tsNdsH+GxjLUTd7KXHMZUTNTIAWeKJ3BNy1Lehjo8Eo=";
         };
 
diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix
index 0dc75096d27c..9ff4b4d058fa 100644
--- a/pkgs/tools/misc/dijo/default.nix
+++ b/pkgs/tools/misc/dijo/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NerdyPepper";
     repo = "dijo";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE=";
   };
   useFetchCargoVendor = true;
diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index 733fae1b01f7..7404b142fc00 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "diskus";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-88+U5Y2CC0PhikRO3VqoUwZEYZjwln+61OPWbLLb8T0=";
   };
 
diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix
index 95d3f69cac54..cfbc7b343d1b 100644
--- a/pkgs/tools/misc/envchain/default.nix
+++ b/pkgs/tools/misc/envchain/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sorah";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QUy38kJzMbYOyT86as4/yq2ctcszSnB8a3eVWxgd4Fo=";
   };
 
diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix
index eb52c14aeb1a..8f896ec44cae 100644
--- a/pkgs/tools/misc/fclones/default.nix
+++ b/pkgs/tools/misc/fclones/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pkolaczk";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-OCRfJh6vfAkL86J1GuLgfs57from3fx0NS1Bh1+/oXE=";
   };
 
diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix
index 06bce7a739c6..5eeac952d277 100644
--- a/pkgs/tools/misc/fclones/gui.nix
+++ b/pkgs/tools/misc/fclones/gui.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pkolaczk";
     repo = "fclones-gui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ad7wyoCjSQ8i6c+4IorImqAY2Q6pwBtI2JkkbkGa46U=";
   };
 
diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 1c3006bf32b5..5ec56de3c064 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "timvisee";
     repo = "ffsend";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo=";
   };
 
diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix
index 55b48b82fab6..f70e9a5a2583 100644
--- a/pkgs/tools/misc/fltrdr/default.nix
+++ b/pkgs/tools/misc/fltrdr/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "fltrdr";
     owner = "octobanana";
-    tag = version;
+    rev = version;
     sha256 = "1vpci7vqzcpdd21zgigyz38k77r9fc81dmiwsvfr8w7gad5sg6sj";
   };
 
diff --git a/pkgs/tools/misc/freshfetch/default.nix b/pkgs/tools/misc/freshfetch/default.nix
index 96f6aa2067e7..eb7799428958 100644
--- a/pkgs/tools/misc/freshfetch/default.nix
+++ b/pkgs/tools/misc/freshfetch/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "k4rakara";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1l9zngr5l12g71j85iyph4jjri3crxc2pi9q0gczrrzvs03439mn";
   };
 
diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index b6d7b1a15d85..1b434c71aea8 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-WYolvHAK7l1HJZuBXsPJ+X6uzWFHBlHELx4zvD/S934=";
   };
 
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 4bb358093204..109b1b347938 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "garabik";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1h0h88h484a9796hai0wasi1xmjxxhpyxgixn6fgdyc5h69gv8nl";
   };
 
diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix
index dd0ffc261346..b302e7c4fbe5 100644
--- a/pkgs/tools/misc/grex/default.nix
+++ b/pkgs/tools/misc/grex/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pemistahl";
     repo = "grex";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Ut2H2H66XN1+wHpYivnuhil21lbd7bwIcIcMyIimdis=";
   };
 
diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix
index 5bdb505e5b88..9777c5d1a001 100644
--- a/pkgs/tools/misc/h/default.nix
+++ b/pkgs/tools/misc/h/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zimbatm";
     repo = "h";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4rhol8a+OMX2+MxFPEM1WzM/70C7sye8jw4pg7CujRo=";
   };
 
diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 7eb77f305395..90af4652dad1 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Benjamin-Dobell";
     repo = "Heimdall";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1ygn4snvcmi98rgldgxf5hwm7zzi1zcsihfvm6awf9s6mpcjzbqz";
   };
 
diff --git a/pkgs/tools/misc/hiksink/default.nix b/pkgs/tools/misc/hiksink/default.nix
index 1be0558b08bd..fb2fd6df3fe5 100644
--- a/pkgs/tools/misc/hiksink/default.nix
+++ b/pkgs/tools/misc/hiksink/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "CornerBit";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-k/cBCc7DywyBbAzCRCHdrOVmo+QVCsSgDn8hcyTIUI8=";
   };
 
diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
index 007e2ef8b3b6..79859ce7f990 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "hyperfine";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-c8yK9U8UWRWUSGGGrAds6zAqxAiBLWq/RcZ6pvYNpgk=";
   };
 
diff --git a/pkgs/tools/misc/iay/default.nix b/pkgs/tools/misc/iay/default.nix
index 4816645215cd..d30f38d3d4fc 100644
--- a/pkgs/tools/misc/iay/default.nix
+++ b/pkgs/tools/misc/iay/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aaqaishtyaq";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oNUK2ROcocKoIlAuNZcJczDYtSchzpB1qaYbSYsjN50=";
   };
 
diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/tools/misc/kcollectd/default.nix
index a36ff4d51f8d..86fb2628866d 100644
--- a/pkgs/tools/misc/kcollectd/default.nix
+++ b/pkgs/tools/misc/kcollectd/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
   src = fetchFromGitLab {
     owner = "aerusso";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-bUVL5eRQ5UkSZo562pnyEcj0fVoSC5WHRq4BfN67jEM=";
   };
 
diff --git a/pkgs/tools/misc/krunner-translator/default.nix b/pkgs/tools/misc/krunner-translator/default.nix
index a6a95f39b698..ce20c400f5b9 100644
--- a/pkgs/tools/misc/krunner-translator/default.nix
+++ b/pkgs/tools/misc/krunner-translator/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "naraesk";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "8MusGvNhTxa8Sm8WiSwRaVIfZOeXmgcO4T6H9LqFGLs=";
   };
 
diff --git a/pkgs/tools/misc/ksnip/default.nix b/pkgs/tools/misc/ksnip/default.nix
index 4fbeef716256..f56c9a537378 100644
--- a/pkgs/tools/misc/ksnip/default.nix
+++ b/pkgs/tools/misc/ksnip/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ksnip";
     repo = "ksnip";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-n7YwDXd73hyrzb6L8utZFuHh9HnjVtkU6CC4jfWPj/I=";
   };
 
diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix
index c608a3d2d7dd..9979cd0dc2a9 100644
--- a/pkgs/tools/misc/lighthouse-steamvr/default.nix
+++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ShayBox";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-FiS+jB5l5xtFIVISA6+K/jbyJZFPwLvy7G+dA+78kZU=";
   };
 
diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix
index b3661c9240d8..a0febe773a63 100644
--- a/pkgs/tools/misc/lorri/default.nix
+++ b/pkgs/tools/misc/lorri/default.nix
@@ -27,7 +27,7 @@ in
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
-    tag = version;
+    rev = version;
     inherit sha256;
   };
 
diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix
index 64b2617e8f45..71fb707312c9 100644
--- a/pkgs/tools/misc/noti/default.nix
+++ b/pkgs/tools/misc/noti/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "variadico";
     repo = "noti";
-    tag = version;
+    rev = version;
     hash = "sha256-8CHSbKOiWNYqKBU1kqQm5t02DJq0JfoIaPsU6Ylc46E=";
   };
 
diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix
index b704c4cdc2c1..b4601e2f365a 100644
--- a/pkgs/tools/misc/ntfy-sh/default.nix
+++ b/pkgs/tools/misc/ntfy-sh/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "binwiederhier";
     repo = "ntfy";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lSj4LfS4nBC1xtTE/ee2Nhx9TmlU+138miwC0nEfVRY=";
   };
 
diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/tools/misc/nvfancontrol/default.nix
index ba068f7d244a..c35a4715936c 100644
--- a/pkgs/tools/misc/nvfancontrol/default.nix
+++ b/pkgs/tools/misc/nvfancontrol/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "foucault";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-0WBQSnTYVc3sNmZf/KFzznMg9AVsyaBgdx/IvG1dZAw=";
   };
 
diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix
index b20969259152..e3fbe0415d41 100644
--- a/pkgs/tools/misc/octofetch/default.nix
+++ b/pkgs/tools/misc/octofetch/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "azur1s";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI=";
   };
 
diff --git a/pkgs/tools/misc/online-judge-template-generator/default.nix b/pkgs/tools/misc/online-judge-template-generator/default.nix
index c3b401ad558a..5eb3cd93224a 100644
--- a/pkgs/tools/misc/online-judge-template-generator/default.nix
+++ b/pkgs/tools/misc/online-judge-template-generator/default.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "online-judge-tools";
     repo = "template-generator";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-cS1ED1a92fEFqy6ht8UFjxocWIm35IA/VuaPSLsdlqg=";
   };
 
diff --git a/pkgs/tools/misc/opentelemetry-collector/releases.nix b/pkgs/tools/misc/opentelemetry-collector/releases.nix
index d2813f3aba0d..a4d8cc4a188b 100644
--- a/pkgs/tools/misc/opentelemetry-collector/releases.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/releases.nix
@@ -25,7 +25,7 @@ let
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector-releases";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-VJ/lIvTXU8jbmoA0eONotxIwo9TT8MZbbu7hbO0PK7k=";
   };
 
diff --git a/pkgs/tools/misc/owofetch/default.nix b/pkgs/tools/misc/owofetch/default.nix
index c24d4683da02..f850a9ad6949 100644
--- a/pkgs/tools/misc/owofetch/default.nix
+++ b/pkgs/tools/misc/owofetch/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "netthier";
     repo = "owofetch-rs";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-I8mzOUvm72KLLBumpgn9gNyx9FKvUrB4ze1iM1+OA18=";
   };
 
diff --git a/pkgs/tools/misc/pandoc-drawio-filter/default.nix b/pkgs/tools/misc/pandoc-drawio-filter/default.nix
index 3507f5bbe036..cea114175301 100644
--- a/pkgs/tools/misc/pandoc-drawio-filter/default.nix
+++ b/pkgs/tools/misc/pandoc-drawio-filter/default.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "tfc";
     repo = "pandoc-drawio-filter";
-    tag = version;
+    rev = version;
     sha256 = "sha256-2XJSAfxqEmmamWIAM3vZqi0mZjUUugmR3zWw8Imjadk=";
   };
 
diff --git a/pkgs/tools/misc/pandoc-eqnos/default.nix b/pkgs/tools/misc/pandoc-eqnos/default.nix
index bc614440ff84..0947d6769aac 100644
--- a/pkgs/tools/misc/pandoc-eqnos/default.nix
+++ b/pkgs/tools/misc/pandoc-eqnos/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tomduck";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-7GQdfGHhtQs6LZK+ZyMmcPSkoFfBWmATTMejMiFcS7Y=";
   };
 
diff --git a/pkgs/tools/misc/pandoc-fignos/default.nix b/pkgs/tools/misc/pandoc-fignos/default.nix
index f0ef762a42d8..226405ba1429 100644
--- a/pkgs/tools/misc/pandoc-fignos/default.nix
+++ b/pkgs/tools/misc/pandoc-fignos/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tomduck";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-eDwAW0nLB4YqrWT3Ajt9bmX1A43wl+tOPm2St5VpCLk=";
   };
 
diff --git a/pkgs/tools/misc/pandoc-imagine/default.nix b/pkgs/tools/misc/pandoc-imagine/default.nix
index fd6fc109b87f..f075776a4b0f 100644
--- a/pkgs/tools/misc/pandoc-imagine/default.nix
+++ b/pkgs/tools/misc/pandoc-imagine/default.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     repo = "imagine";
     owner = "hertogp";
-    tag = version;
+    rev = version;
     sha256 = "1wpnckc7qyrf6ga5xhr6gv38k1anpy9nx888n7n3rh6nixzcz2dw";
   };
 
diff --git a/pkgs/tools/misc/pandoc-secnos/default.nix b/pkgs/tools/misc/pandoc-secnos/default.nix
index caff2e626bac..d76e2d905fe9 100644
--- a/pkgs/tools/misc/pandoc-secnos/default.nix
+++ b/pkgs/tools/misc/pandoc-secnos/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tomduck";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-J9KLZvioYM3Pl2UXjrEgd4PuLTwCLYy9SsJIzgw5/jU=";
   };
 
diff --git a/pkgs/tools/misc/pandoc-tablenos/default.nix b/pkgs/tools/misc/pandoc-tablenos/default.nix
index 06a5c62aa68b..eede87b92e19 100644
--- a/pkgs/tools/misc/pandoc-tablenos/default.nix
+++ b/pkgs/tools/misc/pandoc-tablenos/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tomduck";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-FwzsRziY3PoySo9hIFuLw6tOO9oQij6oQEyoY8HgnII=";
   };
 
diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix
index 6877bd71f22a..a39b4d9f8ac8 100644
--- a/pkgs/tools/misc/parcellite/default.nix
+++ b/pkgs/tools/misc/parcellite/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rickyrockrat";
     repo = "parcellite";
-    tag = version;
+    rev = version;
     sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy";
   };
 
diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix
index 934d0d0b7cd1..b8e971e767e7 100644
--- a/pkgs/tools/misc/qflipper/default.nix
+++ b/pkgs/tools/misc/qflipper/default.nix
@@ -37,7 +37,7 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "flipperdevices";
     repo = "qFlipper";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     inherit hash;
   };
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
index e8708c78de4e..e26bcf6d403c 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "panzi";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256:1w26ddxb1xirb7qjf7kv9llxzjhbhcb7warnxbx41qhbni46g26y";
   };
 
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index 98aee234b956..5b39116a42cf 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -26,7 +26,7 @@ mkDerivation rec {
     (fetchFromGitHub {
       owner = "marazmista";
       repo = "radeon-profile";
-      tag = version;
+      rev = version;
       sha256 = "0z6a9w79s5wiy8cvwcdp5wmgf6702d0wzw95f6176yhp4cwy4cq2";
     })
     + "/radeon-profile";
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index ef72a809f3f2..4a06287dc93e 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sahib";
     repo = "rmlint";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-pOo1YfeqHUU6xyBRFbcj2lX1MHJ+a5Hi31BMC1nYZGo=";
   };
 
diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix
index 05012025c473..54ffb7caf835 100644
--- a/pkgs/tools/misc/rust-motd/default.nix
+++ b/pkgs/tools/misc/rust-motd/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rust-motd";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-pgmAf9izrIun6+EayxSNy9glTUFd0x/uy5r/aijVi4U=";
   };
 
diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix
index aef4997e1a16..c4e787f1d503 100644
--- a/pkgs/tools/misc/shadowenv/default.nix
+++ b/pkgs/tools/misc/shadowenv/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-ZipFcwTpKKFnQWOPxXg07V71jitG0NSLpGLEzUSsUFA=";
   };
 
diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix
index 9257cfaaf50e..fec1bdb3e5b0 100644
--- a/pkgs/tools/misc/sheldon/default.nix
+++ b/pkgs/tools/misc/sheldon/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rossmacarthur";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-C4rGE+tKlpEJabyGAexIoPmUiLvl87GkL6XH5aJHCrU=";
   };
 
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index ad27b4a26f54..094be04ce9a3 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-YoLi4wxBK9TFTtZRm+2N8HO5ZiC3V2GMqKFKKLHq++s=";
   };
 
diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix
index 563d6c5d85d3..9dd4cb6ff039 100644
--- a/pkgs/tools/misc/synth/default.nix
+++ b/pkgs/tools/misc/synth/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shuttle-hq";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-/z2VEfeCCuffxlMh4WOpYkMSAgmh+sbx3ajcD5d4DdE=";
   };
 
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index edc5c07c1a72..aa1d78d7658d 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openPrinting";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-l3HEnYycP56vZWREWkAyHmcFgtu09dy4Ds65u7eqNZk=";
   };
 
diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix
index cc086091d0ec..7d5d1a906ff0 100644
--- a/pkgs/tools/misc/tab-rs/default.nix
+++ b/pkgs/tools/misc/tab-rs/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "austinjones";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr";
   };
 
diff --git a/pkgs/tools/misc/thinkpad-scripts/default.nix b/pkgs/tools/misc/thinkpad-scripts/default.nix
index a54244473c51..ec0c74aa0131 100644
--- a/pkgs/tools/misc/thinkpad-scripts/default.nix
+++ b/pkgs/tools/misc/thinkpad-scripts/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "martin-ueding";
     repo = "thinkpad-scripts";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "08adx8r5pwwazbnfahay42l5f203mmvcn2ipz5hg8myqc9jxm2ky";
   };
 
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 3c76d69c9ea7..5da5d402196b 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linrunner";
     repo = "TLP";
-    tag = version;
+    rev = version;
     hash = "sha256-Bqg0IwLh3XIVJd2VkPQFDCZ/hVrzRFrRLlSHJXlJGWU=";
   };
 
diff --git a/pkgs/tools/misc/tmux-sessionizer/default.nix b/pkgs/tools/misc/tmux-sessionizer/default.nix
index a21786c497f5..37bfd5a8aa8e 100644
--- a/pkgs/tools/misc/tmux-sessionizer/default.nix
+++ b/pkgs/tools/misc/tmux-sessionizer/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "jrmoulton";
     repo = name;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-uoSm9oWZSiqwsg7dVVMay9COL5MEK3a5Pd+D66RzzPM=";
   };
 
diff --git a/pkgs/tools/misc/toastify/default.nix b/pkgs/tools/misc/toastify/default.nix
index 1c911604a4d7..a95122afbeef 100644
--- a/pkgs/tools/misc/toastify/default.nix
+++ b/pkgs/tools/misc/toastify/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hoodie";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-hSBh1LTfe3rQDPUryo2Swdf/yLYrOQ/Fg3Dz7ZqV3gw=";
   };
 
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index 8e870796f818..e445c7668a83 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-TLeShvDdVqFBIStdRlgF1Zmi8FwS9pmeQ9qOu63nq/E=";
   };
 
diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix
index 8e553c2bd58a..4301f58926c1 100644
--- a/pkgs/tools/misc/toybox/default.nix
+++ b/pkgs/tools/misc/toybox/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "landley";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-D+tf2bJQlf2pLMNZdMUOoUdE3ea/KgkqoXGsnl1MVOE=";
   };
 
diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix
index 06652d83300f..3d53fe0b43bb 100644
--- a/pkgs/tools/misc/tremor-rs/default.nix
+++ b/pkgs/tools/misc/tremor-rs/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tremor-rs";
     repo = "tremor-runtime";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-DoFqHKTu4CvgDYPT4vbwNvSZ/lNTdAF+wlHOOIBJKUw=";
   };
 
diff --git a/pkgs/tools/misc/tremor-rs/ls.nix b/pkgs/tools/misc/tremor-rs/ls.nix
index 70f1a02cf8d2..88f0db427d56 100644
--- a/pkgs/tools/misc/tremor-rs/ls.nix
+++ b/pkgs/tools/misc/tremor-rs/ls.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tremor-rs";
     repo = "tremor-language-server";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-odYhpb3FkbIF1dc2DSpz3Lg+r39lhDKml9KGmbqJAtA=";
   };
 
diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix
index ea3ca7435820..8069e7cec5d1 100644
--- a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix
+++ b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jlam55555";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j";
   };
 
diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix
index 40317ce69f99..b711e6d8ca9a 100644
--- a/pkgs/tools/misc/wagyu/default.nix
+++ b/pkgs/tools/misc/wagyu/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AleoHQ";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-5n8BmETv5jUvgu0rskAPYaBgYyNL2QU2t/iUb3hNMMw=";
   };
 
diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix
index 6be26a09e67c..581ac08c5bd6 100644
--- a/pkgs/tools/misc/watchexec/default.nix
+++ b/pkgs/tools/misc/watchexec/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yZGMibh6Qo4gIwj5v0LRt7kdrHGsJ1OG3ACvVKZY7hQ=";
   };
 
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix
index c841eb18ecdc..dd511b708481 100644
--- a/pkgs/tools/misc/xflux/gui.nix
+++ b/pkgs/tools/misc/xflux/gui.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     repo = "xflux-gui";
     owner = "xflux-gui";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "09zphcd9821ink63636swql4g85hg6lpsazqg1mawlk9ikc8zbps";
   };
 
diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix
index 5ecbf379c9c7..62eac3d811f3 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/tools/networking/axel/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "axel-download-accelerator";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5GUna5k8GhAx1Xe8n9IvXT7IO6gksxCLh+sMANlxTBM=";
   };
 
diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix
index b9dd78a8c2f8..892e7e4c0e21 100644
--- a/pkgs/tools/networking/bore-cli/default.nix
+++ b/pkgs/tools/networking/bore-cli/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ekzhang";
     repo = "bore";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-Wkhcv8q/dGRJqG7ArsnsPsRBnXdScGedwxunbOzAjyY=";
   };
 
diff --git a/pkgs/tools/networking/cocom/default.nix b/pkgs/tools/networking/cocom/default.nix
index 6d16b7289aec..98f837cf0bba 100644
--- a/pkgs/tools/networking/cocom/default.nix
+++ b/pkgs/tools/networking/cocom/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LamdaLamdaLamda";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0sl4ivn95sr5pgw2z877gmhyfc4mk9xr457i5g2i4wqnf2jmy14j";
   };
 
diff --git a/pkgs/tools/networking/curl-impersonate/chrome/default.nix b/pkgs/tools/networking/curl-impersonate/chrome/default.nix
index 1ba657fb2c06..dce29e548661 100644
--- a/pkgs/tools/networking/curl-impersonate/chrome/default.nix
+++ b/pkgs/tools/networking/curl-impersonate/chrome/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yifeikong";
     repo = "curl-impersonate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-m6zeQUL+yBh3ixS+crbJWHX5TLa61A/3oqMz5UVELso=";
   };
 
diff --git a/pkgs/tools/networking/curl-impersonate/firefox/default.nix b/pkgs/tools/networking/curl-impersonate/firefox/default.nix
index 92b05214ae82..e0d178466ea2 100644
--- a/pkgs/tools/networking/curl-impersonate/firefox/default.nix
+++ b/pkgs/tools/networking/curl-impersonate/firefox/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lwthiker";
     repo = "curl-impersonate";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ExmEhjJC8FPzx08RuKOhRxKgJ4Dh+ElEl+OUHzRCzZc=";
   };
 
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index 0417da40fd48..d2ccb30dbb5b 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -27,7 +27,7 @@ let
 
   src = fetchFromGitHub {
     inherit owner repo;
-    tag = version;
+    rev = version;
     hash = "sha256-rU3eg92MuGs/6r7oJho2roeUCZoyfqYt1xOERoRPqmQ=";
   };
   rtloader = stdenv.mkDerivation {
diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix
index 1a0d27108b93..263b5f51d277 100644
--- a/pkgs/tools/networking/dd-agent/integrations-core.nix
+++ b/pkgs/tools/networking/dd-agent/integrations-core.nix
@@ -46,7 +46,7 @@ let
   src = fetchFromGitHub {
     owner = "DataDog";
     repo = "integrations-core";
-    tag = version;
+    rev = version;
     sha256 = "sha256-p5eoNNHQQl314mfUk2t3qQaerPu02GKA+tKkAY7bojk=";
   };
   version = "7.56.2";
diff --git a/pkgs/tools/networking/dnsviz/default.nix b/pkgs/tools/networking/dnsviz/default.nix
index 2e33f3a535d4..46a9617cc2cc 100644
--- a/pkgs/tools/networking/dnsviz/default.nix
+++ b/pkgs/tools/networking/dnsviz/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dnsviz";
     repo = "dnsviz";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-x6LdPVQFfsJIuKde1+LbFKz5bBEi+Mri9sVH0nGsbCU=";
   };
 
diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix
index cc4d6cb9ebe9..e02263f7a3f7 100644
--- a/pkgs/tools/networking/drill/default.nix
+++ b/pkgs/tools/networking/drill/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "fcsonline";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-4y5gpkQB0U6Yq92O6DDD5eq/i/36l/VfeyiE//pcZOk=";
   };
 
diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix
index 79f6033e5b0f..bcc257143e88 100644
--- a/pkgs/tools/networking/flannel/plugin.nix
+++ b/pkgs/tools/networking/flannel/plugin.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "flannel-io";
     repo = "cni-plugin";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mhDUpQf1HQLx4vn+Ju5jN5DYgkdsAs8CcmZbBqEITB4=";
   };
 
diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix
index 5861e6eaf049..42b9d4ed0522 100644
--- a/pkgs/tools/networking/gandi-cli/default.nix
+++ b/pkgs/tools/networking/gandi-cli/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Gandi";
     repo = "gandi.cli";
-    tag = version;
+    rev = version;
     sha256 = "sha256-KLeEbbzgqpmBjeTc5RYsFScym8xtMqVjU+H0lyDM0+o=";
   };
 
diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix
index 6a5a3456941b..1be8d6d62a6a 100644
--- a/pkgs/tools/networking/gmrender-resurrect/default.nix
+++ b/pkgs/tools/networking/gmrender-resurrect/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "gmrender-resurrect";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-Zt8YYRqqX5L/MGLsFzR8JOdYoNX9ypXLX5i+fqkzPkk=";
   };
 
diff --git a/pkgs/tools/networking/ifwifi/default.nix b/pkgs/tools/networking/ifwifi/default.nix
index 0bda48d723b3..3504a56c920f 100644
--- a/pkgs/tools/networking/ifwifi/default.nix
+++ b/pkgs/tools/networking/ifwifi/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "araujobsd";
     repo = "ifwifi";
-    tag = version;
+    rev = version;
     sha256 = "sha256-DPMCwyKqGJrav0wASBky9bS1bvJ3xaGsDzsk1bKaH1U=";
   };
 
diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix
index 2562c7a9b10f..40ac48b15f82 100644
--- a/pkgs/tools/networking/lxi-tools/default.nix
+++ b/pkgs/tools/networking/lxi-tools/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lxi-tools";
     repo = "lxi-tools";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-lmWZpKI3TXwF76LDFfZcOGUtPeBmBu+0Lu/3eCMMb3Y=";
   };
 
diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix
index cdacd1afb211..20fddf5ba910 100644
--- a/pkgs/tools/networking/mozwire/default.nix
+++ b/pkgs/tools/networking/mozwire/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NilsIrl";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-2i8C1XgfI3MXnwXZzY6n8tIcw45G9h3vZqRlFaVoLH0=";
   };
 
diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index 3cbf1e428f69..c3fc477f1c2d 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "traviscross";
     repo = "mtr";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-f5bL3IdXibIc1xXCuZHwcEV5vhypRE2mLsS3A8HW2QM=";
   };
 
diff --git a/pkgs/tools/networking/networkmanager/tray.nix b/pkgs/tools/networking/networkmanager/tray.nix
index ea9c7da6f74e..1e1882c35cf9 100644
--- a/pkgs/tools/networking/networkmanager/tray.nix
+++ b/pkgs/tools/networking/networkmanager/tray.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "palinek";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-JTH1cmkgdW2aRWMYPRvOAvCJz0ClCIpjUtcWcqJQGSU=";
   };
 
diff --git a/pkgs/tools/networking/octodns/providers/bind/default.nix b/pkgs/tools/networking/octodns/providers/bind/default.nix
index 2a7fb7a46274..6d9ddd5afdc6 100644
--- a/pkgs/tools/networking/octodns/providers/bind/default.nix
+++ b/pkgs/tools/networking/octodns/providers/bind/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "octodns";
     repo = "octodns-bind";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-IxZr7Wds8wLfJg6rqCtJ59Sg/mCIJ1g9jDJ8CTM7O8w=";
   };
 
diff --git a/pkgs/tools/networking/opendrop/default.nix b/pkgs/tools/networking/opendrop/default.nix
index 6df6f369302d..704ee944b685 100644
--- a/pkgs/tools/networking/opendrop/default.nix
+++ b/pkgs/tools/networking/opendrop/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "seemoo-lab";
     repo = "opendrop";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-4FeVQO7Z6t9mjIgesdjKx4Mi+Ro5EVGJpEFjCvB2SlA=";
   };
 
diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
index 2b7caaa8d01b..bc0ef08d56c9 100644
--- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
+++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jonathanio";
     repo = "update-systemd-resolved";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lYJTR3oBmpENcqNHa9PFXsw7ly6agwjBWf4UXf1d8Kc=";
   };
 
diff --git a/pkgs/tools/networking/pingu/default.nix b/pkgs/tools/networking/pingu/default.nix
index 63c1a15f0a26..c5778b735bf4 100644
--- a/pkgs/tools/networking/pingu/default.nix
+++ b/pkgs/tools/networking/pingu/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sheepla";
     repo = "pingu";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-iAHj6/qaZgpTfrUZZ9qdsjiNMJ2zH0CzhR4TVSC9oLE=";
   };
 
diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/tools/networking/q/default.nix
index 05ab3f209192..6aac0616b554 100644
--- a/pkgs/tools/networking/q/default.nix
+++ b/pkgs/tools/networking/q/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "natesales";
     repo = "q";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kfuf0iwRYNxd9TfIIHvAqLxXjesQh7jC0evT9DQrrzQ=";
   };
 
diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix
index 46a0164b9070..0326f9df532d 100644
--- a/pkgs/tools/networking/rosenpass/default.nix
+++ b/pkgs/tools/networking/rosenpass/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-fQIeKGyTkFWUV9M1o256G4U1Os5OlVsRZu+5olEkbD4=";
   };
 
diff --git a/pkgs/tools/networking/s3rs/default.nix b/pkgs/tools/networking/s3rs/default.nix
index dc7ec6393a76..3a09bee66c52 100644
--- a/pkgs/tools/networking/s3rs/default.nix
+++ b/pkgs/tools/networking/s3rs/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "yanganto";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mJ1bMfv/HY74TknpRvu8RIs1d2VlNreEVtHCtQSHQw8=";
   };
 
diff --git a/pkgs/tools/networking/suckit/default.nix b/pkgs/tools/networking/suckit/default.nix
index 65589170a759..8cbbefeab601 100644
--- a/pkgs/tools/networking/suckit/default.nix
+++ b/pkgs/tools/networking/suckit/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "skallwar";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-M4/vD1sVny7hAf4h56Z2xy7yuCqH/H3qHYod6haZOs0=";
   };
 
diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index 42a497fd7006..a02f6e5c9936 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -25,7 +25,7 @@ pythonPackages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "telepresenceio";
     repo = "telepresence";
-    tag = version;
+    rev = version;
     sha256 = "1ccc8bzcdxp6rh6llk7grcnmyc05fq7dz5w0mifdzjv3a473hsky";
   };
 
diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix
index b1a3ec1f3dec..d6c66cc514cd 100644
--- a/pkgs/tools/networking/veilid/default.nix
+++ b/pkgs/tools/networking/veilid/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitLab {
     owner = "veilid";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-p9bQ90zUXVeVPUDuns+gmZb9SJHpAVrJOHe+RvEru7w=";
   };
 
diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix
index 81f4fd315d71..884667c39172 100644
--- a/pkgs/tools/networking/vpn-slice/default.nix
+++ b/pkgs/tools/networking/vpn-slice/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dlenski";
     repo = "vpn-slice";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-T6VULLNRLWO4OcAsuTmhty6H4EhinyxQSg0dfv2DUJs=";
   };
 
diff --git a/pkgs/tools/package-management/libcomps/default.nix b/pkgs/tools/package-management/libcomps/default.nix
index 780ed5b91e29..048c6af62c3a 100644
--- a/pkgs/tools/package-management/libcomps/default.nix
+++ b/pkgs/tools/package-management/libcomps/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "libcomps";
-    tag = version;
+    rev = version;
     hash = "sha256-2ZxU1g5HDWnSxTabnmfyQwz1ZCXK+7kJXLofeFBiwn0=";
   };
 
diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index 8669d4f14243..ffb6053cd0a3 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "librepo";
-    tag = version;
+    rev = version;
     sha256 = "sha256-ws57vFoK5yBMHHNQ9W48Icp4am0/5k3n4ybem1aAzVM=";
   };
 
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index a2d96fd8686f..21834a5299c3 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -98,7 +98,7 @@ lib.makeExtensible (self: {
       src = fetchFromGitHub {
         owner = "lix-project";
         repo = "lix";
-        tag = version;
+        rev = version;
         hash = "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=";
       };
 
@@ -128,7 +128,7 @@ lib.makeExtensible (self: {
       src = fetchFromGitHub {
         owner = "lix-project";
         repo = "lix";
-        tag = version;
+        rev = version;
         hash = "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=";
       };
 
@@ -158,7 +158,7 @@ lib.makeExtensible (self: {
       src = fetchFromGitHub {
         owner = "lix-project";
         repo = "lix";
-        tag = version;
+        rev = version;
         hash = "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=";
       };
 
@@ -174,7 +174,7 @@ lib.makeExtensible (self: {
       version = "2.92.0";
       src = fetchgit {
         url = "https://git.lix.systems/lix-project/nix-eval-jobs.git";
-        tag = version;
+        rev = version;
         hash = "sha256-tPr61X9v/OMVt7VXOs1RRStciwN8gDGxEKx+h0/Fg48=";
       };
     };
diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
index 8e28938aa6dc..623b17695ea7 100644
--- a/pkgs/tools/package-management/nix-eval-jobs/default.nix
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-v5n6t49X7MOpqS9j0FtI6TWOXvxuZMmGsp2OfUK5QfA=";
   };
   buildInputs = [
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index b9b030bc4294..de1cf8319039 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-index";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-r3Vg9ox953HdUp5Csxd2DYUyBe9u61fmA94PpcAZRqo=";
   };
 
diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix
index 2f9313b9041a..1f255aef6796 100644
--- a/pkgs/tools/package-management/nix-template/default.nix
+++ b/pkgs/tools/package-management/nix-template/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     name = "${pname}-${version}-src";
     owner = "jonringer";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-42u5FmTIKHpfQ2zZQXIrFkAN2/XvU0wWnCRrQkQzcNI=";
   };
 
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index 657227e8e032..1617854abcd2 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -7,7 +7,7 @@
   src ? fetchFromGitHub {
     owner = "NixOS";
     repo = "nix";
-    tag = version;
+    rev = version;
     inherit hash;
   },
   patches ? [ ],
diff --git a/pkgs/tools/package-management/nix/dependencies.nix b/pkgs/tools/package-management/nix/dependencies.nix
index a8cdeeb4c77c..a1a964836959 100644
--- a/pkgs/tools/package-management/nix/dependencies.nix
+++ b/pkgs/tools/package-management/nix/dependencies.nix
@@ -43,7 +43,7 @@ in
           src = fetchFromGitHub {
             owner = "aws";
             repo = "aws-sdk-cpp";
-            tag = version;
+            rev = version;
             hash = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g=";
           };
           postPatch =
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 9a0fb38507e5..0c66f2310825 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "PackageKit";
     repo = "PackageKit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-MYZFI1Q90F/AXVSJJBhmw+E7IMLXrdwmSuFJwv5D/z4=";
   };
 
diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index 4757c9d1345b..1cce9329b6f4 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "PackageKit-Qt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-rLNeVjzIT18qUZgj6Qcf7E59CL4gx/ArYJfs9KHrqNs=";
   };
 
diff --git a/pkgs/tools/security/age-plugin-ledger/default.nix b/pkgs/tools/security/age-plugin-ledger/default.nix
index e0fb27a441f7..9c441ccda539 100644
--- a/pkgs/tools/security/age-plugin-ledger/default.nix
+++ b/pkgs/tools/security/age-plugin-ledger/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Ledger-Donjon";
     repo = "age-plugin-ledger";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-g5GbWXhaGEafiM3qkGlRXHcOzPZl2pbDWEBPg4gQWcg=";
   };
 
diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
index ecae1f3d6de4..04c0e3e89543 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BLAKE2";
     repo = "BLAKE2";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     sha256 = "sha256-6BVl3Rh+CRPQq3QxcUlk5ArvjIj/IcPCA2/Ok0Zu7UI=";
   };
 
diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix
index 7d02393daa55..ab25caee50ac 100644
--- a/pkgs/tools/security/bitwarden-directory-connector/default.nix
+++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix
@@ -25,7 +25,7 @@ let
       src = fetchFromGitHub {
         owner = "bitwarden";
         repo = "directory-connector";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-8EY+bU7i3fdUBQYsykUzgOIWS5VAJlmRYW8fsp0xfnY=";
       };
 
diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index 97e62771f7e4..086a59d7a781 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "chipsec";
     repo = "chipsec";
-    tag = version;
+    rev = version;
     hash = "sha256-+pbFG1SmSO/cnt1e+kel7ereC0I1OCJKKsS0KaJDWdc=";
   };
 
diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix
index 46c712eff8d2..51e4aceb9bce 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/pkgs/tools/security/chrome-token-signing/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "open-eid";
     repo = "chrome-token-signing";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-wKy/RVR7jx5AkMJgHXsuV+jlzyfH5nDRggcIUgh2ML4=";
   };
 
diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix
index 07c277c50de5..42a048b78ca4 100644
--- a/pkgs/tools/security/cosign/default.nix
+++ b/pkgs/tools/security/cosign/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9hUf6J3kTI0nvLExReUUovW8pZjlaoqgFmLd5mShZzU=";
   };
 
diff --git a/pkgs/tools/security/echidna/default.nix b/pkgs/tools/security/echidna/default.nix
index 68315afdbb18..f3bfb9fbffee 100644
--- a/pkgs/tools/security/echidna/default.nix
+++ b/pkgs/tools/security/echidna/default.nix
@@ -16,7 +16,7 @@ mkDerivation (
     src = fetchFromGitHub {
       owner = "crytic";
       repo = "echidna";
-      tag = "v${version}";
+      rev = "v${version}";
       sha256 = "sha256-NJ2G6EkexYE4P3GD7PZ+lLEs1dqnoqIB2zfAOD5SQ8M=";
     };
 
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 0f7398258f7a..cc4eb1e06f46 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Fedict";
     repo = "eid-mw";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-WFXVQ2CNrEEy4R6xGiwWkAZmbvXK44FtO5w6s1ZUZpA=";
   };
 
diff --git a/pkgs/tools/security/fwbuilder/default.nix b/pkgs/tools/security/fwbuilder/default.nix
index f8a3e1ef9890..284e302f0188 100644
--- a/pkgs/tools/security/fwbuilder/default.nix
+++ b/pkgs/tools/security/fwbuilder/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fwbuilder";
     repo = "fwbuilder";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-j5HjGcIqq93Ca9OBqEgSotoSXyw+q6Fqxa3hKk1ctwQ=";
   };
 
diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix
index 98b0b111379c..daa7e274712c 100644
--- a/pkgs/tools/security/fwknop/default.nix
+++ b/pkgs/tools/security/fwknop/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mrash";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "05kvqhmxj9p2y835w75f3jvhr38bb96cd58mvfd7xil9dhmhn9ra";
   };
 
diff --git a/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
index 8e648dd7cf4b..37d5148051ee 100644
--- a/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
@@ -13,7 +13,7 @@ buildGhidraExtension {
   src = fetchFromGitHub {
     owner = "antoniovazquezblanco";
     repo = "GhidraFindcrypt";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-gWVYy+PWpNXlcgD83jap4IFRv66qdhloOwvpQVU2TcI=";
   };
 
diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
index 07039ca5b566..22b53b61ab53 100644
--- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
@@ -13,7 +13,7 @@ let
     src = fetchFromGitHub {
       owner = "boricj";
       repo = "ghidra-delinker-extension";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-h6F50Z7S6tPOl9mIhChLKoFxHuAkq/n36ysUEFwWGxI=";
     };
 
diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix
index 020febaf49b0..34baf6c971f5 100644
--- a/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix
@@ -10,7 +10,7 @@ buildGhidraExtension rec {
   src = fetchFromGitHub {
     owner = "mooncat-greenpy";
     repo = "Ghidra_GolangAnalyzerExtension";
-    tag = version;
+    rev = version;
     hash = "sha256-uxozIJ+BLcP1vBnLOCZD9ueY10hd37fON/Miii3zabo=";
   };
 
diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
index 3e5c78ad1123..54f45aaecf9b 100644
--- a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
@@ -31,7 +31,7 @@ let
     src = fetchFromGitHub {
       owner = "CERTCC";
       repo = "kaiju";
-      tag = version;
+      rev = version;
       hash = "sha256-o9VAmZl0dJfap5WccDXUWS4PSKvb/DYmeZotKZ1v/ps=";
     };
 
diff --git a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix
index b0bbbd76a2ab..54d30e996b9e 100644
--- a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix
@@ -10,7 +10,7 @@ buildGhidraExtension rec {
   src = fetchFromGitHub {
     owner = "WorksButNotTested";
     repo = "lightkeeper";
-    tag = version;
+    rev = version;
     hash = "sha256-aGMWg6VQleKH/txlxpSw19QOotWZSqeW5Ve2SpWGhgA=";
   };
   preConfigure = ''
diff --git a/pkgs/tools/security/ghidra/extensions/wasm/default.nix b/pkgs/tools/security/ghidra/extensions/wasm/default.nix
index e1f798822799..b8c8eaff8001 100644
--- a/pkgs/tools/security/ghidra/extensions/wasm/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/wasm/default.nix
@@ -15,7 +15,7 @@ buildGhidraExtension {
   src = fetchFromGitHub {
     owner = "nneonneo";
     repo = "ghidra-wasm-plugin";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aoSMNzv+TgydiXM4CbvAyu/YsxmdZPvpkZkYEE3C+V4=";
   };
 
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index f2e52235ccc7..c24a3536179c 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-GL0vnrNz9vcdybubYIjiK0tDH3L4lNWNo+rAAWv7d8o=";
   };
 
diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix
index 7f75a746ba9c..f6ee7ceb28a2 100644
--- a/pkgs/tools/security/gopass/git-credential.nix
+++ b/pkgs/tools/security/gopass/git-credential.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "git-credential-gopass";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xtZAT1Lb7YJ0Hy2cMT2riVbEoWtz7lusKJ9QT4ZI6Ek=";
   };
 
diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix
index dc2474d2284f..d458b99dba91 100644
--- a/pkgs/tools/security/gopass/hibp.nix
+++ b/pkgs/tools/security/gopass/hibp.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-hibp";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-auY0Wg5ki4WIHtA172wJJj9VxQEHWMmQop5bIviinn8=";
   };
 
diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix
index 657dbe9983a7..4d0116b22b50 100644
--- a/pkgs/tools/security/gopass/summon.nix
+++ b/pkgs/tools/security/gopass/summon.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-summon-provider";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-yMua3BSl4u/1axLMmLIzjqj8wYvMMPTqmRgcuH1tqN0=";
   };
 
diff --git a/pkgs/tools/security/gotrue/default.nix b/pkgs/tools/security/gotrue/default.nix
index 985ec6e546c6..6bff0c026a2a 100644
--- a/pkgs/tools/security/gotrue/default.nix
+++ b/pkgs/tools/security/gotrue/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "netlify";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-9h6CyCY7741tJR+qWDLwgPkAtE/kmaoTqlXEY+mOW58=";
   };
 
diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix
index 3a5a201bc3c7..e028e085d02d 100644
--- a/pkgs/tools/security/gotrue/supabase.nix
+++ b/pkgs/tools/security/gotrue/supabase.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "auth";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-dm6JBBHFX61acQ4tnkklZqAM4hiOqtvea0oy7/bSovQ=";
   };
 
diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix
index 152fc8f231d1..2d650d3ac395 100644
--- a/pkgs/tools/security/gpg-tui/default.nix
+++ b/pkgs/tools/security/gpg-tui/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "gpg-tui";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-aHmLcWiDy5GMbcKi285tfBggNmGkpVAoZMm4dt8LKak=";
   };
 
diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix
index 63f5686861e5..056d9699a745 100644
--- a/pkgs/tools/security/kbs2/default.nix
+++ b/pkgs/tools/security/kbs2/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "woodruffw";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-o8/ENAWzVqs7rokST6xnyu9Q/pKqq/UnKWOFRuIuGes=";
   };
 
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 701cb8924f39..c58852e05ab8 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "keybase";
     repo = "client";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-hRqxA2gPL1UKbz9DwgfZfjE6e5pB7zenZqK+k1i8F2g=";
   };
   vendorHash = "sha256-KHahkGzkXr6xp0XY9MyEeeiHnmphaNYi9dPBQ476+us=";
diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix
index e70e2ae0b2f5..00f76354d09d 100644
--- a/pkgs/tools/security/krunner-pass/default.nix
+++ b/pkgs/tools/security/krunner-pass/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "akermu";
     repo = "krunner-pass";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "032fs2174ls545kjixbhzyd65wgxkw4s5vg8b20irc5c9ak3pxm0";
   };
 
diff --git a/pkgs/tools/security/lethe/default.nix b/pkgs/tools/security/lethe/default.nix
index f0d914f8a727..c654c975eebc 100644
--- a/pkgs/tools/security/lethe/default.nix
+++ b/pkgs/tools/security/lethe/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kostassoid";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-y2D/80pnpYpTl+q9COTQkvtj9lzBlOWuMcnn5WFnX8E=";
   };
 
diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix
index ba6e61bbb2c4..544363a24fca 100644
--- a/pkgs/tools/security/libmodsecurity/default.nix
+++ b/pkgs/tools/security/libmodsecurity/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "owasp-modsecurity";
     repo = "ModSecurity";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-SaeBO3+WvPhHiJoiOmijB0G3/QYxjAdxgeCVqESS+4U=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
index a767127bea5a..2e6665c7204a 100644
--- a/pkgs/tools/security/nsjail/default.nix
+++ b/pkgs/tools/security/nsjail/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "nsjail";
-    tag = version;
+    rev = version;
     fetchSubmodules = true;
     hash = "sha256-/K+qJV5Dq+my45Cpw6czdsWLtO9lnJwZTsOIRt4Iijk=";
   };
diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix
index 49544c7aa244..4aa96fe40909 100644
--- a/pkgs/tools/security/pass/extensions/audit/default.nix
+++ b/pkgs/tools/security/pass/extensions/audit/default.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "pass-audit";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-xigP8LxRXITLF3X21zhWx6ooFNSTKGv46yFSt1dd4vs=";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/checkup.nix b/pkgs/tools/security/pass/extensions/checkup.nix
index b8357624f9b5..633b0be00cc7 100644
--- a/pkgs/tools/security/pass/extensions/checkup.nix
+++ b/pkgs/tools/security/pass/extensions/checkup.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "etu";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1p65yxr00k35g4bnagszp8i03pmhnrcmipgrdsawps2ba8faqp6r";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/file.nix b/pkgs/tools/security/pass/extensions/file.nix
index 888505163b79..54c7e0f8e12c 100644
--- a/pkgs/tools/security/pass/extensions/file.nix
+++ b/pkgs/tools/security/pass/extensions/file.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dvogt23";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-18KvmcfLwelyk9RV/IMaj6O/nkQEQz84eUEB/mRaKE4=";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix
index ef9e4e890704..085b77342fbe 100644
--- a/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "congma";
     repo = "pass-genphrase";
-    tag = version;
+    rev = version;
     sha256 = "01dff2jlp111y7vlmp1wbgijzphhlzc19m02fs8nzmn5vxyffanx";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix
index 2c4c54f387a8..dbde743461af 100644
--- a/pkgs/tools/security/pass/extensions/otp.nix
+++ b/pkgs/tools/security/pass/extensions/otp.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tadfisher";
     repo = "pass-otp";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix
index 3265fdc699fd..f9ad7fe0f894 100644
--- a/pkgs/tools/security/pass/extensions/tomb.nix
+++ b/pkgs/tools/security/pass/extensions/tomb.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "pass-tomb";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-kbbMHmYmeyt7HM8YiNhknePm1vUaXWWXPWePKGpbU+o=";
   };
 
diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix
index 341bb623e225..6f53159c9b67 100644
--- a/pkgs/tools/security/pass/extensions/update.nix
+++ b/pkgs/tools/security/pass/extensions/update.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "pass-update";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-NFdPnGMs8myiHufeHAQUNDUuvDzYeoWYZllI9+4HL+s=";
   };
 
diff --git a/pkgs/tools/security/pass/wofi-pass.nix b/pkgs/tools/security/pass/wofi-pass.nix
index a35eb1cceb22..68039864ffb5 100644
--- a/pkgs/tools/security/pass/wofi-pass.nix
+++ b/pkgs/tools/security/pass/wofi-pass.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "schmidtandreas";
     repo = "wofi-pass";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-oRGDhr28UQjr+g//fWcLKWXqKSsRUWtdh39UMFSaPfw=";
   };
 
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index 89b9cf718f88..faef0c0c08ba 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GPGTools";
     repo = "pinentry";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-QnDuqFrI/U7aZ5WcOCp5vLE+w59LVvDGOFNQy9fSy70=";
   };
 
diff --git a/pkgs/tools/security/quill/default.nix b/pkgs/tools/security/quill/default.nix
index a6e8fb000de3..8f9cf642c969 100644
--- a/pkgs/tools/security/quill/default.nix
+++ b/pkgs/tools/security/quill/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dfinity";
     repo = "quill";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-lCDKM9zzGcey4oWp6imiHvGSNRor0xhlmlhRkSXFLlU=";
   };
 
diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix
index 88242b087f42..187306d44859 100644
--- a/pkgs/tools/security/rekor/default.nix
+++ b/pkgs/tools/security/rekor/default.nix
@@ -19,7 +19,7 @@ let
       src = fetchFromGitHub {
         owner = "sigstore";
         repo = "rekor";
-        tag = "v${version}";
+        rev = "v${version}";
         hash = "sha256-JJzLOu8UJbkLT+JywddKtgmDNxAiSV6n9eaQu1ihqSg=";
         # 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/tools/security/rucredstash/default.nix b/pkgs/tools/security/rucredstash/default.nix
index 6b288702be98..f98cd0f74858 100644
--- a/pkgs/tools/security/rucredstash/default.nix
+++ b/pkgs/tools/security/rucredstash/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "psibi";
     repo = "rucredstash";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-trupBiinULzD8TAy3eh1MYXhQilO08xu2a4yN7wwhwk=";
   };
 
diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
index c51cb520574d..6da20e6ba3e3 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Versent";
     repo = "saml2aws";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-5g7mbjBkjNl1xvMMJXcITOZTNWXE7m2WhzzvLuULcuo=";
   };
 
diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix
index c66d2440d671..99a633dafe61 100644
--- a/pkgs/tools/security/solo2-cli/default.nix
+++ b/pkgs/tools/security/solo2-cli/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "solokeys";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-7tpO5ir42mIKJXD0NJzEPXi/Xe6LdyEeBQWNfOdgX5I=";
   };
 
diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
index bff483aeeeae..bef9a55bd31d 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/pkgs/tools/security/stoken/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cernekee";
     repo = "stoken";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8N7TXdBu37eXWIKCBdaXVW0pvN094oRWrdlcy9raddI=";
   };
 
diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix
index 7ba9545c221b..de0793a6a89c 100644
--- a/pkgs/tools/security/vaultwarden/default.nix
+++ b/pkgs/tools/security/vaultwarden/default.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dani-garcia";
     repo = "vaultwarden";
-    tag = version;
+    rev = version;
     hash = "sha256-Lu3/qVTi5Eedcm+3XlHAAJ1nPHm9hW4HZncQKmzDdoo=";
   };
 
diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix
index d0baf9362f00..9779d63b25b8 100644
--- a/pkgs/tools/security/vaultwarden/webvault.nix
+++ b/pkgs/tools/security/vaultwarden/webvault.nix
@@ -16,7 +16,7 @@ let
   bw_web_builds = fetchFromGitHub {
     owner = "dani-garcia";
     repo = "bw_web_builds";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-wQGpl7N0D83FrrV4T+LFe9h3n5Q/MqLbGGO2F5R9k2g=";
   };
 
diff --git a/pkgs/tools/security/web-eid-app/default.nix b/pkgs/tools/security/web-eid-app/default.nix
index 544639672e3f..11afcd40003e 100644
--- a/pkgs/tools/security/web-eid-app/default.nix
+++ b/pkgs/tools/security/web-eid-app/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "web-eid";
     repo = "web-eid-app";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-UqHT85zuoT/ISFP2qgG2J1518eGEvm5L96ntZ/lx9BE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/tools/security/whatweb/default.nix b/pkgs/tools/security/whatweb/default.nix
index 318658b8a12b..f672f4410245 100644
--- a/pkgs/tools/security/whatweb/default.nix
+++ b/pkgs/tools/security/whatweb/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "urbanadventurer";
     repo = "whatweb";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-HLF55x4C8n8aPO4SI0d6Z9wZe80krtUaGUFmMaYRBIE=";
   };
 
diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix
index 4c557e7aa52d..2623821e16dc 100644
--- a/pkgs/tools/system/btop/default.nix
+++ b/pkgs/tools/system/btop/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aristocratos";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-A5hOBxj8tKlkHd8zDHfDoU6fIu8gDpt3/usbiDk0/G0=";
   };
 
diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix
index ab1c0ef25ef1..4db3a1d780ba 100644
--- a/pkgs/tools/system/clinfo/default.nix
+++ b/pkgs/tools/system/clinfo/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Oblomov";
     repo = "clinfo";
-    tag = version;
+    rev = version;
     sha256 = "sha256-UkkrRpmY5vZtTeEqPNYfxAGaJDoTSrNUG9N1Bknozow=";
   };
 
diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix
index 8fe68cac78c2..577cf0a179bb 100644
--- a/pkgs/tools/system/cm-rgb/default.nix
+++ b/pkgs/tools/system/cm-rgb/default.nix
@@ -18,7 +18,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gfduszynski";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-m0ZAjSLRzcjzygLEbvCiDd7krc1gRqTg1ZV4H/o2c68=";
   };
 
diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix
index 5e587ea9688d..3c220cf9fd05 100644
--- a/pkgs/tools/system/gotop/default.nix
+++ b/pkgs/tools/system/gotop/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xxxserxxx";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-W7a3QnSIR95N88RqU2sr6oEDSqOXVfAwacPvS219+1Y=";
   };
 
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index ac790e7d8368..eba4a390e77c 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "htop-dev";
     repo = pname;
-    tag = version;
+    rev = version;
     hash = "sha256-4M2Kzy/tTpIZzpyubnXWywQh7Np5InT4sYkVG2v6wWs=";
   };
 
diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix
index a67642dd2c41..e0f2b28c4dee 100644
--- a/pkgs/tools/system/hw-probe/default.nix
+++ b/pkgs/tools/system/hw-probe/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxhw";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-8dLfk2k7xG2CXMHfMPrpgq43j3ttj5a0bgNPEahl2rQ=";
   };
 
diff --git a/pkgs/tools/system/nvidia-system-monitor-qt/default.nix b/pkgs/tools/system/nvidia-system-monitor-qt/default.nix
index 4931f5f32a22..d7ef01f0c9cc 100644
--- a/pkgs/tools/system/nvidia-system-monitor-qt/default.nix
+++ b/pkgs/tools/system/nvidia-system-monitor-qt/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "congard";
     repo = "nvidia-system-monitor-qt";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-JHK7idyk5UxgDyt+SzvYjTLmlNzx6+Z+OPYsRD4NWPg=";
   };
 
diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix
index 80b71ebe28e5..7caac445a33d 100644
--- a/pkgs/tools/system/nvtop/build-nvtop.nix
+++ b/pkgs/tools/system/nvtop/build-nvtop.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Syllo";
     repo = "nvtop";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-8iChT55L2NSnHg8tLIry0rgi/4966MffShE0ib+2ywc=";
   };
 
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 46f6c1dfdb7d..345afacf0016 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pciutils";
     repo = "pciutils";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-buhq7SN6eH+sckvT5mJ8eP4C1EP/4CUFt3gooJohJW0=";
   };
 
diff --git a/pkgs/tools/system/stacer/default.nix b/pkgs/tools/system/stacer/default.nix
index 2c24b66a050f..05303b472ac9 100644
--- a/pkgs/tools/system/stacer/default.nix
+++ b/pkgs/tools/system/stacer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oguzhaninan";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0qndzzkbq6abapvwq202kva8j619jdn9977sbqmmfs9zkjz4mbsd";
   };
 
diff --git a/pkgs/tools/system/uefitool/common.nix b/pkgs/tools/system/uefitool/common.nix
index 987720d8145b..fa8da1a9ac8a 100644
--- a/pkgs/tools/system/uefitool/common.nix
+++ b/pkgs/tools/system/uefitool/common.nix
@@ -26,7 +26,7 @@ mkDerivation rec {
     inherit sha256;
     owner = "LongSoft";
     repo = pname;
-    tag = version;
+    rev = version;
   };
 
   buildInputs = [ qtbase ];
diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix
index f6a57a95d2b9..043e96d4d39a 100644
--- a/pkgs/tools/text/amber/default.nix
+++ b/pkgs/tools/text/amber/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo=";
   };
 
diff --git a/pkgs/tools/text/autocorrect/default.nix b/pkgs/tools/text/autocorrect/default.nix
index b57cdf162586..29b3f9ed2ea7 100644
--- a/pkgs/tools/text/autocorrect/default.nix
+++ b/pkgs/tools/text/autocorrect/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "huacnlee";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-fwq+Q2GpPXWfIQjfSACBjdyjrmYwVKSSZxCy3+NIKNI=";
   };
 
diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix
index f3c28a96d7a9..02933bf8fa2d 100644
--- a/pkgs/tools/text/chars/default.nix
+++ b/pkgs/tools/text/chars/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "antifuchs";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-mBtwdPzIc6RgEFTyReStFlhS4UhhRWjBTKT6gD3tzpQ=";
   };
 
diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix
index 7ca8f3ff1bc7..3b9c6d2b383a 100644
--- a/pkgs/tools/text/coloursum/default.nix
+++ b/pkgs/tools/text/coloursum/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ticky";
     repo = "coloursum";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-zA2JhSnlFccSY01WMGsgF4AmrF/3BRUCcSMfoEbEPgA=";
   };
 
diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix
index 3c2303fa2cb6..e3502dd3c54f 100644
--- a/pkgs/tools/text/diffr/default.nix
+++ b/pkgs/tools/text/diffr/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mookid";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ylZE2NtTXbGqsxE72ylEQCacTyxBO+/WgvEpoXd5OZI=";
   };
 
diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix
index 11020f2245a8..5d94bd299fd0 100644
--- a/pkgs/tools/text/fastmod/default.nix
+++ b/pkgs/tools/text/fastmod/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-A/3vzfwaStoQ9gdNM8yjmL2J/pQjj6yb68WThiTF+1E=";
   };
 
diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix
index 6471ee9a7f65..e3ac44ff4dbd 100644
--- a/pkgs/tools/text/glogg/default.nix
+++ b/pkgs/tools/text/glogg/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nickbnf";
     repo = "glogg";
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "0hf1c2m8n88frmxmyn0ndr8129p7iky49nq565sw1asaydm5z6pb";
   };
 
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 1d583e1793dc..6ef03ad24d95 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -20,7 +20,7 @@ let
     src = fetchFromGitLab {
       owner = "saalen";
       repo = "highlight";
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-CpbVm5Z9cKPQdOzBNOXsgrX3rfC6DTVE7xfmOAshbEs=";
     };
 
diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix
index ea9236a6820e..77537ec0adbd 100644
--- a/pkgs/tools/text/igrep/default.nix
+++ b/pkgs/tools/text/igrep/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "konradsz";
     repo = "igrep";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ZZhzBGLpzd9+rok+S/ypKpWXVzXaA1CnviC7LfgP/CU=";
   };
 
diff --git a/pkgs/tools/text/languagetool-rust/default.nix b/pkgs/tools/text/languagetool-rust/default.nix
index 9361d1cf5295..389f36581b22 100644
--- a/pkgs/tools/text/languagetool-rust/default.nix
+++ b/pkgs/tools/text/languagetool-rust/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jeertmans";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-8YgSxAF4DA1r7ylj6rx+fGubvT7MeiRQeowuiu0GWwQ=";
   };
 
diff --git a/pkgs/tools/text/mdbook-linkcheck/default.nix b/pkgs/tools/text/mdbook-linkcheck/default.nix
index 7a738b0dd124..474f4f5004c5 100644
--- a/pkgs/tools/text/mdbook-linkcheck/default.nix
+++ b/pkgs/tools/text/mdbook-linkcheck/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Michael-F-Bryan";
     repo = pname;
-    tag = "v${version}";
+    rev = "v${version}";
     sha256 = "sha256-ZbraChBHuKAcUA62EVHZ1RygIotNEEGv24nhSPAEj00=";
   };
 
diff --git a/pkgs/tools/text/pinyin-tool/default.nix b/pkgs/tools/text/pinyin-tool/default.nix
index 353eecf7e347..05dd8c2305c7 100644
--- a/pkgs/tools/text/pinyin-tool/default.nix
+++ b/pkgs/tools/text/pinyin-tool/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "briankung";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b";
   };
 
diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix
index e81c8e0dd0a6..afb2e7f55660 100644
--- a/pkgs/tools/text/ripgrep-all/default.nix
+++ b/pkgs/tools/text/ripgrep-all/default.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "phiresky";
     repo = "ripgrep-all";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-ns7RL7kiG72r07LkF6RzShNg8M2SU6tU5+gXDxzUQHM=";
   };
 
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 84c2ea13183d..3f8caf570f62 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -149,7 +149,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "asciidoc-py";
     repo = "asciidoc-py";
-    tag = version;
+    rev = version;
     hash = "sha256-td3C7xTWfSzdo9Bbz0dHW2oPaCQYmUE9H2sUFfg5HH0=";
   };
 
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix
index 3973dc7823bf..143b919778cb 100644
--- a/pkgs/tools/typesetting/htmldoc/default.nix
+++ b/pkgs/tools/typesetting/htmldoc/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = "htmldoc";
-    tag = "v${version}";
+    rev = "v${version}";
     hash = "sha256-nEDvG2Q6uMYWyb49EKOZimkOfEavCjvfFgucwi3u64k=";
   };
 
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index 0871b04f39c9..b180d4007c45 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://pagure.io/xmlto.git";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-wttag8J1t9cBPBHNY7me2H0IPOzS8IjfCLIHNWq67Do=";
   };
 
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index 881e54d0f3cb..3b5ccde7979e 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wez";
     repo = pname;
-    tag = version;
+    rev = version;
     sha256 = "sha256-VhrOMpGNMkNNYjcfCqlHI8gdApWr1ThtcxDwQ6gyV/g=";
   };
 
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 8029b5a4f373..d08d2c1eaf69 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "compute-image-packages";
-    tag = version;
+    rev = version;
     sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp";
   };
 
diff --git a/pkgs/tools/wayland/swaytools/default.nix b/pkgs/tools/wayland/swaytools/default.nix
index 9e4ebf644b87..3f994ef03eb2 100644
--- a/pkgs/tools/wayland/swaytools/default.nix
+++ b/pkgs/tools/wayland/swaytools/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tmccombs";
     repo = "swaytools";
-    tag = version;
+    rev = version;
     sha256 = "sha256-UoWK53B1DNmKwNLFwJW1ZEm9dwMOvQeO03+RoMl6M0Q=";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 736be54a296b..bf74c35eb2bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11148,7 +11148,7 @@ with pkgs;
     src = fetchFromGitHub {
       owner = "facebook";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-ZrU7G3xeimF3H2LRGBDHOq936u5pH/3nGecM4XEoWc8=";
     };
   };
@@ -11159,7 +11159,7 @@ with pkgs;
     src = fetchFromGitHub {
       owner = "facebook";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg=";
     };
   };
@@ -11170,7 +11170,7 @@ with pkgs;
     src = fetchFromGitHub {
       owner = "facebook";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs=";
     };
   };
@@ -11181,7 +11181,7 @@ with pkgs;
     src = fetchFromGitHub {
       owner = "facebook";
       repo = pname;
-      tag = "v${version}";
+      rev = "v${version}";
       hash = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk=";
     };
   };
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 2226f5648c49..5e682627d109 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -168,7 +168,7 @@ rec {
       src = fetchFromGitHub {
         owner = "openresty";
         repo = "lua-resty-core";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = "sha256-RJ2wcHTu447wM0h1fa2qCBl4/p9XL6ZqX9pktRW64RI=";
       };
 
@@ -192,7 +192,7 @@ rec {
       src = fetchFromGitHub {
         owner = "openresty";
         repo = "lua-resty-lrucache";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = "sha256-J8RNAMourxqUF8wPKd8XBhNwGC/x1KKvrVnZtYDEu4Q=";
       };
 
@@ -263,7 +263,7 @@ rec {
       src = fetchFromGitHub {
         owner = "vicious-widgets";
         repo = "vicious";
-        tag = "v${version}";
+        rev = "v${version}";
         sha256 = "sha256-VlJ2hNou2+t7eSyHmFkC2xJ92OH/uJ/ewYHkFLQjUPQ=";
       };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 296dfcc37814..442976c40a3b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16930,7 +16930,7 @@ self: super: with self; {
             src = pkgs.fetchFromGitHub {
               owner = "grpc";
               repo = "grpc";
-              tag = "v${version}";
+              rev = "v${version}";
               hash = "sha256-PpiOT4ZJe1uMp5j+ReQulC9jpT0xoR2sAl6vRYKA0AA=";
               fetchSubmodules = true;
             };

From b15d72589b678447c25177f744a5e217f0097390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberto=20Merino=20Risue=C3=B1o?= <Alberto.Merino@uclm.es>
Date: Wed, 12 Mar 2025 12:56:14 +0100
Subject: [PATCH 317/489] source-meta-json-schema: init at 7.0.3

---
 .../so/source-meta-json-schema/package.nix    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/so/source-meta-json-schema/package.nix

diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix
new file mode 100644
index 000000000000..0c9b70eaf960
--- /dev/null
+++ b/pkgs/by-name/so/source-meta-json-schema/package.nix
@@ -0,0 +1,37 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+}:
+let
+  version = "7.0.3";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "source-meta-json-schema";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "sourcemeta";
+    repo = "jsonschema";
+    rev = "v${version}";
+    hash = "sha256-x/bRLeH76zqcHxYodVrJYtb8CO35D3ZWYxHvvZ3Jg9A=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = {
+    homepage = "https://github.com/sourcemeta/jsonschema";
+    description = "The CLI for working with JSON Schema. Covers formatting, linting, testing, bundling, and more for both local development and CI/CD pipelines ";
+    changelog = "https://github.com/sourcemeta/jsonschema/releases";
+    license = with lib.licenses; [
+      agpl3Plus
+    ];
+    maintainers = with lib.maintainers; [
+      amerino
+    ];
+    platforms = lib.platforms.all;
+  };
+})

From 9790e9378ec6ed6b2cbc5927b376135885faa447 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 09:47:56 +0200
Subject: [PATCH 318/489] exploitdb: 2025-04-07 -> 2025-04-08

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-04-07...2025-04-08
---
 pkgs/by-name/ex/exploitdb/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index 47f33ba813a8..f9fa72114747 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-04-07";
+  version = "2025-04-08";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-cuKfuxgHD6aFsYSbcmLSaqz5z1EyOCgjBxsrvJFfuoU=";
+    hash = "sha256-xo9DhcQyigfAOF/yn46U09YMr8jlbJZp93wwJ4btr6Y=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b454ece07454571bc66c73b457d858b60c761f98 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 09:49:00 +0200
Subject: [PATCH 319/489] checkov: 3.2.399 -> 3.2.400

Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.399...refs/tags/3.2.400

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.400
---
 pkgs/by-name/ch/checkov/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index 28a46a64576a..eca5647ce705 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -25,14 +25,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.399";
+  version = "3.2.400";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-/ssPTHHW3AeQRjIDdBBZe6Jnoj/UvQXiLYFhuOJZI5o=";
+    hash = "sha256-R0u1O0az4LMrE7m3PVyLmNf1ru90ym5lbpWAd3T+0QU=";
   };
 
   pythonRelaxDeps = [

From c6df0714abea4415bdaf68fe92f1a8d42d285d6e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 09:49:35 +0200
Subject: [PATCH 320/489] python313Packages.publicsuffixlist: 1.0.2.20250329 ->
 1.0.2.20250408

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

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 677b89f0fe07..59c2ddfd32bd 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250329";
+  version = "1.0.2.20250408";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HinLmgjEHCmoW3tNTQF8vKWSh7IExxaGbdcztQsPuSk=";
+    hash = "sha256-LDbUgmHbow6IRI0I2s2eyRv9l/hUpH9ubMxcz1rp4uI=";
   };
 
   build-system = [ setuptools ];

From 820b1130d4996a090f21ff4fd6fa0238170432a9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 09:50:06 +0200
Subject: [PATCH 321/489] python312Packages.mypy-boto3-codebuild: 1.37.26 ->
 1.37.29

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5c39b6079d78..b45eefd39510 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -266,8 +266,8 @@ rec {
       "sha256-nVAeLXy2hjJZDjNTjFccKClY7DS0oLv9Q9QLlngkX6M=";
 
   mypy-boto3-codebuild =
-    buildMypyBoto3Package "codebuild" "1.37.26"
-      "sha256-gHSdYTzGKq5U3L3kqNCtl6JW8zzIBTbQeHRmLsPIYGg=";
+    buildMypyBoto3Package "codebuild" "1.37.29"
+      "sha256-iUO4pxG9wJexwwnD3KUie9TeLP1D6Mu3RjP11zYxHp4=";
 
   mypy-boto3-codecatalyst =
     buildMypyBoto3Package "codecatalyst" "1.37.0"

From 2cc27756dc304c6d5b0151e805a12e45e59fb28c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 09:50:31 +0200
Subject: [PATCH 322/489] python312Packages.mypy-boto3-glue: 1.37.13 -> 1.37.29

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b45eefd39510..b0661e8e481f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -574,8 +574,8 @@ rec {
       "sha256-JSVZVCZ6P5A+EqjXHmbbDIdE1rKrdSwNcZvUbYxKpSA=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.37.13"
-      "sha256-FrJfuU55fUM3pxt4ey/KLmgXD3wTs6PlksCOBCQ1ibA=";
+    buildMypyBoto3Package "glue" "1.37.29"
+      "sha256-LL7zn9WjB7NyFYN2bs54X9v5i+ax2GpDDFzMcm6t5N0=";
 
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.37.0"

From 385fa533de2e13d727a4f8ca4647f2da65f71529 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 09:50:56 +0200
Subject: [PATCH 323/489] python312Packages.mypy-boto3-medialive: 1.37.26 ->
 1.37.29

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b0661e8e481f..d6ccb4d3797f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -866,8 +866,8 @@ rec {
       "sha256-Ltzv3h+NATTcKsyd1PfnUdjIhT3V0OS3woGsStyI/qA=";
 
   mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.37.26"
-      "sha256-fJHjUBVtXAeNth2fAzBdcLwaFNN6ma+3eQpwFnZU6B4=";
+    buildMypyBoto3Package "medialive" "1.37.29"
+      "sha256-X8jdJi7XRidW2DsyFRM+6jMUtu3jNJDNm0h7HMOxp/E=";
 
   mypy-boto3-mediapackage =
     buildMypyBoto3Package "mediapackage" "1.37.0"

From b9811725f431257322806a917a73641fcbf4f2b6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 09:51:07 +0200
Subject: [PATCH 324/489] python312Packages.mypy-boto3-personalize: 1.37.0 ->
 1.37.29

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d6ccb4d3797f..1b779c4a34c4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1014,8 +1014,8 @@ rec {
       "sha256-e9sP379VsbZeKUhLURtsMsSPxfIvCsYVNqZhUg67+MY=";
 
   mypy-boto3-personalize =
-    buildMypyBoto3Package "personalize" "1.37.0"
-      "sha256-qUtv4DOn0Hle7QGBr3cgphQXDNj9iC0xwOhCGHaayW8=";
+    buildMypyBoto3Package "personalize" "1.37.29"
+      "sha256-A7TLIG3TYVkSAAIRcn6OLoNSUpiwIEItwk4JI+f0nAc=";
 
   mypy-boto3-personalize-events =
     buildMypyBoto3Package "personalize-events" "1.37.0"

From 3d48ffcff4c07c6f3500a86fe3b1beae8f06dda3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 09:51:36 +0200
Subject: [PATCH 325/489] python312Packages.mypy-boto3-transfer: 1.37.24 ->
 1.37.29

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1b779c4a34c4..c5f832f2a229 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1370,8 +1370,8 @@ rec {
       "sha256-UW0b40n+M8za5guDPxhU5cRvtbkqzX6G7M2UaxNq5ws=";
 
   mypy-boto3-transfer =
-    buildMypyBoto3Package "transfer" "1.37.24"
-      "sha256-0+oRkebGHtwR7NXxXfdVMlF1+11+yFQyDBPJGuaz9k4=";
+    buildMypyBoto3Package "transfer" "1.37.29"
+      "sha256-sTjua+D1wGOa/8lod+/cafll9lk3NFI6vkE7NlGKmyU=";
 
   mypy-boto3-translate =
     buildMypyBoto3Package "translate" "1.37.0"

From ffda5123b132ec5370a3423bd6539a5783f6d9d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 09:51:44 +0200
Subject: [PATCH 326/489] python313Packages.botocore-stubs: 1.37.28 -> 1.37.29

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index f4a29c68f6a0..eca5c6af828d 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.37.28";
+  version = "1.37.29";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-FsTll2y4O4Y4hHIDUOJF3d5zvTnP4slI1axXxwquyJ4=";
+    hash = "sha256-xZiYvx0Jv2qfSR9HBcVpbnS4MVa3ZqoXFoZ/EbigTqE=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 6d4fb3d94227276221b28ab1c69f6a10abd3072e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 09:51:48 +0200
Subject: [PATCH 327/489] python313Packages.boto3-stubs: 1.37.28 -> 1.37.29

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 0737837d581f..8beb92b16a52 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.37.28";
+  version = "1.37.29";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-+FkmPOdsszpMed6lRc1EdYjKI6H9CQg8FvjlhgX4lRU=";
+    hash = "sha256-NkRGBqfBwQyXAN3lkPevsTRUYGVVP3YfNiB8H+uEfgs=";
   };
 
   build-system = [ setuptools ];

From c343a6d6b69c6c9b7a951d3f3a96a9e4f4b495e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 07:54:58 +0000
Subject: [PATCH 328/489] osv-scanner: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix
index 717b0871ea86..df28d244f0fc 100644
--- a/pkgs/by-name/os/osv-scanner/package.nix
+++ b/pkgs/by-name/os/osv-scanner/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "osv-scanner";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "osv-scanner";
     tag = "v${version}";
-    hash = "sha256-iYbCCGZDTUbyW1XvQIpLZEtuzwUhTBAf3EfAwRX9qYU=";
+    hash = "sha256-jE1nzpUpt2WbaG6MQfji8k5qML7bi9mGSVFzQM3+DKQ=";
   };
 
-  vendorHash = "sha256-saD4RehZrKSC5V3A5r5prlq+080BFbhEp1Jo1rCbSHI=";
+  vendorHash = "sha256-E5u4BmsB/jSsGehtNFJEMja9T5YYKDqgwT7askcaAjA=";
 
   subPackages = [
     "cmd/osv-scanner"

From a0ee269bc072f4fda6f874a62571d53915f66f54 Mon Sep 17 00:00:00 2001
From: GueLaKais <koroyeldiores@gmail.com>
Date: Sat, 5 Apr 2025 20:33:59 +0200
Subject: [PATCH 329/489] [python312Packages.]colcon: init at 0.19.0

---
 pkgs/by-name/co/colcon/package.nix            |  1 +
 .../python-modules/colcon/default.nix         | 68 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 71 insertions(+)
 create mode 100644 pkgs/by-name/co/colcon/package.nix
 create mode 100644 pkgs/development/python-modules/colcon/default.nix

diff --git a/pkgs/by-name/co/colcon/package.nix b/pkgs/by-name/co/colcon/package.nix
new file mode 100644
index 000000000000..c88b051d468a
--- /dev/null
+++ b/pkgs/by-name/co/colcon/package.nix
@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication colcon
diff --git a/pkgs/development/python-modules/colcon/default.nix b/pkgs/development/python-modules/colcon/default.nix
new file mode 100644
index 000000000000..1c6c0cc37be0
--- /dev/null
+++ b/pkgs/development/python-modules/colcon/default.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  # build-system
+  setuptools,
+  # dependencies
+  distlib,
+  empy,
+  packaging,
+  python-dateutil,
+  pyyaml,
+  # tests
+  pytestCheckHook,
+  pytest-cov-stub,
+  pytest-repeat,
+  pytest-rerunfailures,
+}:
+buildPythonPackage rec {
+  pname = "colcon-core";
+  version = "0.19.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "colcon";
+    repo = "colcon-core";
+    tag = version;
+    hash = "sha256-R/TVHPT305PwaVSisP0TtbgjCFBwCZkXOAgkYhCKpyY=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    empy
+    distlib
+    packaging
+    python-dateutil
+    pyyaml
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    pytest-repeat
+    pytest-rerunfailures
+  ];
+
+  disabledTestPaths = [
+    # Skip the linter and spell check tests that require additional dependencies
+    "test/test_flake8.py"
+    "test/test_spell_check.py"
+  ];
+
+  pythonImportsCheck = [ "colcon_core" ];
+
+  pythonRemoveDeps = [
+    # We use pytest-cov-stub instead (and it is not a runtime dependency anyways)
+    "pytest-cov"
+  ];
+
+  meta = {
+    description = "Command line tool to build sets of software packages";
+    homepage = "https://github.com/colcon/colcon-core";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ guelakais ];
+    mainProgram = "colcon";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 442976c40a3b..7f725c55c9c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2649,6 +2649,8 @@ self: super: with self; {
 
   colbert-ai = callPackage ../development/python-modules/colbert-ai { };
 
+  colcon = callPackage ../development/python-modules/colcon { };
+
   collections-extended = callPackage ../development/python-modules/collections-extended { };
 
   collidoscope = callPackage ../development/python-modules/collidoscope { };

From 6f1396f7dc459dce81252622acc156ffdf7bafde Mon Sep 17 00:00:00 2001
From: Brian McGee <brian@bmcgee.ie>
Date: Tue, 8 Apr 2025 09:50:47 +0100
Subject: [PATCH 330/489] treefmt: 2.2.0 -> 2.2.1 (#397034)

https://github.com/numtide/treefmt/releases/tag/v2.2.1
---
 pkgs/by-name/tr/treefmt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/treefmt/package.nix b/pkgs/by-name/tr/treefmt/package.nix
index 8a2713a5fc47..1210546d1332 100644
--- a/pkgs/by-name/tr/treefmt/package.nix
+++ b/pkgs/by-name/tr/treefmt/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "treefmt";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "treefmt";
     rev = "v${version}";
-    hash = "sha256-097qAvJnMpxvhXNEjk54TXQHIODXP8lpitbN0ekWN+U=";
+    hash = "sha256-gNGDqCRPvXjbfDQkEP8UsEStL9fsvUVYWPv3d8o1Bq0=";
   };
 
-  vendorHash = "sha256-UfZqxknX2tgfH8SSYQBm71FkcMRY6PVjBHzb5ZcPk4Q=";
+  vendorHash = "sha256-47yOjk3eO5K0T01GUDvheJxoAJz0ZmiV2RdqTv01pYQ=";
 
   subPackages = [ "." ];
 

From 4392f03db71ed9dc3f2dcb476a7c4fd643af0bb5 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 28 Mar 2025 10:22:26 +0100
Subject: [PATCH 331/489] nixos/cfssl: Add Disable Option

---
 nixos/modules/services/security/cfssl.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix
index 2d0465d6a0b8..514442dbe437 100644
--- a/nixos/modules/services/security/cfssl.nix
+++ b/nixos/modules/services/security/cfssl.nix
@@ -164,6 +164,12 @@ in
       ];
       description = "Log level (0 = DEBUG, 5 = FATAL).";
     };
+
+    disable = lib.mkOption {
+      default = null;
+      type = lib.types.nullOr lib.types.commas;
+      description = "Endpoints to disable (comma-separated list)";
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -218,6 +224,7 @@ in
               (opt "tls-remote-ca" tlsRemoteCa)
               (opt "db-config" dbConfig)
               (opt "loglevel" (toString logLevel))
+              (opt "disable" disable)
             ];
         }
         (lib.mkIf (cfg.dataDir == options.services.cfssl.dataDir.default) {

From 70ab722286713c7ec71cde86ce431bdc1e1b01cc Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 6 Apr 2025 21:29:03 -0700
Subject: [PATCH 332/489] llvmPackages_git: 21.0.0-unstable-2025-03-30 ->
 21.0.0-unstable-2025-04-06

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index d256295f2f2a..b0b7068d3c40 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.2".officialRelease.sha256 = "sha256-t30Jh8ckp5qD6XDxtvnSaYiAWbEi6L6hAWh6tN8JjtY=";
     "21.0.0-git".gitRelease = {
-      rev = "65734de9b93bef5b3211298b4fcc5dc79d18d31e";
-      rev-version = "21.0.0-unstable-2025-03-30";
-      sha256 = "sha256-v7/Goj8lc+8AUX/nJeqRcaudZAQoAwBZ9FtrDYX87ns=";
+      rev = "6ce0fd7f74502a75120bef43f12f56e3a5d80dfd";
+      rev-version = "21.0.0-unstable-2025-04-06";
+      sha256 = "sha256-1GjWjJeU/RgXkBBfT6+wcfLnM4O6FiqkppuL+JfjDbI=";
     };
   } // llvmVersions;
 

From 576393b6bf6c7f6cc6b3441b5728dd81a80bf317 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 01:58:00 +0000
Subject: [PATCH 333/489] vscode-extensions.angular.ng-template: 19.2.2 ->
 19.2.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4b72b470176d..8b7f7e24a294 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -257,8 +257,8 @@ let
         mktplcRef = {
           name = "ng-template";
           publisher = "Angular";
-          version = "19.2.2";
-          hash = "sha256-WoNrKcK9Gr9gVWH/pwKyEUHuzcVNKh6zQwwpG4BuVCg=";
+          version = "19.2.3";
+          hash = "sha256-fW7JtaFXBR+PL17CUCtIAXndO/fBctisHd/uZg5Dez4=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";

From 8b49226119f06b12919e8a68c9587e9317ffd2fb Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 01:59:53 +0000
Subject: [PATCH 334/489] vscode-extensions.banacorn.agda-mode: 0.5.4 -> 0.5.5

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8b7f7e24a294..163dc9e325cd 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -490,8 +490,8 @@ let
         mktplcRef = {
           publisher = "banacorn";
           name = "agda-mode";
-          version = "0.5.4";
-          hash = "sha256-U+J1FxFMK0tfi+YueXohnommHXagoadVYsZLp5lAC3Q=";
+          version = "0.5.5";
+          hash = "sha256-xz+KO743jGziLzO7pINTcOX9JV68MJ0juDl+rpr9hk8=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog";

From 042b1135e18f99ad12f9cf1e4d72b7a4df8a2514 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:00:25 +0000
Subject: [PATCH 335/489] vscode-extensions.betterthantomorrow.calva: 2.0.374
 -> 2.0.496

---
 .../vscode/extensions/betterthantomorrow.calva/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
index 4fc5c16eb7fd..bbb5f89de32c 100644
--- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "calva";
     publisher = "betterthantomorrow";
-    version = "2.0.374";
-    hash = "sha256-VwdHOkduSSIrcOvrcVf7K8DSp3N1u9fvbaCVDCxp+bk=";
+    version = "2.0.496";
+    hash = "sha256-vf6JwsMMAcAZMXTRrczgEpvmmN34eSgsO8QXNL4+DHM=";
   };
   nativeBuildInputs = [
     jq

From 14b7df355faea6339f8267a53298e2024e8d2e17 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:01:54 +0000
Subject: [PATCH 336/489] vscode-extensions.bradlc.vscode-tailwindcss: 0.14.12
 -> 0.14.14

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 163dc9e325cd..dc4c1dbe3b02 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -781,8 +781,8 @@ let
         mktplcRef = {
           name = "vscode-tailwindcss";
           publisher = "bradlc";
-          version = "0.14.12";
-          hash = "sha256-Dn+Z5uZYoWSriNnkYK1rRoHv8sjr7ui70UeTA3e0wIs=";
+          version = "0.14.14";
+          hash = "sha256-LUjVrtL1HmxzzW8OqbadN/p3DdZDwSj2iFeXudV2ULo=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog";

From b0ab18189b6e2ff3fbe0fa971b570390754291eb Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:02:37 +0000
Subject: [PATCH 337/489] vscode-extensions.castwide.solargraph: 0.24.1 ->
 0.25.0

---
 .../editors/vscode/extensions/castwide.solargraph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix b/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix
index ad38fb0393ea..0f1084cd9a24 100644
--- a/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/castwide.solargraph/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "solargraph";
     publisher = "castwide";
-    version = "0.24.1";
-    hash = "sha256-M96kGuCKo232rIwLovDU+C/rhEgZWT4s/zsR7CUYPnk=";
+    version = "0.25.0";
+    hash = "sha256-5SmCkHGCS8dYfdSm3NRk091jH44m+7kkj+VL84YKM4g=";
   };
   meta = {
     description = "Ruby language server featuring code completion, intellisense, and inline documentation";

From d17f620f0bccebbe3a29f4e3cd78fd1352b5dccf Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:03:44 +0000
Subject: [PATCH 338/489] vscode-extensions.coder.coder-remote: 1.5.0 -> 1.7.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index dc4c1dbe3b02..ef3ac066f546 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1011,8 +1011,8 @@ let
         mktplcRef = {
           name = "coder-remote";
           publisher = "coder";
-          version = "1.5.0";
-          hash = "sha256-l4F3HZKkqANw9ErCE75IpI3GIWJIkePOW9+4QsKWaVQ=";
+          version = "1.7.0";
+          hash = "sha256-uUm5kS8vjCKGpJOdyJcE/ig3DUZSsQ7LbvYodNyWF5w=";
         };
         meta = {
           description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";

From bf07ab6f98be33c0cab5298a1f90d8b17b7c19cd Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:04:29 +0000
Subject: [PATCH 339/489] vscode-extensions.cweijan.dbclient-jdbc: 1.4.2 ->
 1.4.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ef3ac066f546..051026acb473 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1158,8 +1158,8 @@ let
         mktplcRef = {
           name = "dbclient-jdbc";
           publisher = "cweijan";
-          version = "1.4.2";
-          hash = "sha256-ru4c7/6X3HfKyn5wz7I5PRh+A4bntB+FAWEGUzjMlY8=";
+          version = "1.4.3";
+          hash = "sha256-XaV7N3IFe6+gc/qrHkSUikAQghJb6k6+XE5fMYWdyDY=";
         };
         meta = {
           description = "JDBC Adapter For Database Client";

From 5e21d639fbb737bee41df6504df4d7fa586e3e8b Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:04:38 +0000
Subject: [PATCH 340/489] vscode-extensions.cweijan.vscode-database-client2:
 8.2.3 -> 8.2.4

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 051026acb473..62c4f2dbf03d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1174,8 +1174,8 @@ let
         mktplcRef = {
           name = "vscode-database-client2";
           publisher = "cweijan";
-          version = "8.2.3";
-          hash = "sha256-QOYTJSO0kGXSjvLnkbmbXSaKZcvWqO07yvZ/PNe8Fmc=";
+          version = "8.2.4";
+          hash = "sha256-tfUEUFyijRfzH805Eb26fgrIPLPv2GuOsCOqHuQQmQM=";
         };
         meta = {
           description = "Database Client For Visual Studio Code";

From 3126169ac4193d3eccc53df17ebb39c416a76cee Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:04:55 +0000
Subject: [PATCH 341/489] vscode-extensions.danielsanmedium.dscodegpt: 3.9.49
 -> 3.10.68

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 62c4f2dbf03d..4b53972794eb 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1203,8 +1203,8 @@ let
         mktplcRef = {
           publisher = "DanielSanMedium";
           name = "dscodegpt";
-          version = "3.9.49";
-          hash = "sha256-YKeUgQpnH5XrYOiUdU5R2a9PJLj2iLYPXxhGdXAqW8U=";
+          version = "3.10.68";
+          hash = "sha256-CB6XraQoMoFRhSKZzTVwsXs5ip5PfYraGR6GyULxrl0=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";

From ba932f930c7be42521ffa3afe83fcbde6ac72eea Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:05:03 +0000
Subject: [PATCH 342/489] vscode-extensions.daohong-emilio.yash: 0.3.0 -> 0.3.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4b53972794eb..53f7d4af566c 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1220,8 +1220,8 @@ let
         mktplcRef = {
           publisher = "daohong-emilio";
           name = "yash";
-          version = "0.3.0";
-          hash = "sha256-vQ0r1/DEfA6ebB4NmUciO5d4zRWS4pZeTXspWVRfe4g=";
+          version = "0.3.1";
+          hash = "sha256-DentLM/XT7b7O4vptVcja9E8pQjiDPOLilo8wjTH0IE=";
         };
         meta = {
           license = lib.licenses.mit;

From 13ded0f39c0b24883c333d690c4ad383fca36559 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:05:13 +0000
Subject: [PATCH 343/489] vscode-extensions.dart-code.dart-code: 3.107.20250311
 -> 3.108.2

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 53f7d4af566c..5b75b27946d2 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1233,8 +1233,8 @@ let
         mktplcRef = {
           name = "dart-code";
           publisher = "dart-code";
-          version = "3.107.20250311";
-          hash = "sha256-A66/oodVLCFT2+UAP+DW+Un8T5l396UDACzHYHbe7Hk=";
+          version = "3.108.2";
+          hash = "sha256-tBJSx0m/RWWkZaBdoM7awaBt7ZrfWic0AIYUAGyNz+E=";
         };
 
         meta.license = lib.licenses.mit;

From 4529101f9cca607b1e03adc161f4916d131b9e58 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:05:21 +0000
Subject: [PATCH 344/489] vscode-extensions.dart-code.flutter: 3.107.20250303
 -> 3.108.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5b75b27946d2..6cafe4c1cdd5 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1244,8 +1244,8 @@ let
         mktplcRef = {
           name = "flutter";
           publisher = "dart-code";
-          version = "3.107.20250303";
-          hash = "sha256-xhhZIZK7ywNxoXHeih/fpR0QoatIkbzcfX+eXOogzJs=";
+          version = "3.108.0";
+          hash = "sha256-+wqnHTQhVuSn46CsIVa3PCCrJ73kRr9oOLePm3uPshA=";
         };
 
         meta.license = lib.licenses.mit;

From a9ee5c3e83a4df2aefd1ff1302808b6f07e769c6 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:07:19 +0000
Subject: [PATCH 345/489] vscode-extensions.discloud.discloud: 2.22.36 ->
 2.22.40

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 6cafe4c1cdd5..2b7cd7570499 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1482,8 +1482,8 @@ let
         mktplcRef = {
           publisher = "discloud";
           name = "discloud";
-          version = "2.22.36";
-          hash = "sha256-SZ9cT5fowDS8NcWpZWU05+VEiDENs/vCikc8K6loRms=";
+          version = "2.22.40";
+          hash = "sha256-YxWla1bayzIX70PxdFSZuJum6ddazzgQKjRH7DpceTY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";

From 3d367e6b8b40c171c2408e6351ae5ed1af7c508b Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:07:34 +0000
Subject: [PATCH 346/489] 
 vscode-extensions.divyanshuagrawal.competitive-programming-helper:
 2025.3.1742989763 -> 2025.4.1743875007

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 2b7cd7570499..0f3141c0527e 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1511,8 +1511,8 @@ let
         mktplcRef = {
           name = "competitive-programming-helper";
           publisher = "DivyanshuAgrawal";
-          version = "2025.3.1742989763";
-          hash = "sha256-e7pRhZOe+6UW7VE63yX+Il2YZToR4cwYqEar+aAPlkc=";
+          version = "2025.4.1743875007";
+          hash = "sha256-WtzJ9rcssUAk2zACjqWYpwh6aHtzh9eGMGANeeFqCnU=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";

From da852649035caef1fa25e1c0ace7bca756c29731 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:08:06 +0000
Subject: [PATCH 347/489] vscode-extensions.eamodio.gitlens: 16.3.3 -> 17.0.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 0f3141c0527e..09df37401a94 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1595,8 +1595,8 @@ let
           # semver scheme, contrary to preview versions which are listed on
           # the VSCode Marketplace and use a calver scheme. We should avoid
           # using preview versions, because they expire after two weeks.
-          version = "16.3.3";
-          hash = "sha256-nc/EaMhZSdpd3ZaRQLZkSh1p4Ai3CFN4GunI2+o/+ZI=";
+          version = "17.0.1";
+          hash = "sha256-0wRhdVR9q7oFjQQM090oXRxICUMCu7BjgOGkKTxeQmg=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";

From 4c6eb33366841aba3be7d5dce8e1dd910e6208e1 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:10:00 +0000
Subject: [PATCH 348/489] vscode-extensions.firsttris.vscode-jest-runner:
 0.4.79 -> 0.4.80

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 09df37401a94..8e0817fae33f 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1898,8 +1898,8 @@ let
         mktplcRef = {
           name = "vscode-jest-runner";
           publisher = "firsttris";
-          version = "0.4.79";
-          hash = "sha256-gcykn/mOvNzFKjKyY4fVhmIWR2kBKCo1ILpp1am0dIw=";
+          version = "0.4.80";
+          hash = "sha256-Qe0EOKohvk/ALYT0QbOiYKOkBvfF63hv3T4VwiIls6A=";
         };
         meta = {
           description = "Simple way to run or debug a single (or multiple) tests from context-menu";

From 77de1124c1cccbc8ea6bd738597b039798b44880 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:11:31 +0000
Subject: [PATCH 349/489] vscode-extensions.github.copilot: 1.293.0 -> 1.297.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8e0817fae33f..077eb81ea230 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2105,8 +2105,8 @@ let
           publisher = "github";
           name = "copilot";
           # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json
-          version = "1.293.0";
-          hash = "sha256-LwgINocPHA9jL6pMw40BgaZ3lOUwWPoOJWTDr+27h5Q=";
+          version = "1.297.0";
+          hash = "sha256-UVL0Yf8MSY7ETOxmEK+dljrOQL9ctUWVhbYdr0v00b0=";
         };
 
         meta = {

From 29e660c6484d32eb8118dd1aaac8398766d50f10 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:11:57 +0000
Subject: [PATCH 350/489] vscode-extensions.github.vscode-pull-request-github:
 0.107.2025031304 -> 0.108.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 077eb81ea230..003f8af813fa 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2171,8 +2171,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "vscode-pull-request-github";
-          version = "0.107.2025031304";
-          hash = "sha256-BWmcAocEWBE7eeiyMBUcTBmozPWgLkdiDOskhf7drD8=";
+          version = "0.108.0";
+          hash = "sha256-GNNPc8nzNIrPOn+4ujKvhKodeHt9r1QlV8+EgqIz54I=";
         };
         meta = {
           license = lib.licenses.mit;

From 44080b0d35898c259a8314eeaf2aa7c50f89341e Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:12:07 +0000
Subject: [PATCH 351/489] vscode-extensions.gitlab.gitlab-workflow: 6.6.0 ->
 6.7.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 003f8af813fa..eee2aed83248 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2183,8 +2183,8 @@ let
         mktplcRef = {
           name = "gitlab-workflow";
           publisher = "gitlab";
-          version = "6.6.0";
-          hash = "sha256-Tf1rsKK1KMBonwBR/2fZv2F6VLkPYXzX7sI3EipZvrQ=";
+          version = "6.7.1";
+          hash = "sha256-qNOjbDdGrab53YYO4TCqxk8v2pmvjElgeXYU525/6Eg=";
         };
         meta = {
           description = "GitLab extension for Visual Studio Code";

From 7a1d1e95bb68a4a1085722ab16eb58f21785758c Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:14:39 +0000
Subject: [PATCH 352/489] vscode-extensions.ionic.ionic: 1.103.0 -> 1.104.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index eee2aed83248..5a756ade5d18 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2550,8 +2550,8 @@ let
         mktplcRef = {
           name = "ionic";
           publisher = "ionic";
-          version = "1.103.0";
-          hash = "sha256-TjtMkFCKu30LUvYv7nKav9EZlnmm3iXb9LlRYPPfKB0=";
+          version = "1.104.0";
+          hash = "sha256-E3Hfs7YgZ4+eF0Pg7CI7fPFt6DEtFw0DdLq4BSY7vBQ=";
         };
         meta = {
           description = "Official VSCode extension for Ionic and Capacitor development";

From 4d10e2427cd3d827c99162f0bfc0e8c3f940c3c0 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:14:50 +0000
Subject: [PATCH 353/489] vscode-extensions.ionide.ionide-fsharp: 7.25.5 ->
 7.25.7

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5a756ade5d18..c19026deb932 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2566,8 +2566,8 @@ let
         mktplcRef = {
           name = "Ionide-fsharp";
           publisher = "Ionide";
-          version = "7.25.5";
-          hash = "sha256-Aak4uML3NqMaq4IJzcGHTYbcXlq1y/ZJ6m/f1pQWoQs=";
+          version = "7.25.7";
+          hash = "sha256-6AN6LrFGWmLsCwRrtLqW1Mf+txReGeg7fvZ8W2Jv8Uo=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";

From d66279f6665886a76fd78d32f67653b3500ea107 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:16:43 +0000
Subject: [PATCH 354/489] vscode-extensions.jroesch.lean: 0.16.59 -> 0.16.60

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c19026deb932..5332cbbc6333 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2827,8 +2827,8 @@ let
         mktplcRef = {
           name = "lean";
           publisher = "jroesch";
-          version = "0.16.59";
-          hash = "sha256-tXiAM2MBF+Axd0zB7Rlgx8b8FgwlLaZex0++H2DpBls=";
+          version = "0.16.60";
+          hash = "sha256-z0mOnbqpKMH5d78jAMgDIgO+5sk4xHOWAfa4kzXYISs=";
         };
         meta = {
           changelog = "https://github.com/leanprover/vscode-lean/blob/v${mktplcRef.version}/README.md#release-notes";

From 3985135b585377d44222c589a0917949971aeab5 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:18:19 +0000
Subject: [PATCH 355/489] vscode-extensions.ltex-plus.vscode-ltex-plus: 15.4.0
 -> 15.5.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5332cbbc6333..40223353254b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3074,8 +3074,8 @@ let
         mktplcRef = {
           name = "vscode-ltex-plus";
           publisher = "ltex-plus";
-          version = "15.4.0";
-          hash = "sha256-ET7ZnXKiT4IAoySMaZn0O2awsKtWMGgnTT7xOEcSim4=";
+          version = "15.5.0";
+          hash = "sha256-tAqtWX7NHR8ftrtDRY2BGk3VwLa0Wx9OxQo8uGF/JlA=";
         };
         meta = {
           description = "VS Code extension for grammar/spell checking using LanguageTool with support for LaTeX, Markdown, and others";

From 01144c21e064e75ac61c089e34d8f79456dd3484 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:18:41 +0000
Subject: [PATCH 356/489] vscode-extensions.marp-team.marp-vscode: 3.1.1 ->
 3.2.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 40223353254b..bbcc1a9a76d8 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3119,8 +3119,8 @@ let
         mktplcRef = {
           name = "marp-vscode";
           publisher = "marp-team";
-          version = "3.1.1";
-          hash = "sha256-WRhLd5uTy3F2rBf/9emjm9JB5hvRv+dB66vhuqnedwc=";
+          version = "3.2.0";
+          hash = "sha256-SSkmvm9NJnLw38luZWF6K7g5caaivtP+v+39qPR/oyo=";
         };
         meta = {
           license = lib.licenses.mit;

From 28a7f9c97c16f15b54ae1aaadf6ced3123755c57 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:19:24 +0000
Subject: [PATCH 357/489] vscode-extensions.mechatroner.rainbow-csv: 3.18.0 ->
 3.19.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index bbcc1a9a76d8..74527f809454 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3209,8 +3209,8 @@ let
         mktplcRef = {
           name = "rainbow-csv";
           publisher = "mechatroner";
-          version = "3.18.0";
-          hash = "sha256-zmIaGvenFU8jiGHGIk3d6dmXO12t+WMwq76OEUbclgg=";
+          version = "3.19.0";
+          hash = "sha256-el3vcF90RZiXrqlBxAko9mLdeoThnwGb/JzmR1woutc=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/mechatroner.rainbow-csv/changelog";

From c4a4d5f8975962eb2dc22b41823666044396f908 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:20:27 +0000
Subject: [PATCH 358/489] 
 vscode-extensions.ms-dotnettools.vscode-dotnet-runtime: 2.3.0 -> 2.3.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 74527f809454..13be0f5e3455 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3349,8 +3349,8 @@ let
         mktplcRef = {
           name = "vscode-dotnet-runtime";
           publisher = "ms-dotnettools";
-          version = "2.3.0";
-          hash = "sha256-KfWQpg+qSxrmL4z05pk239i8bY6EMJpu6F48mJbnK08=";
+          version = "2.3.1";
+          hash = "sha256-0bn2B17kJd5uXe/MJCzYin2iWGdKD4H4nUIXdzb5NxM=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog";

From b264ab4727ab3ce7bbeed1ff73dc2397886e4fca Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:21:12 +0000
Subject: [PATCH 359/489] 
 vscode-extensions.ms-dotnettools.vscodeintellicode-csharp: 2.1.11 -> 2.2.3

---
 .../applications/editors/vscode/extensions/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 13be0f5e3455..d47f7145ebf1 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3368,26 +3368,26 @@ let
             sources = {
               "x86_64-linux" = {
                 arch = "linux-x64";
-                hash = "sha256-oQMwzQuW5vjxtDboRCeiEO5aytsAY6rb14JDTmK3JPg=";
+                hash = "sha256-pmA7BNwyHiaU93j61/MyrBV5kH0DlW+7BA6HNlKGnso=";
               };
               "x86_64-darwin" = {
                 arch = "darwin-x64";
-                hash = "sha256-/9+qtLDNYUFvdoehit3BihA38p6RqJ7na5Q27xxpZk0=";
+                hash = "sha256-E2KRzjIxLFmwArzEKittjejacrCOFFNNzphWw8v5CpE=";
               };
               "aarch64-linux" = {
                 arch = "linux-arm64";
-                hash = "sha256-JqLlYMKyTXaEzuTPPxVaO8WJiuCUN+9xBzyA6+aYdSc=";
+                hash = "sha256-pnQP1OKr3NJgUuXzO1InYqGA49OuMFn2iEf8wpl4PqM=";
               };
               "aarch64-darwin" = {
                 arch = "darwin-arm64";
-                hash = "sha256-dhiUePePkO3MxRQ5UP+lOxRax503JlERe/GWJ8pPUIg=";
+                hash = "sha256-8XIeK5AIFKQaK5YMNSRqxr5p72zXb7ZLPq6PbeWO864=";
               };
             };
           in
           {
             name = "vscodeintellicode-csharp";
             publisher = "ms-dotnettools";
-            version = "2.1.11";
+            version = "2.2.3";
           }
           // sources.${stdenv.system};
         nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

From 861b815e793d05edfbbb45ab8a4b3cb56279c4bd Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:21:21 +0000
Subject: [PATCH 360/489] 
 vscode-extensions.ms-kubernetes-tools.vscode-kubernetes-tools: 1.3.20 ->
 1.3.21

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index d47f7145ebf1..74c26f50356a 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3415,8 +3415,8 @@ let
         mktplcRef = {
           name = "vscode-kubernetes-tools";
           publisher = "ms-kubernetes-tools";
-          version = "1.3.20";
-          hash = "sha256-83KcESin+w3Y6jiSrSq6iWF99jformxr7NTnYSkKtKQ=";
+          version = "1.3.21";
+          hash = "sha256-/Y7sRpJzwmo3fgwdrYqNNu8XA+j3zohJBv9vOcm3bRk=";
         };
         meta = {
           license = lib.licenses.mit;

From d02f83691cdc0f2a2ed1be40562730b38d9969ef Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:21:41 +0000
Subject: [PATCH 361/489] vscode-extensions.ms-python.debugpy: 2025.4.1 ->
 2025.6.0

---
 .../editors/vscode/extensions/ms-python.debugpy/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
index 60ee4ebf8f62..4ae1856fe0b2 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "debugpy";
     publisher = "ms-python";
-    version = "2025.4.1";
-    hash = "sha256-PzO5CA/JaLlyMMQ0wOIIvoL116boSOpqtX9plw9IUgQ=";
+    version = "2025.6.0";
+    hash = "sha256-sdePoi+GdWi0AMWLOvVtCYkCbdxZMx2pMJAZF7aYluc=";
   };
 
   meta = {

From 30006726c9266d3b4fd08959d17cd5f6d711e4aa Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:22:33 +0000
Subject: [PATCH 362/489] vscode-extensions.ms-toolsai.jupyter: 2025.2.0 ->
 2025.3.0

---
 .../editors/vscode/extensions/ms-toolsai.jupyter/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
index dd70a4e1527d..1c88d3a0f416 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "jupyter";
     publisher = "ms-toolsai";
-    version = "2025.2.0";
-    hash = "sha256-YMvu8aEumV3VTdNZKiLK+5jmTL9y5tcMxrEBwEMcTI4=";
+    version = "2025.3.0";
+    hash = "sha256-dH74EX5PDq4t/CukjsswtKLVwbE+q0J+fpZ1MA8CDZI=";
   };
 
   nativeBuildInputs = [

From 3fadef5e250b1cf12596859c26cf73edc9f042c3 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:23:06 +0000
Subject: [PATCH 363/489] vscode-extensions.ms-vscode-remote.remote-containers:
 0.404.0 -> 0.409.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 74c26f50356a..e7b3b25f9b42 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3638,8 +3638,8 @@ let
         mktplcRef = {
           name = "remote-containers";
           publisher = "ms-vscode-remote";
-          version = "0.404.0";
-          hash = "sha256-7rPJruFk3XbDvipIYqYwwsbhofuViXsdtnKihiwRKok=";
+          version = "0.409.0";
+          hash = "sha256-K+pJeon1EWux3pnfzvwCODo55vWpA2Lvps4GFJW/ALU=";
         };
         meta = {
           description = "Open any folder or repository inside a Docker container";

From 498108cece8a28bb4481f61d8d117e0f7f754a9b Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:23:15 +0000
Subject: [PATCH 364/489] vscode-extensions.ms-vscode-remote.remote-ssh:
 0.118.0 -> 0.119.0

---
 .../vscode/extensions/ms-vscode-remote.remote-ssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix
index 024c4e5237ed..57e0e3e8b276 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix
@@ -84,8 +84,8 @@ buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "remote-ssh";
     publisher = "ms-vscode-remote";
-    version = "0.118.0";
-    hash = "sha256-LHsOjl5fIm4/ixlFs/yL/U2VRwRMigRk0Q3MtNdyzVE=";
+    version = "0.119.0";
+    hash = "sha256-S6quMPlDNSLIqyMmTZsDts5bLh2LBdAPuQibT3AEHH8=";
   };
 
   postPatch = ''

From 9024b0740ba0f39c2cb885c90590aee037764514 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:24:04 +0000
Subject: [PATCH 365/489] vscode-extensions.ms-vscode.cpptools: 1.22.2 ->
 1.24.5

---
 .../vscode/extensions/ms-vscode.cpptools/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
index 90aabc32d73f..8d2cfbad60c4 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
@@ -41,11 +41,11 @@ let
   isx86Linux = stdenv.hostPlatform.system == "x86_64-linux";
   supported = {
     x86_64-linux = {
-      hash = "sha256-ek4WBr9ZJ87TXlKQowA68YNt3WNOXymLcVfz1g+Be2o=";
+      hash = "sha256-KWr+nfODCRoZq67qwswzbcPW5WMmf9kvRwNFKpjyt4k=";
       arch = "linux-x64";
     };
     aarch64-linux = {
-      hash = "sha256-2+JqosgyoMRFnl8fnCrKljkdF3eU72mXy30ZUnaIerA=";
+      hash = "sha256-a6PwlSo3q1hLVx0JDSTwPGfjfk7CtdYCuFccSpPg7U8=";
       arch = "linux-arm64";
     };
   };
@@ -58,7 +58,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = base // {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "1.22.2";
+    version = "1.24.5";
   };
 
   nativeBuildInputs = [

From 7afafa0d282ddff59c5ac5f499df180238300435 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:25:02 +0000
Subject: [PATCH 366/489] 
 vscode-extensions.ms-windows-ai-studio.windows-ai-studio: 0.6.1 -> 0.10.9

---
 .../ms-windows-ai-studio.windows-ai-studio/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
index cdb13b4c6020..263f7baaa46e 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "windows-ai-studio";
     publisher = "ms-windows-ai-studio";
-    version = "0.6.1";
-    hash = "sha256-BAA7wSfyJ4y8how+NnaGdCf/BCU6aOmI8ew8qpcQCnY=";
+    version = "0.10.9";
+    hash = "sha256-JhpPOnzFQmTtzyl5p/dqFH/tjJ4qsfJhdco6uLUpVN4=";
   };
 
   meta = {

From 8271100fef32586bf5d782b574846e010ca17434 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:27:02 +0000
Subject: [PATCH 367/489] vscode-extensions.pkief.material-icon-theme: 5.20.0
 -> 5.21.2

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index e7b3b25f9b42..5630bb5221d1 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3952,8 +3952,8 @@ let
         mktplcRef = {
           name = "material-icon-theme";
           publisher = "PKief";
-          version = "5.20.0";
-          sha256 = "sha256-Z83FXPf8mXcxmzOdk8IG9ZcP/1OYL8pEHEKPc3pZFdo=";
+          version = "5.21.2";
+          sha256 = "sha256-HEcFa+SCosf5UonqxFQZI+G5ogxCaScmHt54xn4H4QI=";
         };
         meta = {
           license = lib.licenses.mit;

From 97fd5dfe61187387a7fb0cb260a824945f14ba18 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:28:52 +0000
Subject: [PATCH 368/489] vscode-extensions.rooveterinaryinc.roo-cline: 3.10.5
 -> 3.11.9

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

diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
index 47f844424189..e4562b1713e7 100644
--- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "RooVeterinaryInc";
     name = "roo-cline";
-    version = "3.10.5";
-    hash = "sha256-7A8BQHUu7CYA28fHv68Zvf6zhlJwwXZaNVLb+/cBAIg=";
+    version = "3.11.9";
+    hash = "sha256-+Bi9nHRXXZGKGvTS8o0CbtS6KBJmQz+Wiiinqs16vZA=";
   };
 
   passthru.updateScript = vscode-extensions-update-script { };

From ef9999ef31d5e805a0e7c8c36d077a6300486707 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:29:39 +0000
Subject: [PATCH 369/489] vscode-extensions.saoudrizwan.claude-dev: 3.8.6 ->
 3.9.2

---
 .../vscode/extensions/saoudrizwan.claude-dev/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
index 19686b60827a..86bb5c49f123 100644
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-dev";
     publisher = "saoudrizwan";
-    version = "3.8.6";
-    hash = "sha256-JqrzMZoAlBcBfQPWJn+c0PW5ScWclstg5BDPyntN3co=";
+    version = "3.9.2";
+    hash = "sha256-InlftUHtOHEszgtjPl7H6V0PkyHUEZ6MqyZTbFtjA+k=";
   };
 
   meta = {

From b906da8ad69ce3c233f0f59efa121cd8aa923203 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:31:33 +0000
Subject: [PATCH 370/489] vscode-extensions.sonarsource.sonarlint-vscode:
 4.18.0 -> 4.19.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5630bb5221d1..08cdda19ed35 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4550,8 +4550,8 @@ let
         mktplcRef = {
           publisher = "sonarsource";
           name = "sonarlint-vscode";
-          version = "4.18.0";
-          hash = "sha256-+2aeJhIwH6oiRQcPK714u8IiU3QKwhQOB0xgmsf4DXw=";
+          version = "4.19.0";
+          hash = "sha256-IjukIQIs4RoCZyzJiRDgFIPBvIK5Wn8o7NdvbfqlMBI=";
         };
         meta.license = lib.licenses.lgpl3Only;
       };

From cdf0aa730cc6074b9b3311d8b0b67d6d0d0f34b9 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:32:24 +0000
Subject: [PATCH 371/489] 
 vscode-extensions.streetsidesoftware.code-spell-checker: 4.0.41 -> 4.0.45

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 08cdda19ed35..3ee181d6c8fa 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4641,8 +4641,8 @@ let
         mktplcRef = {
           publisher = "streetsidesoftware";
           name = "code-spell-checker";
-          version = "4.0.41";
-          hash = "sha256-M/uqzU64nqSdRtxxQ1H+pg0YdkqYXEHlxmXrVcn/UqA=";
+          version = "4.0.45";
+          hash = "sha256-2goKjykQMLTRPP9Y0aBXLu3qDlhEKO00x82C18nKlIY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";

From 4df83bca243f7525be5d12feead720496722c4aa Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:33:17 +0000
Subject: [PATCH 372/489] vscode-extensions.tabnine.tabnine-vscode: 3.249.0 ->
 3.253.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 3ee181d6c8fa..5a5c6ab2c312 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4751,8 +4751,8 @@ let
         mktplcRef = {
           name = "tabnine-vscode";
           publisher = "tabnine";
-          version = "3.249.0";
-          hash = "sha256-Pp1LlVAkozh2kIEvmPxg4LuuT08MeGbMN77M5Mx81qI=";
+          version = "3.253.0";
+          hash = "sha256-4FDYIDLqb66XylX1WRGqbwqBUc0XgNG6XENEVXC/7Sk=";
         };
         meta = {
           license = lib.licenses.mit;

From 2fc1124669dca397532039257ac0cbc45e6da207 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:35:57 +0000
Subject: [PATCH 373/489] vscode-extensions.usernamehw.errorlens: 3.24.0 ->
 3.25.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5a5c6ab2c312..9f3af0aa3100 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5092,8 +5092,8 @@ let
         mktplcRef = {
           name = "errorlens";
           publisher = "usernamehw";
-          version = "3.24.0";
-          hash = "sha256-r5xXR4rDbP+2bk66yqPoLod8IZXFrntcKHuWbAiFWwE=";
+          version = "3.25.0";
+          hash = "sha256-Gszz6sGJt6DBgVCH7tgTGTX73TbKBwityJn7cY39WmU=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";

From f1836a63643f33edc0c82b3296a695c6f4f46ca3 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:36:34 +0000
Subject: [PATCH 374/489] vscode-extensions.visualjj.visualjj: 0.14.2 -> 0.14.4

---
 .../vscode/extensions/visualjj.visualjj/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index 88221112cb7b..5bbccd2b23e3 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-s3peDZApzSfemXRqRjf5fYQGHVf1DAP7XG4NuOqiGcY=";
+          hash = "sha256-Sno0UnWnuOogT9DMEF+8dMZLqxAoHSsKORkHpre40dE=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-WutwGOcXoREk6oUdFjhsKcrf64CG4GSn9JgGWiQe9l8=";
+          hash = "sha256-GaqBiAs0G9h1p2itDITPFBkFD1uOmM0fEp4tKmYFCXY=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-377T8cfY4jHX+iJjdDScMP+wX6UZCYLasl16ngwfq6U=";
+          hash = "sha256-uDRhsAGw7mEI2ztC8QWDtrHAeMwk9IzU5Sln7HQl+1Y=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-fufJ9NV73skhwBFe2vCLjh5ykQagXfO0VAdHGPhfOQ4=";
+          hash = "sha256-/5VEFXlGORo9t5ehDmLcqb0cYvJ6Gb1yIootyqpMZM8=";
         };
       };
     in
     {
       name = "visualjj";
       publisher = "visualjj";
-      version = "0.14.2";
+      version = "0.14.4";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From ab5e66011a2257ecc3541343c65a4e8f2aca81b3 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:37:35 +0000
Subject: [PATCH 375/489] vscode-extensions.vscjava.vscode-java-test: 0.43.0 ->
 0.43.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 9f3af0aa3100..913065705958 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5292,8 +5292,8 @@ let
         mktplcRef = {
           publisher = "vscjava";
           name = "vscode-java-test";
-          version = "0.43.0";
-          hash = "sha256-EM0S1Y4cRMBCRbAZgl9m6fIhANPrvdGVZXOLlDLnVWo=";
+          version = "0.43.1";
+          hash = "sha256-yiKBG1A5ahvB6iTqh2yzFzcKJlU1lu4dqd+4cygWVQ4=";
         };
         meta = {
           license = lib.licenses.mit;

From 1d12b55d10630c330d900d63f1cf0a6cf1182dfb Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 02:40:25 +0000
Subject: [PATCH 376/489] vscode-extensions.ziglang.vscode-zig: 0.6.7 -> 0.6.8

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 913065705958..71250f495667 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5681,8 +5681,8 @@ let
         mktplcRef = {
           name = "vscode-zig";
           publisher = "ziglang";
-          version = "0.6.7";
-          hash = "sha256-l8pu348v2JUg/7+Qy5B41eyraPUj9WQ1WuW1aumgM9w=";
+          version = "0.6.8";
+          hash = "sha256-u4Vd2YP47ccpz4ZMOGDN1eFS8qiC7nGIbo6YtvxNHFM=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog";

From 4a88ec510735998f817af024161830d5cdd2dab4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 09:35:41 +0000
Subject: [PATCH 377/489] openfga: 1.8.8 -> 1.8.9

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

diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 69c7e761b0f3..6fdc26636c8a 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "openfga";
-  version = "1.8.8";
+  version = "1.8.9";
 in
 
 buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "openfga";
     repo = "openfga";
     rev = "v${version}";
-    hash = "sha256-Hg6mtePtaZ2Yg3ohDVEDFsZKcBDY24K2lb+avZHfqD8=";
+    hash = "sha256-yrj59gZjYxYPVqizCm98INsWmMTTx9BkK++6Gr5mr/Y=";
   };
 
-  vendorHash = "sha256-M14y4WZZTvXm6dOkJV16TFv2xHkInZCI9rEu9h7lQ1I=";
+  vendorHash = "sha256-6rC8de55fadBCE+15kN17Xm9UmkH/fwbndLI0FXO/Cc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 9b4c271094c8acd7ea68493794d146dab269c386 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 09:32:05 +0000
Subject: [PATCH 378/489] blockbench: 4.12.2 -> 4.12.4

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

diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix
index d5236efdea77..6c6f6ba67283 100644
--- a/pkgs/by-name/bl/blockbench/package.nix
+++ b/pkgs/by-name/bl/blockbench/package.nix
@@ -12,13 +12,13 @@
 
 buildNpmPackage rec {
   pname = "blockbench";
-  version = "4.12.2";
+  version = "4.12.4";
 
   src = fetchFromGitHub {
     owner = "JannisX11";
     repo = "blockbench";
     tag = "v${version}";
-    hash = "sha256-/OdSV/wTrs6roiPiSQCqCLrlWtkB11gm3DM7r7B4HUU=";
+    hash = "sha256-tg2ICxliTmahO3twKgC4LSVyiX9K2jfA7lCcSCkzcbQ=";
   };
 
   nativeBuildInputs =
@@ -28,7 +28,7 @@ buildNpmPackage rec {
       copyDesktopItems
     ];
 
-  npmDepsHash = "sha256-ZM3hFMHuKl5BW1+10czESDknc9jIZ024mUSUdNHF3EM=";
+  npmDepsHash = "sha256-a5OjCVHPeaBEYTFIUOnc9We677oCGwAvwMv8f1QRk9Q=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 
@@ -66,7 +66,7 @@ buildNpmPackage rec {
 
       for size in 16 32 48 64 128 256 512; do
         mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-        magick convert -resize "$size"x"$size" icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png
+        magick icon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png
       done
 
       makeWrapper ${lib.getExe electron} $out/bin/blockbench \

From a25f6765c2a1b7ca209b6c1cd931ef0ef917214a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 10:11:52 +0000
Subject: [PATCH 379/489] anyrun: 0-unstable-2024-12-27 ->
 0-unstable-2025-04-04

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

diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix
index c9c9e269833d..9b22ba61467a 100644
--- a/pkgs/by-name/an/anyrun/package.nix
+++ b/pkgs/by-name/an/anyrun/package.nix
@@ -17,13 +17,13 @@
 
 rustPlatform.buildRustPackage {
   pname = "anyrun";
-  version = "0-unstable-2024-12-27";
+  version = "0-unstable-2025-04-04";
 
   src = fetchFromGitHub {
     owner = "kirottu";
     repo = "anyrun";
-    rev = "06017e753c8886d5296768dca80745ee09402a2d";
-    hash = "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o=";
+    rev = "786f539d69d5abcefa68978dbaa964ac14536a00";
+    hash = "sha256-f+oXT9b3xuBDmm4v4nDqJvlHabxxZRB6+pay4Ub/NvA=";
   };
 
   useFetchCargoVendor = true;

From 719b4583863e605c863b77915134a0ce3bd061d0 Mon Sep 17 00:00:00 2001
From: Dilip <igoldlip@gmail.com>
Date: Thu, 20 Feb 2025 10:57:41 +0530
Subject: [PATCH 380/489] layan-cursors: init at 2021-08-01

---
 pkgs/by-name/la/layan-cursors/package.nix | 38 +++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/la/layan-cursors/package.nix

diff --git a/pkgs/by-name/la/layan-cursors/package.nix b/pkgs/by-name/la/layan-cursors/package.nix
new file mode 100644
index 000000000000..c74853a85914
--- /dev/null
+++ b/pkgs/by-name/la/layan-cursors/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "layan-cursors";
+  version = "2021-08-01";
+
+  src = fetchFromGitHub {
+    owner = "vinceliuice";
+    repo = "Layan-cursors";
+    tag = finalAttrs.version;
+    hash = "sha256-Izc5Q3IuM0ryTIdL+GjhRT7JKbznyxS2Fc4pY5dksq4=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -dm 0755 $out/share/icons
+    cp -R dist $out/share/icons/layan-cursors
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Cursor theme inspired by layan gtk theme and based on capitaine-cursors";
+    changelog = "https://github.com/vinceliuice/Layan-cursors/releases/tag/${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://github.com/vinceliuice/Layan-cursors/";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ idlip ];
+  };
+
+})

From 0f1c7f59abfa9983e4c3f203734190d120277a55 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 8 Apr 2025 12:16:13 +0200
Subject: [PATCH 381/489] javaPackages.compilers: fix eval

---
 pkgs/top-level/java-packages.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index a2124af1270b..1b2c7126781a 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -57,16 +57,24 @@ with pkgs;
 
       temurin-bin = recurseIntoAttrs (
         let
-          temurinLinux = callPackage ../development/compilers/temurin-bin/jdk-linux.nix { };
-          temurinDarwin = callPackage ../development/compilers/temurin-bin/jdk-darwin.nix { };
+          temurinLinux = import ../development/compilers/temurin-bin/jdk-linux.nix {
+            inherit (pkgs) lib callPackage stdenv;
+          };
+          temurinDarwin = import ../development/compilers/temurin-bin/jdk-darwin.nix {
+            inherit (pkgs) lib callPackage;
+          };
         in
         lib.mapAttrs (name: drv: mkLinuxDarwin drv temurinDarwin.${name}) temurinLinux
       );
 
       semeru-bin = recurseIntoAttrs (
         let
-          semeruLinux = callPackage ../development/compilers/semeru-bin/jdk-linux.nix { };
-          semeruDarwin = callPackage ../development/compilers/semeru-bin/jdk-darwin.nix { };
+          semeruLinux = import ../development/compilers/semeru-bin/jdk-linux.nix {
+            inherit (pkgs) lib callPackage;
+          };
+          semeruDarwin = import ../development/compilers/semeru-bin/jdk-darwin.nix {
+            inherit (pkgs) lib callPackage;
+          };
         in
         lib.mapAttrs (name: drv: mkLinuxDarwin drv semeruDarwin.${name}) semeruLinux
       );

From 3b9649b2adf7ae426cd6e153c35e8c1a0879af09 Mon Sep 17 00:00:00 2001
From: cr0n <cr0n@cypherpunks.cc>
Date: Sun, 16 Mar 2025 17:15:15 +0100
Subject: [PATCH 382/489] necesse-server: init at 0.31.1-17664948

Dedicated server for Necesse. Release notes for this version:
https://steamcommunity.com/games/1169040/announcements/detail/534344040319026817
---
 pkgs/by-name/ne/necesse-server/package.nix | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/ne/necesse-server/package.nix

diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix
new file mode 100644
index 000000000000..49cffba090e0
--- /dev/null
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@@ -0,0 +1,51 @@
+{
+  fetchzip,
+  jre,
+  lib,
+  stdenvNoCC,
+}:
+
+let
+  version = "0.31.1-17664948";
+  urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
+
+in
+stdenvNoCC.mkDerivation {
+  pname = "necesse-server";
+  inherit version;
+
+  src = fetchzip {
+    url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
+    hash = "sha256-H7/fc3zkuEMuv9Uq00TLSLF4rT8+UWsofnuCFrmUtjU=";
+  };
+
+  # removing packaged jre since we use our own
+  postUnpack = ''
+    rm -rf "$sourceRoot/jre"
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp -r . $out
+    params='-nogui "$@"'
+    cat >$out/bin/necesse-server <<EOF
+    #! $SHELL -e
+    exec ${lib.getExe jre} -jar $out/Server.jar $params
+    EOF
+    chmod +x $out/bin/necesse-server
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://necessegame.com/server/";
+    description = "Dedicated server for Necesse";
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.unfreeRedistributable;
+    mainProgram = "necesse-server";
+    maintainers = with lib.maintainers; [ cr0n ];
+  };
+}

From fe31ed819d4cb5589be8ed4c1f84a2a85ed348fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 10:48:10 +0000
Subject: [PATCH 383/489] libretro.play: 0-unstable-2025-03-25 ->
 0-unstable-2025-04-04

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

diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index a0dd0c6399db..98861e57c740 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2025-03-25";
+  version = "0-unstable-2025-04-04";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "01d094c0c3ed723b0747079afddfd319001f01d4";
-    hash = "sha256-o8tfYg88spRZBDokc/dkRsVvvfGejYVnDQfvQ1BBRps=";
+    rev = "225e37d0dc7b8a7bb6dc3534b992373477f9923d";
+    hash = "sha256-bY4RwJyS4R/vjae2UCi4SnIW04IzoQyMOYsW4f+UQg8=";
     fetchSubmodules = true;
   };
 

From eb24b03238f56b9f70411e4c6e692698078a65ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 11:05:17 +0000
Subject: [PATCH 384/489] libretro.picodrive: 0-unstable-2025-03-25 ->
 0-unstable-2025-04-03

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

diff --git a/pkgs/applications/emulators/libretro/cores/picodrive.nix b/pkgs/applications/emulators/libretro/cores/picodrive.nix
index f7a8e3bc1bc9..04843e9eee1d 100644
--- a/pkgs/applications/emulators/libretro/cores/picodrive.nix
+++ b/pkgs/applications/emulators/libretro/cores/picodrive.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "picodrive";
-  version = "0-unstable-2025-03-25";
+  version = "0-unstable-2025-04-03";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "picodrive";
-    rev = "752c266491ae8775dab9a98dbd94472f42b9b16f";
-    hash = "sha256-l9qYOUyQzyleWeQv74rEOEwOk6iyH43WVIUHcC6Aw2Y=";
+    rev = "1a08d73159820bb31941d8c5ed6242a74bd4b332";
+    hash = "sha256-849XeceXoPHpOMlxVtHgL2TYQTHibUbGs0oHBEiCzvw=";
     fetchSubmodules = true;
   };
 

From 9b2cc71d22468af176558a735844026ada40f4af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 11:08:44 +0000
Subject: [PATCH 385/489] libretro.scummvm: 0-unstable-2025-03-09 ->
 0-unstable-2025-04-05

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

diff --git a/pkgs/applications/emulators/libretro/cores/scummvm.nix b/pkgs/applications/emulators/libretro/cores/scummvm.nix
index 7e545bb3c28a..13082d102542 100644
--- a/pkgs/applications/emulators/libretro/cores/scummvm.nix
+++ b/pkgs/applications/emulators/libretro/cores/scummvm.nix
@@ -25,13 +25,13 @@ let
 in
 mkLibretroCore {
   core = "scummvm";
-  version = "0-unstable-2025-03-09";
+  version = "0-unstable-2025-04-05";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "scummvm";
-    rev = "8e9d265d81661dcffe0bc326e07e50af5d1d224a";
-    hash = "sha256-BdBQoj358uL7VNPZozRA4oEG5KS09rkucd80vQgkaDo=";
+    rev = "9d31b31c179fd4a43f7cfc383a3435a9070c6aa8";
+    hash = "sha256-E5e30Iowwr8pnryncnzlPjBhpIEuKqAHxHk+HwagEnE=";
   };
 
   extraBuildInputs = [

From 94214706c4713857fdad0082aad47cde51e62fc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Mar 2025 09:24:26 +0000
Subject: [PATCH 386/489] vaultenv: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index d19f1fb1f5aa..0b44a8b05395 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -32,13 +32,13 @@
 }:
 mkDerivation rec {
   pname = "vaultenv";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "channable";
     repo = "vaultenv";
     rev = "v${version}";
-    hash = "sha256-Jb+Y/Cbapw2ZCXMwXMw1hsy0vT/K8mM/A/Z1all7y+A=";
+    hash = "sha256-Qb9GMAFjQBsPItwkiWSMWv8WJyc5hOz9Yrq5PPOFVQo=";
   };
 
   buildTools = [ hpack ];

From e10420c0d7b00e74a5cc5140a7201da6d759a85a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 11:21:03 +0000
Subject: [PATCH 387/489] libretro.pcsx-rearmed: 0-unstable-2025-03-26 ->
 0-unstable-2025-03-30

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

diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
index f107b64f8d5d..445e0cea6ca3 100644
--- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
+++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "pcsx-rearmed";
-  version = "0-unstable-2025-03-26";
+  version = "0-unstable-2025-03-30";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "pcsx_rearmed";
-    rev = "4b0894f55fb7244b522fb720f41363e86f2085fe";
-    hash = "sha256-748TR87fO1BLBWwDAJxkEBr327g64RUTdBvvMu6lSEI=";
+    rev = "6091efb4d64ed745495455ba82352ec82f55cb4f";
+    hash = "sha256-9FyD3a6FE7xtt/UGvRNfopvQPgAg/0QGrJ1NNMEIsyg=";
   };
 
   dontConfigure = true;

From c5b3992d9fefed47978bd677cf6dc2b65ab68915 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 11:27:59 +0000
Subject: [PATCH 388/489] libretro.beetle-pce-fast: 0-unstable-2025-03-07 ->
 0-unstable-2025-03-28

---
 .../emulators/libretro/cores/beetle-pce-fast.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
index 53fa19ff4df0..c9911c347d1b 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-pce-fast";
-  version = "0-unstable-2025-03-07";
+  version = "0-unstable-2025-03-28";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pce-fast-libretro";
-    rev = "9f2b7943db1fb784daf0948b0b493bc7f76919f8";
-    hash = "sha256-fwrfZ0Z/DAtDRuBqxCS11/qNoomAtUgEOf4eOLk9vO0=";
+    rev = "4ee33ff536f14295c178a037f9b5d5a960ce3c6f";
+    hash = "sha256-ZL+aV469RHp5SSBFmK0q+1h2MdcM1q+TZu5Rrv/N0DU=";
   };
 
   makefile = "Makefile";

From be36cd0ec29cc1263e3434d9df91b0963746edfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 11:47:38 +0000
Subject: [PATCH 389/489] libretro.mame2003: 0-unstable-2025-03-18 ->
 0-unstable-2025-04-02

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

diff --git a/pkgs/applications/emulators/libretro/cores/mame2003.nix b/pkgs/applications/emulators/libretro/cores/mame2003.nix
index ddc92524eeac..6a21b1681378 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003";
-  version = "0-unstable-2025-03-18";
+  version = "0-unstable-2025-04-02";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-libretro";
-    rev = "8565eec2e963b78f07a5a1f4b74df1271f3ece13";
-    hash = "sha256-pChPUwKIOtP4nl9ReqlrgxOJ/qcO6m2SnHhx3Y+hktM=";
+    rev = "a0547e84a8f58856551ca2d252f05f56212810a4";
+    hash = "sha256-POpKNpPOyOp/EkrUTa2esOJAaWoJvuijDToF6/V41uU=";
   };
 
   # Fix build with GCC 14

From b0ec4d70046a0822929a9caef63da6a6a0f5aeb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 18:51:47 +0000
Subject: [PATCH 390/489] stripe-cli: 1.25.1 -> 1.26.0

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

diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index 71bb01cb86e2..58e61329b4b9 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "stripe-cli";
-  version = "1.25.1";
+  version = "1.26.0";
 
   src = fetchFromGitHub {
     owner = "stripe";
     repo = "stripe-cli";
     rev = "v${version}";
-    hash = "sha256-WlLrWMDOwpSoHUixkJbCoewt/4UgnTbwIMBD5p5SI3c=";
+    hash = "sha256-gnV7BPHtbv6wFcgVUhKfIrskfAZIyZq6LtQwQYAkFCQ=";
   };
-  vendorHash = "sha256-dWLrJ866R+yPEYs4vc8SRADZXC1xCO7sDosHbU1G63o=";
+  vendorHash = "sha256-T8vrEbR240ihkLDG4vu0s+MxKJ5nOLm0aseDgK9EPPE=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From f9036aec78e69f295113c74346065338dbab0d2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 11:53:45 +0000
Subject: [PATCH 391/489] libretro.mame2003-plus: 0-unstable-2025-03-27 ->
 0-unstable-2025-04-07

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

diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
index 876cc55cc95b..4c0f638580f3 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003-plus";
-  version = "0-unstable-2025-03-27";
+  version = "0-unstable-2025-04-07";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-plus-libretro";
-    rev = "4df08f409666e46a0a2d94c3cebcfbba72975ca9";
-    hash = "sha256-Dp4f3j9Zm3BLMftEJSDSYrqPy1zJ8miStiUTI9mFdLw=";
+    rev = "2b5fc26ee64d963021bc266aa45f19d90b282f92";
+    hash = "sha256-ZbebYUOUdaLVTh+VD8AQvAv/zQzr6tugJRl3iYSrUeo=";
   };
 
   makefile = "Makefile";

From 716f63e0df28291c2d5dc27ca6e8de924bac8f39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 11:04:56 +0000
Subject: [PATCH 392/489] unshield: 1.5.1 -> 1.6.2

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

diff --git a/pkgs/by-name/un/unshield/package.nix b/pkgs/by-name/un/unshield/package.nix
index e3f2ff9be845..cbcfe71b52d0 100644
--- a/pkgs/by-name/un/unshield/package.nix
+++ b/pkgs/by-name/un/unshield/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "unshield";
-  version = "1.5.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "twogood";
     repo = "unshield";
     rev = version;
-    sha256 = "1p2inn93svm83kr5p0j1al0rx47f1zykmagxsblgy04gi942iza3";
+    sha256 = "sha256-CYlrPwNPneJIwvQCnzyfi6MZiXoflMDfUDCRL79+yBk=";
   };
 
   nativeBuildInputs = [ cmake ];

From 4b3ade95dd974e3ccf8d7ed704e3d032a27b761d Mon Sep 17 00:00:00 2001
From: Cosima Neidahl <opna2608@protonmail.com>
Date: Tue, 8 Apr 2025 13:57:37 +0200
Subject: [PATCH 393/489] lomiri.lomiri-ui-extras: 0.6.3 -> 0.7.0 (#394901)

---
 .../lomiri/qml/lomiri-ui-extras/default.nix     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
index 800163372b0a..81093351ea6a 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
@@ -18,18 +18,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-ui-extras";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-ui-extras";
-    rev = finalAttrs.version;
-    hash = "sha256-SF/UF84K9kNtLHO9FDuIFdQId0NfbmRiRZiPrOKvE9o=";
+    tag = finalAttrs.version;
+    hash = "sha256-fN9rZC8J8xyAStvBNTpLqAcssaiQQpu6INwMLlnkvfw=";
   };
 
   postPatch = ''
     substituteInPlace modules/Lomiri/Components/Extras{,/{plugin,PamAuthentication}}/CMakeLists.txt \
-      --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
+      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
   '';
 
   strictDeps = true;
@@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
+    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
     (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (
       lib.concatStringsSep ";" [
         # Exclude tests
@@ -103,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Lomiri UI Extra Components";
     longDescription = ''
       A collection of UI components that for various reasons can't be included in
@@ -112,8 +113,8 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-extras";
     changelog = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/blob/${finalAttrs.version}/ChangeLog";
-    license = licenses.gpl3Only;
-    maintainers = teams.lomiri.members;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = lib.teams.lomiri.members;
+    platforms = lib.platforms.linux;
   };
 })

From c64a68560e2b9dddbb77dd7960fbfdccef926297 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Tue, 1 Apr 2025 14:29:25 -0400
Subject: [PATCH 394/489] picolibc: init at 1.8.9

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

diff --git a/pkgs/by-name/pi/picolibc/package.nix b/pkgs/by-name/pi/picolibc/package.nix
new file mode 100644
index 000000000000..df0e3bfdd612
--- /dev/null
+++ b/pkgs/by-name/pi/picolibc/package.nix
@@ -0,0 +1,80 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  lib,
+  meson,
+  ninja,
+  nix-update-script,
+
+  # General Build Options
+  multilib ? true,
+}:
+let
+  inherit (lib.strings) mesonBool mesonOption;
+in
+stdenv.mkDerivation (finalAttrs: {
+  name = "picolibc";
+  version = "1.8.9";
+  strictDeps = true;
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "picolibc";
+    repo = "picolibc";
+    rev = "db4d0fe5952d5ecd714781e3212d4086d970735a";
+    hash = "sha256-W1zK9mLMfi5pbOpbSLxiB2qKdiyNjOSQu96NM94/fcY=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
+
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/doc/os.md?plain=1#L183
+  mesonFlags = [
+    (mesonBool "multilib" multilib)
+    (mesonOption "specsdir" "${placeholder "dev"}/lib")
+    (mesonOption "tls-model" "global-dynamic")
+    (mesonOption "errno-function" "auto")
+    (mesonBool "picolib" false)
+    (mesonBool "picocrt" false)
+    (mesonBool "semihost" false)
+    (mesonBool "use-stdlib" true)
+    (mesonBool "posix-console" true)
+    (mesonBool "newlib-global-atexit" true)
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      arm = pkgsCross.arm-embedded.picolibc;
+    };
+  };
+
+  meta =
+    let
+      inherit (lib) licenses maintainers;
+    in
+    {
+      description = "C library designed for embedded 32- and 64- bit systems";
+      longDescription = ''
+        Picolibc is library offering standard C library APIs that targets
+        small embedded systems with limited RAM. Picolibc was formed by blending
+        code from [Newlib](http://sourceware.org/newlib/) and
+        [AVR Libc](https://www.nongnu.org/avr-libc/).
+      '';
+      homepage = "https://keithp.com/picolibc/";
+      changelog = "https://github.com/picolibc/picolibc/releases/tag/${finalAttrs.version}";
+      license = [
+        licenses.bsd2
+        licenses.bsd3
+      ];
+      maintainers = [ maintainers.RossSmyth ];
+      # https://github.com/picolibc/picolibc/tree/db4d0fe5952d5ecd714781e3212d4086d970735a?tab=readme-ov-file#supported-architectures
+      platforms = lib.platforms.all;
+    };
+})

From c115936c3c8967597bb22b6da09ce8e7cc92275d Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Tue, 1 Apr 2025 16:51:13 -0400
Subject: [PATCH 395/489] picolibc: Add config options

---
 pkgs/by-name/pi/picolibc/package.nix | 176 ++++++++++++++++++++++++---
 1 file changed, 161 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/pi/picolibc/package.nix b/pkgs/by-name/pi/picolibc/package.nix
index df0e3bfdd612..afc7a140b819 100644
--- a/pkgs/by-name/pi/picolibc/package.nix
+++ b/pkgs/by-name/pi/picolibc/package.nix
@@ -5,15 +5,97 @@
   meson,
   ninja,
   nix-update-script,
+  pkgsCross,
 
   # General Build Options
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L40-L57
   multilib ? true,
+  sanitize-bounds ? false,
+  sanitize-trap-on-error ? false,
+  profile ? false,
+  analyzer ? false,
+  assert-verbose ? true,
+  fast-strcmp ? true,
+
+  # Testing options
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L75
+  picolib ? stdenv.hostPlatform.isNone,
+  semihost ? stdenv.hostPlatform.isNone,
+
+  # Stdio Options
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L114
+  tinystdio ? true,
+  io-c99-formats ? true,
+  io-long-long ? false,
+  io-pos-args ? false,
+  io-long-double ? false,
+
+  # Tinystdio options
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L129
+  io-float-exact ? true,
+  atomic-ungetc ? true,
+  posix-console ? !stdenv.hostPlatform.isNone,
+  format-default ? "double",
+  printf-aliases ? true,
+  io-percent-b ? false,
+  printf-small-ultoa ? true,
+  printf-percent-n ? false,
+  minimal-io-long-long ? false,
+  fast-bufio ? false,
+  io-wchar ? false,
+
+  # Internaltionalization options
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L181
+  mb-capable ? false,
+  mb-extended-charsets ? false,
+  mb-ucs-charsets ? "auto",
+  mb-iso-charsets ? "auto",
+  mb-jis-charsets ? "auto",
+  mb-windows-charsets ? "auto",
+
+  # Startup/shutdown options
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L198
+  picocrt ? stdenv.hostPlatform.isNone,
+  picocrt-enable-mmu ? true,
+  picocrt-lib ? true,
+  picoexit ? true,
+  initfini-array ? true,
+  crt-runtime-size ? false,
+
+  # Legacy (non-picoexit) startup/shutdown options
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L217
+  newlib-atexit-dynamic-alloc ? false,
+  newlib-global-atexit ? !stdenv.hostPlatform.isNone,
+  newlib-register-fini ? false,
+
+  # Malloc options
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L228
+  newlib-nano-malloc ? true,
+  nano-malloc-clear-freed ? false,
+
+  # Locking options
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L237
+  single-thread ? false,
+
+  # TLS storage options
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L244
+  thread-local-storage ? "picolibc",
+  tls-model ? if stdenv.hostPlatform.isNone then "local-exec" else "global-dynamic",
+  newlib-global-errno ? false,
+  errno-function ? if stdenv.hostPlatform.isNone then "false" else "auto",
+  tls-rp2040 ? false,
+
+  # Math options
+  # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/meson_options.txt#L261
+  want-math-errno ? false,
 }:
 let
   inherit (lib.strings) mesonBool mesonOption;
+
+  canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 in
 stdenv.mkDerivation (finalAttrs: {
-  name = "picolibc";
+  pname = "picolibc";
   version = "1.8.9";
   strictDeps = true;
 
@@ -24,8 +106,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "picolibc";
-    repo = "picolibc";
-    rev = "db4d0fe5952d5ecd714781e3212d4086d970735a";
+    repo = finalAttrs.pname;
+    tag = finalAttrs.version;
     hash = "sha256-W1zK9mLMfi5pbOpbSLxiB2qKdiyNjOSQu96NM94/fcY=";
   };
 
@@ -34,19 +116,83 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
+  # Default values taken from
+  # Build fails without using them.
   # https://github.com/picolibc/picolibc/blob/e57b766cb5d80f23c20d05ab067001d85910f927/doc/os.md?plain=1#L183
-  mesonFlags = [
-    (mesonBool "multilib" multilib)
-    (mesonOption "specsdir" "${placeholder "dev"}/lib")
-    (mesonOption "tls-model" "global-dynamic")
-    (mesonOption "errno-function" "auto")
-    (mesonBool "picolib" false)
-    (mesonBool "picocrt" false)
-    (mesonBool "semihost" false)
-    (mesonBool "use-stdlib" true)
-    (mesonBool "posix-console" true)
-    (mesonBool "newlib-global-atexit" true)
-  ];
+  mesonFlags =
+    [
+      (mesonBool "multilib" multilib)
+      (mesonBool "sanitize-bounds" sanitize-bounds)
+      (mesonBool "sanitize-trap-on-error" sanitize-trap-on-error)
+      (mesonBool "profile" profile)
+      (mesonBool "analyzer" analyzer)
+      (mesonBool "assert-verbose" assert-verbose)
+      (mesonBool "fast-strcmp" fast-strcmp)
+
+      # Testing options
+      (mesonBool "picolib" picolib)
+      (mesonBool "semihost" semihost)
+      (mesonBool "use-stdlib" true)
+
+      # Install options
+      (mesonOption "specsdir" "${placeholder "dev"}/lib")
+
+      (mesonBool "tinystdio" tinystdio)
+      (mesonBool "io-c99-formats" io-c99-formats)
+      (mesonBool "io-long-long" io-long-long)
+      (mesonBool "io-pos-args" io-pos-args)
+      (mesonBool "io-long-double" io-long-double)
+
+      (mesonBool "io-float-exact" io-float-exact)
+      (mesonBool "atomic-ungetc" atomic-ungetc)
+      (mesonBool "posix-console" posix-console)
+      (mesonOption "format-default" format-default)
+      (mesonBool "printf-aliases" printf-aliases)
+      (mesonBool "io-percent-b" io-percent-b)
+      (mesonBool "printf-small-ultoa" printf-small-ultoa)
+      (mesonBool "printf-percent-n" printf-percent-n)
+      (mesonBool "minimal-io-long-long" minimal-io-long-long)
+      (mesonBool "fast-bufio" fast-bufio)
+      (mesonBool "io-wchar" io-wchar)
+
+      (mesonBool "mb-capable" mb-capable)
+      (mesonBool "mb-extended-charsets" mb-extended-charsets)
+      (mesonOption "mb-ucs-charsets" mb-ucs-charsets)
+      (mesonOption "mb-iso-charsets" mb-iso-charsets)
+      (mesonOption "mb-jis-charsets" mb-jis-charsets)
+      (mesonOption "mb-windows-charsets" mb-windows-charsets)
+
+      (mesonBool "picocrt" picocrt)
+      (mesonBool "picocrt-enable-mmu" picocrt-enable-mmu)
+      (mesonBool "picocrt-lib" picocrt-lib)
+      (mesonBool "picoexit" picoexit)
+      (mesonBool "newlib-initfini-array" initfini-array)
+      (mesonBool "crt-runtime-size" crt-runtime-size)
+
+      (mesonBool "newlib-atexit-dynamic-alloc" newlib-atexit-dynamic-alloc)
+      (mesonBool "newlib-global-atexit" newlib-global-atexit)
+      (mesonBool "newlib-register-fini" newlib-register-fini)
+
+      (mesonBool "newlib-nano-malloc" newlib-nano-malloc)
+      (mesonBool "nano-malloc-clear-freed" nano-malloc-clear-freed)
+
+      (mesonBool "newlib-multithread" (!single-thread))
+
+      (mesonOption "thread-local-storage" thread-local-storage)
+      (mesonOption "tls-model" tls-model)
+      (mesonBool "newlib-global-errno" newlib-global-errno)
+      (mesonOption "errno-function" errno-function)
+      (mesonBool "tls-rp2040" tls-rp2040)
+
+      (mesonBool "want-math-errno" want-math-errno)
+    ]
+    ++ lib.optionals finalAttrs.doCheck [
+      (mesonBool "tests" true)
+      # Something is broken with this and I'm not sure what.
+      (mesonOption "tests-cdefs" "false")
+    ];
+
+  doCheck = canExecute;
 
   passthru = {
     updateScript = nix-update-script { };

From 3ca4d61a1d772ce4341ef2a6017ca1cbc60d03e7 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Tue, 8 Apr 2025 15:18:52 +0300
Subject: [PATCH 396/489] =?UTF-8?q?sile:=200.15.9=20=E2=86=92=200.15.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix
index cfffab29a406..750f31fe0c4d 100644
--- a/pkgs/by-name/si/sile/package.nix
+++ b/pkgs/by-name/si/sile/package.nix
@@ -29,18 +29,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sile";
-  version = "0.15.9";
+  version = "0.15.10";
 
   src = fetchurl {
     url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst";
-    hash = "sha256-+9pZUDszPYJmFgHbZH0aKtZ6qLcJjh73jG2CFoRKxWc=";
+    hash = "sha256-sPABtKfIpamGNWELnCnkVagHeuHq/1KoT364/aLHDu0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
     dontConfigure = true;
     nativeBuildInputs = [ zstd ];
-    hash = "sha256-FdUrivumG5R69CwZedpkBzds5PcZr4zSsA6QW/+rDBM=";
+    hash = "sha256-57NcGm46aggPO+/54P1arCSPV3BHlAWwmWIzbpkT2js=";
   };
 
   nativeBuildInputs = [

From 10c071b1079a2d2ba5f1849816c6c515adf97288 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Mon, 7 Apr 2025 14:48:55 +0200
Subject: [PATCH 397/489] centrifugo: fix ldflags paths and nixos test for v6

---
 nixos/tests/centrifugo.nix             | 17 +++++++++--------
 pkgs/by-name/ce/centrifugo/package.nix |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/centrifugo.nix b/nixos/tests/centrifugo.nix
index 8ad44a011663..51afeb3dee76 100644
--- a/nixos/tests/centrifugo.nix
+++ b/nixos/tests/centrifugo.nix
@@ -21,12 +21,15 @@ in
           services.centrifugo = {
             enable = true;
             settings = {
-              inherit name;
-              port = centrifugoPort;
-              # See https://centrifugal.dev/docs/server/engines#redis-sharding
-              engine = "redis";
-              # Connect to local Redis shard via Unix socket.
-              redis_address =
+              node = {
+                inherit name;
+              };
+              http_server.port = centrifugoPort;
+              http_api.insecure = true;
+              usage_stats.disabled = true;
+
+              engine.type = "redis";
+              engine.redis.address =
                 let
                   toRedisAddresses = map (name: "${name}:${toString redisPort}");
                 in
@@ -35,8 +38,6 @@ in
                   "unix://${config.services.redis.servers.centrifugo.unixSocket}"
                 ]
                 ++ toRedisAddresses (lib.drop (index + 1) nodes);
-              usage_stats_disable = true;
-              api_insecure = true;
             };
             extraGroups = [
               config.services.redis.servers.centrifugo.user
diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix
index 44c8139c955e..07ed329661d1 100644
--- a/pkgs/by-name/ce/centrifugo/package.nix
+++ b/pkgs/by-name/ce/centrifugo/package.nix
@@ -30,9 +30,9 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X=github.com/centrifugal/centrifugo/v5/internal/build.Version=${version}"
-    "-X=github.com/centrifugal/centrifugo/v5/internal/build.UsageStatsEndpoint=${statsEndpoint}"
-    "-X=github.com/centrifugal/centrifugo/v5/internal/build.UsageStatsToken=${statsToken}"
+    "-X=github.com/centrifugal/centrifugo/v6/internal/build.Version=${version}"
+    "-X=github.com/centrifugal/centrifugo/v6/internal/build.UsageStatsEndpoint=${statsEndpoint}"
+    "-X=github.com/centrifugal/centrifugo/v6/internal/build.UsageStatsToken=${statsToken}"
   ];
 
   excludedPackages = [

From 119b243fd36828e3a3693b679068a2cbc827b36f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Mon, 7 Apr 2025 15:35:45 +0200
Subject: [PATCH 398/489] centrifugo: add valodim as maintainer

---
 nixos/tests/centrifugo.nix             | 5 ++++-
 pkgs/by-name/ce/centrifugo/package.nix | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/centrifugo.nix b/nixos/tests/centrifugo.nix
index 51afeb3dee76..5867297c3d30 100644
--- a/nixos/tests/centrifugo.nix
+++ b/nixos/tests/centrifugo.nix
@@ -10,7 +10,10 @@ in
 { lib, ... }:
 {
   name = "centrifugo";
-  meta.maintainers = [ lib.maintainers.tie ];
+  meta.maintainers = [
+    lib.maintainers.tie
+    lib.maintainers.valodim
+  ];
 
   nodes = lib.listToAttrs (
     lib.imap0 (index: name: {
diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix
index 07ed329661d1..9a74648e6efa 100644
--- a/pkgs/by-name/ce/centrifugo/package.nix
+++ b/pkgs/by-name/ce/centrifugo/package.nix
@@ -56,7 +56,10 @@ buildGoModule rec {
     homepage = "https://centrifugal.dev";
     changelog = "https://github.com/centrifugal/centrifugo/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.tie ];
+    maintainers = [
+      lib.maintainers.tie
+      lib.maintainers.valodim
+    ];
     mainProgram = "centrifugo";
   };
 }

From ffcc12d1924df723e46719deec4fa175d953b5d0 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 8 Apr 2025 10:29:08 +0200
Subject: [PATCH 399/489] centrifugo: add release note and assertion for
 compatibility

---
 doc/release-notes/rl-2505.section.md             | 2 ++
 nixos/modules/services/networking/centrifugo.nix | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 6a6a797269c6..ddc57c62a89f 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -110,6 +110,8 @@
 
 - `pkgs.nextcloud28` has been removed since it's out of support upstream.
 
+- `centrifugo` was updated to v6, which uses a new config format. See [upstream documentation](https://centrifugal.dev/docs/getting-started/migration_v6) for migration.
+
 - `teleport` has been upgraded from major version 16 to major version 17.
   Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/)
   and [release notes for v17](https://goteleport.com/docs/changelog/#1701-11152024).
diff --git a/nixos/modules/services/networking/centrifugo.nix b/nixos/modules/services/networking/centrifugo.nix
index 7b9a05069498..0f2a9f3e5f6a 100644
--- a/nixos/modules/services/networking/centrifugo.nix
+++ b/nixos/modules/services/networking/centrifugo.nix
@@ -65,6 +65,14 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion =
+          (lib.versionAtLeast cfg.package.version "6") -> (!(cfg.settings ? name) && !(cfg.settings ? port));
+        message = "`services.centrifugo.settings` is v5 config, must be compatible with centrifugo v6 config format";
+      }
+    ];
+
     systemd.services.centrifugo = {
       description = "Centrifugo messaging server";
       wantedBy = [ "multi-user.target" ];

From ef7511cb79226956f7a088862b41564c6416a026 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 12:25:13 +0000
Subject: [PATCH 400/489] libretro.beetle-psx: 0-unstable-2025-03-28 ->
 0-unstable-2025-04-04

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

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
index 50679b0bf8c9..c0f00af9e778 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-psx" + lib.optionalString withHw "-hw";
-  version = "0-unstable-2025-03-28";
+  version = "0-unstable-2025-04-04";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-psx-libretro";
-    rev = "e2522914f72291ad7232d996e7eabdf167b1b414";
-    hash = "sha256-uxnRNP5BRpabHLjuI4IiLzqCfRobETEMnwJ9mw+ZdaE=";
+    rev = "90c09d4b8e6923a22538c35f68ace2d9fead134d";
+    hash = "sha256-eVoKmGE3N8uePcNpxWjAjgUjTIfEHZR3K2FLtQtLp+M=";
   };
 
   extraBuildInputs = lib.optionals withHw [

From 3ca68569ffb49fd6af7a83ad7adac6fbbdfb09e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 12:39:53 +0000
Subject: [PATCH 401/489] libretro.bsnes: 0-unstable-2025-03-07 ->
 0-unstable-2025-04-04

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

diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix
index 539bcef66f52..07f1f03b2148 100644
--- a/pkgs/applications/emulators/libretro/cores/bsnes.nix
+++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bsnes";
-  version = "0-unstable-2025-03-07";
+  version = "0-unstable-2025-04-04";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bsnes-libretro";
-    rev = "ec353ea2502be9b71f3d9830b7a7b66ee69e254c";
-    hash = "sha256-9QRKEIi1JHd503KN9+DKxLMJMJWyNu9vomPAmlbb/zw=";
+    rev = "8d89089d35bedc257dc13bebd3790f70417311a5";
+    hash = "sha256-0n2N2Ks8MIy7dcuj2SESjDNxma7RRhAgOxQ5sC3XJTM=";
   };
 
   makefile = "Makefile";

From ed1af45b73c45dc1ac93721437bed05ae9e47a0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 12:42:11 +0000
Subject: [PATCH 402/489] libretro.fceumm: 0-unstable-2025-02-12 ->
 0-unstable-2025-04-06

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

diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix
index fe7a6f78ed78..3039615973f7 100644
--- a/pkgs/applications/emulators/libretro/cores/fceumm.nix
+++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fceumm";
-  version = "0-unstable-2025-02-12";
+  version = "0-unstable-2025-04-06";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-fceumm";
-    rev = "26f92531a95a9a74f45a8bf13fc9f3f48cde2976";
-    hash = "sha256-XtSuZEfu03dFMQUX4VvpeFLzoWG3TeIBQG4cQkap+t8=";
+    rev = "b349f7f3e211bb7725f133d3818ab98da5059760";
+    hash = "sha256-MNYpuipjnDl9GUl5qWGi5W5cFhUCd/weCKuTRdttKJ4=";
   };
 
   meta = {

From e01616c9ff34c46cb0b2e086650de3be04c52917 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 12:55:23 +0000
Subject: [PATCH 403/489] libretro.mame: 0-unstable-2025-03-06 ->
 0-unstable-2025-04-01

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

diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix
index 82855f07f20f..587f11685853 100644
--- a/pkgs/applications/emulators/libretro/cores/mame.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame.nix
@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
   core = "mame";
-  version = "0-unstable-2025-03-06";
+  version = "0-unstable-2025-04-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame";
-    rev = "40edadab2e445bfda9d206def9508b43b11fb96a";
-    hash = "sha256-TrDx77VCdtLuihwhlz+sYkUvegTxsG8eAn3h6KYO3z0=";
+    rev = "a638be8510d061f435e2abd46e514bb6c7e41262";
+    hash = "sha256-adMLJ3mm+02X07UwG3ojhdt1x5+FvCartxNc/EHz4CQ=";
     fetchSubmodules = true;
   };
 

From 05f9749e6c4ed120092372a6757cfe6a6e24773d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 12:58:58 +0000
Subject: [PATCH 404/489] bao: 0.13.0 -> 0.13.1

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

diff --git a/pkgs/by-name/ba/bao/package.nix b/pkgs/by-name/ba/bao/package.nix
index 56a3071df33a..cf01ae2ff834 100644
--- a/pkgs/by-name/ba/bao/package.nix
+++ b/pkgs/by-name/ba/bao/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bao";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchCrate {
     inherit version;
     pname = "${pname}_bin";
-    hash = "sha256-MpMNhL1n8dNJJcJJiDXv/qWUgCNqQIvvcR8veH+abuI=";
+    hash = "sha256-8h5otpu3z2Hgy0jMCITJNr8Q4iVdlR5Lea2X+WuenWs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Vw8T/pgGMjI8QklkQNuZSYmKcKhaR320q8ZBAT4HPZ8=";
+  cargoHash = "sha256-B0wvJTcIRJxBU0G1DONnKeQYrmsmMIorhTLc73o4/kE=";
 
   meta = {
     description = "Implementation of BLAKE3 verified streaming";

From 659512012c2f16ba4b91dffb658e5516be1a884b Mon Sep 17 00:00:00 2001
From: Igal Tabachnik <hmemcpy@gmail.com>
Date: Tue, 8 Apr 2025 13:17:44 +0300
Subject: [PATCH 405/489] Adding libGL explicitly as a common LD library for
 all JetBrains products

---
 pkgs/applications/editors/jetbrains/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 8e3053497b05..57651d9773d2 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -82,9 +82,9 @@ let
         pname
         jdk
         extraWrapperArgs
-        extraLdPath
         extraBuildInputs
         ;
+      extraLdPath = extraLdPath ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libGL ];
       src =
         if fromSource then
           communitySources."${pname}"
@@ -336,7 +336,6 @@ rec {
         libICE
         libSM
         libX11
-        libGL
       ];
     }).overrideAttrs
       (attrs: {
@@ -378,7 +377,6 @@ rec {
           libxcrypt-legacy
           fontconfig
           xorg.libX11
-          libGL
         ]
         ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
           expat

From a858cb1e2db2f1a4d4523654c983af2eb685dc14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 13:07:00 +0000
Subject: [PATCH 406/489] source-meta-json-schema: 7.0.3 -> 8.0.0

---
 pkgs/by-name/so/source-meta-json-schema/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix
index 0c9b70eaf960..afcf8fdd2273 100644
--- a/pkgs/by-name/so/source-meta-json-schema/package.nix
+++ b/pkgs/by-name/so/source-meta-json-schema/package.nix
@@ -5,7 +5,7 @@
   cmake,
 }:
 let
-  version = "7.0.3";
+  version = "8.0.0";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "source-meta-json-schema";
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "sourcemeta";
     repo = "jsonschema";
     rev = "v${version}";
-    hash = "sha256-x/bRLeH76zqcHxYodVrJYtb8CO35D3ZWYxHvvZ3Jg9A=";
+    hash = "sha256-EH+wi8MAgAxTy7OPQK/faX6OVY38/Z5fXhaK92xKkyA=";
   };
 
   nativeBuildInputs = [

From 579f9d1999bf89d8479c2d59b4fb18621838c925 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 13:17:28 +0000
Subject: [PATCH 407/489] reptor: 0.27 -> 0.28

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

diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix
index c1fbf0c5b36d..c6f86a1eb3ed 100644
--- a/pkgs/development/python-modules/reptor/default.nix
+++ b/pkgs/development/python-modules/reptor/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "reptor";
-  version = "0.27";
+  version = "0.28";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "Syslifters";
     repo = "reptor";
     tag = version;
-    hash = "sha256-aba2f+7I/Lo3Vr7u9VCDRXQ5BRbQpJlQCCnib+Wp9Vs=";
+    hash = "sha256-hzdgG2/bTkzTUPK/Rnch4q12R5kY+qlr6gRwx54vbcE=";
   };
 
   pythonRelaxDeps = true;

From 99716eef2b89686309ad6fd0e5dd552af5438177 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 8 Apr 2025 15:18:32 +0200
Subject: [PATCH 408/489] python312Packages.torchmetrics: 1.7.0 -> 1.7.1

Diff: https://github.com/Lightning-AI/torchmetrics/compare/refs/tags/v1.7.0...refs/tags/v1.7.1

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

diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix
index 132bd67caea3..7b2eb68b21b4 100644
--- a/pkgs/development/python-modules/torchmetrics/default.nix
+++ b/pkgs/development/python-modules/torchmetrics/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "torchmetrics";
-  version = "1.7.0";
+  version = "1.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lightning-AI";
     repo = "torchmetrics";
     tag = "v${version}";
-    hash = "sha256-OrNYkvaTU1Zm1634eaLQqESkmLmPGgIBN2mAd1xmMP0=";
+    hash = "sha256-pjUGv064xVOfXiLDMTaFu6Fu4kt/2tfg2l2YGKlhjfw=";
   };
 
   dependencies = [

From bcd292807b8490a7061ec3b37f0e2f5508f59d5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 13:34:48 +0000
Subject: [PATCH 409/489] mqttui: 0.22.0 -> 0.22.1

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

diff --git a/pkgs/by-name/mq/mqttui/package.nix b/pkgs/by-name/mq/mqttui/package.nix
index da132595b4cb..01d4cddc5bbc 100644
--- a/pkgs/by-name/mq/mqttui/package.nix
+++ b/pkgs/by-name/mq/mqttui/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mqttui";
-  version = "0.22.0";
+  version = "0.22.1";
 
   src = fetchFromGitHub {
     owner = "EdJoPaTo";
     repo = "mqttui";
     tag = "v${version}";
-    hash = "sha256-q4C4YAs8Q1jHA5P2OApkFZnYM4/aZGxnE8Pd6Hmwd1I=";
+    hash = "sha256-wKqIDKng4pfqDuYtqFRh3UIeZQ4QzzFlLkQn5MXcVlU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-pn4wmlMW8p6IAHrYjmvmZxNMjIJwJ2MYRsANz4D6xCU=";
+  cargoHash = "sha256-gk5nA6np7dK4+j26aySNWfMZ9t/+7nZRaPsnhlDEnes=";
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security;
 

From 5bf4f2a7d26bfc4cc784af64007c35b5224330f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 13:35:51 +0000
Subject: [PATCH 410/489] obs-studio-plugins.obs-color-monitor: 0.9.0 -> 0.9.1

---
 .../video/obs-studio/plugins/obs-color-monitor.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
index 313fb67ecc5f..2f31975697ca 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-color-monitor";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-color-monitor";
     tag = finalAttrs.version;
-    hash = "sha256-EIp1GQ5dKN43D7xodX/ucYcJm994eKsnidFlbLKWHuI=";
+    hash = "sha256-4Dagga9BgW1Fiaxqs9QlyTax+SgFyTiNiU3yP2GjIDs=";
   };
 
   nativeBuildInputs = [ cmake ];

From 5d77aa4b323394d3242f7ad2f3407a251217c2df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 13:35:54 +0000
Subject: [PATCH 411/489] phrase-cli: 2.39.0 -> 2.40.0

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

diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix
index 01c005fb9ced..64a81fb07e3c 100644
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "phrase-cli";
-  version = "2.39.0";
+  version = "2.40.0";
 
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
     rev = version;
-    sha256 = "sha256-85XgRml1D6J4HkxiUk0zLlC+q0ylmN68hL0z73HG/Lk=";
+    sha256 = "sha256-d/B5XzEAM1GlpQxshy0kEJexF01FlF99hnoctKDXhp0=";
   };
 
-  vendorHash = "sha256-k7y0sJTulCf234oMCccw+bk0pzsebqD82kkVX7xZluE=";
+  vendorHash = "sha256-VV4ctHj9fPosAgqBOfkqOKETSeGJXFPPP+kBMgqV2nk=";
 
   ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
 

From 454d4032925a13b68f0c3c0b0526def4d18d1af1 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Tue, 8 Apr 2025 15:36:00 +0200
Subject: [PATCH 412/489] yazi: 25.3.2 -> 25.4.8

Changelog: https://github.com/sxyazi/yazi/releases/tag/v25.4.8
Diff: https://github.com/sxyazi/yazi/compare/v25.3.2...v25.4.8
---
 pkgs/by-name/ya/yazi-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix
index 1d6bca02300e..efd8965208dc 100644
--- a/pkgs/by-name/ya/yazi-unwrapped/package.nix
+++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix
@@ -10,18 +10,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yazi";
-  version = "25.3.2";
+  version = "25.4.8";
 
   srcs = builtins.attrValues finalAttrs.passthru.srcs;
 
   sourceRoot = finalAttrs.passthru.srcs.code_src.name;
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3uQ+DDEzi4mo8yTv21ftoSjjFqjQfWMzjUczP6dasO4=";
+  cargoHash = "sha256-RqAolwIQqJQo9cVZ1uA0D+6yAmQKN2a7Uk3f4b/FjHU=";
 
   env.YAZI_GEN_COMPLETIONS = true;
   env.VERGEN_GIT_SHA = "Nixpkgs";
-  env.VERGEN_BUILD_DATE = "2025-03-02";
+  env.VERGEN_BUILD_DATE = "2025-04-08";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ];
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       owner = "sxyazi";
       repo = "yazi";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-xx/SGINyvbXZh0J8LgG2/jjFT1l6krNOzM5JAsRtxGE=";
+      hash = "sha256-oxO7nT4AZJilxA2DliYk57NETHu78xQ8nFdV+UwyKHE=";
     };
 
     man_src = fetchFromGitHub {

From f84f2e9ecf67618e88a68c7be64247f27be47985 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 13:53:30 +0000
Subject: [PATCH 413/489] krill: 0.14.5 -> 0.14.6

---
 pkgs/servers/krill/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix
index fd8f627fa316..19ea2892e999 100644
--- a/pkgs/servers/krill/default.nix
+++ b/pkgs/servers/krill/default.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "krill";
-  version = "0.14.5";
+  version = "0.14.6";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-3pkDu20vgzslJcK5KQH+GY+jnimEZgm+bQxy8QMUeCk=";
+    hash = "sha256-U7uanUE/xdmXqtpvnG6b+oDKamNZkCH04OCy3Y5UIhQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-8K4Jn2A9OREwLRyFddHREcylapoFr+/AMT7Wq4o2Ue4=";
+  cargoHash = "sha256-PR8HoHroHp5nBbRwR8TZ5NeBH4eDXGV46HkDLeydmAk=";
 
   buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
   nativeBuildInputs = [ pkg-config ];

From d2e55b89797fc0f6b509a6307287d844d97a3eb3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 13:55:31 +0000
Subject: [PATCH 414/489] heynote: 2.1.3 -> 2.1.4

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

diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix
index ed160a6a1823..3859f013e290 100644
--- a/pkgs/by-name/he/heynote/package.nix
+++ b/pkgs/by-name/he/heynote/package.nix
@@ -7,11 +7,11 @@
 }:
 let
   pname = "heynote";
-  version = "2.1.3";
+  version = "2.1.4";
 
   src = fetchurl {
     url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage";
-    sha256 = "sha256-O8loDE2GzXQofh3iNQeP5OAWh7i0QCSxl4I++ERcjbU=";
+    sha256 = "sha256-nei4akpXA5MWpQSL/oIcwfNILTKE3lwSi1ij68FMMtQ=";
   };
 
   appimageContents = appimageTools.extractType2 {

From ecca7defcf33a63a742c973fb92f16aeaf19cb8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 13:57:00 +0000
Subject: [PATCH 415/489] goconst: 1.7.1 -> 1.8.0

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

diff --git a/pkgs/by-name/go/goconst/package.nix b/pkgs/by-name/go/goconst/package.nix
index 6d1546d69f42..eb28baa3d818 100644
--- a/pkgs/by-name/go/goconst/package.nix
+++ b/pkgs/by-name/go/goconst/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule rec {
   pname = "goconst";
-  version = "1.7.1";
+  version = "1.8.0";
 
   excludedPackages = [ "tests" ];
 
@@ -14,7 +14,7 @@ buildGoModule rec {
     owner = "jgautheron";
     repo = "goconst";
     rev = "v${version}";
-    sha256 = "sha256-GpOZJ5/5aNw1o8fk2RSAx200v6AZ+pbNu/25i8OSS1Y=";
+    sha256 = "sha256-pEkwEVnxZ7d10FE1CG5Ym9JBbzZl8mnabzdPg5gfKuo=";
   };
 
   vendorHash = null;

From 2e6d1f8d58236ed63449662ef2020af7b33bdbd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 13:59:29 +0000
Subject: [PATCH 416/489] kubernetes-helmPlugins.helm-diff: 3.10.0 -> 3.11.0

---
 .../networking/cluster/helm/plugins/helm-diff.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
index 2f9545fbdc6c..01528df8d729 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "helm-diff";
-  version = "3.10.0";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "databus23";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-vRngZigXOyxdx9bG2uWpeQ0ASTW+4tKuQWZ1Vm47Y+k=";
+    hash = "sha256-wnroUILQKVW+aMPhI8MHyzRMox3MhpRMtvYWm6siJqQ=";
   };
 
-  vendorHash = "sha256-kotV3GC2ilq258cLVGOzBTHb0koWfn92Acl0L8rRi5I=";
+  vendorHash = "sha256-B4o67yVp7u9N/HNEkF7pbHC33a8fZJvayoPL+qovDeY=";
 
   ldflags = [
     "-s"

From df94b6285185d84604a61fb4a01f995c6e066421 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 13:59:46 +0000
Subject: [PATCH 417/489] vpl-gpu-rt: 25.1.4 -> 25.2.0

---
 pkgs/by-name/vp/vpl-gpu-rt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
index f5f47bb2456f..d22026b9ec9d 100644
--- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix
+++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vpl-gpu-rt";
-  version = "25.1.4";
+  version = "25.2.0";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "intel";
     repo = "vpl-gpu-rt";
     rev = "intel-onevpl-${version}";
-    hash = "sha256-pu9iEAhQE7eHmrjzsyWtIecT79vcZyr5QfPq/Ce3Xxg=";
+    hash = "sha256-fQAnyUh9xuWsR8+yLtDdalJhW6kmBj1GBF20UZM7M6w=";
   };
 
   nativeBuildInputs = [

From 92729eb5e0944cc964fe92095b1a7d644eeee65b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 16:08:52 +0000
Subject: [PATCH 418/489] envfs: 1.0.6 -> 1.1.0

---
 nixos/tests/envfs.nix             | 2 --
 pkgs/by-name/en/envfs/package.nix | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/envfs.nix b/nixos/tests/envfs.nix
index 9e728698ebc3..b9067467eb2b 100644
--- a/nixos/tests/envfs.nix
+++ b/nixos/tests/envfs.nix
@@ -25,8 +25,6 @@ import ./make-test-python.nix (
           "PATH= /usr/bin/env --version",
           "PATH= test -e /usr/bin/sh",
           "PATH= test -e /usr/bin/env",
-          # no stat
-          "! test -e /usr/bin/cp",
           # also picks up PATH that was set after execve
           "! /usr/bin/hello",
           "PATH=${pkgs.hello}/bin /usr/bin/hello",
diff --git a/pkgs/by-name/en/envfs/package.nix b/pkgs/by-name/en/envfs/package.nix
index 6dd4a3472547..a61d7e2c3501 100644
--- a/pkgs/by-name/en/envfs/package.nix
+++ b/pkgs/by-name/en/envfs/package.nix
@@ -6,15 +6,15 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "envfs";
-  version = "1.0.6";
+  version = "1.1.0";
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "envfs";
     rev = version;
-    hash = "sha256-kOfnKguvJQHW/AfQOetxVefjoEj7ec5ew6fumhOwP08=";
+    hash = "sha256-bpATdm/lB+zomPYGCxA7omWK/SKPIaqr94J+fjMaXfE=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-VvdvYxNBzwJJy09npC30VaOzOU9Fwi++qon9Od4juHE=";
+  cargoHash = "sha256-nMUdAFRHJZDwvLASBVykzzkwk3HxslDehqqm1U99qYg=";
 
   passthru.tests = {
     envfs = nixosTests.envfs;

From 80b264337de1e9ead6cc7837c07a1bd20798f60d Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 7 Apr 2025 21:43:15 +0530
Subject: [PATCH 419/489] envfs: cleanup, add nix-update-script

Move to finalAttrs, remove with lib;

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/by-name/en/envfs/package.nix | 32 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/en/envfs/package.nix b/pkgs/by-name/en/envfs/package.nix
index a61d7e2c3501..3c7b57002fb4 100644
--- a/pkgs/by-name/en/envfs/package.nix
+++ b/pkgs/by-name/en/envfs/package.nix
@@ -1,34 +1,42 @@
 {
-  rustPlatform,
   lib,
   fetchFromGitHub,
+  rustPlatform,
   nixosTests,
+  nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "envfs";
   version = "1.1.0";
+
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "envfs";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-bpATdm/lB+zomPYGCxA7omWK/SKPIaqr94J+fjMaXfE=";
   };
+
   useFetchCargoVendor = true;
   cargoHash = "sha256-nMUdAFRHJZDwvLASBVykzzkwk3HxslDehqqm1U99qYg=";
 
-  passthru.tests = {
-    envfs = nixosTests.envfs;
-  };
-
   postInstall = ''
     ln -s envfs $out/bin/mount.envfs
     ln -s envfs $out/bin/mount.fuse.envfs
   '';
-  meta = with lib; {
+
+  passthru = {
+    tests = {
+      envfs = nixosTests.envfs;
+    };
+
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Fuse filesystem that returns symlinks to executables based on the PATH of the requesting process";
     homepage = "https://github.com/Mic92/envfs";
-    license = licenses.mit;
-    maintainers = with maintainers; [ mic92 ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mic92 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From b9756b03b372c8df2e4397eee560a58eef1bca70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 14:23:30 +0000
Subject: [PATCH 420/489] ffizer: 2.13.1 -> 2.13.2

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

diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix
index 81edec825164..dbcd7a4f2b72 100644
--- a/pkgs/by-name/ff/ffizer/package.nix
+++ b/pkgs/by-name/ff/ffizer/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ffizer";
-  version = "2.13.1";
+  version = "2.13.2";
 
   buildFeatures = [ "cli" ];
 
@@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec {
     owner = "ffizer";
     repo = "ffizer";
     rev = version;
-    hash = "sha256-ZX6Zv6ioAO33Cc5WCVBgJWlOmNvbVgckMylRnphpOdw=";
+    hash = "sha256-GL1tdWOcbdybPayfShoGnxHsqYi8p+DZ6Eo/8bvWElE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-JbCRD2P2jt2f+c2BUnb512p5ulein0guzgx4gj3SeVU=";
+  cargoHash = "sha256-5hsJ6eMiUPOqAzW1bdXTGTP5tY6VM2tTdySpkJl6pAY=";
 
   nativeBuildInputs = [
     pkg-config

From a00510a1f61a69cae3c65082f31902049f0d4e2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 22:58:51 +0000
Subject: [PATCH 421/489] trunk: 0.21.12 -> 0.21.13

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

diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix
index df7650f46460..9c31a076fdd2 100644
--- a/pkgs/by-name/tr/trunk/package.nix
+++ b/pkgs/by-name/tr/trunk/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "trunk";
-  version = "0.21.12";
+  version = "0.21.13";
 
   src = fetchFromGitHub {
     owner = "trunk-rs";
     repo = "trunk";
     rev = "v${version}";
-    hash = "sha256-GFRNbrfI0sJ/GuvT924/gxmzbnf0s0QNf+Mpv1+5rbc=";
+    hash = "sha256-Kj0XUO8GSLBUwkvskOidA489cvcHdf9IKSVZ/OqlAnE=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-XQyHGavGUnWCTim2jC+kKKNYaWzwXg0slXxABSrKqJg=";
+  cargoHash = "sha256-oXLB/Jbb/J8oXl0IyECIjjv4pdKz94pocD/iTBv4GRs=";
 
   meta = with lib; {
     homepage = "https://github.com/trunk-rs/trunk";

From 6dc0270f5bc842957499f2da2d95da2f72947b1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 22:20:32 +0000
Subject: [PATCH 422/489] backgroundremover: 0.2.9 -> 0.3.0

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

diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix
index 1b963d940c7d..37dbc1ff7f45 100644
--- a/pkgs/by-name/ba/backgroundremover/package.nix
+++ b/pkgs/by-name/ba/backgroundremover/package.nix
@@ -11,7 +11,7 @@ let
   p = python3.pkgs;
   self = p.buildPythonApplication rec {
     pname = "backgroundremover";
-    version = "0.2.9";
+    version = "0.3.0";
     pyproject = true;
 
     build-system = [
@@ -22,7 +22,7 @@ let
       owner = "nadermx";
       repo = "backgroundremover";
       rev = "v${version}";
-      hash = "sha256-tQ8J3xamOzPPSbFMxIDYKv1TzK1AVwF/DWXdZlrlYvM=";
+      hash = "sha256-fWazMDjc+EoXvO7Iq+zwtJaMEU64ajpO6JtlvU5T0nc=";
     };
 
     models = runCommand "background-remover-models" { } ''

From ccc36a941ccf33243ce6725723c83224f475d3c9 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 8 Apr 2025 09:35:03 -0500
Subject: [PATCH 423/489] chafa: Migrate to by-name and use new darwin sdk
 pattern

---
 .../misc/chafa/default.nix => by-name/ch/chafa/package.nix}   | 1 -
 pkgs/{tools/misc => by-name/ch}/chafa/xmlcatalog_patch.patch  | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 5 deletions(-)
 rename pkgs/{tools/misc/chafa/default.nix => by-name/ch/chafa/package.nix} (99%)
 rename pkgs/{tools/misc => by-name/ch}/chafa/xmlcatalog_patch.patch (100%)

diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/by-name/ch/chafa/package.nix
similarity index 99%
rename from pkgs/tools/misc/chafa/default.nix
rename to pkgs/by-name/ch/chafa/package.nix
index 490d1a7049d9..ef46ea903727 100644
--- a/pkgs/tools/misc/chafa/default.nix
+++ b/pkgs/by-name/ch/chafa/package.nix
@@ -16,7 +16,6 @@
   docbook_xml_dtd_412,
   docbook_xsl,
   glib,
-  Foundation,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/misc/chafa/xmlcatalog_patch.patch b/pkgs/by-name/ch/chafa/xmlcatalog_patch.patch
similarity index 100%
rename from pkgs/tools/misc/chafa/xmlcatalog_patch.patch
rename to pkgs/by-name/ch/chafa/xmlcatalog_patch.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f113b9da842e..5f4800846b36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3070,10 +3070,6 @@ with pkgs;
 
   cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert;
 
-  chafa = callPackage ../tools/misc/chafa {
-    inherit (darwin.apple_sdk.frameworks) Foundation;
-  };
-
   ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { };
 
   clamav = callPackage ../tools/security/clamav {

From 37c719d55ae9e858e305f819793dcc255181f04b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 01:36:23 +0000
Subject: [PATCH 424/489] mockgen: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/by-name/mo/mockgen/package.nix b/pkgs/by-name/mo/mockgen/package.nix
index 403f29e54f9c..c8b151af3aba 100644
--- a/pkgs/by-name/mo/mockgen/package.nix
+++ b/pkgs/by-name/mo/mockgen/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "mockgen";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "uber-go";
     repo = "mock";
     rev = "v${version}";
-    sha256 = "sha256-1UlaM3IvKlplBW1pg5l+IXwirlierjDKqKsVwFt7EAw=";
+    sha256 = "sha256-xzPuy+KH40FDnjir/aROYlgWzLBY8qKDbYmkFMzHVkc=";
   };
 
   vendorHash = "sha256-0OnK5/e0juEYrNJuVkr+tK66btRW/oaHpJSDakB32Bc=";

From 283d2c569c8b3e4bf8c74c0dff3d2e220fe9344d Mon Sep 17 00:00:00 2001
From: Nurali Aslanbekov <ilarvne@proton.me>
Date: Sun, 6 Apr 2025 15:24:55 +0500
Subject: [PATCH 425/489] hours: init at 0.5.0

---
 pkgs/by-name/ho/hours/package.nix | 34 +++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/ho/hours/package.nix

diff --git a/pkgs/by-name/ho/hours/package.nix b/pkgs/by-name/ho/hours/package.nix
new file mode 100644
index 000000000000..48c2ab726889
--- /dev/null
+++ b/pkgs/by-name/ho/hours/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  stdenv,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "hours";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "dhth";
+    repo = "hours";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-B9M02THTCrr7ylbbflpkpTFMuoIwV2O0PQKOKbyxYPg=";
+  };
+
+  vendorHash = "sha256-5lhn0iTLmXUsaedvtyaL3qWLosmQaQVq5StMDl7pXXI=";
+
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "No-frills time tracking toolkit for command line nerds";
+    homepage = "https://github.com/dhth/hours";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ilarvne ];
+    platforms = lib.platforms.unix;
+    mainProgram = "hours";
+  };
+})

From 3dccd8c0d50f315bbf72ca1552573bcc9eb7f4b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 19:00:43 +0000
Subject: [PATCH 426/489] redpanda-client: 24.3.8 -> 25.1.1

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

diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index 0bb772f90eaf..56994b141155 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -7,12 +7,12 @@
   stdenv,
 }:
 let
-  version = "24.3.8";
+  version = "25.1.1";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-7ufF1OXFtT+OZY6UiDDiaohe4witVPEaO9zZaM6wldA=";
+    sha256 = "sha256-HjcgyDEm6m6/ab75GLFy6B5hu3Q7CQDIjxVnTVfCgbA=";
   };
 in
 buildGoModule rec {
@@ -20,7 +20,7 @@ buildGoModule rec {
   inherit doCheck src version;
   modRoot = "./src/go/rpk";
   runVend = false;
-  vendorHash = "sha256-MdfCc3XdoMv3nnyaCbqU7mwJSgtusw9wVWjYqqJJmHA=";
+  vendorHash = "sha256-syAv40Coxy4uRQ6n20ikL7BTdP81N6Un1VKHpICv458=";
 
   ldflags = [
     ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''

From 91510d3e99f54c691f1e07faa8abc379f63c7deb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 17:13:50 +0000
Subject: [PATCH 427/489] manga-tui: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix
index 18fe73e6260c..af215b99a4dd 100644
--- a/pkgs/by-name/ma/manga-tui/package.nix
+++ b/pkgs/by-name/ma/manga-tui/package.nix
@@ -10,7 +10,7 @@
   nix-update-script,
 }:
 let
-  version = "0.6.0";
+  version = "0.7.0";
 in
 rustPlatform.buildRustPackage {
   pname = "manga-tui";
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage {
     owner = "josueBarretogit";
     repo = "manga-tui";
     rev = "v${version}";
-    hash = "sha256-L5KZaBJDG0z6NUGPJfbOkKCp1xQEzqfJ9GREx189VqU=";
+    hash = "sha256-1WFg2hG3UnOO9+HpUcdPkZNhsNYa2QG1PhzLZ4bQiQM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-gmG/gDozYizwjcm3SGs2m8oLiuWp6oxJPOB3FlHfW+4=";
+  cargoHash = "sha256-1nERwIZCR/afgfGdronpy145GnDkbsB7YjF6XyDcfEY=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 6dcf74b066ed0860cdbc00103cb20b31a1433da9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Apr 2025 16:26:59 +0000
Subject: [PATCH 428/489] turso-cli: 1.0.3 -> 1.0.6

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

diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix
index 1e13fe0a3505..5b1bb7d3e935 100644
--- a/pkgs/by-name/tu/turso-cli/package.nix
+++ b/pkgs/by-name/tu/turso-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "turso-cli";
-  version = "1.0.3";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso-cli";
     rev = "v${version}";
-    hash = "sha256-94av3EW96qApCYWpo08QjrxoneuqGrE98aE7YXQEaT4=";
+    hash = "sha256-5XGcB003fYAQi8r+IjPxKVRtFgGFkfP2hOIxptlXn9E=";
   };
 
   vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU=";

From fe82769492a4adab044bc601f2331e487716c13b Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 8 Apr 2025 16:50:44 +0200
Subject: [PATCH 429/489] Revert "tokyonight-gtk-theme: 0-unstable-2024-11-06
 -> 0-unstable-2025-04-04"

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

diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
index 364c09933290..346b4d69a03d 100644
--- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
+++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
@@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-04-04";
+    version = "0-unstable-2024-11-06";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Tokyonight-GTK-Theme";
-      rev = "7c6fa4221a480da928e28761ddbc84a68a5afbed";
-      hash = "sha256-D/TivtXnSCkmFk3HVgQlZD7xxmugPkzCRrA3x3Vd4eU=";
+      rev = "4dc45d60bf35f50ebd9ee41f16ab63783f80dd64";
+      hash = "sha256-AKZA+WCcfxDeNrNrq3XYw+SFoWd1VV2T9+CwK2y6+jA=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From 9d376305b33238e5ba0603e9d586aabc1f03c5f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 01:04:07 +0000
Subject: [PATCH 430/489] osm2pgsql: 2.0.1 -> 2.1.0

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

diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix
index d4fbb130bea9..ddf69d31d81c 100644
--- a/pkgs/by-name/os/osm2pgsql/package.nix
+++ b/pkgs/by-name/os/osm2pgsql/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osm2pgsql";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "osm2pgsql-dev";
     repo = "osm2pgsql";
     rev = finalAttrs.version;
-    hash = "sha256-+EFvYloLm/cDOflqj6ZIgjFoljKhYBVIKxD8L9j2Hj4=";
+    hash = "sha256-YKlw/YIRogu0AbkRA3kZ4j4tbbVYbgVcLVYifYarmjE=";
   };
 
   postPatch = ''

From ba8ac4938508ce334f3ea82af2075b5ae15bff9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 15:00:33 +0000
Subject: [PATCH 431/489] nuclei: 3.4.1 -> 3.4.2

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

diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix
index df52ee807ec8..535e7be2055e 100644
--- a/pkgs/by-name/nu/nuclei/package.nix
+++ b/pkgs/by-name/nu/nuclei/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "nuclei";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei";
     tag = "v${version}";
-    hash = "sha256-ZSmyhNbZotNiqoXl4E+Pjap5zewPlwcTlPihcm4v6Qs=";
+    hash = "sha256-p3coR11+1xFQF3flIxfEP6HqQOD7+gHuT0ysOSKQyzc=";
   };
 
-  vendorHash = "sha256-tTFEDTUM3ldH3/NtqYx4LyEazp7o5qZ6ionu01Vxwrw=";
+  vendorHash = "sha256-cT8ZDp1GSdlgMr0i23i2WAVRmSbhwZZa/RKNPezr9l0=";
 
   proxyVendor = true; # hash mismatch between Linux and Darwin
 

From b1aff9080af94f4403ab32e0f410cb90241599d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 15:00:57 +0000
Subject: [PATCH 432/489] libretro.genesis-plus-gx: 0-unstable-2025-03-08 ->
 0-unstable-2025-04-04

---
 .../emulators/libretro/cores/genesis-plus-gx.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index ea811e7eece3..f286c792d223 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2025-03-08";
+  version = "0-unstable-2025-04-04";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "1024afbcd77a7bf7c87972c7c86d3a7759877fc7";
-    hash = "sha256-9Y3uzWpiYIRGTFApVGdLIONpBpPaO1sRgaGj1EVI3M4=";
+    rev = "32a4853c5fd352cc3054e83ed375476cf023aa5f";
+    hash = "sha256-3r562/3WWWkibEKzPrA+lASY5Wpz8kuX5EQKqFKJdAA=";
   };
 
   meta = {

From a3243010aafa085df22da01e38c5290467ff2ad4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 01:15:24 +0000
Subject: [PATCH 433/489] go-toml: 2.2.3 -> 2.2.4

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

diff --git a/pkgs/by-name/go/go-toml/package.nix b/pkgs/by-name/go/go-toml/package.nix
index d22898102778..f363710a18d8 100644
--- a/pkgs/by-name/go/go-toml/package.nix
+++ b/pkgs/by-name/go/go-toml/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "2.2.3";
+  version = "2.2.4";
 in
 buildGoModule {
   pname = "go-toml";
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "pelletier";
     repo = "go-toml";
     rev = "v${version}";
-    sha256 = "sha256-+l89SvJ/4SxVItys1ROLOv2hZ5euU1MF21Yn0siQHUM=";
+    sha256 = "sha256-VKUrpSaGzkewNSyE0sB6PWVIQiraY7UxE5Wve+76UFk=";
   };
 
-  vendorHash = "sha256-YkOcpzn5AKFMDWUYbKY8DzGMiIMSyaDfexFmXv5HNQI=";
+  vendorHash = null;
 
   excludedPackages = [
     "cmd/gotoml-test-decoder"

From 9c92a3d16c8aff9e3c08247abca8fd73bdfde930 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 01:17:30 +0000
Subject: [PATCH 434/489] cosign: 2.4.3 -> 2.5.0

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

diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix
index 42a048b78ca4..bba82db3d967 100644
--- a/pkgs/tools/security/cosign/default.nix
+++ b/pkgs/tools/security/cosign/default.nix
@@ -14,13 +14,13 @@
 }:
 buildGoModule rec {
   pname = "cosign";
-  version = "2.4.3";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-9hUf6J3kTI0nvLExReUUovW8pZjlaoqgFmLd5mShZzU=";
+    hash = "sha256-QvU+JpIcE9EX+ehRWvs2bS2VGgGVekNX8f5+mITIwU0=";
   };
 
   buildInputs =
@@ -32,7 +32,7 @@ buildGoModule rec {
     installShellFiles
   ];
 
-  vendorHash = "sha256-jNRNjAecf84XzkPLWHjCYPxh1igUs7Yd0MSAmRcPtlc=";
+  vendorHash = "sha256-qIi+Pp4XZg1GxOhM9fCyD9rPaIiQHhoQudB50gzWgrM=";
 
   subPackages = [
     "cmd/cosign"

From 00669552fd6bf1381106e482e35ca0ad4e36f363 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 02:26:05 +0000
Subject: [PATCH 435/489] iroh: 0.34.0 -> 0.34.1

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

diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix
index e230987a0e9e..01138c9e3517 100644
--- a/pkgs/by-name/ir/iroh/package.nix
+++ b/pkgs/by-name/ir/iroh/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "iroh";
-  version = "0.34.0";
+  version = "0.34.1";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "iroh";
     rev = "v${version}";
-    hash = "sha256-uavWluu7rVY2lZXDRsKApcZMB7TJsGuhJzieZPMXdvE=";
+    hash = "sha256-kOqmkuKOP2dWrUVaGwHckWjaFVZkSoXqqUgn+2KaWkc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-7tQbfXVdgoxACF6qtesbUQ3AtVFAI2IbGO720PjwZCc=";
+  cargoHash = "sha256-O/j+/sRyMtqd4GaER2trn9SEFpZuSlc5q1MTXU+rwLg=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;

From 82819621a2ff7f082ab688c9b13e688c0911ccad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 02:23:32 +0000
Subject: [PATCH 436/489] kor: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix
index af32830388e7..9f419bb5e0ff 100644
--- a/pkgs/by-name/ko/kor/package.nix
+++ b/pkgs/by-name/ko/kor/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kor";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "yonahd";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-VK5G8J851rsIEt2ljrTWFPCxhIBTgLkMlEMVb9kJcOs=";
+    hash = "sha256-jqP2GsqliltjabbHDcRseMz7TOWl9YofAG/4Y7ADub8=";
   };
 
-  vendorHash = "sha256-iJtZ/t4VCVPqMKwV7jCKwqxitkZ/pTlP6mz9ElGcSsY=";
+  vendorHash = "sha256-HZS1PPlra1uGBuerGs5X9poRzn7EGhTopKaC9tkhjlo=";
 
   preCheck = ''
     HOME=$(mktemp -d)

From b4d398b409070a76f0312ae7d351c03c7e85fb52 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 7 Apr 2025 18:36:44 -0700
Subject: [PATCH 437/489] quesoglc: unbreak, modernize

---
 pkgs/by-name/qu/quesoglc/package.nix | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/qu/quesoglc/package.nix b/pkgs/by-name/qu/quesoglc/package.nix
index ff38dc30757a..caf85dd1e926 100644
--- a/pkgs/by-name/qu/quesoglc/package.nix
+++ b/pkgs/by-name/qu/quesoglc/package.nix
@@ -10,13 +10,15 @@
   fribidi,
   libX11,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "quesoglc";
   version = "0.7.2";
+
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl";
+    url = "mirror://sourceforge/quesoglc/quesoglc-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-VP7y7mhRct80TQb/RpmkQRQ7h6vtDVFFJK3E+JukyTE=";
   };
+
   buildInputs = [
     libGLU
     libGL
@@ -26,8 +28,18 @@ stdenv.mkDerivation rec {
     fribidi
     libX11
   ];
+
+  # required for cross builds
+  configureFlags = [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+    "ac_cv_func_memcmp_working=yes"
+  ];
+
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   # FIXME: Configure fails to use system glew.
-  meta = with lib; {
+  meta = {
     description = "Free implementation of the OpenGL Character Renderer";
     longDescription = ''
       QuesoGLC is a free (as in free speech) implementation of the OpenGL
@@ -36,8 +48,8 @@ stdenv.mkDerivation rec {
       platform that supports both FreeType and the OpenGL API.
     '';
     homepage = "https://quesoglc.sourceforge.net/";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ astsmtl ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ astsmtl ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From b429cc9dd41aa1fd225766e0ec2fc5eb79c13b95 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 17:13:45 +0200
Subject: [PATCH 438/489] greenmask: 0.2.9 -> 0.2.11

Diff: https://github.com/GreenmaskIO/greenmask/compare/refs/tags/v0.2.9...v0.2.11

Changelog: https://github.com/GreenmaskIO/greenmask/releases/tag/v0.2.11
---
 pkgs/by-name/gr/greenmask/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix
index 951d7b453687..177d4fecddd3 100644
--- a/pkgs/by-name/gr/greenmask/package.nix
+++ b/pkgs/by-name/gr/greenmask/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "greenmask";
-  version = "0.2.9";
+  version = "0.2.11";
 
   src = fetchFromGitHub {
     owner = "GreenmaskIO";
     repo = "greenmask";
     tag = "v${version}";
-    hash = "sha256-ORyczdynAAr2hYzXove/IXRngkRIhKgXLQg5VbvvGS8=";
+    hash = "sha256-KHM/r4zDJrZMIC7+Kp+98xhV5r4zkpxc1ffqf0jgnLs=";
   };
 
-  vendorHash = "sha256-UY79Fex8hwaXtFLefBUeyO7PxJevWWaQU5MEOAMLPkA=";
+  vendorHash = "sha256-g3/WuLDb4mAzklT+nxQ1U/l+JDzSubENMB5hWjIaIIU=";
 
   subPackages = [ "cmd/greenmask/" ];
 

From 1663bc86ffe2bd9632259aa755c7956f00f59689 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 02:05:31 +0000
Subject: [PATCH 439/489] badger: 4.6.0 -> 4.7.0

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

diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix
index 9dc855b9ded8..f1655fe44951 100644
--- a/pkgs/by-name/ba/badger/package.nix
+++ b/pkgs/by-name/ba/badger/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "badger";
-  version = "4.6.0";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "badger";
     rev = "v${version}";
-    hash = "sha256-W3vPTLGI7YT7dFklJnOcpfYqQ9aBCsel9L6q4WNincY=";
+    hash = "sha256-R4nahpUuCjPas1NBnWmQ/KBTY+/yPSyo8AmTvgwhYVI=";
   };
 
-  vendorHash = "sha256-UVdOiaj1FN0etB9F0kt+THfO0Aa1kgdGYVeSVv4GpxY=";
+  vendorHash = "sha256-x4+CHLmQhu7Y6n1qx2CBY6KzRIRLD7Gn+pzXQy3/5rA=";
 
   subPackages = [ "badger" ];
 

From 9625b56112f21f3d84316801890bd9045eb5a94f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 01:51:07 +0000
Subject: [PATCH 440/489] httm: 0.46.6 -> 0.46.7

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

diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix
index c1458d5b16b9..e8734388ad8c 100644
--- a/pkgs/by-name/ht/httm/package.nix
+++ b/pkgs/by-name/ht/httm/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.46.6";
+  version = "0.46.7";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = "httm";
     rev = version;
-    hash = "sha256-QMw5FrI5GCaUrUPaxqGDBtz7RPcCFQn+jntmyertzhM=";
+    hash = "sha256-GSYkgDDDkvQnuW8zeLL703L8tlgklhB3OKulJdmrRoY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-dIF3Qi8rK+H07x4uhi8uXs1Pdr8p3KIkVUrXqEQpCsc=";
+  cargoHash = "sha256-UxOm6G0hQfi7L49YQEshfNkPMy7LPNX2VBg0F9uLMiY=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From f9f8890ea403bf1d36f6d9282f3dd77901ce0edd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 8 Apr 2025 17:16:45 +0200
Subject: [PATCH 441/489] python312Packages.langgraph-prebuilt: fix by adding
 missing xxhash test input

---
 .../python-modules/langgraph-prebuilt/default.nix   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
index 73a1d6ade3ad..995c7f552494 100644
--- a/pkgs/development/python-modules/langgraph-prebuilt/default.nix
+++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
@@ -16,11 +16,12 @@
   langgraph-checkpoint-sqlite,
   postgresql,
   postgresqlTestHook,
-  psycopg-pool,
   psycopg,
+  psycopg-pool,
   pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
+  xxhash,
 
   # passthru
   nix-update-script,
@@ -55,19 +56,17 @@ buildPythonPackage rec {
   doCheck = !stdenv.hostPlatform.isDarwin;
 
   nativeCheckInputs = [
-    pytestCheckHook
-    postgresql
-    postgresqlTestHook
-  ];
-
-  checkInputs = [
     langgraph-checkpoint
     langgraph-checkpoint-postgres
     langgraph-checkpoint-sqlite
+    postgresql
+    postgresqlTestHook
     psycopg
     psycopg-pool
     pytest-asyncio
     pytest-mock
+    pytestCheckHook
+    xxhash
   ];
 
   preCheck = ''

From aa05799b685f7f838e6a9de285fadc8406d70024 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 07:57:09 +0000
Subject: [PATCH 442/489] qucs-s: 25.1.1 -> 25.1.2

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

diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix
index aa41e3185c03..8ced7004f1a2 100644
--- a/pkgs/applications/science/electronics/qucs-s/default.nix
+++ b/pkgs/applications/science/electronics/qucs-s/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qucs-s";
-  version = "25.1.1";
+  version = "25.1.2";
 
   src = fetchFromGitHub {
     owner = "ra3xdh";
     repo = "qucs_s";
     rev = version;
-    hash = "sha256-H/iLCCX1fMozs/G8erX7cia7wRLjvLxofuiu6pGVJ58=";
+    hash = "sha256-+xPhHmuogNuolmMFcUAP2hMfJh1D+O4DrPkcuR6+mR8=";
   };
 
   postPatch = ''

From ad203522a2a8839fa0abd495e701e2de2f2059b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 07:58:53 +0000
Subject: [PATCH 443/489] qucsator-rf: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/by-name/qu/qucsator-rf/package.nix b/pkgs/by-name/qu/qucsator-rf/package.nix
index 2549a5694f84..135b0c014f6d 100644
--- a/pkgs/by-name/qu/qucsator-rf/package.nix
+++ b/pkgs/by-name/qu/qucsator-rf/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qucsator-rf";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "ra3xdh";
     repo = "qucsator_rf";
     rev = version;
-    hash = "sha256-Q1hpCt3SeXRzUFX4jPUu8ZsPTx2W28LQ3YwlYtOZhqg=";
+    hash = "sha256-c9deaY9eV1q+bx/k1tNpdVrJ8Q/L2G0lSQBYaOSfoDs=";
   };
 
   # Upstream forces NO_DEFAULT_PATH on APPLE

From 0f9261e03d217dd874eac8e9c0ad4cc5fbd408e3 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 7 Apr 2025 18:27:03 -0700
Subject: [PATCH 444/489] openct: unbreak, modernize

---
 pkgs/by-name/op/openct/package.nix | 39 +++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/op/openct/package.nix b/pkgs/by-name/op/openct/package.nix
index 2b25bf2614c5..62c2f5ed9e40 100644
--- a/pkgs/by-name/op/openct/package.nix
+++ b/pkgs/by-name/op/openct/package.nix
@@ -3,28 +3,34 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  pkg-config,
-  pcsclite,
-  libusb-compat-0_1,
   doxygen,
   libxslt,
+  pkg-config,
+  pcsclite,
+  libtool,
+  libusb-compat-0_1,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "openct";
   version = "0.6.20";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "openct";
-    rev = "${pname}-${version}";
-    sha256 = "09wxq0jxdxhci3zr7jd3zcxjkl3j0r1v00k3q8gqrg9gighh8nk2";
+    rev = "openct-${finalAttrs.version}";
+    hash = "sha256-YloE4YsvvYwfwmMCsEMGctApO/ujyZP/iAz21iXAnSc=";
   };
 
   postPatch = ''
-    sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am
+    substituteInPlace etc/Makefile.am \
+      --replace-fail "DESTDIR" "out"
   '';
 
+  # unbreak build on GCC 14, remove when https://github.com/OpenSC/openct/pull/12
+  # (or equivalent) is merged and released
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   configureFlags = [
     "--enable-api-doc"
     "--enable-usb"
@@ -35,24 +41,29 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
+    doxygen
+    libxslt # xsltproc
     pkg-config
   ];
+
   buildInputs = [
     pcsclite
+    libtool # libltdl
     libusb-compat-0_1
-    doxygen
-    libxslt
   ];
 
+  strictDeps = true;
+
   preInstall = ''
     mkdir -p $out/etc
   '';
 
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
+  meta = {
     homepage = "https://github.com/OpenSC/openct/";
-    license = licenses.lgpl21;
     description = "Drivers for several smart card readers";
-    platforms = platforms.all;
+    license = lib.licenses.lgpl21;
+    maintainers = [ ];
+    platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})

From cdeb23c415541d483dea4180a17dc085014fa638 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 15:19:20 +0000
Subject: [PATCH 445/489] libretro.gambatte: 0-unstable-2025-03-07 ->
 0-unstable-2025-04-04

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

diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix
index c60d72e1d021..2f28042aa697 100644
--- a/pkgs/applications/emulators/libretro/cores/gambatte.nix
+++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2025-03-07";
+  version = "0-unstable-2025-04-04";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "4b3edb41d33e52b6d70c4e18bf0819a070991b66";
-    hash = "sha256-8RmNDvUd64FqEgduNMHgbunu92SqMi+Pn//Ou2EQUFs=";
+    rev = "2910240a4100ccad68f935082b8bbce194673cb5";
+    hash = "sha256-segz2SocZaNNgToNQOIEVIOD3CidyZIS81dStcdAsTs=";
   };
 
   meta = {

From a1aeaf4132062303aa6d4b17eb4239cb7b5f8626 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 17:24:27 +0200
Subject: [PATCH 446/489] python313Packages.mcpadapt: 0.0.19 -> 0.1.0

Diff: https://github.com/grll/mcpadapt/compare/refs/tags/v0.0.19...v0.1.0

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

diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix
index 76a433c60782..81cd5385ed8d 100644
--- a/pkgs/development/python-modules/mcpadapt/default.nix
+++ b/pkgs/development/python-modules/mcpadapt/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "mcpadapt";
-  version = "0.0.19";
+  version = "0.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "grll";
     repo = "mcpadapt";
     tag = "v${version}";
-    hash = "sha256-CQK9Nv12E3jBcHI/RwJOaD2E6DbTWwVvTZ31kpsNGXg=";
+    hash = "sha256-hSmE53LfpLAZosVWHqy3795UPqqLdknMVfWrIxAxWBM=";
   };
 
   build-system = [ hatchling ];

From 5de4f12f4793476e59cf1a115f8340852303aaae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 15:26:08 +0000
Subject: [PATCH 447/489] hyprutils: 0.5.2 -> 0.6.0

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

diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index a818df4cdef6..9591ae16b4d0 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprutils";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprutils";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=";
+    hash = "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=";
   };
 
   nativeBuildInputs = [

From 4d12ab650aeb9f10ac27beaec447ffeac6abc54f Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 8 Apr 2025 17:33:02 +0200
Subject: [PATCH 448/489] grafana-alloy: remove emilylange from maintainers

I was added based on my maintainership in grafana-agent.

And now that grafana-agent was dropped from nixpkgs, I had a deeper look
at grafana-alloy once again and I am still not happy with it.

So I decided to migrate to something else than grafana-alloy and am
dropping my maintainership accordingly.
---
 pkgs/by-name/gr/grafana-alloy/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index 84383c352580..4e9b416979d9 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -146,7 +146,6 @@ buildGoModule rec {
     maintainers = with maintainers; [
       azahi
       flokli
-      emilylange
       hbjydev
     ];
     platforms = lib.platforms.unix;

From c13e1d46985f3f5bfb666cbd1f2688f1d2cf6dde Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 17:36:48 +0200
Subject: [PATCH 449/489] python313Packages.pyexploitdb: 0.2.74 -> 0.2.75

Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md
---
 pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index cfc4a2e8673b..32c92136fb16 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyexploitdb";
-  version = "0.2.74";
+  version = "0.2.75";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyExploitDb";
     inherit version;
-    hash = "sha256-pQRyIv1wu78vNjxl5tt0kI34RvCEycEMMEtaOnlaa10=";
+    hash = "sha256-rQP9OuWK+kEyc5DipPo0tPagvHm1Rl1YVUiALL7OKvQ=";
   };
 
   build-system = [ setuptools ];

From 37f32a2e468e1acf92829ea6415ef495ed11f1cf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 17:42:54 +0200
Subject: [PATCH 450/489] python313Packages.types-awscrt: 0.24.2 -> 0.25.7

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

diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix
index f664f3142bd2..0bb1901cc4a8 100644
--- a/pkgs/development/python-modules/types-awscrt/default.nix
+++ b/pkgs/development/python-modules/types-awscrt/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "types-awscrt";
-  version = "0.24.2";
+  version = "0.25.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "types_awscrt";
     inherit version;
-    hash = "sha256-WCa69prV0px2vkn8ffACIigfoxsU+Z6ftEktceyY/qU=";
+    hash = "sha256-4RKYdQyZZH9/O5jW1tZIeQCWzTLURf0NSaYEGmMzbJo=";
   };
 
   build-system = [ setuptools ];

From 84dca211cde4edfb7a018f0abaa79d802752923f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 15:52:21 +0000
Subject: [PATCH 451/489] surrealdb-migrations: 2.2.0 -> 2.2.1

---
 .../tools/database/surrealdb-migrations/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix
index 25e379eaa01f..ac8e2f1f705f 100644
--- a/pkgs/development/tools/database/surrealdb-migrations/default.nix
+++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "surrealdb-migrations";
-  version = "2.2.0";
+  version = "2.2.1";
 in
 rustPlatform.buildRustPackage rec {
   inherit pname version;
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec {
     owner = "Odonno";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-OiH3O74tJQFAW+ZyyspvOXUMcWkqjpd4GVU4cKn1jBg=";
+    hash = "sha256-MeHNBtzl2bNJFGKtM1o9mGnX0vbmnpUPc18ecqG6J+8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-dx5fGtKE0wfjQgTi5HBce6Afmc+0rJA24IRhrBirZbo=";
+  cargoHash = "sha256-l59RbKohfPsAp/70UaT/bhy5Z4orVf7fuJgU+0fuyk4=";
 
   buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
 

From b19846f215fbdb79688939e7ccdc4388dd588632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Tue, 8 Apr 2025 16:55:43 +0100
Subject: [PATCH 452/489] hyprlock: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix
index 4159f9ab4552..74d105fafb7c 100644
--- a/pkgs/by-name/hy/hyprlock/package.nix
+++ b/pkgs/by-name/hy/hyprlock/package.nix
@@ -28,13 +28,13 @@
 
 gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprlock";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprlock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-U+8HOPgfrNkFEadoyB9GXSPPFW/Uytvb3TxyqW3JOw4=";
+    hash = "sha256-KTRgq+0rMBz31AAjrDvQprPHbVobCwIo9+gkcUujglw=";
   };
 
   nativeBuildInputs = [

From 4041ea763aa93dfef2740dcc1b405948546aed6e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 8 Apr 2025 17:57:14 +0200
Subject: [PATCH 453/489] python312Packages.langgraph: disable failing tests

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

diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index 2716824e6d71..708da84981d8 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -23,7 +23,6 @@
   langgraph-checkpoint-sqlite,
   langsmith,
   psycopg,
-  psycopg-pool,
   pydantic,
   pytest-asyncio,
   pytest-mock,
@@ -115,10 +114,11 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # psycopg.errors.InsufficientPrivilege: permission denied to create database
-    "tests/test_pregel_async.py"
-    "tests/test_pregel.py"
+    "tests/test_checkpoint_migration.py"
     "tests/test_large_cases.py"
     "tests/test_large_cases_async.py"
+    "tests/test_pregel.py"
+    "tests/test_pregel_async.py"
   ];
 
   passthru = {

From 2a9bc4c1b6ade707dea37b5e2647df7b72284bdb Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 31 Mar 2025 17:12:20 +0200
Subject: [PATCH 454/489] Revert "cosmic-settings: use mold linker"

This reverts commit d9344e9f6798845a33636b9a14f51da1dd7622c9.

In Nixpkgs, we consider the linker a property of the platform.
Individual packages should not be using toolchains other than the ones
that are part of the platform without a strong justification.  In this
case, the only justification appears to have been that upstream uses
this linker.  Just like we don't force every package whose upstream
happens to use Clang in their own builds to build with Clang in
Nixpkgs rather than the platform compiler, upstream's choice alone
isn't grounds for overriding the platform linker here.
---
 pkgs/by-name/co/cosmic-settings/package.nix | 144 +++++++++-----------
 1 file changed, 68 insertions(+), 76 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 3cac2e12b85f..7305976a50ee 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  stdenvAdapters,
   fetchFromGitHub,
   rustPlatform,
   cmake,
@@ -19,90 +18,83 @@
   cosmic-randr,
   xkeyboard_config,
   nix-update-script,
-
-  withMoldLinker ? stdenv.targetPlatform.isLinux,
 }:
 let
   libcosmicAppHook' = (libcosmicAppHook.__spliced.buildHost or libcosmicAppHook).override {
     includeSettings = false;
   };
 in
-rustPlatform.buildRustPackage.override
-  { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; }
-  (finalAttrs: {
-    pname = "cosmic-settings";
-    version = "1.0.0-alpha.6";
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cosmic-settings";
+  version = "1.0.0-alpha.6";
 
-    src = fetchFromGitHub {
-      owner = "pop-os";
-      repo = "cosmic-settings";
-      tag = "epoch-${finalAttrs.version}";
-      hash = "sha256-UKg3TIpyaqtynk6wLFFPpv69F74hmqfMVPra2+iFbvE=";
-    };
+  src = fetchFromGitHub {
+    owner = "pop-os";
+    repo = "cosmic-settings";
+    tag = "epoch-${finalAttrs.version}";
+    hash = "sha256-UKg3TIpyaqtynk6wLFFPpv69F74hmqfMVPra2+iFbvE=";
+  };
 
-    useFetchCargoVendor = true;
-    cargoHash = "sha256-mf/Cw3/RLrCYgsk7JKCU2+oPn1VPbD+4JzkUmbd47m8=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-mf/Cw3/RLrCYgsk7JKCU2+oPn1VPbD+4JzkUmbd47m8=";
 
-    nativeBuildInputs = [
-      cmake
-      just
-      libcosmicAppHook'
-      pkg-config
-      rustPlatform.bindgenHook
-      util-linux
+  nativeBuildInputs = [
+    cmake
+    just
+    libcosmicAppHook'
+    pkg-config
+    rustPlatform.bindgenHook
+    util-linux
+  ];
+
+  buildInputs = [
+    expat
+    fontconfig
+    freetype
+    libinput
+    pipewire
+    pulseaudio
+    udev
+  ];
+
+  dontUseJustBuild = true;
+  dontUseJustCheck = true;
+
+  justFlags = [
+    "--set"
+    "prefix"
+    (placeholder "out")
+    "--set"
+    "bin-src"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings"
+  ];
+
+  preFixup = ''
+    libcosmicAppWrapperArgs+=(
+      --prefix PATH : ${lib.makeBinPath [ cosmic-randr ]}
+      --set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml
+      --set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml
+    )
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version"
+      "unstable"
+      "--version-regex"
+      "epoch-(.*)"
     ];
+  };
 
-    buildInputs = [
-      expat
-      fontconfig
-      freetype
-      libinput
-      pipewire
-      pulseaudio
-      udev
+  meta = {
+    description = "Settings for the COSMIC Desktop Environment";
+    homepage = "https://github.com/pop-os/cosmic-settings";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "cosmic-settings";
+    maintainers = with lib.maintainers; [
+      nyabinary
+      HeitorAugustoLN
     ];
-
-    dontUseJustBuild = true;
-    dontUseJustCheck = true;
-
-    justFlags = [
-      "--set"
-      "prefix"
-      (placeholder "out")
-      "--set"
-      "bin-src"
-      "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings"
-    ];
-
-    env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
-      lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold";
-
-    preFixup = ''
-      libcosmicAppWrapperArgs+=(
-        --prefix PATH : ${lib.makeBinPath [ cosmic-randr ]}
-        --set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml
-        --set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml
-      )
-    '';
-
-    passthru.updateScript = nix-update-script {
-      extraArgs = [
-        "--version"
-        "unstable"
-        "--version-regex"
-        "epoch-(.*)"
-      ];
-    };
-
-    meta = {
-      description = "Settings for the COSMIC Desktop Environment";
-      homepage = "https://github.com/pop-os/cosmic-settings";
-      license = lib.licenses.gpl3Only;
-      mainProgram = "cosmic-settings";
-      maintainers = with lib.maintainers; [
-        nyabinary
-        HeitorAugustoLN
-      ];
-      platforms = lib.platforms.linux;
-    };
-  })
+    platforms = lib.platforms.linux;
+  };
+})

From 9cde6b86e9b5e1094695862bad811a251f7a94d1 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 31 Mar 2025 17:18:44 +0200
Subject: [PATCH 455/489] Revert "cosmic-randr: use mold linker"

This reverts commit 801b31bb362705233a52c364cef9a7328667ab24.

In Nixpkgs, we consider the linker a property of the platform.
Individual packages should not be using toolchains other than the ones
that are part of the platform without a strong justification.  In this
case, the only justification appears to have been that upstream uses
this linker.  Just like we don't force every package whose upstream
happens to use Clang in their own builds to build with Clang in
Nixpkgs rather than the platform compiler, upstream's choice alone
isn't grounds for overriding the platform linker here.
---
 pkgs/by-name/co/cosmic-randr/package.nix | 104 +++++++++++------------
 1 file changed, 48 insertions(+), 56 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index e8115fad0f15..34444fe33e2c 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -1,73 +1,65 @@
 {
   lib,
   stdenv,
-  stdenvAdapters,
   fetchFromGitHub,
   rustPlatform,
   just,
   pkg-config,
   wayland,
   nix-update-script,
-
-  withMoldLinker ? stdenv.targetPlatform.isLinux,
 }:
 
-rustPlatform.buildRustPackage.override
-  { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; }
-  (finalAttrs: {
-    pname = "cosmic-randr";
-    version = "1.0.0-alpha.6";
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cosmic-randr";
+  version = "1.0.0-alpha.6";
 
-    src = fetchFromGitHub {
-      owner = "pop-os";
-      repo = "cosmic-randr";
-      tag = "epoch-${finalAttrs.version}";
-      hash = "sha256-Sqxe+vKonsK9MmJGtbrZHE7frfrjkHXysm0WQt7WSU4=";
-    };
+  src = fetchFromGitHub {
+    owner = "pop-os";
+    repo = "cosmic-randr";
+    tag = "epoch-${finalAttrs.version}";
+    hash = "sha256-Sqxe+vKonsK9MmJGtbrZHE7frfrjkHXysm0WQt7WSU4=";
+  };
 
-    useFetchCargoVendor = true;
-    cargoHash = "sha256-UQ/fhjUiniVeHRQYulYko4OxcWB6UhFuxH1dVAfAzIY=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-UQ/fhjUiniVeHRQYulYko4OxcWB6UhFuxH1dVAfAzIY=";
 
-    nativeBuildInputs = [
-      just
-      pkg-config
+  nativeBuildInputs = [
+    just
+    pkg-config
+  ];
+
+  buildInputs = [ wayland ];
+
+  dontUseJustBuild = true;
+  dontUseJustCheck = true;
+
+  justFlags = [
+    "--set"
+    "prefix"
+    (placeholder "out")
+    "--set"
+    "bin-src"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr"
+  ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version"
+      "unstable"
+      "--version-regex"
+      "epoch-(.*)"
     ];
+  };
 
-    buildInputs = [ wayland ];
-
-    dontUseJustBuild = true;
-    dontUseJustCheck = true;
-
-    justFlags = [
-      "--set"
-      "prefix"
-      (placeholder "out")
-      "--set"
-      "bin-src"
-      "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr"
+  meta = {
+    homepage = "https://github.com/pop-os/cosmic-randr";
+    description = "Library and utility for displaying and configuring Wayland outputs";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
+      nyabinary
+      HeitorAugustoLN
     ];
-
-    env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
-      lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold";
-
-    passthru.updateScript = nix-update-script {
-      extraArgs = [
-        "--version"
-        "unstable"
-        "--version-regex"
-        "epoch-(.*)"
-      ];
-    };
-
-    meta = {
-      homepage = "https://github.com/pop-os/cosmic-randr";
-      description = "Library and utility for displaying and configuring Wayland outputs";
-      license = lib.licenses.mpl20;
-      maintainers = with lib.maintainers; [
-        nyabinary
-        HeitorAugustoLN
-      ];
-      platforms = lib.platforms.linux;
-      mainProgram = "cosmic-randr";
-    };
-  })
+    platforms = lib.platforms.linux;
+    mainProgram = "cosmic-randr";
+  };
+})

From 588d8570a155ce50e48f24019cbcbe5f6156db30 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 31 Mar 2025 17:22:10 +0200
Subject: [PATCH 456/489] Revert "cosmic-launcher: use mold linker"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This mostly reverts commit 63a365d8ffd47ffe7bbd0e577e3fecb51130efed.
I've left the deletion of the postPatch from the original commit stand
— it seems to have been included in the original commit by mistake
instead of being a separate commit, as it has nothing to do with mold.

In Nixpkgs, we consider the linker a property of the platform.
Individual packages should not be using toolchains other than the ones
that are part of the platform without a strong justification.  In this
case, the only justification appears to have been that upstream uses
this linker.  Just like we don't force every package whose upstream
happens to use Clang in their own builds to build with Clang in
Nixpkgs rather than the platform compiler, upstream's choice alone
isn't grounds for overriding the platform linker here.
---
 pkgs/by-name/co/cosmic-launcher/package.nix | 102 +++++++++-----------
 1 file changed, 48 insertions(+), 54 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index fba267328761..ac55e2b38390 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -1,70 +1,64 @@
 {
   lib,
   stdenv,
-  stdenvAdapters,
   fetchFromGitHub,
   rustPlatform,
   just,
   libcosmicAppHook,
   nix-update-script,
-
-  withMoldLinker ? stdenv.targetPlatform.isLinux,
 }:
 
-rustPlatform.buildRustPackage.override
-  { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; }
-  (finalAttrs: {
-    pname = "cosmic-launcher";
-    version = "1.0.0-alpha.6";
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cosmic-launcher";
+  version = "1.0.0-alpha.6";
 
-    src = fetchFromGitHub {
-      owner = "pop-os";
-      repo = "cosmic-launcher";
-      tag = "epoch-${finalAttrs.version}";
-      hash = "sha256-BtYnL+qkM/aw+Air5yOKH098V+TQByM5mh1DX7v+v+s=";
-    };
+  src = fetchFromGitHub {
+    owner = "pop-os";
+    repo = "cosmic-launcher";
+    tag = "epoch-${finalAttrs.version}";
+    hash = "sha256-BtYnL+qkM/aw+Air5yOKH098V+TQByM5mh1DX7v+v+s=";
+  };
 
-    useFetchCargoVendor = true;
-    cargoHash = "sha256-g7Qr3C8jQg65KehXAhftdXCpEukag0w12ClvZFkxfqs=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-g7Qr3C8jQg65KehXAhftdXCpEukag0w12ClvZFkxfqs=";
 
-    nativeBuildInputs = [
-      just
-      libcosmicAppHook
+  nativeBuildInputs = [
+    just
+    libcosmicAppHook
+  ];
+
+  dontUseJustBuild = true;
+  dontUseJustCheck = true;
+
+  justFlags = [
+    "--set"
+    "prefix"
+    (placeholder "out")
+    "--set"
+    "bin-src"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-launcher"
+  ];
+
+  env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable";
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version"
+      "unstable"
+      "--version-regex"
+      "epoch-(.*)"
     ];
+  };
 
-    dontUseJustBuild = true;
-    dontUseJustCheck = true;
-
-    justFlags = [
-      "--set"
-      "prefix"
-      (placeholder "out")
-      "--set"
-      "bin-src"
-      "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-launcher"
+  meta = {
+    homepage = "https://github.com/pop-os/cosmic-launcher";
+    description = "Launcher for the COSMIC Desktop Environment";
+    mainProgram = "cosmic-launcher";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      nyabinary
+      HeitorAugustoLN
     ];
-
-    env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
-      "--cfg tokio_unstable${lib.optionalString withMoldLinker " -C link-arg=-fuse-ld=mold"}";
-
-    passthru.updateScript = nix-update-script {
-      extraArgs = [
-        "--version"
-        "unstable"
-        "--version-regex"
-        "epoch-(.*)"
-      ];
-    };
-
-    meta = {
-      homepage = "https://github.com/pop-os/cosmic-launcher";
-      description = "Launcher for the COSMIC Desktop Environment";
-      mainProgram = "cosmic-launcher";
-      license = lib.licenses.gpl3Only;
-      maintainers = with lib.maintainers; [
-        nyabinary
-        HeitorAugustoLN
-      ];
-      platforms = lib.platforms.linux;
-    };
-  })
+    platforms = lib.platforms.linux;
+  };
+})

From 960d63ec1d495551332c41433f65f777157d141e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 31 Mar 2025 17:27:58 +0200
Subject: [PATCH 457/489] Revert "cosmic-bg: use mold linker"

This reverts commit 0ee24498210e397f3beeefb4a3b87e43d1d5817b.

In Nixpkgs, we consider the linker a property of the platform.
Individual packages should not be using toolchains other than the ones
that are part of the platform without a strong justification.  In this
case, the only justification appears to have been that upstream uses
this linker.  Just like we don't force every package whose upstream
happens to use Clang in their own builds to build with Clang in
Nixpkgs rather than the platform compiler, upstream's choice alone
isn't grounds for overriding the platform linker here.
---
 pkgs/by-name/co/cosmic-bg/package.nix | 102 ++++++++++++--------------
 1 file changed, 47 insertions(+), 55 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 61fe82b61528..240931718aab 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -1,72 +1,64 @@
 {
   lib,
   stdenv,
-  stdenvAdapters,
   fetchFromGitHub,
   rustPlatform,
   libcosmicAppHook,
   just,
   nasm,
   nix-update-script,
-
-  withMoldLinker ? stdenv.targetPlatform.isLinux,
 }:
 
-rustPlatform.buildRustPackage.override
-  { stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; }
-  (finalAttrs: {
-    pname = "cosmic-bg";
-    version = "1.0.0-alpha.6";
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cosmic-bg";
+  version = "1.0.0-alpha.6";
 
-    src = fetchFromGitHub {
-      owner = "pop-os";
-      repo = "cosmic-bg";
-      tag = "epoch-${finalAttrs.version}";
-      hash = "sha256-4b4laUXTnAbdngLVh8/dD144m9QrGReSEjRZoNR6Iks=";
-    };
+  src = fetchFromGitHub {
+    owner = "pop-os";
+    repo = "cosmic-bg";
+    tag = "epoch-${finalAttrs.version}";
+    hash = "sha256-4b4laUXTnAbdngLVh8/dD144m9QrGReSEjRZoNR6Iks=";
+  };
 
-    useFetchCargoVendor = true;
-    cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk=";
 
-    nativeBuildInputs = [
-      just
-      libcosmicAppHook
-      nasm
+  nativeBuildInputs = [
+    just
+    libcosmicAppHook
+    nasm
+  ];
+
+  dontUseJustBuild = true;
+  dontUseJustCheck = true;
+
+  justFlags = [
+    "--set"
+    "prefix"
+    (placeholder "out")
+    "--set"
+    "bin-src"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg"
+  ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version"
+      "unstable"
+      "--version-regex"
+      "epoch-(.*)"
     ];
+  };
 
-    dontUseJustBuild = true;
-    dontUseJustCheck = true;
-
-    justFlags = [
-      "--set"
-      "prefix"
-      (placeholder "out")
-      "--set"
-      "bin-src"
-      "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg"
+  meta = {
+    homepage = "https://github.com/pop-os/cosmic-bg";
+    description = "Applies Background for the COSMIC Desktop Environment";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
+      nyabinary
+      HeitorAugustoLN
     ];
-
-    env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
-      lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold";
-
-    passthru.updateScript = nix-update-script {
-      extraArgs = [
-        "--version"
-        "unstable"
-        "--version-regex"
-        "epoch-(.*)"
-      ];
-    };
-
-    meta = {
-      homepage = "https://github.com/pop-os/cosmic-bg";
-      description = "Applies Background for the COSMIC Desktop Environment";
-      license = lib.licenses.mpl20;
-      maintainers = with lib.maintainers; [
-        nyabinary
-        HeitorAugustoLN
-      ];
-      platforms = lib.platforms.linux;
-      mainProgram = "cosmic-bg";
-    };
-  })
+    platforms = lib.platforms.linux;
+    mainProgram = "cosmic-bg";
+  };
+})

From f5c243506e5c6e0f431f617bc671cc36a9b92a08 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Apr 2025 17:59:15 +0200
Subject: [PATCH 458/489] python313Packages.tencentcloud-sdk-python: 3.0.1355
 -> 3.0.1356

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1355...3.0.1356

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

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 1aadc9635fef..cbc33570fbec 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1355";
+  version = "3.0.1356";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-Sg6RU4rvagvFV5oyyDiCp/atdUlkCRYXoctIRaukfic=";
+    hash = "sha256-sxmrymOkZCfvb1THOHNOz0PLv5MigcJeZsZ4UylgTG0=";
   };
 
   build-system = [ setuptools ];

From 80403c6b5670cf8fddf5d1a15850383d7cac235a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 16:02:25 +0000
Subject: [PATCH 459/489] primecount: 7.15 -> 7.16

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

diff --git a/pkgs/by-name/pr/primecount/package.nix b/pkgs/by-name/pr/primecount/package.nix
index f8a402931699..9e2ae25a3244 100644
--- a/pkgs/by-name/pr/primecount/package.nix
+++ b/pkgs/by-name/pr/primecount/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "primecount";
-  version = "7.15";
+  version = "7.16";
 
   src = fetchFromGitHub {
     owner = "kimwalisch";
     repo = "primecount";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-UE+BEYynZGMBi3hjNX51I9cD/I1bbmfj9bO9r8UwwD0=";
+    hash = "sha256-wmq2AmpmDNJE7AEbn+sFbmLYR/ewdVQeEyWkmq16U9o=";
   };
 
   outputs = [

From 21a0fa98538316b7364acf373737fb1e0d1ef01d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 16:07:49 +0000
Subject: [PATCH 460/489] libvgm: 0-unstable-2024-10-17 ->
 0-unstable-2025-04-05

---
 pkgs/development/libraries/libvgm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix
index 09d7ac023648..d3ba36cff93a 100644
--- a/pkgs/development/libraries/libvgm/default.nix
+++ b/pkgs/development/libraries/libvgm/default.nix
@@ -40,13 +40,13 @@ assert enableTools -> enableAudio && enableEmulation && enableLibplayer;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libvgm";
-  version = "0-unstable-2024-10-17";
+  version = "0-unstable-2025-04-05";
 
   src = fetchFromGitHub {
     owner = "ValleyBell";
     repo = "libvgm";
-    rev = "7b694e53e42a75ce48b846c53d08e4a33f627842";
-    hash = "sha256-u+mBzmEixJT3rwuipITktFI4iVswnXftfF7syBw4t/w=";
+    rev = "4464b6d59f1afe99a0f7679dff50c5ada4a31654";
+    hash = "sha256-btKg65haGhuz+xh4eWlujzUIhjjdUg9RelLX/ouLx68=";
   };
 
   outputs = [

From 8385f13527f1de2b310c7992c4cd49858711242d Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Tue, 8 Apr 2025 18:15:56 +0200
Subject: [PATCH 461/489] yazi: add resvg to optional dependencies

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

diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix
index de7be8884cc6..7b45631d0b2d 100644
--- a/pkgs/by-name/ya/yazi/package.nix
+++ b/pkgs/by-name/ya/yazi/package.nix
@@ -16,6 +16,7 @@
     zoxide
     imagemagick
     chafa
+    resvg
   ],
 
   # deps
@@ -33,6 +34,7 @@
   zoxide,
   imagemagick,
   chafa,
+  resvg,
 
   settings ? { },
   plugins ? { },

From 9c49419752e5b4c3c6fac2621d2bcda198745c56 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 8 Apr 2025 18:17:09 +0200
Subject: [PATCH 462/489] python312Packages.uv-dynamic-versioning: 0.6.0 ->
 0.8.0

Diff: https://github.com/ninoseki/uv-dynamic-versioning/compare/refs/tags/v0.6.0...refs/tags/v0.8.0

Changelog: https://github.com/ninoseki/uv-dynamic-versioning/releases/tag/v0.8.0
---
 .../python-modules/uv-dynamic-versioning/default.nix        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix
index f31733bd045d..450f3df1a06d 100644
--- a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix
+++ b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix
@@ -9,6 +9,7 @@
   # dependencies
   dunamai,
   eval-type-backport,
+  jinja2,
   pydantic,
   returns,
   tomlkit,
@@ -21,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "uv-dynamic-versioning";
-  version = "0.6.0";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -30,7 +31,7 @@ buildPythonPackage rec {
     tag = "v${version}";
     # Tests perform mock operations on the local repo
     leaveDotGit = true;
-    hash = "sha256-rcvNQ6QrVu2pp1aWTalNK2R7CW/NfFGmu4Dea1EN2ZA=";
+    hash = "sha256-DO10OGij7koV5VYqywRR28pg0sEOAuGpqz1Ksf39MQo=";
   };
 
   build-system = [
@@ -41,6 +42,7 @@ buildPythonPackage rec {
     dunamai
     eval-type-backport
     hatchling
+    jinja2
     pydantic
     returns
     tomlkit

From abd52dd8723a8b0293d25603769205cefeacab50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Mar 2025 21:45:55 +0100
Subject: [PATCH 463/489] nixVersions.{nix_2_28,nix_2_26}: switch simplified
 meson build

So we are adding a simplified version that builds a monolithic nix binary to get finished
in time for the release. Afterwards we will switch to the modular build again.
---
 lib/tests/nix-for-tests.nix                   |   2 +-
 .../nix/{common.nix => common-autoconf.nix}   |   0
 .../package-management/nix/common-meson.nix   | 287 ++++++++++++++++++
 pkgs/tools/package-management/nix/default.nix |  65 ++--
 .../tools/package-management/nix/nix-perl.nix |  25 +-
 5 files changed, 334 insertions(+), 45 deletions(-)
 rename pkgs/tools/package-management/nix/{common.nix => common-autoconf.nix} (100%)
 create mode 100644 pkgs/tools/package-management/nix/common-meson.nix

diff --git a/lib/tests/nix-for-tests.nix b/lib/tests/nix-for-tests.nix
index 96c01241773a..a9a5b2f8de54 100644
--- a/lib/tests/nix-for-tests.nix
+++ b/lib/tests/nix-for-tests.nix
@@ -14,7 +14,7 @@
 
 builtins.mapAttrs (
   attr: pkg:
-  if lib.versionAtLeast pkg.version "2.26" then
+  if lib.versionAtLeast pkg.version "2.29pre" then
     pkg.overrideScope (finalScope: prevScope: { aws-sdk-cpp = null; })
   else
     pkg.override { withAWS = false; }
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common-autoconf.nix
similarity index 100%
rename from pkgs/tools/package-management/nix/common.nix
rename to pkgs/tools/package-management/nix/common-autoconf.nix
diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix
new file mode 100644
index 000000000000..d6d27f18ebd4
--- /dev/null
+++ b/pkgs/tools/package-management/nix/common-meson.nix
@@ -0,0 +1,287 @@
+{
+  lib,
+  fetchFromGitHub,
+  version,
+  suffix ? "",
+  hash ? null,
+  src ? fetchFromGitHub {
+    owner = "NixOS";
+    repo = "nix";
+    rev = version;
+    inherit hash;
+  },
+  patches ? [ ],
+  maintainers ? lib.teams.nix.members ++ [
+    lib.maintainers.lovesegfault
+    lib.maintainers.artturin
+  ],
+  self_attribute_name,
+}@args:
+assert (hash == null) -> (src != null);
+{
+  stdenv,
+  bison,
+  boehmgc,
+  boost,
+  brotli,
+  busybox-sandbox-shell,
+  bzip2,
+  callPackage,
+  cmake,
+  curl,
+  darwin,
+  doxygen,
+  editline,
+  flex,
+  git,
+  gtest,
+  jq,
+  lib,
+  libarchive,
+  libblake3,
+  libcpuid,
+  libgit2,
+  libsodium,
+  lowdown,
+  lowdown-unsandboxed,
+  toml11,
+  man,
+  meson,
+  ninja,
+  mdbook,
+  mdbook-linkcheck,
+  nlohmann_json,
+  nixosTests,
+  openssl,
+  perl,
+  python3,
+  pkg-config,
+  rapidcheck,
+  rsync,
+  Security,
+  sqlite,
+  util-linuxMinimal,
+  xz,
+  enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
+  enableStatic ? stdenv.hostPlatform.isStatic,
+  withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin),
+  aws-sdk-cpp,
+  withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp,
+  libseccomp,
+
+  confDir,
+  stateDir,
+  storeDir,
+
+  # passthru tests
+  pkgsi686Linux,
+  pkgsStatic,
+  runCommand,
+  pkgs,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nix";
+
+  version = "${version}${suffix}";
+  VERSION_SUFFIX = suffix;
+
+  inherit src patches;
+
+  outputs =
+    [
+      "out"
+      "dev"
+    ]
+    ++ lib.optionals enableDocumentation [
+      "man"
+      "doc"
+    ];
+
+  hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
+
+  hardeningDisable = [
+    "shadowstack"
+  ] ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
+
+  nativeCheckInputs = [
+    git
+    man
+  ];
+
+  nativeBuildInputs =
+    [
+      bison
+      cmake
+      flex
+      jq
+      meson
+      ninja
+      pkg-config
+      rsync
+    ]
+    ++ lib.optionals enableDocumentation [
+      (lib.getBin lowdown-unsandboxed)
+      mdbook
+      mdbook-linkcheck
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      util-linuxMinimal
+    ]
+    ++ lib.optionals enableDocumentation [
+      python3
+      doxygen
+    ];
+
+  buildInputs =
+    [
+      boost
+      brotli
+      bzip2
+      curl
+      editline
+      libgit2
+      libsodium
+      lowdown
+      openssl
+      sqlite
+      toml11
+      xz
+    ]
+    ++ lib.optionals (lib.versionAtLeast version "2.26") [
+      libblake3
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      Security
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+      libcpuid
+    ]
+    ++ lib.optionals withLibseccomp [
+      libseccomp
+    ]
+    ++ lib.optionals withAWS [
+      aws-sdk-cpp
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+      darwin.apple_sdk.libs.sandbox
+    ];
+
+  propagatedBuildInputs = [
+    boehmgc
+    nlohmann_json
+    libarchive
+  ];
+
+  checkInputs = [
+    gtest
+    rapidcheck
+  ];
+
+  postPatch = ''
+    patchShebangs --build tests
+  '';
+
+  preConfigure =
+    # Copy libboost_context so we don't get all of Boost in our closure.
+    # https://github.com/NixOS/nixpkgs/issues/45462
+    lib.optionalString (!enableStatic) ''
+      mkdir -p $out/lib
+      cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib
+      rm -f $out/lib/*.a
+      ${lib.optionalString stdenv.hostPlatform.isLinux ''
+        chmod u+w $out/lib/*.so.*
+        patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.*
+      ''}
+    '';
+
+  dontUseCmakeConfigure = true;
+
+  mesonFlags =
+    [
+      (lib.mesonBool "bindings" false)
+      (lib.mesonOption "libstore:store-dir" storeDir)
+      (lib.mesonOption "libstore:localstatedir" stateDir)
+      (lib.mesonOption "libstore:sysconfdir" confDir)
+      (lib.mesonEnable "libutil:cpuid" stdenv.hostPlatform.isx86_64)
+      (lib.mesonEnable "libstore:seccomp-sandboxing" withLibseccomp)
+      (lib.mesonBool "libstore:embedded-sandbox-shell" (
+        stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic
+      ))
+      (lib.mesonBool "doc-gen" enableDocumentation)
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      (lib.mesonOption "libstore:sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
+      # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
+    ]
+    ++ lib.optionals (stdenv.cc.isGNU && !enableStatic) [
+      # TODO: do we still need this?
+      # "--enable-lto"
+    ];
+
+  doCheck = true;
+
+  # socket path becomes too long otherwise
+  preInstallCheck =
+    lib.optionalString stdenv.hostPlatform.isDarwin ''
+      export TMPDIR=$NIX_BUILD_TOP
+    ''
+    # See https://github.com/NixOS/nix/issues/5687
+    + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") ''
+      echo "exit 0" > tests/functional/flakes/show.sh
+    ''
+    + ''
+      # nixStatic otherwise does not find its man pages in tests.
+      export MANPATH=$man/share/man:$MANPATH
+    '';
+
+  separateDebugInfo = stdenv.hostPlatform.isLinux && enableStatic;
+
+  passthru = {
+    inherit aws-sdk-cpp boehmgc;
+
+    # TODO:
+    perl-bindings = perl.pkgs.toPerlModule (
+      callPackage ./nix-perl.nix {
+        nix = finalAttrs.finalPackage;
+        inherit Security;
+      }
+    );
+
+    tests = import ./tests.nix {
+      inherit
+        runCommand
+        version
+        src
+        lib
+        stdenv
+        pkgs
+        pkgsi686Linux
+        pkgsStatic
+        nixosTests
+        self_attribute_name
+        ;
+      nix = finalAttrs.finalPackage;
+    };
+  };
+
+  # point 'nix edit' and ofborg at the file that defines the attribute,
+  # not this common file.
+  pos = builtins.unsafeGetAttrPos "version" args;
+  meta = with lib; {
+    description = "Powerful package manager that makes package management reliable and reproducible";
+    longDescription = ''
+      Nix is a powerful package manager for Linux and other Unix systems that
+      makes package management reliable and reproducible. It provides atomic
+      upgrades and rollbacks, side-by-side installation of multiple versions of
+      a package, multi-user package management and easy setup of build
+      environments.
+    '';
+    homepage = "https://nixos.org/";
+    license = licenses.lgpl21Plus;
+    inherit maintainers;
+    platforms = platforms.unix;
+    outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";
+    mainProgram = "nix";
+  };
+})
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index de70aa46badf..89f6805752b7 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -20,20 +20,35 @@
 let
 
   # Called for Nix < 2.26
-  common =
+  commonAutoconf =
     args:
-    nixDependencies.callPackage (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) {
+    nixDependencies.callPackage
+      (import ./common-autoconf.nix ({ inherit lib fetchFromGitHub; } // args))
+      {
+        inherit
+          Security
+          storeDir
+          stateDir
+          confDir
+          ;
+        aws-sdk-cpp =
+          if lib.versionAtLeast args.version "2.12pre" then
+            nixDependencies.aws-sdk-cpp
+          else
+            nixDependencies.aws-sdk-cpp-old;
+      };
+
+  # Called for Nix == 2.28. Transitional until we always use
+  # per-component packages.
+  commonMeson =
+    args:
+    nixDependencies.callPackage (import ./common-meson.nix ({ inherit lib fetchFromGitHub; } // args)) {
       inherit
         Security
         storeDir
         stateDir
         confDir
         ;
-      aws-sdk-cpp =
-        if lib.versionAtLeast args.version "2.12pre" then
-          nixDependencies.aws-sdk-cpp
-        else
-          nixDependencies.aws-sdk-cpp-old;
     };
 
   # https://github.com/NixOS/nix/pull/7585
@@ -140,7 +155,7 @@ lib.makeExtensible (
   (
     {
       nix_2_3 =
-        (common {
+        (commonAutoconf {
           version = "2.3.18";
           hash = "sha256-jBz2Ub65eFYG+aWgSI3AJYvLSghio77fWQiIW1svA9U=";
           patches = [
@@ -155,48 +170,30 @@ lib.makeExtensible (
             enableParallelChecking = false;
           };
 
-      nix_2_24 = common {
+      nix_2_24 = commonAutoconf {
         version = "2.24.14";
         hash = "sha256-SthMCsj6POjawLnJq9+lj/UzObX9skaeN1UGmMZiwTY=";
         self_attribute_name = "nix_2_24";
       };
 
-      nix_2_25 = common {
+      nix_2_25 = commonAutoconf {
         version = "2.25.5";
         hash = "sha256-9xrQhrqHCSqWsQveykZvG/ZMu0se66fUQw3xVSg6BpQ=";
         self_attribute_name = "nix_2_25";
       };
 
-      nixComponents_2_26 = nixDependencies.callPackage ./modular/packages.nix rec {
+      nix_2_26 = commonMeson {
         version = "2.26.3";
-        inherit (self.nix_2_24.meta) maintainers;
-        otherSplices = generateSplicesForNixComponents "nixComponents_2_26";
-        src = fetchFromGitHub {
-          owner = "NixOS";
-          repo = "nix";
-          tag = version;
-          hash = "sha256-5ZV8YqU8mfFmoAMiUEuBqNwk0T3vUR//x1D12BiYCeY=";
-        };
+        hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI=";
+        self_attribute_name = "nix_2_28";
       };
 
-      # Note, this might eventually become an alias, as packages should
-      # depend on the components they need in `nixComponents_2_26`.
-      nix_2_26 = addTests "nix_2_26" self.nixComponents_2_26.nix-everything;
-
-      nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix rec {
+      nix_2_28 = commonMeson {
         version = "2.28.1";
-        inherit (self.nix_2_24.meta) maintainers;
-        otherSplices = generateSplicesForNixComponents "nixComponents_2_28";
-        src = fetchFromGitHub {
-          owner = "NixOS";
-          repo = "nix";
-          rev = version;
-          hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI=";
-        };
+        hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI=";
+        self_attribute_name = "nix_2_28";
       };
 
-      nix_2_28 = addTests "nix_2_28" self.nixComponents_2_28.nix-everything;
-
       nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
         version = "2.29pre20250407_${lib.substring 0 8 src.rev}";
         inherit (self.nix_2_24.meta) maintainers;
diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix
index 99ce5101265b..f3b42e4c7c2e 100644
--- a/pkgs/tools/package-management/nix/nix-perl.nix
+++ b/pkgs/tools/package-management/nix/nix-perl.nix
@@ -14,11 +14,13 @@
   meson,
   ninja,
   bzip2,
+  libarchive,
 }:
 
 let
   atLeast223 = lib.versionAtLeast nix.version "2.23";
   atLeast224 = lib.versionAtLeast nix.version "2.24";
+  atLeast226 = lib.versionAtLeast nix.version "2.26";
 
   mkConfigureOption =
     {
@@ -39,21 +41,24 @@ stdenv.mkDerivation (finalAttrs: {
   postUnpack = "sourceRoot=$sourceRoot/${lib.optionalString atLeast224 "src"}/perl";
 
   # TODO: Remove this once the nix build also uses meson
-  postPatch = lib.optionalString atLeast224 ''
+  postPatch = lib.optionalString (atLeast224 && lib.versionOlder nix.version "2.27") ''
     substituteInPlace lib/Nix/Store.xs \
       --replace-fail 'config-util.hh' 'nix/config.h' \
       --replace-fail 'config-store.hh' 'nix/config.h'
   '';
 
-  buildInputs = [
-    boost
-    bzip2
-    curl
-    libsodium
-    nix
-    perl
-    xz
-  ] ++ lib.optional (stdenv.hostPlatform.isDarwin) Security;
+  buildInputs =
+    [
+      boost
+      bzip2
+      curl
+      libsodium
+      nix
+      perl
+      xz
+    ]
+    ++ lib.optional (stdenv.hostPlatform.isDarwin) Security
+    ++ lib.optional atLeast226 libarchive;
 
   # Not cross-safe since Nix checks for curl/perl via
   # NEED_PROG/find_program, but both seem to be needed at runtime

From 28d057efd30c6b9b7d68f5c1e2fff449b8987989 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 8 Apr 2025 11:50:33 -0400
Subject: [PATCH 464/489] nix-eval-jobs: Strip unneeded deps

---
 pkgs/tools/package-management/nix-eval-jobs/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
index 623b17695ea7..d229bc50e301 100644
--- a/pkgs/tools/package-management/nix-eval-jobs/default.nix
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -14,24 +14,25 @@
 stdenv.mkDerivation rec {
   pname = "nix-eval-jobs";
   version = "2.28.0";
+
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
     rev = "v${version}";
     hash = "sha256-v5n6t49X7MOpqS9j0FtI6TWOXvxuZMmGsp2OfUK5QfA=";
   };
+
   buildInputs = [
     boost
     nix
     curl
     nlohmann_json
   ];
+
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
-    # nlohmann_json can be only discovered via cmake files
-    cmake
   ];
 
   # Since this package is intimately tied to a specific Nix release, we

From 0e29e0421269fb6968d10370a024e21df8f734d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 17:01:01 +0000
Subject: [PATCH 465/489] stackit-cli: 0.29.0 -> 0.30.0

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

diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index cd678c8f98a9..7bce2ce7a466 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "stackit-cli";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-EPjQrPt6m7yOFgYqHOaWAZN7CjlsOgl2jsEuRB8+1fE=";
+    hash = "sha256-S+lmNVZafa0BFN0rhmhBU2ez28ATDFDF2TApt32c9Z8=";
   };
 
-  vendorHash = "sha256-NiaY0HKDerYqehZkYToAHazaJe0eMUuue+8h6QdQDHM=";
+  vendorHash = "sha256-y3wztN/exexIwsAnQAlQu81rGTJZrgNmeVj45MVSxk0=";
 
   subPackages = [ "." ];
 

From 8f2eee63aa995fcd010472785cc29d6fb37b4772 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 17:09:56 +0000
Subject: [PATCH 466/489] vendir: 0.43.1 -> 0.43.2

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

diff --git a/pkgs/by-name/ve/vendir/package.nix b/pkgs/by-name/ve/vendir/package.nix
index 5ee4df9747da..1d6608c77ad1 100644
--- a/pkgs/by-name/ve/vendir/package.nix
+++ b/pkgs/by-name/ve/vendir/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "vendir";
-  version = "0.43.1";
+  version = "0.43.2";
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "carvel-vendir";
     rev = "v${version}";
-    sha256 = "sha256-VIP1NkSZMoTZfvl6xAAbs0sL9rBc6FDaZHgOmRViStY=";
+    sha256 = "sha256-OCFXgVMFEKh3ImKQy4m2HVycyvt9IWJKd5Ng6rjNuzA=";
   };
 
   vendorHash = null;

From 716b540cbed41ce432f5efea6817f3bff9e2567d Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Wed, 9 Apr 2025 02:22:01 +0900
Subject: [PATCH 467/489] uv: 0.6.12 -> 0.6.13

https://github.com/astral-sh/uv/releases/tag/0.6.13

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 78f402585aea..24ee7fbd4f40 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.6.12";
+  version = "0.6.13";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-I7SRCw36xXkNnOe1+qDik3p9IeNo70DKMbJpqaoRhhQ=";
+    hash = "sha256-vJvF8ioEtiriWh120WhMxkYSody04PuXA6EISjWWvYA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ZCdwyjGM9z3GBlwF6TunmNT7IKyn9pssUaBMyZJxLhE=";
+  cargoHash = "sha256-pwbqYe2zdQJQGoqrIwryBHmnS8spPgQ0qdpmxdT+9sk=";
 
   buildInputs = [
     rust-jemalloc-sys

From 418142615573501d4d9493a87792ae7507ea7cd7 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 8 Apr 2025 20:08:31 +0200
Subject: [PATCH 468/489] chromium,chromedriver: 135.0.7049.52 -> 135.0.7049.84

https://chromereleases.googleblog.com/2025/04/stable-channel-update-for-desktop_8.html

This update includes 2 security fixes.

CVEs:
CVE-2025-3066
---
 .../networking/browsers/chromium/info.json    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 29f084a35e29..4db78372a890 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "135.0.7049.52",
+    "version": "135.0.7049.84",
     "chromedriver": {
-      "version": "135.0.7049.42",
-      "hash_darwin": "sha256-CixR0TvndAgxvXYbetIqKg6NRu/z3pJe+USCZ0pyQd4=",
-      "hash_darwin_aarch64": "sha256-WKDi97j1F9+I6RYOsdiXVrgVibZ3ZoVPljo1XAtw0o8="
+      "version": "135.0.7049.85",
+      "hash_darwin": "sha256-L4x/MSCbVt2UIQwbHREDV8br6DmdfuqTJ3//7opK2IU=",
+      "hash_darwin_aarch64": "sha256-vixXGqbc2UYpydg1RILhrtmr5DdbJ5I1sD8aNikejQU="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "9ba7e609d28c509a8ce9265c2247065d8d251173",
-        "hash": "sha256-PjvfckdlaMq9HWefGxFppgBumlqh7xoCoxYFwk/r630=",
+        "rev": "6c019e56001911b3fd467e03bf68c435924d62f4",
+        "hash": "sha256-BFw1o2cIHBeBudeigH6YTOuLGsp/+pTOeE1lXBO3aio=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -126,8 +126,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "bdc68b25b620d7302a955e2c38c548ebfe74ef31",
-        "hash": "sha256-R9SQiKUjLkLmPJwuWpw7fcibrWxSlXWkDsCra7Ci0UQ="
+        "rev": "53dfda5e9d07d58b43cea66b8153c55dd751ff88",
+        "hash": "sha256-zXxJZz2C4eDJ8beHDXJe0UCNesDw5R0ogFcsdiF8VIc="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -616,8 +616,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "b99f146a03d3c98049768fd91c2bbe6594b02b2c",
-        "hash": "sha256-tl1GDmcStkuKMmzzsYuRG6Nrk4xDqgYYBoa1VsQNOwY="
+        "rev": "6e445bdea696eb6b6a46681dfc1a63edaa517edb",
+        "hash": "sha256-mSup6nKsEPjJ/HBV7PwjBI4PP7/RdwFm/dnavKeRqzI="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -706,8 +706,8 @@
       },
       "src/third_party/wasm_tts_engine/src": {
         "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
-        "rev": "6ab3e63276a2d66ba3e7db4f87c5b7cb00e22130",
-        "hash": "sha256-ZcnKKnHsN1UyztAXClc2EUwfeX3yuLtMM2Zjwpnh62U="
+        "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125",
+        "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM="
       },
       "src/third_party/wayland/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -751,8 +751,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "04413d62f754a7b1a3a2d8c3df23bcde040112b2",
-        "hash": "sha256-sFoBgpPeMJQNSjNp8dDEUlB/7lJUpIXTpu0eRq94cGk="
+        "rev": "9e5db68b15087eccd8d2493b4e8539c1657e0f75",
+        "hash": "sha256-gXdBDo+fzp6hJB8qyhscV7ajwSfCUeYvSxhL10g56rU="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",

From bc57991924ec6d0ff2f8ad787e71448d2579893d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 18:30:49 +0000
Subject: [PATCH 469/489] lemmy-server: 0.19.10 -> 0.19.11

---
 pkgs/servers/web-apps/lemmy/pin.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json
index 3ce35050642e..074df2f75d76 100644
--- a/pkgs/servers/web-apps/lemmy/pin.json
+++ b/pkgs/servers/web-apps/lemmy/pin.json
@@ -1,8 +1,8 @@
 {
-  "serverVersion": "0.19.10",
-  "uiVersion": "0.19.10",
-  "serverHash": "sha256-RKXub6mpsDjm7kA/B+kMzLb/BZM4NuVRA3bPIPmc+vg=",
-  "serverCargoHash": "sha256-E+rml4PGJ3b/6Z22eZlhcudl2hfAS7OV2h7hqpsBoKQ=",
-  "uiHash": "sha256-QALxc4tKsflRcVJ99JYs7SSbgBWU9Y7SPIwxvLoVvM0=",
-  "uiPNPMDepsHash": "sha256-sEN8NUlXWuvfmuAaoy/Vx3X+xG/TbeAdYG2LfctcOGc="
+  "serverVersion": "0.19.11",
+  "uiVersion": "0.19.11",
+  "serverHash": "sha256-veF+fJTjsB543PyBnnBN4rmejTWrnlnLghnP6mLDP7U=",
+  "serverCargoHash": "sha256-H9Eu/nKxK27OXvzPi5ItTbKcHqISKAjN17MRWsw5xlc=",
+  "uiHash": "sha256-K8nNb/HQy/s5S5h9Ndt3t8F9/h1D2zOGrTEKhv+Z4Ks=",
+  "uiPNPMDepsHash": "sha256-SqU/kYadwszogaBErP2v1VXIMhJj9AHRKdrHLc99fMw="
 }

From 019895f15a39f0fa9db90d72caa5a38120ef6266 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 18:56:02 +0000
Subject: [PATCH 470/489] remnote: 1.19.8 -> 1.19.11

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

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index 9e00c8711a80..08a9379b4cef 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.19.8";
+  version = "1.19.11";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-xMr+UftIWxtlYzzdOtidCJWisSwJd+xEtaKyoZnyVXc=";
+    hash = "sha256-rKvbh4TihITP+M4znObUU+80YfG9gookilLpIBUxt9U=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From df7c31835e882bb287af107fdbd8a611f373e92d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 19:06:20 +0000
Subject: [PATCH 471/489] pgroll: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix
index b3592a8a7392..348e0595f19d 100644
--- a/pkgs/by-name/pg/pgroll/package.nix
+++ b/pkgs/by-name/pg/pgroll/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "pgroll";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "xataio";
     repo = "pgroll";
     tag = "v${version}";
-    hash = "sha256-AJ0dTvywbwwSHOwSPrAgTE9M1AMvo/GRj6L1dZM9Hz8=";
+    hash = "sha256-XjjoyJZVy/Zjac35enaBRCWU92YA9xFzFRhlsR8G9Bg=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-olblf/mi/M9Zo4C/fR/Z11C+bAEFOy7bz7EXfMn8Akw=";
+  vendorHash = "sha256-tPGqa2Sa1N+WY5iprryil1Yzx0FbbgSp4CcNc9dNWhY=";
 
   excludedPackages = [ "dev" ];
 

From a9f5a342260034ed2c9c640e31a186a512764774 Mon Sep 17 00:00:00 2001
From: Felix Kimmel <felix.kimmel@web.de>
Date: Tue, 8 Apr 2025 21:11:58 +0200
Subject: [PATCH 472/489] vscode-extensions.almenon.arepl: init at 3.0.0

---
 .../extensions/almenon.arepl/default.nix      | 20 +++++++++++++++++++
 .../editors/vscode/extensions/default.nix     |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix b/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix
new file mode 100644
index 000000000000..3164d8dda54a
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/almenon.arepl/default.nix
@@ -0,0 +1,20 @@
+{
+  lib,
+  vscode-utils,
+}:
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "arepl";
+    publisher = "almenon";
+    version = "3.0.0";
+    hash = "sha256-NadsB/6kUQ7/d9o3rUc7889jO+4MdvBhtyI4UUGpzqk=";
+  };
+
+  meta = {
+    description = "Preferred dark/light themes by John Papa";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=almenon.arepl";
+    homepage = "https://github.com/Almenon/AREPL-vscode";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.therobot2105 ];
+  };
+}
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 71250f495667..e01c1bd7d952 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -241,6 +241,8 @@ let
         };
       };
 
+      almenon.arepl = callPackage ./almenon.arepl { };
+
       alygin.vscode-tlaplus = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "vscode-tlaplus";

From 72e09730382eff1f2586ae14086fe8bfd6b10639 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 19:35:15 +0000
Subject: [PATCH 473/489] vi-mongo: 0.1.22 -> 0.1.23

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

diff --git a/pkgs/by-name/vi/vi-mongo/package.nix b/pkgs/by-name/vi/vi-mongo/package.nix
index a045ff8ed78e..f7f7c1b0ed15 100644
--- a/pkgs/by-name/vi/vi-mongo/package.nix
+++ b/pkgs/by-name/vi/vi-mongo/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "vi-mongo";
-  version = "0.1.22";
+  version = "0.1.23";
 
   src = fetchFromGitHub {
     owner = "kopecmaciej";
     repo = "vi-mongo";
     tag = "v${version}";
-    hash = "sha256-OKeflsr823Z9KBgymJG2Z9C4OFxdbW8LzVCWLahMJ0s=";
+    hash = "sha256-zQgGclK6iUtN1PMBSuYVYE8tS1qHTKcTDWDYqhVp3Hg=";
   };
 
   vendorHash = "sha256-rKXrmK0ns3FB6EGyCJ2nYrCUsQ7yPm8dmzJioiVzHIc=";

From bbebb7479d4d5bb2c16296b4f9c43c4ce8c00370 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Tue, 8 Apr 2025 12:49:18 -0700
Subject: [PATCH 474/489] python312Packages.mcp: 1.5.0 -> 1.6.0 Changelog:
 https://github.com/modelcontextprotocol/python-sdk/releases/tag/v1.6.0

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

diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index 654a284178f8..55780ebe8ab9 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "mcp";
-  version = "1.5.0";
+  version = "1.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "python-sdk";
     tag = "v${version}";
-    hash = "sha256-Z2NN6k4mD6NixDON1MUOELpBZW9JvMvFErcCbFPdg2o=";
+    hash = "sha256-APm3x4tcDbp8D2ygW43wFyP0llJ6fXZiINHRYShp9ZY=";
   };
 
   postPatch = ''

From 804b658ac546564768feed9f061905d19472bdd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 20:21:33 +0000
Subject: [PATCH 475/489] python312Packages.scikit-base: 0.12.1 -> 0.12.2

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

diff --git a/pkgs/development/python-modules/scikit-base/default.nix b/pkgs/development/python-modules/scikit-base/default.nix
index acf4b9332b95..4dd13a0edaef 100644
--- a/pkgs/development/python-modules/scikit-base/default.nix
+++ b/pkgs/development/python-modules/scikit-base/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-base";
-  version = "0.12.1";
+  version = "0.12.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sktime";
     repo = "skbase";
     tag = "v${version}";
-    hash = "sha256-UGYkYhgo6LzlZTg6YDehJXd4D5p8FfUgWPdlW4PPOdI=";
+    hash = "sha256-Bkvk3x76DuLr7Q3NkD7z0ycXK6+K+24hawWeBrX6t1w=";
   };
 
   build-system = [ setuptools ];

From 1f5eb6fa4ae9a026fc3b599c2b7ec04d8c923b38 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 5 Apr 2025 19:58:22 +0200
Subject: [PATCH 476/489] nixVersions.stable: nix_2_24 -> nix_2_28

---
 pkgs/tools/package-management/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 89f6805752b7..6fd7f3e18dbf 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -228,7 +228,7 @@ lib.makeExtensible (
           nix;
 
       # Read ./README.md before bumping a major release
-      stable = addFallbackPathsCheck self.nix_2_24;
+      stable = addFallbackPathsCheck self.nix_2_28;
     }
     // lib.optionalAttrs config.allowAliases (
       lib.listToAttrs (

From 58f4fb424823f7b0e5e18b6369423fd5348f361f Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 7 Apr 2025 02:02:43 +0200
Subject: [PATCH 477/489] nix-du: nixForLinking -> nix_2_24

Upstream needs a patch for 2.28 headers rejiggle
---
 pkgs/tools/package-management/nix-du/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 33ef120c40bc..369eec6c9f88 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   rustPlatform,
-  nixForLinking,
+  nixVersions,
   nlohmann_json,
   boost,
   graphviz,
@@ -27,13 +27,13 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = true;
   nativeCheckInputs = [
-    nixForLinking
+    nixVersions.nix_2_24
     graphviz
   ];
 
   buildInputs = [
     boost
-    nixForLinking
+    nixVersions.nix_2_24
     nlohmann_json
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
 

From d6bd5f2f50a9ca25e310e67e6ce0fd929baf8a20 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 7 Apr 2025 14:34:17 +0200
Subject: [PATCH 478/489] nickel: Pin nixVersions.nix_2_24

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

diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix
index 6be15bb7d196..4e929e4d6395 100644
--- a/pkgs/by-name/ni/nickel/package.nix
+++ b/pkgs/by-name/ni/nickel/package.nix
@@ -6,7 +6,7 @@
   python3,
   versionCheckHook,
   pkg-config,
-  nix,
+  nixVersions,
   nix-update-script,
   enableNixImport ? true,
 }:
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ];
 
   buildInputs = lib.optionals enableNixImport [
-    nix
+    nixVersions.nix_2_24
     boost
   ];
 

From c4dddcff9df916afeb659a3caef1272f802fa446 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 7 Apr 2025 14:37:55 +0200
Subject: [PATCH 479/489] nix-heuristic-gc: Pin nix_2_24

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

diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix
index 0c0c8e76222a..88cad6addb7a 100644
--- a/pkgs/by-name/ni/nix-heuristic-gc/package.nix
+++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix
@@ -3,7 +3,7 @@
 {
   lib,
   fetchFromGitHub,
-  nix,
+  nixVersions,
   boost,
   python3Packages,
 }:
@@ -19,12 +19,12 @@ python3Packages.buildPythonPackage rec {
 
   # NIX_SYSTEM suggested at
   # https://github.com/NixOS/nixpkgs/issues/386184#issuecomment-2692433531
-  NIX_SYSTEM = nix.stdenv.hostPlatform.system;
-  NIX_CFLAGS_COMPILE = [ "-I${lib.getDev nix}/include/nix" ];
+  NIX_SYSTEM = nixVersions.nix_2_24.stdenv.hostPlatform.system;
+  NIX_CFLAGS_COMPILE = [ "-I${lib.getDev nixVersions.nix_2_24}/include/nix" ];
 
   buildInputs = [
     boost
-    nix
+    nixVersions.nix_2_24
     python3Packages.pybind11
     python3Packages.setuptools
   ];

From fe06019091e5c369f6a771504827bbc0799899c0 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 7 Apr 2025 14:39:08 +0200
Subject: [PATCH 480/489] nix-plugins: Pin nix_2_24

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

diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix
index bb0c86e7cba6..918734291ffd 100644
--- a/pkgs/by-name/ni/nix-plugins/package.nix
+++ b/pkgs/by-name/ni/nix-plugins/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  nix,
+  nixVersions,
   cmake,
   pkg-config,
   boost,
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    nix
+    nixVersions.nix_2_24
     boost
   ];
 

From 1be27f982dbfab3b0ce63071559750de9f3c6558 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 7 Apr 2025 14:40:35 +0200
Subject: [PATCH 481/489] nixd,nixt: Pin nix_2_24

---
 .../tools/language-servers/nixd/default.nix            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix
index a56c47b59b31..6dc9ff0fb969 100644
--- a/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/pkgs/development/tools/language-servers/nixd/default.nix
@@ -8,7 +8,7 @@
   llvmPackages,
   meson,
   ninja,
-  nixForLinking,
+  nixVersions,
   nix-update-script,
   nixd,
   nixf,
@@ -101,12 +101,12 @@ in
       ];
 
       buildInputs = [
-        nixForLinking
+        nixVersions.nix_2_24
         gtest
         boost
       ];
 
-      env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h";
+      env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h";
 
       passthru.tests.pkg-config = testers.hasPkgConfigModules {
         package = nixt;
@@ -127,7 +127,7 @@ in
       sourceRoot = "${common.src.name}/nixd";
 
       buildInputs = [
-        nixForLinking
+        nixVersions.nix_2_24
         nixf
         nixt
         llvmPackages.llvm
@@ -137,7 +137,7 @@ in
 
       nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ];
 
-      env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h";
+      env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h";
 
       # See https://github.com/nix-community/nixd/issues/519
       doCheck = false;

From a5ff1199c767ba1c2c3845d94799d84d0b4f96ab Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 7 Apr 2025 20:12:38 -0400
Subject: [PATCH 482/489] attic-client: Use Nix 2.24 for now

FYI https://github.com/zhaofengli/attic/pull/234 Gets on 2.28
---
 pkgs/by-name/at/attic-client/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix
index f0ddc302125c..5e8c267dbf2d 100644
--- a/pkgs/by-name/at/attic-client/package.nix
+++ b/pkgs/by-name/at/attic-client/package.nix
@@ -2,7 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  nixForLinking,
+  nixVersions,
   nixosTests,
   boost,
   pkg-config,
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
 
   buildInputs =
     [
-      nixForLinking
+      nixVersions.nix_2_24
       boost
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin (
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage {
   useFetchCargoVendor = true;
 
   ATTIC_DISTRIBUTOR = "nixpkgs";
-  NIX_INCLUDE_PATH = "${lib.getDev nixForLinking}/include";
+  NIX_INCLUDE_PATH = "${lib.getDev nixVersions.nix_2_24}/include";
 
   # Attic interacts with Nix directly and its tests require trusted-user access
   # to nix-daemon to import NARs, which is not possible in the build sandbox.

From f81520f83cdccde21d5da4f9369936a8bc4a30b5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 7 Apr 2025 20:23:16 -0400
Subject: [PATCH 483/489] libblake3: Don't use TBB by default for now

See comment: there are some issues, and since this is all rather new and
Nix dependency, I am wary of a conditional dep so close to the Nixpkgs
stable release.

If we can get a mostly unconditional fix (at least everything but
MinGW), I am happy to enable again.
---
 pkgs/by-name/li/libblake3/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix
index f8ad9df8f55f..59306559958e 100644
--- a/pkgs/by-name/li/libblake3/package.nix
+++ b/pkgs/by-name/li/libblake3/package.nix
@@ -4,7 +4,13 @@
   cmake,
   fetchFromGitHub,
   tbb_2021_11,
-  useTBB ? true,
+
+  # Until we have a release with
+  # https://github.com/BLAKE3-team/BLAKE3/pull/461 and similar, or those
+  # PRs are patched onto this current release. Even then, I think we
+  # still need to disable for MinGW build because
+  # https://github.com/BLAKE3-team/BLAKE3/issues/467
+  useTBB ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {

From 3bc50ee7c74ac045f94c8667514d66e6b37fa246 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 8 Apr 2025 22:42:47 +0200
Subject: [PATCH 484/489] [python312Packages.]private-gpt: fix by relaxing
 docx2txt dependency

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

diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix
index d814ad05ab5e..815964658c8c 100644
--- a/pkgs/development/python-modules/private-gpt/default.nix
+++ b/pkgs/development/python-modules/private-gpt/default.nix
@@ -44,6 +44,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     "cryptography"
+    "docx2txt"
     "fastapi"
     "llama-index-core"
     "llama-index-readers-file"

From 5c695204e167b3b2445e637404cf4833f73faacf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Apr 2025 20:47:40 +0000
Subject: [PATCH 485/489] myks: 4.6.1 -> 4.8.0

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

diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix
index 5eb57965676d..439e618e584a 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "myks";
-  version = "4.6.1";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${version}";
-    hash = "sha256-xHWiE0SCv5LbObAa4Ha/U1uTFe9z11nhpB/eMj5qYoA=";
+    hash = "sha256-B2arJ7m7q/vf1YcaYquhkBU3anekZAwRd1ZIvwvYnmM=";
   };
 
-  vendorHash = "sha256-tgshaSrh5o28uiSMF7sv4AP57xYkaHq6B8sQTrnteqQ=";
+  vendorHash = "sha256-/LpBb0wbK7OP8HmL2/uMVeilIs4P51Pf+sg23zbPqtI=";
 
   subPackages = ".";
 

From 60852fa717e17dc4c9afd4b87423d1b0f9a360f0 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 9 Apr 2025 02:29:30 +0530
Subject: [PATCH 486/489] cosmic-packages: add passthru.tests

---
 pkgs/by-name/co/cosmic-applets/package.nix    | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-applibrary/package.nix | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-bg/package.nix         | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-comp/package.nix       | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-edit/package.nix       | 10 ++++++++
 pkgs/by-name/co/cosmic-files/package.nix      | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-greeter/package.nix    | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-idle/package.nix       | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-launcher/package.nix   | 25 +++++++++++++------
 .../co/cosmic-notifications/package.nix       | 10 ++++++++
 pkgs/by-name/co/cosmic-osd/package.nix        | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-panel/package.nix      | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-player/package.nix     | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-protocols/package.nix  | 21 ++++++++++++----
 pkgs/by-name/co/cosmic-randr/package.nix      | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-screenshot/package.nix | 10 ++++++++
 pkgs/by-name/co/cosmic-session/package.nix    | 13 +++++++++-
 .../co/cosmic-settings-daemon/package.nix     | 10 ++++++++
 pkgs/by-name/co/cosmic-settings/package.nix   | 25 +++++++++++++------
 pkgs/by-name/co/cosmic-store/package.nix      |  9 +++++++
 pkgs/by-name/co/cosmic-term/package.nix       | 25 +++++++++++++------
 .../co/cosmic-workspaces-epoch/package.nix    | 25 +++++++++++++------
 .../xd/xdg-desktop-portal-cosmic/package.nix  | 25 +++++++++++++------
 23 files changed, 365 insertions(+), 118 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix
index d43c222385b8..d3d1bdd9ebb0 100644
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -14,6 +14,7 @@
   udev,
   xkeyboard_config,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -64,13 +65,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     )
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index a6fca5a62349..30dcddceb0ae 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -6,6 +6,7 @@
   libcosmicAppHook,
   just,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -43,13 +44,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 240931718aab..dd6637c115f8 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -7,6 +7,7 @@
   just,
   nasm,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -41,13 +42,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-bg"
   ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index 2f3ae72a11c6..815b6d2deb87 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -13,6 +13,7 @@
   udev,
   systemd,
   nix-update-script,
+  nixosTests,
 
   useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
 }:
@@ -57,13 +58,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   dontCargoInstall = true;
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index f9077e2c283c..d30051be8245 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -16,6 +16,7 @@
   wayland,
   xorg,
   vulkan-loader,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -84,6 +85,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --suffix XDG_DATA_DIRS : "${cosmic-icons}/share"
   '';
 
+  passthru.tests = {
+    inherit (nixosTests)
+      cosmic
+      cosmic-autologin
+      cosmic-noxwayland
+      cosmic-autologin-noxwayland
+      ;
+  };
+
   meta = with lib; {
     homepage = "https://github.com/pop-os/cosmic-edit";
     description = "Text Editor for the COSMIC Desktop Environment";
diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index 7951c9f82d9d..2f94b8b9f533 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -7,6 +7,7 @@
   libcosmicAppHook,
   glib,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -80,13 +81,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     runHook postCheck
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index 90ca350a82c2..68a5ee7aa5ea 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -12,6 +12,7 @@
   coreutils,
   xkeyboard_config,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -69,13 +70,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     )
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index 3bf2c64eb330..18332385b9fc 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -11,6 +11,7 @@
   just,
   bash,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -48,13 +49,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     substituteInPlace src/main.rs --replace-fail '"/bin/sh"' '"${lib.getExe' bash "sh"}"'
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index ac55e2b38390..d852fefb31e3 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -6,6 +6,7 @@
   just,
   libcosmicAppHook,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -41,13 +42,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable";
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    passthru.updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index 99a85f7ee6a7..5fa93c6b17c5 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -12,6 +12,7 @@
   appstream-glib,
   desktop-file-utils,
   intltool,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -62,6 +63,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}"
   '';
 
+  passthru.tests = {
+    inherit (nixosTests)
+      cosmic
+      cosmic-autologin
+      cosmic-noxwayland
+      cosmic-autologin-noxwayland
+      ;
+  };
+
   meta = with lib; {
     homepage = "https://github.com/pop-os/cosmic-notifications";
     description = "Notifications for the COSMIC Desktop Environment";
diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index 745f86f03891..31be64525d5e 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -6,6 +6,7 @@
   pulseaudio,
   udev,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -31,13 +32,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1";
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index 279addbd48b7..56b193f96dbf 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -6,6 +6,7 @@
   libcosmicAppHook,
   just,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -39,13 +40,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel"
   ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index 4dc39cf83dfb..82e0bb86bd2f 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -13,6 +13,7 @@
   libglvnd,
   libgbm,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -71,13 +72,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libcosmicAppWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix
index e887e516cbec..7f6b46785e2a 100644
--- a/pkgs/by-name/co/cosmic-protocols/package.nix
+++ b/pkgs/by-name/co/cosmic-protocols/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   wayland-scanner,
   nix-update-script,
+  nixosTests,
 }:
 
 stdenv.mkDerivation {
@@ -20,11 +21,21 @@ stdenv.mkDerivation {
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
   nativeBuildInputs = [ wayland-scanner ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "branch=HEAD"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "branch=HEAD"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 34444fe33e2c..e5605ace88ab 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -7,6 +7,7 @@
   pkg-config,
   wayland,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -42,13 +43,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-randr"
   ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index df6a50a5ec12..4a5a6e4da84b 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -5,6 +5,7 @@
   rustPlatform,
   just,
   pkg-config,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -37,6 +38,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-screenshot"
   ];
 
+  passthru.tests = {
+    inherit (nixosTests)
+      cosmic
+      cosmic-autologin
+      cosmic-noxwayland
+      cosmic-autologin-noxwayland
+      ;
+  };
+
   meta = with lib; {
     homepage = "https://github.com/pop-os/cosmic-screenshot";
     description = "Screenshot tool for the COSMIC Desktop Environment";
diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix
index 3f3bf681c7b1..d92ff5c15e0c 100644
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@@ -7,6 +7,7 @@
   dbus,
   stdenv,
   xdg-desktop-portal-cosmic,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -62,7 +63,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
     fi
   '';
 
-  passthru.providedSessions = [ "cosmic" ];
+  passthru = {
+    providedSessions = [ "cosmic" ];
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+  };
 
   meta = {
     homepage = "https://github.com/pop-os/cosmic-session";
diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index e63ca30c9c2c..1fea2c041514 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -7,6 +7,7 @@
   geoclue2-with-demo-agent,
   libinput,
   udev,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -38,6 +39,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   dontCargoInstall = true;
 
+  passthru.tests = {
+    inherit (nixosTests)
+      cosmic
+      cosmic-autologin
+      cosmic-noxwayland
+      cosmic-autologin-noxwayland
+      ;
+  };
+
   meta = with lib; {
     homepage = "https://github.com/pop-os/cosmic-settings-daemon";
     description = "Settings Daemon for the COSMIC Desktop Environment";
diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 7305976a50ee..76a97c61c3e8 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -18,6 +18,7 @@
   cosmic-randr,
   xkeyboard_config,
   nix-update-script,
+  nixosTests,
 }:
 let
   libcosmicAppHook' = (libcosmicAppHook.__spliced.buildHost or libcosmicAppHook).override {
@@ -77,13 +78,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     )
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index e096b9cc2d03..9387581d4aa8 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -10,6 +10,7 @@
   flatpak,
   openssl,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -51,6 +52,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
     updateScript = nix-update-script {
       extraArgs = [
         "--version"
diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index f8efd682d3a4..c186673faf4a 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -10,6 +10,7 @@
   freetype,
   libinput,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -57,13 +58,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-term"
   ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index 598ad84c8a36..824f3f960f85 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -9,6 +9,7 @@
   libgbm,
   udev,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -45,13 +46,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index abe32972b3b6..d9ce146f6a07 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -12,6 +12,7 @@
   gst_all_1,
   coreutils,
   nix-update-script,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -71,13 +72,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version"
-      "unstable"
-      "--version-regex"
-      "epoch-(.*)"
-    ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
   };
 
   meta = {

From a85de54826322dade2a1ead886900a5b0a3c939d Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Tue, 8 Apr 2025 14:16:55 -0700
Subject: [PATCH 487/489] python312Packages.mcp: Replace dotlambda with josh as
 maintainer

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

diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index 55780ebe8ab9..d303e82b3ee6 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -93,6 +93,6 @@ buildPythonPackage rec {
     description = "Official Python SDK for Model Context Protocol servers and clients";
     homepage = "https://github.com/modelcontextprotocol/python-sdk";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ dotlambda ];
+    maintainers = with lib.maintainers; [ josh ];
   };
 }

From 471394356316095ba9a150136c3d759754141380 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 14 Feb 2025 23:23:16 +0000
Subject: [PATCH 488/489] hydra: 0-unstable-2025-02-12 -> 0-unstable-2025-04-07

Diff: https://github.com/NixOS/hydra/compare/c6f98202cd1b091475ae51b6a093d00b4c8060d4...1c52c4c0ed596ea71de370562ed5af1604bd2183
---
 pkgs/by-name/hy/hydra/package.nix | 29 ++++++++---------------------
 pkgs/top-level/all-packages.nix   |  2 +-
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 7e2c45fd4c40..84ae45ccbb6a 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -47,7 +47,6 @@
   fetchFromGitHub,
   nixosTests,
   unstableGitUpdater,
-  nixVersions,
 }:
 
 let
@@ -80,6 +79,7 @@ let
         CryptRandPasswd
         DBDPg
         DBDSQLite
+        DBIxClassHelpers
         DataDump
         DateTime
         DigestSHA1
@@ -122,34 +122,21 @@ let
         UUID4Tiny
         XMLSimple
         YAML
-        nix.perl-bindings
+        (nix.libs.nix-perl-bindings or nix.perl-bindings)
         git
       ];
   };
 
-  nix-eval-jobs' =
-    (nix-eval-jobs.override {
-      nix = nixVersions.nix_2_25;
-    }).overrideAttrs
-      (_: {
-        version = "2.25.0-unstable-2025-02-13";
-        src = fetchFromGitHub {
-          owner = "nix-community";
-          repo = "nix-eval-jobs";
-          rev = "6d4fd5a93d7bc953ffa4dcd6d53ad7056a71eff7";
-          hash = "sha256-1dZLPw+nlFQzzswfyTxW+8VF1AJ4ZvoYvLTjlHiz1SA=";
-        };
-      });
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hydra";
-  version = "0-unstable-2025-02-12";
+  version = "0-unstable-2025-04-07";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "c6f98202cd1b091475ae51b6a093d00b4c8060d4";
-    hash = "sha256-CEDUtkA005PiLt1wSo3sgmxfxUBikQSE74ZudyWNxfE=";
+    rev = "1c52c4c0ed596ea71de370562ed5af1604bd2183";
+    hash = "sha256-pcZA2SA7nskxsvDYp3nzF5V258b67YrZONv9G3PhLCE=";
   };
 
   outputs = [
@@ -182,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
       subversion
       openssh
       nix
-      nix-eval-jobs'
+      nix-eval-jobs
       coreutils
       findutils
       pixz
@@ -220,7 +207,7 @@ stdenv.mkDerivation (finalAttrs: {
     glibcLocales
     python3
     libressl.nc
-    nix-eval-jobs'
+    nix-eval-jobs
     openldap
     postgresql
   ];
@@ -257,7 +244,7 @@ stdenv.mkDerivation (finalAttrs: {
             --set-default HYDRA_RELEASE ${finalAttrs.version} \
             --set HYDRA_HOME $out/libexec/hydra \
             --set NIX_RELEASE ${nix.name or "unknown"} \
-            --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs'.name or "unknown"}
+            --set NIX_EVAL_JOBS_RELEASE ${nix-eval-jobs.name or "unknown"}
     done
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b970ee43b0c..3876c0063928 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9853,7 +9853,7 @@ with pkgs;
   hunspellWithDicts =
     dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; };
 
-  hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_24; };
+  hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_28; };
 
   icu-versions = callPackages ../development/libraries/icu { };
   inherit (icu-versions)

From c56194b2acaa40e83a410885fc649d4caf9c60c1 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 7 Apr 2025 19:24:48 +0530
Subject: [PATCH 489/489] squashfuse: Use fuse3 instead of fuse

Co-authored-by: ralismark <13449732+ralismark@users.noreply.github.com>
---
 pkgs/by-name/sq/squashfuse/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sq/squashfuse/package.nix b/pkgs/by-name/sq/squashfuse/package.nix
index 172979803507..3a55cfa171b5 100644
--- a/pkgs/by-name/sq/squashfuse/package.nix
+++ b/pkgs/by-name/sq/squashfuse/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   autoreconfHook,
   libtool,
-  fuse,
+  fuse3,
   pkg-config,
   lz4,
   xz,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     zlib
     lzo
     zstd
-    fuse
+    fuse3
   ];
 
   meta = {